From afd1179c0da0fae65998425d3bc30ecb310e6ca2 Mon Sep 17 00:00:00 2001
From: Daniil Suleiman <31325372+sulemanof@users.noreply.github.com>
Date: Mon, 23 Mar 2020 10:57:03 +0300
Subject: [PATCH 001/179] [NP] Remove kbnUrl usage in
 discover/dashboard/visualize (#60016)

* Remove kbnUrl usages from disciver/dashboard/visualize

* Remove kbnUrl usage in angular_config

* Wrap with encodeURIComponent

* Fix reloading when base path

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 .../kibana/public/dashboard/legacy_imports.ts |  8 ----
 .../public/dashboard/np_ready/application.ts  | 30 +-----------
 .../dashboard/np_ready/dashboard_app.tsx      | 48 +++++++++----------
 .../public/dashboard/np_ready/legacy_app.js   | 14 +++---
 .../public/discover/get_inner_angular.ts      | 12 +----
 .../discover/np_ready/angular/discover.js     | 23 +++++----
 .../angular/doc_table/components/table_row.ts | 13 ++---
 .../kibana/public/visualize/legacy_imports.ts |  5 --
 .../public/visualize/np_ready/application.ts  | 28 +----------
 .../visualize/np_ready/editor/editor.js       | 21 +++-----
 .../np_ready/listing/visualize_listing.js     |  9 ++--
 .../public/angular/angular_config.tsx         |  2 +-
 12 files changed, 65 insertions(+), 148 deletions(-)

diff --git a/src/legacy/core_plugins/kibana/public/dashboard/legacy_imports.ts b/src/legacy/core_plugins/kibana/public/dashboard/legacy_imports.ts
index 3f81bfe5aadf2..55e1475fcb03a 100644
--- a/src/legacy/core_plugins/kibana/public/dashboard/legacy_imports.ts
+++ b/src/legacy/core_plugins/kibana/public/dashboard/legacy_imports.ts
@@ -25,17 +25,9 @@
  */
 
 export { npSetup, npStart } from 'ui/new_platform';
-
-export { KbnUrl } from 'ui/url/kbn_url';
-// @ts-ignore
-export { KbnUrlProvider } from 'ui/url/index';
-export { IInjector } from 'ui/chrome';
 export { absoluteToParsedUrl } from 'ui/url/absolute_to_parsed_url';
 export {
   configureAppAngularModule,
-  IPrivate,
   migrateLegacyQuery,
-  PrivateProvider,
-  PromiseServiceCreator,
   subscribeWithScope,
 } from '../../../../../plugins/kibana_legacy/public';
diff --git a/src/legacy/core_plugins/kibana/public/dashboard/np_ready/application.ts b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/application.ts
index 9447b5384d172..877ccab99171d 100644
--- a/src/legacy/core_plugins/kibana/public/dashboard/np_ready/application.ts
+++ b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/application.ts
@@ -29,13 +29,7 @@ import {
   PluginInitializerContext,
 } from 'kibana/public';
 import { Storage } from '../../../../../../plugins/kibana_utils/public';
-import {
-  configureAppAngularModule,
-  IPrivate,
-  KbnUrlProvider,
-  PrivateProvider,
-  PromiseServiceCreator,
-} from '../legacy_imports';
+import { configureAppAngularModule } from '../legacy_imports';
 // @ts-ignore
 import { initDashboardApp } from './legacy_app';
 import { EmbeddableStart } from '../../../../../../plugins/embeddable/public';
@@ -116,10 +110,7 @@ function mountDashboardApp(appBasePath: string, element: HTMLElement) {
 
 function createLocalAngularModule(core: AppMountContext['core'], navigation: NavigationStart) {
   createLocalI18nModule();
-  createLocalPrivateModule();
-  createLocalPromiseModule();
   createLocalConfigModule(core);
-  createLocalKbnUrlModule();
   createLocalTopNavModule(navigation);
   createLocalIconModule();
 
@@ -127,10 +118,7 @@ function createLocalAngularModule(core: AppMountContext['core'], navigation: Nav
     ...thirdPartyAngularDependencies,
     'app/dashboard/Config',
     'app/dashboard/I18n',
-    'app/dashboard/Private',
     'app/dashboard/TopNav',
-    'app/dashboard/KbnUrl',
-    'app/dashboard/Promise',
     'app/dashboard/icon',
   ]);
   return dashboardAngularModule;
@@ -142,14 +130,8 @@ function createLocalIconModule() {
     .directive('icon', reactDirective => reactDirective(EuiIcon));
 }
 
-function createLocalKbnUrlModule() {
-  angular
-    .module('app/dashboard/KbnUrl', ['app/dashboard/Private', 'ngRoute'])
-    .service('kbnUrl', (Private: IPrivate) => Private(KbnUrlProvider));
-}
-
 function createLocalConfigModule(core: AppMountContext['core']) {
-  angular.module('app/dashboard/Config', ['app/dashboard/Private']).provider('config', () => {
+  angular.module('app/dashboard/Config', []).provider('config', () => {
     return {
       $get: () => ({
         get: core.uiSettings.get.bind(core.uiSettings),
@@ -158,14 +140,6 @@ function createLocalConfigModule(core: AppMountContext['core']) {
   });
 }
 
-function createLocalPromiseModule() {
-  angular.module('app/dashboard/Promise', []).service('Promise', PromiseServiceCreator);
-}
-
-function createLocalPrivateModule() {
-  angular.module('app/dashboard/Private', []).provider('Private', PrivateProvider);
-}
-
 function createLocalTopNavModule(navigation: NavigationStart) {
   angular
     .module('app/dashboard/TopNav', ['react'])
diff --git a/src/legacy/core_plugins/kibana/public/dashboard/np_ready/dashboard_app.tsx b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/dashboard_app.tsx
index c0a0693431295..4e9942767186e 100644
--- a/src/legacy/core_plugins/kibana/public/dashboard/np_ready/dashboard_app.tsx
+++ b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/dashboard_app.tsx
@@ -21,8 +21,6 @@ import moment from 'moment';
 import { Subscription } from 'rxjs';
 import { History } from 'history';
 
-import { IInjector } from '../legacy_imports';
-
 import { ViewMode } from '../../../../embeddable_api/public/np_ready/public';
 import { SavedObjectDashboard } from '../saved_dashboard/saved_dashboard';
 import { DashboardAppState, SavedDashboardPanel } from './types';
@@ -86,28 +84,26 @@ export interface DashboardAppScope extends ng.IScope {
 }
 
 export function initDashboardAppDirective(app: any, deps: RenderDeps) {
-  app.directive('dashboardApp', function($injector: IInjector) {
-    return {
-      restrict: 'E',
-      controllerAs: 'dashboardApp',
-      controller: (
-        $scope: DashboardAppScope,
-        $route: any,
-        $routeParams: {
-          id?: string;
-        },
-        kbnUrlStateStorage: IKbnUrlStateStorage,
-        history: History
-      ) =>
-        new DashboardAppController({
-          $route,
-          $scope,
-          $routeParams,
-          indexPatterns: deps.data.indexPatterns,
-          kbnUrlStateStorage,
-          history,
-          ...deps,
-        }),
-    };
-  });
+  app.directive('dashboardApp', () => ({
+    restrict: 'E',
+    controllerAs: 'dashboardApp',
+    controller: (
+      $scope: DashboardAppScope,
+      $route: any,
+      $routeParams: {
+        id?: string;
+      },
+      kbnUrlStateStorage: IKbnUrlStateStorage,
+      history: History
+    ) =>
+      new DashboardAppController({
+        $route,
+        $scope,
+        $routeParams,
+        indexPatterns: deps.data.indexPatterns,
+        kbnUrlStateStorage,
+        history,
+        ...deps,
+      }),
+  }));
 }
diff --git a/src/legacy/core_plugins/kibana/public/dashboard/np_ready/legacy_app.js b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/legacy_app.js
index 64abbdfb87d58..dbeaf8a98b461 100644
--- a/src/legacy/core_plugins/kibana/public/dashboard/np_ready/legacy_app.js
+++ b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/legacy_app.js
@@ -18,6 +18,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
+import { parse } from 'query-string';
 
 import dashboardTemplate from './dashboard_app.html';
 import dashboardListingTemplate from './listing/dashboard_listing_ng_wrapper.html';
@@ -93,9 +94,8 @@ export function initDashboardApp(app, deps) {
       .when(DashboardConstants.LANDING_PAGE_PATH, {
         ...defaults,
         template: dashboardListingTemplate,
-        controller($injector, $location, $scope, kbnUrlStateStorage) {
+        controller($scope, kbnUrlStateStorage, history) {
           const service = deps.savedDashboards;
-          const kbnUrl = $injector.get('kbnUrl');
           const dashboardConfig = deps.dashboardConfig;
 
           // syncs `_g` portion of url with query services
@@ -106,13 +106,13 @@ export function initDashboardApp(app, deps) {
 
           $scope.listingLimit = deps.uiSettings.get('savedObjects:listingLimit');
           $scope.create = () => {
-            kbnUrl.redirect(DashboardConstants.CREATE_NEW_DASHBOARD_URL);
+            history.push(DashboardConstants.CREATE_NEW_DASHBOARD_URL);
           };
           $scope.find = search => {
             return service.find(search, $scope.listingLimit);
           };
           $scope.editItem = ({ id }) => {
-            kbnUrl.redirect(`${createDashboardEditUrl(id)}?_a=(viewMode:edit)`);
+            history.push(`${createDashboardEditUrl(id)}?_a=(viewMode:edit)`);
           };
           $scope.getViewUrl = ({ id }) => {
             return deps.addBasePath(`#${createDashboardEditUrl(id)}`);
@@ -121,7 +121,7 @@ export function initDashboardApp(app, deps) {
             return service.delete(dashboards.map(d => d.id));
           };
           $scope.hideWriteControls = dashboardConfig.getHideWriteControls();
-          $scope.initialFilter = $location.search().filter || EMPTY_FILTER;
+          $scope.initialFilter = parse(history.location.search).filter || EMPTY_FILTER;
           deps.chrome.setBreadcrumbs([
             {
               text: i18n.translate('kbn.dashboard.dashboardBreadcrumbsTitle', {
@@ -191,7 +191,7 @@ export function initDashboardApp(app, deps) {
         template: dashboardTemplate,
         controller: createNewDashboardCtrl,
         resolve: {
-          dash: function($route, kbnUrl, history) {
+          dash: function($route, history) {
             const id = $route.current.params.id;
 
             return ensureDefaultIndexPattern(deps.core, deps.data, history)
@@ -208,7 +208,7 @@ export function initDashboardApp(app, deps) {
                 // A corrupt dashboard was detected (e.g. with invalid JSON properties)
                 if (error instanceof InvalidJSONProperty) {
                   deps.core.notifications.toasts.addDanger(error.message);
-                  kbnUrl.redirect(DashboardConstants.LANDING_PAGE_PATH);
+                  history.push(DashboardConstants.LANDING_PAGE_PATH);
                   return;
                 }
 
diff --git a/src/legacy/core_plugins/kibana/public/discover/get_inner_angular.ts b/src/legacy/core_plugins/kibana/public/discover/get_inner_angular.ts
index a19278911507c..031e10e99289f 100644
--- a/src/legacy/core_plugins/kibana/public/discover/get_inner_angular.ts
+++ b/src/legacy/core_plugins/kibana/public/discover/get_inner_angular.ts
@@ -24,8 +24,6 @@ import angular from 'angular';
 import { EuiIcon } from '@elastic/eui';
 import { i18nDirective, i18nFilter, I18nProvider } from '@kbn/i18n/angular';
 import { CoreStart, LegacyCoreStart } from 'kibana/public';
-// @ts-ignore
-import { KbnUrlProvider } from 'ui/url';
 import { DataPublicPluginStart } from '../../../../../plugins/data/public';
 import { Storage } from '../../../../../plugins/kibana_utils/public';
 import { NavigationPublicPluginStart as NavigationStart } from '../../../../../plugins/navigation/public';
@@ -59,7 +57,6 @@ import { createRenderCompleteDirective } from './np_ready/angular/directives/ren
 import {
   initAngularBootstrap,
   configureAppAngularModule,
-  IPrivate,
   KbnAccessibleClickProvider,
   PrivateProvider,
   PromiseServiceCreator,
@@ -106,7 +103,6 @@ export function initializeInnerAngularModule(
     createLocalI18nModule();
     createLocalPrivateModule();
     createLocalPromiseModule();
-    createLocalKbnUrlModule();
     createLocalTopNavModule(navigation);
     createLocalStorageModule();
     createElasticSearchModule(data);
@@ -166,12 +162,6 @@ export function initializeInnerAngularModule(
     .service('debounce', ['$timeout', DebounceProviderTimeout]);
 }
 
-function createLocalKbnUrlModule() {
-  angular
-    .module('discoverKbnUrl', ['discoverPrivate', 'ngRoute'])
-    .service('kbnUrl', (Private: IPrivate) => Private(KbnUrlProvider));
-}
-
 function createLocalPromiseModule() {
   angular.module('discoverPromise', []).service('Promise', PromiseServiceCreator);
 }
@@ -223,7 +213,7 @@ function createPagerFactoryModule() {
 
 function createDocTableModule() {
   angular
-    .module('discoverDocTable', ['discoverKbnUrl', 'discoverPagerFactory', 'react'])
+    .module('discoverDocTable', ['discoverPagerFactory', 'react'])
     .directive('docTable', createDocTableDirective)
     .directive('kbnTableHeader', createTableHeaderDirective)
     .directive('toolBarPagerText', createToolBarPagerTextDirective)
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 e45ab2a7d7675..278317ec2e87b 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
@@ -184,7 +184,6 @@ function discoverController(
   $timeout,
   $window,
   Promise,
-  kbnUrl,
   localStorage,
   uiCapabilities
 ) {
@@ -255,6 +254,15 @@ function discoverController(
     }
   });
 
+  // this listener is waiting for such a path http://localhost:5601/app/kibana#/discover
+  // which could be set through pressing "New" button in top nav or go to "Discover" plugin from the sidebar
+  // to reload the page in a right way
+  const unlistenHistoryBasePath = history.listen(({ pathname, search, hash }) => {
+    if (!search && !hash && pathname === '/discover') {
+      $route.reload();
+    }
+  });
+
   $scope.setIndexPattern = async id => {
     await replaceUrlAppState({ index: id });
     $route.reload();
@@ -310,6 +318,7 @@ function discoverController(
     stopStateSync();
     stopSyncingGlobalStateWithUrl();
     stopSyncingQueryAppStateWithStateContainer();
+    unlistenHistoryBasePath();
   });
 
   const getTopNavLinks = () => {
@@ -323,7 +332,7 @@ function discoverController(
       }),
       run: function() {
         $scope.$evalAsync(() => {
-          kbnUrl.change('/discover');
+          history.push('/discover');
         });
       },
       testId: 'discoverNewButton',
@@ -391,9 +400,7 @@ function discoverController(
       testId: 'discoverOpenButton',
       run: () => {
         showOpenSearchPanel({
-          makeUrl: searchId => {
-            return kbnUrl.eval('#/discover/{{id}}', { id: searchId });
-          },
+          makeUrl: searchId => `#/discover/${encodeURIComponent(searchId)}`,
           I18nContext: core.i18n.Context,
         });
       },
@@ -751,7 +758,7 @@ function discoverController(
           });
 
           if (savedSearch.id !== $route.current.params.id) {
-            kbnUrl.change('/discover/{{id}}', { id: savedSearch.id });
+            history.push(`/discover/${encodeURIComponent(savedSearch.id)}`);
           } else {
             // Update defaults so that "reload saved query" functions correctly
             setAppState(getStateDefaults());
@@ -921,11 +928,11 @@ function discoverController(
   };
 
   $scope.resetQuery = function() {
-    kbnUrl.change('/discover/{{id}}', { id: $route.current.params.id });
+    history.push(`/discover/${encodeURIComponent($route.current.params.id)}`);
   };
 
   $scope.newQuery = function() {
-    kbnUrl.change('/discover');
+    history.push('/discover');
   };
 
   $scope.updateDataSource = () => {
diff --git a/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_table/components/table_row.ts b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_table/components/table_row.ts
index 5d3f6ac199a46..698bfe7416d42 100644
--- a/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_table/components/table_row.ts
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_table/components/table_row.ts
@@ -41,11 +41,7 @@ interface LazyScope extends ng.IScope {
   [key: string]: any;
 }
 
-export function createTableRowDirective(
-  $compile: ng.ICompileService,
-  $httpParamSerializer: any,
-  kbnUrl: any
-) {
+export function createTableRowDirective($compile: ng.ICompileService, $httpParamSerializer: any) {
   const cellTemplate = _.template(noWhiteSpace(cellTemplateHtml));
   const truncateByHeightTemplate = _.template(noWhiteSpace(truncateByHeightTemplateHtml));
 
@@ -110,10 +106,9 @@ export function createTableRowDirective(
       };
 
       $scope.getContextAppHref = () => {
-        const path = kbnUrl.eval('#/discover/context/{{ indexPattern }}/{{ anchorId }}', {
-          anchorId: $scope.row._id,
-          indexPattern: $scope.indexPattern.id,
-        });
+        const path = `#/discover/context/${encodeURIComponent(
+          $scope.indexPattern.id
+        )}/${encodeURIComponent($scope.row._id)}`;
         const globalFilters: any = getServices().filterManager.getGlobalFilters();
         const appFilters: any = getServices().filterManager.getAppFilters();
         const hash = $httpParamSerializer({
diff --git a/src/legacy/core_plugins/kibana/public/visualize/legacy_imports.ts b/src/legacy/core_plugins/kibana/public/visualize/legacy_imports.ts
index e6b7a29e28d89..a2e2ba3543104 100644
--- a/src/legacy/core_plugins/kibana/public/visualize/legacy_imports.ts
+++ b/src/legacy/core_plugins/kibana/public/visualize/legacy_imports.ts
@@ -24,8 +24,6 @@
  * directly where they are needed.
  */
 
-// @ts-ignore
-export { KbnUrlProvider } from 'ui/url';
 export { absoluteToParsedUrl } from 'ui/url/absolute_to_parsed_url';
 export { KibanaParsedUrl } from 'ui/url/kibana_parsed_url';
 export { wrapInI18nContext } from 'ui/i18n';
@@ -33,9 +31,6 @@ export { DashboardConstants } from '../dashboard/np_ready/dashboard_constants';
 export { VisSavedObject, VISUALIZE_EMBEDDABLE_TYPE } from '../../../visualizations/public/';
 export {
   configureAppAngularModule,
-  IPrivate,
   migrateLegacyQuery,
-  PrivateProvider,
-  PromiseServiceCreator,
   subscribeWithScope,
 } from '../../../../../plugins/kibana_legacy/public';
diff --git a/src/legacy/core_plugins/kibana/public/visualize/np_ready/application.ts b/src/legacy/core_plugins/kibana/public/visualize/np_ready/application.ts
index c7c3286bb5c71..241397884c8fe 100644
--- a/src/legacy/core_plugins/kibana/public/visualize/np_ready/application.ts
+++ b/src/legacy/core_plugins/kibana/public/visualize/np_ready/application.ts
@@ -21,13 +21,7 @@ import angular, { IModule } from 'angular';
 import { i18nDirective, i18nFilter, I18nProvider } from '@kbn/i18n/angular';
 
 import { AppMountContext } from 'kibana/public';
-import {
-  configureAppAngularModule,
-  KbnUrlProvider,
-  IPrivate,
-  PrivateProvider,
-  PromiseServiceCreator,
-} from '../legacy_imports';
+import { configureAppAngularModule } from '../legacy_imports';
 import { NavigationPublicPluginStart as NavigationStart } from '../../../../../../plugins/navigation/public';
 import {
   createTopNavDirective,
@@ -82,36 +76,16 @@ function mountVisualizeApp(appBasePath: string, element: HTMLElement) {
 
 function createLocalAngularModule(core: AppMountContext['core'], navigation: NavigationStart) {
   createLocalI18nModule();
-  createLocalPrivateModule();
-  createLocalPromiseModule();
-  createLocalKbnUrlModule();
   createLocalTopNavModule(navigation);
 
   const visualizeAngularModule: IModule = angular.module(moduleName, [
     ...thirdPartyAngularDependencies,
     'app/visualize/I18n',
-    'app/visualize/Private',
     'app/visualize/TopNav',
-    'app/visualize/KbnUrl',
-    'app/visualize/Promise',
   ]);
   return visualizeAngularModule;
 }
 
-function createLocalKbnUrlModule() {
-  angular
-    .module('app/visualize/KbnUrl', ['app/visualize/Private', 'ngRoute'])
-    .service('kbnUrl', (Private: IPrivate) => Private(KbnUrlProvider));
-}
-
-function createLocalPromiseModule() {
-  angular.module('app/visualize/Promise', []).service('Promise', PromiseServiceCreator);
-}
-
-function createLocalPrivateModule() {
-  angular.module('app/visualize/Private', []).provider('Private', PrivateProvider);
-}
-
 function createLocalTopNavModule(navigation: NavigationStart) {
   angular
     .module('app/visualize/TopNav', ['react'])
diff --git a/src/legacy/core_plugins/kibana/public/visualize/np_ready/editor/editor.js b/src/legacy/core_plugins/kibana/public/visualize/np_ready/editor/editor.js
index 1fab38027f65b..7d1c29fbf48da 100644
--- a/src/legacy/core_plugins/kibana/public/visualize/np_ready/editor/editor.js
+++ b/src/legacy/core_plugins/kibana/public/visualize/np_ready/editor/editor.js
@@ -30,7 +30,7 @@ import { VisualizeConstants } from '../visualize_constants';
 import { getEditBreadcrumbs } from '../breadcrumbs';
 
 import { addHelpMenuToAppChrome } from '../help_menu/help_menu_util';
-import { unhashUrl } from '../../../../../../../plugins/kibana_utils/public';
+import { unhashUrl, removeQueryParam } from '../../../../../../../plugins/kibana_utils/public';
 import { MarkdownSimple, toMountPoint } from '../../../../../../../plugins/kibana_react/public';
 import { addFatalError, kbnBaseUrl } from '../../../../../../../plugins/kibana_legacy/public';
 import {
@@ -69,16 +69,7 @@ export function initEditorDirective(app, deps) {
   initVisualizationDirective(app, deps);
 }
 
-function VisualizeAppController(
-  $scope,
-  $route,
-  $window,
-  $injector,
-  $timeout,
-  kbnUrl,
-  kbnUrlStateStorage,
-  history
-) {
+function VisualizeAppController($scope, $route, $injector, $timeout, kbnUrlStateStorage, history) {
   const {
     indexPatterns,
     localStorage,
@@ -421,7 +412,7 @@ function VisualizeAppController(
 
     const addToDashMode =
       $route.current.params[DashboardConstants.ADD_VISUALIZATION_TO_DASHBOARD_MODE_PARAM];
-    kbnUrl.removeParam(DashboardConstants.ADD_VISUALIZATION_TO_DASHBOARD_MODE_PARAM);
+    removeQueryParam(history, DashboardConstants.ADD_VISUALIZATION_TO_DASHBOARD_MODE_PARAM);
 
     $scope.isAddToDashMode = () => addToDashMode;
 
@@ -639,10 +630,10 @@ function VisualizeAppController(
               const savedVisualizationParsedUrl = new KibanaParsedUrl({
                 basePath: getBasePath(),
                 appId: kbnBaseUrl.slice('/app/'.length),
-                appPath: kbnUrl.eval(`${VisualizeConstants.EDIT_PATH}/{{id}}`, { id: savedVis.id }),
+                appPath: `${VisualizeConstants.EDIT_PATH}/${encodeURIComponent(savedVis.id)}`,
               });
               // Manually insert a new url so the back button will open the saved visualization.
-              $window.history.pushState({}, '', savedVisualizationParsedUrl.getRootRelativePath());
+              history.replace(savedVisualizationParsedUrl.appPath);
               setActiveUrl(savedVisualizationParsedUrl.appPath);
 
               const lastDashboardAbsoluteUrl = chrome.navLinks.get('kibana:dashboard').url;
@@ -658,7 +649,7 @@ function VisualizeAppController(
                 DashboardConstants.ADD_EMBEDDABLE_ID,
                 savedVis.id
               );
-              kbnUrl.change(dashboardParsedUrl.appPath);
+              history.push(dashboardParsedUrl.appPath);
             } else if (savedVis.id === $route.current.params.id) {
               chrome.docTitle.change(savedVis.lastSavedTitle);
               chrome.setBreadcrumbs($injector.invoke(getEditBreadcrumbs));
diff --git a/src/legacy/core_plugins/kibana/public/visualize/np_ready/listing/visualize_listing.js b/src/legacy/core_plugins/kibana/public/visualize/np_ready/listing/visualize_listing.js
index 5a479a491395a..6c02afb672e4c 100644
--- a/src/legacy/core_plugins/kibana/public/visualize/np_ready/listing/visualize_listing.js
+++ b/src/legacy/core_plugins/kibana/public/visualize/np_ready/listing/visualize_listing.js
@@ -34,7 +34,7 @@ export function initListingDirective(app) {
   );
 }
 
-export function VisualizeListingController($injector, $scope, createNewVis, kbnUrlStateStorage) {
+export function VisualizeListingController($scope, createNewVis, kbnUrlStateStorage, history) {
   const {
     addBasePath,
     chrome,
@@ -46,7 +46,6 @@ export function VisualizeListingController($injector, $scope, createNewVis, kbnU
     visualizations,
     core: { docLinks, savedObjects },
   } = getServices();
-  const kbnUrl = $injector.get('kbnUrl');
 
   // syncs `_g` portion of url with query services
   const { stop: stopSyncingQueryServiceStateWithUrl } = syncQueryStateWithUrl(
@@ -83,7 +82,11 @@ export function VisualizeListingController($injector, $scope, createNewVis, kbnU
     this.closeNewVisModal = visualizations.showNewVisModal({
       onClose: () => {
         // In case the user came via a URL to this page, change the URL to the regular landing page URL after closing the modal
-        kbnUrl.changePath(VisualizeConstants.LANDING_PAGE_PATH);
+        history.push({
+          // Should preserve querystring part so the global state is preserved.
+          ...history.location,
+          pathname: VisualizeConstants.LANDING_PAGE_PATH,
+        });
       },
     });
   }
diff --git a/src/plugins/kibana_legacy/public/angular/angular_config.tsx b/src/plugins/kibana_legacy/public/angular/angular_config.tsx
index 67d62cab7409b..71cd57ef2d72e 100644
--- a/src/plugins/kibana_legacy/public/angular/angular_config.tsx
+++ b/src/plugins/kibana_legacy/public/angular/angular_config.tsx
@@ -226,7 +226,7 @@ const $setupUICapabilityRedirect = (newPlatform: CoreStart) => (
       }
 
       if (!get(newPlatform.application.capabilities, route.requireUICapability)) {
-        $injector.get('kbnUrl').change('/home');
+        $injector.get('$location').url('/home');
         event.preventDefault();
       }
     }

From 7bafeb1d6f562a7e6b3c893ad7fc51b0a2e5de6a Mon Sep 17 00:00:00 2001
From: Tudor Golubenco <tudor@elastic.co>
Date: Mon, 23 Mar 2020 10:29:38 +0100
Subject: [PATCH 002/179] [SIEM] Use ECS categorisation for Authentication
 widgets (#60734)

* Update the Authentication histogram to use categorization fields

* linting

* Use categorization fields for the Authentications table

* Use event.outcome for authentications KPIs

* Adjust mock to fix unit test

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 .../navigation/authentications_query_tab_body.tsx | 10 +++++-----
 .../siem/server/lib/authentications/query.dsl.ts  |  4 ++--
 .../plugins/siem/server/lib/kpi_hosts/mock.ts     |  8 ++++----
 .../lib/kpi_hosts/query_authentication.dsl.ts     |  8 ++++----
 .../query.authentications_over_time.dsl.ts        | 15 +++++++++++++--
 5 files changed, 28 insertions(+), 17 deletions(-)

diff --git a/x-pack/legacy/plugins/siem/public/pages/hosts/navigation/authentications_query_tab_body.tsx b/x-pack/legacy/plugins/siem/public/pages/hosts/navigation/authentications_query_tab_body.tsx
index fb083b7a7da2f..5a6759fd07221 100644
--- a/x-pack/legacy/plugins/siem/public/pages/hosts/navigation/authentications_query_tab_body.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/hosts/navigation/authentications_query_tab_body.tsx
@@ -25,15 +25,15 @@ const AuthenticationTableManage = manageQuery(AuthenticationTable);
 const ID = 'authenticationsOverTimeQuery';
 const authStackByOptions: MatrixHistogramOption[] = [
   {
-    text: 'event.type',
-    value: 'event.type',
+    text: 'event.outcome',
+    value: 'event.outcome',
   },
 ];
-const DEFAULT_STACK_BY = 'event.type';
+const DEFAULT_STACK_BY = 'event.outcome';
 
 enum AuthMatrixDataGroup {
-  authSuccess = 'authentication_success',
-  authFailure = 'authentication_failure',
+  authSuccess = 'success',
+  authFailure = 'failure',
 }
 
 export const authMatrixDataMappingFields: MatrixHistogramMappingTypes = {
diff --git a/x-pack/legacy/plugins/siem/server/lib/authentications/query.dsl.ts b/x-pack/legacy/plugins/siem/server/lib/authentications/query.dsl.ts
index 333cc79fadabc..b9ed88e91f87d 100644
--- a/x-pack/legacy/plugins/siem/server/lib/authentications/query.dsl.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/authentications/query.dsl.ts
@@ -70,7 +70,7 @@ export const buildQuery = ({
             failures: {
               filter: {
                 term: {
-                  'event.type': 'authentication_failure',
+                  'event.outcome': 'failure',
                 },
               },
               aggs: {
@@ -86,7 +86,7 @@ export const buildQuery = ({
             successes: {
               filter: {
                 term: {
-                  'event.type': 'authentication_success',
+                  'event.outcome': 'success',
                 },
               },
               aggs: {
diff --git a/x-pack/legacy/plugins/siem/server/lib/kpi_hosts/mock.ts b/x-pack/legacy/plugins/siem/server/lib/kpi_hosts/mock.ts
index b82a540900bd0..ed9fbf0ba0646 100644
--- a/x-pack/legacy/plugins/siem/server/lib/kpi_hosts/mock.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/kpi_hosts/mock.ts
@@ -356,15 +356,15 @@ export const mockKpiHostDetailsUniqueIpsQuery = [
 ];
 
 const mockAuthAggs = {
-  authentication_success: { filter: { term: { 'event.type': 'authentication_success' } } },
+  authentication_success: { filter: { term: { 'event.outcome': 'success' } } },
   authentication_success_histogram: {
     auto_date_histogram: { field: '@timestamp', buckets: '6' },
-    aggs: { count: { filter: { term: { 'event.type': 'authentication_success' } } } },
+    aggs: { count: { filter: { term: { 'event.outcome': 'success' } } } },
   },
-  authentication_failure: { filter: { term: { 'event.type': 'authentication_failure' } } },
+  authentication_failure: { filter: { term: { 'event.outcome': 'failure' } } },
   authentication_failure_histogram: {
     auto_date_histogram: { field: '@timestamp', buckets: '6' },
-    aggs: { count: { filter: { term: { 'event.type': 'authentication_failure' } } } },
+    aggs: { count: { filter: { term: { 'event.outcome': 'failure' } } } },
   },
 };
 
diff --git a/x-pack/legacy/plugins/siem/server/lib/kpi_hosts/query_authentication.dsl.ts b/x-pack/legacy/plugins/siem/server/lib/kpi_hosts/query_authentication.dsl.ts
index 5734aa6ee88cc..0b7803d007194 100644
--- a/x-pack/legacy/plugins/siem/server/lib/kpi_hosts/query_authentication.dsl.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/kpi_hosts/query_authentication.dsl.ts
@@ -49,7 +49,7 @@ export const buildAuthQuery = ({
         authentication_success: {
           filter: {
             term: {
-              'event.type': 'authentication_success',
+              'event.outcome': 'success',
             },
           },
         },
@@ -62,7 +62,7 @@ export const buildAuthQuery = ({
             count: {
               filter: {
                 term: {
-                  'event.type': 'authentication_success',
+                  'event.outcome': 'success',
                 },
               },
             },
@@ -71,7 +71,7 @@ export const buildAuthQuery = ({
         authentication_failure: {
           filter: {
             term: {
-              'event.type': 'authentication_failure',
+              'event.outcome': 'failure',
             },
           },
         },
@@ -84,7 +84,7 @@ export const buildAuthQuery = ({
             count: {
               filter: {
                 term: {
-                  'event.type': 'authentication_failure',
+                  'event.outcome': 'failure',
                 },
               },
             },
diff --git a/x-pack/legacy/plugins/siem/server/lib/matrix_histogram/query.authentications_over_time.dsl.ts b/x-pack/legacy/plugins/siem/server/lib/matrix_histogram/query.authentications_over_time.dsl.ts
index ccf0d235abdd3..34a3804f974de 100644
--- a/x-pack/legacy/plugins/siem/server/lib/matrix_histogram/query.authentications_over_time.dsl.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/matrix_histogram/query.authentications_over_time.dsl.ts
@@ -13,10 +13,21 @@ export const buildAuthenticationsOverTimeQuery = ({
   sourceConfiguration: {
     fields: { timestamp },
   },
-  stackByField = 'event.type',
+  stackByField = 'event.outcome',
 }: MatrixHistogramRequestOptions) => {
   const filter = [
     ...createQueryFilterClauses(filterQuery),
+    {
+      bool: {
+        must: [
+          {
+            term: {
+              'event.category': 'authentication',
+            },
+          },
+        ],
+      },
+    },
     {
       range: {
         [timestamp]: {
@@ -45,7 +56,7 @@ export const buildAuthenticationsOverTimeQuery = ({
       eventActionGroup: {
         terms: {
           field: stackByField,
-          include: ['authentication_success', 'authentication_failure'],
+          include: ['success', 'failure'],
           order: {
             _count: 'desc',
           },

From b03a3628dd918bc34d39e39cefe01d1ec8986a82 Mon Sep 17 00:00:00 2001
From: James Gowdy <jgowdy@elastic.co>
Date: Mon, 23 Mar 2020 10:38:51 +0000
Subject: [PATCH 003/179] [ML] Fixing app clean up (#60853)

---
 x-pack/plugins/ml/public/application/app.tsx | 65 +++++++++-----------
 1 file changed, 30 insertions(+), 35 deletions(-)

diff --git a/x-pack/plugins/ml/public/application/app.tsx b/x-pack/plugins/ml/public/application/app.tsx
index 6269c11fca896..8c3e0c066f411 100644
--- a/x-pack/plugins/ml/public/application/app.tsx
+++ b/x-pack/plugins/ml/public/application/app.tsx
@@ -23,45 +23,16 @@ type MlDependencies = MlSetupDependencies & MlStartDependencies;
 interface AppProps {
   coreStart: CoreStart;
   deps: MlDependencies;
-  appMountParams: AppMountParameters;
 }
 
 const localStorage = new Storage(window.localStorage);
 
-const App: FC<AppProps> = ({ coreStart, deps, appMountParams }) => {
-  setDependencyCache({
-    indexPatterns: deps.data.indexPatterns,
-    timefilter: deps.data.query.timefilter,
-    fieldFormats: deps.data.fieldFormats,
-    autocomplete: deps.data.autocomplete,
-    config: coreStart.uiSettings!,
-    chrome: coreStart.chrome!,
-    docLinks: coreStart.docLinks!,
-    toastNotifications: coreStart.notifications.toasts,
-    overlays: coreStart.overlays,
-    recentlyAccessed: coreStart.chrome!.recentlyAccessed,
-    basePath: coreStart.http.basePath,
-    savedObjectsClient: coreStart.savedObjects.client,
-    application: coreStart.application,
-    http: coreStart.http,
-    security: deps.security,
-    urlGenerators: deps.share.urlGenerators,
-  });
-
-  const mlLicense = setLicenseCache(deps.licensing);
-
-  appMountParams.onAppLeave(actions => {
-    mlLicense.unsubscribe();
-    clearCache();
-    return actions.default();
-  });
-
+const App: FC<AppProps> = ({ coreStart, deps }) => {
   const pageDeps = {
     indexPatterns: deps.data.indexPatterns,
     config: coreStart.uiSettings!,
     setBreadcrumbs: coreStart.chrome!.setBreadcrumbs,
   };
-
   const services = {
     appName: 'ML',
     data: deps.data,
@@ -85,10 +56,34 @@ export const renderApp = (
   deps: MlDependencies,
   appMountParams: AppMountParameters
 ) => {
-  ReactDOM.render(
-    <App coreStart={coreStart} deps={deps} appMountParams={appMountParams} />,
-    appMountParams.element
-  );
+  setDependencyCache({
+    indexPatterns: deps.data.indexPatterns,
+    timefilter: deps.data.query.timefilter,
+    fieldFormats: deps.data.fieldFormats,
+    autocomplete: deps.data.autocomplete,
+    config: coreStart.uiSettings!,
+    chrome: coreStart.chrome!,
+    docLinks: coreStart.docLinks!,
+    toastNotifications: coreStart.notifications.toasts,
+    overlays: coreStart.overlays,
+    recentlyAccessed: coreStart.chrome!.recentlyAccessed,
+    basePath: coreStart.http.basePath,
+    savedObjectsClient: coreStart.savedObjects.client,
+    application: coreStart.application,
+    http: coreStart.http,
+    security: deps.security,
+    urlGenerators: deps.share.urlGenerators,
+  });
 
-  return () => ReactDOM.unmountComponentAtNode(appMountParams.element);
+  const mlLicense = setLicenseCache(deps.licensing);
+
+  appMountParams.onAppLeave(actions => actions.default());
+
+  ReactDOM.render(<App coreStart={coreStart} deps={deps} />, appMountParams.element);
+
+  return () => {
+    mlLicense.unsubscribe();
+    clearCache();
+    ReactDOM.unmountComponentAtNode(appMountParams.element);
+  };
 };

From 7eec87954798f9d28ae18c17a5680ac657da71b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cau=C3=AA=20Marcondes?=
 <55978943+cauemarcondes@users.noreply.github.com>
Date: Mon, 23 Mar 2020 11:48:58 +0000
Subject: [PATCH 004/179] [APM]Create custom link from Trace summary (#59648)

* adding custom links to actions menu

* user should have at least gold license to be able to manage custom links

* replacing variable for the correspondent value

* refactoring license prompt to a shared place

* fixing query to return filters that were saved separated by comma

* refactoring license prompt to a shared place

* fixing query to return filters that were saved separated by comma

* adding unit test, splitting value by comma and removing empty ones

* adding custom links to actions menu

* UI fixes

* moving stuff to common

* changing flyout texts

* refactoring getSelectOption

* refactoring getSelectOption

* refactoring filter options name

* adding preview panel

* adding preview panel

* fixing test

* adding unit test for replace template variables

* fixing typo

* polishing preview panel

* fixing pr comments

* fixing pr comments

* adding links

* fixing unit test

* removing servicemap license prompt
---
 .../app/ServiceMap/PlatinumLicensePrompt.tsx  |  74 -------
 .../components/app/ServiceMap/index.tsx       |  24 +-
 .../CustomLinkFlyout/Documentation.tsx        |  16 ++
 .../CustomLinkFlyout/FiltersSection.tsx       |  29 +--
 .../CustomLinkFlyout/LinkPreview.test.tsx     |  51 +++++
 .../CustomLinkFlyout/LinkPreview.tsx          | 124 +++++++++++
 .../CustomLinkFlyout/LinkSection.tsx          |  31 ++-
 .../CustomLinkFlyout/helper.test.ts           | 205 ++++++++++++++++++
 .../CustomLink/CustomLinkFlyout/helper.ts     | 116 ++++++++--
 .../CustomLink/CustomLinkFlyout/index.tsx     |  18 +-
 .../CustomLinkFlyout/saveCustomLink.ts        |   2 +-
 .../CustomLink.test.tsx => index.test.tsx}    | 177 ++++++++++++---
 .../Settings/CustomizeUI/CustomLink/index.tsx |  31 ++-
 .../LicensePrompt/LicensePrompt.stories.tsx}  |   6 +-
 .../components/shared/LicensePrompt/index.tsx |  63 ++++++
 .../shared/Links/ElasticDocsLink.tsx          |   2 +-
 .../components/shared/LoadingStatePrompt.tsx  |   2 +-
 .../CustomLink/CustomLinkPopover.test.tsx     |  70 ++++++
 .../CustomLink/CustomLinkPopover.tsx          |  73 +++++++
 .../CustomLink/CustomLinkSection.test.tsx     |  41 ++++
 .../CustomLink/CustomLinkSection.tsx          |  40 ++++
 .../CustomLink/ManageCustomLink.test.tsx      |  50 +++++
 .../CustomLink/ManageCustomLink.tsx           |  59 +++++
 .../CustomLink/index.test.tsx                 | 128 +++++++++++
 .../CustomLink/index.tsx                      | 128 +++++++++++
 .../TransactionActionMenu.tsx                 | 158 +++++++++++---
 .../__test__/TransactionActionMenu.test.tsx   | 131 ++++++++++-
 .../apm/common/custom_link_filter_options.ts  |  28 +++
 .../lib/helpers/create_or_update_index.ts     |   1 +
 .../get_transaction.test.ts.snap              |  73 +++++++
 .../list_custom_links.test.ts.snap            |  14 ++
 .../__test__/get_transaction.test.ts          |  56 +++++
 .../custom_link/create_custom_link_index.ts   |   8 +-
 .../create_or_update_custom_link.ts           |   4 +-
 .../custom_link/custom_link_types.d.ts        |   2 +-
 .../settings/custom_link/get_transaction.ts   |  38 ++++
 .../settings/custom_link/list_custom_links.ts |  11 +-
 .../apm/server/routes/create_apm_api.ts       |   6 +-
 .../apm/server/routes/settings/custom_link.ts |  34 ++-
 .../typings/es_schemas/raw/fields/service.ts  |   1 +
 40 files changed, 1894 insertions(+), 231 deletions(-)
 delete mode 100644 x-pack/legacy/plugins/apm/public/components/app/ServiceMap/PlatinumLicensePrompt.tsx
 create mode 100644 x-pack/legacy/plugins/apm/public/components/app/Settings/CustomizeUI/CustomLink/CustomLinkFlyout/Documentation.tsx
 create mode 100644 x-pack/legacy/plugins/apm/public/components/app/Settings/CustomizeUI/CustomLink/CustomLinkFlyout/LinkPreview.test.tsx
 create mode 100644 x-pack/legacy/plugins/apm/public/components/app/Settings/CustomizeUI/CustomLink/CustomLinkFlyout/LinkPreview.tsx
 create mode 100644 x-pack/legacy/plugins/apm/public/components/app/Settings/CustomizeUI/CustomLink/CustomLinkFlyout/helper.test.ts
 rename x-pack/legacy/plugins/apm/public/components/app/Settings/CustomizeUI/CustomLink/{__test__/CustomLink.test.tsx => index.test.tsx} (56%)
 rename x-pack/legacy/plugins/apm/public/components/{app/ServiceMap/PlatinumLicensePrompt.stories.tsx => shared/LicensePrompt/LicensePrompt.stories.tsx} (79%)
 create mode 100644 x-pack/legacy/plugins/apm/public/components/shared/LicensePrompt/index.tsx
 create mode 100644 x-pack/legacy/plugins/apm/public/components/shared/TransactionActionMenu/CustomLink/CustomLinkPopover.test.tsx
 create mode 100644 x-pack/legacy/plugins/apm/public/components/shared/TransactionActionMenu/CustomLink/CustomLinkPopover.tsx
 create mode 100644 x-pack/legacy/plugins/apm/public/components/shared/TransactionActionMenu/CustomLink/CustomLinkSection.test.tsx
 create mode 100644 x-pack/legacy/plugins/apm/public/components/shared/TransactionActionMenu/CustomLink/CustomLinkSection.tsx
 create mode 100644 x-pack/legacy/plugins/apm/public/components/shared/TransactionActionMenu/CustomLink/ManageCustomLink.test.tsx
 create mode 100644 x-pack/legacy/plugins/apm/public/components/shared/TransactionActionMenu/CustomLink/ManageCustomLink.tsx
 create mode 100644 x-pack/legacy/plugins/apm/public/components/shared/TransactionActionMenu/CustomLink/index.test.tsx
 create mode 100644 x-pack/legacy/plugins/apm/public/components/shared/TransactionActionMenu/CustomLink/index.tsx
 create mode 100644 x-pack/plugins/apm/common/custom_link_filter_options.ts
 create mode 100644 x-pack/plugins/apm/server/lib/settings/custom_link/__test__/__snapshots__/get_transaction.test.ts.snap
 create mode 100644 x-pack/plugins/apm/server/lib/settings/custom_link/__test__/get_transaction.test.ts
 create mode 100644 x-pack/plugins/apm/server/lib/settings/custom_link/get_transaction.ts

diff --git a/x-pack/legacy/plugins/apm/public/components/app/ServiceMap/PlatinumLicensePrompt.tsx b/x-pack/legacy/plugins/apm/public/components/app/ServiceMap/PlatinumLicensePrompt.tsx
deleted file mode 100644
index 77f0b64ba0fb1..0000000000000
--- a/x-pack/legacy/plugins/apm/public/components/app/ServiceMap/PlatinumLicensePrompt.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 {
-  EuiButton,
-  EuiPanel,
-  EuiFlexGroup,
-  EuiFlexItem,
-  EuiTitle,
-  EuiText,
-  EuiSpacer
-} from '@elastic/eui';
-import { i18n } from '@kbn/i18n';
-import React from 'react';
-import { invalidLicenseMessage } from '../../../../../../../plugins/apm/common/service_map';
-import { useKibanaUrl } from '../../../hooks/useKibanaUrl';
-
-export function PlatinumLicensePrompt() {
-  // Set the height to give it some top margin
-  const flexGroupStyle = { height: '60vh' };
-  const flexItemStyle = { width: 600, textAlign: 'center' as const };
-
-  const licensePageUrl = useKibanaUrl(
-    '/app/kibana',
-    '/management/elasticsearch/license_management/home'
-  );
-
-  return (
-    <EuiFlexGroup
-      alignItems="center"
-      justifyContent="spaceAround"
-      style={flexGroupStyle}
-    >
-      <EuiFlexItem grow={false} style={flexItemStyle}>
-        <EuiPanel grow={false} hasShadow={true} paddingSize="none">
-          <EuiPanel
-            betaBadgeLabel={i18n.translate('xpack.apm.serviceMap.betaBadge', {
-              defaultMessage: 'Beta'
-            })}
-            betaBadgeTooltipContent={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.'
-              }
-            )}
-          >
-            <EuiSpacer size="l" />
-            <EuiTitle>
-              <h2>
-                {i18n.translate('xpack.apm.serviceMap.licensePromptTitle', {
-                  defaultMessage: 'Service maps is available in Platinum.'
-                })}
-              </h2>
-            </EuiTitle>
-            <EuiSpacer size="m" />
-            <EuiText grow={false}>
-              <p>{invalidLicenseMessage}</p>
-            </EuiText>
-            <EuiSpacer size="l" />
-            <EuiButton href={licensePageUrl} fill={true}>
-              {i18n.translate('xpack.apm.serviceMap.licensePromptButtonText', {
-                defaultMessage: 'Start 30-day Platinum trial'
-              })}
-            </EuiButton>
-          </EuiPanel>
-        </EuiPanel>
-      </EuiFlexItem>
-    </EuiFlexGroup>
-  );
-}
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 5770771e01905..4974553f6ca93 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,21 +4,25 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+import { EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
 import theme from '@elastic/eui/dist/eui_theme_light.json';
 import React from 'react';
-import { isValidPlatinumLicense } from '../../../../../../../plugins/apm/common/service_map';
+import {
+  invalidLicenseMessage,
+  isValidPlatinumLicense
+} from '../../../../../../../plugins/apm/common/service_map';
 import { useFetcher } from '../../../hooks/useFetcher';
 import { useLicense } from '../../../hooks/useLicense';
 import { useUrlParams } from '../../../hooks/useUrlParams';
 import { callApmApi } from '../../../services/rest/createCallApmApi';
-import { BetaBadge } from './BetaBadge';
+import { LicensePrompt } from '../../shared/LicensePrompt';
 import { Controls } from './Controls';
 import { Cytoscape } from './Cytoscape';
 import { cytoscapeDivStyle } from './cytoscapeOptions';
 import { EmptyBanner } from './EmptyBanner';
-import { PlatinumLicensePrompt } from './PlatinumLicensePrompt';
 import { Popover } from './Popover';
 import { useRefDimensions } from './useRefDimensions';
+import { BetaBadge } from './BetaBadge';
 
 interface ServiceMapProps {
   serviceName?: string;
@@ -74,6 +78,18 @@ export function ServiceMap({ serviceName }: ServiceMapProps) {
       </Cytoscape>
     </div>
   ) : (
-    <PlatinumLicensePrompt />
+    <EuiFlexGroup
+      alignItems="center"
+      justifyContent="spaceAround"
+      // Set the height to give it some top margin
+      style={{ height: '60vh' }}
+    >
+      <EuiFlexItem
+        grow={false}
+        style={{ width: 600, textAlign: 'center' as const }}
+      >
+        <LicensePrompt text={invalidLicenseMessage} showBetaBadge />
+      </EuiFlexItem>
+    </EuiFlexGroup>
   );
 }
diff --git a/x-pack/legacy/plugins/apm/public/components/app/Settings/CustomizeUI/CustomLink/CustomLinkFlyout/Documentation.tsx b/x-pack/legacy/plugins/apm/public/components/app/Settings/CustomizeUI/CustomLink/CustomLinkFlyout/Documentation.tsx
new file mode 100644
index 0000000000000..48a0288f11ae5
--- /dev/null
+++ b/x-pack/legacy/plugins/apm/public/components/app/Settings/CustomizeUI/CustomLink/CustomLinkFlyout/Documentation.tsx
@@ -0,0 +1,16 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+import React from 'react';
+import { ElasticDocsLink } from '../../../../../shared/Links/ElasticDocsLink';
+
+interface Props {
+  label: string;
+}
+export const Documentation = ({ label }: Props) => (
+  <ElasticDocsLink section="/kibana" path="/custom-links.html" target="_blank">
+    {label}
+  </ElasticDocsLink>
+);
diff --git a/x-pack/legacy/plugins/apm/public/components/app/Settings/CustomizeUI/CustomLink/CustomLinkFlyout/FiltersSection.tsx b/x-pack/legacy/plugins/apm/public/components/app/Settings/CustomizeUI/CustomLink/CustomLinkFlyout/FiltersSection.tsx
index 69fecf25f5143..1c253b2fa8bff 100644
--- a/x-pack/legacy/plugins/apm/public/components/app/Settings/CustomizeUI/CustomLink/CustomLinkFlyout/FiltersSection.tsx
+++ b/x-pack/legacy/plugins/apm/public/components/app/Settings/CustomizeUI/CustomLink/CustomLinkFlyout/FiltersSection.tsx
@@ -16,12 +16,11 @@ import {
 import { i18n } from '@kbn/i18n';
 import { isEmpty } from 'lodash';
 import React from 'react';
-// eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { FilterOptions } from '../../../../../../../../../../plugins/apm/server/routes/settings/custom_link';
+import { FilterOptions } from '../../../../../../../../../../plugins/apm/common/custom_link_filter_options';
 import {
   DEFAULT_OPTION,
-  Filters,
-  filterSelectOptions,
+  FilterKeyValue,
+  FILTER_SELECT_OPTIONS,
   getSelectOptions
 } from './helper';
 
@@ -29,10 +28,10 @@ export const FiltersSection = ({
   filters,
   onChangeFilters
 }: {
-  filters: Filters;
-  onChangeFilters: (filters: Filters) => void;
+  filters: FilterKeyValue[];
+  onChangeFilters: (filters: FilterKeyValue[]) => void;
 }) => {
-  const onChangeFilter = (filter: Filters[0], idx: number) => {
+  const onChangeFilter = (filter: FilterKeyValue, idx: number) => {
     const newFilters = [...filters];
     newFilters[idx] = filter;
     onChangeFilters(newFilters);
@@ -40,7 +39,8 @@ export const FiltersSection = ({
 
   const onRemoveFilter = (idx: number) => {
     // remove without mutating original array
-    const newFilters = [...filters].splice(idx, 1);
+    const newFilters = [...filters];
+    newFilters.splice(idx, 1);
 
     // if there is only one item left it should not be removed
     // but reset to empty
@@ -68,12 +68,12 @@ export const FiltersSection = ({
         </h3>
       </EuiTitle>
       <EuiSpacer size="s" />
-      <EuiText size="xs">
+      <EuiText size="s">
         {i18n.translate(
           'xpack.apm.settings.customizeUI.customLink.flyout.filters.subtitle',
           {
             defaultMessage:
-              'Add additional values within the same field by comma separating values.'
+              'Use the filter options to scope them to only appear for specific services.'
           }
         )}
       </EuiText>
@@ -83,12 +83,12 @@ export const FiltersSection = ({
       {filters.map((filter, idx) => {
         const [key, value] = filter;
         const filterId = `filter-${idx}`;
-        const selectOptions = getSelectOptions(filters, idx);
+        const selectOptions = getSelectOptions(filters, key);
         return (
           <EuiFlexGroup key={filterId} gutterSize="s" alignItems="center">
             <EuiFlexItem>
               <EuiSelect
-                aria-label={filterId}
+                data-test-subj={filterId}
                 id={filterId}
                 fullWidth
                 options={selectOptions}
@@ -113,6 +113,7 @@ export const FiltersSection = ({
             </EuiFlexItem>
             <EuiFlexItem>
               <EuiFieldText
+                data-test-subj={`value-${idx}`}
                 fullWidth
                 placeholder={i18n.translate(
                   'xpack.apm.settings.customizeUI.customLink.flyOut.filters.defaultOption.value',
@@ -127,7 +128,7 @@ export const FiltersSection = ({
               <EuiButtonEmpty
                 iconType="trash"
                 onClick={() => onRemoveFilter(idx)}
-                disabled={!key && filters.length === 1}
+                disabled={!value && !key && filters.length === 1}
               />
             </EuiFlexItem>
           </EuiFlexGroup>
@@ -139,7 +140,7 @@ export const FiltersSection = ({
       <AddFilterButton
         onClick={handleAddFilter}
         // Disable button when user has already added all items available
-        isDisabled={filters.length === filterSelectOptions.length - 1}
+        isDisabled={filters.length === FILTER_SELECT_OPTIONS.length - 1}
       />
     </>
   );
diff --git a/x-pack/legacy/plugins/apm/public/components/app/Settings/CustomizeUI/CustomLink/CustomLinkFlyout/LinkPreview.test.tsx b/x-pack/legacy/plugins/apm/public/components/app/Settings/CustomizeUI/CustomLink/CustomLinkFlyout/LinkPreview.test.tsx
new file mode 100644
index 0000000000000..9b487cf916089
--- /dev/null
+++ b/x-pack/legacy/plugins/apm/public/components/app/Settings/CustomizeUI/CustomLink/CustomLinkFlyout/LinkPreview.test.tsx
@@ -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 React from 'react';
+import { LinkPreview } from '../CustomLinkFlyout/LinkPreview';
+import { render, getNodeText, getByTestId } from '@testing-library/react';
+
+describe('LinkPreview', () => {
+  const getElementValue = (container: HTMLElement, id: string) =>
+    getNodeText(
+      ((getByTestId(container, id) as HTMLDivElement)
+        .children as HTMLCollection)[0] as HTMLDivElement
+    );
+
+  it('shows label and url default values', () => {
+    const { container } = render(
+      <LinkPreview label="" url="" filters={[['', '']]} />
+    );
+    expect(getElementValue(container, 'preview-label')).toEqual('Elastic.co');
+    expect(getElementValue(container, 'preview-url')).toEqual(
+      'https://www.elastic.co'
+    );
+  });
+
+  it('shows label and url values', () => {
+    const { container } = render(
+      <LinkPreview label="foo" url="https://baz.co" filters={[['', '']]} />
+    );
+    expect(getElementValue(container, 'preview-label')).toEqual('foo');
+    expect(
+      (getByTestId(container, 'preview-link') as HTMLAnchorElement).text
+    ).toEqual('https://baz.co');
+  });
+
+  it('shows warning when couldnt replace context variables', () => {
+    const { container } = render(
+      <LinkPreview
+        label="foo"
+        url="https://baz.co?service.name={{invalid}"
+        filters={[['', '']]}
+      />
+    );
+    expect(getElementValue(container, 'preview-label')).toEqual('foo');
+    expect(
+      (getByTestId(container, 'preview-link') as HTMLAnchorElement).text
+    ).toEqual('https://baz.co?service.name={{invalid}');
+    expect(getByTestId(container, 'preview-warning')).toBeInTheDocument();
+  });
+});
diff --git a/x-pack/legacy/plugins/apm/public/components/app/Settings/CustomizeUI/CustomLink/CustomLinkFlyout/LinkPreview.tsx b/x-pack/legacy/plugins/apm/public/components/app/Settings/CustomizeUI/CustomLink/CustomLinkFlyout/LinkPreview.tsx
new file mode 100644
index 0000000000000..0ad3455ab271f
--- /dev/null
+++ b/x-pack/legacy/plugins/apm/public/components/app/Settings/CustomizeUI/CustomLink/CustomLinkFlyout/LinkPreview.tsx
@@ -0,0 +1,124 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React, { useEffect, useState } from 'react';
+import {
+  EuiPanel,
+  EuiText,
+  EuiSpacer,
+  EuiLink,
+  EuiToolTip,
+  EuiIcon,
+  EuiFlexGroup,
+  EuiFlexItem
+} from '@elastic/eui';
+import { i18n } from '@kbn/i18n';
+import { debounce } from 'lodash';
+import { Transaction } from '../../../../../../../../../../plugins/apm/typings/es_schemas/ui/transaction';
+import { callApmApi } from '../../../../../../services/rest/createCallApmApi';
+import {
+  FilterKeyValue,
+  convertFiltersToObject,
+  replaceTemplateVariables
+} from './helper';
+
+interface Props {
+  label: string;
+  url: string;
+  filters: FilterKeyValue[];
+}
+
+const fetchTransaction = debounce(
+  async (
+    filters: FilterKeyValue[],
+    callback: (transaction: Transaction) => void
+  ) => {
+    const transaction = await callApmApi({
+      pathname: '/api/apm/settings/custom_links/transaction',
+      params: { query: convertFiltersToObject(filters) }
+    });
+    callback(transaction);
+  },
+  1000
+);
+
+const getTextColor = (value?: string) => (value ? 'default' : 'subdued');
+
+export const LinkPreview = ({ label, url, filters }: Props) => {
+  const [transaction, setTransaction] = useState<Transaction | undefined>();
+
+  useEffect(() => {
+    fetchTransaction(filters, setTransaction);
+  }, [filters]);
+
+  const { formattedUrl, error } = replaceTemplateVariables(url, transaction);
+
+  return (
+    <EuiPanel betaBadgeLabel="Preview" paddingSize="l">
+      <EuiText
+        size="s"
+        color={getTextColor(label)}
+        className="eui-textBreakWord"
+        data-test-subj="preview-label"
+      >
+        {label
+          ? label
+          : i18n.translate(
+              'xpack.apm.settings.customizeUI.customLink.default.label',
+              { defaultMessage: 'Elastic.co' }
+            )}
+      </EuiText>
+
+      <EuiText
+        size="s"
+        color={getTextColor(url)}
+        className="eui-textBreakWord"
+        data-test-subj="preview-url"
+      >
+        {url ? (
+          <EuiLink
+            href={formattedUrl}
+            target="_blank"
+            data-test-subj="preview-link"
+          >
+            {formattedUrl}
+          </EuiLink>
+        ) : (
+          i18n.translate(
+            'xpack.apm.settings.customizeUI.customLink.default.url',
+            { defaultMessage: 'https://www.elastic.co' }
+          )
+        )}
+      </EuiText>
+      <EuiSpacer />
+      <EuiFlexGroup justifyContent="spaceBetween">
+        <EuiFlexItem grow={false}>
+          <EuiText size="s" color="subdued">
+            {i18n.translate(
+              'xpack.apm.settings.customizeUI.customLink.linkPreview.descrition',
+              {
+                defaultMessage:
+                  'Test your link with values from an example transaction document based on the filters above.'
+              }
+            )}
+          </EuiText>
+        </EuiFlexItem>
+
+        <EuiFlexItem grow={false}>
+          {error && (
+            <EuiToolTip position="top" content={error}>
+              <EuiIcon
+                type="alert"
+                color="warning"
+                data-test-subj="preview-warning"
+              />
+            </EuiToolTip>
+          )}
+        </EuiFlexItem>
+      </EuiFlexGroup>
+    </EuiPanel>
+  );
+};
diff --git a/x-pack/legacy/plugins/apm/public/components/app/Settings/CustomizeUI/CustomLink/CustomLinkFlyout/LinkSection.tsx b/x-pack/legacy/plugins/apm/public/components/app/Settings/CustomizeUI/CustomLink/CustomLinkFlyout/LinkSection.tsx
index 89f55a6c682ca..8bcebc2aea09e 100644
--- a/x-pack/legacy/plugins/apm/public/components/app/Settings/CustomizeUI/CustomLink/CustomLinkFlyout/LinkSection.tsx
+++ b/x-pack/legacy/plugins/apm/public/components/app/Settings/CustomizeUI/CustomLink/CustomLinkFlyout/LinkSection.tsx
@@ -13,11 +13,12 @@ import {
 import { i18n } from '@kbn/i18n';
 import React from 'react';
 import { CustomLink } from '../../../../../../../../../../plugins/apm/server/lib/settings/custom_link/custom_link_types';
+import { Documentation } from './Documentation';
 
 interface InputField {
   name: keyof CustomLink;
   label: string;
-  helpText: string;
+  helpText: string | React.ReactNode;
   placeholder: string;
   onChange: (value: string) => void;
   value?: string;
@@ -69,13 +70,25 @@ export const LinkSection = ({
           defaultMessage: 'URL'
         }
       ),
-      helpText: i18n.translate(
-        'xpack.apm.settings.customizeUI.customLink.flyout.link.url.helpText',
-        {
-          defaultMessage:
-            'Add fieldname variables to your URL to apply values e.g. {sample}. TODO: Learn more in the docs.',
-          values: { sample: '{{trace.id}}' }
-        }
+      helpText: (
+        <>
+          {i18n.translate(
+            'xpack.apm.settings.customizeUI.customLink.flyout.link.url.helpText',
+            {
+              defaultMessage:
+                'Add field name variables to your URL to apply values e.g. {sample}.',
+              values: { sample: '{{trace.id}}' }
+            }
+          )}{' '}
+          <Documentation
+            label={i18n.translate(
+              'xpack.apm.settings.customizeUI.customLink.flyout.link.url.doc',
+              {
+                defaultMessage: 'Learn more in the docs.'
+              }
+            )}
+          />
+        </>
       ),
       placeholder: i18n.translate(
         'xpack.apm.settings.customizeUI.customLink.flyout.link.url.placeholder',
@@ -125,7 +138,7 @@ export const LinkSection = ({
               fullWidth
               value={field.value}
               onChange={e => field.onChange(e.target.value)}
-              aria-label={field.name}
+              data-test-subj={field.name}
             />
           </EuiFormRow>
         );
diff --git a/x-pack/legacy/plugins/apm/public/components/app/Settings/CustomizeUI/CustomLink/CustomLinkFlyout/helper.test.ts b/x-pack/legacy/plugins/apm/public/components/app/Settings/CustomizeUI/CustomLink/CustomLinkFlyout/helper.test.ts
new file mode 100644
index 0000000000000..ac01ee48f2fe5
--- /dev/null
+++ b/x-pack/legacy/plugins/apm/public/components/app/Settings/CustomizeUI/CustomLink/CustomLinkFlyout/helper.test.ts
@@ -0,0 +1,205 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+import {
+  convertFiltersToArray,
+  convertFiltersToObject,
+  getSelectOptions,
+  replaceTemplateVariables
+} from '../CustomLinkFlyout/helper';
+import { CustomLink } from '../../../../../../../../../../plugins/apm/server/lib/settings/custom_link/custom_link_types';
+import { Transaction } from '../../../../../../../../../../plugins/apm/typings/es_schemas/ui/transaction';
+
+describe('Custom link helper', () => {
+  describe('convertFiltersToArray', () => {
+    it('returns array of tuple when custom link not defined', () => {
+      expect(convertFiltersToArray()).toEqual([['', '']]);
+    });
+    it('returns filters as array', () => {
+      expect(
+        convertFiltersToArray({
+          'service.name': 'foo',
+          'transaction.type': 'bar'
+        } as CustomLink)
+      ).toEqual([
+        ['service.name', 'foo'],
+        ['transaction.type', 'bar']
+      ]);
+    });
+    it('returns empty when no filter is added', () => {
+      expect(
+        convertFiltersToArray({
+          label: 'foo',
+          url: 'bar'
+        } as CustomLink)
+      ).toEqual([['', '']]);
+    });
+  });
+
+  describe('convertFiltersToObject', () => {
+    it('returns undefined when any filter is added', () => {
+      expect(convertFiltersToObject([['', '']])).toBeUndefined();
+    });
+    it('removes uncompleted filters', () => {
+      expect(
+        convertFiltersToObject([
+          ['service.name', ''],
+          ['', 'foo'],
+          ['transaction.type', 'bar']
+        ])
+      ).toEqual({ 'transaction.type': ['bar'] });
+    });
+    it('splits the value by comma', () => {
+      expect(
+        convertFiltersToObject([
+          ['service.name', 'foo'],
+          ['service.environment', 'foo, bar'],
+          ['transaction.type', 'foo, '],
+          ['transaction.name', 'foo,']
+        ])
+      ).toEqual({
+        'service.name': ['foo'],
+        'service.environment': ['foo', 'bar'],
+        'transaction.type': ['foo'],
+        'transaction.name': ['foo']
+      });
+    });
+  });
+
+  describe('getSelectOptions', () => {
+    it('returns all available options when no filters were selected', () => {
+      expect(
+        getSelectOptions(
+          [
+            ['', ''],
+            ['', ''],
+            ['', ''],
+            ['', '']
+          ],
+          ''
+        )
+      ).toEqual([
+        { value: 'DEFAULT', text: 'Select field...' },
+        { value: 'service.name', text: 'service.name' },
+        { value: 'service.environment', text: 'service.environment' },
+        { value: 'transaction.type', text: 'transaction.type' },
+        { value: 'transaction.name', text: 'transaction.name' }
+      ]);
+    });
+    it('removes item added in another filter', () => {
+      expect(
+        getSelectOptions(
+          [
+            ['service.name', 'foo'],
+            ['', ''],
+            ['', ''],
+            ['', '']
+          ],
+          ''
+        )
+      ).toEqual([
+        { value: 'DEFAULT', text: 'Select field...' },
+        { value: 'service.environment', text: 'service.environment' },
+        { value: 'transaction.type', text: 'transaction.type' },
+        { value: 'transaction.name', text: 'transaction.name' }
+      ]);
+    });
+    it('removes item added in another filter but keep the current selected', () => {
+      expect(
+        getSelectOptions(
+          [
+            ['service.name', 'foo'],
+            ['transaction.name', 'bar'],
+            ['', ''],
+            ['', '']
+          ],
+          'transaction.name'
+        )
+      ).toEqual([
+        { value: 'DEFAULT', text: 'Select field...' },
+        { value: 'service.environment', text: 'service.environment' },
+        { value: 'transaction.type', text: 'transaction.type' },
+        { value: 'transaction.name', text: 'transaction.name' }
+      ]);
+    });
+    it('returns empty when all option were selected', () => {
+      expect(
+        getSelectOptions(
+          [
+            ['service.name', 'foo'],
+            ['transaction.name', 'bar'],
+            ['service.environment', 'baz'],
+            ['transaction.type', 'qux']
+          ],
+          ''
+        )
+      ).toEqual([{ value: 'DEFAULT', text: 'Select field...' }]);
+    });
+  });
+
+  describe('replaceTemplateVariables', () => {
+    const transaction = ({
+      service: { name: 'foo' },
+      trace: { id: '123' }
+    } as unknown) as Transaction;
+
+    it('replaces template variables', () => {
+      expect(
+        replaceTemplateVariables(
+          'https://elastic.co?service.name={{service.name}}&trace.id={{trace.id}}',
+          transaction
+        )
+      ).toEqual({
+        error: undefined,
+        formattedUrl: 'https://elastic.co?service.name=foo&trace.id=123'
+      });
+    });
+
+    it('returns error when transaction is not defined', () => {
+      const expectedResult = {
+        error:
+          "We couldn't find a matching transaction document based on the defined filters.",
+        formattedUrl: 'https://elastic.co?service.name=&trace.id='
+      };
+      expect(
+        replaceTemplateVariables(
+          'https://elastic.co?service.name={{service.name}}&trace.id={{trace.id}}'
+        )
+      ).toEqual(expectedResult);
+      expect(
+        replaceTemplateVariables(
+          'https://elastic.co?service.name={{service.name}}&trace.id={{trace.id}}',
+          ({} as unknown) as Transaction
+        )
+      ).toEqual(expectedResult);
+    });
+
+    it('returns error when could not replace variables', () => {
+      expect(
+        replaceTemplateVariables(
+          'https://elastic.co?service.name={{service.nam}}&trace.id={{trace.i}}',
+          transaction
+        )
+      ).toEqual({
+        error:
+          "We couldn't find a value match for {{service.nam}}, {{trace.i}} in the example transaction document.",
+        formattedUrl: 'https://elastic.co?service.name=&trace.id='
+      });
+    });
+
+    it('returns error when variable is invalid', () => {
+      expect(
+        replaceTemplateVariables(
+          'https://elastic.co?service.name={{service.name}',
+          transaction
+        )
+      ).toEqual({
+        error:
+          "We couldn't find an example transaction document due to invalid variable(s) defined.",
+        formattedUrl: 'https://elastic.co?service.name={{service.name}'
+      });
+    });
+  });
+});
diff --git a/x-pack/legacy/plugins/apm/public/components/app/Settings/CustomizeUI/CustomLink/CustomLinkFlyout/helper.ts b/x-pack/legacy/plugins/apm/public/components/app/Settings/CustomizeUI/CustomLink/CustomLinkFlyout/helper.ts
index bb86a251594ab..df99c82c71b70 100644
--- a/x-pack/legacy/plugins/apm/public/components/app/Settings/CustomizeUI/CustomLink/CustomLinkFlyout/helper.ts
+++ b/x-pack/legacy/plugins/apm/public/components/app/Settings/CustomizeUI/CustomLink/CustomLinkFlyout/helper.ts
@@ -4,15 +4,18 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 import { i18n } from '@kbn/i18n';
-import { isEmpty, pick } from 'lodash';
+import Mustache from 'mustache';
+import { isEmpty, pick, get } from 'lodash';
+import { Transaction } from '../../../../../../../../../../plugins/apm/typings/es_schemas/ui/transaction';
 import {
   FilterOptions,
-  filterOptions
-  // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-} from '../../../../../../../../../../plugins/apm/server/routes/settings/custom_link';
+  FILTER_OPTIONS
+} from '../../../../../../../../../../plugins/apm/common/custom_link_filter_options';
 import { CustomLink } from '../../../../../../../../../../plugins/apm/server/lib/settings/custom_link/custom_link_types';
 
-export type Filters = Array<[keyof FilterOptions | '', string]>;
+type FilterKey = keyof FilterOptions | '';
+type FilterValue = string;
+export type FilterKeyValue = [FilterKey, FilterValue];
 
 interface FilterSelectOption {
   value: 'DEFAULT' | keyof FilterOptions;
@@ -33,9 +36,13 @@ interface FilterSelectOption {
  * results: [['service.name', 'opbeans-java'],['transaction.type', 'request']]
  * @param customLink
  */
-export const convertFiltersToArray = (customLink?: CustomLink): Filters => {
+export const convertFiltersToArray = (
+  customLink?: CustomLink
+): FilterKeyValue[] => {
   if (customLink) {
-    const filters = Object.entries(pick(customLink, filterOptions)) as Filters;
+    const filters = Object.entries(
+      pick(customLink, FILTER_OPTIONS)
+    ) as FilterKeyValue[];
     if (!isEmpty(filters)) {
       return filters;
     }
@@ -54,9 +61,18 @@ export const convertFiltersToArray = (customLink?: CustomLink): Filters => {
  * }
  * @param filters
  */
-export const convertFiltersToObject = (filters: Filters) => {
+export const convertFiltersToObject = (filters: FilterKeyValue[]) => {
   const convertedFilters = Object.fromEntries(
-    filters.filter(([key, value]) => !isEmpty(key) && !isEmpty(value))
+    filters
+      .filter(([key, value]) => !isEmpty(key) && !isEmpty(value))
+      .map(([key, value]) => [
+        key,
+        // Splits the value by comma, removes whitespace from both ends and filters out empty values
+        value
+          .split(',')
+          .map(v => v.trim())
+          .filter(v => v)
+      ])
   );
   if (!isEmpty(convertedFilters)) {
     return convertedFilters;
@@ -71,9 +87,9 @@ export const DEFAULT_OPTION: FilterSelectOption = {
   )
 };
 
-export const filterSelectOptions: FilterSelectOption[] = [
+export const FILTER_SELECT_OPTIONS: FilterSelectOption[] = [
   DEFAULT_OPTION,
-  ...filterOptions.map(filter => ({
+  ...FILTER_OPTIONS.map(filter => ({
     value: filter as keyof FilterOptions,
     text: filter
   }))
@@ -83,14 +99,76 @@ export const filterSelectOptions: FilterSelectOption[] = [
  * Returns the options available, removing filters already added, but keeping the selected filter.
  *
  * @param filters
- * @param idx
+ * @param selectedKey
  */
-export const getSelectOptions = (filters: Filters, idx: number) => {
-  return filterSelectOptions.filter(option => {
-    const indexUsedFilter = filters.findIndex(
-      filter => filter[0] === option.value
+export const getSelectOptions = (
+  filters: FilterKeyValue[],
+  selectedKey: FilterKey
+) => {
+  return FILTER_SELECT_OPTIONS.filter(
+    ({ value }) =>
+      !filters.some(
+        ([filterKey]) => filterKey === value && filterKey !== selectedKey
+      )
+  );
+};
+
+const getInvalidTemplateVariables = (
+  template: string,
+  transaction: Transaction
+) => {
+  return (Mustache.parse(template) as Array<[string, string]>)
+    .filter(([type]) => type === 'name')
+    .map(([, value]) => value)
+    .filter(templateVar => get(transaction, templateVar) == null);
+};
+
+const validateUrl = (url: string, transaction?: Transaction) => {
+  if (!transaction || isEmpty(transaction)) {
+    return i18n.translate(
+      'xpack.apm.settings.customizeUI.customLink.preview.transaction.notFound',
+      {
+        defaultMessage:
+          "We couldn't find a matching transaction document based on the defined filters."
+      }
+    );
+  }
+  try {
+    const invalidVariables = getInvalidTemplateVariables(url, transaction);
+    if (!isEmpty(invalidVariables)) {
+      return i18n.translate(
+        'xpack.apm.settings.customizeUI.customLink.preview.contextVariable.noMatch',
+        {
+          defaultMessage:
+            "We couldn't find a value match for {variables} in the example transaction document.",
+          values: {
+            variables: invalidVariables
+              .map(variable => `{{${variable}}}`)
+              .join(', ')
+          }
+        }
+      );
+    }
+  } catch (e) {
+    return i18n.translate(
+      'xpack.apm.settings.customizeUI.customLink.preview.contextVariable.invalid',
+      {
+        defaultMessage:
+          "We couldn't find an example transaction document due to invalid variable(s) defined."
+      }
     );
-    // Filter out all items already added, besides the one selected in the current filter.
-    return indexUsedFilter === -1 || idx === indexUsedFilter;
-  });
+  }
+};
+
+export const replaceTemplateVariables = (
+  url: string,
+  transaction?: Transaction
+) => {
+  const error = validateUrl(url, transaction);
+  try {
+    return { formattedUrl: Mustache.render(url, transaction), error };
+  } catch (e) {
+    // errors will be caught on validateUrl function
+    return { formattedUrl: url, error };
+  }
 };
diff --git a/x-pack/legacy/plugins/apm/public/components/app/Settings/CustomizeUI/CustomLink/CustomLinkFlyout/index.tsx b/x-pack/legacy/plugins/apm/public/components/app/Settings/CustomizeUI/CustomLink/CustomLinkFlyout/index.tsx
index 88358c888160b..68755bad5f652 100644
--- a/x-pack/legacy/plugins/apm/public/components/app/Settings/CustomizeUI/CustomLink/CustomLinkFlyout/index.tsx
+++ b/x-pack/legacy/plugins/apm/public/components/app/Settings/CustomizeUI/CustomLink/CustomLinkFlyout/index.tsx
@@ -21,6 +21,8 @@ import { FlyoutFooter } from './FlyoutFooter';
 import { LinkSection } from './LinkSection';
 import { saveCustomLink } from './saveCustomLink';
 import { convertFiltersToArray, convertFiltersToObject } from './helper';
+import { LinkPreview } from './LinkPreview';
+import { Documentation } from './Documentation';
 
 interface Props {
   onClose: () => void;
@@ -87,9 +89,17 @@ export const CustomLinkFlyout = ({
                   'xpack.apm.settings.customizeUI.customLink.flyout.label',
                   {
                     defaultMessage:
-                      'Links will be available in the context of transaction details throughout the APM app. You can create an unlimited number of links and use the filter options to scope them to only appear for specific services. You can refer to dynamic variables by using any of the transaction metadata to fill in your URLs. TODO: Learn more about it in the docs.'
+                      'Links will be available in the context of transaction details throughout the APM app. You can create an unlimited number of links. You can refer to dynamic variables by using any of the transaction metadata to fill in your URLs. More information, including examples, are available in the'
                   }
-                )}
+                )}{' '}
+                <Documentation
+                  label={i18n.translate(
+                    'xpack.apm.settings.customizeUI.customLink.flyout.label.doc',
+                    {
+                      defaultMessage: 'documentation.'
+                    }
+                  )}
+                />
               </p>
             </EuiText>
 
@@ -105,6 +115,10 @@ export const CustomLinkFlyout = ({
             <EuiSpacer size="l" />
 
             <FiltersSection filters={filters} onChangeFilters={setFilters} />
+
+            <EuiSpacer size="l" />
+
+            <LinkPreview label={label} url={url} filters={filters} />
           </EuiFlyoutBody>
 
           <FlyoutFooter
diff --git a/x-pack/legacy/plugins/apm/public/components/app/Settings/CustomizeUI/CustomLink/CustomLinkFlyout/saveCustomLink.ts b/x-pack/legacy/plugins/apm/public/components/app/Settings/CustomizeUI/CustomLink/CustomLinkFlyout/saveCustomLink.ts
index f255840e1d734..815ce1d95c385 100644
--- a/x-pack/legacy/plugins/apm/public/components/app/Settings/CustomizeUI/CustomLink/CustomLinkFlyout/saveCustomLink.ts
+++ b/x-pack/legacy/plugins/apm/public/components/app/Settings/CustomizeUI/CustomLink/CustomLinkFlyout/saveCustomLink.ts
@@ -18,7 +18,7 @@ export async function saveCustomLink({
   id?: string;
   label: string;
   url: string;
-  filters?: { [key: string]: string };
+  filters?: { [key: string]: string[] };
   toasts: NotificationsStart['toasts'];
 }) {
   try {
diff --git a/x-pack/legacy/plugins/apm/public/components/app/Settings/CustomizeUI/CustomLink/__test__/CustomLink.test.tsx b/x-pack/legacy/plugins/apm/public/components/app/Settings/CustomizeUI/CustomLink/index.test.tsx
similarity index 56%
rename from x-pack/legacy/plugins/apm/public/components/app/Settings/CustomizeUI/CustomLink/__test__/CustomLink.test.tsx
rename to x-pack/legacy/plugins/apm/public/components/app/Settings/CustomizeUI/CustomLink/index.test.tsx
index f02cc2be8268d..7c39356189891 100644
--- a/x-pack/legacy/plugins/apm/public/components/app/Settings/CustomizeUI/CustomLink/__test__/CustomLink.test.tsx
+++ b/x-pack/legacy/plugins/apm/public/components/app/Settings/CustomizeUI/CustomLink/index.test.tsx
@@ -7,14 +7,17 @@
 import { fireEvent, render, wait } from '@testing-library/react';
 import React from 'react';
 import { act } from 'react-dom/test-utils';
-import { CustomLinkOverview } from '../';
-import * as hooks from '../../../../../../hooks/useFetcher';
+import * as apmApi from '../../../../../services/rest/createCallApmApi';
+import { License } from '../../../../../../../../../plugins/licensing/common/license';
+import * as hooks from '../../../../../hooks/useFetcher';
+import { LicenseContext } from '../../../../../context/LicenseContext';
+import { CustomLinkOverview } from '.';
 import {
+  MockApmPluginContextWrapper,
   expectTextsInDocument,
-  MockApmPluginContextWrapper
-} from '../../../../../../utils/testHelpers';
-import * as saveCustomLink from '../CustomLinkFlyout/saveCustomLink';
-import * as apmApi from '../../../../../../services/rest/createCallApmApi';
+  expectTextsNotInDocument
+} from '../../../../../utils/testHelpers';
+import * as saveCustomLink from './CustomLinkFlyout/saveCustomLink';
 
 const data = [
   {
@@ -32,6 +35,23 @@ const data = [
 ];
 
 describe('CustomLink', () => {
+  let callApmApiSpy: Function;
+  beforeAll(() => {
+    callApmApiSpy = spyOn(apmApi, 'callApmApi').and.returnValue({});
+  });
+  afterAll(() => {
+    jest.resetAllMocks();
+  });
+  const goldLicense = new License({
+    signature: 'test signature',
+    license: {
+      expiryDateInMillis: 0,
+      mode: 'gold',
+      status: 'active',
+      type: 'gold',
+      uid: '1'
+    }
+  });
   describe('empty prompt', () => {
     beforeAll(() => {
       spyOn(hooks, 'useFetcher').and.returnValue({
@@ -44,14 +64,20 @@ describe('CustomLink', () => {
       jest.clearAllMocks();
     });
     it('shows when no link is available', () => {
-      const component = render(<CustomLinkOverview />);
+      const component = render(
+        <LicenseContext.Provider value={goldLicense}>
+          <CustomLinkOverview />
+        </LicenseContext.Provider>
+      );
       expectTextsInDocument(component, ['No links found.']);
     });
     it('opens flyout when click to create new link', () => {
       const { queryByText, getByText } = render(
-        <MockApmPluginContextWrapper>
-          <CustomLinkOverview />
-        </MockApmPluginContextWrapper>
+        <LicenseContext.Provider value={goldLicense}>
+          <MockApmPluginContextWrapper>
+            <CustomLinkOverview />
+          </MockApmPluginContextWrapper>
+        </LicenseContext.Provider>
       );
       expect(queryByText('Create link')).not.toBeInTheDocument();
       act(() => {
@@ -75,9 +101,11 @@ describe('CustomLink', () => {
 
     it('shows a table with all custom link', () => {
       const component = render(
-        <MockApmPluginContextWrapper>
-          <CustomLinkOverview />
-        </MockApmPluginContextWrapper>
+        <LicenseContext.Provider value={goldLicense}>
+          <MockApmPluginContextWrapper>
+            <CustomLinkOverview />
+          </MockApmPluginContextWrapper>
+        </LicenseContext.Provider>
       );
       expectTextsInDocument(component, [
         'label 1',
@@ -89,9 +117,11 @@ describe('CustomLink', () => {
 
     it('checks if create custom link button is available and working', () => {
       const { queryByText, getByText } = render(
-        <MockApmPluginContextWrapper>
-          <CustomLinkOverview />
-        </MockApmPluginContextWrapper>
+        <LicenseContext.Provider value={goldLicense}>
+          <MockApmPluginContextWrapper>
+            <CustomLinkOverview />
+          </MockApmPluginContextWrapper>
+        </LicenseContext.Provider>
       );
       expect(queryByText('Create link')).not.toBeInTheDocument();
       act(() => {
@@ -103,10 +133,8 @@ describe('CustomLink', () => {
 
   describe('Flyout', () => {
     const refetch = jest.fn();
-    let callApmApiSpy: Function;
     let saveCustomLinkSpy: Function;
     beforeAll(() => {
-      callApmApiSpy = spyOn(apmApi, 'callApmApi');
       saveCustomLinkSpy = spyOn(saveCustomLink, 'saveCustomLink');
       spyOn(hooks, 'useFetcher').and.returnValue({
         data,
@@ -120,9 +148,11 @@ describe('CustomLink', () => {
 
     const openFlyout = () => {
       const component = render(
-        <MockApmPluginContextWrapper>
-          <CustomLinkOverview />
-        </MockApmPluginContextWrapper>
+        <LicenseContext.Provider value={goldLicense}>
+          <MockApmPluginContextWrapper>
+            <CustomLinkOverview />
+          </MockApmPluginContextWrapper>
+        </LicenseContext.Provider>
       );
       expect(component.queryByText('Create link')).not.toBeInTheDocument();
       act(() => {
@@ -134,13 +164,13 @@ describe('CustomLink', () => {
 
     it('creates a custom link', async () => {
       const component = openFlyout();
-      const labelInput = component.getByLabelText('label');
+      const labelInput = component.getByTestId('label');
       act(() => {
         fireEvent.change(labelInput, {
           target: { value: 'foo' }
         });
       });
-      const urlInput = component.getByLabelText('url');
+      const urlInput = component.getByTestId('url');
       act(() => {
         fireEvent.change(urlInput, {
           target: { value: 'bar' }
@@ -154,9 +184,11 @@ describe('CustomLink', () => {
 
     it('deletes a custom link', async () => {
       const component = render(
-        <MockApmPluginContextWrapper>
-          <CustomLinkOverview />
-        </MockApmPluginContextWrapper>
+        <LicenseContext.Provider value={goldLicense}>
+          <MockApmPluginContextWrapper>
+            <CustomLinkOverview />
+          </MockApmPluginContextWrapper>
+        </LicenseContext.Provider>
       );
       expect(component.queryByText('Create link')).not.toBeInTheDocument();
       const editButtons = component.getAllByLabelText('Edit');
@@ -204,9 +236,7 @@ describe('CustomLink', () => {
           if (addNewFilter) {
             addFilterField(component, 1);
           }
-          const field = component.getByLabelText(
-            fieldName
-          ) as HTMLSelectElement;
+          const field = component.getByTestId(fieldName) as HTMLSelectElement;
           const optionsAvailable = Object.values(field)
             .map(option => (option as HTMLOptionElement).text)
             .filter(option => option);
@@ -248,4 +278,93 @@ describe('CustomLink', () => {
       });
     });
   });
+
+  describe('invalid license', () => {
+    beforeAll(() => {
+      spyOn(hooks, 'useFetcher').and.returnValue({
+        data: [],
+        status: 'success'
+      });
+    });
+    it('shows license prompt when user has a basic license', () => {
+      const license = new License({
+        signature: 'test signature',
+        license: {
+          expiryDateInMillis: 0,
+          mode: 'basic',
+          status: 'active',
+          type: 'basic',
+          uid: '1'
+        }
+      });
+      const component = render(
+        <LicenseContext.Provider value={license}>
+          <MockApmPluginContextWrapper>
+            <CustomLinkOverview />
+          </MockApmPluginContextWrapper>
+        </LicenseContext.Provider>
+      );
+      expectTextsInDocument(component, ['Start free 30-day trial']);
+    });
+    it('shows license prompt when user has an invalid gold license', () => {
+      const license = new License({
+        signature: 'test signature',
+        license: {
+          expiryDateInMillis: 0,
+          mode: 'gold',
+          status: 'invalid',
+          type: 'gold',
+          uid: '1'
+        }
+      });
+      const component = render(
+        <LicenseContext.Provider value={license}>
+          <MockApmPluginContextWrapper>
+            <CustomLinkOverview />
+          </MockApmPluginContextWrapper>
+        </LicenseContext.Provider>
+      );
+      expectTextsInDocument(component, ['Start free 30-day trial']);
+    });
+    it('shows license prompt when user has an invalid trial license', () => {
+      const license = new License({
+        signature: 'test signature',
+        license: {
+          expiryDateInMillis: 0,
+          mode: 'trial',
+          status: 'invalid',
+          type: 'trial',
+          uid: '1'
+        }
+      });
+      const component = render(
+        <LicenseContext.Provider value={license}>
+          <MockApmPluginContextWrapper>
+            <CustomLinkOverview />
+          </MockApmPluginContextWrapper>
+        </LicenseContext.Provider>
+      );
+      expectTextsInDocument(component, ['Start free 30-day trial']);
+    });
+    it('doesnt show license prompt when user has a trial license', () => {
+      const license = new License({
+        signature: 'test signature',
+        license: {
+          expiryDateInMillis: 0,
+          mode: 'trial',
+          status: 'active',
+          type: 'trial',
+          uid: '1'
+        }
+      });
+      const component = render(
+        <LicenseContext.Provider value={license}>
+          <MockApmPluginContextWrapper>
+            <CustomLinkOverview />
+          </MockApmPluginContextWrapper>
+        </LicenseContext.Provider>
+      );
+      expectTextsNotInDocument(component, ['Start free 30-day trial']);
+    });
+  });
 });
diff --git a/x-pack/legacy/plugins/apm/public/components/app/Settings/CustomizeUI/CustomLink/index.tsx b/x-pack/legacy/plugins/apm/public/components/app/Settings/CustomizeUI/CustomLink/index.tsx
index bc1882c8c2785..a4985d4410699 100644
--- a/x-pack/legacy/plugins/apm/public/components/app/Settings/CustomizeUI/CustomLink/index.tsx
+++ b/x-pack/legacy/plugins/apm/public/components/app/Settings/CustomizeUI/CustomLink/index.tsx
@@ -7,6 +7,8 @@
 import { EuiPanel, EuiSpacer, EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
 import { isEmpty } from 'lodash';
 import React, { useEffect, useState } from 'react';
+import { i18n } from '@kbn/i18n';
+import { useLicense } from '../../../../../hooks/useLicense';
 import { CustomLink } from '../../../../../../../../../plugins/apm/server/lib/settings/custom_link/custom_link_types';
 import { useFetcher, FETCH_STATUS } from '../../../../../hooks/useFetcher';
 import { CustomLinkFlyout } from './CustomLinkFlyout';
@@ -14,8 +16,12 @@ import { CustomLinkTable } from './CustomLinkTable';
 import { EmptyPrompt } from './EmptyPrompt';
 import { Title } from './Title';
 import { CreateCustomLinkButton } from './CreateCustomLinkButton';
+import { LicensePrompt } from '../../../../shared/LicensePrompt';
 
 export const CustomLinkOverview = () => {
+  const license = useLicense();
+  const hasValidLicense = license?.isActive && license?.hasAtLeast('gold');
+
   const [isFlyoutOpen, setIsFlyoutOpen] = useState(false);
   const [customLinkSelected, setCustomLinkSelected] = useState<
     CustomLink | undefined
@@ -65,7 +71,7 @@ export const CustomLinkOverview = () => {
           <EuiFlexItem grow={false}>
             <Title />
           </EuiFlexItem>
-          {!showEmptyPrompt && (
+          {hasValidLicense && !showEmptyPrompt && (
             <EuiFlexItem>
               <EuiFlexGroup alignItems="center" justifyContent="flexEnd">
                 <EuiFlexItem grow={false}>
@@ -77,13 +83,24 @@ export const CustomLinkOverview = () => {
         </EuiFlexGroup>
 
         <EuiSpacer size="m" />
-
-        {showEmptyPrompt ? (
-          <EmptyPrompt onCreateCustomLinkClick={onCreateCustomLinkClick} />
+        {hasValidLicense ? (
+          showEmptyPrompt ? (
+            <EmptyPrompt onCreateCustomLinkClick={onCreateCustomLinkClick} />
+          ) : (
+            <CustomLinkTable
+              items={customLinks}
+              onCustomLinkSelected={setCustomLinkSelected}
+            />
+          )
         ) : (
-          <CustomLinkTable
-            items={customLinks}
-            onCustomLinkSelected={setCustomLinkSelected}
+          <LicensePrompt
+            text={i18n.translate(
+              'xpack.apm.settings.customizeUI.customLink.license.text',
+              {
+                defaultMessage:
+                  "To create custom links, you must be subscribed to an Elastic Gold license or above. With it, you'll have the ability to create custom links to improve your workflow when analyzing your services."
+              }
+            )}
           />
         )}
       </EuiPanel>
diff --git a/x-pack/legacy/plugins/apm/public/components/app/ServiceMap/PlatinumLicensePrompt.stories.tsx b/x-pack/legacy/plugins/apm/public/components/shared/LicensePrompt/LicensePrompt.stories.tsx
similarity index 79%
rename from x-pack/legacy/plugins/apm/public/components/app/ServiceMap/PlatinumLicensePrompt.stories.tsx
rename to x-pack/legacy/plugins/apm/public/components/shared/LicensePrompt/LicensePrompt.stories.tsx
index 80281c1a0a8fc..010bba7677f00 100644
--- a/x-pack/legacy/plugins/apm/public/components/app/ServiceMap/PlatinumLicensePrompt.stories.tsx
+++ b/x-pack/legacy/plugins/apm/public/components/shared/LicensePrompt/LicensePrompt.stories.tsx
@@ -6,13 +6,13 @@
 
 import { storiesOf } from '@storybook/react';
 import React from 'react';
-import { PlatinumLicensePrompt } from './PlatinumLicensePrompt';
 import {
   ApmPluginContext,
   ApmPluginContextValue
 } from '../../../context/ApmPluginContext';
+import { LicensePrompt } from '.';
 
-storiesOf('app/ServiceMap/PlatinumLicensePrompt', module).add(
+storiesOf('app/LicensePrompt', module).add(
   'example',
   () => {
     const contextMock = ({
@@ -21,7 +21,7 @@ storiesOf('app/ServiceMap/PlatinumLicensePrompt', module).add(
 
     return (
       <ApmPluginContext.Provider value={contextMock}>
-        <PlatinumLicensePrompt />
+        <LicensePrompt text="To create Feature name, you must be subscribed to an Elastic X license or above." />
       </ApmPluginContext.Provider>
     );
   },
diff --git a/x-pack/legacy/plugins/apm/public/components/shared/LicensePrompt/index.tsx b/x-pack/legacy/plugins/apm/public/components/shared/LicensePrompt/index.tsx
new file mode 100644
index 0000000000000..d2afefb83a568
--- /dev/null
+++ b/x-pack/legacy/plugins/apm/public/components/shared/LicensePrompt/index.tsx
@@ -0,0 +1,63 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { EuiButton, EuiEmptyPrompt, EuiPanel } from '@elastic/eui';
+import React from 'react';
+import { i18n } from '@kbn/i18n';
+import { useKibanaUrl } from '../../../hooks/useKibanaUrl';
+
+interface Props {
+  text: string;
+  showBetaBadge?: boolean;
+}
+
+export const LicensePrompt = ({ text, showBetaBadge = false }: Props) => {
+  const licensePageUrl = useKibanaUrl(
+    '/app/kibana',
+    '/management/elasticsearch/license_management/home'
+  );
+
+  const renderLicenseBody = (
+    <EuiEmptyPrompt
+      iconType="iInCircle"
+      iconColor="subdued"
+      title={
+        <h2>
+          {i18n.translate('xpack.apm.license.title', {
+            defaultMessage: 'Start free 30-day trial'
+          })}
+        </h2>
+      }
+      body={<p>{text}</p>}
+      actions={
+        <EuiButton fill={true} href={licensePageUrl}>
+          {i18n.translate('xpack.apm.license.button', {
+            defaultMessage: 'Start trial'
+          })}
+        </EuiButton>
+      }
+    />
+  );
+
+  const renderWithBetaBadge = (
+    <EuiPanel
+      betaBadgeLabel={i18n.translate('xpack.apm.license.betaBadge', {
+        defaultMessage: 'Beta'
+      })}
+      betaBadgeTooltipContent={i18n.translate(
+        'xpack.apm.license.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.'
+        }
+      )}
+    >
+      {renderLicenseBody}
+    </EuiPanel>
+  );
+
+  return <>{showBetaBadge ? renderWithBetaBadge : renderLicenseBody}</>;
+};
diff --git a/x-pack/legacy/plugins/apm/public/components/shared/Links/ElasticDocsLink.tsx b/x-pack/legacy/plugins/apm/public/components/shared/Links/ElasticDocsLink.tsx
index 0e0c318ad3299..9fcab049e224f 100644
--- a/x-pack/legacy/plugins/apm/public/components/shared/Links/ElasticDocsLink.tsx
+++ b/x-pack/legacy/plugins/apm/public/components/shared/Links/ElasticDocsLink.tsx
@@ -9,7 +9,7 @@ import { EuiLink, EuiLinkAnchorProps } from '@elastic/eui';
 import { useApmPluginContext } from '../../../hooks/useApmPluginContext';
 
 // union type constisting of valid guide sections that we link to
-type DocsSection = '/apm/get-started' | '/x-pack' | '/apm/server';
+type DocsSection = '/apm/get-started' | '/x-pack' | '/apm/server' | '/kibana';
 
 interface Props extends EuiLinkAnchorProps {
   section: DocsSection;
diff --git a/x-pack/legacy/plugins/apm/public/components/shared/LoadingStatePrompt.tsx b/x-pack/legacy/plugins/apm/public/components/shared/LoadingStatePrompt.tsx
index e1cf07c03dee9..8a87de976f5ed 100644
--- a/x-pack/legacy/plugins/apm/public/components/shared/LoadingStatePrompt.tsx
+++ b/x-pack/legacy/plugins/apm/public/components/shared/LoadingStatePrompt.tsx
@@ -11,7 +11,7 @@ export function LoadingStatePrompt() {
   return (
     <EuiFlexGroup justifyContent="spaceAround">
       <EuiFlexItem grow={false}>
-        <EuiLoadingSpinner size="l" />
+        <EuiLoadingSpinner size="l" data-test-subj="loading-spinner" />
       </EuiFlexItem>
     </EuiFlexGroup>
   );
diff --git a/x-pack/legacy/plugins/apm/public/components/shared/TransactionActionMenu/CustomLink/CustomLinkPopover.test.tsx b/x-pack/legacy/plugins/apm/public/components/shared/TransactionActionMenu/CustomLink/CustomLinkPopover.test.tsx
new file mode 100644
index 0000000000000..99789ca2ecdf5
--- /dev/null
+++ b/x-pack/legacy/plugins/apm/public/components/shared/TransactionActionMenu/CustomLink/CustomLinkPopover.test.tsx
@@ -0,0 +1,70 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+import React from 'react';
+import { render, act, fireEvent } from '@testing-library/react';
+import { CustomLink } from '../../../../../../../../plugins/apm/server/lib/settings/custom_link/custom_link_types';
+import { Transaction } from '../../../../../../../../plugins/apm/typings/es_schemas/ui/transaction';
+import { CustomLinkPopover } from './CustomLinkPopover';
+import { expectTextsInDocument } from '../../../../utils/testHelpers';
+
+describe('CustomLinkPopover', () => {
+  const customLinks = [
+    { id: '1', label: 'foo', url: 'http://elastic.co' },
+    {
+      id: '2',
+      label: 'bar',
+      url: 'http://elastic.co?service.name={{service.name}}'
+    }
+  ] as CustomLink[];
+  const transaction = ({
+    service: { name: 'foo.bar' }
+  } as unknown) as Transaction;
+  it('renders popover', () => {
+    const component = render(
+      <CustomLinkPopover
+        customLinks={customLinks}
+        transaction={transaction}
+        onCreateCustomLinkClick={jest.fn()}
+        onClose={jest.fn()}
+      />
+    );
+    expectTextsInDocument(component, ['CUSTOM LINKS', 'Create', 'foo', 'bar']);
+  });
+
+  it('closes popover', () => {
+    const handleCloseMock = jest.fn();
+    const { getByText } = render(
+      <CustomLinkPopover
+        customLinks={customLinks}
+        transaction={transaction}
+        onCreateCustomLinkClick={jest.fn()}
+        onClose={handleCloseMock}
+      />
+    );
+    expect(handleCloseMock).not.toHaveBeenCalled();
+    act(() => {
+      fireEvent.click(getByText('CUSTOM LINKS'));
+    });
+    expect(handleCloseMock).toHaveBeenCalled();
+  });
+
+  it('opens flyout to create new custom link', () => {
+    const handleCreateCustomLinkClickMock = jest.fn();
+    const { getByText } = render(
+      <CustomLinkPopover
+        customLinks={customLinks}
+        transaction={transaction}
+        onCreateCustomLinkClick={handleCreateCustomLinkClickMock}
+        onClose={jest.fn()}
+      />
+    );
+    expect(handleCreateCustomLinkClickMock).not.toHaveBeenCalled();
+    act(() => {
+      fireEvent.click(getByText('Create'));
+    });
+    expect(handleCreateCustomLinkClickMock).toHaveBeenCalled();
+  });
+});
diff --git a/x-pack/legacy/plugins/apm/public/components/shared/TransactionActionMenu/CustomLink/CustomLinkPopover.tsx b/x-pack/legacy/plugins/apm/public/components/shared/TransactionActionMenu/CustomLink/CustomLinkPopover.tsx
new file mode 100644
index 0000000000000..ee4aa25606a0c
--- /dev/null
+++ b/x-pack/legacy/plugins/apm/public/components/shared/TransactionActionMenu/CustomLink/CustomLinkPopover.tsx
@@ -0,0 +1,73 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+import React from 'react';
+import {
+  EuiPopoverTitle,
+  EuiFlexGroup,
+  EuiFlexItem,
+  EuiButtonEmpty
+} from '@elastic/eui';
+import { i18n } from '@kbn/i18n';
+import styled from 'styled-components';
+import { Transaction } from '../../../../../../../../plugins/apm/typings/es_schemas/ui/transaction';
+import { CustomLink } from '../../../../../../../../plugins/apm/server/lib/settings/custom_link/custom_link_types';
+import { CustomLinkSection } from './CustomLinkSection';
+import { ManageCustomLink } from './ManageCustomLink';
+import { px } from '../../../../style/variables';
+
+const ScrollableContainer = styled.div`
+  max-height: ${px(535)};
+  overflow: scroll;
+`;
+
+export const CustomLinkPopover = ({
+  customLinks,
+  onCreateCustomLinkClick,
+  onClose,
+  transaction
+}: {
+  customLinks: CustomLink[];
+  onCreateCustomLinkClick: () => void;
+  onClose: () => void;
+  transaction: Transaction;
+}) => {
+  return (
+    <>
+      <EuiPopoverTitle>
+        <EuiFlexGroup>
+          <EuiFlexItem style={{ alignItems: 'flex-start' }}>
+            <EuiButtonEmpty
+              color="text"
+              size="xs"
+              onClick={onClose}
+              iconType="arrowLeft"
+              style={{ fontWeight: 'bold' }}
+              flush="left"
+            >
+              {i18n.translate(
+                'xpack.apm.transactionActionMenu.customLink.popover.title',
+                {
+                  defaultMessage: 'CUSTOM LINKS'
+                }
+              )}
+            </EuiButtonEmpty>
+          </EuiFlexItem>
+          <EuiFlexItem>
+            <ManageCustomLink
+              onCreateCustomLinkClick={onCreateCustomLinkClick}
+            />
+          </EuiFlexItem>
+        </EuiFlexGroup>
+      </EuiPopoverTitle>
+      <ScrollableContainer>
+        <CustomLinkSection
+          customLinks={customLinks}
+          transaction={transaction}
+        />
+      </ScrollableContainer>
+    </>
+  );
+};
diff --git a/x-pack/legacy/plugins/apm/public/components/shared/TransactionActionMenu/CustomLink/CustomLinkSection.test.tsx b/x-pack/legacy/plugins/apm/public/components/shared/TransactionActionMenu/CustomLink/CustomLinkSection.test.tsx
new file mode 100644
index 0000000000000..4e52c302c6025
--- /dev/null
+++ b/x-pack/legacy/plugins/apm/public/components/shared/TransactionActionMenu/CustomLink/CustomLinkSection.test.tsx
@@ -0,0 +1,41 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+import React from 'react';
+import { render } from '@testing-library/react';
+import { CustomLink } from '../../../../../../../../plugins/apm/server/lib/settings/custom_link/custom_link_types';
+import { CustomLinkSection } from './CustomLinkSection';
+import {
+  expectTextsInDocument,
+  expectTextsNotInDocument
+} from '../../../../utils/testHelpers';
+import { Transaction } from '../../../../../../../../plugins/apm/typings/es_schemas/ui/transaction';
+
+describe('CustomLinkSection', () => {
+  const customLinks = [
+    { id: '1', label: 'foo', url: 'http://elastic.co' },
+    {
+      id: '2',
+      label: 'bar',
+      url: 'http://elastic.co?service.name={{service.name}}'
+    }
+  ] as CustomLink[];
+  const transaction = ({
+    service: { name: 'foo.bar' }
+  } as unknown) as Transaction;
+  it('shows links', () => {
+    const component = render(
+      <CustomLinkSection customLinks={customLinks} transaction={transaction} />
+    );
+    expectTextsInDocument(component, ['foo', 'bar']);
+  });
+
+  it('doesnt show any links', () => {
+    const component = render(
+      <CustomLinkSection customLinks={[]} transaction={transaction} />
+    );
+    expectTextsNotInDocument(component, ['foo', 'bar']);
+  });
+});
diff --git a/x-pack/legacy/plugins/apm/public/components/shared/TransactionActionMenu/CustomLink/CustomLinkSection.tsx b/x-pack/legacy/plugins/apm/public/components/shared/TransactionActionMenu/CustomLink/CustomLinkSection.tsx
new file mode 100644
index 0000000000000..601405dda6ece
--- /dev/null
+++ b/x-pack/legacy/plugins/apm/public/components/shared/TransactionActionMenu/CustomLink/CustomLinkSection.tsx
@@ -0,0 +1,40 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+import React from 'react';
+import Mustache from 'mustache';
+import { Transaction } from '../../../../../../../../plugins/apm/typings/es_schemas/ui/transaction';
+import { CustomLink } from '../../../../../../../../plugins/apm/server/lib/settings/custom_link/custom_link_types';
+import {
+  SectionLinks,
+  SectionLink
+} from '../../../../../../../../plugins/observability/public';
+
+export const CustomLinkSection = ({
+  customLinks,
+  transaction
+}: {
+  customLinks: CustomLink[];
+  transaction: Transaction;
+}) => (
+  <SectionLinks>
+    {customLinks.map(link => {
+      let href = link.url;
+      try {
+        href = Mustache.render(link.url, transaction);
+      } catch (e) {
+        // ignores any error that happens
+      }
+      return (
+        <SectionLink
+          key={link.id}
+          label={link.label}
+          href={href}
+          target="_blank"
+        />
+      );
+    })}
+  </SectionLinks>
+);
diff --git a/x-pack/legacy/plugins/apm/public/components/shared/TransactionActionMenu/CustomLink/ManageCustomLink.test.tsx b/x-pack/legacy/plugins/apm/public/components/shared/TransactionActionMenu/CustomLink/ManageCustomLink.test.tsx
new file mode 100644
index 0000000000000..9e7df53b0882f
--- /dev/null
+++ b/x-pack/legacy/plugins/apm/public/components/shared/TransactionActionMenu/CustomLink/ManageCustomLink.test.tsx
@@ -0,0 +1,50 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React from 'react';
+import { render, act, fireEvent } from '@testing-library/react';
+import { ManageCustomLink } from './ManageCustomLink';
+import {
+  expectTextsInDocument,
+  expectTextsNotInDocument
+} from '../../../../utils/testHelpers';
+
+describe('ManageCustomLink', () => {
+  it('renders with create button', () => {
+    const component = render(
+      <ManageCustomLink onCreateCustomLinkClick={jest.fn()} />
+    );
+    expect(
+      component.getByLabelText('Custom links settings page')
+    ).toBeInTheDocument();
+    expectTextsInDocument(component, ['Create']);
+  });
+  it('renders without create button', () => {
+    const component = render(
+      <ManageCustomLink
+        onCreateCustomLinkClick={jest.fn()}
+        showCreateCustomLinkButton={false}
+      />
+    );
+    expect(
+      component.getByLabelText('Custom links settings page')
+    ).toBeInTheDocument();
+    expectTextsNotInDocument(component, ['Create']);
+  });
+  it('opens flyout to create new custom link', () => {
+    const handleCreateCustomLinkClickMock = jest.fn();
+    const { getByText } = render(
+      <ManageCustomLink
+        onCreateCustomLinkClick={handleCreateCustomLinkClickMock}
+      />
+    );
+    expect(handleCreateCustomLinkClickMock).not.toHaveBeenCalled();
+    act(() => {
+      fireEvent.click(getByText('Create'));
+    });
+    expect(handleCreateCustomLinkClickMock).toHaveBeenCalled();
+  });
+});
diff --git a/x-pack/legacy/plugins/apm/public/components/shared/TransactionActionMenu/CustomLink/ManageCustomLink.tsx b/x-pack/legacy/plugins/apm/public/components/shared/TransactionActionMenu/CustomLink/ManageCustomLink.tsx
new file mode 100644
index 0000000000000..fa9f8b2f07c53
--- /dev/null
+++ b/x-pack/legacy/plugins/apm/public/components/shared/TransactionActionMenu/CustomLink/ManageCustomLink.tsx
@@ -0,0 +1,59 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+import React from 'react';
+import {
+  EuiFlexGroup,
+  EuiFlexItem,
+  EuiToolTip,
+  EuiButtonEmpty,
+  EuiIcon
+} from '@elastic/eui';
+import { i18n } from '@kbn/i18n';
+import { APMLink } from '../../Links/apm/APMLink';
+
+export const ManageCustomLink = ({
+  onCreateCustomLinkClick,
+  showCreateCustomLinkButton = true
+}: {
+  onCreateCustomLinkClick: () => void;
+  showCreateCustomLinkButton?: boolean;
+}) => (
+  <EuiFlexGroup>
+    <EuiFlexItem>
+      <EuiFlexGroup justifyContent="flexEnd" gutterSize="none">
+        <EuiFlexItem grow={false} style={{ justifyContent: 'center' }}>
+          <EuiToolTip
+            position="top"
+            content={i18n.translate('xpack.apm.customLink.buttom.manage', {
+              defaultMessage: 'Manage custom links'
+            })}
+          >
+            <APMLink path={`/settings/customize-ui`}>
+              <EuiIcon
+                type="gear"
+                color="text"
+                aria-label="Custom links settings page"
+              />
+            </APMLink>
+          </EuiToolTip>
+        </EuiFlexItem>
+        {showCreateCustomLinkButton && (
+          <EuiFlexItem grow={false}>
+            <EuiButtonEmpty
+              iconType="plusInCircle"
+              size="xs"
+              onClick={onCreateCustomLinkClick}
+            >
+              {i18n.translate('xpack.apm.customLink.buttom.create.title', {
+                defaultMessage: 'Create'
+              })}
+            </EuiButtonEmpty>
+          </EuiFlexItem>
+        )}
+      </EuiFlexGroup>
+    </EuiFlexItem>
+  </EuiFlexGroup>
+);
diff --git a/x-pack/legacy/plugins/apm/public/components/shared/TransactionActionMenu/CustomLink/index.test.tsx b/x-pack/legacy/plugins/apm/public/components/shared/TransactionActionMenu/CustomLink/index.test.tsx
new file mode 100644
index 0000000000000..ba9c7eee8792b
--- /dev/null
+++ b/x-pack/legacy/plugins/apm/public/components/shared/TransactionActionMenu/CustomLink/index.test.tsx
@@ -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 React from 'react';
+import { render, act, fireEvent } from '@testing-library/react';
+import { CustomLink } from '.';
+import { Transaction } from '../../../../../../../../plugins/apm/typings/es_schemas/ui/transaction';
+import { FETCH_STATUS } from '../../../../hooks/useFetcher';
+import {
+  expectTextsInDocument,
+  expectTextsNotInDocument
+} from '../../../../utils/testHelpers';
+import { CustomLink as CustomLinkType } from '../../../../../../../../plugins/apm/server/lib/settings/custom_link/custom_link_types';
+
+describe('Custom links', () => {
+  it('shows empty message when no custom link is available', () => {
+    const component = render(
+      <CustomLink
+        customLinks={[]}
+        transaction={({} as unknown) as Transaction}
+        onCreateCustomLinkClick={jest.fn()}
+        onSeeMoreClick={jest.fn()}
+        status={FETCH_STATUS.SUCCESS}
+      />
+    );
+
+    expectTextsInDocument(component, [
+      'No custom links found. Set up your own custom links i.e. a link to a specific Dashboard or external link.'
+    ]);
+    expectTextsNotInDocument(component, ['Create']);
+  });
+
+  it('shows loading while custom links are fetched', () => {
+    const { getByTestId } = render(
+      <CustomLink
+        customLinks={[]}
+        transaction={({} as unknown) as Transaction}
+        onCreateCustomLinkClick={jest.fn()}
+        onSeeMoreClick={jest.fn()}
+        status={FETCH_STATUS.LOADING}
+      />
+    );
+    expect(getByTestId('loading-spinner')).toBeInTheDocument();
+  });
+
+  it('shows first 3 custom links available', () => {
+    const customLinks = [
+      { id: '1', label: 'foo', url: 'foo' },
+      { id: '2', label: 'bar', url: 'bar' },
+      { id: '3', label: 'baz', url: 'baz' },
+      { id: '4', label: 'qux', url: 'qux' }
+    ] as CustomLinkType[];
+    const component = render(
+      <CustomLink
+        customLinks={customLinks}
+        transaction={({} as unknown) as Transaction}
+        onCreateCustomLinkClick={jest.fn()}
+        onSeeMoreClick={jest.fn()}
+        status={FETCH_STATUS.SUCCESS}
+      />
+    );
+    expectTextsInDocument(component, ['foo', 'bar', 'baz']);
+    expectTextsNotInDocument(component, ['qux']);
+  });
+
+  it('clicks on See more button', () => {
+    const customLinks = [
+      { id: '1', label: 'foo', url: 'foo' },
+      { id: '2', label: 'bar', url: 'bar' },
+      { id: '3', label: 'baz', url: 'baz' },
+      { id: '4', label: 'qux', url: 'qux' }
+    ] as CustomLinkType[];
+    const onSeeMoreClickMock = jest.fn();
+    const component = render(
+      <CustomLink
+        customLinks={customLinks}
+        transaction={({} as unknown) as Transaction}
+        onCreateCustomLinkClick={jest.fn()}
+        onSeeMoreClick={onSeeMoreClickMock}
+        status={FETCH_STATUS.SUCCESS}
+      />
+    );
+    expect(onSeeMoreClickMock).not.toHaveBeenCalled();
+    act(() => {
+      fireEvent.click(component.getByText('See more'));
+    });
+    expect(onSeeMoreClickMock).toHaveBeenCalled();
+  });
+
+  describe('create custom link buttons', () => {
+    it('shows create button below empty message', () => {
+      const component = render(
+        <CustomLink
+          customLinks={[]}
+          transaction={({} as unknown) as Transaction}
+          onCreateCustomLinkClick={jest.fn()}
+          onSeeMoreClick={jest.fn()}
+          status={FETCH_STATUS.SUCCESS}
+        />
+      );
+
+      expectTextsInDocument(component, ['Create custom link']);
+      expectTextsNotInDocument(component, ['Create']);
+    });
+    it('shows create button besides the title', () => {
+      const customLinks = [
+        { id: '1', label: 'foo', url: 'foo' },
+        { id: '2', label: 'bar', url: 'bar' },
+        { id: '3', label: 'baz', url: 'baz' },
+        { id: '4', label: 'qux', url: 'qux' }
+      ] as CustomLinkType[];
+      const component = render(
+        <CustomLink
+          customLinks={customLinks}
+          transaction={({} as unknown) as Transaction}
+          onCreateCustomLinkClick={jest.fn()}
+          onSeeMoreClick={jest.fn()}
+          status={FETCH_STATUS.SUCCESS}
+        />
+      );
+      expectTextsInDocument(component, ['Create']);
+      expectTextsNotInDocument(component, ['Create custom link']);
+    });
+  });
+});
diff --git a/x-pack/legacy/plugins/apm/public/components/shared/TransactionActionMenu/CustomLink/index.tsx b/x-pack/legacy/plugins/apm/public/components/shared/TransactionActionMenu/CustomLink/index.tsx
new file mode 100644
index 0000000000000..9280f8e71bf9e
--- /dev/null
+++ b/x-pack/legacy/plugins/apm/public/components/shared/TransactionActionMenu/CustomLink/index.tsx
@@ -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 React from 'react';
+import {
+  EuiText,
+  EuiIcon,
+  EuiFlexGroup,
+  EuiFlexItem,
+  EuiSpacer,
+  EuiButtonEmpty
+} from '@elastic/eui';
+import { i18n } from '@kbn/i18n';
+import styled from 'styled-components';
+import { isEmpty } from 'lodash';
+import { Transaction } from '../../../../../../../../plugins/apm/typings/es_schemas/ui/transaction';
+import { CustomLink as CustomLinkType } from '../../../../../../../../plugins/apm/server/lib/settings/custom_link/custom_link_types';
+import {
+  ActionMenuDivider,
+  SectionSubtitle
+} from '../../../../../../../../plugins/observability/public';
+import { CustomLinkSection } from './CustomLinkSection';
+import { ManageCustomLink } from './ManageCustomLink';
+import { FETCH_STATUS } from '../../../../hooks/useFetcher';
+import { LoadingStatePrompt } from '../../LoadingStatePrompt';
+import { px } from '../../../../style/variables';
+
+const SeeMoreButton = styled.button<{ show: boolean }>`
+  display: ${props => (props.show ? 'flex' : 'none')};
+  align-items: center;
+  width: 100%;
+  justify-content: space-between;
+  &:hover {
+    text-decoration: underline;
+  }
+`;
+
+export const CustomLink = ({
+  customLinks,
+  status,
+  onCreateCustomLinkClick,
+  onSeeMoreClick,
+  transaction
+}: {
+  customLinks: CustomLinkType[];
+  status: FETCH_STATUS;
+  onCreateCustomLinkClick: () => void;
+  onSeeMoreClick: () => void;
+  transaction: Transaction;
+}) => {
+  const renderEmptyPrompt = (
+    <>
+      <EuiText size="xs" grow={false} style={{ width: px(300) }}>
+        {i18n.translate('xpack.apm.customLink.empty', {
+          defaultMessage:
+            'No custom links found. Set up your own custom links i.e. a link to a specific Dashboard or external link.'
+        })}
+      </EuiText>
+      <EuiSpacer size="s" />
+      <EuiButtonEmpty
+        iconType="plusInCircle"
+        size="xs"
+        onClick={onCreateCustomLinkClick}
+      >
+        {i18n.translate('xpack.apm.customLink.buttom.create', {
+          defaultMessage: 'Create custom link'
+        })}
+      </EuiButtonEmpty>
+    </>
+  );
+
+  const renderCustomLinkBottomSection = isEmpty(customLinks) ? (
+    renderEmptyPrompt
+  ) : (
+    <SeeMoreButton onClick={onSeeMoreClick} show={customLinks.length > 3}>
+      <EuiText size="s">
+        {i18n.translate('xpack.apm.transactionActionMenu.customLink.seeMore', {
+          defaultMessage: 'See more'
+        })}
+      </EuiText>
+      <EuiIcon type="arrowRight" />
+    </SeeMoreButton>
+  );
+
+  return (
+    <>
+      <ActionMenuDivider />
+      <EuiFlexGroup>
+        <EuiFlexItem style={{ justifyContent: 'center' }}>
+          <EuiText size={'s'} grow={false}>
+            <h5>
+              {i18n.translate(
+                'xpack.apm.transactionActionMenu.customLink.section',
+                {
+                  defaultMessage: 'Custom Links'
+                }
+              )}
+            </h5>
+          </EuiText>
+        </EuiFlexItem>
+        <EuiFlexItem>
+          <ManageCustomLink
+            onCreateCustomLinkClick={onCreateCustomLinkClick}
+            showCreateCustomLinkButton={!!customLinks.length}
+          />
+        </EuiFlexItem>
+      </EuiFlexGroup>
+      <EuiSpacer size="s" />
+      <SectionSubtitle>
+        {i18n.translate('xpack.apm.transactionActionMenu.customLink.subtitle', {
+          defaultMessage: 'Links will open in a new window.'
+        })}
+      </SectionSubtitle>
+      <CustomLinkSection
+        customLinks={customLinks.slice(0, 3)}
+        transaction={transaction}
+      />
+      <EuiSpacer size="s" />
+      {status === FETCH_STATUS.LOADING ? (
+        <LoadingStatePrompt />
+      ) : (
+        renderCustomLinkBottomSection
+      )}
+    </>
+  );
+};
diff --git a/x-pack/legacy/plugins/apm/public/components/shared/TransactionActionMenu/TransactionActionMenu.tsx b/x-pack/legacy/plugins/apm/public/components/shared/TransactionActionMenu/TransactionActionMenu.tsx
index dd022626807d0..e3c412f40ba3a 100644
--- a/x-pack/legacy/plugins/apm/public/components/shared/TransactionActionMenu/TransactionActionMenu.tsx
+++ b/x-pack/legacy/plugins/apm/public/components/shared/TransactionActionMenu/TransactionActionMenu.tsx
@@ -6,7 +6,10 @@
 
 import { EuiButtonEmpty } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
-import React, { FunctionComponent, useState } from 'react';
+import React, { FunctionComponent, useMemo, useState } from 'react';
+import { FilterOptions } from '../../../../../../../plugins/apm/common/custom_link_filter_options';
+import { CustomLink as CustomLinkType } from '../../../../../../../plugins/apm/server/lib/settings/custom_link/custom_link_types';
+import { Transaction } from '../../../../../../../plugins/apm/typings/es_schemas/ui/transaction';
 import {
   ActionMenu,
   ActionMenuDivider,
@@ -16,11 +19,16 @@ import {
   SectionSubtitle,
   SectionTitle
 } from '../../../../../../../plugins/observability/public';
-import { Transaction } from '../../../../../../../plugins/apm/typings/es_schemas/ui/transaction';
 import { useApmPluginContext } from '../../../hooks/useApmPluginContext';
+import { useFetcher } from '../../../hooks/useFetcher';
 import { useLocation } from '../../../hooks/useLocation';
 import { useUrlParams } from '../../../hooks/useUrlParams';
+import { CustomLinkFlyout } from '../../app/Settings/CustomizeUI/CustomLink/CustomLinkFlyout';
+import { CustomLink } from './CustomLink';
+import { CustomLinkPopover } from './CustomLink/CustomLinkPopover';
 import { getSections } from './sections';
+import { useLicense } from '../../../hooks/useLicense';
+import { px } from '../../../style/variables';
 
 interface Props {
   readonly transaction: Transaction;
@@ -37,11 +45,36 @@ const ActionMenuButton = ({ onClick }: { onClick: () => void }) => (
 export const TransactionActionMenu: FunctionComponent<Props> = ({
   transaction
 }: Props) => {
+  const license = useLicense();
+  const hasValidLicense = license?.isActive && license?.hasAtLeast('gold');
+
   const { core } = useApmPluginContext();
   const location = useLocation();
   const { urlParams } = useUrlParams();
 
-  const [isOpen, setIsOpen] = useState(false);
+  const [isActionPopoverOpen, setIsActionPopoverOpen] = useState(false);
+  const [isCustomLinksPopoverOpen, setIsCustomLinksPopoverOpen] = useState(
+    false
+  );
+  const [isCustomLinkFlyoutOpen, setIsCustomLinkFlyoutOpen] = useState(false);
+
+  const filters: FilterOptions = useMemo(
+    () => ({
+      'service.name': transaction?.service.name,
+      'service.environment': transaction?.service.environment,
+      'transaction.name': transaction?.transaction.name,
+      'transaction.type': transaction?.transaction.type
+    }),
+    [transaction]
+  );
+  const { data: customLinks = [], status, refetch } = useFetcher(
+    callApmApi =>
+      callApmApi({
+        pathname: '/api/apm/settings/custom_links',
+        params: { query: filters }
+      }),
+    [filters]
+  );
 
   const sections = getSections({
     transaction,
@@ -50,39 +83,92 @@ export const TransactionActionMenu: FunctionComponent<Props> = ({
     urlParams
   });
 
+  const toggleCustomLinkFlyout = () => {
+    setIsCustomLinkFlyoutOpen(isOpen => !isOpen);
+  };
+
+  const toggleCustomLinkPopover = () => {
+    setIsCustomLinksPopoverOpen(isOpen => !isOpen);
+  };
+
   return (
-    <ActionMenu
-      id="transactionActionMenu"
-      closePopover={() => setIsOpen(false)}
-      isOpen={isOpen}
-      anchorPosition="downRight"
-      button={<ActionMenuButton onClick={() => setIsOpen(!isOpen)} />}
-    >
-      {sections.map((section, idx) => {
-        const isLastSection = idx !== sections.length - 1;
-        return (
-          <div key={idx}>
-            {section.map(item => (
-              <Section key={item.key}>
-                {item.title && <SectionTitle>{item.title}</SectionTitle>}
-                {item.subtitle && (
-                  <SectionSubtitle>{item.subtitle}</SectionSubtitle>
-                )}
-                <SectionLinks>
-                  {item.actions.map(action => (
-                    <SectionLink
-                      key={action.key}
-                      label={action.label}
-                      href={action.href}
-                    />
-                  ))}
-                </SectionLinks>
-              </Section>
-            ))}
-            {isLastSection && <ActionMenuDivider />}
-          </div>
-        );
-      })}
-    </ActionMenu>
+    <>
+      {isCustomLinkFlyoutOpen && (
+        <CustomLinkFlyout
+          customLinkSelected={{ ...filters } as CustomLinkType}
+          onClose={toggleCustomLinkFlyout}
+          onSave={() => {
+            toggleCustomLinkFlyout();
+            refetch();
+          }}
+          onDelete={() => {
+            toggleCustomLinkFlyout();
+            refetch();
+          }}
+        />
+      )}
+      <ActionMenu
+        id="transactionActionMenu"
+        closePopover={() => {
+          setIsActionPopoverOpen(false);
+          setIsCustomLinksPopoverOpen(false);
+        }}
+        isOpen={isActionPopoverOpen}
+        anchorPosition="downRight"
+        button={
+          <ActionMenuButton onClick={() => setIsActionPopoverOpen(true)} />
+        }
+      >
+        <div style={{ maxHeight: px(600) }}>
+          {isCustomLinksPopoverOpen ? (
+            <CustomLinkPopover
+              customLinks={customLinks.slice(3, customLinks.length)}
+              onCreateCustomLinkClick={toggleCustomLinkFlyout}
+              onClose={toggleCustomLinkPopover}
+              transaction={transaction}
+            />
+          ) : (
+            <>
+              {sections.map((section, idx) => {
+                const isLastSection = idx !== sections.length - 1;
+                return (
+                  <div key={idx}>
+                    {section.map(item => (
+                      <Section key={item.key}>
+                        {item.title && (
+                          <SectionTitle>{item.title}</SectionTitle>
+                        )}
+                        {item.subtitle && (
+                          <SectionSubtitle>{item.subtitle}</SectionSubtitle>
+                        )}
+                        <SectionLinks>
+                          {item.actions.map(action => (
+                            <SectionLink
+                              key={action.key}
+                              label={action.label}
+                              href={action.href}
+                            />
+                          ))}
+                        </SectionLinks>
+                      </Section>
+                    ))}
+                    {isLastSection && <ActionMenuDivider />}
+                  </div>
+                );
+              })}
+              {hasValidLicense && (
+                <CustomLink
+                  customLinks={customLinks}
+                  status={status}
+                  onCreateCustomLinkClick={toggleCustomLinkFlyout}
+                  onSeeMoreClick={toggleCustomLinkPopover}
+                  transaction={transaction}
+                />
+              )}
+            </>
+          )}
+        </div>
+      </ActionMenu>
+    </>
   );
 };
diff --git a/x-pack/legacy/plugins/apm/public/components/shared/TransactionActionMenu/__test__/TransactionActionMenu.test.tsx b/x-pack/legacy/plugins/apm/public/components/shared/TransactionActionMenu/__test__/TransactionActionMenu.test.tsx
index ac3616e8c134c..9094662e34914 100644
--- a/x-pack/legacy/plugins/apm/public/components/shared/TransactionActionMenu/__test__/TransactionActionMenu.test.tsx
+++ b/x-pack/legacy/plugins/apm/public/components/shared/TransactionActionMenu/__test__/TransactionActionMenu.test.tsx
@@ -5,11 +5,18 @@
  */
 
 import React from 'react';
-import { render, fireEvent } from '@testing-library/react';
+import { render, fireEvent, act } from '@testing-library/react';
 import { TransactionActionMenu } from '../TransactionActionMenu';
 import { Transaction } from '../../../../../../../../plugins/apm/typings/es_schemas/ui/transaction';
 import * as Transactions from './mockData';
-import { MockApmPluginContextWrapper } from '../../../../utils/testHelpers';
+import {
+  MockApmPluginContextWrapper,
+  expectTextsNotInDocument,
+  expectTextsInDocument
+} from '../../../../utils/testHelpers';
+import * as hooks from '../../../../hooks/useFetcher';
+import { LicenseContext } from '../../../../context/LicenseContext';
+import { License } from '../../../../../../../../plugins/licensing/common/license';
 
 const renderTransaction = async (transaction: Record<string, any>) => {
   const rendered = render(
@@ -23,6 +30,15 @@ const renderTransaction = async (transaction: Record<string, any>) => {
 };
 
 describe('TransactionActionMenu component', () => {
+  beforeAll(() => {
+    spyOn(hooks, 'useFetcher').and.returnValue({
+      data: [],
+      status: 'success'
+    });
+  });
+  afterAll(() => {
+    jest.clearAllMocks();
+  });
   it('should always render the discover link', async () => {
     const { queryByText } = await renderTransaction(
       Transactions.transactionWithMinimalData
@@ -124,4 +140,115 @@ describe('TransactionActionMenu component', () => {
 
     expect(container).toMatchSnapshot();
   });
+
+  describe('Custom links', () => {
+    it('doesnt show custom links when license is not valid', () => {
+      const license = new License({
+        signature: 'test signature',
+        license: {
+          expiryDateInMillis: 0,
+          mode: 'gold',
+          status: 'invalid',
+          type: 'gold',
+          uid: '1'
+        }
+      });
+      const component = render(
+        <LicenseContext.Provider value={license}>
+          <MockApmPluginContextWrapper>
+            <TransactionActionMenu
+              transaction={
+                Transactions.transactionWithMinimalData as Transaction
+              }
+            />
+          </MockApmPluginContextWrapper>
+        </LicenseContext.Provider>
+      );
+      act(() => {
+        fireEvent.click(component.getByText('Actions'));
+      });
+      expectTextsNotInDocument(component, ['Custom Links']);
+    });
+    it('doesnt show custom links when basic license', () => {
+      const license = new License({
+        signature: 'test signature',
+        license: {
+          expiryDateInMillis: 0,
+          mode: 'basic',
+          status: 'active',
+          type: 'basic',
+          uid: '1'
+        }
+      });
+      const component = render(
+        <LicenseContext.Provider value={license}>
+          <MockApmPluginContextWrapper>
+            <TransactionActionMenu
+              transaction={
+                Transactions.transactionWithMinimalData as Transaction
+              }
+            />
+          </MockApmPluginContextWrapper>
+        </LicenseContext.Provider>
+      );
+      act(() => {
+        fireEvent.click(component.getByText('Actions'));
+      });
+      expectTextsNotInDocument(component, ['Custom Links']);
+    });
+    it('shows custom links when trial license', () => {
+      const license = new License({
+        signature: 'test signature',
+        license: {
+          expiryDateInMillis: 0,
+          mode: 'trial',
+          status: 'active',
+          type: 'trial',
+          uid: '1'
+        }
+      });
+      const component = render(
+        <LicenseContext.Provider value={license}>
+          <MockApmPluginContextWrapper>
+            <TransactionActionMenu
+              transaction={
+                Transactions.transactionWithMinimalData as Transaction
+              }
+            />
+          </MockApmPluginContextWrapper>
+        </LicenseContext.Provider>
+      );
+      act(() => {
+        fireEvent.click(component.getByText('Actions'));
+      });
+      expectTextsInDocument(component, ['Custom Links']);
+    });
+    it('shows custom links when gold license', () => {
+      const license = new License({
+        signature: 'test signature',
+        license: {
+          expiryDateInMillis: 0,
+          mode: 'gold',
+          status: 'active',
+          type: 'gold',
+          uid: '1'
+        }
+      });
+      const component = render(
+        <LicenseContext.Provider value={license}>
+          <MockApmPluginContextWrapper>
+            <TransactionActionMenu
+              transaction={
+                Transactions.transactionWithMinimalData as Transaction
+              }
+            />
+          </MockApmPluginContextWrapper>
+        </LicenseContext.Provider>
+      );
+      act(() => {
+        fireEvent.click(component.getByText('Actions'));
+      });
+      expectTextsInDocument(component, ['Custom Links']);
+    });
+  });
 });
diff --git a/x-pack/plugins/apm/common/custom_link_filter_options.ts b/x-pack/plugins/apm/common/custom_link_filter_options.ts
new file mode 100644
index 0000000000000..32b19ad60a646
--- /dev/null
+++ b/x-pack/plugins/apm/common/custom_link_filter_options.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 * as t from 'io-ts';
+import {
+  SERVICE_NAME,
+  SERVICE_ENVIRONMENT,
+  TRANSACTION_TYPE,
+  TRANSACTION_NAME
+} from './elasticsearch_fieldnames';
+
+export const FilterOptionsRt = t.partial({
+  [SERVICE_NAME]: t.union([t.string, t.array(t.string)]),
+  [SERVICE_ENVIRONMENT]: t.union([t.string, t.array(t.string)]),
+  [TRANSACTION_NAME]: t.union([t.string, t.array(t.string)]),
+  [TRANSACTION_TYPE]: t.union([t.string, t.array(t.string)])
+});
+
+export type FilterOptions = t.TypeOf<typeof FilterOptionsRt>;
+
+export const FILTER_OPTIONS: ReadonlyArray<keyof FilterOptions> = [
+  SERVICE_NAME,
+  SERVICE_ENVIRONMENT,
+  TRANSACTION_TYPE,
+  TRANSACTION_NAME
+] as const;
diff --git a/x-pack/plugins/apm/server/lib/helpers/create_or_update_index.ts b/x-pack/plugins/apm/server/lib/helpers/create_or_update_index.ts
index 0a0da332e73ae..cc01c990bf985 100644
--- a/x-pack/plugins/apm/server/lib/helpers/create_or_update_index.ts
+++ b/x-pack/plugins/apm/server/lib/helpers/create_or_update_index.ts
@@ -18,6 +18,7 @@ export type Mappings =
       scaling_factor?: number;
       ignore_malformed?: boolean;
       coerce?: boolean;
+      fields?: Record<string, Mappings>;
     };
 
 export async function createOrUpdateIndex({
diff --git a/x-pack/plugins/apm/server/lib/settings/custom_link/__test__/__snapshots__/get_transaction.test.ts.snap b/x-pack/plugins/apm/server/lib/settings/custom_link/__test__/__snapshots__/get_transaction.test.ts.snap
new file mode 100644
index 0000000000000..16a270fd6d25b
--- /dev/null
+++ b/x-pack/plugins/apm/server/lib/settings/custom_link/__test__/__snapshots__/get_transaction.test.ts.snap
@@ -0,0 +1,73 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`custom link get transaction fetches with all filter 1`] = `
+Object {
+  "body": Object {
+    "query": Object {
+      "bool": Object {
+        "filter": Array [
+          Object {
+            "term": Object {
+              "service.name": "foo",
+            },
+          },
+          Object {
+            "term": Object {
+              "service.environment": "bar",
+            },
+          },
+          Object {
+            "term": Object {
+              "transaction.type": "qux",
+            },
+          },
+          Object {
+            "term": Object {
+              "transaction.name": "baz",
+            },
+          },
+        ],
+      },
+    },
+  },
+  "index": "myIndex",
+  "size": 1,
+  "terminateAfter": 1,
+}
+`;
+
+exports[`custom link get transaction fetches without filter 1`] = `
+Object {
+  "body": Object {
+    "query": Object {
+      "bool": Object {
+        "filter": Array [],
+      },
+    },
+  },
+  "index": "myIndex",
+  "size": 1,
+  "terminateAfter": 1,
+}
+`;
+
+exports[`custom link get transaction removes not listed filters from query 1`] = `
+Object {
+  "body": Object {
+    "query": Object {
+      "bool": Object {
+        "filter": Array [
+          Object {
+            "term": Object {
+              "service.name": "foo",
+            },
+          },
+        ],
+      },
+    },
+  },
+  "index": "myIndex",
+  "size": 1,
+  "terminateAfter": 1,
+}
+`;
diff --git a/x-pack/plugins/apm/server/lib/settings/custom_link/__test__/__snapshots__/list_custom_links.test.ts.snap b/x-pack/plugins/apm/server/lib/settings/custom_link/__test__/__snapshots__/list_custom_links.test.ts.snap
index b3819ace40d6c..bb8f6dcb22902 100644
--- a/x-pack/plugins/apm/server/lib/settings/custom_link/__test__/__snapshots__/list_custom_links.test.ts.snap
+++ b/x-pack/plugins/apm/server/lib/settings/custom_link/__test__/__snapshots__/list_custom_links.test.ts.snap
@@ -8,6 +8,13 @@ Object {
         "filter": Array [],
       },
     },
+    "sort": Array [
+      Object {
+        "label.keyword": Object {
+          "order": "asc",
+        },
+      },
+    ],
   },
   "index": "myIndex",
   "size": 500,
@@ -69,6 +76,13 @@ Object {
         ],
       },
     },
+    "sort": Array [
+      Object {
+        "label.keyword": Object {
+          "order": "asc",
+        },
+      },
+    ],
   },
   "index": "myIndex",
   "size": 500,
diff --git a/x-pack/plugins/apm/server/lib/settings/custom_link/__test__/get_transaction.test.ts b/x-pack/plugins/apm/server/lib/settings/custom_link/__test__/get_transaction.test.ts
new file mode 100644
index 0000000000000..4fc22298a476c
--- /dev/null
+++ b/x-pack/plugins/apm/server/lib/settings/custom_link/__test__/get_transaction.test.ts
@@ -0,0 +1,56 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+import {
+  inspectSearchParams,
+  SearchParamsMock
+} from '../../../../../../../legacy/plugins/apm/public/utils/testHelpers';
+import { getTransaction } from '../get_transaction';
+import { Setup } from '../../../helpers/setup_request';
+import {
+  SERVICE_NAME,
+  TRANSACTION_TYPE,
+  SERVICE_ENVIRONMENT,
+  TRANSACTION_NAME
+} from '../../../../../common/elasticsearch_fieldnames';
+
+describe('custom link get transaction', () => {
+  let mock: SearchParamsMock;
+  it('removes not listed filters from query', async () => {
+    mock = await inspectSearchParams(setup =>
+      getTransaction({
+        setup: (setup as unknown) as Setup,
+        // @ts-ignore ignoring the _debug is not part of filter options
+        filters: { _debug: true, [SERVICE_NAME]: 'foo' }
+      })
+    );
+
+    expect(mock.params).toMatchSnapshot();
+  });
+  it('fetches without filter', async () => {
+    mock = await inspectSearchParams(setup =>
+      getTransaction({
+        setup: (setup as unknown) as Setup
+      })
+    );
+
+    expect(mock.params).toMatchSnapshot();
+  });
+  it('fetches with all filter', async () => {
+    mock = await inspectSearchParams(setup =>
+      getTransaction({
+        setup: (setup as unknown) as Setup,
+        filters: {
+          [SERVICE_NAME]: 'foo',
+          [SERVICE_ENVIRONMENT]: 'bar',
+          [TRANSACTION_NAME]: 'baz',
+          [TRANSACTION_TYPE]: 'qux'
+        }
+      })
+    );
+
+    expect(mock.params).toMatchSnapshot();
+  });
+});
diff --git a/x-pack/plugins/apm/server/lib/settings/custom_link/create_custom_link_index.ts b/x-pack/plugins/apm/server/lib/settings/custom_link/create_custom_link_index.ts
index cdb3cff616030..1583e15bdecd5 100644
--- a/x-pack/plugins/apm/server/lib/settings/custom_link/create_custom_link_index.ts
+++ b/x-pack/plugins/apm/server/lib/settings/custom_link/create_custom_link_index.ts
@@ -31,7 +31,13 @@ const mappings: Mappings = {
       type: 'date'
     },
     label: {
-      type: 'text'
+      type: 'text',
+      fields: {
+        // Adding keyword type to be able to sort by label alphabetically
+        keyword: {
+          type: 'keyword'
+        }
+      }
     },
     url: {
       type: 'keyword'
diff --git a/x-pack/plugins/apm/server/lib/settings/custom_link/create_or_update_custom_link.ts b/x-pack/plugins/apm/server/lib/settings/custom_link/create_or_update_custom_link.ts
index 809fe2050a072..5dce371e4f307 100644
--- a/x-pack/plugins/apm/server/lib/settings/custom_link/create_or_update_custom_link.ts
+++ b/x-pack/plugins/apm/server/lib/settings/custom_link/create_or_update_custom_link.ts
@@ -5,7 +5,7 @@
  */
 
 import { pick } from 'lodash';
-import { filterOptions } from '../../../routes/settings/custom_link';
+import { FILTER_OPTIONS } from '../../../../common/custom_link_filter_options';
 import { APMIndexDocumentParams } from '../../helpers/es_client';
 import { Setup } from '../../helpers/setup_request';
 import { CustomLink } from './custom_link_types';
@@ -28,7 +28,7 @@ export async function createOrUpdateCustomLink({
       '@timestamp': Date.now(),
       label: customLink.label,
       url: customLink.url,
-      ...pick(customLink, filterOptions)
+      ...pick(customLink, FILTER_OPTIONS)
     }
   };
 
diff --git a/x-pack/plugins/apm/server/lib/settings/custom_link/custom_link_types.d.ts b/x-pack/plugins/apm/server/lib/settings/custom_link/custom_link_types.d.ts
index 60b97712713a9..edb9eb35b9029 100644
--- a/x-pack/plugins/apm/server/lib/settings/custom_link/custom_link_types.d.ts
+++ b/x-pack/plugins/apm/server/lib/settings/custom_link/custom_link_types.d.ts
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 import * as t from 'io-ts';
-import { FilterOptions } from '../../../routes/settings/custom_link';
+import { FilterOptions } from '../../../../common/custom_link_filter_options';
 
 export type CustomLink = {
   id?: string;
diff --git a/x-pack/plugins/apm/server/lib/settings/custom_link/get_transaction.ts b/x-pack/plugins/apm/server/lib/settings/custom_link/get_transaction.ts
new file mode 100644
index 0000000000000..396a7cb29f014
--- /dev/null
+++ b/x-pack/plugins/apm/server/lib/settings/custom_link/get_transaction.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 { pick } from 'lodash';
+import {
+  FilterOptions,
+  FILTER_OPTIONS
+} from '../../../../common/custom_link_filter_options';
+import { Transaction } from '../../../../typings/es_schemas/ui/transaction';
+import { Setup } from '../../helpers/setup_request';
+
+export async function getTransaction({
+  setup,
+  filters = {}
+}: {
+  setup: Setup;
+  filters?: FilterOptions;
+}) {
+  const { client, indices } = setup;
+
+  const esFilters = Object.entries(pick(filters, FILTER_OPTIONS)).map(
+    ([key, value]) => {
+      return { term: { [key]: value } };
+    }
+  );
+
+  const params = {
+    terminateAfter: 1,
+    index: indices['apm_oss.transactionIndices'],
+    size: 1,
+    body: { query: { bool: { filter: esFilters } } }
+  };
+  const resp = await client.search<Transaction>(params);
+  return resp.hits.hits[0]?._source;
+}
diff --git a/x-pack/plugins/apm/server/lib/settings/custom_link/list_custom_links.ts b/x-pack/plugins/apm/server/lib/settings/custom_link/list_custom_links.ts
index e6052da73b0db..67956ef3a60ce 100644
--- a/x-pack/plugins/apm/server/lib/settings/custom_link/list_custom_links.ts
+++ b/x-pack/plugins/apm/server/lib/settings/custom_link/list_custom_links.ts
@@ -4,9 +4,9 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+import { FilterOptions } from '../../../../common/custom_link_filter_options';
 import { Setup } from '../../helpers/setup_request';
 import { CustomLink } from './custom_link_types';
-import { FilterOptions } from '../../../routes/settings/custom_link';
 
 export async function listCustomLinks({
   setup,
@@ -37,7 +37,14 @@ export async function listCustomLinks({
         bool: {
           filter: esFilters
         }
-      }
+      },
+      sort: [
+        {
+          'label.keyword': {
+            order: 'asc'
+          }
+        }
+      ]
     }
   };
   const resp = await internalClient.search<CustomLink>(params);
diff --git a/x-pack/plugins/apm/server/routes/create_apm_api.ts b/x-pack/plugins/apm/server/routes/create_apm_api.ts
index 34f0536a90b4d..50a794067bfad 100644
--- a/x-pack/plugins/apm/server/routes/create_apm_api.ts
+++ b/x-pack/plugins/apm/server/routes/create_apm_api.ts
@@ -63,7 +63,8 @@ import {
   createCustomLinkRoute,
   updateCustomLinkRoute,
   deleteCustomLinkRoute,
-  listCustomLinksRoute
+  listCustomLinksRoute,
+  customLinkTransactionRoute
 } from './settings/custom_link';
 
 const createApmApi = () => {
@@ -138,7 +139,8 @@ const createApmApi = () => {
     .add(createCustomLinkRoute)
     .add(updateCustomLinkRoute)
     .add(deleteCustomLinkRoute)
-    .add(listCustomLinksRoute);
+    .add(listCustomLinksRoute)
+    .add(customLinkTransactionRoute);
 
   return api;
 };
diff --git a/x-pack/plugins/apm/server/routes/settings/custom_link.ts b/x-pack/plugins/apm/server/routes/settings/custom_link.ts
index 5988d7f85b186..e11c1df9d4b16 100644
--- a/x-pack/plugins/apm/server/routes/settings/custom_link.ts
+++ b/x-pack/plugins/apm/server/routes/settings/custom_link.ts
@@ -4,33 +4,25 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 import * as t from 'io-ts';
-import {
-  SERVICE_NAME,
-  SERVICE_ENVIRONMENT,
-  TRANSACTION_NAME,
-  TRANSACTION_TYPE
-} from '../../../common/elasticsearch_fieldnames';
+import { FilterOptionsRt } from '../../../common/custom_link_filter_options';
 import { createRoute } from '../create_route';
 import { setupRequest } from '../../lib/helpers/setup_request';
 import { createOrUpdateCustomLink } from '../../lib/settings/custom_link/create_or_update_custom_link';
 import { deleteCustomLink } from '../../lib/settings/custom_link/delete_custom_link';
 import { listCustomLinks } from '../../lib/settings/custom_link/list_custom_links';
+import { getTransaction } from '../../lib/settings/custom_link/get_transaction';
 
-const FilterOptionsRt = t.partial({
-  [SERVICE_NAME]: t.string,
-  [SERVICE_ENVIRONMENT]: t.string,
-  [TRANSACTION_NAME]: t.string,
-  [TRANSACTION_TYPE]: t.string
-});
-
-export type FilterOptions = t.TypeOf<typeof FilterOptionsRt>;
-
-export const filterOptions: Array<keyof FilterOptions> = [
-  SERVICE_NAME,
-  SERVICE_ENVIRONMENT,
-  TRANSACTION_TYPE,
-  TRANSACTION_NAME
-];
+export const customLinkTransactionRoute = createRoute(core => ({
+  path: '/api/apm/settings/custom_links/transaction',
+  params: {
+    query: FilterOptionsRt
+  },
+  handler: async ({ context, request }) => {
+    const setup = await setupRequest(context, request);
+    const { params } = context;
+    return await getTransaction({ setup, filters: params.query });
+  }
+}));
 
 export const listCustomLinksRoute = createRoute(core => ({
   path: '/api/apm/settings/custom_links',
diff --git a/x-pack/plugins/apm/typings/es_schemas/raw/fields/service.ts b/x-pack/plugins/apm/typings/es_schemas/raw/fields/service.ts
index 09020ce61c6e4..3ef852ebf6dd6 100644
--- a/x-pack/plugins/apm/typings/es_schemas/raw/fields/service.ts
+++ b/x-pack/plugins/apm/typings/es_schemas/raw/fields/service.ts
@@ -6,6 +6,7 @@
 
 export interface Service {
   name: string;
+  environment?: string;
   framework?: {
     name: string;
     version: string;

From 7dc45f544154c5ed9ba7b532dd989635e6b8228c Mon Sep 17 00:00:00 2001
From: Gidi Meir Morris <github@gidi.io>
Date: Mon, 23 Mar 2020 13:12:53 +0000
Subject: [PATCH 005/179] removed boom errors from AlertNavigationRegistry
 (#60887)

---
 .../alert_navigation_registry/alert_navigation_registry.ts | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/x-pack/plugins/alerting/public/alert_navigation_registry/alert_navigation_registry.ts b/x-pack/plugins/alerting/public/alert_navigation_registry/alert_navigation_registry.ts
index 7f1919fbea684..f30629789b4ed 100644
--- a/x-pack/plugins/alerting/public/alert_navigation_registry/alert_navigation_registry.ts
+++ b/x-pack/plugins/alerting/public/alert_navigation_registry/alert_navigation_registry.ts
@@ -4,7 +4,6 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import Boom from 'boom';
 import { i18n } from '@kbn/i18n';
 import { AlertType } from '../../common';
 import { AlertNavigationHandler } from './types';
@@ -36,7 +35,7 @@ export class AlertNavigationRegistry {
 
   public registerDefault(consumer: string, handler: AlertNavigationHandler) {
     if (this.hasDefaultHandler(consumer)) {
-      throw Boom.badRequest(
+      throw new Error(
         i18n.translate('xpack.alerting.alertNavigationRegistry.register.duplicateDefaultError', {
           defaultMessage: 'Default Navigation within "{consumer}" is already registered.',
           values: {
@@ -54,7 +53,7 @@ export class AlertNavigationRegistry {
 
   public register(consumer: string, alertType: AlertType, handler: AlertNavigationHandler) {
     if (this.hasTypedHandler(consumer, alertType)) {
-      throw Boom.badRequest(
+      throw new Error(
         i18n.translate('xpack.alerting.alertNavigationRegistry.register.duplicateNavigationError', {
           defaultMessage:
             'Navigation for Alert type "{alertType}" within "{consumer}" is already registered.',
@@ -78,7 +77,7 @@ export class AlertNavigationRegistry {
       return (consumerHandlers.get(alertType.id) ?? consumerHandlers.get(DEFAULT_HANDLER))!;
     }
 
-    throw Boom.badRequest(
+    throw new Error(
       i18n.translate('xpack.alerting.alertNavigationRegistry.get.missingNavigationError', {
         defaultMessage:
           'Navigation for Alert type "{alertType}" within "{consumer}" is not registered.',

From e235321903b0d8824d9850710392158d19b1dbd5 Mon Sep 17 00:00:00 2001
From: Bhavya RM <bhavya@elastic.co>
Date: Mon, 23 Mar 2020 09:45:19 -0400
Subject: [PATCH 006/179] a11y tests for login and logout (#60799)

a11y login screen
---
 x-pack/test/accessibility/apps/login_page.ts | 21 +++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/x-pack/test/accessibility/apps/login_page.ts b/x-pack/test/accessibility/apps/login_page.ts
index 5b18b6be9e3a4..8c673bb332d91 100644
--- a/x-pack/test/accessibility/apps/login_page.ts
+++ b/x-pack/test/accessibility/apps/login_page.ts
@@ -28,14 +28,33 @@ export default function({ getService, getPageObjects }: FtrProviderContext) {
         await PageObjects.security.forceLogout();
       });
 
-      it('meets a11y requirements', async () => {
+      it('login page meets a11y requirements', async () => {
         await PageObjects.common.navigateToApp('login');
 
         await retry.waitFor(
           'login page visible',
           async () => await testSubjects.exists('loginSubmit')
         );
+        await a11y.testAppSnapshot();
+      });
+
+      it('User can login with a11y requirements', async () => {
+        await PageObjects.security.login();
+        await a11y.testAppSnapshot();
+      });
+
+      it('Wrong credentials message meets a11y requirements', async () => {
+        await PageObjects.security.loginPage.login('wrong-user', 'wrong-password', {
+          expectSuccess: false,
+        });
+        await PageObjects.security.loginPage.getErrorMessage();
+        await a11y.testAppSnapshot();
+      });
 
+      it('Logout message acknowledges a11y requirements', async () => {
+        await PageObjects.security.login();
+        await PageObjects.security.logout();
+        await testSubjects.getVisibleText('loginInfoMessage');
         await a11y.testAppSnapshot();
       });
     });

From a5aafc039d8f445293ddf43d89ab58bdab61f83c Mon Sep 17 00:00:00 2001
From: Gidi Meir Morris <github@gidi.io>
Date: Mon, 23 Mar 2020 13:56:26 +0000
Subject: [PATCH 007/179] [Alerting] Fixes mistake in empty list assertion
 (#60896)

---
 .../page_objects/triggers_actions_ui_page.ts                  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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 6c41c2cab801e..2a50c0117eae9 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
@@ -111,11 +111,11 @@ export function TriggersActionsPageProvider({ getService }: FtrProviderContext)
         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);
+        expect(rows.length).to.eql(0);
         const emptyRow = await find.byCssSelector(
           '[data-test-subj="alertsList"] table .euiTableRow'
         );
-        expect(await emptyRow.getVisibleText()).not.to.eql('No items found');
+        expect(await emptyRow.getVisibleText()).to.eql('No items found');
       });
       return true;
     },

From c7b0ade01d7d01ebe4d9329e517a44be20ea833b Mon Sep 17 00:00:00 2001
From: Dmitry Lemeshko <dzmitry.lemechko@elastic.co>
Date: Mon, 23 Mar 2020 17:06:19 +0300
Subject: [PATCH 008/179] skip flaky functional test (#60898)

---
 x-pack/test/functional/apps/uptime/settings.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/x-pack/test/functional/apps/uptime/settings.ts b/x-pack/test/functional/apps/uptime/settings.ts
index 0e804dd161c6b..aafb145a1b9b0 100644
--- a/x-pack/test/functional/apps/uptime/settings.ts
+++ b/x-pack/test/functional/apps/uptime/settings.ts
@@ -16,7 +16,8 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
   const pageObjects = getPageObjects(['uptime']);
   const es = getService('es');
 
-  describe('uptime settings page', () => {
+  // Flaky https://github.com/elastic/kibana/issues/60866
+  describe.skip('uptime settings page', () => {
     const settingsPage = () => pageObjects.uptime.settings;
     beforeEach('navigate to clean app root', async () => {
       // make 10 checks

From c22dbb17641b5ea9a9ae0742e623f7b5c53ffbfc Mon Sep 17 00:00:00 2001
From: Brian Seeders <brian.seeders@elastic.co>
Date: Mon, 23 Mar 2020 10:29:33 -0400
Subject: [PATCH 009/179] [CI] Add error steps and help links to PR comments
 (#60772)

---
 vars/githubPr.groovy   | 19 +++++++++++++++++++
 vars/jenkinsApi.groovy | 21 +++++++++++++++++++++
 2 files changed, 40 insertions(+)
 create mode 100644 vars/jenkinsApi.groovy

diff --git a/vars/githubPr.groovy b/vars/githubPr.groovy
index 0176424452d07..965fb1d4e108e 100644
--- a/vars/githubPr.groovy
+++ b/vars/githubPr.groovy
@@ -169,7 +169,20 @@ def getNextCommentMessage(previousCommentInfo = [:]) {
       ## :broken_heart: Build Failed
       * [continuous-integration/kibana-ci/pull-request](${env.BUILD_URL})
       * Commit: ${getCommitHash()}
+      * [Pipeline Steps](${env.BUILD_URL}flowGraphTable) (look for red circles / failed steps)
+      * [Interpreting CI Failures](https://www.elastic.co/guide/en/kibana/current/interpreting-ci-failures.html)
     """
+
+    try {
+      def steps = getFailedSteps()
+      if (steps?.size() > 0) {
+        def list = steps.collect { "* [${it.displayName}](${it.logs})" }.join("\n")
+        messages << "### Failed CI Steps\n${list}"
+      }
+    } catch (ex) {
+      buildUtils.printStacktrace(ex)
+      print "Error retrieving failed pipeline steps for PR comment, will skip this section"
+    }
   }
 
   messages << getTestFailuresMessage()
@@ -220,3 +233,9 @@ def deleteComment(commentId) {
 def getCommitHash() {
   return env.ghprbActualCommit
 }
+
+def getFailedSteps() {
+  return jenkinsApi.getFailedSteps()?.findAll { step ->
+    step.displayName != 'Check out from version control'
+  }
+}
diff --git a/vars/jenkinsApi.groovy b/vars/jenkinsApi.groovy
new file mode 100644
index 0000000000000..1ea4c3dd76b8d
--- /dev/null
+++ b/vars/jenkinsApi.groovy
@@ -0,0 +1,21 @@
+def getSteps() {
+  def url = "${env.BUILD_URL}api/json?tree=actions[nodes[iconColor,running,displayName,id,parents]]"
+  def responseRaw = httpRequest([ method: "GET", url: url ])
+  def response = toJSON(responseRaw)
+
+  def graphAction = response?.actions?.find { it._class == "org.jenkinsci.plugins.workflow.job.views.FlowGraphAction" }
+
+  return graphAction?.nodes
+}
+
+def getFailedSteps() {
+  def steps = getSteps()
+  def failedSteps = steps?.findAll { it.iconColor == "red" && it._class == "org.jenkinsci.plugins.workflow.cps.nodes.StepAtomNode" }
+  failedSteps.each { step ->
+    step.logs = "${env.BUILD_URL}execution/node/${step.id}/log".toString()
+  }
+
+  return failedSteps
+}
+
+return this

From 42539a56ebd3dafc9dec92052d81508be8386377 Mon Sep 17 00:00:00 2001
From: Brian Seeders <brian.seeders@elastic.co>
Date: Mon, 23 Mar 2020 10:30:14 -0400
Subject: [PATCH 010/179] Only run xpack siem cypress in PRs when there are
 siem changes (#60661)

---
 Jenkinsfile             |  7 ++++-
 vars/prChanges.groovy   | 11 ++++++--
 vars/whenChanged.groovy | 57 +++++++++++++++++++++++++++++++++++++++++
 3 files changed, 72 insertions(+), 3 deletions(-)
 create mode 100644 vars/whenChanged.groovy

diff --git a/Jenkinsfile b/Jenkinsfile
index d43da6e0bee04..79d3c93006cb6 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -40,7 +40,12 @@ kibanaPipeline(timeoutMinutes: 135, checkPrChanges: true) {
           'xpack-ciGroup9': kibanaPipeline.xpackCiGroupProcess(9),
           'xpack-ciGroup10': kibanaPipeline.xpackCiGroupProcess(10),
           'xpack-accessibility': kibanaPipeline.functionalTestProcess('xpack-accessibility', './test/scripts/jenkins_xpack_accessibility.sh'),
-          'xpack-siemCypress': kibanaPipeline.functionalTestProcess('xpack-siemCypress', './test/scripts/jenkins_siem_cypress.sh'),
+          'xpack-siemCypress': { processNumber ->
+            whenChanged(['x-pack/legacy/plugins/siem/', 'x-pack/test/siem_cypress/']) {
+              kibanaPipeline.functionalTestProcess('xpack-siemCypress', './test/scripts/jenkins_siem_cypress.sh')(processNumber)
+            }
+          },
+
           // 'xpack-visualRegression': kibanaPipeline.functionalTestProcess('xpack-visualRegression', './test/scripts/jenkins_xpack_visual_regression.sh'),
         ]),
       ])
diff --git a/vars/prChanges.groovy b/vars/prChanges.groovy
index a9eb9027a0597..d7f46ee7be23e 100644
--- a/vars/prChanges.groovy
+++ b/vars/prChanges.groovy
@@ -1,3 +1,6 @@
+import groovy.transform.Field
+
+public static @Field PR_CHANGES_CACHE = null
 
 def getSkippablePaths() {
   return [
@@ -36,9 +39,13 @@ def areChangesSkippable() {
 }
 
 def getChanges() {
-  withGithubCredentials {
-    return githubPrs.getChanges(env.ghprbPullId)
+  if (!PR_CHANGES_CACHE && env.ghprbPullId) {
+    withGithubCredentials {
+      PR_CHANGES_CACHE = githubPrs.getChanges(env.ghprbPullId)
+    }
   }
+
+  return PR_CHANGES_CACHE
 }
 
 def getChangedFiles() {
diff --git a/vars/whenChanged.groovy b/vars/whenChanged.groovy
new file mode 100644
index 0000000000000..c58ec83f2b051
--- /dev/null
+++ b/vars/whenChanged.groovy
@@ -0,0 +1,57 @@
+/*
+  whenChanged('some/path') { yourCode() } can be used to execute pipeline code in PRs only when changes are detected on paths that you specify.
+  The specified code blocks will also always be executed during the non-PR jobs for tracked branches.
+
+  You have the option of passing in path prefixes, or regexes. Single or multiple.
+  Path specifications are NOT globby, they are only prefixes.
+  Specifying multiple will treat them as ORs.
+
+  Example Usages:
+    whenChanged('a/path/prefix/') { someCode() }
+    whenChanged(startsWith: 'a/path/prefix/') { someCode() } // Same as above
+    whenChanged(['prefix1/', 'prefix2/']) { someCode() }
+    whenChanged(regex: /\.test\.js$/) { someCode() }
+    whenChanged(regex: [/abc/, /xyz/]) { someCode() }
+*/
+
+def call(String startsWithString, Closure closure) {
+  return whenChanged([ startsWith: startsWithString ], closure)
+}
+
+def call(List<String> startsWithStrings, Closure closure) {
+  return whenChanged([ startsWith: startsWithStrings ], closure)
+}
+
+def call(Map params, Closure closure) {
+  if (!githubPr.isPr()) {
+    return closure()
+  }
+
+  def files = prChanges.getChangedFiles()
+  def hasMatch = false
+
+  if (params.regex) {
+    params.regex = [] + params.regex
+    print "Checking PR for changes that match: ${params.regex.join(', ')}"
+    hasMatch = !!files.find { file ->
+      params.regex.find { regex -> file =~ regex }
+    }
+  }
+
+  if (!hasMatch && params.startsWith) {
+    params.startsWith = [] + params.startsWith
+    print "Checking PR for changes that start with: ${params.startsWith.join(', ')}"
+    hasMatch = !!files.find { file ->
+      params.startsWith.find { str -> file.startsWith(str) }
+    }
+  }
+
+  if (hasMatch) {
+    print "Changes found, executing pipeline."
+    closure()
+  } else {
+    print "No changes found, skipping."
+  }
+}
+
+return this

From 8572e3f18fb8f45aad96b76f5b3e1bf3873f04e4 Mon Sep 17 00:00:00 2001
From: Alison Goryachev <alison.goryachev@elastic.co>
Date: Mon, 23 Mar 2020 10:42:40 -0400
Subject: [PATCH 011/179] [Remote clustersadopt changes to remote info API
 (#60795)

---
 .../common/lib/cluster_serialization.test.ts  | 35 ++++++++++++++++++-
 .../common/lib/cluster_serialization.ts       | 15 ++++----
 .../server/routes/api/get_route.ts            |  7 ----
 3 files changed, 43 insertions(+), 14 deletions(-)

diff --git a/x-pack/plugins/remote_clusters/common/lib/cluster_serialization.test.ts b/x-pack/plugins/remote_clusters/common/lib/cluster_serialization.test.ts
index 5be6ed8828e6f..10b3dbbd9b452 100644
--- a/x-pack/plugins/remote_clusters/common/lib/cluster_serialization.test.ts
+++ b/x-pack/plugins/remote_clusters/common/lib/cluster_serialization.test.ts
@@ -13,11 +13,12 @@ describe('cluster_serialization', () => {
       expect(() => deserializeCluster('foo', 'bar')).toThrowError();
     });
 
-    it('should deserialize a complete cluster object', () => {
+    it('should deserialize a complete default cluster object', () => {
       expect(
         deserializeCluster('test_cluster', {
           seeds: ['localhost:9300'],
           connected: true,
+          mode: 'sniff',
           num_nodes_connected: 1,
           max_connections_per_cluster: 3,
           initial_connect_timeout: '30s',
@@ -29,6 +30,7 @@ describe('cluster_serialization', () => {
         })
       ).toEqual({
         name: 'test_cluster',
+        mode: 'sniff',
         seeds: ['localhost:9300'],
         isConnected: true,
         connectedNodesCount: 1,
@@ -40,6 +42,37 @@ describe('cluster_serialization', () => {
       });
     });
 
+    it('should deserialize a complete "proxy" mode cluster object', () => {
+      expect(
+        deserializeCluster('test_cluster', {
+          proxy_address: 'localhost:9300',
+          mode: 'proxy',
+          connected: true,
+          num_proxy_sockets_connected: 1,
+          max_proxy_socket_connections: 3,
+          initial_connect_timeout: '30s',
+          skip_unavailable: false,
+          server_name: 'my_server_name',
+          transport: {
+            ping_schedule: '-1',
+            compress: false,
+          },
+        })
+      ).toEqual({
+        name: 'test_cluster',
+        mode: 'proxy',
+        proxyAddress: 'localhost:9300',
+        isConnected: true,
+        connectedSocketsCount: 1,
+        proxySocketConnections: 3,
+        initialConnectTimeout: '30s',
+        skipUnavailable: false,
+        transportPingSchedule: '-1',
+        transportCompress: false,
+        serverName: 'my_server_name',
+      });
+    });
+
     it('should deserialize a cluster object without transport information', () => {
       expect(
         deserializeCluster('test_cluster', {
diff --git a/x-pack/plugins/remote_clusters/common/lib/cluster_serialization.ts b/x-pack/plugins/remote_clusters/common/lib/cluster_serialization.ts
index 53dc72eb1695a..fbea311cdeefa 100644
--- a/x-pack/plugins/remote_clusters/common/lib/cluster_serialization.ts
+++ b/x-pack/plugins/remote_clusters/common/lib/cluster_serialization.ts
@@ -18,9 +18,10 @@ export interface ClusterEs {
     ping_schedule?: string;
     compress?: boolean;
   };
-  address?: string;
-  max_socket_connections?: number;
-  num_sockets_connected?: number;
+  proxy_address?: string;
+  max_proxy_socket_connections?: number;
+  num_proxy_sockets_connected?: number;
+  server_name?: string;
 }
 
 export interface Cluster {
@@ -77,9 +78,10 @@ export function deserializeCluster(
     initial_connect_timeout: initialConnectTimeout,
     skip_unavailable: skipUnavailable,
     transport,
-    address: proxyAddress,
-    max_socket_connections: proxySocketConnections,
-    num_sockets_connected: connectedSocketsCount,
+    proxy_address: proxyAddress,
+    max_proxy_socket_connections: proxySocketConnections,
+    num_proxy_sockets_connected: connectedSocketsCount,
+    server_name: serverName,
   } = esClusterObject;
 
   let deserializedClusterObject: Cluster = {
@@ -94,6 +96,7 @@ export function deserializeCluster(
     proxyAddress,
     proxySocketConnections,
     connectedSocketsCount,
+    serverName,
   };
 
   if (transport) {
diff --git a/x-pack/plugins/remote_clusters/server/routes/api/get_route.ts b/x-pack/plugins/remote_clusters/server/routes/api/get_route.ts
index abd44977d8e46..8938f342674f0 100644
--- a/x-pack/plugins/remote_clusters/server/routes/api/get_route.ts
+++ b/x-pack/plugins/remote_clusters/server/routes/api/get_route.ts
@@ -45,16 +45,9 @@ export const register = (deps: RouteDependencies): void => {
           ? get(clusterSettings, `persistent.cluster.remote[${clusterName}].proxy`, undefined)
           : undefined;
 
-        // server_name is not available via the GET /_remote/info API, so we get it from the cluster settings
-        // Per https://github.com/elastic/kibana/pull/26067#issuecomment-441848124, we only look at persistent settings
-        const serverName = isPersistent
-          ? get(clusterSettings, `persistent.cluster.remote[${clusterName}].server_name`, undefined)
-          : undefined;
-
         return {
           ...deserializeCluster(clusterName, cluster, deprecatedProxyAddress),
           isConfiguredByNode,
-          serverName,
         };
       });
 

From a79087769471837440efb9c333b56fc04a809e23 Mon Sep 17 00:00:00 2001
From: Phillip Burch <phillip.burch@live.com>
Date: Mon, 23 Mar 2020 10:02:11 -0500
Subject: [PATCH 012/179] [Metrics UI] Alerting for metrics explorer and
 inventory (#58779)

* Add flyout with expressions

* Integrate frontend with backend

* Extended AlertContextValue with metadata optional property

* Progress

* Pre-fill criteria with current page filters

* Better validation. Naming for clarity

* Fix types for flyout

* Respect the groupby property in metric explorer

* Fix lint errors

* Fix text, add toast notifications

* Fix tests. Make sure update handles predefined expressions

* Dynamically load source from alert flyout

* Remove unused import

* Simplify and add group by functionality

* Remove unecessary useEffect

* disable exhastive deps

* Remove unecessary useEffect

* change language

* Implement design feedback

* Add alert dropdown to the header and snapshot screen

* Remove icon

* Remove unused props. Code cleanup

* Remove unused values

* Fix formatted message id

* Remove create alert option for now.

* Fix type issue

* Add rate, card and count as aggs

* Fix types

Co-authored-by: Yuliia Naumenko <yuliia.naumenko@elastic.com>
Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
Co-authored-by: Henry Harding <henry.harding@elastic.co>
---
 x-pack/plugins/infra/kibana.json              |   3 +-
 .../plugins/infra/public/apps/start_app.tsx   |  36 +-
 .../alerting/metrics/alert_dropdown.tsx       |  62 +++
 .../alerting/metrics/alert_flyout.tsx         |  53 ++
 .../alerting/metrics/expression.tsx           | 473 ++++++++++++++++++
 .../metrics/metric_threshold_alert_type.ts    |  24 +
 .../alerting/metrics/validation.tsx           |  80 +++
 .../chart_context_menu.test.tsx               |   2 +-
 .../metrics_explorer/chart_context_menu.tsx   |  44 +-
 .../components/metrics_explorer/kuery_bar.tsx |  19 +-
 .../components/metrics_explorer/toolbar.tsx   |   1 +
 .../components/waffle/node_context_menu.tsx   |  83 +--
 .../public/pages/infrastructure/index.tsx     |  60 ++-
 x-pack/plugins/infra/public/plugin.ts         |  11 +-
 .../public/utils/triggers_actions_context.tsx |  32 ++
 15 files changed, 887 insertions(+), 96 deletions(-)
 create mode 100644 x-pack/plugins/infra/public/components/alerting/metrics/alert_dropdown.tsx
 create mode 100644 x-pack/plugins/infra/public/components/alerting/metrics/alert_flyout.tsx
 create mode 100644 x-pack/plugins/infra/public/components/alerting/metrics/expression.tsx
 create mode 100644 x-pack/plugins/infra/public/components/alerting/metrics/metric_threshold_alert_type.ts
 create mode 100644 x-pack/plugins/infra/public/components/alerting/metrics/validation.tsx
 create mode 100644 x-pack/plugins/infra/public/utils/triggers_actions_context.tsx

diff --git a/x-pack/plugins/infra/kibana.json b/x-pack/plugins/infra/kibana.json
index bb40d65d311e8..b8796ad7a358e 100644
--- a/x-pack/plugins/infra/kibana.json
+++ b/x-pack/plugins/infra/kibana.json
@@ -11,7 +11,8 @@
     "data",
     "dataEnhanced",
     "metrics",
-    "alerting"
+    "alerting",
+    "triggers_actions_ui"
   ],
   "server": true,
   "ui": true,
diff --git a/x-pack/plugins/infra/public/apps/start_app.tsx b/x-pack/plugins/infra/public/apps/start_app.tsx
index a797e4c9d4ba7..a986ee6ece352 100644
--- a/x-pack/plugins/infra/public/apps/start_app.tsx
+++ b/x-pack/plugins/infra/public/apps/start_app.tsx
@@ -15,7 +15,8 @@ import { CoreStart, AppMountParameters } from 'kibana/public';
 
 // TODO use theme provided from parentApp when kibana supports it
 import { EuiErrorBoundary } from '@elastic/eui';
-import { EuiThemeProvider } from '../../../observability/public';
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import { EuiThemeProvider } from '../../../observability/public/typings/eui_styled_components';
 import { InfraFrontendLibs } from '../lib/lib';
 import { createStore } from '../store';
 import { ApolloClientContext } from '../utils/apollo_context';
@@ -26,6 +27,8 @@ import {
   KibanaContextProvider,
 } from '../../../../../src/plugins/kibana_react/public';
 import { AppRouter } from '../routers';
+import { TriggersAndActionsUIPublicPluginSetup } from '../../../triggers_actions_ui/public';
+import { TriggersActionsProvider } from '../utils/triggers_actions_context';
 import '../index.scss';
 
 export const CONTAINER_CLASSNAME = 'infra-container-element';
@@ -35,7 +38,8 @@ export async function startApp(
   core: CoreStart,
   plugins: object,
   params: AppMountParameters,
-  Router: AppRouter
+  Router: AppRouter,
+  triggersActionsUI: TriggersAndActionsUIPublicPluginSetup
 ) {
   const { element, appBasePath } = params;
   const history = createBrowserHistory({ basename: appBasePath });
@@ -51,19 +55,21 @@ export async function startApp(
     return (
       <core.i18n.Context>
         <EuiErrorBoundary>
-          <ReduxStoreProvider store={store}>
-            <ReduxStateContextProvider>
-              <ApolloProvider client={libs.apolloClient}>
-                <ApolloClientContext.Provider value={libs.apolloClient}>
-                  <EuiThemeProvider darkMode={darkMode}>
-                    <HistoryContext.Provider value={history}>
-                      <Router history={history} />
-                    </HistoryContext.Provider>
-                  </EuiThemeProvider>
-                </ApolloClientContext.Provider>
-              </ApolloProvider>
-            </ReduxStateContextProvider>
-          </ReduxStoreProvider>
+          <TriggersActionsProvider triggersActionsUI={triggersActionsUI}>
+            <ReduxStoreProvider store={store}>
+              <ReduxStateContextProvider>
+                <ApolloProvider client={libs.apolloClient}>
+                  <ApolloClientContext.Provider value={libs.apolloClient}>
+                    <EuiThemeProvider darkMode={darkMode}>
+                      <HistoryContext.Provider value={history}>
+                        <Router history={history} />
+                      </HistoryContext.Provider>
+                    </EuiThemeProvider>
+                  </ApolloClientContext.Provider>
+                </ApolloProvider>
+              </ReduxStateContextProvider>
+            </ReduxStoreProvider>
+          </TriggersActionsProvider>
         </EuiErrorBoundary>
       </core.i18n.Context>
     );
diff --git a/x-pack/plugins/infra/public/components/alerting/metrics/alert_dropdown.tsx b/x-pack/plugins/infra/public/components/alerting/metrics/alert_dropdown.tsx
new file mode 100644
index 0000000000000..0a464d91fbe06
--- /dev/null
+++ b/x-pack/plugins/infra/public/components/alerting/metrics/alert_dropdown.tsx
@@ -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 React, { useState, useCallback, useMemo } from 'react';
+import { EuiPopover, EuiButtonEmpty, EuiContextMenuItem, EuiContextMenuPanel } from '@elastic/eui';
+import { FormattedMessage } from '@kbn/i18n/react';
+import { AlertFlyout } from './alert_flyout';
+import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
+
+export const AlertDropdown = () => {
+  const [popoverOpen, setPopoverOpen] = useState(false);
+  const [flyoutVisible, setFlyoutVisible] = useState(false);
+  const kibana = useKibana();
+
+  const closePopover = useCallback(() => {
+    setPopoverOpen(false);
+  }, [setPopoverOpen]);
+
+  const openPopover = useCallback(() => {
+    setPopoverOpen(true);
+  }, [setPopoverOpen]);
+
+  const menuItems = useMemo(() => {
+    return [
+      <EuiContextMenuItem icon="bell" key="createLink" onClick={() => setFlyoutVisible(true)}>
+        <FormattedMessage
+          id="xpack.infra.alerting.createAlertButton"
+          defaultMessage="Create alert"
+        />
+      </EuiContextMenuItem>,
+      <EuiContextMenuItem
+        icon="tableOfContents"
+        key="manageLink"
+        href={kibana.services?.application?.getUrlForApp(
+          'kibana#/management/kibana/triggersActions/alerts'
+        )}
+      >
+        <FormattedMessage id="xpack.infra.alerting.manageAlerts" defaultMessage="Manage Alerts" />
+      </EuiContextMenuItem>,
+    ];
+  }, [kibana.services]);
+
+  return (
+    <>
+      <EuiPopover
+        button={
+          <EuiButtonEmpty iconSide={'right'} iconType={'arrowDown'} onClick={openPopover}>
+            <FormattedMessage id="xpack.infra.alerting.alertsButton" defaultMessage="Alerts" />
+          </EuiButtonEmpty>
+        }
+        isOpen={popoverOpen}
+        closePopover={closePopover}
+      >
+        <EuiContextMenuPanel items={menuItems} />
+      </EuiPopover>
+      <AlertFlyout setVisible={setFlyoutVisible} visible={flyoutVisible} />
+    </>
+  );
+};
diff --git a/x-pack/plugins/infra/public/components/alerting/metrics/alert_flyout.tsx b/x-pack/plugins/infra/public/components/alerting/metrics/alert_flyout.tsx
new file mode 100644
index 0000000000000..a00d63af8aac2
--- /dev/null
+++ b/x-pack/plugins/infra/public/components/alerting/metrics/alert_flyout.tsx
@@ -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 React, { useContext } from 'react';
+import { AlertsContextProvider, AlertAdd } from '../../../../../triggers_actions_ui/public';
+import { TriggerActionsContext } from '../../../utils/triggers_actions_context';
+import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import { METRIC_THRESHOLD_ALERT_TYPE_ID } from '../../../../server/lib/alerting/metric_threshold/types';
+import { MetricsExplorerOptions } from '../../../containers/metrics_explorer/use_metrics_explorer_options';
+import { MetricsExplorerSeries } from '../../../../common/http_api/metrics_explorer';
+
+interface Props {
+  visible?: boolean;
+  options?: Partial<MetricsExplorerOptions>;
+  series?: MetricsExplorerSeries;
+  setVisible: React.Dispatch<React.SetStateAction<boolean>>;
+}
+
+export const AlertFlyout = (props: Props) => {
+  const { triggersActionsUI } = useContext(TriggerActionsContext);
+  const { services } = useKibana();
+
+  return (
+    <>
+      {triggersActionsUI && (
+        <AlertsContextProvider
+          value={{
+            metadata: {
+              currentOptions: props.options,
+              series: props.series,
+            },
+            toastNotifications: services.notifications?.toasts,
+            http: services.http,
+            actionTypeRegistry: triggersActionsUI.actionTypeRegistry,
+            alertTypeRegistry: triggersActionsUI.alertTypeRegistry,
+          }}
+        >
+          <AlertAdd
+            addFlyoutVisible={props.visible!}
+            setAddFlyoutVisibility={props.setVisible}
+            alertTypeId={METRIC_THRESHOLD_ALERT_TYPE_ID}
+            canChangeTrigger={false}
+            consumer={'metrics'}
+          />
+        </AlertsContextProvider>
+      )}
+    </>
+  );
+};
diff --git a/x-pack/plugins/infra/public/components/alerting/metrics/expression.tsx b/x-pack/plugins/infra/public/components/alerting/metrics/expression.tsx
new file mode 100644
index 0000000000000..ea8dd1484a670
--- /dev/null
+++ b/x-pack/plugins/infra/public/components/alerting/metrics/expression.tsx
@@ -0,0 +1,473 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * 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, useMemo, useEffect, useState } from 'react';
+import {
+  EuiFlexGroup,
+  EuiFlexItem,
+  EuiButtonIcon,
+  EuiSpacer,
+  EuiText,
+  EuiFormRow,
+  EuiButtonEmpty,
+} from '@elastic/eui';
+import { IFieldType } from 'src/plugins/data/public';
+import { FormattedMessage } from '@kbn/i18n/react';
+import { i18n } from '@kbn/i18n';
+import { euiStyled } from '../../../../../observability/public';
+import {
+  WhenExpression,
+  OfExpression,
+  ThresholdExpression,
+  ForLastExpression,
+  // eslint-disable-next-line @kbn/eslint/no-restricted-paths
+} from '../../../../../triggers_actions_ui/public/common';
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import { IErrorObject } from '../../../../../triggers_actions_ui/public/types';
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import { AlertsContextValue } from '../../../../../triggers_actions_ui/public/application/context/alerts_context';
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import { MetricsExplorerOptions } from '../../../containers/metrics_explorer/use_metrics_explorer_options';
+import { MetricsExplorerKueryBar } from '../../metrics_explorer/kuery_bar';
+import { MetricsExplorerSeries } from '../../../../common/http_api/metrics_explorer';
+import { useSource } from '../../../containers/source';
+import { MetricsExplorerGroupBy } from '../../metrics_explorer/group_by';
+
+export interface MetricExpression {
+  aggType?: string;
+  metric?: string;
+  comparator?: Comparator;
+  threshold?: number[];
+  timeSize?: number;
+  timeUnit?: TimeUnit;
+  indexPattern?: string;
+}
+
+interface AlertContextMeta {
+  currentOptions?: Partial<MetricsExplorerOptions>;
+  series?: MetricsExplorerSeries;
+}
+
+interface Props {
+  errors: IErrorObject[];
+  alertParams: {
+    criteria: MetricExpression[];
+    groupBy?: string;
+    filterQuery?: string;
+  };
+  alertsContext: AlertsContextValue<AlertContextMeta>;
+  setAlertParams(key: string, value: any): void;
+  setAlertProperty(key: string, value: any): void;
+}
+
+type Comparator = '>' | '>=' | 'between' | '<' | '<=';
+type TimeUnit = 's' | 'm' | 'h' | 'd';
+
+export const Expressions: React.FC<Props> = props => {
+  const { setAlertParams, alertParams, errors, alertsContext } = props;
+  const { source, createDerivedIndexPattern } = useSource({ sourceId: 'default' });
+  const [timeSize, setTimeSize] = useState<number | undefined>(1);
+  const [timeUnit, setTimeUnit] = useState<TimeUnit>('s');
+
+  const derivedIndexPattern = useMemo(() => createDerivedIndexPattern('metrics'), [
+    createDerivedIndexPattern,
+  ]);
+
+  const options = useMemo<MetricsExplorerOptions>(() => {
+    if (alertsContext.metadata?.currentOptions?.metrics) {
+      return alertsContext.metadata.currentOptions as MetricsExplorerOptions;
+    } else {
+      return {
+        metrics: [],
+        aggregation: 'avg',
+      };
+    }
+  }, [alertsContext.metadata]);
+
+  const defaultExpression = useMemo<MetricExpression>(
+    () => ({
+      aggType: AGGREGATION_TYPES.MAX,
+      comparator: '>',
+      threshold: [],
+      timeSize: 1,
+      timeUnit: 's',
+      indexPattern: source?.configuration.metricAlias,
+    }),
+    [source]
+  );
+
+  const updateParams = useCallback(
+    (id, e: MetricExpression) => {
+      const exp = alertParams.criteria ? alertParams.criteria.slice() : [];
+      exp[id] = { ...exp[id], ...e };
+      setAlertParams('criteria', exp);
+    },
+    [setAlertParams, alertParams.criteria]
+  );
+
+  const addExpression = useCallback(() => {
+    const exp = alertParams.criteria.slice();
+    exp.push(defaultExpression);
+    setAlertParams('criteria', exp);
+  }, [setAlertParams, alertParams.criteria, defaultExpression]);
+
+  const removeExpression = useCallback(
+    (id: number) => {
+      const exp = alertParams.criteria.slice();
+      if (exp.length > 1) {
+        exp.splice(id, 1);
+        setAlertParams('criteria', exp);
+      }
+    },
+    [setAlertParams, alertParams.criteria]
+  );
+
+  const onFilterQuerySubmit = useCallback(
+    (filter: any) => {
+      setAlertParams('filterQuery', filter);
+    },
+    [setAlertParams]
+  );
+
+  const onGroupByChange = useCallback(
+    (group: string | null) => {
+      setAlertParams('groupBy', group || undefined);
+    },
+    [setAlertParams]
+  );
+
+  const emptyError = useMemo(() => {
+    return {
+      aggField: [],
+      timeSizeUnit: [],
+      timeWindowSize: [],
+    };
+  }, []);
+
+  const updateTimeSize = useCallback(
+    (ts: number | undefined) => {
+      const criteria = alertParams.criteria.map(c => ({
+        ...c,
+        timeSize: ts,
+      }));
+      setTimeSize(ts || undefined);
+      setAlertParams('criteria', criteria);
+    },
+    [alertParams.criteria, setAlertParams]
+  );
+
+  const updateTimeUnit = useCallback(
+    (tu: string) => {
+      const criteria = alertParams.criteria.map(c => ({
+        ...c,
+        timeUnit: tu,
+      }));
+      setTimeUnit(tu as TimeUnit);
+      setAlertParams('criteria', criteria);
+    },
+    [alertParams.criteria, setAlertParams]
+  );
+
+  useEffect(() => {
+    const md = alertsContext.metadata;
+    if (md) {
+      if (md.currentOptions?.metrics) {
+        setAlertParams(
+          'criteria',
+          md.currentOptions.metrics.map(metric => ({
+            metric: metric.field,
+            comparator: '>',
+            threshold: [],
+            timeSize,
+            timeUnit,
+            indexPattern: source?.configuration.metricAlias,
+            aggType: metric.aggregation,
+          }))
+        );
+      } else {
+        setAlertParams('criteria', [defaultExpression]);
+      }
+
+      if (md.currentOptions) {
+        if (md.currentOptions.filterQuery) {
+          setAlertParams('filterQuery', md.currentOptions.filterQuery);
+        } else if (md.currentOptions.groupBy && md.series) {
+          const filter = `${md.currentOptions.groupBy}: "${md.series.id}"`;
+          setAlertParams('filterQuery', filter);
+        }
+
+        setAlertParams('groupBy', md.currentOptions.groupBy);
+      }
+    }
+  }, [alertsContext.metadata, defaultExpression, source]); // eslint-disable-line react-hooks/exhaustive-deps
+
+  return (
+    <>
+      <EuiSpacer size={'m'} />
+      <EuiText size="xs">
+        <h4>
+          <FormattedMessage
+            id="xpack.infra.metrics.alertFlyout.conditions"
+            defaultMessage="Conditions"
+          />
+        </h4>
+      </EuiText>
+      <EuiSpacer size={'xs'} />
+      {alertParams.criteria &&
+        alertParams.criteria.map((e, idx) => {
+          return (
+            <ExpressionRow
+              canDelete={alertParams.criteria.length > 1}
+              fields={derivedIndexPattern.fields}
+              remove={removeExpression}
+              addExpression={addExpression}
+              key={idx} // idx's don't usually make good key's but here the index has semantic meaning
+              expressionId={idx}
+              setAlertParams={updateParams}
+              errors={errors[idx] || emptyError}
+              expression={e || {}}
+            />
+          );
+        })}
+
+      <ForLastExpression
+        timeWindowSize={timeSize}
+        timeWindowUnit={timeUnit}
+        errors={emptyError}
+        onChangeWindowSize={updateTimeSize}
+        onChangeWindowUnit={updateTimeUnit}
+      />
+
+      <div>
+        <EuiButtonEmpty
+          color={'primary'}
+          iconSide={'left'}
+          flush={'left'}
+          iconType={'plusInCircleFilled'}
+          onClick={addExpression}
+        >
+          <FormattedMessage
+            id="xpack.infra.metrics.alertFlyout.addCondition"
+            defaultMessage="Add condition"
+          />
+        </EuiButtonEmpty>
+      </div>
+
+      <EuiSpacer size={'m'} />
+
+      <EuiFormRow
+        label={i18n.translate('xpack.infra.metrics.alertFlyout.filterLabel', {
+          defaultMessage: 'Filter',
+        })}
+        helpText={i18n.translate('xpack.infra.metrics.alertFlyout.filterHelpText', {
+          defaultMessage: 'Filter help text',
+        })}
+        fullWidth
+        compressed
+      >
+        <MetricsExplorerKueryBar
+          derivedIndexPattern={derivedIndexPattern}
+          onSubmit={onFilterQuerySubmit}
+          value={alertParams.filterQuery}
+        />
+      </EuiFormRow>
+
+      <EuiSpacer size={'m'} />
+
+      {alertsContext.metadata && (
+        <EuiFormRow
+          label={i18n.translate('xpack.infra.metrics.alertFlyout.createAlertPerText', {
+            defaultMessage: 'Create alert per',
+          })}
+          helpText={i18n.translate('xpack.infra.metrics.alertFlyout.createAlertPerHelpText', {
+            defaultMessage: 'Create alert help text',
+          })}
+          fullWidth
+          compressed
+        >
+          <MetricsExplorerGroupBy
+            onChange={onGroupByChange}
+            fields={derivedIndexPattern.fields}
+            options={{
+              ...options,
+              groupBy: alertParams.groupBy || undefined,
+            }}
+          />
+        </EuiFormRow>
+      )}
+    </>
+  );
+};
+
+interface ExpressionRowProps {
+  fields: IFieldType[];
+  expressionId: number;
+  expression: MetricExpression;
+  errors: IErrorObject;
+  canDelete: boolean;
+  addExpression(): void;
+  remove(id: number): void;
+  setAlertParams(id: number, params: MetricExpression): void;
+}
+
+const StyledExpressionRow = euiStyled(EuiFlexGroup)`
+  display: flex;
+  flex-wrap: wrap;
+  margin: 0 -${props => props.theme.eui.euiSizeXS};
+`;
+
+const StyledExpression = euiStyled.div`
+  padding: 0 ${props => props.theme.eui.euiSizeXS};
+`;
+
+export const ExpressionRow: React.FC<ExpressionRowProps> = props => {
+  const { setAlertParams, expression, errors, expressionId, remove, fields, canDelete } = props;
+  const { aggType = AGGREGATION_TYPES.MAX, metric, comparator = '>', threshold = [] } = expression;
+
+  const updateAggType = useCallback(
+    (at: string) => {
+      setAlertParams(expressionId, { ...expression, aggType: at });
+    },
+    [expressionId, expression, setAlertParams]
+  );
+
+  const updateMetric = useCallback(
+    (m?: string) => {
+      setAlertParams(expressionId, { ...expression, metric: m });
+    },
+    [expressionId, expression, setAlertParams]
+  );
+
+  const updateComparator = useCallback(
+    (c?: string) => {
+      setAlertParams(expressionId, { ...expression, comparator: c as Comparator });
+    },
+    [expressionId, expression, setAlertParams]
+  );
+
+  const updateThreshold = useCallback(
+    t => {
+      setAlertParams(expressionId, { ...expression, threshold: t });
+    },
+    [expressionId, expression, setAlertParams]
+  );
+
+  return (
+    <>
+      <EuiFlexGroup gutterSize="xs">
+        <EuiFlexItem grow>
+          <StyledExpressionRow>
+            <StyledExpression>
+              <WhenExpression
+                customAggTypesOptions={aggregationType}
+                aggType={aggType}
+                onChangeSelectedAggType={updateAggType}
+              />
+            </StyledExpression>
+            {aggType !== 'count' && (
+              <StyledExpression>
+                <OfExpression
+                  customAggTypesOptions={aggregationType}
+                  aggField={metric}
+                  fields={fields.map(f => ({
+                    normalizedType: f.type,
+                    name: f.name,
+                  }))}
+                  aggType={aggType}
+                  errors={errors}
+                  onChangeSelectedAggField={updateMetric}
+                />
+              </StyledExpression>
+            )}
+            <StyledExpression>
+              <ThresholdExpression
+                thresholdComparator={comparator || '>'}
+                threshold={threshold}
+                onChangeSelectedThresholdComparator={updateComparator}
+                onChangeSelectedThreshold={updateThreshold}
+                errors={errors}
+              />
+            </StyledExpression>
+          </StyledExpressionRow>
+        </EuiFlexItem>
+        {canDelete && (
+          <EuiFlexItem grow={false}>
+            <EuiButtonIcon
+              aria-label={i18n.translate('xpack.infra.metrics.alertFlyout.removeCondition', {
+                defaultMessage: 'Remove condition',
+              })}
+              color={'danger'}
+              iconType={'trash'}
+              onClick={() => remove(expressionId)}
+            />
+          </EuiFlexItem>
+        )}
+      </EuiFlexGroup>
+      <EuiSpacer size={'s'} />
+    </>
+  );
+};
+
+enum AGGREGATION_TYPES {
+  COUNT = 'count',
+  AVERAGE = 'avg',
+  SUM = 'sum',
+  MIN = 'min',
+  MAX = 'max',
+  RATE = 'rate',
+  CARDINALITY = 'cardinality',
+}
+
+export const aggregationType: { [key: string]: any } = {
+  avg: {
+    text: i18n.translate('xpack.infra.metrics.alertFlyout.aggregationText.avg', {
+      defaultMessage: 'Average',
+    }),
+    fieldRequired: true,
+    validNormalizedTypes: ['number'],
+    value: AGGREGATION_TYPES.AVERAGE,
+  },
+  max: {
+    text: i18n.translate('xpack.infra.metrics.alertFlyout.aggregationText.max', {
+      defaultMessage: 'Max',
+    }),
+    fieldRequired: true,
+    validNormalizedTypes: ['number', 'date'],
+    value: AGGREGATION_TYPES.MAX,
+  },
+  min: {
+    text: i18n.translate('xpack.infra.metrics.alertFlyout.aggregationText.min', {
+      defaultMessage: 'Min',
+    }),
+    fieldRequired: true,
+    validNormalizedTypes: ['number', 'date'],
+    value: AGGREGATION_TYPES.MIN,
+  },
+  cardinality: {
+    text: i18n.translate('xpack.infra.metrics.alertFlyout.aggregationText.cardinality', {
+      defaultMessage: 'Cardinality',
+    }),
+    fieldRequired: false,
+    value: AGGREGATION_TYPES.CARDINALITY,
+    validNormalizedTypes: ['number'],
+  },
+  rate: {
+    text: i18n.translate('xpack.infra.metrics.alertFlyout.aggregationText.rate', {
+      defaultMessage: 'Rate',
+    }),
+    fieldRequired: false,
+    value: AGGREGATION_TYPES.RATE,
+    validNormalizedTypes: ['number'],
+  },
+  count: {
+    text: i18n.translate('xpack.infra.metrics.alertFlyout.aggregationText.count', {
+      defaultMessage: 'Document count',
+    }),
+    fieldRequired: false,
+    value: AGGREGATION_TYPES.COUNT,
+    validNormalizedTypes: ['number'],
+  },
+};
diff --git a/x-pack/plugins/infra/public/components/alerting/metrics/metric_threshold_alert_type.ts b/x-pack/plugins/infra/public/components/alerting/metrics/metric_threshold_alert_type.ts
new file mode 100644
index 0000000000000..d3b5aaa7c8796
--- /dev/null
+++ b/x-pack/plugins/infra/public/components/alerting/metrics/metric_threshold_alert_type.ts
@@ -0,0 +1,24 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+import { i18n } from '@kbn/i18n';
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import { AlertTypeModel } from '../../../../../triggers_actions_ui/public/types';
+import { Expressions } from './expression';
+import { validateMetricThreshold } from './validation';
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import { METRIC_THRESHOLD_ALERT_TYPE_ID } from '../../../../server/lib/alerting/metric_threshold/types';
+
+export function getAlertType(): AlertTypeModel {
+  return {
+    id: METRIC_THRESHOLD_ALERT_TYPE_ID,
+    name: i18n.translate('xpack.infra.metrics.alertFlyout.alertName', {
+      defaultMessage: 'Alert Trigger',
+    }),
+    iconClass: 'bell',
+    alertParamsExpression: Expressions,
+    validate: validateMetricThreshold,
+  };
+}
diff --git a/x-pack/plugins/infra/public/components/alerting/metrics/validation.tsx b/x-pack/plugins/infra/public/components/alerting/metrics/validation.tsx
new file mode 100644
index 0000000000000..0f5b07f8c0e13
--- /dev/null
+++ b/x-pack/plugins/infra/public/components/alerting/metrics/validation.tsx
@@ -0,0 +1,80 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * 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';
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+
+import { MetricExpression } from './expression';
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import { ValidationResult } from '../../../../../triggers_actions_ui/public/types';
+
+export function validateMetricThreshold({
+  criteria,
+}: {
+  criteria: MetricExpression[];
+}): ValidationResult {
+  const validationResult = { errors: {} };
+  const errors: {
+    [id: string]: {
+      aggField: string[];
+      timeSizeUnit: string[];
+      timeWindowSize: string[];
+      threshold0: string[];
+      threshold1: string[];
+    };
+  } = {};
+  validationResult.errors = errors;
+
+  if (!criteria || !criteria.length) {
+    return validationResult;
+  }
+
+  criteria.forEach((c, idx) => {
+    // Create an id for each criteria, so we can map errors to specific criteria.
+    const id = idx.toString();
+
+    errors[id] = errors[id] || {
+      aggField: [],
+      timeSizeUnit: [],
+      timeWindowSize: [],
+      threshold0: [],
+      threshold1: [],
+    };
+    if (!c.aggType) {
+      errors[id].aggField.push(
+        i18n.translate('xpack.infra.metrics.alertFlyout.error.aggregationRequired', {
+          defaultMessage: 'Aggreation is required.',
+        })
+      );
+    }
+
+    if (!c.threshold || !c.threshold.length) {
+      errors[id].threshold0.push(
+        i18n.translate('xpack.infra.metrics.alertFlyout.error.thresholdRequired', {
+          defaultMessage: 'Threshold is required.',
+        })
+      );
+    }
+
+    if (c.comparator === 'between' && (!c.threshold || c.threshold.length < 2)) {
+      errors[id].threshold1.push(
+        i18n.translate('xpack.infra.metrics.alertFlyout.error.thresholdRequired', {
+          defaultMessage: 'Threshold is required.',
+        })
+      );
+    }
+
+    if (!c.timeSize) {
+      errors[id].timeWindowSize.push(
+        i18n.translate('xpack.infra.metrics.alertFlyout.error.timeRequred', {
+          defaultMessage: 'Time size is Required.',
+        })
+      );
+    }
+  });
+
+  return validationResult;
+}
diff --git a/x-pack/plugins/infra/public/components/metrics_explorer/chart_context_menu.test.tsx b/x-pack/plugins/infra/public/components/metrics_explorer/chart_context_menu.test.tsx
index a23a2739a8e23..8ffef269a42ea 100644
--- a/x-pack/plugins/infra/public/components/metrics_explorer/chart_context_menu.test.tsx
+++ b/x-pack/plugins/infra/public/components/metrics_explorer/chart_context_menu.test.tsx
@@ -143,7 +143,7 @@ describe('MetricsExplorerChartContextMenu', () => {
         uiCapabilities: customUICapabilities,
         chartOptions,
       });
-      expect(component.find('button').length).toBe(0);
+      expect(component.find('button').length).toBe(1);
     });
   });
 
diff --git a/x-pack/plugins/infra/public/components/metrics_explorer/chart_context_menu.tsx b/x-pack/plugins/infra/public/components/metrics_explorer/chart_context_menu.tsx
index c50550f1de56f..75a04cbe9799e 100644
--- a/x-pack/plugins/infra/public/components/metrics_explorer/chart_context_menu.tsx
+++ b/x-pack/plugins/infra/public/components/metrics_explorer/chart_context_menu.tsx
@@ -24,6 +24,7 @@ import { createTSVBLink } from './helpers/create_tsvb_link';
 import { getNodeDetailUrl } from '../../pages/link_to/redirect_to_node_detail';
 import { SourceConfiguration } from '../../utils/source_configuration';
 import { InventoryItemType } from '../../../common/inventory_models/types';
+import { AlertFlyout } from '../alerting/metrics/alert_flyout';
 import { useLinkProps } from '../../hooks/use_link_props';
 
 export interface Props {
@@ -81,6 +82,7 @@ export const MetricsExplorerChartContextMenu: React.FC<Props> = ({
   chartOptions,
 }: Props) => {
   const [isPopoverOpen, setPopoverState] = useState(false);
+  const [flyoutVisible, setFlyoutVisible] = useState(false);
   const supportFiltering = options.groupBy != null && onFilter != null;
   const handleFilter = useCallback(() => {
     // onFilter needs check for Typescript even though it's
@@ -141,7 +143,20 @@ export const MetricsExplorerChartContextMenu: React.FC<Props> = ({
       ]
     : [];
 
-  const itemPanels = [...filterByItem, ...openInVisualize, ...viewNodeDetail];
+  const itemPanels = [
+    ...filterByItem,
+    ...openInVisualize,
+    ...viewNodeDetail,
+    {
+      name: i18n.translate('xpack.infra.metricsExplorer.alerts.createAlertButton', {
+        defaultMessage: 'Create alert',
+      }),
+      icon: 'bell',
+      onClick() {
+        setFlyoutVisible(true);
+      },
+    },
+  ];
 
   // If there are no itemPanels then there is no reason to show the actions button.
   if (itemPanels.length === 0) return null;
@@ -174,15 +189,24 @@ export const MetricsExplorerChartContextMenu: React.FC<Props> = ({
       {actionLabel}
     </EuiButtonEmpty>
   );
+
   return (
-    <EuiPopover
-      closePopover={handleClose}
-      id={`${series.id}-popover`}
-      button={button}
-      isOpen={isPopoverOpen}
-      panelPaddingSize="none"
-    >
-      <EuiContextMenu initialPanelId={0} panels={panels} />
-    </EuiPopover>
+    <>
+      <EuiPopover
+        closePopover={handleClose}
+        id={`${series.id}-popover`}
+        button={button}
+        isOpen={isPopoverOpen}
+        panelPaddingSize="none"
+      >
+        <EuiContextMenu initialPanelId={0} panels={panels} />
+        <AlertFlyout
+          series={series}
+          options={options}
+          setVisible={setFlyoutVisible}
+          visible={flyoutVisible}
+        />
+      </EuiPopover>
+    </>
   );
 };
diff --git a/x-pack/plugins/infra/public/components/metrics_explorer/kuery_bar.tsx b/x-pack/plugins/infra/public/components/metrics_explorer/kuery_bar.tsx
index 0e18deedd404c..dcc160d05b6ad 100644
--- a/x-pack/plugins/infra/public/components/metrics_explorer/kuery_bar.tsx
+++ b/x-pack/plugins/infra/public/components/metrics_explorer/kuery_bar.tsx
@@ -16,6 +16,7 @@ interface Props {
   derivedIndexPattern: IIndexPattern;
   onSubmit: (query: string) => void;
   value?: string | null;
+  placeholder?: string;
 }
 
 function validateQuery(query: string) {
@@ -27,7 +28,12 @@ function validateQuery(query: string) {
   return true;
 }
 
-export const MetricsExplorerKueryBar = ({ derivedIndexPattern, onSubmit, value }: Props) => {
+export const MetricsExplorerKueryBar = ({
+  derivedIndexPattern,
+  onSubmit,
+  value,
+  placeholder,
+}: Props) => {
   const [draftQuery, setDraftQuery] = useState<string>(value || '');
   const [isValid, setValidation] = useState<boolean>(true);
 
@@ -48,9 +54,12 @@ export const MetricsExplorerKueryBar = ({ derivedIndexPattern, onSubmit, value }
     fields: derivedIndexPattern.fields.filter(field => isDisplayable(field)),
   };
 
-  const placeholder = i18n.translate('xpack.infra.homePage.toolbar.kqlSearchFieldPlaceholder', {
-    defaultMessage: 'Search for infrastructure data… (e.g. host.name:host-1)',
-  });
+  const defaultPlaceholder = i18n.translate(
+    'xpack.infra.homePage.toolbar.kqlSearchFieldPlaceholder',
+    {
+      defaultMessage: 'Search for infrastructure data… (e.g. host.name:host-1)',
+    }
+  );
 
   return (
     <WithKueryAutocompletion indexPattern={filteredDerivedIndexPattern}>
@@ -62,7 +71,7 @@ export const MetricsExplorerKueryBar = ({ derivedIndexPattern, onSubmit, value }
           loadSuggestions={loadSuggestions}
           onChange={handleChange}
           onSubmit={onSubmit}
-          placeholder={placeholder}
+          placeholder={placeholder || defaultPlaceholder}
           suggestions={suggestions}
           value={draftQuery}
         />
diff --git a/x-pack/plugins/infra/public/components/metrics_explorer/toolbar.tsx b/x-pack/plugins/infra/public/components/metrics_explorer/toolbar.tsx
index 9e96819a36cac..0fbb0b6acad17 100644
--- a/x-pack/plugins/infra/public/components/metrics_explorer/toolbar.tsx
+++ b/x-pack/plugins/infra/public/components/metrics_explorer/toolbar.tsx
@@ -63,6 +63,7 @@ export const MetricsExplorerToolbar = ({
   const isDefaultOptions = options.aggregation === 'avg' && options.metrics.length === 0;
   const [timepickerQuickRanges] = useKibanaUiSetting('timepicker:quickRanges');
   const commonlyUsedRanges = mapKibanaQuickRangesToDatePickerRanges(timepickerQuickRanges);
+
   return (
     <Toolbar>
       <EuiFlexGroup alignItems="center">
diff --git a/x-pack/plugins/infra/public/components/waffle/node_context_menu.tsx b/x-pack/plugins/infra/public/components/waffle/node_context_menu.tsx
index cc6a94c8a41a2..5f05cebd8f616 100644
--- a/x-pack/plugins/infra/public/components/waffle/node_context_menu.tsx
+++ b/x-pack/plugins/infra/public/components/waffle/node_context_menu.tsx
@@ -8,7 +8,7 @@ import { EuiPopoverProps, EuiCode } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n/react';
 
-import React, { useMemo } from 'react';
+import React, { useMemo, useState } from 'react';
 import { InfraWaffleMapNode, InfraWaffleMapOptions } from '../../lib/lib';
 import { getNodeDetailUrl, getNodeLogsUrl } from '../../pages/link_to';
 import { createUptimeLink } from './lib/create_uptime_link';
@@ -25,6 +25,7 @@ import {
   SectionLink,
 } from '../../../../observability/public';
 import { useLinkProps } from '../../hooks/use_link_props';
+import { AlertFlyout } from '../alerting/metrics/alert_flyout';
 
 interface Props {
   options: InfraWaffleMapOptions;
@@ -46,6 +47,7 @@ export const NodeContextMenu: React.FC<Props> = ({
   nodeType,
   popoverPosition,
 }) => {
+  const [flyoutVisible, setFlyoutVisible] = useState(false);
   const inventoryModel = findInventoryModel(nodeType);
   const nodeDetailFrom = currentTime - inventoryModel.metrics.defaultTimeRangeInSeconds * 1000;
   const uiCapabilities = useKibana().services.application?.capabilities;
@@ -144,41 +146,48 @@ export const NodeContextMenu: React.FC<Props> = ({
   };
 
   return (
-    <ActionMenu
-      closePopover={closePopover}
-      id={`${node.pathId}-popover`}
-      isOpen={isPopoverOpen}
-      button={children!}
-      anchorPosition={popoverPosition}
-    >
-      <div style={{ maxWidth: 300 }} data-test-subj="nodeContextMenu">
-        <Section>
-          <SectionTitle>
-            <FormattedMessage
-              id="xpack.infra.nodeContextMenu.title"
-              defaultMessage="{inventoryName} details"
-              values={{ inventoryName: inventoryModel.singularDisplayName }}
-            />
-          </SectionTitle>
-          {inventoryId.label && (
-            <SectionSubtitle>
-              <div style={{ wordBreak: 'break-all' }}>
-                <FormattedMessage
-                  id="xpack.infra.nodeContextMenu.description"
-                  defaultMessage="View details for {label} {value}"
-                  values={{ label: inventoryId.label, value: inventoryId.value }}
-                />
-              </div>
-            </SectionSubtitle>
-          )}
-          <SectionLinks>
-            <SectionLink data-test-subj="viewLogsContextMenuItem" {...nodeLogsMenuItem} />
-            <SectionLink {...nodeDetailMenuItem} />
-            <SectionLink data-test-subj="viewApmTracesContextMenuItem" {...apmTracesMenuItem} />
-            <SectionLink {...uptimeMenuItem} />
-          </SectionLinks>
-        </Section>
-      </div>
-    </ActionMenu>
+    <>
+      <ActionMenu
+        closePopover={closePopover}
+        id={`${node.pathId}-popover`}
+        isOpen={isPopoverOpen}
+        button={children!}
+        anchorPosition={popoverPosition}
+      >
+        <div style={{ maxWidth: 300 }} data-test-subj="nodeContextMenu">
+          <Section>
+            <SectionTitle>
+              <FormattedMessage
+                id="xpack.infra.nodeContextMenu.title"
+                defaultMessage="{inventoryName} details"
+                values={{ inventoryName: inventoryModel.singularDisplayName }}
+              />
+            </SectionTitle>
+            {inventoryId.label && (
+              <SectionSubtitle>
+                <div style={{ wordBreak: 'break-all' }}>
+                  <FormattedMessage
+                    id="xpack.infra.nodeContextMenu.description"
+                    defaultMessage="View details for {label} {value}"
+                    values={{ label: inventoryId.label, value: inventoryId.value }}
+                  />
+                </div>
+              </SectionSubtitle>
+            )}
+            <SectionLinks>
+              <SectionLink data-test-subj="viewLogsContextMenuItem" {...nodeLogsMenuItem} />
+              <SectionLink {...nodeDetailMenuItem} />
+              <SectionLink data-test-subj="viewApmTracesContextMenuItem" {...apmTracesMenuItem} />
+              <SectionLink {...uptimeMenuItem} />
+            </SectionLinks>
+          </Section>
+        </div>
+      </ActionMenu>
+      <AlertFlyout
+        options={{ filterQuery: `${nodeType}: ${node.id}` }}
+        setVisible={setFlyoutVisible}
+        visible={flyoutVisible}
+      />
+    </>
   );
 };
diff --git a/x-pack/plugins/infra/public/pages/infrastructure/index.tsx b/x-pack/plugins/infra/public/pages/infrastructure/index.tsx
index b4ff7aeff696c..730f67ab2bdca 100644
--- a/x-pack/plugins/infra/public/pages/infrastructure/index.tsx
+++ b/x-pack/plugins/infra/public/pages/infrastructure/index.tsx
@@ -9,6 +9,7 @@ import { i18n } from '@kbn/i18n';
 import React from 'react';
 import { Route, RouteComponentProps, Switch } from 'react-router-dom';
 
+import { EuiFlexItem, EuiFlexGroup } from '@elastic/eui';
 import { DocumentTitle } from '../../components/document_title';
 import { HelpCenterContent } from '../../components/help_center_content';
 import { RoutedTabs } from '../../components/navigation/routed_tabs';
@@ -24,9 +25,11 @@ import { MetricsSettingsPage } from './settings';
 import { AppNavigation } from '../../components/navigation/app_navigation';
 import { SourceLoadingPage } from '../../components/source_loading_page';
 import { useKibana } from '../../../../../../src/plugins/kibana_react/public';
+import { AlertDropdown } from '../../components/alerting/metrics/alert_dropdown';
 
 export const InfrastructurePage = ({ match }: RouteComponentProps) => {
   const uiCapabilities = useKibana().services.application?.capabilities;
+
   return (
     <Source.Provider sourceId="default">
       <ColumnarPage>
@@ -59,31 +62,38 @@ export const InfrastructurePage = ({ match }: RouteComponentProps) => {
             defaultMessage: 'Metrics',
           })}
         >
-          <RoutedTabs
-            tabs={[
-              {
-                app: 'metrics',
-                title: i18n.translate('xpack.infra.homePage.inventoryTabTitle', {
-                  defaultMessage: 'Inventory',
-                }),
-                pathname: '/inventory',
-              },
-              {
-                app: 'metrics',
-                title: i18n.translate('xpack.infra.homePage.metricsExplorerTabTitle', {
-                  defaultMessage: 'Metrics Explorer',
-                }),
-                pathname: '/explorer',
-              },
-              {
-                app: 'metrics',
-                title: i18n.translate('xpack.infra.homePage.settingsTabTitle', {
-                  defaultMessage: 'Settings',
-                }),
-                pathname: '/settings',
-              },
-            ]}
-          />
+          <EuiFlexGroup gutterSize={'none'} alignItems={'center'}>
+            <EuiFlexItem>
+              <RoutedTabs
+                tabs={[
+                  {
+                    app: 'metrics',
+                    title: i18n.translate('xpack.infra.homePage.inventoryTabTitle', {
+                      defaultMessage: 'Inventory',
+                    }),
+                    pathname: '/inventory',
+                  },
+                  {
+                    app: 'metrics',
+                    title: i18n.translate('xpack.infra.homePage.metricsExplorerTabTitle', {
+                      defaultMessage: 'Metrics Explorer',
+                    }),
+                    pathname: '/explorer',
+                  },
+                  {
+                    app: 'metrics',
+                    title: i18n.translate('xpack.infra.homePage.settingsTabTitle', {
+                      defaultMessage: 'Settings',
+                    }),
+                    pathname: '/settings',
+                  },
+                ]}
+              />
+            </EuiFlexItem>
+            <EuiFlexItem grow={false}>
+              <AlertDropdown />
+            </EuiFlexItem>
+          </EuiFlexGroup>
         </AppNavigation>
 
         <Switch>
diff --git a/x-pack/plugins/infra/public/plugin.ts b/x-pack/plugins/infra/public/plugin.ts
index d576331662a08..15796f35856bd 100644
--- a/x-pack/plugins/infra/public/plugin.ts
+++ b/x-pack/plugins/infra/public/plugin.ts
@@ -29,6 +29,8 @@ import { DataPublicPluginSetup, DataPublicPluginStart } from '../../../../src/pl
 import { UsageCollectionSetup } from '../../../../src/plugins/usage_collection/public';
 import { DataEnhancedSetup, DataEnhancedStart } from '../../data_enhanced/public';
 import { LogsRouter, MetricsRouter } from './routers';
+import { TriggersAndActionsUIPublicPluginSetup } from '../../../plugins/triggers_actions_ui/public';
+import { getAlertType } from './components/alerting/metrics/metric_threshold_alert_type';
 
 export type ClientSetup = void;
 export type ClientStart = void;
@@ -38,6 +40,7 @@ export interface ClientPluginsSetup {
   data: DataPublicPluginSetup;
   usageCollection: UsageCollectionSetup;
   dataEnhanced: DataEnhancedSetup;
+  triggers_actions_ui: TriggersAndActionsUIPublicPluginSetup;
 }
 
 export interface ClientPluginsStart {
@@ -58,6 +61,8 @@ export class Plugin
   setup(core: CoreSetup, pluginsSetup: ClientPluginsSetup) {
     registerFeatures(pluginsSetup.home);
 
+    pluginsSetup.triggers_actions_ui.alertTypeRegistry.register(getAlertType());
+
     core.application.register({
       id: 'logs',
       title: i18n.translate('xpack.infra.logs.pluginTitle', {
@@ -76,7 +81,8 @@ export class Plugin
           coreStart,
           plugins,
           params,
-          LogsRouter
+          LogsRouter,
+          pluginsSetup.triggers_actions_ui
         );
       },
     });
@@ -99,7 +105,8 @@ export class Plugin
           coreStart,
           plugins,
           params,
-          MetricsRouter
+          MetricsRouter,
+          pluginsSetup.triggers_actions_ui
         );
       },
     });
diff --git a/x-pack/plugins/infra/public/utils/triggers_actions_context.tsx b/x-pack/plugins/infra/public/utils/triggers_actions_context.tsx
new file mode 100644
index 0000000000000..4ca4aedb4a08b
--- /dev/null
+++ b/x-pack/plugins/infra/public/utils/triggers_actions_context.tsx
@@ -0,0 +1,32 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import * as React from 'react';
+import { TriggersAndActionsUIPublicPluginSetup } from '../../../triggers_actions_ui/public';
+
+interface ContextProps {
+  triggersActionsUI: TriggersAndActionsUIPublicPluginSetup | null;
+}
+
+export const TriggerActionsContext = React.createContext<ContextProps>({
+  triggersActionsUI: null,
+});
+
+interface Props {
+  triggersActionsUI: TriggersAndActionsUIPublicPluginSetup;
+}
+
+export const TriggersActionsProvider: React.FC<Props> = props => {
+  return (
+    <TriggerActionsContext.Provider
+      value={{
+        triggersActionsUI: props.triggersActionsUI,
+      }}
+    >
+      {props.children}
+    </TriggerActionsContext.Provider>
+  );
+};

From 3401ae42e0b9d700a91b6933f3310b61ee19789e Mon Sep 17 00:00:00 2001
From: Luke Elmers <luke.elmers@elastic.co>
Date: Mon, 23 Mar 2020 09:17:27 -0600
Subject: [PATCH 013/179] =?UTF-8?q?Goodbye,=20legacy=20data=20plugin=20?=
 =?UTF-8?q?=F0=9F=91=8B=20(#60449)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .eslintrc.js                                  |  6 --
 .i18nrc.json                                  |  5 +-
 src/legacy/core_plugins/data/index.ts         | 41 -------------
 src/legacy/core_plugins/data/package.json     |  4 --
 src/legacy/core_plugins/data/public/index.ts  | 26 ---------
 src/legacy/core_plugins/data/public/legacy.ts | 44 --------------
 src/legacy/core_plugins/data/public/plugin.ts | 58 -------------------
 src/legacy/core_plugins/data/public/setup.ts  | 23 --------
 .../core_plugins/input_control_vis/index.ts   |  2 +-
 .../core_plugins/kibana/public/.eslintrc.js   |  2 -
 src/legacy/core_plugins/timelion/index.ts     |  2 +-
 .../core_plugins/timelion/public/app.js       |  1 -
 .../public/markdown_vis_controller.test.tsx   |  5 --
 .../core_plugins/vis_type_timelion/index.ts   |  2 +-
 .../components/panel_config/gauge.test.js     |  6 --
 .../components/vis_types/gauge/series.test.js |  6 --
 .../vis_types/metric/series.test.js           |  6 --
 .../core_plugins/vis_type_vislib/index.ts     |  2 +-
 src/legacy/core_plugins/vis_type_xy/index.ts  |  2 +-
 x-pack/legacy/plugins/lens/index.ts           |  2 +-
 .../lens/public/app_plugin/app.test.tsx       |  5 --
 .../dimension_panel/dimension_panel.test.tsx  |  6 --
 .../indexpattern_suggestions.test.tsx         |  6 +-
 23 files changed, 8 insertions(+), 254 deletions(-)
 delete mode 100644 src/legacy/core_plugins/data/index.ts
 delete mode 100644 src/legacy/core_plugins/data/package.json
 delete mode 100644 src/legacy/core_plugins/data/public/index.ts
 delete mode 100644 src/legacy/core_plugins/data/public/legacy.ts
 delete mode 100644 src/legacy/core_plugins/data/public/plugin.ts
 delete mode 100644 src/legacy/core_plugins/data/public/setup.ts

diff --git a/.eslintrc.js b/.eslintrc.js
index 3d6a5c262c453..af05af0f6e402 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -69,12 +69,6 @@ module.exports = {
         'jsx-a11y/no-onchange': 'off',
       },
     },
-    {
-      files: ['src/legacy/core_plugins/data/**/*.{js,ts,tsx}'],
-      rules: {
-        'react-hooks/exhaustive-deps': 'off',
-      },
-    },
     {
       files: ['src/legacy/core_plugins/expressions/**/*.{js,ts,tsx}'],
       rules: {
diff --git a/.i18nrc.json b/.i18nrc.json
index 07878ed3c15fb..bffe99bf3654b 100644
--- a/.i18nrc.json
+++ b/.i18nrc.json
@@ -4,10 +4,7 @@
     "console": "src/plugins/console",
     "core": "src/core",
     "dashboard": "src/plugins/dashboard",
-    "data": [
-      "src/legacy/core_plugins/data",
-      "src/plugins/data"
-    ],
+    "data": "src/plugins/data",
     "embeddableApi": "src/plugins/embeddable",
     "embeddableExamples": "examples/embeddable_examples",
     "share": "src/plugins/share",
diff --git a/src/legacy/core_plugins/data/index.ts b/src/legacy/core_plugins/data/index.ts
deleted file mode 100644
index 10c8cf464b82d..0000000000000
--- a/src/legacy/core_plugins/data/index.ts
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import { resolve } from 'path';
-import { Legacy } from '../../../../kibana';
-
-// eslint-disable-next-line import/no-default-export
-export default function DataPlugin(kibana: any) {
-  const config: Legacy.PluginSpecOptions = {
-    id: 'data',
-    require: ['elasticsearch'],
-    publicDir: resolve(__dirname, 'public'),
-    config: (Joi: any) => {
-      return Joi.object({
-        enabled: Joi.boolean().default(true),
-      }).default();
-    },
-    init: (server: Legacy.Server) => ({}),
-    uiExports: {
-      injectDefaultVars: () => ({}),
-    },
-  };
-
-  return new kibana.Plugin(config);
-}
diff --git a/src/legacy/core_plugins/data/package.json b/src/legacy/core_plugins/data/package.json
deleted file mode 100644
index 3f40374650ad7..0000000000000
--- a/src/legacy/core_plugins/data/package.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "name": "data",
-  "version": "kibana"
-}
diff --git a/src/legacy/core_plugins/data/public/index.ts b/src/legacy/core_plugins/data/public/index.ts
deleted file mode 100644
index 27a3dd825485d..0000000000000
--- a/src/legacy/core_plugins/data/public/index.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import { DataPlugin as Plugin } from './plugin';
-
-export function plugin() {
-  return new Plugin();
-}
-
-export { DataSetup, DataStart } from './plugin';
diff --git a/src/legacy/core_plugins/data/public/legacy.ts b/src/legacy/core_plugins/data/public/legacy.ts
deleted file mode 100644
index 370b412127db8..0000000000000
--- a/src/legacy/core_plugins/data/public/legacy.ts
+++ /dev/null
@@ -1,44 +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.
- */
-
-/**
- * New Platform Shim
- *
- * In this file, we import any legacy dependencies we have, and shim them into
- * our plugin by manually constructing the values that the new platform will
- * eventually be passing to the `setup` method of our plugin definition.
- *
- * The idea is that our `plugin.ts` can stay "pure" and not contain any legacy
- * world code. Then when it comes time to migrate to the new platform, we can
- * simply delete this shim file.
- *
- * We are also calling `setup` here and exporting our public contract so that
- * other legacy plugins are able to import from '../core_plugins/data/legacy'
- * and receive the response value of the `setup` contract, mimicking the
- * data that will eventually be injected by the new platform.
- */
-
-import { npSetup, npStart } from 'ui/new_platform';
-import { plugin } from '.';
-
-const dataPlugin = plugin();
-
-export const setup = dataPlugin.setup(npSetup.core);
-
-export const start = dataPlugin.start(npStart.core);
diff --git a/src/legacy/core_plugins/data/public/plugin.ts b/src/legacy/core_plugins/data/public/plugin.ts
deleted file mode 100644
index 76a3d92d20283..0000000000000
--- a/src/legacy/core_plugins/data/public/plugin.ts
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import { CoreSetup, CoreStart, Plugin } from 'kibana/public';
-
-/**
- * Interface for this plugin's returned `setup` contract.
- *
- * @public
- */
-export interface DataSetup {} // eslint-disable-line @typescript-eslint/no-empty-interface
-
-/**
- * Interface for this plugin's returned `start` contract.
- *
- * @public
- */
-export interface DataStart {} // eslint-disable-line @typescript-eslint/no-empty-interface
-
-/**
- * Data Plugin - public
- *
- * This is the entry point for the entire client-side public contract of the plugin.
- * If something is not explicitly exported here, you can safely assume it is private
- * to the plugin and not considered stable.
- *
- * All stateful contracts will be injected by the platform at runtime, and are defined
- * in the setup/start interfaces. The remaining items exported here are either types,
- * or static code.
- */
-
-export class DataPlugin implements Plugin<DataSetup, DataStart> {
-  public setup(core: CoreSetup) {
-    return {};
-  }
-
-  public start(core: CoreStart): DataStart {
-    return {};
-  }
-
-  public stop() {}
-}
diff --git a/src/legacy/core_plugins/data/public/setup.ts b/src/legacy/core_plugins/data/public/setup.ts
deleted file mode 100644
index a99a2a4d06efe..0000000000000
--- a/src/legacy/core_plugins/data/public/setup.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import { setup } from './legacy';
-
-// for backwards compatibility with 7.3
-export const data = setup;
diff --git a/src/legacy/core_plugins/input_control_vis/index.ts b/src/legacy/core_plugins/input_control_vis/index.ts
index 8f6178e26126b..d67472ac4b95f 100644
--- a/src/legacy/core_plugins/input_control_vis/index.ts
+++ b/src/legacy/core_plugins/input_control_vis/index.ts
@@ -25,7 +25,7 @@ import { LegacyPluginApi, LegacyPluginInitializer } from '../../../../src/legacy
 const inputControlVisPluginInitializer: LegacyPluginInitializer = ({ Plugin }: LegacyPluginApi) =>
   new Plugin({
     id: 'input_control_vis',
-    require: ['kibana', 'elasticsearch', 'visualizations', 'interpreter', 'data'],
+    require: ['kibana', 'elasticsearch', 'visualizations', 'interpreter'],
     publicDir: resolve(__dirname, 'public'),
     uiExports: {
       styleSheetPaths: resolve(__dirname, 'public/index.scss'),
diff --git a/src/legacy/core_plugins/kibana/public/.eslintrc.js b/src/legacy/core_plugins/kibana/public/.eslintrc.js
index e7171a5291d26..1153706eb8566 100644
--- a/src/legacy/core_plugins/kibana/public/.eslintrc.js
+++ b/src/legacy/core_plugins/kibana/public/.eslintrc.js
@@ -43,8 +43,6 @@ function buildRestrictedPaths(shimmedPlugins) {
           'ui/**/*',
           'src/legacy/ui/**/*',
           'src/legacy/core_plugins/kibana/public/**/*',
-          'src/legacy/core_plugins/data/public/**/*',
-          '!src/legacy/core_plugins/data/public/index.ts',
           `!src/legacy/core_plugins/kibana/public/${shimmedPlugin}/**/*`,
         ],
         allowSameFolder: false,
diff --git a/src/legacy/core_plugins/timelion/index.ts b/src/legacy/core_plugins/timelion/index.ts
index 9e2bfd4023bd9..41a15dc4e0186 100644
--- a/src/legacy/core_plugins/timelion/index.ts
+++ b/src/legacy/core_plugins/timelion/index.ts
@@ -29,7 +29,7 @@ const experimentalLabel = i18n.translate('timelion.uiSettings.experimentalLabel'
 
 const timelionPluginInitializer: LegacyPluginInitializer = ({ Plugin }: LegacyPluginApi) =>
   new Plugin({
-    require: ['kibana', 'elasticsearch', 'data'],
+    require: ['kibana', 'elasticsearch'],
     config(Joi: any) {
       return Joi.object({
         enabled: Joi.boolean().default(true),
diff --git a/src/legacy/core_plugins/timelion/public/app.js b/src/legacy/core_plugins/timelion/public/app.js
index a9d678cfea79c..66d93b4ce9b89 100644
--- a/src/legacy/core_plugins/timelion/public/app.js
+++ b/src/legacy/core_plugins/timelion/public/app.js
@@ -38,7 +38,6 @@ import 'ui/directives/input_focus';
 import './directives/saved_object_finder';
 import 'ui/directives/listen';
 import './directives/saved_object_save_as_checkbox';
-import '../../data/public/legacy';
 import './services/saved_sheet_register';
 
 import rootTemplate from 'plugins/timelion/index.html';
diff --git a/src/legacy/core_plugins/vis_type_markdown/public/markdown_vis_controller.test.tsx b/src/legacy/core_plugins/vis_type_markdown/public/markdown_vis_controller.test.tsx
index 5bcb2961c42de..103879cb6e6df 100644
--- a/src/legacy/core_plugins/vis_type_markdown/public/markdown_vis_controller.test.tsx
+++ b/src/legacy/core_plugins/vis_type_markdown/public/markdown_vis_controller.test.tsx
@@ -21,11 +21,6 @@ import React from 'react';
 import { render, mount } from 'enzyme';
 import { MarkdownVisWrapper } from './markdown_vis_controller';
 
-// We need Markdown to do these tests, so mock data plugin
-jest.mock('../../data/public/legacy', () => {
-  return {};
-});
-
 describe('markdown vis controller', () => {
   it('should set html from markdown params', () => {
     const vis = {
diff --git a/src/legacy/core_plugins/vis_type_timelion/index.ts b/src/legacy/core_plugins/vis_type_timelion/index.ts
index 4664bebb4f38a..6c1e3f452959e 100644
--- a/src/legacy/core_plugins/vis_type_timelion/index.ts
+++ b/src/legacy/core_plugins/vis_type_timelion/index.ts
@@ -25,7 +25,7 @@ import { LegacyPluginApi, LegacyPluginInitializer } from '../../../../src/legacy
 const timelionVisPluginInitializer: LegacyPluginInitializer = ({ Plugin }: LegacyPluginApi) =>
   new Plugin({
     id: 'timelion_vis',
-    require: ['kibana', 'elasticsearch', 'visualizations', 'data'],
+    require: ['kibana', 'elasticsearch', 'visualizations'],
     publicDir: resolve(__dirname, 'public'),
     uiExports: {
       styleSheetPaths: resolve(__dirname, 'public/index.scss'),
diff --git a/src/legacy/core_plugins/vis_type_timeseries/public/components/panel_config/gauge.test.js b/src/legacy/core_plugins/vis_type_timeseries/public/components/panel_config/gauge.test.js
index d92dafadb68bc..4509b669b0505 100644
--- a/src/legacy/core_plugins/vis_type_timeseries/public/components/panel_config/gauge.test.js
+++ b/src/legacy/core_plugins/vis_type_timeseries/public/components/panel_config/gauge.test.js
@@ -20,12 +20,6 @@
 import React from 'react';
 import { shallowWithIntl } from 'test_utils/enzyme_helpers';
 
-jest.mock('plugins/data', () => {
-  return {
-    QueryStringInput: () => <div className="queryStringInput" />,
-  };
-});
-
 jest.mock('../lib/get_default_query_language', () => ({
   getDefaultQueryLanguage: () => 'kuery',
 }));
diff --git a/src/legacy/core_plugins/vis_type_timeseries/public/components/vis_types/gauge/series.test.js b/src/legacy/core_plugins/vis_type_timeseries/public/components/vis_types/gauge/series.test.js
index 4efd5bb65451c..65bf7561e3866 100644
--- a/src/legacy/core_plugins/vis_type_timeseries/public/components/vis_types/gauge/series.test.js
+++ b/src/legacy/core_plugins/vis_type_timeseries/public/components/vis_types/gauge/series.test.js
@@ -20,12 +20,6 @@ import React from 'react';
 import { GaugeSeries } from './series';
 import { mountWithIntl } from 'test_utils/enzyme_helpers';
 
-jest.mock('plugins/data', () => {
-  return {
-    QueryStringInput: () => <div className="queryStringInput" />,
-  };
-});
-
 const defaultProps = {
   disableAdd: true,
   disableDelete: true,
diff --git a/src/legacy/core_plugins/vis_type_timeseries/public/components/vis_types/metric/series.test.js b/src/legacy/core_plugins/vis_type_timeseries/public/components/vis_types/metric/series.test.js
index 299e7c12f931a..94a12266df3b3 100644
--- a/src/legacy/core_plugins/vis_type_timeseries/public/components/vis_types/metric/series.test.js
+++ b/src/legacy/core_plugins/vis_type_timeseries/public/components/vis_types/metric/series.test.js
@@ -21,12 +21,6 @@ import React from 'react';
 import { MetricSeries } from './series';
 import { mountWithIntl } from 'test_utils/enzyme_helpers';
 
-jest.mock('plugins/data', () => {
-  return {
-    QueryStringInput: () => <div className="queryStringInput" />,
-  };
-});
-
 const defaultProps = {
   disableAdd: false,
   disableDelete: true,
diff --git a/src/legacy/core_plugins/vis_type_vislib/index.ts b/src/legacy/core_plugins/vis_type_vislib/index.ts
index 74c8f3f96e669..1f75aea31ba0b 100644
--- a/src/legacy/core_plugins/vis_type_vislib/index.ts
+++ b/src/legacy/core_plugins/vis_type_vislib/index.ts
@@ -25,7 +25,7 @@ import { LegacyPluginApi, LegacyPluginInitializer } from '../../types';
 const visTypeVislibPluginInitializer: LegacyPluginInitializer = ({ Plugin }: LegacyPluginApi) =>
   new Plugin({
     id: 'vis_type_vislib',
-    require: ['kibana', 'elasticsearch', 'visualizations', 'interpreter', 'data'],
+    require: ['kibana', 'elasticsearch', 'visualizations', 'interpreter'],
     publicDir: resolve(__dirname, 'public'),
     styleSheetPaths: resolve(__dirname, 'public/index.scss'),
     uiExports: {
diff --git a/src/legacy/core_plugins/vis_type_xy/index.ts b/src/legacy/core_plugins/vis_type_xy/index.ts
index 975399f891503..58d2e425eef40 100644
--- a/src/legacy/core_plugins/vis_type_xy/index.ts
+++ b/src/legacy/core_plugins/vis_type_xy/index.ts
@@ -31,7 +31,7 @@ export interface ConfigSchema {
 const visTypeXyPluginInitializer: LegacyPluginInitializer = ({ Plugin }: LegacyPluginApi) =>
   new Plugin({
     id: 'visTypeXy',
-    require: ['kibana', 'elasticsearch', 'visualizations', 'interpreter', 'data'],
+    require: ['kibana', 'elasticsearch', 'visualizations', 'interpreter'],
     publicDir: resolve(__dirname, 'public'),
     uiExports: {
       hacks: [resolve(__dirname, 'public/legacy')],
diff --git a/x-pack/legacy/plugins/lens/index.ts b/x-pack/legacy/plugins/lens/index.ts
index 5eda6c4b4ff7a..b1c67fb81ba07 100644
--- a/x-pack/legacy/plugins/lens/index.ts
+++ b/x-pack/legacy/plugins/lens/index.ts
@@ -19,7 +19,7 @@ export const lens: LegacyPluginInitializer = kibana => {
     id: PLUGIN_ID,
     configPrefix: `xpack.${PLUGIN_ID}`,
     // task_manager could be required, but is only used for telemetry
-    require: ['kibana', 'elasticsearch', 'xpack_main', 'interpreter', 'data'],
+    require: ['kibana', 'elasticsearch', 'xpack_main', 'interpreter'],
     publicDir: resolve(__dirname, 'public'),
 
     uiExports: {
diff --git a/x-pack/legacy/plugins/lens/public/app_plugin/app.test.tsx b/x-pack/legacy/plugins/lens/public/app_plugin/app.test.tsx
index d6312005a6c25..fbda18cc0e307 100644
--- a/x-pack/legacy/plugins/lens/public/app_plugin/app.test.tsx
+++ b/x-pack/legacy/plugins/lens/public/app_plugin/app.test.tsx
@@ -22,7 +22,6 @@ import { dataPluginMock } from '../../../../../../src/plugins/data/public/mocks'
 const dataStartMock = dataPluginMock.createStartContract();
 
 import { TopNavMenuData } from '../../../../../../src/plugins/navigation/public';
-import { DataStart } from '../../../../../../src/legacy/core_plugins/data/public';
 import { coreMock } from 'src/core/public/mocks';
 
 jest.mock('ui/new_platform');
@@ -87,7 +86,6 @@ describe('Lens App', () => {
     editorFrame: EditorFrameInstance;
     data: typeof dataStartMock;
     core: typeof core;
-    dataShim: DataStart;
     storage: Storage;
     docId?: string;
     docStorage: SavedObjectStore;
@@ -134,7 +132,6 @@ describe('Lens App', () => {
       editorFrame: EditorFrameInstance;
       data: typeof dataStartMock;
       core: typeof core;
-      dataShim: DataStart;
       storage: Storage;
       docId?: string;
       docStorage: SavedObjectStore;
@@ -332,7 +329,6 @@ describe('Lens App', () => {
         editorFrame: EditorFrameInstance;
         data: typeof dataStartMock;
         core: typeof core;
-        dataShim: DataStart;
         storage: Storage;
         docId?: string;
         docStorage: SavedObjectStore;
@@ -648,7 +644,6 @@ describe('Lens App', () => {
       editorFrame: EditorFrameInstance;
       data: typeof dataStartMock;
       core: typeof core;
-      dataShim: DataStart;
       storage: Storage;
       docId?: string;
       docStorage: SavedObjectStore;
diff --git a/x-pack/legacy/plugins/lens/public/indexpattern_datasource/dimension_panel/dimension_panel.test.tsx b/x-pack/legacy/plugins/lens/public/indexpattern_datasource/dimension_panel/dimension_panel.test.tsx
index 41c317ccab290..f4485774bc942 100644
--- a/x-pack/legacy/plugins/lens/public/indexpattern_datasource/dimension_panel/dimension_panel.test.tsx
+++ b/x-pack/legacy/plugins/lens/public/indexpattern_datasource/dimension_panel/dimension_panel.test.tsx
@@ -34,12 +34,6 @@ jest.mock('ui/new_platform');
 jest.mock('../loader');
 jest.mock('../state_helpers');
 
-// Used by indexpattern plugin, which is a dependency of a dependency
-jest.mock('ui/chrome');
-// Contains old and new platform data plugins, used for interpreter and filter ratio
-jest.mock('ui/new_platform');
-jest.mock('plugins/data/setup', () => ({ data: { query: { ui: {} } } }));
-
 const expectedIndexPatterns = {
   1: {
     id: '1',
diff --git a/x-pack/legacy/plugins/lens/public/indexpattern_datasource/indexpattern_suggestions.test.tsx b/x-pack/legacy/plugins/lens/public/indexpattern_datasource/indexpattern_suggestions.test.tsx
index e86a16c1af9d6..4e48d0c0987b5 100644
--- a/x-pack/legacy/plugins/lens/public/indexpattern_datasource/indexpattern_suggestions.test.tsx
+++ b/x-pack/legacy/plugins/lens/public/indexpattern_datasource/indexpattern_suggestions.test.tsx
@@ -12,13 +12,9 @@ import {
   getDatasourceSuggestionsFromCurrentState,
 } from './indexpattern_suggestions';
 
+jest.mock('ui/new_platform');
 jest.mock('./loader');
 jest.mock('../id_generator');
-// chrome, notify, storage are used by ./plugin
-jest.mock('ui/chrome');
-// Contains old and new platform data plugins, used for interpreter and filter ratio
-jest.mock('ui/new_platform');
-jest.mock('plugins/data/setup', () => ({ data: { query: { ui: {} } } }));
 
 const expectedIndexPatterns = {
   1: {

From 85615bdb3f30da61882501a7a20a8e2dcb1af55b Mon Sep 17 00:00:00 2001
From: Wylie Conlon <william.conlon@elastic.co>
Date: Mon, 23 Mar 2020 11:32:07 -0400
Subject: [PATCH 014/179] Fix formatter on range aggregation (#58651)

* Fix formatter on range aggregation

* Fix test that was using unformatted byte ranges

* Fix test

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 .../data/public/field_formats/utils/deserialize.ts   |  3 ++-
 test/functional/apps/visualize/_data_table.js        | 12 ++++++------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/plugins/data/public/field_formats/utils/deserialize.ts b/src/plugins/data/public/field_formats/utils/deserialize.ts
index c735ad196fbee..840e023a11589 100644
--- a/src/plugins/data/public/field_formats/utils/deserialize.ts
+++ b/src/plugins/data/public/field_formats/utils/deserialize.ts
@@ -70,7 +70,8 @@ export const deserializeFieldFormat: FormatFactory = function(
   const { id } = mapping;
   if (id === 'range') {
     const RangeFormat = FieldFormat.from((range: any) => {
-      const format = getFieldFormat(this, id, mapping.params);
+      const nestedFormatter = mapping.params as SerializedFieldFormat;
+      const format = getFieldFormat(this, nestedFormatter.id, nestedFormatter.params);
       const gte = '\u2265';
       const lt = '\u003c';
       return i18n.translate('data.aggTypes.buckets.ranges.rangesFormatMessage', {
diff --git a/test/functional/apps/visualize/_data_table.js b/test/functional/apps/visualize/_data_table.js
index 0a9ff1e77a2ef..a6305e158007d 100644
--- a/test/functional/apps/visualize/_data_table.js
+++ b/test/functional/apps/visualize/_data_table.js
@@ -99,9 +99,9 @@ export default function({ getService, getPageObjects }) {
       async function expectValidTableData() {
         const data = await PageObjects.visChart.getTableVisData();
         expect(data.trim().split('\n')).to.be.eql([
-          '≥ 0 and < 1000',
+          '≥ 0B and < 1,000B',
           '1,351 64.7%',
-          '≥ 1000 and < 2000',
+          '≥ 1,000B and < 1.953KB',
           '737 35.3%',
         ]);
       }
@@ -144,9 +144,9 @@ export default function({ getService, getPageObjects }) {
 
       const data = await PageObjects.visChart.getTableVisData();
       expect(data.trim().split('\n')).to.be.eql([
-        '≥ 0 and < 1000',
+        '≥ 0B and < 1,000B',
         '344.094B',
-        '≥ 1000 and < 2000',
+        '≥ 1,000B and < 1.953KB',
         '1.697KB',
       ]);
     });
@@ -248,9 +248,9 @@ export default function({ getService, getPageObjects }) {
       await PageObjects.visEditor.clickGo();
       const data = await PageObjects.visChart.getTableVisData();
       expect(data.trim().split('\n')).to.be.eql([
-        '≥ 0 and < 1000',
+        '≥ 0B and < 1,000B',
         '1,351',
-        '≥ 1000 and < 2000',
+        '≥ 1,000B and < 1.953KB',
         '737',
       ]);
     });

From 1b583a2e27174c5e81367da352aa8ae61534965a Mon Sep 17 00:00:00 2001
From: Daniil Suleiman <31325372+sulemanof@users.noreply.github.com>
Date: Mon, 23 Mar 2020 18:42:04 +0300
Subject: [PATCH 015/179] [TSVB] Fix percentiles band mode (#60741)

* Fix percentiles band mode

* Add support of bar chart, fix tests

* Use accessor formatters

* Fix tests
---
 .../public/components/aggs/percentile_ui.js   |  2 +
 .../public/visualizations/constants/chart.js  |  1 +
 .../timeseries/decorators/area_decorator.js   |  7 ++-
 .../timeseries/decorators/bar_decorator.js    |  7 ++-
 .../visualizations/views/timeseries/index.js  |  6 +++
 .../response_processors/series/percentile.js  | 51 ++++++++++---------
 .../series/percentile.test.js                 | 44 +++++-----------
 7 files changed, 61 insertions(+), 57 deletions(-)

diff --git a/src/legacy/core_plugins/vis_type_timeseries/public/components/aggs/percentile_ui.js b/src/legacy/core_plugins/vis_type_timeseries/public/components/aggs/percentile_ui.js
index b931c8084a61e..f94c2f609da8f 100644
--- a/src/legacy/core_plugins/vis_type_timeseries/public/components/aggs/percentile_ui.js
+++ b/src/legacy/core_plugins/vis_type_timeseries/public/components/aggs/percentile_ui.js
@@ -135,6 +135,8 @@ class PercentilesUi extends Component {
           <EuiFlexItem style={optionsStyle} grow={false}>
             <EuiFieldNumber
               id={htmlId('fillTo')}
+              min={0}
+              max={100}
               step={1}
               onChange={this.handleTextChange(model, 'percentile')}
               value={Number(model.percentile)}
diff --git a/src/legacy/core_plugins/vis_type_timeseries/public/visualizations/constants/chart.js b/src/legacy/core_plugins/vis_type_timeseries/public/visualizations/constants/chart.js
index 2e7eae438de12..d5ecbaa2ade06 100644
--- a/src/legacy/core_plugins/vis_type_timeseries/public/visualizations/constants/chart.js
+++ b/src/legacy/core_plugins/vis_type_timeseries/public/visualizations/constants/chart.js
@@ -32,6 +32,7 @@ export const GRID_LINE_CONFIG = {
 export const X_ACCESSOR_INDEX = 0;
 export const STACK_ACCESSORS = [0];
 export const Y_ACCESSOR_INDEXES = [1];
+export const Y0_ACCESSOR_INDEXES = [2];
 
 export const STACKED_OPTIONS = {
   NONE: 'none',
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 923024ff690a4..0afe773266a61 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
@@ -21,7 +21,7 @@ import React from 'react';
 import { ScaleType, AreaSeries } from '@elastic/charts';
 import { getAreaStyles } from '../utils/series_styles';
 import { ChartsEntities } from '../model/charts';
-import { X_ACCESSOR_INDEX, Y_ACCESSOR_INDEXES } from '../../../constants';
+import { X_ACCESSOR_INDEX, Y_ACCESSOR_INDEXES, Y0_ACCESSOR_INDEXES } from '../../../constants';
 
 export function AreaSeriesDecorator({
   seriesId,
@@ -40,6 +40,8 @@ export function AreaSeriesDecorator({
   enableHistogramMode,
   useDefaultGroupDomain,
   sortIndex,
+  y1AccessorFormat,
+  y0AccessorFormat,
 }) {
   const id = seriesId;
   const groupId = seriesGroupId;
@@ -54,6 +56,9 @@ export function AreaSeriesDecorator({
     hideInLegend,
     xAccessor: X_ACCESSOR_INDEX,
     yAccessors: Y_ACCESSOR_INDEXES,
+    y0Accessors: lines.mode === 'band' ? Y0_ACCESSOR_INDEXES : undefined,
+    y1AccessorFormat,
+    y0AccessorFormat,
     stackAccessors,
     stackAsPercentage,
     xScaleType,
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 6d2cd7b8dd935..c979920caac6d 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
@@ -21,7 +21,7 @@ import React from 'react';
 import { ScaleType, BarSeries } from '@elastic/charts';
 import { getBarStyles } from '../utils/series_styles';
 import { ChartsEntities } from '../model/charts';
-import { X_ACCESSOR_INDEX, Y_ACCESSOR_INDEXES } from '../../../constants';
+import { X_ACCESSOR_INDEX, Y_ACCESSOR_INDEXES, Y0_ACCESSOR_INDEXES } from '../../../constants';
 
 export function BarSeriesDecorator({
   seriesId,
@@ -39,6 +39,8 @@ export function BarSeriesDecorator({
   enableHistogramMode,
   useDefaultGroupDomain,
   sortIndex,
+  y1AccessorFormat,
+  y0AccessorFormat,
 }) {
   const id = seriesId;
   const groupId = seriesGroupId;
@@ -53,6 +55,9 @@ export function BarSeriesDecorator({
     hideInLegend,
     xAccessor: X_ACCESSOR_INDEX,
     yAccessors: Y_ACCESSOR_INDEXES,
+    y0Accessors: bars.mode === 'band' ? Y0_ACCESSOR_INDEXES : undefined,
+    y1AccessorFormat,
+    y0AccessorFormat,
     stackAccessors,
     stackAsPercentage,
     xScaleType,
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 5673f560214c7..bec76433eb8ac 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
@@ -156,6 +156,8 @@ export const TimeSeries = ({
             stack,
             points,
             useDefaultGroupDomain,
+            y1AccessorFormat,
+            y0AccessorFormat,
           },
           sortIndex
         ) => {
@@ -182,6 +184,8 @@ export const TimeSeries = ({
                 enableHistogramMode={enableHistogramMode}
                 useDefaultGroupDomain={useDefaultGroupDomain}
                 sortIndex={sortIndex}
+                y1AccessorFormat={y1AccessorFormat}
+                y0AccessorFormat={y0AccessorFormat}
               />
             );
           }
@@ -206,6 +210,8 @@ export const TimeSeries = ({
                 enableHistogramMode={enableHistogramMode}
                 useDefaultGroupDomain={useDefaultGroupDomain}
                 sortIndex={sortIndex}
+                y1AccessorFormat={y1AccessorFormat}
+                y0AccessorFormat={y0AccessorFormat}
               />
             );
           }
diff --git a/src/plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/percentile.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/percentile.js
index 669a96a43ff8d..00fb48c88ec3f 100644
--- a/src/plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/percentile.js
+++ b/src/plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/percentile.js
@@ -17,7 +17,6 @@
  * under the License.
  */
 
-import _ from 'lodash';
 import { getAggValue } from '../../helpers/get_agg_value';
 import { getDefaultDecoration } from '../../helpers/get_default_decoration';
 import { getSplits } from '../../helpers/get_splits';
@@ -35,41 +34,45 @@ export function percentile(resp, panel, series, meta) {
     getSplits(resp, panel, series, meta).forEach(split => {
       metric.percentiles.forEach(percentile => {
         const percentileValue = percentile.value ? percentile.value : 0;
-        const label = `${split.label} (${percentileValue})`;
+        const id = `${split.id}:${percentile.id}`;
         const data = split.timeseries.buckets.map(bucket => {
-          const m = _.assign({}, metric, { percent: percentileValue });
-          return [bucket.key, getAggValue(bucket, m)];
+          const higherMetric = { ...metric, percent: percentileValue };
+          const serieData = [bucket.key, getAggValue(bucket, higherMetric)];
+
+          if (percentile.mode === 'band') {
+            const lowerMetric = { ...metric, percent: percentile.percentile };
+            serieData.push(getAggValue(bucket, lowerMetric));
+          }
+
+          return serieData;
         });
         if (percentile.mode === 'band') {
-          const fillData = split.timeseries.buckets.map(bucket => {
-            const m = _.assign({}, metric, { percent: percentile.percentile });
-            return [bucket.key, getAggValue(bucket, m)];
-          });
           results.push({
-            id: `${split.id}:${percentile.id}`,
+            id,
             color: split.color,
-            label,
+            label: split.label,
             data,
-            lines: { show: true, fill: percentile.shade, lineWidth: 0 },
-            points: { show: false },
-            legend: false,
-            fillBetween: `${split.id}:${percentile.id}:${percentile.percentile}`,
-          });
-          results.push({
-            id: `${split.id}:${percentile.id}:${percentile.percentile}`,
-            color: split.color,
-            label,
-            data: fillData,
-            lines: { show: true, fill: false, lineWidth: 0 },
-            legend: false,
+            lines: {
+              show: series.chart_type === 'line',
+              fill: Number(percentile.shade),
+              lineWidth: 0,
+              mode: 'band',
+            },
+            bars: {
+              show: series.chart_type === 'bar',
+              fill: Number(percentile.shade),
+              mode: 'band',
+            },
             points: { show: false },
+            y1AccessorFormat: ` (${percentileValue})`,
+            y0AccessorFormat: ` (${percentile.percentile})`,
           });
         } else {
           const decoration = getDefaultDecoration(series);
           results.push({
-            id: `${split.id}:${percentile.id}`,
+            id,
             color: split.color,
-            label,
+            label: `${split.label} (${percentileValue})`,
             data,
             ...decoration,
           });
diff --git a/src/plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/percentile.test.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/percentile.test.js
index 9cb08de8dad23..aec1c45cf97e1 100644
--- a/src/plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/percentile.test.js
+++ b/src/plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/percentile.test.js
@@ -89,63 +89,45 @@ describe('percentile(resp, panel, series)', () => {
   test('creates a series', () => {
     const next = results => results;
     const results = percentile(resp, panel, series)(next)([]);
-    expect(results).toHaveLength(3);
+    expect(results).toHaveLength(2);
 
     expect(results[0]).toHaveProperty('id', 'test:10-90');
     expect(results[0]).toHaveProperty('color', 'rgb(255, 0, 0)');
-    expect(results[0]).toHaveProperty('fillBetween', 'test:10-90:90');
-    expect(results[0]).toHaveProperty('label', 'Percentile of cpu (10)');
-    expect(results[0]).toHaveProperty('legend', false);
+    expect(results[0]).toHaveProperty('label', 'Percentile of cpu');
     expect(results[0]).toHaveProperty('lines');
     expect(results[0].lines).toEqual({
       fill: 0.2,
       lineWidth: 0,
       show: true,
+      mode: 'band',
     });
     expect(results[0]).toHaveProperty('points');
     expect(results[0].points).toEqual({ show: false });
     expect(results[0].data).toEqual([
-      [1, 1],
-      [2, 1.2],
+      [1, 1, 5],
+      [2, 1.2, 5.3],
     ]);
 
-    expect(results[1]).toHaveProperty('id', 'test:10-90:90');
+    expect(results[1]).toHaveProperty('id', 'test:50');
     expect(results[1]).toHaveProperty('color', 'rgb(255, 0, 0)');
-    expect(results[1]).toHaveProperty('label', 'Percentile of cpu (10)');
-    expect(results[1]).toHaveProperty('legend', false);
+    expect(results[1]).toHaveProperty('label', 'Percentile of cpu (50)');
+    expect(results[1]).toHaveProperty('stack', false);
     expect(results[1]).toHaveProperty('lines');
     expect(results[1].lines).toEqual({
-      fill: false,
-      lineWidth: 0,
-      show: true,
-    });
-    expect(results[1]).toHaveProperty('points');
-    expect(results[1].points).toEqual({ show: false });
-    expect(results[1].data).toEqual([
-      [1, 5],
-      [2, 5.3],
-    ]);
-
-    expect(results[2]).toHaveProperty('id', 'test:50');
-    expect(results[2]).toHaveProperty('color', 'rgb(255, 0, 0)');
-    expect(results[2]).toHaveProperty('label', 'Percentile of cpu (50)');
-    expect(results[2]).toHaveProperty('stack', false);
-    expect(results[2]).toHaveProperty('lines');
-    expect(results[2].lines).toEqual({
       fill: 0,
       lineWidth: 1,
       show: true,
       steps: false,
     });
-    expect(results[2]).toHaveProperty('bars');
-    expect(results[2].bars).toEqual({
+    expect(results[1]).toHaveProperty('bars');
+    expect(results[1].bars).toEqual({
       fill: 0,
       lineWidth: 1,
       show: false,
     });
-    expect(results[2]).toHaveProperty('points');
-    expect(results[2].points).toEqual({ show: true, lineWidth: 1, radius: 1 });
-    expect(results[2].data).toEqual([
+    expect(results[1]).toHaveProperty('points');
+    expect(results[1].points).toEqual({ show: true, lineWidth: 1, radius: 1 });
+    expect(results[1].data).toEqual([
       [1, 2.5],
       [2, 2.7],
     ]);

From 969811eb207a6d78a70d62f4549fb92f7b5fc700 Mon Sep 17 00:00:00 2001
From: Steph Milovic <stephanie.milovic@elastic.co>
Date: Mon, 23 Mar 2020 09:42:35 -0600
Subject: [PATCH 016/179] [SIEM] [Cases] Update case icons (#60812)

---
 .../public/pages/case/components/all_cases/actions.tsx    | 4 ++--
 .../public/pages/case/components/bulk_actions/index.tsx   | 6 ++++--
 .../siem/public/pages/case/components/case_view/index.tsx | 4 ++--
 .../pages/case/components/user_action_tree/index.tsx      | 4 ++--
 .../case/components/user_action_tree/user_action_item.tsx | 6 +++---
 .../components/user_action_tree/user_action_title.tsx     | 8 ++++----
 6 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/x-pack/legacy/plugins/siem/public/pages/case/components/all_cases/actions.tsx b/x-pack/legacy/plugins/siem/public/pages/case/components/all_cases/actions.tsx
index 6253d431f8401..93536077f3a4c 100644
--- a/x-pack/legacy/plugins/siem/public/pages/case/components/all_cases/actions.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/case/components/all_cases/actions.tsx
@@ -32,7 +32,7 @@ export const getActions = ({
   caseStatus === 'open'
     ? {
         description: i18n.CLOSE_CASE,
-        icon: 'magnet',
+        icon: 'folderCheck',
         name: i18n.CLOSE_CASE,
         onClick: (theCase: Case) =>
           dispatchUpdate({
@@ -46,7 +46,7 @@ export const getActions = ({
       }
     : {
         description: i18n.REOPEN_CASE,
-        icon: 'magnet',
+        icon: 'folderExclamation',
         name: i18n.REOPEN_CASE,
         onClick: (theCase: Case) =>
           dispatchUpdate({
diff --git a/x-pack/legacy/plugins/siem/public/pages/case/components/bulk_actions/index.tsx b/x-pack/legacy/plugins/siem/public/pages/case/components/bulk_actions/index.tsx
index b9da834b929ea..74a255bf5ad49 100644
--- a/x-pack/legacy/plugins/siem/public/pages/case/components/bulk_actions/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/case/components/bulk_actions/index.tsx
@@ -27,8 +27,9 @@ export const getBulkItems = ({
     caseStatus === 'open' ? (
       <EuiContextMenuItem
         data-test-subj="cases-bulk-close-button"
+        disabled={selectedCaseIds.length === 0}
         key={i18n.BULK_ACTION_CLOSE_SELECTED}
-        icon="magnet"
+        icon="folderCheck"
         onClick={() => {
           closePopover();
           updateCaseStatus('closed');
@@ -39,8 +40,9 @@ export const getBulkItems = ({
     ) : (
       <EuiContextMenuItem
         data-test-subj="cases-bulk-open-button"
+        disabled={selectedCaseIds.length === 0}
         key={i18n.BULK_ACTION_OPEN_SELECTED}
-        icon="magnet"
+        icon="folderExclamation"
         onClick={() => {
           closePopover();
           updateCaseStatus('open');
diff --git a/x-pack/legacy/plugins/siem/public/pages/case/components/case_view/index.tsx b/x-pack/legacy/plugins/siem/public/pages/case/components/case_view/index.tsx
index 08af603cb0dbf..0ac3adeb860ff 100644
--- a/x-pack/legacy/plugins/siem/public/pages/case/components/case_view/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/case/components/case_view/index.tsx
@@ -105,7 +105,7 @@ export const CaseComponent = React.memo<CaseProps>(({ caseId, initialData }) =>
             title: i18n.CASE_OPENED,
             buttonLabel: i18n.CLOSE_CASE,
             status: caseData.status,
-            icon: 'checkInCircleFilled',
+            icon: 'folderCheck',
             badgeColor: 'secondary',
             isSelected: false,
           }
@@ -115,7 +115,7 @@ export const CaseComponent = React.memo<CaseProps>(({ caseId, initialData }) =>
             title: i18n.CASE_CLOSED,
             buttonLabel: i18n.REOPEN_CASE,
             status: caseData.status,
-            icon: 'magnet',
+            icon: 'folderExclamation',
             badgeColor: 'danger',
             isSelected: true,
           },
diff --git a/x-pack/legacy/plugins/siem/public/pages/case/components/user_action_tree/index.tsx b/x-pack/legacy/plugins/siem/public/pages/case/components/user_action_tree/index.tsx
index 04697e63b7451..6a3d319561353 100644
--- a/x-pack/legacy/plugins/siem/public/pages/case/components/user_action_tree/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/case/components/user_action_tree/index.tsx
@@ -78,7 +78,7 @@ export const UserActionTree = React.memo(
           id={DescriptionId}
           isEditable={manageMarkdownEditIds.includes(DescriptionId)}
           isLoading={isLoadingDescription}
-          labelAction={i18n.EDIT_DESCRIPTION}
+          labelEditAction={i18n.EDIT_DESCRIPTION}
           labelTitle={i18n.ADDED_DESCRIPTION}
           fullName={caseData.createdBy.fullName ?? caseData.createdBy.username}
           markdown={MarkdownDescription}
@@ -92,7 +92,7 @@ export const UserActionTree = React.memo(
             id={comment.id}
             isEditable={manageMarkdownEditIds.includes(comment.id)}
             isLoading={isLoadingIds.includes(comment.id)}
-            labelAction={i18n.EDIT_COMMENT}
+            labelEditAction={i18n.EDIT_COMMENT}
             labelTitle={i18n.ADDED_COMMENT}
             fullName={comment.createdBy.fullName ?? comment.createdBy.username}
             markdown={
diff --git a/x-pack/legacy/plugins/siem/public/pages/case/components/user_action_tree/user_action_item.tsx b/x-pack/legacy/plugins/siem/public/pages/case/components/user_action_tree/user_action_item.tsx
index 7b99f2ef76ab3..ca73f200f1793 100644
--- a/x-pack/legacy/plugins/siem/public/pages/case/components/user_action_tree/user_action_item.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/case/components/user_action_tree/user_action_item.tsx
@@ -16,7 +16,7 @@ interface UserActionItemProps {
   id: string;
   isEditable: boolean;
   isLoading: boolean;
-  labelAction?: string;
+  labelEditAction?: string;
   labelTitle?: string;
   fullName: string;
   markdown: React.ReactNode;
@@ -71,7 +71,7 @@ export const UserActionItem = ({
   id,
   isEditable,
   isLoading,
-  labelAction,
+  labelEditAction,
   labelTitle,
   fullName,
   markdown,
@@ -94,7 +94,7 @@ export const UserActionItem = ({
             createdAt={createdAt}
             id={id}
             isLoading={isLoading}
-            labelAction={labelAction ?? ''}
+            labelEditAction={labelEditAction ?? ''}
             labelTitle={labelTitle ?? ''}
             userName={userName}
             onEdit={onEdit}
diff --git a/x-pack/legacy/plugins/siem/public/pages/case/components/user_action_tree/user_action_title.tsx b/x-pack/legacy/plugins/siem/public/pages/case/components/user_action_tree/user_action_title.tsx
index 6ad60fb9f963e..0ed081e8852f0 100644
--- a/x-pack/legacy/plugins/siem/public/pages/case/components/user_action_tree/user_action_title.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/case/components/user_action_tree/user_action_title.tsx
@@ -25,7 +25,7 @@ interface UserActionTitleProps {
   createdAt: string;
   id: string;
   isLoading: boolean;
-  labelAction: string;
+  labelEditAction: string;
   labelTitle: string;
   userName: string;
   onEdit: (id: string) => void;
@@ -35,7 +35,7 @@ export const UserActionTitle = ({
   createdAt,
   id,
   isLoading,
-  labelAction,
+  labelEditAction,
   labelTitle,
   userName,
   onEdit,
@@ -43,8 +43,8 @@ export const UserActionTitle = ({
   const propertyActions = useMemo(() => {
     return [
       {
-        iconType: 'documentEdit',
-        label: labelAction,
+        iconType: 'pencil',
+        label: labelEditAction,
         onClick: () => onEdit(id),
       },
     ];

From 938ad3764024f618e01611d7162985e01796b7b5 Mon Sep 17 00:00:00 2001
From: Jean-Louis Leysens <jloleysens@gmail.com>
Date: Mon, 23 Mar 2020 16:47:49 +0100
Subject: [PATCH 017/179] [Upgrade Assistant] Fix edge case where reindex op
 can falsely be seen as stale (#60770)

* Fix edge case where reindex op is can falsely be seen as stale

This is for multiple Kibana workers, to ensure that an item just
coming off the queue is seen as "new" we set a "startedAt" field
which will update the reindex op and give it the full timeout
window.

* Update tests to use new api too

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 .../plugins/upgrade_assistant/common/types.ts | 20 +++++++
 .../server/lib/reindexing/error.ts            |  2 +
 .../server/lib/reindexing/error_symbols.ts    |  1 +
 .../server/lib/reindexing/op_utils.ts         |  3 +
 .../server/lib/reindexing/reindex_service.ts  | 59 +++++++++++++++----
 .../server/lib/reindexing/worker.ts           | 34 +++++++----
 .../routes/reindex_indices/reindex_handler.ts | 12 +---
 .../reindex_indices/reindex_indices.test.ts   |  2 +-
 8 files changed, 98 insertions(+), 35 deletions(-)

diff --git a/x-pack/plugins/upgrade_assistant/common/types.ts b/x-pack/plugins/upgrade_assistant/common/types.ts
index 1114e889882c2..6c1b24b677754 100644
--- a/x-pack/plugins/upgrade_assistant/common/types.ts
+++ b/x-pack/plugins/upgrade_assistant/common/types.ts
@@ -30,7 +30,27 @@ export enum ReindexStatus {
 export const REINDEX_OP_TYPE = 'upgrade-assistant-reindex-operation';
 
 export interface QueueSettings extends SavedObjectAttributes {
+  /**
+   * A Unix timestamp of when the reindex operation was enqueued.
+   *
+   * @remark
+   * This is used by the reindexing scheduler to determine execution
+   * order.
+   */
   queuedAt: number;
+
+  /**
+   * A Unix timestamp of when the reindex operation was started.
+   *
+   * @remark
+   * Updating this field is useful for _also_ updating the saved object "updated_at" field
+   * which is used to determine stale or abandoned reindex operations.
+   *
+   * For now this is used by the reindex worker scheduler to determine whether we have
+   * A queue item at the start of the queue.
+   *
+   */
+  startedAt?: number;
 }
 
 export interface ReindexOptions extends SavedObjectAttributes {
diff --git a/x-pack/plugins/upgrade_assistant/server/lib/reindexing/error.ts b/x-pack/plugins/upgrade_assistant/server/lib/reindexing/error.ts
index 59922abd3e635..b1744c79bc26c 100644
--- a/x-pack/plugins/upgrade_assistant/server/lib/reindexing/error.ts
+++ b/x-pack/plugins/upgrade_assistant/server/lib/reindexing/error.ts
@@ -13,6 +13,7 @@ import {
   ReindexAlreadyInProgress,
   MultipleReindexJobsFound,
   ReindexCannotBeCancelled,
+  ReindexIsNotInQueue,
 } from './error_symbols';
 
 export class ReindexError extends Error {
@@ -32,6 +33,7 @@ export const error = {
   reindexTaskFailed: createErrorFactory(ReindexTaskFailed),
   reindexTaskCannotBeDeleted: createErrorFactory(ReindexTaskCannotBeDeleted),
   reindexAlreadyInProgress: createErrorFactory(ReindexAlreadyInProgress),
+  reindexIsNotInQueue: createErrorFactory(ReindexIsNotInQueue),
   multipleReindexJobsFound: createErrorFactory(MultipleReindexJobsFound),
   reindexCannotBeCancelled: createErrorFactory(ReindexCannotBeCancelled),
 };
diff --git a/x-pack/plugins/upgrade_assistant/server/lib/reindexing/error_symbols.ts b/x-pack/plugins/upgrade_assistant/server/lib/reindexing/error_symbols.ts
index d5e8d643f4595..15d1b1bb9c6ae 100644
--- a/x-pack/plugins/upgrade_assistant/server/lib/reindexing/error_symbols.ts
+++ b/x-pack/plugins/upgrade_assistant/server/lib/reindexing/error_symbols.ts
@@ -11,6 +11,7 @@ export const CannotCreateIndex = Symbol('CannotCreateIndex');
 export const ReindexTaskFailed = Symbol('ReindexTaskFailed');
 export const ReindexTaskCannotBeDeleted = Symbol('ReindexTaskCannotBeDeleted');
 export const ReindexAlreadyInProgress = Symbol('ReindexAlreadyInProgress');
+export const ReindexIsNotInQueue = Symbol('ReindexIsNotInQueue');
 export const ReindexCannotBeCancelled = Symbol('ReindexCannotBeCancelled');
 
 export const MultipleReindexJobsFound = Symbol('MultipleReindexJobsFound');
diff --git a/x-pack/plugins/upgrade_assistant/server/lib/reindexing/op_utils.ts b/x-pack/plugins/upgrade_assistant/server/lib/reindexing/op_utils.ts
index dbed7de13f010..ecba02e0d5466 100644
--- a/x-pack/plugins/upgrade_assistant/server/lib/reindexing/op_utils.ts
+++ b/x-pack/plugins/upgrade_assistant/server/lib/reindexing/op_utils.ts
@@ -50,6 +50,9 @@ const orderQueuedReindexOperations = ({
   ),
 });
 
+export const queuedOpHasStarted = (op: ReindexSavedObject) =>
+  Boolean(op.attributes.reindexOptions?.queueSettings?.startedAt);
+
 export const sortAndOrderReindexOperations = flow(
   sortReindexOperations,
   orderQueuedReindexOperations
diff --git a/x-pack/plugins/upgrade_assistant/server/lib/reindexing/reindex_service.ts b/x-pack/plugins/upgrade_assistant/server/lib/reindexing/reindex_service.ts
index b270998658db8..47b7388131ff1 100644
--- a/x-pack/plugins/upgrade_assistant/server/lib/reindexing/reindex_service.ts
+++ b/x-pack/plugins/upgrade_assistant/server/lib/reindexing/reindex_service.ts
@@ -10,7 +10,6 @@ import { LicensingPluginSetup } from '../../../../licensing/server';
 
 import {
   IndexGroup,
-  ReindexOptions,
   ReindexSavedObject,
   ReindexStatus,
   ReindexStep,
@@ -59,7 +58,10 @@ export interface ReindexService {
    * @param indexName
    * @param opts Additional options when creating a new reindex operation
    */
-  createReindexOperation(indexName: string, opts?: ReindexOptions): Promise<ReindexSavedObject>;
+  createReindexOperation(
+    indexName: string,
+    opts?: { enqueue?: boolean }
+  ): Promise<ReindexSavedObject>;
 
   /**
    * Retrieves all reindex operations that have the given status.
@@ -92,7 +94,21 @@ export interface ReindexService {
    * @param indexName
    * @param opts As with {@link createReindexOperation} we support this setting.
    */
-  resumeReindexOperation(indexName: string, opts?: ReindexOptions): Promise<ReindexSavedObject>;
+  resumeReindexOperation(
+    indexName: string,
+    opts?: { enqueue?: boolean }
+  ): Promise<ReindexSavedObject>;
+
+  /**
+   * Update the update_at field on the reindex operation
+   *
+   * @remark
+   * Currently also sets a startedAt field on the SavedObject, not really used
+   * elsewhere, but is an indication that the object has started being processed.
+   *
+   * @param indexName
+   */
+  startQueuedReindexOperation(indexName: string): Promise<ReindexSavedObject>;
 
   /**
    * Cancel an in-progress reindex operation for a given index. Only allowed when the
@@ -544,7 +560,7 @@ export const reindexServiceFactory = (
       }
     },
 
-    async createReindexOperation(indexName: string, opts?: ReindexOptions) {
+    async createReindexOperation(indexName: string, opts?: { enqueue: boolean }) {
       const indexExists = await callAsUser('indices.exists', { index: indexName });
       if (!indexExists) {
         throw error.indexNotFound(`Index ${indexName} does not exist in this cluster.`);
@@ -566,7 +582,10 @@ export const reindexServiceFactory = (
         }
       }
 
-      return actions.createReindexOp(indexName, opts);
+      return actions.createReindexOp(
+        indexName,
+        opts?.enqueue ? { queueSettings: { queuedAt: Date.now() } } : undefined
+      );
     },
 
     async findReindexOperation(indexName: string) {
@@ -654,7 +673,7 @@ export const reindexServiceFactory = (
       });
     },
 
-    async resumeReindexOperation(indexName: string, opts?: ReindexOptions) {
+    async resumeReindexOperation(indexName: string, opts?: { enqueue: boolean }) {
       const reindexOp = await this.findReindexOperation(indexName);
 
       if (!reindexOp) {
@@ -668,16 +687,30 @@ export const reindexServiceFactory = (
         } else if (op.attributes.status !== ReindexStatus.paused) {
           throw new Error(`Reindex operation must be paused in order to be resumed.`);
         }
-
-        const reindexOptions: ReindexOptions | undefined = opts
-          ? {
-              ...(op.attributes.reindexOptions ?? {}),
-              ...opts,
-            }
-          : undefined;
+        const queueSettings = opts?.enqueue ? { queuedAt: Date.now() } : undefined;
 
         return actions.updateReindexOp(op, {
           status: ReindexStatus.inProgress,
+          reindexOptions: queueSettings ? { queueSettings } : undefined,
+        });
+      });
+    },
+
+    async startQueuedReindexOperation(indexName: string) {
+      const reindexOp = await this.findReindexOperation(indexName);
+
+      if (!reindexOp) {
+        throw error.indexNotFound(`No reindex operation found for index ${indexName}`);
+      }
+
+      if (!reindexOp.attributes.reindexOptions?.queueSettings) {
+        throw error.reindexIsNotInQueue(`Reindex operation ${indexName} is not in the queue.`);
+      }
+
+      return actions.runWhileLocked(reindexOp, async lockedReindexOp => {
+        const { reindexOptions } = lockedReindexOp.attributes;
+        reindexOptions!.queueSettings!.startedAt = Date.now();
+        return actions.updateReindexOp(lockedReindexOp, {
           reindexOptions,
         });
       });
diff --git a/x-pack/plugins/upgrade_assistant/server/lib/reindexing/worker.ts b/x-pack/plugins/upgrade_assistant/server/lib/reindexing/worker.ts
index 482b9f280ad7e..d6051ce46312f 100644
--- a/x-pack/plugins/upgrade_assistant/server/lib/reindexing/worker.ts
+++ b/x-pack/plugins/upgrade_assistant/server/lib/reindexing/worker.ts
@@ -6,11 +6,11 @@
 import { IClusterClient, Logger, SavedObjectsClientContract, FakeRequest } from 'src/core/server';
 import moment from 'moment';
 import { ReindexSavedObject, ReindexStatus } from '../../../common/types';
-import { CredentialStore } from './credential_store';
+import { Credential, CredentialStore } from './credential_store';
 import { reindexActionsFactory } from './reindex_actions';
 import { ReindexService, reindexServiceFactory } from './reindex_service';
 import { LicensingPluginSetup } from '../../../../licensing/server';
-import { sortAndOrderReindexOperations } from './op_utils';
+import { sortAndOrderReindexOperations, queuedOpHasStarted } from './op_utils';
 
 const POLL_INTERVAL = 30000;
 // If no nodes have been able to update this index in 2 minutes (due to missing credentials), set to paused.
@@ -128,17 +128,34 @@ export class ReindexWorker {
     }
   };
 
+  private getCredentialScopedReindexService = (credential: Credential) => {
+    const fakeRequest: FakeRequest = { headers: credential };
+    const scopedClusterClient = this.clusterClient.asScoped(fakeRequest);
+    const callAsCurrentUser = scopedClusterClient.callAsCurrentUser.bind(scopedClusterClient);
+    const actions = reindexActionsFactory(this.client, callAsCurrentUser);
+    return reindexServiceFactory(callAsCurrentUser, actions, this.log, this.licensing);
+  };
+
   private updateInProgressOps = async () => {
     try {
       const inProgressOps = await this.reindexService.findAllByStatus(ReindexStatus.inProgress);
       const { parallel, queue } = sortAndOrderReindexOperations(inProgressOps);
 
-      const [firstOpInQueue] = queue;
+      let [firstOpInQueue] = queue;
 
-      if (firstOpInQueue) {
+      if (firstOpInQueue && !queuedOpHasStarted(firstOpInQueue)) {
         this.log.debug(
           `Queue detected; current length ${queue.length}, current item ReindexOperation(id: ${firstOpInQueue.id}, indexName: ${firstOpInQueue.attributes.indexName})`
         );
+        const credential = this.credentialStore.get(firstOpInQueue);
+        if (credential) {
+          const service = this.getCredentialScopedReindexService(credential);
+          firstOpInQueue = await service.startQueuedReindexOperation(
+            firstOpInQueue.attributes.indexName
+          );
+          // Re-associate the credentials
+          this.credentialStore.set(firstOpInQueue, credential);
+        }
       }
 
       this.inProgressOps = parallel.concat(firstOpInQueue ? [firstOpInQueue] : []);
@@ -173,14 +190,7 @@ export class ReindexWorker {
       }
     }
 
-    // Setup a ReindexService specific to these credentials.
-    const fakeRequest: FakeRequest = { headers: credential };
-
-    const scopedClusterClient = this.clusterClient.asScoped(fakeRequest);
-    const callAsCurrentUser = scopedClusterClient.callAsCurrentUser.bind(scopedClusterClient);
-    const actions = reindexActionsFactory(this.client, callAsCurrentUser);
-
-    const service = reindexServiceFactory(callAsCurrentUser, actions, this.log, this.licensing);
+    const service = this.getCredentialScopedReindexService(credential);
     reindexOp = await swallowExceptions(service.processNextStep, this.log)(reindexOp);
 
     // Update credential store with most recent state.
diff --git a/x-pack/plugins/upgrade_assistant/server/routes/reindex_indices/reindex_handler.ts b/x-pack/plugins/upgrade_assistant/server/routes/reindex_indices/reindex_handler.ts
index e640d03791cce..74c349d894839 100644
--- a/x-pack/plugins/upgrade_assistant/server/routes/reindex_indices/reindex_handler.ts
+++ b/x-pack/plugins/upgrade_assistant/server/routes/reindex_indices/reindex_handler.ts
@@ -8,7 +8,7 @@ import { IScopedClusterClient, Logger, SavedObjectsClientContract } from 'kibana
 
 import { LicensingPluginSetup } from '../../../../licensing/server';
 
-import { ReindexOperation, ReindexOptions, ReindexStatus } from '../../../common/types';
+import { ReindexOperation, ReindexStatus } from '../../../common/types';
 
 import { reindexActionsFactory } from '../../lib/reindexing/reindex_actions';
 import { reindexServiceFactory } from '../../lib/reindexing';
@@ -53,17 +53,11 @@ export const reindexHandler = async ({
 
   const existingOp = await reindexService.findReindexOperation(indexName);
 
-  const opts: ReindexOptions | undefined = reindexOptions
-    ? {
-        queueSettings: reindexOptions.enqueue ? { queuedAt: Date.now() } : undefined,
-      }
-    : undefined;
-
   // If the reindexOp already exists and it's paused, resume it. Otherwise create a new one.
   const reindexOp =
     existingOp && existingOp.attributes.status === ReindexStatus.paused
-      ? await reindexService.resumeReindexOperation(indexName, opts)
-      : await reindexService.createReindexOperation(indexName, opts);
+      ? await reindexService.resumeReindexOperation(indexName, reindexOptions)
+      : await reindexService.createReindexOperation(indexName, reindexOptions);
 
   // Add users credentials for the worker to use
   credentialStore.set(reindexOp, headers);
diff --git a/x-pack/plugins/upgrade_assistant/server/routes/reindex_indices/reindex_indices.test.ts b/x-pack/plugins/upgrade_assistant/server/routes/reindex_indices/reindex_indices.test.ts
index df8b2fa80a25a..e739531e0e22c 100644
--- a/x-pack/plugins/upgrade_assistant/server/routes/reindex_indices/reindex_indices.test.ts
+++ b/x-pack/plugins/upgrade_assistant/server/routes/reindex_indices/reindex_indices.test.ts
@@ -261,7 +261,7 @@ describe('reindex API', () => {
 
   describe('POST /api/upgrade_assistant/reindex/batch', () => {
     const queueSettingsArg = {
-      queueSettings: { queuedAt: expect.any(Number) },
+      enqueue: true,
     };
     it('creates a collection of index operations', async () => {
       mockReindexService.createReindexOperation

From 05c995a939a8a8fea80f2e5447e5ce43648f9f07 Mon Sep 17 00:00:00 2001
From: Devon Thomson <devon.thomson@hotmail.com>
Date: Mon, 23 Mar 2020 11:53:51 -0400
Subject: [PATCH 018/179] Support Histogram Data Type (#59387)

Added the histogram field type to Kibana, to be used in the percentiles, percentiles ranks, and median aggregations.
---
 ...ugin-plugins-data-public.es_field_types.md |   1 +
 ...gin-plugins-data-public.kbn_field_types.md |   1 +
 ...ugin-plugins-data-server.es_field_types.md |   1 +
 ...gin-plugins-data-server.kbn_field_types.md |   1 +
 .../__snapshots__/field_editor.test.js.snap   |   4 +
 .../kbn_field_types/kbn_field_types.test.ts   |   1 +
 .../kbn_field_types_factory.ts                |   5 +
 .../data/common/kbn_field_types/types.ts      |   3 +
 src/plugins/data/public/public.api.md         |   4 +
 .../public/search/aggs/metrics/cardinality.ts |   3 +
 .../data/public/search/aggs/metrics/median.ts |   2 +-
 .../search/aggs/metrics/percentile_ranks.ts   |   2 +-
 .../public/search/aggs/metrics/percentiles.ts |   2 +-
 .../public/search/aggs/metrics/top_hit.ts     |   4 +-
 src/plugins/data/server/server.api.md         |   4 +
 .../test/functional/apps/visualize/index.ts   |   1 +
 .../apps/visualize/precalculated_histogram.ts |  60 ++++++
 .../pre_calculated_histogram/data.json        | 197 ++++++++++++++++++
 .../pre_calculated_histogram/mappings.json    |  29 +++
 19 files changed, 321 insertions(+), 4 deletions(-)
 create mode 100644 x-pack/test/functional/apps/visualize/precalculated_histogram.ts
 create mode 100644 x-pack/test/functional/es_archives/pre_calculated_histogram/data.json
 create mode 100644 x-pack/test/functional/es_archives/pre_calculated_histogram/mappings.json

diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.es_field_types.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.es_field_types.md
index e7341caf7b3cd..c5e01715534d1 100644
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.es_field_types.md
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.es_field_types.md
@@ -30,6 +30,7 @@ export declare enum ES_FIELD_TYPES
 |  GEO\_POINT | <code>&quot;geo_point&quot;</code> |  |
 |  GEO\_SHAPE | <code>&quot;geo_shape&quot;</code> |  |
 |  HALF\_FLOAT | <code>&quot;half_float&quot;</code> |  |
+|  HISTOGRAM | <code>&quot;histogram&quot;</code> |  |
 |  INTEGER | <code>&quot;integer&quot;</code> |  |
 |  IP | <code>&quot;ip&quot;</code> |  |
 |  KEYWORD | <code>&quot;keyword&quot;</code> |  |
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.kbn_field_types.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.kbn_field_types.md
index e5ae8ffbd2877..30c3aa946c1ce 100644
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.kbn_field_types.md
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.kbn_field_types.md
@@ -23,6 +23,7 @@ export declare enum KBN_FIELD_TYPES
 |  DATE | <code>&quot;date&quot;</code> |  |
 |  GEO\_POINT | <code>&quot;geo_point&quot;</code> |  |
 |  GEO\_SHAPE | <code>&quot;geo_shape&quot;</code> |  |
+|  HISTOGRAM | <code>&quot;histogram&quot;</code> |  |
 |  IP | <code>&quot;ip&quot;</code> |  |
 |  MURMUR3 | <code>&quot;murmur3&quot;</code> |  |
 |  NESTED | <code>&quot;nested&quot;</code> |  |
diff --git a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.es_field_types.md b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.es_field_types.md
index 81a7cbca77c48..d071955f4f522 100644
--- a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.es_field_types.md
+++ b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.es_field_types.md
@@ -30,6 +30,7 @@ export declare enum ES_FIELD_TYPES
 |  GEO\_POINT | <code>&quot;geo_point&quot;</code> |  |
 |  GEO\_SHAPE | <code>&quot;geo_shape&quot;</code> |  |
 |  HALF\_FLOAT | <code>&quot;half_float&quot;</code> |  |
+|  HISTOGRAM | <code>&quot;histogram&quot;</code> |  |
 |  INTEGER | <code>&quot;integer&quot;</code> |  |
 |  IP | <code>&quot;ip&quot;</code> |  |
 |  KEYWORD | <code>&quot;keyword&quot;</code> |  |
diff --git a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.kbn_field_types.md b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.kbn_field_types.md
index 40b81d2f6ac4d..a0a64190497c8 100644
--- a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.kbn_field_types.md
+++ b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.kbn_field_types.md
@@ -23,6 +23,7 @@ export declare enum KBN_FIELD_TYPES
 |  DATE | <code>&quot;date&quot;</code> |  |
 |  GEO\_POINT | <code>&quot;geo_point&quot;</code> |  |
 |  GEO\_SHAPE | <code>&quot;geo_shape&quot;</code> |  |
+|  HISTOGRAM | <code>&quot;histogram&quot;</code> |  |
 |  IP | <code>&quot;ip&quot;</code> |  |
 |  MURMUR3 | <code>&quot;murmur3&quot;</code> |  |
 |  NESTED | <code>&quot;nested&quot;</code> |  |
diff --git a/src/legacy/ui/public/field_editor/__snapshots__/field_editor.test.js.snap b/src/legacy/ui/public/field_editor/__snapshots__/field_editor.test.js.snap
index 6c454370f59f5..19d12f4bbbd4c 100644
--- a/src/legacy/ui/public/field_editor/__snapshots__/field_editor.test.js.snap
+++ b/src/legacy/ui/public/field_editor/__snapshots__/field_editor.test.js.snap
@@ -945,6 +945,10 @@ exports[`FieldEditor should show deprecated lang warning 1`] = `
               "text": "_source",
               "value": "_source",
             },
+            Object {
+              "text": "histogram",
+              "value": "histogram",
+            },
             Object {
               "text": "conflict",
               "value": "conflict",
diff --git a/src/plugins/data/common/kbn_field_types/kbn_field_types.test.ts b/src/plugins/data/common/kbn_field_types/kbn_field_types.test.ts
index 09fc4555992a8..a3fe19fa9b2fc 100644
--- a/src/plugins/data/common/kbn_field_types/kbn_field_types.test.ts
+++ b/src/plugins/data/common/kbn_field_types/kbn_field_types.test.ts
@@ -87,6 +87,7 @@ describe('utils/kbn_field_types', () => {
         KBN_FIELD_TYPES.DATE,
         KBN_FIELD_TYPES.GEO_POINT,
         KBN_FIELD_TYPES.GEO_SHAPE,
+        KBN_FIELD_TYPES.HISTOGRAM,
         KBN_FIELD_TYPES.IP,
         KBN_FIELD_TYPES.MURMUR3,
         KBN_FIELD_TYPES.NESTED,
diff --git a/src/plugins/data/common/kbn_field_types/kbn_field_types_factory.ts b/src/plugins/data/common/kbn_field_types/kbn_field_types_factory.ts
index 192e8bc4f3727..cb9357eb9865e 100644
--- a/src/plugins/data/common/kbn_field_types/kbn_field_types_factory.ts
+++ b/src/plugins/data/common/kbn_field_types/kbn_field_types_factory.ts
@@ -95,6 +95,11 @@ export const createKbnFieldTypes = (): KbnFieldType[] => [
     name: KBN_FIELD_TYPES._SOURCE,
     esTypes: [ES_FIELD_TYPES._SOURCE],
   }),
+  new KbnFieldType({
+    name: KBN_FIELD_TYPES.HISTOGRAM,
+    filterable: true,
+    esTypes: [ES_FIELD_TYPES.HISTOGRAM],
+  }),
   new KbnFieldType({
     name: KBN_FIELD_TYPES.CONFLICT,
   }),
diff --git a/src/plugins/data/common/kbn_field_types/types.ts b/src/plugins/data/common/kbn_field_types/types.ts
index 11c62e8f86dce..acd7a36b01fb3 100644
--- a/src/plugins/data/common/kbn_field_types/types.ts
+++ b/src/plugins/data/common/kbn_field_types/types.ts
@@ -59,6 +59,8 @@ export enum ES_FIELD_TYPES {
   ATTACHMENT = 'attachment',
   TOKEN_COUNT = 'token_count',
   MURMUR3 = 'murmur3',
+
+  HISTOGRAM = 'histogram',
 }
 
 /** @public **/
@@ -77,4 +79,5 @@ export enum KBN_FIELD_TYPES {
   CONFLICT = 'conflict',
   OBJECT = 'object',
   NESTED = 'nested',
+  HISTOGRAM = 'histogram',
 }
diff --git a/src/plugins/data/public/public.api.md b/src/plugins/data/public/public.api.md
index dad3a8e639bc5..fac16973f92a3 100644
--- a/src/plugins/data/public/public.api.md
+++ b/src/plugins/data/public/public.api.md
@@ -284,6 +284,8 @@ export enum ES_FIELD_TYPES {
     // (undocumented)
     HALF_FLOAT = "half_float",
     // (undocumented)
+    HISTOGRAM = "histogram",
+    // (undocumented)
     _ID = "_id",
     // (undocumented)
     _INDEX = "_index",
@@ -1126,6 +1128,8 @@ export enum KBN_FIELD_TYPES {
     // (undocumented)
     GEO_SHAPE = "geo_shape",
     // (undocumented)
+    HISTOGRAM = "histogram",
+    // (undocumented)
     IP = "ip",
     // (undocumented)
     MURMUR3 = "murmur3",
diff --git a/src/plugins/data/public/search/aggs/metrics/cardinality.ts b/src/plugins/data/public/search/aggs/metrics/cardinality.ts
index aa41307b2a052..88cdf3175665e 100644
--- a/src/plugins/data/public/search/aggs/metrics/cardinality.ts
+++ b/src/plugins/data/public/search/aggs/metrics/cardinality.ts
@@ -45,6 +45,9 @@ export const cardinalityMetricAgg = new MetricAggType({
     {
       name: 'field',
       type: 'field',
+      filterFieldTypes: Object.values(KBN_FIELD_TYPES).filter(
+        type => type !== KBN_FIELD_TYPES.HISTOGRAM
+      ),
     },
   ],
 });
diff --git a/src/plugins/data/public/search/aggs/metrics/median.ts b/src/plugins/data/public/search/aggs/metrics/median.ts
index f2636d52e3484..faa0694cd5312 100644
--- a/src/plugins/data/public/search/aggs/metrics/median.ts
+++ b/src/plugins/data/public/search/aggs/metrics/median.ts
@@ -40,7 +40,7 @@ export const medianMetricAgg = new MetricAggType({
     {
       name: 'field',
       type: 'field',
-      filterFieldTypes: [KBN_FIELD_TYPES.NUMBER, KBN_FIELD_TYPES.DATE],
+      filterFieldTypes: [KBN_FIELD_TYPES.NUMBER, KBN_FIELD_TYPES.DATE, KBN_FIELD_TYPES.HISTOGRAM],
       write(agg, output) {
         output.params.field = agg.getParam('field').name;
         output.params.percents = [50];
diff --git a/src/plugins/data/public/search/aggs/metrics/percentile_ranks.ts b/src/plugins/data/public/search/aggs/metrics/percentile_ranks.ts
index 71b1c1415d98e..7dc0f70ea7b80 100644
--- a/src/plugins/data/public/search/aggs/metrics/percentile_ranks.ts
+++ b/src/plugins/data/public/search/aggs/metrics/percentile_ranks.ts
@@ -59,7 +59,7 @@ export const percentileRanksMetricAgg = new MetricAggType<IPercentileRanksAggCon
     {
       name: 'field',
       type: 'field',
-      filterFieldTypes: KBN_FIELD_TYPES.NUMBER,
+      filterFieldTypes: [KBN_FIELD_TYPES.NUMBER, KBN_FIELD_TYPES.HISTOGRAM],
     },
     {
       name: 'values',
diff --git a/src/plugins/data/public/search/aggs/metrics/percentiles.ts b/src/plugins/data/public/search/aggs/metrics/percentiles.ts
index 004918666f622..a39d68248d608 100644
--- a/src/plugins/data/public/search/aggs/metrics/percentiles.ts
+++ b/src/plugins/data/public/search/aggs/metrics/percentiles.ts
@@ -54,7 +54,7 @@ export const percentilesMetricAgg = new MetricAggType<IPercentileAggConfig>({
     {
       name: 'field',
       type: 'field',
-      filterFieldTypes: [KBN_FIELD_TYPES.NUMBER, KBN_FIELD_TYPES.DATE],
+      filterFieldTypes: [KBN_FIELD_TYPES.NUMBER, KBN_FIELD_TYPES.DATE, KBN_FIELD_TYPES.HISTOGRAM],
     },
     {
       name: 'percents',
diff --git a/src/plugins/data/public/search/aggs/metrics/top_hit.ts b/src/plugins/data/public/search/aggs/metrics/top_hit.ts
index 738de6b62bccb..d0c668c577e62 100644
--- a/src/plugins/data/public/search/aggs/metrics/top_hit.ts
+++ b/src/plugins/data/public/search/aggs/metrics/top_hit.ts
@@ -60,7 +60,9 @@ export const topHitMetricAgg = new MetricAggType({
       name: 'field',
       type: 'field',
       onlyAggregatable: false,
-      filterFieldTypes: '*',
+      filterFieldTypes: Object.values(KBN_FIELD_TYPES).filter(
+        type => type !== KBN_FIELD_TYPES.HISTOGRAM
+      ),
       write(agg, output) {
         const field = agg.getParam('field');
         output.params = {};
diff --git a/src/plugins/data/server/server.api.md b/src/plugins/data/server/server.api.md
index 178b2949a9456..5c231cdc05e61 100644
--- a/src/plugins/data/server/server.api.md
+++ b/src/plugins/data/server/server.api.md
@@ -176,6 +176,8 @@ export enum ES_FIELD_TYPES {
     // (undocumented)
     HALF_FLOAT = "half_float",
     // (undocumented)
+    HISTOGRAM = "histogram",
+    // (undocumented)
     _ID = "_id",
     // (undocumented)
     _INDEX = "_index",
@@ -547,6 +549,8 @@ export enum KBN_FIELD_TYPES {
     // (undocumented)
     GEO_SHAPE = "geo_shape",
     // (undocumented)
+    HISTOGRAM = "histogram",
+    // (undocumented)
     IP = "ip",
     // (undocumented)
     MURMUR3 = "murmur3",
diff --git a/x-pack/test/functional/apps/visualize/index.ts b/x-pack/test/functional/apps/visualize/index.ts
index 29b1ef9870d7d..4335690b6a70e 100644
--- a/x-pack/test/functional/apps/visualize/index.ts
+++ b/x-pack/test/functional/apps/visualize/index.ts
@@ -13,5 +13,6 @@ export default function visualize({ loadTestFile }: FtrProviderContext) {
     loadTestFile(require.resolve('./feature_controls/visualize_security'));
     loadTestFile(require.resolve('./feature_controls/visualize_spaces'));
     loadTestFile(require.resolve('./hybrid_visualization'));
+    loadTestFile(require.resolve('./precalculated_histogram'));
   });
 }
diff --git a/x-pack/test/functional/apps/visualize/precalculated_histogram.ts b/x-pack/test/functional/apps/visualize/precalculated_histogram.ts
new file mode 100644
index 0000000000000..5d362d29b640c
--- /dev/null
+++ b/x-pack/test/functional/apps/visualize/precalculated_histogram.ts
@@ -0,0 +1,60 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import expect from '@kbn/expect';
+import { FtrProviderContext } from '../../ftr_provider_context';
+
+export default function({ getService, getPageObjects }: FtrProviderContext) {
+  const esArchiver = getService('esArchiver');
+  const PageObjects = getPageObjects(['common', 'visualize', 'discover', 'visChart', 'visEditor']);
+  const kibanaServer = getService('kibanaServer');
+  const log = getService('log');
+
+  describe('pre_calculated_histogram', function() {
+    before(async function() {
+      log.debug('Starting pre_calculated_histogram before method');
+      await esArchiver.load('pre_calculated_histogram');
+      await kibanaServer.uiSettings.replace({ defaultIndex: 'test-histogram' });
+    });
+
+    after(function() {
+      return esArchiver.unload('pre_calculated_histogram');
+    });
+
+    const initHistogramBarChart = async () => {
+      await PageObjects.visualize.navigateToNewVisualization();
+      await PageObjects.visualize.clickVerticalBarChart();
+      await PageObjects.visualize.clickNewSearch('histogram-test');
+      await PageObjects.visChart.waitForVisualization();
+    };
+
+    const getFieldOptionsForAggregation = async (aggregation: string): Promise<string[]> => {
+      await PageObjects.visEditor.clickBucket('Y-axis', 'metrics');
+      await PageObjects.visEditor.selectAggregation(aggregation, 'metrics');
+      const fieldValues = await PageObjects.visEditor.getField();
+      return fieldValues;
+    };
+
+    it('appears correctly in discover', async function() {
+      await PageObjects.common.navigateToApp('discover');
+      const rowData = await PageObjects.discover.getDocTableIndex(1);
+      expect(rowData.includes('"values": [ 0.3, 1, 3, 4.2, 4.8 ]')).to.be.ok();
+    });
+
+    it('appears in the field options of a Percentiles aggregation', async function() {
+      await initHistogramBarChart();
+      const fieldValues: string[] = await getFieldOptionsForAggregation('Percentiles');
+      log.debug('Percentiles Fields = ' + fieldValues);
+      expect(fieldValues[0]).to.be('histogram-content');
+    });
+
+    it('appears in the field options of a Percentile Ranks aggregation', async function() {
+      const fieldValues: string[] = await getFieldOptionsForAggregation('Percentile Ranks');
+      log.debug('Percentile Ranks Fields = ' + fieldValues);
+      expect(fieldValues[0]).to.be('histogram-content');
+    });
+  });
+}
diff --git a/x-pack/test/functional/es_archives/pre_calculated_histogram/data.json b/x-pack/test/functional/es_archives/pre_calculated_histogram/data.json
new file mode 100644
index 0000000000000..cab1dbdf84483
--- /dev/null
+++ b/x-pack/test/functional/es_archives/pre_calculated_histogram/data.json
@@ -0,0 +1,197 @@
+{
+  "type": "doc",
+  "value": {
+    "id": "index-pattern:histogram-test",
+    "index": ".kibana",
+    "source": {
+      "index-pattern": {
+        "title": "histogram-test",
+        "fields": "[{\"name\":\"_id\",\"type\":\"string\",\"esTypes\":[\"_id\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":false},{\"name\":\"_index\",\"type\":\"string\",\"esTypes\":[\"_index\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":false},{\"name\":\"_score\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":false,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"_source\",\"type\":\"_source\",\"esTypes\":[\"_source\"],\"count\":0,\"scripted\":false,\"searchable\":false,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"_type\",\"type\":\"string\",\"esTypes\":[\"_type\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":false},{\"name\":\"histogram-content\",\"type\":\"histogram\",\"esTypes\":[\"histogram\"],\"count\":0,\"scripted\":false,\"searchable\":false,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"histogram-title\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true}]"
+      },
+      "type": "index-pattern"
+    }
+  }
+}
+
+{
+  "type": "doc",
+  "value": {
+    "id": "5e69404d93193e4074f0ec1a",
+    "index": "histogram-test",
+    "source": {
+      "histogram-title": "incididunt reprehenderit mollit",
+      "histogram-content": {
+        "values": [
+          0.3,
+          1,
+          3,
+          4.2,
+          4.8
+        ],
+        "counts": [
+          237,
+          170,
+          33,
+          149,
+          241
+        ]
+      }
+    }
+  }
+}
+
+{
+  "type": "doc",
+  "value": {
+    "id": "5e69408f2fc61f57fd5bc762",
+    "index": "histogram-test",
+    "source": {
+      "histogram-title": "culpa cillum ullamco",
+      "histogram-content": {
+        "values": [
+          0.5,
+          1,
+          1.2,
+          1.3,
+          2.8,
+          3.9,
+          4.3
+        ],
+        "counts": [
+          113,
+          197,
+          20,
+          66,
+          20,
+          39,
+          178
+        ]
+      }
+    }
+  }
+}
+
+{
+  "type": "doc",
+  "value": {
+    "id": "5e6940b979b57ad343114cc3",
+    "index": "histogram-test",
+    "source": {
+      "histogram-title": "enim veniam et",
+      "histogram-content": {
+        "values": [
+          3.7,
+          4.2
+        ],
+        "counts": [
+          227,
+          141
+        ]
+      }
+    }
+  }
+}
+
+{
+  "type": "doc",
+  "value": {
+    "id": "5e6940d3e95de786eeb7586d",
+    "index": "histogram-test",
+    "source": {
+      "histogram-title": "est incididunt sunt",
+      "histogram-content": {
+        "values": [
+          1.8,
+          2.4,
+          2.6,
+          4.9
+        ],
+        "counts": [
+          92,
+          101,
+          122,
+          244
+        ]
+      }
+    }
+  }
+}
+
+{
+  "type": "doc",
+  "value": {
+    "id": "5e694119fb2f956a822b93b9",
+    "index": "histogram-test",
+    "source": {
+      "histogram-title": "qui qui tempor",
+      "histogram-content": {
+        "values": [
+          0.5,
+          2.1,
+          2.7,
+          3,
+          3.2,
+          3.5,
+          4.2,
+          5
+        ],
+        "counts": [
+          210,
+          168,
+          182,
+          181,
+          97,
+          164,
+          77,
+          2
+        ]
+      }
+    }
+  }
+}
+
+{
+  "type": "doc",
+  "value": {
+    "id": "5e694145ad3c741aa12d6e8e",
+    "index": "histogram-test",
+    "source": {
+      "histogram-title": "ullamco nisi sunt",
+      "histogram-content": {
+        "values": [
+          1.7,
+          4.5,
+          4.8
+        ],
+        "counts": [
+          74,
+          146,
+          141
+        ]
+      }
+    }
+  }
+}
+
+{
+  "type": "doc",
+  "value": {
+    "id": "5e694159d909d9d99b5e12d1",
+    "index": "histogram-test",
+    "source": {
+      "histogram-title": "magna eu incididunt",
+      "histogram-content": {
+        "values": [
+          1,
+          3.4,
+          4.8
+        ],
+        "counts": [
+          103,
+          205,
+          11
+        ]
+      }
+    }
+  }
+}
diff --git a/x-pack/test/functional/es_archives/pre_calculated_histogram/mappings.json b/x-pack/test/functional/es_archives/pre_calculated_histogram/mappings.json
new file mode 100644
index 0000000000000..f616daf9d5ccb
--- /dev/null
+++ b/x-pack/test/functional/es_archives/pre_calculated_histogram/mappings.json
@@ -0,0 +1,29 @@
+{
+  "type": "index",
+  "value": {
+    "aliases": {},
+    "index": "histogram-test",
+    "mappings": {
+      "properties": {
+        "histogram-title": {
+          "fields": {
+            "keyword": {
+              "ignore_above": 256,
+              "type": "keyword"
+            }
+          },
+          "type": "text"
+        },
+        "histogram-content": {
+          "type": "histogram"
+        }
+      }
+    },
+    "settings": {
+      "index": {
+        "number_of_replicas": "0",
+        "number_of_shards": "1"
+      }
+    }
+  }
+}

From cca23c26fc1ca5f439826813c6dc0eb41b12141d Mon Sep 17 00:00:00 2001
From: Brandon Kobel <brandon.kobel@elastic.co>
Date: Mon, 23 Mar 2020 09:03:13 -0700
Subject: [PATCH 019/179] Adding `authc.grantAPIKeyAsInternalUser`  (#60423)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Parsing the Authorization HTTP header to grant API keys

* Using HTTPAuthorizationHeader and BasicHTTPAuthorizationHeaderCredentials

* Adding tests for grantAPIKey

* Adding http_authentication/ folder

* Removing test route

* Using new classes to create the headers we pass to ES

* No longer .toLowerCase() when parsing the scheme from the request

* Updating snapshots

* Update x-pack/plugins/security/server/authentication/http_authentication/http_authorization_header.ts

Co-Authored-By: Aleh Zasypkin <aleh.zasypkin@gmail.com>

* Updating another inline snapshot

* Adding JSDoc

* Renaming `grant` to `grantAsInternalUser`

* Adding forgotten test. Fixing snapshot

* Fixing mock

* Apply suggestions from code review

Co-Authored-By: Aleh Zasypkin <aleh.zasypkin@gmail.com>
Co-Authored-By: Mike Côté <mikecote@users.noreply.github.com>

* Using new classes for changing password

* Removing unneeded asScoped call

Co-authored-by: Aleh Zasypkin <aleh.zasypkin@gmail.com>
Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
Co-authored-by: Mike Côté <mikecote@users.noreply.github.com>
---
 .../server/authentication/api_keys.test.ts    | 83 ++++++++++++++++++
 .../server/authentication/api_keys.ts         | 79 +++++++++++++++++
 .../get_http_authentication_scheme.test.ts    | 58 -------------
 .../get_http_authentication_scheme.ts         | 21 -----
 ...p_authorization_header_credentials.test.ts | 56 ++++++++++++
 ...c_http_authorization_header_credentials.ts | 44 ++++++++++
 .../http_authorization_header.test.ts         | 85 +++++++++++++++++++
 .../http_authorization_header.ts              | 45 ++++++++++
 .../http_authentication/index.ts              |  8 ++
 .../server/authentication/index.mock.ts       |  1 +
 .../server/authentication/index.test.ts       | 18 ++++
 .../security/server/authentication/index.ts   |  5 ++
 .../server/authentication/providers/basic.ts  | 12 ++-
 .../server/authentication/providers/http.ts   | 18 ++--
 .../authentication/providers/kerberos.ts      | 25 ++++--
 .../server/authentication/providers/oidc.ts   | 15 +++-
 .../server/authentication/providers/pki.ts    | 12 ++-
 .../server/authentication/providers/saml.ts   | 15 +++-
 .../server/authentication/providers/token.ts  | 19 +++--
 .../server/elasticsearch_client_plugin.ts     | 18 ++++
 x-pack/plugins/security/server/plugin.test.ts |  1 +
 .../server/routes/users/change_password.ts    | 14 ++-
 22 files changed, 534 insertions(+), 118 deletions(-)
 delete mode 100644 x-pack/plugins/security/server/authentication/get_http_authentication_scheme.test.ts
 delete mode 100644 x-pack/plugins/security/server/authentication/get_http_authentication_scheme.ts
 create mode 100644 x-pack/plugins/security/server/authentication/http_authentication/basic_http_authorization_header_credentials.test.ts
 create mode 100644 x-pack/plugins/security/server/authentication/http_authentication/basic_http_authorization_header_credentials.ts
 create mode 100644 x-pack/plugins/security/server/authentication/http_authentication/http_authorization_header.test.ts
 create mode 100644 x-pack/plugins/security/server/authentication/http_authentication/http_authorization_header.ts
 create mode 100644 x-pack/plugins/security/server/authentication/http_authentication/index.ts

diff --git a/x-pack/plugins/security/server/authentication/api_keys.test.ts b/x-pack/plugins/security/server/authentication/api_keys.test.ts
index bcb212e7bbf94..78b1d5f8e30b8 100644
--- a/x-pack/plugins/security/server/authentication/api_keys.test.ts
+++ b/x-pack/plugins/security/server/authentication/api_keys.test.ts
@@ -15,6 +15,8 @@ import {
 } from '../../../../../src/core/server/mocks';
 import { licenseMock } from '../../common/licensing/index.mock';
 
+const encodeToBase64 = (str: string) => Buffer.from(str).toString('base64');
+
 describe('API Keys', () => {
   let apiKeys: APIKeys;
   let mockClusterClient: jest.Mocked<IClusterClient>;
@@ -81,6 +83,87 @@ describe('API Keys', () => {
     });
   });
 
+  describe('grantAsInternalUser()', () => {
+    it('returns null when security feature is disabled', async () => {
+      mockLicense.isEnabled.mockReturnValue(false);
+      const result = await apiKeys.grantAsInternalUser(httpServerMock.createKibanaRequest());
+      expect(result).toBeNull();
+
+      expect(mockClusterClient.callAsInternalUser).not.toHaveBeenCalled();
+    });
+
+    it('calls callAsInternalUser with proper parameters for the Basic scheme', async () => {
+      mockLicense.isEnabled.mockReturnValue(true);
+      mockClusterClient.callAsInternalUser.mockResolvedValueOnce({
+        id: '123',
+        name: 'key-name',
+        api_key: 'abc123',
+      });
+      const result = await apiKeys.grantAsInternalUser(
+        httpServerMock.createKibanaRequest({
+          headers: {
+            authorization: `Basic ${encodeToBase64('foo:bar')}`,
+          },
+        })
+      );
+      expect(result).toEqual({
+        api_key: 'abc123',
+        id: '123',
+        name: 'key-name',
+      });
+      expect(mockClusterClient.callAsInternalUser).toHaveBeenCalledWith('shield.grantAPIKey', {
+        body: {
+          grant_type: 'password',
+          username: 'foo',
+          password: 'bar',
+        },
+      });
+    });
+
+    it('calls callAsInternalUser with proper parameters for the Bearer scheme', async () => {
+      mockLicense.isEnabled.mockReturnValue(true);
+      mockClusterClient.callAsInternalUser.mockResolvedValueOnce({
+        id: '123',
+        name: 'key-name',
+        api_key: 'abc123',
+      });
+      const result = await apiKeys.grantAsInternalUser(
+        httpServerMock.createKibanaRequest({
+          headers: {
+            authorization: `Bearer foo-access-token`,
+          },
+        })
+      );
+      expect(result).toEqual({
+        api_key: 'abc123',
+        id: '123',
+        name: 'key-name',
+      });
+      expect(mockClusterClient.callAsInternalUser).toHaveBeenCalledWith('shield.grantAPIKey', {
+        body: {
+          grant_type: 'access_token',
+          access_token: 'foo-access-token',
+        },
+      });
+    });
+
+    it('throw error for other schemes', async () => {
+      mockLicense.isEnabled.mockReturnValue(true);
+      await expect(
+        apiKeys.grantAsInternalUser(
+          httpServerMock.createKibanaRequest({
+            headers: {
+              authorization: `Digest username="foo"`,
+            },
+          })
+        )
+      ).rejects.toThrowErrorMatchingInlineSnapshot(
+        `"Unsupported scheme \\"Digest\\" for granting API Key"`
+      );
+      expect(mockClusterClient.callAsInternalUser).not.toHaveBeenCalled();
+    });
+  });
+
   describe('invalidate()', () => {
     it('returns null when security feature is disabled', async () => {
       mockLicense.isEnabled.mockReturnValue(false);
diff --git a/x-pack/plugins/security/server/authentication/api_keys.ts b/x-pack/plugins/security/server/authentication/api_keys.ts
index 2b1a93d907471..0d77207e390ae 100644
--- a/x-pack/plugins/security/server/authentication/api_keys.ts
+++ b/x-pack/plugins/security/server/authentication/api_keys.ts
@@ -6,6 +6,8 @@
 
 import { IClusterClient, KibanaRequest, Logger } from '../../../../../src/core/server';
 import { SecurityLicense } from '../../common/licensing';
+import { HTTPAuthorizationHeader } from './http_authentication';
+import { BasicHTTPAuthorizationHeaderCredentials } from './http_authentication';
 
 /**
  * Represents the options to create an APIKey class instance that will be
@@ -26,6 +28,13 @@ export interface CreateAPIKeyParams {
   expiration?: string;
 }
 
+interface GrantAPIKeyParams {
+  grant_type: 'password' | 'access_token';
+  username?: string;
+  password?: string;
+  access_token?: string;
+}
+
 /**
  * Represents the params for invalidating an API key
  */
@@ -58,6 +67,21 @@ export interface CreateAPIKeyResult {
   api_key: string;
 }
 
+export interface GrantAPIKeyResult {
+  /**
+   * Unique id for this API key
+   */
+  id: string;
+  /**
+   * Name for this API key
+   */
+  name: string;
+  /**
+   * Generated API key
+   */
+  api_key: string;
+}
+
 /**
  * The return value when invalidating an API key in Elasticsearch.
  */
@@ -131,6 +155,39 @@ export class APIKeys {
     return result;
   }
 
+  /**
+   * Tries to grant an API key for the current user.
+   * @param request Request instance.
+   */
+  async grantAsInternalUser(request: KibanaRequest) {
+    if (!this.license.isEnabled()) {
+      return null;
+    }
+
+    this.logger.debug('Trying to grant an API key');
+    const authorizationHeader = HTTPAuthorizationHeader.parseFromRequest(request);
+    if (authorizationHeader == null) {
+      throw new Error(
+        `Unable to grant an API Key, request does not contain an authorization header`
+      );
+    }
+    const params = this.getGrantParams(authorizationHeader);
+
+    // User needs `manage_api_key` or `grant_api_key` privilege to use this API
+    let result: GrantAPIKeyResult;
+    try {
+      result = (await this.clusterClient.callAsInternalUser('shield.grantAPIKey', {
+        body: params,
+      })) as GrantAPIKeyResult;
+      this.logger.debug('API key was granted successfully');
+    } catch (e) {
+      this.logger.error(`Failed to grant API key: ${e.message}`);
+      throw e;
+    }
+
+    return result;
+  }
+
   /**
    * Tries to invalidate an API key.
    * @param request Request instance.
@@ -164,4 +221,26 @@ export class APIKeys {
 
     return result;
   }
+
+  private getGrantParams(authorizationHeader: HTTPAuthorizationHeader): GrantAPIKeyParams {
+    if (authorizationHeader.scheme.toLowerCase() === 'bearer') {
+      return {
+        grant_type: 'access_token',
+        access_token: authorizationHeader.credentials,
+      };
+    }
+
+    if (authorizationHeader.scheme.toLowerCase() === 'basic') {
+      const basicCredentials = BasicHTTPAuthorizationHeaderCredentials.parseFromCredentials(
+        authorizationHeader.credentials
+      );
+      return {
+        grant_type: 'password',
+        username: basicCredentials.username,
+        password: basicCredentials.password,
+      };
+    }
+
+    throw new Error(`Unsupported scheme "${authorizationHeader.scheme}" for granting API Key`);
+  }
 }
diff --git a/x-pack/plugins/security/server/authentication/get_http_authentication_scheme.test.ts b/x-pack/plugins/security/server/authentication/get_http_authentication_scheme.test.ts
deleted file mode 100644
index 6a63634394ec0..0000000000000
--- a/x-pack/plugins/security/server/authentication/get_http_authentication_scheme.test.ts
+++ /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 { httpServerMock } from '../../../../../src/core/server/http/http_server.mocks';
-
-import { getHTTPAuthenticationScheme } from './get_http_authentication_scheme';
-
-describe('getHTTPAuthenticationScheme', () => {
-  it('returns `null` if request does not have authorization header', () => {
-    expect(getHTTPAuthenticationScheme(httpServerMock.createKibanaRequest())).toBeNull();
-  });
-
-  it('returns `null` if authorization header value isn not a string', () => {
-    expect(
-      getHTTPAuthenticationScheme(
-        httpServerMock.createKibanaRequest({
-          headers: { authorization: ['Basic xxx', 'Bearer xxx'] as any },
-        })
-      )
-    ).toBeNull();
-  });
-
-  it('returns `null` if authorization header value is an empty string', () => {
-    expect(
-      getHTTPAuthenticationScheme(
-        httpServerMock.createKibanaRequest({ headers: { authorization: '' } })
-      )
-    ).toBeNull();
-  });
-
-  it('returns only scheme portion of the authorization header value in lower case', () => {
-    const headerValueAndSchemeMap = [
-      ['Basic xxx', 'basic'],
-      ['Basic xxx yyy', 'basic'],
-      ['basic xxx', 'basic'],
-      ['basic', 'basic'],
-      // We don't trim leading whitespaces in scheme.
-      [' Basic xxx', ''],
-      ['Negotiate xxx', 'negotiate'],
-      ['negotiate xxx', 'negotiate'],
-      ['negotiate', 'negotiate'],
-      ['ApiKey xxx', 'apikey'],
-      ['apikey xxx', 'apikey'],
-      ['Api Key xxx', 'api'],
-    ];
-
-    for (const [authorization, scheme] of headerValueAndSchemeMap) {
-      expect(
-        getHTTPAuthenticationScheme(
-          httpServerMock.createKibanaRequest({ headers: { authorization } })
-        )
-      ).toBe(scheme);
-    }
-  });
-});
diff --git a/x-pack/plugins/security/server/authentication/get_http_authentication_scheme.ts b/x-pack/plugins/security/server/authentication/get_http_authentication_scheme.ts
deleted file mode 100644
index b9c53f34dbcab..0000000000000
--- a/x-pack/plugins/security/server/authentication/get_http_authentication_scheme.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 { KibanaRequest } from '../../../../../src/core/server';
-
-/**
- * Parses request's `Authorization` HTTP header if present and extracts authentication scheme.
- * https://www.iana.org/assignments/http-authschemes/http-authschemes.xhtml#authschemes
- * @param request Request instance to extract authentication scheme for.
- */
-export function getHTTPAuthenticationScheme(request: KibanaRequest) {
-  const authorizationHeaderValue = request.headers.authorization;
-  if (!authorizationHeaderValue || typeof authorizationHeaderValue !== 'string') {
-    return null;
-  }
-
-  return authorizationHeaderValue.split(/\s+/)[0].toLowerCase();
-}
diff --git a/x-pack/plugins/security/server/authentication/http_authentication/basic_http_authorization_header_credentials.test.ts b/x-pack/plugins/security/server/authentication/http_authentication/basic_http_authorization_header_credentials.test.ts
new file mode 100644
index 0000000000000..bd3c7047e77e7
--- /dev/null
+++ b/x-pack/plugins/security/server/authentication/http_authentication/basic_http_authorization_header_credentials.test.ts
@@ -0,0 +1,56 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { BasicHTTPAuthorizationHeaderCredentials } from './basic_http_authorization_header_credentials';
+
+const encodeToBase64 = (str: string) => Buffer.from(str).toString('base64');
+
+describe('BasicHTTPAuthorizationHeaderCredentials.parseFromRequest()', () => {
+  it('parses username from the left-side of the single colon', () => {
+    const basicCredentials = BasicHTTPAuthorizationHeaderCredentials.parseFromCredentials(
+      encodeToBase64('fOo:bAr')
+    );
+    expect(basicCredentials.username).toBe('fOo');
+  });
+
+  it('parses username from the left-side of the first colon', () => {
+    const basicCredentials = BasicHTTPAuthorizationHeaderCredentials.parseFromCredentials(
+      encodeToBase64('fOo:bAr:bAz')
+    );
+    expect(basicCredentials.username).toBe('fOo');
+  });
+
+  it('parses password from the right-side of the single colon', () => {
+    const basicCredentials = BasicHTTPAuthorizationHeaderCredentials.parseFromCredentials(
+      encodeToBase64('fOo:bAr')
+    );
+    expect(basicCredentials.password).toBe('bAr');
+  });
+
+  it('parses password from the right-side of the first colon', () => {
+    const basicCredentials = BasicHTTPAuthorizationHeaderCredentials.parseFromCredentials(
+      encodeToBase64('fOo:bAr:bAz')
+    );
+    expect(basicCredentials.password).toBe('bAr:bAz');
+  });
+
+  it('throws error if there is no colon', () => {
+    expect(() => {
+      BasicHTTPAuthorizationHeaderCredentials.parseFromCredentials(encodeToBase64('fOobArbAz'));
+    }).toThrowErrorMatchingInlineSnapshot(
+      `"Unable to parse basic authentication credentials without a colon"`
+    );
+  });
+});
+
+describe(`toString()`, () => {
+  it('concatenates username and password using a colon and then base64 encodes the string', () => {
+    const basicCredentials = new BasicHTTPAuthorizationHeaderCredentials('elastic', 'changeme');
+
+    expect(basicCredentials.toString()).toEqual(Buffer.from(`elastic:changeme`).toString('base64')); // I don't like that this so closely mirror the actual implementation
+    expect(basicCredentials.toString()).toEqual('ZWxhc3RpYzpjaGFuZ2VtZQ=='); // and I don't like that this is so opaque. Both together seem reasonable...
+  });
+});
diff --git a/x-pack/plugins/security/server/authentication/http_authentication/basic_http_authorization_header_credentials.ts b/x-pack/plugins/security/server/authentication/http_authentication/basic_http_authorization_header_credentials.ts
new file mode 100644
index 0000000000000..b8c3f1dadf1b2
--- /dev/null
+++ b/x-pack/plugins/security/server/authentication/http_authentication/basic_http_authorization_header_credentials.ts
@@ -0,0 +1,44 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+export class BasicHTTPAuthorizationHeaderCredentials {
+  /**
+   * Username, referred to as the `user-id` in https://tools.ietf.org/html/rfc7617.
+   */
+  readonly username: string;
+
+  /**
+   * Password used to authenticate
+   */
+  readonly password: string;
+
+  constructor(username: string, password: string) {
+    this.username = username;
+    this.password = password;
+  }
+
+  /**
+   * Parses the username and password from the credentials included in a HTTP Authorization header
+   * for the Basic scheme https://tools.ietf.org/html/rfc7617
+   * @param credentials The credentials extracted from the HTTP Authorization header
+   */
+  static parseFromCredentials(credentials: string) {
+    const decoded = Buffer.from(credentials, 'base64').toString();
+    if (decoded.indexOf(':') === -1) {
+      throw new Error('Unable to parse basic authentication credentials without a colon');
+    }
+
+    const [username] = decoded.split(':');
+    // according to https://tools.ietf.org/html/rfc7617, everything
+    // after the first colon is considered to be part of the password
+    const password = decoded.substring(username.length + 1);
+    return new BasicHTTPAuthorizationHeaderCredentials(username, password);
+  }
+
+  toString() {
+    return Buffer.from(`${this.username}:${this.password}`).toString('base64');
+  }
+}
diff --git a/x-pack/plugins/security/server/authentication/http_authentication/http_authorization_header.test.ts b/x-pack/plugins/security/server/authentication/http_authentication/http_authorization_header.test.ts
new file mode 100644
index 0000000000000..d47a0c70f608a
--- /dev/null
+++ b/x-pack/plugins/security/server/authentication/http_authentication/http_authorization_header.test.ts
@@ -0,0 +1,85 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { httpServerMock } from '../../../../../../src/core/server/mocks';
+
+import { HTTPAuthorizationHeader } from './http_authorization_header';
+
+describe('HTTPAuthorizationHeader.parseFromRequest()', () => {
+  it('returns `null` if request does not have authorization header', () => {
+    expect(
+      HTTPAuthorizationHeader.parseFromRequest(httpServerMock.createKibanaRequest())
+    ).toBeNull();
+  });
+
+  it('returns `null` if authorization header value is not a string', () => {
+    expect(
+      HTTPAuthorizationHeader.parseFromRequest(
+        httpServerMock.createKibanaRequest({
+          headers: { authorization: ['Basic xxx', 'Bearer xxx'] as any },
+        })
+      )
+    ).toBeNull();
+  });
+
+  it('returns `null` if authorization header value is an empty string', () => {
+    expect(
+      HTTPAuthorizationHeader.parseFromRequest(
+        httpServerMock.createKibanaRequest({ headers: { authorization: '' } })
+      )
+    ).toBeNull();
+  });
+
+  it('parses scheme portion of the authorization header value', () => {
+    const headerValueAndSchemeMap = [
+      ['Basic xxx', 'Basic'],
+      ['Basic xxx yyy', 'Basic'],
+      ['basic xxx', 'basic'],
+      ['basic', 'basic'],
+      // We don't trim leading whitespaces in scheme.
+      [' Basic xxx', ''],
+      ['Negotiate xxx', 'Negotiate'],
+      ['negotiate xxx', 'negotiate'],
+      ['negotiate', 'negotiate'],
+      ['ApiKey xxx', 'ApiKey'],
+      ['apikey xxx', 'apikey'],
+      ['Api Key xxx', 'Api'],
+    ];
+
+    for (const [authorization, scheme] of headerValueAndSchemeMap) {
+      const header = HTTPAuthorizationHeader.parseFromRequest(
+        httpServerMock.createKibanaRequest({ headers: { authorization } })
+      );
+      expect(header).not.toBeNull();
+      expect(header!.scheme).toBe(scheme);
+    }
+  });
+
+  it('parses credentials portion of the authorization header value', () => {
+    const headerValueAndCredentialsMap = [
+      ['xxx fOo', 'fOo'],
+      ['xxx fOo bAr', 'fOo bAr'],
+      // We don't trim leading whitespaces in scheme.
+      [' xxx fOo', 'xxx fOo'],
+    ];
+
+    for (const [authorization, credentials] of headerValueAndCredentialsMap) {
+      const header = HTTPAuthorizationHeader.parseFromRequest(
+        httpServerMock.createKibanaRequest({ headers: { authorization } })
+      );
+      expect(header).not.toBeNull();
+      expect(header!.credentials).toBe(credentials);
+    }
+  });
+});
+
+describe('toString()', () => {
+  it('concatenates scheme and credentials using a space', () => {
+    const header = new HTTPAuthorizationHeader('Bearer', 'some-access-token');
+
+    expect(header.toString()).toEqual('Bearer some-access-token');
+  });
+});
diff --git a/x-pack/plugins/security/server/authentication/http_authentication/http_authorization_header.ts b/x-pack/plugins/security/server/authentication/http_authentication/http_authorization_header.ts
new file mode 100644
index 0000000000000..bfc757734ec72
--- /dev/null
+++ b/x-pack/plugins/security/server/authentication/http_authentication/http_authorization_header.ts
@@ -0,0 +1,45 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { KibanaRequest } from '../../../../../../src/core/server';
+
+export class HTTPAuthorizationHeader {
+  /**
+   * The authentication scheme. Should be consumed in a case-insensitive manner.
+   * https://www.iana.org/assignments/http-authschemes/http-authschemes.xhtml#authschemes
+   */
+  readonly scheme: string;
+
+  /**
+   * The authentication credentials for the scheme.
+   */
+  readonly credentials: string;
+
+  constructor(scheme: string, credentials: string) {
+    this.scheme = scheme;
+    this.credentials = credentials;
+  }
+
+  /**
+   * Parses request's `Authorization` HTTP header if present.
+   * @param request Request instance to extract the authorization header from.
+   */
+  static parseFromRequest(request: KibanaRequest) {
+    const authorizationHeaderValue = request.headers.authorization;
+    if (!authorizationHeaderValue || typeof authorizationHeaderValue !== 'string') {
+      return null;
+    }
+
+    const [scheme] = authorizationHeaderValue.split(/\s+/);
+    const credentials = authorizationHeaderValue.substring(scheme.length + 1);
+
+    return new HTTPAuthorizationHeader(scheme, credentials);
+  }
+
+  toString() {
+    return `${this.scheme} ${this.credentials}`;
+  }
+}
diff --git a/x-pack/plugins/security/server/authentication/http_authentication/index.ts b/x-pack/plugins/security/server/authentication/http_authentication/index.ts
new file mode 100644
index 0000000000000..94eb8762ecaf0
--- /dev/null
+++ b/x-pack/plugins/security/server/authentication/http_authentication/index.ts
@@ -0,0 +1,8 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+export { BasicHTTPAuthorizationHeaderCredentials } from './basic_http_authorization_header_credentials';
+export { HTTPAuthorizationHeader } from './http_authorization_header';
diff --git a/x-pack/plugins/security/server/authentication/index.mock.ts b/x-pack/plugins/security/server/authentication/index.mock.ts
index c634e2c80c299..512de9626a986 100644
--- a/x-pack/plugins/security/server/authentication/index.mock.ts
+++ b/x-pack/plugins/security/server/authentication/index.mock.ts
@@ -13,6 +13,7 @@ export const authenticationMock = {
     isProviderEnabled: jest.fn(),
     createAPIKey: jest.fn(),
     getCurrentUser: jest.fn(),
+    grantAPIKeyAsInternalUser: jest.fn(),
     invalidateAPIKey: jest.fn(),
     isAuthenticated: jest.fn(),
     getSessionInfo: jest.fn(),
diff --git a/x-pack/plugins/security/server/authentication/index.test.ts b/x-pack/plugins/security/server/authentication/index.test.ts
index 30929ba98d33b..e364dbf39db65 100644
--- a/x-pack/plugins/security/server/authentication/index.test.ts
+++ b/x-pack/plugins/security/server/authentication/index.test.ts
@@ -369,6 +369,24 @@ describe('setupAuthentication()', () => {
     });
   });
 
+  describe('grantAPIKeyAsInternalUser()', () => {
+    let grantAPIKeyAsInternalUser: (request: KibanaRequest) => Promise<CreateAPIKeyResult | null>;
+    beforeEach(async () => {
+      grantAPIKeyAsInternalUser = (await setupAuthentication(mockSetupAuthenticationParams))
+        .grantAPIKeyAsInternalUser;
+    });
+
+    it('calls grantAsInternalUser', async () => {
+      const request = httpServerMock.createKibanaRequest();
+      const apiKeysInstance = jest.requireMock('./api_keys').APIKeys.mock.instances[0];
+      apiKeysInstance.grantAsInternalUser.mockResolvedValueOnce({ api_key: 'foo' });
+      await expect(grantAPIKeyAsInternalUser(request)).resolves.toEqual({
+        api_key: 'foo',
+      });
+      expect(apiKeysInstance.grantAsInternalUser).toHaveBeenCalledWith(request);
+    });
+  });
+
   describe('invalidateAPIKey()', () => {
     let invalidateAPIKey: (
       request: KibanaRequest,
diff --git a/x-pack/plugins/security/server/authentication/index.ts b/x-pack/plugins/security/server/authentication/index.ts
index 1eed53efc6441..8b42b2325ee1e 100644
--- a/x-pack/plugins/security/server/authentication/index.ts
+++ b/x-pack/plugins/security/server/authentication/index.ts
@@ -28,6 +28,10 @@ export {
   CreateAPIKeyParams,
   InvalidateAPIKeyParams,
 } from './api_keys';
+export {
+  BasicHTTPAuthorizationHeaderCredentials,
+  HTTPAuthorizationHeader,
+} from './http_authentication';
 
 interface SetupAuthenticationParams {
   http: CoreSetup['http'];
@@ -169,6 +173,7 @@ export async function setupAuthentication({
     getCurrentUser,
     createAPIKey: (request: KibanaRequest, params: CreateAPIKeyParams) =>
       apiKeys.create(request, params),
+    grantAPIKeyAsInternalUser: (request: KibanaRequest) => apiKeys.grantAsInternalUser(request),
     invalidateAPIKey: (request: KibanaRequest, params: InvalidateAPIKeyParams) =>
       apiKeys.invalidate(request, params),
     isAuthenticated: (request: KibanaRequest) => http.auth.isAuthenticated(request),
diff --git a/x-pack/plugins/security/server/authentication/providers/basic.ts b/x-pack/plugins/security/server/authentication/providers/basic.ts
index ad46aff8afa51..76a9f936eca48 100644
--- a/x-pack/plugins/security/server/authentication/providers/basic.ts
+++ b/x-pack/plugins/security/server/authentication/providers/basic.ts
@@ -8,7 +8,10 @@ import { KibanaRequest } from '../../../../../../src/core/server';
 import { canRedirectRequest } from '../can_redirect_request';
 import { AuthenticationResult } from '../authentication_result';
 import { DeauthenticationResult } from '../deauthentication_result';
-import { getHTTPAuthenticationScheme } from '../get_http_authentication_scheme';
+import {
+  HTTPAuthorizationHeader,
+  BasicHTTPAuthorizationHeaderCredentials,
+} from '../http_authentication';
 import { BaseAuthenticationProvider } from './base';
 
 /**
@@ -54,7 +57,10 @@ export class BasicAuthenticationProvider extends BaseAuthenticationProvider {
     this.logger.debug('Trying to perform a login.');
 
     const authHeaders = {
-      authorization: `Basic ${Buffer.from(`${username}:${password}`).toString('base64')}`,
+      authorization: new HTTPAuthorizationHeader(
+        'Basic',
+        new BasicHTTPAuthorizationHeaderCredentials(username, password).toString()
+      ).toString(),
     };
 
     try {
@@ -76,7 +82,7 @@ export class BasicAuthenticationProvider extends BaseAuthenticationProvider {
   public async authenticate(request: KibanaRequest, state?: ProviderState | null) {
     this.logger.debug(`Trying to authenticate user request to ${request.url.path}.`);
 
-    if (getHTTPAuthenticationScheme(request) != null) {
+    if (HTTPAuthorizationHeader.parseFromRequest(request) != null) {
       this.logger.debug('Cannot authenticate requests with `Authorization` header.');
       return AuthenticationResult.notHandled();
     }
diff --git a/x-pack/plugins/security/server/authentication/providers/http.ts b/x-pack/plugins/security/server/authentication/providers/http.ts
index 57163bf8145b8..6b75ae2d48156 100644
--- a/x-pack/plugins/security/server/authentication/providers/http.ts
+++ b/x-pack/plugins/security/server/authentication/providers/http.ts
@@ -7,7 +7,7 @@
 import { KibanaRequest } from '../../../../../../src/core/server';
 import { AuthenticationResult } from '../authentication_result';
 import { DeauthenticationResult } from '../deauthentication_result';
-import { getHTTPAuthenticationScheme } from '../get_http_authentication_scheme';
+import { HTTPAuthorizationHeader } from '../http_authentication';
 import { AuthenticationProviderOptions, BaseAuthenticationProvider } from './base';
 
 interface HTTPAuthenticationProviderOptions {
@@ -38,7 +38,9 @@ export class HTTPAuthenticationProvider extends BaseAuthenticationProvider {
     if ((httpOptions?.supportedSchemes?.size ?? 0) === 0) {
       throw new Error('Supported schemes should be specified');
     }
-    this.supportedSchemes = httpOptions.supportedSchemes;
+    this.supportedSchemes = new Set(
+      [...httpOptions.supportedSchemes].map(scheme => scheme.toLowerCase())
+    );
   }
 
   /**
@@ -56,26 +58,26 @@ export class HTTPAuthenticationProvider extends BaseAuthenticationProvider {
   public async authenticate(request: KibanaRequest) {
     this.logger.debug(`Trying to authenticate user request to ${request.url.path}.`);
 
-    const authenticationScheme = getHTTPAuthenticationScheme(request);
-    if (authenticationScheme == null) {
+    const authorizationHeader = HTTPAuthorizationHeader.parseFromRequest(request);
+    if (authorizationHeader == null) {
       this.logger.debug('Authorization header is not presented.');
       return AuthenticationResult.notHandled();
     }
 
-    if (!this.supportedSchemes.has(authenticationScheme)) {
-      this.logger.debug(`Unsupported authentication scheme: ${authenticationScheme}`);
+    if (!this.supportedSchemes.has(authorizationHeader.scheme.toLowerCase())) {
+      this.logger.debug(`Unsupported authentication scheme: ${authorizationHeader.scheme}`);
       return AuthenticationResult.notHandled();
     }
 
     try {
       const user = await this.getUser(request);
       this.logger.debug(
-        `Request to ${request.url.path} has been authenticated via authorization header with "${authenticationScheme}" scheme.`
+        `Request to ${request.url.path} has been authenticated via authorization header with "${authorizationHeader.scheme}" scheme.`
       );
       return AuthenticationResult.succeeded(user);
     } catch (err) {
       this.logger.debug(
-        `Failed to authenticate request to ${request.url.path} via authorization header with "${authenticationScheme}" scheme: ${err.message}`
+        `Failed to authenticate request to ${request.url.path} via authorization header with "${authorizationHeader.scheme}" scheme: ${err.message}`
       );
       return AuthenticationResult.failed(err);
     }
diff --git a/x-pack/plugins/security/server/authentication/providers/kerberos.ts b/x-pack/plugins/security/server/authentication/providers/kerberos.ts
index 632a07ca2b21a..dbd0a438d71c9 100644
--- a/x-pack/plugins/security/server/authentication/providers/kerberos.ts
+++ b/x-pack/plugins/security/server/authentication/providers/kerberos.ts
@@ -12,7 +12,7 @@ import {
 } from '../../../../../../src/core/server';
 import { AuthenticationResult } from '../authentication_result';
 import { DeauthenticationResult } from '../deauthentication_result';
-import { getHTTPAuthenticationScheme } from '../get_http_authentication_scheme';
+import { HTTPAuthorizationHeader } from '../http_authentication';
 import { Tokens, TokenPair } from '../tokens';
 import { BaseAuthenticationProvider } from './base';
 
@@ -44,13 +44,13 @@ export class KerberosAuthenticationProvider extends BaseAuthenticationProvider {
   public async authenticate(request: KibanaRequest, state?: ProviderState | null) {
     this.logger.debug(`Trying to authenticate user request to ${request.url.path}.`);
 
-    const authenticationScheme = getHTTPAuthenticationScheme(request);
-    if (authenticationScheme && authenticationScheme !== 'negotiate') {
-      this.logger.debug(`Unsupported authentication scheme: ${authenticationScheme}`);
+    const authorizationHeader = HTTPAuthorizationHeader.parseFromRequest(request);
+    if (authorizationHeader && authorizationHeader.scheme.toLowerCase() !== 'negotiate') {
+      this.logger.debug(`Unsupported authentication scheme: ${authorizationHeader.scheme}`);
       return AuthenticationResult.notHandled();
     }
 
-    let authenticationResult = authenticationScheme
+    let authenticationResult = authorizationHeader
       ? await this.authenticateWithNegotiateScheme(request)
       : AuthenticationResult.notHandled();
 
@@ -175,7 +175,9 @@ export class KerberosAuthenticationProvider extends BaseAuthenticationProvider {
 
     try {
       // Then attempt to query for the user details using the new token
-      const authHeaders = { authorization: `Bearer ${tokens.access_token}` };
+      const authHeaders = {
+        authorization: new HTTPAuthorizationHeader('Bearer', tokens.access_token).toString(),
+      };
       const user = await this.getUser(request, authHeaders);
 
       this.logger.debug('User has been authenticated with new access token');
@@ -205,7 +207,9 @@ export class KerberosAuthenticationProvider extends BaseAuthenticationProvider {
     }
 
     try {
-      const authHeaders = { authorization: `Bearer ${accessToken}` };
+      const authHeaders = {
+        authorization: new HTTPAuthorizationHeader('Bearer', accessToken).toString(),
+      };
       const user = await this.getUser(request, authHeaders);
 
       this.logger.debug('Request has been authenticated via state.');
@@ -242,7 +246,12 @@ export class KerberosAuthenticationProvider extends BaseAuthenticationProvider {
     }
 
     try {
-      const authHeaders = { authorization: `Bearer ${refreshedTokenPair.accessToken}` };
+      const authHeaders = {
+        authorization: new HTTPAuthorizationHeader(
+          'Bearer',
+          refreshedTokenPair.accessToken
+        ).toString(),
+      };
       const user = await this.getUser(request, authHeaders);
 
       this.logger.debug('Request has been authenticated via refreshed token.');
diff --git a/x-pack/plugins/security/server/authentication/providers/oidc.ts b/x-pack/plugins/security/server/authentication/providers/oidc.ts
index d52466826c2be..21bce028b0d98 100644
--- a/x-pack/plugins/security/server/authentication/providers/oidc.ts
+++ b/x-pack/plugins/security/server/authentication/providers/oidc.ts
@@ -10,7 +10,7 @@ import { KibanaRequest } from '../../../../../../src/core/server';
 import { AuthenticationResult } from '../authentication_result';
 import { canRedirectRequest } from '../can_redirect_request';
 import { DeauthenticationResult } from '../deauthentication_result';
-import { getHTTPAuthenticationScheme } from '../get_http_authentication_scheme';
+import { HTTPAuthorizationHeader } from '../http_authentication';
 import { Tokens, TokenPair } from '../tokens';
 import {
   AuthenticationProviderOptions,
@@ -131,7 +131,7 @@ export class OIDCAuthenticationProvider extends BaseAuthenticationProvider {
   public async authenticate(request: KibanaRequest, state?: ProviderState | null) {
     this.logger.debug(`Trying to authenticate user request to ${request.url.path}.`);
 
-    if (getHTTPAuthenticationScheme(request) != null) {
+    if (HTTPAuthorizationHeader.parseFromRequest(request) != null) {
       this.logger.debug('Cannot authenticate requests with `Authorization` header.');
       return AuthenticationResult.notHandled();
     }
@@ -289,7 +289,9 @@ export class OIDCAuthenticationProvider extends BaseAuthenticationProvider {
     }
 
     try {
-      const authHeaders = { authorization: `Bearer ${accessToken}` };
+      const authHeaders = {
+        authorization: new HTTPAuthorizationHeader('Bearer', accessToken).toString(),
+      };
       const user = await this.getUser(request, authHeaders);
 
       this.logger.debug('Request has been authenticated via state.');
@@ -345,7 +347,12 @@ export class OIDCAuthenticationProvider extends BaseAuthenticationProvider {
     }
 
     try {
-      const authHeaders = { authorization: `Bearer ${refreshedTokenPair.accessToken}` };
+      const authHeaders = {
+        authorization: new HTTPAuthorizationHeader(
+          'Bearer',
+          refreshedTokenPair.accessToken
+        ).toString(),
+      };
       const user = await this.getUser(request, authHeaders);
 
       this.logger.debug('Request has been authenticated via refreshed token.');
diff --git a/x-pack/plugins/security/server/authentication/providers/pki.ts b/x-pack/plugins/security/server/authentication/providers/pki.ts
index 252ab8cc67144..db022ff355702 100644
--- a/x-pack/plugins/security/server/authentication/providers/pki.ts
+++ b/x-pack/plugins/security/server/authentication/providers/pki.ts
@@ -9,7 +9,7 @@ import { DetailedPeerCertificate } from 'tls';
 import { KibanaRequest } from '../../../../../../src/core/server';
 import { AuthenticationResult } from '../authentication_result';
 import { DeauthenticationResult } from '../deauthentication_result';
-import { getHTTPAuthenticationScheme } from '../get_http_authentication_scheme';
+import { HTTPAuthorizationHeader } from '../http_authentication';
 import { Tokens } from '../tokens';
 import { BaseAuthenticationProvider } from './base';
 
@@ -45,7 +45,7 @@ export class PKIAuthenticationProvider extends BaseAuthenticationProvider {
   public async authenticate(request: KibanaRequest, state?: ProviderState | null) {
     this.logger.debug(`Trying to authenticate user request to ${request.url.path}.`);
 
-    if (getHTTPAuthenticationScheme(request) != null) {
+    if (HTTPAuthorizationHeader.parseFromRequest(request) != null) {
       this.logger.debug('Cannot authenticate requests with `Authorization` header.');
       return AuthenticationResult.notHandled();
     }
@@ -156,7 +156,9 @@ export class PKIAuthenticationProvider extends BaseAuthenticationProvider {
     }
 
     try {
-      const authHeaders = { authorization: `Bearer ${accessToken}` };
+      const authHeaders = {
+        authorization: new HTTPAuthorizationHeader('Bearer', accessToken).toString(),
+      };
       const user = await this.getUser(request, authHeaders);
 
       this.logger.debug('Request has been authenticated via state.');
@@ -207,7 +209,9 @@ export class PKIAuthenticationProvider extends BaseAuthenticationProvider {
 
     try {
       // Then attempt to query for the user details using the new token
-      const authHeaders = { authorization: `Bearer ${accessToken}` };
+      const authHeaders = {
+        authorization: new HTTPAuthorizationHeader('Bearer', accessToken).toString(),
+      };
       const user = await this.getUser(request, authHeaders);
 
       this.logger.debug('User has been authenticated with new access token');
diff --git a/x-pack/plugins/security/server/authentication/providers/saml.ts b/x-pack/plugins/security/server/authentication/providers/saml.ts
index 1152ee5048699..ddf6814989a49 100644
--- a/x-pack/plugins/security/server/authentication/providers/saml.ts
+++ b/x-pack/plugins/security/server/authentication/providers/saml.ts
@@ -10,7 +10,7 @@ import { KibanaRequest } from '../../../../../../src/core/server';
 import { AuthenticationResult } from '../authentication_result';
 import { DeauthenticationResult } from '../deauthentication_result';
 import { canRedirectRequest } from '../can_redirect_request';
-import { getHTTPAuthenticationScheme } from '../get_http_authentication_scheme';
+import { HTTPAuthorizationHeader } from '../http_authentication';
 import { Tokens, TokenPair } from '../tokens';
 import { AuthenticationProviderOptions, BaseAuthenticationProvider } from './base';
 
@@ -181,7 +181,7 @@ export class SAMLAuthenticationProvider extends BaseAuthenticationProvider {
   public async authenticate(request: KibanaRequest, state?: ProviderState | null) {
     this.logger.debug(`Trying to authenticate user request to ${request.url.path}.`);
 
-    if (getHTTPAuthenticationScheme(request) != null) {
+    if (HTTPAuthorizationHeader.parseFromRequest(request) != null) {
       this.logger.debug('Cannot authenticate requests with `Authorization` header.');
       return AuthenticationResult.notHandled();
     }
@@ -390,7 +390,9 @@ export class SAMLAuthenticationProvider extends BaseAuthenticationProvider {
     }
 
     try {
-      const authHeaders = { authorization: `Bearer ${accessToken}` };
+      const authHeaders = {
+        authorization: new HTTPAuthorizationHeader('Bearer', accessToken).toString(),
+      };
       const user = await this.getUser(request, authHeaders);
 
       this.logger.debug('Request has been authenticated via state.');
@@ -445,7 +447,12 @@ export class SAMLAuthenticationProvider extends BaseAuthenticationProvider {
     }
 
     try {
-      const authHeaders = { authorization: `Bearer ${refreshedTokenPair.accessToken}` };
+      const authHeaders = {
+        authorization: new HTTPAuthorizationHeader(
+          'Bearer',
+          refreshedTokenPair.accessToken
+        ).toString(),
+      };
       const user = await this.getUser(request, authHeaders);
 
       this.logger.debug('Request has been authenticated via refreshed token.');
diff --git a/x-pack/plugins/security/server/authentication/providers/token.ts b/x-pack/plugins/security/server/authentication/providers/token.ts
index fffac254ed30a..91808c22c4300 100644
--- a/x-pack/plugins/security/server/authentication/providers/token.ts
+++ b/x-pack/plugins/security/server/authentication/providers/token.ts
@@ -9,7 +9,7 @@ import { KibanaRequest } from '../../../../../../src/core/server';
 import { AuthenticationResult } from '../authentication_result';
 import { DeauthenticationResult } from '../deauthentication_result';
 import { canRedirectRequest } from '../can_redirect_request';
-import { getHTTPAuthenticationScheme } from '../get_http_authentication_scheme';
+import { HTTPAuthorizationHeader } from '../http_authentication';
 import { Tokens, TokenPair } from '../tokens';
 import { BaseAuthenticationProvider } from './base';
 
@@ -60,7 +60,9 @@ export class TokenAuthenticationProvider extends BaseAuthenticationProvider {
       this.logger.debug('Get token API request to Elasticsearch successful');
 
       // Then attempt to query for the user details using the new token
-      const authHeaders = { authorization: `Bearer ${accessToken}` };
+      const authHeaders = {
+        authorization: new HTTPAuthorizationHeader('Bearer', accessToken).toString(),
+      };
       const user = await this.getUser(request, authHeaders);
 
       this.logger.debug('Login has been successfully performed.');
@@ -82,7 +84,7 @@ export class TokenAuthenticationProvider extends BaseAuthenticationProvider {
   public async authenticate(request: KibanaRequest, state?: ProviderState | null) {
     this.logger.debug(`Trying to authenticate user request to ${request.url.path}.`);
 
-    if (getHTTPAuthenticationScheme(request) != null) {
+    if (HTTPAuthorizationHeader.parseFromRequest(request) != null) {
       this.logger.debug('Cannot authenticate requests with `Authorization` header.');
       return AuthenticationResult.notHandled();
     }
@@ -152,7 +154,9 @@ export class TokenAuthenticationProvider extends BaseAuthenticationProvider {
     this.logger.debug('Trying to authenticate via state.');
 
     try {
-      const authHeaders = { authorization: `Bearer ${accessToken}` };
+      const authHeaders = {
+        authorization: new HTTPAuthorizationHeader('Bearer', accessToken).toString(),
+      };
       const user = await this.getUser(request, authHeaders);
 
       this.logger.debug('Request has been authenticated via state.');
@@ -199,7 +203,12 @@ export class TokenAuthenticationProvider extends BaseAuthenticationProvider {
     }
 
     try {
-      const authHeaders = { authorization: `Bearer ${refreshedTokenPair.accessToken}` };
+      const authHeaders = {
+        authorization: new HTTPAuthorizationHeader(
+          'Bearer',
+          refreshedTokenPair.accessToken
+        ).toString(),
+      };
       const user = await this.getUser(request, authHeaders);
 
       this.logger.debug('Request has been authenticated via refreshed token.');
diff --git a/x-pack/plugins/security/server/elasticsearch_client_plugin.ts b/x-pack/plugins/security/server/elasticsearch_client_plugin.ts
index 996dcb685f29b..529e8a8aa6e9c 100644
--- a/x-pack/plugins/security/server/elasticsearch_client_plugin.ts
+++ b/x-pack/plugins/security/server/elasticsearch_client_plugin.ts
@@ -538,6 +538,24 @@ export function elasticsearchClientPlugin(Client: any, config: unknown, componen
     },
   });
 
+  /**
+   * Grants an API key in Elasticsearch for the current user.
+   *
+   * @param {string} type The type of grant, either "password" or "access_token"
+   * @param {string} username Required when using the "password" type
+   * @param {string} password Required when using the "password" type
+   * @param {string} access_token Required when using the "access_token" type
+   *
+   * @returns {{api_key: string}}
+   */
+  shield.grantAPIKey = ca({
+    method: 'POST',
+    needBody: true,
+    url: {
+      fmt: '/_security/api_key/grant',
+    },
+  });
+
   /**
    * Invalidates an API key in Elasticsearch.
    *
diff --git a/x-pack/plugins/security/server/plugin.test.ts b/x-pack/plugins/security/server/plugin.test.ts
index a1ef352056d6a..b817bcc0858a9 100644
--- a/x-pack/plugins/security/server/plugin.test.ts
+++ b/x-pack/plugins/security/server/plugin.test.ts
@@ -74,6 +74,7 @@ describe('Security Plugin', () => {
                   "createAPIKey": [Function],
                   "getCurrentUser": [Function],
                   "getSessionInfo": [Function],
+                  "grantAPIKeyAsInternalUser": [Function],
                   "invalidateAPIKey": [Function],
                   "isAuthenticated": [Function],
                   "isProviderEnabled": [Function],
diff --git a/x-pack/plugins/security/server/routes/users/change_password.ts b/x-pack/plugins/security/server/routes/users/change_password.ts
index fc3ca4573d500..aa7e8bc26cc1f 100644
--- a/x-pack/plugins/security/server/routes/users/change_password.ts
+++ b/x-pack/plugins/security/server/routes/users/change_password.ts
@@ -8,6 +8,10 @@ import { schema } from '@kbn/config-schema';
 import { canUserChangePassword } from '../../../common/model';
 import { getErrorStatusCode, wrapIntoCustomErrorResponse } from '../../errors';
 import { createLicensedRouteHandler } from '../licensed_route_handler';
+import {
+  HTTPAuthorizationHeader,
+  BasicHTTPAuthorizationHeaderCredentials,
+} from '../../authentication';
 import { RouteDefinitionParams } from '..';
 
 export function defineChangeUserPasswordRoutes({
@@ -43,9 +47,13 @@ export function defineChangeUserPasswordRoutes({
           ? {
               headers: {
                 ...request.headers,
-                authorization: `Basic ${Buffer.from(`${username}:${currentPassword}`).toString(
-                  'base64'
-                )}`,
+                authorization: new HTTPAuthorizationHeader(
+                  'Basic',
+                  new BasicHTTPAuthorizationHeaderCredentials(
+                    username,
+                    currentPassword || ''
+                  ).toString()
+                ).toString(),
               },
             }
           : request

From 21e8cea183081d294b4ff323b43da87dc82d07bf Mon Sep 17 00:00:00 2001
From: Ryland Herrick <ryalnd@gmail.com>
Date: Mon, 23 Mar 2020 11:10:40 -0500
Subject: [PATCH 020/179] [SIEM] Add license check to ML Rule form (#60691)

* Gate ML Rules behind a license check

If they don't have a Platinum or Trial license, then we disable the ML
Card and provide them a link to the subscriptions marketing page.

* Add aria-describedby for new ML input fields

* Add data-test-subj to new ML input fields

* Remove unused prop

This is already passed as isLoading

* Fix capitalization on translation id

* Declare defaulted props as optional

* Gray out entire ML card when ML Rules are disabled

If we're editing an existing rule, or if the user has an insufficient
license, we disable both the card and its selectability. This is more
visually striking, and a more obvious CTA.
---
 .../anomaly_threshold_slider/index.tsx        | 13 +++-
 .../rules/components/ml_job_select/index.tsx  | 12 +++-
 .../components/select_rule_type/index.tsx     | 60 ++++++++++++++++---
 .../select_rule_type/translations.ts          |  7 ---
 .../components/step_define_rule/index.tsx     | 23 +++++--
 5 files changed, 92 insertions(+), 23 deletions(-)

diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/anomaly_threshold_slider/index.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/anomaly_threshold_slider/index.tsx
index 18970ff935b8d..1e18023e0c326 100644
--- a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/anomaly_threshold_slider/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/anomaly_threshold_slider/index.tsx
@@ -10,12 +10,16 @@ import { EuiFlexGrid, EuiFlexItem, EuiRange, EuiFormRow } from '@elastic/eui';
 import { FieldHook } from '../../../../../shared_imports';
 
 interface AnomalyThresholdSliderProps {
+  describedByIds: string[];
   field: FieldHook;
 }
 type Event = React.ChangeEvent<HTMLInputElement>;
 type EventArg = Event | React.MouseEvent<HTMLButtonElement>;
 
-export const AnomalyThresholdSlider: React.FC<AnomalyThresholdSliderProps> = ({ field }) => {
+export const AnomalyThresholdSlider: React.FC<AnomalyThresholdSliderProps> = ({
+  describedByIds = [],
+  field,
+}) => {
   const threshold = field.value as number;
   const onThresholdChange = useCallback(
     (event: EventArg) => {
@@ -26,7 +30,12 @@ export const AnomalyThresholdSlider: React.FC<AnomalyThresholdSliderProps> = ({
   );
 
   return (
-    <EuiFormRow label={field.label} fullWidth>
+    <EuiFormRow
+      fullWidth
+      label={field.label}
+      data-test-subj="anomalyThresholdSlider"
+      describedByIds={describedByIds}
+    >
       <EuiFlexGrid columns={2}>
         <EuiFlexItem>
           <EuiRange
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/ml_job_select/index.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/ml_job_select/index.tsx
index 627fa21cc2f61..bc32162c2660b 100644
--- a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/ml_job_select/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/ml_job_select/index.tsx
@@ -20,10 +20,11 @@ const JobDisplay = ({ title, description }: { title: string; description: string
 );
 
 interface MlJobSelectProps {
+  describedByIds: string[];
   field: FieldHook;
 }
 
-export const MlJobSelect: React.FC<MlJobSelectProps> = ({ field }) => {
+export const MlJobSelect: React.FC<MlJobSelectProps> = ({ describedByIds = [], field }) => {
   const jobId = field.value as string;
   const { isInvalid, errorMessage } = getFieldValidityAndErrorMessage(field);
   const [isLoading, siemJobs] = useSiemJobs(false);
@@ -41,7 +42,14 @@ export const MlJobSelect: React.FC<MlJobSelectProps> = ({ field }) => {
   }));
 
   return (
-    <EuiFormRow fullWidth label={field.label} isInvalid={isInvalid} error={errorMessage}>
+    <EuiFormRow
+      fullWidth
+      label={field.label}
+      isInvalid={isInvalid}
+      error={errorMessage}
+      data-test-subj="mlJobSelect"
+      describedByIds={describedByIds}
+    >
       <EuiFlexGroup>
         <EuiFlexItem>
           <EuiSuperSelect
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/select_rule_type/index.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/select_rule_type/index.tsx
index 229ccde54ecab..219b3d6dc4d58 100644
--- a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/select_rule_type/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/select_rule_type/index.tsx
@@ -5,19 +5,58 @@
  */
 
 import React, { useCallback } from 'react';
-import { EuiCard, EuiFlexGrid, EuiFlexItem, EuiIcon, EuiFormRow } from '@elastic/eui';
+import { FormattedMessage } from '@kbn/i18n/react';
+import {
+  EuiCard,
+  EuiFlexGrid,
+  EuiFlexItem,
+  EuiFormRow,
+  EuiIcon,
+  EuiLink,
+  EuiText,
+} from '@elastic/eui';
 
 import { FieldHook } from '../../../../../shared_imports';
 import { RuleType } from '../../../../../containers/detection_engine/rules/types';
 import * as i18n from './translations';
 import { isMlRule } from '../../helpers';
 
+const MlCardDescription = ({ hasValidLicense = false }: { hasValidLicense?: boolean }) => (
+  <EuiText size="s">
+    {hasValidLicense ? (
+      i18n.ML_TYPE_DESCRIPTION
+    ) : (
+      <FormattedMessage
+        id="xpack.siem.detectionEngine.createRule.stepDefineRule.ruleTypeField.mlTypeDisabledDescription"
+        defaultMessage="Access to ML requires a {subscriptionsLink}."
+        values={{
+          subscriptionsLink: (
+            <EuiLink href="https://www.elastic.co/subscriptions" target="_blank">
+              <FormattedMessage
+                id="xpack.siem.components.stepDefineRule.ruleTypeField.subscriptionsLink"
+                defaultMessage="Platinum subscription"
+              />
+            </EuiLink>
+          ),
+        }}
+      />
+    )}
+  </EuiText>
+);
+
 interface SelectRuleTypeProps {
+  describedByIds?: string[];
   field: FieldHook;
-  isReadOnly: boolean;
+  hasValidLicense?: boolean;
+  isReadOnly?: boolean;
 }
 
-export const SelectRuleType: React.FC<SelectRuleTypeProps> = ({ field, isReadOnly = false }) => {
+export const SelectRuleType: React.FC<SelectRuleTypeProps> = ({
+  describedByIds = [],
+  field,
+  hasValidLicense = false,
+  isReadOnly = false,
+}) => {
   const ruleType = field.value as RuleType;
   const setType = useCallback(
     (type: RuleType) => {
@@ -27,10 +66,15 @@ export const SelectRuleType: React.FC<SelectRuleTypeProps> = ({ field, isReadOnl
   );
   const setMl = useCallback(() => setType('machine_learning'), [setType]);
   const setQuery = useCallback(() => setType('query'), [setType]);
-  const license = true; // TODO
+  const mlCardDisabled = isReadOnly || !hasValidLicense;
 
   return (
-    <EuiFormRow label={field.label} fullWidth>
+    <EuiFormRow
+      fullWidth
+      data-test-subj="selectRuleType"
+      describedByIds={describedByIds}
+      label={field.label}
+    >
       <EuiFlexGrid columns={4}>
         <EuiFlexItem>
           <EuiCard
@@ -47,11 +91,11 @@ export const SelectRuleType: React.FC<SelectRuleTypeProps> = ({ field, isReadOnl
         <EuiFlexItem>
           <EuiCard
             title={i18n.ML_TYPE_TITLE}
-            description={license ? i18n.ML_TYPE_DESCRIPTION : i18n.ML_TYPE_DISABLED_DESCRIPTION}
-            isDisabled={!license}
+            description={<MlCardDescription hasValidLicense={hasValidLicense} />}
             icon={<EuiIcon size="l" type="machineLearningApp" />}
+            isDisabled={mlCardDisabled}
             selectable={{
-              isDisabled: isReadOnly,
+              isDisabled: mlCardDisabled,
               onClick: setMl,
               isSelected: isMlRule(ruleType),
             }}
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/select_rule_type/translations.ts b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/select_rule_type/translations.ts
index 32b860e8f703e..4dc0a89af4a49 100644
--- a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/select_rule_type/translations.ts
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/select_rule_type/translations.ts
@@ -33,10 +33,3 @@ export const ML_TYPE_DESCRIPTION = i18n.translate(
     defaultMessage: 'Select ML job to detect anomalous activity.',
   }
 );
-
-export const ML_TYPE_DISABLED_DESCRIPTION = i18n.translate(
-  'xpack.siem.detectionEngine.createRule.stepDefineRule.ruleTypeField.mlTypeDisabledDescription',
-  {
-    defaultMessage: 'Access to ML requires a Platinum subscription.',
-  }
-);
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/step_define_rule/index.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/step_define_rule/index.tsx
index d3ef185f3786b..cf8cc4b87b388 100644
--- a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/step_define_rule/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/step_define_rule/index.tsx
@@ -13,13 +13,14 @@ import {
   EuiButton,
 } from '@elastic/eui';
 import { isEmpty } from 'lodash/fp';
-import React, { FC, memo, useCallback, useState, useEffect } from 'react';
+import React, { FC, memo, useCallback, useState, useEffect, useContext } from 'react';
 import styled from 'styled-components';
 import deepEqual from 'fast-deep-equal';
 
 import { IIndexPattern } from '../../../../../../../../../../src/plugins/data/public';
 import { useFetchIndexPatterns } from '../../../../../containers/detection_engine/rules';
 import { DEFAULT_INDEX_KEY } from '../../../../../../common/constants';
+import { MlCapabilitiesContext } from '../../../../../components/ml/permissions/ml_capabilities_provider';
 import { useUiSetting$ } from '../../../../../lib/kibana';
 import { setFieldValue, isMlRule } from '../../helpers';
 import * as RuleI18n from '../../translations';
@@ -103,6 +104,7 @@ const StepDefineRuleComponent: FC<StepDefineRuleProps> = ({
   setForm,
   setStepData,
 }) => {
+  const mlCapabilities = useContext(MlCapabilitiesContext);
   const [openTimelineSearch, setOpenTimelineSearch] = useState(false);
   const [localUseIndicesConfig, setLocalUseIndicesConfig] = useState(false);
   const [localIsMlRule, setIsMlRule] = useState(false);
@@ -182,6 +184,8 @@ const StepDefineRuleComponent: FC<StepDefineRuleProps> = ({
             path="ruleType"
             component={SelectRuleType}
             componentProps={{
+              describedByIds: ['detectionEngineStepDefineRuleType'],
+              hasValidLicense: mlCapabilities.isPlatinumOrTrialLicense,
               isReadOnly: isUpdateView,
             }}
           />
@@ -220,7 +224,6 @@ const StepDefineRuleComponent: FC<StepDefineRuleProps> = ({
                 component={QueryBarDefineRule}
                 componentProps={{
                   browserFields,
-                  loading: indexPatternLoadingQueryBar,
                   idAria: 'detectionEngineStepDefineRuleQueryBar',
                   indexPattern: indexPatternQueryBar,
                   isDisabled: isLoading,
@@ -234,8 +237,20 @@ const StepDefineRuleComponent: FC<StepDefineRuleProps> = ({
           </EuiFormRow>
           <EuiFormRow fullWidth style={{ display: localIsMlRule ? 'flex' : 'none' }}>
             <>
-              <UseField path="machineLearningJobId" component={MlJobSelect} />
-              <UseField path="anomalyThreshold" component={AnomalyThresholdSlider} />
+              <UseField
+                path="machineLearningJobId"
+                component={MlJobSelect}
+                componentProps={{
+                  describedByIds: ['detectionEngineStepDefineRulemachineLearningJobId'],
+                }}
+              />
+              <UseField
+                path="anomalyThreshold"
+                component={AnomalyThresholdSlider}
+                componentProps={{
+                  describedByIds: ['detectionEngineStepDefineRuleAnomalyThreshold'],
+                }}
+              />
             </>
           </EuiFormRow>
           <FormDataProvider pathsToWatch={['index', 'ruleType']}>

From 91e8e3e883d51634a6b958c0ccd8d0011fdc5559 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mike=20C=C3=B4t=C3=A9?= <mikecote@users.noreply.github.com>
Date: Mon, 23 Mar 2020 12:39:55 -0400
Subject: [PATCH 021/179] Adding `authc.invalidateAPIKeyAsInternalUser`
 (#60717)

* Initial work

* Fix type check issues

* Fix test failures

* Fix ESLint issues

* Add back comment

* PR feedback

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 .../server/authentication/api_keys.test.ts    | 52 +++++++++++++++++++
 .../server/authentication/api_keys.ts         | 41 ++++++++++++---
 .../server/authentication/index.mock.ts       |  1 +
 .../server/authentication/index.test.ts       | 23 +++++++-
 .../security/server/authentication/index.ts   |  2 +
 x-pack/plugins/security/server/plugin.test.ts |  1 +
 6 files changed, 111 insertions(+), 9 deletions(-)

diff --git a/x-pack/plugins/security/server/authentication/api_keys.test.ts b/x-pack/plugins/security/server/authentication/api_keys.test.ts
index 78b1d5f8e30b8..836740d0a547f 100644
--- a/x-pack/plugins/security/server/authentication/api_keys.test.ts
+++ b/x-pack/plugins/security/server/authentication/api_keys.test.ts
@@ -225,4 +225,56 @@ describe('API Keys', () => {
       );
     });
   });
+
+  describe('invalidateAsInternalUser()', () => {
+    it('returns null when security feature is disabled', async () => {
+      mockLicense.isEnabled.mockReturnValue(false);
+      const result = await apiKeys.invalidateAsInternalUser({ id: '123' });
+      expect(result).toBeNull();
+      expect(mockClusterClient.callAsInternalUser).not.toHaveBeenCalled();
+    });
+
+    it('calls callCluster with proper parameters', async () => {
+      mockLicense.isEnabled.mockReturnValue(true);
+      mockClusterClient.callAsInternalUser.mockResolvedValueOnce({
+        invalidated_api_keys: ['api-key-id-1'],
+        previously_invalidated_api_keys: [],
+        error_count: 0,
+      });
+      const result = await apiKeys.invalidateAsInternalUser({ id: '123' });
+      expect(result).toEqual({
+        invalidated_api_keys: ['api-key-id-1'],
+        previously_invalidated_api_keys: [],
+        error_count: 0,
+      });
+      expect(mockClusterClient.callAsInternalUser).toHaveBeenCalledWith('shield.invalidateAPIKey', {
+        body: {
+          id: '123',
+        },
+      });
+    });
+
+    it('Only passes id as a parameter', async () => {
+      mockLicense.isEnabled.mockReturnValue(true);
+      mockClusterClient.callAsInternalUser.mockResolvedValueOnce({
+        invalidated_api_keys: ['api-key-id-1'],
+        previously_invalidated_api_keys: [],
+        error_count: 0,
+      });
+      const result = await apiKeys.invalidateAsInternalUser({
+        id: '123',
+        name: 'abc',
+      } as any);
+      expect(result).toEqual({
+        invalidated_api_keys: ['api-key-id-1'],
+        previously_invalidated_api_keys: [],
+        error_count: 0,
+      });
+      expect(mockClusterClient.callAsInternalUser).toHaveBeenCalledWith('shield.invalidateAPIKey', {
+        body: {
+          id: '123',
+        },
+      });
+    });
+  });
 });
diff --git a/x-pack/plugins/security/server/authentication/api_keys.ts b/x-pack/plugins/security/server/authentication/api_keys.ts
index 0d77207e390ae..9df7219cec334 100644
--- a/x-pack/plugins/security/server/authentication/api_keys.ts
+++ b/x-pack/plugins/security/server/authentication/api_keys.ts
@@ -193,26 +193,51 @@ export class APIKeys {
    * @param request Request instance.
    * @param params The params to invalidate an API key.
    */
-  async invalidate(
-    request: KibanaRequest,
-    params: InvalidateAPIKeyParams
-  ): Promise<InvalidateAPIKeyResult | null> {
+  async invalidate(request: KibanaRequest, params: InvalidateAPIKeyParams) {
     if (!this.license.isEnabled()) {
       return null;
     }
 
-    this.logger.debug('Trying to invalidate an API key');
+    this.logger.debug('Trying to invalidate an API key as current user');
 
-    // User needs `manage_api_key` privilege to use this API
     let result: InvalidateAPIKeyResult;
     try {
-      result = (await this.clusterClient
+      // User needs `manage_api_key` privilege to use this API
+      result = await this.clusterClient
         .asScoped(request)
         .callAsCurrentUser('shield.invalidateAPIKey', {
           body: {
             id: params.id,
           },
-        })) as InvalidateAPIKeyResult;
+        });
+      this.logger.debug('API key was invalidated successfully as current user');
+    } catch (e) {
+      this.logger.error(`Failed to invalidate API key as current user: ${e.message}`);
+      throw e;
+    }
+
+    return result;
+  }
+
+  /**
+   * Tries to invalidate an API key by using the internal user.
+   * @param params The params to invalidate an API key.
+   */
+  async invalidateAsInternalUser(params: InvalidateAPIKeyParams) {
+    if (!this.license.isEnabled()) {
+      return null;
+    }
+
+    this.logger.debug('Trying to invalidate an API key');
+
+    let result: InvalidateAPIKeyResult;
+    try {
+      // Internal user needs `cluster:admin/xpack/security/api_key/invalidate` privilege to use this API
+      result = await this.clusterClient.callAsInternalUser('shield.invalidateAPIKey', {
+        body: {
+          id: params.id,
+        },
+      });
       this.logger.debug('API key was invalidated successfully');
     } catch (e) {
       this.logger.error(`Failed to invalidate API key: ${e.message}`);
diff --git a/x-pack/plugins/security/server/authentication/index.mock.ts b/x-pack/plugins/security/server/authentication/index.mock.ts
index 512de9626a986..43892753f0d3f 100644
--- a/x-pack/plugins/security/server/authentication/index.mock.ts
+++ b/x-pack/plugins/security/server/authentication/index.mock.ts
@@ -15,6 +15,7 @@ export const authenticationMock = {
     getCurrentUser: jest.fn(),
     grantAPIKeyAsInternalUser: jest.fn(),
     invalidateAPIKey: jest.fn(),
+    invalidateAPIKeyAsInternalUser: jest.fn(),
     isAuthenticated: jest.fn(),
     getSessionInfo: jest.fn(),
   }),
diff --git a/x-pack/plugins/security/server/authentication/index.test.ts b/x-pack/plugins/security/server/authentication/index.test.ts
index e364dbf39db65..21e5f18bc0282 100644
--- a/x-pack/plugins/security/server/authentication/index.test.ts
+++ b/x-pack/plugins/security/server/authentication/index.test.ts
@@ -33,7 +33,7 @@ import {
 import { AuthenticatedUser } from '../../common/model';
 import { ConfigType, createConfig$ } from '../config';
 import { AuthenticationResult } from './authentication_result';
-import { setupAuthentication } from '.';
+import { Authentication, setupAuthentication } from '.';
 import {
   CreateAPIKeyResult,
   CreateAPIKeyParams,
@@ -410,4 +410,25 @@ describe('setupAuthentication()', () => {
       expect(apiKeysInstance.invalidate).toHaveBeenCalledWith(request, params);
     });
   });
+
+  describe('invalidateAPIKeyAsInternalUser()', () => {
+    let invalidateAPIKeyAsInternalUser: Authentication['invalidateAPIKeyAsInternalUser'];
+
+    beforeEach(async () => {
+      invalidateAPIKeyAsInternalUser = (await setupAuthentication(mockSetupAuthenticationParams))
+        .invalidateAPIKeyAsInternalUser;
+    });
+
+    it('calls invalidateAPIKeyAsInternalUser with given arguments', async () => {
+      const apiKeysInstance = jest.requireMock('./api_keys').APIKeys.mock.instances[0];
+      const params = {
+        id: '123',
+      };
+      apiKeysInstance.invalidateAsInternalUser.mockResolvedValueOnce({ success: true });
+      await expect(invalidateAPIKeyAsInternalUser(params)).resolves.toEqual({
+        success: true,
+      });
+      expect(apiKeysInstance.invalidateAsInternalUser).toHaveBeenCalledWith(params);
+    });
+  });
 });
diff --git a/x-pack/plugins/security/server/authentication/index.ts b/x-pack/plugins/security/server/authentication/index.ts
index 8b42b2325ee1e..c5c72853e68e1 100644
--- a/x-pack/plugins/security/server/authentication/index.ts
+++ b/x-pack/plugins/security/server/authentication/index.ts
@@ -176,6 +176,8 @@ export async function setupAuthentication({
     grantAPIKeyAsInternalUser: (request: KibanaRequest) => apiKeys.grantAsInternalUser(request),
     invalidateAPIKey: (request: KibanaRequest, params: InvalidateAPIKeyParams) =>
       apiKeys.invalidate(request, params),
+    invalidateAPIKeyAsInternalUser: (params: InvalidateAPIKeyParams) =>
+      apiKeys.invalidateAsInternalUser(params),
     isAuthenticated: (request: KibanaRequest) => http.auth.isAuthenticated(request),
   };
 }
diff --git a/x-pack/plugins/security/server/plugin.test.ts b/x-pack/plugins/security/server/plugin.test.ts
index b817bcc0858a9..a011f7e7be11e 100644
--- a/x-pack/plugins/security/server/plugin.test.ts
+++ b/x-pack/plugins/security/server/plugin.test.ts
@@ -76,6 +76,7 @@ describe('Security Plugin', () => {
                   "getSessionInfo": [Function],
                   "grantAPIKeyAsInternalUser": [Function],
                   "invalidateAPIKey": [Function],
+                  "invalidateAPIKeyAsInternalUser": [Function],
                   "isAuthenticated": [Function],
                   "isProviderEnabled": [Function],
                   "login": [Function],

From de7151e2040ed88129d58acdae69963292a83aea Mon Sep 17 00:00:00 2001
From: James Gowdy <jgowdy@elastic.co>
Date: Mon, 23 Mar 2020 16:40:56 +0000
Subject: [PATCH 022/179] [ML] Disabling datafeed editing when job is running
 (#60751)

* [ML] Disabling datafeed editing when job is running

* changing variable

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 .../edit_job_flyout/edit_job_flyout.js        |  7 +++++
 .../edit_job_flyout/tabs/datafeed.js          | 26 ++++++++++++++++++-
 .../edit_job_flyout/tabs/job_details.js       | 11 ++++++++
 .../server/routes/schemas/datafeeds_schema.ts |  2 +-
 4 files changed, 44 insertions(+), 2 deletions(-)

diff --git a/x-pack/plugins/ml/public/application/jobs/jobs_list/components/edit_job_flyout/edit_job_flyout.js b/x-pack/plugins/ml/public/application/jobs/jobs_list/components/edit_job_flyout/edit_job_flyout.js
index aec57e0d33cdd..29c79458fe431 100644
--- a/x-pack/plugins/ml/public/application/jobs/jobs_list/components/edit_job_flyout/edit_job_flyout.js
+++ b/x-pack/plugins/ml/public/application/jobs/jobs_list/components/edit_job_flyout/edit_job_flyout.js
@@ -31,6 +31,7 @@ import { withKibana } from '../../../../../../../../../src/plugins/kibana_react/
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n/react';
 import { collapseLiteralStrings } from '../../../../../../shared_imports';
+import { DATAFEED_STATE } from '../../../../../../common/constants/states';
 
 export class EditJobFlyoutUI extends Component {
   _initialJobFormState = null;
@@ -41,6 +42,7 @@ export class EditJobFlyoutUI extends Component {
     this.state = {
       job: {},
       hasDatafeed: false,
+      datafeedRunning: false,
       isFlyoutVisible: false,
       isConfirmationModalVisible: false,
       jobDescription: '',
@@ -157,10 +159,12 @@ export class EditJobFlyoutUI extends Component {
 
   extractJob(job, hasDatafeed) {
     this.extractInitialJobFormState(job, hasDatafeed);
+    const datafeedRunning = hasDatafeed && job.datafeed_config.state !== DATAFEED_STATE.STOPPED;
 
     this.setState({
       job,
       hasDatafeed,
+      datafeedRunning,
       jobModelMemoryLimitValidationError: '',
       jobGroupsValidationError: '',
       ...cloneDeep(this._initialJobFormState),
@@ -283,6 +287,7 @@ export class EditJobFlyoutUI extends Component {
         jobModelMemoryLimitValidationError,
         isValidJobDetails,
         isValidJobCustomUrls,
+        datafeedRunning,
       } = this.state;
 
       const tabs = [
@@ -293,6 +298,7 @@ export class EditJobFlyoutUI extends Component {
           }),
           content: (
             <JobDetails
+              datafeedRunning={datafeedRunning}
               jobDescription={jobDescription}
               jobGroups={jobGroups}
               jobModelMemoryLimit={jobModelMemoryLimit}
@@ -328,6 +334,7 @@ export class EditJobFlyoutUI extends Component {
               datafeedScrollSize={datafeedScrollSize}
               jobBucketSpan={jobBucketSpan}
               setDatafeed={this.setDatafeed}
+              datafeedRunning={datafeedRunning}
             />
           ),
         },
diff --git a/x-pack/plugins/ml/public/application/jobs/jobs_list/components/edit_job_flyout/tabs/datafeed.js b/x-pack/plugins/ml/public/application/jobs/jobs_list/components/edit_job_flyout/tabs/datafeed.js
index 096a03621d422..3d81b767021a0 100644
--- a/x-pack/plugins/ml/public/application/jobs/jobs_list/components/edit_job_flyout/tabs/datafeed.js
+++ b/x-pack/plugins/ml/public/application/jobs/jobs_list/components/edit_job_flyout/tabs/datafeed.js
@@ -7,7 +7,14 @@
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
 
-import { EuiFieldText, EuiForm, EuiFormRow, EuiSpacer, EuiFieldNumber } from '@elastic/eui';
+import {
+  EuiFieldText,
+  EuiForm,
+  EuiFormRow,
+  EuiSpacer,
+  EuiFieldNumber,
+  EuiCallOut,
+} from '@elastic/eui';
 
 import { calculateDatafeedFrequencyDefaultSeconds } from '../../../../../../../common/util/job_utils';
 import { getNewJobDefaults } from '../../../../../services/ml_server_info';
@@ -72,9 +79,21 @@ export class Datafeed extends Component {
 
   render() {
     const { query, queryDelay, frequency, scrollSize, defaults } = this.state;
+    const { datafeedRunning } = this.props;
     return (
       <React.Fragment>
         <EuiSpacer size="m" />
+        {datafeedRunning && (
+          <>
+            <EuiCallOut color="warning">
+              <FormattedMessage
+                id="xpack.ml.jobsList.editJobFlyout.datafeed.readOnlyCalloutText"
+                defaultMessage="Datafeed settings cannot be edited while the datafeed is running. Please stop the job if you wish to edit these settings."
+              />
+            </EuiCallOut>
+            <EuiSpacer size="l" />
+          </>
+        )}
         <EuiForm>
           <EuiFormRow
             label={
@@ -90,6 +109,7 @@ export class Datafeed extends Component {
               value={query}
               onChange={this.onQueryChange}
               height="200px"
+              readOnly={datafeedRunning}
             />
           </EuiFormRow>
           <EuiFormRow
@@ -104,6 +124,7 @@ export class Datafeed extends Component {
               value={queryDelay}
               placeholder={defaults.queryDelay}
               onChange={this.onQueryDelayChange}
+              disabled={datafeedRunning}
             />
           </EuiFormRow>
           <EuiFormRow
@@ -118,6 +139,7 @@ export class Datafeed extends Component {
               value={frequency}
               placeholder={defaults.frequency}
               onChange={this.onFrequencyChange}
+              disabled={datafeedRunning}
             />
           </EuiFormRow>
           <EuiFormRow
@@ -132,6 +154,7 @@ export class Datafeed extends Component {
               value={scrollSize}
               placeholder={defaults.scrollSize}
               onChange={this.onScrollSizeChange}
+              disabled={datafeedRunning}
             />
           </EuiFormRow>
         </EuiForm>
@@ -140,6 +163,7 @@ export class Datafeed extends Component {
   }
 }
 Datafeed.propTypes = {
+  datafeedRunning: PropTypes.bool.isRequired,
   datafeedQuery: PropTypes.string.isRequired,
   datafeedQueryDelay: PropTypes.string.isRequired,
   datafeedFrequency: PropTypes.string.isRequired,
diff --git a/x-pack/plugins/ml/public/application/jobs/jobs_list/components/edit_job_flyout/tabs/job_details.js b/x-pack/plugins/ml/public/application/jobs/jobs_list/components/edit_job_flyout/tabs/job_details.js
index a609d6a7c3fba..672fd8cefaaba 100644
--- a/x-pack/plugins/ml/public/application/jobs/jobs_list/components/edit_job_flyout/tabs/job_details.js
+++ b/x-pack/plugins/ml/public/application/jobs/jobs_list/components/edit_job_flyout/tabs/job_details.js
@@ -105,6 +105,7 @@ export class JobDetails extends Component {
       mmlValidationError,
       groupsValidationError,
     } = this.state;
+    const { datafeedRunning } = this.props;
     return (
       <React.Fragment>
         <EuiSpacer size="m" />
@@ -152,6 +153,14 @@ export class JobDetails extends Component {
                 defaultMessage="Model memory limit"
               />
             }
+            helpText={
+              datafeedRunning ? (
+                <FormattedMessage
+                  id="xpack.ml.jobsList.editJobFlyout.jobDetails.modelMemoryLimitLabelHelp"
+                  defaultMessage="Model memory limit cannot be edited while the datafeed is running."
+                />
+              ) : null
+            }
             isInvalid={mmlValidationError !== ''}
             error={mmlValidationError}
           >
@@ -160,6 +169,7 @@ export class JobDetails extends Component {
               onChange={this.onMmlChange}
               isInvalid={mmlValidationError !== ''}
               error={mmlValidationError}
+              disabled={datafeedRunning}
             />
           </EuiFormRow>
         </EuiForm>
@@ -168,6 +178,7 @@ export class JobDetails extends Component {
   }
 }
 JobDetails.propTypes = {
+  datafeedRunning: PropTypes.bool.isRequired,
   jobDescription: PropTypes.string.isRequired,
   jobGroups: PropTypes.array.isRequired,
   jobModelMemoryLimit: PropTypes.string.isRequired,
diff --git a/x-pack/plugins/ml/server/routes/schemas/datafeeds_schema.ts b/x-pack/plugins/ml/server/routes/schemas/datafeeds_schema.ts
index ee49da6538460..466e70197e3d1 100644
--- a/x-pack/plugins/ml/server/routes/schemas/datafeeds_schema.ts
+++ b/x-pack/plugins/ml/server/routes/schemas/datafeeds_schema.ts
@@ -24,7 +24,7 @@ export const datafeedConfigSchema = schema.object({
     })
   ),
   frequency: schema.maybe(schema.string()),
-  indices: schema.arrayOf(schema.string()),
+  indices: schema.maybe(schema.arrayOf(schema.string())),
   indexes: schema.maybe(schema.arrayOf(schema.string())),
   job_id: schema.maybe(schema.string()),
   query: schema.maybe(schema.any()),

From 8143c078b6fffa9319a7809e2a6ccd30f099ac17 Mon Sep 17 00:00:00 2001
From: Andrew Cholakian <andrew@andrewvc.com>
Date: Mon, 23 Mar 2020 11:54:49 -0500
Subject: [PATCH 023/179] [Uptime] Skip failing location test temporarily
 (#60938)

---
 x-pack/test/functional/apps/uptime/locations.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x-pack/test/functional/apps/uptime/locations.ts b/x-pack/test/functional/apps/uptime/locations.ts
index 7f6932ab50319..96c7fad89a85d 100644
--- a/x-pack/test/functional/apps/uptime/locations.ts
+++ b/x-pack/test/functional/apps/uptime/locations.ts
@@ -10,7 +10,7 @@ import { FtrProviderContext } from '../../ftr_provider_context';
 export default ({ getPageObjects, getService }: FtrProviderContext) => {
   const pageObjects = getPageObjects(['uptime']);
 
-  describe('location', () => {
+  describe.skip('location', () => {
     const start = new Date().toISOString();
     const end = new Date().toISOString();
 

From 3c6666263064830cea7a4d3b9c522a3bb7feafe7 Mon Sep 17 00:00:00 2001
From: Zacqary Adam Xeper <Zacqary@users.noreply.github.com>
Date: Mon, 23 Mar 2020 12:33:00 -0500
Subject: [PATCH 024/179] [Metrics Alerts] Remove metric field from doc count
 on backend (#60679)

* Remove metric field from doc count on backend

* Fix tests

* Type fix

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 .../metric_threshold_executor.test.ts         |  3 +-
 .../metric_threshold_executor.ts              | 41 +++++++++++------
 .../register_metric_threshold_alert_type.ts   | 44 ++++++++++++++-----
 .../lib/alerting/metric_threshold/types.ts    | 16 +++++--
 .../apis/infra/metrics_alerting.ts            | 35 +++++----------
 5 files changed, 86 insertions(+), 53 deletions(-)

diff --git a/x-pack/plugins/infra/server/lib/alerting/metric_threshold/metric_threshold_executor.test.ts b/x-pack/plugins/infra/server/lib/alerting/metric_threshold/metric_threshold_executor.test.ts
index a6b9b70feede2..feaa404ae960a 100644
--- a/x-pack/plugins/infra/server/lib/alerting/metric_threshold/metric_threshold_executor.test.ts
+++ b/x-pack/plugins/infra/server/lib/alerting/metric_threshold/metric_threshold_executor.test.ts
@@ -17,7 +17,7 @@ const alertInstances = new Map();
 
 const services = {
   callCluster(_: string, { body }: any) {
-    const metric = body.query.bool.filter[1].exists.field;
+    const metric = body.query.bool.filter[1]?.exists.field;
     if (body.aggs.groupings) {
       if (body.aggs.groupings.composite.after) {
         return mocks.compositeEndResponse;
@@ -228,6 +228,7 @@ describe('The metric threshold alert type', () => {
               comparator,
               threshold,
               aggType: 'count',
+              metric: undefined,
             },
           ],
         },
diff --git a/x-pack/plugins/infra/server/lib/alerting/metric_threshold/metric_threshold_executor.ts b/x-pack/plugins/infra/server/lib/alerting/metric_threshold/metric_threshold_executor.ts
index 8c509c017cf20..778889ba0c7a5 100644
--- a/x-pack/plugins/infra/server/lib/alerting/metric_threshold/metric_threshold_executor.ts
+++ b/x-pack/plugins/infra/server/lib/alerting/metric_threshold/metric_threshold_executor.ts
@@ -63,6 +63,12 @@ export const getElasticsearchMetricQuery = (
   groupBy?: string,
   filterQuery?: string
 ) => {
+  if (aggType === 'count' && metric) {
+    throw new Error('Cannot aggregate document count with a metric');
+  }
+  if (aggType !== 'count' && !metric) {
+    throw new Error('Can only aggregate without a metric if using the document count aggregator');
+  }
   const interval = `${timeSize}${timeUnit}`;
 
   const aggregations =
@@ -108,25 +114,32 @@ export const getElasticsearchMetricQuery = (
       }
     : baseAggs;
 
+  const rangeFilters = [
+    {
+      range: {
+        '@timestamp': {
+          gte: `now-${interval}`,
+        },
+      },
+    },
+  ];
+
+  const metricFieldFilters = metric
+    ? [
+        {
+          exists: {
+            field: metric,
+          },
+        },
+      ]
+    : [];
+
   const parsedFilterQuery = getParsedFilterQuery(filterQuery);
 
   return {
     query: {
       bool: {
-        filter: [
-          {
-            range: {
-              '@timestamp': {
-                gte: `now-${interval}`,
-              },
-            },
-          },
-          {
-            exists: {
-              field: metric,
-            },
-          },
-        ],
+        filter: [...rangeFilters, ...metricFieldFilters],
         ...parsedFilterQuery,
       },
     },
diff --git a/x-pack/plugins/infra/server/lib/alerting/metric_threshold/register_metric_threshold_alert_type.ts b/x-pack/plugins/infra/server/lib/alerting/metric_threshold/register_metric_threshold_alert_type.ts
index 501d7549e1712..ed3a9b2f4fe36 100644
--- a/x-pack/plugins/infra/server/lib/alerting/metric_threshold/register_metric_threshold_alert_type.ts
+++ b/x-pack/plugins/infra/server/lib/alerting/metric_threshold/register_metric_threshold_alert_type.ts
@@ -17,22 +17,44 @@ export async function registerMetricThresholdAlertType(alertingPlugin: PluginSet
   }
   const alertUUID = uuid.v4();
 
+  const baseCriterion = {
+    threshold: schema.arrayOf(schema.number()),
+    comparator: schema.oneOf([
+      schema.literal('>'),
+      schema.literal('<'),
+      schema.literal('>='),
+      schema.literal('<='),
+      schema.literal('between'),
+    ]),
+    timeUnit: schema.string(),
+    timeSize: schema.number(),
+    indexPattern: schema.string(),
+  };
+
+  const nonCountCriterion = schema.object({
+    ...baseCriterion,
+    metric: schema.string(),
+    aggType: schema.oneOf([
+      schema.literal('avg'),
+      schema.literal('min'),
+      schema.literal('max'),
+      schema.literal('rate'),
+      schema.literal('cardinality'),
+    ]),
+  });
+
+  const countCriterion = schema.object({
+    ...baseCriterion,
+    aggType: schema.literal('count'),
+    metric: schema.never(),
+  });
+
   alertingPlugin.registerType({
     id: METRIC_THRESHOLD_ALERT_TYPE_ID,
     name: 'Metric Alert - Threshold',
     validate: {
       params: schema.object({
-        criteria: schema.arrayOf(
-          schema.object({
-            threshold: schema.arrayOf(schema.number()),
-            comparator: schema.string(),
-            aggType: schema.string(),
-            metric: schema.string(),
-            timeUnit: schema.string(),
-            timeSize: schema.number(),
-            indexPattern: schema.string(),
-          })
-        ),
+        criteria: schema.arrayOf(schema.oneOf([countCriterion, nonCountCriterion])),
         groupBy: schema.maybe(schema.string()),
         filterQuery: schema.maybe(schema.string()),
       }),
diff --git a/x-pack/plugins/infra/server/lib/alerting/metric_threshold/types.ts b/x-pack/plugins/infra/server/lib/alerting/metric_threshold/types.ts
index 07739c9d81bc4..557a071ec9175 100644
--- a/x-pack/plugins/infra/server/lib/alerting/metric_threshold/types.ts
+++ b/x-pack/plugins/infra/server/lib/alerting/metric_threshold/types.ts
@@ -25,12 +25,22 @@ export enum AlertStates {
 
 export type TimeUnit = 's' | 'm' | 'h' | 'd';
 
-export interface MetricExpressionParams {
-  aggType: MetricsExplorerAggregation;
-  metric: string;
+interface BaseMetricExpressionParams {
   timeSize: number;
   timeUnit: TimeUnit;
   indexPattern: string;
   threshold: number[];
   comparator: Comparator;
 }
+
+interface NonCountMetricExpressionParams extends BaseMetricExpressionParams {
+  aggType: Exclude<MetricsExplorerAggregation, 'count'>;
+  metric: string;
+}
+
+interface CountMetricExpressionParams extends BaseMetricExpressionParams {
+  aggType: 'count';
+  metric: never;
+}
+
+export type MetricExpressionParams = NonCountMetricExpressionParams | CountMetricExpressionParams;
diff --git a/x-pack/test/api_integration/apis/infra/metrics_alerting.ts b/x-pack/test/api_integration/apis/infra/metrics_alerting.ts
index 09f5a498ddc00..4f17f9db67483 100644
--- a/x-pack/test/api_integration/apis/infra/metrics_alerting.ts
+++ b/x-pack/test/api_integration/apis/infra/metrics_alerting.ts
@@ -13,11 +13,13 @@ import { FtrProviderContext } from '../../ftr_provider_context';
 export default function({ getService }: FtrProviderContext) {
   const client = getService('legacyEs');
   const index = 'test-index';
-  const baseParams = {
-    metric: 'test.metric',
-    timeUnit: 'm',
-    timeSize: 5,
-  };
+  const getSearchParams = (aggType: string) =>
+    ({
+      aggType,
+      timeUnit: 'm',
+      timeSize: 5,
+      ...(aggType !== 'count' ? { metric: 'test.metric' } : {}),
+    } as MetricExpressionParams);
   describe('Metrics Threshold Alerts', () => {
     before(async () => {
       await client.index({
@@ -30,10 +32,7 @@ export default function({ getService }: FtrProviderContext) {
     describe('querying the entire infrastructure', () => {
       for (const aggType of aggs) {
         it(`should work with the ${aggType} aggregator`, async () => {
-          const searchBody = getElasticsearchMetricQuery({
-            ...baseParams,
-            aggType,
-          } as MetricExpressionParams);
+          const searchBody = getElasticsearchMetricQuery(getSearchParams(aggType));
           const result = await client.search({
             index,
             body: searchBody,
@@ -44,10 +43,7 @@ export default function({ getService }: FtrProviderContext) {
       }
       it('should work with a filterQuery', async () => {
         const searchBody = getElasticsearchMetricQuery(
-          {
-            ...baseParams,
-            aggType: 'avg',
-          } as MetricExpressionParams,
+          getSearchParams('avg'),
           undefined,
           '{"bool":{"should":[{"match_phrase":{"agent.hostname":"foo"}}],"minimum_should_match":1}}'
         );
@@ -62,13 +58,7 @@ export default function({ getService }: FtrProviderContext) {
     describe('querying with a groupBy parameter', () => {
       for (const aggType of aggs) {
         it(`should work with the ${aggType} aggregator`, async () => {
-          const searchBody = getElasticsearchMetricQuery(
-            {
-              ...baseParams,
-              aggType,
-            } as MetricExpressionParams,
-            'agent.id'
-          );
+          const searchBody = getElasticsearchMetricQuery(getSearchParams(aggType), 'agent.id');
           const result = await client.search({
             index,
             body: searchBody,
@@ -79,10 +69,7 @@ export default function({ getService }: FtrProviderContext) {
       }
       it('should work with a filterQuery', async () => {
         const searchBody = getElasticsearchMetricQuery(
-          {
-            ...baseParams,
-            aggType: 'avg',
-          } as MetricExpressionParams,
+          getSearchParams('avg'),
           'agent.id',
           '{"bool":{"should":[{"match_phrase":{"agent.hostname":"foo"}}],"minimum_should_match":1}}'
         );

From 85481a7017cd9083e4b6288a8d7ce3febf1b2193 Mon Sep 17 00:00:00 2001
From: Alison Goryachev <alison.goryachev@elastic.co>
Date: Mon, 23 Mar 2020 13:35:27 -0400
Subject: [PATCH 025/179] [UA] Upgrade assistant migration meta data can become
 stale (#60789)

---
 .../server/lib/reindexing/reindex_service.ts  | 23 +++++++++++++++++++
 .../server/routes/cluster_checkup.ts          | 23 +++++++++++++++++--
 2 files changed, 44 insertions(+), 2 deletions(-)

diff --git a/x-pack/plugins/upgrade_assistant/server/lib/reindexing/reindex_service.ts b/x-pack/plugins/upgrade_assistant/server/lib/reindexing/reindex_service.ts
index 47b7388131ff1..1fd022bce4dcf 100644
--- a/x-pack/plugins/upgrade_assistant/server/lib/reindexing/reindex_service.ts
+++ b/x-pack/plugins/upgrade_assistant/server/lib/reindexing/reindex_service.ts
@@ -76,6 +76,12 @@ export interface ReindexService {
    */
   findReindexOperation(indexName: string): Promise<ReindexSavedObject | null>;
 
+  /**
+   * Delete reindex operations for completed indices with deprecations.
+   * @param indexNames
+   */
+  cleanupReindexOperations(indexNames: string[]): Promise<void> | null;
+
   /**
    * Process the reindex operation through one step of the state machine and resolves
    * to the updated reindex operation.
@@ -603,6 +609,23 @@ export const reindexServiceFactory = (
       return findResponse.saved_objects[0];
     },
 
+    async cleanupReindexOperations(indexNames: string[]) {
+      const performCleanup = async (indexName: string) => {
+        const existingReindexOps = await actions.findReindexOperations(indexName);
+
+        if (existingReindexOps && existingReindexOps.total !== 0) {
+          const existingOp = existingReindexOps.saved_objects[0];
+          if (existingOp.attributes.status === ReindexStatus.completed) {
+            // Delete the existing one if its status is completed, but still contains deprecation warnings
+            // example scenario: index was upgraded, but then deleted and restored with an old snapshot
+            await actions.deleteReindexOp(existingOp);
+          }
+        }
+      };
+
+      await Promise.all(indexNames.map(performCleanup));
+    },
+
     findAllByStatus: actions.findAllByStatus,
 
     async processNextStep(reindexOp: ReindexSavedObject) {
diff --git a/x-pack/plugins/upgrade_assistant/server/routes/cluster_checkup.ts b/x-pack/plugins/upgrade_assistant/server/routes/cluster_checkup.ts
index 22a121ab78683..fa4649f1c5dcd 100644
--- a/x-pack/plugins/upgrade_assistant/server/routes/cluster_checkup.ts
+++ b/x-pack/plugins/upgrade_assistant/server/routes/cluster_checkup.ts
@@ -7,8 +7,10 @@
 import { getUpgradeAssistantStatus } from '../lib/es_migration_apis';
 import { versionCheckHandlerWrapper } from '../lib/es_version_precheck';
 import { RouteDependencies } from '../types';
+import { reindexActionsFactory } from '../lib/reindexing/reindex_actions';
+import { reindexServiceFactory } from '../lib/reindexing';
 
-export function registerClusterCheckupRoutes({ cloud, router }: RouteDependencies) {
+export function registerClusterCheckupRoutes({ cloud, router, licensing, log }: RouteDependencies) {
   const isCloudEnabled = Boolean(cloud?.isCloudEnabled);
 
   router.get(
@@ -20,6 +22,7 @@ export function registerClusterCheckupRoutes({ cloud, router }: RouteDependencie
       async (
         {
           core: {
+            savedObjects: { client: savedObjectsClient },
             elasticsearch: { dataClient },
           },
         },
@@ -27,8 +30,24 @@ export function registerClusterCheckupRoutes({ cloud, router }: RouteDependencie
         response
       ) => {
         try {
+          const status = await getUpgradeAssistantStatus(dataClient, isCloudEnabled);
+
+          const callAsCurrentUser = dataClient.callAsCurrentUser.bind(dataClient);
+          const reindexActions = reindexActionsFactory(savedObjectsClient, callAsCurrentUser);
+          const reindexService = reindexServiceFactory(
+            callAsCurrentUser,
+            reindexActions,
+            log,
+            licensing
+          );
+          const indexNames = status.indices
+            .filter(({ index }) => typeof index !== 'undefined')
+            .map(({ index }) => index as string);
+
+          await reindexService.cleanupReindexOperations(indexNames);
+
           return response.ok({
-            body: await getUpgradeAssistantStatus(dataClient, isCloudEnabled),
+            body: status,
           });
         } catch (e) {
           if (e.status === 403) {

From 10afcf4be89cf01da3c9d942deaa2c0479be5691 Mon Sep 17 00:00:00 2001
From: MadameSheema <snootchie.boochies@gmail.com>
Date: Mon, 23 Mar 2020 18:46:35 +0100
Subject: [PATCH 026/179] [SIEM] Adds 'Open one signal' Cypress test (#60484)

* adds data for having closed signals

* adds 'Open one signal when more than one closed signals are selected' test'

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 .../cypress/integration/detections.spec.ts    |  299 +-
 .../plugins/siem/cypress/tasks/detections.ts  |    6 +
 .../es_archives/closed_signals/data.json.gz   |  Bin 0 -> 55877 bytes
 .../es_archives/closed_signals/mappings.json  | 7605 +++++++++++++++++
 4 files changed, 7787 insertions(+), 123 deletions(-)
 create mode 100644 x-pack/test/siem_cypress/es_archives/closed_signals/data.json.gz
 create mode 100644 x-pack/test/siem_cypress/es_archives/closed_signals/mappings.json

diff --git a/x-pack/legacy/plugins/siem/cypress/integration/detections.spec.ts b/x-pack/legacy/plugins/siem/cypress/integration/detections.spec.ts
index de17f40a3ac71..646132c3f88eb 100644
--- a/x-pack/legacy/plugins/siem/cypress/integration/detections.spec.ts
+++ b/x-pack/legacy/plugins/siem/cypress/integration/detections.spec.ts
@@ -16,6 +16,7 @@ import {
   closeSignals,
   goToClosedSignals,
   goToOpenedSignals,
+  openFirstSignal,
   openSignals,
   selectNumberOfSignals,
   waitForSignalsPanelToBeLoaded,
@@ -28,129 +29,181 @@ import { loginAndWaitForPage } from '../tasks/login';
 import { DETECTIONS } from '../urls/navigation';
 
 describe('Detections', () => {
-  beforeEach(() => {
-    esArchiverLoad('signals');
-    loginAndWaitForPage(DETECTIONS);
+  context('Closing signals', () => {
+    beforeEach(() => {
+      esArchiverLoad('signals');
+      loginAndWaitForPage(DETECTIONS);
+    });
+
+    it('Closes and opens signals', () => {
+      waitForSignalsPanelToBeLoaded();
+      waitForSignalsToBeLoaded();
+
+      cy.get(NUMBER_OF_SIGNALS)
+        .invoke('text')
+        .then(numberOfSignals => {
+          cy.get(SHOWING_SIGNALS)
+            .invoke('text')
+            .should('eql', `Showing ${numberOfSignals} signals`);
+
+          const numberOfSignalsToBeClosed = 3;
+          selectNumberOfSignals(numberOfSignalsToBeClosed);
+
+          cy.get(SELECTED_SIGNALS)
+            .invoke('text')
+            .should('eql', `Selected ${numberOfSignalsToBeClosed} signals`);
+
+          closeSignals();
+          waitForSignals();
+          cy.reload();
+          waitForSignals();
+
+          const expectedNumberOfSignalsAfterClosing = +numberOfSignals - numberOfSignalsToBeClosed;
+          cy.get(NUMBER_OF_SIGNALS)
+            .invoke('text')
+            .should('eq', expectedNumberOfSignalsAfterClosing.toString());
+          cy.get(SHOWING_SIGNALS)
+            .invoke('text')
+            .should('eql', `Showing ${expectedNumberOfSignalsAfterClosing.toString()} signals`);
+
+          goToClosedSignals();
+          waitForSignals();
+
+          cy.get(NUMBER_OF_SIGNALS)
+            .invoke('text')
+            .should('eql', numberOfSignalsToBeClosed.toString());
+          cy.get(SHOWING_SIGNALS)
+            .invoke('text')
+            .should('eql', `Showing ${numberOfSignalsToBeClosed.toString()} signals`);
+          cy.get(SIGNALS).should('have.length', numberOfSignalsToBeClosed);
+
+          const numberOfSignalsToBeOpened = 1;
+          selectNumberOfSignals(numberOfSignalsToBeOpened);
+
+          cy.get(SELECTED_SIGNALS)
+            .invoke('text')
+            .should('eql', `Selected ${numberOfSignalsToBeOpened} signal`);
+
+          openSignals();
+          waitForSignals();
+          cy.reload();
+          waitForSignalsToBeLoaded();
+          waitForSignals();
+          goToClosedSignals();
+          waitForSignals();
+
+          const expectedNumberOfClosedSignalsAfterOpened = 2;
+          cy.get(NUMBER_OF_SIGNALS)
+            .invoke('text')
+            .should('eql', expectedNumberOfClosedSignalsAfterOpened.toString());
+          cy.get(SHOWING_SIGNALS)
+            .invoke('text')
+            .should(
+              'eql',
+              `Showing ${expectedNumberOfClosedSignalsAfterOpened.toString()} signals`
+            );
+          cy.get(SIGNALS).should('have.length', expectedNumberOfClosedSignalsAfterOpened);
+
+          goToOpenedSignals();
+          waitForSignals();
+
+          const expectedNumberOfOpenedSignals =
+            +numberOfSignals - expectedNumberOfClosedSignalsAfterOpened;
+          cy.get(SHOWING_SIGNALS)
+            .invoke('text')
+            .should('eql', `Showing ${expectedNumberOfOpenedSignals.toString()} signals`);
+
+          cy.get('[data-test-subj="server-side-event-count"]')
+            .invoke('text')
+            .should('eql', expectedNumberOfOpenedSignals.toString());
+        });
+    });
+
+    it('Closes one signal when more than one opened signals are selected', () => {
+      waitForSignalsToBeLoaded();
+
+      cy.get(NUMBER_OF_SIGNALS)
+        .invoke('text')
+        .then(numberOfSignals => {
+          const numberOfSignalsToBeClosed = 1;
+          const numberOfSignalsToBeSelected = 3;
+
+          cy.get(OPEN_CLOSE_SIGNALS_BTN).should('have.attr', 'disabled');
+          selectNumberOfSignals(numberOfSignalsToBeSelected);
+          cy.get(OPEN_CLOSE_SIGNALS_BTN).should('not.have.attr', 'disabled');
+
+          closeFirstSignal();
+          cy.reload();
+          waitForSignalsToBeLoaded();
+          waitForSignals();
+
+          const expectedNumberOfSignals = +numberOfSignals - numberOfSignalsToBeClosed;
+          cy.get(NUMBER_OF_SIGNALS)
+            .invoke('text')
+            .should('eq', expectedNumberOfSignals.toString());
+          cy.get(SHOWING_SIGNALS)
+            .invoke('text')
+            .should('eql', `Showing ${expectedNumberOfSignals.toString()} signals`);
+
+          goToClosedSignals();
+          waitForSignals();
+
+          cy.get(NUMBER_OF_SIGNALS)
+            .invoke('text')
+            .should('eql', numberOfSignalsToBeClosed.toString());
+          cy.get(SHOWING_SIGNALS)
+            .invoke('text')
+            .should('eql', `Showing ${numberOfSignalsToBeClosed.toString()} signal`);
+          cy.get(SIGNALS).should('have.length', numberOfSignalsToBeClosed);
+        });
+    });
   });
-
-  it('Closes and opens signals', () => {
-    waitForSignalsPanelToBeLoaded();
-    waitForSignalsToBeLoaded();
-
-    cy.get(NUMBER_OF_SIGNALS)
-      .invoke('text')
-      .then(numberOfSignals => {
-        cy.get(SHOWING_SIGNALS)
-          .invoke('text')
-          .should('eql', `Showing ${numberOfSignals} signals`);
-
-        const numberOfSignalsToBeClosed = 3;
-        selectNumberOfSignals(numberOfSignalsToBeClosed);
-
-        cy.get(SELECTED_SIGNALS)
-          .invoke('text')
-          .should('eql', `Selected ${numberOfSignalsToBeClosed} signals`);
-
-        closeSignals();
-        waitForSignals();
-        cy.reload();
-        waitForSignals();
-        waitForSignalsToBeLoaded();
-
-        const expectedNumberOfSignalsAfterClosing = +numberOfSignals - numberOfSignalsToBeClosed;
-        cy.get(NUMBER_OF_SIGNALS)
-          .invoke('text')
-          .should('eq', expectedNumberOfSignalsAfterClosing.toString());
-        cy.get(SHOWING_SIGNALS)
-          .invoke('text')
-          .should('eql', `Showing ${expectedNumberOfSignalsAfterClosing.toString()} signals`);
-
-        goToClosedSignals();
-        waitForSignals();
-
-        cy.get(NUMBER_OF_SIGNALS)
-          .invoke('text')
-          .should('eql', numberOfSignalsToBeClosed.toString());
-        cy.get(SHOWING_SIGNALS)
-          .invoke('text')
-          .should('eql', `Showing ${numberOfSignalsToBeClosed.toString()} signals`);
-        cy.get(SIGNALS).should('have.length', numberOfSignalsToBeClosed);
-
-        const numberOfSignalsToBeOpened = 1;
-        selectNumberOfSignals(numberOfSignalsToBeOpened);
-
-        cy.get(SELECTED_SIGNALS)
-          .invoke('text')
-          .should('eql', `Selected ${numberOfSignalsToBeOpened} signal`);
-
-        openSignals();
-        waitForSignals();
-        cy.reload();
-        waitForSignalsToBeLoaded();
-        waitForSignals();
-        goToClosedSignals();
-        waitForSignals();
-
-        const expectedNumberOfClosedSignalsAfterOpened = 2;
-        cy.get(NUMBER_OF_SIGNALS)
-          .invoke('text')
-          .should('eql', expectedNumberOfClosedSignalsAfterOpened.toString());
-        cy.get(SHOWING_SIGNALS)
-          .invoke('text')
-          .should('eql', `Showing ${expectedNumberOfClosedSignalsAfterOpened.toString()} signals`);
-        cy.get(SIGNALS).should('have.length', expectedNumberOfClosedSignalsAfterOpened);
-
-        goToOpenedSignals();
-        waitForSignals();
-
-        const expectedNumberOfOpenedSignals =
-          +numberOfSignals - expectedNumberOfClosedSignalsAfterOpened;
-        cy.get(SHOWING_SIGNALS)
-          .invoke('text')
-          .should('eql', `Showing ${expectedNumberOfOpenedSignals.toString()} signals`);
-
-        cy.get('[data-test-subj="server-side-event-count"]')
-          .invoke('text')
-          .should('eql', expectedNumberOfOpenedSignals.toString());
-      });
-  });
-
-  it('Closes one signal when more than one opened signals are selected', () => {
-    waitForSignalsToBeLoaded();
-
-    cy.get(NUMBER_OF_SIGNALS)
-      .invoke('text')
-      .then(numberOfSignals => {
-        const numberOfSignalsToBeClosed = 1;
-        const numberOfSignalsToBeSelected = 3;
-
-        cy.get(OPEN_CLOSE_SIGNALS_BTN).should('have.attr', 'disabled');
-        selectNumberOfSignals(numberOfSignalsToBeSelected);
-        cy.get(OPEN_CLOSE_SIGNALS_BTN).should('not.have.attr', 'disabled');
-
-        closeFirstSignal();
-        cy.reload();
-        waitForSignalsToBeLoaded();
-        waitForSignals();
-
-        const expectedNumberOfSignals = +numberOfSignals - numberOfSignalsToBeClosed;
-        cy.get(NUMBER_OF_SIGNALS)
-          .invoke('text')
-          .should('eq', expectedNumberOfSignals.toString());
-        cy.get(SHOWING_SIGNALS)
-          .invoke('text')
-          .should('eql', `Showing ${expectedNumberOfSignals.toString()} signals`);
-
-        goToClosedSignals();
-        waitForSignals();
-
-        cy.get(NUMBER_OF_SIGNALS)
-          .invoke('text')
-          .should('eql', numberOfSignalsToBeClosed.toString());
-        cy.get(SHOWING_SIGNALS)
-          .invoke('text')
-          .should('eql', `Showing ${numberOfSignalsToBeClosed.toString()} signal`);
-        cy.get(SIGNALS).should('have.length', numberOfSignalsToBeClosed);
-      });
+  context('Opening signals', () => {
+    beforeEach(() => {
+      esArchiverLoad('closed_signals');
+      loginAndWaitForPage(DETECTIONS);
+    });
+
+    it('Open one signal when more than one closed signals are selected', () => {
+      waitForSignals();
+      goToClosedSignals();
+      waitForSignalsToBeLoaded();
+
+      cy.get(NUMBER_OF_SIGNALS)
+        .invoke('text')
+        .then(numberOfSignals => {
+          const numberOfSignalsToBeOpened = 1;
+          const numberOfSignalsToBeSelected = 3;
+
+          cy.get(OPEN_CLOSE_SIGNALS_BTN).should('have.attr', 'disabled');
+          selectNumberOfSignals(numberOfSignalsToBeSelected);
+          cy.get(OPEN_CLOSE_SIGNALS_BTN).should('not.have.attr', 'disabled');
+
+          openFirstSignal();
+          cy.reload();
+          goToClosedSignals();
+          waitForSignalsToBeLoaded();
+          waitForSignals();
+
+          const expectedNumberOfSignals = +numberOfSignals - numberOfSignalsToBeOpened;
+          cy.get(NUMBER_OF_SIGNALS)
+            .invoke('text')
+            .should('eq', expectedNumberOfSignals.toString());
+          cy.get(SHOWING_SIGNALS)
+            .invoke('text')
+            .should('eql', `Showing ${expectedNumberOfSignals.toString()} signals`);
+
+          goToOpenedSignals();
+          waitForSignals();
+
+          cy.get(NUMBER_OF_SIGNALS)
+            .invoke('text')
+            .should('eql', numberOfSignalsToBeOpened.toString());
+          cy.get(SHOWING_SIGNALS)
+            .invoke('text')
+            .should('eql', `Showing ${numberOfSignalsToBeOpened.toString()} signal`);
+          cy.get(SIGNALS).should('have.length', numberOfSignalsToBeOpened);
+        });
+    });
   });
 });
diff --git a/x-pack/legacy/plugins/siem/cypress/tasks/detections.ts b/x-pack/legacy/plugins/siem/cypress/tasks/detections.ts
index 3416e3eb81de3..abea4a887b8ba 100644
--- a/x-pack/legacy/plugins/siem/cypress/tasks/detections.ts
+++ b/x-pack/legacy/plugins/siem/cypress/tasks/detections.ts
@@ -40,6 +40,12 @@ export const goToOpenedSignals = () => {
   cy.get(OPENED_SIGNALS_BTN).click({ force: true });
 };
 
+export const openFirstSignal = () => {
+  cy.get(OPEN_CLOSE_SIGNAL_BTN)
+    .first()
+    .click({ force: true });
+};
+
 export const openSignals = () => {
   cy.get(OPEN_CLOSE_SIGNALS_BTN).click({ force: true });
 };
diff --git a/x-pack/test/siem_cypress/es_archives/closed_signals/data.json.gz b/x-pack/test/siem_cypress/es_archives/closed_signals/data.json.gz
new file mode 100644
index 0000000000000000000000000000000000000000..117c829b31d6e4fad894f589c5244678206ec21a
GIT binary patch
literal 55877
zcmaf)WmsIzllGI~0fJj_mk`{YAi+JjyE{Yh;O;JiYY6ThB)H4q7Cg8+yhCLF+1=;a
zm)~{G%m;e<RCjev)qUy^hQdC3`g?)4x9B2^I{>1(dmJeUx|n*yyCrTp%|k@26@Xyq
z^9<*(CBz)kw*pv;=>2}HsjYYjnIXSIh^>4-zDoARK||AL*OH9l;>Rr=+4Q?9{)7BB
z%=9}9?$t7r4Vb`ERx18$!Ye3Gt8RPqn2z}*|8PEBOav1eGHHX0xhsKY#$=}V;j3ia
z=~kfOrmwyy3L-Rnwo@B(bBy=2DyoO96M`kv3uaBqWtfTpU*$H@e*QD}O>Gl7Kb@u*
z8Fz=Cr$pyB2bmhBz9^#Re$!No6vl#|p{REyW^GIcI`6D0Yi<*jpAqIASaXT_TX^tu
zSBf>)icZ(F<Wo3Cv2F#Iev9(Y(S)<O|MpVvdQqlq835DipiI!YVOC%fmhzFhy4VQK
zN?I7nBCZ>xPcaum6%%)MqOhg%6;Z$HFm_ib{bN#ycGU!3!EWQ{*tTJc`>pTTirZSe
z9g?A=jo3}St2Gnf-#uC;pFE>K6m;~Mmb|x%y;!wRPY*m{(oVM@4fX}?aB>}-uhMGG
z2d*}j9=t;Vq~4?7`0CfM%jUGcVO(rTRA8w2EG#{rxA9ujKRzX^Sdx{vcf8VtSVcu;
zHa@T4=gf=FGf=kB$mz2baI&bGg;J`oFUlV(QC}UIV#_}bRxLBG!mdhwweQ71+FM8}
zX?VU94r?|UOI2j^dbT_)zfJuGOYik^UA;QYY%J?`Y~!9G<H}d?bi&Z_#5YhBFYb5s
zOCO!DPwE+57wBjakSz5+%E9Nn-<b4Sg%|HUrWdPQnd&u^=S)_jM>H|}_!={yKv(Y!
zFG=YDz0S6F1sMyrBwgw=<-m`=I%~H*xRxR%Kq*N2stYNlL{C0%lbl62$G-=kMWd%v
zxeMd{(8W~IZINjKXs5$Ti;#2l)Z^n;N9=hCrB12Leyt|IbBJ#$$fIHEQziY6AJfqf
zTk8A%%JneeyBkBi)D~N@Cy+eXWi{dcl!<S~+cH?(WT6)+%OPZYW49yRM$+X}b>+Uc
zUGxc7@opC^l>wR(LpnF(^B)zsT@*v@K`*te6z85FU;(q)6&C1qVk*NW7a!;b-(_gs
z-&M<BSJqY7-I<$R9}O9Ag)f^m&V?R&g%7)U8Z?=Hv*^5NR9?#c;Wtg);_BR_TFGHS
z<saQQ_H~sH#Zek^(;|Ib>2wyy8m=NOX3S_rw$IGh(`?SGJ7HXAY{9I9^TzWYTFwc+
zuo+IX74b}qUkm6s;juFA)YPoAvG1`51PXC7?agm|o^tw@<csY_PT3OC=7!<*_<G3^
ziarBa6|ciNDEGBB?`rY9CylOwNEnEAzW*bCIPtjig1knvY#D(xk@NiB*j{>~Z^^{b
z9^B+mv}F3+aGipS^6fXGa2CB1?VF|jvy}Tyz1Jll9}j;t4=M9w)D0>+281g&IVe@-
zUQQ>$bKjfU5a1!)Y!H9_-ic43f$%UgHMiLaQ}bAQ4nKVW1jRoRlti|L4AqDi;X7w~
zxAHw77JS_%Htm1!*!d&#-r5N;oWJ<-AjOKKC9qTUn4Zt|K)tkunZu&%5~hfQps4X+
z>$2*q`HQTdCNSm3I#*7+QTc2|!hq$1&B<Z)2g1#w;G>&UsjX8qVdp)+1@OlP1?GcW
zZb*JwW;<+MTyOU5{NoZlP!E=-uSVT7f%RzHih*&;-uAhKCL3!kcFC-14SSy}&fV1h
zWo7`@(1R_d1~4aD`Rl&Yp|V%qm*%M|$6@onE9lLh^EW)(-5Re^MAqw$2b5Sy+DPEI
zYI)z-p!uHIKE5oGL3$m%>wGfd_HByWMXg3OwcSFz%P_dhj0m)I*0X3s^x*d>rWHZp
z=Jev^R=oF0IF}12nS?l*ggTjoF`0xjnMJTcIk$&`294|u8W}Ab*;_O+Iy5qRG%^M>
zGDb8qCNwhUI&zjZy00~mn-?q_7fKr!jz%$Y8=&fqxt0RUS6ST|j&ntxt=I8e^InTA
zvXmyUuDdNtnD0tUmtF*huc|?iRF94`<l%G$7<3+mqW{p@@&ZTc$Lr~~2NQdrs@dpF
zKZI_PLyvJfHv?v7&H!}#@)$`1AHbaPbH(s!DF*ZUEI7<8G22IMA4&dHTMes2_d`s4
zSXEbc+l8c}g1|#&c#x2zetbY@9i-=X&5qzG<V01>O8Bacj}CkExCMDDeFHKk1@Y-$
z_TC|+r#DNKSkt86O;fDnBVS@ZdY<UuS`-^e=54oST&+?15=ar4OIKYQp03?qS{&*;
ze6HCNu~_fW4pn$Gr*&#7F}5`t+h;A^6Iyg?3Xgx4OSJD<cAWib!eNs7;{B$pJ!4k-
zh?luL7cWjrfcKZC;Vi2{#o^ZlFszL}7J;r#owl5yI%|#fA2o$j{m^<99I0GfjO>bU
z-Vw|=mduq}^eC(6zJ9H4g`qN1xH1Pz$5JtAPuh^Mhm$94CSHU*h*|_$qrj6Bm0-@+
zc)|2mLu!9+U}KCr$^m0&wAf!6E#eC(ER?4)sXt-jgbA?%1hNd!i8Yo$$x$EyIKJJX
zOiMi31C`bh7BC|?+@|23ao3R4aM48!j}hQaz6`okl*gr@sHmf|Rvi$h;i?(kAy{Vc
zDB%9I#<h*!!^+<qmEArFBgC_fUVc7tJ0jimaV2Gcu6%OR-KQUl8_{ZewVWY>&fb%e
z9?080R71Ku`AXVq^Z*NjqZyVPqGVgJYI%Y4?P|{HB|z(WRXpe2xtT5DF`RW#fre(B
zYcqZ)OE3J$fqzNa?Z`yp{U!H(?ahUg*P6XSf@i*M7ACXm>BF2;%i`F@>tP1`C0Bp6
zC5}WU#r8sM#i*|ClU<QlPW`qfiWHpT?A52WE+N33SM*}D+S(6CXNvv7jVWW8_Z6#A
zx=y7#7<II=4lXv4LoW`Zfr_=JVd6f7iQXBSH4~a{E({aU+9<w@nEv<HcmV!5IzugZ
zdliYc5)Ps~(%<mY<|Udf1+@yqX^HktzwQ8LGjD6t2NkFUN2i9as`Yy&qtYL)*PlPA
z@6NnH?1?|Us=1$=f!y&L!GEOzYCGgO9CRhV5(onYLy?*lxdlY8lL^<1*}bk>p>fN|
zF>H@VDV+cbu4hs)2Qx%|2?WF5^u<{o;Psr~I`)%_O;|BLxo$38{rA{cw})xg?r&w-
zhTPs*Z-yMt7fD^Wtn?}1XNw0*NC%0f=hKSUwo|_IQ0n3o{H*v;k=i15(09I`4lh9=
zanMjI*-s&Mz<(jZO<ne3O@eI_dnjB+Qf~i?Ij=qHRbvR*Co%>XI|0<cDI|I>WR%(A
zQdZ9#b*R{1loQsE7wouXW~LN1sQQBgBcQ3P8E%Z?gYncL5!@4lba2g|uy=B^10$=w
zbdWMuYi;&)Y&+A#cQI`{zj#%XzWSgb){Wy^J1#*1<sv%J$|)-3@=5>wmw=Uo<xvz$
zHn&b~3LJGfs+E>+bqCl!1()<0R`IiA*K}>$=o)fxYzh^Ot^7kn_^vC}lZ~ZqO&@nT
zmv|20CO$>(mTrZpZO1xn;*`q-Ww_p}e+q@2Dg_<x6<lOv+6t|_6BDY|xBbun%v3~T
zT^|OzigF#;GK!A?jZXLFDkfcB7pT-5+IY-HfNo#p<L5Aa`xh8VO+U2}vqUN6$DzX+
zQQ{V|MZ9nKD+blV0lqIR<>F6NbRYF`ff!8L@{+wHSas^;$K=K+=wB6@{tZURrjK1$
z5oDH6aGLsI3=+*c9+CDDnOZzvmiI;>%i1_9PDvCWWis{11wr7KaYzhAF#Dbu`$P$F
z1~jc1e4VF~BUgk|RV8|yrp;D29T+`{inkc`-ZsF^>=sGc70r}2d`JePYy3<1VFd$=
z(S1OOr@^{_D2oAECRc`wVQKXITGLcXjj#Pi(G`#NMRXjQ<12|M)4ZGOAG;>E_S~s^
z9eIltBcT~hiz|s9Z9dWjCrZlW!RHCsi6lm&Oz-K?*@pwakSmU6qN3nAGx(O|$A*OK
zM8OdXQJ}fN=^;}^s~yGgo}r$_^o2sW!u^G~f1+4ISR^e?JTH8l2`~(`eLJm2j#^E;
znk;~moSda=*k#K@PMrCDr4(e#6NZ46+-9$fMxbYLL)HA_H}bT*&ieHqc2Y#>^copn
z%>~e(j}E*OE6+3EF;-rpz3{K5E+<1Uk{=KwsS8#R1%}C(h}PsIq|iDK#454d+%8aZ
zT=QnEz~jv^_M5a*+Ge7k1yhGW+(7<?@YI`L^a?*pI?E#(voa?pG80i)MJ}^d)blxE
zBXo8)BTQ;m@nhtHRRuDk3;{4nW*HoZe&zE#l5lP{8H=_Tr%<X4ZnC;|JJgYk$&Yyp
z593T_pwA}vl@<1ULTd>SrJa#EkwFWUy^z@14w7Cj_dCTqSERE`tZn|pk6)RYiL2wn
z-f0DJBL^=u4Au{iQJeZR=R(Se)@wmo%~*{x9S^4sz*n`srOzGSqva7lMeNBDbV<(U
z$ZY-_rC#{8S<3H4o8mp&vBP9SQBg$`gB)f4Ya|~JS*D^DOtLJYhDp(aXOZ1ST?D}-
zYq_{AdpF(C>o9sPZ!>qk4adFJ=g@o6`qB03d#ARwCHH})L({e6xFDDH>`^Y)3bFZ7
z7jm)-Iv1+xO{Vk^i5!KN?YKnF2jnR(TdP<sXkE|gXGujGGzGYQ7Yk1PXx~%zPfm5L
z85erGX{xa!wGnOa5S4tv>;L)rUkHBi3dgowA2j?NtJvS2gyxMoO|cVS0i6wP5EBN%
ze&@51@;*J@nM@>O?VH7<Jfa+!%`1;7gk=@p<-_9ijA{AMTX%d`QvDYUZmcsm^;O^5
zPPBjAeH=4gyDcQV@tEAZTz)@<iOn)4HTcei5Dyx9);i?-C(FRUP??$ygzOaR6}O|#
zY9R-S9`a(y2g9QHQ2EQelrS{};Yv5d^=p{NoOZzY{~p!@TZvz}s9BEh<!;Ho-8Q$d
zxQJ)@gPo9%b|0T)o|j`jn!6mo#!1{n?`+eCgA28C5&hfq*;jv2>a!mw*>8s{%+x=Y
z6l*AP6$MEa#-ys>BE~6UOg<I1k?X?-68}~i5kc-QiUb~L9WZOXQLhpAn7;M7K%yY`
zCP#w(;Ftjmpjc*Cdk>9%$;JJ+FREMLShvQp@&ivr7PJUh>n{f38g;=Gpn{<FG-zIz
z<l8uEK!`=SB2x91%wX3howqDGwOZt*UcwLW5GeU*8?^0c&9i!f`ropuoAvmwg}y~F
zK{UB_e^~tnO{tsdtmB+fd#l55J*q-Kv=#pn+7&Xf6xI6UWW*7fpCOMzA~v(=8%Zmr
zIr(=`tHhmt=JgFO^CmJ7tlt|aV82~K$_TAss$luZT;gr4ldo2+MRYz-LUzuldKJX|
zHy<Ju)VqCGV^AT6N*&)(2vOT16U%i}g-<%bObOwj6h$aA=A-5IE(z7hBM{~ZF9<Fq
zlP)xXa3vY<k!;g7Tt6*voGP_^o&&0n)Z`rA;Q<u@AABU8G<N~&L$=MZ4hdVuwGdVW
zaa-!qo(L(^I_28KN(0vXQ_w@NH8<x3L!?!9&x!pwk}72r<t1?IRkQcPvayN3C$lPP
zNQY4<;L-#ousd#t3@w#&D+aJ30P5=MKjd3(QSOKo%=n}<M2CdiHJE<zVyH*2DcwD!
zdk|Dfz5Dz%E_Mw#Y?`l8>?G?J|Mp>VZh9}^<k7%yq;tV2bCk~QV-450?~fsz6=cR)
zIrGW1i155|kLsVsUn1(3EYHgBi_j#k%5kkmNW_yIg;t|E#>b*X8EsEo5{8uFn(tiK
zIdd1^yHO7CkG}kHDG*C+WM%nEoU+I)Q&R$HkQ?DD2sZ(uAn#*|Qd_)4cpcZ2l>Y_(
zqRF81KH2qZdljuGO6V#rn}f)m<S&%JnyiB$>0t}nse$p85s-q}(Q56>Ahq6*9P}}G
zD5rL}H~8?~qFX#u-lRW=4QrLLv4ytG4Qo1#+SK;X-y(ed-oOa#Ti!XYQEcPUh=m}Y
zT#l)HM{_fz$=91?UPMKdqeH70fLp<q4^9{$=668aCB|V)1||7Qf^o$)C;?K>^baqS
zTpT8OXCIDku63P`5O0qb=K>=ai;yx3aXZGEJ~zX|=m;IAfMcR_)?a-1sKP+uu%V=z
zAgX7XKWQZDvECkq=L;KEm7J-S$?3Q5=bgauy1hA)RwQuA9}H{L(z%%%YrL;Gh7Ox@
zt&C!a&NlfYm8%uvK!=F2n>Y*~tHBRTXRf!)*PPb91$o_NExrw9hxYd->|s6~NwXB?
zC@yE!(&_1zKpwA@jCtj$)9}cZj}%I%eOUzXc{!grG*Xapa(qPSn21Tt)^JqFVm0E{
z6Y%Q=P_Eq$!^q%cK>NZnC)=zLJ-P3OlEC&D|BaGqKpo8+Sae}Em_oo(fuRqw@(-fs
zC^kl$kDCg1^p+POvoeGaYE4wZOocd4oKCoHZFKiY%F>2-b)kiB@X4Me$#E{vJn(Fw
zX)PY}nh@Azq^G*Ar4bB^px0a(?|dH_9?#>~8F}z%W!W6Lu?5LJkkj#L?rYxFA6tM5
z5)*H2D~dMqLeKdhYx+)i-bi9iEZ?PgIx>2kPoEId<<pmGNqHSxT#vNnA8JZ@U0Ylq
zSv1xswO&|UZ+<(AN5Y!Wc~oybwQ$|iznRw=K=Ryw474k-Kf9w#EC9GTmNHmh*Vqk|
zg=w|2TVG$24$wzl?^qU<kq#gwy0Thd$5#wEcfWlEESwY*meRHH<e#P8U)dX8uSO2M
zUrSiVsk=-4IXXRz_R(qK+>P_#=Ivovlc!FPR$Jm)>GIA=i`@WH*>c>7KTURZ_8bHG
zTeO(D0hEpKu-na}MYpEQ*4y)y`_<vsUJuVk+#ig&wc#2PLUUcDyp7)HC~&%v7{HF&
zQugO0FutS3n{kwNjW}rcUk_<=bj@)ZIwl^Wp}62^#AiAN$NFUKzo_>K4zBR_7e<^&
zcg=!Azv}wvIG&51jqJ^#7Vt8F)3_m+4t0aG!cW|QgKs@pDolz8M#`PI^X|C!2!kw1
zQ@kwFhz$?oLAIGr*Kul<>LGe+sg#4h^J2Pv)%DP!U?P5~fbfCtTf<J8iaJ6KZB=2t
zZG`YUw4o((ZN8x1q$6e2gXVlPX+uVXYyZd%EH<1r0Y0()=2rHvYe#BSZxqpC;xPUq
z{_`bt&|rO{I-}6XPiaw%DL55_g2$8;x$EJQ$PgMM%z@l>V`)7CC7%>9gGJQ@!6a*`
znK^&Y+k%;0{zh|tu`0NBbZ6ISpA+6`A7}++aj)XNTmKO~wHrS1*e|{;E2&f_PjB*S
z?MvQ-^gf)Qev|YKu7+m`*4}QOji3|-y5fN+xe%FYwI7Jh7FJaC+Al*Y-7rCa)Tk4;
zet6+T1NxC*@w=+kl@W3*?+B$OP?50?+FR&#mY|e8-YC)E&>+0)$4knk2}+Cc^~wz+
zgUpY;NO9fG+AtENf%S%yS3?<ju_2|F-eRD=m?J310t+T6kOlVUBSJRgHb%HIWxcWi
zd5wChDPB|dVy2VmZnZnJCN*@Y(ZEPq3&Fu4H6}%FFxuO}T|uu<KcSPe56%~+J`q`P
z)@Oz+dOwtp8uEgppPK=uGi*qu2kE63l<}e{{)Wc1162f1xcX&?OV|R_dw&w)qrHKH
z_Gq(svueJml{n`((Zk#cO$VBAvgc+mz~}?az7r*=8Pl{1g=pqpNmBRnhF3SgU_Uzb
z4x|s4ayN@`M*bSN;e1#BO~co^PVo$v6o%;}s8>wDiSM*mleDhKxmd#jW}{#6*kxgl
zbU7hlSnwM8{hO%~6&?Qh#CbDABK~=-3_b#p*6Zf`+PZ5EU!KSNf=X8^WSd|+Y6a-G
z4(spi*4%s5nV=A9P}=Qam}ks2i)OC;tD=_iM{r^k#b*%0w(yk4Bu6E|711{N-(YBy
zRNK>%;Tw($S4ov%NeQS*W_w40nDgpKBgiaN9ldGZvJ6pMKxL>JKaC%i+#HcC6r^u>
zPw(;uV$r4bPVaH5@8HKN0KO%+L$dJNiax9AJNf+66tP$^;5y_##Jr@}3s5w{8Hh`;
z`ZC=uh%ZKC0<83xj91m=63#Dqvy7t4M4SwblB}4{5UK40hAB`xdrb0RO!5YI^J--(
zwdOpB-3{R6f!~tbFUjKCM*uEw`qsZa|5>j5Dq0|)E~By!a&7@uo)#lmwGgVyMG`JN
z<tWKzvO^T#0aMTcC~ZG3RAMViRmjPq1pD+AJg&j-o=l1^yLk__JmZ3!*ye6c4|5hn
zLoeU9OTI9PxLUPB&fy9ES8yo#@3Z~*)}UFAtZ3NHiRm;hI3w_aT&-h-VG0&2P7g%>
zIyR<XG{bb0wmUO<{MWKOY?Gt5tP`{t9<tufEn2WI^LSiWHr*OvJlV94-z==b4WW%{
zcL%QEz{xrI>iz?`f-9s-K9x@{v`1$Ymc}lC_JI;9Qt2*Or!I)@wls_yw0~2GsV@5b
zbUf(K`jL!2tsmc=`{}{r{D@9uZKCr;{~Yd<X(-M|sP*)NK8Y(=;N1cToxk=9Jo`&}
z@nJ5rSlD+$-jTv6_@;7kvr@pUKC#c?eY9{g)Oy{a!eK#!FH>WkuRQUd3Qm_Z)Cg_+
zNbPa=V+XgbtDcdqjAWZ;C;BnT&&__1wTat}@{X9zkUjK*^iTCt;@>E_1SimR(K7pv
zejq>eMe$~k35tn;Do9%oGbvyVr=U*t3yU!uZiZzN5B_6W$4|==mRjAf8=LrNV$Pf@
zZgG|)6?e$@=(I^p^zLGU*1&T-MWCOK`{$LWxr@@OgpD9Y`A5y#WCJa)UdsCfbhu>s
zgxneln&(wy5`HAKIK<2-Y~MeYJ?+`)HaYs!j`{gxeV=fc)*c4Nl3z~bBr3VUwfH8Q
zQk#60M2*k^d#i|@0NA$wP_(DhA)-uYmsc|oO(v5$$_>+2lxC0}%$O5gspgvFkM>+2
zE-U#m*~AL}=Pvi*xx)QATJsx*d6(jS8S6a*vdh@6;_-=5%NM90>X?r`)BOI;szTW0
z)=cD93360_`xr%qITsA++&;tn@Lo<ubA4FMA77LbUW?Nz3HhwGWP=xGFe?!`^l86N
zYUW)R>6Q=^v|FugE&*(#k~GbJGvN8uuwsV(-8=M1P;r6q0li7QS!xVJ)J7mf^0#md
z@h_iO;b3}1&^T<F#>@&rRUGhT^yvL^{m8DTL(A*hS8#Xn{xH|+=wj=}`>u9TfWGJi
z^?qKvW7nOcn_m2%&sm40KKi)AXOAGZtv$mtKHHw4Ud@6or>GEtLS48)7(zqRO51Tm
zI!)c~te>6*HjnBo#_cSoKqn+NFCIu}!L(J@cnbG)%qH=h{UjJ6v}6A5m~m_rCQ4wF
zHyEpZ%)+J=H6#q$Ou#whtdQW+YnY%GKP<Fm_>cnG_Oy)Ph0IA5`#Do0{lzkS0sz#}
zB$d$GytYmLL7U`ooxJLZN2dE2?1SLC>eoX2dBxDyFM1_hDV5EXLXH8fNii}gq3jpV
zs2}x%iXn}pflB5<QDWSJL`zWn?e$ICm1CR|-}>n$haG65H*Gvvhc|Ltk1cldSiZ6Z
z`OJCr?rNznH?lazu%B!W301v@NnPEis9TKf`?h*{Vfs!uvpoUA8fMddMH@MTS5cmN
zCnjK%#zd5~<^)q1yKRw~{}Z?d@f0xBGG~VO{IuqhN%(YrkpAX#H^2W$hRCKc{GmRJ
z5;A2jR*FS&*3gIa{%um$Zh<CR4ih-cUPfVPNopU@Phc3DJVy_@bnG){3FCbu%hR=U
zH05)a_;^h5(!FYQtgG!*56Vko18iyoGc<WC2P8WwE;9|!Uf)U|&RKI@UQWCNSs>Wd
zSAc%hCxwXmagB29?w7NpifUQA+c?5{Y%dLr+`67_EbWfm6E=1bdp=&#^brddQ&iV_
z3srYyA2lc~A|N`9GRj?PnpkrdQ3Q^?O*im0o~{rSld-;p)*ArKX$~n{9|fe+FXbe{
z;!#78>w^^uRPVo#XH^KGY#z*33!{J~td{M6DZ&#TY#VC@l0$sqn?DUJ+d#^qZnV;h
zlP#W{Bb*6lFjN>hE=ZPsf6K}Y)aEhgd22xJ1>_7Sa*l<y+Lw~-8t%=67-}zm8yD0N
zAEXfqAp!Xp!v4Yn#}Tv0pLv~VH8M#3Dg^C=Y-8oa`qP-@X#`Wh_!u+xK5O?ojwvLw
zGQOlj!6SbG=KFK<cWQA#h!{)s{P(p3{4^%hT>K`|BylY{!q|-Ss1@O0lNiCma`4|2
zM!~k%$f=L_qCwV$Ne)>h%sO<0=YlBGlRl7q9idi7D^$=F>+NFglVA?~xg?BDsK=EP
zvu1geZ<>&iaw*Fcic>=<A8X(kkr#YJy&m6%@ZVlc<yqHFA(Zk<EtKtbP6=Yrg|B~f
zlBK5z!<`uufR@`DWt*fn37_zNt<_#5gwLMR`8G5xEJE!KuHU!smOr+;7NkmG8O<hY
z%$rK_HO!*T&FgDJicQd8o0Ilu0cdMRSsdQZGE0ch0upUHYlUe9OVCHC{CZQuOIr|7
zuoRmv>|GpRc6o^~pP6S(`H>d0u8~C2<yUT0HzNdpsbNiBoz6{G=qij0!q*xwdoAza
z>sg?j8{;9mWs3C5910Srs1W#F&PINrJRw%e(L8H{w^i>(#`#&3$0&7#h3B(l;pfbR
z2&Zu}&o%g4TF$IhufDR**XU&xUPC&;02;&I2N+p7MxR<Z?W{8xm*T4x08Gt&*~sK<
zKcWDjU-v<Xr2u5$kGAg$);@yz9anEy>ZPwBod+l0(%JV@u2c~A+_RU>y(d)ZaJ~E}
zLZ@;xGdT4{qGqB4&L&MVxky(jj9N@TM+xO(1ho?=oxHA80#Mu=gxU^wTcd9~(N29i
zn&b4g4*}tGW!00e#tz={TA{xvb`6%!L>}%Jt2QR#PKHGp?m5w7T{0HzZxv?p->#8N
z*p`Cw-A#-^)~?Kr+W$qaLNA~f;Lr}Z@tlp2`3hKOYde}oY<;M-b3eMFu3RM5<#uAP
z^^G+4-j{hA0nRj^2K<K)q{!r(q)21NDTXl$#`Ir4bq&JH`su&yN7ZB~fnp9Y&8a>H
zapHytnD@eg#k?ngF~8^hp*<TR-2tHd;jt@iQF9s4#+7~NFIwwnTN~@F%dNKypwRYi
z4efLyo|l%#`*X#=-f3ncgekM7Np{76N^DGtcq35+q9h_QTyV)*f)`_N`u+5mgb<`4
zh{qkwA^%KU{d?MVPq+D5xEYz`Y5rQ-+FKh99e(#E;*scmf|UK-7TkF_M);O}fSo0`
zVG}r4`#t*CrE5*i0N6tJO0bw>wqwWTVY-u*wOvwH9$;hZl|j%Q?wDP|gv2NDgDBQw
z5r5WboM@hSeh6Y--mT4&l2VuZB*%ID>SA>&wPd5S^wBQN@^Zz}<e(SOHT+_Jbq2h&
z;GE5n`!AYa)+z=cNtK{<ym@0NkrG3z6(MMt02?b~l!)(tp=xIUVQ4MyRupGAZmj=j
zm2#h4BNe_jHZpRbFLh~G=JYxOtS%O__n^-nw9m>c`0q<CQZd3?1{#2`?td-s=kD5p
z?mhtn<-u{KR!I;_iIHuzaRS`Lxbe=akXarI4N6W6Y@87+aiJvMZ?#p%9(>774Z7UN
zS2G9esaiUoZ6_|$maROhu5BStHufC$0u)A`&9naV%0kVn<#FWdHQcqakA0@CluS{`
z@wphqegi}td&R`jo_$2DE`eVaJxb-0`DbNgNS;;}YQCbU2hfz-!LH+^l-PDp5?XiL
z3qTqMoY7ep>~@@}>2l-EgN5DyrAM~|)I|lu;7Y^vTBf6mq~3-jvx#+PgUFx;nBYQ$
zn8bA1;zb<OLXiz3{%FcFsK0G=ZL=(((B<}Qo}b&UjK3(@zb6bdhk9Dsh=u5VV|~je
ziU=$45e4Ute;rVv+G1BRkPtz(?^J-QERP~G76<HWaFS7P*$^fAegp?8nk%)z-Uo(&
zIWgHh_0Lv9wu)oUTJz0B@U$)gbQS^)E;m@oi+5#rg15kC4gorr!uPRFs=fj^YQbXp
zKM3GS@ZRr)cg+AG>hC^`(ab%uTQ6T|Ai3nMFe&V~AVipcH|<|KG3=jKK>p)&-Zn8J
zPu@csc_dxwQyr<lmmIF5bl7Z0ZrB84!tKCbn`4YQV~y1F<YZtq6TA)o;lp|DTF09N
zi4et<aoR%Pw706!5V@h=6t99wyQ0Y6EvZJBVO75rk1?!NPT6rY<o5n4_Fsz4%8>rr
z&g5GoZpP>HC8r55-OBh0L$JzZL40RX`vhtGXIe8dQw_=fDhhl5c2p!OqL9rZ<U4gz
zG`d>`kG$H6`3Kk-VhTq&;VF1lX%!&!MC|*Lky(QOc+tD3O9y+=4%mzE``C4^&#fIA
z>b?Q^<$oIMq*9w2y!5Y&8&*Z8XzHkD7!q$2&Dw`1s0qM15suCSDcO(ktg?;M5>H~#
zh}dKsvfY494gN1ve|v5b*i@$H^Lg~gYuq>*L-)YT>nNI^)4E{Q#yUxwWY^*Uvm@zq
z;~SQ%t5RL13k~f0ffQ1adHrC<B?zi|D_N*bQ>x^7geC{9!p4{>asI?V<lph{1RUz6
zzXEtICge|d4zgV8?ki?)K0O^#%7bn|zyOYJlgGcE7)@i!A}q2^JOw4>aVE5!1m#Mp
zFXh2ocu;myt|(Fz-lC+~CgW<N;(y#8?I}E1)6K{%(9e&-%~*rOe7*&|!<BYv1-l;H
z&jYg@zMq@@f4FZmxPB8UB9A&%!y>uVHr~in;mS8f%MBpVU)sa3>0qD;8^`;uKw*gq
z_a_oD{63`*R|GMOOOk{sK;9;sgb>2p0hFIJE{5;>0sR9FFaIqPnZ@KHNm&pOsg9Pq
z2h%QK_-~D0L1qYr;Zlo}n5FWD%fGP!uF*gd`jK3=1B|^-8}*@Q4`eKzF{wQX^Wmvw
zN&(w8%quogR&}!00QM45n1cB^?YRZdR#y{8T<a@Q)Ox+TZle?S!JGG1VKmfaYhjEA
zC58%7Ce`aqIav$>$)w6cLH#!66*GH?MpQytf#ZuB?z<7hkgks>v&zY9X@@7FG8Is)
zx}+GmYcX{+2EG#tyNwSA-%GYWo@$o8KC)Xp*JOl`0OX^BZ`J$!x>fJ=>sCDp2I_0K
zm;T9S{j_?T$8cn?N*{sb)=Kk}WFxf)_&^q%czWU3wjW;Zt~^Dxiw5zZg)6X?HY0EZ
zA?^^JKT;b>h)2tHU{B)q<mh&M$eDrUwhPc36$@`?=%oD0P=v)%<X~j{tTSaEmym9^
z=eB)!D7m{ll{68Kc8|xEbFq6_S6!}B6~E(zI|Wptf*}q67sVab=#0^CVrs%=)ZZG&
zq;pZIDK+e+ClHZMfgtx^unZ~K(Y&z3GoEDdf6ek1Oo<x9Tkm}T{BtDsxA{qv3$JN7
zG~d7DOhik@yj{x|IfKkUul!hZUv+hIY<POATfT}kR&CAv)(&Puzt*~smM3v`L1-dH
zaAHnq;@w}|cueSbkZpw5l1Pdp%B#IbiKz>F_e>0!J+AhxT3QgUTYOxB1Iv#{22v0^
z1;jsE&9z9Eg2_k8xl}vDI<LMwa|KcBk0ky8K@f8Xx0T1!RCDmrDm9~ks-b11fNFyb
z5`a3hJ5__FK}Ue^nWYtiB+qvw6gR5+a3B<?K##1!o-*iD0URu;2p3hTGPI;Lwfr0B
zZFXb#m%$7hxnaZGrjGjk<Li|LqBFUb<uME>@eDjB->QkyiqoXW$1Pacz|`Vwvs3IZ
z8(PfRAl!y8Dz-7c%~ab0H*2sg(AT%VGBRiikLF*pl9JLl9@w1E(l0tctCz2~_rhrk
zUwo%N{s5?BtofQb6jyabwZ23X1KNvz+Bk9ezbHO2N+G#<=3QfVlu<z!lUv9@W>J=1
zNd^;BRU<|78LvW|@&_<8LQUdcr2kW{KbZ3*@i&gI`oGl1{}_r_HbEY7=*=><vv|lf
z1>XjGw`MhgRmx#)iJm8$E2(xlegjH1_R<WD%j-@Ik1v@(sGP=b8#&KdWJpPi%y4+2
zY?{QLb(NiXf79*RRFzMox_XQU@>`DzHWV-Jb=2*cKp?Im;c`jHJ6^KeM>SZwHn*?$
zAe6Dnq7^deS_N3I0K7-JK2$LvTraWNcOuwBL^S&?eEKhJVXVcpaoRt|y-LwGB0KfN
zCHNA=D9DTEqtH*z7`HL#>-SkuA$L%11NNM2c}?;ehCM_pBy#+B&v>wc?4tA3VB+8~
zj22MDe>2_|t@NPqs_jWf7QR=Y@cJVoyQjCYZUeYQ+8FJLNIi%|Uwl4Ie!uy;fwxs-
zQJtGgB|T(h&6poMc#i($;&f_y<if}YCJw=j&*SveVY?rsc=>%}oyNYbpi+VVOI=s}
z$-(n~(vR;8XRdJE1ZMBvUg#QopKvkTL(k->w%jz9C?hVnvh~>LG}Zi12`~JIffX{1
zq8V}G*(eA)(LY3+TOxj{zekL>k2qu-p(<^sureTOI%+!&;g<kXwF~ZKU34HtiMtag
zEo%Qv8Rau=vw?Kua(i?wvD`Mxd#ywa)jDe(_Xfz|wUwsW7ye<1IdPRww*GrG?hg(n
zV;~XwsML`rur1Q^h}I;~!HL&o%V#Ed96+)gBR#IMYEXtJlh=$H{>DYdfMu8SEpAPf
z#OX}zy_M7j<7`GVhi+wLA0NeS(w@Pu4;X!|K?z3EN}~!?2jq5Y3ac?;vqH8sd4V9+
zfvArxY?LOI6D03n&02l$f_?gm9z!oc?ENNy=GBZytLz}*KAN4;q~B_OcesyjBhs2^
z3if{FGw;c5oWhNR-u)&QPL~E0oLA?@$NMW2b)cs6GO{mq6!^D#Cpq9slq`3O&J>q7
zRGblB+V-de#<VW8<``sQP-HNLYUh!PwWnKZ&^4tE6_5G6;z|kgc-un{$>X_)-pTh*
zt$!o83O|XRQrRyfmO+lFEF!q7LmhM}2NP2*1A9PQ-5k-uAI&us&WwBx4T#Rlq0a;}
zxS#6JF@1OF3*+7}%D=Ml?)2n<h-T8Gl{@GqSD!#(qtM(uKYtlvtA|A$+x*o@W}t_Q
z+$_Pv!GQ0KZSDujZ?rrRjz0fbY3g!!<YL09Yswe|REG(~;o^~5tK-7VW;(^ZR*5()
z@R1rb5<}C9=@6F1!1|SEIUFM($13xDWfu4zw1@JI{d_6VW8`-JG05aoKX`|&0%foF
z&A9W794M($4{(S$4&4~?re|zirvc#^HB8%<)#DNHJ>k|C&s=8tb3$d1dTzgJdVy2=
z2ENUkq+Ns3$X_2+)^D`cdfk91?Tzc`ad@~60r_kKDfAr2T?KfGpCHxDdn{+810~Cd
zhg1f&(*y?38K-+Ry+DM|eGKD=21o_CFFH+T9~L}rORSJ0WIYEbNd-3i?}pxglA(Ul
zag^)|Sr{l3mP!94pJDwCjXU^f!8byl2D<$Vo6Htowj&643y38;pT?P!F29EFyUkXd
zM)rZ0JX!6XjsTdX%lDs>%CBIN`ChPKMLx6h$cTJaF@Vw@j(uV0VG&%L@p$#IeDcuC
zqb)G<8SfscfRWo(Q{*$053P$!qiP=!<&fSV2>wIzT@Ix1W)^LUgzWI9iY-tOutY|b
zW+KzCX6O)1F%3J4pfRp0PdEHtsVHvoJKJw+t7=0A=ZK4>`b}>54T18U&*$$suI8>9
zCk`({AL@{RQwBd%QUH6cLC6reNbTkQha&a!62M!oqn?QiI#H2Dlx)qgcR`NCk4V^|
zKy|S1rPyY(0^CV&+!rGnamwi5;sdS7Uqx#3GOv48%X(y6^Wv;!0NT$PUBQKhIVSYN
z!5Wd~KTP?uHkLX{OleqZD~)wa-0n4Sy@Tt}AFjiG7vgx(LA-uk7{-E=IsLuyQybAw
z<$(e7S2`NO&sTdp!|BrEamJE=#8uMf+2Ut;IcjOLr!^BXmAv|Yq@z-2oT&(p$Z&Qg
zXVi=qLX&ah0zrhHnh|SwRVPYRXhFG4QJH3_!mBgazZ|~<`*$`9XtV60)NN8JUW`4M
zMmx!qTpqjRhpk-ntpYZX&TC2EJQn?XHLfUwOjtOmAh0@;R)HReK_)_2kK#j#DkLEj
znhP6^ryzt&h8110SMn$CW`6zKP(Hre3E8y~mB4QP53;HL%HTv5T>gV|ZmQJaK*N7d
zfIrx9Q`U^}xnTsAcPsS10@_BW<i=yLv@2y%D{&4~2Q@&pAcqA7RCQVX*L0{)(-F)>
z%z_IV*5~tY2?=JW9wsu%dYiVov|PflW)JjcWS0E*O&6)SAuQRyR)AdqES&$T!G67C
zSSDItcvHvv>QeV*Dg=d?8~9enpqOD3lep4^IU{sHn?VFNAV@PBQ~s%q{ZO7pg5|5t
z<BG+lQ|G4DPF?AiMbv0~(Vq@vr&1gHf9z#_Trg}$jC7o!3(^wyMrEY;n*p)hemP3A
za|z=OpN(-CYt{*$ca7MCyp=%FpM|_zu4T`Y`)>N|pRE~i8zoHp-<_nmb7@<#DW{V@
zwWJ+4RpJAoYCHeM!uOfqDp{}vJx;X6%Hpe2pow$sLFSTpq>~yYCGafF#^H{_d0+6Q
zUj1oe8~#(woP%W*3wO`*mNVD#bsdj{`S&_MOX3;)S(zXIhsN>z-Shqzb_pUorfd=d
zQn;iTm=B3z&IFZRnPIwWVhQ3zMjDnpknKE*5kHI5KuZ&<r(mF24s6z`jYTV8OsrcS
zQn;(e1YPUa+|m#|**FHaG2?kHch^4}`N1Y;N{yOY$uVYY9d9JebR;KgZon|>6(k)A
zWZRrbp5uwsY^4Z*OJJAwzxI*%_db3<t^j&goUeTp>324N#Bj3){WP*yYc^u=-{diH
z<mtc3<bfZ=v1yhQY$!~s?9AHr>wEPAcC`u_HHIz6QD3-s#gIwdLg;Dho~ZsEdDg)4
z*k1naMWtKwW6}NE$DB)aw<iP5+}_us>0{2k`e%is97s8N-HX5OMQnnfOcI5ON+1+M
zz|`JVZIYrWs(Hf2{iEKSU#$Q+dFtt0JRyVo-=n}KWq)tYMZsnw?;)QRST}o8Ro>UG
z0sehTt(X)enHVt|bto^!@2rg4qj5yaa@_(E6fTv*Uza)IH}%8F0?4G%HUB6vX5mji
z-B_0I2?^&hbmr!7<C-ydwkM`9;%mUYlL+%WO_htZXSLiN|F((ob7Ji{iDbeZUyk_H
z1*>Dy4c~tNByh!Bok&T<#wY}*l3@(cQPU&*39ib&_i!D27RSdx#udkA8|xDX#q6cW
zs6V65V*I|bo@Ep1zljTj*uyzP3xXm<FW;$0H$(`UZ8*w^8ow8dh-x}ca~G3PGlPm8
zG|SdM`S+^ZVa+DWx)R0fcfB2Q#fEfsfi^7Z0<bWc=;s{g?B4hIkv568vLLQorZTN<
z+3?Zv${#@eeWCNa=B(-i-LQCzfaT)0+Si7~XySp%8+DU>yMs+J^B1Yyk@+%p$L!dt
z+L>SIzO?34EV_Oen;HEJny_##>OurzNQ@+LZIM!+3F70gxe|k1bow#l>r^Y_$<MB{
zri1M;YDi^rDzd=bLxds5Y+i`RmmIhCfdX(_8LQgB$^iNLlQIDJ-<1I+#=n#SqH?e@
z;6eHSQ3l9&jV1n81{N~^C<Ctn0r3A@8Su9dN05J=Vqoz_zJE^KwJEuYKbK42I8DmO
z_`>7ZjMD42@y@>O`r&?VJl7Nu`Qh_;t-f3`w=pE*5&ObwUK};K$h#d4IUBr4A2<~&
z4Ya*3f3su8e4{JFd=WD(9A@}@C!c&)-=|mqzc|0mCnt&QrWOi!LJmAZhg4B|QzSw(
zYeEpDi+Tc?^rQchE>5T>*|MZOeG7ZE`oTMYY6mb@UA{c?aXx$6(!#?4;x=5bt%7rx
z-IzeDtpYTCzqK>)a0~R*@VISk^S<vUXkNy?-}f{y7cA$Rc7zTqY2d2sW_v9@6!lM=
zD7`_I6sF0w4-u&(Ze>a~CWg-g4{gtA8k6&CvVBBhH}}PagnVKR#ya1!AJN#1tr%-=
z!+UWD1vxwg#6YD~7<bakn-_{Q>yS6K5AF_mvt~O;_KGDLc=%bZyydNe;5_bzV$WyA
z_QrS>D*u+$BP#_0Pr)i8PzhXo{SPS>v52BdEC#x)MVTo;n22<ej}p~itlvmNx}3#z
z_#J~fwX{?}3*<Y4VXh}Z@d>z}3Hz^8KUUMZ6j=AIQft55xhw(xXOywWsx@%RGFfe(
z1kpUjd2pZ2?-2DXP=On!^?O;wlZmcRNwBR*?bIb@lBlYfQ8*_<g_VXGXI6p|1O+xb
za!@+We*I`y4FL9Kq_Eg}9t(%!iwPR4UI~GIH8_Wlp&<D?a!AZN#c<+vzYInBEKoeb
zTYph4R|4`jy~=cn`Qa&-J!4*_YU#cg|3!{K65_%QDP;N@+)N#Bnnpjtp|yGQ(Hw~1
z>kRne)*|C(hwT}Gt3r!$Ze6fVFX42*pNQq=w0@)KyynQ}Id3WQI-&j>lX06JsA|-6
zPs-%-R-0z`L(3PgmT!xmZB3)5Y0~Oc?*-<)DbBs>xY}#_)i7zBJfEpdD<y=l`eS<`
zmJKgBwJgaO1ch#;z6N^KP3Bfr9P$+?f6}QVx)$HB=y3#mCSF*y?a9NVBNP&A6w7L;
zJeh;|ya;+mw>X>RjIog!W{z9F;VaV=oys5BdB`e*b-+5eQ<$jOXdP#gF+GBv$48}}
z3Y2-g!+Ye)TkG$t$r}JJ$iNs`$%Z0MTd}ofj3~NQw6MCP;>ft|>Z3PlpXxqib`A;c
z<haX_9bvBnftDXlR8`A>O?p%+&ToTE6X$>z$ATuK#asivg3NRhBl_9>pd>b1Qsl{L
zO{Of-aQjK{Ln*BQbI*i6WX)XbvZeWbycS<V&|J#_a!x|_Zbx+3;z8a<qb*#2i|Sjv
z>W|z5LX9P=g<?kMZ+5A>h9NkBKxK=4+AQ^T<m81~)ouKQZ|3mkQ)bEfqA_*_<toF_
zTMsK$78iBI`7Y04rp!yeLI=XY1~%4+_1Kgqc4Q8|$y^Hf{xPYsO}r=c@v<zZec;mC
zs_wM3iQaAZ``XC}(5H?6LCTH3V;)#@2Y&put)uEZxBf$S)~=`Om$DKMCw@;m%9hxY
z__Cd?L_*5%yPjUx8^!TM_p;`fSNEyA7Ka7OG!>8a2Lp_#p~r|iIAb-sZ_Wj)D#^K)
zr)TyBVl+4{ww-ocP9y^!uB5fCv|L-1dCBTOH5mS=X4yUjtlY7!o_v_Pw0B;ifNi^F
z>naPZ5p0|N!P?K-zFbNW@&Fn2u-PMHqt-mD>AJkztT9*QdUH44IyoN*6W-|nL2nZk
z-g(k$wVS(|y5HUVwo2g(8f4o$3tSGe8rqi`Mki!d=)Mu&9a~%u1L8HRk=Dm)dDqwp
zbTG`opuFT#iw+9iomBdX9GKl`=bD28EMCanYpC7%5C|XEzi@(5wV=sm(^ULUZkR+2
zzW)~6HEW2lDnSA5U8<LyKz~Xe9fU`g_Z;<u#oJ3*&=Xbgpsa}lEb=;ZEX$!i!hHpG
zJ(%-Ji(Kszes^!-;=L{v7MTH=vg0ac=npl%%4>IcEHbhJ`_+alp8MDJo|bL-GMPw$
zgj{8>YWeT(NJ0t2M@H%>CISOFQ{Xr|B{t&o1m%*ck)Y=si|mo*B9mq3kP8f0xRe~a
zulCb(psNhzgjAVP%;or2L!}AV!}wk4XN8{H#G3!7#^eGgIoAIr{G^*B<Lw5QACYFj
zwjk#)1SCqBsv=-7C;eR&p2sE`v`{rN>Yrzr3`g)A9jLvPE{XFD=?`><G<BR_jh8PA
zHN=tvd6gB*mSpakz5y69%Y~fk+Ya+x+m_Xp496Shi`;8ZjvOn-MyoD120AA4K+)U>
zR_JC;%&<B5NNs1XXS$9W8%v-?`L@<n%~>;BOa9MOOi8rdYmOvJv)>};>CHFiLgq@B
z4g@e>*S(mjo4XOLYMTn2acHt7E~(M^%IoP?hmA;UUOXh@a&>Q@y7(S8*x_}PWa6f4
zY($-c*M0Sy)g$7OALJqE5kkAwmy033w%Feb!j&wM2uHQZ*y&UN9Pmc(Yh2xI%efq5
z$b;@R4{w-|g+p6hZJb9VfjJk&GA57LYC2hVKyMinldTq*T{js19)k8GeZ;1<JTCO{
zPGdi&ruv$S3rnN>#qRNoZ8iSwF`z}pee(lO93It!TwEu&%AO5=-lRu^y+?k$vxbG0
zSexdoZCN10b|ZkpQ$DTsN2vNz`BFt_Nu5TIK_rrl^J6Bi&CW4bsSMxpP3yh2fs>WP
zpl7p0X%iR6c4^%-%>DVD^%c?iY4$eyv<Y8^bIzW%+EQ5Q2$SXs)MSWAy<<za^`RS0
z$l;>#-D9JzcPUW!%2bc??y?Gagr34uUn>WZ9xviH6KP4T^Tm`hE|ebOCM!%Zz5QiI
zyx^T}#3)YOh-j5br%7QdrI~!N?{3q@@IBAl)Pf$>3kc0P&EykeSGN2j>RSuYz;N+I
z`e7;vgKMAXyygv-`9YW(`DC!?*qLu-(3HafJ|N^<MZ?^ALm(;A*<w9D?>-5Bn-DW!
zX}<r#6jDBKit+@zDC#$v3dOd$tr2G~j~R{W68^Tk>)uix!m)&jw`l;PvQ{Ee$%Gac
z*(N~b4h}C9eOmXZ_x$<s4(FcWH><q4bD5)@0YsFXh3?q^4r10fy>B&e6H+Q6cJ(35
zJ#$<)qaO;aN0$+8DXl%1WqUs0GZm{i7`4y0Rb5@59qrU@5l&xfTa9Jp7CkOFW1{t7
z#Onye&7wJ{yrwUa0nHaWg|v&rK-R@15m_pnB%nMKt>d_m3^2P@e79bZd$*>;%X4#x
zAaleGaW||BRuY$SR-B=)fX_Wm{(Kbt<_xWE*q>SAAH^2OON+AsvNNF$+@4NYCV}0G
z(WN!AiO-{eC&4$Q7{tkD?m0yG^<98A<{3Ob>?Q?)TKD6r=Z{ro^RurLyu0V~={4;T
zirk`WWnxFP*Ty%?2xiP6Y`IyxTBf<nrs4QqFm~pL2=8B-CwcPIpm@tm3k~-(zt=i?
z`C29~_(J@8#j&3TCCjXGD#*4oVC1cLq}xOfWRzU(XD6;P-{eRj^eg3P=qPA#`-vFD
z-(av1`BtPsL5XO?zgLj*Q=@+2y&Vrf?C&gW8-zjBHH0iGuxsf!{%X^ES1bzr1yRtO
zhRp)jXUkJS+kWpD-5u8!yW{0+4qum1f`kjE$4{X3xoyuiu2Ib|h8%R74b01(cAP|N
zhhN&H@j=Y(S90$|ytJ3ec;7E0zG7=+X5*WjN{4T|VLs}^_L(Y~blx4Yy{R|Mi3ezM
zv|^Xps4^2aX|0UPn__{RI;!FSBJ{H}K6WRwbeIe5N5v2x`-A~@SF`Wgq!LCMEf}K6
z$t9#x@VG#!7krYFqVChr=b+}kEzCeYx-C16VxNUf=&j(sDVnkuS)0Mwhc01OFWBg$
z%X@(kdvkJnvm}P?X#5KPTc(yni@K?d?yGwwm`$<!87H@!`@qQk{bXhs&qch!c<;||
z`UIKS>ed;U7G#P8%2d)!?CZf#W^?|HQj~9y54N#ZSe!*_j3hPlDo$|q9#s~n3i6pf
zsu-E~x34S{J|YBYV`)Fa)<1z^Xj(t|AAMvR5gIMO+sJfG{gAz?DZeSy&C}?FuuAPb
z^^tj_YNOk__Vau+ETzOk`*D3&&|Tm_$`JK@lCv7osb6jFEK^j)c3-Y19MxlhWO|81
zIigrTO&TAVlv;#AOkvfiY&9KE8c(Yrjac0e?k7{SwOV0GglJT?CYz4o&50AJ68q2N
z{>UU2fPLO5WD>f3!2ZU`cHD`G**`q*PgeP#=l%OH54647jBtFX7c!TNFpAvkR%@K0
zU%fK-e-mg`h-i>Gqk+!;WrGX@sJ`tOX_M4Cf&bMy5n^%j?r6%D;k2DWcIW9K|9Q#7
z0DmOSDlJ^hkQ7-tXWfE<kA|usQ7q0j<wTiRHO7N({7B$u`~x6gzM}6K79e$bCO$E2
z_Pq6ipjAukqk$Di_Q-i67FYd;>KhXcO+#U+XC@20^q@#Dyjdijlo8zb`!6|C8&W>(
zxTtfihQDbOlK=HMzi1KBf;X2zeHC@A`#=&ExT%cu9FB1lg|c^@vXaku*KepxQHJs<
zod-Af|5k;$f4+lTkE)c5?a$Dtc0sT~Sh<yuB<j*4gFLFh7=PNgMzPeAYT`j+v5qYA
zSuy%oF`T~!cVj<Q7Chy^tjm6Yy7c(6w9TXHvQgk6Ac3z%b<qjjwlWA9C3s+)4`y2M
zzOsOxDQyY)m-`G@F4;VkGJc`aRJ}0q27}|sMlWUH-_|g(i9)xTKsdnd1HX5l5Ha;E
zfv^6FFq9{u#YLCf>M(ZyOS-_mcHKhHV$O8Q`GdHSjdn1u{62x`ey`S~%p?wbRVHA*
z5K#DJwi5SWG||*liE^1RnLJO?+M+sVff~{>?qh~BBdKneSD*PJ9pVuEf>e;<hovJ8
z&YxlCa{F@ooA36|S^%{<?k{TpA6;J^S7r0<OLqzgNQ2TPC|!br(xr3@NNy0=<fgkp
zx)A~CZrC&kNK412d()kFZ+w5}yyx6|KkE+$m{>Dwo_W^yJ8R|<_OL&+Jo(&^3rwk4
z7B8cl6MZ$O;(%UD<RP6AW3xH})Aj!f^eW7T`X0~g*u-hDyOybP2QuRmN@8eJK&yT{
zx9>xZ!C{r=VYFZ+no@Zm2ta!KNJyHf{}aB_Co?s}3B7<t&hNDDkNCc<Ay<Y{>q7rf
z{fR7UByfEC2T!I}ss<LVlQo<DFZt+HtHwTRO)`(!aHdFZ(mXkfTIieCk4e?wph{T!
zUD+3fNz1>Q1LGOelt3j_Aywf5PLbXgWt^51+e9i`$q;SEX0cSU-|hUpO7YyYr$K*T
z1@qI)vI-v(QH(5Lp?y{2csL2q9?$xHgF(Yv+bJ(#=TH1_*v>7h#sA#7{kaC;xt)y}
z0DP$ql}Be386*g2`~J;b>)8R-RH=tm<;ldX{f$`KS81*A9@<`LM>`ZL+o|vr2SWxO
z9Z_l-ewxqj-=dCz9%oyYY$AyP5S3G*fJI;VA0~Xk8ZEJl%WYc*DEd#034i*8$@Z2&
zNQM{>CXq8Fkx@DWa;AF1{J19fdtVIv^hdwEzIzy6Oy*`Pm2$r?ns+NRv)sr<EJ=tf
z{DVVxlOa)CTG04nj)x9W-uf5cYY6D`q(7ORWUZ~DEyULMxm>MjI^=3sQ}($}M^-7$
zaR;^MZ1}K<>Ev#+gWE_FJ=c%P=+W_u@FP)HkUYq;{ZG|uP-i?>z{-=RaKh~BW4%`k
z<4Q#}2Xk`+S7MM1c7~WluWr>hbnGN3;5&*&<jeD=IX?hCSoCi~9GcEhSf7s^PWkQ!
z*Uw!O8>G+|*vx0a#?&Ogh-OVxt(30tCRAPDUrJkS3v6J6+|fPU525XK4?A0^R;5Bv
zHc`j@fRkiI?BTrA3rVG^u-g5uqJtL3BWusrd5fBkpL%3`+y}r|QYU?-)r)anX0(YH
z_G`jH@qrZ3c`BO8D)i?b##Oxi1hOW5$l)QYJm_=T6sX`;TBrk!&Nm7dz7K?c=BSiE
z)P+ar{7=NFkeC!{-kbtP=nSDmBXo-+R1!f5R7j2(BXoZg!7M`lujcJ~+XV>D4F;(!
zdUe;WEMt6_4lvnz?ba*{UeNa#O@1?<b->B?{o293MUW-sjaRW{m8raKr+I@iDW>IL
zqm)**@I~HqWZ0vXxkIsFJBMEMj0$~H>}s(_DR%j=1(vy4{$oZ_>&hT4tc-dSzazRb
zRH6oX0#9A|Z^CwVmg(0UZ6n{GR{l(c6J5$X^++Fvjo7(8B|vLJvOI4Jtn`pRyy|7Q
zOKT&Maz*-EPUrJPq^~7<;ezB(;BjvOu(@8pNkB(P)MLJwYG0h)$MOPNNR=*AL*%-D
z*eX$D)$S&iHQSOc><ueJ^%Iyi>+?6Erry+6-i9$us)>;s6U(y{?C=4_iCxHem&R@W
zrv$l8CQ+~9K)YDJ?z88(z0dxm^AH`pf;xi2^h^7~^tCBxBPi{0sfm`S`a5MPSg(fR
zqyYHmjhCM#I-3(rmB4+3|IujHtU_2#PS1s?Ecf>eJLKO;`xYifpRjx1>8ddN$c{X)
zM4x$XhLIn+5sW=0W6*@f|5xD)wU5F$@QSdrX9dL-YpmSvuceJZ5BfIqrM3f7k1cne
z`~)iMW8T7wl$XM?0=Dq}tFM0(3&azO+*4=en}YLFznOQDzA^?M*W|~N><91CMg&*f
zXIaI?bY=Iu*<@Jp&Y5>Q{FkvPQT}QBh$eqF`2;E(V4WczpULU#_F1Cl1~`E?m@|7M
zBI(slQThLGI?}2;36t1V%tZF9Q96&31&vng$O=bZIGb<7G0T}p0A>&36HX#sI}PqV
zxOpE<Wsmw#!xd%fQ083n&rPYapS9EbXLbVB=I1(hY3D$7*1Z#yl~ne}{?V-xwM_v5
zP>EW1DQAQkywAeXur%`DMBXpp^Cj8$ogg`^{@3qaIL}{Zt7GhuFJB^d&$b6LAr!|O
zhoU98gq(vokX+t9{aZFCwxa_`JICQ~-P@{O%b@-_8Y-l7KWNV)B%sM<{jhkj=VyJf
zP)P-Xy_CD|D>l+cTHn<A#s7abkpIAdv`na&3tNW998ipt(55xUI@R6OUHdh6&h$dw
zEs>Q_ZqGGiso@^{^0h{<r1}Mn?dXSV5NIvqm1VtILgSDBW!I?H?X;;Lv2x*J0O$ha
z7>h(!jsek7Lkn1k;Sc+N`usQ1WWm*k7E7>tr9Cr5J+j{jRCmpwO%dp)=fZrYmQ=6p
zU;zr2uqQ?DUyXHrMF87c{X1%r9b^AA4E|I*a2#tL5_33mtq^~*(a<m<0~`1z>!6Jo
zsAdNCCcJH%|99K4c=zsUl%ye>+Z)-?0ZS=JX|GDMOsqFGe<JnNME%(7`lBBoyf1p0
zEovs~yZlJ{OnT3AM5uMx#JHbua9ORUnlkzs3UXs`nB2;$@0xY~emC$u>+?)iy2Z>{
zL1sb({W=G4zWXZ~cHTEy+I;w^i<Omw+UI(CiMh{NIZ|=_>xxA)r_I})6ERQh8ow=;
z{}2N%&g$%EOn<%jk<dFVD?AX(NnteXmAq@}Y<(d&n8%p2oeTZAqaV1w|3Z_x6>aQ!
z#P@!E4)@T3)o{^_@I0oI?LOXJ#g;7W;$L`$H%zWV?$34~ro}4x?q~c?#ffHW#;<$%
zmS|3+%4k*%9t?G|h-SPd#3Qt;#y#@{ThutVKo4K#KLq|c(mAx;>f^gTwKX8C9Zyr4
zvx3sZZLS)=0!_O;jKqt1DA05)a)-AVF}ru#od?o!?3SO0I;#cM;YjHQ8gX_iCmPic
zaIcw?o%7&;$OBt(q?U?}xS?px&(6*8ZL84hXZ&;%d~7!iFGAzKW%r65DH)Bgp-&`E
zvOT<HQ6fWmns{9CL5R*t|GHOCsX*MDyB#I5i?B-)Q26HpQ9_K-2DM?ZhZO0mUIbm@
zo=GA4p+Ft~WR-lgH`#8fCZRin#;bhlMMGo5pX5x`6bUAE&vg``;p17kyJNEj-FZs&
zIfc!Ob==>XUMIJ%Jo;egdy#Cq*nA|fg<HX2>*Bhct-8oU=rA#OB}4;UAPn;Ql4c2x
zKDT>LY0RVCn|x?{Uc;;_t;BRJQPKA&Mt@j+0Lo)Y{4|3rqFtA^D?Ci0O(jcYigxcB
zZ!9HyJ3+W+HakKw#6AZnN1iVwRHRpn&sQLV2t{`P<8n8K9vMxUyD0ONS9Mz@SD<N`
zw<-DnUIJ*8z3J?Gs*>7i?eKhciO$7afS2UJSlTJ3mbm)UPCWB8WyxUmP@<s`t~6#-
z)#-b~CMs3m4=}&p*pp-5Qp|_yxixx}#`&qqv;~dzJuB04s~;o4Uu8xNMTSvGR-=w_
z!0NnmO}i0P!*lX16UVW@_fDwHgz63#ON&Ns?<GKZa%4@!od{}@Xcfet*Fc|CgC6&i
zGsZ5srAXb>Rp#CIh8ML*gR`1Xscb&pgB^kkxI~|RcN@_kEX)Bd6TK!$0S#mRWQ;W$
zzPIV~cCZb%k4}8Ae_k>A$J~E=dn7HJ5ZPaGK~7=JnuoNab3>zaABp>R-01R|AsI|u
zMh)winO4Ce_fUoK2-+l1W|YLHyR32z2L>upvAU5L0|M(AA3`z}tV9PY0JB2dV2f}1
z-I5LCmH{eF+(3F0WgavZzuzVeJ^F#u25bQSSijUQ5e|2gJ*txO7`t~1Yv@747jrzR
zo~3&wC52~O%Z2L=MYir(cOIL$X|fXiAKzQ9ni!*-W%2~cLfw3px++##j5G3P&6LM6
zzsRmj9cQzweZzDo=o7|3JV!XkDMvRxKyXKJe~RZGoA`G1({$-np$3%j%;Qk?RVJX&
zAVUUiWV$#LLTzY~xl|N5;CiR?#-#X+T+okgm9X>2I!-%iP0f^>QS;<8k&<sfTUVr}
zThHm*S|fT=Oe3BQ+V8A^KX@idNM;CTr}!5XzQG8*2)s`Tc+q0pK9-1A_BI41Og)IK
z;e7`O3uh>#{~$XwXS~)*E`e@qaYf4d;RKK~rPa~&Zt9s4_qDyE{}~pRUL{A~c+u?o
z0@D4;Ybn0(mmDUp5tXt9x>li6G<)~X?&pUe2y~_uA+&3lAIy$aH+paoLVr3V6ZaFL
zj;kRkOL_Zhav(4x{0u<;=~r&ELde)R9QJ!>GVUqqn8Gg!Iyq;G-l;d)-wQs~$l9=2
zAq<3vRy}i_BG{u3aghKqdaR{-KO^MECn^;kBuVTzns#J(DD2N>Nj!MH{&s_81AskA
zy`=T^jbll&hj>SnEd{m}unl3gm9~e*Sgq~S?<ffM2_uR%ktQu7AAx508UA#lEv>gE
z+Wx{$oKn#X5V3CRAutDa29p5nj)-!6k4o^XGM7=F>^(pNf_xoFz>)=k$-#$H+&O1N
z5EmL~JW~deem>bZG4WyZ?H)A^Y1x4{xHTO-N_iUbF~h{=4dRx&od9l(p9Dk#f-M8d
z?fn#YE6gn@It{Ep$u3Xl+bnEhBO<*%Beez$e`^O22`-yjjTc`JP;zlidJMW$)XLD!
zI1lQ}y1%l*Q&9goH7{ATSTM={eL7P20((J)*Ndt(@31j>p3_~S3@SxHYHL|)yVD`X
zSx}(N{}C#RXSHQ^c5OrLAy~|fJP0+==XgDrm@ngErIwMHH!_c3@1%AWb}h+Zsafe8
z9#up4R(4sFw8z=M2ZQ%*OB<v7W?7%ph5djSVVQlHpubrg$7c@RjF-2yOa6PJh-5Zz
z$Z&m$d`7)TpJt5eTjbyodLfh!j+ii-d4B7e!Evaty|%qPv?Qrh6t1q@c{zo(`})AX
zdqcidV@OhWEVHR7bwa;vE9P@Q>UGbWP)%CPU_;=Ml@MtiLk<N%T{CwT!vgSB?gw2E
zZI>rYNWhc#SX}|t<@7F-ru$-^PEAprt9#Dfc_N~pI*&x#9U49<t?FG_e<`bJUV9)`
zcDC6^K}ZQ%)W*+=e>g>!!nwIgJnamBZ|R=@`scKL^j(0t)_9cpp-3~Im_Q_FRNBh*
z!QGDb&46eWK3PECZu>m1Pc-XcIJd4LzS_{cB^^?fCL9L(I37G1z>!QITRTu9x%c(5
ztMnoT|J}=Bx=SwXl~xIl*Oy#Nt=>KJ&f53V5e)|!j<Yq50U53B;$&IIG)wNAQ?H<F
zmZqDx+BL}p1?Jy@9Phs)%MZO(A?s#?{xo5{)&*}*iVhsO&5h=Fa<%vItRb18Gd%bI
z{KRx=*3XLG`9Mc0el`7UNPCl?d54$8i6`;<(D4(Mwoh%7!@Zv{<k75At@Q+~MT?4)
zpO5f7<0#`b*0_I%&5}OhLG-Dk+&0<rd_|l^K~d+B>4gqj*Ybs&LiMS-r?vss<j0oN
z()B3to<}9;@q4JrZ^~s}{&M7$O(I|NBNpsf=$5}DrjxR_S=&%J8qQ2$E5HdkOjw|d
zp!gI+ndjAef-+2HB<0FO?b(gd?J91Ba~Xfc=Qcw;7YS=}AE#n1#y&Mho;i@z_RVS@
zILaI1k5|9Y0ETsDS{}^|n?69!jQfX;_=^&6y8{hM13IH*a*E}K2dMCiv^nsiTEz;#
zM(eZUjXTS1Uv!?<s9dcYUGJQ8gG|)#J>vAK@&J+j?m3Qp@(}9yGTd>w-p<o>l`FeA
zYP|6a>2=|pbDDg;{-fQd6y4d0BVB#%D`@p`?w@0O?JK{E<06*K>s-#>erGwG+<30s
z1pM*-gWPxnVNWg3*SQy`;<l0T2cEhuN^AxSY^|xEz;W8t5%I0^O<t)M7l4`+-~;FQ
zKE!PHZZ|$^yx;i%LgB|jxrTv`{eiL+V^vd>sXJtGdVk^Gr%~*S9v|L*;hf_g1rp1m
zV5AacK1jPP?7D}+rw6=>((`WqLPXe(LjGI8B`B|6X7Q=m%SGR8sh*9PEPH+B;4}ol
z0d})!@GTkuzquvg>^u;U`c4pU5nCs7VaAnea}G4P&9E3uAztl#;PuOhcMrJskyF??
z=*X3<*2QM~vdYkU>~&_Sx@L^`C7!7^1C5a%vIfQMoPByjC_|y1PfVY`dI9k}HI~rN
zIm}i$<-QuL2+<oz&oMYqC6FYv1tcs3@2ftz9&0(q0Ty3lIr|Cj{21%d8#9cTL9LtI
z^E^5JeS9T(pcH!wD3j?9@Q9s}lgcYMO(B=a8G8%OscfQhx6HqsGntWCjTp?7CF+UP
zlE+wA+0ZIBv~7zBLo)VIx}>g!gn6?Ht==UZJyXjz@_#bJ*q7X|_8Z{^!ix>bkP5rj
zqRum{EEJe@(PyLF3o@&0b*W@iyEW=FC%fs%1jtam#uiYrqh>nbW(sW8;k&w@2>T71
z*Bp9JrsUg~uGkdbEL>eZaeafqU^@C$I`@|}8BZA*Y6n6`QV@6ZYg!zbgui1556mRP
zCc2x`$#6xX*b38Ugx%`=Vdlf7RwQVA^23D!{vemLb_us7X^-M(>qXOWakS*#udZBP
zkpK1@Zl>3UzNCWNmrw3$KWpAbXBI_Njk{-N6!TxKd~<H;J-kZ%>XsB<6#b{Cw+rvL
zm?>WT>={yfh)J(nmxw~mU{)UQSX_Tlz5n7(zwc{aN<tS?#By_QQIa<5N6DZ*H^iJi
z37D?x71h-<5CzY;HEQbsCK2894Dk~VdZ=-xk*7~6-AfT+E(Tn#rx_63!36HJGRGAa
zHBBIwR`-%gJbYMwqbP(u#JwxBJs<98f9pm(7w{G}2p07y0?~}->}0gM*)QszA;7bq
z=<j9otn&Qu77g<e73+dIGH}5u4?;fopgY$+h#r`9s;X_OZkTCo)I;7&4ixpk+ar{H
z^my3+ogWdNpHh5p|KK3qU{T{!nY@KNX}S5c^K!xR-V{`rA{jp2LDT>A7V%uUErY8o
zW41>s_uA#A+*5JBBV!Q-UjOOBG{f;&ySJ#fC~_En1?<OTa*yt@3*9Y)gXxnB`M-}8
z9i8w1UlqEkdGOEef}x0e<dj1a*7$~S8AfpDHXJ53#y{elo@ul#MO#)=5wG_a9WO^8
z_7U}UfNO(z{;%AI4INy1b@}g9Si~GIksB98ZWQ3dGu)KO_Cry>Jyq9Rlwr^3KiZ3(
z)1ty{<uFrt@G9p{(cYm<E2K!qTU4zay};Q7f0!3<7e0y==*It83vC*CfW-5~c^ayF
z-H}>L#f9DUQY#y3TZYB-$^JSP%b?n052!i4|I-HIdE3_jgAh?U(owYv^_GQ=H+C!?
zyzm06zkNiLc>iBrDC^1?j7as9tZ0Nn(SN#BD8Xj~ekQiNVJvpJd9WzK95QScRoP8D
z5HF_wbTp+ILOim&D&Vpgts4wbfnst`SDVe91FSM?oHacYQr1Zhm(~<ZuhNMC2mXbV
zYCt;|gD{>-gmYq3pH)IRgg>UgaCKKMBRgvdfz?<@zM$euoTu;0>Y@<O16xRuVMl!E
z5Rnm((Z~=gIK2_Q5wU|12S;cSy)UP`trVg5E0SNcB*Csz%=5UE(Eq*mWF*#p)St^B
z{ObeR?t8hXvvXFL(dXRhiv9tIV1Yp>SRm-KoBWB3*iXeSO#6KN%c}^1ndU`703?(}
z;OPD&RTi%Y&+>6mLhUk#ElQ|p|Gg-M=6&mQi9j|ZU<qsERvfjqHndDWX@0ASW}W15
zg24O~nYqwJ<$2A}CvtBjm>9=+BOxlM*%Y2&B?h$)v%1%HFCCX5W4)qL{yZm&>2191
z^BqY75hfKQ63fg8p$xskntIoucS=+xwVgq&xXhHVnUvq7!7{w0U@k>uhPlnmPjQ*~
zI?J{BAL2^CmmA&B@SG(Cggn?A?=jFMZ+S&(u9_HJaMWs_rR2})-Q0Y~<wC~GKxG44
zZ*$Xe099sHSd^e6(Y<lRZcMK|y*2Vvo^EsJ{L)1D!by(*>AUBSi?K4VllWAmWn)Iu
zm_n=Vr}DN~taas0QnNoPmi;KInksz-OKYS(zX&N!dV(eAjWq4gvDLy+$i?0C_>0)`
zlIL`(lq|?}@<}(F-3BwXN;k@sA(a|DcC3Y>H)(9~YCd-p7%Kwrg?eaTdlHY!3$W%3
zL%B(l{TF*2UI|C&{(!Dhue*hlmX%}5xbmnZopemD`kz`BnWQe1JH|Q)ClJx6HjHAe
zrl3C6aUX8%BEsT_x%#`n&@`*PDiexyJL$Tz2vYL-B6HFpf~%e19rNkGol;<amC|rs
zM1{%coXOIU?o=)!UR>%Ei-*^{(mj*1^?8f?Q}vQB2PGQnqM!>U8+R6c!q%b*mpjD$
zce@$I1&16-W~F~-QM!(PtlspjzQ3A3vbiCSRc9m0YLgE-;D2TIYu%zOX`B>bsIdGs
zjg<0D8{x=>H#pN9?DHs0BX!89xTh@yrySq}usz!KJ?QHjXRK4Zs>A7NEu`yv#8c>R
z8OS*s99!Hkm(mL1Z&AR+{Rzkc{-=N}z^2@G>gVhOrp+v{jzO3+%tg$jK-#*Q+fE&R
z1Cd`RDQ-YK75xstFh#vagGq)2L>Cc+4B|oo<&;f;KcZa&*M@A?3&s|U45%|TMukQ$
zoX7b!PDc4nvS8Wpw<%Wsqw8oL3akQsl<S@ytL;?tEPx}0IEg0>0Ggn2puG=e7`dn$
zuS@#|jzNNDqaNY!f|ZAh(suyb-%bvCQG+rET$qYWG`dR$YJoH_;br(!gTSWxLgjr_
zBNt0{uY+&kdcrh)3n7Mgm2NBbPUPD2x&%)HUv_hD?=$RhvL^ENJ@7iuVT_*?4xeBE
ztR4=(9syVcd}v91!F|Iy2Sr31leLoh?=Co9s-2Nf@1Um<o7sRE^H3ys-?skMH-5O%
z`WV+e267NZwClVmjk6rswZg-!{B_QXnDFtW82kVsxWI)E=6|Uu0l}FRLA=(-xt11J
zx&e>$MqL}D=hSq*xLs4tIylG!<Za{tB#pY?WF53Gm(uOSZTD!s&J-pX>U#s(LN9gg
zP(E3_FmbI8c;{4S`-l<OJx(KDjPQ?KM1%ibM)5=f67~jS&^#_OAOQ)g-glW2-gLG$
z*|fM3fK46Xb%uGq>&9Ave;ua}IOr7D9yT;^`L;y?OhJch`BXd#ETyPaJKy=q<~8TH
zB3@1V!<+57<V5fr*r-#F{o7{K7SvnrFSl;2oKt$4kwK~05005PXR``twDp~MaJyaT
z3J;z%cRWrLJZI#8w>I}UCig1~!1rj^k?}kiHMvE?4F-Y{{k;+ph$6&V>^dP1J~#fS
z4fbl0Pg}@N@4B0yOE{-``eDvGtg+7M9;th7@3Ia6`2ZmrkOTVvT@LZD?efIAj(>c$
ziL_d-X^iRKIyaj@hmQ&)Y%;46xFVg3{`hapy@kLiy^#y!k&CH)r;y5G0hfAD)xrQL
z``=1wo%uKJ@a7I0&Ks+Ly)~+%f}3v#ZhW|ihJcOA<gyOBvjDdzTND6Dcdz?sp*D8k
z{iG!de2$4u=_fuP_J=<$)FT&~^A`~_!GE9k2N>+tjwPe#yHoB`#Jj7ksUV%uo<xBB
z(Ovk%61_SrmSVMiK4DeaIKZS~*<Gh3A!_|Pw%3qdX}Z!x9@@9Ipx9AsRr4j+?irI~
zbeddy?aeH(><u(vErc1TpV-Y*zg<<d_!E>UzBRIQLpE!-!ZkuIrUmor6IqQ$z0^q8
zr-j{GXQw{{(&naN@^!r>noGPyRp)lRqTdR12x>=cVmDbcMTCy}KQ=9Ba}r;F7|1w7
zECjy2gPe_wpFJO_q%TuiT91hZkG2qQUmTilBt)8ok=*xZ6&~$rU=m-~2na?wsMUqr
z^y`0?=RHfiPHfDki99t~K`0ihRcQ8we#yNo`q-#*7TMyou=uKmW?HHmyLLl*njNJk
z=<{s|c1wqSw#EKxThdgi^uvuuX5ex9PtPZT(Dv8VdSlgMM}>}Kzd|jZD>Z4cY<(&@
zJfKyw%~2gn4g!9i*=_Lj(bctbwBF!;meI5DAgUwI0-&M3ZM8KAIYIZx7D7%M_3;nF
z2FtIeF@%q*i{`gAHT;{p_@`9_>3`H9<1`7{{7CGCojmy9sLQUemlBk4Zo8*o*?o1%
z+6<|qsZF&n8i;#mP`8)-WAdh0cVN-?2Z>coErY&O&909E3vu$=kzB_3T;%rj0QuzZ
z+|zT0FrmrTH(x%z<O0hzew-2e*dq4sxr{|3w_@dt6+~dF2G~tM7${oc*7BKcFC$BI
z;uuS@jI&l>^|L7J&Ai*F30uW%(}w-}!)-6f{6qp^5O7mMK}}ORJ`rU37N2_9zIhq?
zvCi+|gk~FkkEZu>-Jc78!M4uR>9mI8K~lV1X?-l$wZ0x?oX8KI7%Um<8%%aMb1A>M
z-m+2S4;j8ssuL};DD&89OGMCHn2bI6lNb5culBm6e9~HJaHqS(Bkc<+^pw>glG9#y
z*u7`5jrNF7p<*121wAX7nd67LDy5i2WZf;;Y!nOjInCC%>AsKr{4nV{+$djlx4bZC
z+1w9Q3PrcCHz=l7I10+Fc>!s*BHl+UwKk^3b`Dwi<f?9GHQ15Vm$u{bYykW(-|F9h
zFEmd$WA!y&vs}uG9uMm~#)H`4W(loNf6_cs+YWRIT2G$c!Xnk$4|HF(j$@}nnX~i0
zY=NGfWfQ?JNTCIkw1zlfUcp=r`U05%eMks4egg`@*9bQwJ6x<5?C9OI@Q$DB7KO*m
zuaV!*Qw8Zn^dEJiM%iL-?yg%Cz%JkY79&gStSe&_WkhYb^C9x3Gg8z{Z&JPV`yT-Z
za?1+&v8Qh6){?5{$>#EX^47i<`dF_>Q$1El(D$?m_FR!*&<Sx*>(ySvq_Z1>$fPld
z=}`BEp9^>7(=@jp3BAQy(rKmHipO|0kz4^tyb`zHeYT0`3fKf*$trG0WyI91-zDi>
z?dIf6NDMu5zayi0m-htNd}QGrCeRac)EGOtaRw6hGIgY1&M!={`oR2_J|X}NGS*OJ
zqY%8>kx)nn1fCPh3VYk=?3b%pCC*JYYS2TIp&NmbbMZyY%{1bw9P)~-cVF<GXTzNg
zRZ~ydr%GMfQ_qc*rVpeQ<++Rm*GG#kst;pp+l-Qrf4z;j{WE}-qRAQK)$*2ah+jCO
zhI5~oVf@e0F3(wcf9c85$9!ne#b60{v(^Edv&EP$moWL4tE=4}sU31hz$Xn#e%HAV
z2bN%H72A3a)F8L>F2~sPwvgXg7j(AJxqDzeT(JNFngR@D_}AS{v{Q4Zl4Wn!p=Kp|
z<9+p@E!Xq}Tem0*6@an<p+|?kS{N1IZdAdhIhS+O=&|{4@m$ewyX#(TH!@apOf1l8
zp2nI<i)y^op!9R2atQ2Jh^X(}Zt1Sk7tG1G@2y97*%x9d&I>dv>Nq)dyB|`Ructar
zy{u*^PIr*z$`Xnez3vL#<bdz1E+)kgTVqQXJ~}1(E&CMet9mqypFcslGR40vDk-w(
z4<ZG|dNUjsQ6#Cm^RVGrHQUaDJ-5yV7X=v$Z?W<t<>|-Y_bY$<ow4?<;76VQ!H3?;
zVCv?p#TNmV6LC_r=HIC%<`u`fkKgD)0!BjtNDBpZ=Ii@`Ct4beFAM-3V-Hh!s}@Qr
zQ*Kw?I>UMT4%iQ8#{@>|gRSaI3*6RolRKY0@2)OP6tujq+*<<|9rsTucs}tY>+C92
z=lxcTT(3zS#V%>^+|%ov7OQvq<}Ug|RDUQ#fmd;7OXDqJKTDw5pGoNJKF2ZHcCo8~
z?c`oFKgWE~x|W>o%|(xhVk&jAXA&u@xg0*eoU>f(loEbfUH>KGL|5+z{Nx7X!bsX&
zV8K((MqSJt-F0ju52c%5+=T+M)M`D;yd66|R`L^Ai$YCCeZ$MQog^rBcch(XfMTCr
z{8I7y`>>7cOvfAr*_hXEQmEdZdlc*IwlvIp6Z7w7q9&1K^5(1P?3cC9xRi=7ZigAs
z9^CR99fG&U6QV8@ZRga2m!Z(4ek2s^Jyf67ClNK9LWok45*@E2cP)&NdTANURmQap
zCA*QIXIXGnnJxKzRvt7#xe4+OpwV^-&PB(@f9jcSvR%S^rL}TT;fG<f?E&V#<qdAf
z7aFuRualBk2>^$BD1EC6MBna_XNtI*a+mjYS_NOn*Y)-h2)iDPoOBWqTQx&0C~NL3
zr~49xI^OGL&3y4)BOyI0z-}S)mt0V<xey39JrGOwrVaC<H8F}mqh!xR#6ZHR)Wnb!
zzi<LeGDW%pgh*ub^ruvoRb&Q{hKSO7`*2i^e>c?%UWs{$_K<-bH6w)v(;^-8Igo{_
zqbQCS8(PMuR+cWSwXSwY=uCw%uU7QJ3)b2&5x*jQO$wvT@TP=|A$jQ^(|Ts>R-6Gl
zjxHWu&Au|-K(-lxE#HG`3pJJ4;$qQi*sR+!7<0f5bi$+S7zs^W=c%B^@F|djdps#t
zfBi=ZNWrNBhBX5EBT#8|B-Eu(W8bOzIZv%0({yKfWNiYKMFx5Cg65767fuHg8gi+A
z!x0YpsUF-j`v-QEqoR&nNRHGg8+?Gse)c{{Zxm~3gcQ)!W@4>8_rHUHX~3f*hl9ud
z9eBhD5UI<+=#Sn2m>ggpM!aa_Z@Z9etGiU)rWj|Jo3MRVtC;a=SFvV;bpFKV(bHz%
z%mPT$9inXA2!f=h`C;BO%zu7<4TLKKLjzY)-@t<ky7P0E2mS)|U4lml;8rSdy5Lf(
zkZTV&ta|4MJG!?ZWDjHyE=mub!Vlpl3u{)nZqrBTdHDnLlfMgxb*YY-WwU;XAp5Ks
zxz<f8R^4=WbgNj@`<u8`o#1mEoZYKf2=Wprz1epg4bXJLkFrf!uKfn8=mUt9gpWL-
zRSdWDpcm=Tr9{cFi{|FUtasE?2;lRtpG~iMH(AVg`t$j=^nvzFY@w<D$uuDXD*`LB
zvJZk50trHV0CN2JvE@tGKWJa**L$TqfTXcIWu&ivvLV0NTh1T6{H<ozG9;Xj9>Ee9
ztt}<(2PI#1SHDiWj-!CiEO##VCra9f==B6EYhUe$zsMZ3gr<IR7lfF9@8fv_`#y}L
z;ddFvXB}H@Z~a2_B{=AK`aY?;eaV4EaUHkwqPufxAyt0aRSb6k>@O$R>Frm?Mv!84
zqMg@qx<l1r5nN>VJFx=C>7BBj5y1UO{N0&#A0=zxBvs|>1d+BR0Zs?*GYl+`-Z!(G
zVzqg%4y|M9(T2Z1s1;Hz`P(f95eblkF~55gc@rV0dDqjnVYXogW6MThe;->WAVsl%
z6GlL~<^g4^U>!)X_EhmtR~?sm=VnRwWW^WE&&f=V2caPSyqsDnqQSj@b|@;Ki@oBD
z07irfQ#(KECEBGv#$|#y9@y2s1!!OE=yqAJB|Pt?iFA1nyv#dktNY~;1h+Z<5{2=?
zf0bkJ#ye~wJLK@B^pNuekxt^#9|$F^%X~zEmts6==XWB2Pe=qXT`0*C1x(zZc$mPa
zYJfLjv$x%O{A7wBYxm~Dauw*LLyhF&CG4^4x-{3vhBz>a;DNtPVf?7!qmI^oDDbuh
zy(m3W|3|dZ;{=625hoaLrZL-K(72A^1osdwqKM!Iq`!SLGr)wzna!YW=RHaOl>fE1
zahdqy{O}(X?=Zq|e~eQ52I-o5lph5Kw;thm769uF3>CuA=Piso7-7Gmb*jBhT~&3o
zE7zaCZ-LCfP?PO--a+Iw<9SrgKFU)H6gV`5Jsf|_!|*R0Z{b|$iARH5&ioD$ZAAAp
zqC83YVc<0rd<5U%q_&?HMA>qG4<R`JFVIA{2ZO#Zw^BVgK;|JLEH9r>Tkd@vO5NP}
zM1u(O5(eeCZl$g_*ufvzo1ie-N3iU^yw&v2#ywqUbZwsobWx+yLw!Fv?lQT>E5QU(
z?KB1&|B@vz&kWdm+w;>r-1q;c+uc{!4-yE7hJL2rE*)NZ>X@xge0y7yyAb41*1ap|
zW^$q@jOBTsn+C4Rva*+<pdk|GzKIi5x17Q*rdXanB7Ui)X2bh)`}wQfW5lcI3n*8T
zA^so{W?2&=oRvkgg|q0ejrxq0BE%i;+w2bGA!;GNcF4?X-DUIFI(^HgCJiNXH5{;x
z)zer%vsayQs=o`=BX^%r)z3@)$rg*(RJ&ovUPV<UkoMa)b1CisZ`Vxi)NJSC6v$7K
z9*Hn%@sSBf5GgP<kOq*N0E|4I@1I5JK4c@Nwvh2rbey)C`3>p|r0NwV{d^N>M$tE%
ziof?Mp3h>$s&khme#=&u>Sxfz5nD92HdpJ`;_sPaJ0`{NkccYC*<B~>a`DNkp_b3$
zVFeOKWEzt0l2@EZ5mLk#;hQ{DRh<b`*1GFh1?7z6J}XY?Qf|>@$t$^0;v_6TB>|FH
zZT_h3D8Wof@(A+YF5gdG=vfUfRD+qcgI(y)bFJ!40(rTig%~PT$9A4Bb#?juObWqF
z*BdVM!qi~lj9*%e>}A}3A+O=YmNBdr_?%h_dEG&B6BzOu7*!f0rPOtH6d^YkFK%qi
z(eSCPr0gzXs1{7d<&a^X)NErssDELV`s6?R+NHTIsgJK)%`X$e6WT;5RRKIR1lY)o
z6!PcB!$n%DQcq3wO9~^0T~C^8E}9CSMJd&JO*CtNWq=5lO)_AG8tLP5)1ea4-lB0M
zawBd`sBTVRsBxE}omgVOER*g|1m{1@k12hg9q;@~$Ug;8qUZ+R94|fFm;gKLbCBah
zgv$ccOl41=bYjC^n^M<-Kl%Q{NZ|^<MSzC{cv+}Zw2L5vAbgzIi4(vgsv0kvAgicH
zM&z^DH6z~MFxn|>38VNv`<EbO8s*<3K!j5waORALMt1@FDRh6eTmS6GhUnunvwF2f
zA$+Ka`A8K>ko={WkU(;%e+f4QIN=tkBpiS9Vjw|y!_GV(<MeLflw(5VRN?q-$NsNJ
zP5+xa<M@X=YXy4orI~uwmefqD?H*(5RUe9p)xUdG^sC~vbh$Xi|Kg^w;oKXHjf4>*
zI_y{YI?iKyUlS~2?4Cc8f=N-}mp;FU;68=WzgQGO_$!)zgkJ^Dxh1rq?C(!#yKfs|
zL(3TM==spLZrrz0hov9_TvYJxh-Uqpy}|iQ4eH#BT!Zx?t;dnVb3^*cS8GF$l#kiT
z7=N(<#{Xt~7GdofkJMedo<e_3NcC_5M`l*FOO&-A%jChzz+IL9$y{n4JT6*uSFWd^
z?J|DW?sUb`1)<IO8|+6yiiZj0fCy7=L42O-Uwr33rEbtmFF+NW(5H7*HV4tbNo^e%
z9|R*jGZMj%oFE-YYW}}G6=}G$1zVK&Hb?8GnIU2c0uX20+Fy<HkJO$tOuPTht7ZWZ
zo1l*~>!ED{_$TDPWyY;p&}vbPx?3&_zM^8kW&*(|K7z-E_+RW5oY3mdI-sea8*2Z?
za0NUm2HHb+szM)IN`SGd0VL=!_bsR?=)b21?!TJ)9%i<VmP2K>Kg^lR6^V6vCwj`U
zkqa1st=#{Ec7)M@kEE(JjCKsWSpT-QReb6Qtf?u&PJNt9L(P9lO4!r#uZG<9kl^&R
z$=S))oO>`3_-DJI2Sq%?n(vVt-JIVY6YGGF)xTI@%+tZgnd=8m&%Bs4{cv}$_XT33
zw@Az-E4=>qW#}ai$}!zrdjanfY#vhoeZRnriv(hLG#A|#1qiC2ILvYP_8MFkK<eB&
zGvu^-T{u76`uIYWKF~eTVRyh@q91-)4CjIW!zStrTytv0CSfcjAd9OUixqWK={@An
z*D5JZ+x&Vf_8wrG@=<B{>iBz02{{w;EZcK~pmbn6ZYOX)(vi&^FsQ)ltMjY!u3?@(
zzUnAcyr6ei>Z5R0osoP-M&-)Hg>Gkogg<vLwG+q`MGcX}Uv)=0%JmOZq*2BuR&SM^
z7*()YUAB@)ZCIW?0Ry=J2A4@nT{Rjd3gxRM+Tb=+JS03MlCMYvbegW@>c8G8)1`Ca
zBDN_eaI|7uDRI~g*$#7Z0)wqPYMCJHl8l|p?(g2`#Ukh;VRIpSL@iMu*}+{YQao@;
ziH(>-plyMe{Z1<^c#tt^r1F)T7~O7A<x8Nzs{a$oAF63~fu74KiMi!>?LgrlC{@2j
zd?N0&=U;TT;XSGK>t%Dlez{kT&*v4d^K=4DVG$#z5`+;c?|8aHm)<`8-?4+O${$aJ
zCRMO(d(NNKFH6bxkDI*qII4Fh(iWxnQi2A!uP#pf2DN{cDKR~sDjS-eSX40POvSvK
z?EJDWj%=0K%kxoq61--qApGpL=y>{ICdz|t%Vab8V%UcZOSe+-(W$MRRM8Ea3uD*X
zoVje4DLjBYuhwZKq5N})q%L{PxhPXKKtL-fdk1H~X96k>vT}boT;3q$5Z(Li#1FQ6
zpS(kInL(s%Q}*I~5ArlZV6%q|-8IDAuoqVWB%PG8PxAT8+sqrNK>7;q`;=}9f&ul7
zc*iyh1VENoy$l8h8UUdg@er-28L_X8LQ@2=RK}oZ1juZ0@-=x8OuTZY7{rn`u%WRI
zsX2WI8h2pRsSG{P!N)H#BUg4o!;<5}#|jhqL=ca}Eb`VUcnFmk4JOnwMo7#!9haL}
ztA1gsUxGZzNUwvg1$=JLIGJdpm56?!c2YWgh=U$|Fz>}NwWpkB!dMe_M{zzq8?`mk
zD63J#aY3zWM&gOmSXv|5i^I@w|HbC5>2!$I#)eR4IL{`rMB=S+XdXDwyy%45>|?Qr
zAeF=;V=Viel#Ec3*A@AcsM+W1YMQvsya8rKjR7ku{UMr}EAkgbfVbTtS{ntK3o?NS
z{vv`4@)B;iE3%|7Kf+=g%`=g*HVT(8e%b=b_p<F3OS&rT%8Y;|Uf)f*2#H=Defz3r
zBW-tg4p?0-$dW^wxbHFHRrqy^MxYM!<4rNZt407AwznXn!-w=<86e@ye~1Q<prc2L
z!TUG~{3;v6P$__XNtEW3106sDF9_jcyPKQqnC~v({QioTCYX*$*G7(DZn%V_4*!Xe
zhG>V@lZNQ>?P;2i_yjq@5>9hFc~)c`mYT(K{Ci)5kL+Q*-eT?KhnC$CiU2#W1LqdU
zW)4w1G&4bDYkhMB;5DMT;TDdrA1}fXf&lUoPPicQA?Hg0WUoTrC2!ut1OYnEAD@vN
zzLQn9V(fgjL;HD+V!lK#!bQ=nSGxZx#flZHjXY@`=l2y>h2wL01vqIwOm=90mGgON
zj-XG6X1=84geD+>46s8>>I!|?3kxK!|L!}$jvb?Vg*ntVcxQB1=&IQLG1VTJ{a9O;
zYdT^Qyqk6cC<i#+e|0k%@<xXLa+oiKOq}LZ_Zvq!q4|~JO?_6JP@GZxdM@IQhcCax
z&fIQyPSDntJ%lA~Y6*8mYtftcKn|HQ4{laB<ioK?qk8jm@8h<~!OVMGu!w*NSi)UI
z*o;%|BBR4`m`kSm05ifZ%m{uv`%+i@TH@nofGH`IG#{;@wq`C|J55E5G@oo<1TNhF
z(hcF`5)OM7uOYfm%AkIPYIdd4K|^h+r#H>fv$G?&V+d04ktW^BG_`+)`WRkgEsd$G
z#Rbt}lQdWN`Fc0(aDmg2`YhUQh7Ux2&=11Sg^GNOc1yj)@4t=giR{Tm>6!U)Qr@^E
zCoD&`fxj|p<i=#`jLZ2((x_}hTFA}AHh0((jLBxCS@$Oa9}Pk}<i<ow8XBOoYrQ|E
zFeF~xZ10{C%YhtdJxTp%W3(?NJ4#6y8d1bTc8om4#E@!dNn^5sk=fuwH6oHp@H<#Z
z%bS2#ve93NS%P=^vovxbN^EVv%O_@g;$l`<fSdqjpq-KT6Yp5mDHQ%F#mqjR74u&{
zA9Bo!Fg}#36LODwX>ViAWo9FvE4HEVIgIC(S(65dPpnjB4&1lqj%v(xudbEt4_n$N
zfyFLe(tcd178T`4cAnZLf%#ay1mq1k@W!WP)|F(o6FW}_Ra`}7TWRtD5&arLu=szY
z>!F_>Ch$PHgUJ5g$3QuncrVJlvWTGvL-mY^F_}%TSFEk4x7WG1#Zh-)ZII^~y7>Qy
zldC?qT3wG)6FZZ&iHtXZLUQAdC#sK|EY{@;)>X8xIxCKMxuQ;QSJySK_Ipbn!|RN+
zuUcTmdM(yxG_MA#Z(5Uq4^6GDjSq<y7hb&3`-^_qzwpOkF>_w_rt1;Q^uLzJ8aXvF
zeV%8__v45y=$C*zobQ^}5+b9N_PtJqqZ1&e_<2G$;V(Z#gz5Urw*@;*?LlVG{Jfv7
zKN~g&xBboq5XSZH(p*~`i*d}fA0{x>+ep>nt~9pWAlKQvS*Xp<Kd(7(6yvQUkIn+C
ztllW7g%>5R_vjzl;XQZJx0fF0j5ttBY<R*lrS01JdMb`J#AEPPHsVJdUY2>BJkg01
zVF%{&xAffWhW+Syl;3&U<NR0*1k}LfffJ2a`Hmz3xV$ffh(Ifo2VAq<qqtr(V@8s*
z)kW1gs*5RFG5-m?kk2;e4fXgk&7@GR#~9raDyxXf)XFU#xdi)WC-DkiXJ{4X*Ml{?
z!N3Y9x1*CfOAl!3=OuM@_j5rF)_kO!BEl~FXvgq3-}vOF(t%04EfHt@C<=K2B4E)C
zd)=AFv6#W9e|E~|$aEN%Q{0*ima)v9BX{jz0uh?**#@h6M&BU^XwjVmT*~u~YYb;Q
zY9<+JBblfm{M0h6A)VDwwfCwe^4>_i>1B|SBt+Mo>S^@Q%B?RR$py`h82?Zrj6`rk
zWO->$Rl%5YmyxC}{HXN$p(|?eJU+yV;qs{gapqMxHJVD;F!z#H&)2%_bx)~G^Jgt5
zysLZ0;>cHBOqKS!!a{`ydj}BFzVoK<uUapQc`Cygs-;A7s2C_eh=fp1+5db8C?qtE
z<LPZg4-DJh<H->$*rQ*}e+Fz1FhOraZ8KG->#{+rN2vF<6!`G^bJjCo%X*ALx+~Yh
z<vgLe!s`osESjkdpe&_&CqM&t#-orf`;ZaF>6A+bgOOp>3fg4`3Iqe*6U3z(DvIDi
zREPkwhq%R<8EHTfUXu*Px&9-sljFLSy4m2*;_iK56hOd*{m9Rx<3SP#9vvq{aI1j+
zWFG?LI7Ng{-RTZ?6p|!o+`;<*5D2*WJ%kKlA0})rh7niA1S_WhxLOx%?k}+Uo)Ukr
zcp)D^Z$M1n1ek3Ub1xa5Qc%#@IdLk*aU^;g<+mCJEy`M+*C-7gbnfo*Jh%9a@?^~p
zN~dI*$sp{a^~^|&j`*g_G(ic8=&&s@BL(mI_%00(hAUv+s`3ywsK6N^x_z0ss|Cp$
z0VX2I1kKzCs)zV&Q=`}Se6!z5cqb4L`Y>o+@DPkJfa>T7<VYA@_lU5p?1vPcADHl9
zU)RBNLB<6S(;pXgMH`O=Pu*mS@Gq(9q?rxmKmGN@l_Z@;7vk@@4W?fyN;v^*1h(FG
zRUXUIa=*rlO=FWyI<J=0bQpGs?s$7bOHeAKn|xNXOs+tl73Pr->_{N*!^VnH^X8Ot
z^!ddiK`KESoaXk1{jv-vvHw|r%rmkHi>aNbR-UrDe+)YV@AC#)_<%=7#(UosD7emr
zW(((3zMgSgJK-nq!fw5y-?cH4W=6K)OW*3~(ips9YiMu<s$C*?gfEWL<)af@tk4bW
zZn*NiPbjCun-qKZgg1itC?=|+m+}CL_^yCB6higx52{KpA}+3kBgS`vcPO-2w2gMO
z+E{lMF*hqjQ^kV+c>RhaKj)%DHpE-vEzX5SHwVJbYt6zxHOYbb@XzO{zv%WFRfPqo
z`_G{1U_X6w^X0oQAhX*x;p@c(NY4r!iCZ_UU9ukG1z9b<r<y(I7_DTd@cc+kQ+pAm
zQ<GzJ;h0|mijQvtZ;Hv2p8r2EL50UURxj^trlM-q9Je7$OzqQ<mYrlxthtKWWpd4(
zSBmdnxrSq%$28Qk*e~a8?Bt>KYvc4A6R@Jj!R0KrlJc5gb&}U1u{G=)DI{ZDjbZ2v
zyqE8ERyrMKSpqDzI9dOqzy6I7N96|=ChOhY?xDR=T$OTJLtojseRy5!IcC9>LLBTm
zRDgr1qf^V+facg@{0w$WT;g>`ohvut?BM-()wxQ?_%h=i#?ejc@#nu?4C>6Lu4gm~
z=fXWYa#wAt(TdD^VY@Z(T`+v@2qP==Ds!8<>e{d?pKNpU!paL+TxYT<RZ35W$ecfq
zs;iG7sW$CzIwRP}J_#6MvO#7P+ZxSnUYxu<wX*-Gh;*{^Ghr}uMbO<xioNl(+Jes;
z1d_22xzVB6mNI<?y7YnMDsgOYQ9I<vFp2v7@^IdE#EagM0cX)uTO%zOm`s~y9uAA<
z$70CS4yDQBp`DJOzvpP+-xQPY)QX~0T{TS01<u83=?{P6f3LTlvu+3qKbqe+k?XA>
zg<a!3q`xSz+m1ATURr5JEuYLp_3Q1o!aCULtTAX&ykPZ$qwC~Gv2?+%*Q?GCCzpKd
z+ZE4h4Gg5A3(uQJPTgC+u8Z4{Ry`=}a6LkpvlQda_9`al6aL~1p8B$w2B>D%FW2+r
zs!pp?s>P%Ytas;ca^4E1vC+TmN&Bqn`L5aZEPf^fccCfL)=8Kh67<4t60fbQZ+|BG
z4+d)dM3p`9TV`)_-cxH@^`{~fht_RXuG=$qw;FDIxOdUmCE`!&9G`G$yYnQ3^iYMB
z5k;=*t4oDe+j89k$G;kXzRg+u0UXx(AeQcLbQ2-lke`}SFxAAr^mCF2{llia>zK0;
zE6Vxo^L)<<RuSD%GhJsB%ODhAhO;#>U4FZ7FFHXrT0e>P)0<z*qYg*X&QAf`${z?6
zljwXz2RA1+$u`GOs2vEGBS%E+kB_0!yRBpSq>(%6mNp*mTFn!iA(5A?Q#%{CXY3_Z
zI%9wfq8@z6&7{7Xvw#hum+aetDzuhRtE<;C=I-`D!89h<>;9M;rcX3Y<BZ+wv#+3M
z%tF?sc%lX431tTE+75$exB5a20<%-bVNV>pw$Zq~%r-V%BHuq7xJ5~LinKxVQvB@;
z<P*3=y%a~<cu?F>;`=j+A2fKq+Po-Xu*C_SHR@bMC?ox@c4{kJQ=h;{@$mdX;^kgL
zAnG3ilJ`>t+h|KP?A~7GYFe{%u@t@hD_IS|P?JOa${X}A`VR<`V(1TsE&{>%=nn|D
z$cOm)*XZ)?I$>O7oO{*SrQHYhRNJ417E@CHyf1WLI4@nSytFvEz2>Q(#@*+m>FYbY
z!u3`*BQR#=5b%w$rhR^b=ZxTw;ExvMR}Mg+gGu&Ff>^IyWo@gTlIICcB+^il)AgiR
z>NT~n2qV51R3H0$r(^;aUW_$};{mC?V=L8S)1qRT0|`{Kek?E3`V%u_GFvP&_k|UI
zu(Ei7EV}FE#D7Y@B=o4(uhXN)N-e<Fi6k(+eWkhx46$Y!oUn?}7JgANE?cWV^fA-2
zY|%+JgK|ntm<^C2D$3?u;>uz%w@d1WRur%8elr@h|MrZ;{f(&mONDA(=I7r+ALOQP
zNrrT%rXL*8DrkG7%>+p>zDY?Nb4G)%Yc3$deY=vj-Z645lt&;NUSqEObcr?HwF(66
z-ls1fS`uEHSo1zhG@ddN2m%Rz=Ixac93&o4dG4`CRG@6gov3cK!fi3^aQh=x*h*`+
zXAQ}nUaQtwzcpfTc^u$e<~dPXeQMstIs_5T=Xv4K(AM7`sxpi>grkG~F3yBlD&sVI
z*K$uVaLBOVq6XhWwb^;uGb|QmQVunak_wNW2=N8ti#K-eboDA|yX<X3*yTeVL8Vo8
zfcd7BhT$5gGweje%bQ8{XcT+1bdG*XR#cL>F&rz_LnTeMY`tX)VVyB6=slP{^N!Pp
zHsd3K7YnG>RRNXh!0ynvEesZz?sNG8p3<`BGFxiAtq&kJ)7*`kW7->b5E`qcu}V1y
z$^Pmv7GxeLOtOF8@I7gkFp{2S4?5^w6!TNWwyD{MwVPg)wN9K=qw3<iz|gXZUn7I!
zQqxVdvFDjgL>vM5E2?wNNa=>yBr9)H-WYSnH)%qY3Zw`;3u0eQA88+H(n#rHRx8Gr
zccWiqt_b5j_loYn@i&MUT``(|yIHRN-c5S5kpD{1Ch;cDT5GYe-T6W~ZN8!^Cw*Z2
zt1A}Z*88OI7sLD$QuD~eWQu9T!4u317pU4(*iqML&TKra=!_u--e=rvPfqtkJeh_=
zkeCsf$t5tm!ja+-;@E57*19?hrL5+QA3|4t`0z5-#mX0a*W!6IBRiFK|9*Kdf)KN1
zoZm+jI8JSAS|@N@@HF#I_xwSREALKSL*^<-ur{psPN}GSqCGJ+=X8g=MIDBHqQ+*p
zK_GRoh`fO)bsiwR-ym|V)98BgXES+TVrb_nROKpF<$9eP<g9)VjPn$ihfu`BP}Dyt
zDIAWH1X#Ibw)bYv<ZcA1Z(8DjUZ09A)?p}T?hy#BRv)9AtZTqflAKLcyupD}MBH)F
zg~d875A5TsiK+uR7011gFlqX#EHWeT=vW6<uDkm9KTyd8mi6L+2YL_4TX@iS<tn)a
zYG0{ZUI~<VT->)ReCxr}=(10u#bM~-&?{%Rhcxxq7%H<a_n!19Ryp0wyd*xT;2uY{
z%+aHKjtG$#qQ*q(ZD-8VWtK-a{n;LDS^9^9o~fsZrru9|kV%afB}~yrM&J~K?vz4A
z@(_b`h+!V5({kZftueHtr<%;}I;2Uk^-Jg5&b!K73xEx-siB2T?*HNG8-OG0qOCi&
zZQHgpnb?y|tch*gGvUOxCU!EhZ5tii#_Re1_x@T{UH4YqbI<L%-DmH;_S*XhHcChk
ztEnDk%|C&$hpJ4{-V{gN94pe8sY^?xiNZ6`^I>Ja_2TjcnT%H)Mz-|T?Aipa@$pp{
zUp4L0z9hY@@{Dwsl|Gy~SE(yPJ!n!e){!0K2J2r!34JFv{;jkTd$y3}W|79~Npout
zE36nvG<Y}B(+52AF@5*ja*OcNE)8!=F5JA(1nuQL+&!_R`z-L)oabn_#;;t3jDhD9
zNoiA^7)PE%)5;cn*JJkD7wA~%bMe&V3or902~OFt`1XkapQF$@UG`9soBz-=$Y=~U
z_qJyTGK3Q%>mQWzoxxp@L9jc{^r6dA%M6@sX3#vx=F?pxqw0fihCF&(JI)-JIg9`Y
zU5#=?DBd18`42QRe9-@ufH%9ubR|!!K=W_u+>Q+BRpbZr$M3H)O+Po!@ny$O){=`J
ziXKAnhr1I6{NF(E{~OrJUH8Q_*V(qo4X<^HsX_f`dJ5Qo1Je^GsVqR_B>2NyoOA!-
z7S2TxbD9r?)~@_c>`7B--mYjx7IzZKGkaZZ5`3610k@Z7&iMx+&S0~A-Ot+&=)IF*
z|AD5b6_OVQgh$Q2rCz=%z@eCey_1iZPFw3%DY0%2Sf;-~<{013`VQa_a0tO0Ug{k1
z54SQ7%z*#y@Q!ue=#Xvtn02zC_dRK$=)TDU;m>x`^kuj+8%?G&m;<tdaDX!`|G!CK
zcyk~Rk-PaoXzkkdq01~_WIH^IB-|WOa&$S|tR0PkariiQxEO~!L`(!tLY65p{_kSY
zGgI<{=KqHe_)kx{tjlTx8{LX#AcGI6BjIKBe~)>~x0Bf|B?&kT?xTy~`~UMHZWDsA
z?!R#`^=-1g9d*^}XwtE@wO&oI+%}P!2Qb-1G`ZsA5JO1|y1N8#c<O)OFEsepcti3$
zxJD1*g}QB>VDqc`$02jRhokyQj)HEgOZIbkGLIs3!i^amD{FZ;flimZ1`5OLT6p}e
z1nY5MwWJiUI4(knU|`{aV2u(@4}TmkR3Lm}L8^mpUQzMf4y_zRn0jJUm>xH!v8SSu
zwUlT+8M;^@3n?1uOfT7tmgxi~xEyC)x&(eNNt=aU>lzNcHy6+B4A5E4U*lHcJ6zvi
z0^!1y$6bVs?Abj|=YI^<9HC9qWcKPn0#L$Pi*Er%E%g8<Q%Q<_XI^-498K66LLk?(
z^9zQQ&nS3ED%vd7ycpQ*+z5!Gf>sV%5L6BlEdedP;&76@|CZivN-OsuLs2UKLn}Qk
zb6eFzX@PU?4fb)RH1cyDpsvkn1MEDgPj*9sHHTyNTy-cAO2qu+p6NEUf22Fge8_!Z
zSj1AQtNL*f;YP^=;e)8d_N70Uns|2HG@Aw@k}!q$`zxl*IHzj=SK&co=k{hL#A5OT
zT?S<~??_B#YGt!e2R_&Zh*3xo&QuRTrKGg7D4&&=%{1m|LW;B_S)*Ap>&qcejZ>ym
zv1C2^w+e>ja}9?zbvlF}>c6J^m|s7uaMb*e+q63NSh(Mum<as@@lEx-^e;TVFIYKx
zyxprL1>dQHSTuou1X*?TC<)4(W^?#4LBY-8KSSZ`tiDN5RB!b1Q0ilws?Secd>J(w
zUht1+<DuWeYy9LrSB){)TG*SdiaETQ9knm{S2GH#{3MA=GEjJ)XL04z=+v=dsPv(0
z^hwq511;gJ*JGd}(~go)N9PKkN8pLC_Oq4t^TvN1nMK8$>FWC$sG78Vq2bjX#E@~%
zT^LmRWNLJJe-?Xr)xWpAPR{gP4Bnq4G&=|1+dh2_@tx%Qt#p6vgT_mo$G<JyOq}%#
zEdf*I*h%2$T3&Liwh2zcBcyjsv&qp4pR<?SJlGVnU|XO$jAQopN}zeOLw42@7x$-E
ze4`!H`RCfLNVWpmw8&;<hQrV5x5Ang-*6i4d(x7Oi5igVSGN4L6G`@vI#Ds3Wl7kG
zA#{$njI&jv&m-L2{9Wn)^-l2D4&AiGl6~(}a@wp=@!N_YLRpSH0WFzs4EoHNUc^T7
zHw$)=?Ks@<`sxw#PN~;HQ&kb>)q&?T3~F_h?{539?tW=B@b5|b44)hRY;{qG4IMuF
z106(D8S9v1#yr$Gl)paBB8J}e)a8-{90wzhw`Y}f)C}EHvVIo)WEeW^ln~r<j(}p4
z2`QFVDU2qOKBtI;SgJYZP0vG<z%FuztRqF9X$0g;poSi415^Mrp%63oe>?W#2SEH*
zzS26(O9i&O%X^NK09?^i3FZs60uDYW9fVTFvA0XdDjZLY{UXUCLy4B>ZZy(})o1N>
zl4^Eg2<-_w5FZCEMsEjUBozp2+!g2Z7vyrd(sFc&I4vO0!za?PK1l?l#Frah^=z|v
z$oEX2_$%RxjY=v*m)l>A4q3ybxW?|>_WfLY0$`C<l4(^6BN19Aa(-9&-Tuco#Do#d
zf;vP>7rrR81ktyTQvJ`d`=<HJF*}ZDBvq;(>-&4(y8y9b>KZ@T97-{X{O6YK3lJ17
z`7T16<y^(;DHLM-E6im?WWdj0Ej4GoIPACH(#;|C(s6xEJTIdg^woA%Q{Z+a%CVTj
zy-*EDSAd%nhf!6FT^s5}(>4mt!i({;YV_^1sXp_b;L7u)XHB(cU4n4d19L_?z#qTQ
zPdhDn`eR>8^{y<CRsVI;FcM+&z|MDW%UZZf<V>GjXaJo?gO|@j>Q#<zAX9d~g?T1$
zOz6i%jS|)3yzpqRM<8a%jN#vRqVgJZlk*}kTMsIgG<kcc1WD}pH!bOij*}&BD(3Zn
zWfP&{x^mt;p?}M)E^DX%xc_N1V_{f6g{oazGOX^=5AM+C^!`s715FLmWs{?Bq|ZX0
z>0``d3*e$;Re*Fc2><C~JnR~Z9eOtu-vQNnB4tI51**Zb6;3`6^{Ma}VUAP{G>Mn!
zTfCBvQy$FDLIPGRwS(WP;^0s5SOVLtoCA>AqiHfh>CTx94{%Z=G1474QZNvVddPa7
zg{6m4_1wK2bUWBmHOBk)7xms!@E+WiN=?!aA%hNkQc;jKeYo;EVFn4K_;7E#e8o3n
z?gmjVGe!=~Kc-6)rgRfuXl1#XIi~cz8A6d>e|VdLw1)<x&p&E}w0BH{IY_%-zMbaI
zZ+f=dZk(N+tD8Oy6pPel;RS-Vsq)Xl5gMT?Ek4ODzNtlc>2I6tz_VyshLdxeX!{#)
zKsb<ILc?UbQwBf;^q~^c1CamW7c}xB&qaFL;f%+PGf%yTZEWR~z9N2Yu>ysSFvmzR
z7LtAgI|O6Mq2@PwJuE%_%TQ^~!@y7;Ze|KH$QVaof#UBB^58qh#~$Lq0K>2v)!9Q?
z)j}e!EL3WZ4VaL}3ziuu$QUDkI6w#)sV)R500hSM7iA+&(dvx1nQzO;%^BZb6Fb-6
zW&N&ZyEqh_nyKFRR=lMY1cDnT3X1oqx`_#_4^Q1Q8p{dXFaI{UKY0^BJPl$@yiAg*
z^dBZtgmJNly)dGx;@XA7GbhxldW=$d3^E^T>9BXFyDO%~nO5CI%rp;tL$*_Lx_7Bu
z(aW}!^#(Nrp@gE>My2-xr~e0SU3x1j=v*{z^fvxIvJYRuc_oFCP&iX)$ZPC=55LX1
zon6mKMzPF{KY`i<S>?W-r9X7vX#HMxaHuKlEe{d`Mt>Bz2rN7O;B|uI3V|<9x}(i!
zzAfv~^0ZbZfG!+3Bx4E^iEGGi#>BM_#I?pU)()r*sKt({{R`pOVU7;!f<)3z_&kKx
zZ^(W0rJQ4X@?&3nERn?i`FLby1TNknNZ>enB7zjzB%2+ULgb3IM4m=YVMcV#-*ek=
z=QZ1GHfav+hw%c$P3|Q%N?M7eAEzf`I{Z<s^bwc}TL5tYF#_Xd;)&7F<?6!nYFMtu
zxuh2+O>h@)r`vMsaj&FRy!m<a3UiFCJsKA^k=fsFwlZ~S#y^#fC^5uVwq2ci8&U)~
z&Y`a#Oesv|QvIz)vowJO%9_*y-m(L&{bJo|@6qrh5TkLUf6$7WXpmN}+Ttfh7y^Y+
zSE%*GbDO{9^T29>dqH^Vw5J}p3C{kSHYZ;lW8LZT9->RU7Bnf!#Fn&K%QRivNLc-l
zSb4le80|vUF>+&k*)BGdM6;9^rA&!YRY!>Oxo{XV%;);H4kx(uwA?2>4(m)@?$}LW
zfxH<9i%kxrj++nOfBjEQ%a}c#@D!=%>mP!6q*jn7XY@l#wx|ANE}70VJ3A1W_zJB2
zL%&jZhHHx##nFx5!@s<45RL$7d<=t0*M~+GbBTA1ruia_48Fro?K6JFs9-EU;Y%ty
zNhoRvGme5u3VM^0;ZWp}=#u3C8GsBUp$uX2l47&>nmdXZxIdn>V7btQv54Gc09qk+
zHIHJYx1ax=cO%*3RwSCeh1#O&w?ZfIuL7XxgcJ+406c~Yh$!%V)e*{5*MWoL<_Ac|
z9_H~#Da9Vb@DYf3U6B`n`YQw#)fF5T47Sz*R%J0T#;V-NV{UpzLD$d5YruT04tAt7
zipERfnBl{-dG7AiY&}59$}YKb!HpOpLv>TQVbSDpd*>x9giVv7o_T&3fsA!QSB44v
zXJg?yR@BkOD$_U*rsKgghnvON>`!9r<+e9rfY_MyL2XFZ0vKf&DHs?k03Cpi0E6yW
zlFlg2mO6tP<bTg!vnc(z8W-|a(I3WidKq!Kn`cZNM?ts8T&Dz|=THaYLCALe?Pru|
zjJp2zGqYL@g>I10fZotI;#o*Fu_Ws_9+UT_MD5o&(#=PG=5J$Bdwe0n0Lmy*FmaN9
z(_tf{+l?0xoD5&ao?J&@FNfO?=vTK!`ZBlw;Rv4Ta+?e~Rk(SrZFOmKq0TY0=@V}K
z6V<e~6vBSSC*0U4gWfePgwA^WcX(#Gev6$Vk(`4Zt5`#Xb=L-&ViNOg99hc8p@l1g
zA3y;*+KKW&AGIH4QmaO(d@Ny(V@urpigoykZK~@*vOjFNheABLKk*KnTXZa`4_PBv
z5qf=Wq@_S`C_q9NzAZCpFjU>{c04Z#0Y4Gwq|gf!JZZad0Ts2o1HfF6VM%`jAOVnw
zq<~#$05|{~`_gx4Ic8i22EX-cZ%+3~#T0Mc3u>;-Yi%RGvS`c8*_x){@}nZALZE>^
zCN3S`5~;BSOKSZ~I)jOjJ2t9yuR^zO_*80<QnkBb=|~%rYuyU|_*ifrF}_u53XB9&
znAdf?>zZqy>as<s!dkte{DK?VX+Lr$_s5?`_}^~oy)_qMC{xs(G@LBKS(k6Z9W7`*
z7w15~;|R&5M<%(eCJj?c2pp9!;5(>vD%-LsbW>kfO&6<Cd=zv=u0H*}%@^mT>fX+)
z*;6h>cty|0BCnucJA-X~obxqMVPzJ3ca=VqMVa7cq)mUgn8nOu?DV*3nm5hsb(PfB
z)uD1E{P||at6~VA4UXZlh%eb4!q)?tng#>XmZo;)Lk6?ENf0FE@F-L+_||x}kWzkR
zoL_t>BK6mKA88V&E5kY3tRb?lJXbZfiYza0*}Ayp%&(SQ;EUY8P9ephTEQ(ydl#}c
z$;+ZAC2&Rt=Z~WuhsKJVU(RTpEa+gOlYAjt&>P8xl(z-IW2LMGyg`eSiRQIR<h|c5
zaE0TD!AE`|&pYGmzr-!xbobSf!vq)L)j0iq+h!(akv|m>))Ur0^e5I3-gculiR(wz
zAdo{-+Ccl7?ts(IB?cqbf|81W!<138o40Nkh+%=BDSCsVVOHw)?z0G>9cNX-1c$>0
zO-OdzoXrj=c|;9!m!b}z_hHtP64-#^nE^&*UXn6|!hlo$a&~I_ZsokAMnSo+cwlD@
z+Qco;njRKC{Tem#QBsl_RSn+L-sOjQJlrq(F{DRaiBdXT2<Pv=!D^<%p`>pB-vQrK
zmA;pTF#xk)YDhmfYp!-}p&4!Fclp|?J}so`{`&gfnIzXtJF_>dQ|^l!^&uro9^;l$
zrt&GGEsgRs3dJTuCPE<CBjMDLiXb95$zVv|1HK>iffsrK7y*pqB#iSWuRWX+CGpvD
zS2@}pdXY+>Y<(ESL6cP{CQ}(*%-I{BLL97=Lzf`8u)bvV`<AApE=e4ztMhF^BT304
z7Y0?TJ0=HaJ5>-yGCw{`mhlV}71U2fxB-_$4{+H%KGj^PEN~`DMsBc%BLh1ORT=;j
zfaw64DQw}!`0yKYXzIowCY6376=7m#vKqeC=Zi%LnmzK8dlmi!sDULdTWD;nD<!R)
zu+x`TxOvZXec}89WAVZHq%U@?JI6(mKs4hZ2q^w-y6HeMOKH(?Fn-Zah+K%=zV*C5
ztpOPG^pZTQ7iZkF+dtyS8Dq-69d!)p-doLXXODg7_$wof^w*=Z52J9=tTT)3XhHFt
zaKXAKvo+oFIwqlHJ&p|2HXm0p``LyZ4@N!Iav`j!HmGOfHDreXNCHUjk76|ZW4W_+
zF8wJ&<qyl>@2iGk7S*{}AI`T|9-awRa}Nc>nCEB$t!pgXcSm1oBBN!YBiVimk2FQk
zzz_%B%gn|*VT^Kj+PBfHC;ESHx&BSgIt#sXfxt8V8SD`3FqP$?SzRUYP_4Nph45xx
z57o91&M+x>>D2IMbLr~fO-p6JoKXk+balN%(!Xo`X!_=~aKzZ@+nE!)bn=Ty?Y8NI
z*K4mxB_a>cs%$@{BWZVPb?j471KPhyLxWpG_M^g}vbgK=uLv>Xq~UuL0Ymu!%hbz|
zrqat0PxZ?X3(U~zJ8&)dA<y5(c6)6y_x*hP$@KGSGxvR}=Q{l3`d#c5^m(84aos28
z&Cct$AmYbqQ4Kw`GHu?>{bW?~bp2!hPs>92$8}cEwb$p<OYXbMrw6+h;TCQ~7cOBJ
zp|1ZOLL2V8S&m3(O10HqIg@Sd=qgD{;})%T*I%{851+z!t4li1jgQuE)`jnbV+ESC
zejN=R^w$2Wi+;dAh3_Xl(yxd9_Aw0xmqMo1Ya(}___qGv7yUXa-cMw;UhC@~2q?~T
zM5cJQKEJFyc4<94S0?-U;h5%ZnXMc)Yrj0}CHwm6fKE@ot=zh6J-pc_3HeW*ZwdOR
zydT;(_@AMD8gsmzQHJTbEEOkX+SclIAvLm`o*E~Sw${pW>KJSl9t-ImS`axW?xkWR
zvvKRJy)?DDKe;rw^_8dRpR$?MPvIn7-<HY};OCpnz8V_4o9LJ14`B0=m`YR1hSKoH
zkSuqYxAIi<QCV&fMy>}Ekz+!;vDTdG*;!M*{y}r2L_9Mzgn?+|!(Hw`9wNUsAX@6+
zy{$qw|LTNdx19de>PynRUuFC5@e<q+cW6w_AeqPYZQT1;(XZkB;ke)MWHL2($<!8c
z<7`Pi@Rw2n1}Z(5`QX~W!Lg$t=<igFDA!KR%^x9^!9dvY7hL;u-Hu&K0ws)eY-%5N
z@Oj@IIHrUM`xw<#K6c5kSv-50t&7iS_Yf09T(MY<ZBm5anV4j<R&8*f^%9HH<lLAz
zNzx%%5%R~thKHf}uZOLbupXjZMd^IdPk$rEw1X&yNmfwycXYXn_RCMUGR*wna{XnA
zpS_qg+PEDp)eV0`>T%WV6E+hUQ=*659yQ*?gnYl0XSoUZ*4W#P&R2DYtkSGoKcZL8
z({W+s`yM}YdntPH`V2MVcu$?AY<@|(M%O2|kpVtl)b6L>Te;3G3UJ|U3YE1r?&P;2
zSIM#1gMVhV4HV1xDm&NuZXgaech<}}i=RJ>cZt_`9-Ty&xW~Ag!(a63ffsyPlewCe
zr`h5<sgyM?8ZfIpxXc=KFILs@Vdku{knqauGj3k%^!G#YW7!LvGbzBGVZRsu&OqPb
z<@|M^ujA-X(p?y%#@kw(T@lQ1m{ptmBu+HPm4MB8&M$*KuWBuk&qg~<=WFi+mX{}O
z#TZJuSar$h#71Ul!Y^^u(~t+LRx*S=>x#?O3}ey6Nn>@T#A7l`ai0fXa1_J!km{EO
zFVfkj&W_DsrN|%%8<cJWogdtHZb!8BWOuXNiqc_$ByuxQRrl!f`gVV?S2toU?$%wd
z2ipF&>9r#%!JX27;!=LLqxD0sQiWiAX;D|NwMz-~oSa=BQ>$+;Q=I2%V8$7=I}$EG
z^nH^hk;!tCexBZtScJn4#et@auHXnOgM7g?lJkR+9-~cE_>w0r-i=G!pp@4YARY+9
zVYE2PDaz2d+r;ejTdyHKgR?s^7q_C`%_n8*0ei(!01ReMm0QXwg9u3uHvM7kdrvws
z$sJ1qwnd?a1u(iU2xHfTeBDk6#fnml*wveTj4K1R6W_WM5Qc&cF4vNq%o#3j7=SRa
z-?RjV0|4QG*}~L#xkZNLb@BR(63J^fYn!+sOy1(NHL!Mr(-Ku=Z|1f-`C@h^kRQdq
zP<z*RCA*BO#I#$g{&{SvdEgl34Bx2v21FNM8?-d9vmf>27MD4ylAR=qGadyr0xNW2
zvM`3kS;Ok#jH0iRF-wC=#IR_?kxSV{lbl7dKuGeGO4|8Z^fq<z@-iqtc~B7>o~ozi
zsNPm-VBp0Aq3%)s(bY<2ElJGQ(-;%ce}~Psf}~O-4a*&(Dwf7Wyl?#}K=t+ctGk)6
zhF_6U2O+J$!82JsbRtQj|3%{G>9d!ED@l6rwPW79xW8GPF>Uj<^+5QGXNP{{{m>25
zNEpl|6>$pErkvs!T}s#^+j-0V!wt4jqWt09pg+*Bt~|G-ITh|WExJs^S=bSlBD*dE
z6+u-?9O~zA6wGfp<hwY@Bg;5R@ZW&nckz(3jQ?Vy17w*+WbUbKtBY@h;x#Lmd#hzw
zEAbggRsx*ig+9vznH`%rRi};bqiSP6D?=sLGTmMmb*Jhy&wi0+!pX~o%A9Zz?PSUp
zwSNIulS3oV424U;y3}Is4p0Dt{w+460SMl85{Od<GXxm2`ZxNXXeMdDtY4<@{F&8T
zK6~{L6{*~P(J8<S@^_l7TGYt4a^FfhwRYbTtUvLJtdxgKQDvv78BE7pU9iH6HXh_(
z($fiKg6Ds+xDUw}FgeE&7gjJUq$CU>3~5KbiFXNpn8}7A`-hzB{dS!pocDYIe~;Mt
zGAl=y_ffjO8KFz})4ES2oac{v?Cnm2&Q60jALVV&{j8h&uTv#|Q_}C>Pgd@iLMIG9
z7%QTZ(fzp_`DrOT*;qYitDiSTI(c}7X+^q(E&SPO{Y5}Wd={U!4nE3$e%8~QNHHj*
zQ<sRVn$Y`~F#C`0Fz2Viz~GzL*Wib&z)u=elKrE@Hm`3Q!kbBrTXfc48mpb(7C&k#
zd|oqd9%<f7j2hlv-LzgCXCLnC9$xwO4>jeovo~XPD9#P&Q$!LQyXdXEG#C9U8+<LF
z?~>|njtjQ_*|kTIU3<4p^7Usq*D*au85^yhG7Rh>Pc&8x>5g2BQ|CiCo3bx$Z7a*!
z<-%Jf;91J~26Ga;${{>mUWp}(8<ROd&(A`ahkZ<%=Ag=3lo;6`w^jbZc_PN9*ssRe
zswo%L``a6r?&0fC9#++mc=9OBL)${!(*>*dyg6J+ubB#(pbVqimB?RGp3F;HB{QWw
zYh%8e9HhIiD))u1TPwUR?_nt!2ugDbu%DgbtqbI>E^M=Rn|SFj#4O?t>hLVSCk}-Y
zfwTjR=`}g#Wh>z5#UqA?nE-MCIc5awZ{|g~SMvbaf4Iex2bD8aeY7@`U7j=^j;>ZJ
zNB=6;C~wX|^0yQmO4Q?^bL)H3pKoce+bc}C7zY}cs8qU_2i?{MZ!$O0clD;I7#))+
zZ1t`sZ@AAFH#cyaaopj3d?S@XdppnmSn{%ZFShwn|FZvg!>-|@qy5cCZ6m8EMZ3ek
zd*Sk90#}dNmg_C=KD&#>eQ-essOS?Z=YOo{J)ZVu?`0#x^-)3z(UkzZ;4`1yW14t<
zZLAWi(%OJ!ihD^h*9yo%<irI<qzd*6E&%!0*m)HM5jY5w1Vk5vnPF{S0=k(OH2dYD
zhvCNyv*45F1S+e1%N6ccA6h-(yIg&8;9Ks0ZA`ac&CTP6uB#y$l-D*oR(0*vnbSSe
zrRNzh88Otqi~d&aiHuM;+>HZ*!w@%`t<zV+{u<ThH?ow-CV^_WqRS0+NWBNQIF=aW
z6GZ@FtX=F^`IhU@$wEzon{E2B7W@S8ryMhjt;V073MJ-xeN4XH@%~w8j0@nqF^m?H
z^Mm|{pX++}TW8Z;)o9W|ullWxe|_5&(?_>1&#(Dh!-hg+f^*NkUb1|(p<}#wHX-Q*
zdKE>7GQ{9wtxFlyemg+$3$6<UE+hz??xCdejeoO<Gv>EQGzB!1R!`}Ki_N1%Al$?H
zyHZEIhE@=z%WRo*^oa7?Cc+<jO~>T1f}T@jTaQKI@pfyX)vaR6WIqx0@vNhc+$?)l
z@C%nPW&_zXX@7@`=*!767fs@zf}`e(!b&59gJd_U0wLcmi%N_qT25;W+^Jn(DY%%^
zGMOY0-{^WF6M(Rn8xmSa+a1nd+12G0Xa1Zg^d)(Z)QFd7h<tO!XM84DfB0TkE3abP
zKD`P9#6`-?4`H9wF=-s2Hk9;1#R#J0)5o-+C=nw-{=x~c{W*3nW`>Z9lsmDWH!-O9
zUR<|QCL|(Ravz=*{3)pEd8FSM%aik$?O3sL#`4n@b#=*gOWW^s>eOfM!qC4&!)>$s
z((cz4@1F~x_K$$5nV;}FDz>3l&2p>5Flk)_NM_{n;FwIUw=o<=?MAA3rCCw(j#X)H
z>+p2>F+eoxr37%3BTn34XD2;b^pUol?6Ud4T_odj-~MhbY}{%#-W@RiH8^p0<71ui
zVMU{y1Ym$+Oq^@ifcu;2$(=2vr}HpG@Snf@A~my#``e{cKlBx*OXJclbfZs=3D#?>
z{5q{ZhF%`+OH>$XkrTBn9j1yrZWI+VucSEDl=iM#7_tYvi!werY3_q>WB41YvbXYU
ztC}~-pFE<MBBSLBxjq+)_tPn1#0j&z%+cwmNh)tddL%8KE$t8M!zC9_5}?n>Mhm7T
zvk-R$fs`S-oD3rNDBo#C4Z8!jV3KjKuo0CM!pK)O8DUIsu#rnS;XUVoz2Lp6tUZ!y
zo35<=TranJ!l4P5_@wl$DotO{r_ZEc`_~_uB|qZ8TfMw6&o6^C1x~SEPWw1;bGCi#
zf<nz>TyDRxJ%k<6hWuD`q>jtymfqun!>)&WO=!3N3xlh!1cmGG#Bcmm5LOn>N1os-
zJp^C}V^0%cZ@sj8**IBFw${L(>Ur`r4Em$AmQ~Sj1+A3(-sj-k)?EJxJmtBFl|Fd*
zVLHfuZy<Tna;u7Gq-KE8P$wH^(e|2-8WvHwj^9T;PA%_{n+xDVf|5ouf=0a+A18|i
z^b_{`AZun9`|%<jzrarlv&84teB(AZARL>%`}#b;%obhK7Sqf>^ki)}D4P7dUYD!L
z7NvFKR|@yL_0C>$mL>IQk_L8;2{|1(L<T`}OPi@MOM&dXCX!eBHLgKo79cGk{rV>3
zjaDfHYdhyF%}u<v5hQi*rw1o%mibk=(*4bAqj6E8#k<+*;MFgMDZ=OT3^6gzdv~vD
z_Ivr;_v)`+K3w07du{BQG1LW<!%U2z9>u<nBF3YYTX>$#Q8vw@1_zNEgO~nzR>?(3
zgVuw^tOvLp7a&lI0R960juZXmv?-sWed53?YAez;$VgZ~H0vH-=<ivK9eiwY^YFOi
z%E8;j9h-Mx%sN#6Ziae~jd5H`L8wMSasB~f4EpXu(vc{j5o!n3BDo-Hp=&SnE&w-R
zq7`Blhl&+2Wrk(`Eqd@9c}4~uGvo8#9oBE(EV|ky@4H8?vC3c$O+|aoC#J66{rYrm
z!WLR|B1uAml-k4P7nKQ1^p%SJP>#FfRg)=zc(sY%=4q&@9zSa*nez26#K1`A7!y$8
zlVt!tcRLU_H~?XQ@By;0aS{G3#LPsB^}`(MNEB#a2lp`E3qBRqsF$QzJl37`vp2M{
zFgWidY#_|sxa?c9by^gvO5#TINO*VRP^L8AinEH%UaMS}$uRBIzK4{@k_!s*FsB?L
zWUwt40QtoMfQJfz0l+xJz-(0F1UXi1mNmjSu%34GpST|nxXFyI?HA=L^~uG~YWwZm
zBh%L0W7W5g?T$=LnI4psmtU#yaO4HT$5O;n|G|Y_9A7b{Fvq804mOjtHVuKt;8yit
zasfk{D^zd_fDQ-);}pFB6NM1%TNmqV9yOzSe_O7uls>8m%){$EuO{p)@9%R4_q89R
z27iI!_`d7&Xkq#oVSj--|5VkQ9Ygi;M)bot>_LO}4;FA;wg4)r_fK~kIkF`^6HTV<
z*_+2WEtd`{bQV0D;gYjx)UH!_92-~!SOi-*14lXw0ZmbPh09i}uvJ`IkzD(Ao{QGr
zkqjQG%2xY2aO;nNjz?FAH4Z(AeCSiIf9olaDeMNne6Q4w^0YV<VNFrI6GMZ#G({EH
zLPGMFC^m!bUe0nd-cWp`00dv%0K$Lu2%)Wgp%BjB5Fn(U`YVa`8I$PF$Ko^PhdW*x
z1>aof9R<u$!ebFy7x1XlCo8*#Lks7%s0wz(8NMb|QIrR>inGcTJ(3wl4>G*!WQ1la
z)$0eDl#T(MHdCC3WdVFJd^uhB=;v#G?BE~sdadCSHxngNZGQS7eql-Fxr&G4m8X$}
z-Q{DcZ*&pGx$X-1`mC|v@=kCIMRH~3Gw`Lqz&R1WI5TDw0T?REjgMdWFzihZ{?$vI
zf46iXdlP8cRBc9hM|{^={TQbV@Ivtt89Jq?7Wd74Gj7s?(#g~BU!<8D>2mXY!|%Jm
z!)teFlC3@xx4qrAxYhXeRYbwB=WtW*LRO|vMRXBus(?pQtGG1fyZ3S9VZWzU#}CN;
zszky@JwQY%v}nXjuz-+@PzVw6LB#hMQW3BSs0dTy$bC;H(VTBjTW%wgJ64MQyHS}o
zf*)@$hL`f^X0Gm1<y0@kW=^3pzVPnr?C3#QsdN|+yNRe$9d#Ps!A0q*J>Sh5N#TXD
zR74k`03pJpqEaBn9ndSNXq0*?MS`-tWr$AkT>nFW%K*tf>~RW)1F-YLukYZ~+S>V*
zxGPfjHde_}{*H~uJD&XuIw9&gC5Jw5%8P4xRvqk@(J$gqlp&lL=7Lf-*a55)<g(Cw
z$N*RfQP7(QG5jH|5RgEE4YqpklPP!7cS{`!<S5gKx8_me$TgAou)o$in=O;;XimdY
z7jJ-GX%pK*j^kr@)i}zPu&;8yh@4i(cmpp&T6CRVPHjSYQgeyY`S8i)LCTMz_`fkk
zOT|hL6-#{wbQfk}bQ~)`Q+J9Yq$h0Xb_qz>f4pTM-M#}$vg*g?fT36KPr>DgTj`Tb
z=8_ibiWr1txe;u^m`H(t3?;6px9161M^s@rH8zIQStRupsBT~-i6uMTTTN1@VB%ro
za|Gh6SC(d(%>}ajzbk>`*lcjV7mnOymza(Lyu;a-4ezD&xJe$5P9}ib84015)GwbE
zm#qZCWM_E0`Z6|*GlNov5$ZFl*jTa2l0ibv7~DSeY}%xukcEK4Ck|;aJU{?u0H$*|
z=0f>t%sE8pQ~PhosjyMb`{(ZA(Sa}4>$c6o75nl~Z!MNp*XOt8(eJk>``0hpc4a{}
zDT9~eXIfF5xY!E0Ar?_wGumoBOy5+j%DzhuDy5QmnAF92fT5$Hf0|PgA6$v;itQe<
zj8to1K82MbK714RF>?lo0P-b(Wi^IwBs@HSOxU@eI-MQ|CxA(Cb8uzS_`1a(m0Ct^
zbRd;>D;oZEK?URZGJ6^*pUSGt(yRmf%(?QSF8(fxdea%#M<@cz2m8DZ_iS7Fp^WrF
z&)As_otu*!&tuFc(K|76GccL8(y{#H*zx-Q{YUYBH2&zkEoPcVgyb(gGwfEo#Es%?
zXuNz_l=NrP4sndp&looS2p*_w=<5%PU0-nLN77BwO=p@-hNJ_>1wp;D_ElQIPFi%o
zfq*jhgP-r9g><JCKbLzJN7PoCEAgbp51}e<_pYplE<Xock<dPqyg)d`Ms{3pn-JGU
zXA(}ML6|YNg7#NyqE=iKq{}ttR4}ChME|<&DQkngyD7mP=<!nsJAmCdk)3)bOYi%!
z@3Z`{bisT1)l#~pOV`eRy<&lieN#%?1BbGa?|Zm)v)^X*!u(F(%(bjAeH2>;!QEjH
z0v-jB7xhn?n>?!(=a-)h;kEgavh>vQ>#^ECXfJnZN<|;&<j|x$p&@<kLejj_Pj50$
z8|P!G-n^?*4e2WJ*;(2JbHcFar+@wR0OoOYpR0X{tzUQVz<HjT`MV-Z>}>ZXl05yk
zYUN4e6u$@I*6Iph3NUiUB;S(O{GzYR<s_4I5(b0aY}CsQ1m^^BK5<w8(f}Zn1AW`P
z`f117l9I#ynp3fNhVfRu@aEO4nVxZQc6i<AcM#?OxZA1&20s+Fph`fjl9+0oGk6q4
zE)V;Yksgx^+eh4OGonX4szh6y1}cIr!tv6ngtZ>U7|~eJ-Pp(EVt2HhjQ{iYx2}8f
z-}S}@8-~XH&XLTh_VPc%k4s~k3mKCmy%&9yzJ61xRo~k<^#=pn4D(AM34XRFFRBrh
zvCpz8)WEMs<D9D2hyGAXk(uJ4d_9K&BL@{UfvT@acS(1hX?D$BHQ5$`il;A)iBrrX
z_Wi+iKF#rJ?EPJyGo^k4n}W+NBCY5K(VvF&n=n3O8+R$n=PgLgVe=D)r<}Lrumt(W
z@(5LtSiMSrx_AaXK<3yK7%!3<&9lo`2%Nys@75LGhT0x@tL#y-TD1z<u6hmhE;8%D
zGeEyH#|h)9$9qZ=!zfvbmABKY;%v%UK7Q$4brHB!aG-IY&2}(m%abWE;gp;nE{ci4
zvn9k@R2hdr`mxLHT@>bhm0O%%i^FPy0+@yYq}IX!0D#m!pEs|{rGjSt{aZTrde}bD
zDn^-;dRpDm=^Ku`c%@m}b=3pt)tPH;yX+S&oC!IyaEyz`otm@8Xax2`hGQM}NLtcR
z9mld6L<puy?ZN$9x-RuD5ZS>*_r&%N754~=SK#efdxz>tc1T3pSUC$Xo)gLLf1j;$
z>VRSnVwQ`hjB>NpnfJD;AF^F+@LFgM%Jk9_6@~JUG<^Bc0!g$11EjTyz@n~x3$iCQ
z1vtZHR}{!DmZvx_KoClhNVw6vv1+sFYaNR@(eh<-7L(NKe#V-Qh(3Y(5YdC@aqZ6L
znURQ(_+)<P=;K1c>+3=1T-M3;W#VhveaDZWuTkq?b~_Ld2@>>A=L5;)IJu5R2ntjX
zE$OBU=|bJ*AFm`7Im$$Fw_&!wl8BI&1Fj&hOfIfKd3?_Gg|(es7m;IqCP5MT>Kh!Y
zET&&)gf?!VKAoF}=F*+vT(7<*V~}s}^&G>Ls~Mv^Za|0k8sZrG2OE6$wEe7oY<5Ix
zReD~uczAh2C*AGtg2gDEA}k{nEjgNsU*oq00m+u|WF}AvlmI4Qi$HnU0PKL|=M2hL
zB1zfdk_BdI4R%1!##UR~knGT90SV8VQfni^U!1A=qkuFcc4G=IIGNwk1**%r(Mq3t
ziIzJ=b;i9;!)U>wxCv$bsX@5GxR1>4$an~(gQSDbG=ta7$n&_q>G<vwdled-rG8pe
z6R%mmuDZSrX-;oG_wqv2$I%+UjT60K@q}CjA*rBlh>b!cBQ^NXFo~*%3a}Bxq~>7R
zVZ@-tE)dv%U<Qx|lS)W`Do7g~c_JVCTWd@st7bJKMP{%15sAOdh20Hs3Sb$6dlP^+
z+~q;tpaQf3+6TzmzrDDEW0R~(i^EGulu@nB<OseB4g(@jH0OP`X?V6SFBYv4@*jFa
zqYJ_~T(ij~BMbUX2ulw(ajm}RmJQ{l<6TPTD#8jG0e9I35gc=<M^H_mcaeAXBLv2m
zf?I-HrnWG9>QAd?T^3m5-1yc=`w!|dtfv$cSrBk-K5j>M5Yc&c6WaD1t*zgWuiSLv
zPdLd!V_(zSxbxa5@_vVC;j=o5kt!A?%`hk!zff@u*B#NEsoYf^gM)tNSYVdj(A{CX
zPB?K|fMviktNXIUVrg@EQu%35duXa2-F~l|W!~<tAvC_t%;3c4=m7*-mvKQy*Zs`R
zi08)-a=>gq!4I3<bb5KrX359^OgUc?bKbl_N2wM#XUHNmgl8PJ5fMfO$mh#3kv+D6
zx8S#_thX&F1Gb4nts~8SWT+h5?d{ytp)s4MX^*#xIg9y>^L-T-j<{_aJ`o#DMK||q
z6at<{@1;3O1i!h~^;Rh6TG$?C${N%V84|(fWrR>QoG{fA3EVz2aFVEceZyW(0yeTx
z00sa9UOr$PtQ)dBq_r=^ZfM;%=pvyTnHp!<1~0G8aY}Y7l8netG1Z!>%ZUvF^=%U*
zCSUB1_Hd`<uiUT%?6?b#6+vY1<6$OA&af5bXwuvaN8|;j<u>H$11;t~_(5S%AoLug
zg1is71;9c%7i^CRfDgbQH&8Wtcijd|@jG0dsaRLf602_ZocT_5)J6DRDo=*VhMS+M
zoC&RR&9CtC>0~pfvNra$^1-GTWg`+?@?niai=oxQk$Uv6(nlx3aXSeZA(=+bfD;$f
zjYqM*2YYipWQGXgAHwo>iVuQ=qOKv`Dr4!`aZ<!<&wEsOHM|IihVX|Ae|j%H>y1re
z+t=}QSYL#+^ccNFS#(S`G`5jeQbkt#%(x)OaxOJox!&PDD7XR*1eKg(Zg6pUa&Xe=
zP|>alx+gerBoKry8_}M0m!wcp%2&DWpO04y(7btGl?jYiS7G0PjcEP9!z85xlEE6*
z0S*5!PSD^}84|u=Hee8%G-*<#E#tISl7z>SPuRllX<mfhJf_~U*N|x$%Pk=Ew{+O`
z?%cb*2xl%}G|G-XL4}e^!y+(rM~ce!Rvx`D{}(JwpQCsZDx!vmU;&7Q2*BV&%A|#J
z0C!OB9+8e2@Lm2y2AzOA+;kz)WNf6gtsJ5W*JGu#gpE0&>BsyK4e8w6)#TAhBD%RH
zZCWHC(aqqSNs!;i(eMTevddcMC&F^d5}G>9T7+b=YTzD&>_k5(Y+Amx?AH%i4qnDd
zd2K>AMgc*@9SbkJEB9Ac)g4l#aE6{%m?m=KqPT~v6g1>||L7F3I%6WIS>&=Dhv<3+
z9I5M6%dNPuTasLfVn7Ua#|BYD$EuW@8&yU=QGEw)A$_x1uNy1_9@#J*d^;Bf=I~$e
z41l?XhB<Y0U;7Hq&Ov#U&Xllramlflb1BF?kK9FK2a;c`4>sqJB!1TF@5OwEstFcu
z(#QfW<Merr*mlUY2|#TC1cG5RYO0*(jmfTl;0GSooU_CF7;M{%Zi|6%sIa|O{9+|U
zHN=7O-0KpSYY#kFtX*3Bn&No>anjeue#d0?)4kcF&XpE*Fseacg_1Hwyr}A@abC1?
zJlye&$2D`kHY{(pY`2lQH0o7nK%cG<EHCWSI^2_X<L0&Z&WK)yEYtgqW8BvWVYSh4
zr}N3*03L%Ba{7&x?aFewCbioIR{m~3Z)0eRc~oKL$7aC~UTcC1|AOw>D0?al;h+b7
zg3xF&MHv}doIn@~p9r!RTrD1-xR>GUE4EF)Kr#z_#60C>IM%|Jb@yR%03sM-ngAjl
z<w13dLd*w$MKeR~ZZ-})wrKC&xG@57oetqRRzM_J=m9zA&9a~2Wl*Rxr@sJYkmjRw
zsWo*cqz4=!7HU8czo;m37J8JCOxGlzGC_UyIyL@O28DN79f6jvUkJea(hZgd2OtCx
zI>QhWFfCPxU;^)xtSlZ5S(neaQ<<;x<x4@iuiT%aO^?`aiqHFtQm{iJmm<<wYEP*;
zK|Nn$)ljG%qUNEi;ePi(q7_CZGlX!lC)UCtvh@Ul6Jh?7jpT^I40{4x04}KlF4CWu
zen&kxJ=gUm>2g!bIV5Jf0XvN%<}%^q<#kYNd8<c@Bz~ZbPGZZ4tA_&07v3$c(r?I}
z=L%}tMpo_|WxcXwLC*71g;Xm2aKMK6e*S?kL5Sm=2;)knLTSJ+f!OHN;M2QPxllh$
z{#mbaB5mHSBb=XR#!a|0M0eGdBucV+M}Jer5XZhA?I@0B1&{8a02O;V`>zDD_j?2L
z$1RMDhR9(RAX7A;CBdEauSBt2lZQ};`g%$Sz#;q9Nk#w3)x1*LLVREWV1U3@2ry@X
zZ2-3p^7rG0YJ<xM&cdbv=Gl=hL|Bhy1HLVxvKE?wNfK=yo;gv`CY?0M?#3QPW&0md
zGuly5v&*VyjXwsB(!y?kBiIaLbVu}n1B(A-2IN(s14Kyxptv984jO(enx>u@sTj8?
zfx8T%fvF)iy0};0z|tg35I?k6Am3bFXa1QKp&y$#X@)LapXWLInL!_S^~{r)!Ht)O
zDCPRt+Mh^vlG(rfR9c8Cd<|3I14B(?<My1r4=!<piJM<1%XfI;q4hF?(uU$~G>I`U
zdH^YkBs#G!rqH*jP*1X)`!eU&>%*2PhNDC9HA~3PP2IUMw0=%4vlYec@+HmqGK)Hu
zA*{A=l^&awO~dKTf>T9ubZ(6~!UZ_+Q8|%4K4+;RAr0+q7{vM*ig$x7nktrhsF-Sk
zUytOXHBoxiCyS5&Fc>so=xxC%?6dp4G95_1{CVaQHb}x_l@gu=5t!0d>8rP6Afmpq
z6Z@1tf-ne4j;UBp0vE$ORfgPugPH}LWHlvc7b}Om&)Q05bTCTCLj5hi@U=U1*GYs_
z0L%f*!RVt7L%Z^BI@QQ5^*TK~sW%v%jd={=NFY<~!?Vrvqx?SjW0`$z3pqcF-g*ZV
z_tc5^f)SUwOBQ{|S>?0@(jIoC1gc`^Z)dY|83mU*wL!7U*H?+5N3Z}`?*hT<@Bp{~
z+yi7>Z4|oz_}#hQ4?PY(I;iX2jQd!T@ndR#$~8ugqfejv^*I0e9=XfP=22B8r2BE$
zN#$;I7@S6Ou|nb>?ToS7jF4LLRKu)6F#mkE@%~_t&o-4sx;8p3D464@ZRAe%{=eif
z3s^NSnmf@%+})UhpQmf9D@#?3qE*t#in>-%*SUe)EJ+OI{WnDznz&qE#{lPK{^Ym-
zfeK46AR;_4&v4!t49bU|HsAyT0Od;?zz6_s$rIEX9JI4{)_7-w)Z|=Tzc%??iD9|`
zy_KB=2G_h+I@79Oj{YXpXm^W(E%{ax-kQ2i^fT(qiF^b<y|qgX*fpw*GPBo-P_Ks4
z_cY#3KQJU4dW!(2Y%u(vV|c?*0FWDz+BNOxkfd!&ixJ?b@6lyWFL8phZvs47%G!8p
zZTB{swz7-ps)^H)1e6Gq^8&$V;;o7Wsg}`yL*J!y#1N`}M_@M!A7U>L6`d=C#19k=
z7R3Qaa=s*;CY`?3l*w%)UTf50m|PIB^x;=k57^Z*ef8dwU;19TWFIbmLg340$J7P1
zoP?H5DeSzF8<A@CRg1OWHKF?;abr!vj+@)q9HcacT_hKW;~I}6Rhv37^?Hp+v6}Up
z##6++Vx4%H7XKW%|Ln^-7vKSPBtC$XBE19{LK^<KF#K_7_}=0jeaE$+`~A4n)fZK)
zUO~d+d^BzsW$A<Ny14>UdBhTLe%G&p==acV@buqR?;~BH<!@}^S39R$;?U?+{uAY>
zFpIAc3);p;s0HMfHGPxhLo_z~oS=o&zIeq=n>Mu_KzIy<{UHd50mO_G#rTxlXy}W<
zrfm?<`L3C+K)eUz;W{cRrjT5ukoe`xVM-JEvR0DK<;bHtEF(-(^$_CyDT=3bRqNp=
z4$hTl2+QOk1YVOWTQ$*qN-9x(vT}jnY+b&Pxr6PI?D=2p`R{w&RuJ^~MFZ;BKAw}_
z5sM6Z)^=LzKb>v8FF%gR{a$ltySOtLj(%(JL}3NNF(|mGqM=6@s+0Z5M4=|#D<ot&
zx=d%5^iAKD6z@(Ymh9Ndljwwq;E#BD+ZVW#o#?`LecoE(-!T<^SLE)w;^UixLZ~a&
zTy*n0<4Ny2Yd#mL#SriGPfP7i+?M}Bn5Z5Pzr)D2k(CsMvg%F9dpn;eN^NJOZ1=Yt
z^7%ORs!f1EunnFM@fH#{t`7j(9*fOAKn3C49L@K5ey-s9X?`ebs@zuHm@63X?0m|h
z&dbA;<bt_rZHU>KNHVQf9?(7SC25ODPHzqy{hf{hR?a@Cc=f6q>#;{+7?8Rx8VF`g
zj~GA)K)v<*ii`&!Js>@BZspI{s?KiANRl!bcpf(cgiWMOw4snp#l2n?RO0JP`uD9B
z&wO0>zy)pH&^P}9(^T;Y!}>aCOwisPLaxBHFb;{)SVJ9sdcQY-Vw#LVy8X|*_(Q@H
z?m+@j0jT3ds4fBr+8snMP)M+^K$Dl`%K7BiFm@MTm}{L@QsyphO+P_BgG)u+!B|}p
zwY&luAu0LTsD*Ve`yj4i$9!C8-8wtCd|K2<jAWYRbf!JebSH_RK1FcSDPPa972i1X
zxWm?j!+E%(uV&I&BGv24Mkn_~XVtodRkrpOpXT>BA}k`+=CHg%maB8Wq#sxoc{G3A
zGIAgr?Dl?#D<L$Y>X7TR!lOE1H!P5h6Qj@YBHk63{%rPZ4@uEt!pu}G+V-z26y2d3
zZ=Fgw>&p}v79RdsAMx9tY?nQxsIS7Bj*dmyAGv>{Lx_1q1|^2XVDb`Rd}n6YlJF~E
zj~72d@`V+S7hYCtwZ~B7A1YR6celdOx>D4Us`@Gy10ln{kuyPb!<_PBl#);Y6nMb^
zEuU_P?%?M>h)?p04*d=;Sd?wN;NF*&8tB-+-~J31(3r;cHHVX2zi!4}Dj7ewudv>i
z4euzmWJaPVlbN>nvwt6eja`T8jf+VCDV>CkECZ~G#ZWfRd<Lg4{^JYlO$n}!c!$Xj
z_OF)WfMu#{!BRt~tWBwl1OWBYj`(ThjfZ+=va?jCGjtm5aTlOCrEX{U$-t4;%fyNi
z#S1KZ*d(P${i(sq5TvpxS=gvanGV+q_U~Wf{pY72?(Cyz!>bq6GZ^VA>FR9?iDCBR
z{`o1_VonOlG)EHI!taWW%yr|rmG&3K)g_wNxzEs0`6Q{IFm_CE;0#fzk6@lGE#&ML
zBc|#<P15_lKsz}^E@X=WEv+sbk>Gqtr+saM(tJ=YP>)(MEaukkO>?KMGzd`d8BxBp
zb#<;Q@HhD^dTMm+clzVi=?m})Z>;m{2=Q4ES^vZlZaSZ~|C^*!J%t-xgYo-mUgc)q
z{+ZL|P}+zEa`rcF2^0#3_&F#b#!W5OAkjoMhQU2LB^_UbKm;I;TSf@ICswfoz^_Nh
z9<n<!5rvxE|2}-Ht`gFX+Zc>~szmiRqISPhWc|5btnxQ;^XGhu#n%w3Oj)I*TXJ}6
zi3UEh2lTm63nex7aA(-sU<;fS1XdR0e58CK_xyAD#uw@t<l7bM)vRzUuh!GXl3#8`
z+LoHVS5MDL;dty_@AtbORcbgWckNEjwLWYL{2TVX$!)eZz|nl^MsZ0)<G<c#Xcr9<
z^IrRou>HHk>mID2=obu{up7|5Jrw{p-T?u!?c+qa-+^{*LMjs_hrox)`Pu8XyQmKB
zzu_z6KTo6YX&?~zc@!2u(EO{i;|oeK6otPl*tZk3?)YG`<)Oo+=@Uvw6hf;Qr{3Yu
ziH4fY6I{@om86`@f<et;p6wutzx`*2pZ)&V4mUXmlY(VA#u?h$T3q?!>w85nIxUqT
zzIT1Mc+(c*btvJs`B~DGLC?rKnY4Z)oa%uU#4(P6mPX!#Mh5Y7bA|F_(DJ0c*h&y0
zN}I7TTaoG>v5>g1GtMh@0;UY6ET=0n(5eFnV=MwJdbHL%^-g;D3+H~n8n=v1=fZNa
zKmPIwY7A2~S~A&Oso?9>F1R4&ou<EE)u*NiBloR4j0RV9*#bWbdz^1PIx0q+1`ZD6
z0DN<qk<>8#+pT=hLmL2WV4wWQztj)pI1yw+@3hC~E%uoE#1HA`DX0drN|8<O5*w4o
zhq$!vN03t#Z5!7d1j{6-Bz|Us`CF1MN}^Ye2$aEcprVnV`sWmRrej^J_f-hOIvK<n
zX%Iu=L3)0GUri`l*ANqrC?)LSNK|(i=#FREYzb+_RdQQylIUvUD7r}(t9G&R`#ll<
zPXKKQlJ}A%X%z#)jyc6e>P3il%tlR-6)p-woeL8d$iKDOQ)@KMw)B*MT7z2m)f%SD
zL9Icp=T5DwgOqy2KTWEuS!wZG;pcU0{j_#@?HhNu6`m={)!$j9?z+|FxRzcAPpBrr
zYp0DujA0zCbDWzX<aj-<mL{~LX%gBg79hqT#)TNegf@sVi1FNs@ml@vZY@1iNq`GY
zCNnBl)6F37FC{CPHXgV(GT`3N5O$*Z(|7!X+tW4tME%x>>ehV7!?83#D7Dnk=!Fl&
zN5-i&Dh<sU4l2sjkIB?`MM)-Y5npDvfP!iEnxP0LxB&`^%U!_)H$VYE!Q4SXr&j4+
z!&Hsy{(CT7$Dg!M{D{5Rw^KEpn!6s2y0>y5;5xXCtNPQ{2EA_|blO>a%D?Z+SY>BS
z3n~!tLCbFR9m&9C8tO|UdGIm)BuwyhLfn0v^+MmLNnj%yve-f2`}z*^<)H7N?{lZ`
zK0PwEdV8?t3qqeG?0rM8Zy<NVeB<ofLgV;x@2YiiyzsNq$kFdIlVgS32(2vjQX+~Z
zvxaMCV;Yu6Pf?^e{jG`SYC>{bso6rY(Nu~}L9s!x3&n;xb5Lwh?736yi_|f1bRVjf
zp+YlMt52Ige{Jyf-Tc3mpB?jm8TuXeF75ix7W($RwfW=XkY&!UziWG}j%&q{FbsF4
zJOm|;XVfwp33DiF6ATrW1xm;3`1`hBbUS_K(}=l*Id>5AzL>+DJBT@m`TQ*+kBw%C
z{jfR}^m9hvg`JNLzQe8|HxJc?WoZv@8dtkHgYOcH<Hz2NGR$KdAq&nZag-_~tTzEs
zjWG(?k>G-xu;*%-)t*|5kC%L5OIm4AYf$Un<*s2e9Ml@rdj8b9-VCPGz8=W+tP<q*
z>&{eHlIgB4JJWrL%c`ps{$*(T!?)Y}HDlJy;n_oN<^1A9S#iJXR&EV=j|KG_bHcd9
z)~Kkti%O$tQ524)zl;r$O<;jCvjq&0X<$IW%sIe79|mCN9AE%oVE)#w)vqeGbXi}2
z=;44KTEf<>*V~_1?0v}il4&&3!CE^#->v2JVH}+eAAWt;u3l@^t099A`10nrUzPjL
z-qDX`hf(u`<={W$=vX+gkrJo4ah4;^ln#U<!y*dSN<$MRSW2|?6X4(-!!IPDKfIWZ
zswE78{i*2ymGw2<SL(Cb0R2%i7@46LM?3YIk%9a-CQD39AcLvMpx0gh=lPX?ozgQN
z3<`;VxjIPvKT+bh>h-H?_-pODS-%T^ZHH>3yEg7Lq<6O&n*Ud%%*i)lfV1<J)ANn>
zkEs4iqfzY*rCZCd9C)ptL!<E5ZuSq9ZLzLW-?Bv03%-OYS$?^r(F?q}&obej&}6hO
zPWP?;((D}_Js2yY>KEJ1im5JMo0_kNFIZwlWjBrfUzky;7-bS^tf}Hua`G>Xk&ql?
z#)w8-FswQI7p53VGJ5r@sa<^uwZ*N~(Ia;u*>tT%SFNNwTdepm)EghV-Jhn$C63p6
zQOESpAc+u2i4c$;y-IjYpG)`CU3}XMyqr+$lG38-wCjt_P_3IcRfB4syTztSok4T4
zeccSkx4y7<uJS81>x-`5czWmfRil&c>n>r&qU|IUXr`0z8ueBskw>!LE5!d!<2zHS
zEj~Xri#DV;D>>aoiRXuLv`O)04t;urzWH!!^~HO&*r`1i5ehyzlLkq5m3HOo<q01>
zKS5qIofa$Aw@$W_7}!v4_bh(lG6Q3OIkLOHvw3Fx!~J*Mz+*7>f9}m2i_wx9W|c7^
z65*8aKDflwo(tbC5``2sIz$vF)K>ltXL=d1vNZHYk(k8S&rE~#l9Et43Zid)#{LD2
z4U7$p{f}krB$~Bf<Jg*h5?enTeplJwajQ&_-#PV<A}|)5aY6|pN^4FyL;u2EDpoQ*
z4C$FeTC#-3?;x<Rw4V7crdK^Z-K{VC=BeIkA8!5YtdV%DaCx)dJWFrDacCZwlkEE_
zoj#VuhG}1anfMtGHiJsPUNSAy{9mBq9$chr{_G^VSaj)2Oz+%cyM7yLUvT;^kxC<$
z)EjH1l@MBI@HAF<YMvfpW{Ps4SsymPUd11mt6R5~!^54GTxg!*D>asFy%Uidq8N7R
z?<DY?^ALhSuFJRSy)o1?!pwNK&2Xa6v}L(vismsb#!EseU|L|>-sLLmz_kB6Oj~a>
zfN3FaT*|ii4ci_aA4A+2;>L3pH&%bUxN-IJb|ZYhJ-lky#E;9{V~897*W<?c!*OHr
zZ$_4=gnEX+*nP%6KRy{|?8DCP=?od0k|jP|UlSM`;>N((e>85)A#MzD<9~SEnDNxt
z<L;cf#0jnl6*MbuO#gV?Sda{8zIpgnA((Hn3f*pBEIdKncoNg{DdNU7jSB?Cje%+V
zOnU=N3rq`4`@hSy444*}_8-o)L=Y~iPFPFR_lPj1Jd0_`e<v4WtGRvt*!+I+>-1Zv
zb8PQ{X(ur)n}TVHUed7d3^470X@3FJLM{X_?L4lbgIoy6g@845u!atDAz%$1F!tv$
z_RTslHZV3Y_Wx|$nCnksYls^|+;~QDW64slP8s70CHzU>D$QF$hyHljnB_3@s`_y+
zNT@D6EjO#Ny$WID2}sNJhr`C=-z4>!98w_wY5PbE>AirofVBVQQtNkJRjY=j%38JF
z@r8yIyPf?(q8%w;dfe>tNf=Vym7}x0O1mr|wX*#Ec&%USwA|;V$A%jf=khZ%uwq&5
zx#oAdYLAX@YxNzGUzPR0cw3ps5fLXr3QwdX%;FfG6i5b3B3ITLDor578at`#`y?Ow
iySM2NRC!hZruyFqFJU18H~yD#<NpKY3=tXyITHX-Z$D!I

literal 0
HcmV?d00001

diff --git a/x-pack/test/siem_cypress/es_archives/closed_signals/mappings.json b/x-pack/test/siem_cypress/es_archives/closed_signals/mappings.json
new file mode 100644
index 0000000000000..94d89ed55dd8a
--- /dev/null
+++ b/x-pack/test/siem_cypress/es_archives/closed_signals/mappings.json
@@ -0,0 +1,7605 @@
+{
+  "type": "index",
+  "value": {
+    "aliases": {
+      ".siem-signals-default": {
+        "is_write_index": true
+      }
+    },
+    "index": ".siem-signals-default-000001",
+    "mappings": {
+      "dynamic": "false",
+      "properties": {
+        "@timestamp": {
+          "type": "date"
+        },
+        "agent": {
+          "properties": {
+            "ephemeral_id": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "id": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "name": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "type": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "version": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "as": {
+          "properties": {
+            "number": {
+              "type": "long"
+            },
+            "organization": {
+              "properties": {
+                "name": {
+                  "fields": {
+                    "text": {
+                      "norms": false,
+                      "type": "text"
+                    }
+                  },
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            }
+          }
+        },
+        "client": {
+          "properties": {
+            "address": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "as": {
+              "properties": {
+                "number": {
+                  "type": "long"
+                },
+                "organization": {
+                  "properties": {
+                    "name": {
+                      "fields": {
+                        "text": {
+                          "norms": false,
+                          "type": "text"
+                        }
+                      },
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                }
+              }
+            },
+            "bytes": {
+              "type": "long"
+            },
+            "domain": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "geo": {
+              "properties": {
+                "city_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "continent_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "country_iso_code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "country_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "location": {
+                  "type": "geo_point"
+                },
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "region_iso_code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "region_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "ip": {
+              "type": "ip"
+            },
+            "mac": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "nat": {
+              "properties": {
+                "ip": {
+                  "type": "ip"
+                },
+                "port": {
+                  "type": "long"
+                }
+              }
+            },
+            "packets": {
+              "type": "long"
+            },
+            "port": {
+              "type": "long"
+            },
+            "registered_domain": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "top_level_domain": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "user": {
+              "properties": {
+                "domain": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "email": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "full_name": {
+                  "fields": {
+                    "text": {
+                      "norms": false,
+                      "type": "text"
+                    }
+                  },
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "group": {
+                  "properties": {
+                    "domain": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "id": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "name": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "hash": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "name": {
+                  "fields": {
+                    "text": {
+                      "norms": false,
+                      "type": "text"
+                    }
+                  },
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            }
+          }
+        },
+        "cloud": {
+          "properties": {
+            "account": {
+              "properties": {
+                "id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "availability_zone": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "instance": {
+              "properties": {
+                "id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "machine": {
+              "properties": {
+                "type": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "provider": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "region": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "container": {
+          "properties": {
+            "id": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "image": {
+              "properties": {
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "tag": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "labels": {
+              "type": "object"
+            },
+            "name": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "runtime": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "destination": {
+          "properties": {
+            "address": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "as": {
+              "properties": {
+                "number": {
+                  "type": "long"
+                },
+                "organization": {
+                  "properties": {
+                    "name": {
+                      "fields": {
+                        "text": {
+                          "norms": false,
+                          "type": "text"
+                        }
+                      },
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                }
+              }
+            },
+            "bytes": {
+              "type": "long"
+            },
+            "domain": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "geo": {
+              "properties": {
+                "city_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "continent_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "country_iso_code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "country_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "location": {
+                  "type": "geo_point"
+                },
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "region_iso_code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "region_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "ip": {
+              "type": "ip"
+            },
+            "mac": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "nat": {
+              "properties": {
+                "ip": {
+                  "type": "ip"
+                },
+                "port": {
+                  "type": "long"
+                }
+              }
+            },
+            "packets": {
+              "type": "long"
+            },
+            "port": {
+              "type": "long"
+            },
+            "registered_domain": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "top_level_domain": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "user": {
+              "properties": {
+                "domain": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "email": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "full_name": {
+                  "fields": {
+                    "text": {
+                      "norms": false,
+                      "type": "text"
+                    }
+                  },
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "group": {
+                  "properties": {
+                    "domain": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "id": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "name": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "hash": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "name": {
+                  "fields": {
+                    "text": {
+                      "norms": false,
+                      "type": "text"
+                    }
+                  },
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            }
+          }
+        },
+        "dns": {
+          "properties": {
+            "answers": {
+              "properties": {
+                "class": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "data": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "ttl": {
+                  "type": "long"
+                },
+                "type": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "header_flags": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "id": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "op_code": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "question": {
+              "properties": {
+                "class": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "registered_domain": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "subdomain": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "top_level_domain": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "type": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "resolved_ip": {
+              "type": "ip"
+            },
+            "response_code": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "type": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "ecs": {
+          "properties": {
+            "version": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "error": {
+          "properties": {
+            "code": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "id": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "message": {
+              "norms": false,
+              "type": "text"
+            },
+            "stack_trace": {
+              "doc_values": false,
+              "fields": {
+                "text": {
+                  "norms": false,
+                  "type": "text"
+                }
+              },
+              "ignore_above": 1024,
+              "index": false,
+              "type": "keyword"
+            },
+            "type": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "event": {
+          "properties": {
+            "action": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "category": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "code": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "created": {
+              "type": "date"
+            },
+            "dataset": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "duration": {
+              "type": "long"
+            },
+            "end": {
+              "type": "date"
+            },
+            "hash": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "id": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "ingested": {
+              "type": "date"
+            },
+            "kind": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "module": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "original": {
+              "doc_values": false,
+              "ignore_above": 1024,
+              "index": false,
+              "type": "keyword"
+            },
+            "outcome": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "provider": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "risk_score": {
+              "type": "float"
+            },
+            "risk_score_norm": {
+              "type": "float"
+            },
+            "sequence": {
+              "type": "long"
+            },
+            "severity": {
+              "type": "long"
+            },
+            "start": {
+              "type": "date"
+            },
+            "timezone": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "type": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "file": {
+          "properties": {
+            "accessed": {
+              "type": "date"
+            },
+            "attributes": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "created": {
+              "type": "date"
+            },
+            "ctime": {
+              "type": "date"
+            },
+            "device": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "directory": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "drive_letter": {
+              "ignore_above": 1,
+              "type": "keyword"
+            },
+            "extension": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "gid": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "group": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "hash": {
+              "properties": {
+                "md5": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "sha1": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "sha256": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "sha512": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "inode": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "mode": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "mtime": {
+              "type": "date"
+            },
+            "name": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "owner": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "path": {
+              "fields": {
+                "text": {
+                  "norms": false,
+                  "type": "text"
+                }
+              },
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "size": {
+              "type": "long"
+            },
+            "target_path": {
+              "fields": {
+                "text": {
+                  "norms": false,
+                  "type": "text"
+                }
+              },
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "type": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "uid": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "geo": {
+          "properties": {
+            "city_name": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "continent_name": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "country_iso_code": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "country_name": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "location": {
+              "type": "geo_point"
+            },
+            "name": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "region_iso_code": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "region_name": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "group": {
+          "properties": {
+            "domain": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "id": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "name": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "hash": {
+          "properties": {
+            "md5": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "sha1": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "sha256": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "sha512": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "host": {
+          "properties": {
+            "architecture": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "domain": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "geo": {
+              "properties": {
+                "city_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "continent_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "country_iso_code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "country_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "location": {
+                  "type": "geo_point"
+                },
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "region_iso_code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "region_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "hostname": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "id": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "ip": {
+              "type": "ip"
+            },
+            "mac": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "name": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "os": {
+              "properties": {
+                "family": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "full": {
+                  "fields": {
+                    "text": {
+                      "norms": false,
+                      "type": "text"
+                    }
+                  },
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "kernel": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "name": {
+                  "fields": {
+                    "text": {
+                      "norms": false,
+                      "type": "text"
+                    }
+                  },
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "platform": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "version": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "type": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "uptime": {
+              "type": "long"
+            },
+            "user": {
+              "properties": {
+                "domain": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "email": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "full_name": {
+                  "fields": {
+                    "text": {
+                      "norms": false,
+                      "type": "text"
+                    }
+                  },
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "group": {
+                  "properties": {
+                    "domain": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "id": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "name": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "hash": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "name": {
+                  "fields": {
+                    "text": {
+                      "norms": false,
+                      "type": "text"
+                    }
+                  },
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            }
+          }
+        },
+        "http": {
+          "properties": {
+            "request": {
+              "properties": {
+                "body": {
+                  "properties": {
+                    "bytes": {
+                      "type": "long"
+                    },
+                    "content": {
+                      "fields": {
+                        "text": {
+                          "norms": false,
+                          "type": "text"
+                        }
+                      },
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "bytes": {
+                  "type": "long"
+                },
+                "method": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "referrer": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "response": {
+              "properties": {
+                "body": {
+                  "properties": {
+                    "bytes": {
+                      "type": "long"
+                    },
+                    "content": {
+                      "fields": {
+                        "text": {
+                          "norms": false,
+                          "type": "text"
+                        }
+                      },
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "bytes": {
+                  "type": "long"
+                },
+                "status_code": {
+                  "type": "long"
+                }
+              }
+            },
+            "version": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "labels": {
+          "type": "object"
+        },
+        "log": {
+          "properties": {
+            "level": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "logger": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "origin": {
+              "properties": {
+                "file": {
+                  "properties": {
+                    "line": {
+                      "type": "integer"
+                    },
+                    "name": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "function": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "original": {
+              "doc_values": false,
+              "ignore_above": 1024,
+              "index": false,
+              "type": "keyword"
+            },
+            "syslog": {
+              "properties": {
+                "facility": {
+                  "properties": {
+                    "code": {
+                      "type": "long"
+                    },
+                    "name": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "priority": {
+                  "type": "long"
+                },
+                "severity": {
+                  "properties": {
+                    "code": {
+                      "type": "long"
+                    },
+                    "name": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                }
+              }
+            }
+          }
+        },
+        "message": {
+          "norms": false,
+          "type": "text"
+        },
+        "network": {
+          "properties": {
+            "application": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "bytes": {
+              "type": "long"
+            },
+            "community_id": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "direction": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "forwarded_ip": {
+              "type": "ip"
+            },
+            "iana_number": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "name": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "packets": {
+              "type": "long"
+            },
+            "protocol": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "transport": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "type": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "observer": {
+          "properties": {
+            "geo": {
+              "properties": {
+                "city_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "continent_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "country_iso_code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "country_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "location": {
+                  "type": "geo_point"
+                },
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "region_iso_code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "region_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "hostname": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "ip": {
+              "type": "ip"
+            },
+            "mac": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "name": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "os": {
+              "properties": {
+                "family": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "full": {
+                  "fields": {
+                    "text": {
+                      "norms": false,
+                      "type": "text"
+                    }
+                  },
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "kernel": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "name": {
+                  "fields": {
+                    "text": {
+                      "norms": false,
+                      "type": "text"
+                    }
+                  },
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "platform": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "version": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "product": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "serial_number": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "type": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "vendor": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "version": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "organization": {
+          "properties": {
+            "id": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "name": {
+              "fields": {
+                "text": {
+                  "norms": false,
+                  "type": "text"
+                }
+              },
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "os": {
+          "properties": {
+            "family": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "full": {
+              "fields": {
+                "text": {
+                  "norms": false,
+                  "type": "text"
+                }
+              },
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "kernel": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "name": {
+              "fields": {
+                "text": {
+                  "norms": false,
+                  "type": "text"
+                }
+              },
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "platform": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "version": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "package": {
+          "properties": {
+            "architecture": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "build_version": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "checksum": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "description": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "install_scope": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "installed": {
+              "type": "date"
+            },
+            "license": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "name": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "path": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "reference": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "size": {
+              "type": "long"
+            },
+            "type": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "version": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "process": {
+          "properties": {
+            "args": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "args_count": {
+              "type": "long"
+            },
+            "command_line": {
+              "fields": {
+                "text": {
+                  "norms": false,
+                  "type": "text"
+                }
+              },
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "executable": {
+              "fields": {
+                "text": {
+                  "norms": false,
+                  "type": "text"
+                }
+              },
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "exit_code": {
+              "type": "long"
+            },
+            "hash": {
+              "properties": {
+                "md5": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "sha1": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "sha256": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "sha512": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "name": {
+              "fields": {
+                "text": {
+                  "norms": false,
+                  "type": "text"
+                }
+              },
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "parent": {
+              "properties": {
+                "args": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "args_count": {
+                  "type": "long"
+                },
+                "command_line": {
+                  "fields": {
+                    "text": {
+                      "norms": false,
+                      "type": "text"
+                    }
+                  },
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "executable": {
+                  "fields": {
+                    "text": {
+                      "norms": false,
+                      "type": "text"
+                    }
+                  },
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "exit_code": {
+                  "type": "long"
+                },
+                "name": {
+                  "fields": {
+                    "text": {
+                      "norms": false,
+                      "type": "text"
+                    }
+                  },
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "pgid": {
+                  "type": "long"
+                },
+                "pid": {
+                  "type": "long"
+                },
+                "ppid": {
+                  "type": "long"
+                },
+                "start": {
+                  "type": "date"
+                },
+                "thread": {
+                  "properties": {
+                    "id": {
+                      "type": "long"
+                    },
+                    "name": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "title": {
+                  "fields": {
+                    "text": {
+                      "norms": false,
+                      "type": "text"
+                    }
+                  },
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "uptime": {
+                  "type": "long"
+                },
+                "working_directory": {
+                  "fields": {
+                    "text": {
+                      "norms": false,
+                      "type": "text"
+                    }
+                  },
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "pgid": {
+              "type": "long"
+            },
+            "pid": {
+              "type": "long"
+            },
+            "ppid": {
+              "type": "long"
+            },
+            "start": {
+              "type": "date"
+            },
+            "thread": {
+              "properties": {
+                "id": {
+                  "type": "long"
+                },
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "title": {
+              "fields": {
+                "text": {
+                  "norms": false,
+                  "type": "text"
+                }
+              },
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "uptime": {
+              "type": "long"
+            },
+            "working_directory": {
+              "fields": {
+                "text": {
+                  "norms": false,
+                  "type": "text"
+                }
+              },
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "registry": {
+          "properties": {
+            "data": {
+              "properties": {
+                "bytes": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "strings": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "type": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "hive": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "key": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "path": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "value": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "related": {
+          "properties": {
+            "hash": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "ip": {
+              "type": "ip"
+            },
+            "user": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "rule": {
+          "properties": {
+            "category": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "description": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "id": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "name": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "reference": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "ruleset": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "uuid": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "version": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "server": {
+          "properties": {
+            "address": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "as": {
+              "properties": {
+                "number": {
+                  "type": "long"
+                },
+                "organization": {
+                  "properties": {
+                    "name": {
+                      "fields": {
+                        "text": {
+                          "norms": false,
+                          "type": "text"
+                        }
+                      },
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                }
+              }
+            },
+            "bytes": {
+              "type": "long"
+            },
+            "domain": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "geo": {
+              "properties": {
+                "city_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "continent_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "country_iso_code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "country_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "location": {
+                  "type": "geo_point"
+                },
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "region_iso_code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "region_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "ip": {
+              "type": "ip"
+            },
+            "mac": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "nat": {
+              "properties": {
+                "ip": {
+                  "type": "ip"
+                },
+                "port": {
+                  "type": "long"
+                }
+              }
+            },
+            "packets": {
+              "type": "long"
+            },
+            "port": {
+              "type": "long"
+            },
+            "registered_domain": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "top_level_domain": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "user": {
+              "properties": {
+                "domain": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "email": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "full_name": {
+                  "fields": {
+                    "text": {
+                      "norms": false,
+                      "type": "text"
+                    }
+                  },
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "group": {
+                  "properties": {
+                    "domain": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "id": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "name": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "hash": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "name": {
+                  "fields": {
+                    "text": {
+                      "norms": false,
+                      "type": "text"
+                    }
+                  },
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            }
+          }
+        },
+        "service": {
+          "properties": {
+            "ephemeral_id": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "id": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "name": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "node": {
+              "properties": {
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "state": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "type": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "version": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "signal": {
+          "properties": {
+            "ancestors": {
+              "properties": {
+                "depth": {
+                  "type": "long"
+                },
+                "id": {
+                  "type": "keyword"
+                },
+                "rule": {
+                  "type": "keyword"
+                },
+                "type": {
+                  "type": "keyword"
+                }
+              }
+            },
+            "original_event": {
+              "properties": {
+                "action": {
+                  "type": "keyword"
+                },
+                "category": {
+                  "type": "keyword"
+                },
+                "code": {
+                  "type": "keyword"
+                },
+                "created": {
+                  "type": "date"
+                },
+                "dataset": {
+                  "type": "keyword"
+                },
+                "duration": {
+                  "type": "long"
+                },
+                "end": {
+                  "type": "date"
+                },
+                "hash": {
+                  "type": "keyword"
+                },
+                "id": {
+                  "type": "keyword"
+                },
+                "kind": {
+                  "type": "keyword"
+                },
+                "module": {
+                  "type": "keyword"
+                },
+                "original": {
+                  "doc_values": false,
+                  "index": false,
+                  "type": "keyword"
+                },
+                "outcome": {
+                  "type": "keyword"
+                },
+                "provider": {
+                  "type": "keyword"
+                },
+                "risk_score": {
+                  "type": "float"
+                },
+                "risk_score_norm": {
+                  "type": "float"
+                },
+                "sequence": {
+                  "type": "long"
+                },
+                "severity": {
+                  "type": "long"
+                },
+                "start": {
+                  "type": "date"
+                },
+                "timezone": {
+                  "type": "keyword"
+                },
+                "type": {
+                  "type": "keyword"
+                }
+              }
+            },
+            "original_time": {
+              "type": "date"
+            },
+            "parent": {
+              "properties": {
+                "depth": {
+                  "type": "long"
+                },
+                "id": {
+                  "type": "keyword"
+                },
+                "index": {
+                  "type": "keyword"
+                },
+                "rule": {
+                  "type": "keyword"
+                },
+                "type": {
+                  "type": "keyword"
+                }
+              }
+            },
+            "rule": {
+              "properties": {
+                "created_at": {
+                  "type": "date"
+                },
+                "created_by": {
+                  "type": "keyword"
+                },
+                "description": {
+                  "type": "keyword"
+                },
+                "enabled": {
+                  "type": "keyword"
+                },
+                "false_positives": {
+                  "type": "keyword"
+                },
+                "filters": {
+                  "type": "object"
+                },
+                "from": {
+                  "type": "keyword"
+                },
+                "id": {
+                  "type": "keyword"
+                },
+                "immutable": {
+                  "type": "keyword"
+                },
+                "index": {
+                  "type": "keyword"
+                },
+                "interval": {
+                  "type": "keyword"
+                },
+                "language": {
+                  "type": "keyword"
+                },
+                "max_signals": {
+                  "type": "keyword"
+                },
+                "name": {
+                  "type": "keyword"
+                },
+                "note": {
+                  "type": "text"
+                },
+                "output_index": {
+                  "type": "keyword"
+                },
+                "query": {
+                  "type": "keyword"
+                },
+                "references": {
+                  "type": "keyword"
+                },
+                "risk_score": {
+                  "type": "keyword"
+                },
+                "rule_id": {
+                  "type": "keyword"
+                },
+                "saved_id": {
+                  "type": "keyword"
+                },
+                "severity": {
+                  "type": "keyword"
+                },
+                "size": {
+                  "type": "keyword"
+                },
+                "tags": {
+                  "type": "keyword"
+                },
+                "threat": {
+                  "properties": {
+                    "framework": {
+                      "type": "keyword"
+                    },
+                    "tactic": {
+                      "properties": {
+                        "id": {
+                          "type": "keyword"
+                        },
+                        "name": {
+                          "type": "keyword"
+                        },
+                        "reference": {
+                          "type": "keyword"
+                        }
+                      }
+                    },
+                    "technique": {
+                      "properties": {
+                        "id": {
+                          "type": "keyword"
+                        },
+                        "name": {
+                          "type": "keyword"
+                        },
+                        "reference": {
+                          "type": "keyword"
+                        }
+                      }
+                    }
+                  }
+                },
+                "timeline_id": {
+                  "type": "keyword"
+                },
+                "timeline_title": {
+                  "type": "keyword"
+                },
+                "to": {
+                  "type": "keyword"
+                },
+                "type": {
+                  "type": "keyword"
+                },
+                "updated_at": {
+                  "type": "date"
+                },
+                "updated_by": {
+                  "type": "keyword"
+                },
+                "version": {
+                  "type": "keyword"
+                }
+              }
+            },
+            "status": {
+              "type": "keyword"
+            }
+          }
+        },
+        "source": {
+          "properties": {
+            "address": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "as": {
+              "properties": {
+                "number": {
+                  "type": "long"
+                },
+                "organization": {
+                  "properties": {
+                    "name": {
+                      "fields": {
+                        "text": {
+                          "norms": false,
+                          "type": "text"
+                        }
+                      },
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                }
+              }
+            },
+            "bytes": {
+              "type": "long"
+            },
+            "domain": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "geo": {
+              "properties": {
+                "city_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "continent_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "country_iso_code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "country_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "location": {
+                  "type": "geo_point"
+                },
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "region_iso_code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "region_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "ip": {
+              "type": "ip"
+            },
+            "mac": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "nat": {
+              "properties": {
+                "ip": {
+                  "type": "ip"
+                },
+                "port": {
+                  "type": "long"
+                }
+              }
+            },
+            "packets": {
+              "type": "long"
+            },
+            "port": {
+              "type": "long"
+            },
+            "registered_domain": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "top_level_domain": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "user": {
+              "properties": {
+                "domain": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "email": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "full_name": {
+                  "fields": {
+                    "text": {
+                      "norms": false,
+                      "type": "text"
+                    }
+                  },
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "group": {
+                  "properties": {
+                    "domain": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "id": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "name": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "hash": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "name": {
+                  "fields": {
+                    "text": {
+                      "norms": false,
+                      "type": "text"
+                    }
+                  },
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            }
+          }
+        },
+        "tags": {
+          "ignore_above": 1024,
+          "type": "keyword"
+        },
+        "threat": {
+          "properties": {
+            "framework": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "tactic": {
+              "properties": {
+                "id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "reference": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "technique": {
+              "properties": {
+                "id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "name": {
+                  "fields": {
+                    "text": {
+                      "norms": false,
+                      "type": "text"
+                    }
+                  },
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "reference": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            }
+          }
+        },
+        "tls": {
+          "properties": {
+            "cipher": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "client": {
+              "properties": {
+                "certificate": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "certificate_chain": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "hash": {
+                  "properties": {
+                    "md5": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "sha1": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "sha256": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "issuer": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "ja3": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "not_after": {
+                  "type": "date"
+                },
+                "not_before": {
+                  "type": "date"
+                },
+                "server_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "subject": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "supported_ciphers": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "curve": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "established": {
+              "type": "boolean"
+            },
+            "next_protocol": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "resumed": {
+              "type": "boolean"
+            },
+            "server": {
+              "properties": {
+                "certificate": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "certificate_chain": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "hash": {
+                  "properties": {
+                    "md5": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "sha1": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "sha256": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "issuer": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "ja3s": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "not_after": {
+                  "type": "date"
+                },
+                "not_before": {
+                  "type": "date"
+                },
+                "subject": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "version": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "version_protocol": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "trace": {
+          "properties": {
+            "id": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "transaction": {
+          "properties": {
+            "id": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "url": {
+          "properties": {
+            "domain": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "extension": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "fragment": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "full": {
+              "fields": {
+                "text": {
+                  "norms": false,
+                  "type": "text"
+                }
+              },
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "original": {
+              "fields": {
+                "text": {
+                  "norms": false,
+                  "type": "text"
+                }
+              },
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "password": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "path": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "port": {
+              "type": "long"
+            },
+            "query": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "registered_domain": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "scheme": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "top_level_domain": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "username": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "user": {
+          "properties": {
+            "domain": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "email": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "full_name": {
+              "fields": {
+                "text": {
+                  "norms": false,
+                  "type": "text"
+                }
+              },
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "group": {
+              "properties": {
+                "domain": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "hash": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "id": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "name": {
+              "fields": {
+                "text": {
+                  "norms": false,
+                  "type": "text"
+                }
+              },
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "user_agent": {
+          "properties": {
+            "device": {
+              "properties": {
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "name": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "original": {
+              "fields": {
+                "text": {
+                  "norms": false,
+                  "type": "text"
+                }
+              },
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "os": {
+              "properties": {
+                "family": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "full": {
+                  "fields": {
+                    "text": {
+                      "norms": false,
+                      "type": "text"
+                    }
+                  },
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "kernel": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "name": {
+                  "fields": {
+                    "text": {
+                      "norms": false,
+                      "type": "text"
+                    }
+                  },
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "platform": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "version": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "version": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "vulnerability": {
+          "properties": {
+            "category": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "classification": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "description": {
+              "fields": {
+                "text": {
+                  "norms": false,
+                  "type": "text"
+                }
+              },
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "enumeration": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "id": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "reference": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "report_id": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "scanner": {
+              "properties": {
+                "vendor": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "score": {
+              "properties": {
+                "base": {
+                  "type": "float"
+                },
+                "environmental": {
+                  "type": "float"
+                },
+                "temporal": {
+                  "type": "float"
+                },
+                "version": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "severity": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        }
+      }
+    },
+    "settings": {
+      "index": {
+        "lifecycle": {
+          "name": ".siem-signals-default",
+          "rollover_alias": ".siem-signals-default"
+        },
+        "number_of_replicas": "1",
+        "number_of_shards": "1"
+      }
+    }
+  }
+}
+
+{
+  "type": "index",
+  "value": {
+    "aliases": {
+      "auditbeat-7.6.0": {
+        "is_write_index": true
+      }
+    },
+    "index": "auditbeat-7.6.0-2020.03.11-000001",
+    "mappings": {
+      "_meta": {
+        "beat": "auditbeat",
+        "version": "7.6.0"
+      },
+      "date_detection": false,
+      "dynamic_templates": [
+        {
+          "labels": {
+            "mapping": {
+              "type": "keyword"
+            },
+            "match_mapping_type": "string",
+            "path_match": "labels.*"
+          }
+        },
+        {
+          "container.labels": {
+            "mapping": {
+              "type": "keyword"
+            },
+            "match_mapping_type": "string",
+            "path_match": "container.labels.*"
+          }
+        },
+        {
+          "dns.answers": {
+            "mapping": {
+              "type": "keyword"
+            },
+            "match_mapping_type": "string",
+            "path_match": "dns.answers.*"
+          }
+        },
+        {
+          "log.syslog": {
+            "mapping": {
+              "type": "keyword"
+            },
+            "match_mapping_type": "string",
+            "path_match": "log.syslog.*"
+          }
+        },
+        {
+          "fields": {
+            "mapping": {
+              "type": "keyword"
+            },
+            "match_mapping_type": "string",
+            "path_match": "fields.*"
+          }
+        },
+        {
+          "docker.container.labels": {
+            "mapping": {
+              "type": "keyword"
+            },
+            "match_mapping_type": "string",
+            "path_match": "docker.container.labels.*"
+          }
+        },
+        {
+          "kubernetes.labels.*": {
+            "mapping": {
+              "type": "keyword"
+            },
+            "path_match": "kubernetes.labels.*"
+          }
+        },
+        {
+          "kubernetes.annotations.*": {
+            "mapping": {
+              "type": "keyword"
+            },
+            "path_match": "kubernetes.annotations.*"
+          }
+        },
+        {
+          "strings_as_keyword": {
+            "mapping": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "match_mapping_type": "string"
+          }
+        }
+      ],
+      "properties": {
+        "@timestamp": {
+          "type": "date"
+        },
+        "agent": {
+          "properties": {
+            "ephemeral_id": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "hostname": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "id": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "name": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "type": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "version": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "as": {
+          "properties": {
+            "number": {
+              "type": "long"
+            },
+            "organization": {
+              "properties": {
+                "name": {
+                  "fields": {
+                    "text": {
+                      "norms": false,
+                      "type": "text"
+                    }
+                  },
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            }
+          }
+        },
+        "auditd": {
+          "properties": {
+            "data": {
+              "properties": {
+                "a0": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "a1": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "a2": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "a3": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "a[0-3]": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "acct": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "acl": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "action": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "added": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "addr": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "apparmor": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "arch": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "argc": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "audit_backlog_limit": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "audit_backlog_wait_time": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "audit_enabled": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "audit_failure": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "banners": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "bool": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "bus": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "cap_fe": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "cap_fi": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "cap_fp": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "cap_fver": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "cap_pe": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "cap_pi": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "cap_pp": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "capability": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "cgroup": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "changed": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "cipher": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "class": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "cmd": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "compat": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "daddr": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "data": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "default-context": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "device": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "dir": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "direction": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "dmac": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "dport": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "enforcing": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "entries": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "exit": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "fam": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "family": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "fd": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "fe": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "feature": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "fi": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "file": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "flags": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "format": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "fp": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "fver": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "grantors": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "grp": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "hook": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "hostname": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "icmp_type": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "igid": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "img-ctx": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "inif": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "ino": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "inode_gid": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "inode_uid": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "invalid_context": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "ioctlcmd": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "ip": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "ipid": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "ipx-net": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "items": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "iuid": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "kernel": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "kind": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "ksize": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "laddr": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "len": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "list": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "lport": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "mac": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "macproto": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "maj": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "major": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "minor": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "model": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "msg": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "nargs": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "net": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "new": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "new-chardev": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "new-disk": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "new-enabled": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "new-fs": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "new-level": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "new-log_passwd": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "new-mem": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "new-net": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "new-range": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "new-rng": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "new-role": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "new-seuser": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "new-vcpu": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "new_gid": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "new_lock": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "new_pe": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "new_pi": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "new_pp": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "nlnk-fam": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "nlnk-grp": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "nlnk-pid": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "oauid": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "obj": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "obj_gid": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "obj_uid": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "ocomm": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "oflag": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "old": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "old-auid": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "old-chardev": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "old-disk": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "old-enabled": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "old-fs": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "old-level": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "old-log_passwd": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "old-mem": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "old-net": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "old-range": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "old-rng": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "old-role": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "old-ses": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "old-seuser": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "old-vcpu": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "old_enforcing": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "old_lock": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "old_pe": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "old_pi": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "old_pp": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "old_prom": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "old_val": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "op": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "opid": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "oses": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "outif": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "parent": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "per": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "perm": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "perm_mask": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "permissive": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "pfs": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "printer": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "prom": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "proto": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "qbytes": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "range": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "reason": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "removed": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "res": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "resrc": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "rport": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "sauid": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "scontext": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "selected-context": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "seperm": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "seperms": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "seqno": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "seresult": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "ses": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "seuser": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "sig": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "sigev_signo": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "smac": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "socket": {
+                  "properties": {
+                    "addr": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "family": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "path": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "port": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "saddr": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "spid": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "sport": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "state": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "subj": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "success": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "syscall": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "table": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "tclass": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "tcontext": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "terminal": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "tty": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "unit": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "uri": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "uuid": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "val": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "ver": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "virt": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "vm": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "vm-ctx": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "vm-pid": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "watch": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "message_type": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "paths": {
+              "properties": {
+                "dev": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "inode": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "item": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "mode": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "nametype": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "obj_domain": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "obj_level": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "obj_role": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "obj_user": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "objtype": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "ogid": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "ouid": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "rdev": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "result": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "sequence": {
+              "type": "long"
+            },
+            "session": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "summary": {
+              "properties": {
+                "actor": {
+                  "properties": {
+                    "primary": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "secondary": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "how": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "object": {
+                  "properties": {
+                    "primary": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "secondary": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "type": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                }
+              }
+            }
+          }
+        },
+        "client": {
+          "properties": {
+            "address": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "as": {
+              "properties": {
+                "number": {
+                  "type": "long"
+                },
+                "organization": {
+                  "properties": {
+                    "name": {
+                      "fields": {
+                        "text": {
+                          "norms": false,
+                          "type": "text"
+                        }
+                      },
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                }
+              }
+            },
+            "bytes": {
+              "type": "long"
+            },
+            "domain": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "geo": {
+              "properties": {
+                "city_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "continent_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "country_iso_code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "country_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "location": {
+                  "type": "geo_point"
+                },
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "region_iso_code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "region_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "ip": {
+              "type": "ip"
+            },
+            "mac": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "nat": {
+              "properties": {
+                "ip": {
+                  "type": "ip"
+                },
+                "port": {
+                  "type": "long"
+                }
+              }
+            },
+            "packets": {
+              "type": "long"
+            },
+            "port": {
+              "type": "long"
+            },
+            "registered_domain": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "top_level_domain": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "user": {
+              "properties": {
+                "domain": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "email": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "full_name": {
+                  "fields": {
+                    "text": {
+                      "norms": false,
+                      "type": "text"
+                    }
+                  },
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "group": {
+                  "properties": {
+                    "domain": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "id": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "name": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "hash": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "name": {
+                  "fields": {
+                    "text": {
+                      "norms": false,
+                      "type": "text"
+                    }
+                  },
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            }
+          }
+        },
+        "cloud": {
+          "properties": {
+            "account": {
+              "properties": {
+                "id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "availability_zone": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "image": {
+              "properties": {
+                "id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "instance": {
+              "properties": {
+                "id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "machine": {
+              "properties": {
+                "type": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "project": {
+              "properties": {
+                "id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "provider": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "region": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "container": {
+          "properties": {
+            "id": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "image": {
+              "properties": {
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "tag": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "labels": {
+              "type": "object"
+            },
+            "name": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "runtime": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "destination": {
+          "properties": {
+            "address": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "as": {
+              "properties": {
+                "number": {
+                  "type": "long"
+                },
+                "organization": {
+                  "properties": {
+                    "name": {
+                      "fields": {
+                        "text": {
+                          "norms": false,
+                          "type": "text"
+                        }
+                      },
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                }
+              }
+            },
+            "bytes": {
+              "type": "long"
+            },
+            "domain": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "geo": {
+              "properties": {
+                "city_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "continent_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "country_iso_code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "country_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "location": {
+                  "type": "geo_point"
+                },
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "region_iso_code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "region_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "ip": {
+              "type": "ip"
+            },
+            "mac": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "nat": {
+              "properties": {
+                "ip": {
+                  "type": "ip"
+                },
+                "port": {
+                  "type": "long"
+                }
+              }
+            },
+            "packets": {
+              "type": "long"
+            },
+            "path": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "port": {
+              "type": "long"
+            },
+            "registered_domain": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "top_level_domain": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "user": {
+              "properties": {
+                "domain": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "email": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "full_name": {
+                  "fields": {
+                    "text": {
+                      "norms": false,
+                      "type": "text"
+                    }
+                  },
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "group": {
+                  "properties": {
+                    "domain": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "id": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "name": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "hash": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "name": {
+                  "fields": {
+                    "text": {
+                      "norms": false,
+                      "type": "text"
+                    }
+                  },
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            }
+          }
+        },
+        "dns": {
+          "properties": {
+            "answers": {
+              "properties": {
+                "class": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "data": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "ttl": {
+                  "type": "long"
+                },
+                "type": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "header_flags": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "id": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "op_code": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "question": {
+              "properties": {
+                "class": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "registered_domain": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "subdomain": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "top_level_domain": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "type": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "resolved_ip": {
+              "type": "ip"
+            },
+            "response_code": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "type": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "docker": {
+          "properties": {
+            "container": {
+              "properties": {
+                "labels": {
+                  "type": "object"
+                }
+              }
+            }
+          }
+        },
+        "ecs": {
+          "properties": {
+            "version": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "error": {
+          "properties": {
+            "code": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "id": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "message": {
+              "norms": false,
+              "type": "text"
+            },
+            "stack_trace": {
+              "fields": {
+                "text": {
+                  "norms": false,
+                  "type": "text"
+                }
+              },
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "type": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "event": {
+          "properties": {
+            "action": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "category": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "code": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "created": {
+              "type": "date"
+            },
+            "dataset": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "duration": {
+              "type": "long"
+            },
+            "end": {
+              "type": "date"
+            },
+            "hash": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "id": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "ingested": {
+              "type": "date"
+            },
+            "kind": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "module": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "origin": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "original": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "outcome": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "provider": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "risk_score": {
+              "type": "float"
+            },
+            "risk_score_norm": {
+              "type": "float"
+            },
+            "sequence": {
+              "type": "long"
+            },
+            "severity": {
+              "type": "long"
+            },
+            "start": {
+              "type": "date"
+            },
+            "timezone": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "type": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "fields": {
+          "type": "object"
+        },
+        "file": {
+          "properties": {
+            "accessed": {
+              "type": "date"
+            },
+            "attributes": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "created": {
+              "type": "date"
+            },
+            "ctime": {
+              "type": "date"
+            },
+            "device": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "directory": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "drive_letter": {
+              "ignore_above": 1,
+              "type": "keyword"
+            },
+            "extension": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "gid": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "group": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "hash": {
+              "properties": {
+                "md5": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "sha1": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "sha256": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "sha512": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "inode": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "mode": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "mtime": {
+              "type": "date"
+            },
+            "name": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "origin": {
+              "fields": {
+                "raw": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              },
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "owner": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "path": {
+              "fields": {
+                "text": {
+                  "norms": false,
+                  "type": "text"
+                }
+              },
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "selinux": {
+              "properties": {
+                "domain": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "level": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "role": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "user": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "setgid": {
+              "type": "boolean"
+            },
+            "setuid": {
+              "type": "boolean"
+            },
+            "size": {
+              "type": "long"
+            },
+            "target_path": {
+              "fields": {
+                "text": {
+                  "norms": false,
+                  "type": "text"
+                }
+              },
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "type": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "uid": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "geo": {
+          "properties": {
+            "city_name": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "continent_name": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "country_iso_code": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "country_name": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "location": {
+              "type": "geo_point"
+            },
+            "name": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "region_iso_code": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "region_name": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "geoip": {
+          "properties": {
+            "city_name": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "continent_name": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "country_iso_code": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "location": {
+              "type": "geo_point"
+            },
+            "region_name": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "group": {
+          "properties": {
+            "domain": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "id": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "name": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "hash": {
+          "properties": {
+            "blake2b_256": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "blake2b_384": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "blake2b_512": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "md5": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "sha1": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "sha224": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "sha256": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "sha384": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "sha3_224": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "sha3_256": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "sha3_384": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "sha3_512": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "sha512": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "sha512_224": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "sha512_256": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "xxh64": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "host": {
+          "properties": {
+            "architecture": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "containerized": {
+              "type": "boolean"
+            },
+            "domain": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "geo": {
+              "properties": {
+                "city_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "continent_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "country_iso_code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "country_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "location": {
+                  "type": "geo_point"
+                },
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "region_iso_code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "region_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "hostname": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "id": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "ip": {
+              "type": "ip"
+            },
+            "mac": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "name": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "os": {
+              "properties": {
+                "build": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "codename": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "family": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "full": {
+                  "fields": {
+                    "text": {
+                      "norms": false,
+                      "type": "text"
+                    }
+                  },
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "kernel": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "name": {
+                  "fields": {
+                    "text": {
+                      "norms": false,
+                      "type": "text"
+                    }
+                  },
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "platform": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "version": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "type": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "uptime": {
+              "type": "long"
+            },
+            "user": {
+              "properties": {
+                "domain": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "email": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "full_name": {
+                  "fields": {
+                    "text": {
+                      "norms": false,
+                      "type": "text"
+                    }
+                  },
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "group": {
+                  "properties": {
+                    "domain": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "id": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "name": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "hash": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "name": {
+                  "fields": {
+                    "text": {
+                      "norms": false,
+                      "type": "text"
+                    }
+                  },
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            }
+          }
+        },
+        "http": {
+          "properties": {
+            "request": {
+              "properties": {
+                "body": {
+                  "properties": {
+                    "bytes": {
+                      "type": "long"
+                    },
+                    "content": {
+                      "fields": {
+                        "text": {
+                          "norms": false,
+                          "type": "text"
+                        }
+                      },
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "bytes": {
+                  "type": "long"
+                },
+                "method": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "referrer": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "response": {
+              "properties": {
+                "body": {
+                  "properties": {
+                    "bytes": {
+                      "type": "long"
+                    },
+                    "content": {
+                      "fields": {
+                        "text": {
+                          "norms": false,
+                          "type": "text"
+                        }
+                      },
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "bytes": {
+                  "type": "long"
+                },
+                "status_code": {
+                  "type": "long"
+                }
+              }
+            },
+            "version": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "jolokia": {
+          "properties": {
+            "agent": {
+              "properties": {
+                "id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "version": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "secured": {
+              "type": "boolean"
+            },
+            "server": {
+              "properties": {
+                "product": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "vendor": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "version": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "url": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "kubernetes": {
+          "properties": {
+            "annotations": {
+              "properties": {
+                "*": {
+                  "type": "object"
+                }
+              }
+            },
+            "container": {
+              "properties": {
+                "image": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "deployment": {
+              "properties": {
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "labels": {
+              "properties": {
+                "*": {
+                  "type": "object"
+                }
+              }
+            },
+            "namespace": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "node": {
+              "properties": {
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "pod": {
+              "properties": {
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "uid": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "replicaset": {
+              "properties": {
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "statefulset": {
+              "properties": {
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            }
+          }
+        },
+        "labels": {
+          "type": "object"
+        },
+        "log": {
+          "properties": {
+            "level": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "logger": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "origin": {
+              "properties": {
+                "file": {
+                  "properties": {
+                    "line": {
+                      "type": "long"
+                    },
+                    "name": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "function": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "original": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "syslog": {
+              "properties": {
+                "facility": {
+                  "properties": {
+                    "code": {
+                      "type": "long"
+                    },
+                    "name": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "priority": {
+                  "type": "long"
+                },
+                "severity": {
+                  "properties": {
+                    "code": {
+                      "type": "long"
+                    },
+                    "name": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                }
+              }
+            }
+          }
+        },
+        "message": {
+          "norms": false,
+          "type": "text"
+        },
+        "network": {
+          "properties": {
+            "application": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "bytes": {
+              "type": "long"
+            },
+            "community_id": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "direction": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "forwarded_ip": {
+              "type": "ip"
+            },
+            "iana_number": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "name": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "packets": {
+              "type": "long"
+            },
+            "protocol": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "transport": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "type": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "observer": {
+          "properties": {
+            "geo": {
+              "properties": {
+                "city_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "continent_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "country_iso_code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "country_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "location": {
+                  "type": "geo_point"
+                },
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "region_iso_code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "region_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "hostname": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "ip": {
+              "type": "ip"
+            },
+            "mac": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "name": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "os": {
+              "properties": {
+                "family": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "full": {
+                  "fields": {
+                    "text": {
+                      "norms": false,
+                      "type": "text"
+                    }
+                  },
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "kernel": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "name": {
+                  "fields": {
+                    "text": {
+                      "norms": false,
+                      "type": "text"
+                    }
+                  },
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "platform": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "version": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "product": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "serial_number": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "type": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "vendor": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "version": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "organization": {
+          "properties": {
+            "id": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "name": {
+              "fields": {
+                "text": {
+                  "norms": false,
+                  "type": "text"
+                }
+              },
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "os": {
+          "properties": {
+            "family": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "full": {
+              "fields": {
+                "text": {
+                  "norms": false,
+                  "type": "text"
+                }
+              },
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "kernel": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "name": {
+              "fields": {
+                "text": {
+                  "norms": false,
+                  "type": "text"
+                }
+              },
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "platform": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "version": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "package": {
+          "properties": {
+            "architecture": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "build_version": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "checksum": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "description": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "install_scope": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "installed": {
+              "type": "date"
+            },
+            "license": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "name": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "path": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "reference": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "size": {
+              "type": "long"
+            },
+            "type": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "version": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "process": {
+          "properties": {
+            "args": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "args_count": {
+              "type": "long"
+            },
+            "command_line": {
+              "fields": {
+                "text": {
+                  "norms": false,
+                  "type": "text"
+                }
+              },
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "entity_id": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "executable": {
+              "fields": {
+                "text": {
+                  "norms": false,
+                  "type": "text"
+                }
+              },
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "exit_code": {
+              "type": "long"
+            },
+            "hash": {
+              "properties": {
+                "blake2b_256": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "blake2b_384": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "blake2b_512": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "md5": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "sha1": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "sha224": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "sha256": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "sha384": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "sha3_224": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "sha3_256": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "sha3_384": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "sha3_512": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "sha512": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "sha512_224": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "sha512_256": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "xxh64": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "name": {
+              "fields": {
+                "text": {
+                  "norms": false,
+                  "type": "text"
+                }
+              },
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "parent": {
+              "properties": {
+                "args": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "args_count": {
+                  "type": "long"
+                },
+                "command_line": {
+                  "fields": {
+                    "text": {
+                      "norms": false,
+                      "type": "text"
+                    }
+                  },
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "executable": {
+                  "fields": {
+                    "text": {
+                      "norms": false,
+                      "type": "text"
+                    }
+                  },
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "exit_code": {
+                  "type": "long"
+                },
+                "name": {
+                  "fields": {
+                    "text": {
+                      "norms": false,
+                      "type": "text"
+                    }
+                  },
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "pgid": {
+                  "type": "long"
+                },
+                "pid": {
+                  "type": "long"
+                },
+                "ppid": {
+                  "type": "long"
+                },
+                "start": {
+                  "type": "date"
+                },
+                "thread": {
+                  "properties": {
+                    "id": {
+                      "type": "long"
+                    },
+                    "name": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "title": {
+                  "fields": {
+                    "text": {
+                      "norms": false,
+                      "type": "text"
+                    }
+                  },
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "uptime": {
+                  "type": "long"
+                },
+                "working_directory": {
+                  "fields": {
+                    "text": {
+                      "norms": false,
+                      "type": "text"
+                    }
+                  },
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "pgid": {
+              "type": "long"
+            },
+            "pid": {
+              "type": "long"
+            },
+            "ppid": {
+              "type": "long"
+            },
+            "start": {
+              "type": "date"
+            },
+            "thread": {
+              "properties": {
+                "id": {
+                  "type": "long"
+                },
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "title": {
+              "fields": {
+                "text": {
+                  "norms": false,
+                  "type": "text"
+                }
+              },
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "uptime": {
+              "type": "long"
+            },
+            "working_directory": {
+              "fields": {
+                "text": {
+                  "norms": false,
+                  "type": "text"
+                }
+              },
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "registry": {
+          "properties": {
+            "data": {
+              "properties": {
+                "bytes": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "strings": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "type": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "hive": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "key": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "path": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "value": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "related": {
+          "properties": {
+            "ip": {
+              "type": "ip"
+            },
+            "user": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "rule": {
+          "properties": {
+            "category": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "description": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "id": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "name": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "reference": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "ruleset": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "uuid": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "version": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "server": {
+          "properties": {
+            "address": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "as": {
+              "properties": {
+                "number": {
+                  "type": "long"
+                },
+                "organization": {
+                  "properties": {
+                    "name": {
+                      "fields": {
+                        "text": {
+                          "norms": false,
+                          "type": "text"
+                        }
+                      },
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                }
+              }
+            },
+            "bytes": {
+              "type": "long"
+            },
+            "domain": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "geo": {
+              "properties": {
+                "city_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "continent_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "country_iso_code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "country_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "location": {
+                  "type": "geo_point"
+                },
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "region_iso_code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "region_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "ip": {
+              "type": "ip"
+            },
+            "mac": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "nat": {
+              "properties": {
+                "ip": {
+                  "type": "ip"
+                },
+                "port": {
+                  "type": "long"
+                }
+              }
+            },
+            "packets": {
+              "type": "long"
+            },
+            "port": {
+              "type": "long"
+            },
+            "registered_domain": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "top_level_domain": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "user": {
+              "properties": {
+                "domain": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "email": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "full_name": {
+                  "fields": {
+                    "text": {
+                      "norms": false,
+                      "type": "text"
+                    }
+                  },
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "group": {
+                  "properties": {
+                    "domain": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "id": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "name": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "hash": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "name": {
+                  "fields": {
+                    "text": {
+                      "norms": false,
+                      "type": "text"
+                    }
+                  },
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            }
+          }
+        },
+        "service": {
+          "properties": {
+            "ephemeral_id": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "id": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "name": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "node": {
+              "properties": {
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "state": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "type": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "version": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "socket": {
+          "properties": {
+            "entity_id": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "source": {
+          "properties": {
+            "address": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "as": {
+              "properties": {
+                "number": {
+                  "type": "long"
+                },
+                "organization": {
+                  "properties": {
+                    "name": {
+                      "fields": {
+                        "text": {
+                          "norms": false,
+                          "type": "text"
+                        }
+                      },
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                }
+              }
+            },
+            "bytes": {
+              "type": "long"
+            },
+            "domain": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "geo": {
+              "properties": {
+                "city_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "continent_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "country_iso_code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "country_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "location": {
+                  "type": "geo_point"
+                },
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "region_iso_code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "region_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "ip": {
+              "type": "ip"
+            },
+            "mac": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "nat": {
+              "properties": {
+                "ip": {
+                  "type": "ip"
+                },
+                "port": {
+                  "type": "long"
+                }
+              }
+            },
+            "packets": {
+              "type": "long"
+            },
+            "path": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "port": {
+              "type": "long"
+            },
+            "registered_domain": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "top_level_domain": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "user": {
+              "properties": {
+                "domain": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "email": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "full_name": {
+                  "fields": {
+                    "text": {
+                      "norms": false,
+                      "type": "text"
+                    }
+                  },
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "group": {
+                  "properties": {
+                    "domain": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "id": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "name": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "hash": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "name": {
+                  "fields": {
+                    "text": {
+                      "norms": false,
+                      "type": "text"
+                    }
+                  },
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            }
+          }
+        },
+        "system": {
+          "properties": {
+            "audit": {
+              "properties": {
+                "host": {
+                  "properties": {
+                    "architecture": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "boottime": {
+                      "type": "date"
+                    },
+                    "containerized": {
+                      "type": "boolean"
+                    },
+                    "hostname": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "id": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "ip": {
+                      "type": "ip"
+                    },
+                    "mac": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "os": {
+                      "properties": {
+                        "codename": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "family": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "kernel": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "name": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "platform": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "version": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        }
+                      }
+                    },
+                    "timezone": {
+                      "properties": {
+                        "name": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "offset": {
+                          "properties": {
+                            "sec": {
+                              "type": "long"
+                            }
+                          }
+                        }
+                      }
+                    },
+                    "uptime": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "package": {
+                  "properties": {
+                    "arch": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "entity_id": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "installtime": {
+                      "type": "date"
+                    },
+                    "license": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "name": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "release": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "size": {
+                      "type": "long"
+                    },
+                    "summary": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "url": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "version": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "user": {
+                  "properties": {
+                    "dir": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "gid": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "group": {
+                      "type": "object"
+                    },
+                    "name": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "password": {
+                      "properties": {
+                        "last_changed": {
+                          "type": "date"
+                        },
+                        "type": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        }
+                      }
+                    },
+                    "shell": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "uid": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "user_information": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                }
+              }
+            }
+          }
+        },
+        "tags": {
+          "ignore_above": 1024,
+          "type": "keyword"
+        },
+        "threat": {
+          "properties": {
+            "framework": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "tactic": {
+              "properties": {
+                "id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "reference": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "technique": {
+              "properties": {
+                "id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "name": {
+                  "fields": {
+                    "text": {
+                      "norms": false,
+                      "type": "text"
+                    }
+                  },
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "reference": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            }
+          }
+        },
+        "timeseries": {
+          "properties": {
+            "instance": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "tls": {
+          "properties": {
+            "cipher": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "client": {
+              "properties": {
+                "certificate": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "certificate_chain": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "hash": {
+                  "properties": {
+                    "md5": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "sha1": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "sha256": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "issuer": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "ja3": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "not_after": {
+                  "type": "date"
+                },
+                "not_before": {
+                  "type": "date"
+                },
+                "server_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "subject": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "supported_ciphers": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "curve": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "established": {
+              "type": "boolean"
+            },
+            "next_protocol": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "resumed": {
+              "type": "boolean"
+            },
+            "server": {
+              "properties": {
+                "certificate": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "certificate_chain": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "hash": {
+                  "properties": {
+                    "md5": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "sha1": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "sha256": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "issuer": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "ja3s": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "not_after": {
+                  "type": "date"
+                },
+                "not_before": {
+                  "type": "date"
+                },
+                "subject": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "version": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "version_protocol": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "tracing": {
+          "properties": {
+            "trace": {
+              "properties": {
+                "id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "transaction": {
+              "properties": {
+                "id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            }
+          }
+        },
+        "url": {
+          "properties": {
+            "domain": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "extension": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "fragment": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "full": {
+              "fields": {
+                "text": {
+                  "norms": false,
+                  "type": "text"
+                }
+              },
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "original": {
+              "fields": {
+                "text": {
+                  "norms": false,
+                  "type": "text"
+                }
+              },
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "password": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "path": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "port": {
+              "type": "long"
+            },
+            "query": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "registered_domain": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "scheme": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "top_level_domain": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "username": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "user": {
+          "properties": {
+            "audit": {
+              "properties": {
+                "id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "domain": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "effective": {
+              "properties": {
+                "group": {
+                  "properties": {
+                    "id": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "name": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "email": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "entity_id": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "filesystem": {
+              "properties": {
+                "group": {
+                  "properties": {
+                    "id": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "name": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "full_name": {
+              "fields": {
+                "text": {
+                  "norms": false,
+                  "type": "text"
+                }
+              },
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "group": {
+              "properties": {
+                "domain": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "hash": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "id": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "name": {
+              "fields": {
+                "text": {
+                  "norms": false,
+                  "type": "text"
+                }
+              },
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "name_map": {
+              "type": "object"
+            },
+            "saved": {
+              "properties": {
+                "group": {
+                  "properties": {
+                    "id": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "name": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "selinux": {
+              "properties": {
+                "category": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "domain": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "level": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "role": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "user": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "terminal": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "user_agent": {
+          "properties": {
+            "device": {
+              "properties": {
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "name": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "original": {
+              "fields": {
+                "text": {
+                  "norms": false,
+                  "type": "text"
+                }
+              },
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "os": {
+              "properties": {
+                "family": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "full": {
+                  "fields": {
+                    "text": {
+                      "norms": false,
+                      "type": "text"
+                    }
+                  },
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "kernel": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "name": {
+                  "fields": {
+                    "text": {
+                      "norms": false,
+                      "type": "text"
+                    }
+                  },
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "platform": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "version": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "version": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "vulnerability": {
+          "properties": {
+            "category": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "classification": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "description": {
+              "fields": {
+                "text": {
+                  "norms": false,
+                  "type": "text"
+                }
+              },
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "enumeration": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "id": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "reference": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "report_id": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "scanner": {
+              "properties": {
+                "vendor": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "score": {
+              "properties": {
+                "base": {
+                  "type": "float"
+                },
+                "environmental": {
+                  "type": "float"
+                },
+                "temporal": {
+                  "type": "float"
+                },
+                "version": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "severity": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        }
+      }
+    },
+    "settings": {
+      "index": {
+        "lifecycle": {
+          "name": "auditbeat",
+          "rollover_alias": "auditbeat-7.6.0"
+        },
+        "mapping": {
+          "total_fields": {
+            "limit": "10000"
+          }
+        },
+        "number_of_replicas": "1",
+        "number_of_shards": "1",
+        "query": {
+          "default_field": [
+            "message",
+            "tags",
+            "agent.ephemeral_id",
+            "agent.id",
+            "agent.name",
+            "agent.type",
+            "agent.version",
+            "as.organization.name",
+            "client.address",
+            "client.as.organization.name",
+            "client.domain",
+            "client.geo.city_name",
+            "client.geo.continent_name",
+            "client.geo.country_iso_code",
+            "client.geo.country_name",
+            "client.geo.name",
+            "client.geo.region_iso_code",
+            "client.geo.region_name",
+            "client.mac",
+            "client.registered_domain",
+            "client.top_level_domain",
+            "client.user.domain",
+            "client.user.email",
+            "client.user.full_name",
+            "client.user.group.domain",
+            "client.user.group.id",
+            "client.user.group.name",
+            "client.user.hash",
+            "client.user.id",
+            "client.user.name",
+            "cloud.account.id",
+            "cloud.availability_zone",
+            "cloud.instance.id",
+            "cloud.instance.name",
+            "cloud.machine.type",
+            "cloud.provider",
+            "cloud.region",
+            "container.id",
+            "container.image.name",
+            "container.image.tag",
+            "container.name",
+            "container.runtime",
+            "destination.address",
+            "destination.as.organization.name",
+            "destination.domain",
+            "destination.geo.city_name",
+            "destination.geo.continent_name",
+            "destination.geo.country_iso_code",
+            "destination.geo.country_name",
+            "destination.geo.name",
+            "destination.geo.region_iso_code",
+            "destination.geo.region_name",
+            "destination.mac",
+            "destination.registered_domain",
+            "destination.top_level_domain",
+            "destination.user.domain",
+            "destination.user.email",
+            "destination.user.full_name",
+            "destination.user.group.domain",
+            "destination.user.group.id",
+            "destination.user.group.name",
+            "destination.user.hash",
+            "destination.user.id",
+            "destination.user.name",
+            "dns.answers.class",
+            "dns.answers.data",
+            "dns.answers.name",
+            "dns.answers.type",
+            "dns.header_flags",
+            "dns.id",
+            "dns.op_code",
+            "dns.question.class",
+            "dns.question.name",
+            "dns.question.registered_domain",
+            "dns.question.subdomain",
+            "dns.question.top_level_domain",
+            "dns.question.type",
+            "dns.response_code",
+            "dns.type",
+            "ecs.version",
+            "error.code",
+            "error.id",
+            "error.message",
+            "error.stack_trace",
+            "error.type",
+            "event.action",
+            "event.category",
+            "event.code",
+            "event.dataset",
+            "event.hash",
+            "event.id",
+            "event.kind",
+            "event.module",
+            "event.original",
+            "event.outcome",
+            "event.provider",
+            "event.timezone",
+            "event.type",
+            "file.device",
+            "file.directory",
+            "file.extension",
+            "file.gid",
+            "file.group",
+            "file.hash.md5",
+            "file.hash.sha1",
+            "file.hash.sha256",
+            "file.hash.sha512",
+            "file.inode",
+            "file.mode",
+            "file.name",
+            "file.owner",
+            "file.path",
+            "file.target_path",
+            "file.type",
+            "file.uid",
+            "geo.city_name",
+            "geo.continent_name",
+            "geo.country_iso_code",
+            "geo.country_name",
+            "geo.name",
+            "geo.region_iso_code",
+            "geo.region_name",
+            "group.domain",
+            "group.id",
+            "group.name",
+            "hash.md5",
+            "hash.sha1",
+            "hash.sha256",
+            "hash.sha512",
+            "host.architecture",
+            "host.geo.city_name",
+            "host.geo.continent_name",
+            "host.geo.country_iso_code",
+            "host.geo.country_name",
+            "host.geo.name",
+            "host.geo.region_iso_code",
+            "host.geo.region_name",
+            "host.hostname",
+            "host.id",
+            "host.mac",
+            "host.name",
+            "host.os.family",
+            "host.os.full",
+            "host.os.kernel",
+            "host.os.name",
+            "host.os.platform",
+            "host.os.version",
+            "host.type",
+            "host.user.domain",
+            "host.user.email",
+            "host.user.full_name",
+            "host.user.group.domain",
+            "host.user.group.id",
+            "host.user.group.name",
+            "host.user.hash",
+            "host.user.id",
+            "host.user.name",
+            "http.request.body.content",
+            "http.request.method",
+            "http.request.referrer",
+            "http.response.body.content",
+            "http.version",
+            "log.level",
+            "log.logger",
+            "log.origin.file.name",
+            "log.origin.function",
+            "log.original",
+            "log.syslog.facility.name",
+            "log.syslog.severity.name",
+            "network.application",
+            "network.community_id",
+            "network.direction",
+            "network.iana_number",
+            "network.name",
+            "network.protocol",
+            "network.transport",
+            "network.type",
+            "observer.geo.city_name",
+            "observer.geo.continent_name",
+            "observer.geo.country_iso_code",
+            "observer.geo.country_name",
+            "observer.geo.name",
+            "observer.geo.region_iso_code",
+            "observer.geo.region_name",
+            "observer.hostname",
+            "observer.mac",
+            "observer.name",
+            "observer.os.family",
+            "observer.os.full",
+            "observer.os.kernel",
+            "observer.os.name",
+            "observer.os.platform",
+            "observer.os.version",
+            "observer.product",
+            "observer.serial_number",
+            "observer.type",
+            "observer.vendor",
+            "observer.version",
+            "organization.id",
+            "organization.name",
+            "os.family",
+            "os.full",
+            "os.kernel",
+            "os.name",
+            "os.platform",
+            "os.version",
+            "package.architecture",
+            "package.checksum",
+            "package.description",
+            "package.install_scope",
+            "package.license",
+            "package.name",
+            "package.path",
+            "package.version",
+            "process.args",
+            "text",
+            "process.executable",
+            "process.hash.md5",
+            "process.hash.sha1",
+            "process.hash.sha256",
+            "process.hash.sha512",
+            "process.name",
+            "text",
+            "text",
+            "text",
+            "text",
+            "text",
+            "process.thread.name",
+            "process.title",
+            "process.working_directory",
+            "server.address",
+            "server.as.organization.name",
+            "server.domain",
+            "server.geo.city_name",
+            "server.geo.continent_name",
+            "server.geo.country_iso_code",
+            "server.geo.country_name",
+            "server.geo.name",
+            "server.geo.region_iso_code",
+            "server.geo.region_name",
+            "server.mac",
+            "server.registered_domain",
+            "server.top_level_domain",
+            "server.user.domain",
+            "server.user.email",
+            "server.user.full_name",
+            "server.user.group.domain",
+            "server.user.group.id",
+            "server.user.group.name",
+            "server.user.hash",
+            "server.user.id",
+            "server.user.name",
+            "service.ephemeral_id",
+            "service.id",
+            "service.name",
+            "service.node.name",
+            "service.state",
+            "service.type",
+            "service.version",
+            "source.address",
+            "source.as.organization.name",
+            "source.domain",
+            "source.geo.city_name",
+            "source.geo.continent_name",
+            "source.geo.country_iso_code",
+            "source.geo.country_name",
+            "source.geo.name",
+            "source.geo.region_iso_code",
+            "source.geo.region_name",
+            "source.mac",
+            "source.registered_domain",
+            "source.top_level_domain",
+            "source.user.domain",
+            "source.user.email",
+            "source.user.full_name",
+            "source.user.group.domain",
+            "source.user.group.id",
+            "source.user.group.name",
+            "source.user.hash",
+            "source.user.id",
+            "source.user.name",
+            "threat.framework",
+            "threat.tactic.id",
+            "threat.tactic.name",
+            "threat.tactic.reference",
+            "threat.technique.id",
+            "threat.technique.name",
+            "threat.technique.reference",
+            "tracing.trace.id",
+            "tracing.transaction.id",
+            "url.domain",
+            "url.extension",
+            "url.fragment",
+            "url.full",
+            "url.original",
+            "url.password",
+            "url.path",
+            "url.query",
+            "url.registered_domain",
+            "url.scheme",
+            "url.top_level_domain",
+            "url.username",
+            "user.domain",
+            "user.email",
+            "user.full_name",
+            "user.group.domain",
+            "user.group.id",
+            "user.group.name",
+            "user.hash",
+            "user.id",
+            "user.name",
+            "user_agent.device.name",
+            "user_agent.name",
+            "text",
+            "user_agent.original",
+            "user_agent.os.family",
+            "user_agent.os.full",
+            "user_agent.os.kernel",
+            "user_agent.os.name",
+            "user_agent.os.platform",
+            "user_agent.os.version",
+            "user_agent.version",
+            "text",
+            "agent.hostname",
+            "timeseries.instance",
+            "cloud.project.id",
+            "cloud.image.id",
+            "host.os.build",
+            "host.os.codename",
+            "kubernetes.pod.name",
+            "kubernetes.pod.uid",
+            "kubernetes.namespace",
+            "kubernetes.node.name",
+            "kubernetes.replicaset.name",
+            "kubernetes.deployment.name",
+            "kubernetes.statefulset.name",
+            "kubernetes.container.name",
+            "kubernetes.container.image",
+            "jolokia.agent.version",
+            "jolokia.agent.id",
+            "jolokia.server.product",
+            "jolokia.server.version",
+            "jolokia.server.vendor",
+            "jolokia.url",
+            "raw",
+            "file.origin",
+            "file.selinux.user",
+            "file.selinux.role",
+            "file.selinux.domain",
+            "file.selinux.level",
+            "user.audit.id",
+            "user.audit.name",
+            "user.effective.id",
+            "user.effective.name",
+            "user.effective.group.id",
+            "user.effective.group.name",
+            "user.filesystem.id",
+            "user.filesystem.name",
+            "user.filesystem.group.id",
+            "user.filesystem.group.name",
+            "user.saved.id",
+            "user.saved.name",
+            "user.saved.group.id",
+            "user.saved.group.name",
+            "user.selinux.user",
+            "user.selinux.role",
+            "user.selinux.domain",
+            "user.selinux.level",
+            "user.selinux.category",
+            "source.path",
+            "destination.path",
+            "auditd.message_type",
+            "auditd.session",
+            "auditd.result",
+            "auditd.summary.actor.primary",
+            "auditd.summary.actor.secondary",
+            "auditd.summary.object.type",
+            "auditd.summary.object.primary",
+            "auditd.summary.object.secondary",
+            "auditd.summary.how",
+            "auditd.paths.inode",
+            "auditd.paths.dev",
+            "auditd.paths.obj_user",
+            "auditd.paths.obj_role",
+            "auditd.paths.obj_domain",
+            "auditd.paths.obj_level",
+            "auditd.paths.objtype",
+            "auditd.paths.ouid",
+            "auditd.paths.rdev",
+            "auditd.paths.nametype",
+            "auditd.paths.ogid",
+            "auditd.paths.item",
+            "auditd.paths.mode",
+            "auditd.paths.name",
+            "auditd.data.action",
+            "auditd.data.minor",
+            "auditd.data.acct",
+            "auditd.data.addr",
+            "auditd.data.cipher",
+            "auditd.data.id",
+            "auditd.data.entries",
+            "auditd.data.kind",
+            "auditd.data.ksize",
+            "auditd.data.spid",
+            "auditd.data.arch",
+            "auditd.data.argc",
+            "auditd.data.major",
+            "auditd.data.unit",
+            "auditd.data.table",
+            "auditd.data.terminal",
+            "auditd.data.grantors",
+            "auditd.data.direction",
+            "auditd.data.op",
+            "auditd.data.tty",
+            "auditd.data.syscall",
+            "auditd.data.data",
+            "auditd.data.family",
+            "auditd.data.mac",
+            "auditd.data.pfs",
+            "auditd.data.items",
+            "auditd.data.a0",
+            "auditd.data.a1",
+            "auditd.data.a2",
+            "auditd.data.a3",
+            "auditd.data.hostname",
+            "auditd.data.lport",
+            "auditd.data.rport",
+            "auditd.data.exit",
+            "auditd.data.fp",
+            "auditd.data.laddr",
+            "auditd.data.sport",
+            "auditd.data.capability",
+            "auditd.data.nargs",
+            "auditd.data.new-enabled",
+            "auditd.data.audit_backlog_limit",
+            "auditd.data.dir",
+            "auditd.data.cap_pe",
+            "auditd.data.model",
+            "auditd.data.new_pp",
+            "auditd.data.old-enabled",
+            "auditd.data.oauid",
+            "auditd.data.old",
+            "auditd.data.banners",
+            "auditd.data.feature",
+            "auditd.data.vm-ctx",
+            "auditd.data.opid",
+            "auditd.data.seperms",
+            "auditd.data.seresult",
+            "auditd.data.new-rng",
+            "auditd.data.old-net",
+            "auditd.data.sigev_signo",
+            "auditd.data.ino",
+            "auditd.data.old_enforcing",
+            "auditd.data.old-vcpu",
+            "auditd.data.range",
+            "auditd.data.res",
+            "auditd.data.added",
+            "auditd.data.fam",
+            "auditd.data.nlnk-pid",
+            "auditd.data.subj",
+            "auditd.data.a[0-3]",
+            "auditd.data.cgroup",
+            "auditd.data.kernel",
+            "auditd.data.ocomm",
+            "auditd.data.new-net",
+            "auditd.data.permissive",
+            "auditd.data.class",
+            "auditd.data.compat",
+            "auditd.data.fi",
+            "auditd.data.changed",
+            "auditd.data.msg",
+            "auditd.data.dport",
+            "auditd.data.new-seuser",
+            "auditd.data.invalid_context",
+            "auditd.data.dmac",
+            "auditd.data.ipx-net",
+            "auditd.data.iuid",
+            "auditd.data.macproto",
+            "auditd.data.obj",
+            "auditd.data.ipid",
+            "auditd.data.new-fs",
+            "auditd.data.vm-pid",
+            "auditd.data.cap_pi",
+            "auditd.data.old-auid",
+            "auditd.data.oses",
+            "auditd.data.fd",
+            "auditd.data.igid",
+            "auditd.data.new-disk",
+            "auditd.data.parent",
+            "auditd.data.len",
+            "auditd.data.oflag",
+            "auditd.data.uuid",
+            "auditd.data.code",
+            "auditd.data.nlnk-grp",
+            "auditd.data.cap_fp",
+            "auditd.data.new-mem",
+            "auditd.data.seperm",
+            "auditd.data.enforcing",
+            "auditd.data.new-chardev",
+            "auditd.data.old-rng",
+            "auditd.data.outif",
+            "auditd.data.cmd",
+            "auditd.data.hook",
+            "auditd.data.new-level",
+            "auditd.data.sauid",
+            "auditd.data.sig",
+            "auditd.data.audit_backlog_wait_time",
+            "auditd.data.printer",
+            "auditd.data.old-mem",
+            "auditd.data.perm",
+            "auditd.data.old_pi",
+            "auditd.data.state",
+            "auditd.data.format",
+            "auditd.data.new_gid",
+            "auditd.data.tcontext",
+            "auditd.data.maj",
+            "auditd.data.watch",
+            "auditd.data.device",
+            "auditd.data.grp",
+            "auditd.data.bool",
+            "auditd.data.icmp_type",
+            "auditd.data.new_lock",
+            "auditd.data.old_prom",
+            "auditd.data.acl",
+            "auditd.data.ip",
+            "auditd.data.new_pi",
+            "auditd.data.default-context",
+            "auditd.data.inode_gid",
+            "auditd.data.new-log_passwd",
+            "auditd.data.new_pe",
+            "auditd.data.selected-context",
+            "auditd.data.cap_fver",
+            "auditd.data.file",
+            "auditd.data.net",
+            "auditd.data.virt",
+            "auditd.data.cap_pp",
+            "auditd.data.old-range",
+            "auditd.data.resrc",
+            "auditd.data.new-range",
+            "auditd.data.obj_gid",
+            "auditd.data.proto",
+            "auditd.data.old-disk",
+            "auditd.data.audit_failure",
+            "auditd.data.inif",
+            "auditd.data.vm",
+            "auditd.data.flags",
+            "auditd.data.nlnk-fam",
+            "auditd.data.old-fs",
+            "auditd.data.old-ses",
+            "auditd.data.seqno",
+            "auditd.data.fver",
+            "auditd.data.qbytes",
+            "auditd.data.seuser",
+            "auditd.data.cap_fe",
+            "auditd.data.new-vcpu",
+            "auditd.data.old-level",
+            "auditd.data.old_pp",
+            "auditd.data.daddr",
+            "auditd.data.old-role",
+            "auditd.data.ioctlcmd",
+            "auditd.data.smac",
+            "auditd.data.apparmor",
+            "auditd.data.fe",
+            "auditd.data.perm_mask",
+            "auditd.data.ses",
+            "auditd.data.cap_fi",
+            "auditd.data.obj_uid",
+            "auditd.data.reason",
+            "auditd.data.list",
+            "auditd.data.old_lock",
+            "auditd.data.bus",
+            "auditd.data.old_pe",
+            "auditd.data.new-role",
+            "auditd.data.prom",
+            "auditd.data.uri",
+            "auditd.data.audit_enabled",
+            "auditd.data.old-log_passwd",
+            "auditd.data.old-seuser",
+            "auditd.data.per",
+            "auditd.data.scontext",
+            "auditd.data.tclass",
+            "auditd.data.ver",
+            "auditd.data.new",
+            "auditd.data.val",
+            "auditd.data.img-ctx",
+            "auditd.data.old-chardev",
+            "auditd.data.old_val",
+            "auditd.data.success",
+            "auditd.data.inode_uid",
+            "auditd.data.removed",
+            "auditd.data.socket.port",
+            "auditd.data.socket.saddr",
+            "auditd.data.socket.addr",
+            "auditd.data.socket.family",
+            "auditd.data.socket.path",
+            "geoip.continent_name",
+            "geoip.city_name",
+            "geoip.region_name",
+            "geoip.country_iso_code",
+            "hash.blake2b_256",
+            "hash.blake2b_384",
+            "hash.blake2b_512",
+            "hash.md5",
+            "hash.sha1",
+            "hash.sha224",
+            "hash.sha256",
+            "hash.sha384",
+            "hash.sha3_224",
+            "hash.sha3_256",
+            "hash.sha3_384",
+            "hash.sha3_512",
+            "hash.sha512",
+            "hash.sha512_224",
+            "hash.sha512_256",
+            "hash.xxh64",
+            "event.origin",
+            "user.entity_id",
+            "user.terminal",
+            "process.entity_id",
+            "process.hash.blake2b_256",
+            "process.hash.blake2b_384",
+            "process.hash.blake2b_512",
+            "process.hash.sha224",
+            "process.hash.sha384",
+            "process.hash.sha3_224",
+            "process.hash.sha3_256",
+            "process.hash.sha3_384",
+            "process.hash.sha3_512",
+            "process.hash.sha512_224",
+            "process.hash.sha512_256",
+            "process.hash.xxh64",
+            "socket.entity_id",
+            "system.audit.host.timezone.name",
+            "system.audit.host.hostname",
+            "system.audit.host.id",
+            "system.audit.host.architecture",
+            "system.audit.host.mac",
+            "system.audit.host.os.codename",
+            "system.audit.host.os.platform",
+            "system.audit.host.os.name",
+            "system.audit.host.os.family",
+            "system.audit.host.os.version",
+            "system.audit.host.os.kernel",
+            "system.audit.package.entity_id",
+            "system.audit.package.name",
+            "system.audit.package.version",
+            "system.audit.package.release",
+            "system.audit.package.arch",
+            "system.audit.package.license",
+            "system.audit.package.summary",
+            "system.audit.package.url",
+            "system.audit.user.name",
+            "system.audit.user.uid",
+            "system.audit.user.gid",
+            "system.audit.user.dir",
+            "system.audit.user.shell",
+            "system.audit.user.user_information",
+            "system.audit.user.password.type",
+            "fields.*"
+          ]
+        },
+        "refresh_interval": "5s"
+      }
+    }
+  }
+}
\ No newline at end of file

From c537d453e6d0a5e97fad3976fb3147234c2e4f20 Mon Sep 17 00:00:00 2001
From: Matthias Wilhelm <matthias.wilhelm@elastic.co>
Date: Mon, 23 Mar 2020 19:14:14 +0100
Subject: [PATCH 027/179] Inline timezoneProvider function, remove
 ui/vis/lib/timezone  (#60475)

* Inline getTimezone in discover, vis_type_timeseries,  timelion app & vis_type_timelion
---
 .../kibana/public/discover/kibana_services.ts |  3 ---
 .../np_ready/angular/directives/histogram.tsx | 15 +++++++++++++--
 .../core_plugins/timelion/public/app.js       |  7 +++----
 .../public/helpers/get_timezone.ts}           | 19 +++++++++----------
 .../helpers/timelion_request_handler.ts       |  4 ++--
 .../vis_type_timelion/public/index.ts         |  2 ++
 .../public/legacy_imports.ts                  |  3 ---
 .../get_timezone.ts}                          | 14 ++++++++++++--
 .../public/request_handler.js                 |  4 ++--
 .../visualizations/views/timeseries/index.js  |  5 ++---
 10 files changed, 45 insertions(+), 31 deletions(-)
 rename src/legacy/{ui/public/vis/lib/timezone.js => core_plugins/vis_type_timelion/public/helpers/get_timezone.ts} (70%)
 rename src/legacy/core_plugins/vis_type_timeseries/public/{legacy_imports.ts => lib/get_timezone.ts} (66%)

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 cf76a9355e384..d369eb9679de6 100644
--- a/src/legacy/core_plugins/kibana/public/discover/kibana_services.ts
+++ b/src/legacy/core_plugins/kibana/public/discover/kibana_services.ts
@@ -52,9 +52,6 @@ export { angular };
 export { wrapInI18nContext } from 'ui/i18n';
 import { search } from '../../../../../plugins/data/public';
 export const { getRequestInspectorStats, getResponseInspectorStats, tabifyAggResponse } = search;
-// @ts-ignore
-// @ts-ignore
-export { timezoneProvider } from 'ui/vis/lib/timezone';
 export {
   unhashUrl,
   redirectWhenMissing,
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 107c30ec5e688..f788347ac016c 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
@@ -42,9 +42,10 @@ import {
 } from '@elastic/charts';
 
 import { i18n } from '@kbn/i18n';
+import { IUiSettingsClient } from 'kibana/public';
 import { EuiChartThemeType } from '@elastic/eui/dist/eui_charts_theme';
 import { Subscription } from 'rxjs';
-import { getServices, timezoneProvider } from '../../../kibana_services';
+import { getServices } from '../../../kibana_services';
 
 export interface DiscoverHistogramProps {
   chartData: any;
@@ -86,6 +87,16 @@ function getIntervalInMs(
   }
 }
 
+function getTimezone(uiSettings: IUiSettingsClient) {
+  if (uiSettings.isDefault('dateFormat:tz')) {
+    const detectedTimezone = moment.tz.guess();
+    if (detectedTimezone) return detectedTimezone;
+    else return moment().format('Z');
+  } else {
+    return uiSettings.get('dateFormat:tz', 'Browser');
+  }
+}
+
 export function findMinInterval(
   xValues: number[],
   esValue: number,
@@ -193,7 +204,7 @@ export class DiscoverHistogram extends Component<DiscoverHistogramProps, Discove
 
   public render() {
     const uiSettings = getServices().uiSettings;
-    const timeZone = timezoneProvider(uiSettings)();
+    const timeZone = getTimezone(uiSettings);
     const { chartData } = this.props;
     const { chartsTheme } = this.state;
 
diff --git a/src/legacy/core_plugins/timelion/public/app.js b/src/legacy/core_plugins/timelion/public/app.js
index 66d93b4ce9b89..a50f8a2cd3e8d 100644
--- a/src/legacy/core_plugins/timelion/public/app.js
+++ b/src/legacy/core_plugins/timelion/public/app.js
@@ -24,10 +24,10 @@ import { i18n } from '@kbn/i18n';
 import { capabilities } from 'ui/capabilities';
 import { docTitle } from 'ui/doc_title';
 import { fatalError, toastNotifications } from 'ui/notify';
-import { timezoneProvider } from 'ui/vis/lib/timezone';
 import { timefilter } from 'ui/timefilter';
 import { npStart } from 'ui/new_platform';
 import { getSavedSheetBreadcrumbs, getCreateBreadcrumbs } from './breadcrumbs';
+import { getTimezone } from '../../vis_type_timelion/public';
 
 import 'uiExports/savedObjectTypes';
 
@@ -115,8 +115,7 @@ app.controller('timelion', function(
   $timeout,
   AppState,
   config,
-  kbnUrl,
-  Private
+  kbnUrl
 ) {
   // Keeping this at app scope allows us to keep the current page when the user
   // switches to say, the timepicker.
@@ -127,7 +126,7 @@ app.controller('timelion', function(
   timefilter.enableTimeRangeSelector();
 
   const savedVisualizations = visualizations.savedVisualizationsLoader;
-  const timezone = Private(timezoneProvider)();
+  const timezone = getTimezone(config);
 
   const defaultExpression = '.es(*)';
   const savedSheet = $route.current.locals.savedSheet;
diff --git a/src/legacy/ui/public/vis/lib/timezone.js b/src/legacy/core_plugins/vis_type_timelion/public/helpers/get_timezone.ts
similarity index 70%
rename from src/legacy/ui/public/vis/lib/timezone.js
rename to src/legacy/core_plugins/vis_type_timelion/public/helpers/get_timezone.ts
index a526ca55f9c86..f1e8fc56901e1 100644
--- a/src/legacy/ui/public/vis/lib/timezone.js
+++ b/src/legacy/core_plugins/vis_type_timelion/public/helpers/get_timezone.ts
@@ -18,15 +18,14 @@
  */
 
 import moment from 'moment-timezone';
+import { IUiSettingsClient } from 'kibana/public';
 
-export function timezoneProvider(config) {
-  return function() {
-    if (config.isDefault('dateFormat:tz')) {
-      const detectedTimezone = moment.tz.guess();
-      if (detectedTimezone) return detectedTimezone;
-      else return moment().format('Z');
-    } else {
-      return config.get('dateFormat:tz', 'Browser');
-    }
-  };
+export function getTimezone(config: IUiSettingsClient) {
+  if (config.isDefault('dateFormat:tz')) {
+    const detectedTimezone = moment.tz.guess();
+    if (detectedTimezone) return detectedTimezone;
+    else return moment().format('Z');
+  } else {
+    return config.get('dateFormat:tz', 'Browser');
+  }
 }
diff --git a/src/legacy/core_plugins/vis_type_timelion/public/helpers/timelion_request_handler.ts b/src/legacy/core_plugins/vis_type_timelion/public/helpers/timelion_request_handler.ts
index 603c911438f2a..47bfed6340e93 100644
--- a/src/legacy/core_plugins/vis_type_timelion/public/helpers/timelion_request_handler.ts
+++ b/src/legacy/core_plugins/vis_type_timelion/public/helpers/timelion_request_handler.ts
@@ -21,8 +21,8 @@ import { i18n } from '@kbn/i18n';
 import { KIBANA_CONTEXT_NAME } from 'src/plugins/expressions/public';
 import { VisParams } from 'src/legacy/core_plugins/visualizations/public';
 import { TimeRange, Filter, esQuery, Query } from '../../../../../plugins/data/public';
-import { timezoneProvider } from '../legacy_imports';
 import { TimelionVisDependencies } from '../plugin';
+import { getTimezone } from './get_timezone';
 
 interface Stats {
   cacheCount: number;
@@ -66,7 +66,7 @@ export function getTimelionRequestHandler({
   http,
   timefilter,
 }: TimelionVisDependencies) {
-  const timezone = timezoneProvider(uiSettings)();
+  const timezone = getTimezone(uiSettings);
 
   return async function({
     timeRange,
diff --git a/src/legacy/core_plugins/vis_type_timelion/public/index.ts b/src/legacy/core_plugins/vis_type_timelion/public/index.ts
index 98cc35877094e..6292e2ad3eb08 100644
--- a/src/legacy/core_plugins/vis_type_timelion/public/index.ts
+++ b/src/legacy/core_plugins/vis_type_timelion/public/index.ts
@@ -23,3 +23,5 @@ import { TimelionVisPlugin as Plugin } from './plugin';
 export function plugin(initializerContext: PluginInitializerContext) {
   return new Plugin(initializerContext);
 }
+
+export { getTimezone } from './helpers/get_timezone';
diff --git a/src/legacy/core_plugins/vis_type_timelion/public/legacy_imports.ts b/src/legacy/core_plugins/vis_type_timelion/public/legacy_imports.ts
index a00240ee06828..e7612b288fb24 100644
--- a/src/legacy/core_plugins/vis_type_timelion/public/legacy_imports.ts
+++ b/src/legacy/core_plugins/vis_type_timelion/public/legacy_imports.ts
@@ -19,6 +19,3 @@
 
 export { npSetup, npStart } from 'ui/new_platform';
 export { PluginsStart } from 'ui/new_platform/new_platform';
-
-// @ts-ignore
-export { timezoneProvider } from 'ui/vis/lib/timezone';
diff --git a/src/legacy/core_plugins/vis_type_timeseries/public/legacy_imports.ts b/src/legacy/core_plugins/vis_type_timeseries/public/lib/get_timezone.ts
similarity index 66%
rename from src/legacy/core_plugins/vis_type_timeseries/public/legacy_imports.ts
rename to src/legacy/core_plugins/vis_type_timeseries/public/lib/get_timezone.ts
index 7cf0a12e8567c..f1e8fc56901e1 100644
--- a/src/legacy/core_plugins/vis_type_timeseries/public/legacy_imports.ts
+++ b/src/legacy/core_plugins/vis_type_timeseries/public/lib/get_timezone.ts
@@ -17,5 +17,15 @@
  * under the License.
  */
 
-// @ts-ignore
-export { timezoneProvider } from 'ui/vis/lib/timezone';
+import moment from 'moment-timezone';
+import { IUiSettingsClient } from 'kibana/public';
+
+export function getTimezone(config: IUiSettingsClient) {
+  if (config.isDefault('dateFormat:tz')) {
+    const detectedTimezone = moment.tz.guess();
+    if (detectedTimezone) return detectedTimezone;
+    else return moment().format('Z');
+  } else {
+    return config.get('dateFormat:tz', 'Browser');
+  }
+}
diff --git a/src/legacy/core_plugins/vis_type_timeseries/public/request_handler.js b/src/legacy/core_plugins/vis_type_timeseries/public/request_handler.js
index 032ef335314d9..2cac1567a6eb7 100644
--- a/src/legacy/core_plugins/vis_type_timeseries/public/request_handler.js
+++ b/src/legacy/core_plugins/vis_type_timeseries/public/request_handler.js
@@ -18,7 +18,7 @@
  */
 
 import { validateInterval } from './lib/validate_interval';
-import { timezoneProvider } from './legacy_imports';
+import { getTimezone } from './lib/get_timezone';
 import { getUISettings, getDataStart, getCoreStart } from './services';
 
 export const metricsRequestHandler = async ({
@@ -30,7 +30,7 @@ export const metricsRequestHandler = async ({
   savedObjectId,
 }) => {
   const config = getUISettings();
-  const timezone = timezoneProvider(config)();
+  const timezone = getTimezone(config);
   const uiStateObj = uiState.get(visParams.type, {});
   const parsedTimeRange = getDataStart().query.timefilter.timefilter.calculateBounds(timeRange);
   const scaledDataFormat = config.get('dateFormat:scaled');
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 bec76433eb8ac..3ce3aae2649e1 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
@@ -31,8 +31,7 @@ import {
   TooltipType,
 } from '@elastic/charts';
 import { EuiIcon } from '@elastic/eui';
-
-import { timezoneProvider } from '../../../legacy_imports';
+import { getTimezone } from '../../../lib/get_timezone';
 import { eventBus, ACTIVE_CURSOR } from '../../lib/active_cursor';
 import { getUISettings } from '../../../services';
 import { GRID_LINE_CONFIG, ICON_TYPES_MAP, STACKED_OPTIONS } from '../../constants';
@@ -87,7 +86,7 @@ export const TimeSeries = ({
 
   const tooltipFormatter = decorateFormatter(xAxisFormatter);
   const uiSettings = getUISettings();
-  const timeZone = timezoneProvider(uiSettings)();
+  const timeZone = getTimezone(uiSettings);
   const hasBarChart = series.some(({ bars }) => bars.show);
 
   // compute the theme based on the bg color

From ed5553120716c0918b3d66762fe9b4b7cc3d9d48 Mon Sep 17 00:00:00 2001
From: Peter Pisljar <peter.pisljar@gmail.com>
Date: Mon, 23 Mar 2020 19:19:39 +0100
Subject: [PATCH 028/179] cleanup visualizations api (#59958)

---
 ...ns-data-public.aggconfigoptions.enabled.md |  11 +
 ...plugins-data-public.aggconfigoptions.id.md |  11 +
 ...in-plugins-data-public.aggconfigoptions.md |  22 ++
 ...ins-data-public.aggconfigoptions.params.md |  11 +
 ...ins-data-public.aggconfigoptions.schema.md |  11 +
 ...ugins-data-public.aggconfigoptions.type.md |  11 +
 .../kibana-plugin-plugins-data-public.md      |   1 +
 .../public/input_control_vis_type.ts          |   2 -
 .../public/vis_controller.tsx                 |   2 +-
 .../discover/np_ready/angular/discover.js     |  44 ++--
 .../public/visualize/np_ready/breadcrumbs.ts  |   2 +-
 .../visualize/np_ready/editor/editor.html     |   9 +-
 .../visualize/np_ready/editor/editor.js       | 144 ++++++-----
 .../np_ready/editor/visualization.js          |  34 +--
 .../np_ready/editor/visualization_editor.js   |  19 +-
 .../public/visualize/np_ready/legacy_app.js   |  63 +++--
 .../public/visualize/np_ready/types.d.ts      |   9 +-
 .../__tests__/region_map_visualization.js     |  11 +-
 .../region_map/public/region_map_type.js      |   8 +-
 .../public/region_map_visualization.js        |   4 +-
 .../coordinate_maps_visualization.js          |  11 +-
 .../public/base_maps_visualization.js         |  17 +-
 .../tile_map/public/tile_map_type.js          |   9 +-
 .../public/components/agg.test.tsx            |   4 +-
 .../public/components/agg_common_props.ts     |   5 +-
 .../public/components/agg_group.test.tsx      |  10 +-
 .../public/components/agg_group.tsx           |   7 +-
 .../public/components/agg_param_props.ts      |   4 +-
 .../public/components/agg_params.test.tsx     |   4 +-
 .../components/agg_params_helper.test.ts      |   4 +-
 .../public/components/agg_params_helper.ts    |   4 +-
 .../public/components/controls/field.test.tsx |   4 +-
 .../components/controls/percentiles.test.tsx  |   4 +-
 .../public/components/controls/test_utils.ts  |   4 +-
 .../public/components/sidebar/data_tab.tsx    |   4 +-
 .../public/components/sidebar/sidebar.tsx     |  47 ++--
 .../components/sidebar/sidebar_title.tsx      |  18 +-
 .../public/components/sidebar/state/index.ts  |  32 +--
 .../components/sidebar/state/reducers.ts      |  67 +++--
 .../public/default_editor.tsx                 |  67 ++---
 .../public/default_editor_controller.tsx      |  16 +-
 .../public/vis_options_props.tsx              |   2 +-
 .../components/metric_vis_component.test.tsx  |   6 +-
 .../components/metric_vis_component.tsx       |   5 +-
 .../public/metric_vis_type.test.ts            |  15 +-
 .../public/agg_table/__tests__/agg_table.js   |  84 ++++---
 .../agg_table/__tests__/agg_table_group.js    |  35 ++-
 .../public/table_vis_controller.test.ts       |  32 +--
 .../vis_type_table/public/vis_controller.ts   |  17 +-
 .../__tests__/tag_cloud_visualization.js      |  10 +-
 .../components/tag_cloud_visualization.js     |  15 +-
 .../public/tag_cloud_type.ts                  |   2 -
 .../public/components/timelion_vis.tsx        |   4 +-
 .../public/components/vis_editor.js           |  17 +-
 .../components/vis_editor_visualization.js    |  13 +-
 .../public/editor_controller.js               |  16 +-
 .../views/timeseries/utils/theme.ts           |   1 +
 .../public/__tests__/vega_visualization.js    |   7 +-
 .../vis_type_vega/public/vega_type.ts         |   2 -
 .../public/vega_visualization.js              |  11 +-
 .../__snapshots__/index.test.tsx.snap         |   6 +-
 .../options/metrics_axes/index.test.tsx       |   6 +-
 .../components/options/metrics_axes/index.tsx |   2 +-
 .../options/point_series/point_series.tsx     |   4 +-
 .../vis_type_vislib/public/vis_controller.tsx |   5 +-
 .../__tests__/visualizations/pie_chart.js     |  34 ++-
 .../vislib/components/legend/legend.tsx       |  16 +-
 .../public/components/visualization.test.js   |  11 +-
 .../public/components/visualization.tsx       |  20 +-
 .../public/components/visualization_chart.tsx |  24 +-
 .../public/embeddable/get_index_pattern.ts    |   8 +-
 .../public/embeddable/visualize_embeddable.ts | 130 ++++------
 .../visualize_embeddable_factory.tsx          |  19 +-
 .../public/expressions/{vis.js => vis.ts}     |  81 +++---
 .../expressions/visualization_renderer.tsx    |   9 +-
 .../public/np_ready/public/index.ts           |   3 +-
 .../public/legacy/build_pipeline.test.ts      | 234 ++++++++----------
 .../np_ready/public/legacy/build_pipeline.ts  | 109 ++++----
 .../public/legacy/update_status.test.js       | 102 --------
 .../np_ready/public/legacy/update_status.ts   | 117 ---------
 .../public/np_ready/public/mocks.ts           |   2 +
 .../public/np_ready/public/plugin.ts          |  21 +-
 .../public/saved_visualizations/_saved_vis.ts | 135 +++++-----
 .../saved_visualization_references.test.ts    |   6 +-
 .../public/np_ready/public/services.ts        |   9 +
 .../public/np_ready/public/types.ts           |  34 ++-
 .../public/np_ready/public/vis.ts             | 201 ++++++++++++---
 .../public/np_ready/public/vis_impl.d.ts      |  55 ----
 .../public/np_ready/public/vis_impl.js        | 223 -----------------
 src/plugins/data/public/index.ts              |   1 +
 src/plugins/data/public/public.api.md         |  46 ++--
 .../public/persisted_state/persisted_state.ts |   2 +-
 92 files changed, 1245 insertions(+), 1495 deletions(-)
 create mode 100644 docs/development/plugins/data/public/kibana-plugin-plugins-data-public.aggconfigoptions.enabled.md
 create mode 100644 docs/development/plugins/data/public/kibana-plugin-plugins-data-public.aggconfigoptions.id.md
 create mode 100644 docs/development/plugins/data/public/kibana-plugin-plugins-data-public.aggconfigoptions.md
 create mode 100644 docs/development/plugins/data/public/kibana-plugin-plugins-data-public.aggconfigoptions.params.md
 create mode 100644 docs/development/plugins/data/public/kibana-plugin-plugins-data-public.aggconfigoptions.schema.md
 create mode 100644 docs/development/plugins/data/public/kibana-plugin-plugins-data-public.aggconfigoptions.type.md
 rename src/legacy/core_plugins/visualizations/public/np_ready/public/expressions/{vis.js => vis.ts} (67%)
 delete mode 100644 src/legacy/core_plugins/visualizations/public/np_ready/public/legacy/update_status.test.js
 delete mode 100644 src/legacy/core_plugins/visualizations/public/np_ready/public/legacy/update_status.ts
 delete mode 100644 src/legacy/core_plugins/visualizations/public/np_ready/public/vis_impl.d.ts
 delete mode 100644 src/legacy/core_plugins/visualizations/public/np_ready/public/vis_impl.js

diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.aggconfigoptions.enabled.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.aggconfigoptions.enabled.md
new file mode 100644
index 0000000000000..2ef8c797f4054
--- /dev/null
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.aggconfigoptions.enabled.md
@@ -0,0 +1,11 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) &gt; [AggConfigOptions](./kibana-plugin-plugins-data-public.aggconfigoptions.md) &gt; [enabled](./kibana-plugin-plugins-data-public.aggconfigoptions.enabled.md)
+
+## AggConfigOptions.enabled property
+
+<b>Signature:</b>
+
+```typescript
+enabled?: boolean;
+```
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.aggconfigoptions.id.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.aggconfigoptions.id.md
new file mode 100644
index 0000000000000..8939854ab19ca
--- /dev/null
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.aggconfigoptions.id.md
@@ -0,0 +1,11 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) &gt; [AggConfigOptions](./kibana-plugin-plugins-data-public.aggconfigoptions.md) &gt; [id](./kibana-plugin-plugins-data-public.aggconfigoptions.id.md)
+
+## AggConfigOptions.id property
+
+<b>Signature:</b>
+
+```typescript
+id?: string;
+```
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.aggconfigoptions.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.aggconfigoptions.md
new file mode 100644
index 0000000000000..b841d9b04d6a7
--- /dev/null
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.aggconfigoptions.md
@@ -0,0 +1,22 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) &gt; [AggConfigOptions](./kibana-plugin-plugins-data-public.aggconfigoptions.md)
+
+## AggConfigOptions interface
+
+<b>Signature:</b>
+
+```typescript
+export interface AggConfigOptions 
+```
+
+## Properties
+
+|  Property | Type | Description |
+|  --- | --- | --- |
+|  [enabled](./kibana-plugin-plugins-data-public.aggconfigoptions.enabled.md) | <code>boolean</code> |  |
+|  [id](./kibana-plugin-plugins-data-public.aggconfigoptions.id.md) | <code>string</code> |  |
+|  [params](./kibana-plugin-plugins-data-public.aggconfigoptions.params.md) | <code>Record&lt;string, any&gt;</code> |  |
+|  [schema](./kibana-plugin-plugins-data-public.aggconfigoptions.schema.md) | <code>string</code> |  |
+|  [type](./kibana-plugin-plugins-data-public.aggconfigoptions.type.md) | <code>IAggType</code> |  |
+
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.aggconfigoptions.params.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.aggconfigoptions.params.md
new file mode 100644
index 0000000000000..45219a837cc33
--- /dev/null
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.aggconfigoptions.params.md
@@ -0,0 +1,11 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) &gt; [AggConfigOptions](./kibana-plugin-plugins-data-public.aggconfigoptions.md) &gt; [params](./kibana-plugin-plugins-data-public.aggconfigoptions.params.md)
+
+## AggConfigOptions.params property
+
+<b>Signature:</b>
+
+```typescript
+params?: Record<string, any>;
+```
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.aggconfigoptions.schema.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.aggconfigoptions.schema.md
new file mode 100644
index 0000000000000..b2b42eb2e5b4d
--- /dev/null
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.aggconfigoptions.schema.md
@@ -0,0 +1,11 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) &gt; [AggConfigOptions](./kibana-plugin-plugins-data-public.aggconfigoptions.md) &gt; [schema](./kibana-plugin-plugins-data-public.aggconfigoptions.schema.md)
+
+## AggConfigOptions.schema property
+
+<b>Signature:</b>
+
+```typescript
+schema?: string;
+```
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.aggconfigoptions.type.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.aggconfigoptions.type.md
new file mode 100644
index 0000000000000..866065ce52ba6
--- /dev/null
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.aggconfigoptions.type.md
@@ -0,0 +1,11 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) &gt; [AggConfigOptions](./kibana-plugin-plugins-data-public.aggconfigoptions.md) &gt; [type](./kibana-plugin-plugins-data-public.aggconfigoptions.type.md)
+
+## AggConfigOptions.type property
+
+<b>Signature:</b>
+
+```typescript
+type: IAggType;
+```
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.md
index f8516ec476e88..ea77d6f39389b 100644
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.md
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.md
@@ -48,6 +48,7 @@
 
 |  Interface | Description |
 |  --- | --- |
+|  [AggConfigOptions](./kibana-plugin-plugins-data-public.aggconfigoptions.md) |  |
 |  [AggParamOption](./kibana-plugin-plugins-data-public.aggparamoption.md) |  |
 |  [DataPublicPluginSetup](./kibana-plugin-plugins-data-public.datapublicpluginsetup.md) |  |
 |  [DataPublicPluginStart](./kibana-plugin-plugins-data-public.datapublicpluginstart.md) |  |
diff --git a/src/legacy/core_plugins/input_control_vis/public/input_control_vis_type.ts b/src/legacy/core_plugins/input_control_vis/public/input_control_vis_type.ts
index dae6c9abb625e..023e6ebb7125c 100644
--- a/src/legacy/core_plugins/input_control_vis/public/input_control_vis_type.ts
+++ b/src/legacy/core_plugins/input_control_vis/public/input_control_vis_type.ts
@@ -22,7 +22,6 @@ import { i18n } from '@kbn/i18n';
 import { createInputControlVisController } from './vis_controller';
 import { getControlsTab } from './components/editor/controls_tab';
 import { OptionsTab } from './components/editor/options_tab';
-import { Status } from '../../visualizations/public';
 import { InputControlVisDependencies } from './plugin';
 import { defaultFeedbackMessage } from '../../../../plugins/kibana_utils/common';
 
@@ -40,7 +39,6 @@ export function createInputControlVisTypeDefinition(deps: InputControlVisDepende
       defaultMessage: 'Create interactive controls for easy dashboard manipulation.',
     }),
     stage: 'experimental',
-    requiresUpdateStatus: [Status.PARAMS, Status.TIME],
     feedbackMessage: defaultFeedbackMessage,
     visualization: InputControlVisController,
     visConfig: {
diff --git a/src/legacy/core_plugins/input_control_vis/public/vis_controller.tsx b/src/legacy/core_plugins/input_control_vis/public/vis_controller.tsx
index 624d000dd8d7a..c0ab235c1b9d1 100644
--- a/src/legacy/core_plugins/input_control_vis/public/vis_controller.tsx
+++ b/src/legacy/core_plugins/input_control_vis/public/vis_controller.tsx
@@ -54,7 +54,7 @@ export const createInputControlVisController = (deps: InputControlVisDependencie
         .subscribe(this.queryBarUpdateHandler);
     }
 
-    async render(visData: any, visParams: VisParams, status: any) {
+    async render(visData: any, visParams: VisParams) {
       this.visParams = visParams;
       this.controls = [];
       this.controls = await this.initControls();
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 278317ec2e87b..8e4e77b2d18a6 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
@@ -672,7 +672,7 @@ function discoverController(
         // no timefield, no vis, nothing to update
         if (!getTimeField() || !$scope.vis) return;
 
-        const buckets = $scope.vis.getAggConfig().byTypeName('buckets');
+        const buckets = $scope.vis.data.aggs.byTypeName('buckets');
 
         if (buckets && buckets.length === 1) {
           $scope.bucketInterval = buckets[0].buckets.getInterval();
@@ -876,11 +876,11 @@ function discoverController(
     inspectorRequest.stats(getResponseInspectorStats($scope.searchSource, resp)).ok({ json: resp });
 
     if (getTimeField()) {
-      const tabifiedData = tabifyAggResponse($scope.vis.aggs, resp);
+      const tabifiedData = tabifyAggResponse($scope.vis.data.aggs, resp);
       $scope.searchSource.rawResponse = resp;
       $scope.histogramData = discoverResponseHandler(
         tabifiedData,
-        getDimensions($scope.vis.aggs.aggs, $scope.timeRange)
+        getDimensions($scope.vis.data.aggs.aggs, $scope.timeRange)
       );
     }
 
@@ -1023,41 +1023,27 @@ function discoverController(
       },
     ];
 
-    if ($scope.vis) {
-      const visState = $scope.vis.getEnabledState();
-      visState.aggs = visStateAggs;
-
-      $scope.vis.setState(visState);
-      return;
-    }
-
-    const visSavedObject = {
-      indexPattern: $scope.indexPattern.id,
-      visState: {
-        type: 'histogram',
-        title: savedSearch.title,
-        params: {
-          addLegend: false,
-          addTimeMarker: true,
-        },
+    $scope.vis = visualizations.createVis('histogram', {
+      title: savedSearch.title,
+      params: {
+        addLegend: false,
+        addTimeMarker: true,
+      },
+      data: {
         aggs: visStateAggs,
+        indexPattern: $scope.searchSource.getField('index').id,
+        searchSource: $scope.searchSource,
       },
-    };
-
-    $scope.vis = visualizations.createVis(
-      $scope.searchSource.getField('index'),
-      visSavedObject.visState
-    );
-    visSavedObject.vis = $scope.vis;
+    });
 
     $scope.searchSource.onRequestStart((searchSource, options) => {
       if (!$scope.vis) return;
-      return $scope.vis.getAggConfig().onSearchRequestStart(searchSource, options);
+      return $scope.vis.data.aggs.onSearchRequestStart(searchSource, options);
     });
 
     $scope.searchSource.setField('aggs', function() {
       if (!$scope.vis) return;
-      return $scope.vis.getAggConfig().toDsl();
+      return $scope.vis.data.aggs.toDsl();
     });
   }
 
diff --git a/src/legacy/core_plugins/kibana/public/visualize/np_ready/breadcrumbs.ts b/src/legacy/core_plugins/kibana/public/visualize/np_ready/breadcrumbs.ts
index c334172805b9f..b6a63d50b205b 100644
--- a/src/legacy/core_plugins/kibana/public/visualize/np_ready/breadcrumbs.ts
+++ b/src/legacy/core_plugins/kibana/public/visualize/np_ready/breadcrumbs.ts
@@ -69,7 +69,7 @@ export function getEditBreadcrumbs($route: any) {
   return [
     ...getLandingBreadcrumbs(),
     {
-      text: $route.current.locals.savedVis.title,
+      text: $route.current.locals.resolved.savedVis.title,
     },
   ];
 }
diff --git a/src/legacy/core_plugins/kibana/public/visualize/np_ready/editor/editor.html b/src/legacy/core_plugins/kibana/public/visualize/np_ready/editor/editor.html
index 28baf21925cbe..0dcacd30fba4e 100644
--- a/src/legacy/core_plugins/kibana/public/visualize/np_ready/editor/editor.html
+++ b/src/legacy/core_plugins/kibana/public/visualize/np_ready/editor/editor.html
@@ -69,7 +69,8 @@
   <visualization-embedded
     ng-if="!isVisible"
     class="visualize"
-    saved-obj="savedVis"
+    vis="vis"
+    embeddable-handler="embeddableHandler"
     ui-state="uiState"
     time-range="timeRange"
     filters="filters"
@@ -89,13 +90,15 @@
   </h1>
   <visualization-editor
     ng-if="isVisible"
-    saved-obj="savedVis"
+    vis="vis"
+    saved-search="savedSearch"
+    embeddable-handler="embeddableHandler"
+    event-emitter="eventEmitter"
     ui-state="uiState"
     time-range="timeRange"
     filters="filters"
     query="query"
     class="visEditor__content"
-    app-state="appState"
   />
 
 </visualize-app>
diff --git a/src/legacy/core_plugins/kibana/public/visualize/np_ready/editor/editor.js b/src/legacy/core_plugins/kibana/public/visualize/np_ready/editor/editor.js
index 7d1c29fbf48da..c5325ca3108b4 100644
--- a/src/legacy/core_plugins/kibana/public/visualize/np_ready/editor/editor.js
+++ b/src/legacy/core_plugins/kibana/public/visualize/np_ready/editor/editor.js
@@ -22,6 +22,7 @@ import _ from 'lodash';
 import { Subscription } from 'rxjs';
 import { map } from 'rxjs/operators';
 import { i18n } from '@kbn/i18n';
+import { EventEmitter } from 'events';
 
 import React from 'react';
 import { FormattedMessage } from '@kbn/i18n/react';
@@ -84,6 +85,7 @@ function VisualizeAppController($scope, $route, $injector, $timeout, kbnUrlState
     uiSettings,
     I18nContext,
     setActiveUrl,
+    visualizations,
   } = getServices();
 
   const {
@@ -98,27 +100,63 @@ function VisualizeAppController($scope, $route, $injector, $timeout, kbnUrlState
   );
 
   // Retrieve the resolved SavedVis instance.
-  const savedVis = $route.current.locals.savedVis;
+  const { vis, savedVis, savedSearch, embeddableHandler } = $route.current.locals.resolved;
+  $scope.eventEmitter = new EventEmitter();
   const _applyVis = () => {
     $scope.$apply();
   };
   // This will trigger a digest cycle. This is needed when vis is updated from a global angular like in visualize_embeddable.js.
-  savedVis.vis.on('apply', _applyVis);
+  $scope.eventEmitter.on('apply', _applyVis);
   // vis is instance of src/legacy/ui/public/vis/vis.js.
   // SearchSource is a promise-based stream of search results that can inherit from other search sources.
-  const { vis, searchSource, savedSearch } = savedVis;
+  const searchSource = vis.data.searchSource;
 
   $scope.vis = vis;
+  $scope.savedSearch = savedSearch;
 
   const $appStatus = {
     dirty: !savedVis.id,
   };
 
-  vis.on('dirtyStateChange', ({ isDirty }) => {
-    vis.dirty = isDirty;
-    $scope.$digest();
+  const defaultQuery = {
+    query: '',
+    language:
+      localStorage.get('kibana.userQueryLanguage') || uiSettings.get('search:queryLanguage'),
+  };
+
+  const visStateToEditorState = () => {
+    const savedVisState = visualizations.convertFromSerializedVis(vis.serialize());
+    return {
+      uiState: vis.uiState.toJSON(),
+      query: vis.data.searchSource.getOwnField('query') || defaultQuery,
+      filters: vis.data.searchSource.getOwnField('filter') || [],
+      vis: { ...savedVisState.visState, title: vis.title },
+      linked: !!savedVis.savedSearchId,
+    };
+  };
+
+  const stateDefaults = visStateToEditorState();
+
+  const { stateContainer, stopStateSync } = useVisualizeAppState({
+    stateDefaults,
+    kbnUrlStateStorage,
+  });
+
+  $scope.eventEmitter.on('dirtyStateChange', ({ isDirty }) => {
+    if (!isDirty) {
+      stateContainer.transitions.updateVisState(visStateToEditorState().vis);
+    }
+    $timeout(() => {
+      $scope.dirty = isDirty;
+    });
+  });
+
+  $scope.eventEmitter.on('updateVis', () => {
+    embeddableHandler.reload();
   });
 
+  $scope.embeddableHandler = embeddableHandler;
+
   $scope.topNavMenu = [
     ...(visualizeCapabilities.save
       ? [
@@ -135,10 +173,10 @@ function VisualizeAppController($scope, $route, $injector, $timeout, kbnUrlState
             ),
             testId: 'visualizeSaveButton',
             disableButton() {
-              return Boolean(vis.dirty);
+              return Boolean($scope.dirty);
             },
             tooltip() {
-              if (vis.dirty) {
+              if ($scope.dirty) {
                 return i18n.translate(
                   'kbn.visualize.topNavMenu.saveVisualizationDisabledButtonTooltip',
                   {
@@ -207,7 +245,7 @@ function VisualizeAppController($scope, $route, $injector, $timeout, kbnUrlState
       }),
       testId: 'shareTopNavButton',
       run: anchorElement => {
-        const hasUnappliedChanges = vis.dirty;
+        const hasUnappliedChanges = $scope.dirty;
         const hasUnsavedChanges = $appStatus.dirty;
         share.toggleShareContextMenu({
           anchorElement,
@@ -233,17 +271,17 @@ function VisualizeAppController($scope, $route, $injector, $timeout, kbnUrlState
       }),
       testId: 'openInspectorButton',
       disableButton() {
-        return !vis.hasInspector || !vis.hasInspector();
+        return !embeddableHandler.hasInspector || !embeddableHandler.hasInspector();
       },
       run() {
-        const inspectorSession = vis.openInspector();
+        const inspectorSession = embeddableHandler.openInspector();
         // Close the inspector if this scope is destroyed (e.g. because the user navigates away).
         const removeWatch = $scope.$on('$destroy', () => inspectorSession.close());
         // Remove that watch in case the user closes the inspector session herself.
         inspectorSession.onClose.finally(removeWatch);
       },
       tooltip() {
-        if (!vis.hasInspector || !vis.hasInspector()) {
+        if (!embeddableHandler.hasInspector || !embeddableHandler.hasInspector()) {
           return i18n.translate('kbn.visualize.topNavMenu.openInspectorDisabledButtonTooltip', {
             defaultMessage: `This visualization doesn't support any inspectors.`,
           });
@@ -257,7 +295,7 @@ function VisualizeAppController($scope, $route, $injector, $timeout, kbnUrlState
         defaultMessage: 'Refresh',
       }),
       run: function() {
-        vis.forceReload();
+        embeddableHandler.reload();
       },
       testId: 'visualizeRefreshButton',
     },
@@ -267,28 +305,6 @@ function VisualizeAppController($scope, $route, $injector, $timeout, kbnUrlState
     chrome.docTitle.change(savedVis.title);
   }
 
-  const defaultQuery = {
-    query: '',
-    language:
-      localStorage.get('kibana.userQueryLanguage') || uiSettings.get('search:queryLanguage'),
-  };
-
-  // Extract visualization state with filtered aggs. You can see these filtered aggs in the URL.
-  // Consists of things like aggs, params, listeners, title, type, etc.
-  const savedVisState = vis.getState();
-  const stateDefaults = {
-    uiState: savedVis.uiStateJSON ? JSON.parse(savedVis.uiStateJSON) : {},
-    query: searchSource.getOwnField('query') || defaultQuery,
-    filters: searchSource.getOwnField('filter') || [],
-    vis: savedVisState,
-    linked: !!savedVis.savedSearchId,
-  };
-
-  const { stateContainer, stopStateSync } = useVisualizeAppState({
-    stateDefaults,
-    kbnUrlStateStorage,
-  });
-
   // sync initial app filters from state to filterManager
   filterManager.setAppFilters(_.cloneDeep(stateContainer.getState().filters));
   // setup syncing of app filters between appState and filterManager
@@ -315,7 +331,8 @@ function VisualizeAppController($scope, $route, $injector, $timeout, kbnUrlState
   // appState then they won't be equal.
   if (!_.isEqual(stateContainer.getState().vis, stateDefaults.vis)) {
     try {
-      vis.setState(stateContainer.getState().vis);
+      const { aggs, ...visState } = stateContainer.getState().vis;
+      vis.setState({ ...visState, data: { aggs } });
     } catch (error) {
       // stop syncing url updtes with the state to prevent extra syncing
       stopAllSyncing();
@@ -369,8 +386,8 @@ function VisualizeAppController($scope, $route, $injector, $timeout, kbnUrlState
   };
 
   function init() {
-    if (vis.indexPattern) {
-      $scope.indexPattern = vis.indexPattern;
+    if (vis.data.indexPattern) {
+      $scope.indexPattern = vis.data.indexPattern;
     } else {
       indexPatterns.getDefault().then(defaultIndexPattern => {
         $scope.indexPattern = defaultIndexPattern;
@@ -379,22 +396,14 @@ function VisualizeAppController($scope, $route, $injector, $timeout, kbnUrlState
 
     const initialState = stateContainer.getState();
 
-    $scope.appState = {
-      // mock implementation of the legacy appState.save()
-      // this could be even replaced by passing only "updateAppState" callback
-      save() {
-        stateContainer.transitions.updateVisState(vis.getState());
-      },
-    };
-
     const handleLinkedSearch = linked => {
       if (linked && !savedVis.savedSearchId && savedSearch) {
         savedVis.savedSearchId = savedSearch.id;
-        vis.savedSearchId = savedSearch.id;
+        vis.data.savedSearchId = savedSearch.id;
         searchSource.setParent(savedSearch.searchSource);
       } else if (!linked && savedVis.savedSearchId) {
         delete savedVis.savedSearchId;
-        delete vis.savedSearchId;
+        delete vis.data.savedSearchId;
       }
     };
 
@@ -403,6 +412,7 @@ function VisualizeAppController($scope, $route, $injector, $timeout, kbnUrlState
       'uiState',
       stateContainer
     );
+    vis.uiState = persistedState;
     $scope.uiState = persistedState;
     $scope.savedVis = savedVis;
     $scope.query = initialState.query;
@@ -427,7 +437,7 @@ function VisualizeAppController($scope, $route, $injector, $timeout, kbnUrlState
     $scope.showQueryBarTimePicker = () => {
       // tsvb loads without an indexPattern initially (TODO investigate).
       // hide timefilter only if timeFieldName is explicitly undefined.
-      const hasTimeField = vis.indexPattern ? !!vis.indexPattern.timeFieldName : true;
+      const hasTimeField = vis.data.indexPattern ? !!vis.data.indexPattern.timeFieldName : true;
       return vis.type.options.showTimePicker && hasTimeField;
     };
 
@@ -442,10 +452,24 @@ function VisualizeAppController($scope, $route, $injector, $timeout, kbnUrlState
       updateSavedQueryFromUrl(state.savedQuery);
 
       // if the browser history was changed manually we need to reflect changes in the editor
-      if (!_.isEqual(vis.getState(), state.vis)) {
-        vis.setState(state.vis);
-        vis.forceReload();
-        vis.emit('updateEditor');
+      if (
+        !_.isEqual(
+          {
+            ...visualizations.convertFromSerializedVis(vis.serialize()).visState,
+            title: vis.title,
+          },
+          state.vis
+        )
+      ) {
+        const { aggs, ...visState } = state.vis;
+        vis.setState({
+          ...visState,
+          data: {
+            aggs,
+          },
+        });
+        embeddableHandler.reload();
+        $scope.eventEmitter.emit('updateEditor');
       }
 
       $appStatus.dirty = true;
@@ -498,8 +522,8 @@ function VisualizeAppController($scope, $route, $injector, $timeout, kbnUrlState
       const { query, linked, filters } = stateContainer.getState();
       $scope.query = query;
       handleLinkedSearch(linked);
-      savedVis.searchSource.setField('query', query);
-      savedVis.searchSource.setField('filter', filters);
+      vis.data.searchSource.setField('query', query);
+      vis.data.searchSource.setField('filter', filters);
       $scope.$broadcast('render');
     };
 
@@ -533,7 +557,7 @@ function VisualizeAppController($scope, $route, $injector, $timeout, kbnUrlState
       }
       savedVis.destroy();
       subscriptions.unsubscribe();
-      $scope.vis.off('apply', _applyVis);
+      $scope.eventEmitter.off('apply', _applyVis);
 
       unsubscribePersisted();
       unsubscribeStateUpdates();
@@ -556,7 +580,7 @@ function VisualizeAppController($scope, $route, $injector, $timeout, kbnUrlState
 
     // If nothing has changed, trigger the fetch manually, otherwise it will happen as a result of the changes
     if (!isUpdate) {
-      $scope.vis.forceReload();
+      embeddableHandler.reload();
     }
   };
 
@@ -605,8 +629,10 @@ function VisualizeAppController($scope, $route, $injector, $timeout, kbnUrlState
       title: savedVis.title,
       type: savedVis.type || stateContainer.getState().vis.type,
     });
+    savedVis.searchSource.setField('query', stateContainer.getState().query);
+    savedVis.searchSource.setField('filter', stateContainer.getState().filters);
     savedVis.visState = stateContainer.getState().vis;
-    savedVis.uiStateJSON = angular.toJson($scope.uiState.getChanges());
+    savedVis.uiStateJSON = angular.toJson($scope.uiState.toJSON());
     $appStatus.dirty = false;
 
     return savedVis.save(saveOptions).then(
@@ -720,7 +746,7 @@ function VisualizeAppController($scope, $route, $injector, $timeout, kbnUrlState
     );
   };
 
-  vis.on('unlinkFromSavedSearch', unlinkFromSavedSearch);
+  $scope.eventEmitter.on('unlinkFromSavedSearch', unlinkFromSavedSearch);
 
   addHelpMenuToAppChrome(chrome, docLinks);
 
diff --git a/src/legacy/core_plugins/kibana/public/visualize/np_ready/editor/visualization.js b/src/legacy/core_plugins/kibana/public/visualize/np_ready/editor/visualization.js
index c8acea168444f..fbabd6fc87c98 100644
--- a/src/legacy/core_plugins/kibana/public/visualize/np_ready/editor/visualization.js
+++ b/src/legacy/core_plugins/kibana/public/visualize/np_ready/editor/visualization.js
@@ -17,12 +17,12 @@
  * under the License.
  */
 
-export function initVisualizationDirective(app, deps) {
+export function initVisualizationDirective(app) {
   app.directive('visualizationEmbedded', function($timeout) {
     return {
       restrict: 'E',
       scope: {
-        savedObj: '=',
+        embeddableHandler: '=',
         uiState: '=?',
         timeRange: '=',
         filters: '=',
@@ -31,24 +31,16 @@ export function initVisualizationDirective(app, deps) {
       },
       link: function($scope, element) {
         $scope.renderFunction = async () => {
-          if (!$scope._handler) {
-            $scope._handler = await deps.embeddable
-              .getEmbeddableFactory('visualization')
-              .createFromObject($scope.savedObj, {
-                timeRange: $scope.timeRange,
-                filters: $scope.filters || [],
-                query: $scope.query,
-                appState: $scope.appState,
-                uiState: $scope.uiState,
-              });
-            $scope._handler.render(element[0]);
-          } else {
-            $scope._handler.updateInput({
-              timeRange: $scope.timeRange,
-              filters: $scope.filters || [],
-              query: $scope.query,
-            });
+          if (!$scope.rendered) {
+            $scope.embeddableHandler.render(element[0]);
+            $scope.rendered = true;
           }
+
+          $scope.embeddableHandler.updateInput({
+            timeRange: $scope.timeRange,
+            filters: $scope.filters || [],
+            query: $scope.query,
+          });
         };
 
         $scope.$on('render', event => {
@@ -59,8 +51,8 @@ export function initVisualizationDirective(app, deps) {
         });
 
         $scope.$on('$destroy', () => {
-          if ($scope._handler) {
-            $scope._handler.destroy();
+          if ($scope.embeddableHandler) {
+            $scope.embeddableHandler.destroy();
           }
         });
       },
diff --git a/src/legacy/core_plugins/kibana/public/visualize/np_ready/editor/visualization_editor.js b/src/legacy/core_plugins/kibana/public/visualize/np_ready/editor/visualization_editor.js
index f2d9cbe2ad84c..ef174dbaa5865 100644
--- a/src/legacy/core_plugins/kibana/public/visualize/np_ready/editor/visualization_editor.js
+++ b/src/legacy/core_plugins/kibana/public/visualize/np_ready/editor/visualization_editor.js
@@ -22,16 +22,23 @@ export function initVisEditorDirective(app, deps) {
     return {
       restrict: 'E',
       scope: {
-        savedObj: '=',
+        vis: '=',
         uiState: '=?',
         timeRange: '=',
         filters: '=',
         query: '=',
-        appState: '=',
+        savedSearch: '=',
+        embeddableHandler: '=',
+        eventEmitter: '=',
       },
       link: function($scope, element) {
-        const Editor = $scope.savedObj.vis.type.editor || deps.DefaultVisualizationEditor;
-        const editor = new Editor(element[0], $scope.savedObj);
+        const Editor = $scope.vis.type.editor || deps.DefaultVisualizationEditor;
+        const editor = new Editor(
+          element[0],
+          $scope.vis,
+          $scope.eventEmitter,
+          $scope.embeddableHandler
+        );
 
         $scope.renderFunction = () => {
           editor.render({
@@ -42,8 +49,8 @@ export function initVisEditorDirective(app, deps) {
             timeRange: $scope.timeRange,
             filters: $scope.filters,
             query: $scope.query,
-            appState: $scope.appState,
-            linked: !!$scope.savedObj.savedSearchId,
+            linked: !!$scope.vis.data.savedSearchId,
+            savedSearch: $scope.savedSearch,
           });
         };
 
diff --git a/src/legacy/core_plugins/kibana/public/visualize/np_ready/legacy_app.js b/src/legacy/core_plugins/kibana/public/visualize/np_ready/legacy_app.js
index 0f1d50b149cd9..b0b1ae31a02a5 100644
--- a/src/legacy/core_plugins/kibana/public/visualize/np_ready/legacy_app.js
+++ b/src/legacy/core_plugins/kibana/public/visualize/np_ready/legacy_app.js
@@ -40,6 +40,50 @@ import {
   getCreateBreadcrumbs,
   getEditBreadcrumbs,
 } from './breadcrumbs';
+import { createSavedSearchesLoader } from '../../../../../../plugins/discover/public';
+
+const getResolvedResults = deps => {
+  const { core, data, visualizations } = deps;
+
+  const results = {};
+
+  return savedVis => {
+    results.savedVis = savedVis;
+    return visualizations
+      .convertToSerializedVis(savedVis)
+      .then(serializedVis => visualizations.createVis(serializedVis.type, serializedVis))
+      .then(vis => {
+        if (vis.type.setup) {
+          return vis.type.setup(vis).catch(() => vis);
+        }
+        return vis;
+      })
+      .then(vis => {
+        results.vis = vis;
+        return deps.embeddable.getEmbeddableFactory('visualization').createFromObject(results.vis, {
+          timeRange: data.query.timefilter.timefilter.getTime(),
+          filters: data.query.filterManager.getFilters(),
+        });
+      })
+      .then(embeddableHandler => {
+        results.embeddableHandler = embeddableHandler;
+        if (results.vis.data.savedSearchId) {
+          return createSavedSearchesLoader({
+            savedObjectsClient: core.savedObjects.client,
+            indexPatterns: data.indexPatterns,
+            chrome: core.chrome,
+            overlays: core.overlays,
+          }).get(results.vis.data.savedSearchId);
+        }
+      })
+      .then(savedSearch => {
+        if (savedSearch) {
+          results.savedSearch = savedSearch;
+        }
+        return results;
+      });
+  };
+};
 
 export function initVisualizeApp(app, deps) {
   initVisualizeAppDirective(app, deps);
@@ -101,7 +145,7 @@ export function initVisualizeApp(app, deps) {
         template: editorTemplate,
         k7Breadcrumbs: getCreateBreadcrumbs,
         resolve: {
-          savedVis: function($route, history) {
+          resolved: function($route, history) {
             const { core, data, savedVisualizations, visualizations, toastNotifications } = deps;
             const visTypes = visualizations.all();
             const visType = find(visTypes, { name: $route.current.params.type });
@@ -121,12 +165,7 @@ export function initVisualizeApp(app, deps) {
 
             return ensureDefaultIndexPattern(core, data, history)
               .then(() => savedVisualizations.get($route.current.params))
-              .then(savedVis => {
-                if (savedVis.vis.type.setup) {
-                  return savedVis.vis.type.setup(savedVis).catch(() => savedVis);
-                }
-                return savedVis;
-              })
+              .then(getResolvedResults(deps))
               .catch(
                 redirectWhenMissing({
                   history,
@@ -142,20 +181,16 @@ export function initVisualizeApp(app, deps) {
         template: editorTemplate,
         k7Breadcrumbs: getEditBreadcrumbs,
         resolve: {
-          savedVis: function($route, history) {
+          resolved: function($route, history) {
             const { chrome, core, data, savedVisualizations, toastNotifications } = deps;
+
             return ensureDefaultIndexPattern(core, data, history)
               .then(() => savedVisualizations.get($route.current.params.id))
               .then(savedVis => {
                 chrome.recentlyAccessed.add(savedVis.getFullPath(), savedVis.title, savedVis.id);
                 return savedVis;
               })
-              .then(savedVis => {
-                if (savedVis.vis.type.setup) {
-                  return savedVis.vis.type.setup(savedVis).catch(() => savedVis);
-                }
-                return savedVis;
-              })
+              .then(getResolvedResults(deps))
               .catch(
                 redirectWhenMissing({
                   history,
diff --git a/src/legacy/core_plugins/kibana/public/visualize/np_ready/types.d.ts b/src/legacy/core_plugins/kibana/public/visualize/np_ready/types.d.ts
index 01ce872aeb679..246a031f05769 100644
--- a/src/legacy/core_plugins/kibana/public/visualize/np_ready/types.d.ts
+++ b/src/legacy/core_plugins/kibana/public/visualize/np_ready/types.d.ts
@@ -29,8 +29,10 @@ import { PersistedState } from 'src/plugins/visualizations/public';
 import { LegacyCoreStart } from 'kibana/public';
 import { Vis } from 'src/legacy/core_plugins/visualizations/public';
 import { VisSavedObject } from '../legacy_imports';
+import { SavedVisState } from '../../../../visualizations/public/np_ready/public/types';
+import { SavedSearch } from '../../../../../../plugins/discover/public';
 
-export type PureVisState = ReturnType<Vis['getCurrentState']>;
+export type PureVisState = SavedVisState;
 
 export interface VisualizeAppState {
   filters: Filter[];
@@ -58,14 +60,13 @@ export interface VisualizeAppStateTransitions {
 }
 
 export interface EditorRenderProps {
-  appState: { save(): void };
   core: LegacyCoreStart;
   data: DataPublicPluginStart;
-  embeddable: EmbeddableStart;
   filters: Filter[];
-  uiState: PersistedState;
   timeRange: TimeRange;
   query?: Query;
+  savedSearch?: SavedSearch;
+  uiState: PersistedState;
   /**
    * Flag to determine if visualiztion is linked to the saved search
    */
diff --git a/src/legacy/core_plugins/region_map/public/__tests__/region_map_visualization.js b/src/legacy/core_plugins/region_map/public/__tests__/region_map_visualization.js
index 6bdb5d00e67d8..23ca99791e92e 100644
--- a/src/legacy/core_plugins/region_map/public/__tests__/region_map_visualization.js
+++ b/src/legacy/core_plugins/region_map/public/__tests__/region_map_visualization.js
@@ -21,7 +21,6 @@ import expect from '@kbn/expect';
 import ngMock from 'ng_mock';
 import _ from 'lodash';
 import ChoroplethLayer from '../choropleth_layer';
-import LogstashIndexPatternStubProvider from 'fixtures/stubbed_logstash_index_pattern';
 import { ImageComparator } from 'test_utils/image_comparator';
 import worldJson from './world.json';
 import EMS_CATALOGUE from '../../../../ui/public/vis/__tests__/map/ems_mocks/sample_manifest.json';
@@ -38,13 +37,11 @@ import afterdatachangePng from './afterdatachange.png';
 import afterdatachangeandresizePng from './afterdatachangeandresize.png';
 import aftercolorchangePng from './aftercolorchange.png';
 import changestartupPng from './changestartup.png';
-import {
-  setup as visualizationsSetup,
-  start as visualizationsStart,
-} from '../../../visualizations/public/np_ready/public/legacy';
+import { setup as visualizationsSetup } from '../../../visualizations/public/np_ready/public/legacy';
 
 import { createRegionMapVisualization } from '../region_map_visualization';
 import { createRegionMapTypeDefinition } from '../region_map_type';
+import { ExprVis } from '../../../visualizations/public/np_ready/public/expressions/vis';
 
 const THRESHOLD = 0.45;
 const PIXEL_DIFF = 96;
@@ -52,7 +49,6 @@ const PIXEL_DIFF = 96;
 describe('RegionMapsVisualizationTests', function() {
   let domNode;
   let RegionMapsVisualization;
-  let indexPattern;
   let vis;
   let dependencies;
 
@@ -115,7 +111,6 @@ describe('RegionMapsVisualizationTests', function() {
       }
 
       RegionMapsVisualization = createRegionMapVisualization(dependencies);
-      indexPattern = Private(LogstashIndexPatternStubProvider);
 
       ChoroplethLayer.prototype._makeJsonAjaxCall = async function() {
         //simulate network call
@@ -158,7 +153,7 @@ describe('RegionMapsVisualizationTests', function() {
 
       imageComparator = new ImageComparator();
 
-      vis = visualizationsStart.createVis(indexPattern, {
+      vis = new ExprVis({
         type: 'region_map',
       });
 
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 9a1a76362e094..4faa3f92abb5a 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
@@ -20,7 +20,6 @@ import React from 'react';
 import { i18n } from '@kbn/i18n';
 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';
@@ -55,7 +54,6 @@ provided base maps, or add your own. Darker colors represent higher values.',
         showAllShapes: true, //still under consideration
       },
     },
-    requiresUpdateStatus: [Status.AGGS, Status.PARAMS, Status.RESIZE, Status.DATA, Status.UI_STATE],
     visualization,
     editorConfig: {
       optionsTemplate: props => <RegionMapOptions {...props} serviceSettings={serviceSettings} />,
@@ -100,9 +98,7 @@ provided base maps, or add your own. Darker colors represent higher values.',
         },
       ]),
     },
-    setup: async savedVis => {
-      const vis = savedVis.vis;
-
+    setup: async vis => {
       const tmsLayers = await serviceSettings.getTMSServices();
       vis.type.editorConfig.collections.tmsLayers = tmsLayers;
       if (!vis.params.wms.selectedTmsLayer && tmsLayers.length) {
@@ -146,7 +142,7 @@ provided base maps, or add your own. Darker colors represent higher values.',
         vis.params.selectedJoinField = selectedJoinField;
       }
 
-      return savedVis;
+      return vis;
     },
   };
 }
diff --git a/src/legacy/core_plugins/region_map/public/region_map_visualization.js b/src/legacy/core_plugins/region_map/public/region_map_visualization.js
index 8b5812052a395..25641ea76809d 100644
--- a/src/legacy/core_plugins/region_map/public/region_map_visualization.js
+++ b/src/legacy/core_plugins/region_map/public/region_map_visualization.js
@@ -39,8 +39,8 @@ export function createRegionMapVisualization({ serviceSettings, $injector, uiSet
       this._choroplethLayer = null;
     }
 
-    async render(esResponse, visParams, status) {
-      await super.render(esResponse, visParams, status);
+    async render(esResponse, visParams) {
+      await super.render(esResponse, visParams);
       if (this._choroplethLayer) {
         await this._choroplethLayer.whenDataLoaded();
       }
diff --git a/src/legacy/core_plugins/tile_map/public/__tests__/coordinate_maps_visualization.js b/src/legacy/core_plugins/tile_map/public/__tests__/coordinate_maps_visualization.js
index 6a08405b5b6a5..3b8a7dfbed313 100644
--- a/src/legacy/core_plugins/tile_map/public/__tests__/coordinate_maps_visualization.js
+++ b/src/legacy/core_plugins/tile_map/public/__tests__/coordinate_maps_visualization.js
@@ -19,7 +19,6 @@
 
 import expect from '@kbn/expect';
 import ngMock from 'ng_mock';
-import LogstashIndexPatternStubProvider from 'fixtures/stubbed_logstash_index_pattern';
 import { ImageComparator } from 'test_utils/image_comparator';
 import dummyESResponse from './dummy_es_response.json';
 import initial from './initial.png';
@@ -32,13 +31,11 @@ import EMS_TILES from '../../../../ui/public/vis/__tests__/map/ems_mocks/sample_
 import EMS_STYLE_ROAD_MAP_BRIGHT from '../../../../ui/public/vis/__tests__/map/ems_mocks/sample_style_bright';
 import EMS_STYLE_ROAD_MAP_DESATURATED from '../../../../ui/public/vis/__tests__/map/ems_mocks/sample_style_desaturated';
 import EMS_STYLE_DARK_MAP from '../../../../ui/public/vis/__tests__/map/ems_mocks/sample_style_dark';
-import {
-  setup as visualizationsSetup,
-  start as visualizationsStart,
-} from '../../../visualizations/public/np_ready/public/legacy';
+import { setup as visualizationsSetup } from '../../../visualizations/public/np_ready/public/legacy';
 
 import { createTileMapVisualization } from '../tile_map_visualization';
 import { createTileMapTypeDefinition } from '../tile_map_type';
+import { ExprVis } from '../../../visualizations/public/np_ready/public/expressions/vis';
 
 function mockRawData() {
   const stack = [dummyESResponse];
@@ -67,7 +64,6 @@ let visRegComplete = false;
 describe('CoordinateMapsVisualizationTest', function() {
   let domNode;
   let CoordinateMapsVisualization;
-  let indexPattern;
   let vis;
   let dependencies;
 
@@ -92,7 +88,6 @@ describe('CoordinateMapsVisualizationTest', function() {
       }
 
       CoordinateMapsVisualization = createTileMapVisualization(dependencies);
-      indexPattern = Private(LogstashIndexPatternStubProvider);
 
       getManifestStub = serviceSettings.__debugStubManifestCalls(async url => {
         //simulate network calls
@@ -124,7 +119,7 @@ describe('CoordinateMapsVisualizationTest', function() {
       setupDOM('512px', '512px');
 
       imageComparator = new ImageComparator();
-      vis = visualizationsStart.createVis(indexPattern, {
+      vis = new ExprVis({
         type: 'tile_map',
       });
       vis.params = {
diff --git a/src/legacy/core_plugins/tile_map/public/base_maps_visualization.js b/src/legacy/core_plugins/tile_map/public/base_maps_visualization.js
index ebb0c24243263..d38159c91ef9f 100644
--- a/src/legacy/core_plugins/tile_map/public/base_maps_visualization.js
+++ b/src/legacy/core_plugins/tile_map/public/base_maps_visualization.js
@@ -63,28 +63,21 @@ export function BaseMapsVisualizationProvider(serviceSettings) {
      * @param status
      * @return {Promise}
      */
-    async render(esResponse, visParams, status) {
+    async render(esResponse, visParams) {
       if (!this._kibanaMap) {
         //the visualization has been destroyed;
         return;
       }
 
       await this._mapIsLoaded;
-
-      if (status.resize) {
-        this._kibanaMap.resize();
-      }
-      if (status.params || status.aggs) {
-        this._params = visParams;
-        await this._updateParams();
-      }
+      this._kibanaMap.resize();
+      this._params = visParams;
+      await this._updateParams();
 
       if (this._hasESResponseChanged(esResponse)) {
         await this._updateData(esResponse);
       }
-      if (status.uiState) {
-        this._kibanaMap.useUiStateFromVisualization(this.vis);
-      }
+      this._kibanaMap.useUiStateFromVisualization(this.vis);
 
       await this._whenBaseLayerIsLoaded();
     }
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 0809bf6ecbab6..39d39a4c8f8fc 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
@@ -23,7 +23,6 @@ import { i18n } from '@kbn/i18n';
 import { convertToGeoJson } from 'ui/vis/map/convert_to_geojson';
 
 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';
 import { MapTypes } from './map_types';
@@ -57,7 +56,6 @@ export function createTileMapTypeDefinition(dependencies) {
         wms: uiSettings.get('visualization:tileMap:WMSdefaults'),
       },
     },
-    requiresUpdateStatus: [Status.AGGS, Status.PARAMS, Status.RESIZE, Status.UI_STATE],
     requiresPartialRows: true,
     visualization: CoordinateMapsVisualization,
     responseHandler: convertToGeoJson,
@@ -143,21 +141,20 @@ export function createTileMapTypeDefinition(dependencies) {
         },
       ]),
     },
-    setup: async savedVis => {
-      const vis = savedVis.vis;
+    setup: async vis => {
       let tmsLayers;
 
       try {
         tmsLayers = await serviceSettings.getTMSServices();
       } catch (e) {
-        return savedVis;
+        return vis;
       }
 
       vis.type.editorConfig.collections.tmsLayers = tmsLayers;
       if (!vis.params.wms.selectedTmsLayer && tmsLayers.length) {
         vis.params.wms.selectedTmsLayer = tmsLayers[0];
       }
-      return savedVis;
+      return vis;
     },
   };
 }
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 7e715be25bff3..feb5b3caa023b 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
@@ -22,12 +22,12 @@ import { mount, shallow } from 'enzyme';
 import { act } from 'react-dom/test-utils';
 
 import { IndexPattern, IAggType, AggGroupNames } from 'src/plugins/data/public';
-import { VisState } from 'src/legacy/core_plugins/visualizations/public';
 
 import { DefaultEditorAgg, DefaultEditorAggProps } from './agg';
 import { DefaultEditorAggParams } from './agg_params';
 import { AGGS_ACTION_KEYS } from './agg_group_state';
 import { Schema } from '../schemas';
+import { EditorVisState } from './sidebar/state/reducers';
 
 jest.mock('./agg_params', () => ({
   DefaultEditorAggParams: () => null,
@@ -67,7 +67,7 @@ describe('DefaultEditorAgg component', () => {
       isLastBucket: false,
       isRemovable: false,
       metricAggs: [],
-      state: { params: {} } as VisState,
+      state: { params: {} } as EditorVisState,
       setAggParamValue,
       setStateParamValue,
       onAggTypeChange: () => {},
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 ec92f511b6eee..3aae10879138a 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
@@ -17,9 +17,10 @@
  * under the License.
  */
 
-import { VisState, VisParams } from 'src/legacy/core_plugins/visualizations/public';
+import { VisParams } from 'src/legacy/core_plugins/visualizations/public';
 import { IAggType, IAggConfig, IAggGroupNames } from 'src/plugins/data/public';
 import { Schema } from '../schemas';
+import { EditorVisState } from './sidebar/state/reducers';
 
 type AggId = IAggConfig['id'];
 type AggParams = IAggConfig['params'];
@@ -31,7 +32,7 @@ export interface DefaultEditorCommonProps {
   formIsTouched: boolean;
   groupName: IAggGroupNames;
   metricAggs: IAggConfig[];
-  state: VisState;
+  state: EditorVisState;
   setAggParamValue: <T extends keyof AggParams>(
     aggId: AggId,
     paramName: T,
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 63f5e696c99f4..5d02f0a2c759e 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
@@ -20,12 +20,12 @@
 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 'src/plugins/data/public';
 import { DefaultEditorAggGroup, DefaultEditorAggGroupProps } from './agg_group';
 import { DefaultEditorAgg } from './agg';
 import { DefaultEditorAggAdd } from './agg_add';
 import { Schema } from '../schemas';
+import { EditorVisState } from './sidebar/state/reducers';
 
 jest.mock('@elastic/eui', () => ({
   EuiTitle: 'eui-title',
@@ -93,8 +93,8 @@ describe('DefaultEditorAgg component', () => {
       metricAggs: [],
       groupName: 'metrics',
       state: {
-        aggs,
-      } as VisState,
+        data: { aggs },
+      } as EditorVisState,
       schemas: [
         {
           name: 'metrics',
@@ -147,8 +147,8 @@ describe('DefaultEditorAgg component', () => {
     });
 
     expect(reorderAggs).toHaveBeenCalledWith(
-      defaultProps.state.aggs.aggs[0],
-      defaultProps.state.aggs.aggs[1]
+      defaultProps.state.data.aggs!.aggs[0],
+      defaultProps.state.data.aggs!.aggs[1]
     );
   });
 
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 600612f2cf9d8..08b69ef37f528 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
@@ -73,9 +73,10 @@ function DefaultEditorAggGroup({
   const schemaNames = getSchemasByGroup(schemas, groupName).map(s => s.name);
   const group: IAggConfig[] = useMemo(
     () =>
-      state.aggs.aggs.filter((agg: IAggConfig) => agg.schema && schemaNames.includes(agg.schema)) ||
-      [],
-    [state.aggs.aggs, schemaNames]
+      state.data.aggs!.aggs.filter(
+        (agg: IAggConfig) => agg.schema && schemaNames.includes(agg.schema)
+      ) || [],
+    [state.data.aggs, schemaNames]
   );
 
   const stats = {
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 7c2852798b403..aec332e8674d7 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
@@ -18,10 +18,10 @@
  */
 
 import { IAggConfig, AggParam, IndexPatternField } from 'src/plugins/data/public';
-import { VisState } from 'src/legacy/core_plugins/visualizations/public';
 import { ComboBoxGroupedOptions } from '../utils';
 import { EditorConfig } from './utils';
 import { Schema } from '../schemas';
+import { EditorVisState } from './sidebar/state/reducers';
 
 // NOTE: we cannot export the interface with export { InterfaceName }
 // as there is currently a bug on babel typescript transform plugin for it
@@ -35,7 +35,7 @@ export interface AggParamCommonProps<T, P = AggParam> {
   formIsTouched: boolean;
   indexedFields?: ComboBoxGroupedOptions<IndexPatternField>;
   showValidation: boolean;
-  state: VisState;
+  state: EditorVisState;
   value?: T;
   metricAggs: IAggConfig[];
   schemas: Schema[];
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 cd6486b6a1532..1c49ebf40640e 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
@@ -20,7 +20,6 @@
 import React from 'react';
 import { mount } from 'enzyme';
 
-import { VisState } from 'src/legacy/core_plugins/visualizations/public';
 import { IndexPattern, IAggConfig, AggGroupNames } from 'src/plugins/data/public';
 import {
   DefaultEditorAggParams as PureDefaultEditorAggParams,
@@ -28,6 +27,7 @@ import {
 } from './agg_params';
 import { KibanaContextProvider } from '../../../../../plugins/kibana_react/public';
 import { dataPluginMock } from '../../../../../plugins/data/public/mocks';
+import { EditorVisState } from './sidebar/state/reducers';
 
 const mockEditorConfig = {
   useNormalizedEsInterval: { hidden: false, fixedValue: false },
@@ -108,7 +108,7 @@ describe('DefaultEditorAggParams component', () => {
       formIsTouched: false,
       indexPattern: {} as IndexPattern,
       metricAggs: [],
-      state: {} as VisState,
+      state: {} as EditorVisState,
       setAggParamValue,
       onAggTypeChange,
       setTouched,
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 f2ebbdc87a60a..bed2561341737 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
@@ -25,7 +25,6 @@ import {
   IndexPattern,
   IndexPatternField,
 } from 'src/plugins/data/public';
-import { VisState } from 'src/legacy/core_plugins/visualizations/public';
 import {
   getAggParamsToRender,
   getAggTypeOptions,
@@ -34,6 +33,7 @@ import {
 import { FieldParamEditor, OrderByParamEditor } from './controls';
 import { EditorConfig } from './utils';
 import { Schema } from '../schemas';
+import { EditorVisState } from './sidebar/state/reducers';
 
 jest.mock('../utils', () => ({
   groupAndSortBy: jest.fn(() => ['indexedFields']),
@@ -58,7 +58,7 @@ describe('DefaultEditorAggParams helpers', () => {
         hideCustomLabel: true,
       } as Schema,
     ];
-    const state = {} as VisState;
+    const state = {} as EditorVisState;
     const metricAggs: IAggConfig[] = [];
     const emptyParams = {
       basic: [],
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 e07bf81697579..10590e1a59f4a 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
@@ -28,7 +28,6 @@ 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';
@@ -36,12 +35,13 @@ import { aggParamsMap } from './agg_params_map';
 import { EditorConfig } from './utils';
 import { Schema, getSchemaByName } from '../schemas';
 import { search } from '../../../../../plugins/data/public';
+import { EditorVisState } from './sidebar/state/reducers';
 
 interface ParamInstanceBase {
   agg: IAggConfig;
   editorConfig: EditorConfig;
   metricAggs: IAggConfig[];
-  state: VisState;
+  state: EditorVisState;
   schemas: Schema[];
   hideCustomLabel?: boolean;
 }
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 1043431475494..b33149dc51a19 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
@@ -23,9 +23,9 @@ import { mount, shallow, ReactWrapper } from 'enzyme';
 import { EuiComboBoxProps, EuiComboBox } from '@elastic/eui';
 
 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 { EditorVisState } from '../sidebar/state/reducers';
 
 function callComboBoxOnChange(comp: ReactWrapper, value: any = []) {
   const comboBoxProps = comp.find(EuiComboBox).props() as EuiComboBoxProps<any>;
@@ -78,7 +78,7 @@ describe('FieldParamEditor component', () => {
       setValue,
       setValidity,
       setTouched,
-      state: {} as VisState,
+      state: {} as EditorVisState,
       metricAggs: [] as IAggConfig[],
       schemas: [],
     };
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 76eb12af8c4e2..82166440cf8e8 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
@@ -20,9 +20,9 @@
 import React from 'react';
 import { AggParamEditorProps } from '../agg_param_props';
 import { IAggConfig } from 'src/plugins/data/public';
-import { VisState } from 'src/legacy/core_plugins/visualizations/public';
 import { mount } from 'enzyme';
 import { PercentilesEditor } from './percentiles';
+import { EditorVisState } from '../sidebar/state/reducers';
 
 describe('PercentilesEditor component', () => {
   let setValue: jest.Mock;
@@ -45,7 +45,7 @@ describe('PercentilesEditor component', () => {
       setValue,
       setValidity,
       setTouched,
-      state: {} as VisState,
+      state: {} as EditorVisState,
       metricAggs: [] as IAggConfig[],
       schemas: [],
     };
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 b816e61cce355..7c7431015d175 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
@@ -17,9 +17,9 @@
  * under the License.
  */
 
-import { VisState } from 'src/legacy/core_plugins/visualizations/public';
 import { IAggConfig, AggParam } from 'src/plugins/data/public';
 import { EditorConfig } from '../utils';
+import { EditorVisState } from '../sidebar/state/reducers';
 
 export const aggParamCommonPropsMock = {
   agg: {} as IAggConfig,
@@ -27,7 +27,7 @@ export const aggParamCommonPropsMock = {
   editorConfig: {} as EditorConfig,
   formIsTouched: false,
   metricAggs: [] as IAggConfig[],
-  state: {} as VisState,
+  state: {} as EditorVisState,
   showValidation: false,
   schemas: [],
 };
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 6f92c27e90ec1..a6a1980210be4 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
@@ -21,7 +21,6 @@ import React, { useMemo, useCallback } from 'react';
 import { findLast } from 'lodash';
 import { EuiSpacer } from '@elastic/eui';
 
-import { VisState } from 'src/legacy/core_plugins/visualizations/public';
 import {
   AggGroupNames,
   IAggConfig,
@@ -40,6 +39,7 @@ import {
 } from './state';
 import { AddSchema, ReorderAggs, DefaultEditorAggCommonProps } from '../agg_common_props';
 import { ISchemas } from '../../schemas';
+import { EditorVisState } from './state/reducers';
 
 export interface DefaultEditorDataTabProps {
   dispatch: React.Dispatch<EditorAction>;
@@ -47,7 +47,7 @@ export interface DefaultEditorDataTabProps {
   isTabSelected: boolean;
   metricAggs: IAggConfig[];
   schemas: ISchemas;
-  state: VisState;
+  state: EditorVisState;
   setTouched(isTouched: boolean): void;
   setValidity(modelName: string, value: boolean): void;
   setStateValue: DefaultEditorAggCommonProps['setStateParamValue'];
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 2508ef3a55537..04c931f593e5a 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
@@ -21,6 +21,7 @@ import React, { useMemo, useState, useCallback, KeyboardEventHandler, useEffect
 import { get, isEqual } from 'lodash';
 import { i18n } from '@kbn/i18n';
 import { keyCodes, EuiButtonIcon, EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
+import { EventEmitter } from 'events';
 
 import { Vis } from 'src/legacy/core_plugins/visualizations/public';
 import { DefaultEditorNavBar, OptionTab } from './navbar';
@@ -40,6 +41,7 @@ interface DefaultEditorSideBarProps {
   uiState: PersistedState;
   vis: Vis;
   isLinkedSearch: boolean;
+  eventEmitter: EventEmitter;
   savedSearch?: SavedSearch;
 }
 
@@ -50,14 +52,17 @@ function DefaultEditorSideBar({
   uiState,
   vis,
   isLinkedSearch,
+  eventEmitter,
   savedSearch,
 }: DefaultEditorSideBarProps) {
   const [selectedTab, setSelectedTab] = useState(optionTabs[0].name);
   const [isDirty, setDirty] = useState(false);
-  const [state, dispatch] = useEditorReducer(vis);
+  const [state, dispatch] = useEditorReducer(vis, eventEmitter);
   const { formState, setTouched, setValidity, resetValidity } = useEditorFormState();
 
-  const responseAggs = useMemo(() => state.aggs.getResponseAggs(), [state.aggs]);
+  const responseAggs = useMemo(() => (state.data.aggs ? state.data.aggs.getResponseAggs() : []), [
+    state.data.aggs,
+  ]);
   const metricSchemas = getSchemasByGroup(vis.type.schemas.all || [], AggGroupNames.Metrics).map(
     s => s.name
   );
@@ -90,17 +95,20 @@ function DefaultEditorSideBar({
   const applyChanges = useCallback(() => {
     if (formState.invalid || !isDirty) {
       setTouched(true);
-
       return;
     }
 
-    vis.setCurrentState(state);
-    vis.updateState();
-    vis.emit('dirtyStateChange', {
+    vis.setState({
+      ...vis.serialize(),
+      params: state.params,
+      data: { aggs: state.data.aggs ? (state.data.aggs.aggs.map(agg => agg.toJSON()) as any) : [] },
+    });
+    eventEmitter.emit('updateVis');
+    eventEmitter.emit('dirtyStateChange', {
       isDirty: false,
     });
     setTouched(false);
-  }, [vis, state, formState.invalid, setTouched, isDirty]);
+  }, [vis, state, formState.invalid, setTouched, isDirty, eventEmitter]);
 
   const onSubmit: KeyboardEventHandler<HTMLFormElement> = useCallback(
     event => {
@@ -122,18 +130,22 @@ function DefaultEditorSideBar({
         resetValidity();
       }
     };
-    vis.on('dirtyStateChange', changeHandler);
+    eventEmitter.on('dirtyStateChange', changeHandler);
 
-    return () => vis.off('dirtyStateChange', changeHandler);
-  }, [resetValidity, vis]);
+    return () => {
+      eventEmitter.off('dirtyStateChange', changeHandler);
+    };
+  }, [resetValidity, eventEmitter]);
 
   // subscribe on external vis changes using browser history, for example press back button
   useEffect(() => {
     const resetHandler = () => dispatch(discardChanges(vis));
-    vis.on('updateEditor', resetHandler);
+    eventEmitter.on('updateEditor', resetHandler);
 
-    return () => vis.off('updateEditor', resetHandler);
-  }, [dispatch, vis]);
+    return () => {
+      eventEmitter.off('updateEditor', resetHandler);
+    };
+  }, [dispatch, vis, eventEmitter]);
 
   const dataTabProps = {
     dispatch,
@@ -147,7 +159,7 @@ function DefaultEditorSideBar({
   };
 
   const optionTabProps = {
-    aggs: state.aggs,
+    aggs: state.data.aggs!,
     hasHistogramAgg,
     stateParams: state.params,
     vis,
@@ -173,7 +185,12 @@ function DefaultEditorSideBar({
             onKeyDownCapture={onSubmit}
           >
             {vis.type.requiresSearch && (
-              <SidebarTitle isLinkedSearch={isLinkedSearch} savedSearch={savedSearch} vis={vis} />
+              <SidebarTitle
+                isLinkedSearch={isLinkedSearch}
+                savedSearch={savedSearch}
+                vis={vis}
+                eventEmitter={eventEmitter}
+              />
             )}
 
             {optionTabs.length > 1 && (
diff --git a/src/legacy/core_plugins/vis_default_editor/public/components/sidebar/sidebar_title.tsx b/src/legacy/core_plugins/vis_default_editor/public/components/sidebar/sidebar_title.tsx
index 876404851aed4..575ad5ae2a95c 100644
--- a/src/legacy/core_plugins/vis_default_editor/public/components/sidebar/sidebar_title.tsx
+++ b/src/legacy/core_plugins/vis_default_editor/public/components/sidebar/sidebar_title.tsx
@@ -18,6 +18,7 @@
  */
 
 import React, { useCallback, useState } from 'react';
+import { EventEmitter } from 'events';
 import {
   EuiButton,
   EuiButtonEmpty,
@@ -39,23 +40,24 @@ import { SavedSearch } from '../../../../../../plugins/discover/public';
 
 interface LinkedSearchProps {
   savedSearch: SavedSearch;
-  vis: Vis;
+  eventEmitter: EventEmitter;
 }
 
 interface SidebarTitleProps {
   isLinkedSearch: boolean;
   savedSearch?: SavedSearch;
   vis: Vis;
+  eventEmitter: EventEmitter;
 }
 
-export function LinkedSearch({ savedSearch, vis }: LinkedSearchProps) {
+export function LinkedSearch({ savedSearch, eventEmitter }: LinkedSearchProps) {
   const [showPopover, setShowPopover] = useState(false);
   const closePopover = useCallback(() => setShowPopover(false), []);
   const onClickButtonLink = useCallback(() => setShowPopover(v => !v), []);
   const onClickUnlikFromSavedSearch = useCallback(() => {
     setShowPopover(false);
-    vis.emit('unlinkFromSavedSearch');
-  }, [vis]);
+    eventEmitter.emit('unlinkFromSavedSearch');
+  }, [eventEmitter]);
 
   const linkButtonAriaLabel = i18n.translate(
     'visDefaultEditor.sidebar.savedSearch.linkButtonAriaLabel',
@@ -151,20 +153,20 @@ export function LinkedSearch({ savedSearch, vis }: LinkedSearchProps) {
   );
 }
 
-function SidebarTitle({ savedSearch, vis, isLinkedSearch }: SidebarTitleProps) {
+function SidebarTitle({ savedSearch, vis, isLinkedSearch, eventEmitter }: SidebarTitleProps) {
   return isLinkedSearch && savedSearch ? (
-    <LinkedSearch savedSearch={savedSearch} vis={vis} />
+    <LinkedSearch savedSearch={savedSearch} eventEmitter={eventEmitter} />
   ) : vis.type.options.showIndexSelection ? (
     <EuiTitle size="xs" className="visEditorSidebar__titleContainer eui-textTruncate">
       <h2
         title={i18n.translate('visDefaultEditor.sidebar.indexPatternAriaLabel', {
           defaultMessage: 'Index pattern: {title}',
           values: {
-            title: vis.indexPattern.title,
+            title: vis.data.indexPattern!.title,
           },
         })}
       >
-        {vis.indexPattern.title}
+        {vis.data.indexPattern!.title}
       </h2>
     </EuiTitle>
   ) : (
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 6383ac866dcfc..11cbc3f93e9d3 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
@@ -17,20 +17,23 @@
  * under the License.
  */
 
-import { useEffect, useReducer, useCallback } from 'react';
-import { isEqual } from 'lodash';
+import { useReducer, useCallback } from 'react';
+import { EventEmitter } from 'events';
 
-import { Vis, VisState, VisParams } from 'src/legacy/core_plugins/visualizations/public';
-import { createEditorStateReducer, initEditorState } from './reducers';
+import { Vis } from 'src/legacy/core_plugins/visualizations/public';
+import { createEditorStateReducer, initEditorState, EditorVisState } from './reducers';
 import { EditorStateActionTypes } from './constants';
-import { EditorAction, updateStateParams } from './actions';
+import { EditorAction } 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>] {
+export function useEditorReducer(
+  vis: Vis,
+  eventEmitter: EventEmitter
+): [EditorVisState, React.Dispatch<EditorAction>] {
   const { services } = useKibana<VisDefaultEditorKibanaServices>();
   const [state, dispatch] = useReducer(
     createEditorStateReducer(services.data.search),
@@ -38,28 +41,15 @@ export function useEditorReducer(vis: Vis): [VisState, React.Dispatch<EditorActi
     initEditorState
   );
 
-  useEffect(() => {
-    const handleVisUpdate = (params: VisParams) => {
-      if (!isEqual(params, state.params)) {
-        dispatch(updateStateParams(params));
-      }
-    };
-
-    // fires when visualization state changes, and we need to copy changes to editorState
-    vis.on('updateEditorStateParams', handleVisUpdate);
-
-    return () => vis.off('updateEditorStateParams', handleVisUpdate);
-  }, [vis, state.params]);
-
   const wrappedDispatch = useCallback(
     (action: EditorAction) => {
       dispatch(action);
 
-      vis.emit('dirtyStateChange', {
+      eventEmitter.emit('dirtyStateChange', {
         isDirty: action.type !== EditorStateActionTypes.DISCARD_CHANGES,
       });
     },
-    [vis]
+    [eventEmitter]
   );
 
   return [state, wrappedDispatch];
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 67220fd9fd91b..6e5bec7c69c90 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
@@ -19,35 +19,45 @@
 
 import { cloneDeep } from 'lodash';
 
-import { Vis, VisState } from 'src/legacy/core_plugins/visualizations/public';
+import { Vis } from 'src/legacy/core_plugins/visualizations/public';
 import { AggGroupNames, DataPublicPluginStart } from '../../../../../../../plugins/data/public';
 import { EditorStateActionTypes } from './constants';
 import { getEnabledMetricAggsCount } from '../../agg_group_helper';
 import { EditorAction } from './actions';
 
 function initEditorState(vis: Vis) {
-  return vis.copyCurrentState(true);
+  return {
+    ...vis.clone(),
+  };
 }
 
+export type EditorVisState = Pick<Vis, 'title' | 'description' | 'type' | 'params' | 'data'>;
+
 const createEditorStateReducer = ({
   aggs: { createAggConfigs },
-}: DataPublicPluginStart['search']) => (state: VisState, action: EditorAction): VisState => {
+}: DataPublicPluginStart['search']) => (
+  state: EditorVisState,
+  action: EditorAction
+): EditorVisState => {
   switch (action.type) {
     case EditorStateActionTypes.ADD_NEW_AGG: {
       const { schema } = action.payload;
       const defaultConfig =
-        !state.aggs.aggs.find(agg => agg.schema === schema.name) && schema.defaults
+        !state.data.aggs!.aggs.find(agg => agg.schema === schema.name) && schema.defaults
           ? (schema as any).defaults.slice(0, schema.max)
           : { schema: schema.name };
-      const aggConfig = state.aggs.createAggConfig(defaultConfig, {
+      const aggConfig = state.data.aggs!.createAggConfig(defaultConfig, {
         addToAggConfigs: false,
       });
       aggConfig.brandNew = true;
-      const newAggs = [...state.aggs.aggs, aggConfig];
+      const newAggs = [...state.data.aggs!.aggs, aggConfig];
 
       return {
         ...state,
-        aggs: createAggConfigs(state.aggs.indexPattern, newAggs),
+        data: {
+          ...state.data,
+          aggs: createAggConfigs(state.data.indexPattern!, newAggs),
+        },
       };
     }
 
@@ -58,7 +68,7 @@ const createEditorStateReducer = ({
     case EditorStateActionTypes.CHANGE_AGG_TYPE: {
       const { aggId, value } = action.payload;
 
-      const newAggs = state.aggs.aggs.map(agg => {
+      const newAggs = state.data.aggs!.aggs.map(agg => {
         if (agg.id === aggId) {
           agg.type = value;
 
@@ -70,14 +80,17 @@ const createEditorStateReducer = ({
 
       return {
         ...state,
-        aggs: createAggConfigs(state.aggs.indexPattern, newAggs),
+        data: {
+          ...state.data,
+          aggs: createAggConfigs(state.data.indexPattern!, newAggs),
+        },
       };
     }
 
     case EditorStateActionTypes.SET_AGG_PARAM_VALUE: {
       const { aggId, paramName, value } = action.payload;
 
-      const newAggs = state.aggs.aggs.map(agg => {
+      const newAggs = state.data.aggs!.aggs.map(agg => {
         if (agg.id === aggId) {
           const parsedAgg = agg.toJSON();
 
@@ -95,7 +108,10 @@ const createEditorStateReducer = ({
 
       return {
         ...state,
-        aggs: createAggConfigs(state.aggs.indexPattern, newAggs),
+        data: {
+          ...state.data,
+          aggs: createAggConfigs(state.data.indexPattern!, newAggs),
+        },
       };
     }
 
@@ -113,7 +129,7 @@ const createEditorStateReducer = ({
 
     case EditorStateActionTypes.REMOVE_AGG: {
       let isMetric = false;
-      const newAggs = state.aggs.aggs.filter(({ id, schema }) => {
+      const newAggs = state.data.aggs!.aggs.filter(({ id, schema }) => {
         if (id === action.payload.aggId) {
           const schemaDef = action.payload.schemas.find(s => s.name === schema);
           if (schemaDef && schemaDef.group === AggGroupNames.Metrics) {
@@ -136,26 +152,36 @@ const createEditorStateReducer = ({
 
       return {
         ...state,
-        aggs: createAggConfigs(state.aggs.indexPattern, newAggs),
+        data: {
+          ...state.data,
+          aggs: createAggConfigs(state.data.indexPattern!, newAggs),
+        },
       };
     }
 
     case EditorStateActionTypes.REORDER_AGGS: {
       const { sourceAgg, destinationAgg } = action.payload;
-      const destinationIndex = state.aggs.aggs.indexOf(destinationAgg);
-      const newAggs = [...state.aggs.aggs];
-      newAggs.splice(destinationIndex, 0, newAggs.splice(state.aggs.aggs.indexOf(sourceAgg), 1)[0]);
+      const destinationIndex = state.data.aggs!.aggs.indexOf(destinationAgg);
+      const newAggs = [...state.data.aggs!.aggs];
+      newAggs.splice(
+        destinationIndex,
+        0,
+        newAggs.splice(state.data.aggs!.aggs.indexOf(sourceAgg), 1)[0]
+      );
 
       return {
         ...state,
-        aggs: createAggConfigs(state.aggs.indexPattern, newAggs),
+        data: {
+          ...state.data,
+          aggs: createAggConfigs(state.data.indexPattern!, newAggs),
+        },
       };
     }
 
     case EditorStateActionTypes.TOGGLE_ENABLED_AGG: {
       const { aggId, enabled } = action.payload;
 
-      const newAggs = state.aggs.aggs.map(agg => {
+      const newAggs = state.data.aggs!.aggs.map(agg => {
         if (agg.id === aggId) {
           const parsedAgg = agg.toJSON();
 
@@ -170,7 +196,10 @@ const createEditorStateReducer = ({
 
       return {
         ...state,
-        aggs: createAggConfigs(state.aggs.indexPattern, newAggs),
+        data: {
+          ...state.data,
+          aggs: createAggConfigs(state.data.indexPattern!, newAggs),
+        },
       };
     }
 
diff --git a/src/legacy/core_plugins/vis_default_editor/public/default_editor.tsx b/src/legacy/core_plugins/vis_default_editor/public/default_editor.tsx
index fa3213d244e7e..b504dfd6a55e9 100644
--- a/src/legacy/core_plugins/vis_default_editor/public/default_editor.tsx
+++ b/src/legacy/core_plugins/vis_default_editor/public/default_editor.tsx
@@ -20,10 +20,6 @@
 import React, { useEffect, useRef, useState, useCallback } from 'react';
 
 import { EditorRenderProps } from '../../kibana/public/visualize/np_ready/types';
-import {
-  VisualizeEmbeddableContract as VisualizeEmbeddable,
-  VisualizeEmbeddableFactoryContract as VisualizeEmbeddableFactory,
-} from '../../visualizations/public/';
 import { PanelsContainer, Panel } from '../../../../plugins/kibana_react/public';
 
 import './vis_type_agg_filter';
@@ -32,68 +28,44 @@ import { DefaultEditorControllerState } from './default_editor_controller';
 import { getInitialWidth } from './editor_size';
 
 function DefaultEditor({
-  embeddable,
-  savedObj,
+  vis,
   uiState,
   timeRange,
   filters,
-  appState,
   optionTabs,
   query,
+  embeddableHandler,
+  eventEmitter,
   linked,
+  savedSearch,
 }: DefaultEditorControllerState & Omit<EditorRenderProps, 'data' | 'core'>) {
   const visRef = useRef<HTMLDivElement>(null);
-  const visHandler = useRef<VisualizeEmbeddable | null>(null);
   const [isCollapsed, setIsCollapsed] = useState(false);
-  const [factory, setFactory] = useState<VisualizeEmbeddableFactory | null>(null);
-  const { vis, savedSearch } = savedObj;
 
   const onClickCollapse = useCallback(() => {
     setIsCollapsed(value => !value);
   }, []);
 
   useEffect(() => {
-    async function visualize() {
-      if (!visRef.current || (!visHandler.current && factory)) {
-        return;
-      }
-
-      if (!visHandler.current) {
-        const embeddableFactory = embeddable.getEmbeddableFactory(
-          'visualization'
-        ) as VisualizeEmbeddableFactory;
-        setFactory(embeddableFactory);
-
-        visHandler.current = (await embeddableFactory.createFromObject(savedObj, {
-          // should be look through createFromObject interface again because of "id" param
-          id: '',
-          uiState,
-          appState,
-          timeRange,
-          filters,
-          query,
-        })) as VisualizeEmbeddable;
-
-        visHandler.current.render(visRef.current);
-      } else {
-        visHandler.current.updateInput({
-          timeRange,
-          filters,
-          query,
-        });
-      }
+    if (!visRef.current) {
+      return;
     }
 
-    visualize();
-  }, [uiState, savedObj, timeRange, filters, appState, query, factory, embeddable]);
+    embeddableHandler.render(visRef.current);
+    setTimeout(() => {
+      eventEmitter.emit('apply');
+    });
+
+    return () => embeddableHandler.destroy();
+  }, [embeddableHandler, eventEmitter]);
 
   useEffect(() => {
-    return () => {
-      if (visHandler.current) {
-        visHandler.current.destroy();
-      }
-    };
-  }, []);
+    embeddableHandler.updateInput({
+      timeRange,
+      filters,
+      query,
+    });
+  }, [embeddableHandler, timeRange, filters, query]);
 
   const editorInitialWidth = getInitialWidth(vis.type.editorConfig.defaultSize);
 
@@ -120,6 +92,7 @@ function DefaultEditor({
           uiState={uiState}
           isLinkedSearch={linked}
           savedSearch={savedSearch}
+          eventEmitter={eventEmitter}
         />
       </Panel>
     </PanelsContainer>
diff --git a/src/legacy/core_plugins/vis_default_editor/public/default_editor_controller.tsx b/src/legacy/core_plugins/vis_default_editor/public/default_editor_controller.tsx
index db910604eddd1..13fcabd799959 100644
--- a/src/legacy/core_plugins/vis_default_editor/public/default_editor_controller.tsx
+++ b/src/legacy/core_plugins/vis_default_editor/public/default_editor_controller.tsx
@@ -21,18 +21,22 @@ import React from 'react';
 import { render, unmountComponentAtNode } from 'react-dom';
 import { i18n } from '@kbn/i18n';
 import { I18nProvider } from '@kbn/i18n/react';
+import { EventEmitter } from 'events';
 
 import { EditorRenderProps } from 'src/legacy/core_plugins/kibana/public/visualize/np_ready/types';
-import { VisSavedObject } from 'src/legacy/core_plugins/visualizations/public/';
+import { Vis } from 'src/legacy/core_plugins/visualizations/public/';
 import { Storage } from '../../../../plugins/kibana_utils/public';
 import { KibanaContextProvider } from '../../../../plugins/kibana_react/public';
 import { DefaultEditor } from './default_editor';
 import { DefaultEditorDataTab, OptionTab } from './components/sidebar';
+import { VisualizeEmbeddable } from '../../visualizations/public/np_ready/public/embeddable';
 
 const localStorage = new Storage(window.localStorage);
 
 export interface DefaultEditorControllerState {
-  savedObj: VisSavedObject;
+  vis: Vis;
+  eventEmitter: EventEmitter;
+  embeddableHandler: VisualizeEmbeddable;
   optionTabs: OptionTab[];
 }
 
@@ -40,9 +44,9 @@ class DefaultEditorController {
   private el: HTMLElement;
   private state: DefaultEditorControllerState;
 
-  constructor(el: HTMLElement, savedObj: VisSavedObject) {
+  constructor(el: HTMLElement, vis: Vis, eventEmitter: EventEmitter, embeddableHandler: any) {
     this.el = el;
-    const { type: visType } = savedObj.vis;
+    const { type: visType } = vis;
 
     const optionTabs = [
       ...(visType.schemas.buckets || visType.schemas.metrics
@@ -71,8 +75,10 @@ class DefaultEditorController {
     ];
 
     this.state = {
-      savedObj,
+      vis,
       optionTabs,
+      eventEmitter,
+      embeddableHandler,
     };
   }
 
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 2e8f20946c73a..3239e871a2465 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 { PersistedState } from 'src/plugins/visualizations/public';
 import { IAggConfigs } from 'src/plugins/data/public';
-import { PersistedState } from '../../../../plugins/visualizations/public';
 import { Vis } from '../../visualizations/public';
 
 export interface VisOptionsProps<VisParamType = unknown> {
diff --git a/src/legacy/core_plugins/vis_type_metric/public/components/metric_vis_component.test.tsx b/src/legacy/core_plugins/vis_type_metric/public/components/metric_vis_component.test.tsx
index 6a466c9cd0211..7ba4fe017522d 100644
--- a/src/legacy/core_plugins/vis_type_metric/public/components/metric_vis_component.test.tsx
+++ b/src/legacy/core_plugins/vis_type_metric/public/components/metric_vis_component.test.tsx
@@ -20,12 +20,12 @@
 import React from 'react';
 import { shallow } from 'enzyme';
 
-import { Vis } from 'src/legacy/core_plugins/visualizations/public';
 import { MetricVisComponent, MetricVisComponentProps } from './metric_vis_component';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
 import { npStart } from 'ui/new_platform';
 import { fieldFormats } from '../../../../../plugins/data/public';
 import { identity } from 'lodash';
+import { ExprVis } from '../../../visualizations/public/np_ready/public/expressions/vis';
 
 jest.mock('ui/new_platform');
 
@@ -37,7 +37,7 @@ const baseVisData = {
 } as any;
 
 describe('MetricVisComponent', function() {
-  const vis: Vis = {
+  const vis: ExprVis = {
     params: {
       metric: {
         colorSchema: 'Green to Red',
@@ -57,7 +57,7 @@ describe('MetricVisComponent', function() {
   const getComponent = (propOverrides: Partial<Props> = {} as Partial<Props>) => {
     const props: Props = {
       vis,
-      visParams: vis.params,
+      visParams: vis.params as any,
       visData: baseVisData,
       renderComplete: jest.fn(),
       ...propOverrides,
diff --git a/src/legacy/core_plugins/vis_type_metric/public/components/metric_vis_component.tsx b/src/legacy/core_plugins/vis_type_metric/public/components/metric_vis_component.tsx
index a93bb618da31f..175458497a05e 100644
--- a/src/legacy/core_plugins/vis_type_metric/public/components/metric_vis_component.tsx
+++ b/src/legacy/core_plugins/vis_type_metric/public/components/metric_vis_component.tsx
@@ -27,12 +27,13 @@ import { FieldFormatsContentType, IFieldFormat } from '../../../../../plugins/da
 import { KibanaDatatable } from '../../../../../plugins/expressions/public';
 import { getHeatmapColors } from '../../../../../plugins/charts/public';
 import { VisParams, MetricVisMetric } from '../types';
-import { SchemaConfig, Vis } from '../../../visualizations/public';
+import { SchemaConfig } from '../../../visualizations/public';
+import { ExprVis } from '../../../visualizations/public/np_ready/public/expressions/vis';
 
 export interface MetricVisComponentProps {
   visParams: VisParams;
   visData: Input;
-  vis: Vis;
+  vis: ExprVis;
   renderComplete: () => void;
 }
 
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 cce5864aa50a1..c0bfa47bff502 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
@@ -61,11 +61,22 @@ describe('metric_vis - createMetricVisTypeDefinition', () => {
       labelTemplate: 'ip[{{value}}]',
     });
 
+    const searchSource = {
+      getField: (name: string) => {
+        if (name === 'index') {
+          return stubIndexPattern;
+        }
+      },
+    };
+
     // TODO: remove when Vis is converted to typescript. Only importing Vis as type
     // @ts-ignore
-    vis = visualizationsStart.createVis(stubIndexPattern, {
+    vis = visualizationsStart.createVis('metric', {
       type: 'metric',
-      aggs: [{ id: '1', type: 'top_hits', schema: 'metric', params: { field: 'ip' } }],
+      data: {
+        searchSource,
+        aggs: [{ id: '1', type: 'top_hits', schema: 'metric', params: { field: 'ip' } }],
+      },
     });
 
     vis.params.dimensions = {
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 8edef2ea16353..211b79e915038 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
@@ -50,57 +50,73 @@ describe('Table Vis - AggTable Directive', function() {
   const tabifiedData = {};
 
   const init = () => {
-    const vis1 = visualizationsStart.createVis(indexPattern, 'table');
-    tabifiedData.metricOnly = tabifyAggResponse(vis1.aggs, metricOnly);
+    const searchSource = {
+      getField: name => {
+        if (name === 'index') {
+          return indexPattern;
+        }
+      },
+    };
+    const vis1 = visualizationsStart.createVis('table', {
+      type: 'table',
+      data: { searchSource, aggs: [] },
+    });
+    tabifiedData.metricOnly = tabifyAggResponse(vis1.data.aggs, metricOnly);
 
-    const vis2 = visualizationsStart.createVis(indexPattern, {
+    const vis2 = visualizationsStart.createVis('table', {
       type: 'table',
       params: {
         showMetricsAtAllLevels: true,
       },
-      aggs: [
-        { type: 'avg', schema: 'metric', params: { field: 'bytes' } },
-        { type: 'terms', schema: 'bucket', params: { field: 'extension' } },
-        { type: 'terms', schema: 'bucket', params: { field: 'geo.src' } },
-        { type: 'terms', schema: 'bucket', params: { field: 'machine.os' } },
-      ],
+      data: {
+        aggs: [
+          { type: 'avg', schema: 'metric', params: { field: 'bytes' } },
+          { type: 'terms', schema: 'bucket', params: { field: 'extension' } },
+          { type: 'terms', schema: 'bucket', params: { field: 'geo.src' } },
+          { type: 'terms', schema: 'bucket', params: { field: 'machine.os' } },
+        ],
+        searchSource,
+      },
     });
-    vis2.aggs.aggs.forEach(function(agg, i) {
+    vis2.data.aggs.aggs.forEach(function(agg, i) {
       agg.id = 'agg_' + (i + 1);
     });
-    tabifiedData.threeTermBuckets = tabifyAggResponse(vis2.aggs, threeTermBuckets, {
+    tabifiedData.threeTermBuckets = tabifyAggResponse(vis2.data.aggs, threeTermBuckets, {
       metricsAtAllLevels: true,
     });
 
-    const vis3 = visualizationsStart.createVis(indexPattern, {
+    const vis3 = visualizationsStart.createVis('table', {
       type: 'table',
-      aggs: [
-        { type: 'avg', schema: 'metric', params: { field: 'bytes' } },
-        { type: 'min', schema: 'metric', params: { field: '@timestamp' } },
-        { type: 'terms', schema: 'bucket', params: { field: 'extension' } },
-        {
-          type: 'date_histogram',
-          schema: 'bucket',
-          params: { field: '@timestamp', interval: 'd' },
-        },
-        {
-          type: 'derivative',
-          schema: 'metric',
-          params: { metricAgg: 'custom', customMetric: { id: '5-orderAgg', type: 'count' } },
-        },
-        {
-          type: 'top_hits',
-          schema: 'metric',
-          params: { field: 'bytes', aggregate: { val: 'min' }, size: 1 },
-        },
-      ],
+      data: {
+        aggs: [
+          { type: 'avg', schema: 'metric', params: { field: 'bytes' } },
+          { type: 'min', schema: 'metric', params: { field: '@timestamp' } },
+          { type: 'terms', schema: 'bucket', params: { field: 'extension' } },
+          {
+            type: 'date_histogram',
+            schema: 'bucket',
+            params: { field: '@timestamp', interval: 'd' },
+          },
+          {
+            type: 'derivative',
+            schema: 'metric',
+            params: { metricAgg: 'custom', customMetric: { id: '5-orderAgg', type: 'count' } },
+          },
+          {
+            type: 'top_hits',
+            schema: 'metric',
+            params: { field: 'bytes', aggregate: { val: 'min' }, size: 1 },
+          },
+        ],
+        searchSource,
+      },
     });
-    vis3.aggs.aggs.forEach(function(agg, i) {
+    vis3.data.aggs.aggs.forEach(function(agg, i) {
       agg.id = 'agg_' + (i + 1);
     });
 
     tabifiedData.oneTermOneHistogramBucketWithTwoMetricsOneTopHitOneDerivative = tabifyAggResponse(
-      vis3.aggs,
+      vis3.data.aggs,
       oneTermOneHistogramBucketWithTwoMetricsOneTopHitOneDerivative
     );
   };
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 89900d2144030..77f817e44ba79 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
@@ -38,22 +38,35 @@ describe('Table Vis - AggTableGroup Directive', function() {
   const tabifiedData = {};
 
   const init = () => {
-    const vis1 = visualizationsStart.createVis(indexPattern, 'table');
-    tabifiedData.metricOnly = tabifyAggResponse(vis1.aggs, metricOnly);
+    const searchSource = {
+      getField: name => {
+        if (name === 'index') {
+          return indexPattern;
+        }
+      },
+    };
+    const vis1 = visualizationsStart.createVis('table', {
+      type: 'table',
+      data: { searchSource, aggs: [] },
+    });
+    tabifiedData.metricOnly = tabifyAggResponse(vis1.data.aggs, metricOnly);
 
-    const vis2 = visualizationsStart.createVis(indexPattern, {
+    const vis2 = visualizationsStart.createVis('pie', {
       type: 'pie',
-      aggs: [
-        { type: 'avg', schema: 'metric', params: { field: 'bytes' } },
-        { type: 'terms', schema: 'split', params: { field: 'extension' } },
-        { type: 'terms', schema: 'segment', params: { field: 'geo.src' } },
-        { type: 'terms', schema: 'segment', params: { field: 'machine.os' } },
-      ],
+      data: {
+        aggs: [
+          { type: 'avg', schema: 'metric', params: { field: 'bytes' } },
+          { type: 'terms', schema: 'split', params: { field: 'extension' } },
+          { type: 'terms', schema: 'segment', params: { field: 'geo.src' } },
+          { type: 'terms', schema: 'segment', params: { field: 'machine.os' } },
+        ],
+        searchSource,
+      },
     });
-    vis2.aggs.aggs.forEach(function(agg, i) {
+    vis2.data.aggs.aggs.forEach(function(agg, i) {
       agg.id = 'agg_' + (i + 1);
     });
-    tabifiedData.threeTermBuckets = tabifyAggResponse(vis2.aggs, threeTermBuckets);
+    tabifiedData.threeTermBuckets = tabifyAggResponse(vis2.data.aggs, threeTermBuckets);
   };
 
   const initLocalAngular = () => {
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 327a47093f535..ad56607e9296c 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
@@ -118,20 +118,22 @@ describe('Table Vis - Controller', () => {
     return ({
       type: tableVisTypeDefinition,
       params: Object.assign({}, tableVisTypeDefinition.visConfig.defaults, params),
-      aggs: createAggConfigs(stubIndexPattern, [
-        { type: 'count', schema: 'metric' },
-        {
-          type: 'range',
-          schema: 'bucket',
-          params: {
-            field: 'bytes',
-            ranges: [
-              { from: 0, to: 1000 },
-              { from: 1000, to: 2000 },
-            ],
+      data: {
+        aggs: createAggConfigs(stubIndexPattern, [
+          { type: 'count', schema: 'metric' },
+          {
+            type: 'range',
+            schema: 'bucket',
+            params: {
+              field: 'bytes',
+              ranges: [
+                { from: 0, to: 1000 },
+                { from: 1000, to: 2000 },
+              ],
+            },
           },
-        },
-      ]),
+        ]),
+      },
     } as unknown) as Vis;
   }
 
@@ -151,11 +153,11 @@ describe('Table Vis - Controller', () => {
 
   // basically a parameterized beforeEach
   function initController(vis: Vis) {
-    vis.aggs.aggs.forEach((agg: IAggConfig, i: number) => {
+    vis.data.aggs!.aggs.forEach((agg: IAggConfig, i: number) => {
       agg.id = 'agg_' + (i + 1);
     });
 
-    tabifiedResponse = tabifyAggResponse(vis.aggs, oneRangeBucket);
+    tabifiedResponse = tabifyAggResponse(vis.data.aggs!, oneRangeBucket);
     $rootScope.vis = vis;
     $rootScope.visParams = vis.params;
     $rootScope.uiState = {
diff --git a/src/legacy/core_plugins/vis_type_table/public/vis_controller.ts b/src/legacy/core_plugins/vis_type_table/public/vis_controller.ts
index 2d27a99bdd8af..2feaad9f4e6b6 100644
--- a/src/legacy/core_plugins/vis_type_table/public/vis_controller.ts
+++ b/src/legacy/core_plugins/vis_type_table/public/vis_controller.ts
@@ -19,12 +19,12 @@
 
 import angular, { IModule, auto, IRootScopeService, IScope, ICompileService } from 'angular';
 import $ from 'jquery';
-import { isEqual } from 'lodash';
 
-import { Vis, VisParams } from '../../visualizations/public';
+import { VisParams } from '../../visualizations/public';
 import { npStart } from './legacy_imports';
 import { getAngularModule } from './get_inner_angular';
 import { initTableVisLegacyModule } from './table_vis_legacy_module';
+import { ExprVis } from '../../visualizations/public/np_ready/public/expressions/vis';
 
 const innerAngularName = 'kibana/table_vis';
 
@@ -32,12 +32,12 @@ export class TableVisualizationController {
   private tableVisModule: IModule | undefined;
   private injector: auto.IInjectorService | undefined;
   el: JQuery<Element>;
-  vis: Vis;
+  vis: ExprVis;
   $rootScope: IRootScopeService | null = null;
   $scope: (IScope & { [key: string]: any }) | undefined;
   $compile: ICompileService | undefined;
 
-  constructor(domeElement: Element, vis: Vis) {
+  constructor(domeElement: Element, vis: ExprVis) {
     this.el = $(domeElement);
     this.vis = vis;
   }
@@ -60,7 +60,7 @@ export class TableVisualizationController {
     }
   }
 
-  async render(esResponse: object, visParams: VisParams, status: { [key: string]: boolean }) {
+  async render(esResponse: object, visParams: VisParams) {
     this.initLocalAngular();
 
     return new Promise(async (resolve, reject) => {
@@ -77,15 +77,10 @@ export class TableVisualizationController {
         this.$scope.visState = { params: visParams };
         this.$scope.esResponse = esResponse;
 
-        if (!isEqual(this.$scope.visParams, visParams)) {
-          this.vis.emit('updateEditorStateParams', visParams);
-        }
-
         this.$scope.visParams = visParams;
         this.$scope.renderComplete = resolve;
         this.$scope.renderFailed = reject;
         this.$scope.resize = Date.now();
-        this.$scope.updateStatus = status;
         this.$scope.$apply();
       };
 
@@ -93,7 +88,7 @@ export class TableVisualizationController {
         this.$scope = this.$rootScope.$new();
         this.$scope.uiState = this.vis.getUiState();
         updateScope();
-        this.el.find('div').append(this.$compile(this.vis.type.visConfig.template)(this.$scope));
+        this.el.find('div').append(this.$compile(this.vis.type!.visConfig.template)(this.$scope));
         this.$scope.$apply();
       } else {
         updateScope();
diff --git a/src/legacy/core_plugins/vis_type_tagcloud/public/components/__tests__/tag_cloud_visualization.js b/src/legacy/core_plugins/vis_type_tagcloud/public/components/__tests__/tag_cloud_visualization.js
index 3091b3340cd6d..6f54744a2f508 100644
--- a/src/legacy/core_plugins/vis_type_tagcloud/public/components/__tests__/tag_cloud_visualization.js
+++ b/src/legacy/core_plugins/vis_type_tagcloud/public/components/__tests__/tag_cloud_visualization.js
@@ -19,7 +19,6 @@
 
 import expect from '@kbn/expect';
 import ngMock from 'ng_mock';
-import LogstashIndexPatternStubProvider from 'fixtures/stubbed_logstash_index_pattern';
 import { start as visualizationsStart } from '../../../../../core_plugins/visualizations/public/np_ready/public/legacy';
 import { ImageComparator } from 'test_utils/image_comparator';
 import { createTagCloudVisualization } from '../tag_cloud_visualization';
@@ -36,7 +35,6 @@ const PIXEL_DIFF = 64;
 
 describe('TagCloudVisualizationTest', function() {
   let domNode;
-  let indexPattern;
   let vis;
   let imageComparator;
 
@@ -66,22 +64,18 @@ describe('TagCloudVisualizationTest', function() {
   });
 
   beforeEach(ngMock.module('kibana'));
-  beforeEach(
-    ngMock.inject(Private => {
-      indexPattern = Private(LogstashIndexPatternStubProvider);
-    })
-  );
 
   describe('TagCloudVisualization - basics', function() {
     beforeEach(async function() {
       setupDOM('512px', '512px');
       imageComparator = new ImageComparator();
-      vis = visualizationsStart.createVis(indexPattern, {
+      vis = visualizationsStart.createVis('tagcloud', {
         type: 'tagcloud',
         params: {
           bucket: { accessor: 0, format: {} },
           metric: { accessor: 0, format: {} },
         },
+        data: {},
       });
     });
 
diff --git a/src/legacy/core_plugins/vis_type_tagcloud/public/components/tag_cloud_visualization.js b/src/legacy/core_plugins/vis_type_tagcloud/public/components/tag_cloud_visualization.js
index 114643c9a74e0..04f447bf78d50 100644
--- a/src/legacy/core_plugins/vis_type_tagcloud/public/components/tag_cloud_visualization.js
+++ b/src/legacy/core_plugins/vis_type_tagcloud/public/components/tag_cloud_visualization.js
@@ -79,17 +79,10 @@ export function createTagCloudVisualization({ colors }) {
       render(<Label ref={this._label} />, this._labelNode);
     }
 
-    async render(data, visParams, status) {
-      if (!(status.resize || status.data || status.params)) return;
-
-      if (status.params || status.data) {
-        this._updateParams(visParams);
-        this._updateData(data);
-      }
-
-      if (status.resize) {
-        this._resize();
-      }
+    async render(data, visParams) {
+      this._updateParams(visParams);
+      this._updateData(data);
+      this._resize();
 
       await this._renderComplete$.pipe(take(1)).toPromise();
 
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 9a522fe6e648e..5a8cc3004a315 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
@@ -20,7 +20,6 @@
 import { i18n } from '@kbn/i18n';
 
 import { Schemas } from '../../vis_default_editor/public';
-import { Status } from '../../visualizations/public';
 
 import { TagCloudOptions } from './components/tag_cloud_options';
 
@@ -44,7 +43,6 @@ export const createTagCloudVisTypeDefinition = (deps: TagCloudVisDependencies) =
       showLabel: true,
     },
   },
-  requiresUpdateStatus: [Status.PARAMS, Status.RESIZE, Status.DATA],
   visualization: createTagCloudVisualization(deps),
   editorConfig: {
     collections: {
diff --git a/src/legacy/core_plugins/vis_type_timelion/public/components/timelion_vis.tsx b/src/legacy/core_plugins/vis_type_timelion/public/components/timelion_vis.tsx
index 9e11fd5d3f45c..f55d1602ea342 100644
--- a/src/legacy/core_plugins/vis_type_timelion/public/components/timelion_vis.tsx
+++ b/src/legacy/core_plugins/vis_type_timelion/public/components/timelion_vis.tsx
@@ -20,16 +20,16 @@
 import React from 'react';
 
 import { IUiSettingsClient } from 'kibana/public';
-import { Vis } from 'src/legacy/core_plugins/visualizations/public';
 import { ChartComponent } from './chart';
 import { VisParams } from '../timelion_vis_fn';
 import { TimelionSuccessResponse } from '../helpers/timelion_request_handler';
+import { ExprVis } from '../../../visualizations/public/np_ready/public/expressions/vis';
 
 export interface TimelionVisComponentProp {
   config: IUiSettingsClient;
   renderComplete(): void;
   updateStatus: object;
-  vis: Vis;
+  vis: ExprVis;
   visData: TimelionSuccessResponse;
   visParams: VisParams;
 }
diff --git a/src/legacy/core_plugins/vis_type_timeseries/public/components/vis_editor.js b/src/legacy/core_plugins/vis_type_timeseries/public/components/vis_editor.js
index ff2546f75c51a..b4845696fc8c0 100644
--- a/src/legacy/core_plugins/vis_type_timeseries/public/components/vis_editor.js
+++ b/src/legacy/core_plugins/vis_type_timeseries/public/components/vis_editor.js
@@ -65,7 +65,7 @@ export class VisEditor extends Component {
   }
 
   get uiState() {
-    return this.props.vis.getUiState();
+    return this.props.vis.uiState;
   }
 
   getConfig = (...args) => {
@@ -73,17 +73,15 @@ export class VisEditor extends Component {
   };
 
   handleUiState = (field, value) => {
-    this.props.vis.uiStateVal(field, value);
+    this.props.vis.uiState.set(field, value);
   };
 
   updateVisState = debounce(() => {
     this.props.vis.params = this.state.model;
-    this.props.vis.updateState();
-    // This check should be redundant, since this method should only be called when we're in editor
-    // mode where there's also an appState passed into us.
-    if (this.props.appState) {
-      this.props.appState.save();
-    }
+    this.props.eventEmitter.emit('updateVis');
+    this.props.eventEmitter.emit('dirtyStateChange', {
+      isDirty: false,
+    });
   }, VIS_STATE_DEBOUNCE_DELAY);
 
   isValidKueryQuery = filterQuery => {
@@ -184,7 +182,8 @@ export class VisEditor extends Component {
               dirty={this.state.dirty}
               autoApply={this.state.autoApply}
               model={model}
-              savedObj={this.props.savedObj}
+              embeddableHandler={this.props.embeddableHandler}
+              vis={this.props.vis}
               timeRange={this.props.timeRange}
               uiState={this.uiState}
               onCommit={this.handleCommit}
diff --git a/src/legacy/core_plugins/vis_type_timeseries/public/components/vis_editor_visualization.js b/src/legacy/core_plugins/vis_type_timeseries/public/components/vis_editor_visualization.js
index c45a4d68e8aad..fbd17d99be9bf 100644
--- a/src/legacy/core_plugins/vis_type_timeseries/public/components/vis_editor_visualization.js
+++ b/src/legacy/core_plugins/vis_type_timeseries/public/components/vis_editor_visualization.js
@@ -29,7 +29,6 @@ import {
   AUTO_INTERVAL,
 } from './lib/get_interval';
 import { PANEL_TYPES } from '../../../../../plugins/vis_type_timeseries/common/panel_types';
-import { start as embeddables } from '../../../embeddable_api/public/np_ready/public/legacy';
 
 const MIN_CHART_HEIGHT = 300;
 
@@ -70,15 +69,9 @@ class VisEditorVisualizationUI extends Component {
       return;
     }
 
-    const { timeRange, savedObj, onDataChange } = this.props;
+    const { onDataChange, embeddableHandler } = this.props;
 
-    this._handler = await embeddables
-      .getEmbeddableFactory('visualization')
-      .createFromObject(savedObj, {
-        vis: {},
-        timeRange: timeRange,
-        filters: [],
-      });
+    this._handler = embeddableHandler;
     await this._handler.render(this._visEl.current);
 
     this._subscription = this._handler.handler.data$.subscribe(data => {
@@ -285,7 +278,7 @@ VisEditorVisualizationUI.propTypes = {
   onCommit: PropTypes.func,
   uiState: PropTypes.object,
   onToggleAutoApply: PropTypes.func,
-  savedObj: PropTypes.object,
+  embeddableHandler: PropTypes.object,
   timeRange: PropTypes.object,
   dirty: PropTypes.bool,
   autoApply: PropTypes.bool,
diff --git a/src/legacy/core_plugins/vis_type_timeseries/public/editor_controller.js b/src/legacy/core_plugins/vis_type_timeseries/public/editor_controller.js
index 4d029553145da..16a6348712065 100644
--- a/src/legacy/core_plugins/vis_type_timeseries/public/editor_controller.js
+++ b/src/legacy/core_plugins/vis_type_timeseries/public/editor_controller.js
@@ -23,12 +23,15 @@ import { fetchIndexPatternFields } from './lib/fetch_fields';
 import { getSavedObjectsClient, getUISettings, getI18n } from './services';
 
 export class EditorController {
-  constructor(el, savedObj) {
+  constructor(el, vis, eventEmitter, embeddableHandler) {
     this.el = el;
 
+    this.embeddableHandler = embeddableHandler;
+    this.eventEmitter = eventEmitter;
+
     this.state = {
-      savedObj: savedObj,
-      vis: savedObj.vis,
+      fields: [],
+      vis: vis,
       isLoaded: false,
     };
   }
@@ -47,7 +50,7 @@ export class EditorController {
 
     this.state.vis.params.default_index_pattern = title;
     this.state.vis.params.default_timefield = timeFieldName;
-    this.state.vis.fields = await fetchIndexPatternFields(this.state.vis);
+    this.state.fields = await fetchIndexPatternFields(this.state.vis);
 
     this.state.isLoaded = true;
   };
@@ -67,13 +70,14 @@ export class EditorController {
         <Component
           config={getUISettings()}
           vis={this.state.vis}
-          visFields={this.state.vis.fields}
+          visFields={this.state.fields}
           visParams={this.state.vis.params}
-          savedObj={this.state.savedObj}
           timeRange={params.timeRange}
           renderComplete={() => {}}
           isEditorMode={true}
           appState={params.appState}
+          embeddableHandler={this.embeddableHandler}
+          eventEmitter={this.eventEmitter}
         />
       </I18nContext>,
       this.el
diff --git a/src/legacy/core_plugins/vis_type_timeseries/public/visualizations/views/timeseries/utils/theme.ts b/src/legacy/core_plugins/vis_type_timeseries/public/visualizations/views/timeseries/utils/theme.ts
index a25d5e1ce1d35..2694732aa381d 100644
--- a/src/legacy/core_plugins/vis_type_timeseries/public/visualizations/views/timeseries/utils/theme.ts
+++ b/src/legacy/core_plugins/vis_type_timeseries/public/visualizations/views/timeseries/utils/theme.ts
@@ -16,6 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+// @ts-ignore
 import colorJS from 'color';
 import { Theme, LIGHT_THEME, DARK_THEME } from '@elastic/charts';
 
diff --git a/src/legacy/core_plugins/vis_type_vega/public/__tests__/vega_visualization.js b/src/legacy/core_plugins/vis_type_vega/public/__tests__/vega_visualization.js
index 5befc09b24544..0db3e6cefa724 100644
--- a/src/legacy/core_plugins/vis_type_vega/public/__tests__/vega_visualization.js
+++ b/src/legacy/core_plugins/vis_type_vega/public/__tests__/vega_visualization.js
@@ -22,7 +22,6 @@ import expect from '@kbn/expect';
 import ngMock from 'ng_mock';
 import $ from 'jquery';
 import { createVegaVisualization } from '../vega_visualization';
-import LogstashIndexPatternStubProvider from 'fixtures/stubbed_logstash_index_pattern';
 import { ImageComparator } from 'test_utils/image_comparator';
 
 import vegaliteGraph from '!!raw-loader!./vegalite_graph.hjson';
@@ -57,7 +56,6 @@ const PIXEL_DIFF = 30;
 describe('VegaVisualizations', () => {
   let domNode;
   let VegaVisualization;
-  let indexPattern;
   let vis;
   let imageComparator;
   let vegaVisualizationDependencies;
@@ -71,7 +69,7 @@ describe('VegaVisualizations', () => {
 
   beforeEach(ngMock.module('kibana'));
   beforeEach(
-    ngMock.inject((Private, $injector) => {
+    ngMock.inject($injector => {
       vegaVisualizationDependencies = {
         serviceSettings: $injector.get('serviceSettings'),
         core: {
@@ -99,7 +97,6 @@ describe('VegaVisualizations', () => {
       }
 
       VegaVisualization = createVegaVisualization(vegaVisualizationDependencies);
-      indexPattern = Private(LogstashIndexPatternStubProvider);
     })
   );
 
@@ -108,7 +105,7 @@ describe('VegaVisualizations', () => {
       setupDOM('512px', '512px');
       imageComparator = new ImageComparator();
 
-      vis = visualizationsStart.createVis(indexPattern, { type: 'vega' });
+      vis = visualizationsStart.createVis('vega', { type: 'vega' });
     });
 
     afterEach(function() {
diff --git a/src/legacy/core_plugins/vis_type_vega/public/vega_type.ts b/src/legacy/core_plugins/vis_type_vega/public/vega_type.ts
index 78f9c170ab62d..b0ec90d2c378f 100644
--- a/src/legacy/core_plugins/vis_type_vega/public/vega_type.ts
+++ b/src/legacy/core_plugins/vis_type_vega/public/vega_type.ts
@@ -19,7 +19,6 @@
 
 import { i18n } from '@kbn/i18n';
 // @ts-ignore
-import { Status } from '../../visualizations/public';
 import { DefaultEditorSize } from '../../vis_default_editor/public';
 import { VegaVisualizationDependencies } from './plugin';
 import { VegaVisEditor } from './components';
@@ -51,7 +50,6 @@ export const createVegaTypeDefinition = (dependencies: VegaVisualizationDependen
     },
     visualization,
     requestHandler,
-    requiresUpdateStatus: [Status.DATA, Status.RESIZE],
     responseHandler: 'none',
     options: {
       showIndexSelection: false,
diff --git a/src/legacy/core_plugins/vis_type_vega/public/vega_visualization.js b/src/legacy/core_plugins/vis_type_vega/public/vega_visualization.js
index 3d48eeaaf3f94..96835ef3b10bc 100644
--- a/src/legacy/core_plugins/vis_type_vega/public/vega_visualization.js
+++ b/src/legacy/core_plugins/vis_type_vega/public/vega_visualization.js
@@ -69,7 +69,7 @@ export const createVegaVisualization = ({ serviceSettings }) =>
      * @param {*} status
      * @returns {Promise<void>}
      */
-    async render(visData, visParams, status) {
+    async render(visData) {
       const { toasts } = getNotifications();
 
       if (!visData && !this._vegaView) {
@@ -82,7 +82,7 @@ export const createVegaVisualization = ({ serviceSettings }) =>
       }
 
       try {
-        await this._render(visData, status);
+        await this._render(visData);
       } catch (error) {
         if (this._vegaView) {
           this._vegaView.onError(error);
@@ -96,8 +96,8 @@ export const createVegaVisualization = ({ serviceSettings }) =>
       }
     }
 
-    async _render(vegaParser, status) {
-      if (vegaParser && (status.data || !this._vegaView)) {
+    async _render(vegaParser) {
+      if (vegaParser) {
         // New data received, rebuild the graph
         if (this._vegaView) {
           await this._vegaView.destroy();
@@ -121,9 +121,6 @@ export const createVegaVisualization = ({ serviceSettings }) =>
           this._vegaView = new VegaView(vegaViewParams);
         }
         await this._vegaView.init();
-      } else if (status.resize) {
-        // the graph has been resized
-        await this._vegaView.resize();
       }
     }
 
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/components/options/metrics_axes/__snapshots__/index.test.tsx.snap b/src/legacy/core_plugins/vis_type_vislib/public/components/options/metrics_axes/__snapshots__/index.test.tsx.snap
index 80ed3b6a7ebff..442bc826d51fc 100644
--- a/src/legacy/core_plugins/vis_type_vislib/public/components/options/metrics_axes/__snapshots__/index.test.tsx.snap
+++ b/src/legacy/core_plugins/vis_type_vislib/public/components/options/metrics_axes/__snapshots__/index.test.tsx.snap
@@ -54,7 +54,7 @@ exports[`MetricsAxisOptions component should init with the default set of props
     }
     vis={
       Object {
-        "setVisType": [MockFunction],
+        "setState": [MockFunction],
         "type": Object {
           "schemas": Object {
             "metrics": Array [
@@ -126,7 +126,7 @@ exports[`MetricsAxisOptions component should init with the default set of props
     }
     vis={
       Object {
-        "setVisType": [MockFunction],
+        "setState": [MockFunction],
         "type": Object {
           "schemas": Object {
             "metrics": Array [
@@ -169,7 +169,7 @@ exports[`MetricsAxisOptions component should init with the default set of props
     setCategoryAxis={[Function]}
     vis={
       Object {
-        "setVisType": [MockFunction],
+        "setState": [MockFunction],
         "type": Object {
           "schemas": Object {
             "metrics": Array [
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 032dd10cf11d2..a3f150e718817 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
@@ -94,7 +94,7 @@ describe('MetricsAxisOptions component', () => {
           type: ChartTypes.AREA,
           schemas: { metrics: [{ name: 'metric' }] },
         },
-        setVisType: jest.fn(),
+        setState: jest.fn(),
       },
       stateParams: {
         valueAxes: [axis],
@@ -145,7 +145,7 @@ describe('MetricsAxisOptions component', () => {
         },
       });
 
-      expect(defaultProps.vis.setVisType).toHaveBeenLastCalledWith(ChartTypes.LINE);
+      expect(defaultProps.vis.setState).toHaveBeenLastCalledWith({ type: ChartTypes.LINE });
     });
 
     it('should set histogram visType when multiple seriesParam', () => {
@@ -159,7 +159,7 @@ describe('MetricsAxisOptions component', () => {
         },
       });
 
-      expect(defaultProps.vis.setVisType).toHaveBeenLastCalledWith(ChartTypes.HISTOGRAM);
+      expect(defaultProps.vis.setState).toHaveBeenLastCalledWith({ type: ChartTypes.HISTOGRAM });
     });
   });
 
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 a6f4a967d9c76..c7b4562b1087e 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
@@ -299,7 +299,7 @@ function MetricsAxisOptions(props: ValidationVisOptionsProps<BasicVislibParams>)
   }, [stateParams.seriesParams]);
 
   useEffect(() => {
-    vis.setVisType(visType);
+    vis.setState({ type: visType } as any);
   }, [vis, visType]);
 
   return isTabSelected ? (
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/components/options/point_series/point_series.tsx b/src/legacy/core_plugins/vis_type_vislib/public/components/options/point_series/point_series.tsx
index 229c4922145e8..b9872ab94bd0b 100644
--- a/src/legacy/core_plugins/vis_type_vislib/public/components/options/point_series/point_series.tsx
+++ b/src/legacy/core_plugins/vis_type_vislib/public/components/options/point_series/point_series.tsx
@@ -44,7 +44,9 @@ function PointSeriesOptions(props: ValidationVisOptionsProps<BasicVislibParams>)
 
         <BasicOptions {...props} />
 
-        {vis.hasSchemaAgg('segment', 'date_histogram') ? (
+        {vis.data.aggs!.aggs.some(
+          agg => agg.schema === 'segment' && agg.type.name === 'date_histogram'
+        ) ? (
           <SwitchOption
             label={i18n.translate('visTypeVislib.editors.pointSeries.currentTimeMarkerLabel', {
               defaultMessage: 'Current time marker',
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vis_controller.tsx b/src/legacy/core_plugins/vis_type_vislib/public/vis_controller.tsx
index 580e47195aada..010b61a0900b0 100644
--- a/src/legacy/core_plugins/vis_type_vislib/public/vis_controller.tsx
+++ b/src/legacy/core_plugins/vis_type_vislib/public/vis_controller.tsx
@@ -26,7 +26,8 @@ import { Positions } from './utils/collections';
 import { VisTypeVislibDependencies } from './plugin';
 import { mountReactNode } from '../../../../core/public/utils';
 import { VisLegend, CUSTOM_LEGEND_VIS_TYPES } from './vislib/components/legend';
-import { VisParams, Vis } from '../../visualizations/public';
+import { VisParams } from '../../visualizations/public';
+import { ExprVis } from '../../visualizations/public/np_ready/public/expressions/vis';
 
 const legendClassName = {
   top: 'visLib--legend-top',
@@ -45,7 +46,7 @@ export const createVislibVisController = (deps: VisTypeVislibDependencies) => {
     legendEl: HTMLDivElement;
     vislibVis: any;
 
-    constructor(public el: Element, public vis: Vis) {
+    constructor(public el: Element, public vis: ExprVis) {
       this.el = el;
       this.vis = vis;
       this.unmount = null;
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/visualizations/pie_chart.js b/src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/visualizations/pie_chart.js
index 43e3b987f1962..21f4e60e4bc6e 100644
--- a/src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/visualizations/pie_chart.js
+++ b/src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/visualizations/pie_chart.js
@@ -133,21 +133,30 @@ describe('No global chart settings', function() {
     responseHandler = vislibSlicesResponseHandler;
 
     let id1 = 1;
-    stubVis1 = visualizationsStart.createVis(indexPattern, {
+    stubVis1 = visualizationsStart.createVis('pie', {
       type: 'pie',
-      aggs: rowAgg,
+      data: {
+        aggs: rowAgg,
+        searchSource: {
+          getField: name => {
+            if (name === 'index') {
+              return indexPattern;
+            }
+          },
+        },
+      },
     });
 
     stubVis1.isHierarchical = () => true;
 
     // We need to set the aggs to a known value.
-    _.each(stubVis1.aggs.aggs, function(agg) {
+    _.each(stubVis1.data.aggs.aggs, function(agg) {
       agg.id = 'agg_' + id1++;
     });
   });
 
   beforeEach(async () => {
-    const table1 = tabifyAggResponse(stubVis1.aggs, threeTermBuckets, {
+    const table1 = tabifyAggResponse(stubVis1.data.aggs, threeTermBuckets, {
       metricsAtAllLevels: true,
     });
     data1 = await responseHandler(table1, rowAggDimensions);
@@ -222,19 +231,28 @@ describe('Vislib PieChart Class Test Suite', function() {
         responseHandler = vislibSlicesResponseHandler;
 
         let id = 1;
-        stubVis = visualizationsStart.createVis(indexPattern, {
+        stubVis = visualizationsStart.createVis('pie', {
           type: 'pie',
-          aggs: dataAgg,
+          data: {
+            aggs: dataAgg,
+            searchSource: {
+              getField: name => {
+                if (name === 'index') {
+                  return indexPattern;
+                }
+              },
+            },
+          },
         });
 
         // We need to set the aggs to a known value.
-        _.each(stubVis.aggs.aggs, function(agg) {
+        _.each(stubVis.data.aggs.aggs, function(agg) {
           agg.id = 'agg_' + id++;
         });
       });
 
       beforeEach(async () => {
-        const table = tabifyAggResponse(stubVis.aggs, threeTermBuckets, {
+        const table = tabifyAggResponse(stubVis.data.aggs, threeTermBuckets, {
           metricsAtAllLevels: true,
         });
         data = await responseHandler(table, dataDimensions);
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/components/legend/legend.tsx b/src/legacy/core_plugins/vis_type_vislib/public/vislib/components/legend/legend.tsx
index d82941b7b8cee..afd974d6d9b40 100644
--- a/src/legacy/core_plugins/vis_type_vislib/public/vislib/components/legend/legend.tsx
+++ b/src/legacy/core_plugins/vis_type_vislib/public/vislib/components/legend/legend.tsx
@@ -23,22 +23,11 @@ import { compact, uniq, map, every, isUndefined } from 'lodash';
 import { i18n } from '@kbn/i18n';
 import { EuiPopoverProps, EuiIcon, keyCodes, htmlIdGenerator } from '@elastic/eui';
 
-import { IAggConfig } from '../../../../../../../plugins/data/public';
+import { createFiltersFromEvent } from '../../../legacy_imports';
 import { CUSTOM_LEGEND_VIS_TYPES, LegendItem } from './models';
 import { VisLegendItem } from './legend_item';
 import { getPieNames } from './pie_utils';
 
-import { Vis } from '../../../../../visualizations/public';
-import { createFiltersFromEvent, tabifyGetColumns } from '../../../legacy_imports';
-
-const getTableAggs = (vis: Vis): IAggConfig[] => {
-  if (!vis.aggs || !vis.aggs.getResponseAggs) {
-    return [];
-  }
-  const columns = tabifyGetColumns(vis.aggs.getResponseAggs(), !vis.isHierarchical());
-  return columns.map(c => c.aggConfig);
-};
-
 export interface VisLegendProps {
   vis: any;
   vislibVis: any;
@@ -50,7 +39,6 @@ export interface VisLegendProps {
 export interface VisLegendState {
   open: boolean;
   labels: any[];
-  tableAggs: any[];
   filterableLabels: Set<string>;
   selectedLabel: string | null;
 }
@@ -66,7 +54,6 @@ export class VisLegend extends PureComponent<VisLegendProps, VisLegendState> {
     this.state = {
       open,
       labels: [],
-      tableAggs: [],
       filterableLabels: new Set(),
       selectedLabel: null,
     };
@@ -200,7 +187,6 @@ export class VisLegend extends PureComponent<VisLegendProps, VisLegendState> {
       this.getColor = this.props.vislibVis.visConfig.data.getColorFunc();
     }
 
-    this.setState({ tableAggs: getTableAggs(this.props.vis) });
     this.setLabels(this.props.visData, vislibVis.visConfigArgs.type);
   };
 
diff --git a/src/legacy/core_plugins/visualizations/public/np_ready/public/components/visualization.test.js b/src/legacy/core_plugins/visualizations/public/np_ready/public/components/visualization.test.js
index 4773fa482e62d..f2844e3aab113 100644
--- a/src/legacy/core_plugins/visualizations/public/np_ready/public/components/visualization.test.js
+++ b/src/legacy/core_plugins/visualizations/public/np_ready/public/components/visualization.test.js
@@ -55,7 +55,7 @@ describe('<Visualization/>', () => {
 
   beforeEach(() => {
     vis = {
-      _setUiState: function(uiState) {
+      setUiState: function(uiState) {
         this.uiState = uiState;
       },
       getUiState: function() {
@@ -79,15 +79,6 @@ describe('<Visualization/>', () => {
     expect(wrapper.text()).toBe('No results found');
   });
 
-  it('should display error message when there is a request error that should be shown and no data', () => {
-    const errorVis = { ...vis, requestError: { message: 'Request error' }, showRequestError: true };
-    const data = null;
-    const wrapper = render(
-      <Visualization vis={errorVis} visData={data} listenOnChange={true} uiState={uiState} />
-    );
-    expect(wrapper.text()).toBe('Request error');
-  });
-
   it('should render chart when data is present', () => {
     const wrapper = render(
       <Visualization vis={vis} visData={visData} uiState={uiState} listenOnChange={true} />
diff --git a/src/legacy/core_plugins/visualizations/public/np_ready/public/components/visualization.tsx b/src/legacy/core_plugins/visualizations/public/np_ready/public/components/visualization.tsx
index 33830c45848e4..5296de365daec 100644
--- a/src/legacy/core_plugins/visualizations/public/np_ready/public/components/visualization.tsx
+++ b/src/legacy/core_plugins/visualizations/public/np_ready/public/components/visualization.tsx
@@ -23,10 +23,9 @@ import { PersistedState } from '../../../../../../../plugins/visualizations/publ
 import { memoizeLast } from '../legacy/memoize';
 import { VisualizationChart } from './visualization_chart';
 import { VisualizationNoResults } from './visualization_noresults';
-import { VisualizationRequestError } from './visualization_requesterror';
-import { Vis } from '..';
+import { ExprVis } from '../expressions/vis';
 
-function shouldShowNoResultsMessage(vis: Vis, visData: any): boolean {
+function shouldShowNoResultsMessage(vis: ExprVis, visData: any): boolean {
   const requiresSearch = get(vis, 'type.requiresSearch');
   const rows: object[] | undefined = get(visData, 'rows');
   const isZeroHits = get(visData, 'hits') === 0 || (rows && !rows.length);
@@ -35,17 +34,11 @@ function shouldShowNoResultsMessage(vis: Vis, visData: any): boolean {
   return Boolean(requiresSearch && isZeroHits && shouldShowMessage);
 }
 
-function shouldShowRequestErrorMessage(vis: Vis, visData: any): boolean {
-  const requestError = get(vis, 'requestError');
-  const showRequestError = get(vis, 'showRequestError');
-  return Boolean(!visData && requestError && showRequestError);
-}
-
 interface VisualizationProps {
   listenOnChange: boolean;
   onInit?: () => void;
   uiState: PersistedState;
-  vis: Vis;
+  vis: ExprVis;
   visData: any;
   visParams: any;
 }
@@ -56,20 +49,17 @@ export class Visualization extends React.Component<VisualizationProps> {
   constructor(props: VisualizationProps) {
     super(props);
 
-    props.vis._setUiState(props.uiState);
+    props.vis.setUiState(props.uiState);
   }
 
   public render() {
     const { vis, visData, visParams, onInit, uiState, listenOnChange } = this.props;
 
     const noResults = this.showNoResultsMessage(vis, visData);
-    const requestError = shouldShowRequestErrorMessage(vis, visData);
 
     return (
       <div className="visualization">
-        {requestError ? (
-          <VisualizationRequestError onInit={onInit} error={vis.requestError} />
-        ) : noResults ? (
+        {noResults ? (
           <VisualizationNoResults onInit={onInit} />
         ) : (
           <VisualizationChart
diff --git a/src/legacy/core_plugins/visualizations/public/np_ready/public/components/visualization_chart.tsx b/src/legacy/core_plugins/visualizations/public/np_ready/public/components/visualization_chart.tsx
index 7b1a18e8066a7..fcfbc8445952c 100644
--- a/src/legacy/core_plugins/visualizations/public/np_ready/public/components/visualization_chart.tsx
+++ b/src/legacy/core_plugins/visualizations/public/np_ready/public/components/visualization_chart.tsx
@@ -21,14 +21,14 @@ import React from 'react';
 import * as Rx from 'rxjs';
 import { debounceTime, filter, share, switchMap } from 'rxjs/operators';
 import { PersistedState } from '../../../../../../../plugins/visualizations/public';
-import { Vis, VisualizationController } from '../vis';
-import { getUpdateStatus } from '../legacy/update_status';
+import { VisualizationController } from '../types';
 import { ResizeChecker } from '../../../../../../../plugins/kibana_utils/public';
+import { ExprVis } from '../expressions/vis';
 
 interface VisualizationChartProps {
   onInit?: () => void;
   uiState: PersistedState;
-  vis: Vis;
+  vis: ExprVis;
   visData: any;
   visParams: any;
   listenOnChange: boolean;
@@ -40,10 +40,9 @@ class VisualizationChart extends React.Component<VisualizationChartProps> {
   private chartDiv = React.createRef<HTMLDivElement>();
   private containerDiv = React.createRef<HTMLDivElement>();
   private renderSubject: Rx.Subject<{
-    vis: Vis;
+    vis: ExprVis;
     visParams: any;
     visData: any;
-    container: HTMLElement;
   }>;
   private renderSubscription: Rx.Subscription;
 
@@ -54,11 +53,9 @@ class VisualizationChart extends React.Component<VisualizationChartProps> {
     const render$ = this.renderSubject.asObservable().pipe(share());
 
     const success$ = render$.pipe(
-      filter(
-        ({ vis, visData, container }) => vis && container && (!vis.type.requiresSearch || visData)
-      ),
+      filter(({ vis, visData }) => vis && (!vis.type.requiresSearch || visData)),
       debounceTime(100),
-      switchMap(async ({ vis, visData, visParams, container }) => {
+      switchMap(async ({ vis, visData, visParams }) => {
         if (!this.visualization) {
           // This should never happen, since we only should trigger another rendering
           // after this component has mounted and thus the visualization implementation
@@ -66,15 +63,11 @@ class VisualizationChart extends React.Component<VisualizationChartProps> {
           throw new Error('Visualization implementation was not initialized on first render.');
         }
 
-        vis.size = [container.clientWidth, container.clientHeight];
-        const status = getUpdateStatus(vis.type.requiresUpdateStatus, this, this.props);
-        return this.visualization.render(visData, visParams, status);
+        return this.visualization.render(visData, visParams);
       })
     );
 
-    const requestError$ = render$.pipe(filter(({ vis }) => vis.requestError));
-
-    this.renderSubscription = Rx.merge(success$, requestError$).subscribe(() => {
+    this.renderSubscription = success$.subscribe(() => {
       if (this.props.onInit) {
         this.props.onInit();
       }
@@ -145,7 +138,6 @@ class VisualizationChart extends React.Component<VisualizationChartProps> {
         vis: this.props.vis,
         visData: this.props.visData,
         visParams: this.props.visParams,
-        container: this.containerDiv.current,
       });
     }
   }
diff --git a/src/legacy/core_plugins/visualizations/public/np_ready/public/embeddable/get_index_pattern.ts b/src/legacy/core_plugins/visualizations/public/np_ready/public/embeddable/get_index_pattern.ts
index 51d839275fd27..05ce68221eaf0 100644
--- a/src/legacy/core_plugins/visualizations/public/np_ready/public/embeddable/get_index_pattern.ts
+++ b/src/legacy/core_plugins/visualizations/public/np_ready/public/embeddable/get_index_pattern.ts
@@ -28,18 +28,18 @@ import { getUISettings, getSavedObjects } from '../services';
 export async function getIndexPattern(
   savedVis: VisSavedObject
 ): Promise<IIndexPattern | undefined> {
-  if (savedVis.vis.type.name !== 'metrics') {
-    return savedVis.vis.indexPattern;
+  if (savedVis.visState.type !== 'metrics') {
+    return savedVis.searchSource!.getField('index');
   }
 
   const savedObjectsClient = getSavedObjects().client;
   const defaultIndex = getUISettings().get('defaultIndex');
 
-  if (savedVis.vis.params.index_pattern) {
+  if (savedVis.visState.params.index_pattern) {
     const indexPatternObjects = await savedObjectsClient.find<IndexPatternAttributes>({
       type: 'index-pattern',
       fields: ['title', 'fields'],
-      search: `"${savedVis.vis.params.index_pattern}"`,
+      search: `"${savedVis.visState.params.index_pattern}"`,
       searchFields: ['title'],
     });
     const [indexPattern] = indexPatternObjects.savedObjects.map(indexPatterns.getFromSavedObject);
diff --git a/src/legacy/core_plugins/visualizations/public/np_ready/public/embeddable/visualize_embeddable.ts b/src/legacy/core_plugins/visualizations/public/np_ready/public/embeddable/visualize_embeddable.ts
index c45e6832dc836..342824bade3dd 100644
--- a/src/legacy/core_plugins/visualizations/public/np_ready/public/embeddable/visualize_embeddable.ts
+++ b/src/legacy/core_plugins/visualizations/public/np_ready/public/embeddable/visualize_embeddable.ts
@@ -45,13 +45,12 @@ import { PersistedState } from '../../../../../../../plugins/visualizations/publ
 import { buildPipeline } from '../legacy/build_pipeline';
 import { Vis } from '../vis';
 import { getExpressions, getUiActions } from '../services';
-import { VisSavedObject } from '../types';
 import { VIS_EVENT_TO_TRIGGER } from './events';
 
 const getKeys = <T extends {}>(o: T): Array<keyof T> => Object.keys(o) as Array<keyof T>;
 
 export interface VisualizeEmbeddableConfiguration {
-  savedVisualization: VisSavedObject;
+  vis: Vis;
   indexPatterns?: IIndexPattern[];
   editUrl: string;
   editable: boolean;
@@ -73,7 +72,6 @@ export interface VisualizeInput extends EmbeddableInput {
 export interface VisualizeOutput extends EmbeddableOutput {
   editUrl: string;
   indexPatterns?: IIndexPattern[];
-  savedObjectId: string;
   visTypeName: string;
 }
 
@@ -81,9 +79,6 @@ type ExpressionLoader = InstanceType<ExpressionsStart['ExpressionLoader']>;
 
 export class VisualizeEmbeddable extends Embeddable<VisualizeInput, VisualizeOutput> {
   private handler?: ExpressionLoader;
-  private savedVisualization: VisSavedObject;
-  private appState: { save(): void } | undefined;
-  private uiState: PersistedState;
   private timefilter: TimefilterContract;
   private timeRange?: TimeRange;
   private query?: Query;
@@ -99,49 +94,24 @@ export class VisualizeEmbeddable extends Embeddable<VisualizeInput, VisualizeOut
 
   constructor(
     timefilter: TimefilterContract,
-    {
-      savedVisualization,
-      editUrl,
-      indexPatterns,
-      editable,
-      appState,
-      uiState,
-    }: VisualizeEmbeddableConfiguration,
+    { vis, editUrl, indexPatterns, editable }: VisualizeEmbeddableConfiguration,
     initialInput: VisualizeInput,
     parent?: Container
   ) {
     super(
       initialInput,
       {
-        defaultTitle: savedVisualization.title,
+        defaultTitle: vis.title,
         editUrl,
         indexPatterns,
         editable,
-        savedObjectId: savedVisualization.id!,
-        visTypeName: savedVisualization.vis.type.name,
+        visTypeName: vis.type.name,
       },
       parent
     );
     this.timefilter = timefilter;
-    this.appState = appState;
-    this.savedVisualization = savedVisualization;
-    this.vis = this.savedVisualization.vis;
-
-    this.vis.on('update', this.handleVisUpdate);
-    this.vis.on('reload', this.reload);
-
-    if (uiState) {
-      this.uiState = uiState;
-    } else {
-      const parsedUiState = savedVisualization.uiStateJSON
-        ? JSON.parse(savedVisualization.uiStateJSON)
-        : {};
-      this.uiState = new PersistedState(parsedUiState);
-
-      this.uiState.on('change', this.uiStateChangeHandler);
-    }
-
-    this.vis._setUiState(this.uiState);
+    this.vis = vis;
+    this.vis.uiState.on('change', this.uiStateChangeHandler);
 
     this.autoRefreshFetchSubscription = timefilter
       .getAutoRefreshFetch$()
@@ -155,7 +125,7 @@ export class VisualizeEmbeddable extends Embeddable<VisualizeInput, VisualizeOut
   }
 
   public getVisualizationDescription() {
-    return this.savedVisualization.description;
+    return this.vis.description;
   }
 
   public getInspectorAdapters = () => {
@@ -184,16 +154,16 @@ export class VisualizeEmbeddable extends Embeddable<VisualizeInput, VisualizeOut
       if (!_.isEqual(visCustomizations, this.visCustomizations)) {
         this.visCustomizations = visCustomizations;
         // Turn this off or the uiStateChangeHandler will fire for every modification.
-        this.uiState.off('change', this.uiStateChangeHandler);
-        this.uiState.clearAllKeys();
-        this.uiState.set('vis', visCustomizations);
+        this.vis.uiState.off('change', this.uiStateChangeHandler);
+        this.vis.uiState.clearAllKeys();
+        this.vis.uiState.set('vis', visCustomizations);
         getKeys(visCustomizations).forEach(key => {
-          this.uiState.set(key, visCustomizations[key]);
+          this.vis.uiState.set(key, visCustomizations[key]);
         });
-        this.uiState.on('change', this.uiStateChangeHandler);
+        this.vis.uiState.on('change', this.uiStateChangeHandler);
       }
-    } else if (!this.appState) {
-      this.uiState.clearAllKeys();
+    } else if (this.parent) {
+      this.vis.uiState.clearAllKeys();
     }
   }
 
@@ -227,8 +197,8 @@ export class VisualizeEmbeddable extends Embeddable<VisualizeInput, VisualizeOut
       }
     }
 
-    if (this.savedVisualization.description && this.domNode) {
-      this.domNode.setAttribute('data-description', this.savedVisualization.description);
+    if (this.vis.description && this.domNode) {
+      this.domNode.setAttribute('data-description', this.vis.description);
     }
 
     if (this.handler && dirty) {
@@ -236,6 +206,22 @@ export class VisualizeEmbeddable extends Embeddable<VisualizeInput, VisualizeOut
     }
   }
 
+  // this is a hack to make editor still work, will be removed once we clean up editor
+  // @ts-ignore
+  hasInspector = () => {
+    const visTypesWithoutInspector = [
+      'markdown',
+      'input_control_vis',
+      'metrics',
+      'vega',
+      'timelion',
+    ];
+    if (visTypesWithoutInspector.includes(this.vis.type.name)) {
+      return false;
+    }
+    return this.getInspectorAdapters();
+  };
+
   /**
    *
    * @param {Element} domNode
@@ -245,26 +231,6 @@ export class VisualizeEmbeddable extends Embeddable<VisualizeInput, VisualizeOut
 
     this.transferCustomizationsToUiState();
 
-    this.savedVisualization.vis._setUiState(this.uiState);
-    this.uiState = this.savedVisualization.vis.getUiState();
-
-    // this is a hack to make editor still work, will be removed once we clean up editor
-    this.vis.hasInspector = () => {
-      const visTypesWithoutInspector = [
-        'markdown',
-        'input_control_vis',
-        'metrics',
-        'vega',
-        'timelion',
-      ];
-      if (visTypesWithoutInspector.includes(this.vis.type.name)) {
-        return false;
-      }
-      return this.getInspectorAdapters();
-    };
-
-    this.vis.openInspector = this.openInspector;
-
     const div = document.createElement('div');
     div.className = `visualize panel-content panel-content--fullWidth`;
     domNode.appendChild(div);
@@ -277,12 +243,12 @@ export class VisualizeEmbeddable extends Embeddable<VisualizeInput, VisualizeOut
       this.handler.events$.subscribe(async event => {
         // maps hack, remove once esaggs function is cleaned up and ready to accept variables
         if (event.name === 'bounds') {
-          const agg = this.vis.getAggConfig().aggs.find((a: any) => {
+          const agg = this.vis.data.aggs!.aggs.find((a: any) => {
             return get(a, 'type.dslName') === 'geohash_grid';
           });
           if (
-            agg.params.precision !== event.data.precision ||
-            !_.isEqual(agg.params.boundingBox, event.data.boundingBox)
+            (agg && agg.params.precision !== event.data.precision) ||
+            (agg && !_.isEqual(agg.params.boundingBox, event.data.boundingBox))
           ) {
             agg.params.boundingBox = event.data.boundingBox;
             agg.params.precision = event.data.precision;
@@ -296,7 +262,7 @@ export class VisualizeEmbeddable extends Embeddable<VisualizeInput, VisualizeOut
             event.name === 'brush' ? VIS_EVENT_TO_TRIGGER.brush : VIS_EVENT_TO_TRIGGER.filter;
           const context: EmbeddableVisTriggerContext = {
             embeddable: this,
-            timeFieldName: this.vis.indexPattern.timeFieldName,
+            timeFieldName: this.vis.data.indexPattern!.timeFieldName!,
             data: event.data,
           };
           getUiActions()
@@ -308,8 +274,8 @@ export class VisualizeEmbeddable extends Embeddable<VisualizeInput, VisualizeOut
 
     div.setAttribute('data-title', this.output.title || '');
 
-    if (this.savedVisualization.description) {
-      div.setAttribute('data-description', this.savedVisualization.description);
+    if (this.vis.description) {
+      div.setAttribute('data-description', this.vis.description);
     }
 
     div.setAttribute('data-test-subj', 'visualizationLoader');
@@ -339,10 +305,8 @@ export class VisualizeEmbeddable extends Embeddable<VisualizeInput, VisualizeOut
   public destroy() {
     super.destroy();
     this.subscriptions.forEach(s => s.unsubscribe());
-    this.uiState.off('change', this.uiStateChangeHandler);
-    this.savedVisualization.vis.removeListener('reload', this.reload);
-    this.savedVisualization.vis.removeListener('update', this.handleVisUpdate);
-    this.savedVisualization.destroy();
+    this.vis.uiState.off('change', this.uiStateChangeHandler);
+
     if (this.handler) {
       this.handler.destroy();
       this.handler.getElement().remove();
@@ -361,35 +325,25 @@ export class VisualizeEmbeddable extends Embeddable<VisualizeInput, VisualizeOut
         query: this.input.query,
         filters: this.input.filters,
       },
-      uiState: this.uiState,
+      uiState: this.vis.uiState,
     };
     this.expression = await buildPipeline(this.vis, {
-      searchSource: this.savedVisualization.searchSource,
       timefilter: this.timefilter,
       timeRange: this.timeRange,
-      savedObjectId: this.savedVisualization.id,
     });
 
-    this.vis.filters = { timeRange: this.timeRange };
-
     if (this.handler) {
       this.handler.update(this.expression, expressionParams);
     }
-
-    this.vis.emit('apply');
   }
 
   private handleVisUpdate = async () => {
-    if (this.appState) {
-      this.appState.save();
-    }
-
     this.updateHandler();
   };
 
   private uiStateChangeHandler = () => {
     this.updateInput({
-      ...this.uiState.toJSON(),
+      ...this.vis.uiState.toJSON(),
     });
   };
 
diff --git a/src/legacy/core_plugins/visualizations/public/np_ready/public/embeddable/visualize_embeddable_factory.tsx b/src/legacy/core_plugins/visualizations/public/np_ready/public/embeddable/visualize_embeddable_factory.tsx
index 1cd97115ee10e..911f5530e97e3 100644
--- a/src/legacy/core_plugins/visualizations/public/np_ready/public/embeddable/visualize_embeddable_factory.tsx
+++ b/src/legacy/core_plugins/visualizations/public/np_ready/public/embeddable/visualize_embeddable_factory.tsx
@@ -26,9 +26,8 @@ import {
   ErrorEmbeddable,
 } from '../../../../../../../plugins/embeddable/public';
 import { DisabledLabEmbeddable } from './disabled_lab_embeddable';
-import { getIndexPattern } from './get_index_pattern';
 import { VisualizeEmbeddable, VisualizeInput, VisualizeOutput } from './visualize_embeddable';
-import { VisSavedObject } from '../types';
+import { Vis } from '../types';
 import { VISUALIZE_EMBEDDABLE_TYPE } from './constants';
 import {
   getCapabilities,
@@ -39,6 +38,7 @@ import {
   getTimeFilter,
 } from '../services';
 import { showNewVisModal } from '../wizard';
+import { convertToSerializedVis } from '../saved_visualizations/_saved_vis';
 
 interface VisualizationAttributes extends SavedObjectAttributes {
   visState: string;
@@ -94,31 +94,31 @@ export class VisualizeEmbeddableFactory extends EmbeddableFactory<
   }
 
   public async createFromObject(
-    savedObject: VisSavedObject,
+    vis: Vis,
     input: Partial<VisualizeInput> & { id: string },
     parent?: Container
   ): Promise<VisualizeEmbeddable | ErrorEmbeddable | DisabledLabEmbeddable> {
     const savedVisualizations = getSavedVisualizationsLoader();
 
     try {
-      const visId = savedObject.id as string;
+      const visId = vis.id as string;
 
       const editUrl = visId
         ? getHttp().basePath.prepend(`/app/kibana${savedVisualizations.urlFor(visId)}`)
         : '';
       const isLabsEnabled = getUISettings().get<boolean>('visualize:enableLabs');
 
-      if (!isLabsEnabled && savedObject.vis.type.stage === 'experimental') {
-        return new DisabledLabEmbeddable(savedObject.title, input);
+      if (!isLabsEnabled && vis.type.stage === 'experimental') {
+        return new DisabledLabEmbeddable(vis.title, input);
       }
 
-      const indexPattern = await getIndexPattern(savedObject);
+      const indexPattern = vis.data.indexPattern;
       const indexPatterns = indexPattern ? [indexPattern] : [];
       const editable = await this.isEditable();
       return new VisualizeEmbeddable(
         getTimeFilter(),
         {
-          savedVisualization: savedObject,
+          vis,
           indexPatterns,
           editUrl,
           editable,
@@ -143,7 +143,8 @@ export class VisualizeEmbeddableFactory extends EmbeddableFactory<
 
     try {
       const savedObject = await savedVisualizations.get(savedObjectId);
-      return this.createFromObject(savedObject, input, parent);
+      const vis = new Vis(savedObject.visState.type, await convertToSerializedVis(savedObject));
+      return this.createFromObject(vis, input, parent);
     } catch (e) {
       console.error(e); // eslint-disable-line no-console
       return new ErrorEmbeddable(e, input, parent);
diff --git a/src/legacy/core_plugins/visualizations/public/np_ready/public/expressions/vis.js b/src/legacy/core_plugins/visualizations/public/np_ready/public/expressions/vis.ts
similarity index 67%
rename from src/legacy/core_plugins/visualizations/public/np_ready/public/expressions/vis.js
rename to src/legacy/core_plugins/visualizations/public/np_ready/public/expressions/vis.ts
index a891140677d60..3b0458a6c8dcc 100644
--- a/src/legacy/core_plugins/visualizations/public/np_ready/public/expressions/vis.js
+++ b/src/legacy/core_plugins/visualizations/public/np_ready/public/expressions/vis.ts
@@ -32,25 +32,47 @@ import _ from 'lodash';
 import { PersistedState } from '../../../../../../../plugins/visualizations/public';
 
 import { getTypes } from '../services';
+import { VisType } from '../vis_types';
+import { VisParams } from '../types';
 
-export class Vis extends EventEmitter {
-  constructor(visState = { type: 'histogram' }) {
+export interface ExprVisState {
+  title?: string;
+  type: VisType | string;
+  params?: VisParams;
+}
+
+export interface ExprVisAPIEvents {
+  filter: (data: any) => void;
+  brush: (data: any) => void;
+}
+
+export interface ExprVisAPI {
+  events: ExprVisAPIEvents;
+}
+
+export class ExprVis extends EventEmitter {
+  public title: string = '';
+  public type: VisType;
+  public params: VisParams = {};
+  public sessionState: Record<string, any> = {};
+  public API: ExprVisAPI;
+  public eventsSubject: any;
+  private uiState: PersistedState;
+
+  constructor(visState: ExprVisState = { type: 'histogram' }) {
     super();
 
-    this._setUiState(new PersistedState());
+    this.type = this.getType(visState.type);
+    this.uiState = new PersistedState();
     this.setState(visState);
 
-    // Session state is for storing information that is transitory, and will not be saved with the visualization.
-    // For instance, map bounds, which depends on the view port, browser window size, etc.
-    this.sessionState = {};
-
     this.API = {
       events: {
-        filter: data => {
+        filter: (data: any) => {
           if (!this.eventsSubject) return;
           this.eventsSubject.next({ name: 'filterBucket', data });
         },
-        brush: data => {
+        brush: (data: any) => {
           if (!this.eventsSubject) return;
           this.eventsSubject.next({ name: 'brush', data });
         },
@@ -58,18 +80,22 @@ export class Vis extends EventEmitter {
     };
   }
 
-  setState(state) {
-    this.title = state.title || '';
-    const type = state.type || this.type;
+  private getType(type: string | VisType) {
     if (_.isString(type)) {
-      this.type = getTypes().get(type);
+      return getTypes().get(type);
       if (!this.type) {
         throw new Error(`Invalid type "${type}"`);
       }
     } else {
-      this.type = type;
+      return type;
     }
+  }
 
+  setState(state: ExprVisState) {
+    this.title = state.title || '';
+    if (state.type) {
+      this.type = this.getType(state.type);
+    }
     this.params = _.defaultsDeep(
       {},
       _.cloneDeep(state.params || {}),
@@ -77,10 +103,6 @@ export class Vis extends EventEmitter {
     );
   }
 
-  setCurrentState(state) {
-    this.setState(state);
-  }
-
   getState() {
     return {
       title: this.title,
@@ -106,34 +128,27 @@ export class Vis extends EventEmitter {
   }
 
   hasUiState() {
-    return !!this.__uiState;
+    return !!this.uiState;
   }
 
-  /***
-   * this should not be used outside of visualize
-   * @param uiState
-   * @private
-   */
-  _setUiState(uiState) {
-    if (uiState instanceof PersistedState) {
-      this.__uiState = uiState;
-    }
+  getUiState() {
+    return this.uiState;
   }
 
-  getUiState() {
-    return this.__uiState;
+  setUiState(state: PersistedState) {
+    this.uiState = state;
   }
 
   /**
    * Currently this is only used to extract map-specific information
    * (e.g. mapZoom, mapCenter).
    */
-  uiStateVal(key, val) {
+  uiStateVal(key: string, val: any) {
     if (this.hasUiState()) {
       if (_.isUndefined(val)) {
-        return this.__uiState.get(key);
+        return this.uiState.get(key);
       }
-      return this.__uiState.set(key, val);
+      return this.uiState.set(key, val);
     }
     return val;
   }
diff --git a/src/legacy/core_plugins/visualizations/public/np_ready/public/expressions/visualization_renderer.tsx b/src/legacy/core_plugins/visualizations/public/np_ready/public/expressions/visualization_renderer.tsx
index 02a31447d23c1..0fd81c753da24 100644
--- a/src/legacy/core_plugins/visualizations/public/np_ready/public/expressions/visualization_renderer.tsx
+++ b/src/legacy/core_plugins/visualizations/public/np_ready/public/expressions/visualization_renderer.tsx
@@ -20,8 +20,9 @@
 import React from 'react';
 import { render, unmountComponentAtNode } from 'react-dom';
 // @ts-ignore
-import { Vis } from './vis';
+import { ExprVis } from './vis';
 import { Visualization } from '../components';
+import { VisParams } from '../types';
 
 export const visualization = () => ({
   name: 'visualization',
@@ -31,9 +32,9 @@ export const visualization = () => ({
     const { visData, visConfig, params } = config;
     const visType = config.visType || visConfig.type;
 
-    const vis = new Vis({
-      type: visType,
-      params: visConfig,
+    const vis = new ExprVis({
+      type: visType as string,
+      params: visConfig as VisParams,
     });
 
     vis.eventsSubject = { next: handlers.event };
diff --git a/src/legacy/core_plugins/visualizations/public/np_ready/public/index.ts b/src/legacy/core_plugins/visualizations/public/np_ready/public/index.ts
index b59eb2277411c..078cc4a3f4035 100644
--- a/src/legacy/core_plugins/visualizations/public/np_ready/public/index.ts
+++ b/src/legacy/core_plugins/visualizations/public/np_ready/public/index.ts
@@ -39,12 +39,11 @@ export { VisualizationsSetup, VisualizationsStart };
 /** @public types */
 export { VisTypeAlias, VisType } from './vis_types';
 export { VisSavedObject } from './types';
-export { Vis, VisParams, VisState } from './vis';
+export { Vis, VisParams, SerializedVis, SerializedVisData, VisData } from './vis';
 import { VisualizeEmbeddableFactory, VisualizeEmbeddable } from './embeddable';
 export type VisualizeEmbeddableFactoryContract = PublicContract<VisualizeEmbeddableFactory>;
 export type VisualizeEmbeddableContract = PublicContract<VisualizeEmbeddable>;
 export { TypesService } from './vis_types/types_service';
-export { Status } from './legacy/update_status'; // should remove
 export { VISUALIZE_EMBEDDABLE_TYPE, VisualizeInput } from './embeddable';
 export { SchemaConfig } from './legacy/build_pipeline';
 
diff --git a/src/legacy/core_plugins/visualizations/public/np_ready/public/legacy/build_pipeline.test.ts b/src/legacy/core_plugins/visualizations/public/np_ready/public/legacy/build_pipeline.test.ts
index 9446069182e19..d5c532b53a53e 100644
--- a/src/legacy/core_plugins/visualizations/public/np_ready/public/legacy/build_pipeline.test.ts
+++ b/src/legacy/core_plugins/visualizations/public/np_ready/public/legacy/build_pipeline.test.ts
@@ -27,7 +27,7 @@ import {
   Schemas,
 } from './build_pipeline';
 import { Vis } from '..';
-import { searchSourceMock, dataPluginMock } from '../../../../../../../plugins/data/public/mocks';
+import { dataPluginMock } from '../../../../../../../plugins/data/public/mocks';
 import { IAggConfig } from '../../../../../../../plugins/data/public';
 
 jest.mock('ui/new_platform');
@@ -78,19 +78,11 @@ describe('visualize loader pipeline helpers: build pipeline', () => {
   });
 
   describe('buildPipelineVisFunction', () => {
-    let visStateDef: ReturnType<Vis['getCurrentState']>;
     let schemaConfig: SchemaConfig;
     let schemasDef: Schemas;
     let uiState: any;
 
     beforeEach(() => {
-      visStateDef = {
-        title: 'title',
-        // @ts-ignore
-        type: 'type',
-        params: {},
-      } as ReturnType<Vis['getCurrentState']>;
-
       schemaConfig = {
         accessor: 0,
         label: '',
@@ -105,66 +97,53 @@ describe('visualize loader pipeline helpers: build pipeline', () => {
 
     it('handles vega function', () => {
       const vis = {
-        ...visStateDef,
         params: { spec: 'this is a test' },
       };
-      const actual = buildPipelineVisFunction.vega(vis, schemasDef, uiState);
+      const actual = buildPipelineVisFunction.vega(vis.params, schemasDef, uiState);
       expect(actual).toMatchSnapshot();
     });
 
     it('handles input_control_vis function', () => {
-      const visState = {
-        ...visStateDef,
-        params: {
-          some: 'nested',
-          data: { here: true },
-        },
+      const params = {
+        some: 'nested',
+        data: { here: true },
       };
-      const actual = buildPipelineVisFunction.input_control_vis(visState, schemasDef, uiState);
+      const actual = buildPipelineVisFunction.input_control_vis(params, schemasDef, uiState);
       expect(actual).toMatchSnapshot();
     });
 
     it('handles metrics/tsvb function', () => {
-      const visState = { ...visStateDef, params: { foo: 'bar' } };
-      const actual = buildPipelineVisFunction.metrics(visState, schemasDef, uiState);
+      const params = { foo: 'bar' };
+      const actual = buildPipelineVisFunction.metrics(params, schemasDef, uiState);
       expect(actual).toMatchSnapshot();
     });
 
     it('handles timelion function', () => {
-      const visState = {
-        ...visStateDef,
-        params: { expression: 'foo', interval: 'bar' },
-      };
-      const actual = buildPipelineVisFunction.timelion(visState, schemasDef, uiState);
+      const params = { expression: 'foo', interval: 'bar' };
+      const actual = buildPipelineVisFunction.timelion(params, schemasDef, uiState);
       expect(actual).toMatchSnapshot();
     });
 
     it('handles markdown function', () => {
-      const visState = {
-        ...visStateDef,
-        params: {
-          markdown: '## hello _markdown_',
-          fontSize: 12,
-          openLinksInNewTab: true,
-          foo: 'bar',
-        },
+      const params = {
+        markdown: '## hello _markdown_',
+        fontSize: 12,
+        openLinksInNewTab: true,
+        foo: 'bar',
       };
-      const actual = buildPipelineVisFunction.markdown(visState, schemasDef, uiState);
+      const actual = buildPipelineVisFunction.markdown(params, schemasDef, uiState);
       expect(actual).toMatchSnapshot();
     });
 
     it('handles undefined markdown function', () => {
-      const visState = {
-        ...visStateDef,
-        params: { fontSize: 12, openLinksInNewTab: true, foo: 'bar' },
-      };
-      const actual = buildPipelineVisFunction.markdown(visState, schemasDef, uiState);
+      const params = { fontSize: 12, openLinksInNewTab: true, foo: 'bar' };
+      const actual = buildPipelineVisFunction.markdown(params, schemasDef, uiState);
       expect(actual).toMatchSnapshot();
     });
 
     describe('handles table function', () => {
       it('without splits or buckets', () => {
-        const visState = { ...visStateDef, params: { foo: 'bar' } };
+        const params = { foo: 'bar' };
         const schemas = {
           ...schemasDef,
           metric: [
@@ -172,22 +151,22 @@ describe('visualize loader pipeline helpers: build pipeline', () => {
             { ...schemaConfig, accessor: 1 },
           ],
         };
-        const actual = buildPipelineVisFunction.table(visState, schemas, uiState);
+        const actual = buildPipelineVisFunction.table(params, schemas, uiState);
         expect(actual).toMatchSnapshot();
       });
 
       it('with splits', () => {
-        const visState = { ...visStateDef, params: { foo: 'bar' } };
+        const params = { foo: 'bar' };
         const schemas = {
           ...schemasDef,
           split_row: [1, 2],
         };
-        const actual = buildPipelineVisFunction.table(visState, schemas, uiState);
+        const actual = buildPipelineVisFunction.table(params, schemas, uiState);
         expect(actual).toMatchSnapshot();
       });
 
       it('with splits and buckets', () => {
-        const visState = { ...visStateDef, params: { foo: 'bar' } };
+        const params = { foo: 'bar' };
         const schemas = {
           ...schemasDef,
           metric: [
@@ -197,17 +176,14 @@ describe('visualize loader pipeline helpers: build pipeline', () => {
           split_row: [2, 4],
           bucket: [3],
         };
-        const actual = buildPipelineVisFunction.table(visState, schemas, uiState);
+        const actual = buildPipelineVisFunction.table(params, schemas, uiState);
         expect(actual).toMatchSnapshot();
       });
 
       it('with showPartialRows=true and showMetricsAtAllLevels=true', () => {
-        const visState = {
-          ...visStateDef,
-          params: {
-            showMetricsAtAllLevels: true,
-            showPartialRows: true,
-          },
+        const params = {
+          showMetricsAtAllLevels: true,
+          showPartialRows: true,
         };
         const schemas = {
           ...schemasDef,
@@ -219,17 +195,14 @@ describe('visualize loader pipeline helpers: build pipeline', () => {
           ],
           bucket: [0, 3],
         };
-        const actual = buildPipelineVisFunction.table(visState, schemas, uiState);
+        const actual = buildPipelineVisFunction.table(params, schemas, uiState);
         expect(actual).toMatchSnapshot();
       });
 
       it('with showPartialRows=true and showMetricsAtAllLevels=false', () => {
-        const visState = {
-          ...visStateDef,
-          params: {
-            showMetricsAtAllLevels: false,
-            showPartialRows: true,
-          },
+        const params = {
+          showMetricsAtAllLevels: false,
+          showPartialRows: true,
         };
         const schemas = {
           ...schemasDef,
@@ -241,14 +214,14 @@ describe('visualize loader pipeline helpers: build pipeline', () => {
           ],
           bucket: [0, 3],
         };
-        const actual = buildPipelineVisFunction.table(visState, schemas, uiState);
+        const actual = buildPipelineVisFunction.table(params, schemas, uiState);
         expect(actual).toMatchSnapshot();
       });
     });
 
     describe('handles metric function', () => {
       it('without buckets', () => {
-        const visState = { ...visStateDef, params: { metric: {} } };
+        const params = { metric: {} };
         const schemas = {
           ...schemasDef,
           metric: [
@@ -256,12 +229,12 @@ describe('visualize loader pipeline helpers: build pipeline', () => {
             { ...schemaConfig, accessor: 1 },
           ],
         };
-        const actual = buildPipelineVisFunction.metric(visState, schemas, uiState);
+        const actual = buildPipelineVisFunction.metric(params, schemas, uiState);
         expect(actual).toMatchSnapshot();
       });
 
       it('with buckets', () => {
-        const visState = { ...visStateDef, params: { metric: {} } };
+        const params = { metric: {} };
         const schemas = {
           ...schemasDef,
           metric: [
@@ -270,21 +243,21 @@ describe('visualize loader pipeline helpers: build pipeline', () => {
           ],
           group: [{ accessor: 2 }],
         };
-        const actual = buildPipelineVisFunction.metric(visState, schemas, uiState);
+        const actual = buildPipelineVisFunction.metric(params, schemas, uiState);
         expect(actual).toMatchSnapshot();
       });
 
       it('with percentage mode should have percentage format', () => {
-        const visState = { ...visStateDef, params: { metric: { percentageMode: true } } };
+        const params = { metric: { percentageMode: true } };
         const schemas = { ...schemasDef };
-        const actual = buildPipelineVisFunction.metric(visState, schemas, uiState);
+        const actual = buildPipelineVisFunction.metric(params, schemas, uiState);
         expect(actual).toMatchSnapshot();
       });
     });
 
     describe('handles tagcloud function', () => {
       it('without buckets', () => {
-        const actual = buildPipelineVisFunction.tagcloud(visStateDef, schemasDef, uiState);
+        const actual = buildPipelineVisFunction.tagcloud({}, schemasDef, uiState);
         expect(actual).toMatchSnapshot();
       });
 
@@ -293,21 +266,21 @@ describe('visualize loader pipeline helpers: build pipeline', () => {
           ...schemasDef,
           segment: [{ accessor: 1 }],
         };
-        const actual = buildPipelineVisFunction.tagcloud(visStateDef, schemas, uiState);
+        const actual = buildPipelineVisFunction.tagcloud({}, schemas, uiState);
         expect(actual).toMatchSnapshot();
       });
 
       it('with boolean param showLabel', () => {
-        const visState = { ...visStateDef, params: { showLabel: false } };
-        const actual = buildPipelineVisFunction.tagcloud(visState, schemasDef, uiState);
+        const params = { showLabel: false };
+        const actual = buildPipelineVisFunction.tagcloud(params, schemasDef, uiState);
         expect(actual).toMatchSnapshot();
       });
     });
 
     describe('handles region_map function', () => {
       it('without buckets', () => {
-        const visState = { ...visStateDef, params: { metric: {} } };
-        const actual = buildPipelineVisFunction.region_map(visState, schemasDef, uiState);
+        const params = { metric: {} };
+        const actual = buildPipelineVisFunction.region_map(params, schemasDef, uiState);
         expect(actual).toMatchSnapshot();
       });
 
@@ -316,19 +289,19 @@ describe('visualize loader pipeline helpers: build pipeline', () => {
           ...schemasDef,
           segment: [1, 2],
         };
-        const actual = buildPipelineVisFunction.region_map(visStateDef, schemas, uiState);
+        const actual = buildPipelineVisFunction.region_map({}, schemas, uiState);
         expect(actual).toMatchSnapshot();
       });
     });
 
     it('handles tile_map function', () => {
-      const visState = { ...visStateDef, params: { metric: {} } };
+      const params = { metric: {} };
       const schemas = {
         ...schemasDef,
         segment: [1, 2],
         geo_centroid: [3, 4],
       };
-      const actual = buildPipelineVisFunction.tile_map(visState, schemas, uiState);
+      const actual = buildPipelineVisFunction.tile_map(params, schemas, uiState);
       expect(actual).toMatchSnapshot();
     });
 
@@ -337,7 +310,7 @@ describe('visualize loader pipeline helpers: build pipeline', () => {
         ...schemasDef,
         segment: [1, 2],
       };
-      const actual = buildPipelineVisFunction.pie(visStateDef, schemas, uiState);
+      const actual = buildPipelineVisFunction.pie({}, schemas, uiState);
       expect(actual).toMatchSnapshot();
     });
   });
@@ -347,11 +320,16 @@ describe('visualize loader pipeline helpers: build pipeline', () => {
 
     it('calls toExpression on vis_type if it exists', async () => {
       const vis = ({
-        getCurrentState: () => {},
-        getUiState: () => null,
+        getState: () => {},
         isHierarchical: () => false,
-        aggs: {
-          getResponseAggs: () => [],
+        data: {
+          aggs: {
+            getResponseAggs: () => [],
+          },
+          searchSource: {
+            getField: jest.fn(),
+            getParent: jest.fn(),
+          },
         },
         // @ts-ignore
         type: {
@@ -359,7 +337,6 @@ describe('visualize loader pipeline helpers: build pipeline', () => {
         },
       } as unknown) as Vis;
       const expression = await buildPipeline(vis, {
-        searchSource: searchSourceMock,
         timefilter: dataStart.query.timefilter.timefilter,
       });
       expect(expression).toMatchSnapshot();
@@ -370,7 +347,6 @@ describe('visualize loader pipeline helpers: build pipeline', () => {
     const dataStart = dataPluginMock.createStartContract();
 
     let aggs: IAggConfig[];
-    let visState: any;
     let vis: Vis;
     let params: any;
 
@@ -397,7 +373,11 @@ describe('visualize loader pipeline helpers: build pipeline', () => {
 
     describe('test y dimension format for histogram chart', () => {
       beforeEach(() => {
-        visState = {
+        vis = {
+          // @ts-ignore
+          type: {
+            name: 'histogram',
+          },
           params: {
             seriesParams: [
               {
@@ -414,24 +394,16 @@ describe('visualize loader pipeline helpers: build pipeline', () => {
               },
             ],
           },
-        };
-
-        vis = {
-          // @ts-ignore
-          type: {
-            name: 'histogram',
-          },
-          aggs: {
-            getResponseAggs: () => {
-              return aggs;
-            },
+          data: {
+            aggs: {
+              getResponseAggs: () => {
+                return aggs;
+              },
+            } as any,
           },
           isHierarchical: () => {
             return false;
           },
-          getCurrentState: () => {
-            return visState;
-          },
         };
       });
 
@@ -443,7 +415,7 @@ describe('visualize loader pipeline helpers: build pipeline', () => {
       });
 
       it('with one numeric metric in percentage mode', async () => {
-        visState.params.valueAxes[0].scale.mode = 'percentage';
+        vis.params.valueAxes[0].scale.mode = 'percentage';
         const dimensions = await buildVislibDimensions(vis, params);
         const expected = { id: 'percent' };
         const actual = dimensions.y[0].format;
@@ -454,33 +426,31 @@ describe('visualize loader pipeline helpers: build pipeline', () => {
         const aggConfig = aggs[0];
         aggs = [{ ...aggConfig } as IAggConfig, { ...aggConfig, id: '5' } as IAggConfig];
 
-        visState = {
-          params: {
-            seriesParams: [
-              {
-                data: { id: '0' },
-                valueAxis: 'axis-y-1',
-              },
-              {
-                data: { id: '5' },
-                valueAxis: 'axis-y-2',
-              },
-            ],
-            valueAxes: [
-              {
-                id: 'axis-y-1',
-                scale: {
-                  mode: 'normal',
-                },
+        vis.params = {
+          seriesParams: [
+            {
+              data: { id: '0' },
+              valueAxis: 'axis-y-1',
+            },
+            {
+              data: { id: '5' },
+              valueAxis: 'axis-y-2',
+            },
+          ],
+          valueAxes: [
+            {
+              id: 'axis-y-1',
+              scale: {
+                mode: 'normal',
               },
-              {
-                id: 'axis-y-2',
-                scale: {
-                  mode: 'percentage',
-                },
+            },
+            {
+              id: 'axis-y-2',
+              scale: {
+                mode: 'percentage',
               },
-            ],
-          },
+            },
+          ],
         };
 
         const dimensions = await buildVislibDimensions(vis, params);
@@ -493,29 +463,27 @@ describe('visualize loader pipeline helpers: build pipeline', () => {
 
     describe('test y dimension format for gauge chart', () => {
       beforeEach(() => {
-        visState = { params: { gauge: {} } };
-
         vis = {
           // @ts-ignore
           type: {
             name: 'gauge',
           },
-          aggs: {
-            getResponseAggs: () => {
-              return aggs;
-            },
+          params: { gauge: {} },
+          data: {
+            aggs: {
+              getResponseAggs: () => {
+                return aggs;
+              },
+            } as any,
           },
           isHierarchical: () => {
             return false;
           },
-          getCurrentState: () => {
-            return visState;
-          },
         };
       });
 
       it('with percentageMode = false', async () => {
-        visState.params.gauge.percentageMode = false;
+        vis.params.gauge.percentageMode = false;
         const dimensions = await buildVislibDimensions(vis, params);
         const expected = { id: 'number' };
         const actual = dimensions.y[0].format;
@@ -523,7 +491,7 @@ describe('visualize loader pipeline helpers: build pipeline', () => {
       });
 
       it('with percentageMode = true', async () => {
-        visState.params.gauge.percentageMode = true;
+        vis.params.gauge.percentageMode = true;
         const dimensions = await buildVislibDimensions(vis, params);
         const expected = { id: 'percent' };
         const actual = dimensions.y[0].format;
diff --git a/src/legacy/core_plugins/visualizations/public/np_ready/public/legacy/build_pipeline.ts b/src/legacy/core_plugins/visualizations/public/np_ready/public/legacy/build_pipeline.ts
index de974e6e969ef..ea15cd9201fd7 100644
--- a/src/legacy/core_plugins/visualizations/public/np_ready/public/legacy/build_pipeline.ts
+++ b/src/legacy/core_plugins/visualizations/public/np_ready/public/legacy/build_pipeline.ts
@@ -21,14 +21,13 @@ import { get } from 'lodash';
 import moment from 'moment';
 import { SerializedFieldFormat } from '../../../../../../../plugins/expressions/public';
 import {
-  fieldFormats,
   IAggConfig,
-  ISearchSource,
+  fieldFormats,
   search,
   TimefilterContract,
 } from '../../../../../../../plugins/data/public';
-const { isDateHistogramBucketAggConfig } = search.aggs;
 import { Vis, VisParams } from '../types';
+const { isDateHistogramBucketAggConfig } = search.aggs;
 
 interface SchemaConfigParams {
   precision?: number;
@@ -59,7 +58,7 @@ export interface Schemas {
 }
 
 type buildVisFunction = (
-  visState: ReturnType<Vis['getCurrentState']>,
+  params: VisParams,
   schemas: Schemas,
   uiState: any,
   meta?: { savedObjectId?: string }
@@ -139,7 +138,12 @@ const getSchemas = (
   const schemas: Schemas = {
     metric: [],
   };
-  const responseAggs = vis.aggs.getResponseAggs().filter((agg: IAggConfig) => agg.enabled);
+
+  if (!vis.data.aggs) {
+    return schemas;
+  }
+
+  const responseAggs = vis.data.aggs.getResponseAggs().filter((agg: IAggConfig) => agg.enabled);
   const isHierarchical = vis.isHierarchical();
   const metrics = responseAggs.filter((agg: IAggConfig) => agg.type.type === 'metrics');
   responseAggs.forEach((agg: IAggConfig) => {
@@ -228,9 +232,8 @@ export const prepareDimension = (variable: string, data: any) => {
 };
 
 const adjustVislibDimensionFormmaters = (vis: Vis, dimensions: { y: any[] }): void => {
-  const visState = vis.getCurrentState();
-  const visConfig = visState.params;
-  const responseAggs = vis.aggs.getResponseAggs().filter((agg: IAggConfig) => agg.enabled);
+  const visConfig = vis.params;
+  const responseAggs = vis.data.aggs!.getResponseAggs().filter((agg: IAggConfig) => agg.enabled);
 
   (dimensions.y || []).forEach(yDimension => {
     const yAgg = responseAggs[yDimension.accessor];
@@ -252,27 +255,26 @@ const adjustVislibDimensionFormmaters = (vis: Vis, dimensions: { y: any[] }): vo
 };
 
 export const buildPipelineVisFunction: BuildPipelineVisFunction = {
-  vega: visState => {
-    return `vega ${prepareString('spec', visState.params.spec)}`;
+  vega: params => {
+    return `vega ${prepareString('spec', params.spec)}`;
   },
-  input_control_vis: visState => {
-    return `input_control_vis ${prepareJson('visConfig', visState.params)}`;
+  input_control_vis: params => {
+    return `input_control_vis ${prepareJson('visConfig', params)}`;
   },
-  metrics: (visState, schemas, uiState = {}, meta) => {
-    const paramsJson = prepareJson('params', visState.params);
+  metrics: (params, schemas, uiState = {}) => {
+    const paramsJson = prepareJson('params', params);
     const uiStateJson = prepareJson('uiState', uiState);
-    const savedObjectIdParam = prepareString('savedObjectId', meta?.savedObjectId);
 
-    const params = [paramsJson, uiStateJson, savedObjectIdParam].filter(param => Boolean(param));
-    return `tsvb ${params.join(' ')}`;
+    const paramsArray = [paramsJson, uiStateJson].filter(param => Boolean(param));
+    return `tsvb ${paramsArray.join(' ')}`;
   },
-  timelion: visState => {
-    const expression = prepareString('expression', visState.params.expression);
-    const interval = prepareString('interval', visState.params.interval);
+  timelion: params => {
+    const expression = prepareString('expression', params.expression);
+    const interval = prepareString('interval', params.interval);
     return `timelion_vis ${expression}${interval}`;
   },
-  markdown: visState => {
-    const { markdown, fontSize, openLinksInNewTab } = visState.params;
+  markdown: params => {
+    const { markdown, fontSize, openLinksInNewTab } = params;
     let escapedMarkdown = '';
     if (typeof markdown === 'string' || markdown instanceof String) {
       escapedMarkdown = escapeString(markdown.toString());
@@ -282,14 +284,14 @@ export const buildPipelineVisFunction: BuildPipelineVisFunction = {
     expr += prepareValue('openLinksInNewTab', openLinksInNewTab);
     return expr;
   },
-  table: (visState, schemas) => {
+  table: (params, schemas) => {
     const visConfig = {
-      ...visState.params,
-      ...buildVisConfig.table(schemas, visState.params),
+      ...params,
+      ...buildVisConfig.table(schemas, params),
     };
     return `kibana_table ${prepareJson('visConfig', visConfig)}`;
   },
-  metric: (visState, schemas) => {
+  metric: (params, schemas) => {
     const {
       percentageMode,
       useRanges,
@@ -299,11 +301,11 @@ export const buildPipelineVisFunction: BuildPipelineVisFunction = {
       labels,
       invertColors,
       style,
-    } = visState.params.metric;
+    } = params.metric;
     const { metrics, bucket } = buildVisConfig.metric(schemas).dimensions;
 
     // fix formatter for percentage mode
-    if (get(visState.params, 'metric.percentageMode') === true) {
+    if (get(params, 'metric.percentageMode') === true) {
       metrics.forEach((metric: SchemaConfig) => {
         metric.format = { id: 'percent' };
       });
@@ -335,8 +337,8 @@ export const buildPipelineVisFunction: BuildPipelineVisFunction = {
 
     return expr;
   },
-  tagcloud: (visState, schemas) => {
-    const { scale, orientation, minFontSize, maxFontSize, showLabel } = visState.params;
+  tagcloud: (params, schemas) => {
+    const { scale, orientation, minFontSize, maxFontSize, showLabel } = params;
     const { metric, bucket } = buildVisConfig.tagcloud(schemas);
     let expr = `tagcloud metric={visdimension ${metric.accessor}} `;
     expr += prepareValue('scale', scale);
@@ -348,23 +350,23 @@ export const buildPipelineVisFunction: BuildPipelineVisFunction = {
 
     return expr;
   },
-  region_map: (visState, schemas) => {
+  region_map: (params, schemas) => {
     const visConfig = {
-      ...visState.params,
+      ...params,
       ...buildVisConfig.region_map(schemas),
     };
     return `regionmap ${prepareJson('visConfig', visConfig)}`;
   },
-  tile_map: (visState, schemas) => {
+  tile_map: (params, schemas) => {
     const visConfig = {
-      ...visState.params,
+      ...params,
       ...buildVisConfig.tile_map(schemas),
     };
     return `tilemap ${prepareJson('visConfig', visConfig)}`;
   },
-  pie: (visState, schemas) => {
+  pie: (params, schemas) => {
     const visConfig = {
-      ...visState.params,
+      ...params,
       ...buildVisConfig.pie(schemas),
     };
     return `kibana_pie ${prepareJson('visConfig', visConfig)}`;
@@ -440,7 +442,6 @@ const buildVisConfig: BuildVisConfigFunction = {
 export const buildVislibDimensions = async (
   vis: any,
   params: {
-    searchSource: any;
     timefilter: TimefilterContract;
     timeRange?: any;
     abortSignal?: AbortSignal;
@@ -460,7 +461,7 @@ export const buildVislibDimensions = async (
     splitColumn: schemas.split_column,
   };
   if (schemas.segment) {
-    const xAgg = vis.aggs.getResponseAggs()[dimensions.x.accessor];
+    const xAgg = vis.data.aggs.getResponseAggs()[dimensions.x.accessor];
     if (xAgg.type.name === 'date_histogram') {
       dimensions.x.params.date = true;
       const { esUnit, esValue } = xAgg.buckets.getInterval();
@@ -472,7 +473,7 @@ export const buildVislibDimensions = async (
     } else if (xAgg.type.name === 'histogram') {
       const intervalParam = xAgg.type.paramByName('interval');
       const output = { params: {} as any };
-      await intervalParam.modifyAggConfigOnSearchRequestStart(xAgg, params.searchSource, {
+      await intervalParam.modifyAggConfigOnSearchRequestStart(xAgg, vis.data.searchSource, {
         abortSignal: params.abortSignal,
       });
       intervalParam.write(xAgg, output);
@@ -487,18 +488,14 @@ export const buildVislibDimensions = async (
 export const buildPipeline = async (
   vis: Vis,
   params: {
-    searchSource: ISearchSource;
     timefilter: TimefilterContract;
     timeRange?: any;
-    savedObjectId?: string;
   }
 ) => {
-  const { searchSource } = params;
-  const { indexPattern } = vis;
-  const query = searchSource.getField('query');
-  const filters = searchSource.getField('filter');
-  const visState = vis.getCurrentState();
-  const uiState = vis.getUiState();
+  const { indexPattern, searchSource } = vis.data;
+  const query = searchSource!.getField('query');
+  const filters = searchSource!.getField('filter');
+  const { uiState } = vis;
 
   // context
   let pipeline = `kibana | kibana_context `;
@@ -508,18 +505,18 @@ export const buildPipeline = async (
   if (filters) {
     pipeline += prepareJson('filters', filters);
   }
-  if (vis.savedSearchId) {
-    pipeline += prepareString('savedSearchId', vis.savedSearchId);
+  if (vis.data.savedSearchId) {
+    pipeline += prepareString('savedSearchId', vis.data.savedSearchId);
   }
   pipeline += '| ';
 
   // request handler
   if (vis.type.requestHandler === 'courier') {
     pipeline += `esaggs
-    ${prepareString('index', indexPattern.id)}
+    ${prepareString('index', indexPattern!.id)}
     metricsAtAllLevels=${vis.isHierarchical()}
     partialRows=${vis.type.requiresPartialRows || vis.params.showPartialRows || false}
-    ${prepareJson('aggConfigs', visState.aggs)} | `;
+    ${prepareJson('aggConfigs', vis.data.aggs!.aggs)} | `;
   }
 
   const schemas = getSchemas(vis, {
@@ -527,18 +524,16 @@ export const buildPipeline = async (
     timefilter: params.timefilter,
   });
   if (buildPipelineVisFunction[vis.type.name]) {
-    pipeline += buildPipelineVisFunction[vis.type.name](visState, schemas, uiState, {
-      savedObjectId: params.savedObjectId,
-    });
+    pipeline += buildPipelineVisFunction[vis.type.name](vis.params, schemas, uiState);
   } else if (vislibCharts.includes(vis.type.name)) {
-    const visConfig = visState.params;
+    const visConfig = { ...vis.params };
     visConfig.dimensions = await buildVislibDimensions(vis, params);
 
-    pipeline += `vislib type='${vis.type.name}' ${prepareJson('visConfig', visState.params)}`;
+    pipeline += `vislib type='${vis.type.name}' ${prepareJson('visConfig', visConfig)}`;
   } else if (vis.type.toExpression) {
     pipeline += await vis.type.toExpression(vis, params);
   } else {
-    const visConfig = visState.params;
+    const visConfig = { ...vis.params };
     visConfig.dimensions = schemas;
     pipeline += `visualization type='${vis.type.name}'
     ${prepareJson('visConfig', visConfig)}
diff --git a/src/legacy/core_plugins/visualizations/public/np_ready/public/legacy/update_status.test.js b/src/legacy/core_plugins/visualizations/public/np_ready/public/legacy/update_status.test.js
deleted file mode 100644
index c63a8cd48e625..0000000000000
--- a/src/legacy/core_plugins/visualizations/public/np_ready/public/legacy/update_status.test.js
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import { getUpdateStatus, Status } from './update_status';
-
-// Parts of the tests in this file are generated more dynamically, based on the
-// values inside the Status object.Make sure this object has one function per entry
-// in Status, that actually change on the passed $scope, what needs to be changed
-// so that we expect the getUpdateStatus function to actually detect a change.
-const changeFunctions = {
-  [Status.AGGS]: $scope => ($scope.vis.aggs = { foo: 'new' }),
-  [Status.DATA]: $scope => ($scope.visData = { foo: 'new' }),
-  [Status.PARAMS]: $scope => ($scope.vis.params = { foo: 'new' }),
-  [Status.RESIZE]: $scope => ($scope.vis.size = [50, 50]),
-  [Status.TIME]: $scope => ($scope.vis.filters.timeRange = { from: 'now-7d', to: 'now' }),
-  [Status.UI_STATE]: $scope => ($scope.uiState = { foo: 'new' }),
-};
-
-describe('getUpdateStatus', () => {
-  function getScope() {
-    return {
-      vis: {
-        aggs: {},
-        size: [100, 100],
-        params: {},
-        filters: {},
-      },
-      uiState: {},
-      visData: {},
-    };
-  }
-
-  function initStatusCheckerAndChangeProperty(type, requiresUpdateStatus) {
-    const $scope = getScope();
-    // Call the getUpdateStatus function initially, so it can store it's current state
-    getUpdateStatus(requiresUpdateStatus, $scope, $scope);
-
-    // Get the change function for that specific change type
-    const changeFn = changeFunctions[type];
-    if (!changeFn) {
-      throw new Error(`Please implement the test change function for ${type}.`);
-    }
-
-    // Call that change function to manipulate the scope so it changed.
-    changeFn($scope);
-
-    return getUpdateStatus(requiresUpdateStatus, $scope, $scope);
-  }
-
-  it('should be a function', () => {
-    expect(typeof getUpdateStatus).toBe('function');
-  });
-
-  Object.entries(Status).forEach(([typeKey, typeValue]) => {
-    // This block automatically creates very simple tests for each of the Status
-    // keys, so we have simple tests per changed property.
-    // If it makes sense to test more specific behavior of a specific change detection
-    // please add additional tests for that.
-
-    it(`should detect changes for Status.${typeKey}`, () => {
-      // Check whether the required change type is not correctly determined
-      const status = initStatusCheckerAndChangeProperty(typeValue, [typeValue]);
-      expect(status[typeValue]).toBe(true);
-    });
-
-    it(`should not detect changes in other properties when changing Status.${typeKey}`, () => {
-      // Only change typeKey, but track changes for all status changes
-      const status = initStatusCheckerAndChangeProperty(typeValue, Object.values(Status));
-      Object.values(Status)
-        // Filter out the actual changed property so we only test for all other properties
-        .filter(stat => stat !== typeValue)
-        .forEach(otherProp => {
-          expect(status[otherProp]).toBeFalsy();
-        });
-    });
-
-    it(`should not detect changes if not requested for Status.${typeKey}`, () => {
-      const allOtherStatusProperties = Object.values(Status).filter(stat => stat !== typeValue);
-      // Change only the typeKey property, but do not listen for changes on it
-      // listen on all other status changes instead.
-      const status = initStatusCheckerAndChangeProperty(typeValue, allOtherStatusProperties);
-      // The typeValue check should be falsy, since we did not request tracking it.
-      expect(status[typeValue]).toBeFalsy();
-    });
-  });
-});
diff --git a/src/legacy/core_plugins/visualizations/public/np_ready/public/legacy/update_status.ts b/src/legacy/core_plugins/visualizations/public/np_ready/public/legacy/update_status.ts
deleted file mode 100644
index 92a9ce8366f4f..0000000000000
--- a/src/legacy/core_plugins/visualizations/public/np_ready/public/legacy/update_status.ts
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import { PersistedState } from '../../../../../../../plugins/visualizations/public';
-import { calculateObjectHash } from '../../../../../../../plugins/kibana_utils/common';
-import { Vis } from '../vis';
-
-enum Status {
-  AGGS = 'aggs',
-  DATA = 'data',
-  PARAMS = 'params',
-  RESIZE = 'resize',
-  TIME = 'time',
-  UI_STATE = 'uiState',
-}
-
-/**
- * Checks whether the hash of a specific key in the given oldStatus has changed
- * compared to the new valueHash passed.
- */
-function hasHashChanged<T extends string>(
-  valueHash: string,
-  oldStatus: { [key in T]?: string },
-  name: T
-): boolean {
-  const oldHash = oldStatus[name];
-  return oldHash !== valueHash;
-}
-
-interface Size {
-  width: number;
-  height: number;
-}
-
-function hasSizeChanged(size: Size, oldSize?: Size): boolean {
-  if (!oldSize) {
-    return true;
-  }
-  return oldSize.width !== size.width || oldSize.height !== size.height;
-}
-
-function getUpdateStatus<T extends Status>(
-  requiresUpdateStatus: T[] = [],
-  obj: any,
-  param: { vis: Vis; visData: any; uiState: PersistedState }
-): { [reqStats in T]: boolean } {
-  const status = {} as { [reqStats in Status]: boolean };
-
-  // If the vis type doesn't need update status, skip all calculations
-  if (requiresUpdateStatus.length === 0) {
-    return status;
-  }
-
-  if (!obj._oldStatus) {
-    obj._oldStatus = {};
-  }
-
-  for (const requiredStatus of requiresUpdateStatus) {
-    let hash;
-    // Calculate all required status updates for this visualization
-    switch (requiredStatus) {
-      case Status.AGGS:
-        hash = calculateObjectHash(param.vis.aggs);
-        status.aggs = hasHashChanged(hash, obj._oldStatus, 'aggs');
-        obj._oldStatus.aggs = hash;
-        break;
-      case Status.DATA:
-        hash = calculateObjectHash(param.visData);
-        status.data = hasHashChanged(hash, obj._oldStatus, 'data');
-        obj._oldStatus.data = hash;
-        break;
-      case Status.PARAMS:
-        hash = calculateObjectHash(param.vis.params);
-        status.params = hasHashChanged(hash, obj._oldStatus, 'param');
-        obj._oldStatus.param = hash;
-        break;
-      case Status.RESIZE:
-        const width: number = param.vis.size ? param.vis.size[0] : 0;
-        const height: number = param.vis.size ? param.vis.size[1] : 0;
-        const size = { width, height };
-        status.resize = hasSizeChanged(size, obj._oldStatus.resize);
-        obj._oldStatus.resize = size;
-        break;
-      case Status.TIME:
-        const timeRange = param.vis.filters && param.vis.filters.timeRange;
-        hash = calculateObjectHash(timeRange);
-        status.time = hasHashChanged(hash, obj._oldStatus, 'time');
-        obj._oldStatus.time = hash;
-        break;
-      case Status.UI_STATE:
-        hash = calculateObjectHash(param.uiState);
-        status.uiState = hasHashChanged(hash, obj._oldStatus, 'uiState');
-        obj._oldStatus.uiState = hash;
-        break;
-    }
-  }
-
-  return status;
-}
-
-export { getUpdateStatus, Status };
diff --git a/src/legacy/core_plugins/visualizations/public/np_ready/public/mocks.ts b/src/legacy/core_plugins/visualizations/public/np_ready/public/mocks.ts
index 4ee727e46f4d6..17f777e4e80e1 100644
--- a/src/legacy/core_plugins/visualizations/public/np_ready/public/mocks.ts
+++ b/src/legacy/core_plugins/visualizations/public/np_ready/public/mocks.ts
@@ -41,6 +41,8 @@ const createStartContract = (): VisualizationsStart => ({
   savedVisualizationsLoader: {} as any,
   showNewVisModal: jest.fn(),
   createVis: jest.fn(),
+  convertFromSerializedVis: jest.fn(),
+  convertToSerializedVis: jest.fn(),
 });
 
 const createInstance = async () => {
diff --git a/src/legacy/core_plugins/visualizations/public/np_ready/public/plugin.ts b/src/legacy/core_plugins/visualizations/public/np_ready/public/plugin.ts
index 953caecefb974..3ade6cee0d4d2 100644
--- a/src/legacy/core_plugins/visualizations/public/np_ready/public/plugin.ts
+++ b/src/legacy/core_plugins/visualizations/public/np_ready/public/plugin.ts
@@ -39,6 +39,8 @@ import {
   setSavedVisualizationsLoader,
   setTimeFilter,
   setAggs,
+  setChrome,
+  setOverlays,
 } from './services';
 import { VISUALIZE_EMBEDDABLE_TYPE, VisualizeEmbeddableFactory } from './embeddable';
 import { ExpressionsSetup, ExpressionsStart } from '../../../../../../plugins/expressions/public';
@@ -48,14 +50,16 @@ import { visualization as visualizationRenderer } from './expressions/visualizat
 import {
   DataPublicPluginSetup,
   DataPublicPluginStart,
-  IIndexPattern,
 } from '../../../../../../plugins/data/public';
 import { UsageCollectionSetup } from '../../../../../../plugins/usage_collection/public';
 import { createSavedVisLoader, SavedVisualizationsLoader } from './saved_visualizations';
-import { VisImpl } from './vis_impl';
+import { SerializedVis, Vis } from './vis';
 import { showNewVisModal } from './wizard';
 import { UiActionsStart } from '../../../../../../plugins/ui_actions/public';
-import { VisState } from './types';
+import {
+  convertFromSerializedVis,
+  convertToSerializedVis,
+} from './saved_visualizations/_saved_vis';
 
 /**
  * Interface for this plugin's returned setup/start contracts.
@@ -67,7 +71,9 @@ export type VisualizationsSetup = TypesSetup;
 
 export interface VisualizationsStart extends TypesStart {
   savedVisualizationsLoader: SavedVisualizationsLoader;
-  createVis: (indexPattern: IIndexPattern, visState?: VisState) => VisImpl;
+  createVis: (visType: string, visState?: SerializedVis) => Vis;
+  convertToSerializedVis: typeof convertToSerializedVis;
+  convertFromSerializedVis: typeof convertFromSerializedVis;
   showNewVisModal: typeof showNewVisModal;
 }
 
@@ -138,6 +144,8 @@ export class VisualizationsPlugin
     setUiActions(uiActions);
     setTimeFilter(data.query.timefilter.timefilter);
     setAggs(data.search.aggs);
+    setOverlays(core.overlays);
+    setChrome(core.chrome);
     const savedVisualizationsLoader = createSavedVisLoader({
       savedObjectsClient: core.savedObjects.client,
       indexPatterns: data.indexPatterns,
@@ -155,8 +163,9 @@ export class VisualizationsPlugin
        * @param {IIndexPattern} indexPattern - index pattern to use
        * @param {VisState} visState - visualization configuration
        */
-      createVis: (indexPattern: IIndexPattern, visState?: VisState) =>
-        new VisImpl(indexPattern, visState),
+      createVis: (visType: string, visState?: SerializedVis) => new Vis(visType, visState),
+      convertToSerializedVis,
+      convertFromSerializedVis,
       savedVisualizationsLoader,
     };
   }
diff --git a/src/legacy/core_plugins/visualizations/public/np_ready/public/saved_visualizations/_saved_vis.ts b/src/legacy/core_plugins/visualizations/public/np_ready/public/saved_visualizations/_saved_vis.ts
index e381a01edef8b..c9906428ccb31 100644
--- a/src/legacy/core_plugins/visualizations/public/np_ready/public/saved_visualizations/_saved_vis.ts
+++ b/src/legacy/core_plugins/visualizations/public/np_ready/public/saved_visualizations/_saved_vis.ts
@@ -32,65 +32,74 @@ import {
 // @ts-ignore
 import { updateOldState } from '../legacy/vis_update_state';
 import { extractReferences, injectReferences } from './saved_visualization_references';
-import { IIndexPattern } from '../../../../../../../plugins/data/public';
-import { VisSavedObject } from '../types';
-import { VisImpl } from '../vis_impl';
+import {
+  IIndexPattern,
+  ISearchSource,
+  SearchSource,
+} from '../../../../../../../plugins/data/public';
+import { ISavedVis, SerializedVis } from '../types';
 import { createSavedSearchesLoader } from '../../../../../../../plugins/discover/public';
-
-async function _afterEsResp(savedVis: VisSavedObject, services: any) {
-  await _getLinkedSavedSearch(savedVis, services);
-  savedVis.searchSource!.setField('size', 0);
-  savedVis.vis = savedVis.vis ? _updateVis(savedVis) : await _createVis(savedVis);
-  return savedVis;
-}
-
-async function _getLinkedSavedSearch(savedVis: VisSavedObject, services: any) {
-  const linkedSearch = !!savedVis.savedSearchId;
-  const current = savedVis.savedSearch;
-
-  if (linkedSearch && current && current.id === savedVis.savedSearchId) {
-    return;
-  }
-
-  if (savedVis.savedSearch) {
-    savedVis.searchSource!.setParent(savedVis.savedSearch.searchSource.getParent());
-    savedVis.savedSearch.destroy();
-    delete savedVis.savedSearch;
-  }
-  const savedSearches = createSavedSearchesLoader(services);
-
-  if (linkedSearch) {
-    savedVis.savedSearch = await savedSearches.get(savedVis.savedSearchId!);
-    savedVis.searchSource!.setParent(savedVis.savedSearch!.searchSource);
-  }
-}
-
-async function _createVis(savedVis: VisSavedObject) {
-  savedVis.visState = updateOldState(savedVis.visState);
-
-  // visState doesn't yet exist when importing a visualization, so we can't
-  // assume that exists at this point. If it does exist, then we're not
-  // importing a visualization, so we want to sync the title.
-  if (savedVis.visState) {
-    savedVis.visState.title = savedVis.title;
-  }
-
-  savedVis.vis = new VisImpl(savedVis.searchSource!.getField('index')!, savedVis.visState);
-
-  savedVis.vis!.savedSearchId = savedVis.savedSearchId;
-
-  return savedVis.vis;
-}
-
-function _updateVis(savedVis: VisSavedObject) {
-  if (savedVis.vis && savedVis.searchSource) {
-    savedVis.vis.indexPattern = savedVis.searchSource.getField('index');
-    savedVis.visState.title = savedVis.title;
-    savedVis.vis.setState(savedVis.visState);
-    savedVis.vis.savedSearchId = savedVis.savedSearchId;
+import { getChrome, getOverlays, getIndexPatterns, getSavedObjects } from '../services';
+
+export const convertToSerializedVis = async (savedVis: ISavedVis): Promise<SerializedVis> => {
+  const { visState } = savedVis;
+  const searchSource =
+    savedVis.searchSource && (await getSearchSource(savedVis.searchSource, savedVis.savedSearchId));
+
+  const indexPattern =
+    searchSource && searchSource.getField('index') ? searchSource.getField('index')!.id : undefined;
+
+  const aggs = indexPattern ? visState.aggs || [] : visState.aggs;
+
+  return {
+    id: savedVis.id,
+    title: savedVis.title,
+    type: visState.type,
+    description: savedVis.description,
+    params: visState.params,
+    uiState: JSON.parse(savedVis.uiStateJSON || '{}'),
+    data: {
+      indexPattern,
+      aggs,
+      searchSource,
+      savedSearchId: savedVis.savedSearchId,
+    },
+  };
+};
+
+export const convertFromSerializedVis = (vis: SerializedVis): ISavedVis => {
+  return {
+    id: vis.id,
+    title: vis.title,
+    description: vis.description,
+    visState: {
+      type: vis.type,
+      aggs: vis.data.aggs,
+      params: vis.params,
+    },
+    uiStateJSON: JSON.stringify(vis.uiState),
+    searchSource: vis.data.searchSource!,
+    savedSearchId: vis.data.savedSearchId,
+  };
+};
+
+const getSearchSource = async (inputSearchSource: ISearchSource, savedSearchId?: string) => {
+  const searchSource = inputSearchSource.createCopy
+    ? inputSearchSource.createCopy()
+    : new SearchSource({ ...(inputSearchSource as any).fields });
+  if (savedSearchId) {
+    const savedSearch = await createSavedSearchesLoader({
+      savedObjectsClient: getSavedObjects().client,
+      indexPatterns: getIndexPatterns(),
+      chrome: getChrome(),
+      overlays: getOverlays(),
+    }).get(savedSearchId);
+
+    searchSource.setParent(savedSearch.searchSource);
   }
-  return savedVis.vis;
-}
+  searchSource!.setField('size', 0);
+  return searchSource;
+};
 
 export function createSavedVisClass(services: SavedObjectKibanaServices) {
   const SavedObjectClass = createSavedObjectClass(services);
@@ -131,8 +140,16 @@ export function createSavedVisClass(services: SavedObjectKibanaServices) {
           savedSearchId: opts.savedSearchId,
           version: 1,
         },
-        afterESResp: (savedObject: SavedObject) => {
-          return _afterEsResp(savedObject as VisSavedObject, services) as Promise<SavedObject>;
+        afterESResp: async (savedObject: SavedObject) => {
+          const savedVis = (savedObject as any) as ISavedVis;
+          savedVis.visState = await updateOldState(savedVis.visState);
+          if (savedVis.savedSearchId && savedVis.searchSource) {
+            savedObject.searchSource = await getSearchSource(
+              savedVis.searchSource,
+              savedVis.savedSearchId
+            );
+          }
+          return (savedVis as any) as SavedObject;
         },
       });
       this.showInRecentlyAccessed = true;
diff --git a/src/legacy/core_plugins/visualizations/public/np_ready/public/saved_visualizations/saved_visualization_references.test.ts b/src/legacy/core_plugins/visualizations/public/np_ready/public/saved_visualizations/saved_visualization_references.test.ts
index 98af6d99025c2..2e3a4f0f58b27 100644
--- a/src/legacy/core_plugins/visualizations/public/np_ready/public/saved_visualizations/saved_visualization_references.test.ts
+++ b/src/legacy/core_plugins/visualizations/public/np_ready/public/saved_visualizations/saved_visualization_references.test.ts
@@ -18,7 +18,7 @@
  */
 
 import { extractReferences, injectReferences } from './saved_visualization_references';
-import { VisSavedObject, VisState } from '../types';
+import { VisSavedObject, SavedVisState } from '../types';
 
 describe('extractReferences', () => {
   test('extracts nothing if savedSearchId is empty', () => {
@@ -140,7 +140,7 @@ Object {
             },
           ],
         },
-      } as unknown) as VisState,
+      } as unknown) as SavedVisState,
     } as VisSavedObject;
     const references = [
       {
@@ -201,7 +201,7 @@ Object {
             },
           ],
         },
-      } as unknown) as VisState,
+      } as unknown) as SavedVisState,
     } as VisSavedObject;
     expect(() => injectReferences(context, [])).toThrowErrorMatchingInlineSnapshot(
       `"Could not find index pattern reference \\"control_0_index_pattern\\""`
diff --git a/src/legacy/core_plugins/visualizations/public/np_ready/public/services.ts b/src/legacy/core_plugins/visualizations/public/np_ready/public/services.ts
index b2eebe8b5b57d..23cdeae7d15ff 100644
--- a/src/legacy/core_plugins/visualizations/public/np_ready/public/services.ts
+++ b/src/legacy/core_plugins/visualizations/public/np_ready/public/services.ts
@@ -18,10 +18,13 @@
  */
 
 import {
+  ApplicationStart,
   Capabilities,
+  ChromeStart,
   HttpStart,
   I18nStart,
   IUiSettingsClient,
+  OverlayStart,
   SavedObjectsStart,
 } from '../../../../../../core/public';
 import { TypesStart } from './vis_types';
@@ -76,3 +79,9 @@ export const [getSavedVisualizationsLoader, setSavedVisualizationsLoader] = crea
 export const [getAggs, setAggs] = createGetterSetter<DataPublicPluginStart['search']['aggs']>(
   'AggConfigs'
 );
+
+export const [getOverlays, setOverlays] = createGetterSetter<OverlayStart>('Overlays');
+
+export const [getChrome, setChrome] = createGetterSetter<ChromeStart>('Chrome');
+
+export const [getApplication, setApplication] = createGetterSetter<ApplicationStart>('Application');
diff --git a/src/legacy/core_plugins/visualizations/public/np_ready/public/types.ts b/src/legacy/core_plugins/visualizations/public/np_ready/public/types.ts
index d8e3ccdeb065e..8f93a179af3bc 100644
--- a/src/legacy/core_plugins/visualizations/public/np_ready/public/types.ts
+++ b/src/legacy/core_plugins/visualizations/public/np_ready/public/types.ts
@@ -18,21 +18,33 @@
  */
 
 import { SavedObject } from '../../../../../../plugins/saved_objects/public';
-import { Vis, VisState, VisParams, VisualizationController } from './vis';
-import { ISearchSource } from '../../../../../../plugins/data/public/';
-import { SavedSearch } from '../../../../../../plugins/discover/public';
+import { ISearchSource, AggConfigOptions } from '../../../../../../plugins/data/public';
+import { SerializedVis, Vis, VisParams } from './vis';
 
-export { Vis, VisState, VisParams, VisualizationController };
+export { Vis, SerializedVis, VisParams };
 
-export interface VisSavedObject extends SavedObject {
-  vis: Vis;
-  description?: string;
-  searchSource: ISearchSource;
+export interface VisualizationController {
+  render(visData: any, visParams: any): Promise<void>;
+  destroy(): void;
+  isLoaded?(): Promise<void> | void;
+}
+
+export interface SavedVisState {
+  type: string;
+  params: VisParams;
+  aggs: AggConfigOptions[];
+}
+
+export interface ISavedVis {
+  id: string;
   title: string;
+  description?: string;
+  visState: SavedVisState;
+  searchSource?: ISearchSource;
   uiStateJSON?: string;
-  destroy: () => void;
   savedSearchRefName?: string;
   savedSearchId?: string;
-  savedSearch?: SavedSearch;
-  visState: VisState;
 }
+
+// @ts-ignore-next-line
+export interface VisSavedObject extends SavedObject, ISavedVis {}
diff --git a/src/legacy/core_plugins/visualizations/public/np_ready/public/vis.ts b/src/legacy/core_plugins/visualizations/public/np_ready/public/vis.ts
index eb262966a4a22..0ba936c9f6567 100644
--- a/src/legacy/core_plugins/visualizations/public/np_ready/public/vis.ts
+++ b/src/legacy/core_plugins/visualizations/public/np_ready/public/vis.ts
@@ -17,47 +17,182 @@
  * under the License.
  */
 
+/**
+ * @name Vis
+ *
+ * @description This class consists of aggs, params, listeners, title, and type.
+ *  - Aggs: Instances of IAggConfig.
+ *  - Params: The settings in the Options tab.
+ *
+ * Not to be confused with vislib/vis.js.
+ */
+
+import { isFunction, defaults, cloneDeep } from 'lodash';
+import { PersistedState } from '../../../../../../../src/plugins/visualizations/public';
+// @ts-ignore
+import { updateVisualizationConfig } from './legacy/vis_update';
+import { getTypes, getAggs } from './services';
 import { VisType } from './vis_types';
-import { Status } from './legacy/update_status';
-import { IAggConfigs } from '../../../../../../plugins/data/public';
-
-export interface Vis {
-  type: VisType;
-  getCurrentState: (
-    includeDisabled?: boolean
-  ) => {
-    title: string;
-    type: string;
-    params: VisParams;
-    aggs: Array<{ [key: string]: any }>;
-  };
-
-  /**
-   * If a visualization based on the saved search,
-   * the id is necessary for building an expression function in src/plugins/expressions/common/expression_functions/specs/kibana_context.ts
-   */
+import {
+  IAggConfigs,
+  IndexPattern,
+  ISearchSource,
+  AggConfigOptions,
+} from '../../../../../../plugins/data/public';
+
+export interface SerializedVisData {
+  expression?: string;
+  aggs: AggConfigOptions[];
+  indexPattern?: string;
+  searchSource?: ISearchSource;
   savedSearchId?: string;
+}
 
-  // Since we haven't typed everything here yet, we basically "any" the rest
-  // of that interface. This should be removed as soon as this type definition
-  // has been completed. But that way we at least have typing for a couple of
-  // properties on that type.
-  [key: string]: any;
+export interface SerializedVis {
+  id: string;
+  title: string;
+  description?: string;
+  type: string;
+  params: VisParams;
+  uiState?: any;
+  data: SerializedVisData;
+}
+
+export interface VisData {
+  ast?: string;
+  aggs?: IAggConfigs;
+  indexPattern?: IndexPattern;
+  searchSource?: ISearchSource;
+  savedSearchId?: string;
 }
 
 export interface VisParams {
   [key: string]: any;
 }
 
-export interface VisState {
-  title: string;
-  type: VisType;
-  params: VisParams;
-  aggs: IAggConfigs;
-}
+export class Vis {
+  public readonly type: VisType;
+  public readonly id: string;
+  public title: string = '';
+  public description: string = '';
+  public params: VisParams = {};
+  // Session state is for storing information that is transitory, and will not be saved with the visualization.
+  // For instance, map bounds, which depends on the view port, browser window size, etc.
+  public sessionState: Record<string, any> = {};
+  public data: VisData = {};
+
+  public readonly uiState: PersistedState;
+
+  constructor(visType: string, visState: SerializedVis = {} as any) {
+    this.type = this.getType(visType);
+    this.params = this.getParams(visState.params);
+    this.uiState = new PersistedState(visState.uiState);
+    this.id = visState.id;
+
+    this.setState(visState || {});
+  }
+
+  private getType(visType: string) {
+    const type = getTypes().get(visType);
+    if (!type) {
+      throw new Error(`Invalid type "${visType}"`);
+    }
+    return type;
+  }
+
+  private getParams(params: VisParams) {
+    return defaults({}, cloneDeep(params || {}), cloneDeep(this.type.visConfig.defaults || {}));
+  }
+
+  setState(state: SerializedVis) {
+    let typeChanged = false;
+    if (state.type && this.type.name !== state.type) {
+      // @ts-ignore
+      this.type = this.getType(state.type);
+      typeChanged = true;
+    }
+    if (state.title !== undefined) {
+      this.title = state.title;
+    }
+    if (state.description !== undefined) {
+      this.description = state.description;
+    }
+    if (state.params || typeChanged) {
+      this.params = this.getParams(state.params);
+    }
+
+    // move to migration script
+    updateVisualizationConfig(state.params, this.params);
+
+    if (state.data && state.data.searchSource) {
+      this.data.searchSource = state.data.searchSource!;
+      this.data.indexPattern = this.data.searchSource.getField('index');
+    }
+    if (state.data && state.data.savedSearchId) {
+      this.data.savedSearchId = state.data.savedSearchId;
+    }
+    if (state.data && state.data.aggs) {
+      let configStates = state.data.aggs;
+      configStates = this.initializeDefaultsFromSchemas(configStates, this.type.schemas.all || []);
+      if (!this.data.indexPattern) {
+        if (state.data.aggs.length) {
+          throw new Error('trying to initialize aggs without index pattern');
+        }
+        return;
+      }
+      this.data.aggs = getAggs().createAggConfigs(this.data.indexPattern, configStates);
+    }
+  }
+
+  clone() {
+    return new Vis(this.type.name, this.serialize());
+  }
+
+  serialize(): SerializedVis {
+    const aggs = this.data.aggs ? this.data.aggs.aggs.map(agg => agg.toJSON()) : [];
+    const indexPattern = this.data.searchSource && this.data.searchSource.getField('index');
+    return {
+      id: this.id,
+      title: this.title,
+      type: this.type.name,
+      params: cloneDeep(this.params) as any,
+      uiState: this.uiState.toJSON(),
+      data: {
+        aggs: aggs as any,
+        indexPattern: indexPattern ? indexPattern.id : undefined,
+        searchSource: this.data.searchSource!.createCopy(),
+        savedSearchId: this.data.savedSearchId,
+      },
+    };
+  }
+
+  toAST() {
+    return this.type.toAST(this.params);
+  }
+
+  // deprecated
+  isHierarchical() {
+    if (isFunction(this.type.hierarchicalData)) {
+      return !!this.type.hierarchicalData(this);
+    } else {
+      return !!this.type.hierarchicalData;
+    }
+  }
 
-export interface VisualizationController {
-  render(visData: any, visParams: any, update: { [key in Status]: boolean }): Promise<void>;
-  destroy(): void;
-  isLoaded?(): Promise<void> | void;
+  private initializeDefaultsFromSchemas(configStates: AggConfigOptions[], schemas: any) {
+    // Set the defaults for any schema which has them. If the defaults
+    // for some reason has more then the max only set the max number
+    // of defaults (not sure why a someone define more...
+    // but whatever). Also if a schema.name is already set then don't
+    // set anything.
+    const newConfigs = [...configStates];
+    schemas
+      .filter((schema: any) => Array.isArray(schema.defaults) && schema.defaults.length > 0)
+      .filter((schema: any) => !configStates.find(agg => agg.schema && agg.schema === schema.name))
+      .forEach((schema: any) => {
+        const defaultSchemaConfig = schema.defaults.slice(0, schema.max);
+        defaultSchemaConfig.forEach((d: any) => newConfigs.push(d));
+      });
+    return newConfigs;
+  }
 }
diff --git a/src/legacy/core_plugins/visualizations/public/np_ready/public/vis_impl.d.ts b/src/legacy/core_plugins/visualizations/public/np_ready/public/vis_impl.d.ts
deleted file mode 100644
index 0e759c3d9872c..0000000000000
--- a/src/legacy/core_plugins/visualizations/public/np_ready/public/vis_impl.d.ts
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import { Vis, VisState, VisParams } from './vis';
-import { VisType } from './vis_types';
-import { IAggConfig, IIndexPattern } from '../../../../../../plugins/data/public';
-import { Schema } from '../../../../vis_default_editor/public';
-
-type InitVisStateType =
-  | Partial<VisState>
-  | Partial<Omit<VisState, 'type'> & { type: string }>
-  | string;
-
-export type VisImplConstructor = new (
-  indexPattern: IIndexPattern,
-  visState?: InitVisStateType
-) => VisImpl;
-
-export declare class VisImpl implements Vis {
-  constructor(indexPattern: IIndexPattern, visState?: InitVisStateType);
-
-  type: VisType;
-  getCurrentState: (
-    includeDisabled?: boolean
-  ) => {
-    title: string;
-    type: string;
-    params: VisParams;
-    aggs: Array<{ [key: string]: any }>;
-  };
-
-  private initializeDefaultsFromSchemas(configStates: IAggConfig[], schemas: Schema[]);
-
-  // Since we haven't typed everything here yet, we basically "any" the rest
-  // of that interface. This should be removed as soon as this type definition
-  // has been completed. But that way we at least have typing for a couple of
-  // properties on that type.
-  [key: string]: any;
-}
diff --git a/src/legacy/core_plugins/visualizations/public/np_ready/public/vis_impl.js b/src/legacy/core_plugins/visualizations/public/np_ready/public/vis_impl.js
deleted file mode 100644
index abd8f351ae94d..0000000000000
--- a/src/legacy/core_plugins/visualizations/public/np_ready/public/vis_impl.js
+++ /dev/null
@@ -1,223 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-/**
- * @name Vis
- *
- * @description This class consists of aggs, params, listeners, title, and type.
- *  - Aggs: Instances of IAggConfig.
- *  - Params: The settings in the Options tab.
- *
- * Not to be confused with vislib/vis.js.
- */
-
-import { EventEmitter } from 'events';
-import _ from 'lodash';
-import { PersistedState } from '../../../../../../../src/plugins/visualizations/public';
-import { updateVisualizationConfig } from './legacy/vis_update';
-import { getTypes, getAggs } from './services';
-
-class VisImpl extends EventEmitter {
-  constructor(indexPattern, visState) {
-    super();
-    visState = visState || {};
-
-    if (_.isString(visState)) {
-      visState = {
-        type: visState,
-      };
-    }
-
-    this.indexPattern = indexPattern;
-    this._setUiState(new PersistedState());
-    this.setCurrentState(visState);
-    this.setState(this.getCurrentState(), false);
-
-    // Session state is for storing information that is transitory, and will not be saved with the visualization.
-    // For instance, map bounds, which depends on the view port, browser window size, etc.
-    this.sessionState = {};
-
-    this.API = {
-      events: {
-        filter: data => this.eventsSubject.next({ name: 'filterBucket', data }),
-        brush: data => this.eventsSubject.next({ name: 'brush', data }),
-      },
-    };
-  }
-
-  initializeDefaultsFromSchemas(configStates, schemas) {
-    // Set the defaults for any schema which has them. If the defaults
-    // for some reason has more then the max only set the max number
-    // of defaults (not sure why a someone define more...
-    // but whatever). Also if a schema.name is already set then don't
-    // set anything.
-    const newConfigs = [...configStates];
-    schemas
-      .filter(schema => Array.isArray(schema.defaults) && schema.defaults.length > 0)
-      .filter(schema => !configStates.find(agg => agg.schema && agg.schema === schema.name))
-      .forEach(schema => {
-        const defaults = schema.defaults.slice(0, schema.max);
-        defaults.forEach(d => newConfigs.push(d));
-      });
-    return newConfigs;
-  }
-
-  setCurrentState(state) {
-    this.title = state.title || '';
-    const type = state.type || this.type;
-    if (_.isString(type)) {
-      this.type = getTypes().get(type);
-      if (!this.type) {
-        throw new Error(`Invalid type "${type}"`);
-      }
-    } else {
-      this.type = type;
-    }
-
-    this.params = _.defaults(
-      {},
-      _.cloneDeep(state.params || {}),
-      _.cloneDeep(this.type.visConfig.defaults || {})
-    );
-
-    updateVisualizationConfig(state.params, this.params);
-
-    if (state.aggs || !this.aggs) {
-      let configStates = state.aggs ? state.aggs.aggs || state.aggs : [];
-      configStates = this.initializeDefaultsFromSchemas(configStates, this.type.schemas.all || []);
-      this.aggs = getAggs().createAggConfigs(this.indexPattern, configStates);
-    }
-  }
-
-  setState(state, updateCurrentState = true) {
-    this._state = _.cloneDeep(state);
-    if (updateCurrentState) {
-      this.setCurrentState(this._state);
-    }
-  }
-
-  setVisType(type) {
-    this.type.type = type;
-  }
-
-  updateState() {
-    this.setState(this.getCurrentState(true));
-    this.emit('update');
-  }
-
-  forceReload() {
-    this.emit('reload');
-  }
-
-  getCurrentState(includeDisabled) {
-    return {
-      title: this.title,
-      type: this.type.name,
-      params: _.cloneDeep(this.params),
-      aggs: this.aggs.aggs
-        .map(agg => agg.toJSON())
-        .filter(agg => includeDisabled || agg.enabled)
-        .filter(Boolean),
-    };
-  }
-
-  copyCurrentState(includeDisabled = false) {
-    const state = this.getCurrentState(includeDisabled);
-    state.aggs = getAggs().createAggConfigs(
-      this.indexPattern,
-      state.aggs.aggs || state.aggs,
-      this.type.schemas.all
-    );
-    return state;
-  }
-
-  getStateInternal(includeDisabled) {
-    return {
-      title: this._state.title,
-      type: this._state.type,
-      params: this._state.params,
-      aggs: this._state.aggs.filter(agg => includeDisabled || agg.enabled),
-    };
-  }
-
-  getEnabledState() {
-    return this.getStateInternal(false);
-  }
-
-  getAggConfig() {
-    return this.aggs.clone({ enabledOnly: true });
-  }
-
-  getState() {
-    return this.getStateInternal(true);
-  }
-
-  isHierarchical() {
-    if (_.isFunction(this.type.hierarchicalData)) {
-      return !!this.type.hierarchicalData(this);
-    } else {
-      return !!this.type.hierarchicalData;
-    }
-  }
-
-  hasSchemaAgg(schemaName, aggTypeName) {
-    const aggs = this.aggs.bySchemaName(schemaName) || [];
-    return aggs.some(function(agg) {
-      if (!agg.type || !agg.type.name) return false;
-      return agg.type.name === aggTypeName;
-    });
-  }
-
-  hasUiState() {
-    return !!this.__uiState;
-  }
-
-  /***
-   * this should not be used outside of visualize
-   * @param uiState
-   * @private
-   */
-  _setUiState(uiState) {
-    if (uiState instanceof PersistedState) {
-      this.__uiState = uiState;
-    }
-  }
-
-  getUiState() {
-    return this.__uiState;
-  }
-
-  /**
-   * Currently this is only used to extract map-specific information
-   * (e.g. mapZoom, mapCenter).
-   */
-  uiStateVal(key, val) {
-    if (this.hasUiState()) {
-      if (_.isUndefined(val)) {
-        return this.__uiState.get(key);
-      }
-      return this.__uiState.set(key, val);
-    }
-    return val;
-  }
-}
-
-VisImpl.prototype.type = 'histogram';
-
-export { VisImpl };
diff --git a/src/plugins/data/public/index.ts b/src/plugins/data/public/index.ts
index 339a5fea91c5f..977b9568ceaa6 100644
--- a/src/plugins/data/public/index.ts
+++ b/src/plugins/data/public/index.ts
@@ -328,6 +328,7 @@ export {
   AggParamType,
   AggTypeFieldFilters, // TODO convert to interface
   AggTypeFilters, // TODO convert to interface
+  AggConfigOptions,
   BUCKET_TYPES,
   DateRangeKey, // only used in field formatter deserialization, which will live in data
   IAggConfig,
diff --git a/src/plugins/data/public/public.api.md b/src/plugins/data/public/public.api.md
index fac16973f92a3..f0807187fc254 100644
--- a/src/plugins/data/public/public.api.md
+++ b/src/plugins/data/public/public.api.md
@@ -54,6 +54,22 @@ import { Unit } from '@elastic/datemath';
 import { UnregisterCallback } from 'history';
 import { UserProvidedValues } from 'src/core/server/types';
 
+// Warning: (ae-missing-release-tag) "AggConfigOptions" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export interface AggConfigOptions {
+    // (undocumented)
+    enabled?: boolean;
+    // (undocumented)
+    id?: string;
+    // (undocumented)
+    params?: Record<string, any>;
+    // (undocumented)
+    schema?: string;
+    // (undocumented)
+    type: IAggType;
+}
+
 // Warning: (ae-missing-release-tag) "AggGroupNames" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
@@ -1832,21 +1848,21 @@ export type TSearchStrategyProvider<T extends TStrategyTypes> = (context: ISearc
 // src/plugins/data/public/index.ts:234:27 - (ae-forgotten-export) The symbol "flattenHitWrapper" needs to be exported by the entry point index.d.ts
 // src/plugins/data/public/index.ts:234:27 - (ae-forgotten-export) The symbol "getRoutes" needs to be exported by the entry point index.d.ts
 // src/plugins/data/public/index.ts:234:27 - (ae-forgotten-export) The symbol "formatHitProvider" needs to be exported by the entry point index.d.ts
-// src/plugins/data/public/index.ts:379:20 - (ae-forgotten-export) The symbol "getRequestInspectorStats" needs to be exported by the entry point index.d.ts
-// src/plugins/data/public/index.ts:379:20 - (ae-forgotten-export) The symbol "getResponseInspectorStats" needs to be exported by the entry point index.d.ts
-// src/plugins/data/public/index.ts:379:20 - (ae-forgotten-export) The symbol "tabifyAggResponse" needs to be exported by the entry point index.d.ts
-// src/plugins/data/public/index.ts:379:20 - (ae-forgotten-export) The symbol "tabifyGetColumns" needs to be exported by the entry point index.d.ts
-// src/plugins/data/public/index.ts:384:1 - (ae-forgotten-export) The symbol "CidrMask" needs to be exported by the entry point index.d.ts
-// src/plugins/data/public/index.ts:385:1 - (ae-forgotten-export) The symbol "convertDateRangeToString" needs to be exported by the entry point index.d.ts
-// src/plugins/data/public/index.ts:387:1 - (ae-forgotten-export) The symbol "dateHistogramInterval" needs to be exported by the entry point index.d.ts
-// src/plugins/data/public/index.ts:396:1 - (ae-forgotten-export) The symbol "InvalidEsCalendarIntervalError" needs to be exported by the entry point index.d.ts
-// src/plugins/data/public/index.ts:397:1 - (ae-forgotten-export) The symbol "InvalidEsIntervalFormatError" needs to be exported by the entry point index.d.ts
-// src/plugins/data/public/index.ts:398:1 - (ae-forgotten-export) The symbol "isDateHistogramBucketAggConfig" needs to be exported by the entry point index.d.ts
-// src/plugins/data/public/index.ts:401:1 - (ae-forgotten-export) The symbol "isValidEsInterval" needs to be exported by the entry point index.d.ts
-// src/plugins/data/public/index.ts:402:1 - (ae-forgotten-export) The symbol "isValidInterval" needs to be exported by the entry point index.d.ts
-// src/plugins/data/public/index.ts:405:1 - (ae-forgotten-export) The symbol "parseInterval" needs to be exported by the entry point index.d.ts
-// src/plugins/data/public/index.ts:406:1 - (ae-forgotten-export) The symbol "propFilter" needs to be exported by the entry point index.d.ts
-// src/plugins/data/public/index.ts:409:1 - (ae-forgotten-export) The symbol "toAbsoluteDates" needs to be exported by the entry point index.d.ts
+// src/plugins/data/public/index.ts:380:20 - (ae-forgotten-export) The symbol "getRequestInspectorStats" needs to be exported by the entry point index.d.ts
+// src/plugins/data/public/index.ts:380:20 - (ae-forgotten-export) The symbol "getResponseInspectorStats" needs to be exported by the entry point index.d.ts
+// src/plugins/data/public/index.ts:380:20 - (ae-forgotten-export) The symbol "tabifyAggResponse" needs to be exported by the entry point index.d.ts
+// src/plugins/data/public/index.ts:380:20 - (ae-forgotten-export) The symbol "tabifyGetColumns" needs to be exported by the entry point index.d.ts
+// src/plugins/data/public/index.ts:385:1 - (ae-forgotten-export) The symbol "CidrMask" needs to be exported by the entry point index.d.ts
+// src/plugins/data/public/index.ts:386:1 - (ae-forgotten-export) The symbol "convertDateRangeToString" needs to be exported by the entry point index.d.ts
+// src/plugins/data/public/index.ts:388:1 - (ae-forgotten-export) The symbol "dateHistogramInterval" needs to be exported by the entry point index.d.ts
+// src/plugins/data/public/index.ts:397:1 - (ae-forgotten-export) The symbol "InvalidEsCalendarIntervalError" needs to be exported by the entry point index.d.ts
+// src/plugins/data/public/index.ts:398:1 - (ae-forgotten-export) The symbol "InvalidEsIntervalFormatError" needs to be exported by the entry point index.d.ts
+// src/plugins/data/public/index.ts:399:1 - (ae-forgotten-export) The symbol "isDateHistogramBucketAggConfig" needs to be exported by the entry point index.d.ts
+// src/plugins/data/public/index.ts:402:1 - (ae-forgotten-export) The symbol "isValidEsInterval" needs to be exported by the entry point index.d.ts
+// src/plugins/data/public/index.ts:403:1 - (ae-forgotten-export) The symbol "isValidInterval" needs to be exported by the entry point index.d.ts
+// src/plugins/data/public/index.ts:406:1 - (ae-forgotten-export) The symbol "parseInterval" needs to be exported by the entry point index.d.ts
+// src/plugins/data/public/index.ts:407:1 - (ae-forgotten-export) The symbol "propFilter" needs to be exported by the entry point index.d.ts
+// src/plugins/data/public/index.ts:410:1 - (ae-forgotten-export) The symbol "toAbsoluteDates" needs to be exported by the entry point index.d.ts
 // src/plugins/data/public/query/state_sync/connect_to_query_state.ts:33:33 - (ae-forgotten-export) The symbol "FilterStateStore" needs to be exported by the entry point index.d.ts
 // src/plugins/data/public/query/state_sync/connect_to_query_state.ts:37:1 - (ae-forgotten-export) The symbol "QueryStateChange" needs to be exported by the entry point index.d.ts
 // src/plugins/data/public/types.ts:52:5 - (ae-forgotten-export) The symbol "createFiltersFromEvent" needs to be exported by the entry point index.d.ts
diff --git a/src/plugins/visualizations/public/persisted_state/persisted_state.ts b/src/plugins/visualizations/public/persisted_state/persisted_state.ts
index b81b651c73509..3e675574fd678 100644
--- a/src/plugins/visualizations/public/persisted_state/persisted_state.ts
+++ b/src/plugins/visualizations/public/persisted_state/persisted_state.ts
@@ -85,7 +85,7 @@ export class PersistedState extends EventEmitter {
   setSilent(key: PersistedStateKey | any, value?: any) {
     const params = prepSetParams(key, value, this._path);
 
-    if (params.key) {
+    if (params.key || params.value) {
       return this.setValue(params.key, params.value, true);
     }
   }

From d8d06e7343d4457d6afa0e6e4b49607abe11f640 Mon Sep 17 00:00:00 2001
From: Gidi Meir Morris <github@gidi.io>
Date: Mon, 23 Mar 2020 18:23:26 +0000
Subject: [PATCH 029/179] [Alerting] Fixes flaky test in Alert Instances
 Details page (#60893)

Fixes flaky test in Alert Instances Details page
---
 .../apps/triggers_actions_ui/details.ts       | 64 ++++++++++++-------
 1 file changed, 41 insertions(+), 23 deletions(-)

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 145b536a26f61..2c29954528bd5 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
@@ -254,12 +254,15 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
       });
 
       it('renders the active alert instances', async () => {
+        // refresh to ensure Api call and UI are looking at freshest output
+        await browser.refresh();
+
         // Verify content
         await testSubjects.existOrFail('alertInstancesList');
 
         const { alertInstances } = await alerting.alerts.getAlertState(alert.id);
 
-        const dateOnAllInstances = mapValues(
+        const dateOnAllInstancesFromApiResponse = mapValues<Record<string, number>>(
           alertInstances,
           ({
             meta: {
@@ -268,28 +271,32 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
           }) => date
         );
 
-        log.debug(`API RESULT: ${JSON.stringify(dateOnAllInstances)}`);
+        log.debug(
+          `API RESULT: ${Object.entries(dateOnAllInstancesFromApiResponse)
+            .map(([id, date]) => `${id}: ${moment(date).utc()}`)
+            .join(', ')}`
+        );
 
         const instancesList = await pageObjects.alertDetailsUI.getAlertInstancesList();
         expect(instancesList.map(instance => omit(instance, 'duration'))).to.eql([
           {
             instance: 'us-central',
             status: 'Active',
-            start: moment(dateOnAllInstances['us-central'])
+            start: moment(dateOnAllInstancesFromApiResponse['us-central'])
               .utc()
               .format('D MMM YYYY @ HH:mm:ss'),
           },
           {
             instance: 'us-east',
             status: 'Active',
-            start: moment(dateOnAllInstances['us-east'])
+            start: moment(dateOnAllInstancesFromApiResponse['us-east'])
               .utc()
               .format('D MMM YYYY @ HH:mm:ss'),
           },
           {
             instance: 'us-west',
             status: 'Active',
-            start: moment(dateOnAllInstances['us-west'])
+            start: moment(dateOnAllInstancesFromApiResponse['us-west'])
               .utc()
               .format('D MMM YYYY @ HH:mm:ss'),
           },
@@ -299,30 +306,41 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
           await pageObjects.alertDetailsUI.getAlertInstanceDurationEpoch()
         ).utc();
 
-        const durationFromInstanceTillPageLoad = mapValues(dateOnAllInstances, date =>
-          moment.duration(durationEpoch.diff(moment(date).utc()))
+        log.debug(`DURATION EPOCH is: ${durationEpoch}]`);
+
+        const durationFromInstanceInApiUntilPageLoad = mapValues(
+          dateOnAllInstancesFromApiResponse,
+          // time from Alert Instance until pageload (AKA durationEpoch)
+          date => {
+            const durationFromApiResuiltToEpoch = moment.duration(
+              durationEpoch.diff(moment(date).utc())
+            );
+            // The UI removes milliseconds, so lets do the same in the test so we can compare
+            return moment.duration({
+              hours: durationFromApiResuiltToEpoch.hours(),
+              minutes: durationFromApiResuiltToEpoch.minutes(),
+              seconds: durationFromApiResuiltToEpoch.seconds(),
+            });
+          }
         );
+
         instancesList
           .map(alertInstance => ({
             id: alertInstance.instance,
-            duration: alertInstance.duration.split(':').map(part => parseInt(part, 10)),
+            // time from Alert Instance used to render the list until pageload (AKA durationEpoch)
+            duration: moment.duration(alertInstance.duration),
           }))
-          .map(({ id, duration: [hours, minutes, seconds] }) => ({
-            id,
-            duration: moment.duration({
-              hours,
-              minutes,
-              seconds,
-            }),
-          }))
-          .forEach(({ id, duration }) => {
-            // make sure the duration is within a 10 second range which is
-            // good enough as the alert interval is 1m, so we know it is a fresh value
-            expect(duration.as('milliseconds')).to.greaterThan(
-              durationFromInstanceTillPageLoad[id].subtract(1000 * 10).as('milliseconds')
+          .forEach(({ id, duration: durationAsItAppearsOnList }) => {
+            log.debug(
+              `DURATION of ${id} [From UI: ${durationAsItAppearsOnList.as(
+                'seconds'
+              )} seconds] [From API: ${durationFromInstanceInApiUntilPageLoad[id].as(
+                'seconds'
+              )} seconds]`
             );
-            expect(duration.as('milliseconds')).to.lessThan(
-              durationFromInstanceTillPageLoad[id].add(1000 * 10).as('milliseconds')
+
+            expect(durationFromInstanceInApiUntilPageLoad[id].as('seconds')).to.equal(
+              durationAsItAppearsOnList.as('seconds')
             );
           });
       });

From 452193fdba7c77815472889d1715b1ca341530ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alejandro=20Fern=C3=A1ndez=20Haro?=
 <alejandro.haro@elastic.co>
Date: Mon, 23 Mar 2020 18:49:38 +0000
Subject: [PATCH 030/179] [Telemetry] Server-side Migration to NP (#60485)

* [Telemetry] Migration to NP

* Telemetry management advanced settings section + fix import paths + dropped support for injectVars

* Fix i18nrc paths for telemetry

* Move ui_metric mappings to NP registerType

* Fixed minor test tweaks

* Add README docs (#60443)

* Add missing translation

* Update the telemetryService config only when authenticated

* start method is not a promise anymore

* Fix mocha tests

* No need to JSON.stringify the API responses

* Catch handleOldSettings as we used to do

* Deal with the forbidden use case in the optIn API

* No need to provide the plugin name in the logger.get(). It is automatically scoped + one missing CallCluster vs. APICaller type replacement

* Add empty start method in README.md to show differences with the other approach

* Telemetry collection with X-Pack README

* Docs update

* Allow monitoring collector to send its own ES client

* All collections should provide their own ES client

* PR feedback

* i18n NITs from kibana-platform feedback

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 .i18nrc.json                                  |   4 +-
 .../application_usage/mappings.ts             |  36 ---
 .../application_usage/package.json            |   4 -
 .../telemetry/common/constants.ts             |  83 ------
 src/legacy/core_plugins/telemetry/index.ts    | 153 -----------
 .../core_plugins/telemetry/mappings.json      |  30 ---
 .../core_plugins/telemetry/package.json       |   4 -
 .../public/views/management/management.tsx    |  49 ----
 .../telemetry/server/collection_manager.ts    | 249 -----------------
 .../core_plugins/telemetry/server/plugin.ts   |  70 -----
 .../server/routes/telemetry_opt_in.ts         |  97 -------
 .../server/routes/telemetry_usage_stats.ts    |  67 -----
 .../telemetry_config/replace_injected_vars.ts |  72 -----
 src/legacy/core_plugins/ui_metric/index.ts    |   3 -
 .../core_plugins/ui_metric/mappings.json      |   9 -
 .../index.ts => server/i18n/constants.ts}     |  16 +-
 ...tions_path.js => get_translations_path.ts} |  10 +-
 src/legacy/server/i18n/{index.js => index.ts} |  30 ++-
 .../localization/file_integrity.test.mocks.ts |   0
 .../i18n}/localization/file_integrity.test.ts |   0
 .../i18n}/localization/file_integrity.ts      |   0
 .../i18n}/localization/index.ts               |   0
 .../telemetry_localization_collector.test.ts  |   5 +-
 .../telemetry_localization_collector.ts       |  29 +-
 src/legacy/server/kbn_server.d.ts             |   2 +
 src/plugins/data/server/server.api.md         |   1 -
 .../telemetry/README.md                       |   2 +-
 src/plugins/telemetry/common/constants.ts     |  45 +++-
 ..._telemetry_allow_changing_opt_in_status.ts |   3 +-
 .../get_telemetry_failure_details.test.ts     |   0
 .../get_telemetry_failure_details.ts          |   2 +-
 ...ry_notify_user_about_optin_default.test.ts |   0
 ...lemetry_notify_user_about_optin_default.ts |   2 +-
 .../get_telemetry_opt_in.test.ts              |   2 +-
 .../telemetry_config/get_telemetry_opt_in.ts  |   2 +-
 .../get_telemetry_send_usage_from.test.ts     |   2 +-
 .../get_telemetry_send_usage_from.ts          |   2 +-
 .../common}/telemetry_config/index.ts         |   1 -
 .../common/telemetry_config/types.ts}         |   5 +-
 src/plugins/telemetry/kibana.json             |   8 +-
 .../telemetry/public/components/index.ts      |   2 -
 src/plugins/telemetry/public/index.ts         |   7 +-
 src/plugins/telemetry/public/mocks.ts         |  28 +-
 src/plugins/telemetry/public/plugin.ts        | 122 ++++++++-
 .../public/services/telemetry_service.ts      |  53 ++--
 .../application_usage/index.test.ts           |  11 +-
 .../collectors/application_usage/index.ts     |   0
 .../application_usage/saved_objects_types.ts  |  59 ++++
 .../telemetry_application_usage_collector.ts  |  22 +-
 .../server/collectors/find_all.test.ts        |   2 +-
 .../telemetry/server/collectors/find_all.ts   |   0
 .../telemetry/server/collectors/index.ts      |   2 -
 .../server/collectors/management/index.ts     |   0
 .../telemetry_management_collector.ts         |  23 +-
 .../collectors/telemetry_plugin/index.ts      |   0
 .../telemetry_plugin_collector.ts             |  44 +--
 .../server/collectors/ui_metric/index.test.ts |  11 +-
 .../server/collectors/ui_metric/index.ts      |   0
 .../telemetry_ui_metric_collector.ts          |  22 +-
 .../usage/ensure_deep_object.test.ts          |   0
 .../collectors/usage/ensure_deep_object.ts    |   0
 .../server/collectors/usage/index.ts          |   0
 .../usage/telemetry_usage_collector.test.ts   |  21 +-
 .../usage/telemetry_usage_collector.ts        |  19 +-
 src/plugins/telemetry/server/config.ts        |  61 +++++
 .../telemetry/server/fetcher.ts               | 189 +++++++------
 .../handle_old_settings.ts                    |  18 +-
 .../server/handle_old_settings/index.ts       |   0
 .../telemetry/server/index.ts                 |  29 +-
 src/plugins/telemetry/server/plugin.ts        | 168 ++++++++++++
 .../telemetry/server/routes/index.ts          |  23 +-
 .../server/routes/telemetry_opt_in.ts         | 101 +++++++
 .../server/routes/telemetry_opt_in_stats.ts   |  50 ++--
 .../server/routes/telemetry_usage_stats.ts    |  82 ++++++
 .../routes/telemetry_user_has_seen_notice.ts  |  30 +--
 .../__tests__/get_cluster_info.js             |   0
 .../__tests__/get_cluster_stats.js            |   0
 .../__tests__/get_local_stats.js              |   9 +-
 .../server/telemetry_collection/constants.ts  |   0
 .../telemetry_collection/get_cluster_info.ts  |   4 +-
 .../telemetry_collection/get_cluster_stats.ts |   6 +-
 .../server/telemetry_collection/get_kibana.ts |  20 +-
 .../telemetry_collection/get_local_license.ts |  22 +-
 .../telemetry_collection/get_local_stats.ts   |  21 +-
 .../server/telemetry_collection/index.ts      |   3 +-
 .../register_collection.ts                    |  10 +-
 .../get_telemetry_saved_object.test.ts        |   4 +-
 .../get_telemetry_saved_object.ts             |  13 +-
 .../server/telemetry_repository/index.ts      |  25 ++
 .../update_telemetry_saved_object.ts          |   4 +-
 .../telemetry_collection_manager/README.md    |   7 +
 .../common}/index.ts                          |   3 +-
 .../telemetry_collection_manager/kibana.json  |  10 +
 .../server}/encryption/encrypt.test.ts        |   0
 .../server}/encryption/encrypt.ts             |   0
 .../server}/encryption/index.ts               |   0
 .../server}/encryption/telemetry_jwks.ts      |   0
 .../server/index.ts                           |  41 +++
 .../server/plugin.ts                          | 253 ++++++++++++++++++
 .../server/types.ts                           | 150 +++++++++++
 .../telemetry_management_section/README.md    |   5 +
 .../telemetry_management_section/kibana.json  |  10 +
 .../opt_in_example_flyout.test.tsx.snap       |   0
 .../public/components/index.ts                |  22 ++
 .../components/opt_in_example_flyout.test.tsx |   0
 .../components/opt_in_example_flyout.tsx      |   0
 .../telemetry_management_section.tsx          |   9 +-
 .../telemetry_management_section_wrapper.tsx  |  40 +++
 .../public/index.ts}                          |   6 +-
 .../public/plugin.ts                          |  54 ++++
 src/plugins/usage_collection/README.md        | 163 ++++++++---
 .../server/collector/collector.ts             |   5 +-
 .../server/collector/collector_set.ts         |  13 +-
 src/plugins/usage_collection/server/index.ts  |   2 +-
 src/plugins/usage_collection/server/plugin.ts |  16 +-
 test/tsconfig.json                            |   3 +-
 x-pack/legacy/plugins/monitoring/index.js     |   2 -
 x-pack/legacy/plugins/xpack_main/index.js     |   2 -
 .../register_xpack_collection.ts              |  21 --
 .../public/application/lib/telemetry.ts       |   2 +-
 x-pack/plugins/monitoring/kibana.json         |   4 +-
 x-pack/plugins/monitoring/server/plugin.ts    |  32 ++-
 .../get_all_stats.test.ts                     |  60 +++--
 .../telemetry_collection/get_all_stats.ts     |  19 +-
 .../get_beats_stats.test.ts                   |   8 +-
 .../telemetry_collection/get_beats_stats.ts   |  17 +-
 .../get_cluster_uuids.test.ts                 |  19 +-
 .../telemetry_collection/get_cluster_uuids.ts |  25 +-
 .../telemetry_collection/get_es_stats.test.ts |  18 +-
 .../telemetry_collection/get_es_stats.ts      |  15 +-
 .../get_high_level_stats.test.ts              |  16 +-
 .../get_high_level_stats.ts                   |  17 +-
 .../telemetry_collection/get_kibana_stats.ts  |  10 +-
 .../telemetry_collection/get_licenses.test.ts |  21 +-
 .../telemetry_collection/get_licenses.ts      |  24 +-
 .../register_monitoring_collection.ts         |  20 +-
 .../telemetry_collection_xpack/README.md      |   9 +
 .../common/index.ts                           |   8 +
 .../telemetry_collection_xpack/kibana.json    |  10 +
 .../server/index.ts                           |  15 ++
 .../server/plugin.ts                          |  31 +++
 .../get_stats_with_xpack.test.ts.snap         |   0
 .../__tests__/get_xpack.js                    |   0
 .../server/telemetry_collection/constants.ts  |   0
 .../get_stats_with_xpack.test.ts              |  55 ++--
 .../get_stats_with_xpack.ts                   |  14 +-
 .../server/telemetry_collection/get_xpack.ts  |   0
 .../server/telemetry_collection/index.ts      |   2 +-
 .../telemetry/telemetry_optin_notice_seen.ts  |   2 +-
 149 files changed, 2128 insertions(+), 1621 deletions(-)
 delete mode 100644 src/legacy/core_plugins/application_usage/mappings.ts
 delete mode 100644 src/legacy/core_plugins/application_usage/package.json
 delete mode 100644 src/legacy/core_plugins/telemetry/common/constants.ts
 delete mode 100644 src/legacy/core_plugins/telemetry/index.ts
 delete mode 100644 src/legacy/core_plugins/telemetry/mappings.json
 delete mode 100644 src/legacy/core_plugins/telemetry/package.json
 delete mode 100644 src/legacy/core_plugins/telemetry/public/views/management/management.tsx
 delete mode 100644 src/legacy/core_plugins/telemetry/server/collection_manager.ts
 delete mode 100644 src/legacy/core_plugins/telemetry/server/plugin.ts
 delete mode 100644 src/legacy/core_plugins/telemetry/server/routes/telemetry_opt_in.ts
 delete mode 100644 src/legacy/core_plugins/telemetry/server/routes/telemetry_usage_stats.ts
 delete mode 100644 src/legacy/core_plugins/telemetry/server/telemetry_config/replace_injected_vars.ts
 delete mode 100644 src/legacy/core_plugins/ui_metric/mappings.json
 rename src/legacy/{core_plugins/application_usage/index.ts => server/i18n/constants.ts} (66%)
 rename src/legacy/server/i18n/{get_translations_path.js => get_translations_path.ts} (85%)
 rename src/legacy/server/i18n/{index.js => index.ts} (62%)
 rename src/legacy/{core_plugins/telemetry/server/collectors => server/i18n}/localization/file_integrity.test.mocks.ts (100%)
 rename src/legacy/{core_plugins/telemetry/server/collectors => server/i18n}/localization/file_integrity.test.ts (100%)
 rename src/legacy/{core_plugins/telemetry/server/collectors => server/i18n}/localization/file_integrity.ts (100%)
 rename src/legacy/{core_plugins/telemetry/server/collectors => server/i18n}/localization/index.ts (100%)
 rename src/legacy/{core_plugins/telemetry/server/collectors => server/i18n}/localization/telemetry_localization_collector.test.ts (94%)
 rename src/legacy/{core_plugins/telemetry/server/collectors => server/i18n}/localization/telemetry_localization_collector.ts (71%)
 rename src/{legacy/core_plugins => plugins}/telemetry/README.md (81%)
 rename src/{legacy/core_plugins/telemetry/server => plugins/telemetry/common}/telemetry_config/get_telemetry_allow_changing_opt_in_status.ts (93%)
 rename src/{legacy/core_plugins/telemetry/server => plugins/telemetry/common}/telemetry_config/get_telemetry_failure_details.test.ts (100%)
 rename src/{legacy/core_plugins/telemetry/server => plugins/telemetry/common}/telemetry_config/get_telemetry_failure_details.ts (94%)
 rename src/{legacy/core_plugins/telemetry/server => plugins/telemetry/common}/telemetry_config/get_telemetry_notify_user_about_optin_default.test.ts (100%)
 rename src/{legacy/core_plugins/telemetry/server => plugins/telemetry/common}/telemetry_config/get_telemetry_notify_user_about_optin_default.ts (94%)
 rename src/{legacy/core_plugins/telemetry/server => plugins/telemetry/common}/telemetry_config/get_telemetry_opt_in.test.ts (98%)
 rename src/{legacy/core_plugins/telemetry/server => plugins/telemetry/common}/telemetry_config/get_telemetry_opt_in.ts (97%)
 rename src/{legacy/core_plugins/telemetry/server => plugins/telemetry/common}/telemetry_config/get_telemetry_send_usage_from.test.ts (96%)
 rename src/{legacy/core_plugins/telemetry/server => plugins/telemetry/common}/telemetry_config/get_telemetry_send_usage_from.ts (93%)
 rename src/{legacy/core_plugins/telemetry/server => plugins/telemetry/common}/telemetry_config/index.ts (94%)
 rename src/{legacy/core_plugins/telemetry/server/telemetry_repository/index.ts => plugins/telemetry/common/telemetry_config/types.ts} (86%)
 rename src/{legacy/core_plugins => plugins}/telemetry/server/collectors/application_usage/index.test.ts (91%)
 rename src/{legacy/core_plugins => plugins}/telemetry/server/collectors/application_usage/index.ts (100%)
 create mode 100644 src/plugins/telemetry/server/collectors/application_usage/saved_objects_types.ts
 rename src/{legacy/core_plugins => plugins}/telemetry/server/collectors/application_usage/telemetry_application_usage_collector.ts (94%)
 rename src/{legacy/core_plugins => plugins}/telemetry/server/collectors/find_all.test.ts (96%)
 rename src/{legacy/core_plugins => plugins}/telemetry/server/collectors/find_all.ts (100%)
 rename src/{legacy/core_plugins => plugins}/telemetry/server/collectors/index.ts (90%)
 rename src/{legacy/core_plugins => plugins}/telemetry/server/collectors/management/index.ts (100%)
 rename src/{legacy/core_plugins => plugins}/telemetry/server/collectors/management/telemetry_management_collector.ts (73%)
 rename src/{legacy/core_plugins => plugins}/telemetry/server/collectors/telemetry_plugin/index.ts (100%)
 rename src/{legacy/core_plugins => plugins}/telemetry/server/collectors/telemetry_plugin/telemetry_plugin_collector.ts (62%)
 rename src/{legacy/core_plugins => plugins}/telemetry/server/collectors/ui_metric/index.test.ts (87%)
 rename src/{legacy/core_plugins => plugins}/telemetry/server/collectors/ui_metric/index.ts (100%)
 rename src/{legacy/core_plugins => plugins}/telemetry/server/collectors/ui_metric/telemetry_ui_metric_collector.ts (82%)
 rename src/{legacy/core_plugins => plugins}/telemetry/server/collectors/usage/ensure_deep_object.test.ts (100%)
 rename src/{legacy/core_plugins => plugins}/telemetry/server/collectors/usage/ensure_deep_object.ts (100%)
 rename src/{legacy/core_plugins => plugins}/telemetry/server/collectors/usage/index.ts (100%)
 rename src/{legacy/core_plugins => plugins}/telemetry/server/collectors/usage/telemetry_usage_collector.test.ts (89%)
 rename src/{legacy/core_plugins => plugins}/telemetry/server/collectors/usage/telemetry_usage_collector.ts (87%)
 create mode 100644 src/plugins/telemetry/server/config.ts
 rename src/{legacy/core_plugins => plugins}/telemetry/server/fetcher.ts (55%)
 rename src/{legacy/core_plugins => plugins}/telemetry/server/handle_old_settings/handle_old_settings.ts (74%)
 rename src/{legacy/core_plugins => plugins}/telemetry/server/handle_old_settings/index.ts (100%)
 rename src/{legacy/core_plugins => plugins}/telemetry/server/index.ts (60%)
 create mode 100644 src/plugins/telemetry/server/plugin.ts
 rename src/{legacy/core_plugins => plugins}/telemetry/server/routes/index.ts (61%)
 create mode 100644 src/plugins/telemetry/server/routes/telemetry_opt_in.ts
 rename src/{legacy/core_plugins => plugins}/telemetry/server/routes/telemetry_opt_in_stats.ts (65%)
 create mode 100644 src/plugins/telemetry/server/routes/telemetry_usage_stats.ts
 rename src/{legacy/core_plugins => plugins}/telemetry/server/routes/telemetry_user_has_seen_notice.ts (65%)
 rename src/{legacy/core_plugins => plugins}/telemetry/server/telemetry_collection/__tests__/get_cluster_info.js (100%)
 rename src/{legacy/core_plugins => plugins}/telemetry/server/telemetry_collection/__tests__/get_cluster_stats.js (100%)
 rename src/{legacy/core_plugins => plugins}/telemetry/server/telemetry_collection/__tests__/get_local_stats.js (96%)
 rename src/{legacy/core_plugins => plugins}/telemetry/server/telemetry_collection/constants.ts (100%)
 rename src/{legacy/core_plugins => plugins}/telemetry/server/telemetry_collection/get_cluster_info.ts (92%)
 rename src/{legacy/core_plugins => plugins}/telemetry/server/telemetry_collection/get_cluster_stats.ts (86%)
 rename src/{legacy/core_plugins => plugins}/telemetry/server/telemetry_collection/get_kibana.ts (79%)
 rename src/{legacy/core_plugins => plugins}/telemetry/server/telemetry_collection/get_local_license.ts (80%)
 rename src/{legacy/core_plugins => plugins}/telemetry/server/telemetry_collection/get_local_stats.ts (82%)
 rename src/{legacy/core_plugins => plugins}/telemetry/server/telemetry_collection/index.ts (87%)
 rename src/{legacy/core_plugins => plugins}/telemetry/server/telemetry_collection/register_collection.ts (86%)
 rename src/{legacy/core_plugins => plugins}/telemetry/server/telemetry_repository/get_telemetry_saved_object.test.ts (95%)
 rename src/{legacy/core_plugins => plugins}/telemetry/server/telemetry_repository/get_telemetry_saved_object.ts (81%)
 create mode 100644 src/plugins/telemetry/server/telemetry_repository/index.ts
 rename src/{legacy/core_plugins => plugins}/telemetry/server/telemetry_repository/update_telemetry_saved_object.ts (89%)
 create mode 100644 src/plugins/telemetry_collection_manager/README.md
 rename src/{legacy/core_plugins/telemetry/public/views/management => plugins/telemetry_collection_manager/common}/index.ts (87%)
 create mode 100644 src/plugins/telemetry_collection_manager/kibana.json
 rename src/{legacy/core_plugins/telemetry/server/collectors => plugins/telemetry_collection_manager/server}/encryption/encrypt.test.ts (100%)
 rename src/{legacy/core_plugins/telemetry/server/collectors => plugins/telemetry_collection_manager/server}/encryption/encrypt.ts (100%)
 rename src/{legacy/core_plugins/telemetry/server/collectors => plugins/telemetry_collection_manager/server}/encryption/index.ts (100%)
 rename src/{legacy/core_plugins/telemetry/server/collectors => plugins/telemetry_collection_manager/server}/encryption/telemetry_jwks.ts (100%)
 create mode 100644 src/plugins/telemetry_collection_manager/server/index.ts
 create mode 100644 src/plugins/telemetry_collection_manager/server/plugin.ts
 create mode 100644 src/plugins/telemetry_collection_manager/server/types.ts
 create mode 100644 src/plugins/telemetry_management_section/README.md
 create mode 100644 src/plugins/telemetry_management_section/kibana.json
 rename src/plugins/{telemetry => telemetry_management_section}/public/components/__snapshots__/opt_in_example_flyout.test.tsx.snap (100%)
 create mode 100644 src/plugins/telemetry_management_section/public/components/index.ts
 rename src/plugins/{telemetry => telemetry_management_section}/public/components/opt_in_example_flyout.test.tsx (100%)
 rename src/plugins/{telemetry => telemetry_management_section}/public/components/opt_in_example_flyout.tsx (100%)
 rename src/plugins/{telemetry => telemetry_management_section}/public/components/telemetry_management_section.tsx (96%)
 create mode 100644 src/plugins/telemetry_management_section/public/components/telemetry_management_section_wrapper.tsx
 rename src/{legacy/server/i18n/constants.js => plugins/telemetry_management_section/public/index.ts} (85%)
 create mode 100644 src/plugins/telemetry_management_section/public/plugin.ts
 delete mode 100644 x-pack/legacy/plugins/xpack_main/server/telemetry_collection/register_xpack_collection.ts
 create mode 100644 x-pack/plugins/telemetry_collection_xpack/README.md
 create mode 100644 x-pack/plugins/telemetry_collection_xpack/common/index.ts
 create mode 100644 x-pack/plugins/telemetry_collection_xpack/kibana.json
 create mode 100644 x-pack/plugins/telemetry_collection_xpack/server/index.ts
 create mode 100644 x-pack/plugins/telemetry_collection_xpack/server/plugin.ts
 rename x-pack/{legacy/plugins/xpack_main => plugins/telemetry_collection_xpack}/server/telemetry_collection/__snapshots__/get_stats_with_xpack.test.ts.snap (100%)
 rename x-pack/{legacy/plugins/xpack_main => plugins/telemetry_collection_xpack}/server/telemetry_collection/__tests__/get_xpack.js (100%)
 rename x-pack/{legacy/plugins/xpack_main => plugins/telemetry_collection_xpack}/server/telemetry_collection/constants.ts (100%)
 rename x-pack/{legacy/plugins/xpack_main => plugins/telemetry_collection_xpack}/server/telemetry_collection/get_stats_with_xpack.test.ts (73%)
 rename x-pack/{legacy/plugins/xpack_main => plugins/telemetry_collection_xpack}/server/telemetry_collection/get_stats_with_xpack.ts (70%)
 rename x-pack/{legacy/plugins/xpack_main => plugins/telemetry_collection_xpack}/server/telemetry_collection/get_xpack.ts (100%)
 rename x-pack/{legacy/plugins/xpack_main => plugins/telemetry_collection_xpack}/server/telemetry_collection/index.ts (76%)

diff --git a/.i18nrc.json b/.i18nrc.json
index bffe99bf3654b..36b28a0f5bd34 100644
--- a/.i18nrc.json
+++ b/.i18nrc.json
@@ -35,8 +35,8 @@
     "server": "src/legacy/server",
     "statusPage": "src/legacy/core_plugins/status_page",
     "telemetry": [
-      "src/legacy/core_plugins/telemetry",
-      "src/plugins/telemetry"
+      "src/plugins/telemetry",
+      "src/plugins/telemetry_management_section"
     ],
     "tileMap": "src/legacy/core_plugins/tile_map",
     "timelion": ["src/legacy/core_plugins/timelion", "src/legacy/core_plugins/vis_type_timelion", "src/plugins/timelion"],
diff --git a/src/legacy/core_plugins/application_usage/mappings.ts b/src/legacy/core_plugins/application_usage/mappings.ts
deleted file mode 100644
index 39adc53f7e9ff..0000000000000
--- a/src/legacy/core_plugins/application_usage/mappings.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-export const mappings = {
-  application_usage_totals: {
-    properties: {
-      appId: { type: 'keyword' },
-      numberOfClicks: { type: 'long' },
-      minutesOnScreen: { type: 'float' },
-    },
-  },
-  application_usage_transactional: {
-    properties: {
-      timestamp: { type: 'date' },
-      appId: { type: 'keyword' },
-      numberOfClicks: { type: 'long' },
-      minutesOnScreen: { type: 'float' },
-    },
-  },
-};
diff --git a/src/legacy/core_plugins/application_usage/package.json b/src/legacy/core_plugins/application_usage/package.json
deleted file mode 100644
index 5ab10a2f8d237..0000000000000
--- a/src/legacy/core_plugins/application_usage/package.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "name": "application_usage",
-  "version": "kibana"
-}
\ No newline at end of file
diff --git a/src/legacy/core_plugins/telemetry/common/constants.ts b/src/legacy/core_plugins/telemetry/common/constants.ts
deleted file mode 100644
index b44bf319e6627..0000000000000
--- a/src/legacy/core_plugins/telemetry/common/constants.ts
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import { i18n } from '@kbn/i18n';
-
-/*
- * config options opt into telemetry
- * @type {string}
- */
-export const CONFIG_TELEMETRY = 'telemetry:optIn';
-/*
- * config description for opting into telemetry
- * @type {string}
- */
-export const getConfigTelemetryDesc = () => {
-  return i18n.translate('telemetry.telemetryConfigDescription', {
-    defaultMessage:
-      'Help us improve the Elastic Stack by providing usage statistics for basic features. We will not share this data outside of Elastic.',
-  });
-};
-
-/**
- * The amount of time, in milliseconds, to wait between reports when enabled.
- *
- * Currently 24 hours.
- * @type {Number}
- */
-export const REPORT_INTERVAL_MS = 86400000;
-
-/**
- * Link to the Elastic Telemetry privacy statement.
- */
-export const PRIVACY_STATEMENT_URL = `https://www.elastic.co/legal/privacy-statement`;
-
-/**
- * The type name used within the Monitoring index to publish localization stats.
- * @type {string}
- */
-export const KIBANA_LOCALIZATION_STATS_TYPE = 'localization';
-
-/**
- * The type name used to publish telemetry plugin stats.
- * @type {string}
- */
-export const TELEMETRY_STATS_TYPE = 'telemetry';
-
-/**
- * UI metric usage type
- * @type {string}
- */
-export const UI_METRIC_USAGE_TYPE = 'ui_metric';
-
-/**
- * Application Usage type
- */
-export const APPLICATION_USAGE_TYPE = 'application_usage';
-
-/**
- * Link to Advanced Settings.
- */
-export const PATH_TO_ADVANCED_SETTINGS = 'kibana#/management/kibana/settings';
-
-/**
- * The type name used within the Monitoring index to publish management stats.
- * @type {string}
- */
-export const KIBANA_STACK_MANAGEMENT_STATS_TYPE = 'stack_management';
diff --git a/src/legacy/core_plugins/telemetry/index.ts b/src/legacy/core_plugins/telemetry/index.ts
deleted file mode 100644
index 1e88e7d65cffd..0000000000000
--- a/src/legacy/core_plugins/telemetry/index.ts
+++ /dev/null
@@ -1,153 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import * as Rx from 'rxjs';
-import { resolve } from 'path';
-import JoiNamespace from 'joi';
-import { Server } from 'hapi';
-import { PluginInitializerContext } from 'src/core/server';
-// eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { getConfigPath } from '../../../core/server/path';
-// @ts-ignore
-import mappings from './mappings.json';
-import {
-  telemetryPlugin,
-  replaceTelemetryInjectedVars,
-  FetcherTask,
-  PluginsSetup,
-  handleOldSettings,
-} from './server';
-
-const ENDPOINT_VERSION = 'v2';
-
-const telemetry = (kibana: any) => {
-  return new kibana.Plugin({
-    id: 'telemetry',
-    configPrefix: 'telemetry',
-    publicDir: resolve(__dirname, 'public'),
-    require: ['elasticsearch'],
-    config(Joi: typeof JoiNamespace) {
-      return Joi.object({
-        enabled: Joi.boolean().default(true),
-        allowChangingOptInStatus: Joi.boolean().default(true),
-        optIn: Joi.when('allowChangingOptInStatus', {
-          is: false,
-          then: Joi.valid(true).default(true),
-          otherwise: Joi.boolean().default(true),
-        }),
-        // `config` is used internally and not intended to be set
-        config: Joi.string().default(getConfigPath()),
-        banner: Joi.boolean().default(true),
-        url: Joi.when('$dev', {
-          is: true,
-          then: Joi.string().default(
-            `https://telemetry-staging.elastic.co/xpack/${ENDPOINT_VERSION}/send`
-          ),
-          otherwise: Joi.string().default(
-            `https://telemetry.elastic.co/xpack/${ENDPOINT_VERSION}/send`
-          ),
-        }),
-        optInStatusUrl: Joi.when('$dev', {
-          is: true,
-          then: Joi.string().default(
-            `https://telemetry-staging.elastic.co/opt_in_status/${ENDPOINT_VERSION}/send`
-          ),
-          otherwise: Joi.string().default(
-            `https://telemetry.elastic.co/opt_in_status/${ENDPOINT_VERSION}/send`
-          ),
-        }),
-        sendUsageFrom: Joi.string()
-          .allow(['server', 'browser'])
-          .default('browser'),
-      }).default();
-    },
-    uiExports: {
-      managementSections: ['plugins/telemetry/views/management'],
-      savedObjectSchemas: {
-        telemetry: {
-          isNamespaceAgnostic: true,
-        },
-      },
-      async replaceInjectedVars(originalInjectedVars: any, request: any, server: any) {
-        const telemetryInjectedVars = await replaceTelemetryInjectedVars(request, server);
-        return Object.assign({}, originalInjectedVars, telemetryInjectedVars);
-      },
-      injectDefaultVars(server: Server) {
-        const config = server.config();
-        return {
-          telemetryEnabled: config.get('telemetry.enabled'),
-          telemetryUrl: config.get('telemetry.url'),
-          telemetryBanner:
-            config.get('telemetry.allowChangingOptInStatus') !== false &&
-            config.get('telemetry.banner'),
-          telemetryOptedIn: config.get('telemetry.optIn'),
-          telemetryOptInStatusUrl: config.get('telemetry.optInStatusUrl'),
-          allowChangingOptInStatus: config.get('telemetry.allowChangingOptInStatus'),
-          telemetrySendUsageFrom: config.get('telemetry.sendUsageFrom'),
-          telemetryNotifyUserAboutOptInDefault: false,
-        };
-      },
-      mappings,
-    },
-    postInit(server: Server) {
-      const fetcherTask = new FetcherTask(server);
-      fetcherTask.start();
-    },
-    async init(server: Server) {
-      const { usageCollection } = server.newPlatform.setup.plugins;
-      const initializerContext = {
-        env: {
-          packageInfo: {
-            version: server.config().get('pkg.version'),
-          },
-        },
-        config: {
-          create() {
-            const config = server.config();
-            return Rx.of({
-              enabled: config.get('telemetry.enabled'),
-              optIn: config.get('telemetry.optIn'),
-              config: config.get('telemetry.config'),
-              banner: config.get('telemetry.banner'),
-              url: config.get('telemetry.url'),
-              allowChangingOptInStatus: config.get('telemetry.allowChangingOptInStatus'),
-            });
-          },
-        },
-      } as PluginInitializerContext;
-
-      try {
-        await handleOldSettings(server);
-      } catch (err) {
-        server.log(['warning', 'telemetry'], 'Unable to update legacy telemetry configs.');
-      }
-
-      const pluginsSetup: PluginsSetup = {
-        usageCollection,
-      };
-
-      const npPlugin = telemetryPlugin(initializerContext);
-      await npPlugin.setup(server.newPlatform.setup.core, pluginsSetup, server);
-      await npPlugin.start(server.newPlatform.start.core);
-    },
-  });
-};
-
-// eslint-disable-next-line import/no-default-export
-export default telemetry;
diff --git a/src/legacy/core_plugins/telemetry/mappings.json b/src/legacy/core_plugins/telemetry/mappings.json
deleted file mode 100644
index fa9cc93d6363a..0000000000000
--- a/src/legacy/core_plugins/telemetry/mappings.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "telemetry": {
-    "properties": {
-      "enabled": {
-        "type": "boolean"
-      },
-      "sendUsageFrom": {
-        "ignore_above": 256,
-        "type": "keyword"
-      },
-      "lastReported": {
-        "type": "date"
-      },
-      "lastVersionChecked": {
-        "ignore_above": 256,
-        "type": "keyword"
-      },
-      "userHasSeenNotice": {
-        "type": "boolean"
-      },
-      "reportFailureCount": {
-        "type": "integer"
-      },
-      "reportFailureVersion": {
-        "ignore_above": 256,
-        "type": "keyword"
-      }
-    }
-  }
-}
diff --git a/src/legacy/core_plugins/telemetry/package.json b/src/legacy/core_plugins/telemetry/package.json
deleted file mode 100644
index 979e68cce742f..0000000000000
--- a/src/legacy/core_plugins/telemetry/package.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "name": "telemetry",
-  "version": "kibana"
-}
diff --git a/src/legacy/core_plugins/telemetry/public/views/management/management.tsx b/src/legacy/core_plugins/telemetry/public/views/management/management.tsx
deleted file mode 100644
index c8ae410e0aa57..0000000000000
--- a/src/legacy/core_plugins/telemetry/public/views/management/management.tsx
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-import React from 'react';
-import routes from 'ui/routes';
-import { npStart, npSetup } from 'ui/new_platform';
-// eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { TelemetryManagementSection } from '../../../../../../plugins/telemetry/public/components';
-
-routes.defaults(/\/management/, {
-  resolve: {
-    telemetryManagementSection() {
-      const { telemetry } = npStart.plugins as any;
-      const { advancedSettings } = npSetup.plugins as any;
-
-      if (telemetry && advancedSettings) {
-        const componentRegistry = advancedSettings.component;
-        const Component = (props: any) => (
-          <TelemetryManagementSection
-            showAppliesSettingMessage={true}
-            telemetryService={telemetry.telemetryService}
-            {...props}
-          />
-        );
-
-        componentRegistry.register(
-          componentRegistry.componentType.PAGE_FOOTER_COMPONENT,
-          Component,
-          true
-        );
-      }
-    },
-  },
-});
diff --git a/src/legacy/core_plugins/telemetry/server/collection_manager.ts b/src/legacy/core_plugins/telemetry/server/collection_manager.ts
deleted file mode 100644
index ebac4bede85bb..0000000000000
--- a/src/legacy/core_plugins/telemetry/server/collection_manager.ts
+++ /dev/null
@@ -1,249 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import { 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 } & {
-  server: any;
-  start: string;
-  end: string;
-};
-
-export type UnencryptedStatsGetterConfig = { unencrypted: true } & {
-  req: any;
-  start: string;
-  end: string;
-};
-
-export interface ClusterDetails {
-  clusterUuid: string;
-}
-
-export interface StatsCollectionConfig {
-  usageCollection: UsageCollectionSetup;
-  callCluster: CallCluster;
-  server: any;
-  start: string | number;
-  end: string | number;
-}
-
-export interface BasicStatsPayload {
-  timestamp: string;
-  cluster_uuid: string;
-  cluster_name: string;
-  version: string;
-  cluster_stats: object;
-  collection?: string;
-  stack_stats: object;
-}
-
-export type StatsGetterConfig = UnencryptedStatsGetterConfig | EncryptedStatsGetterConfig;
-export type ClusterDetailsGetter = (config: StatsCollectionConfig) => Promise<ClusterDetails[]>;
-export type StatsGetter<T extends BasicStatsPayload = BasicStatsPayload> = (
-  clustersDetails: ClusterDetails[],
-  config: StatsCollectionConfig
-) => Promise<T[]>;
-export type LicenseGetter = (
-  clustersDetails: ClusterDetails[],
-  config: StatsCollectionConfig
-) => Promise<{ [clusterUuid: string]: ESLicense | undefined }>;
-
-interface CollectionConfig<T extends BasicStatsPayload> {
-  title: string;
-  priority: number;
-  esCluster: string | Cluster;
-  statsGetter: StatsGetter<T>;
-  clusterDetailsGetter: ClusterDetailsGetter;
-  licenseGetter: LicenseGetter;
-}
-interface Collection {
-  statsGetter: StatsGetter;
-  licenseGetter: LicenseGetter;
-  clusterDetailsGetter: ClusterDetailsGetter;
-  esCluster: string | Cluster;
-  title: string;
-}
-
-export class TelemetryCollectionManager {
-  private usageGetterMethodPriority = -1;
-  private collections: Collection[] = [];
-
-  public setCollection = <T extends BasicStatsPayload>(collectionConfig: CollectionConfig<T>) => {
-    const {
-      title,
-      priority,
-      esCluster,
-      statsGetter,
-      clusterDetailsGetter,
-      licenseGetter,
-    } = collectionConfig;
-
-    if (typeof priority !== 'number') {
-      throw new Error('priority must be set.');
-    }
-    if (priority === this.usageGetterMethodPriority) {
-      throw new Error(`A Usage Getter with the same priority is already set.`);
-    }
-
-    if (priority > this.usageGetterMethodPriority) {
-      if (!statsGetter) {
-        throw Error('Stats getter method not set.');
-      }
-      if (!esCluster) {
-        throw Error('esCluster name must be set for the getCluster method.');
-      }
-      if (!clusterDetailsGetter) {
-        throw Error('Cluster UUIds method is not set.');
-      }
-      if (!licenseGetter) {
-        throw Error('License getter method not set.');
-      }
-
-      this.collections.unshift({
-        licenseGetter,
-        statsGetter,
-        clusterDetailsGetter,
-        esCluster,
-        title,
-      });
-      this.usageGetterMethodPriority = priority;
-    }
-  };
-
-  private getStatsCollectionConfig = async (
-    collection: Collection,
-    config: StatsGetterConfig
-  ): Promise<StatsCollectionConfig> => {
-    const { start, end } = config;
-    const server = config.unencrypted ? config.req.server : config.server;
-    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;
-
-    const { usageCollection } = server.newPlatform.setup.plugins;
-    return { server, callCluster, start, end, usageCollection };
-  };
-
-  private getOptInStatsForCollection = async (
-    collection: Collection,
-    optInStatus: boolean,
-    statsCollectionConfig: StatsCollectionConfig
-  ) => {
-    const clustersDetails = await collection.clusterDetailsGetter(statsCollectionConfig);
-    return clustersDetails.map(({ clusterUuid }) => ({
-      cluster_uuid: clusterUuid,
-      opt_in_status: optInStatus,
-    }));
-  };
-
-  private getUsageForCollection = async (
-    collection: Collection,
-    statsCollectionConfig: StatsCollectionConfig
-  ) => {
-    const clustersDetails = await collection.clusterDetailsGetter(statsCollectionConfig);
-
-    if (clustersDetails.length === 0) {
-      // don't bother doing a further lookup, try next collection.
-      return;
-    }
-
-    const [stats, licenses] = await Promise.all([
-      collection.statsGetter(clustersDetails, statsCollectionConfig),
-      collection.licenseGetter(clustersDetails, statsCollectionConfig),
-    ]);
-
-    return stats.map(stat => {
-      const license = licenses[stat.cluster_uuid];
-      return {
-        ...(license ? { license } : {}),
-        ...stat,
-        collectionSource: collection.title,
-      };
-    });
-  };
-
-  public getOptInStats = async (optInStatus: boolean, config: StatsGetterConfig) => {
-    for (const collection of this.collections) {
-      const statsCollectionConfig = await this.getStatsCollectionConfig(collection, config);
-      try {
-        const optInStats = await this.getOptInStatsForCollection(
-          collection,
-          optInStatus,
-          statsCollectionConfig
-        );
-        if (optInStats && optInStats.length) {
-          statsCollectionConfig.server.log(
-            ['debug', 'telemetry', 'collection'],
-            `Got Opt In stats using ${collection.title} collection.`
-          );
-          if (config.unencrypted) {
-            return optInStats;
-          }
-          const isDev = statsCollectionConfig.server.config().get('env.dev');
-          return encryptTelemetry(optInStats, isDev);
-        }
-      } catch (err) {
-        statsCollectionConfig.server.log(
-          ['debu', 'telemetry', 'collection'],
-          `Failed to collect any opt in stats with registered collections.`
-        );
-        // swallow error to try next collection;
-      }
-    }
-
-    return [];
-  };
-  public getStats = async (config: StatsGetterConfig) => {
-    for (const collection of this.collections) {
-      const statsCollectionConfig = await this.getStatsCollectionConfig(collection, config);
-      try {
-        const usageData = await this.getUsageForCollection(collection, statsCollectionConfig);
-        if (usageData && usageData.length) {
-          statsCollectionConfig.server.log(
-            ['debug', 'telemetry', 'collection'],
-            `Got Usage using ${collection.title} collection.`
-          );
-          if (config.unencrypted) {
-            return usageData;
-          }
-          const isDev = statsCollectionConfig.server.config().get('env.dev');
-          return encryptTelemetry(usageData, isDev);
-        }
-      } catch (err) {
-        statsCollectionConfig.server.log(
-          ['debug', 'telemetry', 'collection'],
-          `Failed to collect any usage with registered collections.`
-        );
-        // swallow error to try next collection;
-      }
-    }
-
-    return [];
-  };
-}
-
-export const telemetryCollectionManager = new TelemetryCollectionManager();
diff --git a/src/legacy/core_plugins/telemetry/server/plugin.ts b/src/legacy/core_plugins/telemetry/server/plugin.ts
deleted file mode 100644
index 0b9f0526988c8..0000000000000
--- a/src/legacy/core_plugins/telemetry/server/plugin.ts
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import {
-  CoreSetup,
-  PluginInitializerContext,
-  ISavedObjectsRepository,
-  CoreStart,
-} from 'src/core/server';
-import { Server } from 'hapi';
-import { registerRoutes } from './routes';
-import { registerCollection } from './telemetry_collection';
-import { UsageCollectionSetup } from '../../../../plugins/usage_collection/server';
-import {
-  registerUiMetricUsageCollector,
-  registerTelemetryUsageCollector,
-  registerLocalizationUsageCollector,
-  registerTelemetryPluginUsageCollector,
-  registerManagementUsageCollector,
-  registerApplicationUsageCollector,
-} from './collectors';
-
-export interface PluginsSetup {
-  usageCollection: UsageCollectionSetup;
-}
-
-export class TelemetryPlugin {
-  private readonly currentKibanaVersion: string;
-  private savedObjectsClient?: ISavedObjectsRepository;
-
-  constructor(initializerContext: PluginInitializerContext) {
-    this.currentKibanaVersion = initializerContext.env.packageInfo.version;
-  }
-
-  public setup(core: CoreSetup, { usageCollection }: PluginsSetup, server: Server) {
-    const currentKibanaVersion = this.currentKibanaVersion;
-
-    registerCollection();
-    registerRoutes({ core, currentKibanaVersion, server });
-
-    const getSavedObjectsClient = () => this.savedObjectsClient;
-
-    registerTelemetryPluginUsageCollector(usageCollection, server);
-    registerLocalizationUsageCollector(usageCollection, server);
-    registerTelemetryUsageCollector(usageCollection, server);
-    registerUiMetricUsageCollector(usageCollection, getSavedObjectsClient);
-    registerManagementUsageCollector(usageCollection, server);
-    registerApplicationUsageCollector(usageCollection, getSavedObjectsClient);
-  }
-
-  public start({ savedObjects }: CoreStart) {
-    this.savedObjectsClient = savedObjects.createInternalRepository();
-  }
-}
diff --git a/src/legacy/core_plugins/telemetry/server/routes/telemetry_opt_in.ts b/src/legacy/core_plugins/telemetry/server/routes/telemetry_opt_in.ts
deleted file mode 100644
index ccbc28f6cbadb..0000000000000
--- a/src/legacy/core_plugins/telemetry/server/routes/telemetry_opt_in.ts
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import Joi from 'joi';
-import moment from 'moment';
-import { boomify } from 'boom';
-import { CoreSetup } from 'src/core/server';
-import { Legacy } from 'kibana';
-import { getTelemetryAllowChangingOptInStatus } from '../telemetry_config';
-import { sendTelemetryOptInStatus } from './telemetry_opt_in_stats';
-
-import {
-  TelemetrySavedObjectAttributes,
-  updateTelemetrySavedObject,
-} from '../telemetry_repository';
-
-interface RegisterOptInRoutesParams {
-  core: CoreSetup;
-  currentKibanaVersion: string;
-  server: Legacy.Server;
-}
-
-export function registerTelemetryOptInRoutes({
-  server,
-  currentKibanaVersion,
-}: RegisterOptInRoutesParams) {
-  server.route({
-    method: 'POST',
-    path: '/api/telemetry/v2/optIn',
-    options: {
-      validate: {
-        payload: Joi.object({
-          enabled: Joi.bool().required(),
-        }),
-      },
-    },
-    handler: async (req: any, h: any) => {
-      try {
-        const newOptInStatus = req.payload.enabled;
-        const attributes: TelemetrySavedObjectAttributes = {
-          enabled: newOptInStatus,
-          lastVersionChecked: currentKibanaVersion,
-        };
-        const config = req.server.config();
-        const savedObjectsClient = req.getSavedObjectsClient();
-        const configTelemetryAllowChangingOptInStatus = config.get(
-          'telemetry.allowChangingOptInStatus'
-        );
-
-        const allowChangingOptInStatus = getTelemetryAllowChangingOptInStatus({
-          telemetrySavedObject: savedObjectsClient,
-          configTelemetryAllowChangingOptInStatus,
-        });
-        if (!allowChangingOptInStatus) {
-          return h.response({ error: 'Not allowed to change Opt-in Status.' }).code(400);
-        }
-
-        const sendUsageFrom = config.get('telemetry.sendUsageFrom');
-        if (sendUsageFrom === 'server') {
-          const optInStatusUrl = config.get('telemetry.optInStatusUrl');
-          await sendTelemetryOptInStatus(
-            { optInStatusUrl, newOptInStatus },
-            {
-              start: moment()
-                .subtract(20, 'minutes')
-                .toISOString(),
-              end: moment().toISOString(),
-              server: req.server,
-              unencrypted: false,
-            }
-          );
-        }
-
-        await updateTelemetrySavedObject(savedObjectsClient, attributes);
-        return h.response({}).code(200);
-      } catch (err) {
-        return boomify(err);
-      }
-    },
-  });
-}
diff --git a/src/legacy/core_plugins/telemetry/server/routes/telemetry_usage_stats.ts b/src/legacy/core_plugins/telemetry/server/routes/telemetry_usage_stats.ts
deleted file mode 100644
index ee3241b0dc2ea..0000000000000
--- a/src/legacy/core_plugins/telemetry/server/routes/telemetry_usage_stats.ts
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import Joi from 'joi';
-import { boomify } from 'boom';
-import { Legacy } from 'kibana';
-import { telemetryCollectionManager } from '../collection_manager';
-
-export function registerTelemetryUsageStatsRoutes(server: Legacy.Server) {
-  server.route({
-    method: 'POST',
-    path: '/api/telemetry/v2/clusters/_stats',
-    options: {
-      validate: {
-        payload: Joi.object({
-          unencrypted: Joi.bool(),
-          timeRange: Joi.object({
-            min: Joi.date().required(),
-            max: Joi.date().required(),
-          }).required(),
-        }),
-      },
-    },
-    handler: async (req: any, h: any) => {
-      const config = req.server.config();
-      const start = req.payload.timeRange.min;
-      const end = req.payload.timeRange.max;
-      const unencrypted = req.payload.unencrypted;
-
-      try {
-        return await telemetryCollectionManager.getStats({
-          unencrypted,
-          server,
-          req,
-          start,
-          end,
-        });
-      } catch (err) {
-        const isDev = config.get('env.dev');
-        if (isDev) {
-          // don't ignore errors when running in dev mode
-          return boomify(err, { statusCode: err.status || 500 });
-        } else {
-          const statusCode = unencrypted && err.status === 403 ? 403 : 200;
-          // ignore errors and return empty set
-          return h.response([]).code(statusCode);
-        }
-      }
-    },
-  });
-}
diff --git a/src/legacy/core_plugins/telemetry/server/telemetry_config/replace_injected_vars.ts b/src/legacy/core_plugins/telemetry/server/telemetry_config/replace_injected_vars.ts
deleted file mode 100644
index f09ee8623afac..0000000000000
--- a/src/legacy/core_plugins/telemetry/server/telemetry_config/replace_injected_vars.ts
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import { getTelemetrySavedObject } from '../telemetry_repository';
-import { getTelemetryOptIn } from './get_telemetry_opt_in';
-import { getTelemetrySendUsageFrom } from './get_telemetry_send_usage_from';
-import { getTelemetryAllowChangingOptInStatus } from './get_telemetry_allow_changing_opt_in_status';
-import { getNotifyUserAboutOptInDefault } from './get_telemetry_notify_user_about_optin_default';
-
-export async function replaceTelemetryInjectedVars(request: any, server: any) {
-  const config = server.config();
-  const configTelemetrySendUsageFrom = config.get('telemetry.sendUsageFrom');
-  const configTelemetryOptIn = config.get('telemetry.optIn');
-  const configTelemetryAllowChangingOptInStatus = config.get('telemetry.allowChangingOptInStatus');
-  const isRequestingApplication = request.path.startsWith('/app');
-
-  // Prevent interstitial screens (such as the space selector) from prompting for telemetry
-  if (!isRequestingApplication) {
-    return {
-      telemetryOptedIn: false,
-    };
-  }
-
-  const currentKibanaVersion = config.get('pkg.version');
-  const savedObjectsClient = server.savedObjects.getScopedSavedObjectsClient(request);
-  const telemetrySavedObject = await getTelemetrySavedObject(savedObjectsClient);
-  const allowChangingOptInStatus = getTelemetryAllowChangingOptInStatus({
-    configTelemetryAllowChangingOptInStatus,
-    telemetrySavedObject,
-  });
-
-  const telemetryOptedIn = getTelemetryOptIn({
-    configTelemetryOptIn,
-    allowChangingOptInStatus,
-    telemetrySavedObject,
-    currentKibanaVersion,
-  });
-
-  const telemetrySendUsageFrom = getTelemetrySendUsageFrom({
-    configTelemetrySendUsageFrom,
-    telemetrySavedObject,
-  });
-
-  const telemetryNotifyUserAboutOptInDefault = getNotifyUserAboutOptInDefault({
-    telemetrySavedObject,
-    allowChangingOptInStatus,
-    configTelemetryOptIn,
-    telemetryOptedIn,
-  });
-
-  return {
-    telemetryOptedIn,
-    telemetrySendUsageFrom,
-    telemetryNotifyUserAboutOptInDefault,
-  };
-}
diff --git a/src/legacy/core_plugins/ui_metric/index.ts b/src/legacy/core_plugins/ui_metric/index.ts
index 5a4a0ebf1a632..2e5be3d7b0a39 100644
--- a/src/legacy/core_plugins/ui_metric/index.ts
+++ b/src/legacy/core_plugins/ui_metric/index.ts
@@ -25,9 +25,6 @@ export default function(kibana: any) {
     id: 'ui_metric',
     require: ['kibana', 'elasticsearch'],
     publicDir: resolve(__dirname, 'public'),
-    uiExports: {
-      mappings: require('./mappings.json'),
-    },
     init() {},
   });
 }
diff --git a/src/legacy/core_plugins/ui_metric/mappings.json b/src/legacy/core_plugins/ui_metric/mappings.json
deleted file mode 100644
index 113e37e60e48b..0000000000000
--- a/src/legacy/core_plugins/ui_metric/mappings.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "ui-metric": {
-    "properties": {
-      "count": {
-        "type": "integer"
-      }
-    }
-  }
-}
diff --git a/src/legacy/core_plugins/application_usage/index.ts b/src/legacy/server/i18n/constants.ts
similarity index 66%
rename from src/legacy/core_plugins/application_usage/index.ts
rename to src/legacy/server/i18n/constants.ts
index 752d6eaa19bb0..96fa420d4c6e1 100644
--- a/src/legacy/core_plugins/application_usage/index.ts
+++ b/src/legacy/server/i18n/constants.ts
@@ -17,15 +17,9 @@
  * under the License.
  */
 
-import { Legacy } from '../../../../kibana';
-import { mappings } from './mappings';
+export const I18N_RC = '.i18nrc.json';
 
-// eslint-disable-next-line import/no-default-export
-export default function ApplicationUsagePlugin(kibana: any) {
-  const config: Legacy.PluginSpecOptions = {
-    id: 'application_usage',
-    uiExports: { mappings }, // Needed to define the mappings for the SavedObjects
-  };
-
-  return new kibana.Plugin(config);
-}
+/**
+ * The type name used within the Monitoring index to publish localization stats.
+ */
+export const KIBANA_LOCALIZATION_STATS_TYPE = 'localization';
diff --git a/src/legacy/server/i18n/get_translations_path.js b/src/legacy/server/i18n/get_translations_path.ts
similarity index 85%
rename from src/legacy/server/i18n/get_translations_path.js
rename to src/legacy/server/i18n/get_translations_path.ts
index 6ac3e75e1d4a8..ac7c61dcf8543 100644
--- a/src/legacy/server/i18n/get_translations_path.js
+++ b/src/legacy/server/i18n/get_translations_path.ts
@@ -24,16 +24,20 @@ import globby from 'globby';
 
 const readFileAsync = promisify(readFile);
 
-export async function getTranslationPaths({ cwd, glob }) {
+interface I18NRCFileStructure {
+  translations?: string[];
+}
+
+export async function getTranslationPaths({ cwd, glob }: { cwd: string; glob: string }) {
   const entries = await globby(glob, { cwd });
-  const translationPaths = [];
+  const translationPaths: string[] = [];
 
   for (const entry of entries) {
     const entryFullPath = resolve(cwd, entry);
     const pluginBasePath = dirname(entryFullPath);
     try {
       const content = await readFileAsync(entryFullPath, 'utf8');
-      const { translations } = JSON.parse(content);
+      const { translations } = JSON.parse(content) as I18NRCFileStructure;
       if (translations && translations.length) {
         translations.forEach(translation => {
           const translationFullPath = resolve(pluginBasePath, translation);
diff --git a/src/legacy/server/i18n/index.js b/src/legacy/server/i18n/index.ts
similarity index 62%
rename from src/legacy/server/i18n/index.js
rename to src/legacy/server/i18n/index.ts
index e7fa5d5f6a5c0..9902aaa1e8914 100644
--- a/src/legacy/server/i18n/index.js
+++ b/src/legacy/server/i18n/index.ts
@@ -19,30 +19,35 @@
 
 import { i18n, i18nLoader } from '@kbn/i18n';
 import { basename } from 'path';
+import { Server } from 'hapi';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
 import { fromRoot } from '../../../core/server/utils';
 import { getTranslationPaths } from './get_translations_path';
 import { I18N_RC } from './constants';
+import KbnServer, { KibanaConfig } from '../kbn_server';
+import { registerLocalizationUsageCollector } from './localization';
 
-export async function i18nMixin(kbnServer, server, config) {
-  const locale = config.get('i18n.locale');
+export async function i18nMixin(kbnServer: KbnServer, server: Server, config: KibanaConfig) {
+  const locale = config.get('i18n.locale') as string;
 
   const translationPaths = await Promise.all([
     getTranslationPaths({
       cwd: fromRoot('.'),
       glob: I18N_RC,
     }),
-    ...config.get('plugins.paths').map(cwd => getTranslationPaths({ cwd, glob: I18N_RC })),
-    ...config
-      .get('plugins.scanDirs')
-      .map(cwd => getTranslationPaths({ cwd, glob: `*/${I18N_RC}` })),
+    ...(config.get('plugins.paths') as string[]).map(cwd =>
+      getTranslationPaths({ cwd, glob: I18N_RC })
+    ),
+    ...(config.get('plugins.scanDirs') as string[]).map(cwd =>
+      getTranslationPaths({ cwd, glob: `*/${I18N_RC}` })
+    ),
     getTranslationPaths({
       cwd: fromRoot('../kibana-extra'),
       glob: `*/${I18N_RC}`,
     }),
   ]);
 
-  const currentTranslationPaths = []
+  const currentTranslationPaths = ([] as string[])
     .concat(...translationPaths)
     .filter(translationPath => basename(translationPath, '.json') === locale);
   i18nLoader.registerTranslationFiles(currentTranslationPaths);
@@ -55,5 +60,14 @@ export async function i18nMixin(kbnServer, server, config) {
     })
   );
 
-  server.decorate('server', 'getTranslationsFilePaths', () => currentTranslationPaths);
+  const getTranslationsFilePaths = () => currentTranslationPaths;
+
+  server.decorate('server', 'getTranslationsFilePaths', getTranslationsFilePaths);
+
+  if (kbnServer.newPlatform.setup.plugins.usageCollection) {
+    registerLocalizationUsageCollector(kbnServer.newPlatform.setup.plugins.usageCollection, {
+      getLocale: () => config.get('i18n.locale') as string,
+      getTranslationsFilePaths,
+    });
+  }
 }
diff --git a/src/legacy/core_plugins/telemetry/server/collectors/localization/file_integrity.test.mocks.ts b/src/legacy/server/i18n/localization/file_integrity.test.mocks.ts
similarity index 100%
rename from src/legacy/core_plugins/telemetry/server/collectors/localization/file_integrity.test.mocks.ts
rename to src/legacy/server/i18n/localization/file_integrity.test.mocks.ts
diff --git a/src/legacy/core_plugins/telemetry/server/collectors/localization/file_integrity.test.ts b/src/legacy/server/i18n/localization/file_integrity.test.ts
similarity index 100%
rename from src/legacy/core_plugins/telemetry/server/collectors/localization/file_integrity.test.ts
rename to src/legacy/server/i18n/localization/file_integrity.test.ts
diff --git a/src/legacy/core_plugins/telemetry/server/collectors/localization/file_integrity.ts b/src/legacy/server/i18n/localization/file_integrity.ts
similarity index 100%
rename from src/legacy/core_plugins/telemetry/server/collectors/localization/file_integrity.ts
rename to src/legacy/server/i18n/localization/file_integrity.ts
diff --git a/src/legacy/core_plugins/telemetry/server/collectors/localization/index.ts b/src/legacy/server/i18n/localization/index.ts
similarity index 100%
rename from src/legacy/core_plugins/telemetry/server/collectors/localization/index.ts
rename to src/legacy/server/i18n/localization/index.ts
diff --git a/src/legacy/core_plugins/telemetry/server/collectors/localization/telemetry_localization_collector.test.ts b/src/legacy/server/i18n/localization/telemetry_localization_collector.test.ts
similarity index 94%
rename from src/legacy/core_plugins/telemetry/server/collectors/localization/telemetry_localization_collector.test.ts
rename to src/legacy/server/i18n/localization/telemetry_localization_collector.test.ts
index eec5cc8a065e4..cbe23da87c767 100644
--- a/src/legacy/core_plugins/telemetry/server/collectors/localization/telemetry_localization_collector.test.ts
+++ b/src/legacy/server/i18n/localization/telemetry_localization_collector.test.ts
@@ -22,16 +22,17 @@ interface TranslationsMock {
 }
 
 const createI18nLoaderMock = (translations: TranslationsMock) => {
-  return {
+  return ({
     getTranslationsByLocale() {
       return {
         messages: translations,
       };
     },
-  };
+  } as unknown) as typeof i18nLoader;
 };
 
 import { getTranslationCount } from './telemetry_localization_collector';
+import { i18nLoader } from '@kbn/i18n';
 
 describe('getTranslationCount', () => {
   it('returns 0 if no translations registered', async () => {
diff --git a/src/legacy/core_plugins/telemetry/server/collectors/localization/telemetry_localization_collector.ts b/src/legacy/server/i18n/localization/telemetry_localization_collector.ts
similarity index 71%
rename from src/legacy/core_plugins/telemetry/server/collectors/localization/telemetry_localization_collector.ts
rename to src/legacy/server/i18n/localization/telemetry_localization_collector.ts
index 191565187be14..89566dfd4ef68 100644
--- a/src/legacy/core_plugins/telemetry/server/collectors/localization/telemetry_localization_collector.ts
+++ b/src/legacy/server/i18n/localization/telemetry_localization_collector.ts
@@ -19,25 +19,36 @@
 
 import { i18nLoader } from '@kbn/i18n';
 import { size } from 'lodash';
+import { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
 import { getIntegrityHashes, Integrities } from './file_integrity';
-import { KIBANA_LOCALIZATION_STATS_TYPE } from '../../../common/constants';
-import { UsageCollectionSetup } from '../../../../../../plugins/usage_collection/server';
+import { KIBANA_LOCALIZATION_STATS_TYPE } from '../constants';
+
 export interface UsageStats {
   locale: string;
   integrities: Integrities;
   labelsCount?: number;
 }
 
-export async function getTranslationCount(loader: any, locale: string): Promise<number> {
+export interface LocalizationUsageCollectorHelpers {
+  getLocale: () => string;
+  getTranslationsFilePaths: () => string[];
+}
+
+export async function getTranslationCount(
+  loader: typeof i18nLoader,
+  locale: string
+): Promise<number> {
   const translations = await loader.getTranslationsByLocale(locale);
   return size(translations.messages);
 }
 
-export function createCollectorFetch(server: any) {
+export function createCollectorFetch({
+  getLocale,
+  getTranslationsFilePaths,
+}: LocalizationUsageCollectorHelpers) {
   return async function fetchUsageStats(): Promise<UsageStats> {
-    const config = server.config();
-    const locale: string = config.get('i18n.locale');
-    const translationFilePaths: string[] = server.getTranslationsFilePaths();
+    const locale = getLocale();
+    const translationFilePaths: string[] = getTranslationsFilePaths();
 
     const [labelsCount, integrities] = await Promise.all([
       getTranslationCount(i18nLoader, locale),
@@ -54,12 +65,12 @@ export function createCollectorFetch(server: any) {
 
 export function registerLocalizationUsageCollector(
   usageCollection: UsageCollectionSetup,
-  server: any
+  helpers: LocalizationUsageCollectorHelpers
 ) {
   const collector = usageCollection.makeUsageCollector({
     type: KIBANA_LOCALIZATION_STATS_TYPE,
     isReady: () => true,
-    fetch: createCollectorFetch(server),
+    fetch: createCollectorFetch(helpers),
   });
 
   usageCollection.registerCollector(collector);
diff --git a/src/legacy/server/kbn_server.d.ts b/src/legacy/server/kbn_server.d.ts
index 9952b345fa06f..d222dbb550f11 100644
--- a/src/legacy/server/kbn_server.d.ts
+++ b/src/legacy/server/kbn_server.d.ts
@@ -20,6 +20,7 @@
 import { ResponseObject, Server } from 'hapi';
 import { UnwrapPromise } from '@kbn/utility-types';
 
+import { TelemetryCollectionManagerPluginSetup } from 'src/plugins/telemetry_collection_manager/server';
 import {
   ConfigService,
   CoreSetup,
@@ -104,6 +105,7 @@ type KbnMixinFunc = (kbnServer: KbnServer, server: Server, config: any) => Promi
 
 export interface PluginsSetup {
   usageCollection: UsageCollectionSetup;
+  telemetryCollectionManager: TelemetryCollectionManagerPluginSetup;
   home: HomeServerPluginSetup;
   [key: string]: object;
 }
diff --git a/src/plugins/data/server/server.api.md b/src/plugins/data/server/server.api.md
index 5c231cdc05e61..1abc74fe07ccc 100644
--- a/src/plugins/data/server/server.api.md
+++ b/src/plugins/data/server/server.api.md
@@ -7,7 +7,6 @@
 import { APICaller as APICaller_2 } from 'kibana/server';
 import Boom from 'boom';
 import { BulkIndexDocumentsParams } from 'elasticsearch';
-import { CallCluster as CallCluster_2 } from 'src/legacy/core_plugins/elasticsearch';
 import { CatAliasesParams } from 'elasticsearch';
 import { CatAllocationParams } from 'elasticsearch';
 import { CatCommonParams } from 'elasticsearch';
diff --git a/src/legacy/core_plugins/telemetry/README.md b/src/plugins/telemetry/README.md
similarity index 81%
rename from src/legacy/core_plugins/telemetry/README.md
rename to src/plugins/telemetry/README.md
index 830c08f8e8bed..196d596fb784f 100644
--- a/src/legacy/core_plugins/telemetry/README.md
+++ b/src/plugins/telemetry/README.md
@@ -6,4 +6,4 @@ Telemetry allows Kibana features to have usage tracked in the wild. The general
 2. Sending a payload of usage data up to Elastic's telemetry cluster.
 3. Viewing usage data in the Kibana instance of the telemetry cluster (Viewing).
 
-This plugin is responsible for sending usage data to the telemetry cluster. For collecting usage data, use 
+This plugin is responsible for sending usage data to the telemetry cluster. For collecting usage data, use the [`usageCollection` plugin](../usage_collection/README.md)
diff --git a/src/plugins/telemetry/common/constants.ts b/src/plugins/telemetry/common/constants.ts
index 7b7694ed9aed7..babd009143c5e 100644
--- a/src/plugins/telemetry/common/constants.ts
+++ b/src/plugins/telemetry/common/constants.ts
@@ -17,13 +17,31 @@
  * under the License.
  */
 
+import { i18n } from '@kbn/i18n';
+
+/**
+ * config options opt into telemetry
+ */
+export const CONFIG_TELEMETRY = 'telemetry:optIn';
+
+/**
+ * config description for opting into telemetry
+ */
+export const getConfigTelemetryDesc = () => {
+  // Can't find where it's used but copying it over from the legacy code just in case...
+  return i18n.translate('telemetry.telemetryConfigDescription', {
+    defaultMessage:
+      'Help us improve the Elastic Stack by providing usage statistics for basic features. We will not share this data outside of Elastic.',
+  });
+};
+
 /**
  * The amount of time, in milliseconds, to wait between reports when enabled.
  * Currently 24 hours.
  */
 export const REPORT_INTERVAL_MS = 86400000;
 
-/*
+/**
  * Key for the localStorage service
  */
 export const LOCALSTORAGE_KEY = 'telemetry.data';
@@ -37,3 +55,28 @@ export const PATH_TO_ADVANCED_SETTINGS = 'kibana#/management/kibana/settings';
  * Link to the Elastic Telemetry privacy statement.
  */
 export const PRIVACY_STATEMENT_URL = `https://www.elastic.co/legal/privacy-statement`;
+
+/**
+ * The type name used to publish telemetry plugin stats.
+ */
+export const TELEMETRY_STATS_TYPE = 'telemetry';
+
+/**
+ * The endpoint version when hitting the remote telemetry service
+ */
+export const ENDPOINT_VERSION = 'v2';
+
+/**
+ * UI metric usage type
+ */
+export const UI_METRIC_USAGE_TYPE = 'ui_metric';
+
+/**
+ * Application Usage type
+ */
+export const APPLICATION_USAGE_TYPE = 'application_usage';
+
+/**
+ * The type name used within the Monitoring index to publish management stats.
+ */
+export const KIBANA_STACK_MANAGEMENT_STATS_TYPE = 'stack_management';
diff --git a/src/legacy/core_plugins/telemetry/server/telemetry_config/get_telemetry_allow_changing_opt_in_status.ts b/src/plugins/telemetry/common/telemetry_config/get_telemetry_allow_changing_opt_in_status.ts
similarity index 93%
rename from src/legacy/core_plugins/telemetry/server/telemetry_config/get_telemetry_allow_changing_opt_in_status.ts
rename to src/plugins/telemetry/common/telemetry_config/get_telemetry_allow_changing_opt_in_status.ts
index 9fa4fbc5e0227..d7dcfd606b6ac 100644
--- a/src/legacy/core_plugins/telemetry/server/telemetry_config/get_telemetry_allow_changing_opt_in_status.ts
+++ b/src/plugins/telemetry/common/telemetry_config/get_telemetry_allow_changing_opt_in_status.ts
@@ -16,7 +16,8 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { TelemetrySavedObject } from '../telemetry_repository/get_telemetry_saved_object';
+
+import { TelemetrySavedObject } from './types';
 
 interface GetTelemetryAllowChangingOptInStatus {
   configTelemetryAllowChangingOptInStatus: boolean;
diff --git a/src/legacy/core_plugins/telemetry/server/telemetry_config/get_telemetry_failure_details.test.ts b/src/plugins/telemetry/common/telemetry_config/get_telemetry_failure_details.test.ts
similarity index 100%
rename from src/legacy/core_plugins/telemetry/server/telemetry_config/get_telemetry_failure_details.test.ts
rename to src/plugins/telemetry/common/telemetry_config/get_telemetry_failure_details.test.ts
diff --git a/src/legacy/core_plugins/telemetry/server/telemetry_config/get_telemetry_failure_details.ts b/src/plugins/telemetry/common/telemetry_config/get_telemetry_failure_details.ts
similarity index 94%
rename from src/legacy/core_plugins/telemetry/server/telemetry_config/get_telemetry_failure_details.ts
rename to src/plugins/telemetry/common/telemetry_config/get_telemetry_failure_details.ts
index 2952fa96a5cf3..c23ec42be56c4 100644
--- a/src/legacy/core_plugins/telemetry/server/telemetry_config/get_telemetry_failure_details.ts
+++ b/src/plugins/telemetry/common/telemetry_config/get_telemetry_failure_details.ts
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { TelemetrySavedObject } from '../telemetry_repository/get_telemetry_saved_object';
+import { TelemetrySavedObject } from './types';
 
 interface GetTelemetryFailureDetailsConfig {
   telemetrySavedObject: TelemetrySavedObject;
diff --git a/src/legacy/core_plugins/telemetry/server/telemetry_config/get_telemetry_notify_user_about_optin_default.test.ts b/src/plugins/telemetry/common/telemetry_config/get_telemetry_notify_user_about_optin_default.test.ts
similarity index 100%
rename from src/legacy/core_plugins/telemetry/server/telemetry_config/get_telemetry_notify_user_about_optin_default.test.ts
rename to src/plugins/telemetry/common/telemetry_config/get_telemetry_notify_user_about_optin_default.test.ts
diff --git a/src/legacy/core_plugins/telemetry/server/telemetry_config/get_telemetry_notify_user_about_optin_default.ts b/src/plugins/telemetry/common/telemetry_config/get_telemetry_notify_user_about_optin_default.ts
similarity index 94%
rename from src/legacy/core_plugins/telemetry/server/telemetry_config/get_telemetry_notify_user_about_optin_default.ts
rename to src/plugins/telemetry/common/telemetry_config/get_telemetry_notify_user_about_optin_default.ts
index 8ef3bd8388ecb..19bd1974ffba1 100644
--- a/src/legacy/core_plugins/telemetry/server/telemetry_config/get_telemetry_notify_user_about_optin_default.ts
+++ b/src/plugins/telemetry/common/telemetry_config/get_telemetry_notify_user_about_optin_default.ts
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { TelemetrySavedObject } from '../telemetry_repository/get_telemetry_saved_object';
+import { TelemetrySavedObject } from './types';
 
 interface NotifyOpts {
   allowChangingOptInStatus: boolean;
diff --git a/src/legacy/core_plugins/telemetry/server/telemetry_config/get_telemetry_opt_in.test.ts b/src/plugins/telemetry/common/telemetry_config/get_telemetry_opt_in.test.ts
similarity index 98%
rename from src/legacy/core_plugins/telemetry/server/telemetry_config/get_telemetry_opt_in.test.ts
rename to src/plugins/telemetry/common/telemetry_config/get_telemetry_opt_in.test.ts
index efc4a020e0ff0..da44abd35517c 100644
--- a/src/legacy/core_plugins/telemetry/server/telemetry_config/get_telemetry_opt_in.test.ts
+++ b/src/plugins/telemetry/common/telemetry_config/get_telemetry_opt_in.test.ts
@@ -18,7 +18,7 @@
  */
 
 import { getTelemetryOptIn } from './get_telemetry_opt_in';
-import { TelemetrySavedObject } from '../telemetry_repository/get_telemetry_saved_object';
+import { TelemetrySavedObject } from './types';
 
 describe('getTelemetryOptIn', () => {
   it('returns null when saved object not found', () => {
diff --git a/src/legacy/core_plugins/telemetry/server/telemetry_config/get_telemetry_opt_in.ts b/src/plugins/telemetry/common/telemetry_config/get_telemetry_opt_in.ts
similarity index 97%
rename from src/legacy/core_plugins/telemetry/server/telemetry_config/get_telemetry_opt_in.ts
rename to src/plugins/telemetry/common/telemetry_config/get_telemetry_opt_in.ts
index d83ffdf69b576..7beb5415ad7b1 100644
--- a/src/legacy/core_plugins/telemetry/server/telemetry_config/get_telemetry_opt_in.ts
+++ b/src/plugins/telemetry/common/telemetry_config/get_telemetry_opt_in.ts
@@ -18,7 +18,7 @@
  */
 
 import semver from 'semver';
-import { TelemetrySavedObject } from '../telemetry_repository/get_telemetry_saved_object';
+import { TelemetrySavedObject } from './types';
 
 interface GetTelemetryOptInConfig {
   telemetrySavedObject: TelemetrySavedObject;
diff --git a/src/legacy/core_plugins/telemetry/server/telemetry_config/get_telemetry_send_usage_from.test.ts b/src/plugins/telemetry/common/telemetry_config/get_telemetry_send_usage_from.test.ts
similarity index 96%
rename from src/legacy/core_plugins/telemetry/server/telemetry_config/get_telemetry_send_usage_from.test.ts
rename to src/plugins/telemetry/common/telemetry_config/get_telemetry_send_usage_from.test.ts
index 69868a97a931d..2cf68f0abedea 100644
--- a/src/legacy/core_plugins/telemetry/server/telemetry_config/get_telemetry_send_usage_from.test.ts
+++ b/src/plugins/telemetry/common/telemetry_config/get_telemetry_send_usage_from.test.ts
@@ -18,7 +18,7 @@
  */
 
 import { getTelemetrySendUsageFrom } from './get_telemetry_send_usage_from';
-import { TelemetrySavedObject } from '../telemetry_repository/get_telemetry_saved_object';
+import { TelemetrySavedObject } from './types';
 
 describe('getTelemetrySendUsageFrom', () => {
   it('returns kibana.yml config when saved object not found', () => {
diff --git a/src/legacy/core_plugins/telemetry/server/telemetry_config/get_telemetry_send_usage_from.ts b/src/plugins/telemetry/common/telemetry_config/get_telemetry_send_usage_from.ts
similarity index 93%
rename from src/legacy/core_plugins/telemetry/server/telemetry_config/get_telemetry_send_usage_from.ts
rename to src/plugins/telemetry/common/telemetry_config/get_telemetry_send_usage_from.ts
index 9e4ae14b6097c..78dc1d877c47f 100644
--- a/src/legacy/core_plugins/telemetry/server/telemetry_config/get_telemetry_send_usage_from.ts
+++ b/src/plugins/telemetry/common/telemetry_config/get_telemetry_send_usage_from.ts
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { TelemetrySavedObject } from '../telemetry_repository/get_telemetry_saved_object';
+import { TelemetrySavedObject } from './types';
 
 interface GetTelemetryUsageFetcherConfig {
   configTelemetrySendUsageFrom: 'browser' | 'server';
diff --git a/src/legacy/core_plugins/telemetry/server/telemetry_config/index.ts b/src/plugins/telemetry/common/telemetry_config/index.ts
similarity index 94%
rename from src/legacy/core_plugins/telemetry/server/telemetry_config/index.ts
rename to src/plugins/telemetry/common/telemetry_config/index.ts
index bf9855ce7538e..51eb4dd16105e 100644
--- a/src/legacy/core_plugins/telemetry/server/telemetry_config/index.ts
+++ b/src/plugins/telemetry/common/telemetry_config/index.ts
@@ -17,7 +17,6 @@
  * under the License.
  */
 
-export { replaceTelemetryInjectedVars } from './replace_injected_vars';
 export { getTelemetryOptIn } from './get_telemetry_opt_in';
 export { getTelemetrySendUsageFrom } from './get_telemetry_send_usage_from';
 export { getTelemetryAllowChangingOptInStatus } from './get_telemetry_allow_changing_opt_in_status';
diff --git a/src/legacy/core_plugins/telemetry/server/telemetry_repository/index.ts b/src/plugins/telemetry/common/telemetry_config/types.ts
similarity index 86%
rename from src/legacy/core_plugins/telemetry/server/telemetry_repository/index.ts
rename to src/plugins/telemetry/common/telemetry_config/types.ts
index f1735d1bb2866..7ab37e9544164 100644
--- a/src/legacy/core_plugins/telemetry/server/telemetry_repository/index.ts
+++ b/src/plugins/telemetry/common/telemetry_config/types.ts
@@ -17,9 +17,6 @@
  * under the License.
  */
 
-export { getTelemetrySavedObject, TelemetrySavedObject } from './get_telemetry_saved_object';
-export { updateTelemetrySavedObject } from './update_telemetry_saved_object';
-
 export interface TelemetrySavedObjectAttributes {
   enabled?: boolean | null;
   lastVersionChecked?: string;
@@ -30,3 +27,5 @@ export interface TelemetrySavedObjectAttributes {
   reportFailureCount?: number;
   reportFailureVersion?: string;
 }
+
+export type TelemetrySavedObject = TelemetrySavedObjectAttributes | null | false;
diff --git a/src/plugins/telemetry/kibana.json b/src/plugins/telemetry/kibana.json
index 3a28149276c3e..f623f4f2a565d 100644
--- a/src/plugins/telemetry/kibana.json
+++ b/src/plugins/telemetry/kibana.json
@@ -1,6 +1,10 @@
 {
   "id": "telemetry",
   "version": "kibana",
-  "server": false,
-  "ui": true
+  "server": true,
+  "ui": true,
+  "requiredPlugins": [
+    "telemetryCollectionManager",
+    "usageCollection"
+  ]
 }
diff --git a/src/plugins/telemetry/public/components/index.ts b/src/plugins/telemetry/public/components/index.ts
index f4341154f527a..8fda181b2ed93 100644
--- a/src/plugins/telemetry/public/components/index.ts
+++ b/src/plugins/telemetry/public/components/index.ts
@@ -17,6 +17,4 @@
  * under the License.
  */
 
-export { OptInExampleFlyout } from './opt_in_example_flyout';
-export { TelemetryManagementSection } from './telemetry_management_section';
 export { OptedInNoticeBanner } from './opted_in_notice_banner';
diff --git a/src/plugins/telemetry/public/index.ts b/src/plugins/telemetry/public/index.ts
index 2f86d7749bb9b..665c89ba2bffa 100644
--- a/src/plugins/telemetry/public/index.ts
+++ b/src/plugins/telemetry/public/index.ts
@@ -17,9 +17,10 @@
  * under the License.
  */
 
-import { TelemetryPlugin } from './plugin';
+import { PluginInitializerContext } from 'kibana/public';
+import { TelemetryPlugin, TelemetryPluginConfig } from './plugin';
 export { TelemetryPluginStart, TelemetryPluginSetup } from './plugin';
 
-export function plugin() {
-  return new TelemetryPlugin();
+export function plugin(initializerContext: PluginInitializerContext<TelemetryPluginConfig>) {
+  return new TelemetryPlugin(initializerContext);
 }
diff --git a/src/plugins/telemetry/public/mocks.ts b/src/plugins/telemetry/public/mocks.ts
index 93dc13c327509..4e0f02242961a 100644
--- a/src/plugins/telemetry/public/mocks.ts
+++ b/src/plugins/telemetry/public/mocks.ts
@@ -23,8 +23,6 @@ import { overlayServiceMock } from '../../../core/public/overlays/overlay_servic
 import { httpServiceMock } from '../../../core/public/http/http_service.mock';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
 import { notificationServiceMock } from '../../../core/public/notifications/notifications_service.mock';
-// eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { injectedMetadataServiceMock } from '../../../core/public/injected_metadata/injected_metadata_service.mock';
 import { TelemetryService } from './services/telemetry_service';
 import { TelemetryNotifications } from './services/telemetry_notifications/telemetry_notifications';
 import { TelemetryPluginStart } from './plugin';
@@ -32,23 +30,19 @@ import { TelemetryPluginStart } from './plugin';
 export function mockTelemetryService({
   reportOptInStatusChange,
 }: { reportOptInStatusChange?: boolean } = {}) {
-  const injectedMetadata = injectedMetadataServiceMock.createStartContract();
-  injectedMetadata.getInjectedVar.mockImplementation((key: string) => {
-    switch (key) {
-      case 'telemetryNotifyUserAboutOptInDefault':
-        return true;
-      case 'allowChangingOptInStatus':
-        return true;
-      case 'telemetryOptedIn':
-        return true;
-      default: {
-        throw Error(`Unhandled getInjectedVar key "${key}".`);
-      }
-    }
-  });
+  const config = {
+    enabled: true,
+    url: 'http://localhost',
+    optInStatusUrl: 'http://localhost',
+    sendUsageFrom: 'browser' as const,
+    optIn: true,
+    banner: true,
+    allowChangingOptInStatus: true,
+    telemetryNotifyUserAboutOptInDefault: true,
+  };
 
   return new TelemetryService({
-    injectedMetadata,
+    config,
     http: httpServiceMock.createStartContract(),
     notifications: notificationServiceMock.createStartContract(),
     reportOptInStatusChange,
diff --git a/src/plugins/telemetry/public/plugin.ts b/src/plugins/telemetry/public/plugin.ts
index 9cfb4ca1ec395..86679227059e6 100644
--- a/src/plugins/telemetry/public/plugin.ts
+++ b/src/plugins/telemetry/public/plugin.ts
@@ -16,9 +16,27 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { Plugin, CoreStart, CoreSetup, HttpStart } from '../../../core/public';
+
+import {
+  Plugin,
+  CoreStart,
+  CoreSetup,
+  HttpStart,
+  PluginInitializerContext,
+  SavedObjectsClientContract,
+} from '../../../core/public';
 
 import { TelemetrySender, TelemetryService, TelemetryNotifications } from './services';
+import {
+  TelemetrySavedObjectAttributes,
+  TelemetrySavedObject,
+} from '../common/telemetry_config/types';
+import {
+  getTelemetryAllowChangingOptInStatus,
+  getTelemetryOptIn,
+  getTelemetrySendUsageFrom,
+} from '../common/telemetry_config';
+import { getNotifyUserAboutOptInDefault } from '../common/telemetry_config/get_telemetry_notify_user_about_optin_default';
 
 export interface TelemetryPluginSetup {
   telemetryService: TelemetryService;
@@ -29,17 +47,32 @@ export interface TelemetryPluginStart {
   telemetryNotifications: TelemetryNotifications;
 }
 
+export interface TelemetryPluginConfig {
+  enabled: boolean;
+  url: string;
+  banner: boolean;
+  allowChangingOptInStatus: boolean;
+  optIn: boolean | null;
+  optInStatusUrl: string;
+  sendUsageFrom: 'browser' | 'server';
+  telemetryNotifyUserAboutOptInDefault?: boolean;
+}
+
 export class TelemetryPlugin implements Plugin<TelemetryPluginSetup, TelemetryPluginStart> {
+  private readonly currentKibanaVersion: string;
+  private readonly config: TelemetryPluginConfig;
   private telemetrySender?: TelemetrySender;
   private telemetryNotifications?: TelemetryNotifications;
   private telemetryService?: TelemetryService;
 
-  public setup({ http, injectedMetadata, notifications }: CoreSetup): TelemetryPluginSetup {
-    this.telemetryService = new TelemetryService({
-      http,
-      injectedMetadata,
-      notifications,
-    });
+  constructor(initializerContext: PluginInitializerContext<TelemetryPluginConfig>) {
+    this.currentKibanaVersion = initializerContext.env.packageInfo.version;
+    this.config = initializerContext.config.get();
+  }
+
+  public setup({ http, notifications }: CoreSetup): TelemetryPluginSetup {
+    const config = this.config;
+    this.telemetryService = new TelemetryService({ config, http, notifications });
 
     this.telemetrySender = new TelemetrySender(this.telemetryService);
 
@@ -48,24 +81,29 @@ export class TelemetryPlugin implements Plugin<TelemetryPluginSetup, TelemetryPl
     };
   }
 
-  public start({ injectedMetadata, http, overlays, application }: CoreStart): TelemetryPluginStart {
+  public start({ http, overlays, application, savedObjects }: CoreStart): TelemetryPluginStart {
     if (!this.telemetryService) {
       throw Error('Telemetry plugin failed to initialize properly.');
     }
 
-    const telemetryBanner = injectedMetadata.getInjectedVar('telemetryBanner') as boolean;
-
     this.telemetryNotifications = new TelemetryNotifications({
       overlays,
       telemetryService: this.telemetryService,
     });
 
-    application.currentAppId$.subscribe(appId => {
+    application.currentAppId$.subscribe(async () => {
       const isUnauthenticated = this.getIsUnauthenticated(http);
       if (isUnauthenticated) {
         return;
       }
 
+      // Update the telemetry config based as a mix of the config files and saved objects
+      const telemetrySavedObject = await this.getTelemetrySavedObject(savedObjects.client);
+      const updatedConfig = await this.updateConfigsBasedOnSavedObjects(telemetrySavedObject);
+      this.telemetryService!.config = updatedConfig;
+
+      const telemetryBanner = updatedConfig.banner;
+
       this.maybeStartTelemetryPoller();
       if (telemetryBanner) {
         this.maybeShowOptedInNotificationBanner();
@@ -111,4 +149,66 @@ export class TelemetryPlugin implements Plugin<TelemetryPluginSetup, TelemetryPl
       this.telemetryNotifications.renderOptInBanner();
     }
   }
+
+  private async updateConfigsBasedOnSavedObjects(
+    telemetrySavedObject: TelemetrySavedObject
+  ): Promise<TelemetryPluginConfig> {
+    const configTelemetrySendUsageFrom = this.config.sendUsageFrom;
+    const configTelemetryOptIn = this.config.optIn as boolean;
+    const configTelemetryAllowChangingOptInStatus = this.config.allowChangingOptInStatus;
+
+    const currentKibanaVersion = this.currentKibanaVersion;
+
+    const allowChangingOptInStatus = getTelemetryAllowChangingOptInStatus({
+      configTelemetryAllowChangingOptInStatus,
+      telemetrySavedObject,
+    });
+
+    const optIn = getTelemetryOptIn({
+      configTelemetryOptIn,
+      allowChangingOptInStatus,
+      telemetrySavedObject,
+      currentKibanaVersion,
+    });
+
+    const sendUsageFrom = getTelemetrySendUsageFrom({
+      configTelemetrySendUsageFrom,
+      telemetrySavedObject,
+    });
+
+    const telemetryNotifyUserAboutOptInDefault = getNotifyUserAboutOptInDefault({
+      telemetrySavedObject,
+      allowChangingOptInStatus,
+      configTelemetryOptIn,
+      telemetryOptedIn: optIn,
+    });
+
+    return {
+      ...this.config,
+      optIn,
+      sendUsageFrom,
+      telemetryNotifyUserAboutOptInDefault,
+    };
+  }
+
+  private async getTelemetrySavedObject(savedObjectsClient: SavedObjectsClientContract) {
+    try {
+      const { attributes } = await savedObjectsClient.get<TelemetrySavedObjectAttributes>(
+        'telemetry',
+        'telemetry'
+      );
+      return attributes;
+    } catch (error) {
+      const errorCode = error[Symbol('SavedObjectsClientErrorCode')];
+      if (errorCode === 'SavedObjectsClient/notFound') {
+        return null;
+      }
+
+      if (errorCode === 'SavedObjectsClient/forbidden') {
+        return false;
+      }
+
+      throw error;
+    }
+  }
 }
diff --git a/src/plugins/telemetry/public/services/telemetry_service.ts b/src/plugins/telemetry/public/services/telemetry_service.ts
index cb91451bd8ef4..cac4e3fdf5f50 100644
--- a/src/plugins/telemetry/public/services/telemetry_service.ts
+++ b/src/plugins/telemetry/public/services/telemetry_service.ts
@@ -20,62 +20,75 @@
 import moment from 'moment';
 import { i18n } from '@kbn/i18n';
 import { CoreStart } from 'kibana/public';
+import { TelemetryPluginConfig } from '../plugin';
 
 interface TelemetryServiceConstructor {
+  config: TelemetryPluginConfig;
   http: CoreStart['http'];
-  injectedMetadata: CoreStart['injectedMetadata'];
   notifications: CoreStart['notifications'];
   reportOptInStatusChange?: boolean;
 }
 
 export class TelemetryService {
   private readonly http: CoreStart['http'];
-  private readonly injectedMetadata: CoreStart['injectedMetadata'];
   private readonly reportOptInStatusChange: boolean;
   private readonly notifications: CoreStart['notifications'];
-  private isOptedIn: boolean | null;
-  private userHasSeenOptedInNotice: boolean;
+  private readonly defaultConfig: TelemetryPluginConfig;
+  private updatedConfig?: TelemetryPluginConfig;
 
   constructor({
+    config,
     http,
-    injectedMetadata,
     notifications,
     reportOptInStatusChange = true,
   }: TelemetryServiceConstructor) {
-    const isOptedIn = injectedMetadata.getInjectedVar('telemetryOptedIn') as boolean | null;
-    const userHasSeenOptedInNotice = injectedMetadata.getInjectedVar(
-      'telemetryNotifyUserAboutOptInDefault'
-    ) as boolean;
+    this.defaultConfig = config;
     this.reportOptInStatusChange = reportOptInStatusChange;
-    this.injectedMetadata = injectedMetadata;
     this.notifications = notifications;
     this.http = http;
+  }
+
+  public set config(updatedConfig: TelemetryPluginConfig) {
+    this.updatedConfig = updatedConfig;
+  }
+
+  public get config() {
+    return { ...this.defaultConfig, ...this.updatedConfig };
+  }
+
+  public get isOptedIn() {
+    return this.config.optIn;
+  }
+
+  public set isOptedIn(optIn) {
+    this.config = { ...this.config, optIn };
+  }
+
+  public get userHasSeenOptedInNotice() {
+    return this.config.telemetryNotifyUserAboutOptInDefault;
+  }
 
-    this.isOptedIn = isOptedIn;
-    this.userHasSeenOptedInNotice = userHasSeenOptedInNotice;
+  public set userHasSeenOptedInNotice(telemetryNotifyUserAboutOptInDefault) {
+    this.config = { ...this.config, telemetryNotifyUserAboutOptInDefault };
   }
 
   public getCanChangeOptInStatus = () => {
-    const allowChangingOptInStatus = this.injectedMetadata.getInjectedVar(
-      'allowChangingOptInStatus'
-    ) as boolean;
+    const allowChangingOptInStatus = this.config.allowChangingOptInStatus;
     return allowChangingOptInStatus;
   };
 
   public getOptInStatusUrl = () => {
-    const telemetryOptInStatusUrl = this.injectedMetadata.getInjectedVar(
-      'telemetryOptInStatusUrl'
-    ) as string;
+    const telemetryOptInStatusUrl = this.config.optInStatusUrl;
     return telemetryOptInStatusUrl;
   };
 
   public getTelemetryUrl = () => {
-    const telemetryUrl = this.injectedMetadata.getInjectedVar('telemetryUrl') as string;
+    const telemetryUrl = this.config.url;
     return telemetryUrl;
   };
 
   public getUserHasSeenOptedInNotice = () => {
-    return this.userHasSeenOptedInNotice;
+    return this.config.telemetryNotifyUserAboutOptInDefault || false;
   };
 
   public getIsOptedIn = () => {
diff --git a/src/legacy/core_plugins/telemetry/server/collectors/application_usage/index.test.ts b/src/plugins/telemetry/server/collectors/application_usage/index.test.ts
similarity index 91%
rename from src/legacy/core_plugins/telemetry/server/collectors/application_usage/index.test.ts
rename to src/plugins/telemetry/server/collectors/application_usage/index.test.ts
index 1a64100bda692..5a8fa71363ba7 100644
--- a/src/legacy/core_plugins/telemetry/server/collectors/application_usage/index.test.ts
+++ b/src/plugins/telemetry/server/collectors/application_usage/index.test.ts
@@ -17,10 +17,10 @@
  * under the License.
  */
 
-import { UsageCollectionSetup } from '../../../../../../plugins/usage_collection/server';
-import { savedObjectsRepositoryMock } from '../../../../../../core/server/mocks';
+import { UsageCollectionSetup } from '../../../../../plugins/usage_collection/server';
+import { savedObjectsRepositoryMock } from '../../../../../core/server/mocks';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { CollectorOptions } from '../../../../../../plugins/usage_collection/server/collector/collector';
+import { CollectorOptions } from '../../../../../plugins/usage_collection/server/collector/collector';
 
 import { registerApplicationUsageCollector } from './';
 import {
@@ -40,9 +40,12 @@ describe('telemetry_application_usage', () => {
   } as any;
 
   const getUsageCollector = jest.fn();
+  const registerType = jest.fn();
   const callCluster = jest.fn();
 
-  beforeAll(() => registerApplicationUsageCollector(usageCollectionMock, getUsageCollector));
+  beforeAll(() =>
+    registerApplicationUsageCollector(usageCollectionMock, registerType, getUsageCollector)
+  );
   afterAll(() => jest.clearAllTimers());
 
   test('registered collector is set', () => {
diff --git a/src/legacy/core_plugins/telemetry/server/collectors/application_usage/index.ts b/src/plugins/telemetry/server/collectors/application_usage/index.ts
similarity index 100%
rename from src/legacy/core_plugins/telemetry/server/collectors/application_usage/index.ts
rename to src/plugins/telemetry/server/collectors/application_usage/index.ts
diff --git a/src/plugins/telemetry/server/collectors/application_usage/saved_objects_types.ts b/src/plugins/telemetry/server/collectors/application_usage/saved_objects_types.ts
new file mode 100644
index 0000000000000..9f997ab7b5df3
--- /dev/null
+++ b/src/plugins/telemetry/server/collectors/application_usage/saved_objects_types.ts
@@ -0,0 +1,59 @@
+/*
+ * 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 { SavedObjectAttributes, SavedObjectsServiceSetup } from 'kibana/server';
+
+export interface ApplicationUsageTotal extends SavedObjectAttributes {
+  appId: string;
+  minutesOnScreen: number;
+  numberOfClicks: number;
+}
+
+export interface ApplicationUsageTransactional extends ApplicationUsageTotal {
+  timestamp: string;
+}
+
+export function registerMappings(registerType: SavedObjectsServiceSetup['registerType']) {
+  registerType({
+    name: 'application_usage_totals',
+    hidden: false,
+    namespaceAgnostic: true,
+    mappings: {
+      properties: {
+        appId: { type: 'keyword' },
+        numberOfClicks: { type: 'long' },
+        minutesOnScreen: { type: 'float' },
+      },
+    },
+  });
+
+  registerType({
+    name: 'application_usage_transactional',
+    hidden: false,
+    namespaceAgnostic: true,
+    mappings: {
+      properties: {
+        timestamp: { type: 'date' },
+        appId: { type: 'keyword' },
+        numberOfClicks: { type: 'long' },
+        minutesOnScreen: { type: 'float' },
+      },
+    },
+  });
+}
diff --git a/src/legacy/core_plugins/telemetry/server/collectors/application_usage/telemetry_application_usage_collector.ts b/src/plugins/telemetry/server/collectors/application_usage/telemetry_application_usage_collector.ts
similarity index 94%
rename from src/legacy/core_plugins/telemetry/server/collectors/application_usage/telemetry_application_usage_collector.ts
rename to src/plugins/telemetry/server/collectors/application_usage/telemetry_application_usage_collector.ts
index 5c862686a37d9..f52687038bbbc 100644
--- a/src/legacy/core_plugins/telemetry/server/collectors/application_usage/telemetry_application_usage_collector.ts
+++ b/src/plugins/telemetry/server/collectors/application_usage/telemetry_application_usage_collector.ts
@@ -18,10 +18,15 @@
  */
 
 import moment from 'moment';
+import { ISavedObjectsRepository, SavedObjectsServiceSetup } from 'kibana/server';
+import { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
 import { APPLICATION_USAGE_TYPE } from '../../../common/constants';
-import { UsageCollectionSetup } from '../../../../../../plugins/usage_collection/server';
-import { ISavedObjectsRepository, SavedObjectAttributes } from '../../../../../../core/server';
 import { findAll } from '../find_all';
+import {
+  ApplicationUsageTotal,
+  ApplicationUsageTransactional,
+  registerMappings,
+} from './saved_objects_types';
 
 /**
  * Roll indices every 24h
@@ -36,16 +41,6 @@ export const ROLL_INDICES_START = 5 * 60 * 1000;
 export const SAVED_OBJECTS_TOTAL_TYPE = 'application_usage_totals';
 export const SAVED_OBJECTS_TRANSACTIONAL_TYPE = 'application_usage_transactional';
 
-interface ApplicationUsageTotal extends SavedObjectAttributes {
-  appId: string;
-  minutesOnScreen: number;
-  numberOfClicks: number;
-}
-
-interface ApplicationUsageTransactional extends ApplicationUsageTotal {
-  timestamp: string;
-}
-
 interface ApplicationUsageTelemetryReport {
   [appId: string]: {
     clicks_total: number;
@@ -61,8 +56,11 @@ interface ApplicationUsageTelemetryReport {
 
 export function registerApplicationUsageCollector(
   usageCollection: UsageCollectionSetup,
+  registerType: SavedObjectsServiceSetup['registerType'],
   getSavedObjectsClient: () => ISavedObjectsRepository | undefined
 ) {
+  registerMappings(registerType);
+
   const collector = usageCollection.makeUsageCollector({
     type: APPLICATION_USAGE_TYPE,
     isReady: () => typeof getSavedObjectsClient() !== 'undefined',
diff --git a/src/legacy/core_plugins/telemetry/server/collectors/find_all.test.ts b/src/plugins/telemetry/server/collectors/find_all.test.ts
similarity index 96%
rename from src/legacy/core_plugins/telemetry/server/collectors/find_all.test.ts
rename to src/plugins/telemetry/server/collectors/find_all.test.ts
index 012cda395bc6c..a62c74c0c0838 100644
--- a/src/legacy/core_plugins/telemetry/server/collectors/find_all.test.ts
+++ b/src/plugins/telemetry/server/collectors/find_all.test.ts
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { savedObjectsRepositoryMock } from '../../../../../core/server/mocks';
+import { savedObjectsRepositoryMock } from '../../../../core/server/mocks';
 
 import { findAll } from './find_all';
 
diff --git a/src/legacy/core_plugins/telemetry/server/collectors/find_all.ts b/src/plugins/telemetry/server/collectors/find_all.ts
similarity index 100%
rename from src/legacy/core_plugins/telemetry/server/collectors/find_all.ts
rename to src/plugins/telemetry/server/collectors/find_all.ts
diff --git a/src/legacy/core_plugins/telemetry/server/collectors/index.ts b/src/plugins/telemetry/server/collectors/index.ts
similarity index 90%
rename from src/legacy/core_plugins/telemetry/server/collectors/index.ts
rename to src/plugins/telemetry/server/collectors/index.ts
index 6cb7a38b6414f..6eeda080bb3ab 100644
--- a/src/legacy/core_plugins/telemetry/server/collectors/index.ts
+++ b/src/plugins/telemetry/server/collectors/index.ts
@@ -17,10 +17,8 @@
  * under the License.
  */
 
-export { encryptTelemetry } from './encryption';
 export { registerTelemetryUsageCollector } from './usage';
 export { registerUiMetricUsageCollector } from './ui_metric';
-export { registerLocalizationUsageCollector } from './localization';
 export { registerTelemetryPluginUsageCollector } from './telemetry_plugin';
 export { registerManagementUsageCollector } from './management';
 export { registerApplicationUsageCollector } from './application_usage';
diff --git a/src/legacy/core_plugins/telemetry/server/collectors/management/index.ts b/src/plugins/telemetry/server/collectors/management/index.ts
similarity index 100%
rename from src/legacy/core_plugins/telemetry/server/collectors/management/index.ts
rename to src/plugins/telemetry/server/collectors/management/index.ts
diff --git a/src/legacy/core_plugins/telemetry/server/collectors/management/telemetry_management_collector.ts b/src/plugins/telemetry/server/collectors/management/telemetry_management_collector.ts
similarity index 73%
rename from src/legacy/core_plugins/telemetry/server/collectors/management/telemetry_management_collector.ts
rename to src/plugins/telemetry/server/collectors/management/telemetry_management_collector.ts
index 481b1e9af2a79..7dc4ca64e6bc3 100644
--- a/src/legacy/core_plugins/telemetry/server/collectors/management/telemetry_management_collector.ts
+++ b/src/plugins/telemetry/server/collectors/management/telemetry_management_collector.ts
@@ -17,11 +17,10 @@
  * under the License.
  */
 
-import { Server } from 'hapi';
 import { size } from 'lodash';
+import { IUiSettingsClient } from 'kibana/server';
+import { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
 import { KIBANA_STACK_MANAGEMENT_STATS_TYPE } from '../../../common/constants';
-import { UsageCollectionSetup } from '../../../../../../plugins/usage_collection/server';
-import { SavedObjectsClient } from '../../../../../../core/server';
 
 export type UsageStats = Record<string, any>;
 
@@ -30,12 +29,12 @@ export async function getTranslationCount(loader: any, locale: string): Promise<
   return size(translations.messages);
 }
 
-export function createCollectorFetch(server: Server) {
-  return async function fetchUsageStats(): Promise<UsageStats> {
-    const internalRepo = server.newPlatform.start.core.savedObjects.createInternalRepository();
-    const uiSettingsClient = server.newPlatform.start.core.uiSettings.asScopedToClient(
-      new SavedObjectsClient(internalRepo)
-    );
+export function createCollectorFetch(getUiSettingsClient: () => IUiSettingsClient | undefined) {
+  return async function fetchUsageStats(): Promise<UsageStats | undefined> {
+    const uiSettingsClient = getUiSettingsClient();
+    if (!uiSettingsClient) {
+      return;
+    }
 
     const user = await uiSettingsClient.getUserProvided();
     const modifiedEntries = Object.keys(user)
@@ -51,12 +50,12 @@ export function createCollectorFetch(server: Server) {
 
 export function registerManagementUsageCollector(
   usageCollection: UsageCollectionSetup,
-  server: any
+  getUiSettingsClient: () => IUiSettingsClient | undefined
 ) {
   const collector = usageCollection.makeUsageCollector({
     type: KIBANA_STACK_MANAGEMENT_STATS_TYPE,
-    isReady: () => true,
-    fetch: createCollectorFetch(server),
+    isReady: () => typeof getUiSettingsClient() !== 'undefined',
+    fetch: createCollectorFetch(getUiSettingsClient),
   });
 
   usageCollection.registerCollector(collector);
diff --git a/src/legacy/core_plugins/telemetry/server/collectors/telemetry_plugin/index.ts b/src/plugins/telemetry/server/collectors/telemetry_plugin/index.ts
similarity index 100%
rename from src/legacy/core_plugins/telemetry/server/collectors/telemetry_plugin/index.ts
rename to src/plugins/telemetry/server/collectors/telemetry_plugin/index.ts
diff --git a/src/legacy/core_plugins/telemetry/server/collectors/telemetry_plugin/telemetry_plugin_collector.ts b/src/plugins/telemetry/server/collectors/telemetry_plugin/telemetry_plugin_collector.ts
similarity index 62%
rename from src/legacy/core_plugins/telemetry/server/collectors/telemetry_plugin/telemetry_plugin_collector.ts
rename to src/plugins/telemetry/server/collectors/telemetry_plugin/telemetry_plugin_collector.ts
index 5e25538cbad80..ab90935266d69 100644
--- a/src/legacy/core_plugins/telemetry/server/collectors/telemetry_plugin/telemetry_plugin_collector.ts
+++ b/src/plugins/telemetry/server/collectors/telemetry_plugin/telemetry_plugin_collector.ts
@@ -17,10 +17,14 @@
  * under the License.
  */
 
+import { Observable } from 'rxjs';
+import { take } from 'rxjs/operators';
+import { ISavedObjectsRepository, SavedObjectsClient } from '../../../../../core/server';
 import { TELEMETRY_STATS_TYPE } from '../../../common/constants';
 import { getTelemetrySavedObject, TelemetrySavedObject } from '../../telemetry_repository';
-import { getTelemetryOptIn, getTelemetrySendUsageFrom } from '../../telemetry_config';
-import { UsageCollectionSetup } from '../../../../../../plugins/usage_collection/server';
+import { getTelemetryOptIn, getTelemetrySendUsageFrom } from '../../../common/telemetry_config';
+import { UsageCollectionSetup } from '../../../../usage_collection/server';
+import { TelemetryConfigType } from '../../config';
 
 export interface TelemetryUsageStats {
   opt_in_status?: boolean | null;
@@ -28,21 +32,31 @@ export interface TelemetryUsageStats {
   last_reported?: number;
 }
 
-export function createCollectorFetch(server: any) {
+export interface TelemetryPluginUsageCollectorOptions {
+  currentKibanaVersion: string;
+  config$: Observable<TelemetryConfigType>;
+  getSavedObjectsClient: () => ISavedObjectsRepository | undefined;
+}
+
+export function createCollectorFetch({
+  currentKibanaVersion,
+  config$,
+  getSavedObjectsClient,
+}: TelemetryPluginUsageCollectorOptions) {
   return async function fetchUsageStats(): Promise<TelemetryUsageStats> {
-    const config = server.config();
-    const configTelemetrySendUsageFrom = config.get('telemetry.sendUsageFrom');
-    const allowChangingOptInStatus = config.get('telemetry.allowChangingOptInStatus');
-    const configTelemetryOptIn = config.get('telemetry.optIn');
-    const currentKibanaVersion = config.get('pkg.version');
+    const { sendUsageFrom, allowChangingOptInStatus, optIn = null } = await config$
+      .pipe(take(1))
+      .toPromise();
+    const configTelemetrySendUsageFrom = sendUsageFrom;
+    const configTelemetryOptIn = optIn;
 
     let telemetrySavedObject: TelemetrySavedObject = {};
 
     try {
-      const { getSavedObjectsRepository } = server.savedObjects;
-      const { callWithInternalUser } = server.plugins.elasticsearch.getCluster('admin');
-      const internalRepository = getSavedObjectsRepository(callWithInternalUser);
-      telemetrySavedObject = await getTelemetrySavedObject(internalRepository);
+      const internalRepository = getSavedObjectsClient()!;
+      telemetrySavedObject = await getTelemetrySavedObject(
+        new SavedObjectsClient(internalRepository)
+      );
     } catch (err) {
       // no-op
     }
@@ -65,12 +79,12 @@ export function createCollectorFetch(server: any) {
 
 export function registerTelemetryPluginUsageCollector(
   usageCollection: UsageCollectionSetup,
-  server: any
+  options: TelemetryPluginUsageCollectorOptions
 ) {
   const collector = usageCollection.makeUsageCollector({
     type: TELEMETRY_STATS_TYPE,
-    isReady: () => true,
-    fetch: createCollectorFetch(server),
+    isReady: () => typeof options.getSavedObjectsClient() !== 'undefined',
+    fetch: createCollectorFetch(options),
   });
 
   usageCollection.registerCollector(collector);
diff --git a/src/legacy/core_plugins/telemetry/server/collectors/ui_metric/index.test.ts b/src/plugins/telemetry/server/collectors/ui_metric/index.test.ts
similarity index 87%
rename from src/legacy/core_plugins/telemetry/server/collectors/ui_metric/index.test.ts
rename to src/plugins/telemetry/server/collectors/ui_metric/index.test.ts
index ddb58a7d09bbd..d6667a6384a1f 100644
--- a/src/legacy/core_plugins/telemetry/server/collectors/ui_metric/index.test.ts
+++ b/src/plugins/telemetry/server/collectors/ui_metric/index.test.ts
@@ -17,10 +17,10 @@
  * under the License.
  */
 
-import { UsageCollectionSetup } from '../../../../../../plugins/usage_collection/server';
-import { savedObjectsRepositoryMock } from '../../../../../../core/server/mocks';
+import { UsageCollectionSetup } from '../../../../../plugins/usage_collection/server';
+import { savedObjectsRepositoryMock } from '../../../../../core/server/mocks';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { CollectorOptions } from '../../../../../../plugins/usage_collection/server/collector/collector';
+import { CollectorOptions } from '../../../../../plugins/usage_collection/server/collector/collector';
 
 import { registerUiMetricUsageCollector } from './';
 
@@ -33,9 +33,12 @@ describe('telemetry_ui_metric', () => {
   } as any;
 
   const getUsageCollector = jest.fn();
+  const registerType = jest.fn();
   const callCluster = jest.fn();
 
-  beforeAll(() => registerUiMetricUsageCollector(usageCollectionMock, getUsageCollector));
+  beforeAll(() =>
+    registerUiMetricUsageCollector(usageCollectionMock, registerType, getUsageCollector)
+  );
 
   test('registered collector is set', () => {
     expect(collector).not.toBeUndefined();
diff --git a/src/legacy/core_plugins/telemetry/server/collectors/ui_metric/index.ts b/src/plugins/telemetry/server/collectors/ui_metric/index.ts
similarity index 100%
rename from src/legacy/core_plugins/telemetry/server/collectors/ui_metric/index.ts
rename to src/plugins/telemetry/server/collectors/ui_metric/index.ts
diff --git a/src/legacy/core_plugins/telemetry/server/collectors/ui_metric/telemetry_ui_metric_collector.ts b/src/plugins/telemetry/server/collectors/ui_metric/telemetry_ui_metric_collector.ts
similarity index 82%
rename from src/legacy/core_plugins/telemetry/server/collectors/ui_metric/telemetry_ui_metric_collector.ts
rename to src/plugins/telemetry/server/collectors/ui_metric/telemetry_ui_metric_collector.ts
index a7b6850b0b20a..3f6e1836cac7d 100644
--- a/src/legacy/core_plugins/telemetry/server/collectors/ui_metric/telemetry_ui_metric_collector.ts
+++ b/src/plugins/telemetry/server/collectors/ui_metric/telemetry_ui_metric_collector.ts
@@ -17,9 +17,13 @@
  * under the License.
  */
 
-import { ISavedObjectsRepository, SavedObjectAttributes } from 'kibana/server';
+import {
+  ISavedObjectsRepository,
+  SavedObjectAttributes,
+  SavedObjectsServiceSetup,
+} from 'kibana/server';
+import { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
 import { UI_METRIC_USAGE_TYPE } from '../../../common/constants';
-import { UsageCollectionSetup } from '../../../../../../plugins/usage_collection/server';
 import { findAll } from '../find_all';
 
 interface UIMetricsSavedObjects extends SavedObjectAttributes {
@@ -28,8 +32,22 @@ interface UIMetricsSavedObjects extends SavedObjectAttributes {
 
 export function registerUiMetricUsageCollector(
   usageCollection: UsageCollectionSetup,
+  registerType: SavedObjectsServiceSetup['registerType'],
   getSavedObjectsClient: () => ISavedObjectsRepository | undefined
 ) {
+  registerType({
+    name: 'ui-metric',
+    hidden: false,
+    namespaceAgnostic: true,
+    mappings: {
+      properties: {
+        count: {
+          type: 'integer',
+        },
+      },
+    },
+  });
+
   const collector = usageCollection.makeUsageCollector({
     type: UI_METRIC_USAGE_TYPE,
     fetch: async () => {
diff --git a/src/legacy/core_plugins/telemetry/server/collectors/usage/ensure_deep_object.test.ts b/src/plugins/telemetry/server/collectors/usage/ensure_deep_object.test.ts
similarity index 100%
rename from src/legacy/core_plugins/telemetry/server/collectors/usage/ensure_deep_object.test.ts
rename to src/plugins/telemetry/server/collectors/usage/ensure_deep_object.test.ts
diff --git a/src/legacy/core_plugins/telemetry/server/collectors/usage/ensure_deep_object.ts b/src/plugins/telemetry/server/collectors/usage/ensure_deep_object.ts
similarity index 100%
rename from src/legacy/core_plugins/telemetry/server/collectors/usage/ensure_deep_object.ts
rename to src/plugins/telemetry/server/collectors/usage/ensure_deep_object.ts
diff --git a/src/legacy/core_plugins/telemetry/server/collectors/usage/index.ts b/src/plugins/telemetry/server/collectors/usage/index.ts
similarity index 100%
rename from src/legacy/core_plugins/telemetry/server/collectors/usage/index.ts
rename to src/plugins/telemetry/server/collectors/usage/index.ts
diff --git a/src/legacy/core_plugins/telemetry/server/collectors/usage/telemetry_usage_collector.test.ts b/src/plugins/telemetry/server/collectors/usage/telemetry_usage_collector.test.ts
similarity index 89%
rename from src/legacy/core_plugins/telemetry/server/collectors/usage/telemetry_usage_collector.test.ts
rename to src/plugins/telemetry/server/collectors/usage/telemetry_usage_collector.test.ts
index 78685cd6becc8..f44603f4f19f4 100644
--- a/src/legacy/core_plugins/telemetry/server/collectors/usage/telemetry_usage_collector.test.ts
+++ b/src/plugins/telemetry/server/collectors/usage/telemetry_usage_collector.test.ts
@@ -18,7 +18,6 @@
  */
 
 import { writeFileSync, unlinkSync } from 'fs';
-import { Server } from 'hapi';
 import { resolve } from 'path';
 import { tmpdir } from 'os';
 import {
@@ -32,20 +31,6 @@ const mockUsageCollector = () => ({
   makeUsageCollector: jest.fn().mockImplementationOnce((arg: object) => arg),
 });
 
-const serverWithConfig = (configPath: string): Server => {
-  return {
-    config: () => ({
-      get: (key: string) => {
-        if (key !== 'telemetry.config' && key !== 'xpack.xpack_main.telemetry.config') {
-          throw new Error('Expected `telemetry.config`');
-        }
-
-        return configPath;
-      },
-    }),
-  } as Server;
-};
-
 describe('telemetry_usage_collector', () => {
   const tempDir = tmpdir();
   const tempFiles = {
@@ -129,11 +114,13 @@ describe('telemetry_usage_collector', () => {
       // note: it uses the file's path to get the directory, then looks for 'telemetry.yml'
       // exclusively, which is indirectly tested by passing it the wrong "file" in the same
       // dir
-      const server: Server = serverWithConfig(tempFiles.unreadable);
 
       // the `makeUsageCollector` is mocked above to return the argument passed to it
       const usageCollector = mockUsageCollector() as any;
-      const collectorOptions = createTelemetryUsageCollector(usageCollector, server);
+      const collectorOptions = createTelemetryUsageCollector(
+        usageCollector,
+        () => tempFiles.unreadable
+      );
 
       expect(collectorOptions.type).toBe('static_telemetry');
       expect(await collectorOptions.fetch({} as any)).toEqual(expectedObject); // Sending any as the callCluster client because it's not needed in this collector but TS requires it when calling it.
diff --git a/src/legacy/core_plugins/telemetry/server/collectors/usage/telemetry_usage_collector.ts b/src/plugins/telemetry/server/collectors/usage/telemetry_usage_collector.ts
similarity index 87%
rename from src/legacy/core_plugins/telemetry/server/collectors/usage/telemetry_usage_collector.ts
rename to src/plugins/telemetry/server/collectors/usage/telemetry_usage_collector.ts
index 6919b6959aa8c..3daae90106e9e 100644
--- a/src/legacy/core_plugins/telemetry/server/collectors/usage/telemetry_usage_collector.ts
+++ b/src/plugins/telemetry/server/collectors/usage/telemetry_usage_collector.ts
@@ -18,13 +18,16 @@
  */
 
 import { accessSync, constants, readFileSync, statSync } from 'fs';
-import { Server } from 'hapi';
 import { safeLoad } from 'js-yaml';
 import { dirname, join } from 'path';
 
+import { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
+
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import { getConfigPath } from '../../../../../core/server/path';
+
 // look for telemetry.yml in the same places we expect kibana.yml
 import { ensureDeepObject } from './ensure_deep_object';
-import { UsageCollectionSetup } from '../../../../../../plugins/usage_collection/server';
 
 /**
  * The maximum file size before we ignore it (note: this limit is arbitrary).
@@ -77,24 +80,20 @@ export async function readTelemetryFile(path: string): Promise<object | undefine
 
 export function createTelemetryUsageCollector(
   usageCollection: UsageCollectionSetup,
-  server: Server
+  getConfigPathFn = getConfigPath // exposed for testing
 ) {
   return usageCollection.makeUsageCollector({
     type: 'static_telemetry',
     isReady: () => true,
     fetch: async () => {
-      const config = server.config();
-      const configPath = config.get('telemetry.config') as string;
+      const configPath = getConfigPathFn();
       const telemetryPath = join(dirname(configPath), 'telemetry.yml');
       return await readTelemetryFile(telemetryPath);
     },
   });
 }
 
-export function registerTelemetryUsageCollector(
-  usageCollection: UsageCollectionSetup,
-  server: Server
-) {
-  const collector = createTelemetryUsageCollector(usageCollection, server);
+export function registerTelemetryUsageCollector(usageCollection: UsageCollectionSetup) {
+  const collector = createTelemetryUsageCollector(usageCollection);
   usageCollection.registerCollector(collector);
 }
diff --git a/src/plugins/telemetry/server/config.ts b/src/plugins/telemetry/server/config.ts
new file mode 100644
index 0000000000000..7c62a37df7170
--- /dev/null
+++ b/src/plugins/telemetry/server/config.ts
@@ -0,0 +1,61 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { schema, TypeOf } from '@kbn/config-schema';
+import { ENDPOINT_VERSION } from '../common/constants';
+
+export const configSchema = schema.object({
+  enabled: schema.boolean({ defaultValue: true }),
+  allowChangingOptInStatus: schema.boolean({ defaultValue: true }),
+  optIn: schema.conditional(
+    schema.siblingRef('allowChangingOptInStatus'),
+    schema.literal(false),
+    schema.maybe(schema.literal(true)),
+    schema.boolean({ defaultValue: true }),
+    { defaultValue: true }
+  ),
+  // `config` is used internally and not intended to be set
+  // config: Joi.string().default(getConfigPath()), TODO: Get it in some other way
+  banner: schema.boolean({ defaultValue: true }),
+  url: schema.conditional(
+    schema.contextRef('dev'),
+    schema.literal(true),
+    schema.string({
+      defaultValue: `https://telemetry-staging.elastic.co/xpack/${ENDPOINT_VERSION}/send`,
+    }),
+    schema.string({
+      defaultValue: `https://telemetry.elastic.co/xpack/${ENDPOINT_VERSION}/send`,
+    })
+  ),
+  optInStatusUrl: schema.conditional(
+    schema.contextRef('dev'),
+    schema.literal(true),
+    schema.string({
+      defaultValue: `https://telemetry-staging.elastic.co/opt_in_status/${ENDPOINT_VERSION}/send`,
+    }),
+    schema.string({
+      defaultValue: `https://telemetry.elastic.co/opt_in_status/${ENDPOINT_VERSION}/send`,
+    })
+  ),
+  sendUsageFrom: schema.oneOf([schema.literal('server'), schema.literal('browser')], {
+    defaultValue: 'browser',
+  }),
+});
+
+export type TelemetryConfigType = TypeOf<typeof configSchema>;
diff --git a/src/legacy/core_plugins/telemetry/server/fetcher.ts b/src/plugins/telemetry/server/fetcher.ts
similarity index 55%
rename from src/legacy/core_plugins/telemetry/server/fetcher.ts
rename to src/plugins/telemetry/server/fetcher.ts
index d30ee10066813..be85824855ff3 100644
--- a/src/legacy/core_plugins/telemetry/server/fetcher.ts
+++ b/src/plugins/telemetry/server/fetcher.ts
@@ -18,48 +18,109 @@
  */
 
 import moment from 'moment';
+import { Observable } from 'rxjs';
+import { take } from 'rxjs/operators';
 // @ts-ignore
 import fetch from 'node-fetch';
-import { telemetryCollectionManager } from './collection_manager';
+import { TelemetryCollectionManagerPluginStart } from 'src/plugins/telemetry_collection_manager/server';
+import {
+  PluginInitializerContext,
+  Logger,
+  SavedObjectsClientContract,
+  SavedObjectsClient,
+  CoreStart,
+  ICustomClusterClient,
+} from '../../../core/server';
 import {
   getTelemetryOptIn,
   getTelemetrySendUsageFrom,
   getTelemetryFailureDetails,
-} from './telemetry_config';
+} from '../common/telemetry_config';
 import { getTelemetrySavedObject, updateTelemetrySavedObject } from './telemetry_repository';
 import { REPORT_INTERVAL_MS } from '../common/constants';
+import { TelemetryConfigType } from './config';
+
+export interface FetcherTaskDepsStart {
+  telemetryCollectionManager: TelemetryCollectionManagerPluginStart;
+}
 
 export class FetcherTask {
   private readonly initialCheckDelayMs = 60 * 1000 * 5;
   private readonly checkIntervalMs = 60 * 1000 * 60 * 12;
+  private readonly config$: Observable<TelemetryConfigType>;
+  private readonly currentKibanaVersion: string;
+  private readonly logger: Logger;
   private intervalId?: NodeJS.Timeout;
   private lastReported?: number;
-  private currentVersion: string;
   private isSending = false;
-  private server: any;
+  private internalRepository?: SavedObjectsClientContract;
+  private telemetryCollectionManager?: TelemetryCollectionManagerPluginStart;
+  private elasticsearchClient?: ICustomClusterClient;
+
+  constructor(initializerContext: PluginInitializerContext<TelemetryConfigType>) {
+    this.config$ = initializerContext.config.create();
+    this.currentKibanaVersion = initializerContext.env.packageInfo.version;
+    this.logger = initializerContext.logger.get('fetcher');
+  }
+
+  public start(
+    { savedObjects, elasticsearch }: CoreStart,
+    { telemetryCollectionManager }: FetcherTaskDepsStart
+  ) {
+    this.internalRepository = new SavedObjectsClient(savedObjects.createInternalRepository());
+    this.telemetryCollectionManager = telemetryCollectionManager;
+    this.elasticsearchClient = elasticsearch.legacy.createClient('telemetry-fetcher');
+
+    setTimeout(() => {
+      this.sendIfDue();
+      this.intervalId = setInterval(() => this.sendIfDue(), this.checkIntervalMs);
+    }, this.initialCheckDelayMs);
+  }
+
+  public stop() {
+    if (this.intervalId) {
+      clearInterval(this.intervalId);
+    }
+    if (this.elasticsearchClient) {
+      this.elasticsearchClient.close();
+    }
+  }
 
-  constructor(server: any) {
-    this.server = server;
-    this.currentVersion = this.server.config().get('pkg.version');
+  private async sendIfDue() {
+    if (this.isSending) {
+      return;
+    }
+    const telemetryConfig = await this.getCurrentConfigs();
+    if (!this.shouldSendReport(telemetryConfig)) {
+      return;
+    }
+
+    try {
+      this.isSending = true;
+      const clusters = await this.fetchTelemetry();
+      const { telemetryUrl } = telemetryConfig;
+      for (const cluster of clusters) {
+        await this.sendTelemetry(telemetryUrl, cluster);
+      }
+
+      await this.updateLastReported();
+    } catch (err) {
+      await this.updateReportFailure(telemetryConfig);
+
+      this.logger.warn(`Error sending telemetry usage data: ${err}`);
+    }
+    this.isSending = false;
   }
 
-  private getInternalRepository = () => {
-    const { getSavedObjectsRepository } = this.server.savedObjects;
-    const { callWithInternalUser } = this.server.plugins.elasticsearch.getCluster('admin');
-    const internalRepository = getSavedObjectsRepository(callWithInternalUser);
-    return internalRepository;
-  };
-
-  private getCurrentConfigs = async () => {
-    const internalRepository = this.getInternalRepository();
-    const telemetrySavedObject = await getTelemetrySavedObject(internalRepository);
-    const config = this.server.config();
-    const currentKibanaVersion = config.get('pkg.version');
-    const configTelemetrySendUsageFrom = config.get('telemetry.sendUsageFrom');
-    const allowChangingOptInStatus = config.get('telemetry.allowChangingOptInStatus');
-    const configTelemetryOptIn = config.get('telemetry.optIn');
-    const telemetryUrl = config.get('telemetry.url') as string;
-    const { failureCount, failureVersion } = await getTelemetryFailureDetails({
+  private async getCurrentConfigs() {
+    const telemetrySavedObject = await getTelemetrySavedObject(this.internalRepository!);
+    const config = await this.config$.pipe(take(1)).toPromise();
+    const currentKibanaVersion = this.currentKibanaVersion;
+    const configTelemetrySendUsageFrom = config.sendUsageFrom;
+    const allowChangingOptInStatus = config.allowChangingOptInStatus;
+    const configTelemetryOptIn = typeof config.optIn === 'undefined' ? null : config.optIn;
+    const telemetryUrl = config.url;
+    const { failureCount, failureVersion } = getTelemetryFailureDetails({
       telemetrySavedObject,
     });
 
@@ -78,33 +139,30 @@ export class FetcherTask {
       failureCount,
       failureVersion,
     };
-  };
+  }
 
-  private updateLastReported = async () => {
-    const internalRepository = this.getInternalRepository();
+  private async updateLastReported() {
     this.lastReported = Date.now();
-    updateTelemetrySavedObject(internalRepository, {
+    updateTelemetrySavedObject(this.internalRepository!, {
       reportFailureCount: 0,
       lastReported: this.lastReported,
     });
-  };
-
-  private updateReportFailure = async ({ failureCount }: { failureCount: number }) => {
-    const internalRepository = this.getInternalRepository();
+  }
 
-    updateTelemetrySavedObject(internalRepository, {
+  private async updateReportFailure({ failureCount }: { failureCount: number }) {
+    updateTelemetrySavedObject(this.internalRepository!, {
       reportFailureCount: failureCount + 1,
-      reportFailureVersion: this.currentVersion,
+      reportFailureVersion: this.currentKibanaVersion,
     });
-  };
+  }
 
-  private shouldSendReport = ({
+  private shouldSendReport({
     telemetryOptIn,
     telemetrySendUsageFrom,
     reportFailureCount,
     currentVersion,
     reportFailureVersion,
-  }: any) => {
+  }: any) {
     if (reportFailureCount > 2 && reportFailureVersion === currentVersion) {
       return false;
     }
@@ -115,21 +173,20 @@ export class FetcherTask {
       }
     }
     return false;
-  };
+  }
 
-  private fetchTelemetry = async () => {
-    return await telemetryCollectionManager.getStats({
+  private async fetchTelemetry() {
+    return await this.telemetryCollectionManager!.getStats({
       unencrypted: false,
-      server: this.server,
       start: moment()
         .subtract(20, 'minutes')
         .toISOString(),
       end: moment().toISOString(),
     });
-  };
+  }
 
-  private sendTelemetry = async (url: string, cluster: any): Promise<void> => {
-    this.server.log(['debug', 'telemetry', 'fetcher'], `Sending usage stats.`);
+  private async sendTelemetry(url: string, cluster: any): Promise<void> {
+    this.logger.debug(`Sending usage stats.`);
     /**
      * send OPTIONS before sending usage data.
      * OPTIONS is less intrusive as it does not contain any payload and is used here to check if the endpoint is reachable.
@@ -142,47 +199,5 @@ export class FetcherTask {
       method: 'post',
       body: cluster,
     });
-  };
-
-  private sendIfDue = async () => {
-    if (this.isSending) {
-      return;
-    }
-    const telemetryConfig = await this.getCurrentConfigs();
-    if (!this.shouldSendReport(telemetryConfig)) {
-      return;
-    }
-
-    try {
-      this.isSending = true;
-      const clusters = await this.fetchTelemetry();
-      const { telemetryUrl } = telemetryConfig;
-      for (const cluster of clusters) {
-        await this.sendTelemetry(telemetryUrl, cluster);
-      }
-
-      await this.updateLastReported();
-    } catch (err) {
-      await this.updateReportFailure(telemetryConfig);
-
-      this.server.log(
-        ['warning', 'telemetry', 'fetcher'],
-        `Error sending telemetry usage data: ${err}`
-      );
-    }
-    this.isSending = false;
-  };
-
-  public start = () => {
-    setTimeout(() => {
-      this.sendIfDue();
-      this.intervalId = setInterval(() => this.sendIfDue(), this.checkIntervalMs);
-    }, this.initialCheckDelayMs);
-  };
-
-  public stop = () => {
-    if (this.intervalId) {
-      clearInterval(this.intervalId);
-    }
-  };
+  }
 }
diff --git a/src/legacy/core_plugins/telemetry/server/handle_old_settings/handle_old_settings.ts b/src/plugins/telemetry/server/handle_old_settings/handle_old_settings.ts
similarity index 74%
rename from src/legacy/core_plugins/telemetry/server/handle_old_settings/handle_old_settings.ts
rename to src/plugins/telemetry/server/handle_old_settings/handle_old_settings.ts
index b28a01bffa44d..3562ba452104c 100644
--- a/src/legacy/core_plugins/telemetry/server/handle_old_settings/handle_old_settings.ts
+++ b/src/plugins/telemetry/server/handle_old_settings/handle_old_settings.ts
@@ -26,27 +26,25 @@
  * @return {Boolean} {@code true} if the banner should still be displayed. {@code false} if the banner should not be displayed.
  */
 
-import { Server } from 'hapi';
+import { IUiSettingsClient, SavedObjectsClientContract } from 'kibana/server';
 import { CONFIG_TELEMETRY } from '../../common/constants';
 import { updateTelemetrySavedObject } from '../telemetry_repository';
 
 const CONFIG_ALLOW_REPORT = 'xPackMonitoring:allowReport';
 
-export async function handleOldSettings(server: Server) {
-  const { getSavedObjectsRepository } = server.savedObjects;
-  const { callWithInternalUser } = server.plugins.elasticsearch.getCluster('admin');
-  const savedObjectsClient = getSavedObjectsRepository(callWithInternalUser);
-  const uiSettings = server.uiSettingsServiceFactory({ savedObjectsClient });
-
-  const oldTelemetrySetting = await uiSettings.get(CONFIG_TELEMETRY);
-  const oldAllowReportSetting = await uiSettings.get(CONFIG_ALLOW_REPORT);
+export async function handleOldSettings(
+  savedObjectsClient: SavedObjectsClientContract,
+  uiSettingsClient: IUiSettingsClient
+) {
+  const oldTelemetrySetting = await uiSettingsClient.get(CONFIG_TELEMETRY);
+  const oldAllowReportSetting = await uiSettingsClient.get(CONFIG_ALLOW_REPORT);
   let legacyOptInValue = null;
 
   if (typeof oldTelemetrySetting === 'boolean') {
     legacyOptInValue = oldTelemetrySetting;
   } else if (
     typeof oldAllowReportSetting === 'boolean' &&
-    uiSettings.isOverridden(CONFIG_ALLOW_REPORT)
+    uiSettingsClient.isOverridden(CONFIG_ALLOW_REPORT)
   ) {
     legacyOptInValue = oldAllowReportSetting;
   }
diff --git a/src/legacy/core_plugins/telemetry/server/handle_old_settings/index.ts b/src/plugins/telemetry/server/handle_old_settings/index.ts
similarity index 100%
rename from src/legacy/core_plugins/telemetry/server/handle_old_settings/index.ts
rename to src/plugins/telemetry/server/handle_old_settings/index.ts
diff --git a/src/legacy/core_plugins/telemetry/server/index.ts b/src/plugins/telemetry/server/index.ts
similarity index 60%
rename from src/legacy/core_plugins/telemetry/server/index.ts
rename to src/plugins/telemetry/server/index.ts
index 85d7d80234ffc..d048c8f5e9427 100644
--- a/src/legacy/core_plugins/telemetry/server/index.ts
+++ b/src/plugins/telemetry/server/index.ts
@@ -17,15 +17,34 @@
  * under the License.
  */
 
-import { PluginInitializerContext } from 'src/core/server';
+import { PluginInitializerContext, PluginConfigDescriptor } from 'kibana/server';
 import { TelemetryPlugin } from './plugin';
 import * as constants from '../common/constants';
+import { configSchema, TelemetryConfigType } from './config';
 
 export { FetcherTask } from './fetcher';
-export { replaceTelemetryInjectedVars } from './telemetry_config';
 export { handleOldSettings } from './handle_old_settings';
-export { telemetryCollectionManager } from './collection_manager';
-export { PluginsSetup } from './plugin';
-export const telemetryPlugin = (initializerContext: PluginInitializerContext) =>
+export { TelemetryPluginsSetup } from './plugin';
+
+export const config: PluginConfigDescriptor<TelemetryConfigType> = {
+  schema: configSchema,
+  exposeToBrowser: {
+    enabled: true,
+    url: true,
+    banner: true,
+    allowChangingOptInStatus: true,
+    optIn: true,
+    optInStatusUrl: true,
+    sendUsageFrom: true,
+  },
+};
+
+export const plugin = (initializerContext: PluginInitializerContext<TelemetryConfigType>) =>
   new TelemetryPlugin(initializerContext);
 export { constants };
+export {
+  getClusterUuids,
+  getLocalLicense,
+  getLocalStats,
+  TelemetryLocalStats,
+} from './telemetry_collection';
diff --git a/src/plugins/telemetry/server/plugin.ts b/src/plugins/telemetry/server/plugin.ts
new file mode 100644
index 0000000000000..af512d234a7dc
--- /dev/null
+++ b/src/plugins/telemetry/server/plugin.ts
@@ -0,0 +1,168 @@
+/*
+ * 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 { Observable } from 'rxjs';
+import { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
+import {
+  TelemetryCollectionManagerPluginSetup,
+  TelemetryCollectionManagerPluginStart,
+} from 'src/plugins/telemetry_collection_manager/server';
+import {
+  CoreSetup,
+  PluginInitializerContext,
+  ISavedObjectsRepository,
+  CoreStart,
+  IUiSettingsClient,
+  SavedObjectsClient,
+  Plugin,
+  Logger,
+} from '../../../core/server';
+import { registerRoutes } from './routes';
+import { registerCollection } from './telemetry_collection';
+import {
+  registerUiMetricUsageCollector,
+  registerTelemetryUsageCollector,
+  registerTelemetryPluginUsageCollector,
+  registerManagementUsageCollector,
+  registerApplicationUsageCollector,
+} from './collectors';
+import { TelemetryConfigType } from './config';
+import { FetcherTask } from './fetcher';
+import { handleOldSettings } from './handle_old_settings';
+
+export interface TelemetryPluginsSetup {
+  usageCollection: UsageCollectionSetup;
+  telemetryCollectionManager: TelemetryCollectionManagerPluginSetup;
+}
+
+export interface TelemetryPluginsStart {
+  telemetryCollectionManager: TelemetryCollectionManagerPluginStart;
+}
+
+type SavedObjectsRegisterType = CoreSetup['savedObjects']['registerType'];
+
+export class TelemetryPlugin implements Plugin {
+  private readonly logger: Logger;
+  private readonly currentKibanaVersion: string;
+  private readonly config$: Observable<TelemetryConfigType>;
+  private readonly isDev: boolean;
+  private readonly fetcherTask: FetcherTask;
+  private savedObjectsClient?: ISavedObjectsRepository;
+  private uiSettingsClient?: IUiSettingsClient;
+
+  constructor(initializerContext: PluginInitializerContext<TelemetryConfigType>) {
+    this.logger = initializerContext.logger.get();
+    this.isDev = initializerContext.env.mode.dev;
+    this.currentKibanaVersion = initializerContext.env.packageInfo.version;
+    this.config$ = initializerContext.config.create();
+    this.fetcherTask = new FetcherTask({
+      ...initializerContext,
+      logger: this.logger,
+    });
+  }
+
+  public async setup(
+    core: CoreSetup,
+    { usageCollection, telemetryCollectionManager }: TelemetryPluginsSetup
+  ) {
+    const currentKibanaVersion = this.currentKibanaVersion;
+    const config$ = this.config$;
+    const isDev = this.isDev;
+
+    registerCollection(telemetryCollectionManager, core.elasticsearch.dataClient);
+    const router = core.http.createRouter();
+
+    registerRoutes({
+      config$,
+      currentKibanaVersion,
+      isDev,
+      router,
+      telemetryCollectionManager,
+    });
+
+    this.registerMappings(opts => core.savedObjects.registerType(opts));
+    this.registerUsageCollectors(usageCollection, opts => core.savedObjects.registerType(opts));
+  }
+
+  public async start(core: CoreStart, { telemetryCollectionManager }: TelemetryPluginsStart) {
+    const { savedObjects, uiSettings } = core;
+    this.savedObjectsClient = savedObjects.createInternalRepository();
+    const savedObjectsClient = new SavedObjectsClient(this.savedObjectsClient);
+    this.uiSettingsClient = uiSettings.asScopedToClient(savedObjectsClient);
+
+    try {
+      await handleOldSettings(savedObjectsClient, this.uiSettingsClient);
+    } catch (error) {
+      this.logger.warn('Unable to update legacy telemetry configs.');
+    }
+
+    this.fetcherTask.start(core, { telemetryCollectionManager });
+  }
+
+  private registerMappings(registerType: SavedObjectsRegisterType) {
+    registerType({
+      name: 'telemetry',
+      hidden: false,
+      namespaceAgnostic: true,
+      mappings: {
+        properties: {
+          enabled: {
+            type: 'boolean',
+          },
+          sendUsageFrom: {
+            type: 'keyword',
+          },
+          lastReported: {
+            type: 'date',
+          },
+          lastVersionChecked: {
+            type: 'keyword',
+          },
+          userHasSeenNotice: {
+            type: 'boolean',
+          },
+          reportFailureCount: {
+            type: 'integer',
+          },
+          reportFailureVersion: {
+            type: 'keyword',
+          },
+        },
+      },
+    });
+  }
+
+  private registerUsageCollectors(
+    usageCollection: UsageCollectionSetup,
+    registerType: SavedObjectsRegisterType
+  ) {
+    const getSavedObjectsClient = () => this.savedObjectsClient;
+    const getUiSettingsClient = () => this.uiSettingsClient;
+
+    registerTelemetryPluginUsageCollector(usageCollection, {
+      currentKibanaVersion: this.currentKibanaVersion,
+      config$: this.config$,
+      getSavedObjectsClient,
+    });
+    registerTelemetryUsageCollector(usageCollection);
+    registerManagementUsageCollector(usageCollection, getUiSettingsClient);
+    registerUiMetricUsageCollector(usageCollection, registerType, getSavedObjectsClient);
+    registerApplicationUsageCollector(usageCollection, registerType, getSavedObjectsClient);
+  }
+}
diff --git a/src/legacy/core_plugins/telemetry/server/routes/index.ts b/src/plugins/telemetry/server/routes/index.ts
similarity index 61%
rename from src/legacy/core_plugins/telemetry/server/routes/index.ts
rename to src/plugins/telemetry/server/routes/index.ts
index 31ff1682d6806..ad84cb9d2665d 100644
--- a/src/legacy/core_plugins/telemetry/server/routes/index.ts
+++ b/src/plugins/telemetry/server/routes/index.ts
@@ -17,22 +17,27 @@
  * under the License.
  */
 
-import { Legacy } from 'kibana';
-import { CoreSetup } from 'src/core/server';
+import { Observable } from 'rxjs';
+import { IRouter } from 'kibana/server';
+import { TelemetryCollectionManagerPluginSetup } from 'src/plugins/telemetry_collection_manager/server';
 import { registerTelemetryOptInRoutes } from './telemetry_opt_in';
 import { registerTelemetryUsageStatsRoutes } from './telemetry_usage_stats';
 import { registerTelemetryOptInStatsRoutes } from './telemetry_opt_in_stats';
 import { registerTelemetryUserHasSeenNotice } from './telemetry_user_has_seen_notice';
+import { TelemetryConfigType } from '../config';
 
 interface RegisterRoutesParams {
-  core: CoreSetup;
+  isDev: boolean;
+  config$: Observable<TelemetryConfigType>;
   currentKibanaVersion: string;
-  server: Legacy.Server;
+  router: IRouter;
+  telemetryCollectionManager: TelemetryCollectionManagerPluginSetup;
 }
 
-export function registerRoutes({ core, currentKibanaVersion, server }: RegisterRoutesParams) {
-  registerTelemetryOptInRoutes({ core, currentKibanaVersion, server });
-  registerTelemetryUsageStatsRoutes(server);
-  registerTelemetryOptInStatsRoutes(server);
-  registerTelemetryUserHasSeenNotice(server);
+export function registerRoutes(options: RegisterRoutesParams) {
+  const { isDev, telemetryCollectionManager, router } = options;
+  registerTelemetryOptInRoutes(options);
+  registerTelemetryUsageStatsRoutes(router, telemetryCollectionManager, isDev);
+  registerTelemetryOptInStatsRoutes(router, telemetryCollectionManager);
+  registerTelemetryUserHasSeenNotice(router);
 }
diff --git a/src/plugins/telemetry/server/routes/telemetry_opt_in.ts b/src/plugins/telemetry/server/routes/telemetry_opt_in.ts
new file mode 100644
index 0000000000000..e65ade0ab8aaa
--- /dev/null
+++ b/src/plugins/telemetry/server/routes/telemetry_opt_in.ts
@@ -0,0 +1,101 @@
+/*
+ * 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 moment from 'moment';
+import { Observable } from 'rxjs';
+import { take } from 'rxjs/operators';
+import { schema } from '@kbn/config-schema';
+import { IRouter } from 'kibana/server';
+import { TelemetryCollectionManagerPluginSetup } from 'src/plugins/telemetry_collection_manager/server';
+import { getTelemetryAllowChangingOptInStatus } from '../../common/telemetry_config';
+import { sendTelemetryOptInStatus } from './telemetry_opt_in_stats';
+
+import {
+  TelemetrySavedObjectAttributes,
+  updateTelemetrySavedObject,
+  getTelemetrySavedObject,
+} from '../telemetry_repository';
+import { TelemetryConfigType } from '../config';
+
+interface RegisterOptInRoutesParams {
+  currentKibanaVersion: string;
+  router: IRouter;
+  config$: Observable<TelemetryConfigType>;
+  telemetryCollectionManager: TelemetryCollectionManagerPluginSetup;
+}
+
+export function registerTelemetryOptInRoutes({
+  config$,
+  router,
+  currentKibanaVersion,
+  telemetryCollectionManager,
+}: RegisterOptInRoutesParams) {
+  router.post(
+    {
+      path: '/api/telemetry/v2/optIn',
+      validate: {
+        body: schema.object({ enabled: schema.boolean() }),
+      },
+    },
+    async (context, req, res) => {
+      const newOptInStatus = req.body.enabled;
+      const attributes: TelemetrySavedObjectAttributes = {
+        enabled: newOptInStatus,
+        lastVersionChecked: currentKibanaVersion,
+      };
+      const config = await config$.pipe(take(1)).toPromise();
+      const telemetrySavedObject = await getTelemetrySavedObject(context.core.savedObjects.client);
+
+      if (telemetrySavedObject === false) {
+        // If we get false, we couldn't get the saved object due to lack of permissions
+        // so we can assume the user won't be able to update it either
+        return res.forbidden();
+      }
+
+      const configTelemetryAllowChangingOptInStatus = config.allowChangingOptInStatus;
+      const allowChangingOptInStatus = getTelemetryAllowChangingOptInStatus({
+        telemetrySavedObject,
+        configTelemetryAllowChangingOptInStatus,
+      });
+      if (!allowChangingOptInStatus) {
+        return res.badRequest({
+          body: JSON.stringify({ error: 'Not allowed to change Opt-in Status.' }),
+        });
+      }
+
+      if (config.sendUsageFrom === 'server') {
+        const optInStatusUrl = config.optInStatusUrl;
+        await sendTelemetryOptInStatus(
+          telemetryCollectionManager,
+          { optInStatusUrl, newOptInStatus },
+          {
+            start: moment()
+              .subtract(20, 'minutes')
+              .toISOString(),
+            end: moment().toISOString(),
+            unencrypted: false,
+          }
+        );
+      }
+
+      await updateTelemetrySavedObject(context.core.savedObjects.client, attributes);
+      return res.ok({});
+    }
+  );
+}
diff --git a/src/legacy/core_plugins/telemetry/server/routes/telemetry_opt_in_stats.ts b/src/plugins/telemetry/server/routes/telemetry_opt_in_stats.ts
similarity index 65%
rename from src/legacy/core_plugins/telemetry/server/routes/telemetry_opt_in_stats.ts
rename to src/plugins/telemetry/server/routes/telemetry_opt_in_stats.ts
index e64f3f6ff8a94..3263c6d49523c 100644
--- a/src/legacy/core_plugins/telemetry/server/routes/telemetry_opt_in_stats.ts
+++ b/src/plugins/telemetry/server/routes/telemetry_opt_in_stats.ts
@@ -19,10 +19,14 @@
 
 // @ts-ignore
 import fetch from 'node-fetch';
-import Joi from 'joi';
 import moment from 'moment';
-import { Legacy } from 'kibana';
-import { telemetryCollectionManager, StatsGetterConfig } from '../collection_manager';
+
+import { IRouter } from 'kibana/server';
+import { schema } from '@kbn/config-schema';
+import {
+  TelemetryCollectionManagerPluginSetup,
+  StatsGetterConfig,
+} from 'src/plugins/telemetry_collection_manager/server';
 
 interface SendTelemetryOptInStatusConfig {
   optInStatusUrl: string;
@@ -30,6 +34,7 @@ interface SendTelemetryOptInStatusConfig {
 }
 
 export async function sendTelemetryOptInStatus(
+  telemetryCollectionManager: TelemetryCollectionManagerPluginSetup,
   config: SendTelemetryOptInStatusConfig,
   statsGetterConfig: StatsGetterConfig
 ) {
@@ -45,41 +50,42 @@ export async function sendTelemetryOptInStatus(
   });
 }
 
-export function registerTelemetryOptInStatsRoutes(server: Legacy.Server) {
-  server.route({
-    method: 'POST',
-    path: '/api/telemetry/v2/clusters/_opt_in_stats',
-    options: {
+export function registerTelemetryOptInStatsRoutes(
+  router: IRouter,
+  telemetryCollectionManager: TelemetryCollectionManagerPluginSetup
+) {
+  router.post(
+    {
+      path: '/api/telemetry/v2/clusters/_opt_in_stats',
       validate: {
-        payload: Joi.object({
-          enabled: Joi.bool().required(),
-          unencrypted: Joi.bool().default(true),
+        body: schema.object({
+          enabled: schema.boolean(),
+          unencrypted: schema.boolean({ defaultValue: true }),
         }),
       },
     },
-    handler: async (req: any, h: any) => {
+    async (context, req, res) => {
       try {
-        const newOptInStatus = req.payload.enabled;
-        const unencrypted = req.payload.unencrypted;
-        const statsGetterConfig = {
+        const newOptInStatus = req.body.enabled;
+        const unencrypted = req.body.unencrypted;
+
+        const statsGetterConfig: StatsGetterConfig = {
           start: moment()
             .subtract(20, 'minutes')
             .toISOString(),
           end: moment().toISOString(),
-          server: req.server,
-          req,
           unencrypted,
+          request: req,
         };
 
         const optInStatus = await telemetryCollectionManager.getOptInStats(
           newOptInStatus,
           statsGetterConfig
         );
-
-        return h.response(optInStatus).code(200);
+        return res.ok({ body: optInStatus });
       } catch (err) {
-        return h.response([]).code(200);
+        return res.ok({ body: [] });
       }
-    },
-  });
+    }
+  );
 }
diff --git a/src/plugins/telemetry/server/routes/telemetry_usage_stats.ts b/src/plugins/telemetry/server/routes/telemetry_usage_stats.ts
new file mode 100644
index 0000000000000..15d4c0ca2fa55
--- /dev/null
+++ b/src/plugins/telemetry/server/routes/telemetry_usage_stats.ts
@@ -0,0 +1,82 @@
+/*
+ * 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 moment from 'moment';
+import { schema } from '@kbn/config-schema';
+import { TypeOptions } from '@kbn/config-schema/target/types/types';
+import { IRouter } from 'kibana/server';
+import {
+  TelemetryCollectionManagerPluginSetup,
+  StatsGetterConfig,
+} from 'src/plugins/telemetry_collection_manager/server';
+
+const validate: TypeOptions<string | number>['validate'] = value => {
+  if (!moment(value).isValid()) {
+    return `${value} is not a valid date`;
+  }
+};
+
+const dateSchema = schema.oneOf([schema.string({ validate }), schema.number({ validate })]);
+
+export function registerTelemetryUsageStatsRoutes(
+  router: IRouter,
+  telemetryCollectionManager: TelemetryCollectionManagerPluginSetup,
+  isDev: boolean
+) {
+  router.post(
+    {
+      path: '/api/telemetry/v2/clusters/_stats',
+      validate: {
+        body: schema.object({
+          unencrypted: schema.boolean({ defaultValue: false }),
+          timeRange: schema.object({
+            min: dateSchema,
+            max: dateSchema,
+          }),
+        }),
+      },
+    },
+    async (context, req, res) => {
+      const start = moment(req.body.timeRange.min).toISOString();
+      const end = moment(req.body.timeRange.max).toISOString();
+      const unencrypted = req.body.unencrypted;
+
+      try {
+        const statsConfig: StatsGetterConfig = {
+          unencrypted,
+          start,
+          end,
+          request: req,
+        };
+        const stats = await telemetryCollectionManager.getStats(statsConfig);
+        return res.ok({ body: stats });
+      } catch (err) {
+        if (isDev) {
+          // don't ignore errors when running in dev mode
+          throw err;
+        }
+        if (unencrypted && err.status === 403) {
+          return res.forbidden();
+        }
+        // ignore errors and return empty set
+        return res.ok({ body: [] });
+      }
+    }
+  );
+}
diff --git a/src/legacy/core_plugins/telemetry/server/routes/telemetry_user_has_seen_notice.ts b/src/plugins/telemetry/server/routes/telemetry_user_has_seen_notice.ts
similarity index 65%
rename from src/legacy/core_plugins/telemetry/server/routes/telemetry_user_has_seen_notice.ts
rename to src/plugins/telemetry/server/routes/telemetry_user_has_seen_notice.ts
index 665e6d9aaeb75..45a5147107f02 100644
--- a/src/legacy/core_plugins/telemetry/server/routes/telemetry_user_has_seen_notice.ts
+++ b/src/plugins/telemetry/server/routes/telemetry_user_has_seen_notice.ts
@@ -17,8 +17,7 @@
  * under the License.
  */
 
-import { Legacy } from 'kibana';
-import { Request } from 'hapi';
+import { IRouter } from 'kibana/server';
 import {
   TelemetrySavedObject,
   TelemetrySavedObjectAttributes,
@@ -26,19 +25,14 @@ import {
   updateTelemetrySavedObject,
 } from '../telemetry_repository';
 
-const getInternalRepository = (server: Legacy.Server) => {
-  const { getSavedObjectsRepository } = server.savedObjects;
-  const { callWithInternalUser } = server.plugins.elasticsearch.getCluster('admin');
-  const internalRepository = getSavedObjectsRepository(callWithInternalUser);
-  return internalRepository;
-};
-
-export function registerTelemetryUserHasSeenNotice(server: Legacy.Server) {
-  server.route({
-    method: 'PUT',
-    path: '/api/telemetry/v2/userHasSeenNotice',
-    handler: async (req: Request): Promise<TelemetrySavedObjectAttributes> => {
-      const internalRepository = getInternalRepository(server);
+export function registerTelemetryUserHasSeenNotice(router: IRouter) {
+  router.put(
+    {
+      path: '/api/telemetry/v2/userHasSeenNotice',
+      validate: false,
+    },
+    async (context, req, res) => {
+      const internalRepository = context.core.savedObjects.client;
       const telemetrySavedObject: TelemetrySavedObject = await getTelemetrySavedObject(
         internalRepository
       );
@@ -50,7 +44,7 @@ export function registerTelemetryUserHasSeenNotice(server: Legacy.Server) {
       };
       await updateTelemetrySavedObject(internalRepository, updatedAttributes);
 
-      return updatedAttributes;
-    },
-  });
+      return res.ok({ body: updatedAttributes });
+    }
+  );
 }
diff --git a/src/legacy/core_plugins/telemetry/server/telemetry_collection/__tests__/get_cluster_info.js b/src/plugins/telemetry/server/telemetry_collection/__tests__/get_cluster_info.js
similarity index 100%
rename from src/legacy/core_plugins/telemetry/server/telemetry_collection/__tests__/get_cluster_info.js
rename to src/plugins/telemetry/server/telemetry_collection/__tests__/get_cluster_info.js
diff --git a/src/legacy/core_plugins/telemetry/server/telemetry_collection/__tests__/get_cluster_stats.js b/src/plugins/telemetry/server/telemetry_collection/__tests__/get_cluster_stats.js
similarity index 100%
rename from src/legacy/core_plugins/telemetry/server/telemetry_collection/__tests__/get_cluster_stats.js
rename to src/plugins/telemetry/server/telemetry_collection/__tests__/get_cluster_stats.js
diff --git a/src/legacy/core_plugins/telemetry/server/telemetry_collection/__tests__/get_local_stats.js b/src/plugins/telemetry/server/telemetry_collection/__tests__/get_local_stats.js
similarity index 96%
rename from src/legacy/core_plugins/telemetry/server/telemetry_collection/__tests__/get_local_stats.js
rename to src/plugins/telemetry/server/telemetry_collection/__tests__/get_local_stats.js
index 94627953f1ac6..ac3c5307adcf6 100644
--- a/src/legacy/core_plugins/telemetry/server/telemetry_collection/__tests__/get_local_stats.js
+++ b/src/plugins/telemetry/server/telemetry_collection/__tests__/get_local_stats.js
@@ -128,9 +128,14 @@ describe('get_local_stats', () => {
     },
   };
 
+  const context = {
+    logger: console,
+    version: '8.0.0',
+  };
+
   describe('handleLocalStats', () => {
     it('returns expected object without xpack and kibana data', () => {
-      const result = handleLocalStats(getMockServer(), clusterInfo, clusterStats);
+      const result = handleLocalStats(clusterInfo, clusterStats, void 0, context);
       expect(result.cluster_uuid).to.eql(combinedStatsResult.cluster_uuid);
       expect(result.cluster_name).to.eql(combinedStatsResult.cluster_name);
       expect(result.cluster_stats).to.eql(combinedStatsResult.cluster_stats);
@@ -141,7 +146,7 @@ describe('get_local_stats', () => {
     });
 
     it('returns expected object with xpack', () => {
-      const result = handleLocalStats(getMockServer(), clusterInfo, clusterStats);
+      const result = handleLocalStats(clusterInfo, clusterStats, void 0, context);
       const { stack_stats: stack, ...cluster } = result;
       expect(cluster.collection).to.be(combinedStatsResult.collection);
       expect(cluster.cluster_uuid).to.be(combinedStatsResult.cluster_uuid);
diff --git a/src/legacy/core_plugins/telemetry/server/telemetry_collection/constants.ts b/src/plugins/telemetry/server/telemetry_collection/constants.ts
similarity index 100%
rename from src/legacy/core_plugins/telemetry/server/telemetry_collection/constants.ts
rename to src/plugins/telemetry/server/telemetry_collection/constants.ts
diff --git a/src/legacy/core_plugins/telemetry/server/telemetry_collection/get_cluster_info.ts b/src/plugins/telemetry/server/telemetry_collection/get_cluster_info.ts
similarity index 92%
rename from src/legacy/core_plugins/telemetry/server/telemetry_collection/get_cluster_info.ts
rename to src/plugins/telemetry/server/telemetry_collection/get_cluster_info.ts
index 67812457ed4ec..d5f0d2d8c9598 100644
--- a/src/legacy/core_plugins/telemetry/server/telemetry_collection/get_cluster_info.ts
+++ b/src/plugins/telemetry/server/telemetry_collection/get_cluster_info.ts
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { CallCluster } from 'src/legacy/core_plugins/elasticsearch';
+import { APICaller } from 'kibana/server';
 
 // This can be removed when the ES client improves the types
 export interface ESClusterInfo {
@@ -43,6 +43,6 @@ export interface ESClusterInfo {
  *
  * @param {function} callCluster The callWithInternalUser handler (exposed for testing)
  */
-export function getClusterInfo(callCluster: CallCluster) {
+export function getClusterInfo(callCluster: APICaller) {
   return callCluster<ESClusterInfo>('info');
 }
diff --git a/src/legacy/core_plugins/telemetry/server/telemetry_collection/get_cluster_stats.ts b/src/plugins/telemetry/server/telemetry_collection/get_cluster_stats.ts
similarity index 86%
rename from src/legacy/core_plugins/telemetry/server/telemetry_collection/get_cluster_stats.ts
rename to src/plugins/telemetry/server/telemetry_collection/get_cluster_stats.ts
index 4abd95f0cf66d..89e2cae777985 100644
--- a/src/legacy/core_plugins/telemetry/server/telemetry_collection/get_cluster_stats.ts
+++ b/src/plugins/telemetry/server/telemetry_collection/get_cluster_stats.ts
@@ -17,15 +17,15 @@
  * under the License.
  */
 
-import { CallCluster } from 'src/legacy/core_plugins/elasticsearch';
+import { ClusterDetailsGetter } from 'src/plugins/telemetry_collection_manager/server';
+import { APICaller } from 'kibana/server';
 import { TIMEOUT } from './constants';
-import { ClusterDetailsGetter } from '../collection_manager';
 /**
  * Get the cluster stats from the connected cluster.
  *
  * This is the equivalent to GET /_cluster/stats?timeout=30s.
  */
-export async function getClusterStats(callCluster: CallCluster) {
+export async function getClusterStats(callCluster: APICaller) {
   return await callCluster('cluster.stats', {
     timeout: TIMEOUT,
   });
diff --git a/src/legacy/core_plugins/telemetry/server/telemetry_collection/get_kibana.ts b/src/plugins/telemetry/server/telemetry_collection/get_kibana.ts
similarity index 79%
rename from src/legacy/core_plugins/telemetry/server/telemetry_collection/get_kibana.ts
rename to src/plugins/telemetry/server/telemetry_collection/get_kibana.ts
index 537d5a85911cd..86c6731e11d37 100644
--- a/src/legacy/core_plugins/telemetry/server/telemetry_collection/get_kibana.ts
+++ b/src/plugins/telemetry/server/telemetry_collection/get_kibana.ts
@@ -19,7 +19,8 @@
 
 import { omit } from 'lodash';
 import { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
-import { CallCluster } from 'src/legacy/core_plugins/elasticsearch';
+import { APICaller } from 'kibana/server';
+import { StatsCollectionContext } from 'src/plugins/telemetry_collection_manager/server';
 
 export interface KibanaUsageStats {
   kibana: {
@@ -37,12 +38,12 @@ export interface KibanaUsageStats {
   [plugin: string]: any;
 }
 
-export function handleKibanaStats(server: any, response?: KibanaUsageStats) {
+export function handleKibanaStats(
+  { logger, version: serverVersion }: StatsCollectionContext,
+  response?: KibanaUsageStats
+) {
   if (!response) {
-    server.log(
-      ['warning', 'telemetry', 'local-stats'],
-      'No Kibana stats returned from usage collectors'
-    );
+    logger.warn('No Kibana stats returned from usage collectors');
     return;
   }
 
@@ -60,10 +61,7 @@ export function handleKibanaStats(server: any, response?: KibanaUsageStats) {
     };
   }, {});
 
-  const version = server
-    .config()
-    .get('pkg.version')
-    .replace(/-snapshot/i, '');
+  const version = serverVersion.replace(/-snapshot/i, ''); // Shouldn't we better maintain the -snapshot so we can differentiate between actual final releases and snapshots?
 
   // combine core stats (os types, saved objects) with plugin usage stats
   // organize the object into the same format as monitoring-enabled telemetry
@@ -79,7 +77,7 @@ export function handleKibanaStats(server: any, response?: KibanaUsageStats) {
 
 export async function getKibana(
   usageCollection: UsageCollectionSetup,
-  callWithInternalUser: CallCluster
+  callWithInternalUser: APICaller
 ): Promise<KibanaUsageStats> {
   const usage = await usageCollection.bulkFetch(callWithInternalUser);
   return usageCollection.toObject(usage);
diff --git a/src/legacy/core_plugins/telemetry/server/telemetry_collection/get_local_license.ts b/src/plugins/telemetry/server/telemetry_collection/get_local_license.ts
similarity index 80%
rename from src/legacy/core_plugins/telemetry/server/telemetry_collection/get_local_license.ts
rename to src/plugins/telemetry/server/telemetry_collection/get_local_license.ts
index 589392ffb6095..ad0666c7ad153 100644
--- a/src/legacy/core_plugins/telemetry/server/telemetry_collection/get_local_license.ts
+++ b/src/plugins/telemetry/server/telemetry_collection/get_local_license.ts
@@ -17,26 +17,12 @@
  * under the License.
  */
 
-import { CallCluster } from 'src/legacy/core_plugins/elasticsearch';
-import { LicenseGetter } from '../collection_manager';
+import { APICaller } from 'kibana/server';
+import { ESLicense, LicenseGetter } from 'src/plugins/telemetry_collection_manager/server';
 
-// From https://www.elastic.co/guide/en/elasticsearch/reference/current/get-license.html
-export interface ESLicense {
-  status: string;
-  uid: string;
-  type: string;
-  issue_date: string;
-  issue_date_in_millis: number;
-  expiry_date: string;
-  expirty_date_in_millis: number;
-  max_nodes: number;
-  issued_to: string;
-  issuer: string;
-  start_date_in_millis: number;
-}
 let cachedLicense: ESLicense | undefined;
 
-function fetchLicense(callCluster: CallCluster, local: boolean) {
+function fetchLicense(callCluster: APICaller, local: boolean) {
   return callCluster<{ license: ESLicense }>('transport.request', {
     method: 'GET',
     path: '/_license',
@@ -55,7 +41,7 @@ function fetchLicense(callCluster: CallCluster, local: boolean) {
  *
  * Like any X-Pack related API, X-Pack must installed for this to work.
  */
-async function getLicenseFromLocalOrMaster(callCluster: CallCluster) {
+async function getLicenseFromLocalOrMaster(callCluster: APICaller) {
   // Fetching the local license is cheaper than getting it from the master and good enough
   const { license } = await fetchLicense(callCluster, true).catch(async err => {
     if (cachedLicense) {
diff --git a/src/legacy/core_plugins/telemetry/server/telemetry_collection/get_local_stats.ts b/src/plugins/telemetry/server/telemetry_collection/get_local_stats.ts
similarity index 82%
rename from src/legacy/core_plugins/telemetry/server/telemetry_collection/get_local_stats.ts
rename to src/plugins/telemetry/server/telemetry_collection/get_local_stats.ts
index d99710deb1cbc..19d5c2970361c 100644
--- a/src/legacy/core_plugins/telemetry/server/telemetry_collection/get_local_stats.ts
+++ b/src/plugins/telemetry/server/telemetry_collection/get_local_stats.ts
@@ -17,10 +17,13 @@
  * under the License.
  */
 
+import {
+  StatsGetter,
+  StatsCollectionContext,
+} from 'src/plugins/telemetry_collection_manager/server';
 import { getClusterInfo, ESClusterInfo } from './get_cluster_info';
 import { getClusterStats } from './get_cluster_stats';
 import { getKibana, handleKibanaStats, KibanaUsageStats } from './get_kibana';
-import { StatsGetter } from '../collection_manager';
 
 /**
  * Handle the separate local calls by combining them into a single object response that looks like the
@@ -32,10 +35,10 @@ import { StatsGetter } from '../collection_manager';
  * @param {Object} kibana The Kibana Usage stats
  */
 export function handleLocalStats(
-  server: any,
   { cluster_name, cluster_uuid, version }: ESClusterInfo,
   { _nodes, cluster_name: clusterName, ...clusterStats }: any,
-  kibana: KibanaUsageStats
+  kibana: KibanaUsageStats,
+  context: StatsCollectionContext
 ) {
   return {
     timestamp: new Date().toISOString(),
@@ -45,7 +48,7 @@ export function handleLocalStats(
     cluster_stats: clusterStats,
     collection: 'local',
     stack_stats: {
-      kibana: handleKibanaStats(server, kibana),
+      kibana: handleKibanaStats(context, kibana),
     },
   };
 }
@@ -55,8 +58,12 @@ export type TelemetryLocalStats = ReturnType<typeof handleLocalStats>;
 /**
  * Get statistics for all products joined by Elasticsearch cluster.
  */
-export const getLocalStats: StatsGetter<TelemetryLocalStats> = async (clustersDetails, config) => {
-  const { server, callCluster, usageCollection } = config;
+export const getLocalStats: StatsGetter<{}, TelemetryLocalStats> = async (
+  clustersDetails,
+  config,
+  context
+) => {
+  const { callCluster, usageCollection } = config;
 
   return await Promise.all(
     clustersDetails.map(async clustersDetail => {
@@ -65,7 +72,7 @@ export const getLocalStats: StatsGetter<TelemetryLocalStats> = async (clustersDe
         getClusterStats(callCluster), // cluster stats (not to be confused with cluster _state_)
         getKibana(usageCollection, callCluster),
       ]);
-      return handleLocalStats(server, clusterInfo, clusterStats, kibana);
+      return handleLocalStats(clusterInfo, clusterStats, kibana, context);
     })
   );
 };
diff --git a/src/legacy/core_plugins/telemetry/server/telemetry_collection/index.ts b/src/plugins/telemetry/server/telemetry_collection/index.ts
similarity index 87%
rename from src/legacy/core_plugins/telemetry/server/telemetry_collection/index.ts
rename to src/plugins/telemetry/server/telemetry_collection/index.ts
index 9ac94216c21bc..377ddab7b877c 100644
--- a/src/legacy/core_plugins/telemetry/server/telemetry_collection/index.ts
+++ b/src/plugins/telemetry/server/telemetry_collection/index.ts
@@ -17,6 +17,7 @@
  * under the License.
  */
 
-export { getLocalStats } from './get_local_stats';
+export { getLocalStats, TelemetryLocalStats } from './get_local_stats';
+export { getLocalLicense } from './get_local_license';
 export { getClusterUuids } from './get_cluster_stats';
 export { registerCollection } from './register_collection';
diff --git a/src/legacy/core_plugins/telemetry/server/telemetry_collection/register_collection.ts b/src/plugins/telemetry/server/telemetry_collection/register_collection.ts
similarity index 86%
rename from src/legacy/core_plugins/telemetry/server/telemetry_collection/register_collection.ts
rename to src/plugins/telemetry/server/telemetry_collection/register_collection.ts
index 6580b47dba08e..833fd9f7fd5bc 100644
--- a/src/legacy/core_plugins/telemetry/server/telemetry_collection/register_collection.ts
+++ b/src/plugins/telemetry/server/telemetry_collection/register_collection.ts
@@ -36,14 +36,18 @@
  * under the License.
  */
 
-import { telemetryCollectionManager } from '../collection_manager';
+import { IClusterClient } from 'kibana/server';
+import { TelemetryCollectionManagerPluginSetup } from 'src/plugins/telemetry_collection_manager/server';
 import { getLocalStats } from './get_local_stats';
 import { getClusterUuids } from './get_cluster_stats';
 import { getLocalLicense } from './get_local_license';
 
-export function registerCollection() {
+export function registerCollection(
+  telemetryCollectionManager: TelemetryCollectionManagerPluginSetup,
+  esCluster: IClusterClient
+) {
   telemetryCollectionManager.setCollection({
-    esCluster: 'data',
+    esCluster,
     title: 'local',
     priority: 0,
     statsGetter: getLocalStats,
diff --git a/src/legacy/core_plugins/telemetry/server/telemetry_repository/get_telemetry_saved_object.test.ts b/src/plugins/telemetry/server/telemetry_repository/get_telemetry_saved_object.test.ts
similarity index 95%
rename from src/legacy/core_plugins/telemetry/server/telemetry_repository/get_telemetry_saved_object.test.ts
rename to src/plugins/telemetry/server/telemetry_repository/get_telemetry_saved_object.test.ts
index 7cc177878de4d..ebb583e88d4e1 100644
--- a/src/legacy/core_plugins/telemetry/server/telemetry_repository/get_telemetry_saved_object.test.ts
+++ b/src/plugins/telemetry/server/telemetry_repository/get_telemetry_saved_object.test.ts
@@ -18,7 +18,7 @@
  */
 
 import { getTelemetrySavedObject } from './get_telemetry_saved_object';
-import { SavedObjectsErrorHelpers } from '../../../../../core/server';
+import { SavedObjectsErrorHelpers } from '../../../../core/server';
 
 describe('getTelemetrySavedObject', () => {
   it('returns null when saved object not found', async () => {
@@ -79,7 +79,7 @@ function getCallGetTelemetrySavedObjectParams(
 
 async function callGetTelemetrySavedObject(params: CallGetTelemetrySavedObjectParams) {
   const savedObjectsClient = getMockSavedObjectsClient(params);
-  return await getTelemetrySavedObject(savedObjectsClient);
+  return await getTelemetrySavedObject(savedObjectsClient as any);
 }
 
 const SavedObjectForbiddenMessage = 'savedObjectForbidden';
diff --git a/src/legacy/core_plugins/telemetry/server/telemetry_repository/get_telemetry_saved_object.ts b/src/plugins/telemetry/server/telemetry_repository/get_telemetry_saved_object.ts
similarity index 81%
rename from src/legacy/core_plugins/telemetry/server/telemetry_repository/get_telemetry_saved_object.ts
rename to src/plugins/telemetry/server/telemetry_repository/get_telemetry_saved_object.ts
index 91965ef201ecb..1b3ea093fb3d8 100644
--- a/src/legacy/core_plugins/telemetry/server/telemetry_repository/get_telemetry_saved_object.ts
+++ b/src/plugins/telemetry/server/telemetry_repository/get_telemetry_saved_object.ts
@@ -17,13 +17,16 @@
  * under the License.
  */
 
-import { TelemetrySavedObjectAttributes } from './';
-import { SavedObjectsErrorHelpers } from '../../../../../core/server';
+import { SavedObjectsErrorHelpers, SavedObjectsClientContract } from '../../../../core/server';
+import { TelemetrySavedObject } from './';
 
-export type TelemetrySavedObject = TelemetrySavedObjectAttributes | null | false;
-type GetTelemetrySavedObject = (repository: any) => Promise<TelemetrySavedObject>;
+type GetTelemetrySavedObject = (
+  repository: SavedObjectsClientContract
+) => Promise<TelemetrySavedObject>;
 
-export const getTelemetrySavedObject: GetTelemetrySavedObject = async (repository: any) => {
+export const getTelemetrySavedObject: GetTelemetrySavedObject = async (
+  repository: SavedObjectsClientContract
+) => {
   try {
     const { attributes } = await repository.get('telemetry', 'telemetry');
     return attributes;
diff --git a/src/plugins/telemetry/server/telemetry_repository/index.ts b/src/plugins/telemetry/server/telemetry_repository/index.ts
new file mode 100644
index 0000000000000..b98fa6971e481
--- /dev/null
+++ b/src/plugins/telemetry/server/telemetry_repository/index.ts
@@ -0,0 +1,25 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+export { getTelemetrySavedObject } from './get_telemetry_saved_object';
+export { updateTelemetrySavedObject } from './update_telemetry_saved_object';
+export {
+  TelemetrySavedObject,
+  TelemetrySavedObjectAttributes,
+} from '../../common/telemetry_config/types';
diff --git a/src/legacy/core_plugins/telemetry/server/telemetry_repository/update_telemetry_saved_object.ts b/src/plugins/telemetry/server/telemetry_repository/update_telemetry_saved_object.ts
similarity index 89%
rename from src/legacy/core_plugins/telemetry/server/telemetry_repository/update_telemetry_saved_object.ts
rename to src/plugins/telemetry/server/telemetry_repository/update_telemetry_saved_object.ts
index b66e01faaa6bc..64a2f675e4fd8 100644
--- a/src/legacy/core_plugins/telemetry/server/telemetry_repository/update_telemetry_saved_object.ts
+++ b/src/plugins/telemetry/server/telemetry_repository/update_telemetry_saved_object.ts
@@ -17,11 +17,11 @@
  * under the License.
  */
 
+import { SavedObjectsErrorHelpers, SavedObjectsClientContract } from '../../../../core/server';
 import { TelemetrySavedObjectAttributes } from './';
-import { SavedObjectsErrorHelpers } from '../../../../../core/server';
 
 export async function updateTelemetrySavedObject(
-  savedObjectsClient: any,
+  savedObjectsClient: SavedObjectsClientContract,
   savedObjectAttributes: TelemetrySavedObjectAttributes
 ) {
   try {
diff --git a/src/plugins/telemetry_collection_manager/README.md b/src/plugins/telemetry_collection_manager/README.md
new file mode 100644
index 0000000000000..3ded16e08a7aa
--- /dev/null
+++ b/src/plugins/telemetry_collection_manager/README.md
@@ -0,0 +1,7 @@
+# Telemetry Collection Manager
+
+Telemetry's collection manager to go through all the telemetry sources when fetching it before reporting.
+
+It has been split into a separate plugin because the `telemetry` plugin was pretty much being a passthrough in many cases to instantiate and maintain the logic of this bit.
+
+For separation of concerns, it's better to have this piece of logic independent to the rest.
diff --git a/src/legacy/core_plugins/telemetry/public/views/management/index.ts b/src/plugins/telemetry_collection_manager/common/index.ts
similarity index 87%
rename from src/legacy/core_plugins/telemetry/public/views/management/index.ts
rename to src/plugins/telemetry_collection_manager/common/index.ts
index 2e9f064ec80d8..5ad29c06bb682 100644
--- a/src/legacy/core_plugins/telemetry/public/views/management/index.ts
+++ b/src/plugins/telemetry_collection_manager/common/index.ts
@@ -17,4 +17,5 @@
  * under the License.
  */
 
-import './management';
+export const PLUGIN_ID = 'telemetryCollectionManager';
+export const PLUGIN_NAME = 'telemetry_collection_manager';
diff --git a/src/plugins/telemetry_collection_manager/kibana.json b/src/plugins/telemetry_collection_manager/kibana.json
new file mode 100644
index 0000000000000..f4278265834a4
--- /dev/null
+++ b/src/plugins/telemetry_collection_manager/kibana.json
@@ -0,0 +1,10 @@
+{
+  "id": "telemetryCollectionManager",
+  "version": "kibana",
+  "server": true,
+  "ui": false,
+  "requiredPlugins": [
+    "usageCollection"
+  ],
+  "optionalPlugins": []
+}
diff --git a/src/legacy/core_plugins/telemetry/server/collectors/encryption/encrypt.test.ts b/src/plugins/telemetry_collection_manager/server/encryption/encrypt.test.ts
similarity index 100%
rename from src/legacy/core_plugins/telemetry/server/collectors/encryption/encrypt.test.ts
rename to src/plugins/telemetry_collection_manager/server/encryption/encrypt.test.ts
diff --git a/src/legacy/core_plugins/telemetry/server/collectors/encryption/encrypt.ts b/src/plugins/telemetry_collection_manager/server/encryption/encrypt.ts
similarity index 100%
rename from src/legacy/core_plugins/telemetry/server/collectors/encryption/encrypt.ts
rename to src/plugins/telemetry_collection_manager/server/encryption/encrypt.ts
diff --git a/src/legacy/core_plugins/telemetry/server/collectors/encryption/index.ts b/src/plugins/telemetry_collection_manager/server/encryption/index.ts
similarity index 100%
rename from src/legacy/core_plugins/telemetry/server/collectors/encryption/index.ts
rename to src/plugins/telemetry_collection_manager/server/encryption/index.ts
diff --git a/src/legacy/core_plugins/telemetry/server/collectors/encryption/telemetry_jwks.ts b/src/plugins/telemetry_collection_manager/server/encryption/telemetry_jwks.ts
similarity index 100%
rename from src/legacy/core_plugins/telemetry/server/collectors/encryption/telemetry_jwks.ts
rename to src/plugins/telemetry_collection_manager/server/encryption/telemetry_jwks.ts
diff --git a/src/plugins/telemetry_collection_manager/server/index.ts b/src/plugins/telemetry_collection_manager/server/index.ts
new file mode 100644
index 0000000000000..8761c28e14095
--- /dev/null
+++ b/src/plugins/telemetry_collection_manager/server/index.ts
@@ -0,0 +1,41 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { PluginInitializerContext } from 'kibana/server';
+import { TelemetryCollectionManagerPlugin } from './plugin';
+
+//  This exports static code and TypeScript types,
+//  as well as, Kibana Platform `plugin()` initializer.
+
+export function plugin(initializerContext: PluginInitializerContext) {
+  return new TelemetryCollectionManagerPlugin(initializerContext);
+}
+
+export {
+  TelemetryCollectionManagerPluginSetup,
+  TelemetryCollectionManagerPluginStart,
+  ESLicense,
+  StatsCollectionConfig,
+  StatsGetter,
+  StatsGetterConfig,
+  StatsCollectionContext,
+  ClusterDetails,
+  ClusterDetailsGetter,
+  LicenseGetter,
+} from './types';
diff --git a/src/plugins/telemetry_collection_manager/server/plugin.ts b/src/plugins/telemetry_collection_manager/server/plugin.ts
new file mode 100644
index 0000000000000..7e8dff9e0aec1
--- /dev/null
+++ b/src/plugins/telemetry_collection_manager/server/plugin.ts
@@ -0,0 +1,253 @@
+/*
+ * 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 { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
+import {
+  PluginInitializerContext,
+  CoreSetup,
+  CoreStart,
+  Plugin,
+  Logger,
+} from '../../../core/server';
+
+import {
+  TelemetryCollectionManagerPluginSetup,
+  TelemetryCollectionManagerPluginStart,
+  BasicStatsPayload,
+  CollectionConfig,
+  Collection,
+  StatsGetterConfig,
+  StatsCollectionConfig,
+  UsageStatsPayload,
+  StatsCollectionContext,
+} from './types';
+
+import { encryptTelemetry } from './encryption';
+
+interface TelemetryCollectionPluginsDepsSetup {
+  usageCollection: UsageCollectionSetup;
+}
+
+export class TelemetryCollectionManagerPlugin
+  implements Plugin<TelemetryCollectionManagerPluginSetup, TelemetryCollectionManagerPluginStart> {
+  private readonly logger: Logger;
+  private readonly collections: Array<Collection<any>> = [];
+  private usageGetterMethodPriority = -1;
+  private usageCollection?: UsageCollectionSetup;
+  private readonly isDev: boolean;
+  private readonly version: string;
+
+  constructor(initializerContext: PluginInitializerContext) {
+    this.logger = initializerContext.logger.get();
+    this.isDev = initializerContext.env.mode.dev;
+    this.version = initializerContext.env.packageInfo.version;
+  }
+
+  public setup(core: CoreSetup, { usageCollection }: TelemetryCollectionPluginsDepsSetup) {
+    this.usageCollection = usageCollection;
+
+    return {
+      setCollection: this.setCollection.bind(this),
+      getOptInStats: this.getOptInStats.bind(this),
+      getStats: this.getStats.bind(this),
+    };
+  }
+
+  public start(core: CoreStart) {
+    return {
+      setCollection: this.setCollection.bind(this),
+      getOptInStats: this.getOptInStats.bind(this),
+      getStats: this.getStats.bind(this),
+    };
+  }
+
+  public stop() {}
+
+  private setCollection<CustomContext extends Record<string, any>, T extends BasicStatsPayload>(
+    collectionConfig: CollectionConfig<CustomContext, T>
+  ) {
+    const {
+      title,
+      priority,
+      esCluster,
+      statsGetter,
+      clusterDetailsGetter,
+      licenseGetter,
+    } = collectionConfig;
+
+    if (typeof priority !== 'number') {
+      throw new Error('priority must be set.');
+    }
+    if (priority === this.usageGetterMethodPriority) {
+      throw new Error(`A Usage Getter with the same priority is already set.`);
+    }
+
+    if (priority > this.usageGetterMethodPriority) {
+      if (!statsGetter) {
+        throw Error('Stats getter method not set.');
+      }
+      if (!esCluster) {
+        throw Error('esCluster name must be set for the getCluster method.');
+      }
+      if (!clusterDetailsGetter) {
+        throw Error('Cluster UUIds method is not set.');
+      }
+      if (!licenseGetter) {
+        throw Error('License getter method not set.');
+      }
+
+      this.collections.unshift({
+        licenseGetter,
+        statsGetter,
+        clusterDetailsGetter,
+        esCluster,
+        title,
+      });
+      this.usageGetterMethodPriority = priority;
+    }
+  }
+
+  private getStatsCollectionConfig(
+    config: StatsGetterConfig,
+    collection: Collection,
+    usageCollection: UsageCollectionSetup
+  ): StatsCollectionConfig {
+    const { start, end, request } = config;
+
+    const callCluster = config.unencrypted
+      ? collection.esCluster.asScoped(request).callAsCurrentUser
+      : collection.esCluster.callAsInternalUser;
+
+    return { callCluster, start, end, usageCollection };
+  }
+
+  private async getOptInStats(optInStatus: boolean, config: StatsGetterConfig) {
+    if (!this.usageCollection) {
+      return [];
+    }
+    for (const collection of this.collections) {
+      const statsCollectionConfig = this.getStatsCollectionConfig(
+        config,
+        collection,
+        this.usageCollection
+      );
+      try {
+        const optInStats = await this.getOptInStatsForCollection(
+          collection,
+          optInStatus,
+          statsCollectionConfig
+        );
+        if (optInStats && optInStats.length) {
+          this.logger.debug(`Got Opt In stats using ${collection.title} collection.`);
+          if (config.unencrypted) {
+            return optInStats;
+          }
+          return encryptTelemetry(optInStats, this.isDev);
+        }
+      } catch (err) {
+        this.logger.debug(`Failed to collect any opt in stats with registered collections.`);
+        // swallow error to try next collection;
+      }
+    }
+
+    return [];
+  }
+
+  private getOptInStatsForCollection = async (
+    collection: Collection,
+    optInStatus: boolean,
+    statsCollectionConfig: StatsCollectionConfig
+  ) => {
+    const context: StatsCollectionContext = {
+      logger: this.logger.get(collection.title),
+      isDev: this.isDev,
+      version: this.version,
+      ...collection.customContext,
+    };
+
+    const clustersDetails = await collection.clusterDetailsGetter(statsCollectionConfig, context);
+    return clustersDetails.map(({ clusterUuid }) => ({
+      cluster_uuid: clusterUuid,
+      opt_in_status: optInStatus,
+    }));
+  };
+
+  private async getStats(config: StatsGetterConfig) {
+    if (!this.usageCollection) {
+      return [];
+    }
+    for (const collection of this.collections) {
+      const statsCollectionConfig = this.getStatsCollectionConfig(
+        config,
+        collection,
+        this.usageCollection
+      );
+      try {
+        const usageData = await this.getUsageForCollection(collection, statsCollectionConfig);
+        if (usageData.length) {
+          this.logger.debug(`Got Usage using ${collection.title} collection.`);
+          if (config.unencrypted) {
+            return usageData;
+          }
+          return encryptTelemetry(usageData, this.isDev);
+        }
+      } catch (err) {
+        this.logger.debug(
+          `Failed to collect any usage with registered collection ${collection.title}.`
+        );
+        // swallow error to try next collection;
+      }
+    }
+
+    return [];
+  }
+
+  private async getUsageForCollection(
+    collection: Collection,
+    statsCollectionConfig: StatsCollectionConfig
+  ): Promise<UsageStatsPayload[]> {
+    const context: StatsCollectionContext = {
+      logger: this.logger.get(collection.title),
+      isDev: this.isDev,
+      version: this.version,
+      ...collection.customContext,
+    };
+
+    const clustersDetails = await collection.clusterDetailsGetter(statsCollectionConfig, context);
+
+    if (clustersDetails.length === 0) {
+      // don't bother doing a further lookup, try next collection.
+      return [];
+    }
+
+    const [stats, licenses] = await Promise.all([
+      collection.statsGetter(clustersDetails, statsCollectionConfig, context),
+      collection.licenseGetter(clustersDetails, statsCollectionConfig, context),
+    ]);
+
+    return stats.map(stat => {
+      const license = licenses[stat.cluster_uuid];
+      return {
+        ...(license ? { license } : {}),
+        ...stat,
+        collectionSource: collection.title,
+      };
+    });
+  }
+}
diff --git a/src/plugins/telemetry_collection_manager/server/types.ts b/src/plugins/telemetry_collection_manager/server/types.ts
new file mode 100644
index 0000000000000..e23d6a4c388f4
--- /dev/null
+++ b/src/plugins/telemetry_collection_manager/server/types.ts
@@ -0,0 +1,150 @@
+/*
+ * 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 { APICaller, Logger, KibanaRequest, IClusterClient } from 'kibana/server';
+import { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
+import { TelemetryCollectionManagerPlugin } from './plugin';
+
+export interface TelemetryCollectionManagerPluginSetup {
+  setCollection: <CustomContext extends Record<string, any>, T extends BasicStatsPayload>(
+    collectionConfig: CollectionConfig<CustomContext, T>
+  ) => void;
+  getOptInStats: TelemetryCollectionManagerPlugin['getOptInStats'];
+  getStats: TelemetryCollectionManagerPlugin['getStats'];
+}
+
+export interface TelemetryCollectionManagerPluginStart {
+  setCollection: <CustomContext extends Record<string, any>, T extends BasicStatsPayload>(
+    collectionConfig: CollectionConfig<CustomContext, T>
+  ) => void;
+  getOptInStats: TelemetryCollectionManagerPlugin['getOptInStats'];
+  getStats: TelemetryCollectionManagerPlugin['getStats'];
+}
+
+export interface TelemetryOptInStats {
+  cluster_uuid: string;
+  opt_in_status: boolean;
+}
+
+export interface BaseStatsGetterConfig {
+  unencrypted: boolean;
+  start: string;
+  end: string;
+  request?: KibanaRequest;
+}
+
+export interface EncryptedStatsGetterConfig extends BaseStatsGetterConfig {
+  unencrypted: false;
+}
+
+export interface UnencryptedStatsGetterConfig extends BaseStatsGetterConfig {
+  unencrypted: true;
+  request: KibanaRequest;
+}
+
+export interface ClusterDetails {
+  clusterUuid: string;
+}
+
+export interface StatsCollectionConfig {
+  usageCollection: UsageCollectionSetup;
+  callCluster: APICaller;
+  start: string | number;
+  end: string | number;
+}
+
+export interface BasicStatsPayload {
+  timestamp: string;
+  cluster_uuid: string;
+  cluster_name: string;
+  version: string;
+  cluster_stats: object;
+  collection?: string;
+  stack_stats: object;
+}
+
+export interface UsageStatsPayload extends BasicStatsPayload {
+  license?: ESLicense;
+  collectionSource: string;
+}
+
+// From https://www.elastic.co/guide/en/elasticsearch/reference/current/get-license.html
+export interface ESLicense {
+  status: string;
+  uid: string;
+  type: string;
+  issue_date: string;
+  issue_date_in_millis: number;
+  expiry_date: string;
+  expirty_date_in_millis: number;
+  max_nodes: number;
+  issued_to: string;
+  issuer: string;
+  start_date_in_millis: number;
+}
+
+export interface StatsCollectionContext {
+  logger: Logger;
+  isDev: boolean;
+  version: string;
+}
+
+export type StatsGetterConfig = UnencryptedStatsGetterConfig | EncryptedStatsGetterConfig;
+export type ClusterDetailsGetter<CustomContext extends Record<string, any> = {}> = (
+  config: StatsCollectionConfig,
+  context: StatsCollectionContext & CustomContext
+) => Promise<ClusterDetails[]>;
+export type StatsGetter<
+  CustomContext extends Record<string, any> = {},
+  T extends BasicStatsPayload = BasicStatsPayload
+> = (
+  clustersDetails: ClusterDetails[],
+  config: StatsCollectionConfig,
+  context: StatsCollectionContext & CustomContext
+) => Promise<T[]>;
+export type LicenseGetter<CustomContext extends Record<string, any> = {}> = (
+  clustersDetails: ClusterDetails[],
+  config: StatsCollectionConfig,
+  context: StatsCollectionContext & CustomContext
+) => Promise<{ [clusterUuid: string]: ESLicense | undefined }>;
+
+export interface CollectionConfig<
+  CustomContext extends Record<string, any> = {},
+  T extends BasicStatsPayload = BasicStatsPayload
+> {
+  title: string;
+  priority: number;
+  esCluster: IClusterClient;
+  statsGetter: StatsGetter<CustomContext, T>;
+  clusterDetailsGetter: ClusterDetailsGetter<CustomContext>;
+  licenseGetter: LicenseGetter<CustomContext>;
+  customContext?: CustomContext;
+}
+
+export interface Collection<
+  CustomContext extends Record<string, any> = {},
+  T extends BasicStatsPayload = BasicStatsPayload
+> {
+  customContext?: CustomContext;
+  statsGetter: StatsGetter<CustomContext, T>;
+  licenseGetter: LicenseGetter<CustomContext>;
+  clusterDetailsGetter: ClusterDetailsGetter<CustomContext>;
+  esCluster: IClusterClient;
+  title: string;
+}
diff --git a/src/plugins/telemetry_management_section/README.md b/src/plugins/telemetry_management_section/README.md
new file mode 100644
index 0000000000000..0f795786720c9
--- /dev/null
+++ b/src/plugins/telemetry_management_section/README.md
@@ -0,0 +1,5 @@
+# Telemetry Management Section
+
+This plugin adds the Advanced Settings section for the Usage Data collection (aka Telemetry).
+
+The reason for having it separated from the `telemetry` plugin is to avoid circular dependencies. The plugin `advancedSettings` depends on the `home` app that depends on the `telemetry` plugin because of the telemetry banner in the welcome screen.
diff --git a/src/plugins/telemetry_management_section/kibana.json b/src/plugins/telemetry_management_section/kibana.json
new file mode 100644
index 0000000000000..3364833def4d6
--- /dev/null
+++ b/src/plugins/telemetry_management_section/kibana.json
@@ -0,0 +1,10 @@
+{
+  "id": "telemetryManagementSection",
+  "version": "kibana",
+  "server": false,
+  "ui": true,
+  "requiredPlugins": [
+    "advancedSettings",
+    "telemetry"
+  ]
+}
diff --git a/src/plugins/telemetry/public/components/__snapshots__/opt_in_example_flyout.test.tsx.snap b/src/plugins/telemetry_management_section/public/components/__snapshots__/opt_in_example_flyout.test.tsx.snap
similarity index 100%
rename from src/plugins/telemetry/public/components/__snapshots__/opt_in_example_flyout.test.tsx.snap
rename to src/plugins/telemetry_management_section/public/components/__snapshots__/opt_in_example_flyout.test.tsx.snap
diff --git a/src/plugins/telemetry_management_section/public/components/index.ts b/src/plugins/telemetry_management_section/public/components/index.ts
new file mode 100644
index 0000000000000..86954744e7a01
--- /dev/null
+++ b/src/plugins/telemetry_management_section/public/components/index.ts
@@ -0,0 +1,22 @@
+/*
+ * 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 { OptInExampleFlyout } from './opt_in_example_flyout';
+export { telemetryManagementSectionWrapper } from './telemetry_management_section_wrapper';
+export { TelemetryManagementSection } from './telemetry_management_section';
diff --git a/src/plugins/telemetry/public/components/opt_in_example_flyout.test.tsx b/src/plugins/telemetry_management_section/public/components/opt_in_example_flyout.test.tsx
similarity index 100%
rename from src/plugins/telemetry/public/components/opt_in_example_flyout.test.tsx
rename to src/plugins/telemetry_management_section/public/components/opt_in_example_flyout.test.tsx
diff --git a/src/plugins/telemetry/public/components/opt_in_example_flyout.tsx b/src/plugins/telemetry_management_section/public/components/opt_in_example_flyout.tsx
similarity index 100%
rename from src/plugins/telemetry/public/components/opt_in_example_flyout.tsx
rename to src/plugins/telemetry_management_section/public/components/opt_in_example_flyout.tsx
diff --git a/src/plugins/telemetry/public/components/telemetry_management_section.tsx b/src/plugins/telemetry_management_section/public/components/telemetry_management_section.tsx
similarity index 96%
rename from src/plugins/telemetry/public/components/telemetry_management_section.tsx
rename to src/plugins/telemetry_management_section/public/components/telemetry_management_section.tsx
index bf14c33a48048..26e075b666593 100644
--- a/src/plugins/telemetry/public/components/telemetry_management_section.tsx
+++ b/src/plugins/telemetry_management_section/public/components/telemetry_management_section.tsx
@@ -31,11 +31,14 @@ import {
 
 import { FormattedMessage } from '@kbn/i18n/react';
 import { i18n } from '@kbn/i18n';
-import { PRIVACY_STATEMENT_URL } from '../../common/constants';
+import { TelemetryPluginSetup } from 'src/plugins/telemetry/public';
+import { PRIVACY_STATEMENT_URL } from '../../../telemetry/common/constants';
 import { OptInExampleFlyout } from './opt_in_example_flyout';
 import { Field } from '../../../advanced_settings/public';
-import { ToastsStart } from '../../../../core/public/';
-import { TelemetryService } from '../services/telemetry_service';
+import { ToastsStart } from '../../../../core/public';
+
+type TelemetryService = TelemetryPluginSetup['telemetryService'];
+
 const SEARCH_TERMS = ['telemetry', 'usage', 'data', 'usage data'];
 
 interface Props {
diff --git a/src/plugins/telemetry_management_section/public/components/telemetry_management_section_wrapper.tsx b/src/plugins/telemetry_management_section/public/components/telemetry_management_section_wrapper.tsx
new file mode 100644
index 0000000000000..b8b20b68f666e
--- /dev/null
+++ b/src/plugins/telemetry_management_section/public/components/telemetry_management_section_wrapper.tsx
@@ -0,0 +1,40 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import React from 'react';
+import { TelemetryPluginSetup } from 'src/plugins/telemetry/public';
+import { TelemetryManagementSection } from './telemetry_management_section';
+
+// It should be this but the types are way too vague in the AdvancedSettings plugin `Record<string, any>`
+// type Props = Omit<TelemetryManagementSection['props'], 'telemetryService'>;
+type Props = any;
+
+export function telemetryManagementSectionWrapper(
+  telemetryService: TelemetryPluginSetup['telemetryService']
+) {
+  const TelemetryManagementSectionWrapper = (props: Props) => (
+    <TelemetryManagementSection
+      showAppliesSettingMessage={true}
+      telemetryService={telemetryService}
+      {...props}
+    />
+  );
+
+  return TelemetryManagementSectionWrapper;
+}
diff --git a/src/legacy/server/i18n/constants.js b/src/plugins/telemetry_management_section/public/index.ts
similarity index 85%
rename from src/legacy/server/i18n/constants.js
rename to src/plugins/telemetry_management_section/public/index.ts
index a7a410dbcb5b3..6a80cdd98b1a3 100644
--- a/src/legacy/server/i18n/constants.js
+++ b/src/plugins/telemetry_management_section/public/index.ts
@@ -17,4 +17,8 @@
  * under the License.
  */
 
-export const I18N_RC = '.i18nrc.json';
+import { TelemetryManagementSectionPlugin } from './plugin';
+
+export function plugin() {
+  return new TelemetryManagementSectionPlugin();
+}
diff --git a/src/plugins/telemetry_management_section/public/plugin.ts b/src/plugins/telemetry_management_section/public/plugin.ts
new file mode 100644
index 0000000000000..738b38c36d30d
--- /dev/null
+++ b/src/plugins/telemetry_management_section/public/plugin.ts
@@ -0,0 +1,54 @@
+/*
+ * 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 { AdvancedSettingsSetup } from 'src/plugins/advanced_settings/public';
+import { TelemetryPluginSetup } from 'src/plugins/telemetry/public';
+import { Plugin, CoreStart, CoreSetup } from '../../../core/public';
+
+import { telemetryManagementSectionWrapper } from './components/telemetry_management_section_wrapper';
+
+export interface TelemetryPluginConfig {
+  enabled: boolean;
+  url: string;
+  banner: boolean;
+  allowChangingOptInStatus: boolean;
+  optIn: boolean | null;
+  optInStatusUrl: string;
+  sendUsageFrom: 'browser' | 'server';
+  telemetryNotifyUserAboutOptInDefault?: boolean;
+}
+
+export interface TelemetryManagementSectionPluginDepsSetup {
+  telemetry: TelemetryPluginSetup;
+  advancedSettings: AdvancedSettingsSetup;
+}
+
+export class TelemetryManagementSectionPlugin implements Plugin {
+  public setup(
+    core: CoreSetup,
+    { advancedSettings, telemetry: { telemetryService } }: TelemetryManagementSectionPluginDepsSetup
+  ) {
+    advancedSettings.component.register(
+      advancedSettings.component.componentType.PAGE_FOOTER_COMPONENT,
+      telemetryManagementSectionWrapper(telemetryService),
+      true
+    );
+  }
+
+  public start(core: CoreStart) {}
+}
diff --git a/src/plugins/usage_collection/README.md b/src/plugins/usage_collection/README.md
index 4b81fe9b22083..1c97c9c63c0e2 100644
--- a/src/plugins/usage_collection/README.md
+++ b/src/plugins/usage_collection/README.md
@@ -10,37 +10,100 @@ To integrate with the telemetry services for usage collection of your feature, t
 
 All you need to provide is a `type` for organizing your fields, and a `fetch` method for returning your usage data. Then you need to make the Telemetry service aware of the collector by registering it.
 
-### New Platform:
+### New Platform
 
 1. Make sure `usageCollection` is in your optional Plugins:
 
-```json
-// plugin/kibana.json
-{
-  "id": "...",
-  "optionalPlugins": ["usageCollection"]
-}
-```
+    ```json
+    // plugin/kibana.json
+    {
+      "id": "...",
+      "optionalPlugins": ["usageCollection"]
+    }
+    ```
 
 2. Register Usage collector in the `setup` function:
 
+    ```ts
+    // server/plugin.ts
+    import { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
+    import { CoreSetup, CoreStart } from 'kibana/server';
+
+    class Plugin {
+      public setup(core: CoreSetup, plugins: { usageCollection?: UsageCollectionSetup }) {
+        registerMyPluginUsageCollector(plugins.usageCollection);
+      }
+
+      public start(core: CoreStart) {}
+    }
+    ```
+
+3. Creating and registering a Usage Collector. Ideally collectors would be defined in a separate directory `server/collectors/register.ts`.
+
+    ```ts
+    // server/collectors/register.ts
+    import { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
+    import { APICluster } from 'kibana/server';
+
+    export function registerMyPluginUsageCollector(usageCollection?: UsageCollectionSetup): void {
+      // usageCollection is an optional dependency, so make sure to return if it is not registered.
+      if (!usageCollection) {
+        return;
+      }
+
+      // create usage collector
+      const myCollector = usageCollection.makeUsageCollector({
+        type: MY_USAGE_TYPE,
+        fetch: async (callCluster: APICluster) => {
+
+        // query ES and get some data
+        // summarize the data into a model
+        // return the modeled object that includes whatever you want to track
+
+          return {
+            my_objects: {
+              total: SOME_NUMBER
+            }
+          };
+        },
+      });
+
+      // register usage collector
+      usageCollection.registerCollector(myCollector);
+    }
+    ```
+
+Some background: The `callCluster` that gets passed to the `fetch` method is created in a way that's a bit tricky, to support multiple contexts the `fetch` method could be called. Your `fetch` method could get called as a result of an HTTP API request: in this case, the `callCluster` function wraps `callWithRequest`, and the request headers are expected to have read privilege on the entire `.kibana` index. The use case for this is stats pulled from a Kibana Metricbeat module, where the Beat calls Kibana's stats API in Kibana to invoke collection.
+
+Note: there will be many cases where you won't need to use the `callCluster` function that gets passed in to your `fetch` method at all. Your feature might have an accumulating value in server memory, or read something from the OS, or use other clients like a custom SavedObjects client. In that case it's up to the plugin to initialize those clients like the example below:
+
 ```ts
 // server/plugin.ts
+import { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
+import { CoreSetup, CoreStart } from 'kibana/server';
+
 class Plugin {
-  setup(core, plugins) {
-    registerMyPluginUsageCollector(plugins.usageCollection);
+  private savedObjectsClient?: ISavedObjectsRepository;
+
+  public setup(core: CoreSetup, plugins: { usageCollection?: UsageCollectionSetup }) {
+    registerMyPluginUsageCollector(() => this.savedObjectsClient, plugins.usageCollection);
+  }
+
+  public start(core: CoreStart) {
+    this.savedObjectsClient = core.savedObjects.client
   }
 }
 ```
 
-3. Creating and registering a Usage Collector. Ideally collectors would be defined in a separate directory `server/collectors/register.ts`.
-
 ```ts
 // server/collectors/register.ts
 import { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
-import { CallCluster } from 'src/legacy/core_plugins/elasticsearch';
+import { ISavedObjectsRepository } from 'kibana/server';
 
-export function registerMyPluginUsageCollector(usageCollection?: UsageCollectionSetup): void {
+export function registerMyPluginUsageCollector(
+  getSavedObjectsClient: () => ISavedObjectsRepository | undefined,
+  usageCollection?: UsageCollectionSetup
+  ): void {
   // usageCollection is an optional dependency, so make sure to return if it is not registered.
   if (!usageCollection) {
     return;
@@ -49,17 +112,12 @@ export function registerMyPluginUsageCollector(usageCollection?: UsageCollection
   // create usage collector
   const myCollector = usageCollection.makeUsageCollector({
     type: MY_USAGE_TYPE,
-    fetch: async (callCluster: CallCluster) => {
+    isReady: () => typeof getSavedObjectsClient() !== 'undefined',
+    fetch: async () => {
+      const savedObjectsClient = getSavedObjectsClient()!;
+      // get something from the savedObjects
 
-    // query ES and get some data
-    // summarize the data into a model
-    // return the modeled object that includes whatever you want to track
-
-      return {
-        my_objects: {
-          total: SOME_NUMBER
-        }
-      };
+      return { my_objects };
     },
   });
 
@@ -68,11 +126,7 @@ export function registerMyPluginUsageCollector(usageCollection?: UsageCollection
 }
 ```
 
-Some background: The `callCluster` that gets passed to the `fetch` method is created in a way that's a bit tricky, to support multiple contexts the `fetch` method could be called. Your `fetch` method could get called as a result of an HTTP API request: in this case, the `callCluster` function wraps `callWithRequest`, and the request headers are expected to have read privilege on the entire `.kibana` index. The use case for this is stats pulled from a Kibana Metricbeat module, where the Beat calls Kibana's stats API in Kibana to invoke collection.
-
-Note: there will be many cases where you won't need to use the `callCluster` function that gets passed in to your `fetch` method at all. Your feature might have an accumulating value in server memory, or read something from the OS.
-
-### Migrating to NP from Legacy Plugins:
+### Migrating to NP from Legacy Plugins
 
 Pass `usageCollection` to the setup NP plugin setup function under plugins. Inside the `setup` function call the `registerCollector` like what you'd do in the NP example above.
 
@@ -91,7 +145,7 @@ export const myPlugin = (kibana: any) => {
 }
 ```
 
-### Legacy Plugins:
+### Legacy Plugins
 
 Typically, a plugin will create the collector object and register it with the Telemetry service from the `init` method of the plugin definition, or a helper module called from `init`.
 
@@ -109,7 +163,7 @@ export const myPlugin = (kibana: any) => {
 
 ## Update the telemetry payload and telemetry cluster field mappings
 
-There is a module in the telemetry service that creates the payload of data that gets sent up to the telemetry cluster. 
+There is a module in the telemetry service that creates the payload of data that gets sent up to the telemetry cluster.
 
 New fields added to the telemetry payload currently mean that telemetry cluster field mappings have to be updated, so they can be searched and aggregated in Kibana visualizations. This is also a short-term obligation. In the next refactoring phase, collectors will need to use a proscribed data model that eliminates maintenance of mappings in the telemetry cluster.
 
@@ -122,12 +176,14 @@ There are a few ways you can test that your usage collector is working properly.
     - The `.monitoring-*` indices, when Monitoring is enabled. Monitoring enhances the sent payload of telemetry by producing usage data potentially of multiple clusters that exist in the monitoring data. Monitoring data is time-based, and the time frame of collection is the last 15 minutes.
     - Live-pulled from ES API endpoints. This will get just real-time stats without context of historical data.
     - The dev script in x-pack can be run on the command-line with:
-      ```
+
+      ```shell
       cd x-pack
       node scripts/api_debug.js telemetry --host=http://localhost:5601
       ```
+
       Where `http://localhost:5601` is a Kibana server running in dev mode. If needed, authentication and basePath info can be provided in the command as well.
-    - Automatic inclusion of all the stats fetched by collectors is added in https://github.com/elastic/kibana/pull/22336 / 6.5.0
+    - Automatic inclusion of all the stats fetched by collectors is added in [#22336](https://github.com/elastic/kibana/pull/22336) / 6.5.0
 3. In Dev mode, Kibana will send telemetry data to a staging telemetry cluster. Assuming you have access to the staging cluster, you can log in and check the latest documents for your new fields.
 4. If you catch the network traffic coming from your browser when a telemetry payload is sent, you can examine the request payload body to see the data. This can be tricky as telemetry payloads are sent only once per day per browser. Use incognito mode or clear your localStorage data to force a telemetry payload.
 
@@ -157,7 +213,33 @@ the name of a dashboard they've viewed, or the timestamp of the interaction.
 
 ## How to use it
 
-To track a user interaction, import the `createUiStatsReporter` helper function from UI Metric app:
+To track a user interaction, use the `reportUiStats` method exposed by the plugin `usageCollection` in the public side:
+
+1. Similarly to the server-side usage collection, make sure `usageCollection` is in your optional Plugins:
+
+    ```json
+    // plugin/kibana.json
+    {
+      "id": "...",
+      "optionalPlugins": ["usageCollection"]
+    }
+    ```
+
+2. Register Usage collector in the `setup` function:
+
+    ```ts
+    // public/plugin.ts
+    class Plugin {
+      setup(core, { usageCollection }) {
+        if (usageCollection) {
+          // Call the following method as many times as you want to report an increase in the count for this event
+          usageCollection.reportUiStats(`<AppName>`, usageCollection.METRIC_TYPE.CLICK, `<EventName>`);
+        }
+      }
+    }
+    ```
+
+Alternatively, in the Legacy world you can still import the `createUiStatsReporter` helper function from UI Metric app:
 
 ```js
 import { createUiStatsReporter, METRIC_TYPE } from 'relative/path/to/src/legacy/core_plugins/ui_metric/public';
@@ -167,9 +249,10 @@ trackMetric('click', `<EventName>`);
 ```
 
 Metric Types:
-  - `METRIC_TYPE.CLICK` for tracking clicks `trackMetric(METRIC_TYPE.CLICK, 'my_button_clicked');`
-  - `METRIC_TYPE.LOADED` for a component load or page load `trackMetric(METRIC_TYPE.LOADED', 'my_component_loaded');`
-  - `METRIC_TYPE.COUNT` for a tracking a misc count `trackMetric(METRIC_TYPE.COUNT', 'my_counter', <count> });`
+
+- `METRIC_TYPE.CLICK` for tracking clicks `trackMetric(METRIC_TYPE.CLICK, 'my_button_clicked');`
+- `METRIC_TYPE.LOADED` for a component load or page load `trackMetric(METRIC_TYPE.LOADED', 'my_component_loaded');`
+- `METRIC_TYPE.COUNT` for a tracking a misc count `trackMetric(METRIC_TYPE.COUNT', 'my_counter', <count> });`
 
 Call this function whenever you would like to track a user interaction within your app. The function
 accepts two arguments, `metricType` and `eventNames`. These should be underscore-delimited strings.
@@ -196,7 +279,7 @@ use a `eventName` of  `create_vis_1m`, `create_vis_5m`, `create_vis_20m`, or `cr
 ## How it works
 
 Under the hood, your app and metric type will be stored in a saved object of type `user-metric` and the
-ID `ui-metric:my_app:my_metric`. This saved object will have a `count` property which will be incremented 
+ID `ui-metric:my_app:my_metric`. This saved object will have a `count` property which will be incremented
 every time the above URI is hit.
 
 These saved objects are automatically consumed by the stats API and surfaced under the
@@ -216,4 +299,6 @@ These saved objects are automatically consumed by the stats API and surfaced und
 ```
 
 By storing these metrics and their counts as key-value pairs, we can add more metrics without having
-to worry about exceeding the 1000-field soft limit in Elasticsearch.
\ No newline at end of file
+to worry about exceeding the 1000-field soft limit in Elasticsearch.
+
+The only caveat is that it makes it harder to consume in Kibana when analysing each entry in the array separately. In the telemetry team we are working to find a solution to this. We are building a new way of reporting telemetry called [Pulse](../../../rfcs/text/0008_pulse.md) that will help on making these UI-Metrics easier to consume.
diff --git a/src/plugins/usage_collection/server/collector/collector.ts b/src/plugins/usage_collection/server/collector/collector.ts
index 91951aa2f3edf..b4f86f67e798d 100644
--- a/src/plugins/usage_collection/server/collector/collector.ts
+++ b/src/plugins/usage_collection/server/collector/collector.ts
@@ -17,15 +17,14 @@
  * under the License.
  */
 
-import { Logger } from 'kibana/server';
-import { CallCluster } from 'src/legacy/core_plugins/elasticsearch';
+import { Logger, APICaller } from 'kibana/server';
 
 export type CollectorFormatForBulkUpload<T, U> = (result: T) => { type: string; payload: U };
 
 export interface CollectorOptions<T = unknown, U = T> {
   type: string;
   init?: Function;
-  fetch: (callCluster: CallCluster) => Promise<T> | T;
+  fetch: (callCluster: APICaller) => Promise<T> | T;
   /*
    * A hook for allowing the fetched data payload to be organized into a typed
    * data model for internal bulk upload. See defaultFormatterForBulkUpload for
diff --git a/src/plugins/usage_collection/server/collector/collector_set.ts b/src/plugins/usage_collection/server/collector/collector_set.ts
index 6cc5d057b080a..64a48025be248 100644
--- a/src/plugins/usage_collection/server/collector/collector_set.ts
+++ b/src/plugins/usage_collection/server/collector/collector_set.ts
@@ -18,8 +18,7 @@
  */
 
 import { snakeCase } from 'lodash';
-import { Logger } from 'kibana/server';
-import { CallCluster } from 'src/legacy/core_plugins/elasticsearch';
+import { Logger, APICaller } from 'kibana/server';
 import { Collector, CollectorOptions } from './collector';
 import { UsageCollector } from './usage_collector';
 
@@ -31,7 +30,7 @@ interface CollectorSetConfig {
 
 export class CollectorSet {
   private _waitingForAllCollectorsTimestamp?: number;
-  private logger: Logger;
+  private readonly logger: Logger;
   private readonly maximumWaitTimeForAllCollectorsInS: number;
   private collectors: Array<Collector<any, any>> = [];
   constructor({ logger, maximumWaitTimeForAllCollectorsInS, collectors = [] }: CollectorSetConfig) {
@@ -112,7 +111,7 @@ export class CollectorSet {
   };
 
   public bulkFetch = async (
-    callCluster: CallCluster,
+    callCluster: APICaller,
     collectors: Array<Collector<any, any>> = this.collectors
   ) => {
     const responses = [];
@@ -135,13 +134,13 @@ export class CollectorSet {
   /*
    * @return {new CollectorSet}
    */
-  public getFilteredCollectorSet = (filter: any) => {
+  public getFilteredCollectorSet = (filter: (col: Collector) => boolean) => {
     const filtered = this.collectors.filter(filter);
     return this.makeCollectorSetFromArray(filtered);
   };
 
-  public bulkFetchUsage = async (callCluster: CallCluster) => {
-    const usageCollectors = this.getFilteredCollectorSet((c: any) => c instanceof UsageCollector);
+  public bulkFetchUsage = async (callCluster: APICaller) => {
+    const usageCollectors = this.getFilteredCollectorSet(c => c instanceof UsageCollector);
     return await this.bulkFetch(callCluster, usageCollectors.collectors);
   };
 
diff --git a/src/plugins/usage_collection/server/index.ts b/src/plugins/usage_collection/server/index.ts
index 6a28dba50a915..a2769c8b4b405 100644
--- a/src/plugins/usage_collection/server/index.ts
+++ b/src/plugins/usage_collection/server/index.ts
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { PluginInitializerContext } from '../../../../src/core/server';
+import { PluginInitializerContext } from 'kibana/server';
 import { UsageCollectionPlugin } from './plugin';
 
 export { UsageCollectionSetup } from './plugin';
diff --git a/src/plugins/usage_collection/server/plugin.ts b/src/plugins/usage_collection/server/plugin.ts
index 52acb5b3fc86f..00584e1fd5d86 100644
--- a/src/plugins/usage_collection/server/plugin.ts
+++ b/src/plugins/usage_collection/server/plugin.ts
@@ -18,15 +18,21 @@
  */
 
 import { first } from 'rxjs/operators';
-import { CoreStart, ISavedObjectsRepository } from 'kibana/server';
+import {
+  PluginInitializerContext,
+  Logger,
+  CoreSetup,
+  CoreStart,
+  ISavedObjectsRepository,
+  Plugin,
+} from 'kibana/server';
 import { ConfigType } from './config';
-import { PluginInitializerContext, Logger, CoreSetup } from '../../../../src/core/server';
 import { CollectorSet } from './collector';
 import { setupRoutes } from './routes';
 
 export type UsageCollectionSetup = CollectorSet;
-export class UsageCollectionPlugin {
-  logger: Logger;
+export class UsageCollectionPlugin implements Plugin<CollectorSet> {
+  private readonly logger: Logger;
   private savedObjects?: ISavedObjectsRepository;
   constructor(private readonly initializerContext: PluginInitializerContext) {
     this.logger = this.initializerContext.logger.get();
@@ -39,7 +45,7 @@ export class UsageCollectionPlugin {
       .toPromise();
 
     const collectorSet = new CollectorSet({
-      logger: this.logger,
+      logger: this.logger.get('collector-set'),
       maximumWaitTimeForAllCollectorsInS: config.maximumWaitTimeForAllCollectorsInS,
     });
 
diff --git a/test/tsconfig.json b/test/tsconfig.json
index 71c9e375a4124..285d3db64a874 100644
--- a/test/tsconfig.json
+++ b/test/tsconfig.json
@@ -14,9 +14,10 @@
     "**/*.ts",
     "**/*.tsx",
     "../typings/lodash.topath/*.ts",
+    "../typings/elastic__node_crypto.d.ts",
     "typings/**/*"
   ],
   "exclude": [
     "plugin_functional/plugins/**/*"
   ]
-}
\ No newline at end of file
+}
diff --git a/x-pack/legacy/plugins/monitoring/index.js b/x-pack/legacy/plugins/monitoring/index.js
index fcf704b5f65d3..ccb45dc1f446f 100644
--- a/x-pack/legacy/plugins/monitoring/index.js
+++ b/x-pack/legacy/plugins/monitoring/index.js
@@ -9,7 +9,6 @@ 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
@@ -32,7 +31,6 @@ export const monitoring = kibana => {
       if (npMonitoring) {
         const kbnServerStatus = this.kbnServer.status;
         npMonitoring.registerLegacyAPI({
-          telemetryCollectionManager,
           getServerStatus: () => {
             const status = kbnServerStatus.toJSON();
             return get(status, 'overall.state');
diff --git a/x-pack/legacy/plugins/xpack_main/index.js b/x-pack/legacy/plugins/xpack_main/index.js
index 809d90d58d796..4cf32b971b57e 100644
--- a/x-pack/legacy/plugins/xpack_main/index.js
+++ b/x-pack/legacy/plugins/xpack_main/index.js
@@ -12,7 +12,6 @@ import { setupXPackMain } from './server/lib/setup_xpack_main';
 import { xpackInfoRoute, settingsRoute } from './server/routes/api/v1';
 
 export { callClusterFactory } from './server/lib/call_cluster_factory';
-import { registerMonitoringCollection } from './server/telemetry_collection';
 
 export const xpackMain = kibana => {
   return new kibana.Plugin({
@@ -69,7 +68,6 @@ export const xpackMain = kibana => {
       }
 
       mirrorPluginStatus(server.plugins.elasticsearch, this, 'yellow', 'red');
-      registerMonitoringCollection();
 
       featuresPlugin.registerLegacyAPI({
         xpackInfo: setupXPackMain(server),
diff --git a/x-pack/legacy/plugins/xpack_main/server/telemetry_collection/register_xpack_collection.ts b/x-pack/legacy/plugins/xpack_main/server/telemetry_collection/register_xpack_collection.ts
deleted file mode 100644
index 04445d7bde7d7..0000000000000
--- a/x-pack/legacy/plugins/xpack_main/server/telemetry_collection/register_xpack_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 { getLocalLicense } from '../../../../../../src/legacy/core_plugins/telemetry/server/telemetry_collection/get_local_license';
-import { telemetryCollectionManager } from '../../../../../../src/legacy/core_plugins/telemetry/server';
-import { getClusterUuids } from '../../../../../../src/legacy/core_plugins/telemetry/server/telemetry_collection';
-import { getStatsWithXpack } from './get_stats_with_xpack';
-
-export function registerMonitoringCollection() {
-  telemetryCollectionManager.setCollection({
-    esCluster: 'data',
-    title: 'local_xpack',
-    priority: 1,
-    statsGetter: getStatsWithXpack,
-    clusterDetailsGetter: getClusterUuids,
-    licenseGetter: getLocalLicense,
-  });
-}
diff --git a/x-pack/plugins/license_management/public/application/lib/telemetry.ts b/x-pack/plugins/license_management/public/application/lib/telemetry.ts
index 1d90fce6f6b9a..823680a36dccb 100644
--- a/x-pack/plugins/license_management/public/application/lib/telemetry.ts
+++ b/x-pack/plugins/license_management/public/application/lib/telemetry.ts
@@ -6,7 +6,7 @@
 
 import { TelemetryPluginSetup } from '../../../../../../src/plugins/telemetry/public';
 
-export { OptInExampleFlyout } from '../../../../../../src/plugins/telemetry/public/components';
+export { OptInExampleFlyout } from '../../../../../../src/plugins/telemetry_management_section/public/components';
 export { PRIVACY_STATEMENT_URL } from '../../../../../../src/plugins/telemetry/common/constants';
 export { TelemetryPluginSetup, shouldShowTelemetryOptIn };
 
diff --git a/x-pack/plugins/monitoring/kibana.json b/x-pack/plugins/monitoring/kibana.json
index 8d69937c3677d..bbdf1a2e7cb76 100644
--- a/x-pack/plugins/monitoring/kibana.json
+++ b/x-pack/plugins/monitoring/kibana.json
@@ -3,8 +3,8 @@
   "version": "8.0.0",
   "kibanaVersion": "kibana",
   "configPath": ["monitoring"],
-  "requiredPlugins": ["usageCollection", "licensing", "features"],
-  "optionalPlugins": ["alerting", "actions", "infra"],
+  "requiredPlugins": ["licensing", "features"],
+  "optionalPlugins": ["alerting", "actions", "infra", "telemetryCollectionManager", "usageCollection"],
   "server": true,
   "ui": false
 }
diff --git a/x-pack/plugins/monitoring/server/plugin.ts b/x-pack/plugins/monitoring/server/plugin.ts
index bd1455a2c582f..ca5ef7f9db26b 100644
--- a/x-pack/plugins/monitoring/server/plugin.ts
+++ b/x-pack/plugins/monitoring/server/plugin.ts
@@ -9,7 +9,7 @@ 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 { TelemetryCollectionManagerPluginSetup } from 'src/plugins/telemetry_collection_manager/server';
 import {
   LOGGING_TAG,
   KIBANA_MONITORING_LOGGING_TAG,
@@ -50,13 +50,13 @@ import { getLicenseExpiration } from './alerts/license_expiration';
 import { InfraPluginSetup } from '../../infra/server';
 
 export interface LegacyAPI {
-  telemetryCollectionManager: TelemetryCollectionManager;
   getServerStatus: () => string;
   infra: any;
 }
 
 interface PluginsSetup {
-  usageCollection: UsageCollectionSetup;
+  telemetryCollectionManager?: TelemetryCollectionManagerPluginSetup;
+  usageCollection?: UsageCollectionSetup;
   licensing: LicensingPluginSetup;
   features: FeaturesPluginSetupContract;
   alerting: AlertingPluginSetupContract;
@@ -120,7 +120,7 @@ export class Plugin {
       router: core.http.createRouter(),
       instanceUuid: core.uuid.getInstanceUuid(),
       esDataClient: core.elasticsearch.dataClient,
-      kibanaStatsCollector: plugins.usageCollection.getCollectorByType(
+      kibanaStatsCollector: plugins.usageCollection?.getCollectorByType(
         KIBANA_STATS_TYPE_MONITORING
       ),
     };
@@ -157,13 +157,22 @@ export class Plugin {
       );
     }
 
+    // Initialize telemetry
+    if (plugins.telemetryCollectionManager) {
+      registerMonitoringCollection(plugins.telemetryCollectionManager, this.cluster, {
+        maxBucketSize: config.ui.max_bucket_size,
+      });
+    }
+
     // Register collector objects for stats to show up in the APIs
-    registerCollectors(
-      plugins.usageCollection,
-      config,
-      core.metrics.getOpsMetrics$(),
-      get(legacyConfig, 'kibana.index')
-    );
+    if (plugins.usageCollection) {
+      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);
@@ -275,9 +284,6 @@ export class Plugin {
   }
 
   async setupLegacy(legacyAPI: LegacyAPI) {
-    // Initialize telemetry
-    registerMonitoringCollection(this.cluster, legacyAPI.telemetryCollectionManager);
-
     // Set the stats getter
     this.bulkUploader.setKibanaStatusGetter(() => legacyAPI.getServerStatus());
   }
diff --git a/x-pack/plugins/monitoring/server/telemetry_collection/get_all_stats.test.ts b/x-pack/plugins/monitoring/server/telemetry_collection/get_all_stats.test.ts
index dcc7924fe171a..1a9f2a4da32c2 100644
--- a/x-pack/plugins/monitoring/server/telemetry_collection/get_all_stats.test.ts
+++ b/x-pack/plugins/monitoring/server/telemetry_collection/get_all_stats.test.ts
@@ -9,26 +9,12 @@ import { getStackStats, getAllStats, handleAllStats } from './get_all_stats';
 import { ESClusterStats } from './get_es_stats';
 import { KibanaStats } from './get_kibana_stats';
 import { ClustersHighLevelStats } from './get_high_level_stats';
+import { coreMock } from 'src/core/server/mocks';
 
 describe('get_all_stats', () => {
-  const size = 123;
   const start = 0;
   const end = 1;
   const callCluster = sinon.stub();
-  const server = {
-    config: sinon.stub().returns({
-      get: sinon
-        .stub()
-        .withArgs('xpack.monitoring.elasticsearch.index_pattern')
-        .returns('.monitoring-es-N-*')
-        .withArgs('xpack.monitoring.kibana.index_pattern')
-        .returns('.monitoring-kibana-N-*')
-        .withArgs('xpack.monitoring.logstash.index_pattern')
-        .returns('.monitoring-logstash-N-*')
-        .withArgs('xpack.monitoring.max_bucket_size')
-        .returns(size),
-    }),
-  };
 
   const esClusters = [
     { cluster_uuid: 'a' },
@@ -186,13 +172,21 @@ describe('get_all_stats', () => {
         .returns(Promise.resolve({})); // Beats state
 
       expect(
-        await getAllStats([{ clusterUuid: 'a' }], {
-          callCluster: callCluster as any,
-          usageCollection: {} as any,
-          server,
-          start,
-          end,
-        })
+        await getAllStats(
+          [{ clusterUuid: 'a' }],
+          {
+            callCluster: callCluster as any,
+            usageCollection: {} as any,
+            start,
+            end,
+          },
+          {
+            logger: coreMock.createPluginInitializerContext().logger.get('test'),
+            isDev: true,
+            version: 'version',
+            maxBucketSize: 1,
+          }
+        )
       ).toStrictEqual(allClusters);
     });
 
@@ -204,13 +198,21 @@ describe('get_all_stats', () => {
       callCluster.withArgs('search').returns(Promise.resolve(clusterUuidsResponse));
 
       expect(
-        await getAllStats([], {
-          callCluster: callCluster as any,
-          usageCollection: {} as any,
-          server,
-          start,
-          end,
-        })
+        await getAllStats(
+          [],
+          {
+            callCluster: callCluster as any,
+            usageCollection: {} as any,
+            start,
+            end,
+          },
+          {
+            logger: coreMock.createPluginInitializerContext().logger.get('test'),
+            isDev: true,
+            version: 'version',
+            maxBucketSize: 1,
+          }
+        )
       ).toStrictEqual([]);
     });
   });
diff --git a/x-pack/plugins/monitoring/server/telemetry_collection/get_all_stats.ts b/x-pack/plugins/monitoring/server/telemetry_collection/get_all_stats.ts
index a6ed5254dabd5..b180730acfd36 100644
--- a/x-pack/plugins/monitoring/server/telemetry_collection/get_all_stats.ts
+++ b/x-pack/plugins/monitoring/server/telemetry_collection/get_all_stats.ts
@@ -6,7 +6,7 @@
 
 import { get, set, merge } from 'lodash';
 
-import { StatsGetter } from 'src/legacy/core_plugins/telemetry/server/collection_manager';
+import { StatsGetter } from 'src/plugins/telemetry_collection_manager/server';
 import { LOGSTASH_SYSTEM_ID, KIBANA_SYSTEM_ID, BEATS_SYSTEM_ID } from '../../common/constants';
 import { getElasticsearchStats, ESClusterStats } from './get_es_stats';
 import { getKibanaStats, KibanaStats } from './get_kibana_stats';
@@ -17,22 +17,27 @@ type PromiseReturnType<T extends (...args: any[]) => any> = ReturnType<T> extend
   ? R
   : T;
 
+export interface CustomContext {
+  maxBucketSize: number;
+}
+
 /**
  * Get statistics for all products joined by Elasticsearch cluster.
  * Returns the array of clusters joined with the Kibana and Logstash instances.
  *
  */
-export const getAllStats: StatsGetter = async (
+export const getAllStats: StatsGetter<CustomContext> = async (
   clustersDetails,
-  { server, callCluster, start, end }
+  { callCluster, start, end },
+  { maxBucketSize }
 ) => {
   const clusterUuids = clustersDetails.map(clusterDetails => clusterDetails.clusterUuid);
 
   const [esClusters, kibana, logstash, beats] = await Promise.all([
-    getElasticsearchStats(server, callCluster, clusterUuids), // cluster_stats, stack_stats.xpack, cluster_name/uuid, license, version
-    getKibanaStats(server, callCluster, clusterUuids, start, end), // stack_stats.kibana
-    getHighLevelStats(server, callCluster, clusterUuids, start, end, LOGSTASH_SYSTEM_ID), // stack_stats.logstash
-    getBeatsStats(server, callCluster, clusterUuids, start, end), // stack_stats.beats
+    getElasticsearchStats(callCluster, clusterUuids, maxBucketSize), // cluster_stats, stack_stats.xpack, cluster_name/uuid, license, version
+    getKibanaStats(callCluster, clusterUuids, start, end, maxBucketSize), // stack_stats.kibana
+    getHighLevelStats(callCluster, clusterUuids, start, end, LOGSTASH_SYSTEM_ID, maxBucketSize), // stack_stats.logstash
+    getBeatsStats(callCluster, clusterUuids, start, end), // stack_stats.beats
   ]);
 
   return handleAllStats(esClusters, { kibana, logstash, beats });
diff --git a/x-pack/plugins/monitoring/server/telemetry_collection/get_beats_stats.test.ts b/x-pack/plugins/monitoring/server/telemetry_collection/get_beats_stats.test.ts
index 310c01571c71d..c619db90c8975 100644
--- a/x-pack/plugins/monitoring/server/telemetry_collection/get_beats_stats.test.ts
+++ b/x-pack/plugins/monitoring/server/telemetry_collection/get_beats_stats.test.ts
@@ -22,18 +22,16 @@ describe('Get Beats Stats', () => {
     const clusterUuids = ['aCluster', 'bCluster', 'cCluster'];
     const start = 100;
     const end = 200;
-    let server = { config: () => ({ get: sinon.stub() }) };
     let callCluster = sinon.stub();
 
     beforeEach(() => {
       const getStub = { get: sinon.stub() };
       getStub.get.withArgs('xpack.monitoring.beats.index_pattern').returns('beats-indices-*');
-      server = { config: () => getStub };
       callCluster = sinon.stub();
     });
 
     it('should set `from: 0, to: 10000` in the query', async () => {
-      await fetchBeatsStats(server, callCluster, clusterUuids, start, end, {} as any);
+      await fetchBeatsStats(callCluster, clusterUuids, start, end, {} as any);
       const { args } = callCluster.firstCall;
       const [api, { body }] = args;
 
@@ -43,7 +41,7 @@ describe('Get Beats Stats', () => {
     });
 
     it('should set `from: 10000, from: 10000` in the query', async () => {
-      await fetchBeatsStats(server, callCluster, clusterUuids, start, end, { page: 1 } as any);
+      await fetchBeatsStats(callCluster, clusterUuids, start, end, { page: 1 } as any);
       const { args } = callCluster.firstCall;
       const [api, { body }] = args;
 
@@ -53,7 +51,7 @@ describe('Get Beats Stats', () => {
     });
 
     it('should set `from: 20000, from: 10000` in the query', async () => {
-      await fetchBeatsStats(server, callCluster, clusterUuids, start, end, { page: 2 } as any);
+      await fetchBeatsStats(callCluster, clusterUuids, start, end, { page: 2 } as any);
       const { args } = callCluster.firstCall;
       const [api, { body }] = args;
 
diff --git a/x-pack/plugins/monitoring/server/telemetry_collection/get_beats_stats.ts b/x-pack/plugins/monitoring/server/telemetry_collection/get_beats_stats.ts
index cd588d7a90355..bf904e46516e0 100644
--- a/x-pack/plugins/monitoring/server/telemetry_collection/get_beats_stats.ts
+++ b/x-pack/plugins/monitoring/server/telemetry_collection/get_beats_stats.ts
@@ -5,8 +5,8 @@
  */
 
 import { get } from 'lodash';
-import { StatsCollectionConfig } from 'src/legacy/core_plugins/telemetry/server/collection_manager';
 import { SearchResponse } from 'elasticsearch';
+import { StatsCollectionConfig } from 'src/plugins/telemetry_collection_manager/server';
 import { createQuery } from './create_query';
 import { INDEX_PATTERN_BEATS } from '../../common/constants';
 
@@ -308,7 +308,6 @@ export function processResults(
 
 /*
  * Create a set of result objects where each is the result of searching hits from Elasticsearch with a size of HITS_SIZE each time.
- * @param {Object} server - The server instance
  * @param {function} callCluster - The callWithRequest or callWithInternalUser handler
  * @param {Array} clusterUuids - The string Cluster UUIDs to fetch details for
  * @param {Date} start - Start time to limit the stats
@@ -319,7 +318,6 @@ export function processResults(
  * @return {Promise}
  */
 async function fetchBeatsByType(
-  server: StatsCollectionConfig['server'],
   callCluster: StatsCollectionConfig['callCluster'],
   clusterUuids: string[],
   start: StatsCollectionConfig['start'],
@@ -376,7 +374,7 @@ async function fetchBeatsByType(
       };
 
       // returns a promise and keeps the caller blocked from returning until the entire clusters object is built
-      return fetchBeatsByType(server, callCluster, clusterUuids, start, end, nextOptions, type);
+      return fetchBeatsByType(callCluster, clusterUuids, start, end, nextOptions, type);
     }
   }
 
@@ -384,25 +382,23 @@ async function fetchBeatsByType(
 }
 
 export async function fetchBeatsStats(
-  server: StatsCollectionConfig['server'],
   callCluster: StatsCollectionConfig['callCluster'],
   clusterUuids: string[],
   start: StatsCollectionConfig['start'],
   end: StatsCollectionConfig['end'],
   options: { page?: number } & BeatsProcessOptions
 ) {
-  return fetchBeatsByType(server, callCluster, clusterUuids, start, end, options, 'beats_stats');
+  return fetchBeatsByType(callCluster, clusterUuids, start, end, options, 'beats_stats');
 }
 
 export async function fetchBeatsStates(
-  server: StatsCollectionConfig['server'],
   callCluster: StatsCollectionConfig['callCluster'],
   clusterUuids: string[],
   start: StatsCollectionConfig['start'],
   end: StatsCollectionConfig['end'],
   options: { page?: number } & BeatsProcessOptions
 ) {
-  return fetchBeatsByType(server, callCluster, clusterUuids, start, end, options, 'beats_state');
+  return fetchBeatsByType(callCluster, clusterUuids, start, end, options, 'beats_state');
 }
 
 /*
@@ -410,7 +406,6 @@ export async function fetchBeatsStates(
  * @return {Object} - Beats stats in an object keyed by the cluster UUIDs
  */
 export async function getBeatsStats(
-  server: StatsCollectionConfig['server'],
   callCluster: StatsCollectionConfig['callCluster'],
   clusterUuids: string[],
   start: StatsCollectionConfig['start'],
@@ -425,8 +420,8 @@ export async function getBeatsStats(
   };
 
   await Promise.all([
-    fetchBeatsStats(server, callCluster, clusterUuids, start, end, options),
-    fetchBeatsStates(server, callCluster, clusterUuids, start, end, options),
+    fetchBeatsStats(callCluster, clusterUuids, start, end, options),
+    fetchBeatsStates(callCluster, clusterUuids, start, end, options),
   ]);
 
   return options.clusters;
diff --git a/x-pack/plugins/monitoring/server/telemetry_collection/get_cluster_uuids.test.ts b/x-pack/plugins/monitoring/server/telemetry_collection/get_cluster_uuids.test.ts
index 4f952b9dec6da..e8133afd95c20 100644
--- a/x-pack/plugins/monitoring/server/telemetry_collection/get_cluster_uuids.test.ts
+++ b/x-pack/plugins/monitoring/server/telemetry_collection/get_cluster_uuids.test.ts
@@ -13,17 +13,6 @@ import {
 
 describe('get_cluster_uuids', () => {
   const callCluster = sinon.stub();
-  const size = 123;
-  const server = {
-    config: sinon.stub().returns({
-      get: sinon
-        .stub()
-        .withArgs('xpack.monitoring.elasticsearch.index_pattern')
-        .returns('.monitoring-es-N-*')
-        .withArgs('xpack.monitoring.max_bucket_size')
-        .returns(size),
-    }),
-  };
   const response = {
     aggregations: {
       cluster_uuids: {
@@ -41,7 +30,9 @@ describe('get_cluster_uuids', () => {
     it('returns cluster UUIDs', async () => {
       callCluster.withArgs('search').returns(Promise.resolve(response));
       expect(
-        await getClusterUuids({ server, callCluster, start, end, usageCollection: {} as any })
+        await getClusterUuids({ callCluster, start, end, usageCollection: {} as any }, {
+          maxBucketSize: 1,
+        } as any)
       ).toStrictEqual(expectedUuids);
     });
   });
@@ -50,7 +41,9 @@ describe('get_cluster_uuids', () => {
     it('searches for clusters', async () => {
       callCluster.returns(Promise.resolve(response));
       expect(
-        await fetchClusterUuids({ server, callCluster, start, end, usageCollection: {} as any })
+        await fetchClusterUuids({ callCluster, start, end, usageCollection: {} as any }, {
+          maxBucketSize: 1,
+        } as any)
       ).toStrictEqual(response);
     });
   });
diff --git a/x-pack/plugins/monitoring/server/telemetry_collection/get_cluster_uuids.ts b/x-pack/plugins/monitoring/server/telemetry_collection/get_cluster_uuids.ts
index 46b3007ae80e2..db025450ba833 100644
--- a/x-pack/plugins/monitoring/server/telemetry_collection/get_cluster_uuids.ts
+++ b/x-pack/plugins/monitoring/server/telemetry_collection/get_cluster_uuids.ts
@@ -5,30 +5,33 @@
  */
 
 import { get } from 'lodash';
-// @ts-ignore
-import { createQuery } from './create_query';
-// @ts-ignore
-import { INDEX_PATTERN_ELASTICSEARCH } from '../../common/constants';
-
 import {
   ClusterDetailsGetter,
   StatsCollectionConfig,
   ClusterDetails,
-} from '../../../../../src/legacy/core_plugins/telemetry/server/collection_manager';
+} from 'src/plugins/telemetry_collection_manager/server';
+import { createQuery } from './create_query';
+import { INDEX_PATTERN_ELASTICSEARCH } from '../../common/constants';
+import { CustomContext } from './get_all_stats';
 
 /**
  * Get a list of Cluster UUIDs that exist within the specified timespan.
  */
-export const getClusterUuids: ClusterDetailsGetter = async (config: any) => {
-  const response = await fetchClusterUuids(config);
+export const getClusterUuids: ClusterDetailsGetter<CustomContext> = async (
+  config,
+  { maxBucketSize }
+) => {
+  const response = await fetchClusterUuids(config, maxBucketSize);
   return handleClusterUuidsResponse(response);
 };
 
 /**
  * Fetch the aggregated Cluster UUIDs from the monitoring cluster.
  */
-export function fetchClusterUuids({ server, callCluster, start, end }: StatsCollectionConfig) {
-  const config = server.config();
+export function fetchClusterUuids(
+  { callCluster, start, end }: StatsCollectionConfig,
+  maxBucketSize: number
+) {
   const params = {
     index: INDEX_PATTERN_ELASTICSEARCH,
     size: 0,
@@ -40,7 +43,7 @@ export function fetchClusterUuids({ server, callCluster, start, end }: StatsColl
         cluster_uuids: {
           terms: {
             field: 'cluster_uuid',
-            size: config.get('monitoring.ui.max_bucket_size'),
+            size: maxBucketSize,
           },
         },
       },
diff --git a/x-pack/plugins/monitoring/server/telemetry_collection/get_es_stats.test.ts b/x-pack/plugins/monitoring/server/telemetry_collection/get_es_stats.test.ts
index 70ed2240b47d4..52fb989bfd20f 100644
--- a/x-pack/plugins/monitoring/server/telemetry_collection/get_es_stats.test.ts
+++ b/x-pack/plugins/monitoring/server/telemetry_collection/get_es_stats.test.ts
@@ -13,17 +13,6 @@ import {
 
 describe('get_es_stats', () => {
   const callWith = sinon.stub();
-  const size = 123;
-  const server = {
-    config: sinon.stub().returns({
-      get: sinon
-        .stub()
-        .withArgs('xpack.monitoring.elasticsearch.index_pattern')
-        .returns('.monitoring-es-N-*')
-        .withArgs('xpack.monitoring.max_bucket_size')
-        .returns(size),
-    }),
-  };
   const response = {
     hits: {
       hits: [
@@ -35,12 +24,13 @@ describe('get_es_stats', () => {
   };
   const expectedClusters = response.hits.hits.map(hit => hit._source);
   const clusterUuids = expectedClusters.map(cluster => cluster.cluster_uuid);
+  const maxBucketSize = 1;
 
   describe('getElasticsearchStats', () => {
     it('returns clusters', async () => {
       callWith.withArgs('search').returns(Promise.resolve(response));
 
-      expect(await getElasticsearchStats(server, callWith, clusterUuids)).toStrictEqual(
+      expect(await getElasticsearchStats(callWith, clusterUuids, maxBucketSize)).toStrictEqual(
         expectedClusters
       );
     });
@@ -50,7 +40,9 @@ describe('get_es_stats', () => {
     it('searches for clusters', async () => {
       callWith.returns(response);
 
-      expect(await fetchElasticsearchStats(server, callWith, clusterUuids)).toStrictEqual(response);
+      expect(await fetchElasticsearchStats(callWith, clusterUuids, maxBucketSize)).toStrictEqual(
+        response
+      );
     });
   });
 
diff --git a/x-pack/plugins/monitoring/server/telemetry_collection/get_es_stats.ts b/x-pack/plugins/monitoring/server/telemetry_collection/get_es_stats.ts
index 2f2fffd3f0823..37b6cbcf249d6 100644
--- a/x-pack/plugins/monitoring/server/telemetry_collection/get_es_stats.ts
+++ b/x-pack/plugins/monitoring/server/telemetry_collection/get_es_stats.ts
@@ -4,8 +4,8 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { StatsCollectionConfig } from 'src/legacy/core_plugins/telemetry/server/collection_manager';
 import { SearchResponse } from 'elasticsearch';
+import { StatsCollectionConfig } from 'src/plugins/telemetry_collection_manager/server';
 import { INDEX_PATTERN_ELASTICSEARCH } from '../../common/constants';
 
 /**
@@ -16,11 +16,11 @@ import { INDEX_PATTERN_ELASTICSEARCH } from '../../common/constants';
  * @param {Array} clusterUuids The string Cluster UUIDs to fetch details for
  */
 export async function getElasticsearchStats(
-  server: StatsCollectionConfig['server'],
   callCluster: StatsCollectionConfig['callCluster'],
-  clusterUuids: string[]
+  clusterUuids: string[],
+  maxBucketSize: number
 ) {
-  const response = await fetchElasticsearchStats(server, callCluster, clusterUuids);
+  const response = await fetchElasticsearchStats(callCluster, clusterUuids, maxBucketSize);
   return handleElasticsearchStats(response);
 }
 
@@ -34,14 +34,13 @@ export async function getElasticsearchStats(
  * Returns the response for the aggregations to fetch details for the product.
  */
 export function fetchElasticsearchStats(
-  server: StatsCollectionConfig['server'],
   callCluster: StatsCollectionConfig['callCluster'],
-  clusterUuids: string[]
+  clusterUuids: string[],
+  maxBucketSize: number
 ) {
-  const config = server.config();
   const params = {
     index: INDEX_PATTERN_ELASTICSEARCH,
-    size: config.get('monitoring.ui.max_bucket_size'),
+    size: maxBucketSize,
     ignoreUnavailable: true,
     filterPath: [
       'hits.hits._source.cluster_uuid',
diff --git a/x-pack/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
index 76c80e2eb3d37..d308ddc13e40c 100644
--- a/x-pack/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
@@ -13,21 +13,10 @@ import {
 
 describe('get_high_level_stats', () => {
   const callWith = sinon.stub();
-  const size = 123;
   const product = 'xyz';
   const cloudName = 'bare-metal';
   const start = 0;
   const end = 1;
-  const server = {
-    config: sinon.stub().returns({
-      get: sinon
-        .stub()
-        .withArgs(`xpack.monitoring.${product}.index_pattern`)
-        .returns(`.monitoring-${product}-N-*`)
-        .withArgs('xpack.monitoring.max_bucket_size')
-        .returns(size),
-    }),
-  };
   const response = {
     hits: {
       hits: [
@@ -238,13 +227,14 @@ describe('get_high_level_stats', () => {
     },
   };
   const clusterUuids = Object.keys(expectedClusters);
+  const maxBucketSize = 10;
 
   describe('getHighLevelStats', () => {
     it('returns clusters', async () => {
       callWith.withArgs('search').returns(Promise.resolve(response));
 
       expect(
-        await getHighLevelStats(server, callWith, clusterUuids, start, end, product)
+        await getHighLevelStats(callWith, clusterUuids, start, end, product, maxBucketSize)
       ).toStrictEqual(expectedClusters);
     });
   });
@@ -254,7 +244,7 @@ describe('get_high_level_stats', () => {
       callWith.returns(Promise.resolve(response));
 
       expect(
-        await fetchHighLevelStats(server, callWith, clusterUuids, start, end, product)
+        await fetchHighLevelStats(callWith, clusterUuids, start, end, product, maxBucketSize)
       ).toStrictEqual(response);
     });
   });
diff --git a/x-pack/plugins/monitoring/server/telemetry_collection/get_high_level_stats.ts b/x-pack/plugins/monitoring/server/telemetry_collection/get_high_level_stats.ts
index f67f80940d9f4..87a1fb7e6e5cf 100644
--- a/x-pack/plugins/monitoring/server/telemetry_collection/get_high_level_stats.ts
+++ b/x-pack/plugins/monitoring/server/telemetry_collection/get_high_level_stats.ts
@@ -5,8 +5,8 @@
  */
 
 import { get } from 'lodash';
-import { StatsCollectionConfig } from 'src/legacy/core_plugins/telemetry/server/collection_manager';
 import { SearchResponse } from 'elasticsearch';
+import { StatsCollectionConfig } from 'src/plugins/telemetry_collection_manager/server';
 import { createQuery } from './create_query';
 import {
   INDEX_PATTERN_KIBANA,
@@ -247,20 +247,20 @@ function getIndexPatternForStackProduct(product: string) {
  * Returns an object keyed by the cluster UUIDs to make grouping easier.
  */
 export async function getHighLevelStats(
-  server: StatsCollectionConfig['server'],
   callCluster: StatsCollectionConfig['callCluster'],
   clusterUuids: string[],
   start: StatsCollectionConfig['start'],
   end: StatsCollectionConfig['end'],
-  product: string
+  product: string,
+  maxBucketSize: number
 ) {
   const response = await fetchHighLevelStats(
-    server,
     callCluster,
     clusterUuids,
     start,
     end,
-    product
+    product,
+    maxBucketSize
   );
   return handleHighLevelStatsResponse(response, product);
 }
@@ -268,14 +268,13 @@ export async function getHighLevelStats(
 export async function fetchHighLevelStats<
   T extends { cluster_uuid?: string } = { cluster_uuid?: string }
 >(
-  server: StatsCollectionConfig['server'],
   callCluster: StatsCollectionConfig['callCluster'],
   clusterUuids: string[],
   start: StatsCollectionConfig['start'] | undefined,
   end: StatsCollectionConfig['end'] | undefined,
-  product: string
+  product: string,
+  maxBucketSize: number
 ): Promise<SearchResponse<T>> {
-  const config = server.config();
   const isKibanaIndex = product === KIBANA_SYSTEM_ID;
   const filters: object[] = [{ terms: { cluster_uuid: clusterUuids } }];
 
@@ -302,7 +301,7 @@ export async function fetchHighLevelStats<
 
   const params = {
     index: getIndexPatternForStackProduct(product),
-    size: config.get('monitoring.ui.max_bucket_size'),
+    size: maxBucketSize,
     headers: {
       'X-QUERY-SOURCE': TELEMETRY_QUERY_SOURCE,
     },
diff --git a/x-pack/plugins/monitoring/server/telemetry_collection/get_kibana_stats.ts b/x-pack/plugins/monitoring/server/telemetry_collection/get_kibana_stats.ts
index e2ad64ce04c6b..45df56b2139ff 100644
--- a/x-pack/plugins/monitoring/server/telemetry_collection/get_kibana_stats.ts
+++ b/x-pack/plugins/monitoring/server/telemetry_collection/get_kibana_stats.ts
@@ -6,8 +6,8 @@
 
 import moment from 'moment';
 import { isEmpty } from 'lodash';
-import { StatsCollectionConfig } from 'src/legacy/core_plugins/telemetry/server/collection_manager';
 import { SearchResponse } from 'elasticsearch';
+import { StatsCollectionConfig } from 'src/plugins/telemetry_collection_manager/server';
 import { KIBANA_SYSTEM_ID, TELEMETRY_COLLECTION_INTERVAL } from '../../common/constants';
 import {
   fetchHighLevelStats,
@@ -173,20 +173,20 @@ export function ensureTimeSpan(
  * specialized usage data that comes with kibana stats (kibana_stats.usage).
  */
 export async function getKibanaStats(
-  server: StatsCollectionConfig['server'],
   callCluster: StatsCollectionConfig['callCluster'],
   clusterUuids: string[],
   start: StatsCollectionConfig['start'],
-  end: StatsCollectionConfig['end']
+  end: StatsCollectionConfig['end'],
+  maxBucketSize: number
 ) {
   const { start: safeStart, end: safeEnd } = ensureTimeSpan(start, end);
   const rawStats = await fetchHighLevelStats<KibanaUsageStats>(
-    server,
     callCluster,
     clusterUuids,
     safeStart,
     safeEnd,
-    KIBANA_SYSTEM_ID
+    KIBANA_SYSTEM_ID,
+    maxBucketSize
   );
   const highLevelStats = handleHighLevelStatsResponse(rawStats, KIBANA_SYSTEM_ID);
   const usageStats = getUsageStats(rawStats);
diff --git a/x-pack/plugins/monitoring/server/telemetry_collection/get_licenses.test.ts b/x-pack/plugins/monitoring/server/telemetry_collection/get_licenses.test.ts
index bb8326ce0b63a..16fa47afdb692 100644
--- a/x-pack/plugins/monitoring/server/telemetry_collection/get_licenses.test.ts
+++ b/x-pack/plugins/monitoring/server/telemetry_collection/get_licenses.test.ts
@@ -9,17 +9,6 @@ import { getLicenses, handleLicenses, fetchLicenses } from './get_licenses';
 
 describe('get_licenses', () => {
   const callWith = sinon.stub();
-  const size = 123;
-  const server = {
-    config: sinon.stub().returns({
-      get: sinon
-        .stub()
-        .withArgs('xpack.monitoring.elasticsearch.index_pattern')
-        .returns('.monitoring-es-N-*')
-        .withArgs('xpack.monitoring.max_bucket_size')
-        .returns(size),
-    }),
-  };
   const response = {
     hits: {
       hits: [
@@ -42,7 +31,11 @@ describe('get_licenses', () => {
       callWith.withArgs('search').returns(Promise.resolve(response));
 
       expect(
-        await getLicenses(clusterUuids, { server, callCluster: callWith } as any)
+        await getLicenses(
+          clusterUuids,
+          { callCluster: callWith } as any,
+          { maxBucketSize: 1 } as any
+        )
       ).toStrictEqual(expectedLicenses);
     });
   });
@@ -53,9 +46,9 @@ describe('get_licenses', () => {
 
       expect(
         await fetchLicenses(
-          server,
           callWith,
-          clusterUuids.map(({ clusterUuid }) => clusterUuid)
+          clusterUuids.map(({ clusterUuid }) => clusterUuid),
+          { maxBucketSize: 1 } as any
         )
       ).toStrictEqual(response);
     });
diff --git a/x-pack/plugins/monitoring/server/telemetry_collection/get_licenses.ts b/x-pack/plugins/monitoring/server/telemetry_collection/get_licenses.ts
index 7364227e7dc92..0d41ac0f46814 100644
--- a/x-pack/plugins/monitoring/server/telemetry_collection/get_licenses.ts
+++ b/x-pack/plugins/monitoring/server/telemetry_collection/get_licenses.ts
@@ -4,20 +4,25 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+import { SearchResponse } from 'elasticsearch';
 import {
-  StatsCollectionConfig,
+  ESLicense,
   LicenseGetter,
-} from 'src/legacy/core_plugins/telemetry/server/collection_manager';
-import { SearchResponse } from 'elasticsearch';
-import { ESLicense } from 'src/legacy/core_plugins/telemetry/server/telemetry_collection/get_local_license';
+  StatsCollectionConfig,
+} from 'src/plugins/telemetry_collection_manager/server';
 import { INDEX_PATTERN_ELASTICSEARCH } from '../../common/constants';
+import { CustomContext } from './get_all_stats';
 
 /**
  * Get statistics for all selected Elasticsearch clusters.
  */
-export const getLicenses: LicenseGetter = async (clustersDetails, { server, callCluster }) => {
+export const getLicenses: LicenseGetter<CustomContext> = async (
+  clustersDetails,
+  { callCluster },
+  { maxBucketSize }
+) => {
   const clusterUuids = clustersDetails.map(({ clusterUuid }) => clusterUuid);
-  const response = await fetchLicenses(server, callCluster, clusterUuids);
+  const response = await fetchLicenses(callCluster, clusterUuids, maxBucketSize);
   return handleLicenses(response);
 };
 
@@ -31,14 +36,13 @@ export const getLicenses: LicenseGetter = async (clustersDetails, { server, call
  * Returns the response for the aggregations to fetch details for the product.
  */
 export function fetchLicenses(
-  server: StatsCollectionConfig['server'],
   callCluster: StatsCollectionConfig['callCluster'],
-  clusterUuids: string[]
+  clusterUuids: string[],
+  maxBucketSize: number
 ) {
-  const config = server.config();
   const params = {
     index: INDEX_PATTERN_ELASTICSEARCH,
-    size: config.get('monitoring.ui.max_bucket_size'),
+    size: maxBucketSize,
     ignoreUnavailable: true,
     filterPath: ['hits.hits._source.cluster_uuid', 'hits.hits._source.license'],
     body: {
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
index 7bc4e9cbf7558..d81f549de7522 100644
--- a/x-pack/plugins/monitoring/server/telemetry_collection/register_monitoring_collection.ts
+++ b/x-pack/plugins/monitoring/server/telemetry_collection/register_monitoring_collection.ts
@@ -5,29 +5,23 @@
  */
 
 import { ICustomClusterClient } from 'kibana/server';
-import { Cluster } from 'src/legacy/core_plugins/elasticsearch';
-// @ts-ignore
-import { getAllStats } from './get_all_stats';
+import { TelemetryCollectionManagerPluginSetup } from 'src/plugins/telemetry_collection_manager/server';
+import { getAllStats, CustomContext } from './get_all_stats';
 import { getClusterUuids } from './get_cluster_uuids';
 import { getLicenses } from './get_licenses';
 
 export function registerMonitoringCollection(
-  cluster: ICustomClusterClient,
-  telemetryCollectionManager: any
+  telemetryCollectionManager: TelemetryCollectionManagerPluginSetup,
+  esCluster: ICustomClusterClient,
+  customContext: CustomContext
 ) {
-  // 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,
+    esCluster,
     title: 'monitoring',
     priority: 2,
     statsGetter: getAllStats,
     clusterDetailsGetter: getClusterUuids,
     licenseGetter: getLicenses,
+    customContext,
   });
 }
diff --git a/x-pack/plugins/telemetry_collection_xpack/README.md b/x-pack/plugins/telemetry_collection_xpack/README.md
new file mode 100644
index 0000000000000..6c205bb17c663
--- /dev/null
+++ b/x-pack/plugins/telemetry_collection_xpack/README.md
@@ -0,0 +1,9 @@
+# Telemetry collection with X-Pack
+
+Gathers all usage collection, retrieving them from both: OSS and X-Pack plugins.
+
+---
+
+## Development
+
+See the [kibana contributing guide](https://github.com/elastic/kibana/blob/master/CONTRIBUTING.md) for instructions on how to set up your development environment.
diff --git a/x-pack/plugins/telemetry_collection_xpack/common/index.ts b/x-pack/plugins/telemetry_collection_xpack/common/index.ts
new file mode 100644
index 0000000000000..2b08ebe2e7bbf
--- /dev/null
+++ b/x-pack/plugins/telemetry_collection_xpack/common/index.ts
@@ -0,0 +1,8 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+export const PLUGIN_ID = 'telemetryCollectionXpack';
+export const PLUGIN_NAME = 'telemetry_collection_xpack';
diff --git a/x-pack/plugins/telemetry_collection_xpack/kibana.json b/x-pack/plugins/telemetry_collection_xpack/kibana.json
new file mode 100644
index 0000000000000..8499e0258f8ff
--- /dev/null
+++ b/x-pack/plugins/telemetry_collection_xpack/kibana.json
@@ -0,0 +1,10 @@
+{
+  "id": "telemetryCollectionXpack",
+  "version": "kibana",
+  "server": true,
+  "ui": false,
+  "requiredPlugins": [
+    "telemetryCollectionManager"
+  ],
+  "optionalPlugins": []
+}
diff --git a/x-pack/plugins/telemetry_collection_xpack/server/index.ts b/x-pack/plugins/telemetry_collection_xpack/server/index.ts
new file mode 100644
index 0000000000000..249d16c331c39
--- /dev/null
+++ b/x-pack/plugins/telemetry_collection_xpack/server/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 { PluginInitializerContext } from 'kibana/server';
+import { TelemetryCollectionXpackPlugin } from './plugin';
+
+//  This exports static code and TypeScript types,
+//  as well as, Kibana Platform `plugin()` initializer.
+
+export function plugin(initializerContext: PluginInitializerContext) {
+  return new TelemetryCollectionXpackPlugin(initializerContext);
+}
diff --git a/x-pack/plugins/telemetry_collection_xpack/server/plugin.ts b/x-pack/plugins/telemetry_collection_xpack/server/plugin.ts
new file mode 100644
index 0000000000000..b0afba8852495
--- /dev/null
+++ b/x-pack/plugins/telemetry_collection_xpack/server/plugin.ts
@@ -0,0 +1,31 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { PluginInitializerContext, CoreSetup, CoreStart, Plugin } from 'kibana/server';
+import { TelemetryCollectionManagerPluginSetup } from 'src/plugins/telemetry_collection_manager/server';
+import { getClusterUuids, getLocalLicense } from '../../../../src/plugins/telemetry/server';
+import { getStatsWithXpack } from './telemetry_collection';
+
+interface TelemetryCollectionXpackDepsSetup {
+  telemetryCollectionManager: TelemetryCollectionManagerPluginSetup;
+}
+
+export class TelemetryCollectionXpackPlugin implements Plugin {
+  constructor(initializerContext: PluginInitializerContext) {}
+
+  public setup(core: CoreSetup, { telemetryCollectionManager }: TelemetryCollectionXpackDepsSetup) {
+    telemetryCollectionManager.setCollection({
+      esCluster: core.elasticsearch.dataClient,
+      title: 'local_xpack',
+      priority: 1,
+      statsGetter: getStatsWithXpack,
+      clusterDetailsGetter: getClusterUuids,
+      licenseGetter: getLocalLicense,
+    });
+  }
+
+  public start(core: CoreStart) {}
+}
diff --git a/x-pack/legacy/plugins/xpack_main/server/telemetry_collection/__snapshots__/get_stats_with_xpack.test.ts.snap b/x-pack/plugins/telemetry_collection_xpack/server/telemetry_collection/__snapshots__/get_stats_with_xpack.test.ts.snap
similarity index 100%
rename from x-pack/legacy/plugins/xpack_main/server/telemetry_collection/__snapshots__/get_stats_with_xpack.test.ts.snap
rename to x-pack/plugins/telemetry_collection_xpack/server/telemetry_collection/__snapshots__/get_stats_with_xpack.test.ts.snap
diff --git a/x-pack/legacy/plugins/xpack_main/server/telemetry_collection/__tests__/get_xpack.js b/x-pack/plugins/telemetry_collection_xpack/server/telemetry_collection/__tests__/get_xpack.js
similarity index 100%
rename from x-pack/legacy/plugins/xpack_main/server/telemetry_collection/__tests__/get_xpack.js
rename to x-pack/plugins/telemetry_collection_xpack/server/telemetry_collection/__tests__/get_xpack.js
diff --git a/x-pack/legacy/plugins/xpack_main/server/telemetry_collection/constants.ts b/x-pack/plugins/telemetry_collection_xpack/server/telemetry_collection/constants.ts
similarity index 100%
rename from x-pack/legacy/plugins/xpack_main/server/telemetry_collection/constants.ts
rename to x-pack/plugins/telemetry_collection_xpack/server/telemetry_collection/constants.ts
diff --git a/x-pack/legacy/plugins/xpack_main/server/telemetry_collection/get_stats_with_xpack.test.ts b/x-pack/plugins/telemetry_collection_xpack/server/telemetry_collection/get_stats_with_xpack.test.ts
similarity index 73%
rename from x-pack/legacy/plugins/xpack_main/server/telemetry_collection/get_stats_with_xpack.test.ts
rename to x-pack/plugins/telemetry_collection_xpack/server/telemetry_collection/get_stats_with_xpack.test.ts
index b85cbd9661022..f2a9995098e59 100644
--- a/x-pack/legacy/plugins/xpack_main/server/telemetry_collection/get_stats_with_xpack.test.ts
+++ b/x-pack/plugins/telemetry_collection_xpack/server/telemetry_collection/get_stats_with_xpack.test.ts
@@ -4,6 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+import { coreMock } from '../../../../../src/core/server/mocks';
 import { getStatsWithXpack } from './get_stats_with_xpack';
 
 const kibana = {
@@ -28,26 +29,10 @@ const kibana = {
   snow: { chances: 0 },
 };
 
-const getMockServer = (getCluster = jest.fn()) => ({
-  log(tags: string[], message: string) {
-    // eslint-disable-next-line no-console
-    console.log({ tags, message });
-  },
-  config() {
-    return {
-      get(item: string) {
-        switch (item) {
-          case 'pkg.version':
-            return '8675309-snapshot';
-          default:
-            throw Error(`unexpected config.get('${item}') received.`);
-        }
-      },
-    };
-  },
-  plugins: {
-    elasticsearch: { getCluster },
-  },
+const getContext = () => ({
+  version: '8675309-snapshot',
+  isDev: true,
+  logger: coreMock.createPluginInitializerContext().logger.get('test'),
 });
 
 const mockUsageCollection = (kibanaUsage = kibana) => ({
@@ -72,13 +57,16 @@ describe('Telemetry Collection: Get Aggregated Stats', () => {
       }
     });
     const usageCollection = mockUsageCollection();
-    const server = getMockServer();
+    const context = getContext();
 
-    const stats = await getStatsWithXpack([{ clusterUuid: '1234' }], {
-      callCluster,
-      usageCollection,
-      server,
-    } as any);
+    const stats = await getStatsWithXpack(
+      [{ clusterUuid: '1234' }],
+      {
+        callCluster,
+        usageCollection,
+      } as any,
+      context
+    );
     expect(stats.map(({ timestamp, ...rest }) => rest)).toMatchSnapshot();
   });
 
@@ -101,13 +89,16 @@ describe('Telemetry Collection: Get Aggregated Stats', () => {
       }
     });
     const usageCollection = mockUsageCollection();
-    const server = getMockServer();
+    const context = getContext();
 
-    const stats = await getStatsWithXpack([{ clusterUuid: '1234' }], {
-      callCluster,
-      usageCollection,
-      server,
-    } as any);
+    const stats = await getStatsWithXpack(
+      [{ clusterUuid: '1234' }],
+      {
+        callCluster,
+        usageCollection,
+      } as any,
+      context
+    );
     expect(stats.map(({ timestamp, ...rest }) => rest)).toMatchSnapshot();
   });
 });
diff --git a/x-pack/legacy/plugins/xpack_main/server/telemetry_collection/get_stats_with_xpack.ts b/x-pack/plugins/telemetry_collection_xpack/server/telemetry_collection/get_stats_with_xpack.ts
similarity index 70%
rename from x-pack/legacy/plugins/xpack_main/server/telemetry_collection/get_stats_with_xpack.ts
rename to x-pack/plugins/telemetry_collection_xpack/server/telemetry_collection/get_stats_with_xpack.ts
index ea7465f66f120..705b2a11bde5b 100644
--- a/x-pack/legacy/plugins/xpack_main/server/telemetry_collection/get_stats_with_xpack.ts
+++ b/x-pack/plugins/telemetry_collection_xpack/server/telemetry_collection/get_stats_with_xpack.ts
@@ -4,23 +4,21 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { StatsGetter } from '../../../../../../src/legacy/core_plugins/telemetry/server/collection_manager';
-import {
-  getLocalStats,
-  TelemetryLocalStats,
-} from '../../../../../../src/legacy/core_plugins/telemetry/server/telemetry_collection/get_local_stats';
+import { TelemetryLocalStats, getLocalStats } from '../../../../../src/plugins/telemetry/server';
+import { StatsGetter } from '../../../../../src/plugins/telemetry_collection_manager/server';
 import { getXPackUsage } from './get_xpack';
 
 export type TelemetryAggregatedStats = TelemetryLocalStats & {
   stack_stats: { xpack?: object };
 };
 
-export const getStatsWithXpack: StatsGetter<TelemetryAggregatedStats> = async function(
+export const getStatsWithXpack: StatsGetter<{}, TelemetryAggregatedStats> = async function(
   clustersDetails,
-  config
+  config,
+  context
 ) {
   const { callCluster } = config;
-  const clustersLocalStats = await getLocalStats(clustersDetails, config);
+  const clustersLocalStats = await getLocalStats(clustersDetails, config, context);
   const xpack = await getXPackUsage(callCluster).catch(() => undefined); // We want to still report something (and do not lose the license) even when this method fails.
 
   return clustersLocalStats.map(localStats => {
diff --git a/x-pack/legacy/plugins/xpack_main/server/telemetry_collection/get_xpack.ts b/x-pack/plugins/telemetry_collection_xpack/server/telemetry_collection/get_xpack.ts
similarity index 100%
rename from x-pack/legacy/plugins/xpack_main/server/telemetry_collection/get_xpack.ts
rename to x-pack/plugins/telemetry_collection_xpack/server/telemetry_collection/get_xpack.ts
diff --git a/x-pack/legacy/plugins/xpack_main/server/telemetry_collection/index.ts b/x-pack/plugins/telemetry_collection_xpack/server/telemetry_collection/index.ts
similarity index 76%
rename from x-pack/legacy/plugins/xpack_main/server/telemetry_collection/index.ts
rename to x-pack/plugins/telemetry_collection_xpack/server/telemetry_collection/index.ts
index 0b13957d7089c..553f8dc0c4188 100644
--- a/x-pack/legacy/plugins/xpack_main/server/telemetry_collection/index.ts
+++ b/x-pack/plugins/telemetry_collection_xpack/server/telemetry_collection/index.ts
@@ -4,4 +4,4 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-export { registerMonitoringCollection } from './register_xpack_collection';
+export { getStatsWithXpack } from './get_stats_with_xpack';
diff --git a/x-pack/test/api_integration/apis/telemetry/telemetry_optin_notice_seen.ts b/x-pack/test/api_integration/apis/telemetry/telemetry_optin_notice_seen.ts
index 582864795015c..c25ea403ce364 100644
--- a/x-pack/test/api_integration/apis/telemetry/telemetry_optin_notice_seen.ts
+++ b/x-pack/test/api_integration/apis/telemetry/telemetry_optin_notice_seen.ts
@@ -6,7 +6,7 @@
 
 import expect from '@kbn/expect';
 import { Client, DeleteDocumentParams, GetParams, GetResponse } from 'elasticsearch';
-import { TelemetrySavedObjectAttributes } from '../../../../../src/legacy/core_plugins/telemetry/server/telemetry_repository';
+import { TelemetrySavedObjectAttributes } from '../../../../../src/plugins/telemetry/server/telemetry_repository';
 import { FtrProviderContext } from '../../ftr_provider_context';
 
 export default function optInTest({ getService }: FtrProviderContext) {

From 2da5d635bf810b926176e48e1e5e23a26a3dbb5b Mon Sep 17 00:00:00 2001
From: Poff Poffenberger <poffdeluxe@gmail.com>
Date: Mon, 23 Mar 2020 14:09:05 -0500
Subject: [PATCH 031/179] Re-enable a CSS fix for the Monaco Editor's focus
 behavior (#60803)

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 src/plugins/kibana_react/public/code_editor/code_editor.tsx | 2 ++
 src/plugins/kibana_react/public/code_editor/editor.scss     | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/plugins/kibana_react/public/code_editor/code_editor.tsx b/src/plugins/kibana_react/public/code_editor/code_editor.tsx
index 37707fdec2140..e8b118b804347 100644
--- a/src/plugins/kibana_react/public/code_editor/code_editor.tsx
+++ b/src/plugins/kibana_react/public/code_editor/code_editor.tsx
@@ -25,6 +25,8 @@ import { monaco } from '@kbn/ui-shared-deps/monaco';
 
 import { LIGHT_THEME, DARK_THEME } from './editor_theme';
 
+import './editor.scss';
+
 export interface Props {
   /** Width of editor. Defaults to 100%. */
   width?: string | number;
diff --git a/src/plugins/kibana_react/public/code_editor/editor.scss b/src/plugins/kibana_react/public/code_editor/editor.scss
index 86a764716bc7c..23a3e3af7e656 100644
--- a/src/plugins/kibana_react/public/code_editor/editor.scss
+++ b/src/plugins/kibana_react/public/code_editor/editor.scss
@@ -1,3 +1,3 @@
 .react-monaco-editor-container .monaco-editor .inputarea:focus {
-  animation: none; // Removes textarea EUI blue underline animation from EUI
+  animation: none !important; // Removes textarea EUI blue underline animation from EUI
 }

From 65359856a0db4671558b10e5ee0fdc560485f4d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B8ren=20Louv-Jansen?= <sorenlouv@gmail.com>
Date: Mon, 23 Mar 2020 20:14:26 +0100
Subject: [PATCH 032/179] [APM] Remote Agent Config: Add additional (java)
 options (#59860)

---
 .../app/Main/route_config/index.tsx           |  29 +-
 .../route_handlers/agent_configuration.tsx    |  56 ++++
 .../app/Main/route_config/route_names.tsx     |   2 +
 .../AddEditFlyout/DeleteButton.tsx            |  96 ------
 .../AddEditFlyout/ServiceSection.tsx          | 159 ---------
 .../AddEditFlyout/SettingsSection.tsx         | 174 ----------
 .../AddEditFlyout/index.tsx                   | 256 ---------------
 .../AddEditFlyout/saveConfig.ts               | 107 -------
 .../ServicePage/FormRowSelect.tsx             |  53 +++
 .../ServicePage/ServicePage.tsx               | 208 ++++++++++++
 .../SettingsPage/SettingFormRow.tsx           | 178 +++++++++++
 .../SettingsPage/SettingsPage.tsx             | 301 ++++++++++++++++++
 .../SettingsPage/saveConfig.ts                |  68 ++++
 .../index.stories.tsx                         |  63 ++++
 .../AgentConfigurationCreateEdit/index.tsx    | 157 +++++++++
 .../AgentConfigurationList.tsx                | 232 --------------
 .../List/ConfirmDeleteModal.tsx               | 119 +++++++
 .../AgentConfigurations/List/index.tsx        | 221 +++++++++++++
 .../Settings/AgentConfigurations/index.tsx    |  66 +---
 .../public/components/app/Settings/index.tsx  |  16 +-
 .../components/shared/Links/apm/APMLink.tsx   |   2 +-
 .../Links/apm/agentConfigurationLinks.tsx     |  26 ++
 .../shared/SelectWithPlaceholder/index.tsx    |  47 +--
 .../apm/public/context/LocationContext.tsx    |   8 +-
 .../plugins/apm/public/hooks/useFetcher.tsx   |  39 ++-
 .../all_option.ts}                            |   6 +-
 .../agent_configuration/amount_and_unit.ts    |  19 ++
 .../configuration_types.d.ts                  |   3 +-
 .../agent_configuration_intake_rt.test.ts     |  58 ++++
 .../agent_configuration_intake_rt.ts          |  35 ++
 .../runtime_types/boolean_rt.test.ts          |  26 ++
 .../runtime_types/boolean_rt.ts               |   9 +
 .../runtime_types/bytes_rt.test.ts            |  39 +++
 .../runtime_types/bytes_rt.ts                 |  33 ++
 .../runtime_types/capture_body_rt.test.ts     |  26 ++
 .../runtime_types/capture_body_rt.ts          |  14 +
 .../runtime_types/duration_rt.test.ts         |  34 ++
 .../runtime_types/duration_rt.ts              |  33 ++
 .../runtime_types/integer_rt.test.ts          |  47 +++
 .../runtime_types/integer_rt.ts               |  31 ++
 .../runtime_types/number_float_rt.test.ts     |  36 +++
 .../runtime_types/number_float_rt.ts          |  36 +++
 .../__snapshots__/index.test.ts.snap          | 191 +++++++++++
 .../setting_definitions/general_settings.ts   | 219 +++++++++++++
 .../setting_definitions/index.test.ts         | 187 +++++++++++
 .../setting_definitions/index.ts              | 113 +++++++
 .../setting_definitions/java_settings.ts      | 256 +++++++++++++++
 .../setting_definitions/types.d.ts            | 107 +++++++
 .../index.test.ts                             |  41 ---
 .../agent_configuration_intake_rt/index.ts    |  26 --
 .../transaction_max_spans_rt/index.test.ts    |  28 --
 .../transaction_max_spans_rt/index.ts         |  19 --
 .../transaction_sample_rate_rt/index.test.ts  |  38 ---
 .../transaction_sample_rate_rt/index.ts       |  19 --
 .../lib/helpers/create_or_update_index.ts     |   3 +-
 .../convert_settings_to_string.ts             |  26 ++
 .../create_agent_config_index.ts              |  31 +-
 .../create_or_update_configuration.ts         |   2 +-
 .../find_exact_configuration.ts               |  11 +-
 .../get_environments/get_all_environments.ts  |   2 +-
 .../get_existing_environments_for_service.ts  |   2 +-
 .../agent_configuration/get_service_names.ts  |   2 +-
 .../list_configurations.ts                    |  10 +-
 .../mark_applied_by_agent.ts                  |   2 +-
 .../search_configurations.ts                  |  11 +-
 .../custom_link/create_custom_link_index.ts   |   1 +
 .../apm/server/routes/create_apm_api.ts       |   2 +
 .../routes/settings/agent_configuration.ts    | 118 ++++---
 .../translations/translations/ja-JP.json      |  42 ---
 .../translations/translations/zh-CN.json      |  42 ---
 .../apis/apm/agent_configuration.ts           |  54 ++--
 .../apis/apm/feature_controls.ts              |   2 +-
 72 files changed, 3290 insertions(+), 1485 deletions(-)
 create mode 100644 x-pack/legacy/plugins/apm/public/components/app/Main/route_config/route_handlers/agent_configuration.tsx
 delete mode 100644 x-pack/legacy/plugins/apm/public/components/app/Settings/AgentConfigurations/AddEditFlyout/DeleteButton.tsx
 delete mode 100644 x-pack/legacy/plugins/apm/public/components/app/Settings/AgentConfigurations/AddEditFlyout/ServiceSection.tsx
 delete mode 100644 x-pack/legacy/plugins/apm/public/components/app/Settings/AgentConfigurations/AddEditFlyout/SettingsSection.tsx
 delete mode 100644 x-pack/legacy/plugins/apm/public/components/app/Settings/AgentConfigurations/AddEditFlyout/index.tsx
 delete mode 100644 x-pack/legacy/plugins/apm/public/components/app/Settings/AgentConfigurations/AddEditFlyout/saveConfig.ts
 create mode 100644 x-pack/legacy/plugins/apm/public/components/app/Settings/AgentConfigurations/AgentConfigurationCreateEdit/ServicePage/FormRowSelect.tsx
 create mode 100644 x-pack/legacy/plugins/apm/public/components/app/Settings/AgentConfigurations/AgentConfigurationCreateEdit/ServicePage/ServicePage.tsx
 create mode 100644 x-pack/legacy/plugins/apm/public/components/app/Settings/AgentConfigurations/AgentConfigurationCreateEdit/SettingsPage/SettingFormRow.tsx
 create mode 100644 x-pack/legacy/plugins/apm/public/components/app/Settings/AgentConfigurations/AgentConfigurationCreateEdit/SettingsPage/SettingsPage.tsx
 create mode 100644 x-pack/legacy/plugins/apm/public/components/app/Settings/AgentConfigurations/AgentConfigurationCreateEdit/SettingsPage/saveConfig.ts
 create mode 100644 x-pack/legacy/plugins/apm/public/components/app/Settings/AgentConfigurations/AgentConfigurationCreateEdit/index.stories.tsx
 create mode 100644 x-pack/legacy/plugins/apm/public/components/app/Settings/AgentConfigurations/AgentConfigurationCreateEdit/index.tsx
 delete mode 100644 x-pack/legacy/plugins/apm/public/components/app/Settings/AgentConfigurations/AgentConfigurationList.tsx
 create mode 100644 x-pack/legacy/plugins/apm/public/components/app/Settings/AgentConfigurations/List/ConfirmDeleteModal.tsx
 create mode 100644 x-pack/legacy/plugins/apm/public/components/app/Settings/AgentConfigurations/List/index.tsx
 create mode 100644 x-pack/legacy/plugins/apm/public/components/shared/Links/apm/agentConfigurationLinks.tsx
 rename x-pack/plugins/apm/common/{agent_configuration_constants.ts => agent_configuration/all_option.ts} (74%)
 create mode 100644 x-pack/plugins/apm/common/agent_configuration/amount_and_unit.ts
 rename x-pack/plugins/apm/{server/lib/settings => common}/agent_configuration/configuration_types.d.ts (82%)
 create mode 100644 x-pack/plugins/apm/common/agent_configuration/runtime_types/agent_configuration_intake_rt.test.ts
 create mode 100644 x-pack/plugins/apm/common/agent_configuration/runtime_types/agent_configuration_intake_rt.ts
 create mode 100644 x-pack/plugins/apm/common/agent_configuration/runtime_types/boolean_rt.test.ts
 create mode 100644 x-pack/plugins/apm/common/agent_configuration/runtime_types/boolean_rt.ts
 create mode 100644 x-pack/plugins/apm/common/agent_configuration/runtime_types/bytes_rt.test.ts
 create mode 100644 x-pack/plugins/apm/common/agent_configuration/runtime_types/bytes_rt.ts
 create mode 100644 x-pack/plugins/apm/common/agent_configuration/runtime_types/capture_body_rt.test.ts
 create mode 100644 x-pack/plugins/apm/common/agent_configuration/runtime_types/capture_body_rt.ts
 create mode 100644 x-pack/plugins/apm/common/agent_configuration/runtime_types/duration_rt.test.ts
 create mode 100644 x-pack/plugins/apm/common/agent_configuration/runtime_types/duration_rt.ts
 create mode 100644 x-pack/plugins/apm/common/agent_configuration/runtime_types/integer_rt.test.ts
 create mode 100644 x-pack/plugins/apm/common/agent_configuration/runtime_types/integer_rt.ts
 create mode 100644 x-pack/plugins/apm/common/agent_configuration/runtime_types/number_float_rt.test.ts
 create mode 100644 x-pack/plugins/apm/common/agent_configuration/runtime_types/number_float_rt.ts
 create mode 100644 x-pack/plugins/apm/common/agent_configuration/setting_definitions/__snapshots__/index.test.ts.snap
 create mode 100644 x-pack/plugins/apm/common/agent_configuration/setting_definitions/general_settings.ts
 create mode 100644 x-pack/plugins/apm/common/agent_configuration/setting_definitions/index.test.ts
 create mode 100644 x-pack/plugins/apm/common/agent_configuration/setting_definitions/index.ts
 create mode 100644 x-pack/plugins/apm/common/agent_configuration/setting_definitions/java_settings.ts
 create mode 100644 x-pack/plugins/apm/common/agent_configuration/setting_definitions/types.d.ts
 delete mode 100644 x-pack/plugins/apm/common/runtime_types/agent_configuration_intake_rt/index.test.ts
 delete mode 100644 x-pack/plugins/apm/common/runtime_types/agent_configuration_intake_rt/index.ts
 delete mode 100644 x-pack/plugins/apm/common/runtime_types/transaction_max_spans_rt/index.test.ts
 delete mode 100644 x-pack/plugins/apm/common/runtime_types/transaction_max_spans_rt/index.ts
 delete mode 100644 x-pack/plugins/apm/common/runtime_types/transaction_sample_rate_rt/index.test.ts
 delete mode 100644 x-pack/plugins/apm/common/runtime_types/transaction_sample_rate_rt/index.ts
 create mode 100644 x-pack/plugins/apm/server/lib/settings/agent_configuration/convert_settings_to_string.ts

diff --git a/x-pack/legacy/plugins/apm/public/components/app/Main/route_config/index.tsx b/x-pack/legacy/plugins/apm/public/components/app/Main/route_config/index.tsx
index 2e737382c67a5..c87e56fe9eff6 100644
--- a/x-pack/legacy/plugins/apm/public/components/app/Main/route_config/index.tsx
+++ b/x-pack/legacy/plugins/apm/public/components/app/Main/route_config/index.tsx
@@ -23,6 +23,10 @@ import { resolveUrlParams } from '../../../../context/UrlParamsContext/resolveUr
 import { UNIDENTIFIED_SERVICE_NODES_LABEL } from '../../../../../../../../plugins/apm/common/i18n';
 import { TraceLink } from '../../TraceLink';
 import { CustomizeUI } from '../../Settings/CustomizeUI';
+import {
+  EditAgentConfigurationRouteHandler,
+  CreateAgentConfigurationRouteHandler
+} from './route_handlers/agent_configuration';
 
 const metricsBreadcrumb = i18n.translate('xpack.apm.breadcrumb.metricsTitle', {
   defaultMessage: 'Metrics'
@@ -101,12 +105,31 @@ export const routes: BreadcrumbRoute[] = [
     ),
     breadcrumb: i18n.translate(
       'xpack.apm.breadcrumb.settings.agentConfigurationTitle',
-      {
-        defaultMessage: 'Agent Configuration'
-      }
+      { defaultMessage: 'Agent Configuration' }
     ),
     name: RouteName.AGENT_CONFIGURATION
   },
+
+  {
+    exact: true,
+    path: '/settings/agent-configuration/create',
+    breadcrumb: i18n.translate(
+      'xpack.apm.breadcrumb.settings.createAgentConfigurationTitle',
+      { defaultMessage: 'Create Agent Configuration' }
+    ),
+    name: RouteName.AGENT_CONFIGURATION_CREATE,
+    component: () => <CreateAgentConfigurationRouteHandler />
+  },
+  {
+    exact: true,
+    path: '/settings/agent-configuration/edit',
+    breadcrumb: i18n.translate(
+      'xpack.apm.breadcrumb.settings.editAgentConfigurationTitle',
+      { defaultMessage: 'Edit Agent Configuration' }
+    ),
+    name: RouteName.AGENT_CONFIGURATION_EDIT,
+    component: () => <EditAgentConfigurationRouteHandler />
+  },
   {
     exact: true,
     path: '/services/:serviceName',
diff --git a/x-pack/legacy/plugins/apm/public/components/app/Main/route_config/route_handlers/agent_configuration.tsx b/x-pack/legacy/plugins/apm/public/components/app/Main/route_config/route_handlers/agent_configuration.tsx
new file mode 100644
index 0000000000000..58087f0d8be42
--- /dev/null
+++ b/x-pack/legacy/plugins/apm/public/components/app/Main/route_config/route_handlers/agent_configuration.tsx
@@ -0,0 +1,56 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React from 'react';
+import { useFetcher } from '../../../../../hooks/useFetcher';
+import { history } from '../../../../../utils/history';
+import { Settings } from '../../../Settings';
+import { AgentConfigurationCreateEdit } from '../../../Settings/AgentConfigurations/AgentConfigurationCreateEdit';
+import { toQuery } from '../../../../shared/Links/url_helpers';
+
+export function EditAgentConfigurationRouteHandler() {
+  const { search } = history.location;
+
+  // typescript complains because `pageStop` does not exist in `APMQueryParams`
+  // Going forward we should move away from globally declared query params and this is a first step
+  // @ts-ignore
+  const { name, environment, pageStep } = toQuery(search);
+
+  const res = useFetcher(
+    callApmApi => {
+      return callApmApi({
+        pathname: '/api/apm/settings/agent-configuration/view',
+        params: { query: { name, environment } }
+      });
+    },
+    [name, environment]
+  );
+
+  return (
+    <Settings>
+      <AgentConfigurationCreateEdit
+        pageStep={pageStep || 'choose-settings-step'}
+        existingConfigResult={res}
+      />
+    </Settings>
+  );
+}
+
+export function CreateAgentConfigurationRouteHandler() {
+  const { search } = history.location;
+
+  // Ignoring here because we specifically DO NOT want to add the query params to the global route handler
+  // @ts-ignore
+  const { pageStep } = toQuery(search);
+
+  return (
+    <Settings>
+      <AgentConfigurationCreateEdit
+        pageStep={pageStep || 'choose-service-step'}
+      />
+    </Settings>
+  );
+}
diff --git a/x-pack/legacy/plugins/apm/public/components/app/Main/route_config/route_names.tsx b/x-pack/legacy/plugins/apm/public/components/app/Main/route_config/route_names.tsx
index db57e8356f39b..33a4990cb549e 100644
--- a/x-pack/legacy/plugins/apm/public/components/app/Main/route_config/route_names.tsx
+++ b/x-pack/legacy/plugins/apm/public/components/app/Main/route_config/route_names.tsx
@@ -20,6 +20,8 @@ export enum RouteName {
   TRANSACTION_NAME = 'transaction_name',
   SETTINGS = 'settings',
   AGENT_CONFIGURATION = 'agent_configuration',
+  AGENT_CONFIGURATION_CREATE = 'agent_configuration_create',
+  AGENT_CONFIGURATION_EDIT = 'agent_configuration_edit',
   INDICES = 'indices',
   SERVICE_NODES = 'nodes',
   LINK_TO_TRACE = 'link_to_trace',
diff --git a/x-pack/legacy/plugins/apm/public/components/app/Settings/AgentConfigurations/AddEditFlyout/DeleteButton.tsx b/x-pack/legacy/plugins/apm/public/components/app/Settings/AgentConfigurations/AddEditFlyout/DeleteButton.tsx
deleted file mode 100644
index 997df371b51ed..0000000000000
--- a/x-pack/legacy/plugins/apm/public/components/app/Settings/AgentConfigurations/AddEditFlyout/DeleteButton.tsx
+++ /dev/null
@@ -1,96 +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, { useState } from 'react';
-import { EuiButtonEmpty } from '@elastic/eui';
-import { NotificationsStart } from 'kibana/public';
-import { i18n } from '@kbn/i18n';
-import { Config } from '../index';
-import { getOptionLabel } from '../../../../../../../../../plugins/apm/common/agent_configuration_constants';
-import { callApmApi } from '../../../../../services/rest/createCallApmApi';
-import { useApmPluginContext } from '../../../../../hooks/useApmPluginContext';
-
-interface Props {
-  onDeleted: () => void;
-  selectedConfig: Config;
-}
-
-export function DeleteButton({ onDeleted, selectedConfig }: Props) {
-  const [isDeleting, setIsDeleting] = useState(false);
-  const { toasts } = useApmPluginContext().core.notifications;
-
-  return (
-    <EuiButtonEmpty
-      color="danger"
-      isLoading={isDeleting}
-      iconSide="right"
-      onClick={async () => {
-        setIsDeleting(true);
-        await deleteConfig(selectedConfig, toasts);
-        setIsDeleting(false);
-        onDeleted();
-      }}
-    >
-      {i18n.translate(
-        'xpack.apm.settings.agentConf.flyout.deleteSection.buttonLabel',
-        { defaultMessage: 'Delete' }
-      )}
-    </EuiButtonEmpty>
-  );
-}
-
-async function deleteConfig(
-  selectedConfig: Config,
-  toasts: NotificationsStart['toasts']
-) {
-  try {
-    await callApmApi({
-      pathname: '/api/apm/settings/agent-configuration',
-      method: 'DELETE',
-      params: {
-        body: {
-          service: {
-            name: selectedConfig.service.name,
-            environment: selectedConfig.service.environment
-          }
-        }
-      }
-    });
-
-    toasts.addSuccess({
-      title: i18n.translate(
-        'xpack.apm.settings.agentConf.flyout.deleteSection.deleteConfigSucceededTitle',
-        { defaultMessage: 'Configuration was deleted' }
-      ),
-      text: i18n.translate(
-        'xpack.apm.settings.agentConf.flyout.deleteSection.deleteConfigSucceededText',
-        {
-          defaultMessage:
-            'You have successfully deleted a configuration for "{serviceName}". It will take some time to propagate to the agents.',
-          values: { serviceName: getOptionLabel(selectedConfig.service.name) }
-        }
-      )
-    });
-  } catch (error) {
-    toasts.addDanger({
-      title: i18n.translate(
-        'xpack.apm.settings.agentConf.flyout.deleteSection.deleteConfigFailedTitle',
-        { defaultMessage: 'Configuration could not be deleted' }
-      ),
-      text: i18n.translate(
-        'xpack.apm.settings.agentConf.flyout.deleteSection.deleteConfigFailedText',
-        {
-          defaultMessage:
-            'Something went wrong when deleting a configuration for "{serviceName}". Error: "{errorMessage}"',
-          values: {
-            serviceName: getOptionLabel(selectedConfig.service.name),
-            errorMessage: error.message
-          }
-        }
-      )
-    });
-  }
-}
diff --git a/x-pack/legacy/plugins/apm/public/components/app/Settings/AgentConfigurations/AddEditFlyout/ServiceSection.tsx b/x-pack/legacy/plugins/apm/public/components/app/Settings/AgentConfigurations/AddEditFlyout/ServiceSection.tsx
deleted file mode 100644
index 537bdace50e24..0000000000000
--- a/x-pack/legacy/plugins/apm/public/components/app/Settings/AgentConfigurations/AddEditFlyout/ServiceSection.tsx
+++ /dev/null
@@ -1,159 +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 { EuiTitle, EuiSpacer, EuiFormRow, EuiText } from '@elastic/eui';
-import React from 'react';
-import { i18n } from '@kbn/i18n';
-import {
-  omitAllOption,
-  getOptionLabel
-} from '../../../../../../../../../plugins/apm/common/agent_configuration_constants';
-import { useFetcher } from '../../../../../hooks/useFetcher';
-import { SelectWithPlaceholder } from '../../../../shared/SelectWithPlaceholder';
-
-const SELECT_PLACEHOLDER_LABEL = `- ${i18n.translate(
-  'xpack.apm.settings.agentConf.flyOut.serviceSection.selectPlaceholder',
-  { defaultMessage: 'Select' }
-)} -`;
-
-interface Props {
-  isReadOnly: boolean;
-  serviceName: string;
-  onServiceNameChange: (env: string) => void;
-  environment: string;
-  onEnvironmentChange: (env: string) => void;
-}
-
-export function ServiceSection({
-  isReadOnly,
-  serviceName,
-  onServiceNameChange,
-  environment,
-  onEnvironmentChange
-}: Props) {
-  const { data: serviceNames = [], status: serviceNamesStatus } = useFetcher(
-    callApmApi => {
-      if (!isReadOnly) {
-        return callApmApi({
-          pathname: '/api/apm/settings/agent-configuration/services',
-          forceCache: true
-        });
-      }
-    },
-    [isReadOnly],
-    { preservePreviousData: false }
-  );
-  const { data: environments = [], status: environmentStatus } = useFetcher(
-    callApmApi => {
-      if (!isReadOnly && serviceName) {
-        return callApmApi({
-          pathname: '/api/apm/settings/agent-configuration/environments',
-          params: { query: { serviceName: omitAllOption(serviceName) } }
-        });
-      }
-    },
-    [isReadOnly, serviceName],
-    { preservePreviousData: false }
-  );
-
-  const ALREADY_CONFIGURED_TRANSLATED = i18n.translate(
-    'xpack.apm.settings.agentConf.flyOut.serviceSection.alreadyConfiguredOption',
-    { defaultMessage: 'already configured' }
-  );
-
-  const serviceNameOptions = serviceNames.map(name => ({
-    text: getOptionLabel(name),
-    value: name
-  }));
-  const environmentOptions = environments.map(
-    ({ name, alreadyConfigured }) => ({
-      disabled: alreadyConfigured,
-      text: `${getOptionLabel(name)} ${
-        alreadyConfigured ? `(${ALREADY_CONFIGURED_TRANSLATED})` : ''
-      }`,
-      value: name
-    })
-  );
-
-  return (
-    <>
-      <EuiTitle size="xs">
-        <h3>
-          {i18n.translate(
-            'xpack.apm.settings.agentConf.flyOut.serviceSection.title',
-            { defaultMessage: 'Service' }
-          )}
-        </h3>
-      </EuiTitle>
-
-      <EuiSpacer size="m" />
-
-      <EuiFormRow
-        label={i18n.translate(
-          'xpack.apm.settings.agentConf.flyOut.serviceSection.serviceNameSelectLabel',
-          { defaultMessage: 'Name' }
-        )}
-        helpText={
-          !isReadOnly &&
-          i18n.translate(
-            'xpack.apm.settings.agentConf.flyOut.serviceSection.serviceNameSelectHelpText',
-            { defaultMessage: 'Choose the service you want to configure.' }
-          )
-        }
-      >
-        {isReadOnly ? (
-          <EuiText>{getOptionLabel(serviceName)}</EuiText>
-        ) : (
-          <SelectWithPlaceholder
-            placeholder={SELECT_PLACEHOLDER_LABEL}
-            isLoading={serviceNamesStatus === 'loading'}
-            options={serviceNameOptions}
-            value={serviceName}
-            disabled={serviceNamesStatus === 'loading'}
-            onChange={e => {
-              e.preventDefault();
-              onServiceNameChange(e.target.value);
-              onEnvironmentChange('');
-            }}
-          />
-        )}
-      </EuiFormRow>
-
-      <EuiFormRow
-        label={i18n.translate(
-          'xpack.apm.settings.agentConf.flyOut.serviceSection.serviceEnvironmentSelectLabel',
-          { defaultMessage: 'Environment' }
-        )}
-        helpText={
-          !isReadOnly &&
-          i18n.translate(
-            'xpack.apm.settings.agentConf.flyOut.serviceSection.serviceEnvironmentSelectHelpText',
-            {
-              defaultMessage:
-                'Only a single environment per configuration is supported.'
-            }
-          )
-        }
-      >
-        {isReadOnly ? (
-          <EuiText>{getOptionLabel(environment)}</EuiText>
-        ) : (
-          <SelectWithPlaceholder
-            placeholder={SELECT_PLACEHOLDER_LABEL}
-            isLoading={environmentStatus === 'loading'}
-            options={environmentOptions}
-            value={environment}
-            disabled={!serviceName || environmentStatus === 'loading'}
-            onChange={e => {
-              e.preventDefault();
-              onEnvironmentChange(e.target.value);
-            }}
-          />
-        )}
-      </EuiFormRow>
-    </>
-  );
-}
diff --git a/x-pack/legacy/plugins/apm/public/components/app/Settings/AgentConfigurations/AddEditFlyout/SettingsSection.tsx b/x-pack/legacy/plugins/apm/public/components/app/Settings/AgentConfigurations/AddEditFlyout/SettingsSection.tsx
deleted file mode 100644
index 24c8222d4cd99..0000000000000
--- a/x-pack/legacy/plugins/apm/public/components/app/Settings/AgentConfigurations/AddEditFlyout/SettingsSection.tsx
+++ /dev/null
@@ -1,174 +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 {
-  EuiFormRow,
-  EuiFieldText,
-  EuiTitle,
-  EuiSpacer,
-  EuiFieldNumber
-} from '@elastic/eui';
-import { i18n } from '@kbn/i18n';
-import { isEmpty } from 'lodash';
-import { SelectWithPlaceholder } from '../../../../shared/SelectWithPlaceholder';
-
-interface Props {
-  isRumService: boolean;
-
-  // sampleRate
-  sampleRate: string;
-  setSampleRate: (value: string) => void;
-  isSampleRateValid?: boolean;
-
-  // captureBody
-  captureBody: string;
-  setCaptureBody: (value: string) => void;
-
-  // transactionMaxSpans
-  transactionMaxSpans: string;
-  setTransactionMaxSpans: (value: string) => void;
-  isTransactionMaxSpansValid?: boolean;
-}
-
-export function SettingsSection({
-  isRumService,
-
-  // sampleRate
-  sampleRate,
-  setSampleRate,
-  isSampleRateValid,
-
-  // captureBody
-  captureBody,
-  setCaptureBody,
-
-  // transactionMaxSpans
-  transactionMaxSpans,
-  setTransactionMaxSpans,
-  isTransactionMaxSpansValid
-}: Props) {
-  return (
-    <>
-      <EuiTitle size="xs">
-        <h3>
-          {i18n.translate(
-            'xpack.apm.settings.agentConf.flyOut.settingsSection.title',
-            { defaultMessage: 'Options' }
-          )}
-        </h3>
-      </EuiTitle>
-
-      <EuiSpacer size="m" />
-
-      <EuiFormRow
-        label={i18n.translate(
-          'xpack.apm.settings.agentConf.flyOut.settingsSection.sampleRateConfigurationInputLabel',
-          { defaultMessage: 'Transaction sample rate' }
-        )}
-        helpText={i18n.translate(
-          'xpack.apm.settings.agentConf.flyOut.settingsSection.sampleRateConfigurationInputHelpText',
-          {
-            defaultMessage:
-              'Choose a rate between 0.000 and 1.0. Default is 1.0 (100% of traces).'
-          }
-        )}
-        error={i18n.translate(
-          'xpack.apm.settings.agentConf.flyOut.settingsSection.sampleRateConfigurationInputErrorText',
-          { defaultMessage: 'Sample rate must be between 0.000 and 1' }
-        )}
-        isInvalid={!isEmpty(sampleRate) && !isSampleRateValid}
-      >
-        <EuiFieldText
-          placeholder={i18n.translate(
-            'xpack.apm.settings.agentConf.flyOut.settingsSection.sampleRateConfigurationInputPlaceholderText',
-            { defaultMessage: 'Set sample rate' }
-          )}
-          value={sampleRate}
-          onChange={e => {
-            e.preventDefault();
-            setSampleRate(e.target.value);
-          }}
-        />
-      </EuiFormRow>
-
-      <EuiSpacer size="m" />
-
-      {!isRumService && (
-        <EuiFormRow
-          label={i18n.translate(
-            'xpack.apm.settings.agentConf.flyOut.settingsSection.captureBodyInputLabel',
-            { defaultMessage: 'Capture body' }
-          )}
-          helpText={i18n.translate(
-            'xpack.apm.settings.agentConf.flyOut.settingsSection.captureBodyInputHelpText',
-            {
-              defaultMessage:
-                'For transactions that are HTTP requests, the agent can optionally capture the request body (e.g. POST variables). Default is "off".'
-            }
-          )}
-        >
-          <SelectWithPlaceholder
-            placeholder={i18n.translate(
-              'xpack.apm.settings.agentConf.flyOut.settingsSection.captureBodyInputPlaceholderText',
-              { defaultMessage: 'Select option' }
-            )}
-            options={[
-              { text: 'off' },
-              { text: 'errors' },
-              { text: 'transactions' },
-              { text: 'all' }
-            ]}
-            value={captureBody}
-            onChange={e => {
-              e.preventDefault();
-              setCaptureBody(e.target.value);
-            }}
-          />
-        </EuiFormRow>
-      )}
-
-      {!isRumService && (
-        <EuiFormRow
-          label={i18n.translate(
-            'xpack.apm.settings.agentConf.flyOut.settingsSection.transactionMaxSpansConfigInputLabel',
-            { defaultMessage: 'Transaction max spans' }
-          )}
-          helpText={i18n.translate(
-            'xpack.apm.settings.agentConf.flyOut.settingsSection.transactionMaxSpansConfigInputHelpText',
-            {
-              defaultMessage:
-                'Limits the amount of spans that are recorded per transaction. Default is 500.'
-            }
-          )}
-          error={i18n.translate(
-            'xpack.apm.settings.agentConf.flyOut.settingsSection.transactionMaxSpansConfigInputErrorText',
-            { defaultMessage: 'Must be between 0 and 32000' }
-          )}
-          isInvalid={
-            !isEmpty(transactionMaxSpans) && !isTransactionMaxSpansValid
-          }
-        >
-          <EuiFieldNumber
-            placeholder={i18n.translate(
-              'xpack.apm.settings.agentConf.flyOut.settingsSection.transactionMaxSpansConfigInputPlaceholderText',
-              { defaultMessage: 'Set transaction max spans' }
-            )}
-            value={
-              transactionMaxSpans === '' ? '' : Number(transactionMaxSpans)
-            }
-            min={0}
-            max={32000}
-            onChange={e => {
-              e.preventDefault();
-              setTransactionMaxSpans(e.target.value);
-            }}
-          />
-        </EuiFormRow>
-      )}
-    </>
-  );
-}
diff --git a/x-pack/legacy/plugins/apm/public/components/app/Settings/AgentConfigurations/AddEditFlyout/index.tsx b/x-pack/legacy/plugins/apm/public/components/app/Settings/AgentConfigurations/AddEditFlyout/index.tsx
deleted file mode 100644
index a034ca543390f..0000000000000
--- a/x-pack/legacy/plugins/apm/public/components/app/Settings/AgentConfigurations/AddEditFlyout/index.tsx
+++ /dev/null
@@ -1,256 +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 {
-  EuiButton,
-  EuiButtonEmpty,
-  EuiFlexGroup,
-  EuiFlexItem,
-  EuiFlyout,
-  EuiFlyoutBody,
-  EuiFlyoutFooter,
-  EuiFlyoutHeader,
-  EuiForm,
-  EuiPortal,
-  EuiTitle,
-  EuiText,
-  EuiSpacer
-} from '@elastic/eui';
-import React, { useState } from 'react';
-import { i18n } from '@kbn/i18n';
-import { isRight } from 'fp-ts/lib/Either';
-import { transactionSampleRateRt } from '../../../../../../../../../plugins/apm/common/runtime_types/transaction_sample_rate_rt';
-import { Config } from '../index';
-import { SettingsSection } from './SettingsSection';
-import { ServiceSection } from './ServiceSection';
-import { DeleteButton } from './DeleteButton';
-import { transactionMaxSpansRt } from '../../../../../../../../../plugins/apm/common/runtime_types/transaction_max_spans_rt';
-import { useFetcher } from '../../../../../hooks/useFetcher';
-import { isRumAgentName } from '../../../../../../../../../plugins/apm/common/agent_name';
-import { ALL_OPTION_VALUE } from '../../../../../../../../../plugins/apm/common/agent_configuration_constants';
-import { saveConfig } from './saveConfig';
-import { useApmPluginContext } from '../../../../../hooks/useApmPluginContext';
-import { useUiTracker } from '../../../../../../../../../plugins/observability/public';
-
-const defaultSettings = {
-  TRANSACTION_SAMPLE_RATE: '1.0',
-  CAPTURE_BODY: 'off',
-  TRANSACTION_MAX_SPANS: '500'
-};
-
-interface Props {
-  onClose: () => void;
-  onSaved: () => void;
-  onDeleted: () => void;
-  selectedConfig: Config | null;
-}
-
-export function AddEditFlyout({
-  onClose,
-  onSaved,
-  onDeleted,
-  selectedConfig
-}: Props) {
-  const { toasts } = useApmPluginContext().core.notifications;
-  const [isSaving, setIsSaving] = useState(false);
-
-  // get a telemetry UI event tracker
-  const trackApmEvent = useUiTracker({ app: 'apm' });
-
-  // config conditions (service)
-  const [serviceName, setServiceName] = useState<string>(
-    selectedConfig ? selectedConfig.service.name || ALL_OPTION_VALUE : ''
-  );
-  const [environment, setEnvironment] = useState<string>(
-    selectedConfig ? selectedConfig.service.environment || ALL_OPTION_VALUE : ''
-  );
-
-  const { data: { agentName } = { agentName: undefined } } = useFetcher(
-    callApmApi => {
-      if (serviceName === ALL_OPTION_VALUE) {
-        return Promise.resolve({ agentName: undefined });
-      }
-
-      if (serviceName) {
-        return callApmApi({
-          pathname: '/api/apm/settings/agent-configuration/agent_name',
-          params: { query: { serviceName } }
-        });
-      }
-    },
-    [serviceName],
-    { preservePreviousData: false }
-  );
-
-  // config settings
-  const [sampleRate, setSampleRate] = useState<string>(
-    (
-      selectedConfig?.settings.transaction_sample_rate ||
-      defaultSettings.TRANSACTION_SAMPLE_RATE
-    ).toString()
-  );
-  const [captureBody, setCaptureBody] = useState<string>(
-    selectedConfig?.settings.capture_body || defaultSettings.CAPTURE_BODY
-  );
-  const [transactionMaxSpans, setTransactionMaxSpans] = useState<string>(
-    (
-      selectedConfig?.settings.transaction_max_spans ||
-      defaultSettings.TRANSACTION_MAX_SPANS
-    ).toString()
-  );
-
-  const isRumService = isRumAgentName(agentName);
-  const isSampleRateValid = isRight(transactionSampleRateRt.decode(sampleRate));
-  const isTransactionMaxSpansValid = isRight(
-    transactionMaxSpansRt.decode(transactionMaxSpans)
-  );
-
-  const isFormValid =
-    !!serviceName &&
-    !!environment &&
-    isSampleRateValid &&
-    // captureBody and isTransactionMaxSpansValid are required except if service is RUM
-    (isRumService || (!!captureBody && isTransactionMaxSpansValid)) &&
-    // agent name is required, except if serviceName is "all"
-    (serviceName === ALL_OPTION_VALUE || agentName !== undefined);
-
-  const handleSubmitEvent = async (
-    event:
-      | React.FormEvent<HTMLFormElement>
-      | React.MouseEvent<HTMLButtonElement>
-  ) => {
-    event.preventDefault();
-    setIsSaving(true);
-
-    await saveConfig({
-      serviceName,
-      environment,
-      sampleRate,
-      captureBody,
-      transactionMaxSpans,
-      agentName,
-      isExistingConfig: Boolean(selectedConfig),
-      toasts,
-      trackApmEvent
-    });
-    setIsSaving(false);
-    onSaved();
-  };
-
-  return (
-    <EuiPortal>
-      <EuiFlyout size="s" onClose={onClose} ownFocus={true}>
-        <EuiFlyoutHeader hasBorder>
-          <EuiTitle>
-            <h2>
-              {selectedConfig
-                ? i18n.translate(
-                    'xpack.apm.settings.agentConf.editConfigTitle',
-                    { defaultMessage: 'Edit configuration' }
-                  )
-                : i18n.translate(
-                    'xpack.apm.settings.agentConf.createConfigTitle',
-                    { defaultMessage: 'Create configuration' }
-                  )}
-            </h2>
-          </EuiTitle>
-        </EuiFlyoutHeader>
-        <EuiFlyoutBody>
-          <EuiText size="s">
-            This allows you to fine-tune your agent configuration directly in
-            Kibana. Best of all, changes are automatically propagated to your
-            APM agents so there’s no need to redeploy.
-          </EuiText>
-
-          <EuiSpacer size="m" />
-
-          <EuiForm>
-            {/* eslint-disable-next-line jsx-a11y/no-noninteractive-element-interactions */}
-            <form
-              onKeyPress={e => {
-                const didClickEnter = e.which === 13;
-                if (didClickEnter) {
-                  handleSubmitEvent(e);
-                }
-              }}
-            >
-              <ServiceSection
-                isReadOnly={Boolean(selectedConfig)}
-                //
-                // environment
-                environment={environment}
-                onEnvironmentChange={setEnvironment}
-                //
-                // serviceName
-                serviceName={serviceName}
-                onServiceNameChange={setServiceName}
-              />
-
-              <EuiSpacer />
-
-              <SettingsSection
-                isRumService={isRumService}
-                //
-                // sampleRate
-                sampleRate={sampleRate}
-                setSampleRate={setSampleRate}
-                isSampleRateValid={isSampleRateValid}
-                //
-                // captureBody
-                captureBody={captureBody}
-                setCaptureBody={setCaptureBody}
-                //
-                // transactionMaxSpans
-                transactionMaxSpans={transactionMaxSpans}
-                setTransactionMaxSpans={setTransactionMaxSpans}
-                isTransactionMaxSpansValid={isTransactionMaxSpansValid}
-              />
-            </form>
-          </EuiForm>
-        </EuiFlyoutBody>
-        <EuiFlyoutFooter>
-          <EuiFlexGroup justifyContent="spaceBetween">
-            <EuiFlexItem grow={false}>
-              {selectedConfig ? (
-                <DeleteButton
-                  selectedConfig={selectedConfig}
-                  onDeleted={onDeleted}
-                />
-              ) : null}
-            </EuiFlexItem>
-            <EuiFlexItem grow={false}>
-              <EuiFlexGroup justifyContent="flexEnd">
-                <EuiFlexItem grow={false}>
-                  <EuiButtonEmpty onClick={onClose}>
-                    {i18n.translate(
-                      'xpack.apm.settings.agentConf.cancelButtonLabel',
-                      { defaultMessage: 'Cancel' }
-                    )}
-                  </EuiButtonEmpty>
-                </EuiFlexItem>
-                <EuiFlexItem grow={false}>
-                  <EuiButton
-                    type="submit"
-                    fill
-                    isLoading={isSaving}
-                    iconSide="right"
-                    isDisabled={!isFormValid}
-                    onClick={handleSubmitEvent}
-                  >
-                    {i18n.translate(
-                      'xpack.apm.settings.agentConf.saveConfigurationButtonLabel',
-                      { defaultMessage: 'Save' }
-                    )}
-                  </EuiButton>
-                </EuiFlexItem>
-              </EuiFlexGroup>
-            </EuiFlexItem>
-          </EuiFlexGroup>
-        </EuiFlyoutFooter>
-      </EuiFlyout>
-    </EuiPortal>
-  );
-}
diff --git a/x-pack/legacy/plugins/apm/public/components/app/Settings/AgentConfigurations/AddEditFlyout/saveConfig.ts b/x-pack/legacy/plugins/apm/public/components/app/Settings/AgentConfigurations/AddEditFlyout/saveConfig.ts
deleted file mode 100644
index 229394cb5da8c..0000000000000
--- a/x-pack/legacy/plugins/apm/public/components/app/Settings/AgentConfigurations/AddEditFlyout/saveConfig.ts
+++ /dev/null
@@ -1,107 +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 { NotificationsStart } from 'kibana/public';
-import { callApmApi } from '../../../../../services/rest/createCallApmApi';
-import { isRumAgentName } from '../../../../../../../../../plugins/apm/common/agent_name';
-import {
-  getOptionLabel,
-  omitAllOption
-} from '../../../../../../../../../plugins/apm/common/agent_configuration_constants';
-import { UiTracker } from '../../../../../../../../../plugins/observability/public';
-
-interface Settings {
-  transaction_sample_rate: number;
-  capture_body?: string;
-  transaction_max_spans?: number;
-}
-
-export async function saveConfig({
-  serviceName,
-  environment,
-  sampleRate,
-  captureBody,
-  transactionMaxSpans,
-  agentName,
-  isExistingConfig,
-  toasts,
-  trackApmEvent
-}: {
-  serviceName: string;
-  environment: string;
-  sampleRate: string;
-  captureBody: string;
-  transactionMaxSpans: string;
-  agentName?: string;
-  isExistingConfig: boolean;
-  toasts: NotificationsStart['toasts'];
-  trackApmEvent: UiTracker;
-}) {
-  trackApmEvent({ metric: 'save_agent_configuration' });
-
-  try {
-    const settings: Settings = {
-      transaction_sample_rate: Number(sampleRate)
-    };
-
-    if (!isRumAgentName(agentName)) {
-      settings.capture_body = captureBody;
-      settings.transaction_max_spans = Number(transactionMaxSpans);
-    }
-
-    const configuration = {
-      agent_name: agentName,
-      service: {
-        name: omitAllOption(serviceName),
-        environment: omitAllOption(environment)
-      },
-      settings
-    };
-
-    await callApmApi({
-      pathname: '/api/apm/settings/agent-configuration',
-      method: 'PUT',
-      params: {
-        query: { overwrite: isExistingConfig },
-        body: configuration
-      }
-    });
-
-    toasts.addSuccess({
-      title: i18n.translate(
-        'xpack.apm.settings.agentConf.saveConfig.succeeded.title',
-        { defaultMessage: 'Configuration saved' }
-      ),
-      text: i18n.translate(
-        'xpack.apm.settings.agentConf.saveConfig.succeeded.text',
-        {
-          defaultMessage:
-            'The configuration for "{serviceName}" was saved. It will take some time to propagate to the agents.',
-          values: { serviceName: getOptionLabel(serviceName) }
-        }
-      )
-    });
-  } catch (error) {
-    toasts.addDanger({
-      title: i18n.translate(
-        'xpack.apm.settings.agentConf.saveConfig.failed.title',
-        { defaultMessage: 'Configuration could not be saved' }
-      ),
-      text: i18n.translate(
-        'xpack.apm.settings.agentConf.saveConfig.failed.text',
-        {
-          defaultMessage:
-            'Something went wrong when saving the configuration for "{serviceName}". Error: "{errorMessage}"',
-          values: {
-            serviceName: getOptionLabel(serviceName),
-            errorMessage: error.message
-          }
-        }
-      )
-    });
-  }
-}
diff --git a/x-pack/legacy/plugins/apm/public/components/app/Settings/AgentConfigurations/AgentConfigurationCreateEdit/ServicePage/FormRowSelect.tsx b/x-pack/legacy/plugins/apm/public/components/app/Settings/AgentConfigurations/AgentConfigurationCreateEdit/ServicePage/FormRowSelect.tsx
new file mode 100644
index 0000000000000..30d3f9580db48
--- /dev/null
+++ b/x-pack/legacy/plugins/apm/public/components/app/Settings/AgentConfigurations/AgentConfigurationCreateEdit/ServicePage/FormRowSelect.tsx
@@ -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 React from 'react';
+import {
+  EuiDescribedFormGroup,
+  EuiSelectOption,
+  EuiFormRow
+} from '@elastic/eui';
+import { SelectWithPlaceholder } from '../../../../../shared/SelectWithPlaceholder';
+
+interface Props {
+  title: string;
+  description: string;
+  fieldLabel: string;
+  isLoading: boolean;
+  options?: EuiSelectOption[];
+  value?: string;
+  disabled: boolean;
+  onChange: (event: React.ChangeEvent<HTMLSelectElement>) => void;
+}
+
+export function FormRowSelect({
+  title,
+  description,
+  fieldLabel,
+  isLoading,
+  options,
+  value,
+  disabled,
+  onChange
+}: Props) {
+  return (
+    <EuiDescribedFormGroup
+      fullWidth
+      title={<h3>{title}</h3>}
+      description={description}
+    >
+      <EuiFormRow label={fieldLabel}>
+        <SelectWithPlaceholder
+          isLoading={isLoading}
+          options={options}
+          value={value}
+          disabled={disabled}
+          onChange={onChange}
+        />
+      </EuiFormRow>
+    </EuiDescribedFormGroup>
+  );
+}
diff --git a/x-pack/legacy/plugins/apm/public/components/app/Settings/AgentConfigurations/AgentConfigurationCreateEdit/ServicePage/ServicePage.tsx b/x-pack/legacy/plugins/apm/public/components/app/Settings/AgentConfigurations/AgentConfigurationCreateEdit/ServicePage/ServicePage.tsx
new file mode 100644
index 0000000000000..b9f8fd86d067b
--- /dev/null
+++ b/x-pack/legacy/plugins/apm/public/components/app/Settings/AgentConfigurations/AgentConfigurationCreateEdit/ServicePage/ServicePage.tsx
@@ -0,0 +1,208 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import {
+  EuiTitle,
+  EuiSpacer,
+  EuiPanel,
+  EuiFlexGroup,
+  EuiFlexItem,
+  EuiButton
+} from '@elastic/eui';
+import React from 'react';
+import { i18n } from '@kbn/i18n';
+import { isString } from 'lodash';
+import { EuiButtonEmpty } from '@elastic/eui';
+import { AgentConfigurationIntake } from '../../../../../../../../../../plugins/apm/common/agent_configuration/configuration_types';
+import {
+  omitAllOption,
+  getOptionLabel
+} from '../../../../../../../../../../plugins/apm/common/agent_configuration/all_option';
+import { useFetcher, FETCH_STATUS } from '../../../../../../hooks/useFetcher';
+import { FormRowSelect } from './FormRowSelect';
+import { APMLink } from '../../../../../shared/Links/apm/APMLink';
+
+interface Props {
+  newConfig: AgentConfigurationIntake;
+  setNewConfig: React.Dispatch<React.SetStateAction<AgentConfigurationIntake>>;
+  onClickNext: () => void;
+}
+
+export function ServicePage({ newConfig, setNewConfig, onClickNext }: Props) {
+  const { data: serviceNames = [], status: serviceNamesStatus } = useFetcher(
+    callApmApi => {
+      return callApmApi({
+        pathname: '/api/apm/settings/agent-configuration/services',
+        forceCache: true
+      });
+    },
+    [],
+    { preservePreviousData: false }
+  );
+
+  const { data: environments = [], status: environmentStatus } = useFetcher(
+    callApmApi => {
+      if (newConfig.service.name) {
+        return callApmApi({
+          pathname: '/api/apm/settings/agent-configuration/environments',
+          params: {
+            query: { serviceName: omitAllOption(newConfig.service.name) }
+          }
+        });
+      }
+    },
+    [newConfig.service.name],
+    { preservePreviousData: false }
+  );
+
+  const { status: agentNameStatus } = useFetcher(
+    async callApmApi => {
+      const serviceName = newConfig.service.name;
+
+      if (!isString(serviceName) || serviceName.length === 0) {
+        return;
+      }
+
+      const { agentName } = await callApmApi({
+        pathname: '/api/apm/settings/agent-configuration/agent_name',
+        params: { query: { serviceName } }
+      });
+
+      setNewConfig(prev => ({ ...prev, agent_name: agentName }));
+    },
+    [newConfig.service.name, setNewConfig]
+  );
+
+  const ALREADY_CONFIGURED_TRANSLATED = i18n.translate(
+    'xpack.apm.agentConfig.servicePage.alreadyConfiguredOption',
+    { defaultMessage: 'already configured' }
+  );
+
+  const serviceNameOptions = serviceNames.map(name => ({
+    text: getOptionLabel(name),
+    value: name
+  }));
+  const environmentOptions = environments.map(
+    ({ name, alreadyConfigured }) => ({
+      disabled: alreadyConfigured,
+      text: `${getOptionLabel(name)} ${
+        alreadyConfigured ? `(${ALREADY_CONFIGURED_TRANSLATED})` : ''
+      }`,
+      value: name
+    })
+  );
+
+  return (
+    <EuiPanel paddingSize="m">
+      <EuiTitle size="xs">
+        <h3>
+          {i18n.translate('xpack.apm.agentConfig.servicePage.title', {
+            defaultMessage: 'Choose service'
+          })}
+        </h3>
+      </EuiTitle>
+
+      <EuiSpacer size="m" />
+
+      {/* Service name options */}
+      <FormRowSelect
+        title={i18n.translate(
+          'xpack.apm.agentConfig.servicePage.service.title',
+          { defaultMessage: 'Service' }
+        )}
+        description={i18n.translate(
+          'xpack.apm.agentConfig.servicePage.service.description',
+          { defaultMessage: 'Choose the service you want to configure.' }
+        )}
+        fieldLabel={i18n.translate(
+          'xpack.apm.agentConfig.servicePage.service.fieldLabel',
+          { defaultMessage: 'Service name' }
+        )}
+        isLoading={serviceNamesStatus === FETCH_STATUS.LOADING}
+        options={serviceNameOptions}
+        value={newConfig.service.name}
+        disabled={serviceNamesStatus === FETCH_STATUS.LOADING}
+        onChange={e => {
+          e.preventDefault();
+          const name = e.target.value;
+          setNewConfig(prev => ({
+            ...prev,
+            service: { name, environment: '' }
+          }));
+        }}
+      />
+
+      {/* Environment options */}
+      <FormRowSelect
+        title={i18n.translate(
+          'xpack.apm.agentConfig.servicePage.environment.title',
+          { defaultMessage: 'Environment' }
+        )}
+        description={i18n.translate(
+          'xpack.apm.agentConfig.servicePage.environment.description',
+          {
+            defaultMessage:
+              'Only a single environment per configuration is supported.'
+          }
+        )}
+        fieldLabel={i18n.translate(
+          'xpack.apm.agentConfig.servicePage.environment.fieldLabel',
+          { defaultMessage: 'Service environment' }
+        )}
+        isLoading={environmentStatus === FETCH_STATUS.LOADING}
+        options={environmentOptions}
+        value={newConfig.service.environment}
+        disabled={
+          !newConfig.service.name || environmentStatus === FETCH_STATUS.LOADING
+        }
+        onChange={e => {
+          e.preventDefault();
+          const environment = e.target.value;
+          setNewConfig(prev => ({
+            ...prev,
+            service: { name: prev.service.name, environment }
+          }));
+        }}
+      />
+
+      <EuiSpacer />
+
+      <EuiFlexGroup justifyContent="flexEnd">
+        {/* Cancel button */}
+        <EuiFlexItem grow={false}>
+          <APMLink path="/settings/agent-configuration">
+            <EuiButtonEmpty color="primary">
+              {i18n.translate(
+                'xpack.apm.agentConfig.servicePage.cancelButton',
+                { defaultMessage: 'Cancel' }
+              )}
+            </EuiButtonEmpty>
+          </APMLink>
+        </EuiFlexItem>
+
+        {/* Next button */}
+        <EuiFlexItem grow={false}>
+          <EuiButton
+            type="submit"
+            fill
+            onClick={onClickNext}
+            isLoading={agentNameStatus === FETCH_STATUS.LOADING}
+            isDisabled={
+              !newConfig.service.name ||
+              !newConfig.service.environment ||
+              agentNameStatus === FETCH_STATUS.LOADING
+            }
+          >
+            {i18n.translate(
+              'xpack.apm.agentConfig.saveConfigurationButtonLabel',
+              { defaultMessage: 'Next step' }
+            )}
+          </EuiButton>
+        </EuiFlexItem>
+      </EuiFlexGroup>
+    </EuiPanel>
+  );
+}
diff --git a/x-pack/legacy/plugins/apm/public/components/app/Settings/AgentConfigurations/AgentConfigurationCreateEdit/SettingsPage/SettingFormRow.tsx b/x-pack/legacy/plugins/apm/public/components/app/Settings/AgentConfigurations/AgentConfigurationCreateEdit/SettingsPage/SettingFormRow.tsx
new file mode 100644
index 0000000000000..b1959e4d68aa4
--- /dev/null
+++ b/x-pack/legacy/plugins/apm/public/components/app/Settings/AgentConfigurations/AgentConfigurationCreateEdit/SettingsPage/SettingFormRow.tsx
@@ -0,0 +1,178 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * 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 {
+  EuiFormRow,
+  EuiFieldText,
+  EuiFieldNumber,
+  EuiDescribedFormGroup,
+  EuiFlexGroup,
+  EuiFlexItem,
+  EuiCode,
+  EuiSpacer,
+  EuiIconTip
+} from '@elastic/eui';
+import { i18n } from '@kbn/i18n';
+import { SettingDefinition } from '../../../../../../../../../../plugins/apm/common/agent_configuration/setting_definitions/types';
+import { isValid } from '../../../../../../../../../../plugins/apm/common/agent_configuration/setting_definitions';
+import {
+  amountAndUnitToString,
+  amountAndUnitToObject
+} from '../../../../../../../../../../plugins/apm/common/agent_configuration/amount_and_unit';
+import { SelectWithPlaceholder } from '../../../../../shared/SelectWithPlaceholder';
+
+function FormRow({
+  setting,
+  value,
+  onChange
+}: {
+  setting: SettingDefinition;
+  value?: string;
+  onChange: (key: string, value: string) => void;
+}) {
+  switch (setting.type) {
+    case 'float':
+    case 'text': {
+      return (
+        <EuiFieldText
+          placeholder={setting.placeholder}
+          value={value || ''}
+          onChange={e => onChange(setting.key, e.target.value)}
+        />
+      );
+    }
+
+    case 'integer': {
+      return (
+        <EuiFieldNumber
+          placeholder={setting.placeholder}
+          value={(value as any) || ''}
+          min={setting.min}
+          max={setting.max}
+          onChange={e => onChange(setting.key, e.target.value)}
+        />
+      );
+    }
+
+    case 'select': {
+      return (
+        <SelectWithPlaceholder
+          placeholder={setting.placeholder}
+          options={setting.options}
+          value={value}
+          onChange={e => onChange(setting.key, e.target.value)}
+        />
+      );
+    }
+
+    case 'boolean': {
+      return (
+        <SelectWithPlaceholder
+          placeholder={setting.placeholder}
+          options={[{ text: 'true' }, { text: 'false' }]}
+          value={value}
+          onChange={e => onChange(setting.key, e.target.value)}
+        />
+      );
+    }
+
+    case 'bytes':
+    case 'duration': {
+      const { amount, unit } = amountAndUnitToObject(value ?? '');
+
+      return (
+        <EuiFlexGroup gutterSize="s">
+          <EuiFlexItem grow={false}>
+            <EuiFieldNumber
+              placeholder={setting.placeholder}
+              value={(amount as unknown) as number}
+              onChange={e =>
+                onChange(
+                  setting.key,
+                  amountAndUnitToString({ amount: e.target.value, unit })
+                )
+              }
+            />
+          </EuiFlexItem>
+          <EuiFlexItem grow={false}>
+            <SelectWithPlaceholder
+              placeholder={i18n.translate('xpack.apm.unitLabel', {
+                defaultMessage: 'Select unit'
+              })}
+              value={unit}
+              options={setting.units?.map(text => ({ text }))}
+              onChange={e =>
+                onChange(
+                  setting.key,
+                  amountAndUnitToString({ amount, unit: e.target.value })
+                )
+              }
+            />
+          </EuiFlexItem>
+        </EuiFlexGroup>
+      );
+    }
+
+    default:
+      throw new Error(`Unknown type "${(setting as SettingDefinition).type}"`);
+  }
+}
+
+export function SettingFormRow({
+  isUnsaved,
+  setting,
+  value,
+  onChange
+}: {
+  isUnsaved: boolean;
+  setting: SettingDefinition;
+  value?: string;
+  onChange: (key: string, value: string) => void;
+}) {
+  const isInvalid = value != null && value !== '' && !isValid(setting, value);
+
+  return (
+    <EuiDescribedFormGroup
+      fullWidth
+      title={
+        <h3>
+          {setting.label}{' '}
+          {isUnsaved && (
+            <EuiIconTip
+              type={'dot'}
+              color={'warning'}
+              content={i18n.translate(
+                'xpack.apm.agentConfig.unsavedSetting.tooltip',
+                { defaultMessage: 'Unsaved' }
+              )}
+            />
+          )}
+        </h3>
+      }
+      description={
+        <>
+          {setting.description}
+
+          {setting.defaultValue && (
+            <>
+              <EuiSpacer />
+              <EuiCode>Default: {setting.defaultValue}</EuiCode>
+            </>
+          )}
+        </>
+      }
+    >
+      <EuiFormRow
+        label={setting.key}
+        error={setting.validationError}
+        isInvalid={isInvalid}
+      >
+        <FormRow onChange={onChange} setting={setting} value={value} />
+      </EuiFormRow>
+    </EuiDescribedFormGroup>
+  );
+}
diff --git a/x-pack/legacy/plugins/apm/public/components/app/Settings/AgentConfigurations/AgentConfigurationCreateEdit/SettingsPage/SettingsPage.tsx b/x-pack/legacy/plugins/apm/public/components/app/Settings/AgentConfigurations/AgentConfigurationCreateEdit/SettingsPage/SettingsPage.tsx
new file mode 100644
index 0000000000000..6d76b69600333
--- /dev/null
+++ b/x-pack/legacy/plugins/apm/public/components/app/Settings/AgentConfigurations/AgentConfigurationCreateEdit/SettingsPage/SettingsPage.tsx
@@ -0,0 +1,301 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import {
+  EuiButton,
+  EuiForm,
+  EuiTitle,
+  EuiSpacer,
+  EuiPanel,
+  EuiFlexGroup,
+  EuiFlexItem,
+  EuiStat,
+  EuiBottomBar,
+  EuiText,
+  EuiHealth,
+  EuiLoadingSpinner
+} from '@elastic/eui';
+import React, { useState, useMemo } from 'react';
+import { i18n } from '@kbn/i18n';
+import { EuiButtonEmpty } from '@elastic/eui';
+import { EuiCallOut } from '@elastic/eui';
+import { FETCH_STATUS } from '../../../../../../hooks/useFetcher';
+import { AgentName } from '../../../../../../../../../../plugins/apm/typings/es_schemas/ui/fields/agent';
+import { history } from '../../../../../../utils/history';
+import { AgentConfigurationIntake } from '../../../../../../../../../../plugins/apm/common/agent_configuration/configuration_types';
+import {
+  filterByAgent,
+  settingDefinitions,
+  isValid
+} from '../../../../../../../../../../plugins/apm/common/agent_configuration/setting_definitions';
+import { saveConfig } from './saveConfig';
+import { useApmPluginContext } from '../../../../../../hooks/useApmPluginContext';
+import { useUiTracker } from '../../../../../../../../../../plugins/observability/public';
+import { SettingFormRow } from './SettingFormRow';
+import { getOptionLabel } from '../../../../../../../../../../plugins/apm/common/agent_configuration/all_option';
+
+function removeEmpty<T>(obj: T): T {
+  return Object.fromEntries(
+    Object.entries(obj).filter(([k, v]) => v != null && v !== '')
+  );
+}
+
+export function SettingsPage({
+  status,
+  unsavedChanges,
+  newConfig,
+  setNewConfig,
+  resetSettings,
+  isEditMode,
+  onClickEdit
+}: {
+  status?: FETCH_STATUS;
+  unsavedChanges: Record<string, string>;
+  newConfig: AgentConfigurationIntake;
+  setNewConfig: React.Dispatch<React.SetStateAction<AgentConfigurationIntake>>;
+  resetSettings: () => void;
+  isEditMode: boolean;
+  onClickEdit: () => void;
+}) {
+  // get a telemetry UI event tracker
+  const trackApmEvent = useUiTracker({ app: 'apm' });
+  const { toasts } = useApmPluginContext().core.notifications;
+  const [isSaving, setIsSaving] = useState(false);
+  const unsavedChangesCount = Object.keys(unsavedChanges).length;
+  const isLoading = status === FETCH_STATUS.LOADING;
+
+  const isFormValid = useMemo(() => {
+    return (
+      settingDefinitions
+        // only validate settings that are not empty
+        .filter(({ key }) => {
+          const value = newConfig.settings[key];
+          return value != null && value !== '';
+        })
+
+        // every setting must be valid for the form to be valid
+        .every(def => {
+          const value = newConfig.settings[def.key];
+          return isValid(def, value);
+        })
+    );
+  }, [newConfig.settings]);
+
+  const handleSubmitEvent = async () => {
+    trackApmEvent({ metric: 'save_agent_configuration' });
+    const config = { ...newConfig, settings: removeEmpty(newConfig.settings) };
+
+    setIsSaving(true);
+    await saveConfig({ config, isEditMode, toasts });
+    setIsSaving(false);
+
+    // go back to overview
+    history.push({
+      pathname: '/settings/agent-configuration',
+      search: history.location.search
+    });
+  };
+
+  if (status === FETCH_STATUS.FAILURE) {
+    return (
+      <EuiCallOut
+        title={i18n.translate(
+          'xpack.apm.agentConfig.settingsPage.notFound.title',
+          { defaultMessage: 'Sorry, there was an error' }
+        )}
+        color="danger"
+        iconType="alert"
+      >
+        <p>
+          {i18n.translate(
+            'xpack.apm.agentConfig.settingsPage.notFound.message',
+            { defaultMessage: 'The requested configuration does not exist' }
+          )}
+        </p>
+      </EuiCallOut>
+    );
+  }
+
+  return (
+    <>
+      <EuiForm>
+        {/* Since the submit button is placed outside the form we cannot use `onSubmit` and have to use `onKeyPress` to submit the form on enter */}
+        {/* eslint-disable-next-line jsx-a11y/no-noninteractive-element-interactions */}
+        <form
+          onKeyPress={e => {
+            const didClickEnter = e.which === 13;
+            if (didClickEnter && isFormValid) {
+              e.preventDefault();
+              handleSubmitEvent();
+            }
+          }}
+        >
+          {/* Selected Service panel */}
+          <EuiPanel paddingSize="m">
+            <EuiTitle size="s">
+              <h3>
+                {i18n.translate('xpack.apm.agentConfig.chooseService.title', {
+                  defaultMessage: 'Choose service'
+                })}
+              </h3>
+            </EuiTitle>
+
+            <EuiSpacer size="m" />
+
+            <EuiFlexGroup>
+              <EuiFlexItem>
+                <EuiStat
+                  titleSize="xs"
+                  title={
+                    isLoading ? '-' : getOptionLabel(newConfig.service.name)
+                  }
+                  description={i18n.translate(
+                    'xpack.apm.agentConfig.chooseService.service.name.label',
+                    { defaultMessage: 'Service name' }
+                  )}
+                />
+              </EuiFlexItem>
+              <EuiFlexItem>
+                <EuiStat
+                  titleSize="xs"
+                  title={
+                    isLoading
+                      ? '-'
+                      : getOptionLabel(newConfig.service.environment)
+                  }
+                  description={i18n.translate(
+                    'xpack.apm.agentConfig.chooseService.service.environment.label',
+                    { defaultMessage: 'Environment' }
+                  )}
+                />
+              </EuiFlexItem>
+              <EuiFlexItem grow={false}>
+                {!isEditMode && (
+                  <EuiButton onClick={onClickEdit} iconType="pencil">
+                    {i18n.translate(
+                      'xpack.apm.agentConfig.chooseService.editButton',
+                      { defaultMessage: 'Edit' }
+                    )}
+                  </EuiButton>
+                )}
+              </EuiFlexItem>
+            </EuiFlexGroup>
+          </EuiPanel>
+
+          <EuiSpacer size="m" />
+
+          {/* Settings panel */}
+          <EuiPanel paddingSize="m">
+            <EuiTitle size="s">
+              <h3>
+                {i18n.translate('xpack.apm.agentConfig.settings.title', {
+                  defaultMessage: 'Configuration options'
+                })}
+              </h3>
+            </EuiTitle>
+
+            <EuiSpacer size="m" />
+
+            {isLoading ? (
+              <div style={{ textAlign: 'center' }}>
+                <EuiLoadingSpinner size="m" />
+              </div>
+            ) : (
+              renderSettings({ unsavedChanges, newConfig, setNewConfig })
+            )}
+          </EuiPanel>
+        </form>
+      </EuiForm>
+      <EuiSpacer size="xxl" />
+
+      {/* Bottom bar with save button */}
+      {unsavedChangesCount > 0 && (
+        <EuiBottomBar paddingSize="s">
+          <EuiFlexGroup justifyContent="spaceBetween" alignItems="center">
+            <EuiFlexItem
+              grow={false}
+              style={{
+                flexDirection: 'row',
+                alignItems: 'center'
+              }}
+            >
+              <EuiHealth color="warning" />
+              <EuiText>
+                {i18n.translate('xpack.apm.unsavedChanges', {
+                  defaultMessage:
+                    '{unsavedChangesCount, plural, =0{0 unsaved changes} one {1 unsaved change} other {# unsaved changes}} ',
+                  values: { unsavedChangesCount }
+                })}
+              </EuiText>
+            </EuiFlexItem>
+            <EuiFlexItem grow={false}>
+              <EuiFlexGroup justifyContent="flexEnd">
+                <EuiFlexItem grow={false}>
+                  <EuiButtonEmpty color="ghost" onClick={resetSettings}>
+                    {i18n.translate(
+                      'xpack.apm.agentConfig.settingsPage.discardChangesButton',
+                      { defaultMessage: 'Discard changes' }
+                    )}
+                  </EuiButtonEmpty>
+                </EuiFlexItem>
+                <EuiFlexItem grow={false}>
+                  <EuiButton
+                    onClick={handleSubmitEvent}
+                    fill
+                    isLoading={isSaving}
+                    isDisabled={!isFormValid}
+                    color="secondary"
+                    iconType="check"
+                  >
+                    {i18n.translate(
+                      'xpack.apm.agentConfig.settingsPage.saveButton',
+                      { defaultMessage: 'Save configuration' }
+                    )}
+                  </EuiButton>
+                </EuiFlexItem>
+              </EuiFlexGroup>
+            </EuiFlexItem>
+          </EuiFlexGroup>
+        </EuiBottomBar>
+      )}
+    </>
+  );
+}
+
+function renderSettings({
+  newConfig,
+  unsavedChanges,
+  setNewConfig
+}: {
+  newConfig: AgentConfigurationIntake;
+  unsavedChanges: Record<string, string>;
+  setNewConfig: React.Dispatch<React.SetStateAction<AgentConfigurationIntake>>;
+}) {
+  return (
+    settingDefinitions
+
+      // filter out agent specific items that are not applicable
+      // to the selected service
+      .filter(filterByAgent(newConfig.agent_name as AgentName))
+      .map(setting => (
+        <SettingFormRow
+          isUnsaved={unsavedChanges.hasOwnProperty(setting.key)}
+          key={setting.key}
+          setting={setting}
+          value={newConfig.settings[setting.key]}
+          onChange={(key, value) => {
+            setNewConfig(prev => ({
+              ...prev,
+              settings: {
+                ...prev.settings,
+                [key]: value
+              }
+            }));
+          }}
+        />
+      ))
+  );
+}
diff --git a/x-pack/legacy/plugins/apm/public/components/app/Settings/AgentConfigurations/AgentConfigurationCreateEdit/SettingsPage/saveConfig.ts b/x-pack/legacy/plugins/apm/public/components/app/Settings/AgentConfigurations/AgentConfigurationCreateEdit/SettingsPage/saveConfig.ts
new file mode 100644
index 0000000000000..7e3bcd68699be
--- /dev/null
+++ b/x-pack/legacy/plugins/apm/public/components/app/Settings/AgentConfigurations/AgentConfigurationCreateEdit/SettingsPage/saveConfig.ts
@@ -0,0 +1,68 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { i18n } from '@kbn/i18n';
+import { NotificationsStart } from 'kibana/public';
+import { AgentConfigurationIntake } from '../../../../../../../../../../plugins/apm/common/agent_configuration/configuration_types';
+import {
+  getOptionLabel,
+  omitAllOption
+} from '../../../../../../../../../../plugins/apm/common/agent_configuration/all_option';
+import { callApmApi } from '../../../../../../services/rest/createCallApmApi';
+
+export async function saveConfig({
+  config,
+  isEditMode,
+  toasts
+}: {
+  config: AgentConfigurationIntake;
+  agentName?: string;
+  isEditMode: boolean;
+  toasts: NotificationsStart['toasts'];
+}) {
+  try {
+    await callApmApi({
+      pathname: '/api/apm/settings/agent-configuration',
+      method: 'PUT',
+      params: {
+        query: { overwrite: isEditMode },
+        body: {
+          ...config,
+          service: {
+            name: omitAllOption(config.service.name),
+            environment: omitAllOption(config.service.environment)
+          }
+        }
+      }
+    });
+
+    toasts.addSuccess({
+      title: i18n.translate(
+        'xpack.apm.agentConfig.saveConfig.succeeded.title',
+        { defaultMessage: 'Configuration saved' }
+      ),
+      text: i18n.translate('xpack.apm.agentConfig.saveConfig.succeeded.text', {
+        defaultMessage:
+          'The configuration for "{serviceName}" was saved. It will take some time to propagate to the agents.',
+        values: { serviceName: getOptionLabel(config.service.name) }
+      })
+    });
+  } catch (error) {
+    toasts.addDanger({
+      title: i18n.translate('xpack.apm.agentConfig.saveConfig.failed.title', {
+        defaultMessage: 'Configuration could not be saved'
+      }),
+      text: i18n.translate('xpack.apm.agentConfig.saveConfig.failed.text', {
+        defaultMessage:
+          'Something went wrong when saving the configuration for "{serviceName}". Error: "{errorMessage}"',
+        values: {
+          serviceName: getOptionLabel(config.service.name),
+          errorMessage: error.message
+        }
+      })
+    });
+  }
+}
diff --git a/x-pack/legacy/plugins/apm/public/components/app/Settings/AgentConfigurations/AgentConfigurationCreateEdit/index.stories.tsx b/x-pack/legacy/plugins/apm/public/components/app/Settings/AgentConfigurations/AgentConfigurationCreateEdit/index.stories.tsx
new file mode 100644
index 0000000000000..531e557b6ef86
--- /dev/null
+++ b/x-pack/legacy/plugins/apm/public/components/app/Settings/AgentConfigurations/AgentConfigurationCreateEdit/index.stories.tsx
@@ -0,0 +1,63 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * 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 { HttpSetup } from 'kibana/public';
+import { AgentConfiguration } from '../../../../../../../../../plugins/apm/common/agent_configuration/configuration_types';
+import { FETCH_STATUS } from '../../../../../hooks/useFetcher';
+import { createCallApmApi } from '../../../../../services/rest/createCallApmApi';
+import { AgentConfigurationCreateEdit } from './index';
+import {
+  ApmPluginContext,
+  ApmPluginContextValue
+} from '../../../../../context/ApmPluginContext';
+
+storiesOf(
+  'app/Settings/AgentConfigurations/AgentConfigurationCreateEdit',
+  module
+).add(
+  'with config',
+  () => {
+    const httpMock = {};
+
+    // mock
+    createCallApmApi((httpMock as unknown) as HttpSetup);
+
+    const contextMock = {
+      core: {
+        notifications: { toasts: { addWarning: () => {}, addDanger: () => {} } }
+      }
+    };
+    return (
+      <ApmPluginContext.Provider
+        value={(contextMock as unknown) as ApmPluginContextValue}
+      >
+        <AgentConfigurationCreateEdit
+          pageStep="choose-settings-step"
+          existingConfigResult={{
+            status: FETCH_STATUS.SUCCESS,
+            data: {
+              service: { name: 'opbeans-node', environment: 'production' },
+              settings: {}
+            } as AgentConfiguration
+          }}
+        />
+      </ApmPluginContext.Provider>
+    );
+  },
+  {
+    info: {
+      source: false
+    }
+  }
+);
diff --git a/x-pack/legacy/plugins/apm/public/components/app/Settings/AgentConfigurations/AgentConfigurationCreateEdit/index.tsx b/x-pack/legacy/plugins/apm/public/components/app/Settings/AgentConfigurations/AgentConfigurationCreateEdit/index.tsx
new file mode 100644
index 0000000000000..638e518563f8c
--- /dev/null
+++ b/x-pack/legacy/plugins/apm/public/components/app/Settings/AgentConfigurations/AgentConfigurationCreateEdit/index.tsx
@@ -0,0 +1,157 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { isEmpty } from 'lodash';
+import { EuiTitle, EuiText, EuiSpacer } from '@elastic/eui';
+import React, { useState, useEffect, useCallback } from 'react';
+import { i18n } from '@kbn/i18n';
+import { FetcherResult } from '../../../../../hooks/useFetcher';
+import { history } from '../../../../../utils/history';
+import {
+  AgentConfigurationIntake,
+  AgentConfiguration
+} from '../../../../../../../../../plugins/apm/common/agent_configuration/configuration_types';
+import { ServicePage } from './ServicePage/ServicePage';
+import { SettingsPage } from './SettingsPage/SettingsPage';
+import { fromQuery, toQuery } from '../../../../shared/Links/url_helpers';
+
+type PageStep = 'choose-service-step' | 'choose-settings-step' | 'review-step';
+
+function getInitialNewConfig(
+  existingConfig: AgentConfigurationIntake | undefined
+) {
+  return {
+    agent_name: existingConfig?.agent_name,
+    service: existingConfig?.service || {},
+    settings: existingConfig?.settings || {}
+  };
+}
+
+function setPage(pageStep: PageStep) {
+  history.push({
+    ...history.location,
+    search: fromQuery({
+      ...toQuery(history.location.search),
+      pageStep
+    })
+  });
+}
+
+function getUnsavedChanges({
+  newConfig,
+  existingConfig
+}: {
+  newConfig: AgentConfigurationIntake;
+  existingConfig?: AgentConfigurationIntake;
+}) {
+  return Object.fromEntries(
+    Object.entries(newConfig.settings).filter(([key, value]) => {
+      const existingValue = existingConfig?.settings?.[key];
+
+      // don't highlight changes that were added and removed
+      if (value === '' && existingValue == null) {
+        return false;
+      }
+
+      return existingValue !== value;
+    })
+  );
+}
+
+export function AgentConfigurationCreateEdit({
+  pageStep,
+  existingConfigResult
+}: {
+  pageStep: PageStep;
+  existingConfigResult?: FetcherResult<AgentConfiguration>;
+}) {
+  const existingConfig = existingConfigResult?.data;
+  const isEditMode = Boolean(existingConfigResult);
+  const [newConfig, setNewConfig] = useState<AgentConfigurationIntake>(
+    getInitialNewConfig(existingConfig)
+  );
+
+  const resetSettings = useCallback(() => {
+    setNewConfig(_newConfig => ({
+      ..._newConfig,
+      settings: existingConfig?.settings || {}
+    }));
+  }, [existingConfig]);
+
+  // update newConfig when existingConfig has loaded
+  useEffect(() => {
+    setNewConfig(getInitialNewConfig(existingConfig));
+  }, [existingConfig]);
+
+  useEffect(() => {
+    // the user tried to edit the service of an existing config
+    if (pageStep === 'choose-service-step' && isEditMode) {
+      setPage('choose-settings-step');
+    }
+
+    // the user skipped the first step (select service)
+    if (
+      pageStep === 'choose-settings-step' &&
+      !isEditMode &&
+      isEmpty(newConfig.service)
+    ) {
+      setPage('choose-service-step');
+    }
+  }, [isEditMode, newConfig, pageStep]);
+
+  const unsavedChanges = getUnsavedChanges({ newConfig, existingConfig });
+
+  return (
+    <>
+      <EuiTitle>
+        <h2>
+          {isEditMode
+            ? i18n.translate('xpack.apm.agentConfig.editConfigTitle', {
+                defaultMessage: 'Edit configuration'
+              })
+            : i18n.translate('xpack.apm.agentConfig.createConfigTitle', {
+                defaultMessage: 'Create configuration'
+              })}
+        </h2>
+      </EuiTitle>
+
+      <EuiText size="s">
+        {i18n.translate('xpack.apm.agentConfig.newConfig.description', {
+          defaultMessage: `This allows you to fine-tune your agent configuration directly in
+        Kibana. Best of all, changes are automatically propagated to your APM
+        agents so there’s no need to redeploy.`
+        })}
+      </EuiText>
+
+      <EuiSpacer size="m" />
+
+      {pageStep === 'choose-service-step' && (
+        <ServicePage
+          newConfig={newConfig}
+          setNewConfig={setNewConfig}
+          onClickNext={() => setPage('choose-settings-step')}
+        />
+      )}
+
+      {pageStep === 'choose-settings-step' && (
+        <SettingsPage
+          status={existingConfigResult?.status}
+          unsavedChanges={unsavedChanges}
+          onClickEdit={() => setPage('choose-service-step')}
+          newConfig={newConfig}
+          setNewConfig={setNewConfig}
+          resetSettings={resetSettings}
+          isEditMode={isEditMode}
+        />
+      )}
+
+      {/*
+      TODO: Add review step
+      {pageStep === 'review-step' && <div>Review will be here </div>}
+      */}
+    </>
+  );
+}
diff --git a/x-pack/legacy/plugins/apm/public/components/app/Settings/AgentConfigurations/AgentConfigurationList.tsx b/x-pack/legacy/plugins/apm/public/components/app/Settings/AgentConfigurations/AgentConfigurationList.tsx
deleted file mode 100644
index 557945e9ba67a..0000000000000
--- a/x-pack/legacy/plugins/apm/public/components/app/Settings/AgentConfigurations/AgentConfigurationList.tsx
+++ /dev/null
@@ -1,232 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import React from 'react';
-import { i18n } from '@kbn/i18n';
-import {
-  EuiEmptyPrompt,
-  EuiButton,
-  EuiButtonEmpty,
-  EuiHealth,
-  EuiToolTip
-} from '@elastic/eui';
-import { isEmpty } from 'lodash';
-import theme from '@elastic/eui/dist/eui_theme_light.json';
-import { FETCH_STATUS } from '../../../../hooks/useFetcher';
-import { ITableColumn, ManagedTable } from '../../../shared/ManagedTable';
-import { LoadingStatePrompt } from '../../../shared/LoadingStatePrompt';
-// eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { AgentConfigurationListAPIResponse } from '../../../../../../../../plugins/apm/server/lib/settings/agent_configuration/list_configurations';
-import { Config } from '.';
-import { TimestampTooltip } from '../../../shared/TimestampTooltip';
-import { px, units } from '../../../../style/variables';
-import { getOptionLabel } from '../../../../../../../../plugins/apm/common/agent_configuration_constants';
-
-export function AgentConfigurationList({
-  status,
-  data,
-  setIsFlyoutOpen,
-  setSelectedConfig
-}: {
-  status: FETCH_STATUS;
-  data: AgentConfigurationListAPIResponse;
-  setIsFlyoutOpen: (val: boolean) => void;
-  setSelectedConfig: (val: Config | null) => void;
-}) {
-  const columns: Array<ITableColumn<Config>> = [
-    {
-      field: 'applied_by_agent',
-      align: 'center',
-      width: px(units.double),
-      name: '',
-      sortable: true,
-      render: (isApplied: boolean) => (
-        <EuiToolTip
-          content={
-            isApplied
-              ? i18n.translate(
-                  'xpack.apm.settings.agentConf.configTable.appliedTooltipMessage',
-                  { defaultMessage: 'Applied by at least one agent' }
-                )
-              : i18n.translate(
-                  'xpack.apm.settings.agentConf.configTable.notAppliedTooltipMessage',
-                  { defaultMessage: 'Not yet applied by any agents' }
-                )
-          }
-        >
-          <EuiHealth color={isApplied ? 'success' : theme.euiColorLightShade} />
-        </EuiToolTip>
-      )
-    },
-    {
-      field: 'service.name',
-      name: i18n.translate(
-        'xpack.apm.settings.agentConf.configTable.serviceNameColumnLabel',
-        { defaultMessage: 'Service name' }
-      ),
-      sortable: true,
-      render: (_, config: Config) => (
-        <EuiButtonEmpty
-          flush="left"
-          size="s"
-          color="primary"
-          onClick={() => {
-            setSelectedConfig(config);
-            setIsFlyoutOpen(true);
-          }}
-        >
-          {getOptionLabel(config.service.name)}
-        </EuiButtonEmpty>
-      )
-    },
-    {
-      field: 'service.environment',
-      name: i18n.translate(
-        'xpack.apm.settings.agentConf.configTable.environmentColumnLabel',
-        { defaultMessage: 'Service environment' }
-      ),
-      sortable: true,
-      render: (value: string) => getOptionLabel(value)
-    },
-    {
-      field: 'settings.transaction_sample_rate',
-      name: i18n.translate(
-        'xpack.apm.settings.agentConf.configTable.sampleRateColumnLabel',
-        { defaultMessage: 'Sample rate' }
-      ),
-      dataType: 'number',
-      sortable: true,
-      render: (value: number) => value
-    },
-    {
-      field: 'settings.capture_body',
-      name: i18n.translate(
-        'xpack.apm.settings.agentConf.configTable.captureBodyColumnLabel',
-        { defaultMessage: 'Capture body' }
-      ),
-      sortable: true,
-      render: (value: string) => value
-    },
-    {
-      field: 'settings.transaction_max_spans',
-      name: i18n.translate(
-        'xpack.apm.settings.agentConf.configTable.transactionMaxSpansColumnLabel',
-        { defaultMessage: 'Transaction max spans' }
-      ),
-      dataType: 'number',
-      sortable: true,
-      render: (value: number) => value
-    },
-    {
-      align: 'right',
-      field: '@timestamp',
-      name: i18n.translate(
-        'xpack.apm.settings.agentConf.configTable.lastUpdatedColumnLabel',
-        { defaultMessage: 'Last updated' }
-      ),
-      sortable: true,
-      render: (value: number) => (
-        <TimestampTooltip time={value} timeUnit="minutes" />
-      )
-    },
-    {
-      width: px(units.double),
-      name: '',
-      actions: [
-        {
-          name: i18n.translate(
-            'xpack.apm.settings.agentConf.configTable.editButtonLabel',
-            { defaultMessage: 'Edit' }
-          ),
-          description: i18n.translate(
-            'xpack.apm.settings.agentConf.configTable.editButtonDescription',
-            { defaultMessage: 'Edit this config' }
-          ),
-          icon: 'pencil',
-          color: 'primary',
-          type: 'icon',
-          onClick: (config: Config) => {
-            setSelectedConfig(config);
-            setIsFlyoutOpen(true);
-          }
-        }
-      ]
-    }
-  ];
-
-  const emptyStatePrompt = (
-    <EuiEmptyPrompt
-      iconType="controlsHorizontal"
-      title={
-        <h2>
-          {i18n.translate(
-            'xpack.apm.settings.agentConf.configTable.emptyPromptTitle',
-            { defaultMessage: 'No configurations found.' }
-          )}
-        </h2>
-      }
-      body={
-        <>
-          <p>
-            {i18n.translate(
-              'xpack.apm.settings.agentConf.configTable.emptyPromptText',
-              {
-                defaultMessage:
-                  "Let's change that! You can fine-tune agent configuration directly from Kibana without having to redeploy. Get started by creating your first configuration."
-              }
-            )}
-          </p>
-        </>
-      }
-      actions={
-        <EuiButton color="primary" fill onClick={() => setIsFlyoutOpen(true)}>
-          {i18n.translate(
-            'xpack.apm.settings.agentConf.configTable.createConfigButtonLabel',
-            { defaultMessage: 'Create configuration' }
-          )}
-        </EuiButton>
-      }
-    />
-  );
-
-  const failurePrompt = (
-    <EuiEmptyPrompt
-      iconType="alert"
-      body={
-        <>
-          <p>
-            {i18n.translate(
-              'xpack.apm.settings.agentConf.configTable.configTable.failurePromptText',
-              {
-                defaultMessage:
-                  'The list of agent configurations could not be fetched. Your user may not have the sufficient permissions.'
-              }
-            )}
-          </p>
-        </>
-      }
-    />
-  );
-
-  if (status === 'failure') {
-    return failurePrompt;
-  }
-
-  if (status === 'success' && isEmpty(data)) {
-    return emptyStatePrompt;
-  }
-
-  return (
-    <ManagedTable
-      noItemsMessage={<LoadingStatePrompt />}
-      columns={columns}
-      items={data}
-      initialSortField="service.name"
-      initialSortDirection="asc"
-      initialPageSize={50}
-    />
-  );
-}
diff --git a/x-pack/legacy/plugins/apm/public/components/app/Settings/AgentConfigurations/List/ConfirmDeleteModal.tsx b/x-pack/legacy/plugins/apm/public/components/app/Settings/AgentConfigurations/List/ConfirmDeleteModal.tsx
new file mode 100644
index 0000000000000..267aaddc93f76
--- /dev/null
+++ b/x-pack/legacy/plugins/apm/public/components/app/Settings/AgentConfigurations/List/ConfirmDeleteModal.tsx
@@ -0,0 +1,119 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * 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, { useState } from 'react';
+import { EuiConfirmModal, EuiOverlayMask } from '@elastic/eui';
+import { NotificationsStart } from 'kibana/public';
+import { i18n } from '@kbn/i18n';
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import { AgentConfigurationListAPIResponse } from '../../../../../../../../../plugins/apm/server/lib/settings/agent_configuration/list_configurations';
+import { getOptionLabel } from '../../../../../../../../../plugins/apm/common/agent_configuration/all_option';
+import { callApmApi } from '../../../../../services/rest/createCallApmApi';
+import { useApmPluginContext } from '../../../../../hooks/useApmPluginContext';
+
+type Config = AgentConfigurationListAPIResponse[0];
+
+interface Props {
+  config: Config;
+  onCancel: () => void;
+  onConfirm: () => void;
+}
+
+export function ConfirmDeleteModal({ config, onCancel, onConfirm }: Props) {
+  const [isDeleting, setIsDeleting] = useState(false);
+  const { toasts } = useApmPluginContext().core.notifications;
+
+  return (
+    <EuiOverlayMask>
+      <EuiConfirmModal
+        title={i18n.translate('xpack.apm.agentConfig.deleteModal.title', {
+          defaultMessage: `Delete configuration`
+        })}
+        onCancel={onCancel}
+        onConfirm={async () => {
+          setIsDeleting(true);
+          await deleteConfig(config, toasts);
+          setIsDeleting(false);
+          onConfirm();
+        }}
+        cancelButtonText={i18n.translate(
+          'xpack.apm.agentConfig.deleteModal.cancel',
+          { defaultMessage: `Cancel` }
+        )}
+        confirmButtonText={i18n.translate(
+          'xpack.apm.agentConfig.deleteModal.confirm',
+          { defaultMessage: `Delete` }
+        )}
+        confirmButtonDisabled={isDeleting}
+        buttonColor="danger"
+        defaultFocusedButton="confirm"
+      >
+        <p>
+          {i18n.translate('xpack.apm.agentConfig.deleteModal.text', {
+            defaultMessage: `You are about to delete the configuration for service "{serviceName}" and environment "{environment}".`,
+            values: {
+              serviceName: getOptionLabel(config.service.name),
+              environment: getOptionLabel(config.service.environment)
+            }
+          })}
+        </p>
+      </EuiConfirmModal>
+    </EuiOverlayMask>
+  );
+}
+
+async function deleteConfig(
+  config: Config,
+  toasts: NotificationsStart['toasts']
+) {
+  try {
+    await callApmApi({
+      pathname: '/api/apm/settings/agent-configuration',
+      method: 'DELETE',
+      params: {
+        body: {
+          service: {
+            name: config.service.name,
+            environment: config.service.environment
+          }
+        }
+      }
+    });
+
+    toasts.addSuccess({
+      title: i18n.translate(
+        'xpack.apm.agentConfig.deleteSection.deleteConfigSucceededTitle',
+        { defaultMessage: 'Configuration was deleted' }
+      ),
+      text: i18n.translate(
+        'xpack.apm.agentConfig.deleteSection.deleteConfigSucceededText',
+        {
+          defaultMessage:
+            'You have successfully deleted a configuration for "{serviceName}". It will take some time to propagate to the agents.',
+          values: { serviceName: getOptionLabel(config.service.name) }
+        }
+      )
+    });
+  } catch (error) {
+    toasts.addDanger({
+      title: i18n.translate(
+        'xpack.apm.agentConfig.deleteSection.deleteConfigFailedTitle',
+        { defaultMessage: 'Configuration could not be deleted' }
+      ),
+      text: i18n.translate(
+        'xpack.apm.agentConfig.deleteSection.deleteConfigFailedText',
+        {
+          defaultMessage:
+            'Something went wrong when deleting a configuration for "{serviceName}". Error: "{errorMessage}"',
+          values: {
+            serviceName: getOptionLabel(config.service.name),
+            errorMessage: error.message
+          }
+        }
+      )
+    });
+  }
+}
diff --git a/x-pack/legacy/plugins/apm/public/components/app/Settings/AgentConfigurations/List/index.tsx b/x-pack/legacy/plugins/apm/public/components/app/Settings/AgentConfigurations/List/index.tsx
new file mode 100644
index 0000000000000..6d5f65121d8fd
--- /dev/null
+++ b/x-pack/legacy/plugins/apm/public/components/app/Settings/AgentConfigurations/List/index.tsx
@@ -0,0 +1,221 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * 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, { useState } from 'react';
+import { i18n } from '@kbn/i18n';
+import {
+  EuiEmptyPrompt,
+  EuiButton,
+  EuiButtonEmpty,
+  EuiHealth,
+  EuiToolTip,
+  EuiButtonIcon
+} from '@elastic/eui';
+import { isEmpty } from 'lodash';
+import theme from '@elastic/eui/dist/eui_theme_light.json';
+import { FETCH_STATUS } from '../../../../../hooks/useFetcher';
+import { ITableColumn, ManagedTable } from '../../../../shared/ManagedTable';
+import { LoadingStatePrompt } from '../../../../shared/LoadingStatePrompt';
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import { AgentConfigurationListAPIResponse } from '../../../../../../../../../plugins/apm/server/lib/settings/agent_configuration/list_configurations';
+import { TimestampTooltip } from '../../../../shared/TimestampTooltip';
+import { px, units } from '../../../../../style/variables';
+import { getOptionLabel } from '../../../../../../../../../plugins/apm/common/agent_configuration/all_option';
+import {
+  createAgentConfigurationHref,
+  editAgentConfigurationHref
+} from '../../../../shared/Links/apm/agentConfigurationLinks';
+import { ConfirmDeleteModal } from './ConfirmDeleteModal';
+
+type Config = AgentConfigurationListAPIResponse[0];
+
+export function AgentConfigurationList({
+  status,
+  data,
+  refetch
+}: {
+  status: FETCH_STATUS;
+  data: Config[];
+  refetch: () => void;
+}) {
+  const [configToBeDeleted, setConfigToBeDeleted] = useState<Config | null>(
+    null
+  );
+
+  const emptyStatePrompt = (
+    <EuiEmptyPrompt
+      iconType="controlsHorizontal"
+      title={
+        <h2>
+          {i18n.translate(
+            'xpack.apm.agentConfig.configTable.emptyPromptTitle',
+            { defaultMessage: 'No configurations found.' }
+          )}
+        </h2>
+      }
+      body={
+        <>
+          <p>
+            {i18n.translate(
+              'xpack.apm.agentConfig.configTable.emptyPromptText',
+              {
+                defaultMessage:
+                  "Let's change that! You can fine-tune agent configuration directly from Kibana without having to redeploy. Get started by creating your first configuration."
+              }
+            )}
+          </p>
+        </>
+      }
+      actions={
+        <EuiButton color="primary" fill href={createAgentConfigurationHref()}>
+          {i18n.translate(
+            'xpack.apm.agentConfig.configTable.createConfigButtonLabel',
+            { defaultMessage: 'Create configuration' }
+          )}
+        </EuiButton>
+      }
+    />
+  );
+
+  const failurePrompt = (
+    <EuiEmptyPrompt
+      iconType="alert"
+      body={
+        <>
+          <p>
+            {i18n.translate(
+              'xpack.apm.agentConfig.configTable.configTable.failurePromptText',
+              {
+                defaultMessage:
+                  'The list of agent configurations could not be fetched. Your user may not have the sufficient permissions.'
+              }
+            )}
+          </p>
+        </>
+      }
+    />
+  );
+
+  if (status === FETCH_STATUS.FAILURE) {
+    return failurePrompt;
+  }
+
+  if (status === FETCH_STATUS.SUCCESS && isEmpty(data)) {
+    return emptyStatePrompt;
+  }
+
+  const columns: Array<ITableColumn<Config>> = [
+    {
+      field: 'applied_by_agent',
+      align: 'center',
+      width: px(units.double),
+      name: '',
+      sortable: true,
+      render: (isApplied: boolean) => (
+        <EuiToolTip
+          content={
+            isApplied
+              ? i18n.translate(
+                  'xpack.apm.agentConfig.configTable.appliedTooltipMessage',
+                  { defaultMessage: 'Applied by at least one agent' }
+                )
+              : i18n.translate(
+                  'xpack.apm.agentConfig.configTable.notAppliedTooltipMessage',
+                  { defaultMessage: 'Not yet applied by any agents' }
+                )
+          }
+        >
+          <EuiHealth color={isApplied ? 'success' : theme.euiColorLightShade} />
+        </EuiToolTip>
+      )
+    },
+    {
+      field: 'service.name',
+      name: i18n.translate(
+        'xpack.apm.agentConfig.configTable.serviceNameColumnLabel',
+        { defaultMessage: 'Service name' }
+      ),
+      sortable: true,
+      render: (_, config: Config) => (
+        <EuiButtonEmpty
+          flush="left"
+          size="s"
+          color="primary"
+          href={editAgentConfigurationHref(config.service)}
+        >
+          {getOptionLabel(config.service.name)}
+        </EuiButtonEmpty>
+      )
+    },
+    {
+      field: 'service.environment',
+      name: i18n.translate(
+        'xpack.apm.agentConfig.configTable.environmentColumnLabel',
+        { defaultMessage: 'Service environment' }
+      ),
+      sortable: true,
+      render: (environment: string) => getOptionLabel(environment)
+    },
+    {
+      align: 'right',
+      field: '@timestamp',
+      name: i18n.translate(
+        'xpack.apm.agentConfig.configTable.lastUpdatedColumnLabel',
+        { defaultMessage: 'Last updated' }
+      ),
+      sortable: true,
+      render: (value: number) => (
+        <TimestampTooltip time={value} timeUnit="minutes" />
+      )
+    },
+    {
+      width: px(units.double),
+      name: '',
+      render: (config: Config) => (
+        <EuiButtonIcon
+          aria-label="Edit"
+          iconType="pencil"
+          href={editAgentConfigurationHref(config.service)}
+        />
+      )
+    },
+    {
+      width: px(units.double),
+      name: '',
+      render: (config: Config) => (
+        <EuiButtonIcon
+          aria-label="Delete"
+          iconType="trash"
+          onClick={() => setConfigToBeDeleted(config)}
+        />
+      )
+    }
+  ];
+
+  return (
+    <>
+      {configToBeDeleted && (
+        <ConfirmDeleteModal
+          config={configToBeDeleted}
+          onCancel={() => setConfigToBeDeleted(null)}
+          onConfirm={() => {
+            setConfigToBeDeleted(null);
+            refetch();
+          }}
+        />
+      )}
+
+      <ManagedTable
+        noItemsMessage={<LoadingStatePrompt />}
+        columns={columns}
+        items={data}
+        initialSortField="service.name"
+        initialSortDirection="asc"
+        initialPageSize={20}
+      />
+    </>
+  );
+}
diff --git a/x-pack/legacy/plugins/apm/public/components/app/Settings/AgentConfigurations/index.tsx b/x-pack/legacy/plugins/apm/public/components/app/Settings/AgentConfigurations/index.tsx
index 35cc68547d337..8171e339adc82 100644
--- a/x-pack/legacy/plugins/apm/public/components/app/Settings/AgentConfigurations/index.tsx
+++ b/x-pack/legacy/plugins/apm/public/components/app/Settings/AgentConfigurations/index.tsx
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import React, { useState } from 'react';
+import React from 'react';
 import { i18n } from '@kbn/i18n';
 import {
   EuiTitle,
@@ -16,97 +16,59 @@ import {
 } from '@elastic/eui';
 import { isEmpty } from 'lodash';
 import { useFetcher } from '../../../../hooks/useFetcher';
-// eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { AgentConfigurationListAPIResponse } from '../../../../../../../../plugins/apm/server/lib/settings/agent_configuration/list_configurations';
-import { AgentConfigurationList } from './AgentConfigurationList';
+import { AgentConfigurationList } from './List';
 import { useTrackPageview } from '../../../../../../../../plugins/observability/public';
-import { AddEditFlyout } from './AddEditFlyout';
-
-export type Config = AgentConfigurationListAPIResponse[0];
+import { createAgentConfigurationHref } from '../../../shared/Links/apm/agentConfigurationLinks';
 
 export function AgentConfigurations() {
-  const { data = [], status, refetch } = useFetcher(
+  const { refetch, data = [], status } = useFetcher(
     callApmApi =>
-      callApmApi({ pathname: `/api/apm/settings/agent-configuration` }),
+      callApmApi({ pathname: '/api/apm/settings/agent-configuration' }),
     [],
     { preservePreviousData: false }
   );
-  const [selectedConfig, setSelectedConfig] = useState<Config | null>(null);
-  const [isFlyoutOpen, setIsFlyoutOpen] = useState(false);
 
   useTrackPageview({ app: 'apm', path: 'agent_configuration' });
   useTrackPageview({ app: 'apm', path: 'agent_configuration', delay: 15000 });
 
   const hasConfigurations = !isEmpty(data);
 
-  const onClose = () => {
-    setSelectedConfig(null);
-    setIsFlyoutOpen(false);
-  };
-
   return (
     <>
-      {isFlyoutOpen && (
-        <AddEditFlyout
-          selectedConfig={selectedConfig}
-          onClose={onClose}
-          onSaved={() => {
-            onClose();
-            refetch();
-          }}
-          onDeleted={() => {
-            onClose();
-            refetch();
-          }}
-        />
-      )}
-
       <EuiPanel>
         <EuiFlexGroup alignItems="center">
           <EuiFlexItem grow={false}>
             <EuiTitle>
               <h2>
                 {i18n.translate(
-                  'xpack.apm.settings.agentConf.configurationsPanelTitle',
+                  'xpack.apm.agentConfig.configurationsPanelTitle',
                   { defaultMessage: 'Agent remote configuration' }
                 )}
               </h2>
             </EuiTitle>
           </EuiFlexItem>
 
-          {hasConfigurations ? (
-            <CreateConfigurationButton onClick={() => setIsFlyoutOpen(true)} />
-          ) : null}
+          {hasConfigurations ? <CreateConfigurationButton /> : null}
         </EuiFlexGroup>
 
         <EuiSpacer size="m" />
 
-        <AgentConfigurationList
-          status={status}
-          data={data}
-          setIsFlyoutOpen={setIsFlyoutOpen}
-          setSelectedConfig={setSelectedConfig}
-        />
+        <AgentConfigurationList status={status} data={data} refetch={refetch} />
       </EuiPanel>
     </>
   );
 }
 
-function CreateConfigurationButton({ onClick }: { onClick: () => void }) {
+function CreateConfigurationButton() {
+  const href = createAgentConfigurationHref();
   return (
     <EuiFlexItem>
       <EuiFlexGroup alignItems="center" justifyContent="flexEnd">
         <EuiFlexItem grow={false}>
-          <EuiButton
-            color="primary"
-            fill
-            iconType="plusInCircle"
-            onClick={onClick}
-          >
-            {i18n.translate(
-              'xpack.apm.settings.agentConf.createConfigButtonLabel',
-              { defaultMessage: 'Create configuration' }
-            )}
+          <EuiButton color="primary" fill iconType="plusInCircle" href={href}>
+            {i18n.translate('xpack.apm.agentConfig.createConfigButtonLabel', {
+              defaultMessage: 'Create configuration'
+            })}
           </EuiButton>
         </EuiFlexItem>
       </EuiFlexGroup>
diff --git a/x-pack/legacy/plugins/apm/public/components/app/Settings/index.tsx b/x-pack/legacy/plugins/apm/public/components/app/Settings/index.tsx
index eef386731c5c3..f33bb17decd4e 100644
--- a/x-pack/legacy/plugins/apm/public/components/app/Settings/index.tsx
+++ b/x-pack/legacy/plugins/apm/public/components/app/Settings/index.tsx
@@ -39,23 +39,20 @@ export const Settings: React.FC = props => {
                 id: 0,
                 items: [
                   {
-                    name: i18n.translate(
-                      'xpack.apm.settings.agentConfiguration',
-                      {
-                        defaultMessage: 'Agent Configuration'
-                      }
-                    ),
+                    name: i18n.translate('xpack.apm.settings.agentConfig', {
+                      defaultMessage: 'Agent Configuration'
+                    }),
                     id: '1',
-                    // @ts-ignore
                     href: getAPMHref('/settings/agent-configuration', search),
-                    isSelected: pathname === '/settings/agent-configuration'
+                    isSelected: pathname.startsWith(
+                      '/settings/agent-configuration'
+                    )
                   },
                   {
                     name: i18n.translate('xpack.apm.settings.indices', {
                       defaultMessage: 'Indices'
                     }),
                     id: '2',
-                    // @ts-ignore
                     href: getAPMHref('/settings/apm-indices', search),
                     isSelected: pathname === '/settings/apm-indices'
                   },
@@ -64,7 +61,6 @@ export const Settings: React.FC = props => {
                       defaultMessage: 'Customize UI'
                     }),
                     id: '3',
-                    // @ts-ignore
                     href: getAPMHref('/settings/customize-ui', search),
                     isSelected: pathname === '/settings/customize-ui'
                   }
diff --git a/x-pack/legacy/plugins/apm/public/components/shared/Links/apm/APMLink.tsx b/x-pack/legacy/plugins/apm/public/components/shared/Links/apm/APMLink.tsx
index eba59f6e3ce44..29b3fff2050c8 100644
--- a/x-pack/legacy/plugins/apm/public/components/shared/Links/apm/APMLink.tsx
+++ b/x-pack/legacy/plugins/apm/public/components/shared/Links/apm/APMLink.tsx
@@ -31,7 +31,7 @@ export const PERSISTENT_APM_PARAMS = [
 
 export function getAPMHref(
   path: string,
-  currentSearch: string, // TODO: Replace with passing in URL PARAMS here
+  currentSearch: string,
   query: APMQueryParams = {}
 ) {
   const currentQuery = toQuery(currentSearch);
diff --git a/x-pack/legacy/plugins/apm/public/components/shared/Links/apm/agentConfigurationLinks.tsx b/x-pack/legacy/plugins/apm/public/components/shared/Links/apm/agentConfigurationLinks.tsx
new file mode 100644
index 0000000000000..0c747e0773a69
--- /dev/null
+++ b/x-pack/legacy/plugins/apm/public/components/shared/Links/apm/agentConfigurationLinks.tsx
@@ -0,0 +1,26 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { getAPMHref } from './APMLink';
+import { AgentConfigurationIntake } from '../../../../../../../../plugins/apm/common/agent_configuration/configuration_types';
+import { history } from '../../../../utils/history';
+
+export function editAgentConfigurationHref(
+  configService: AgentConfigurationIntake['service']
+) {
+  const { search } = history.location;
+  return getAPMHref('/settings/agent-configuration/edit', search, {
+    // ignoring because `name` has not been added to url params. Related: https://github.com/elastic/kibana/issues/51963
+    // @ts-ignore
+    name: configService.name,
+    environment: configService.environment
+  });
+}
+
+export function createAgentConfigurationHref() {
+  const { search } = history.location;
+  return getAPMHref('/settings/agent-configuration/create', search);
+}
diff --git a/x-pack/legacy/plugins/apm/public/components/shared/SelectWithPlaceholder/index.tsx b/x-pack/legacy/plugins/apm/public/components/shared/SelectWithPlaceholder/index.tsx
index a8e6bc0a648af..8698978bfe6fb 100644
--- a/x-pack/legacy/plugins/apm/public/components/shared/SelectWithPlaceholder/index.tsx
+++ b/x-pack/legacy/plugins/apm/public/components/shared/SelectWithPlaceholder/index.tsx
@@ -7,33 +7,38 @@
 import React from 'react';
 import { EuiSelect } from '@elastic/eui';
 import { isEmpty } from 'lodash';
+import { i18n } from '@kbn/i18n';
 
-const NO_SELECTION = 'NO_SELECTION';
+export const NO_SELECTION = '__NO_SELECTION__';
+const DEFAULT_PLACEHOLDER = i18n.translate('xpack.apm.selectPlaceholder', {
+  defaultMessage: 'Select option:'
+});
 
 /**
  * This component addresses some cross-browser inconsistencies of `EuiSelect`
  * with `hasNoInitialSelection`. It uses the `placeholder` prop to populate
  * the first option as the initial, not selected option.
  */
-export const SelectWithPlaceholder: typeof EuiSelect = props => (
-  <EuiSelect
-    {...props}
-    options={[
-      { text: props.placeholder, value: NO_SELECTION },
-      ...(props.options || [])
-    ]}
-    value={isEmpty(props.value) ? NO_SELECTION : props.value}
-    onChange={e => {
-      if (props.onChange) {
-        props.onChange(
-          Object.assign(e, {
+export const SelectWithPlaceholder: typeof EuiSelect = props => {
+  const placeholder = props.placeholder || DEFAULT_PLACEHOLDER;
+  return (
+    <EuiSelect
+      {...props}
+      options={[
+        { text: placeholder, value: NO_SELECTION },
+        ...(props.options || [])
+      ]}
+      value={isEmpty(props.value) ? NO_SELECTION : props.value}
+      onChange={e => {
+        if (props.onChange) {
+          const customEvent = Object.assign(e, {
             target: Object.assign(e.target, {
-              value:
-                e.target.value === NO_SELECTION ? undefined : e.target.value
+              value: e.target.value === NO_SELECTION ? '' : e.target.value
             })
-          })
-        );
-      }
-    }}
-  />
-);
+          });
+          props.onChange(customEvent);
+        }
+      }}
+    />
+  );
+};
diff --git a/x-pack/legacy/plugins/apm/public/context/LocationContext.tsx b/x-pack/legacy/plugins/apm/public/context/LocationContext.tsx
index 30e6e02c9fbc1..1e9c20494b42e 100644
--- a/x-pack/legacy/plugins/apm/public/context/LocationContext.tsx
+++ b/x-pack/legacy/plugins/apm/public/context/LocationContext.tsx
@@ -11,10 +11,8 @@ import { withRouter } from 'react-router-dom';
 const initialLocation = {} as Location;
 
 const LocationContext = createContext(initialLocation);
-const LocationProvider: React.ComponentClass<{}> = withRouter(
-  ({ location, children }) => {
-    return <LocationContext.Provider children={children} value={location} />;
-  }
-);
+const LocationProvider = withRouter(({ location, children }) => {
+  return <LocationContext.Provider children={children} value={location} />;
+});
 
 export { LocationContext, LocationProvider };
diff --git a/x-pack/legacy/plugins/apm/public/hooks/useFetcher.tsx b/x-pack/legacy/plugins/apm/public/hooks/useFetcher.tsx
index c2530d6982c3b..95cebd6b2a465 100644
--- a/x-pack/legacy/plugins/apm/public/hooks/useFetcher.tsx
+++ b/x-pack/legacy/plugins/apm/public/hooks/useFetcher.tsx
@@ -4,6 +4,8 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+/* eslint-disable no-console */
+
 import React, { useContext, useEffect, useState, useMemo } from 'react';
 import { i18n } from '@kbn/i18n';
 import { IHttpFetchError } from 'src/core/public';
@@ -20,7 +22,7 @@ export enum FETCH_STATUS {
   PENDING = 'pending'
 }
 
-interface Result<Data> {
+export interface FetcherResult<Data> {
   data?: Data;
   status: FETCH_STATUS;
   error?: Error;
@@ -40,13 +42,15 @@ export function useFetcher<TReturn>(
   options: {
     preservePreviousData?: boolean;
   } = {}
-): Result<InferResponseType<TReturn>> & { refetch: () => void } {
+): FetcherResult<InferResponseType<TReturn>> & { refetch: () => void } {
   const { notifications } = useApmPluginContext().core;
   const { preservePreviousData = true } = options;
   const { setIsLoading } = useLoadingIndicator();
 
   const { dispatchStatus } = useContext(LoadingIndicatorContext);
-  const [result, setResult] = useState<Result<InferResponseType<TReturn>>>({
+  const [result, setResult] = useState<
+    FetcherResult<InferResponseType<TReturn>>
+  >({
     data: undefined,
     status: FETCH_STATUS.PENDING
   });
@@ -80,11 +84,27 @@ export function useFetcher<TReturn>(
             data,
             status: FETCH_STATUS.SUCCESS,
             error: undefined
-          } as Result<InferResponseType<TReturn>>);
+          } as FetcherResult<InferResponseType<TReturn>>);
         }
       } catch (e) {
-        const err = e as IHttpFetchError;
+        const err = e as Error | IHttpFetchError;
+
         if (!didCancel) {
+          const errorDetails =
+            'response' in err ? (
+              <>
+                {err.response?.statusText} ({err.response?.status})
+                <h5>
+                  {i18n.translate('xpack.apm.fetcher.error.url', {
+                    defaultMessage: `URL`
+                  })}
+                </h5>
+                {err.response?.url}
+              </>
+            ) : (
+              err.message
+            );
+
           notifications.toasts.addWarning({
             title: i18n.translate('xpack.apm.fetcher.error.title', {
               defaultMessage: `Error while fetching resource`
@@ -96,13 +116,8 @@ export function useFetcher<TReturn>(
                     defaultMessage: `Error`
                   })}
                 </h5>
-                {err.response?.statusText} ({err.response?.status})
-                <h5>
-                  {i18n.translate('xpack.apm.fetcher.error.url', {
-                    defaultMessage: `URL`
-                  })}
-                </h5>
-                {err.response?.url}
+
+                {errorDetails}
               </div>
             )
           });
diff --git a/x-pack/plugins/apm/common/agent_configuration_constants.ts b/x-pack/plugins/apm/common/agent_configuration/all_option.ts
similarity index 74%
rename from x-pack/plugins/apm/common/agent_configuration_constants.ts
rename to x-pack/plugins/apm/common/agent_configuration/all_option.ts
index 4ddc65c14a134..7b1c7bdda97a7 100644
--- a/x-pack/plugins/apm/common/agent_configuration_constants.ts
+++ b/x-pack/plugins/apm/common/agent_configuration/all_option.ts
@@ -8,11 +8,11 @@ import { i18n } from '@kbn/i18n';
 
 export const ALL_OPTION_VALUE = 'ALL_OPTION_VALUE';
 
-// human-readable label for the option. The "All" option should be translated.
+// human-readable label for service and environment. The "All" option should be translated.
 // Everything else should be returned verbatim
 export function getOptionLabel(value: string | undefined) {
   if (value === undefined || value === ALL_OPTION_VALUE) {
-    return i18n.translate('xpack.apm.settings.agentConf.allOptionLabel', {
+    return i18n.translate('xpack.apm.agentConfig.allOptionLabel', {
       defaultMessage: 'All'
     });
   }
@@ -20,6 +20,6 @@ export function getOptionLabel(value: string | undefined) {
   return value;
 }
 
-export function omitAllOption(value: string) {
+export function omitAllOption(value?: string) {
   return value === ALL_OPTION_VALUE ? undefined : value;
 }
diff --git a/x-pack/plugins/apm/common/agent_configuration/amount_and_unit.ts b/x-pack/plugins/apm/common/agent_configuration/amount_and_unit.ts
new file mode 100644
index 0000000000000..447e529c9c199
--- /dev/null
+++ b/x-pack/plugins/apm/common/agent_configuration/amount_and_unit.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.
+ */
+
+interface AmountAndUnit {
+  amount: string;
+  unit: string;
+}
+
+export function amountAndUnitToObject(value: string): AmountAndUnit {
+  const [, amount = '', unit = ''] = value.match(/(\d+)?(\w+)?/) || [];
+  return { amount, unit };
+}
+
+export function amountAndUnitToString({ amount, unit }: AmountAndUnit) {
+  return `${amount}${unit}`;
+}
diff --git a/x-pack/plugins/apm/server/lib/settings/agent_configuration/configuration_types.d.ts b/x-pack/plugins/apm/common/agent_configuration/configuration_types.d.ts
similarity index 82%
rename from x-pack/plugins/apm/server/lib/settings/agent_configuration/configuration_types.d.ts
rename to x-pack/plugins/apm/common/agent_configuration/configuration_types.d.ts
index ddbe6892c5441..675298c3719f2 100644
--- a/x-pack/plugins/apm/server/lib/settings/agent_configuration/configuration_types.d.ts
+++ b/x-pack/plugins/apm/common/agent_configuration/configuration_types.d.ts
@@ -5,11 +5,12 @@
  */
 
 import t from 'io-ts';
-import { agentConfigurationIntakeRt } from '../../../../common/runtime_types/agent_configuration_intake_rt';
+import { agentConfigurationIntakeRt } from './runtime_types/agent_configuration_intake_rt';
 
 export type AgentConfigurationIntake = t.TypeOf<
   typeof agentConfigurationIntakeRt
 >;
+
 export type AgentConfiguration = {
   '@timestamp': number;
   applied_by_agent?: boolean;
diff --git a/x-pack/plugins/apm/common/agent_configuration/runtime_types/agent_configuration_intake_rt.test.ts b/x-pack/plugins/apm/common/agent_configuration/runtime_types/agent_configuration_intake_rt.test.ts
new file mode 100644
index 0000000000000..c2a3be784f661
--- /dev/null
+++ b/x-pack/plugins/apm/common/agent_configuration/runtime_types/agent_configuration_intake_rt.test.ts
@@ -0,0 +1,58 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { agentConfigurationIntakeRt } from './agent_configuration_intake_rt';
+import { isRight } from 'fp-ts/lib/Either';
+
+describe('agentConfigurationIntakeRt', () => {
+  it('is valid when "transaction_sample_rate" is string', () => {
+    const config = {
+      service: { name: 'my-service', environment: 'my-environment' },
+      settings: {
+        transaction_sample_rate: '0.5'
+      }
+    };
+
+    expect(isConfigValid(config)).toBe(true);
+  });
+
+  it('is invalid when "transaction_sample_rate" is number', () => {
+    const config = {
+      service: {},
+      settings: {
+        transaction_sample_rate: 0.5
+      }
+    };
+
+    expect(isConfigValid(config)).toBe(false);
+  });
+
+  it('is valid when unknown setting is string', () => {
+    const config = {
+      service: { name: 'my-service', environment: 'my-environment' },
+      settings: {
+        my_unknown_setting: '0.5'
+      }
+    };
+
+    expect(isConfigValid(config)).toBe(true);
+  });
+
+  it('is invalid when unknown setting is boolean', () => {
+    const config = {
+      service: { name: 'my-service', environment: 'my-environment' },
+      settings: {
+        my_unknown_setting: false
+      }
+    };
+
+    expect(isConfigValid(config)).toBe(false);
+  });
+});
+
+function isConfigValid(config: any) {
+  return isRight(agentConfigurationIntakeRt.decode(config));
+}
diff --git a/x-pack/plugins/apm/common/agent_configuration/runtime_types/agent_configuration_intake_rt.ts b/x-pack/plugins/apm/common/agent_configuration/runtime_types/agent_configuration_intake_rt.ts
new file mode 100644
index 0000000000000..a0b1d5015b9ef
--- /dev/null
+++ b/x-pack/plugins/apm/common/agent_configuration/runtime_types/agent_configuration_intake_rt.ts
@@ -0,0 +1,35 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import * as t from 'io-ts';
+import { settingDefinitions } from '../setting_definitions';
+
+// retrieve validation from config definitions settings and validate on the server
+const knownSettings = settingDefinitions.reduce<
+  // TODO: is it possible to get rid of any?
+  Record<string, t.Type<any, string, unknown>>
+>((acc, { key, validation }) => {
+  acc[key] = validation;
+  return acc;
+}, {});
+
+export const serviceRt = t.partial({
+  name: t.string,
+  environment: t.string
+});
+
+export const settingsRt = t.intersection([
+  t.record(t.string, t.string),
+  t.partial(knownSettings)
+]);
+
+export const agentConfigurationIntakeRt = t.intersection([
+  t.partial({ agent_name: t.string }),
+  t.type({
+    service: serviceRt,
+    settings: settingsRt
+  })
+]);
diff --git a/x-pack/plugins/apm/common/agent_configuration/runtime_types/boolean_rt.test.ts b/x-pack/plugins/apm/common/agent_configuration/runtime_types/boolean_rt.test.ts
new file mode 100644
index 0000000000000..d4dfbec2344fe
--- /dev/null
+++ b/x-pack/plugins/apm/common/agent_configuration/runtime_types/boolean_rt.test.ts
@@ -0,0 +1,26 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { booleanRt } from './boolean_rt';
+import { isRight } from 'fp-ts/lib/Either';
+
+describe('booleanRt', () => {
+  describe('it should not accept', () => {
+    [undefined, null, '', 0, 'foo', true, false].map(input => {
+      it(`${JSON.stringify(input)}`, () => {
+        expect(isRight(booleanRt.decode(input))).toBe(false);
+      });
+    });
+  });
+
+  describe('it should accept', () => {
+    ['true', 'false'].map(input => {
+      it(`${JSON.stringify(input)}`, () => {
+        expect(isRight(booleanRt.decode(input))).toBe(true);
+      });
+    });
+  });
+});
diff --git a/x-pack/plugins/apm/common/agent_configuration/runtime_types/boolean_rt.ts b/x-pack/plugins/apm/common/agent_configuration/runtime_types/boolean_rt.ts
new file mode 100644
index 0000000000000..0cd3ac9d6939c
--- /dev/null
+++ b/x-pack/plugins/apm/common/agent_configuration/runtime_types/boolean_rt.ts
@@ -0,0 +1,9 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import * as t from 'io-ts';
+
+export const booleanRt = t.union([t.literal('true'), t.literal('false')]);
diff --git a/x-pack/plugins/apm/common/agent_configuration/runtime_types/bytes_rt.test.ts b/x-pack/plugins/apm/common/agent_configuration/runtime_types/bytes_rt.test.ts
new file mode 100644
index 0000000000000..596037645c002
--- /dev/null
+++ b/x-pack/plugins/apm/common/agent_configuration/runtime_types/bytes_rt.test.ts
@@ -0,0 +1,39 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { bytesRt } from './bytes_rt';
+import { isRight } from 'fp-ts/lib/Either';
+
+describe('bytesRt', () => {
+  describe('it should not accept', () => {
+    [
+      undefined,
+      null,
+      '',
+      0,
+      'foo',
+      true,
+      false,
+      '100',
+      'mb',
+      '0kb',
+      '5gb',
+      '6tb'
+    ].map(input => {
+      it(`${JSON.stringify(input)}`, () => {
+        expect(isRight(bytesRt.decode(input))).toBe(false);
+      });
+    });
+  });
+
+  describe('it should accept', () => {
+    ['1b', '2kb', '3mb'].map(input => {
+      it(`${JSON.stringify(input)}`, () => {
+        expect(isRight(bytesRt.decode(input))).toBe(true);
+      });
+    });
+  });
+});
diff --git a/x-pack/plugins/apm/common/agent_configuration/runtime_types/bytes_rt.ts b/x-pack/plugins/apm/common/agent_configuration/runtime_types/bytes_rt.ts
new file mode 100644
index 0000000000000..d189fab89ae5d
--- /dev/null
+++ b/x-pack/plugins/apm/common/agent_configuration/runtime_types/bytes_rt.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 * as t from 'io-ts';
+import { either } from 'fp-ts/lib/Either';
+import { amountAndUnitToObject } from '../amount_and_unit';
+
+export const BYTE_UNITS = ['b', 'kb', 'mb'];
+
+export const bytesRt = new t.Type<string, string, unknown>(
+  'bytesRt',
+  t.string.is,
+  (input, context) => {
+    return either.chain(t.string.validate(input, context), inputAsString => {
+      const { amount, unit } = amountAndUnitToObject(inputAsString);
+      const amountAsInt = parseInt(amount, 10);
+      const isValidUnit = BYTE_UNITS.includes(unit);
+      const isValid = amountAsInt > 0 && isValidUnit;
+
+      return isValid
+        ? t.success(inputAsString)
+        : t.failure(
+            input,
+            context,
+            `Must have numeric amount and a valid unit (${BYTE_UNITS})`
+          );
+    });
+  },
+  t.identity
+);
diff --git a/x-pack/plugins/apm/common/agent_configuration/runtime_types/capture_body_rt.test.ts b/x-pack/plugins/apm/common/agent_configuration/runtime_types/capture_body_rt.test.ts
new file mode 100644
index 0000000000000..ba522e6b8ea68
--- /dev/null
+++ b/x-pack/plugins/apm/common/agent_configuration/runtime_types/capture_body_rt.test.ts
@@ -0,0 +1,26 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { captureBodyRt } from './capture_body_rt';
+import { isRight } from 'fp-ts/lib/Either';
+
+describe('captureBodyRt', () => {
+  describe('it should not accept', () => {
+    [undefined, null, '', 0, 'foo', true, false].map(input => {
+      it(`${JSON.stringify(input)}`, () => {
+        expect(isRight(captureBodyRt.decode(input))).toBe(false);
+      });
+    });
+  });
+
+  describe('it should accept', () => {
+    ['off', 'errors', 'transactions', 'all'].map(input => {
+      it(`${JSON.stringify(input)}`, () => {
+        expect(isRight(captureBodyRt.decode(input))).toBe(true);
+      });
+    });
+  });
+});
diff --git a/x-pack/plugins/apm/common/agent_configuration/runtime_types/capture_body_rt.ts b/x-pack/plugins/apm/common/agent_configuration/runtime_types/capture_body_rt.ts
new file mode 100644
index 0000000000000..8f38a8976beb0
--- /dev/null
+++ b/x-pack/plugins/apm/common/agent_configuration/runtime_types/capture_body_rt.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 * as t from 'io-ts';
+
+export const captureBodyRt = t.union([
+  t.literal('off'),
+  t.literal('errors'),
+  t.literal('transactions'),
+  t.literal('all')
+]);
diff --git a/x-pack/plugins/apm/common/agent_configuration/runtime_types/duration_rt.test.ts b/x-pack/plugins/apm/common/agent_configuration/runtime_types/duration_rt.test.ts
new file mode 100644
index 0000000000000..6b81031542c34
--- /dev/null
+++ b/x-pack/plugins/apm/common/agent_configuration/runtime_types/duration_rt.test.ts
@@ -0,0 +1,34 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { durationRt } from './duration_rt';
+import { isRight } from 'fp-ts/lib/Either';
+
+describe('durationRt', () => {
+  describe('it should not accept', () => {
+    [undefined, null, '', 0, 'foo', true, false, '100', 's', 'm', '0h'].map(
+      input => {
+        it(`${JSON.stringify(input)}`, () => {
+          expect(isRight(durationRt.decode(input))).toBe(false);
+        });
+      }
+    );
+  });
+
+  describe('It should accept', () => {
+    ['1s', '2m', '3h'].map(input => {
+      it(`${JSON.stringify(input)}`, () => {
+        expect(isRight(durationRt.decode(input))).toBe(true);
+      });
+    });
+  });
+});
diff --git a/x-pack/plugins/apm/common/agent_configuration/runtime_types/duration_rt.ts b/x-pack/plugins/apm/common/agent_configuration/runtime_types/duration_rt.ts
new file mode 100644
index 0000000000000..99e6a57089dee
--- /dev/null
+++ b/x-pack/plugins/apm/common/agent_configuration/runtime_types/duration_rt.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 * as t from 'io-ts';
+import { either } from 'fp-ts/lib/Either';
+import { amountAndUnitToObject } from '../amount_and_unit';
+
+export const DURATION_UNITS = ['s', 'm', 'h'];
+
+export const durationRt = new t.Type<string, string, unknown>(
+  'durationRt',
+  t.string.is,
+  (input, context) => {
+    return either.chain(t.string.validate(input, context), inputAsString => {
+      const { amount, unit } = amountAndUnitToObject(inputAsString);
+      const amountAsInt = parseInt(amount, 10);
+      const isValidUnit = DURATION_UNITS.includes(unit);
+      const isValid = amountAsInt > 0 && isValidUnit;
+
+      return isValid
+        ? t.success(inputAsString)
+        : t.failure(
+            input,
+            context,
+            `Must have numeric amount and a valid unit (${DURATION_UNITS})`
+          );
+    });
+  },
+  t.identity
+);
diff --git a/x-pack/plugins/apm/common/agent_configuration/runtime_types/integer_rt.test.ts b/x-pack/plugins/apm/common/agent_configuration/runtime_types/integer_rt.test.ts
new file mode 100644
index 0000000000000..ef7fbeed4331e
--- /dev/null
+++ b/x-pack/plugins/apm/common/agent_configuration/runtime_types/integer_rt.test.ts
@@ -0,0 +1,47 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { integerRt, getIntegerRt } from './integer_rt';
+import { isRight } from 'fp-ts/lib/Either';
+
+describe('integerRt', () => {
+  describe('it should not accept', () => {
+    [undefined, null, '', 'foo', 0, 55, NaN].map(input => {
+      it(`${JSON.stringify(input)}`, () => {
+        expect(isRight(integerRt.decode(input))).toBe(false);
+      });
+    });
+  });
+
+  describe('it should accept', () => {
+    ['-1234', '-1', '0', '1000', '32000', '100000'].map(input => {
+      it(`${JSON.stringify(input)}`, () => {
+        expect(isRight(integerRt.decode(input))).toBe(true);
+      });
+    });
+  });
+});
+
+describe('getIntegerRt', () => {
+  const customIntegerRt = getIntegerRt({ min: 0, max: 32000 });
+  describe('it should not accept', () => {
+    [undefined, null, '', 'foo', 0, 55, '-1', '-55', '33000', NaN].map(
+      input => {
+        it(`${JSON.stringify(input)}`, () => {
+          expect(isRight(customIntegerRt.decode(input))).toBe(false);
+        });
+      }
+    );
+  });
+
+  describe('it should accept', () => {
+    ['0', '1000', '32000'].map(input => {
+      it(`${JSON.stringify(input)}`, () => {
+        expect(isRight(customIntegerRt.decode(input))).toBe(true);
+      });
+    });
+  });
+});
diff --git a/x-pack/plugins/apm/common/agent_configuration/runtime_types/integer_rt.ts b/x-pack/plugins/apm/common/agent_configuration/runtime_types/integer_rt.ts
new file mode 100644
index 0000000000000..6dbf175c8b4ce
--- /dev/null
+++ b/x-pack/plugins/apm/common/agent_configuration/runtime_types/integer_rt.ts
@@ -0,0 +1,31 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import * as t from 'io-ts';
+import { either } from 'fp-ts/lib/Either';
+
+export function getIntegerRt({ min, max }: { min: number; max: number }) {
+  return new t.Type<string, string, unknown>(
+    'integerRt',
+    t.string.is,
+    (input, context) => {
+      return either.chain(t.string.validate(input, context), inputAsString => {
+        const inputAsInt = parseInt(inputAsString, 10);
+        const isValid = inputAsInt >= min && inputAsInt <= max;
+        return isValid
+          ? t.success(inputAsString)
+          : t.failure(
+              input,
+              context,
+              `Number must be a valid number between ${min} and ${max}`
+            );
+      });
+    },
+    t.identity
+  );
+}
+
+export const integerRt = getIntegerRt({ min: -Infinity, max: Infinity });
diff --git a/x-pack/plugins/apm/common/agent_configuration/runtime_types/number_float_rt.test.ts b/x-pack/plugins/apm/common/agent_configuration/runtime_types/number_float_rt.test.ts
new file mode 100644
index 0000000000000..ece229ca162fb
--- /dev/null
+++ b/x-pack/plugins/apm/common/agent_configuration/runtime_types/number_float_rt.test.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 { numberFloatRt } from './number_float_rt';
+import { isRight } from 'fp-ts/lib/Either';
+
+describe('numberFloatRt', () => {
+  it('does not accept empty values', () => {
+    expect(isRight(numberFloatRt.decode(undefined))).toBe(false);
+    expect(isRight(numberFloatRt.decode(null))).toBe(false);
+    expect(isRight(numberFloatRt.decode(''))).toBe(false);
+  });
+
+  it('should only accept stringified numbers', () => {
+    expect(isRight(numberFloatRt.decode('0.5'))).toBe(true);
+    expect(isRight(numberFloatRt.decode(0.5))).toBe(false);
+  });
+
+  it('checks if the number falls within 0, 1', () => {
+    expect(isRight(numberFloatRt.decode('0'))).toBe(true);
+    expect(isRight(numberFloatRt.decode('0.5'))).toBe(true);
+    expect(isRight(numberFloatRt.decode('-0.1'))).toBe(false);
+    expect(isRight(numberFloatRt.decode('1.1'))).toBe(false);
+    expect(isRight(numberFloatRt.decode(NaN))).toBe(false);
+  });
+
+  it('checks whether the number of decimals is 3', () => {
+    expect(isRight(numberFloatRt.decode('1'))).toBe(true);
+    expect(isRight(numberFloatRt.decode('0.9'))).toBe(true);
+    expect(isRight(numberFloatRt.decode('0.99'))).toBe(true);
+    expect(isRight(numberFloatRt.decode('0.999'))).toBe(true);
+    expect(isRight(numberFloatRt.decode('0.9999'))).toBe(false);
+  });
+});
diff --git a/x-pack/plugins/apm/common/agent_configuration/runtime_types/number_float_rt.ts b/x-pack/plugins/apm/common/agent_configuration/runtime_types/number_float_rt.ts
new file mode 100644
index 0000000000000..f1890c9851a3d
--- /dev/null
+++ b/x-pack/plugins/apm/common/agent_configuration/runtime_types/number_float_rt.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 * as t from 'io-ts';
+import { either } from 'fp-ts/lib/Either';
+
+export function getNumberFloatRt({ min, max }: { min: number; max: number }) {
+  return new t.Type<string, string, unknown>(
+    'numberFloatRt',
+    t.string.is,
+    (input, context) => {
+      return either.chain(t.string.validate(input, context), inputAsString => {
+        const inputAsFloat = parseFloat(inputAsString);
+        const maxThreeDecimals =
+          parseFloat(inputAsFloat.toFixed(3)) === inputAsFloat;
+
+        const isValid =
+          inputAsFloat >= min && inputAsFloat <= max && maxThreeDecimals;
+
+        return isValid
+          ? t.success(inputAsString)
+          : t.failure(
+              input,
+              context,
+              `Number must be between ${min} and ${max}`
+            );
+      });
+    },
+    t.identity
+  );
+}
+
+export const numberFloatRt = getNumberFloatRt({ min: 0, max: 1 });
diff --git a/x-pack/plugins/apm/common/agent_configuration/setting_definitions/__snapshots__/index.test.ts.snap b/x-pack/plugins/apm/common/agent_configuration/setting_definitions/__snapshots__/index.test.ts.snap
new file mode 100644
index 0000000000000..365d8838a24a6
--- /dev/null
+++ b/x-pack/plugins/apm/common/agent_configuration/setting_definitions/__snapshots__/index.test.ts.snap
@@ -0,0 +1,191 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`settingDefinitions should have correct default values 1`] = `
+Array [
+  Object {
+    "key": "active",
+    "type": "boolean",
+    "validationName": "(\\"true\\" | \\"false\\")",
+  },
+  Object {
+    "key": "api_request_size",
+    "type": "bytes",
+    "units": Array [
+      "b",
+      "kb",
+      "mb",
+    ],
+    "validationError": "Please specify an integer and a unit",
+    "validationName": "bytesRt",
+  },
+  Object {
+    "key": "api_request_time",
+    "type": "duration",
+    "units": Array [
+      "s",
+      "m",
+      "h",
+    ],
+    "validationError": "Please specify an integer and a unit",
+    "validationName": "durationRt",
+  },
+  Object {
+    "key": "capture_body",
+    "options": Array [
+      Object {
+        "text": "off",
+      },
+      Object {
+        "text": "errors",
+      },
+      Object {
+        "text": "transactions",
+      },
+      Object {
+        "text": "all",
+      },
+    ],
+    "type": "select",
+    "validationName": "(\\"off\\" | \\"errors\\" | \\"transactions\\" | \\"all\\")",
+  },
+  Object {
+    "key": "capture_headers",
+    "type": "boolean",
+    "validationName": "(\\"true\\" | \\"false\\")",
+  },
+  Object {
+    "key": "circuit_breaker_enabled",
+    "type": "boolean",
+    "validationName": "(\\"true\\" | \\"false\\")",
+  },
+  Object {
+    "key": "enable_log_correlation",
+    "type": "boolean",
+    "validationName": "(\\"true\\" | \\"false\\")",
+  },
+  Object {
+    "key": "log_level",
+    "type": "text",
+    "validationName": "string",
+  },
+  Object {
+    "key": "profiling_inferred_spans_enabled",
+    "type": "boolean",
+    "validationName": "(\\"true\\" | \\"false\\")",
+  },
+  Object {
+    "key": "profiling_inferred_spans_excluded_classes",
+    "type": "text",
+    "validationName": "string",
+  },
+  Object {
+    "key": "profiling_inferred_spans_included_classes",
+    "type": "text",
+    "validationName": "string",
+  },
+  Object {
+    "key": "profiling_inferred_spans_min_duration",
+    "type": "duration",
+    "units": Array [
+      "s",
+      "m",
+      "h",
+    ],
+    "validationError": "Please specify an integer and a unit",
+    "validationName": "durationRt",
+  },
+  Object {
+    "key": "profiling_inferred_spans_sampling_interval",
+    "type": "duration",
+    "units": Array [
+      "s",
+      "m",
+      "h",
+    ],
+    "validationError": "Please specify an integer and a unit",
+    "validationName": "durationRt",
+  },
+  Object {
+    "key": "server_timeout",
+    "type": "duration",
+    "units": Array [
+      "s",
+      "m",
+      "h",
+    ],
+    "validationError": "Please specify an integer and a unit",
+    "validationName": "durationRt",
+  },
+  Object {
+    "key": "span_frames_min_duration",
+    "type": "duration",
+    "units": Array [
+      "s",
+      "m",
+      "h",
+    ],
+    "validationError": "Please specify an integer and a unit",
+    "validationName": "durationRt",
+  },
+  Object {
+    "key": "stack_trace_limit",
+    "type": "integer",
+    "validationError": "Must be an integer",
+    "validationName": "integerRt",
+  },
+  Object {
+    "key": "stress_monitor_cpu_duration_threshold",
+    "type": "duration",
+    "units": Array [
+      "s",
+      "m",
+      "h",
+    ],
+    "validationError": "Please specify an integer and a unit",
+    "validationName": "durationRt",
+  },
+  Object {
+    "key": "stress_monitor_gc_relief_threshold",
+    "type": "float",
+    "validationError": "Must be a number between 0.000 and 1",
+    "validationName": "numberFloatRt",
+  },
+  Object {
+    "key": "stress_monitor_gc_stress_threshold",
+    "type": "boolean",
+    "validationName": "(\\"true\\" | \\"false\\")",
+  },
+  Object {
+    "key": "stress_monitor_system_cpu_relief_threshold",
+    "type": "float",
+    "validationError": "Must be a number between 0.000 and 1",
+    "validationName": "numberFloatRt",
+  },
+  Object {
+    "key": "stress_monitor_system_cpu_stress_threshold",
+    "type": "float",
+    "validationError": "Must be a number between 0.000 and 1",
+    "validationName": "numberFloatRt",
+  },
+  Object {
+    "key": "trace_methods_duration_threshold",
+    "type": "integer",
+    "validationError": "Must be an integer",
+    "validationName": "integerRt",
+  },
+  Object {
+    "key": "transaction_max_spans",
+    "max": 32000,
+    "min": 0,
+    "type": "integer",
+    "validationError": "Must be between 0 and 32000",
+    "validationName": "integerRt",
+  },
+  Object {
+    "key": "transaction_sample_rate",
+    "type": "float",
+    "validationError": "Must be a number between 0.000 and 1",
+    "validationName": "numberFloatRt",
+  },
+]
+`;
diff --git a/x-pack/plugins/apm/common/agent_configuration/setting_definitions/general_settings.ts b/x-pack/plugins/apm/common/agent_configuration/setting_definitions/general_settings.ts
new file mode 100644
index 0000000000000..b6eb40305dae7
--- /dev/null
+++ b/x-pack/plugins/apm/common/agent_configuration/setting_definitions/general_settings.ts
@@ -0,0 +1,219 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * 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 { getIntegerRt } from '../runtime_types/integer_rt';
+import { captureBodyRt } from '../runtime_types/capture_body_rt';
+import { RawSettingDefinition } from './types';
+
+/*
+ * Settings added here will show up in the UI and will be validated on the client and server
+ */
+export const generalSettings: RawSettingDefinition[] = [
+  // Active
+  {
+    key: 'active',
+    type: 'boolean',
+    defaultValue: 'true',
+    label: i18n.translate('xpack.apm.agentConfig.active.label', {
+      defaultMessage: 'Active'
+    }),
+    description: i18n.translate('xpack.apm.agentConfig.active.description', {
+      defaultMessage:
+        'A boolean specifying if the agent should be active or not.\nWhen active, the agent instruments incoming HTTP requests, tracks errors and collects and sends metrics.\nWhen inactive, the agent works as a noop, not collecting data and not communicating with the APM Server.\nAs this is a reversible switch, agent threads are not being killed when inactivated, but they will be \nmostly idle in this state, so the overhead should be negligible.\n\nYou can use this setting to dynamically disable Elastic APM at runtime.'
+    }),
+    excludeAgents: ['js-base', 'rum-js', 'python', 'dotnet']
+  },
+
+  // API Request Size
+  {
+    key: 'api_request_size',
+    type: 'bytes',
+    defaultValue: '768kb',
+    label: i18n.translate('xpack.apm.agentConfig.apiRequestSize.label', {
+      defaultMessage: 'API Request Size'
+    }),
+    description: i18n.translate(
+      'xpack.apm.agentConfig.apiRequestSize.description',
+      {
+        defaultMessage:
+          'The maximum total compressed size of the request body which is sent to the APM server intake api via a chunked encoding (HTTP streaming).\nNote that a small overshoot is possible.\n\nAllowed byte units are `b`, `kb` and `mb`. `1kb` is equal to `1024b`.'
+      }
+    ),
+    excludeAgents: ['js-base', 'rum-js', 'dotnet']
+  },
+
+  // API Request Time
+  {
+    key: 'api_request_time',
+    type: 'duration',
+    defaultValue: '10s',
+    label: i18n.translate('xpack.apm.agentConfig.apiRequestTime.label', {
+      defaultMessage: 'API Request Time'
+    }),
+    description: i18n.translate(
+      'xpack.apm.agentConfig.apiRequestTime.description',
+      {
+        defaultMessage:
+          "Maximum time to keep an HTTP request to the APM Server open for.\n\nNOTE: This value has to be lower than the APM Server's `read_timeout` setting."
+      }
+    ),
+    excludeAgents: ['js-base', 'rum-js', 'dotnet']
+  },
+
+  // Capture headers
+  {
+    key: 'capture_headers',
+    type: 'boolean',
+    defaultValue: 'true',
+    label: i18n.translate('xpack.apm.agentConfig.captureHeaders.label', {
+      defaultMessage: 'Capture Headers'
+    }),
+    description: i18n.translate(
+      'xpack.apm.agentConfig.captureHeaders.description',
+      {
+        defaultMessage:
+          'If set to `true`, the agent will capture request and response headers, including cookies.\n\nNOTE: Setting this to `false` reduces network bandwidth, disk space and object allocations.'
+      }
+    ),
+    excludeAgents: ['js-base', 'rum-js']
+  },
+
+  // Capture body
+  {
+    key: 'capture_body',
+    validation: captureBodyRt,
+    type: 'select',
+    defaultValue: 'off',
+    label: i18n.translate('xpack.apm.agentConfig.captureBody.label', {
+      defaultMessage: 'Capture body'
+    }),
+    description: i18n.translate(
+      'xpack.apm.agentConfig.captureBody.description',
+      {
+        defaultMessage:
+          'For transactions that are HTTP requests, the agent can optionally capture the request body (e.g. POST variables). Default is "off".'
+      }
+    ),
+    options: [
+      { text: 'off' },
+      { text: 'errors' },
+      { text: 'transactions' },
+      { text: 'all' }
+    ],
+    excludeAgents: ['js-base', 'rum-js', 'dotnet']
+  },
+
+  // LOG_LEVEL
+  {
+    key: 'log_level',
+    type: 'text',
+    defaultValue: 'info',
+    label: i18n.translate('xpack.apm.agentConfig.logLevel.label', {
+      defaultMessage: 'Log level'
+    }),
+    description: i18n.translate('xpack.apm.agentConfig.logLevel.description', {
+      defaultMessage: 'Sets the logging level for the agent'
+    }),
+    excludeAgents: ['js-base', 'rum-js', 'python']
+  },
+
+  // SERVER_TIMEOUT
+  {
+    key: 'server_timeout',
+    type: 'duration',
+    defaultValue: '5s',
+    label: i18n.translate('xpack.apm.agentConfig.serverTimeout.label', {
+      defaultMessage: 'Server Timeout'
+    }),
+    description: i18n.translate(
+      'xpack.apm.agentConfig.serverTimeout.description',
+      {
+        defaultMessage:
+          'If a request to the APM server takes longer than the configured timeout,\nthe request is cancelled and the event (exception or transaction) is discarded.\nSet to 0 to disable timeouts.\n\nWARNING: If timeouts are disabled or set to a high value, your app could experience memory issues if the APM server times out.'
+      }
+    ),
+    includeAgents: ['nodejs', 'java', 'go']
+  },
+
+  // SPAN_FRAMES_MIN_DURATION
+  {
+    key: 'span_frames_min_duration',
+    type: 'duration',
+    defaultValue: '5ms',
+    label: i18n.translate('xpack.apm.agentConfig.spanFramesMinDuration.label', {
+      defaultMessage: 'Span frames minimum duration'
+    }),
+    description: i18n.translate(
+      'xpack.apm.agentConfig.spanFramesMinDuration.description',
+      {
+        defaultMessage:
+          'In its default settings, the APM agent will collect a stack trace with every recorded span.\nWhile this is very helpful to find the exact place in your code that causes the span, collecting this stack trace does have some overhead. \nWhen setting this option to a negative value, like `-1ms`, stack traces will be collected for all spans. Setting it to a positive value, e.g. `5ms`, will limit stack trace collection to spans with durations equal to or longer than the given value, e.g. 5 milliseconds.\n\nTo disable stack trace collection for spans completely, set the value to `0ms`.'
+      }
+    ),
+    excludeAgents: ['js-base', 'rum-js', 'nodejs']
+  },
+
+  // STACK_TRACE_LIMIT
+  {
+    key: 'stack_trace_limit',
+    type: 'integer',
+    defaultValue: '50',
+    label: i18n.translate('xpack.apm.agentConfig.stackTraceLimit.label', {
+      defaultMessage: 'Stack trace limit'
+    }),
+    description: i18n.translate(
+      'xpack.apm.agentConfig.stackTraceLimit.description',
+      {
+        defaultMessage:
+          'Setting it to 0 will disable stack trace collection. Any positive integer value will be used as the maximum number of frames to collect. Setting it -1 means that all frames will be collected.'
+      }
+    ),
+    includeAgents: ['nodejs', 'java', 'dotnet', 'go']
+  },
+
+  // Transaction sample rate
+  {
+    key: 'transaction_sample_rate',
+    type: 'float',
+    defaultValue: '1.0',
+    label: i18n.translate('xpack.apm.agentConfig.transactionSampleRate.label', {
+      defaultMessage: 'Transaction sample rate'
+    }),
+    description: i18n.translate(
+      'xpack.apm.agentConfig.transactionSampleRate.description',
+      {
+        defaultMessage:
+          'By default, the agent will sample every transaction (e.g. request to your service). To reduce overhead and storage requirements, you can set the sample rate to a value between 0.0 and 1.0. We still record overall time and the result for unsampled transactions, but no context information, labels, or spans.'
+      }
+    )
+  },
+
+  // Transaction max spans
+  {
+    key: 'transaction_max_spans',
+    type: 'integer',
+    validation: getIntegerRt({ min: 0, max: 32000 }),
+    validationError: i18n.translate(
+      'xpack.apm.agentConfig.transactionMaxSpans.errorText',
+      { defaultMessage: 'Must be between 0 and 32000' }
+    ),
+    defaultValue: '500',
+    label: i18n.translate('xpack.apm.agentConfig.transactionMaxSpans.label', {
+      defaultMessage: 'Transaction max spans'
+    }),
+    description: i18n.translate(
+      'xpack.apm.agentConfig.transactionMaxSpans.description',
+      {
+        defaultMessage:
+          'Limits the amount of spans that are recorded per transaction. Default is 500.'
+      }
+    ),
+    min: 0,
+    max: 32000,
+    excludeAgents: ['js-base', 'rum-js']
+  }
+];
diff --git a/x-pack/plugins/apm/common/agent_configuration/setting_definitions/index.test.ts b/x-pack/plugins/apm/common/agent_configuration/setting_definitions/index.test.ts
new file mode 100644
index 0000000000000..0d1113d74c98b
--- /dev/null
+++ b/x-pack/plugins/apm/common/agent_configuration/setting_definitions/index.test.ts
@@ -0,0 +1,187 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { omit } from 'lodash';
+import { filterByAgent, settingDefinitions } from '../setting_definitions';
+import { AgentName } from '../../../typings/es_schemas/ui/fields/agent';
+import { SettingDefinition } from './types';
+
+describe('filterByAgent', () => {
+  describe('when `excludeAgents` is dotnet and nodejs', () => {
+    const setting = {
+      key: 'my-setting',
+      excludeAgents: ['dotnet', 'nodejs']
+    } as SettingDefinition;
+
+    it('should not include dotnet', () => {
+      expect(filterByAgent('dotnet')(setting)).toBe(false);
+    });
+
+    it('should include go', () => {
+      expect(filterByAgent('go')(setting)).toBe(true);
+    });
+  });
+
+  describe('when `includeAgents` is dotnet and nodejs', () => {
+    const setting = {
+      key: 'my-setting',
+      includeAgents: ['dotnet', 'nodejs']
+    } as SettingDefinition;
+
+    it('should not include go', () => {
+      expect(filterByAgent('go')(setting)).toBe(false);
+    });
+
+    it('should include dotnet', () => {
+      expect(filterByAgent('dotnet')(setting)).toBe(true);
+    });
+  });
+
+  describe('options per agent', () => {
+    it('go', () => {
+      expect(getSettingKeysForAgent('go')).toEqual([
+        'active',
+        'api_request_size',
+        'api_request_time',
+        'capture_body',
+        'capture_headers',
+        'log_level',
+        'server_timeout',
+        'span_frames_min_duration',
+        'stack_trace_limit',
+        'transaction_max_spans',
+        'transaction_sample_rate'
+      ]);
+    });
+
+    it('java', () => {
+      expect(getSettingKeysForAgent('java')).toEqual([
+        'active',
+        'api_request_size',
+        'api_request_time',
+        'capture_body',
+        'capture_headers',
+        'circuit_breaker_enabled',
+        'enable_log_correlation',
+        'log_level',
+        'profiling_inferred_spans_enabled',
+        'profiling_inferred_spans_excluded_classes',
+        'profiling_inferred_spans_included_classes',
+        'profiling_inferred_spans_min_duration',
+        'profiling_inferred_spans_sampling_interval',
+        'server_timeout',
+        'span_frames_min_duration',
+        'stack_trace_limit',
+        'stress_monitor_cpu_duration_threshold',
+        'stress_monitor_gc_relief_threshold',
+        'stress_monitor_gc_stress_threshold',
+        'stress_monitor_system_cpu_relief_threshold',
+        'stress_monitor_system_cpu_stress_threshold',
+        'trace_methods_duration_threshold',
+        'transaction_max_spans',
+        'transaction_sample_rate'
+      ]);
+    });
+
+    it('js-base', () => {
+      expect(getSettingKeysForAgent('js-base')).toEqual([
+        'transaction_sample_rate'
+      ]);
+    });
+
+    it('rum-js', () => {
+      expect(getSettingKeysForAgent('rum-js')).toEqual([
+        'transaction_sample_rate'
+      ]);
+    });
+
+    it('nodejs', () => {
+      expect(getSettingKeysForAgent('nodejs')).toEqual([
+        'active',
+        'api_request_size',
+        'api_request_time',
+        'capture_body',
+        'capture_headers',
+        'log_level',
+        'server_timeout',
+        'stack_trace_limit',
+        'transaction_max_spans',
+        'transaction_sample_rate'
+      ]);
+    });
+
+    it('python', () => {
+      expect(getSettingKeysForAgent('python')).toEqual([
+        'api_request_size',
+        'api_request_time',
+        'capture_body',
+        'capture_headers',
+        'span_frames_min_duration',
+        'transaction_max_spans',
+        'transaction_sample_rate'
+      ]);
+    });
+
+    it('dotnet', () => {
+      expect(getSettingKeysForAgent('dotnet')).toEqual([
+        'capture_headers',
+        'log_level',
+        'span_frames_min_duration',
+        'stack_trace_limit',
+        'transaction_max_spans',
+        'transaction_sample_rate'
+      ]);
+    });
+
+    it('ruby', () => {
+      expect(getSettingKeysForAgent('ruby')).toEqual([
+        'active',
+        'api_request_size',
+        'api_request_time',
+        'capture_body',
+        'capture_headers',
+        'log_level',
+        'span_frames_min_duration',
+        'transaction_max_spans',
+        'transaction_sample_rate'
+      ]);
+    });
+
+    it('"All" services (no agent name)', () => {
+      expect(getSettingKeysForAgent(undefined)).toEqual([
+        'capture_headers',
+        'transaction_max_spans',
+        'transaction_sample_rate'
+      ]);
+    });
+  });
+});
+
+describe('settingDefinitions', () => {
+  it('should have correct default values', () => {
+    expect(
+      settingDefinitions.map(def => {
+        return {
+          ...omit(def, [
+            'category',
+            'defaultValue',
+            'description',
+            'excludeAgents',
+            'includeAgents',
+            'label',
+            'validation'
+          ]),
+          validationName: def.validation.name
+        };
+      })
+    ).toMatchSnapshot();
+  });
+});
+
+function getSettingKeysForAgent(agentName: AgentName | undefined) {
+  const definitions = settingDefinitions.filter(filterByAgent(agentName));
+  return definitions.map(def => def.key);
+}
diff --git a/x-pack/plugins/apm/common/agent_configuration/setting_definitions/index.ts b/x-pack/plugins/apm/common/agent_configuration/setting_definitions/index.ts
new file mode 100644
index 0000000000000..8786a94be096d
--- /dev/null
+++ b/x-pack/plugins/apm/common/agent_configuration/setting_definitions/index.ts
@@ -0,0 +1,113 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import * as t from 'io-ts';
+import { sortBy } from 'lodash';
+import { isRight } from 'fp-ts/lib/Either';
+import { i18n } from '@kbn/i18n';
+import { AgentName } from '../../../typings/es_schemas/ui/fields/agent';
+import { booleanRt } from '../runtime_types/boolean_rt';
+import { integerRt } from '../runtime_types/integer_rt';
+import { isRumAgentName } from '../../agent_name';
+import { numberFloatRt } from '../runtime_types/number_float_rt';
+import { bytesRt, BYTE_UNITS } from '../runtime_types/bytes_rt';
+import { durationRt, DURATION_UNITS } from '../runtime_types/duration_rt';
+import { RawSettingDefinition, SettingDefinition } from './types';
+import { generalSettings } from './general_settings';
+import { javaSettings } from './java_settings';
+
+function getDefaultsByType(settingDefinition: RawSettingDefinition) {
+  switch (settingDefinition.type) {
+    case 'boolean':
+      return { validation: booleanRt };
+    case 'text':
+      return { validation: t.string };
+    case 'integer':
+      return {
+        validation: integerRt,
+        validationError: i18n.translate(
+          'xpack.apm.agentConfig.integer.errorText',
+          { defaultMessage: 'Must be an integer' }
+        )
+      };
+    case 'float':
+      return {
+        validation: numberFloatRt,
+        validationError: i18n.translate(
+          'xpack.apm.agentConfig.float.errorText',
+          { defaultMessage: 'Must be a number between 0.000 and 1' }
+        )
+      };
+    case 'bytes':
+      return {
+        validation: bytesRt,
+        units: BYTE_UNITS,
+        validationError: i18n.translate(
+          'xpack.apm.agentConfig.bytes.errorText',
+          { defaultMessage: 'Please specify an integer and a unit' }
+        )
+      };
+    case 'duration':
+      return {
+        validation: durationRt,
+        units: DURATION_UNITS,
+        validationError: i18n.translate(
+          'xpack.apm.agentConfig.bytes.errorText',
+          { defaultMessage: 'Please specify an integer and a unit' }
+        )
+      };
+  }
+}
+
+export function filterByAgent(agentName?: AgentName) {
+  return (setting: SettingDefinition) => {
+    // agentName is missing if "All" was selected
+    if (!agentName) {
+      // options that only apply to certain agents will be filtered out
+      if (setting.includeAgents) {
+        return false;
+      }
+
+      // only options that apply to every agent (ignoring RUM) should be returned
+      if (setting.excludeAgents) {
+        return setting.excludeAgents.every(isRumAgentName);
+      }
+
+      return true;
+    }
+
+    if (setting.includeAgents) {
+      return setting.includeAgents.includes(agentName);
+    }
+
+    if (setting.excludeAgents) {
+      return !setting.excludeAgents.includes(agentName);
+    }
+
+    return true;
+  };
+}
+
+export function isValid(setting: SettingDefinition, value: unknown) {
+  return isRight(setting.validation.decode(value));
+}
+
+export const settingDefinitions = sortBy(
+  [...generalSettings, ...javaSettings].map(def => {
+    const defWithDefaults = {
+      ...getDefaultsByType(def),
+      ...def
+    };
+
+    // ensure every option has validation
+    if (!defWithDefaults.validation) {
+      throw new Error(`Missing validation for ${def.key}`);
+    }
+
+    return defWithDefaults as SettingDefinition;
+  }),
+  'key'
+);
diff --git a/x-pack/plugins/apm/common/agent_configuration/setting_definitions/java_settings.ts b/x-pack/plugins/apm/common/agent_configuration/setting_definitions/java_settings.ts
new file mode 100644
index 0000000000000..1a480c131e853
--- /dev/null
+++ b/x-pack/plugins/apm/common/agent_configuration/setting_definitions/java_settings.ts
@@ -0,0 +1,256 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * 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 { RawSettingDefinition } from './types';
+
+export const javaSettings: RawSettingDefinition[] = [
+  // ENABLE_LOG_CORRELATION
+  {
+    key: 'enable_log_correlation',
+    type: 'boolean',
+    defaultValue: 'false',
+    label: i18n.translate('xpack.apm.agentConfig.enableLogCorrelation.label', {
+      defaultMessage: 'Enable log correlation'
+    }),
+    description: i18n.translate(
+      'xpack.apm.agentConfig.enableLogCorrelation.description',
+      {
+        defaultMessage:
+          "A boolean specifying if the agent should integrate into SLF4J's https://www.slf4j.org/api/org/slf4j/MDC.html[MDC] to enable trace-log correlation.\nIf set to `true`, the agent will set the `trace.id` and `transaction.id` for the currently active spans and transactions to the MDC.\nSee <<log-correlation>> for more details.\n\nNOTE: While it's allowed to enable this setting at runtime, you can't disable it without a restart."
+      }
+    ),
+    includeAgents: ['java']
+  },
+
+  // TRACE_METHODS_DURATION_THRESHOLD
+  {
+    key: 'trace_methods_duration_threshold',
+    type: 'integer',
+    label: i18n.translate(
+      'xpack.apm.agentConfig.traceMethodsDurationThreshold.label',
+      {
+        defaultMessage: 'Trace methods duration threshold'
+      }
+    ),
+    description: i18n.translate(
+      'xpack.apm.agentConfig.traceMethodsDurationThreshold.description',
+      {
+        defaultMessage:
+          'If trace_methods config option is set, provides a threshold to limit spans based on duration. When set to a value greater than 0, spans representing methods traced based on trace_methods will be discarded by default.'
+      }
+    ),
+    includeAgents: ['java']
+  },
+
+  /*
+   * Circuit-Breaker
+   **/
+  {
+    key: 'circuit_breaker_enabled',
+    label: i18n.translate('xpack.apm.agentConfig.circuitBreakerEnabled.label', {
+      defaultMessage: 'Cirtcuit breaker enabled'
+    }),
+    type: 'boolean',
+    category: 'Circuit-Breaker',
+    defaultValue: 'false',
+    description: i18n.translate(
+      'xpack.apm.agentConfig.circuitBreakerEnabled.description',
+      {
+        defaultMessage:
+          'A boolean specifying whether the circuit breaker should be enabled or not. \nWhen enabled, the agent periodically polls stress monitors to detect system/process/JVM stress state. \nIf ANY of the monitors detects a stress indication, the agent will become inactive, as if the \n<<config-active>> configuration option has been set to `false`, thus reducing resource consumption to a minimum. \nWhen inactive, the agent continues polling the same monitors in order to detect whether the stress state \nhas been relieved. If ALL monitors approve that the system/process/JVM is not under stress anymore, the \nagent will resume and become fully functional.'
+      }
+    ),
+    includeAgents: ['java']
+  },
+  {
+    key: 'stress_monitor_gc_stress_threshold',
+    label: i18n.translate(
+      'xpack.apm.agentConfig.stressMonitorGcStressThreshold.label',
+      { defaultMessage: 'Stress monitor gc stress threshold' }
+    ),
+    type: 'boolean',
+    category: 'Circuit-Breaker',
+    defaultValue: '0.95',
+    description: i18n.translate(
+      'xpack.apm.agentConfig.stressMonitorGcStressThreshold.description',
+      {
+        defaultMessage:
+          'The threshold used by the GC monitor to rely on for identifying heap stress.\nThe same threshold will be used for all heap pools, so that if ANY has a usage percentage that crosses it, \nthe agent will consider it as a heap stress. The GC monitor relies only on memory consumption measured \nafter a recent GC.'
+      }
+    ),
+    includeAgents: ['java']
+  },
+  {
+    key: 'stress_monitor_gc_relief_threshold',
+    label: i18n.translate(
+      'xpack.apm.agentConfig.stressMonitorGcReliefThreshold.label',
+      { defaultMessage: 'Stress monitor gc relief threshold' }
+    ),
+
+    type: 'float',
+    category: 'Circuit-Breaker',
+    defaultValue: '0.75',
+    description: i18n.translate(
+      'xpack.apm.agentConfig.stressMonitorGcReliefThreshold.description',
+      {
+        defaultMessage:
+          'The threshold used by the GC monitor to rely on for identifying when the heap is not under stress .\nIf `stress_monitor_gc_stress_threshold` has been crossed, the agent will consider it a heap-stress state. \nIn order to determine that the stress state is over, percentage of occupied memory in ALL heap pools should \nbe lower than this threshold. The GC monitor relies only on memory consumption measured after a recent GC.'
+      }
+    ),
+    includeAgents: ['java']
+  },
+  {
+    key: 'stress_monitor_cpu_duration_threshold',
+    label: i18n.translate(
+      'xpack.apm.agentConfig.stressMonitorCpuDurationThreshold.label',
+      { defaultMessage: 'Stress monitor cpu duration threshold' }
+    ),
+    type: 'duration',
+    category: 'Circuit-Breaker',
+    defaultValue: '1m',
+    description: i18n.translate(
+      'xpack.apm.agentConfig.stressMonitorCpuDurationThreshold.description',
+      {
+        defaultMessage:
+          'The minimal time required in order to determine whether the system is \neither currently under stress, or that the stress detected previously has been relieved. \nAll measurements during this time must be consistent in comparison to the relevant threshold in \norder to detect a change of stress state. Must be at least `1m`.'
+      }
+    ),
+    includeAgents: ['java']
+  },
+  {
+    key: 'stress_monitor_system_cpu_stress_threshold',
+    label: i18n.translate(
+      'xpack.apm.agentConfig.stressMonitorSystemCpuStressThreshold.label',
+      { defaultMessage: 'Stress monitor system cpu stress threshold' }
+    ),
+    type: 'float',
+    category: 'Circuit-Breaker',
+    defaultValue: '0.95',
+    description: i18n.translate(
+      'xpack.apm.agentConfig.stressMonitorSystemCpuStressThreshold.description',
+      {
+        defaultMessage:
+          'The threshold used by the system CPU monitor to detect system CPU stress. \nIf the system CPU crosses this threshold for a duration of at least `stress_monitor_cpu_duration_threshold`, \nthe monitor considers this as a stress state.'
+      }
+    ),
+    includeAgents: ['java']
+  },
+  {
+    key: 'stress_monitor_system_cpu_relief_threshold',
+    label: i18n.translate(
+      'xpack.apm.agentConfig.stressMonitorSystemCpuReliefThreshold.label',
+      { defaultMessage: 'Stress monitor system cpu relief threshold' }
+    ),
+    type: 'float',
+    category: 'Circuit-Breaker',
+    defaultValue: '0.8',
+    description: i18n.translate(
+      'xpack.apm.agentConfig.stressMonitorSystemCpuReliefThreshold.description',
+      {
+        defaultMessage:
+          'The threshold used by the system CPU monitor to determine that the system is \nnot under CPU stress. If the monitor detected a CPU stress, the measured system CPU needs to be below \nthis threshold for a duration of at least `stress_monitor_cpu_duration_threshold` in order for the \nmonitor to decide that the CPU stress has been relieved.'
+      }
+    ),
+    includeAgents: ['java']
+  },
+
+  /*
+   * Profiling
+   **/
+
+  {
+    key: 'profiling_inferred_spans_enabled',
+    label: i18n.translate(
+      'xpack.apm.agentConfig.profilingInferredSpansEnabled.label',
+      { defaultMessage: 'Profiling inferred spans enabled' }
+    ),
+    type: 'boolean',
+    category: 'Profiling',
+    defaultValue: 'false',
+    description: i18n.translate(
+      'xpack.apm.agentConfig.profilingInferredSpansEnabled.description',
+      {
+        defaultMessage:
+          'Set to `true` to make the agent create spans for method executions based on\nhttps://github.com/jvm-profiling-tools/async-profiler[async-profiler], a sampling aka statistical profiler.\n\nDue to the nature of how sampling profilers work,\nthe duration of the inferred spans are not exact, but only estimations.\nThe <<config-profiling-inferred-spans-sampling-interval, `profiling_inferred_spans_sampling_interval`>> lets you fine tune the trade-off between accuracy and overhead.\n\nThe inferred spans are created after a profiling session has ended.\nThis means there is a delay between the regular and the inferred spans being visible in the UI.\n\nNOTE: This feature is not available on Windows'
+      }
+    ),
+    includeAgents: ['java']
+  },
+  {
+    key: 'profiling_inferred_spans_sampling_interval',
+    label: i18n.translate(
+      'xpack.apm.agentConfig.profilingInferredSpansSamplingInterval.label',
+      { defaultMessage: 'Profiling inferred spans sampling interval' }
+    ),
+    type: 'duration',
+    category: 'Profiling',
+    defaultValue: '50ms',
+    description: i18n.translate(
+      'xpack.apm.agentConfig.profilingInferredSpansSamplingInterval.description',
+      {
+        defaultMessage:
+          'The frequency at which stack traces are gathered within a profiling session.\nThe lower you set it, the more accurate the durations will be.\nThis comes at the expense of higher overhead and more spans for potentially irrelevant operations.\nThe minimal duration of a profiling-inferred span is the same as the value of this setting.'
+      }
+    ),
+    includeAgents: ['java']
+  },
+  {
+    key: 'profiling_inferred_spans_min_duration',
+    label: i18n.translate(
+      'xpack.apm.agentConfig.profilingInferredSpansMinDuration.label',
+      { defaultMessage: 'Profiling inferred spans min duration' }
+    ),
+    type: 'duration',
+    category: 'Profiling',
+    defaultValue: '0ms',
+    description: i18n.translate(
+      'xpack.apm.agentConfig.profilingInferredSpansMinDuration.description',
+      {
+        defaultMessage:
+          'The minimum duration of an inferred span.\nNote that the min duration is also implicitly set by the sampling interval.\nHowever, increasing the sampling interval also decreases the accuracy of the duration of inferred spans.'
+      }
+    ),
+    includeAgents: ['java']
+  },
+  {
+    key: 'profiling_inferred_spans_included_classes',
+    label: i18n.translate(
+      'xpack.apm.agentConfig.profilingInferredSpansIncludedClasses.label',
+      { defaultMessage: 'Profiling inferred spans included classes' }
+    ),
+    type: 'text',
+    category: 'Profiling',
+    defaultValue: '*',
+    description: i18n.translate(
+      'xpack.apm.agentConfig.profilingInferredSpansIncludedClasses.description',
+      {
+        defaultMessage:
+          'If set, the agent will only create inferred spans for methods which match this list.\nSetting a value may slightly increase performance and can reduce clutter by only creating spans for the classes you are interested in.\nExample: `org.example.myapp.*`\n\nThis option supports the wildcard `*`, which matches zero or more characters.\nExamples: `/foo/*/bar/*/baz*`, `*foo*`.\nMatching is case insensitive by default.\nPrepending an element with `(?-i)` makes the matching case sensitive.'
+      }
+    ),
+    includeAgents: ['java']
+  },
+  {
+    key: 'profiling_inferred_spans_excluded_classes',
+    label: i18n.translate(
+      'xpack.apm.agentConfig.profilingInferredSpansExcludedClasses.label',
+      { defaultMessage: 'Profiling inferred spans excluded classes' }
+    ),
+    type: 'text',
+    category: 'Profiling',
+    defaultValue:
+      '(?-i)java.*,(?-i)javax.*,(?-i)sun.*,(?-i)com.sun.*,(?-i)jdk.*,(?-i)org.apache.tomcat.*,(?-i)org.apache.catalina.*,(?-i)org.apache.coyote.*,(?-i)org.jboss.as.*,(?-i)org.glassfish.*,(?-i)org.eclipse.jetty.*,(?-i)com.ibm.websphere.*,(?-i)io.undertow.*',
+    description: i18n.translate(
+      'xpack.apm.agentConfig.profilingInferredSpansExcludedClasses.description',
+      {
+        defaultMessage:
+          'Excludes classes for which no profiler-inferred spans should be created.\n\nThis option supports the wildcard `*`, which matches zero or more characters.\nExamples: `/foo/*/bar/*/baz*`, `*foo*`.\nMatching is case insensitive by default.\nPrepending an element with `(?-i)` makes the matching case sensitive.'
+      }
+    ),
+    includeAgents: ['java']
+  }
+];
diff --git a/x-pack/plugins/apm/common/agent_configuration/setting_definitions/types.d.ts b/x-pack/plugins/apm/common/agent_configuration/setting_definitions/types.d.ts
new file mode 100644
index 0000000000000..6b584fc7e2048
--- /dev/null
+++ b/x-pack/plugins/apm/common/agent_configuration/setting_definitions/types.d.ts
@@ -0,0 +1,107 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import * as t from 'io-ts';
+import { AgentName } from '../../../typings/es_schemas/ui/fields/agent';
+
+interface BaseSetting {
+  /**
+   * UI: unique key to identify setting
+   */
+  key: string;
+
+  /**
+   * UI: Human readable name of setting
+   */
+  label: string;
+
+  /**
+   * UI: Human readable name of setting
+   * Not used yet
+   */
+  category?: string;
+
+  /**
+   * UI:
+   */
+  defaultValue?: string;
+
+  /**
+   * UI: description of setting
+   */
+  description: string;
+
+  /**
+   * UI: placeholder to show in input field
+   */
+  placeholder?: string;
+
+  /**
+   * runtime validation of the input
+   */
+  validation?: t.Type<any, string, unknown>;
+
+  /**
+   * UI: error shown when the runtime validation fails
+   */
+  validationError?: string;
+
+  /**
+   * Limits the setting to no agents, except those specified in `includeAgents`
+   */
+  includeAgents?: AgentName[];
+
+  /**
+   * Limits the setting to all agents, except those specified in `excludeAgents`
+   */
+  excludeAgents?: AgentName[];
+}
+
+interface TextSetting extends BaseSetting {
+  type: 'text';
+}
+
+interface IntegerSetting extends BaseSetting {
+  type: 'integer';
+  min?: number;
+  max?: number;
+}
+
+interface FloatSetting extends BaseSetting {
+  type: 'float';
+}
+
+interface SelectSetting extends BaseSetting {
+  type: 'select';
+  options: Array<{ text: string }>;
+}
+
+interface BooleanSetting extends BaseSetting {
+  type: 'boolean';
+}
+
+interface BytesSetting extends BaseSetting {
+  type: 'bytes';
+  units?: string[];
+}
+
+interface DurationSetting extends BaseSetting {
+  type: 'duration';
+  units?: string[];
+}
+
+export type RawSettingDefinition =
+  | TextSetting
+  | FloatSetting
+  | IntegerSetting
+  | SelectSetting
+  | BooleanSetting
+  | BytesSetting
+  | DurationSetting;
+
+export type SettingDefinition = RawSettingDefinition & {
+  validation: NonNullable<RawSettingDefinition['validation']>;
+};
diff --git a/x-pack/plugins/apm/common/runtime_types/agent_configuration_intake_rt/index.test.ts b/x-pack/plugins/apm/common/runtime_types/agent_configuration_intake_rt/index.test.ts
deleted file mode 100644
index 4c9dc78eb41e9..0000000000000
--- a/x-pack/plugins/apm/common/runtime_types/agent_configuration_intake_rt/index.test.ts
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { agentConfigurationIntakeRt } from './index';
-import { isRight } from 'fp-ts/lib/Either';
-
-describe('agentConfigurationIntakeRt', () => {
-  it('is valid when required parameters are given', () => {
-    const config = {
-      service: {},
-      settings: {}
-    };
-
-    expect(isConfigValid(config)).toBe(true);
-  });
-
-  it('is valid when required and optional parameters are given', () => {
-    const config = {
-      service: { name: 'my-service', environment: 'my-environment' },
-      settings: {
-        transaction_sample_rate: 0.5,
-        capture_body: 'foo',
-        transaction_max_spans: 10
-      }
-    };
-
-    expect(isConfigValid(config)).toBe(true);
-  });
-
-  it('is invalid when required parameters are not given', () => {
-    const config = {};
-    expect(isConfigValid(config)).toBe(false);
-  });
-});
-
-function isConfigValid(config: any) {
-  return isRight(agentConfigurationIntakeRt.decode(config));
-}
diff --git a/x-pack/plugins/apm/common/runtime_types/agent_configuration_intake_rt/index.ts b/x-pack/plugins/apm/common/runtime_types/agent_configuration_intake_rt/index.ts
deleted file mode 100644
index 32a2832b5eaf3..0000000000000
--- a/x-pack/plugins/apm/common/runtime_types/agent_configuration_intake_rt/index.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import * as t from 'io-ts';
-import { transactionSampleRateRt } from '../transaction_sample_rate_rt';
-import { transactionMaxSpansRt } from '../transaction_max_spans_rt';
-
-export const serviceRt = t.partial({
-  name: t.string,
-  environment: t.string
-});
-
-export const agentConfigurationIntakeRt = t.intersection([
-  t.partial({ agent_name: t.string }),
-  t.type({
-    service: serviceRt,
-    settings: t.partial({
-      transaction_sample_rate: transactionSampleRateRt,
-      capture_body: t.string,
-      transaction_max_spans: transactionMaxSpansRt
-    })
-  })
-]);
diff --git a/x-pack/plugins/apm/common/runtime_types/transaction_max_spans_rt/index.test.ts b/x-pack/plugins/apm/common/runtime_types/transaction_max_spans_rt/index.test.ts
deleted file mode 100644
index b62251b6974d9..0000000000000
--- a/x-pack/plugins/apm/common/runtime_types/transaction_max_spans_rt/index.test.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { transactionMaxSpansRt } from './index';
-import { isRight } from 'fp-ts/lib/Either';
-
-describe('transactionMaxSpans', () => {
-  it('does not accept empty values', () => {
-    expect(isRight(transactionMaxSpansRt.decode(undefined))).toBe(false);
-    expect(isRight(transactionMaxSpansRt.decode(null))).toBe(false);
-    expect(isRight(transactionMaxSpansRt.decode(''))).toBe(false);
-  });
-
-  it('accepts both strings and numbers as values', () => {
-    expect(isRight(transactionMaxSpansRt.decode('55'))).toBe(true);
-    expect(isRight(transactionMaxSpansRt.decode(55))).toBe(true);
-  });
-
-  it('checks if the number falls within 0, 32000', () => {
-    expect(isRight(transactionMaxSpansRt.decode(0))).toBe(true);
-    expect(isRight(transactionMaxSpansRt.decode(32000))).toBe(true);
-    expect(isRight(transactionMaxSpansRt.decode(-55))).toBe(false);
-    expect(isRight(transactionMaxSpansRt.decode(NaN))).toBe(false);
-  });
-});
diff --git a/x-pack/plugins/apm/common/runtime_types/transaction_max_spans_rt/index.ts b/x-pack/plugins/apm/common/runtime_types/transaction_max_spans_rt/index.ts
deleted file mode 100644
index 251161c21babe..0000000000000
--- a/x-pack/plugins/apm/common/runtime_types/transaction_max_spans_rt/index.ts
+++ /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 * as t from 'io-ts';
-
-export const transactionMaxSpansRt = new t.Type<number, number, unknown>(
-  'transactionMaxSpans',
-  t.number.is,
-  (input, context) => {
-    const value = parseInt(input as string, 10);
-    return value >= 0 && value <= 32000
-      ? t.success(value)
-      : t.failure(input, context);
-  },
-  t.identity
-);
diff --git a/x-pack/plugins/apm/common/runtime_types/transaction_sample_rate_rt/index.test.ts b/x-pack/plugins/apm/common/runtime_types/transaction_sample_rate_rt/index.test.ts
deleted file mode 100644
index 6930a69f0870a..0000000000000
--- a/x-pack/plugins/apm/common/runtime_types/transaction_sample_rate_rt/index.test.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-import { transactionSampleRateRt } from './index';
-import { isRight } from 'fp-ts/lib/Either';
-
-describe('transactionSampleRateRt', () => {
-  it('does not accept empty values', () => {
-    expect(isRight(transactionSampleRateRt.decode(undefined))).toBe(false);
-    expect(isRight(transactionSampleRateRt.decode(null))).toBe(false);
-    expect(isRight(transactionSampleRateRt.decode(''))).toBe(false);
-  });
-
-  it('accepts both strings and numbers as values', () => {
-    expect(isRight(transactionSampleRateRt.decode('0.5'))).toBe(true);
-    expect(isRight(transactionSampleRateRt.decode(0.5))).toBe(true);
-  });
-
-  it('checks if the number falls within 0, 1', () => {
-    expect(isRight(transactionSampleRateRt.decode(0))).toBe(true);
-
-    expect(isRight(transactionSampleRateRt.decode(0.5))).toBe(true);
-
-    expect(isRight(transactionSampleRateRt.decode(-0.1))).toBe(false);
-    expect(isRight(transactionSampleRateRt.decode(1.1))).toBe(false);
-
-    expect(isRight(transactionSampleRateRt.decode(NaN))).toBe(false);
-  });
-
-  it('checks whether the number of decimals is 3', () => {
-    expect(isRight(transactionSampleRateRt.decode(1))).toBe(true);
-    expect(isRight(transactionSampleRateRt.decode(0.99))).toBe(true);
-    expect(isRight(transactionSampleRateRt.decode(0.999))).toBe(true);
-    expect(isRight(transactionSampleRateRt.decode(0.998))).toBe(true);
-  });
-});
diff --git a/x-pack/plugins/apm/common/runtime_types/transaction_sample_rate_rt/index.ts b/x-pack/plugins/apm/common/runtime_types/transaction_sample_rate_rt/index.ts
deleted file mode 100644
index 90c60d16f7b59..0000000000000
--- a/x-pack/plugins/apm/common/runtime_types/transaction_sample_rate_rt/index.ts
+++ /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 * as t from 'io-ts';
-
-export const transactionSampleRateRt = new t.Type<number, number, unknown>(
-  'TransactionSampleRate',
-  t.number.is,
-  (input, context) => {
-    const value = parseFloat(input as string);
-    return value >= 0 && value <= 1 && parseFloat(value.toFixed(3)) === value
-      ? t.success(value)
-      : t.failure(input, context);
-  },
-  t.identity
-);
diff --git a/x-pack/plugins/apm/server/lib/helpers/create_or_update_index.ts b/x-pack/plugins/apm/server/lib/helpers/create_or_update_index.ts
index cc01c990bf985..91a595c0900be 100644
--- a/x-pack/plugins/apm/server/lib/helpers/create_or_update_index.ts
+++ b/x-pack/plugins/apm/server/lib/helpers/create_or_update_index.ts
@@ -9,8 +9,9 @@ import { CallCluster } from 'src/legacy/core_plugins/elasticsearch';
 
 export type Mappings =
   | {
-      dynamic?: boolean;
+      dynamic?: boolean | 'strict';
       properties: Record<string, Mappings>;
+      dynamic_templates?: any[];
     }
   | {
       type: string;
diff --git a/x-pack/plugins/apm/server/lib/settings/agent_configuration/convert_settings_to_string.ts b/x-pack/plugins/apm/server/lib/settings/agent_configuration/convert_settings_to_string.ts
new file mode 100644
index 0000000000000..ab01a68733a7a
--- /dev/null
+++ b/x-pack/plugins/apm/server/lib/settings/agent_configuration/convert_settings_to_string.ts
@@ -0,0 +1,26 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { ESSearchHit } from '../../../../typings/elasticsearch';
+import { AgentConfiguration } from '../../../../common/agent_configuration/configuration_types';
+
+// needed for backwards compatability
+// All settings except `transaction_sample_rate` and `transaction_max_spans` are stored as strings (they are stored as float and integer respectively)
+export function convertConfigSettingsToString(
+  hit: ESSearchHit<AgentConfiguration>
+) {
+  const config = hit._source;
+
+  if (config.settings?.transaction_sample_rate) {
+    config.settings.transaction_sample_rate = config.settings.transaction_sample_rate.toString();
+  }
+
+  if (config.settings?.transaction_max_spans) {
+    config.settings.transaction_max_spans = config.settings.transaction_max_spans.toString();
+  }
+
+  return hit;
+}
diff --git a/x-pack/plugins/apm/server/lib/settings/agent_configuration/create_agent_config_index.ts b/x-pack/plugins/apm/server/lib/settings/agent_configuration/create_agent_config_index.ts
index bc03138e0c247..b2dc22ceb2918 100644
--- a/x-pack/plugins/apm/server/lib/settings/agent_configuration/create_agent_config_index.ts
+++ b/x-pack/plugins/apm/server/lib/settings/agent_configuration/create_agent_config_index.ts
@@ -26,6 +26,19 @@ export async function createApmAgentConfigurationIndex({
 }
 
 const mappings: Mappings = {
+  dynamic: 'strict',
+  dynamic_templates: [
+    {
+      // force string to keyword (instead of default of text + keyword)
+      strings: {
+        match_mapping_type: 'string',
+        mapping: {
+          type: 'keyword',
+          ignore_above: 1024
+        }
+      }
+    }
+  ],
   properties: {
     '@timestamp': {
       type: 'date'
@@ -43,21 +56,9 @@ const mappings: Mappings = {
       }
     },
     settings: {
-      properties: {
-        transaction_sample_rate: {
-          type: 'scaled_float',
-          scaling_factor: 1000,
-          ignore_malformed: true,
-          coerce: false
-        },
-        capture_body: {
-          type: 'keyword',
-          ignore_above: 1024
-        },
-        transaction_max_spans: {
-          type: 'short'
-        }
-      }
+      // allowing dynamic fields without specifying anything specific
+      dynamic: true,
+      properties: {}
     },
     applied_by_agent: {
       type: 'boolean'
diff --git a/x-pack/plugins/apm/server/lib/settings/agent_configuration/create_or_update_configuration.ts b/x-pack/plugins/apm/server/lib/settings/agent_configuration/create_or_update_configuration.ts
index 74fcc61dde863..aa5ddb288b2d7 100644
--- a/x-pack/plugins/apm/server/lib/settings/agent_configuration/create_or_update_configuration.ts
+++ b/x-pack/plugins/apm/server/lib/settings/agent_configuration/create_or_update_configuration.ts
@@ -9,7 +9,7 @@ import { Setup } from '../../helpers/setup_request';
 import {
   AgentConfiguration,
   AgentConfigurationIntake
-} from './configuration_types';
+} from '../../../../common/agent_configuration/configuration_types';
 import { APMIndexDocumentParams } from '../../helpers/es_client';
 
 export async function createOrUpdateConfiguration({
diff --git a/x-pack/plugins/apm/server/lib/settings/agent_configuration/find_exact_configuration.ts b/x-pack/plugins/apm/server/lib/settings/agent_configuration/find_exact_configuration.ts
index eea409882f876..e3455cdbc5a1c 100644
--- a/x-pack/plugins/apm/server/lib/settings/agent_configuration/find_exact_configuration.ts
+++ b/x-pack/plugins/apm/server/lib/settings/agent_configuration/find_exact_configuration.ts
@@ -9,8 +9,9 @@ import {
   SERVICE_ENVIRONMENT
 } from '../../../../common/elasticsearch_fieldnames';
 import { Setup } from '../../helpers/setup_request';
-import { AgentConfiguration } from './configuration_types';
+import { AgentConfiguration } from '../../../../common/agent_configuration/configuration_types';
 import { ESSearchHit } from '../../../../typings/elasticsearch';
+import { convertConfigSettingsToString } from './convert_settings_to_string';
 
 export async function findExactConfiguration({
   service,
@@ -42,5 +43,11 @@ export async function findExactConfiguration({
     params
   );
 
-  return resp.hits.hits[0] as ESSearchHit<AgentConfiguration> | undefined;
+  const hit = resp.hits.hits[0] as ESSearchHit<AgentConfiguration> | undefined;
+
+  if (!hit) {
+    return;
+  }
+
+  return convertConfigSettingsToString(hit);
 }
diff --git a/x-pack/plugins/apm/server/lib/settings/agent_configuration/get_environments/get_all_environments.ts b/x-pack/plugins/apm/server/lib/settings/agent_configuration/get_environments/get_all_environments.ts
index 52a3422f8e6b7..a70f7965d0e59 100644
--- a/x-pack/plugins/apm/server/lib/settings/agent_configuration/get_environments/get_all_environments.ts
+++ b/x-pack/plugins/apm/server/lib/settings/agent_configuration/get_environments/get_all_environments.ts
@@ -10,7 +10,7 @@ import {
   SERVICE_NAME,
   SERVICE_ENVIRONMENT
 } from '../../../../../common/elasticsearch_fieldnames';
-import { ALL_OPTION_VALUE } from '../../../../../common/agent_configuration_constants';
+import { ALL_OPTION_VALUE } from '../../../../../common/agent_configuration/all_option';
 
 export async function getAllEnvironments({
   serviceName,
diff --git a/x-pack/plugins/apm/server/lib/settings/agent_configuration/get_environments/get_existing_environments_for_service.ts b/x-pack/plugins/apm/server/lib/settings/agent_configuration/get_environments/get_existing_environments_for_service.ts
index f54217461510f..754c698af8753 100644
--- a/x-pack/plugins/apm/server/lib/settings/agent_configuration/get_environments/get_existing_environments_for_service.ts
+++ b/x-pack/plugins/apm/server/lib/settings/agent_configuration/get_environments/get_existing_environments_for_service.ts
@@ -9,7 +9,7 @@ import {
   SERVICE_NAME,
   SERVICE_ENVIRONMENT
 } from '../../../../../common/elasticsearch_fieldnames';
-import { ALL_OPTION_VALUE } from '../../../../../common/agent_configuration_constants';
+import { ALL_OPTION_VALUE } from '../../../../../common/agent_configuration/all_option';
 
 export async function getExistingEnvironmentsForService({
   serviceName,
diff --git a/x-pack/plugins/apm/server/lib/settings/agent_configuration/get_service_names.ts b/x-pack/plugins/apm/server/lib/settings/agent_configuration/get_service_names.ts
index 9b9acbb1e0ad5..352bbe1b6a294 100644
--- a/x-pack/plugins/apm/server/lib/settings/agent_configuration/get_service_names.ts
+++ b/x-pack/plugins/apm/server/lib/settings/agent_configuration/get_service_names.ts
@@ -10,7 +10,7 @@ import {
   PROCESSOR_EVENT,
   SERVICE_NAME
 } from '../../../../common/elasticsearch_fieldnames';
-import { ALL_OPTION_VALUE } from '../../../../common/agent_configuration_constants';
+import { ALL_OPTION_VALUE } from '../../../../common/agent_configuration/all_option';
 
 export type AgentConfigurationServicesAPIResponse = PromiseReturnType<
   typeof getServiceNames
diff --git a/x-pack/plugins/apm/server/lib/settings/agent_configuration/list_configurations.ts b/x-pack/plugins/apm/server/lib/settings/agent_configuration/list_configurations.ts
index 585de740bc88d..c44d7b41f532b 100644
--- a/x-pack/plugins/apm/server/lib/settings/agent_configuration/list_configurations.ts
+++ b/x-pack/plugins/apm/server/lib/settings/agent_configuration/list_configurations.ts
@@ -6,7 +6,8 @@
 
 import { PromiseReturnType } from '../../../../typings/common';
 import { Setup } from '../../helpers/setup_request';
-import { AgentConfiguration } from './configuration_types';
+import { AgentConfiguration } from '../../../../common/agent_configuration/configuration_types';
+import { convertConfigSettingsToString } from './convert_settings_to_string';
 
 export type AgentConfigurationListAPIResponse = PromiseReturnType<
   typeof listConfigurations
@@ -20,8 +21,7 @@ export async function listConfigurations({ setup }: { setup: Setup }) {
   };
 
   const resp = await internalClient.search<AgentConfiguration>(params);
-  return resp.hits.hits.map(item => ({
-    id: item._id,
-    ...item._source
-  }));
+  return resp.hits.hits
+    .map(convertConfigSettingsToString)
+    .map(hit => hit._source);
 }
diff --git a/x-pack/plugins/apm/server/lib/settings/agent_configuration/mark_applied_by_agent.ts b/x-pack/plugins/apm/server/lib/settings/agent_configuration/mark_applied_by_agent.ts
index b6aecd1d7f0ca..5157c94a74768 100644
--- a/x-pack/plugins/apm/server/lib/settings/agent_configuration/mark_applied_by_agent.ts
+++ b/x-pack/plugins/apm/server/lib/settings/agent_configuration/mark_applied_by_agent.ts
@@ -5,7 +5,7 @@
  */
 
 import { Setup } from '../../helpers/setup_request';
-import { AgentConfiguration } from './configuration_types';
+import { AgentConfiguration } from '../../../../common/agent_configuration/configuration_types';
 
 export async function markAppliedByAgent({
   id,
diff --git a/x-pack/plugins/apm/server/lib/settings/agent_configuration/search_configurations.ts b/x-pack/plugins/apm/server/lib/settings/agent_configuration/search_configurations.ts
index 9bbdc96a3a797..fa38e8fabfb69 100644
--- a/x-pack/plugins/apm/server/lib/settings/agent_configuration/search_configurations.ts
+++ b/x-pack/plugins/apm/server/lib/settings/agent_configuration/search_configurations.ts
@@ -9,7 +9,8 @@ import {
   SERVICE_ENVIRONMENT
 } from '../../../../common/elasticsearch_fieldnames';
 import { Setup } from '../../helpers/setup_request';
-import { AgentConfiguration } from './configuration_types';
+import { AgentConfiguration } from '../../../../common/agent_configuration/configuration_types';
+import { convertConfigSettingsToString } from './convert_settings_to_string';
 
 export async function searchConfigurations({
   service,
@@ -66,5 +67,11 @@ export async function searchConfigurations({
     params
   );
 
-  return resp.hits.hits[0] as ESSearchHit<AgentConfiguration> | undefined;
+  const hit = resp.hits.hits[0] as ESSearchHit<AgentConfiguration> | undefined;
+
+  if (!hit) {
+    return;
+  }
+
+  return convertConfigSettingsToString(hit);
 }
diff --git a/x-pack/plugins/apm/server/lib/settings/custom_link/create_custom_link_index.ts b/x-pack/plugins/apm/server/lib/settings/custom_link/create_custom_link_index.ts
index 1583e15bdecd5..42b99b34beea7 100644
--- a/x-pack/plugins/apm/server/lib/settings/custom_link/create_custom_link_index.ts
+++ b/x-pack/plugins/apm/server/lib/settings/custom_link/create_custom_link_index.ts
@@ -26,6 +26,7 @@ export const createApmCustomLinkIndex = async ({
 };
 
 const mappings: Mappings = {
+  dynamic: 'strict',
   properties: {
     '@timestamp': {
       type: 'date'
diff --git a/x-pack/plugins/apm/server/routes/create_apm_api.ts b/x-pack/plugins/apm/server/routes/create_apm_api.ts
index 50a794067bfad..57b3f282852c4 100644
--- a/x-pack/plugins/apm/server/routes/create_apm_api.ts
+++ b/x-pack/plugins/apm/server/routes/create_apm_api.ts
@@ -22,6 +22,7 @@ import {
 } from './services';
 import {
   agentConfigurationRoute,
+  getSingleAgentConfigurationRoute,
   agentConfigurationSearchRoute,
   deleteAgentConfigurationRoute,
   listAgentConfigurationEnvironmentsRoute,
@@ -86,6 +87,7 @@ const createApmApi = () => {
     .add(serviceAnnotationsRoute)
 
     // Agent configuration
+    .add(getSingleAgentConfigurationRoute)
     .add(agentConfigurationAgentNameRoute)
     .add(agentConfigurationRoute)
     .add(agentConfigurationSearchRoute)
diff --git a/x-pack/plugins/apm/server/routes/settings/agent_configuration.ts b/x-pack/plugins/apm/server/routes/settings/agent_configuration.ts
index 83b845b1fc436..8cfd736a336c2 100644
--- a/x-pack/plugins/apm/server/routes/settings/agent_configuration.ts
+++ b/x-pack/plugins/apm/server/routes/settings/agent_configuration.ts
@@ -20,7 +20,7 @@ import { markAppliedByAgent } from '../../lib/settings/agent_configuration/mark_
 import {
   serviceRt,
   agentConfigurationIntakeRt
-} from '../../../common/runtime_types/agent_configuration_intake_rt';
+} from '../../../common/agent_configuration/runtime_types/agent_configuration_intake_rt';
 import { jsonRt } from '../../../common/runtime_types/json_rt';
 
 // get list of configurations
@@ -32,6 +32,31 @@ export const agentConfigurationRoute = createRoute(core => ({
   }
 }));
 
+// get a single configuration
+export const getSingleAgentConfigurationRoute = createRoute(() => ({
+  path: '/api/apm/settings/agent-configuration/view',
+  params: {
+    query: serviceRt
+  },
+  handler: async ({ context, request }) => {
+    const setup = await setupRequest(context, request);
+    const { name, environment } = context.params.query;
+
+    const service = { name, environment };
+    const config = await findExactConfiguration({ service, setup });
+
+    if (!config) {
+      context.logger.info(
+        `Config was not found for ${service.name}/${service.environment}`
+      );
+
+      throw Boom.notFound();
+    }
+
+    return config._source;
+  }
+}));
+
 // delete configuration
 export const deleteAgentConfigurationRoute = createRoute(() => ({
   method: 'DELETE',
@@ -68,45 +93,7 @@ export const deleteAgentConfigurationRoute = createRoute(() => ({
   }
 }));
 
-// get list of services
-export const listAgentConfigurationServicesRoute = createRoute(() => ({
-  method: 'GET',
-  path: '/api/apm/settings/agent-configuration/services',
-  handler: async ({ context, request }) => {
-    const setup = await setupRequest(context, request);
-    return await getServiceNames({
-      setup
-    });
-  }
-}));
-
-// get environments for service
-export const listAgentConfigurationEnvironmentsRoute = createRoute(() => ({
-  path: '/api/apm/settings/agent-configuration/environments',
-  params: {
-    query: t.partial({ serviceName: t.string })
-  },
-  handler: async ({ context, request }) => {
-    const setup = await setupRequest(context, request);
-    const { serviceName } = context.params.query;
-    return await getEnvironments({ serviceName, setup });
-  }
-}));
-
-// get agentName for service
-export const agentConfigurationAgentNameRoute = createRoute(() => ({
-  path: '/api/apm/settings/agent-configuration/agent_name',
-  params: {
-    query: t.type({ serviceName: t.string })
-  },
-  handler: async ({ context, request }) => {
-    const setup = await setupRequest(context, request);
-    const { serviceName } = context.params.query;
-    const agentName = await getAgentNameByService({ serviceName, setup });
-    return { agentName };
-  }
-}));
-
+// create/update configuration
 export const createOrUpdateAgentConfigurationRoute = createRoute(() => ({
   method: 'PUT',
   path: '/api/apm/settings/agent-configuration',
@@ -154,10 +141,10 @@ export const agentConfigurationSearchRoute = createRoute(core => ({
   method: 'POST',
   path: '/api/apm/settings/agent-configuration/search',
   params: {
-    body: t.type({
-      service: serviceRt,
-      etag: t.string
-    })
+    body: t.intersection([
+      t.type({ service: serviceRt }),
+      t.partial({ etag: t.string })
+    ])
   },
   handler: async ({ context, request }) => {
     const { service, etag } = context.params.body;
@@ -188,3 +175,46 @@ export const agentConfigurationSearchRoute = createRoute(core => ({
     return config;
   }
 }));
+
+/*
+ * Utility endpoints (not documented as part of the public API)
+ */
+
+// get list of services
+export const listAgentConfigurationServicesRoute = createRoute(() => ({
+  method: 'GET',
+  path: '/api/apm/settings/agent-configuration/services',
+  handler: async ({ context, request }) => {
+    const setup = await setupRequest(context, request);
+    return await getServiceNames({
+      setup
+    });
+  }
+}));
+
+// get environments for service
+export const listAgentConfigurationEnvironmentsRoute = createRoute(() => ({
+  path: '/api/apm/settings/agent-configuration/environments',
+  params: {
+    query: t.partial({ serviceName: t.string })
+  },
+  handler: async ({ context, request }) => {
+    const setup = await setupRequest(context, request);
+    const { serviceName } = context.params.query;
+    return await getEnvironments({ serviceName, setup });
+  }
+}));
+
+// get agentName for service
+export const agentConfigurationAgentNameRoute = createRoute(() => ({
+  path: '/api/apm/settings/agent-configuration/agent_name',
+  params: {
+    query: t.type({ serviceName: t.string })
+  },
+  handler: async ({ context, request }) => {
+    const setup = await setupRequest(context, request);
+    const { serviceName } = context.params.query;
+    const agentName = await getAgentNameByService({ serviceName, setup });
+    return { agentName };
+  }
+}));
diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json
index bec3ffd147964..ce78847a8e8b3 100644
--- a/x-pack/plugins/translations/translations/ja-JP.json
+++ b/x-pack/plugins/translations/translations/ja-JP.json
@@ -3860,48 +3860,6 @@
     "xpack.apm.servicesTable.transactionsPerMinuteColumnLabel": "1 分あたりのトランザクション",
     "xpack.apm.servicesTable.transactionsPerMinuteUnitLabel": "1分あたりトランザクション数",
     "xpack.apm.servicesTable.UpgradeAssistantLink": "Kibana アップグレードアシスタントで詳細をご覧ください",
-    "xpack.apm.settings.agentConf.allOptionLabel": "すべて",
-    "xpack.apm.settings.agentConf.cancelButtonLabel": "キャンセル",
-    "xpack.apm.settings.agentConf.configTable.appliedTooltipMessage": "1 つまたは複数のエージェントにより適用されました。",
-    "xpack.apm.settings.agentConf.configTable.captureBodyColumnLabel": "キャプチャ本文",
-    "xpack.apm.settings.agentConf.configTable.configTable.failurePromptText": "エージェントの構成一覧を取得できませんでした。ユーザーに十分なパーミッションがない可能性があります。",
-    "xpack.apm.settings.agentConf.configTable.createConfigButtonLabel": "構成の作成",
-    "xpack.apm.settings.agentConf.configTable.editButtonDescription": "この構成を編集します",
-    "xpack.apm.settings.agentConf.configTable.editButtonLabel": "編集",
-    "xpack.apm.settings.agentConf.configTable.emptyPromptText": "変更しましょう。直接 Kibana からエージェント構成を微調整できます。再展開する必要はありません。まず、最初の構成を作成します。",
-    "xpack.apm.settings.agentConf.configTable.emptyPromptTitle": "構成が見つかりません。",
-    "xpack.apm.settings.agentConf.configTable.environmentColumnLabel": "サービス環境",
-    "xpack.apm.settings.agentConf.configTable.lastUpdatedColumnLabel": "最終更新",
-    "xpack.apm.settings.agentConf.configTable.notAppliedTooltipMessage": "まだエージェントにより適用されていません",
-    "xpack.apm.settings.agentConf.configTable.sampleRateColumnLabel": "サンプルレート",
-    "xpack.apm.settings.agentConf.configTable.serviceNameColumnLabel": "サービス名",
-    "xpack.apm.settings.agentConf.configTable.transactionMaxSpansColumnLabel": "トランザクションの最大範囲",
-    "xpack.apm.settings.agentConf.configurationsPanelTitle": "構成",
-    "xpack.apm.settings.agentConf.createConfigButtonLabel": "構成の作成",
-    "xpack.apm.settings.agentConf.createConfigTitle": "構成の作成",
-    "xpack.apm.settings.agentConf.editConfigTitle": "構成の編集",
-    "xpack.apm.settings.agentConf.flyout.deleteSection.buttonLabel": "削除",
-    "xpack.apm.settings.agentConf.flyout.deleteSection.deleteConfigFailedText": "{serviceName} の構成を削除中にエラーが発生しました。エラー「{errorMessage}」",
-    "xpack.apm.settings.agentConf.flyout.deleteSection.deleteConfigFailedTitle": "構成を削除できませんでした",
-    "xpack.apm.settings.agentConf.flyout.deleteSection.deleteConfigSucceededText": "「{serviceName}」の構成が正常に削除されました。エージェントに反映されるまでに少し時間がかかります。",
-    "xpack.apm.settings.agentConf.flyout.deleteSection.deleteConfigSucceededTitle": "構成が削除されました",
-    "xpack.apm.settings.agentConf.flyOut.settingsSection.captureBodyInputHelpText": "HTTP リクエストのトランザクションの場合、エージェントはリクエスト本文 (POST 変数など) をキャプチャすることができます。デフォルトは「off」です。",
-    "xpack.apm.settings.agentConf.flyOut.settingsSection.captureBodyInputLabel": "本文をキャプチャ",
-    "xpack.apm.settings.agentConf.flyOut.settingsSection.captureBodyInputPlaceholderText": "オプションを選択",
-    "xpack.apm.settings.agentConf.flyOut.settingsSection.sampleRateConfigurationInputErrorText": "サンプルレートは 0.000 ～ 1 の範囲でなければなりません",
-    "xpack.apm.settings.agentConf.flyOut.settingsSection.sampleRateConfigurationInputHelpText": "0.000 ～ 1.0 の範囲のレートを選択してください。デフォルトは 1.0 (トレースの 100%) です。",
-    "xpack.apm.settings.agentConf.flyOut.settingsSection.sampleRateConfigurationInputLabel": "トランザクションのサンプルレート",
-    "xpack.apm.settings.agentConf.flyOut.settingsSection.sampleRateConfigurationInputPlaceholderText": "サンプルレートを設定",
-    "xpack.apm.settings.agentConf.flyOut.settingsSection.title": "オプション",
-    "xpack.apm.settings.agentConf.flyOut.settingsSection.transactionMaxSpansConfigInputErrorText": "0 と 32000 の間でなければなりません",
-    "xpack.apm.settings.agentConf.flyOut.settingsSection.transactionMaxSpansConfigInputHelpText": "トランザクションごとに記録される範囲を制限します。デフォルトは 500 です。",
-    "xpack.apm.settings.agentConf.flyOut.settingsSection.transactionMaxSpansConfigInputLabel": "トランザクションの最大範囲",
-    "xpack.apm.settings.agentConf.flyOut.settingsSection.transactionMaxSpansConfigInputPlaceholderText": "トランザクションの最大範囲を設定",
-    "xpack.apm.settings.agentConf.saveConfig.failed.text": "「{serviceName}」の構成を保存中にエラーが発生しました。エラー「{errorMessage}」",
-    "xpack.apm.settings.agentConf.saveConfig.failed.title": "構成を保存できませんでした",
-    "xpack.apm.settings.agentConf.saveConfig.succeeded.text": "「{serviceName}」の構成が保存されました。エージェントに反映されるまでに少し時間がかかります。",
-    "xpack.apm.settings.agentConf.saveConfig.succeeded.title": "構成が保存されました",
-    "xpack.apm.settings.agentConf.saveConfigurationButtonLabel": "保存",
     "xpack.apm.settingsLinkLabel": "設定",
     "xpack.apm.setupInstructionsButtonLabel": "セットアップの手順",
     "xpack.apm.stacktraceTab.localVariablesToogleButtonLabel": "ローカル変数",
diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json
index f472247232cb8..d5d0a2f9e7aff 100644
--- a/x-pack/plugins/translations/translations/zh-CN.json
+++ b/x-pack/plugins/translations/translations/zh-CN.json
@@ -3861,48 +3861,6 @@
     "xpack.apm.servicesTable.transactionsPerMinuteColumnLabel": "每分钟事务数",
     "xpack.apm.servicesTable.transactionsPerMinuteUnitLabel": "tpm",
     "xpack.apm.servicesTable.UpgradeAssistantLink": "通过访问 Kibana 升级助手来了解详情",
-    "xpack.apm.settings.agentConf.allOptionLabel": "全部",
-    "xpack.apm.settings.agentConf.cancelButtonLabel": "取消",
-    "xpack.apm.settings.agentConf.configTable.appliedTooltipMessage": "已至少由一个代理应用",
-    "xpack.apm.settings.agentConf.configTable.captureBodyColumnLabel": "捕获正文",
-    "xpack.apm.settings.agentConf.configTable.configTable.failurePromptText": "无法获取代理配置列表。您的用户可能没有足够的权限。",
-    "xpack.apm.settings.agentConf.configTable.createConfigButtonLabel": "创建配置",
-    "xpack.apm.settings.agentConf.configTable.editButtonDescription": "编辑此配置",
-    "xpack.apm.settings.agentConf.configTable.editButtonLabel": "编辑",
-    "xpack.apm.settings.agentConf.configTable.emptyPromptText": "让我们改动一下！可以直接从 Kibana 微调代理配置，无需重新部署。首先创建您的第一个配置。",
-    "xpack.apm.settings.agentConf.configTable.emptyPromptTitle": "未找到任何配置。",
-    "xpack.apm.settings.agentConf.configTable.environmentColumnLabel": "服务环境",
-    "xpack.apm.settings.agentConf.configTable.lastUpdatedColumnLabel": "最后更新时间",
-    "xpack.apm.settings.agentConf.configTable.notAppliedTooltipMessage": "尚未由任何代理应用",
-    "xpack.apm.settings.agentConf.configTable.sampleRateColumnLabel": "采样速率",
-    "xpack.apm.settings.agentConf.configTable.serviceNameColumnLabel": "服务名称",
-    "xpack.apm.settings.agentConf.configTable.transactionMaxSpansColumnLabel": "事务最大跨度数",
-    "xpack.apm.settings.agentConf.configurationsPanelTitle": "代理远程配置",
-    "xpack.apm.settings.agentConf.createConfigButtonLabel": "创建配置",
-    "xpack.apm.settings.agentConf.createConfigTitle": "创建配置",
-    "xpack.apm.settings.agentConf.editConfigTitle": "编辑配置",
-    "xpack.apm.settings.agentConf.flyout.deleteSection.buttonLabel": "删除",
-    "xpack.apm.settings.agentConf.flyout.deleteSection.deleteConfigFailedText": "为“{serviceName}”删除配置时出现问题。错误：“{errorMessage}”",
-    "xpack.apm.settings.agentConf.flyout.deleteSection.deleteConfigFailedTitle": "配置无法删除",
-    "xpack.apm.settings.agentConf.flyout.deleteSection.deleteConfigSucceededText": "您已成功为“{serviceName}”删除配置。将需要一些时间才能传播到代理。",
-    "xpack.apm.settings.agentConf.flyout.deleteSection.deleteConfigSucceededTitle": "配置已删除",
-    "xpack.apm.settings.agentConf.flyOut.settingsSection.captureBodyInputHelpText": "有关属于 HTTP 请求的事务，代理可以选择性地捕获请求正文（例如 POST 变量）。默认为“off”。",
-    "xpack.apm.settings.agentConf.flyOut.settingsSection.captureBodyInputLabel": "捕获正文",
-    "xpack.apm.settings.agentConf.flyOut.settingsSection.captureBodyInputPlaceholderText": "选择选项",
-    "xpack.apm.settings.agentConf.flyOut.settingsSection.sampleRateConfigurationInputErrorText": "采样速率必须介于 0.000 和 1 之间",
-    "xpack.apm.settings.agentConf.flyOut.settingsSection.sampleRateConfigurationInputHelpText": "选择 0.000 和 1.0 之间的速率。默认为 1.0（100% 的跟踪）。",
-    "xpack.apm.settings.agentConf.flyOut.settingsSection.sampleRateConfigurationInputLabel": "事务采样速率",
-    "xpack.apm.settings.agentConf.flyOut.settingsSection.sampleRateConfigurationInputPlaceholderText": "设置采样速率",
-    "xpack.apm.settings.agentConf.flyOut.settingsSection.title": "选项",
-    "xpack.apm.settings.agentConf.flyOut.settingsSection.transactionMaxSpansConfigInputErrorText": "必须介于 0 和 32000 之间",
-    "xpack.apm.settings.agentConf.flyOut.settingsSection.transactionMaxSpansConfigInputHelpText": "限制每个事务记录的跨度数量。默认值为 500。",
-    "xpack.apm.settings.agentConf.flyOut.settingsSection.transactionMaxSpansConfigInputLabel": "事务最大跨度数",
-    "xpack.apm.settings.agentConf.flyOut.settingsSection.transactionMaxSpansConfigInputPlaceholderText": "设置事务最大跨度数",
-    "xpack.apm.settings.agentConf.saveConfig.failed.text": "编辑“{serviceName}”的配置时出现问题。错误：“{errorMessage}”",
-    "xpack.apm.settings.agentConf.saveConfig.failed.title": "配置无法编辑",
-    "xpack.apm.settings.agentConf.saveConfig.succeeded.text": "“{serviceName}”的配置已保存。将需要一些时间才能传播到代理。",
-    "xpack.apm.settings.agentConf.saveConfig.succeeded.title": "配置已保存",
-    "xpack.apm.settings.agentConf.saveConfigurationButtonLabel": "保存",
     "xpack.apm.settingsLinkLabel": "璁剧疆",
     "xpack.apm.setupInstructionsButtonLabel": "设置说明",
     "xpack.apm.stacktraceTab.localVariablesToogleButtonLabel": "本地变量",
diff --git a/x-pack/test/api_integration/apis/apm/agent_configuration.ts b/x-pack/test/api_integration/apis/apm/agent_configuration.ts
index 959a0c97acfa3..8cabac523791c 100644
--- a/x-pack/test/api_integration/apis/apm/agent_configuration.ts
+++ b/x-pack/test/api_integration/apis/apm/agent_configuration.ts
@@ -5,7 +5,7 @@
  */
 
 import expect from '@kbn/expect';
-import { AgentConfigurationIntake } from '../../../../plugins/apm/server/lib/settings/agent_configuration/configuration_types';
+import { AgentConfigurationIntake } from '../../../../plugins/apm/common/agent_configuration/configuration_types';
 import { FtrProviderContext } from '../../ftr_provider_context';
 
 export default function agentConfigurationTests({ getService }: FtrProviderContext) {
@@ -70,7 +70,7 @@ export default function agentConfigurationTests({ getService }: FtrProviderConte
     describe('when creating one configuration', () => {
       const newConfig = {
         service: {},
-        settings: { transaction_sample_rate: 0.55 },
+        settings: { transaction_sample_rate: '0.55' },
       };
 
       const searchParams = {
@@ -86,16 +86,16 @@ export default function agentConfigurationTests({ getService }: FtrProviderConte
         const { statusCode, body } = await searchConfigurations(searchParams);
         expect(statusCode).to.equal(200);
         expect(body._source.service).to.eql({});
-        expect(body._source.settings).to.eql({ transaction_sample_rate: 0.55 });
+        expect(body._source.settings).to.eql({ transaction_sample_rate: '0.55' });
       });
 
       it('can update the created config', async () => {
-        await updateConfiguration({ service: {}, settings: { transaction_sample_rate: 0.85 } });
+        await updateConfiguration({ service: {}, settings: { transaction_sample_rate: '0.85' } });
 
         const { statusCode, body } = await searchConfigurations(searchParams);
         expect(statusCode).to.equal(200);
         expect(body._source.service).to.eql({});
-        expect(body._source.settings).to.eql({ transaction_sample_rate: 0.85 });
+        expect(body._source.settings).to.eql({ transaction_sample_rate: '0.85' });
       });
 
       it('can delete the created config', async () => {
@@ -109,23 +109,23 @@ export default function agentConfigurationTests({ getService }: FtrProviderConte
       const configs = [
         {
           service: {},
-          settings: { transaction_sample_rate: 0.1 },
+          settings: { transaction_sample_rate: '0.1' },
         },
         {
           service: { name: 'my_service' },
-          settings: { transaction_sample_rate: 0.2 },
+          settings: { transaction_sample_rate: '0.2' },
         },
         {
           service: { name: 'my_service', environment: 'development' },
-          settings: { transaction_sample_rate: 0.3 },
+          settings: { transaction_sample_rate: '0.3' },
         },
         {
           service: { environment: 'production' },
-          settings: { transaction_sample_rate: 0.4 },
+          settings: { transaction_sample_rate: '0.4' },
         },
         {
           service: { environment: 'development' },
-          settings: { transaction_sample_rate: 0.5 },
+          settings: { transaction_sample_rate: '0.5' },
         },
       ];
 
@@ -140,27 +140,27 @@ export default function agentConfigurationTests({ getService }: FtrProviderConte
       const agentsRequests = [
         {
           service: { name: 'non_existing_service', environment: 'non_existing_env' },
-          expectedSettings: { transaction_sample_rate: 0.1 },
+          expectedSettings: { transaction_sample_rate: '0.1' },
         },
         {
           service: { name: 'my_service', environment: 'non_existing_env' },
-          expectedSettings: { transaction_sample_rate: 0.2 },
+          expectedSettings: { transaction_sample_rate: '0.2' },
         },
         {
           service: { name: 'my_service', environment: 'production' },
-          expectedSettings: { transaction_sample_rate: 0.2 },
+          expectedSettings: { transaction_sample_rate: '0.2' },
         },
         {
           service: { name: 'my_service', environment: 'development' },
-          expectedSettings: { transaction_sample_rate: 0.3 },
+          expectedSettings: { transaction_sample_rate: '0.3' },
         },
         {
           service: { name: 'non_existing_service', environment: 'production' },
-          expectedSettings: { transaction_sample_rate: 0.4 },
+          expectedSettings: { transaction_sample_rate: '0.4' },
         },
         {
           service: { name: 'non_existing_service', environment: 'development' },
-          expectedSettings: { transaction_sample_rate: 0.5 },
+          expectedSettings: { transaction_sample_rate: '0.5' },
         },
       ];
 
@@ -180,8 +180,9 @@ export default function agentConfigurationTests({ getService }: FtrProviderConte
     describe('when an agent retrieves a configuration', () => {
       const config = {
         service: { name: 'myservice', environment: 'development' },
-        settings: { transaction_sample_rate: 0.9 },
+        settings: { transaction_sample_rate: '0.9' },
       };
+      let etag: string;
 
       before(async () => {
         log.debug('creating agent configuration');
@@ -192,20 +193,27 @@ export default function agentConfigurationTests({ getService }: FtrProviderConte
         await deleteConfiguration(config);
       });
 
-      it(`should have 'applied_by_agent=false' on first request`, async () => {
-        const { body } = await searchConfigurations({
+      it(`should have 'applied_by_agent=false' before supplying etag`, async () => {
+        const res1 = await searchConfigurations({
           service: { name: 'myservice', environment: 'development' },
-          etag: '7312bdcc34999629a3d39df24ed9b2a7553c0c39',
         });
 
-        expect(body._source.applied_by_agent).to.be(false);
+        etag = res1.body._source.etag;
+
+        const res2 = await searchConfigurations({
+          service: { name: 'myservice', environment: 'development' },
+          etag,
+        });
+
+        expect(res1.body._source.applied_by_agent).to.be(false);
+        expect(res2.body._source.applied_by_agent).to.be(false);
       });
 
-      it(`should have 'applied_by_agent=true' on second request`, async () => {
+      it(`should have 'applied_by_agent=true' after supplying etag`, async () => {
         async function getAppliedByAgent() {
           const { body } = await searchConfigurations({
             service: { name: 'myservice', environment: 'development' },
-            etag: '7312bdcc34999629a3d39df24ed9b2a7553c0c39',
+            etag,
           });
 
           return body._source.applied_by_agent;
diff --git a/x-pack/test/api_integration/apis/apm/feature_controls.ts b/x-pack/test/api_integration/apis/apm/feature_controls.ts
index 3c5314d0d3261..afe68f21d9e39 100644
--- a/x-pack/test/api_integration/apis/apm/feature_controls.ts
+++ b/x-pack/test/api_integration/apis/apm/feature_controls.ts
@@ -244,7 +244,7 @@ export default function featureControlsTests({ getService }: FtrProviderContext)
   describe('apm feature controls', () => {
     const config = {
       service: { name: 'test-service' },
-      settings: { transaction_sample_rate: 0.5 },
+      settings: { transaction_sample_rate: '0.5' },
     };
     before(async () => {
       log.info(`Creating agent configuration`);

From ef48205f15130f4dd6251a2c3cdf42000becc472 Mon Sep 17 00:00:00 2001
From: Justin Kambic <justin.kambic@elastic.co>
Date: Mon, 23 Mar 2020 15:18:11 -0400
Subject: [PATCH 033/179] [Uptime] Add configurable page size to monitor list
 (#60573)

* Add configurable page size to monitor list.

* Add functional tests for new feature.

* Update outdated snapshots.

* Extract UI concerns for size select component to dedicated function.

* Add missing props to resolve type check errors.

* Add unit test for new UI functionality.

* Refresh snapshots after additional changes.

* Introduce new parameter to API test function.

* Update flex behavior for new UI component.

* Clean up code in functional page object file.

* Refresh snapshots that were broken by previous feedback implementation.

* Fix async error introduced to test framework by other patch.
---
 .../plugins/uptime/common/graphql/types.ts    |   2 +
 .../__snapshots__/monitor_list.test.tsx.snap  | 160 +++++++++++++-----
 .../monitor_list_pagination.test.tsx.snap     |  70 ++++++--
 .../__tests__/monitor_list.test.tsx           |   6 +
 .../monitor_list_page_size_select.test.tsx    |  45 +++++
 .../monitor_list_pagination.test.tsx          |   4 +
 .../functional/monitor_list/monitor_list.tsx  |  32 ++--
 .../monitor_list_page_size_select.tsx         | 132 +++++++++++++++
 .../monitor_list/overview_page_link.tsx       |   9 +-
 .../plugins/uptime/public/hooks/index.ts      |   2 +-
 .../uptime/public/hooks/use_url_params.ts     |   6 +-
 .../plugins/uptime/public/pages/overview.tsx  |  22 ++-
 .../public/queries/monitor_states_query.ts    |   3 +-
 .../graphql/monitor_states/resolvers.ts       |   3 +-
 .../graphql/monitor_states/schema.gql.ts      |   1 +
 .../server/lib/requests/get_monitor_states.ts |   5 +-
 .../apis/uptime/graphql/monitor_states.ts     |   1 +
 .../api_integration/apis/uptime/rest/index.ts |  11 +-
 .../test/functional/apps/uptime/overview.ts   |  90 +++++++++-
 .../functional/page_objects/uptime_page.ts    |  15 +-
 x-pack/test/functional/services/uptime.ts     |   9 +
 21 files changed, 533 insertions(+), 95 deletions(-)
 create mode 100644 x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/__tests__/monitor_list_page_size_select.test.tsx
 create mode 100644 x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/monitor_list_page_size_select.tsx

diff --git a/x-pack/legacy/plugins/uptime/common/graphql/types.ts b/x-pack/legacy/plugins/uptime/common/graphql/types.ts
index 1a37ce0b18c73..bd017e6cfaf4c 100644
--- a/x-pack/legacy/plugins/uptime/common/graphql/types.ts
+++ b/x-pack/legacy/plugins/uptime/common/graphql/types.ts
@@ -552,6 +552,8 @@ export interface GetMonitorStatesQueryArgs {
   filters?: string | null;
 
   statusFilter?: string | null;
+
+  pageSize: number;
 }
 
 // ====================================================
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 5f1d790430bdd..2b8bc0bb06ddf 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
@@ -80,25 +80,42 @@ exports[`MonitorList component renders a no items message when no data is provid
       size="m"
     />
     <EuiFlexGroup
+      justifyContent="spaceBetween"
       responsive={false}
     >
       <EuiFlexItem
         grow={false}
       >
-        <OverviewPageLink
-          dataTestSubj="xpack.uptime.monitorList.prevButton"
-          direction="prev"
-          pagination=""
+        <MonitorListPageSizeSelect
+          setSize={[MockFunction]}
+          size={25}
         />
       </EuiFlexItem>
       <EuiFlexItem
         grow={false}
       >
-        <OverviewPageLink
-          dataTestSubj="xpack.uptime.monitorList.nextButton"
-          direction="next"
-          pagination=""
-        />
+        <EuiFlexGroup
+          responsive={false}
+        >
+          <EuiFlexItem
+            grow={false}
+          >
+            <OverviewPageLink
+              dataTestSubj="xpack.uptime.monitorList.prevButton"
+              direction="prev"
+              pagination=""
+            />
+          </EuiFlexItem>
+          <EuiFlexItem
+            grow={false}
+          >
+            <OverviewPageLink
+              dataTestSubj="xpack.uptime.monitorList.nextButton"
+              direction="next"
+              pagination=""
+            />
+          </EuiFlexItem>
+        </EuiFlexGroup>
       </EuiFlexItem>
     </EuiFlexGroup>
   </EuiPanel>
@@ -110,6 +127,10 @@ exports[`MonitorList component renders the monitor list 1`] = `
   padding-left: 17px;
 }
 
+.c3 {
+  padding-top: 12px;
+}
+
 .c2 {
   white-space: nowrap;
   overflow: hidden;
@@ -570,41 +591,81 @@ exports[`MonitorList component renders the monitor list 1`] = `
     class="euiSpacer euiSpacer--m"
   />
   <div
-    class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--directionRow"
+    class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--justifyContentSpaceBetween euiFlexGroup--directionRow"
   >
     <div
       class="euiFlexItem euiFlexItem--flexGrowZero"
     >
-      <button
-        aria-label="A disabled pagination button indicating that there cannot be any further navigation in the monitors list."
-        class="euiButtonIcon euiButtonIcon--text"
-        data-test-subj="xpack.uptime.monitorList.prevButton"
-        disabled=""
-        type="button"
+      <div
+        class="euiPopover euiPopover--anchorUpLeft"
       >
         <div
-          aria-hidden="true"
-          class="euiButtonIcon__icon"
-          data-euiicon-type="arrowLeft"
-        />
-      </button>
+          class="euiPopover__anchor"
+        >
+          <button
+            class="euiButtonEmpty euiButtonEmpty--text euiButtonEmpty--iconRight"
+            data-test-subj="xpack.uptime.monitorList.pageSizeSelect.popoverOpen"
+            type="button"
+          >
+            <span
+              class="euiButtonEmpty__content"
+            >
+              <div
+                aria-hidden="true"
+                class="euiButtonEmpty__icon"
+                data-euiicon-type="arrowDown"
+              />
+              <span
+                class="euiButtonEmpty__text"
+              >
+                Rows per page: 25
+              </span>
+            </span>
+          </button>
+        </div>
+      </div>
     </div>
     <div
       class="euiFlexItem euiFlexItem--flexGrowZero"
     >
-      <button
-        aria-label="A disabled pagination button indicating that there cannot be any further navigation in the monitors list."
-        class="euiButtonIcon euiButtonIcon--text"
-        data-test-subj="xpack.uptime.monitorList.nextButton"
-        disabled=""
-        type="button"
+      <div
+        class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--directionRow"
       >
         <div
-          aria-hidden="true"
-          class="euiButtonIcon__icon"
-          data-euiicon-type="arrowRight"
-        />
-      </button>
+          class="euiFlexItem euiFlexItem--flexGrowZero"
+        >
+          <button
+            aria-label="A disabled pagination button indicating that there cannot be any further navigation in the monitors list."
+            class="euiButtonIcon euiButtonIcon--text c3"
+            data-test-subj="xpack.uptime.monitorList.prevButton"
+            disabled=""
+            type="button"
+          >
+            <div
+              aria-hidden="true"
+              class="euiButtonIcon__icon"
+              data-euiicon-type="arrowLeft"
+            />
+          </button>
+        </div>
+        <div
+          class="euiFlexItem euiFlexItem--flexGrowZero"
+        >
+          <button
+            aria-label="A disabled pagination button indicating that there cannot be any further navigation in the monitors list."
+            class="euiButtonIcon euiButtonIcon--text c3"
+            data-test-subj="xpack.uptime.monitorList.nextButton"
+            disabled=""
+            type="button"
+          >
+            <div
+              aria-hidden="true"
+              class="euiButtonIcon__icon"
+              data-euiicon-type="arrowRight"
+            />
+          </button>
+        </div>
+      </div>
     </div>
   </div>
 </div>
@@ -752,25 +813,42 @@ exports[`MonitorList component shallow renders the monitor list 1`] = `
       size="m"
     />
     <EuiFlexGroup
+      justifyContent="spaceBetween"
       responsive={false}
     >
       <EuiFlexItem
         grow={false}
       >
-        <OverviewPageLink
-          dataTestSubj="xpack.uptime.monitorList.prevButton"
-          direction="prev"
-          pagination=""
+        <MonitorListPageSizeSelect
+          setSize={[MockFunction]}
+          size={25}
         />
       </EuiFlexItem>
       <EuiFlexItem
         grow={false}
       >
-        <OverviewPageLink
-          dataTestSubj="xpack.uptime.monitorList.nextButton"
-          direction="next"
-          pagination=""
-        />
+        <EuiFlexGroup
+          responsive={false}
+        >
+          <EuiFlexItem
+            grow={false}
+          >
+            <OverviewPageLink
+              dataTestSubj="xpack.uptime.monitorList.prevButton"
+              direction="prev"
+              pagination=""
+            />
+          </EuiFlexItem>
+          <EuiFlexItem
+            grow={false}
+          >
+            <OverviewPageLink
+              dataTestSubj="xpack.uptime.monitorList.nextButton"
+              direction="next"
+              pagination=""
+            />
+          </EuiFlexItem>
+        </EuiFlexGroup>
       </EuiFlexItem>
     </EuiFlexGroup>
   </EuiPanel>
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/__tests__/__snapshots__/monitor_list_pagination.test.tsx.snap b/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/__tests__/__snapshots__/monitor_list_pagination.test.tsx.snap
index 29ab7a8455fe6..db5bfa72deb36 100644
--- a/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/__tests__/__snapshots__/monitor_list_pagination.test.tsx.snap
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/__tests__/__snapshots__/monitor_list_pagination.test.tsx.snap
@@ -80,25 +80,42 @@ exports[`MonitorListPagination component renders a no items message when no data
       size="m"
     />
     <EuiFlexGroup
+      justifyContent="spaceBetween"
       responsive={false}
     >
       <EuiFlexItem
         grow={false}
       >
-        <OverviewPageLink
-          dataTestSubj="xpack.uptime.monitorList.prevButton"
-          direction="prev"
-          pagination=""
+        <MonitorListPageSizeSelect
+          setSize={[MockFunction]}
+          size={25}
         />
       </EuiFlexItem>
       <EuiFlexItem
         grow={false}
       >
-        <OverviewPageLink
-          dataTestSubj="xpack.uptime.monitorList.nextButton"
-          direction="next"
-          pagination=""
-        />
+        <EuiFlexGroup
+          responsive={false}
+        >
+          <EuiFlexItem
+            grow={false}
+          >
+            <OverviewPageLink
+              dataTestSubj="xpack.uptime.monitorList.prevButton"
+              direction="prev"
+              pagination=""
+            />
+          </EuiFlexItem>
+          <EuiFlexItem
+            grow={false}
+          >
+            <OverviewPageLink
+              dataTestSubj="xpack.uptime.monitorList.nextButton"
+              direction="next"
+              pagination=""
+            />
+          </EuiFlexItem>
+        </EuiFlexGroup>
       </EuiFlexItem>
     </EuiFlexGroup>
   </EuiPanel>
@@ -247,25 +264,42 @@ exports[`MonitorListPagination component renders the monitor list 1`] = `
       size="m"
     />
     <EuiFlexGroup
+      justifyContent="spaceBetween"
       responsive={false}
     >
       <EuiFlexItem
         grow={false}
       >
-        <OverviewPageLink
-          dataTestSubj="xpack.uptime.monitorList.prevButton"
-          direction="prev"
-          pagination="{\\"cursorKey\\":{\\"monitor_id\\":123},\\"cursorDirection\\":\\"BEFORE\\",\\"sortOrder\\":\\"ASC\\"}"
+        <MonitorListPageSizeSelect
+          setSize={[MockFunction]}
+          size={25}
         />
       </EuiFlexItem>
       <EuiFlexItem
         grow={false}
       >
-        <OverviewPageLink
-          dataTestSubj="xpack.uptime.monitorList.nextButton"
-          direction="next"
-          pagination="{\\"cursorKey\\":{\\"monitor_id\\":456},\\"cursorDirection\\":\\"AFTER\\",\\"sortOrder\\":\\"ASC\\"}"
-        />
+        <EuiFlexGroup
+          responsive={false}
+        >
+          <EuiFlexItem
+            grow={false}
+          >
+            <OverviewPageLink
+              dataTestSubj="xpack.uptime.monitorList.prevButton"
+              direction="prev"
+              pagination="{\\"cursorKey\\":{\\"monitor_id\\":123},\\"cursorDirection\\":\\"BEFORE\\",\\"sortOrder\\":\\"ASC\\"}"
+            />
+          </EuiFlexItem>
+          <EuiFlexItem
+            grow={false}
+          >
+            <OverviewPageLink
+              dataTestSubj="xpack.uptime.monitorList.nextButton"
+              direction="next"
+              pagination="{\\"cursorKey\\":{\\"monitor_id\\":456},\\"cursorDirection\\":\\"AFTER\\",\\"sortOrder\\":\\"ASC\\"}"
+            />
+          </EuiFlexItem>
+        </EuiFlexGroup>
       </EuiFlexItem>
     </EuiFlexGroup>
   </EuiPanel>
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/__tests__/monitor_list.test.tsx b/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/__tests__/monitor_list.test.tsx
index 5cdd1772a7f24..d2030155d0092 100644
--- a/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/__tests__/monitor_list.test.tsx
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/__tests__/monitor_list.test.tsx
@@ -87,6 +87,8 @@ describe('MonitorList component', () => {
         data={{ monitorStates: result }}
         hasActiveFilters={false}
         loading={false}
+        pageSize={25}
+        setPageSize={jest.fn()}
         successColor="primary"
       />
     );
@@ -101,6 +103,8 @@ describe('MonitorList component', () => {
         data={{}}
         hasActiveFilters={false}
         loading={false}
+        pageSize={25}
+        setPageSize={jest.fn()}
         successColor="primary"
       />
     );
@@ -114,6 +118,8 @@ describe('MonitorList component', () => {
         data={{ monitorStates: result }}
         hasActiveFilters={false}
         loading={false}
+        pageSize={25}
+        setPageSize={jest.fn()}
         successColor="primary"
       />
     );
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/__tests__/monitor_list_page_size_select.test.tsx b/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/__tests__/monitor_list_page_size_select.test.tsx
new file mode 100644
index 0000000000000..0642712d951fe
--- /dev/null
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/__tests__/monitor_list_page_size_select.test.tsx
@@ -0,0 +1,45 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React from 'react';
+import { MonitorListPageSizeSelectComponent } from '../monitor_list_page_size_select';
+import { mountWithIntl } from 'test_utils/enzyme_helpers';
+
+describe('MonitorListPageSizeSelect', () => {
+  it('updates the state when selection changes', () => {
+    const setSize = jest.fn();
+    const setUrlParams = jest.fn();
+    const wrapper = mountWithIntl(
+      <MonitorListPageSizeSelectComponent size={10} setSize={setSize} setUrlParams={setUrlParams} />
+    );
+    wrapper
+      .find('[data-test-subj="xpack.uptime.monitorList.pageSizeSelect.popoverOpen"]')
+      .first()
+      .simulate('click');
+    wrapper
+      .find('[data-test-subj="xpack.uptime.monitorList.pageSizeSelect.sizeSelectItem25"]')
+      .first()
+      .simulate('click');
+    expect(setSize).toHaveBeenCalledTimes(1);
+    expect(setSize.mock.calls).toMatchInlineSnapshot(`
+      Array [
+        Array [
+          25,
+        ],
+      ]
+    `);
+    expect(setUrlParams).toHaveBeenCalledTimes(1);
+    expect(setUrlParams.mock.calls).toMatchInlineSnapshot(`
+      Array [
+        Array [
+          Object {
+            "pagination": undefined,
+          },
+        ],
+      ]
+    `);
+  });
+});
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/__tests__/monitor_list_pagination.test.tsx b/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/__tests__/monitor_list_pagination.test.tsx
index 1aef9281a3066..b08b8b3fabc3e 100644
--- a/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/__tests__/monitor_list_pagination.test.tsx
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/__tests__/monitor_list_pagination.test.tsx
@@ -99,6 +99,8 @@ describe('MonitorListPagination component', () => {
         dangerColor="danger"
         data={{ monitorStates: result }}
         loading={false}
+        pageSize={25}
+        setPageSize={jest.fn()}
         successColor="primary"
         hasActiveFilters={false}
       />
@@ -114,6 +116,8 @@ describe('MonitorListPagination component', () => {
         data={{}}
         loading={false}
         successColor="primary"
+        pageSize={25}
+        setPageSize={jest.fn()}
         hasActiveFilters={false}
       />
     );
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/monitor_list.tsx b/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/monitor_list.tsx
index 58250222e1330..a9fb1ce2f4be1 100644
--- a/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/monitor_list.tsx
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/monitor_list.tsx
@@ -33,6 +33,7 @@ import { MonitorPageLink } from './monitor_page_link';
 import { OverviewPageLink } from './overview_page_link';
 import * as labels from './translations';
 import { MonitorListDrawer } from '../../connected';
+import { MonitorListPageSizeSelect } from './monitor_list_page_size_select';
 
 interface MonitorListQueryResult {
   monitorStates?: MonitorSummaryResult;
@@ -43,6 +44,8 @@ interface MonitorListProps {
   hasActiveFilters: boolean;
   successColor: string;
   linkParameters?: string;
+  pageSize: number;
+  setPageSize: (size: number) => void;
 }
 
 type Props = UptimeGraphQLQueryProps<MonitorListQueryResult> & MonitorListProps;
@@ -185,20 +188,27 @@ export const MonitorListComponent = (props: Props) => {
           columns={columns}
         />
         <EuiSpacer size="m" />
-        <EuiFlexGroup responsive={false}>
+        <EuiFlexGroup justifyContent="spaceBetween" responsive={false}>
           <EuiFlexItem grow={false}>
-            <OverviewPageLink
-              dataTestSubj="xpack.uptime.monitorList.prevButton"
-              direction="prev"
-              pagination={prevPagePagination}
-            />
+            <MonitorListPageSizeSelect size={props.pageSize} setSize={props.setPageSize} />
           </EuiFlexItem>
           <EuiFlexItem grow={false}>
-            <OverviewPageLink
-              dataTestSubj="xpack.uptime.monitorList.nextButton"
-              direction="next"
-              pagination={nextPagePagination}
-            />
+            <EuiFlexGroup responsive={false}>
+              <EuiFlexItem grow={false}>
+                <OverviewPageLink
+                  dataTestSubj="xpack.uptime.monitorList.prevButton"
+                  direction="prev"
+                  pagination={prevPagePagination}
+                />
+              </EuiFlexItem>
+              <EuiFlexItem grow={false}>
+                <OverviewPageLink
+                  dataTestSubj="xpack.uptime.monitorList.nextButton"
+                  direction="next"
+                  pagination={nextPagePagination}
+                />
+              </EuiFlexItem>
+            </EuiFlexGroup>
           </EuiFlexItem>
         </EuiFlexGroup>
       </EuiPanel>
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/monitor_list_page_size_select.tsx b/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/monitor_list_page_size_select.tsx
new file mode 100644
index 0000000000000..abfc1384bb1af
--- /dev/null
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/monitor_list_page_size_select.tsx
@@ -0,0 +1,132 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * 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, EuiContextMenuPanel, EuiContextMenuItem, EuiPopover } from '@elastic/eui';
+import React, { useState, useEffect } from 'react';
+import { FormattedMessage } from '@kbn/i18n/react';
+import { useUrlParams, UpdateUrlParams } from '../../../hooks';
+
+interface PopoverButtonProps {
+  setIsOpen: (isOpen: boolean) => any;
+  size: number;
+}
+
+const PopoverButton: React.FC<PopoverButtonProps> = ({ setIsOpen, size }) => (
+  <EuiButtonEmpty
+    color="text"
+    data-test-subj="xpack.uptime.monitorList.pageSizeSelect.popoverOpen"
+    iconType="arrowDown"
+    iconSide="right"
+    onClick={() => setIsOpen(true)}
+  >
+    <FormattedMessage
+      id="xpack.uptime.monitorList.pageSizePopoverButtonText"
+      defaultMessage="Rows per page: {size}"
+      values={{ size }}
+    />
+  </EuiButtonEmpty>
+);
+
+interface ContextItemProps {
+  'data-test-subj': string;
+  key: string;
+  numRows: number;
+}
+
+const items: ContextItemProps[] = [
+  {
+    'data-test-subj': 'xpack.uptime.monitorList.pageSizeSelect.sizeSelectItem10',
+    key: '10 rows',
+    numRows: 10,
+  },
+  {
+    'data-test-subj': 'xpack.uptime.monitorList.pageSizeSelect.sizeSelectItem25',
+    key: '25 rows',
+    numRows: 25,
+  },
+  {
+    'data-test-subj': 'xpack.uptime.monitorList.pageSizeSelect.sizeSelectItem50',
+    key: '50 rows',
+    numRows: 50,
+  },
+  {
+    'data-test-subj': 'xpack.uptime.monitorList.pageSizeSelect.sizeSelectItem100',
+    key: '100 rows',
+    numRows: 100,
+  },
+];
+
+const LOCAL_STORAGE_KEY = 'xpack.uptime.monitorList.pageSize';
+
+interface MonitorListPageSizeSelectProps {
+  size: number;
+  setSize: (value: number) => void;
+}
+
+/**
+ * This component wraps the underlying UI functionality to make the component more testable.
+ * The features leveraged in this function are tested elsewhere, and are not novel to this component.
+ */
+export const MonitorListPageSizeSelect: React.FC<MonitorListPageSizeSelectProps> = ({
+  size,
+  setSize,
+}) => {
+  const [, setUrlParams] = useUrlParams();
+
+  useEffect(() => {
+    localStorage.setItem(LOCAL_STORAGE_KEY, size.toString());
+  }, [size]);
+
+  return (
+    <MonitorListPageSizeSelectComponent size={size} setSize={setSize} setUrlParams={setUrlParams} />
+  );
+};
+
+interface ComponentProps extends MonitorListPageSizeSelectProps {
+  setUrlParams: UpdateUrlParams;
+}
+
+/**
+ * This function contains the UI functionality for the page select feature. It's agnostic to any
+ * external services/features, and focuses only on providing the UI and handling user interaction.
+ */
+export const MonitorListPageSizeSelectComponent: React.FC<ComponentProps> = ({
+  size,
+  setSize,
+  setUrlParams,
+}) => {
+  const [isOpen, setIsOpen] = useState(false);
+  return (
+    <EuiPopover
+      button={<PopoverButton setIsOpen={value => setIsOpen(value)} size={size} />}
+      isOpen={isOpen}
+      closePopover={() => setIsOpen(false)}
+      anchorPosition="upLeft"
+    >
+      <EuiContextMenuPanel
+        items={items.map(({ 'data-test-subj': dataTestSubj, key, numRows }) => (
+          <EuiContextMenuItem
+            data-test-subj={dataTestSubj}
+            key={key}
+            icon={size === numRows ? 'check' : 'empty'}
+            onClick={() => {
+              setSize(numRows);
+              // reset pagination because the page size has changed
+              setUrlParams({ pagination: undefined });
+              setIsOpen(false);
+            }}
+          >
+            <FormattedMessage
+              id="xpack.uptime.monitorList.pageSizeSelect.numRowsItemMessage"
+              defaultMessage="{numRows} rows"
+              values={{ numRows }}
+            />
+          </EuiContextMenuItem>
+        ))}
+      />
+    </EuiPopover>
+  );
+};
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/overview_page_link.tsx b/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/overview_page_link.tsx
index 9d8f28cdb34c3..f79da4c98dfed 100644
--- a/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/overview_page_link.tsx
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/overview_page_link.tsx
@@ -7,8 +7,13 @@
 import { EuiButtonIcon } from '@elastic/eui';
 import React, { FunctionComponent } from 'react';
 import { i18n } from '@kbn/i18n';
+import styled from 'styled-components';
 import { useUrlParams } from '../../../hooks';
 
+const OverviewPageLinkButtonIcon = styled(EuiButtonIcon)`
+  padding-top: 12px;
+`;
+
 interface OverviewPageLinkProps {
   dataTestSubj: string;
   direction: string;
@@ -38,8 +43,8 @@ export const OverviewPageLink: FunctionComponent<OverviewPageLinkProps> = ({
   });
 
   return (
-    <EuiButtonIcon
-      color={'text'}
+    <OverviewPageLinkButtonIcon
+      color="text"
       onClick={() => {
         updateUrlParams({ pagination });
       }}
diff --git a/x-pack/legacy/plugins/uptime/public/hooks/index.ts b/x-pack/legacy/plugins/uptime/public/hooks/index.ts
index cfb8d71f783a6..e022248df407a 100644
--- a/x-pack/legacy/plugins/uptime/public/hooks/index.ts
+++ b/x-pack/legacy/plugins/uptime/public/hooks/index.ts
@@ -4,6 +4,6 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-export { useUrlParams } from './use_url_params';
+export * from './use_url_params';
 export * from './use_telemetry';
 export * from './update_kuery_string';
diff --git a/x-pack/legacy/plugins/uptime/public/hooks/use_url_params.ts b/x-pack/legacy/plugins/uptime/public/hooks/use_url_params.ts
index dc309943d7cf9..20063b2c1bc93 100644
--- a/x-pack/legacy/plugins/uptime/public/hooks/use_url_params.ts
+++ b/x-pack/legacy/plugins/uptime/public/hooks/use_url_params.ts
@@ -8,8 +8,10 @@ import { parse, stringify } from 'query-string';
 import { useLocation, useHistory } from 'react-router-dom';
 import { UptimeUrlParams, getSupportedUrlParams } from '../lib/helper';
 
-type GetUrlParams = () => UptimeUrlParams;
-type UpdateUrlParams = (updatedParams: { [key: string]: string | number | boolean }) => void;
+export type GetUrlParams = () => UptimeUrlParams;
+export type UpdateUrlParams = (updatedParams: {
+  [key: string]: string | number | boolean | undefined;
+}) => void;
 
 export type UptimeUrlParamsHook = () => [GetUrlParams, UpdateUrlParams];
 
diff --git a/x-pack/legacy/plugins/uptime/public/pages/overview.tsx b/x-pack/legacy/plugins/uptime/public/pages/overview.tsx
index a8a35fd2681b6..943dbd6bd57ba 100644
--- a/x-pack/legacy/plugins/uptime/public/pages/overview.tsx
+++ b/x-pack/legacy/plugins/uptime/public/pages/overview.tsx
@@ -5,7 +5,7 @@
  */
 
 import { EuiFlexGroup, EuiFlexItem, EuiSpacer } from '@elastic/eui';
-import React, { useContext, useEffect } from 'react';
+import React, { useContext, useEffect, useState } from 'react';
 import styled from 'styled-components';
 import { i18n } from '@kbn/i18n';
 import {
@@ -40,9 +40,26 @@ const EuiFlexItemStyled = styled(EuiFlexItem)`
   }
 `;
 
+// TODO: these values belong deeper down in the monitor
+// list pagination control, but are here temporarily until we
+// are done removing GraphQL
+const DEFAULT_PAGE_SIZE = 10;
+const LOCAL_STORAGE_KEY = 'xpack.uptime.monitorList.pageSize';
+const getMonitorListPageSizeValue = () => {
+  const value = parseInt(localStorage.getItem(LOCAL_STORAGE_KEY) ?? '', 10);
+  if (isNaN(value)) {
+    return DEFAULT_PAGE_SIZE;
+  }
+  return value;
+};
+
 export const OverviewPageComponent = ({ autocomplete, indexPattern, setEsKueryFilters }: Props) => {
   const { colors } = useContext(UptimeThemeContext);
   const [getUrlParams] = useUrlParams();
+  // TODO: this is temporary until we migrate the monitor list to our Redux implementation
+  const [monitorListPageSize, setMonitorListPageSize] = useState<number>(
+    getMonitorListPageSizeValue()
+  );
   const { absoluteDateRangeStart, absoluteDateRangeEnd, ...params } = getUrlParams();
   const {
     dateRangeStart,
@@ -106,10 +123,13 @@ export const OverviewPageComponent = ({ autocomplete, indexPattern, setEsKueryFi
           hasActiveFilters={!!esFilters}
           implementsCustomErrorState={true}
           linkParameters={linkParameters}
+          pageSize={monitorListPageSize}
+          setPageSize={setMonitorListPageSize}
           successColor={colors.success}
           variables={{
             ...sharedProps,
             pagination,
+            pageSize: monitorListPageSize,
           }}
         />
       </EmptyState>
diff --git a/x-pack/legacy/plugins/uptime/public/queries/monitor_states_query.ts b/x-pack/legacy/plugins/uptime/public/queries/monitor_states_query.ts
index 9e609786094d5..676e638c239de 100644
--- a/x-pack/legacy/plugins/uptime/public/queries/monitor_states_query.ts
+++ b/x-pack/legacy/plugins/uptime/public/queries/monitor_states_query.ts
@@ -7,13 +7,14 @@
 import gql from 'graphql-tag';
 
 export const monitorStatesQueryString = `
-query MonitorStates($dateRangeStart: String!, $dateRangeEnd: String!, $pagination: String, $filters: String, $statusFilter: String) {
+query MonitorStates($dateRangeStart: String!, $dateRangeEnd: String!, $pagination: String, $filters: String, $statusFilter: String, $pageSize: Int) {
   monitorStates: getMonitorStates(
     dateRangeStart: $dateRangeStart
     dateRangeEnd: $dateRangeEnd
     pagination: $pagination
     filters: $filters
     statusFilter: $statusFilter
+    pageSize: $pageSize
   ) {
     prevPagePagination
     nextPagePagination
diff --git a/x-pack/plugins/uptime/server/graphql/monitor_states/resolvers.ts b/x-pack/plugins/uptime/server/graphql/monitor_states/resolvers.ts
index 08973b217b96c..479c06234ca66 100644
--- a/x-pack/plugins/uptime/server/graphql/monitor_states/resolvers.ts
+++ b/x-pack/plugins/uptime/server/graphql/monitor_states/resolvers.ts
@@ -32,7 +32,7 @@ export const createMonitorStatesResolvers: CreateUMGraphQLResolvers = (
     Query: {
       async getMonitorStates(
         _resolver,
-        { dateRangeStart, dateRangeEnd, filters, pagination, statusFilter },
+        { dateRangeStart, dateRangeEnd, filters, pagination, statusFilter, pageSize },
         { APICaller, savedObjectsClient }
       ): Promise<MonitorSummaryResult> {
         const dynamicSettings = await savedObjectsAdapter.getUptimeDynamicSettings(
@@ -53,6 +53,7 @@ export const createMonitorStatesResolvers: CreateUMGraphQLResolvers = (
             dateRangeStart,
             dateRangeEnd,
             pagination: decodedPagination,
+            pageSize,
             filters,
             // this is added to make typescript happy,
             // this sort of reassignment used to be further downstream but I've moved it here
diff --git a/x-pack/plugins/uptime/server/graphql/monitor_states/schema.gql.ts b/x-pack/plugins/uptime/server/graphql/monitor_states/schema.gql.ts
index d088aed951204..6ab564fdeb532 100644
--- a/x-pack/plugins/uptime/server/graphql/monitor_states/schema.gql.ts
+++ b/x-pack/plugins/uptime/server/graphql/monitor_states/schema.gql.ts
@@ -177,6 +177,7 @@ export const monitorStatesSchema = gql`
       pagination: String
       filters: String
       statusFilter: String
+      pageSize: Int
     ): MonitorSummaryResult
   }
 `;
diff --git a/x-pack/plugins/uptime/server/lib/requests/get_monitor_states.ts b/x-pack/plugins/uptime/server/lib/requests/get_monitor_states.ts
index bfccb34ab94de..d7842d1a0b4aa 100644
--- a/x-pack/plugins/uptime/server/lib/requests/get_monitor_states.ts
+++ b/x-pack/plugins/uptime/server/lib/requests/get_monitor_states.ts
@@ -24,6 +24,7 @@ export interface GetMonitorStatesParams {
   dateRangeStart: string;
   dateRangeEnd: string;
   pagination?: CursorPagination;
+  pageSize: number;
   filters?: string | null;
   statusFilter?: string;
 }
@@ -53,12 +54,12 @@ export const getMonitorStates: UMElasticsearchQueryFn<
   dateRangeStart,
   dateRangeEnd,
   pagination,
+  pageSize,
   filters,
   statusFilter,
 }) => {
   pagination = pagination || CONTEXT_DEFAULTS.CURSOR_PAGINATION;
   statusFilter = statusFilter === null ? undefined : statusFilter;
-  const size = 10;
 
   const queryContext = new QueryContext(
     callES,
@@ -67,7 +68,7 @@ export const getMonitorStates: UMElasticsearchQueryFn<
     dateRangeEnd,
     pagination,
     filters && filters !== '' ? JSON.parse(filters) : null,
-    size,
+    pageSize,
     statusFilter
   );
 
diff --git a/x-pack/test/api_integration/apis/uptime/graphql/monitor_states.ts b/x-pack/test/api_integration/apis/uptime/graphql/monitor_states.ts
index 511cdb6d004fa..a293426195d23 100644
--- a/x-pack/test/api_integration/apis/uptime/graphql/monitor_states.ts
+++ b/x-pack/test/api_integration/apis/uptime/graphql/monitor_states.ts
@@ -22,6 +22,7 @@ export default function({ getService }: FtrProviderContext) {
       variables: {
         dateRangeStart,
         dateRangeEnd,
+        pageSize: 10,
         ...variables,
       },
     };
diff --git a/x-pack/test/api_integration/apis/uptime/rest/index.ts b/x-pack/test/api_integration/apis/uptime/rest/index.ts
index 712a8bc40c41c..b2236e1bb6308 100644
--- a/x-pack/test/api_integration/apis/uptime/rest/index.ts
+++ b/x-pack/test/api_integration/apis/uptime/rest/index.ts
@@ -17,15 +17,20 @@ export default function({ getService, loadTestFile }: FtrProviderContext) {
   describe('uptime REST endpoints', () => {
     beforeEach('clear settings', async () => {
       try {
-        server.savedObjects.delete({
+        await server.savedObjects.delete({
           type: settingsObjectType,
           id: settingsObjectId,
         });
       } catch (e) {
         // a 404 just means the doc is already missing
-        if (e.statuscode !== 404) {
+        if (e.response.status !== 404) {
+          const { status, statusText, data, headers, config } = e.response;
           throw new Error(
-            `error attempting to delete settings (${e.statuscode}): ${JSON.stringify(e)}`
+            `error attempting to delete settings:\n${JSON.stringify(
+              { status, statusText, data, headers, config },
+              null,
+              2
+            )}`
           );
         }
       }
diff --git a/x-pack/test/functional/apps/uptime/overview.ts b/x-pack/test/functional/apps/uptime/overview.ts
index 9a879032fadc1..f3b587b9bc1e2 100644
--- a/x-pack/test/functional/apps/uptime/overview.ts
+++ b/x-pack/test/functional/apps/uptime/overview.ts
@@ -65,10 +65,8 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
         '0018-up',
         '0019-up',
       ]);
-      await retry.tryForTime(12000, async () => {
-        // there should now be pagination data in the URL
-        await pageObjects.uptime.pageUrlContains('pagination');
-      });
+      // there should now be pagination data in the URL
+      await pageObjects.uptime.pageUrlContains('pagination');
       await pageObjects.uptime.setStatusFilter('up');
       await pageObjects.uptime.pageHasExpectedIds([
         '0000-intermittent',
@@ -82,10 +80,86 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
         '0008-up',
         '0009-up',
       ]);
-      await retry.tryForTime(12000, async () => {
-        // ensure that pagination is removed from the URL
-        await pageObjects.uptime.pageUrlContains('pagination', false);
-      });
+      // ensure that pagination is removed from the URL
+      await pageObjects.uptime.pageUrlContains('pagination', false);
+    });
+
+    it('clears pagination parameters when size changes', async () => {
+      await pageObjects.uptime.goToUptimePageAndSetDateRange(DEFAULT_DATE_START, DEFAULT_DATE_END);
+      await pageObjects.uptime.changePage('next');
+      await pageObjects.uptime.pageUrlContains('pagination');
+      await pageObjects.uptime.setMonitorListPageSize(50);
+      // the pagination parameter should be cleared after a size change
+      await pageObjects.uptime.pageUrlContains('pagination', false);
+    });
+
+    it('pagination size updates to reflect current selection', async () => {
+      await pageObjects.uptime.goToUptimePageAndSetDateRange(DEFAULT_DATE_START, DEFAULT_DATE_END);
+      await pageObjects.uptime.pageHasExpectedIds([
+        '0000-intermittent',
+        '0001-up',
+        '0002-up',
+        '0003-up',
+        '0004-up',
+        '0005-up',
+        '0006-up',
+        '0007-up',
+        '0008-up',
+        '0009-up',
+      ]);
+      await pageObjects.uptime.setMonitorListPageSize(50);
+      await pageObjects.uptime.pageHasExpectedIds([
+        '0000-intermittent',
+        '0001-up',
+        '0002-up',
+        '0003-up',
+        '0004-up',
+        '0005-up',
+        '0006-up',
+        '0007-up',
+        '0008-up',
+        '0009-up',
+        '0010-down',
+        '0011-up',
+        '0012-up',
+        '0013-up',
+        '0014-up',
+        '0015-intermittent',
+        '0016-up',
+        '0017-up',
+        '0018-up',
+        '0019-up',
+        '0020-down',
+        '0021-up',
+        '0022-up',
+        '0023-up',
+        '0024-up',
+        '0025-up',
+        '0026-up',
+        '0027-up',
+        '0028-up',
+        '0029-up',
+        '0030-intermittent',
+        '0031-up',
+        '0032-up',
+        '0033-up',
+        '0034-up',
+        '0035-up',
+        '0036-up',
+        '0037-up',
+        '0038-up',
+        '0039-up',
+        '0040-down',
+        '0041-up',
+        '0042-up',
+        '0043-up',
+        '0044-up',
+        '0045-intermittent',
+        '0046-up',
+        '0047-up',
+        '0048-up',
+        '0049-up',
+      ]);
     });
 
     describe('snapshot counts', () => {
diff --git a/x-pack/test/functional/page_objects/uptime_page.ts b/x-pack/test/functional/page_objects/uptime_page.ts
index e18c7d4154728..0b8e994ba8095 100644
--- a/x-pack/test/functional/page_objects/uptime_page.ts
+++ b/x-pack/test/functional/page_objects/uptime_page.ts
@@ -66,12 +66,14 @@ export function UptimePageProvider({ getPageObjects, getService }: FtrProviderCo
       return await uptimeService.pageHasDataMissing();
     }
 
-    public async pageHasExpectedIds(monitorIdsToCheck: string[]) {
-      await Promise.all(monitorIdsToCheck.map(id => uptimeService.monitorPageLinkExists(id)));
+    public async pageHasExpectedIds(monitorIdsToCheck: string[]): Promise<void> {
+      return retry.tryForTime(15000, async () => {
+        await Promise.all(monitorIdsToCheck.map(id => uptimeService.monitorPageLinkExists(id)));
+      });
     }
 
-    public async pageUrlContains(value: string, expected: boolean = true) {
-      await retry.try(async () => {
+    public async pageUrlContains(value: string, expected: boolean = true): Promise<void> {
+      return retry.tryForTime(12000, async () => {
         expect(await uptimeService.urlContains(value)).to.eql(expected);
       });
     }
@@ -144,5 +146,10 @@ export function UptimePageProvider({ getPageObjects, getService }: FtrProviderCo
       await alerts.setLocationsSelectable();
       await alerts.clickSaveAlertButtion();
     }
+
+    public async setMonitorListPageSize(size: number): Promise<void> {
+      await uptimeService.openPageSizeSelectPopover();
+      return uptimeService.clickPageSizeSelectPopoverItem(size);
+    }
   })();
 }
diff --git a/x-pack/test/functional/services/uptime.ts b/x-pack/test/functional/services/uptime.ts
index 57beedc5e0f29..f9902d0142b96 100644
--- a/x-pack/test/functional/services/uptime.ts
+++ b/x-pack/test/functional/services/uptime.ts
@@ -194,5 +194,14 @@ export function UptimeProvider({ getService }: FtrProviderContext) {
         timeout: 3000,
       });
     },
+    async openPageSizeSelectPopover(): Promise<void> {
+      return testSubjects.click('xpack.uptime.monitorList.pageSizeSelect.popoverOpen', 5000);
+    },
+    async clickPageSizeSelectPopoverItem(size: number = 10): Promise<void> {
+      return testSubjects.click(
+        `xpack.uptime.monitorList.pageSizeSelect.sizeSelectItem${size.toString()}`,
+        5000
+      );
+    },
   };
 }

From afca33b5206e1389af18da81a91682904f2b4c79 Mon Sep 17 00:00:00 2001
From: Lee Drengenberg <lee.drengenberg@elastic.co>
Date: Mon, 23 Mar 2020 19:18:35 +0000
Subject: [PATCH 034/179] add relationship test on Saved Objects (#59968)

* just a demo of function to return saved object table elements

* fix esArchive data, extend import objects test case for relationships

* improved data-test-subjs

* update snapshot for jest test

* unskip other half of the tests

* removed commented-out code

* use new findByTestSubject methods

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 .../__snapshots__/relationships.test.js.snap  |  12 ++
 .../components/relationships/relationships.js |  16 ++-
 .../objects_table/components/table/table.js   |   1 +
 .../apps/management/_import_objects.js        | 109 ++++++++----------
 .../es_archiver/management/data.json.gz       | Bin 1295 -> 1297 bytes
 test/functional/page_objects/settings_page.ts |  65 +++++++++--
 6 files changed, 125 insertions(+), 78 deletions(-)

diff --git a/src/legacy/core_plugins/kibana/public/management/sections/objects/components/objects_table/components/relationships/__jest__/__snapshots__/relationships.test.js.snap b/src/legacy/core_plugins/kibana/public/management/sections/objects/components/objects_table/components/relationships/__jest__/__snapshots__/relationships.test.js.snap
index c1241d5d7c1e5..728944f3ccbfe 100644
--- a/src/legacy/core_plugins/kibana/public/management/sections/objects/components/objects_table/components/relationships/__jest__/__snapshots__/relationships.test.js.snap
+++ b/src/legacy/core_plugins/kibana/public/management/sections/objects/components/objects_table/components/relationships/__jest__/__snapshots__/relationships.test.js.snap
@@ -53,6 +53,7 @@ exports[`Relationships should render dashboards normally 1`] = `
               "width": "50px",
             },
             Object {
+              "data-test-subj": "directRelationship",
               "dataType": "string",
               "field": "relationship",
               "name": "Direct relationship",
@@ -72,6 +73,7 @@ exports[`Relationships should render dashboards normally 1`] = `
               "actions": Array [
                 Object {
                   "available": [Function],
+                  "data-test-subj": "relationshipsTableAction-inspect",
                   "description": "Inspect this saved object",
                   "icon": "inspect",
                   "name": "Inspect",
@@ -117,6 +119,7 @@ exports[`Relationships should render dashboards normally 1`] = `
         }
         pagination={true}
         responsive={true}
+        rowProps={[Function]}
         search={
           Object {
             "filters": Array [
@@ -263,6 +266,7 @@ exports[`Relationships should render index patterns normally 1`] = `
               "width": "50px",
             },
             Object {
+              "data-test-subj": "directRelationship",
               "dataType": "string",
               "field": "relationship",
               "name": "Direct relationship",
@@ -282,6 +286,7 @@ exports[`Relationships should render index patterns normally 1`] = `
               "actions": Array [
                 Object {
                   "available": [Function],
+                  "data-test-subj": "relationshipsTableAction-inspect",
                   "description": "Inspect this saved object",
                   "icon": "inspect",
                   "name": "Inspect",
@@ -327,6 +332,7 @@ exports[`Relationships should render index patterns normally 1`] = `
         }
         pagination={true}
         responsive={true}
+        rowProps={[Function]}
         search={
           Object {
             "filters": Array [
@@ -429,6 +435,7 @@ exports[`Relationships should render searches normally 1`] = `
               "width": "50px",
             },
             Object {
+              "data-test-subj": "directRelationship",
               "dataType": "string",
               "field": "relationship",
               "name": "Direct relationship",
@@ -448,6 +455,7 @@ exports[`Relationships should render searches normally 1`] = `
               "actions": Array [
                 Object {
                   "available": [Function],
+                  "data-test-subj": "relationshipsTableAction-inspect",
                   "description": "Inspect this saved object",
                   "icon": "inspect",
                   "name": "Inspect",
@@ -493,6 +501,7 @@ exports[`Relationships should render searches normally 1`] = `
         }
         pagination={true}
         responsive={true}
+        rowProps={[Function]}
         search={
           Object {
             "filters": Array [
@@ -595,6 +604,7 @@ exports[`Relationships should render visualizations normally 1`] = `
               "width": "50px",
             },
             Object {
+              "data-test-subj": "directRelationship",
               "dataType": "string",
               "field": "relationship",
               "name": "Direct relationship",
@@ -614,6 +624,7 @@ exports[`Relationships should render visualizations normally 1`] = `
               "actions": Array [
                 Object {
                   "available": [Function],
+                  "data-test-subj": "relationshipsTableAction-inspect",
                   "description": "Inspect this saved object",
                   "icon": "inspect",
                   "name": "Inspect",
@@ -659,6 +670,7 @@ exports[`Relationships should render visualizations normally 1`] = `
         }
         pagination={true}
         responsive={true}
+        rowProps={[Function]}
         search={
           Object {
             "filters": Array [
diff --git a/src/legacy/core_plugins/kibana/public/management/sections/objects/components/objects_table/components/relationships/relationships.js b/src/legacy/core_plugins/kibana/public/management/sections/objects/components/objects_table/components/relationships/relationships.js
index ee9fb70e31fb2..ce3415ad2f0e7 100644
--- a/src/legacy/core_plugins/kibana/public/management/sections/objects/components/objects_table/components/relationships/relationships.js
+++ b/src/legacy/core_plugins/kibana/public/management/sections/objects/components/objects_table/components/relationships/relationships.js
@@ -135,6 +135,7 @@ export class Relationships extends Component {
                 aria-label={getSavedObjectLabel(type)}
                 type={object.meta.icon || 'apps'}
                 size="s"
+                data-test-subj="relationshipsObjectType"
               />
             </EuiToolTip>
           );
@@ -149,6 +150,7 @@ export class Relationships extends Component {
         dataType: 'string',
         sortable: false,
         width: '125px',
+        'data-test-subj': 'directRelationship',
         render: relationship => {
           if (relationship === 'parent') {
             return (
@@ -187,10 +189,16 @@ export class Relationships extends Component {
           const { path } = object.meta.inAppUrl || {};
           const canGoInApp = this.props.canGoInApp(object);
           if (!canGoInApp) {
-            return <EuiText size="s">{title || getDefaultTitle(object)}</EuiText>;
+            return (
+              <EuiText size="s" data-test-subj="relationshipsTitle">
+                {title || getDefaultTitle(object)}
+              </EuiText>
+            );
           }
           return (
-            <EuiLink href={chrome.addBasePath(path)}>{title || getDefaultTitle(object)}</EuiLink>
+            <EuiLink href={chrome.addBasePath(path)} data-test-subj="relationshipsTitle">
+              {title || getDefaultTitle(object)}
+            </EuiLink>
           );
         },
       },
@@ -211,6 +219,7 @@ export class Relationships extends Component {
             ),
             type: 'icon',
             icon: 'inspect',
+            'data-test-subj': 'relationshipsTableAction-inspect',
             onClick: object => goInspectObject(object),
             available: object => !!object.meta.editUrl,
           },
@@ -295,6 +304,9 @@ export class Relationships extends Component {
           columns={columns}
           pagination={true}
           search={search}
+          rowProps={() => ({
+            'data-test-subj': `relationshipsTableRow`,
+          })}
         />
       </div>
     );
diff --git a/src/legacy/core_plugins/kibana/public/management/sections/objects/components/objects_table/components/table/table.js b/src/legacy/core_plugins/kibana/public/management/sections/objects/components/objects_table/components/table/table.js
index 386b35399b754..5342693113bca 100644
--- a/src/legacy/core_plugins/kibana/public/management/sections/objects/components/objects_table/components/table/table.js
+++ b/src/legacy/core_plugins/kibana/public/management/sections/objects/components/objects_table/components/table/table.js
@@ -186,6 +186,7 @@ export class Table extends PureComponent {
                 aria-label={getSavedObjectLabel(type)}
                 type={object.meta.icon || 'apps'}
                 size="s"
+                data-test-subj="objectType"
               />
             </EuiToolTip>
           );
diff --git a/test/functional/apps/management/_import_objects.js b/test/functional/apps/management/_import_objects.js
index 8aabe42ccc3db..cd39f1cf25ccc 100644
--- a/test/functional/apps/management/_import_objects.js
+++ b/test/functional/apps/management/_import_objects.js
@@ -19,12 +19,14 @@
 
 import expect from '@kbn/expect';
 import path from 'path';
+import { indexBy } from 'lodash';
 
 export default function({ getService, getPageObjects }) {
   const kibanaServer = getService('kibanaServer');
   const esArchiver = getService('esArchiver');
   const PageObjects = getPageObjects(['common', 'settings', 'header']);
   const testSubjects = getService('testSubjects');
+  const log = getService('log');
 
   describe('import objects', function describeIndexTests() {
     describe('.ndjson file', () => {
@@ -33,6 +35,7 @@ export default function({ getService, getPageObjects }) {
         await kibanaServer.uiSettings.replace({});
         await PageObjects.settings.navigateTo();
         await esArchiver.load('management');
+        await PageObjects.settings.clickKibanaSavedObjects();
       });
 
       afterEach(async function() {
@@ -40,20 +43,31 @@ export default function({ getService, getPageObjects }) {
       });
 
       it('should import saved objects', async function() {
-        await PageObjects.settings.clickKibanaSavedObjects();
         await PageObjects.settings.importFile(
           path.join(__dirname, 'exports', '_import_objects.ndjson')
         );
         await PageObjects.settings.checkImportSucceeded();
         await PageObjects.settings.clickImportDone();
-        await PageObjects.settings.waitUntilSavedObjectsTableIsNotLoading();
-        const objects = await PageObjects.settings.getSavedObjectsInTable();
-        const isSavedObjectImported = objects.includes('Log Agents');
-        expect(isSavedObjectImported).to.be(true);
+
+        // get all the elements in the table, and index them by the 'title' visible text field
+        const elements = indexBy(
+          await PageObjects.settings.getSavedObjectElementsInTable(),
+          'title'
+        );
+        log.debug("check that 'Log Agents' is in table as a visualization");
+        expect(elements['Log Agents'].objectType).to.eql('visualization');
+
+        await elements['logstash-*'].relationshipsElement.click();
+        const flyout = indexBy(await PageObjects.settings.getRelationshipFlyout(), 'title');
+        log.debug(
+          "check that 'Shared-Item Visualization AreaChart' shows 'logstash-*' as it's Parent"
+        );
+        expect(flyout['Shared-Item Visualization AreaChart'].relationship).to.eql('Parent');
+        log.debug("check that 'Log Agents' shows 'logstash-*' as it's Parent");
+        expect(flyout['Log Agents'].relationship).to.eql('Parent');
       });
 
       it('should provide dialog to allow the importing of saved objects with index pattern conflicts', async function() {
-        await PageObjects.settings.clickKibanaSavedObjects();
         await PageObjects.settings.importFile(
           path.join(__dirname, 'exports', '_import_objects_conflicts.ndjson')
         );
@@ -65,15 +79,12 @@ export default function({ getService, getPageObjects }) {
         await PageObjects.settings.clickConfirmChanges();
         await PageObjects.header.waitUntilLoadingHasFinished();
         await PageObjects.settings.clickImportDone();
-        await PageObjects.settings.waitUntilSavedObjectsTableIsNotLoading();
         const objects = await PageObjects.settings.getSavedObjectsInTable();
         const isSavedObjectImported = objects.includes('saved object with index pattern conflict');
         expect(isSavedObjectImported).to.be(true);
       });
 
       it('should allow the user to override duplicate saved objects', async function() {
-        await PageObjects.settings.clickKibanaSavedObjects();
-
         // This data has already been loaded by the "visualize" esArchive. We'll load it again
         // so that we can override the existing visualization.
         await PageObjects.settings.importFile(
@@ -93,8 +104,6 @@ export default function({ getService, getPageObjects }) {
       });
 
       it('should allow the user to cancel overriding duplicate saved objects', async function() {
-        await PageObjects.settings.clickKibanaSavedObjects();
-
         // This data has already been loaded by the "visualize" esArchive. We'll load it again
         // so that we can be prompted to override the existing visualization.
         await PageObjects.settings.importFile(
@@ -114,21 +123,17 @@ export default function({ getService, getPageObjects }) {
       });
 
       it('should import saved objects linked to saved searches', async function() {
-        await PageObjects.settings.clickKibanaSavedObjects();
         await PageObjects.settings.importFile(
           path.join(__dirname, 'exports', '_import_objects_saved_search.ndjson')
         );
         await PageObjects.settings.checkImportSucceeded();
         await PageObjects.settings.clickImportDone();
 
-        await PageObjects.settings.navigateTo();
-        await PageObjects.settings.clickKibanaSavedObjects();
         await PageObjects.settings.importFile(
           path.join(__dirname, 'exports', '_import_objects_connected_to_saved_search.ndjson')
         );
         await PageObjects.settings.checkImportSucceeded();
         await PageObjects.settings.clickImportDone();
-        await PageObjects.settings.waitUntilSavedObjectsTableIsNotLoading();
 
         const objects = await PageObjects.settings.getSavedObjectsInTable();
         const isSavedObjectImported = objects.includes('saved object connected to saved search');
@@ -136,14 +141,11 @@ export default function({ getService, getPageObjects }) {
       });
 
       it('should not import saved objects linked to saved searches when saved search does not exist', async function() {
-        await PageObjects.settings.navigateTo();
-        await PageObjects.settings.clickKibanaSavedObjects();
         await PageObjects.settings.importFile(
           path.join(__dirname, 'exports', '_import_objects_connected_to_saved_search.ndjson')
         );
         await PageObjects.settings.checkNoneImported();
         await PageObjects.settings.clickImportDone();
-        await PageObjects.settings.waitUntilSavedObjectsTableIsNotLoading();
 
         const objects = await PageObjects.settings.getSavedObjectsInTable();
         const isSavedObjectImported = objects.includes('saved object connected to saved search');
@@ -151,12 +153,13 @@ export default function({ getService, getPageObjects }) {
       });
 
       it('should not import saved objects linked to saved searches when saved search index pattern does not exist', async function() {
-        await PageObjects.settings.navigateTo();
-        await PageObjects.settings.clickKibanaIndexPatterns();
-        await PageObjects.settings.removeLogstashIndexPatternIfExist();
+        const elements = indexBy(
+          await PageObjects.settings.getSavedObjectElementsInTable(),
+          'title'
+        );
+        await elements['logstash-*'].checkbox.click();
+        await PageObjects.settings.clickSavedObjectsDelete();
 
-        await PageObjects.settings.navigateTo();
-        await PageObjects.settings.clickKibanaSavedObjects();
         await PageObjects.settings.importFile(
           path.join(__dirname, 'exports', '_import_objects_with_saved_search.ndjson')
         );
@@ -164,7 +167,6 @@ export default function({ getService, getPageObjects }) {
         await PageObjects.settings.checkImportConflictsWarning();
         await PageObjects.settings.clickConfirmChanges();
         await PageObjects.settings.clickImportDone();
-        await PageObjects.settings.waitUntilSavedObjectsTableIsNotLoading();
 
         const objects = await PageObjects.settings.getSavedObjectsInTable();
         const isSavedObjectImported = objects.includes('saved object connected to saved search');
@@ -173,14 +175,11 @@ export default function({ getService, getPageObjects }) {
 
       it('should import saved objects with index patterns when index patterns already exists', async () => {
         // First, import the objects
-        await PageObjects.settings.clickKibanaSavedObjects();
         await PageObjects.settings.importFile(
           path.join(__dirname, 'exports', '_import_objects_with_index_patterns.ndjson')
         );
         await PageObjects.settings.checkImportSucceeded();
         await PageObjects.settings.clickImportDone();
-        // Wait for all the saves to happen
-        await PageObjects.settings.waitUntilSavedObjectsTableIsNotLoading();
 
         const objects = await PageObjects.settings.getSavedObjectsInTable();
         const isSavedObjectImported = objects.includes('saved object imported with index pattern');
@@ -189,19 +188,19 @@ export default function({ getService, getPageObjects }) {
 
       it('should import saved objects with index patterns when index patterns does not exists', async () => {
         // First, we need to delete the index pattern
-        await PageObjects.settings.navigateTo();
-        await PageObjects.settings.clickKibanaIndexPatterns();
-        await PageObjects.settings.removeLogstashIndexPatternIfExist();
+        const elements = indexBy(
+          await PageObjects.settings.getSavedObjectElementsInTable(),
+          'title'
+        );
+        await elements['logstash-*'].checkbox.click();
+        await PageObjects.settings.clickSavedObjectsDelete();
 
         // Then, import the objects
-        await PageObjects.settings.clickKibanaSavedObjects();
         await PageObjects.settings.importFile(
           path.join(__dirname, 'exports', '_import_objects_with_index_patterns.ndjson')
         );
         await PageObjects.settings.checkImportSucceeded();
         await PageObjects.settings.clickImportDone();
-        // Wait for all the saves to happen
-        await PageObjects.settings.waitUntilSavedObjectsTableIsNotLoading();
 
         const objects = await PageObjects.settings.getSavedObjectsInTable();
         const isSavedObjectImported = objects.includes('saved object imported with index pattern');
@@ -215,6 +214,7 @@ export default function({ getService, getPageObjects }) {
         await kibanaServer.uiSettings.replace({});
         await PageObjects.settings.navigateTo();
         await esArchiver.load('management');
+        await PageObjects.settings.clickKibanaSavedObjects();
       });
 
       afterEach(async function() {
@@ -222,20 +222,17 @@ export default function({ getService, getPageObjects }) {
       });
 
       it('should import saved objects', async function() {
-        await PageObjects.settings.clickKibanaSavedObjects();
         await PageObjects.settings.importFile(
           path.join(__dirname, 'exports', '_import_objects.json')
         );
         await PageObjects.settings.checkImportSucceeded();
         await PageObjects.settings.clickImportDone();
-        await PageObjects.settings.waitUntilSavedObjectsTableIsNotLoading();
         const objects = await PageObjects.settings.getSavedObjectsInTable();
         const isSavedObjectImported = objects.includes('Log Agents');
         expect(isSavedObjectImported).to.be(true);
       });
 
       it('should provide dialog to allow the importing of saved objects with index pattern conflicts', async function() {
-        await PageObjects.settings.clickKibanaSavedObjects();
         await PageObjects.settings.importFile(
           path.join(__dirname, 'exports', '_import_objects-conflicts.json')
         );
@@ -248,15 +245,12 @@ export default function({ getService, getPageObjects }) {
         await PageObjects.settings.clickConfirmChanges();
         await PageObjects.header.waitUntilLoadingHasFinished();
         await PageObjects.settings.clickImportDone();
-        await PageObjects.settings.waitUntilSavedObjectsTableIsNotLoading();
         const objects = await PageObjects.settings.getSavedObjectsInTable();
         const isSavedObjectImported = objects.includes('saved object with index pattern conflict');
         expect(isSavedObjectImported).to.be(true);
       });
 
       it('should allow the user to override duplicate saved objects', async function() {
-        await PageObjects.settings.clickKibanaSavedObjects();
-
         // This data has already been loaded by the "visualize" esArchive. We'll load it again
         // so that we can override the existing visualization.
         await PageObjects.settings.importFile(
@@ -277,8 +271,6 @@ export default function({ getService, getPageObjects }) {
       });
 
       it('should allow the user to cancel overriding duplicate saved objects', async function() {
-        await PageObjects.settings.clickKibanaSavedObjects();
-
         // This data has already been loaded by the "visualize" esArchive. We'll load it again
         // so that we can be prompted to override the existing visualization.
         await PageObjects.settings.importFile(
@@ -299,21 +291,17 @@ export default function({ getService, getPageObjects }) {
       });
 
       it('should import saved objects linked to saved searches', async function() {
-        await PageObjects.settings.clickKibanaSavedObjects();
         await PageObjects.settings.importFile(
           path.join(__dirname, 'exports', '_import_objects_saved_search.json')
         );
         await PageObjects.settings.checkImportSucceeded();
         await PageObjects.settings.clickImportDone();
 
-        await PageObjects.settings.navigateTo();
-        await PageObjects.settings.clickKibanaSavedObjects();
         await PageObjects.settings.importFile(
           path.join(__dirname, 'exports', '_import_objects_connected_to_saved_search.json')
         );
         await PageObjects.settings.checkImportSucceeded();
         await PageObjects.settings.clickImportDone();
-        await PageObjects.settings.waitUntilSavedObjectsTableIsNotLoading();
 
         const objects = await PageObjects.settings.getSavedObjectsInTable();
         const isSavedObjectImported = objects.includes('saved object connected to saved search');
@@ -321,14 +309,11 @@ export default function({ getService, getPageObjects }) {
       });
 
       it('should not import saved objects linked to saved searches when saved search does not exist', async function() {
-        await PageObjects.settings.navigateTo();
-        await PageObjects.settings.clickKibanaSavedObjects();
         await PageObjects.settings.importFile(
           path.join(__dirname, 'exports', '_import_objects_connected_to_saved_search.json')
         );
         await PageObjects.settings.checkImportFailedWarning();
         await PageObjects.settings.clickImportDone();
-        await PageObjects.settings.waitUntilSavedObjectsTableIsNotLoading();
 
         const objects = await PageObjects.settings.getSavedObjectsInTable();
         const isSavedObjectImported = objects.includes('saved object connected to saved search');
@@ -337,7 +322,6 @@ export default function({ getService, getPageObjects }) {
 
       it('should not import saved objects linked to saved searches when saved search index pattern does not exist', async function() {
         // First, import the saved search
-        await PageObjects.settings.clickKibanaSavedObjects();
         await PageObjects.settings.importFile(
           path.join(__dirname, 'exports', '_import_objects_saved_search.json')
         );
@@ -346,21 +330,21 @@ export default function({ getService, getPageObjects }) {
         await PageObjects.settings.clickImportDone();
 
         // Second, we need to delete the index pattern
-        await PageObjects.settings.navigateTo();
-        await PageObjects.settings.clickKibanaIndexPatterns();
-        await PageObjects.settings.removeLogstashIndexPatternIfExist();
+        const elements = indexBy(
+          await PageObjects.settings.getSavedObjectElementsInTable(),
+          'title'
+        );
+        await elements['logstash-*'].checkbox.click();
+        await PageObjects.settings.clickSavedObjectsDelete();
 
         // Last, import a saved object connected to the saved search
         // This should NOT show the conflicts
-        await PageObjects.settings.navigateTo();
-        await PageObjects.settings.clickKibanaSavedObjects();
         await PageObjects.settings.importFile(
           path.join(__dirname, 'exports', '_import_objects_connected_to_saved_search.json')
         );
         // Wait for all the saves to happen
         await PageObjects.settings.checkNoneImported();
         await PageObjects.settings.clickImportDone();
-        await PageObjects.settings.waitUntilSavedObjectsTableIsNotLoading();
 
         const objects = await PageObjects.settings.getSavedObjectsInTable();
         const isSavedObjectImported = objects.includes('saved object connected to saved search');
@@ -369,14 +353,11 @@ export default function({ getService, getPageObjects }) {
 
       it('should import saved objects with index patterns when index patterns already exists', async () => {
         // First, import the objects
-        await PageObjects.settings.clickKibanaSavedObjects();
         await PageObjects.settings.importFile(
           path.join(__dirname, 'exports', '_import_objects_with_index_patterns.json')
         );
         await PageObjects.settings.checkImportFailedWarning();
         await PageObjects.settings.clickImportDone();
-        // Wait for all the saves to happen
-        await PageObjects.settings.waitUntilSavedObjectsTableIsNotLoading();
 
         const objects = await PageObjects.settings.getSavedObjectsInTable();
         const isSavedObjectImported = objects.includes('saved object imported with index pattern');
@@ -385,19 +366,19 @@ export default function({ getService, getPageObjects }) {
 
       it('should import saved objects with index patterns when index patterns does not exists', async () => {
         // First, we need to delete the index pattern
-        await PageObjects.settings.navigateTo();
-        await PageObjects.settings.clickKibanaIndexPatterns();
-        await PageObjects.settings.removeLogstashIndexPatternIfExist();
+        const elements = indexBy(
+          await PageObjects.settings.getSavedObjectElementsInTable(),
+          'title'
+        );
+        await elements['logstash-*'].checkbox.click();
+        await PageObjects.settings.clickSavedObjectsDelete();
 
         // Then, import the objects
-        await PageObjects.settings.clickKibanaSavedObjects();
         await PageObjects.settings.importFile(
           path.join(__dirname, 'exports', '_import_objects_with_index_patterns.json')
         );
         await PageObjects.settings.checkImportSucceeded();
         await PageObjects.settings.clickImportDone();
-        // Wait for all the saves to happen
-        await PageObjects.settings.waitUntilSavedObjectsTableIsNotLoading();
 
         const objects = await PageObjects.settings.getSavedObjectsInTable();
         const isSavedObjectImported = objects.includes('saved object imported with index pattern');
diff --git a/test/functional/fixtures/es_archiver/management/data.json.gz b/test/functional/fixtures/es_archiver/management/data.json.gz
index e4b8f7e954477592d8715764032c849e6751f9b0..cfb08a5ee3a609048ffa9743b5adc8db2b5cd7a3 100644
GIT binary patch
literal 1297
zcmV+s1@8JEiwFP!000023e8(lZ`(Kwe($dc@-kp(f~LLOVR`B>+yOgm-9rxphNdtS
zi?MZ;El-l0bV2_6QL^mXX@G07pwvTvn6$-Dq(n*-wLKY)#`d9t@q9GqDjlCX!ab9<
zqipd39|d<@QF7Q!DrPO{a=x0uZ|VEl*@T_LyUA<@e@vFki?hl3#l;fdFX0`V{q7qZ
zg)dzb(>t+bC2Q$M)jEBYGuo5UV<2lKKyu?+x!EqpB`aVto-f84R-i#I#-|J44^K2!
zi!$@HRMn+L;u-!osTP$5j*lxQ4Is%2^c1UWM?iS;;pgBTR7>JDV!~^?(>?;0fs=52
z`GGPJ@4p+$*B}`-`cah@flO647X@OPuLZYxRJa-(WPmotOf_2*4wW1jM`_eBo?3=O
zBT1-|&_D%PHmwclsbt1B<UW|PE|y`czq*o`wjz}<w=5&JUIuE4_OkH|AiEaMVK;s!
z9*@(S%s}b}HnG`in<iH54{45oX^oaL&8g>nnls7>o=Sll5!Dbvc&2d2O#sh9WI5%^
zB3Fh|e8JLOlz{WLAdCZ2ly`<u3xX4N{u09-^=hTcs{#t8AL3aI^nE9>c4G5d@rD0F
zae<phP8)rF6Y(gg)-tNCp%E4m$0y$!{XmwDYlGI?dk`AU=Q)TKV=9({iD%@tfxr#l
zNOB8=%1N4p-Vi~b_-qI*<^R<1{B&3xeuZ)!>6#$c0&LJGhC0bayp~Lkv=lhr9O-+p
z_<U;|xyh$)g?0($vVf^l8ht+E+VlFzOe!V9vBaydS5Py=j>cz|0;>2%v=vrDbY}o@
zpfZ&z4K<9*0*s+wG_(mYWui^0$L5iVEw(X~rt+!EIQ<H7q%=AuJ~E>po896&8m~s}
z<y~@{_;@A0*@`$KIN-(!OP*$m&NlsHLF&`&nDWO5c8by2u1j!7x*Z{e)vmVV(@YGR
z!%KH;Wh^Tyva_q@!;=idE1$kLyTT|+(^f(ss!fZh<TK{t!Z^>>s(LAf$*GTs6TwNd
z!pU*!bAJVaNtHfA(dREffK7$&#%+^Ejfj_`3FdD<o_mouZ@dqEb3662{r8eN%??C*
z`in<W(~H|sRqu=C-8lZs70h2@zg*4yV-y*_hLPW~rOJ?L^2ytA;O^Sjy4wN6+I-L5
zow(ob<YfE&YXtYg)J%$>%=v@)b<Q;K$tMfN<XfLJ`JjP)M6P}LErJ%vKvdW7J@Vj^
zLC;mW2KF)dcN*!}>>l{n<-d^HFBlsJ%{WlNbedm#Xn$XSy>hK>yDAVg`g872_~G!Q
z26tRF--f?QJ10AeZ||*tISiF#EhKLWI~zZ<L*7bA>xS<9=5{yku<i~Ghn`hN1FMV<
zYNQs|7Tsjm&t0E+585>9ob{=~_-}$<!V(nwaRuw4$l?4$T+CA{rdeScEf@#)`-hD%
zy-CCQKT1ho)!Czch78L7G%b{}`Dal+&Lls1ne0+(5NcBe1`S;)=>x)$RVd#2OP1cX
zM-Fbrd36Uk`22<GJ8y$-BEyQ+(tiKbC1>ma10140gkEmFNm-V83EQSj5CP1F>Iy!}
zcPWR0wQCtI(mgHiyc-OyoIj0$NiK|4SzC+QYtBGcv^QY-R`C~h4lQB5BGETA2Cc1X
z+-Z&N7oYmP^XB?WA<D!#yw>5)PD3(_W5iw}k%u1aoTf37BMS#zL+kum-(md+f2)(3
H_A~$hxXyvs

literal 1295
zcmV+q1@QVGiwFP!000026U|#uZ`(Eye$THk{8C_ujX2p_)K4jj4d~FO4;cm&aUjs*
zS>i&8DoMpo4gdEYDN2zX15HpP$A<v%oy7ZiM}8!ar|rpTG`0^FjOU{<SLyiF3GSJ!
zon(tY@TcHTD@qQVNyV%MUCviC_&t3;JDad`csrTR;N4`oyf~YjUtBEV{Sw}?*&n{K
zQFzleF})K@R<c%ZRISrTJEJ`tJq4;(0wg!Cm7DEiT(SZd<N0E&VFeoWVtl&r{qRC#
zwJ0+$OI2N36rSP#Ce@;{!13pbNdqYI2ED}U+6fSzeE2bV2Hlc)kC^b-?zE49W#B9v
z-+qt`%=`C-_BBX`jeb<6MIcj^%|(Hj=4-)i9u=+z2N|G^F;mUfghM3<#?cxzjHi*|
z&{z_xBn(gimQ8B|dMcT*jkph{tczus>aXr3rmaXN%q`1^qnCl2V!UiT1IVt0BkYEE
z;$fUNWCl_<u!+M~+cdFae@Jr#OdGV6X-+-o)0|PR;Hebo5m5~xgx?f&+$`WZh%Bev
zS>(!4nlD(IixP0&7KH176y=>E^n&1ooxjB8j(WFJ<y8TN(hu=$2KwAd?48(HE57Bw
zP+Z{Qk<+fezKM98Q)?O3(a;DBiPMuGjlQGG#&tmJojnMH=JOoHjxiNW!NfCi+l9al
z-$-%`gw9Etgx(NAU-)bYt>kBJcz!x84ql<$N4h46y#O1GiJ?w15$`3FBW(qaH%Iy`
z79Y39k(+!<E3{iEmjz6f(#ZLUYmfC&nN&)IYl&Ciub^j$iN<G@0;>2%v=vrDbaw!8
zpfZ&z4K<9*0*s;GG_(mYWui^0$HvIS5!)EbQ2A74oV-H3QW~8SUzyR5&2IA@4XaVJ
zyi0BqU$4YBTM<VD7u+~u$<s{H#ioBPNPU|fQ~vnCNin+EbqVfBk0XSz+TC`1o{1rI
zc<HXKjAcbdc6YUWc#>gw<=fZhR2W5R+Dhm{wQ2E`e8yZ{80WoORWGG5IrSBBA~<PQ
zI5|#z?yn#)snSO%`uqh5u&I!4+%aj?n0P6g5dQY%xi@+9#&hVK+o`wh-<QmJc3{%W
zUp$hUUfhPNdS5K>#_?aSVEzjG<!a_1SCQdkxbi!-R2eEwKKX4Nw7d4P?(2YIZNAs;
zPTb$_<YfE&&j{{?shJc%nB#-_b<Q;K$tMfN<lnw#@<9Xph+6yduLxQo15;hU_r!yb
z40=@M8ra9+pJ}XLvwPrQm;XU(zu?+1XvTp8rqle|L;L&s>y>M5+f{+MTutY3AN21v
zxJ#+|HvF5kGq02Qx0;8;fJoLt@}_*VVUr!|Rzg}gK<78NyK#qTcPQvR-;V~qA06y>
zEv_w+Vb_~oUwIGOG)|lKrNa1kLhr*y6Z>%m>!HcvEJIw(ODd*WVHz(O2lv~DjWE5b
z!TCQ*Nng9!lYNE^%Kl_5l(P9}Q9jNWKSi1B5@!%9Pz5dxx>C~9{!mpY-m)S~@7jw6
zH?O?A104MQh3PvVgKoOQiq+D7`_rXh>;MBCl0Jl9Zhc5umU#=?rWg<b%!cj?Oys+i
zL&4e|ix%mg7k8fQLM!J_SGpt@#;UBXxa>7&AS>GMT>4S*pXD6dsCq{t12h4xt!hZK
z#`cR(ecgHUkxC)T#L-$ytFzOPvf{WdFHy)t4|dMexL%_Q2VEoUSgTJ<{{ycKSPa}W
F000#3i^u=~

diff --git a/test/functional/page_objects/settings_page.ts b/test/functional/page_objects/settings_page.ts
index e0f64340ca7dc..25706fda74925 100644
--- a/test/functional/page_objects/settings_page.ts
+++ b/test/functional/page_objects/settings_page.ts
@@ -47,6 +47,7 @@ export function SettingsPageProvider({ getService, getPageObjects }: FtrProvider
 
     async clickKibanaSavedObjects() {
       await testSubjects.click('objects');
+      await this.waitUntilSavedObjectsTableIsNotLoading();
     }
 
     async clickKibanaIndexPatterns() {
@@ -648,6 +649,7 @@ export function SettingsPageProvider({ getService, getPageObjects }: FtrProvider
 
     async clickImportDone() {
       await testSubjects.click('importSavedObjectsDoneBtn');
+      await this.waitUntilSavedObjectsTableIsNotLoading();
     }
 
     async clickConfirmChanges() {
@@ -681,9 +683,38 @@ export function SettingsPageProvider({ getService, getPageObjects }: FtrProvider
       });
     }
 
+    async getSavedObjectElementsInTable() {
+      const rows = await testSubjects.findAll('~savedObjectsTableRow');
+      return mapAsync(rows, async row => {
+        const checkbox = await row.findByCssSelector('[data-test-subj*="checkboxSelectRow"]');
+        // return the object type aria-label="index patterns"
+        const objectType = await row.findByTestSubject('objectType');
+        const titleElement = await row.findByTestSubject('savedObjectsTableRowTitle');
+        // not all rows have inspect button - Advanced Settings objects don't
+        let inspectElement;
+        const innerHtml = await row.getAttribute('innerHTML');
+        if (innerHtml.includes('Inspect')) {
+          inspectElement = await row.findByTestSubject('savedObjectsTableAction-inspect');
+        } else {
+          inspectElement = null;
+        }
+        const relationshipsElement = await row.findByTestSubject(
+          'savedObjectsTableAction-relationships'
+        );
+        return {
+          checkbox,
+          objectType: await objectType.getAttribute('aria-label'),
+          titleElement,
+          title: await titleElement.getVisibleText(),
+          inspectElement,
+          relationshipsElement,
+        };
+      });
+    }
+
     async getSavedObjectsInTable() {
       const table = await testSubjects.find('savedObjectsTable');
-      const cells = await table.findAllByCssSelector('td:nth-child(3)');
+      const cells = await table.findAllByTestSubject('savedObjectsTableRowTitle');
 
       const objects = [];
       for (const cell of cells) {
@@ -693,6 +724,23 @@ export function SettingsPageProvider({ getService, getPageObjects }: FtrProvider
       return objects;
     }
 
+    async getRelationshipFlyout() {
+      const rows = await testSubjects.findAll('relationshipsTableRow');
+      return mapAsync(rows, async row => {
+        const objectType = await row.findByTestSubject('relationshipsObjectType');
+        const relationship = await row.findByTestSubject('directRelationship');
+        const titleElement = await row.findByTestSubject('relationshipsTitle');
+        const inspectElement = await row.findByTestSubject('relationshipsTableAction-inspect');
+        return {
+          objectType: await objectType.getAttribute('aria-label'),
+          relationship: await relationship.getVisibleText(),
+          titleElement,
+          title: await titleElement.getVisibleText(),
+          inspectElement,
+        };
+      });
+    }
+
     async getSavedObjectsTableSummary() {
       const table = await testSubjects.find('savedObjectsTable');
       const rows = await table.findAllByCssSelector('tbody tr');
@@ -723,17 +771,10 @@ export function SettingsPageProvider({ getService, getPageObjects }: FtrProvider
       return await deleteButton.isEnabled();
     }
 
-    async canSavedObjectBeDeleted(id: string) {
-      const allCheckBoxes = await testSubjects.findAll('checkboxSelectRow*');
-      for (const checkBox of allCheckBoxes) {
-        if (await checkBox.isSelected()) {
-          await checkBox.click();
-        }
-      }
-
-      const checkBox = await testSubjects.find(`checkboxSelectRow-${id}`);
-      await checkBox.click();
-      return await this.canSavedObjectsBeDeleted();
+    async clickSavedObjectsDelete() {
+      await testSubjects.click('savedObjectsManagementDelete');
+      await testSubjects.click('confirmModalConfirmButton');
+      await this.waitUntilSavedObjectsTableIsNotLoading();
     }
   }
 

From 73deba16cc2c57d75f44a1a35b183e5a79736d00 Mon Sep 17 00:00:00 2001
From: Jen Huang <its.jenetic@gmail.com>
Date: Mon, 23 Mar 2020 12:22:26 -0700
Subject: [PATCH 035/179] Ensure that the default datasources use the default
 config's namespace (#60823)

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 .../common/services/package_to_config.test.ts | 25 +++++++++++++++++++
 .../common/services/package_to_config.ts      |  6 ++++-
 .../ingest_manager/server/services/setup.ts   | 18 ++++---------
 3 files changed, 35 insertions(+), 14 deletions(-)

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 5025c9b5288b9..357f407811880 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
@@ -298,6 +298,31 @@ describe('Ingest Manager - packageToConfig', () => {
         },
       });
     });
+    it('returns datasource with namespace and description', () => {
+      expect(
+        packageToConfigDatasource(
+          mockPackage,
+          '1',
+          '2',
+          'ds-1',
+          'mock-namespace',
+          'Test description'
+        )
+      ).toEqual({
+        config_id: '1',
+        enabled: true,
+        inputs: [],
+        name: 'ds-1',
+        namespace: 'mock-namespace',
+        description: 'Test description',
+        output_id: '2',
+        package: {
+          name: 'mock-package',
+          title: 'Mock package',
+          version: '0.0.0',
+        },
+      });
+    });
     it('returns datasource with inputs', () => {
       const mockPackageWithDatasources = ({
         ...mockPackage,
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 8848fa6a9cf48..fa3479a69e39d 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
@@ -88,10 +88,14 @@ export const packageToConfigDatasource = (
   packageInfo: PackageInfo,
   configId: string,
   outputId: string,
-  datasourceName?: string
+  datasourceName?: string,
+  namespace?: string,
+  description?: string
 ): NewDatasource => {
   return {
     name: datasourceName || `${packageInfo.name}-1`,
+    namespace,
+    description,
     package: {
       name: packageInfo.name,
       title: packageInfo.title,
diff --git a/x-pack/plugins/ingest_manager/server/services/setup.ts b/x-pack/plugins/ingest_manager/server/services/setup.ts
index 7311c46320f40..224355ced7cb1 100644
--- a/x-pack/plugins/ingest_manager/server/services/setup.ts
+++ b/x-pack/plugins/ingest_manager/server/services/setup.ts
@@ -11,7 +11,7 @@ import { agentConfigService } from './agent_config';
 import { outputService } from './output';
 import { ensureInstalledDefaultPackages } from './epm/packages/install';
 import {
-  packageToConfigDatasourceInputs,
+  packageToConfigDatasource,
   Datasource,
   AgentConfig,
   Installation,
@@ -122,16 +122,8 @@ async function addPackageToConfig(
     savedObjectsClient: soClient,
     pkgkey: `${packageToInstall.name}-${packageToInstall.version}`,
   });
-  await datasourceService.create(soClient, {
-    name: `${packageInfo.name}-1`,
-    enabled: true,
-    package: {
-      name: packageInfo.name,
-      title: packageInfo.title,
-      version: packageInfo.version,
-    },
-    inputs: packageToConfigDatasourceInputs(packageInfo),
-    config_id: config.id,
-    output_id: defaultOutput.id,
-  });
+  await datasourceService.create(
+    soClient,
+    packageToConfigDatasource(packageInfo, config.id, defaultOutput.id, undefined, config.namespace)
+  );
 }

From d32c4c8390fe7db4c5d0ebad99389be8c90d1d60 Mon Sep 17 00:00:00 2001
From: Nathan Reese <reese.nathan@gmail.com>
Date: Mon, 23 Mar 2020 13:40:24 -0600
Subject: [PATCH 036/179] [Maps] fix point to point source regression (#60930)

* [Maps] fix pew pew regression

* add functional test for pew pew source
---
 .../es_search_source/es_search_source.js      |  5 ++-
 .../maps/public/layers/sources/es_source.js   |  4 +-
 .../functional/apps/maps/es_pew_pew_source.js | 39 +++++++++++++++++++
 x-pack/test/functional/apps/maps/index.js     |  1 +
 4 files changed, 46 insertions(+), 3 deletions(-)
 create mode 100644 x-pack/test/functional/apps/maps/es_pew_pew_source.js

diff --git a/x-pack/legacy/plugins/maps/public/layers/sources/es_search_source/es_search_source.js b/x-pack/legacy/plugins/maps/public/layers/sources/es_search_source/es_search_source.js
index 440b9aa89a945..cd44ef49623fa 100644
--- a/x-pack/legacy/plugins/maps/public/layers/sources/es_search_source/es_search_source.js
+++ b/x-pack/legacy/plugins/maps/public/layers/sources/es_search_source/es_search_source.js
@@ -149,11 +149,14 @@ export class ESSearchSource extends AbstractESSource {
   }
 
   renderSourceSettingsEditor({ onChange }) {
+    const getGeoField = () => {
+      return this._getGeoField();
+    };
     return (
       <UpdateSourceEditor
         source={this}
         indexPatternId={this.getIndexPatternId()}
-        getGeoField={this._getGeoField}
+        getGeoField={getGeoField}
         onChange={onChange}
         tooltipFields={this._tooltipFields}
         sortField={this._descriptor.sortField}
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 8b079b5202f7f..9dc3067a70436 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
@@ -231,7 +231,7 @@ export class AbstractESSource extends AbstractVectorSource {
     }
   }
 
-  _getGeoField = async () => {
+  async _getGeoField() {
     const indexPattern = await this.getIndexPattern();
     const geoField = indexPattern.fields.getByName(this._descriptor.geoField);
     if (!geoField) {
@@ -243,7 +243,7 @@ export class AbstractESSource extends AbstractVectorSource {
       );
     }
     return geoField;
-  };
+  }
 
   async getDisplayName() {
     try {
diff --git a/x-pack/test/functional/apps/maps/es_pew_pew_source.js b/x-pack/test/functional/apps/maps/es_pew_pew_source.js
new file mode 100644
index 0000000000000..45ae1c69640cf
--- /dev/null
+++ b/x-pack/test/functional/apps/maps/es_pew_pew_source.js
@@ -0,0 +1,39 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import expect from '@kbn/expect';
+
+export default function({ getPageObjects, getService }) {
+  const PageObjects = getPageObjects(['maps']);
+  const inspector = getService('inspector');
+
+  const VECTOR_SOURCE_ID = '67c1de2c-2fc5-4425-8983-094b589afe61';
+
+  describe('point to point source', () => {
+    before(async () => {
+      await PageObjects.maps.loadSavedMap('pew pew demo');
+    });
+
+    it('should request source clusters for destination locations', async () => {
+      await inspector.open();
+      await inspector.openInspectorRequestsView();
+      const requestStats = await inspector.getTableData();
+      const hits = PageObjects.maps.getInspectorStatRowHit(requestStats, 'Hits');
+      const totalHits = PageObjects.maps.getInspectorStatRowHit(requestStats, 'Hits (total)');
+      await inspector.close();
+
+      expect(hits).to.equal('0');
+      expect(totalHits).to.equal('4');
+    });
+
+    it('should render lines', async () => {
+      const mapboxStyle = await PageObjects.maps.getMapboxStyle();
+      const features = mapboxStyle.sources[VECTOR_SOURCE_ID].data.features;
+      expect(features.length).to.equal(2);
+      expect(features[0].geometry.type).to.equal('LineString');
+    });
+  });
+}
diff --git a/x-pack/test/functional/apps/maps/index.js b/x-pack/test/functional/apps/maps/index.js
index ae7de986cf867..58c211724b287 100644
--- a/x-pack/test/functional/apps/maps/index.js
+++ b/x-pack/test/functional/apps/maps/index.js
@@ -41,6 +41,7 @@ export default function({ loadTestFile, getService }) {
     describe('', function() {
       this.tags('ciGroup10');
       loadTestFile(require.resolve('./es_geo_grid_source'));
+      loadTestFile(require.resolve('./es_pew_pew_source'));
       loadTestFile(require.resolve('./joins'));
       loadTestFile(require.resolve('./add_layer_panel'));
       loadTestFile(require.resolve('./import_geojson'));

From 88d41fa352552fa63940de39418dd85553c63d20 Mon Sep 17 00:00:00 2001
From: Thomas Neirynck <thomas@elastic.co>
Date: Mon, 23 Mar 2020 16:09:09 -0400
Subject: [PATCH 037/179] [Maps] Remove client-side scaling of ordinal values
 (#58528)

This removes the rescaling of ordinal values to the [0,1] domain, and modifies the creation of the mapbox-style rules to use the actual RangeStyleMeta-data. This is an important prerequisite for Maps handling tile vector sources. For these sources, Maps does not have access to the raw underlying GeoJson and needs to use the stylemeta directly.
---
 .../maps/public/layers/heatmap_layer.js       |   2 +-
 .../maps/public/layers/styles/color_utils.js  |  25 ++-
 .../public/layers/styles/color_utils.test.js  |  22 +--
 .../layers/styles/heatmap/heatmap_style.js    |   7 +-
 .../properties/dynamic_color_property.js      |  80 ++++++----
 .../properties/dynamic_color_property.test.js | 143 +++++++++++-------
 .../properties/dynamic_icon_property.js       |   4 +-
 .../dynamic_orientation_property.js           |   4 -
 .../properties/dynamic_size_property.js       |  51 ++++---
 .../properties/dynamic_style_property.d.ts    |   2 -
 .../properties/dynamic_style_property.js      |  34 +----
 .../properties/dynamic_text_property.js       |   4 -
 .../properties/label_border_size_property.js  |  30 ++--
 .../public/layers/styles/vector/style_util.js |  36 +++--
 .../layers/styles/vector/style_util.test.js   |  28 +---
 .../layers/styles/vector/vector_style.js      |  14 +-
 .../functional/apps/maps/mapbox_styles.js     | 101 +++++++++----
 17 files changed, 335 insertions(+), 252 deletions(-)

diff --git a/x-pack/legacy/plugins/maps/public/layers/heatmap_layer.js b/x-pack/legacy/plugins/maps/public/layers/heatmap_layer.js
index ef78b5afe3a3a..22f7a92c17c51 100644
--- a/x-pack/legacy/plugins/maps/public/layers/heatmap_layer.js
+++ b/x-pack/legacy/plugins/maps/public/layers/heatmap_layer.js
@@ -72,7 +72,7 @@ export class HeatmapLayer extends VectorLayer {
     const propertyKey = this._getPropKeyOfSelectedMetric();
     const dataBoundToMap = AbstractLayer.getBoundDataForSource(mbMap, this.getId());
     if (featureCollection !== dataBoundToMap) {
-      let max = 0;
+      let max = 1; //max will be at least one, since counts or sums will be at least one.
       for (let i = 0; i < featureCollection.features.length; i++) {
         max = Math.max(featureCollection.features[i].properties[propertyKey], max);
       }
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 a619eaba21aef..09c7d76db1691 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
@@ -78,17 +78,26 @@ export function getColorRampCenterColor(colorRampName) {
 
 // Returns an array of color stops
 // [ stop_input_1: number, stop_output_1: color, stop_input_n: number, stop_output_n: color ]
-export function getOrdinalColorRampStops(colorRampName, numberColors = GRADIENT_INTERVALS) {
+export function getOrdinalColorRampStops(colorRampName, min, max) {
   if (!colorRampName) {
     return null;
   }
-  return getHexColorRangeStrings(colorRampName, numberColors).reduce(
-    (accu, stopColor, idx, srcArr) => {
-      const stopNumber = idx / srcArr.length; // number between 0 and 1, increasing as index increases
-      return [...accu, stopNumber, stopColor];
-    },
-    []
-  );
+
+  if (min > max) {
+    return null;
+  }
+
+  const hexColors = getHexColorRangeStrings(colorRampName, GRADIENT_INTERVALS);
+  if (max === min) {
+    //just return single stop value
+    return [max, hexColors[hexColors.length - 1]];
+  }
+
+  const delta = max - min;
+  return hexColors.reduce((accu, stopColor, idx, srcArr) => {
+    const stopNumber = min + (delta * idx) / srcArr.length;
+    return [...accu, stopNumber, stopColor];
+  }, []);
 }
 
 export const COLOR_GRADIENTS = Object.keys(vislibColorMaps).map(colorRampName => ({
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/color_utils.test.js b/x-pack/legacy/plugins/maps/public/layers/styles/color_utils.test.js
index 5a8289ba903f3..9a5ece01d5206 100644
--- a/x-pack/legacy/plugins/maps/public/layers/styles/color_utils.test.js
+++ b/x-pack/legacy/plugins/maps/public/layers/styles/color_utils.test.js
@@ -60,26 +60,30 @@ describe('getColorRampCenterColor', () => {
 });
 
 describe('getColorRampStops', () => {
-  it('Should create color stops for color ramp', () => {
-    expect(getOrdinalColorRampStops('Blues')).toEqual([
+  it('Should create color stops for custom range', () => {
+    expect(getOrdinalColorRampStops('Blues', 0, 1000)).toEqual([
       0,
       '#f7faff',
-      0.125,
+      125,
       '#ddeaf7',
-      0.25,
+      250,
       '#c5daee',
-      0.375,
+      375,
       '#9dc9e0',
-      0.5,
+      500,
       '#6aadd5',
-      0.625,
+      625,
       '#4191c5',
-      0.75,
+      750,
       '#2070b4',
-      0.875,
+      875,
       '#072f6b',
     ]);
   });
+
+  it('Should snap to end of color stops for identical range', () => {
+    expect(getOrdinalColorRampStops('Blues', 23, 23)).toEqual([23, '#072f6b']);
+  });
 });
 
 describe('getLinearGradient', () => {
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/heatmap/heatmap_style.js b/x-pack/legacy/plugins/maps/public/layers/styles/heatmap/heatmap_style.js
index dc3cfc3ffbdb8..d769fe0da9ec2 100644
--- a/x-pack/legacy/plugins/maps/public/layers/styles/heatmap/heatmap_style.js
+++ b/x-pack/legacy/plugins/maps/public/layers/styles/heatmap/heatmap_style.js
@@ -14,6 +14,11 @@ import { getOrdinalColorRampStops } from '../color_utils';
 import { i18n } from '@kbn/i18n';
 import { EuiIcon } from '@elastic/eui';
 
+//The heatmap range chosen hear runs from 0 to 1. It is arbitrary.
+//Weighting is on the raw count/sum values.
+const MIN_RANGE = 0;
+const MAX_RANGE = 1;
+
 export class HeatmapStyle extends AbstractStyle {
   static type = LAYER_STYLE_TYPE.HEATMAP;
 
@@ -80,7 +85,7 @@ export class HeatmapStyle extends AbstractStyle {
 
     const { colorRampName } = this._descriptor;
     if (colorRampName && colorRampName !== DEFAULT_HEATMAP_COLOR_RAMP_NAME) {
-      const colorStops = getOrdinalColorRampStops(colorRampName);
+      const colorStops = getOrdinalColorRampStops(colorRampName, MIN_RANGE, MAX_RANGE);
       mbMap.setPaintProperty(layerId, 'heatmap-color', [
         'interpolate',
         ['linear'],
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/properties/dynamic_color_property.js b/x-pack/legacy/plugins/maps/public/layers/styles/vector/properties/dynamic_color_property.js
index 417426f12fc98..146bc40aa8531 100644
--- a/x-pack/legacy/plugins/maps/public/layers/styles/vector/properties/dynamic_color_property.js
+++ b/x-pack/legacy/plugins/maps/public/layers/styles/vector/properties/dynamic_color_property.js
@@ -5,8 +5,7 @@
  */
 
 import { DynamicStyleProperty } from './dynamic_style_property';
-import _ from 'lodash';
-import { getComputedFieldName, getOtherCategoryLabel } from '../style_util';
+import { getOtherCategoryLabel, makeMbClampedNumberExpression } from '../style_util';
 import { getOrdinalColorRampStops, getColorPalette } from '../../color_utils';
 import { ColorGradient } from '../../components/color_gradient';
 import React from 'react';
@@ -23,6 +22,7 @@ import { COLOR_MAP_TYPE } from '../../../../../common/constants';
 import { isCategoricalStopsInvalid } from '../components/color/color_stops_utils';
 
 const EMPTY_STOPS = { stops: [], defaultColor: null };
+const RGBA_0000 = 'rgba(0,0,0,0)';
 
 export class DynamicColorProperty extends DynamicStyleProperty {
   syncCircleColorWithMb(mbLayerId, mbMap, alpha) {
@@ -70,6 +70,17 @@ export class DynamicColorProperty extends DynamicStyleProperty {
     mbMap.setPaintProperty(mbLayerId, 'text-halo-color', color);
   }
 
+  supportsFieldMeta() {
+    if (!this.isComplete() || !this._field.supportsFieldMeta()) {
+      return false;
+    }
+
+    return (
+      (this.isCategorical() && !this._options.useCustomColorPalette) ||
+      (this.isOrdinal() && !this._options.useCustomColorRamp)
+    );
+  }
+
   isOrdinal() {
     return (
       typeof this._options.type === 'undefined' || this._options.type === COLOR_MAP_TYPE.ORDINAL
@@ -80,28 +91,20 @@ export class DynamicColorProperty extends DynamicStyleProperty {
     return this._options.type === COLOR_MAP_TYPE.CATEGORICAL;
   }
 
-  isCustomOrdinalColorRamp() {
-    return this._options.useCustomColorRamp;
-  }
-
   supportsMbFeatureState() {
     return true;
   }
 
-  isOrdinalScaled() {
-    return this.isOrdinal() && !this.isCustomOrdinalColorRamp();
-  }
-
   isOrdinalRanged() {
-    return this.isOrdinal() && !this.isCustomOrdinalColorRamp();
+    return this.isOrdinal() && !this._options.useCustomColorRamp;
   }
 
   hasOrdinalBreaks() {
-    return (this.isOrdinal() && this.isCustomOrdinalColorRamp()) || this.isCategorical();
+    return (this.isOrdinal() && this._options.useCustomColorRamp) || this.isCategorical();
   }
 
   _getMbColor() {
-    if (!_.get(this._options, 'field.name')) {
+    if (!this._field || !this._field.getName()) {
       return null;
     }
 
@@ -111,7 +114,7 @@ export class DynamicColorProperty extends DynamicStyleProperty {
   }
 
   _getOrdinalColorMbExpression() {
-    const targetName = getComputedFieldName(this._styleName, this._options.field.name);
+    const targetName = this._field.getName();
     if (this._options.useCustomColorRamp) {
       if (!this._options.customColorRamp || !this._options.customColorRamp.length) {
         // custom color ramp config is not complete
@@ -122,27 +125,44 @@ export class DynamicColorProperty extends DynamicStyleProperty {
         return [...accumulatedStops, nextStop.stop, nextStop.color];
       }, []);
       const firstStopValue = colorStops[0];
-      const lessThenFirstStopValue = firstStopValue - 1;
+      const lessThanFirstStopValue = firstStopValue - 1;
       return [
         'step',
-        ['coalesce', ['feature-state', targetName], lessThenFirstStopValue],
-        'rgba(0,0,0,0)', // MB will assign the base value to any features that is below the first stop value
+        ['coalesce', ['feature-state', targetName], lessThanFirstStopValue],
+        RGBA_0000, // MB will assign the base value to any features that is below the first stop value
         ...colorStops,
       ];
-    }
+    } else {
+      const rangeFieldMeta = this.getRangeFieldMeta();
+      if (!rangeFieldMeta) {
+        return null;
+      }
 
-    const colorStops = getOrdinalColorRampStops(this._options.color);
-    if (!colorStops) {
-      return null;
+      const colorStops = getOrdinalColorRampStops(
+        this._options.color,
+        rangeFieldMeta.min,
+        rangeFieldMeta.max
+      );
+      if (!colorStops) {
+        return null;
+      }
+
+      const lessThanFirstStopValue = rangeFieldMeta.min - 1;
+      return [
+        'interpolate',
+        ['linear'],
+        makeMbClampedNumberExpression({
+          minValue: rangeFieldMeta.min,
+          maxValue: rangeFieldMeta.max,
+          lookupFunction: 'feature-state',
+          fallback: lessThanFirstStopValue,
+          fieldName: targetName,
+        }),
+        lessThanFirstStopValue,
+        RGBA_0000,
+        ...colorStops,
+      ];
     }
-    return [
-      'interpolate',
-      ['linear'],
-      ['coalesce', ['feature-state', targetName], -1],
-      -1,
-      'rgba(0,0,0,0)',
-      ...colorStops,
-    ];
   }
 
   _getColorPaletteStops() {
@@ -220,7 +240,7 @@ export class DynamicColorProperty extends DynamicStyleProperty {
     }
 
     mbStops.push(defaultColor); //last color is default color
-    return ['match', ['to-string', ['get', this._options.field.name]], ...mbStops];
+    return ['match', ['to-string', ['get', this._field.getName()]], ...mbStops];
   }
 
   renderRangeLegendHeader() {
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 755fc72d52798..b19c25b369848 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
@@ -75,16 +75,10 @@ class MockLayer {
   }
 }
 
-const makeProperty = options => {
-  return new DynamicColorProperty(
-    options,
-    VECTOR_STYLES.LINE_COLOR,
-    mockField,
-    new MockLayer(),
-    () => {
-      return x => x + '_format';
-    }
-  );
+const makeProperty = (options, field = mockField) => {
+  return new DynamicColorProperty(options, VECTOR_STYLES.LINE_COLOR, field, new MockLayer(), () => {
+    return x => x + '_format';
+  });
 };
 
 const defaultLegendParams = {
@@ -236,7 +230,72 @@ test('Should pluck the categorical style-meta from fieldmeta', async () => {
   });
 });
 
-describe('get mapbox color expression', () => {
+describe('supportsFieldMeta', () => {
+  test('should support it when field does for ordinals', () => {
+    const dynamicStyleOptions = {
+      type: COLOR_MAP_TYPE.ORDINAL,
+    };
+    const styleProp = makeProperty(dynamicStyleOptions);
+
+    expect(styleProp.supportsFieldMeta()).toEqual(true);
+  });
+
+  test('should support it when field does for categories', () => {
+    const dynamicStyleOptions = {
+      type: COLOR_MAP_TYPE.CATEGORICAL,
+    };
+    const styleProp = makeProperty(dynamicStyleOptions);
+
+    expect(styleProp.supportsFieldMeta()).toEqual(true);
+  });
+
+  test('should not support it when field does not', () => {
+    const field = Object.create(mockField);
+    field.supportsFieldMeta = function() {
+      return false;
+    };
+
+    const dynamicStyleOptions = {
+      type: COLOR_MAP_TYPE.ORDINAL,
+    };
+    const styleProp = makeProperty(dynamicStyleOptions, field);
+
+    expect(styleProp.supportsFieldMeta()).toEqual(false);
+  });
+
+  test('should not support it when field config not complete', () => {
+    const dynamicStyleOptions = {
+      type: COLOR_MAP_TYPE.ORDINAL,
+    };
+    const styleProp = makeProperty(dynamicStyleOptions, null);
+
+    expect(styleProp.supportsFieldMeta()).toEqual(false);
+  });
+
+  test('should not support it when using custom ramp for ordinals', () => {
+    const dynamicStyleOptions = {
+      type: COLOR_MAP_TYPE.ORDINAL,
+      useCustomColorRamp: true,
+      customColorRamp: [],
+    };
+    const styleProp = makeProperty(dynamicStyleOptions);
+
+    expect(styleProp.supportsFieldMeta()).toEqual(false);
+  });
+
+  test('should not support it when using custom palette for categories', () => {
+    const dynamicStyleOptions = {
+      type: COLOR_MAP_TYPE.CATEGORICAL,
+      useCustomColorPalette: true,
+      customColorPalette: [],
+    };
+    const styleProp = makeProperty(dynamicStyleOptions);
+
+    expect(styleProp.supportsFieldMeta()).toEqual(false);
+  });
+});
+
+describe('get mapbox color expression (via internal _getMbColor)', () => {
   describe('ordinal color ramp', () => {
     test('should return null when field is not provided', async () => {
       const dynamicStyleOptions = {
@@ -259,44 +318,46 @@ describe('get mapbox color expression', () => {
       test('should return null when color ramp is not provided', async () => {
         const dynamicStyleOptions = {
           type: COLOR_MAP_TYPE.ORDINAL,
-          field: {
-            name: 'myField',
-          },
         };
         const colorProperty = makeProperty(dynamicStyleOptions);
         expect(colorProperty._getMbColor()).toBeNull();
       });
-
       test('should return mapbox expression for color ramp', async () => {
         const dynamicStyleOptions = {
           type: COLOR_MAP_TYPE.ORDINAL,
-          field: {
-            name: 'myField',
-          },
           color: 'Blues',
         };
         const colorProperty = makeProperty(dynamicStyleOptions);
         expect(colorProperty._getMbColor()).toEqual([
           'interpolate',
           ['linear'],
-          ['coalesce', ['feature-state', '__kbn__dynamic__myField__lineColor'], -1],
+          [
+            'coalesce',
+            [
+              'case',
+              ['==', ['feature-state', 'foobar'], null],
+              -1,
+              ['max', ['min', ['to-number', ['feature-state', 'foobar']], 100], 0],
+            ],
+            -1,
+          ],
           -1,
           'rgba(0,0,0,0)',
           0,
           '#f7faff',
-          0.125,
+          12.5,
           '#ddeaf7',
-          0.25,
+          25,
           '#c5daee',
-          0.375,
+          37.5,
           '#9dc9e0',
-          0.5,
+          50,
           '#6aadd5',
-          0.625,
+          62.5,
           '#4191c5',
-          0.75,
+          75,
           '#2070b4',
-          0.875,
+          87.5,
           '#072f6b',
         ]);
       });
@@ -306,9 +367,6 @@ describe('get mapbox color expression', () => {
       test('should return null when customColorRamp is not provided', async () => {
         const dynamicStyleOptions = {
           type: COLOR_MAP_TYPE.ORDINAL,
-          field: {
-            name: 'myField',
-          },
           useCustomColorRamp: true,
         };
         const colorProperty = makeProperty(dynamicStyleOptions);
@@ -318,9 +376,6 @@ describe('get mapbox color expression', () => {
       test('should return null when customColorRamp is empty', async () => {
         const dynamicStyleOptions = {
           type: COLOR_MAP_TYPE.ORDINAL,
-          field: {
-            name: 'myField',
-          },
           useCustomColorRamp: true,
           customColorRamp: [],
         };
@@ -331,9 +386,6 @@ describe('get mapbox color expression', () => {
       test('should return mapbox expression for custom color ramp', async () => {
         const dynamicStyleOptions = {
           type: COLOR_MAP_TYPE.ORDINAL,
-          field: {
-            name: 'myField',
-          },
           useCustomColorRamp: true,
           customColorRamp: [
             { stop: 10, color: '#f7faff' },
@@ -343,7 +395,7 @@ describe('get mapbox color expression', () => {
         const colorProperty = makeProperty(dynamicStyleOptions);
         expect(colorProperty._getMbColor()).toEqual([
           'step',
-          ['coalesce', ['feature-state', '__kbn__dynamic__myField__lineColor'], 9],
+          ['coalesce', ['feature-state', 'foobar'], 9],
           'rgba(0,0,0,0)',
           10,
           '#f7faff',
@@ -376,9 +428,6 @@ describe('get mapbox color expression', () => {
       test('should return null when color palette is not provided', async () => {
         const dynamicStyleOptions = {
           type: COLOR_MAP_TYPE.CATEGORICAL,
-          field: {
-            name: 'myField',
-          },
         };
         const colorProperty = makeProperty(dynamicStyleOptions);
         expect(colorProperty._getMbColor()).toBeNull();
@@ -387,15 +436,12 @@ describe('get mapbox color expression', () => {
       test('should return mapbox expression for color palette', async () => {
         const dynamicStyleOptions = {
           type: COLOR_MAP_TYPE.CATEGORICAL,
-          field: {
-            name: 'myField',
-          },
           colorCategory: 'palette_0',
         };
         const colorProperty = makeProperty(dynamicStyleOptions);
         expect(colorProperty._getMbColor()).toEqual([
           'match',
-          ['to-string', ['get', 'myField']],
+          ['to-string', ['get', 'foobar']],
           'US',
           '#54B399',
           'CN',
@@ -409,9 +455,6 @@ describe('get mapbox color expression', () => {
       test('should return null when customColorPalette is not provided', async () => {
         const dynamicStyleOptions = {
           type: COLOR_MAP_TYPE.CATEGORICAL,
-          field: {
-            name: 'myField',
-          },
           useCustomColorPalette: true,
         };
         const colorProperty = makeProperty(dynamicStyleOptions);
@@ -421,9 +464,6 @@ describe('get mapbox color expression', () => {
       test('should return null when customColorPalette is empty', async () => {
         const dynamicStyleOptions = {
           type: COLOR_MAP_TYPE.CATEGORICAL,
-          field: {
-            name: 'myField',
-          },
           useCustomColorPalette: true,
           customColorPalette: [],
         };
@@ -434,9 +474,6 @@ describe('get mapbox color expression', () => {
       test('should return mapbox expression for custom color palette', async () => {
         const dynamicStyleOptions = {
           type: COLOR_MAP_TYPE.CATEGORICAL,
-          field: {
-            name: 'myField',
-          },
           useCustomColorPalette: true,
           customColorPalette: [
             { stop: null, color: '#f7faff' },
@@ -446,7 +483,7 @@ describe('get mapbox color expression', () => {
         const colorProperty = makeProperty(dynamicStyleOptions);
         expect(colorProperty._getMbColor()).toEqual([
           'match',
-          ['to-string', ['get', 'myField']],
+          ['to-string', ['get', 'foobar']],
           'MX',
           '#072f6b',
           '#f7faff',
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/properties/dynamic_icon_property.js b/x-pack/legacy/plugins/maps/public/layers/styles/vector/properties/dynamic_icon_property.js
index c492efbdf4ba3..05e2ad06842ce 100644
--- a/x-pack/legacy/plugins/maps/public/layers/styles/vector/properties/dynamic_icon_property.js
+++ b/x-pack/legacy/plugins/maps/public/layers/styles/vector/properties/dynamic_icon_property.js
@@ -81,7 +81,7 @@ export class DynamicIconProperty extends DynamicStyleProperty {
       mbStops.push(getMakiIconId(style, iconPixelSize));
     });
     mbStops.push(getMakiIconId(fallback, iconPixelSize)); //last item is fallback style for anything that does not match provided stops
-    return ['match', ['to-string', ['get', this._options.field.name]], ...mbStops];
+    return ['match', ['to-string', ['get', this._field.getName()]], ...mbStops];
   }
 
   _getMbIconAnchorExpression() {
@@ -98,7 +98,7 @@ export class DynamicIconProperty extends DynamicStyleProperty {
       mbStops.push(getMakiSymbolAnchor(style));
     });
     mbStops.push(getMakiSymbolAnchor(fallback)); //last item is fallback style for anything that does not match provided stops
-    return ['match', ['to-string', ['get', this._options.field.name]], ...mbStops];
+    return ['match', ['to-string', ['get', this._field.getName()]], ...mbStops];
   }
 
   _isIconDynamicConfigComplete() {
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 96408b3d2229e..ae4d935e2457b 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
@@ -25,8 +25,4 @@ export class DynamicOrientationProperty extends DynamicStyleProperty {
   supportsMbFeatureState() {
     return false;
   }
-
-  isOrdinalScaled() {
-    return false;
-  }
 }
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 7626f8c9b4158..8b3f670bfa528 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
@@ -5,7 +5,7 @@
  */
 
 import { DynamicStyleProperty } from './dynamic_style_property';
-
+import { makeMbClampedNumberExpression } from '../style_util';
 import {
   HALF_LARGE_MAKI_ICON_SIZE,
   LARGE_MAKI_ICON_SIZE,
@@ -74,17 +74,24 @@ export class DynamicSizeProperty extends DynamicStyleProperty {
   }
 
   syncIconSizeWithMb(symbolLayerId, mbMap) {
-    if (this._isSizeDynamicConfigComplete(this._options)) {
+    const rangeFieldMeta = this.getRangeFieldMeta();
+    if (this._isSizeDynamicConfigComplete(this._options) && rangeFieldMeta) {
       const halfIconPixels = this.getIconPixelSize() / 2;
-      const targetName = this.getComputedFieldName();
+      const targetName = this.getFieldName();
       // Using property state instead of feature-state because layout properties do not support feature-state
       mbMap.setLayoutProperty(symbolLayerId, 'icon-size', [
         'interpolate',
         ['linear'],
-        ['coalesce', ['get', targetName], 0],
-        0,
+        makeMbClampedNumberExpression({
+          minValue: rangeFieldMeta.min,
+          maxValue: rangeFieldMeta.max,
+          fallback: 0,
+          lookupFunction: 'get',
+          fieldName: targetName,
+        }),
+        rangeFieldMeta.min,
         this._options.minSize / halfIconPixels,
-        1,
+        rangeFieldMeta.max,
         this._options.maxSize / halfIconPixels,
       ]);
     } else {
@@ -113,25 +120,35 @@ export class DynamicSizeProperty extends DynamicStyleProperty {
   }
 
   getMbSizeExpression() {
-    if (this._isSizeDynamicConfigComplete(this._options)) {
-      return this._getMbDataDrivenSize({
-        targetName: this.getComputedFieldName(),
-        minSize: this._options.minSize,
-        maxSize: this._options.maxSize,
-      });
+    const rangeFieldMeta = this.getRangeFieldMeta();
+    if (!this._isSizeDynamicConfigComplete(this._options) || !rangeFieldMeta) {
+      return null;
     }
-    return null;
+
+    return this._getMbDataDrivenSize({
+      targetName: this.getFieldName(),
+      minSize: this._options.minSize,
+      maxSize: this._options.maxSize,
+      minValue: rangeFieldMeta.min,
+      maxValue: rangeFieldMeta.max,
+    });
   }
 
-  _getMbDataDrivenSize({ targetName, minSize, maxSize }) {
+  _getMbDataDrivenSize({ targetName, minSize, maxSize, minValue, maxValue }) {
     const lookup = this.supportsMbFeatureState() ? 'feature-state' : 'get';
     return [
       'interpolate',
       ['linear'],
-      ['coalesce', [lookup, targetName], 0],
-      0,
+      makeMbClampedNumberExpression({
+        lookupFunction: lookup,
+        maxValue,
+        minValue,
+        fieldName: targetName,
+        fallback: 0,
+      }),
+      minValue,
       minSize,
-      1,
+      maxValue,
       maxSize,
     ];
   }
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/properties/dynamic_style_property.d.ts b/x-pack/legacy/plugins/maps/public/layers/styles/vector/properties/dynamic_style_property.d.ts
index 25063944b8891..a83dd55c0c175 100644
--- a/x-pack/legacy/plugins/maps/public/layers/styles/vector/properties/dynamic_style_property.d.ts
+++ b/x-pack/legacy/plugins/maps/public/layers/styles/vector/properties/dynamic_style_property.d.ts
@@ -12,8 +12,6 @@ import {
   DynamicStylePropertyOptions,
 } from '../../../../../common/style_property_descriptor_types';
 import { IField } from '../../../fields/field';
-import { IVectorLayer } from '../../../vector_layer';
-import { IVectorSource } from '../../../sources/vector_source';
 import { CategoryFieldMeta, RangeFieldMeta } from '../../../../../common/descriptor_types';
 
 export interface IDynamicStyleProperty extends IStyleProperty {
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/properties/dynamic_style_property.js b/x-pack/legacy/plugins/maps/public/layers/styles/vector/properties/dynamic_style_property.js
index 68e06bacfa7b7..ea521f8749d80 100644
--- a/x-pack/legacy/plugins/maps/public/layers/styles/vector/properties/dynamic_style_property.js
+++ b/x-pack/legacy/plugins/maps/public/layers/styles/vector/properties/dynamic_style_property.js
@@ -13,7 +13,6 @@ import {
   SOURCE_META_ID_ORIGIN,
   FIELD_ORIGIN,
 } from '../../../../../common/constants';
-import { scaleValue, getComputedFieldName } from '../style_util';
 import React from 'react';
 import { OrdinalLegend } from './components/ordinal_legend';
 import { CategoricalLegend } from './components/categorical_legend';
@@ -109,13 +108,6 @@ export class DynamicStyleProperty extends AbstractStyleProperty {
     return this._field ? this._field.getName() : '';
   }
 
-  getComputedFieldName() {
-    if (!this.isComplete()) {
-      return null;
-    }
-    return getComputedFieldName(this._styleName, this.getField().getName());
-  }
-
   isDynamic() {
     return true;
   }
@@ -150,13 +142,7 @@ export class DynamicStyleProperty extends AbstractStyleProperty {
   }
 
   supportsFieldMeta() {
-    if (this.isOrdinal()) {
-      return this.isComplete() && this.isOrdinalScaled() && this._field.supportsFieldMeta();
-    } else if (this.isCategorical()) {
-      return this.isComplete() && this._field.supportsFieldMeta();
-    } else {
-      return false;
-    }
+    return this.isComplete() && this._field.supportsFieldMeta();
   }
 
   async getFieldMetaRequest() {
@@ -173,10 +159,6 @@ export class DynamicStyleProperty extends AbstractStyleProperty {
     return true;
   }
 
-  isOrdinalScaled() {
-    return true;
-  }
-
   getFieldMetaOptions() {
     return _.get(this.getOptions(), 'fieldMetaOptions', {});
   }
@@ -296,19 +278,9 @@ export class DynamicStyleProperty extends AbstractStyleProperty {
     }
   }
 
-  getMbValue(value) {
-    if (!this.isOrdinal()) {
-      return this.formatField(value);
-    }
-
+  getNumericalMbFeatureStateValue(value) {
     const valueAsFloat = parseFloat(value);
-    if (this.isOrdinalScaled()) {
-      return scaleValue(valueAsFloat, this.getRangeFieldMeta());
-    }
-    if (isNaN(valueAsFloat)) {
-      return 0;
-    }
-    return valueAsFloat;
+    return isNaN(valueAsFloat) ? null : valueAsFloat;
   }
 
   renderBreakedLegend() {
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/properties/dynamic_text_property.js b/x-pack/legacy/plugins/maps/public/layers/styles/vector/properties/dynamic_text_property.js
index c561ec128dec5..de868f3f92650 100644
--- a/x-pack/legacy/plugins/maps/public/layers/styles/vector/properties/dynamic_text_property.js
+++ b/x-pack/legacy/plugins/maps/public/layers/styles/vector/properties/dynamic_text_property.js
@@ -28,8 +28,4 @@ export class DynamicTextProperty extends DynamicStyleProperty {
   supportsMbFeatureState() {
     return false;
   }
-
-  isOrdinalScaled() {
-    return false;
-  }
 }
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/properties/label_border_size_property.js b/x-pack/legacy/plugins/maps/public/layers/styles/vector/properties/label_border_size_property.js
index 7119b659c1232..3016b15d0a05c 100644
--- a/x-pack/legacy/plugins/maps/public/layers/styles/vector/properties/label_border_size_property.js
+++ b/x-pack/legacy/plugins/maps/public/layers/styles/vector/properties/label_border_size_property.js
@@ -31,21 +31,27 @@ export class LabelBorderSizeProperty extends AbstractStyleProperty {
   }
 
   syncLabelBorderSizeWithMb(mbLayerId, mbMap) {
-    const widthRatio = getWidthRatio(this.getOptions().size);
-
     if (this.getOptions().size === LABEL_BORDER_SIZES.NONE) {
       mbMap.setPaintProperty(mbLayerId, 'text-halo-width', 0);
-    } else if (this._labelSizeProperty.isDynamic() && this._labelSizeProperty.isComplete()) {
+      return;
+    }
+
+    const widthRatio = getWidthRatio(this.getOptions().size);
+
+    if (this._labelSizeProperty.isDynamic() && this._labelSizeProperty.isComplete()) {
       const labelSizeExpression = this._labelSizeProperty.getMbSizeExpression();
-      mbMap.setPaintProperty(mbLayerId, 'text-halo-width', [
-        'max',
-        ['*', labelSizeExpression, widthRatio],
-        1,
-      ]);
-    } else {
-      const labelSize = _.get(this._labelSizeProperty.getOptions(), 'size', DEFAULT_LABEL_SIZE);
-      const labelBorderSize = Math.max(labelSize * widthRatio, 1);
-      mbMap.setPaintProperty(mbLayerId, 'text-halo-width', labelBorderSize);
+      if (labelSizeExpression) {
+        mbMap.setPaintProperty(mbLayerId, 'text-halo-width', [
+          'max',
+          ['*', labelSizeExpression, widthRatio],
+          1,
+        ]);
+        return;
+      }
     }
+
+    const labelSize = _.get(this._labelSizeProperty.getOptions(), 'size', DEFAULT_LABEL_SIZE);
+    const labelBorderSize = Math.max(labelSize * widthRatio, 1);
+    mbMap.setPaintProperty(mbLayerId, 'text-halo-width', labelBorderSize);
   }
 }
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/style_util.js b/x-pack/legacy/plugins/maps/public/layers/styles/vector/style_util.js
index 2859b8c0e5a56..0820568468439 100644
--- a/x-pack/legacy/plugins/maps/public/layers/styles/vector/style_util.js
+++ b/x-pack/legacy/plugins/maps/public/layers/styles/vector/style_util.js
@@ -34,22 +34,6 @@ export function isOnlySingleFeatureType(featureType, supportedFeatures, hasFeatu
   }, true);
 }
 
-export function scaleValue(value, range) {
-  if (isNaN(value) || !range) {
-    return -1; //Nothing to scale, put outside scaled range
-  }
-
-  if (range.delta === 0 || value >= range.max) {
-    return 1; //snap to end of scaled range
-  }
-
-  if (value <= range.min) {
-    return 0; //snap to beginning of scaled range
-  }
-
-  return (value - range.min) / range.delta;
-}
-
 export function assignCategoriesToPalette({ categories, paletteValues }) {
   const stops = [];
   let fallback = null;
@@ -70,3 +54,23 @@ export function assignCategoriesToPalette({ categories, paletteValues }) {
     fallback,
   };
 }
+
+export function makeMbClampedNumberExpression({
+  lookupFunction,
+  fieldName,
+  minValue,
+  maxValue,
+  fallback,
+}) {
+  const clamp = ['max', ['min', ['to-number', [lookupFunction, fieldName]], maxValue], minValue];
+  return [
+    'coalesce',
+    [
+      'case',
+      ['==', [lookupFunction, fieldName], null],
+      minValue - 1, //== does a JS-y like check where returns true for null and undefined
+      clamp,
+    ],
+    fallback,
+  ];
+}
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/style_util.test.js b/x-pack/legacy/plugins/maps/public/layers/styles/vector/style_util.test.js
index 2be31c0107193..76bbfc84e3892 100644
--- a/x-pack/legacy/plugins/maps/public/layers/styles/vector/style_util.test.js
+++ b/x-pack/legacy/plugins/maps/public/layers/styles/vector/style_util.test.js
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { isOnlySingleFeatureType, scaleValue, assignCategoriesToPalette } from './style_util';
+import { isOnlySingleFeatureType, assignCategoriesToPalette } from './style_util';
 import { VECTOR_SHAPE_TYPES } from '../../sources/vector_feature_types';
 
 describe('isOnlySingleFeatureType', () => {
@@ -62,32 +62,6 @@ describe('isOnlySingleFeatureType', () => {
   });
 });
 
-describe('scaleValue', () => {
-  test('Should scale value between 0 and 1', () => {
-    expect(scaleValue(5, { min: 0, max: 10, delta: 10 })).toBe(0.5);
-  });
-
-  test('Should snap value less then range min to 0', () => {
-    expect(scaleValue(-1, { min: 0, max: 10, delta: 10 })).toBe(0);
-  });
-
-  test('Should snap value greater then range max to 1', () => {
-    expect(scaleValue(11, { min: 0, max: 10, delta: 10 })).toBe(1);
-  });
-
-  test('Should snap value to 1 when tere is not range delta', () => {
-    expect(scaleValue(10, { min: 10, max: 10, delta: 0 })).toBe(1);
-  });
-
-  test('Should put value as -1 when value is not provided', () => {
-    expect(scaleValue(undefined, { min: 0, max: 10, delta: 10 })).toBe(-1);
-  });
-
-  test('Should put value as -1 when range is not provided', () => {
-    expect(scaleValue(5, undefined)).toBe(-1);
-  });
-});
-
 describe('assignCategoriesToPalette', () => {
   test('Categories and palette values have same length', () => {
     const categories = [{ key: 'alpah' }, { key: 'bravo' }, { key: 'charlie' }, { key: 'delta' }];
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 b5a0b51727936..ae5d148e43cfd 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
@@ -503,11 +503,19 @@ export class VectorStyle extends AbstractStyle {
         const dynamicStyleProp = dynamicStyleProps[j];
         const name = dynamicStyleProp.getField().getName();
         const computedName = getComputedFieldName(dynamicStyleProp.getStyleName(), name);
-        const styleValue = dynamicStyleProp.getMbValue(feature.properties[name]);
+        const rawValue = feature.properties[name];
         if (dynamicStyleProp.supportsMbFeatureState()) {
-          tmpFeatureState[computedName] = styleValue;
+          tmpFeatureState[name] = dynamicStyleProp.getNumericalMbFeatureStateValue(rawValue); //the same value will be potentially overridden multiple times, if the name remains identical
         } else {
-          feature.properties[computedName] = styleValue;
+          //in practice, a new system property will only be created for:
+          // - label text: this requires the value to be formatted first.
+          // - icon orientation: this is a lay-out property which do not support feature-state (but we're still coercing to a number)
+
+          const formattedValue = dynamicStyleProp.isOrdinal()
+            ? dynamicStyleProp.getNumericalMbFeatureStateValue(rawValue)
+            : dynamicStyleProp.formatField(rawValue);
+
+          feature.properties[computedName] = formattedValue;
         }
       }
       tmpFeatureIdentifier.source = mbSourceId;
diff --git a/x-pack/test/functional/apps/maps/mapbox_styles.js b/x-pack/test/functional/apps/maps/mapbox_styles.js
index d3280bae8582e..508a019db1764 100644
--- a/x-pack/test/functional/apps/maps/mapbox_styles.js
+++ b/x-pack/test/functional/apps/maps/mapbox_styles.js
@@ -16,9 +16,7 @@ export const MAPBOX_STYLES = {
       ['==', ['get', '__kbn_isvisibleduetojoin__'], true],
       ['any', ['==', ['geometry-type'], 'Point'], ['==', ['geometry-type'], 'MultiPoint']],
     ],
-    layout: {
-      visibility: 'visible',
-    },
+    layout: { visibility: 'visible' },
     paint: {
       'circle-color': [
         'interpolate',
@@ -26,32 +24,53 @@ export const MAPBOX_STYLES = {
         [
           'coalesce',
           [
-            'feature-state',
-            '__kbn__dynamic____kbnjoin__max_of_prop1_groupby_meta_for_geo_shapes*.shape_name__fillColor',
+            'case',
+            [
+              '==',
+              ['feature-state', '__kbnjoin__max_of_prop1_groupby_meta_for_geo_shapes*.shape_name'],
+              null,
+            ],
+            2,
+            [
+              'max',
+              [
+                'min',
+                [
+                  'to-number',
+                  [
+                    'feature-state',
+                    '__kbnjoin__max_of_prop1_groupby_meta_for_geo_shapes*.shape_name',
+                  ],
+                ],
+                12,
+              ],
+              3,
+            ],
           ],
-          -1,
+          2,
         ],
-        -1,
+        2,
         'rgba(0,0,0,0)',
-        0,
+        3,
         '#f7faff',
-        0.125,
+        4.125,
         '#ddeaf7',
-        0.25,
+        5.25,
         '#c5daee',
-        0.375,
+        6.375,
         '#9dc9e0',
-        0.5,
+        7.5,
         '#6aadd5',
-        0.625,
+        8.625,
         '#4191c5',
-        0.75,
+        9.75,
         '#2070b4',
-        0.875,
+        10.875,
         '#072f6b',
       ],
-      'circle-opacity': 0.75, // Obtained dynamically
-      /* 'circle-stroke-color': '' */ 'circle-stroke-opacity': 0.75,
+      'circle-opacity': 0.75,
+      'circle-stroke-color': '#41937c',
+      'circle-stroke-opacity': 0.75,
       'circle-stroke-width': 1,
       'circle-radius': 10,
     },
@@ -67,9 +86,7 @@ export const MAPBOX_STYLES = {
       ['==', ['get', '__kbn_isvisibleduetojoin__'], true],
       ['any', ['==', ['geometry-type'], 'Polygon'], ['==', ['geometry-type'], 'MultiPolygon']],
     ],
-    layout: {
-      visibility: 'visible',
-    },
+    layout: { visibility: 'visible' },
     paint: {
       'fill-color': [
         'interpolate',
@@ -77,28 +94,48 @@ export const MAPBOX_STYLES = {
         [
           'coalesce',
           [
-            'feature-state',
-            '__kbn__dynamic____kbnjoin__max_of_prop1_groupby_meta_for_geo_shapes*.shape_name__fillColor',
+            'case',
+            [
+              '==',
+              ['feature-state', '__kbnjoin__max_of_prop1_groupby_meta_for_geo_shapes*.shape_name'],
+              null,
+            ],
+            2,
+            [
+              'max',
+              [
+                'min',
+                [
+                  'to-number',
+                  [
+                    'feature-state',
+                    '__kbnjoin__max_of_prop1_groupby_meta_for_geo_shapes*.shape_name',
+                  ],
+                ],
+                12,
+              ],
+              3,
+            ],
           ],
-          -1,
+          2,
         ],
-        -1,
+        2,
         'rgba(0,0,0,0)',
-        0,
+        3,
         '#f7faff',
-        0.125,
+        4.125,
         '#ddeaf7',
-        0.25,
+        5.25,
         '#c5daee',
-        0.375,
+        6.375,
         '#9dc9e0',
-        0.5,
+        7.5,
         '#6aadd5',
-        0.625,
+        8.625,
         '#4191c5',
-        0.75,
+        9.75,
         '#2070b4',
-        0.875,
+        10.875,
         '#072f6b',
       ],
       'fill-opacity': 0.75,

From 3eeb8df172d66911b51e66009b1b53ed39aa91da Mon Sep 17 00:00:00 2001
From: Nicolas Chaulet <nicolas.chaulet@elastic.co>
Date: Mon, 23 Mar 2020 16:40:33 -0400
Subject: [PATCH 038/179] [Fleet] add Agent config details yaml view (#60943)

---
 .../ingest_manager/common/services/routes.ts  |  4 +
 .../enrollment_instructions/index.tsx         |  0
 .../enrollment_instructions/manual/index.tsx  |  0
 .../enrollment_instructions/shell/index.tsx   | 14 ++--
 .../hooks/use_request/agent_config.ts         |  7 ++
 .../details_page/components/yaml/index.tsx    | 78 +++++++++++++++++++
 .../agent_config/details_page/index.tsx       |  4 +-
 .../agent_enrollment_flyout/instructions.tsx  |  5 +-
 8 files changed, 103 insertions(+), 9 deletions(-)
 rename x-pack/plugins/ingest_manager/public/applications/ingest_manager/{sections/fleet/agent_list_page => }/components/enrollment_instructions/index.tsx (100%)
 rename x-pack/plugins/ingest_manager/public/applications/ingest_manager/{sections/fleet/agent_list_page => }/components/enrollment_instructions/manual/index.tsx (100%)
 rename x-pack/plugins/ingest_manager/public/applications/ingest_manager/{sections/fleet/agent_list_page => }/components/enrollment_instructions/shell/index.tsx (86%)
 create mode 100644 x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/details_page/components/yaml/index.tsx

diff --git a/x-pack/plugins/ingest_manager/common/services/routes.ts b/x-pack/plugins/ingest_manager/common/services/routes.ts
index 01b3b1983486c..7cc6fc3c66afb 100644
--- a/x-pack/plugins/ingest_manager/common/services/routes.ts
+++ b/x-pack/plugins/ingest_manager/common/services/routes.ts
@@ -82,6 +82,10 @@ export const agentConfigRouteService = {
   getDeletePath: () => {
     return AGENT_CONFIG_API_ROUTES.DELETE_PATTERN;
   },
+
+  getInfoFullPath: (agentConfigId: string) => {
+    return AGENT_CONFIG_API_ROUTES.FULL_INFO_PATTERN.replace('{agentConfigId}', agentConfigId);
+  },
 };
 
 export const fleetSetupRouteService = {
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/agent_list_page/components/enrollment_instructions/index.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/components/enrollment_instructions/index.tsx
similarity index 100%
rename from x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/agent_list_page/components/enrollment_instructions/index.tsx
rename to x-pack/plugins/ingest_manager/public/applications/ingest_manager/components/enrollment_instructions/index.tsx
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/agent_list_page/components/enrollment_instructions/manual/index.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/components/enrollment_instructions/manual/index.tsx
similarity index 100%
rename from x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/agent_list_page/components/enrollment_instructions/manual/index.tsx
rename to x-pack/plugins/ingest_manager/public/applications/ingest_manager/components/enrollment_instructions/manual/index.tsx
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/agent_list_page/components/enrollment_instructions/shell/index.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/components/enrollment_instructions/shell/index.tsx
similarity index 86%
rename from x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/agent_list_page/components/enrollment_instructions/shell/index.tsx
rename to x-pack/plugins/ingest_manager/public/applications/ingest_manager/components/enrollment_instructions/shell/index.tsx
index 04e84902bc9d4..e6990927b926e 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/agent_list_page/components/enrollment_instructions/shell/index.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/components/enrollment_instructions/shell/index.tsx
@@ -12,7 +12,7 @@ import {
   EuiFieldText,
   EuiPopover,
 } from '@elastic/eui';
-import { EnrollmentAPIKey } from '../../../../../../types';
+import { EnrollmentAPIKey } from '../../../types';
 
 // No need for i18n as these are platform names
 const PLATFORMS = {
@@ -37,11 +37,13 @@ export const ShellEnrollmentInstructions: React.FunctionComponent<Props> = ({
   const [isPlatformOptionsOpen, setIsPlatformOptionsOpen] = useState<boolean>(false);
 
   // Build quick installation command
-  const quickInstallInstructions = `${
-    kibanaCASha256 ? `CA_SHA256=${kibanaCASha256} ` : ''
-  }API_KEY=${
-    apiKey.api_key
-  } sh -c "$(curl ${kibanaUrl}/api/ingest_manager/fleet/install/${currentPlatform})"`;
+  // const quickInstallInstructions = `${
+  //   kibanaCASha256 ? `CA_SHA256=${kibanaCASha256} ` : ''
+  // }API_KEY=${
+  //   apiKey.api_key
+  // } sh -c "$(curl ${kibanaUrl}/api/ingest_manager/fleet/install/${currentPlatform})"`;
+
+  const quickInstallInstructions = `./agent enroll ${kibanaUrl} ${apiKey.api_key}`;
 
   return (
     <>
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/hooks/use_request/agent_config.ts b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/hooks/use_request/agent_config.ts
index d44cc67e2dc4c..d16d835f8c701 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/hooks/use_request/agent_config.ts
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/hooks/use_request/agent_config.ts
@@ -32,6 +32,13 @@ export const useGetOneAgentConfig = (agentConfigId: string) => {
   });
 };
 
+export const useGetOneAgentConfigFull = (agentConfigId: string) => {
+  return useRequest({
+    path: agentConfigRouteService.getInfoFullPath(agentConfigId),
+    method: 'get',
+  });
+};
+
 export const sendGetOneAgentConfig = (agentConfigId: string) => {
   return sendRequest<GetOneAgentConfigResponse>({
     path: agentConfigRouteService.getInfoPath(agentConfigId),
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/details_page/components/yaml/index.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/details_page/components/yaml/index.tsx
new file mode 100644
index 0000000000000..57031a3d72abe
--- /dev/null
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/details_page/components/yaml/index.tsx
@@ -0,0 +1,78 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React, { memo } from 'react';
+import { dump } from 'js-yaml';
+import { FormattedMessage } from '@kbn/i18n/react';
+import {
+  EuiTitle,
+  EuiSpacer,
+  EuiText,
+  EuiCodeBlock,
+  EuiFlexGroup,
+  EuiFlexItem,
+} from '@elastic/eui';
+import { AgentConfig } from '../../../../../../../../common/types/models';
+import {
+  useGetOneAgentConfigFull,
+  useGetEnrollmentAPIKeys,
+  useGetOneEnrollmentAPIKey,
+  useCore,
+} from '../../../../../hooks';
+import { ShellEnrollmentInstructions } from '../../../../../components/enrollment_instructions';
+import { Loading } from '../../../../../components';
+
+const CONFIG_KEYS_ORDER = ['id', 'revision', 'outputs', 'datasources'];
+
+export const ConfigYamlView = memo<{ config: AgentConfig }>(({ config }) => {
+  const core = useCore();
+
+  const fullConfigRequest = useGetOneAgentConfigFull(config.id);
+  const apiKeysRequest = useGetEnrollmentAPIKeys();
+  const apiKeyRequest = useGetOneEnrollmentAPIKey(apiKeysRequest.data?.list?.[0].id as string);
+
+  if (fullConfigRequest.isLoading && !fullConfigRequest.data) {
+    return <Loading />;
+  }
+
+  return (
+    <EuiFlexGroup>
+      <EuiFlexItem grow={7}>
+        <EuiCodeBlock language="yaml" isCopyable>
+          {dump(fullConfigRequest.data.item, {
+            sortKeys: (keyA: string, keyB: string) => {
+              return CONFIG_KEYS_ORDER.indexOf(keyA) - CONFIG_KEYS_ORDER.indexOf(keyB);
+            },
+          })}
+        </EuiCodeBlock>
+      </EuiFlexItem>
+      <EuiFlexItem grow={3}>
+        <EuiTitle size="s">
+          <h3>
+            <FormattedMessage
+              id="xpack.ingestManager.yamlConfig.instructionTittle"
+              defaultMessage="Enroll with fleet"
+            />
+          </h3>
+        </EuiTitle>
+        <EuiSpacer size="m" />
+        <EuiText size="s">
+          <FormattedMessage
+            id="xpack.ingestManager.yamlConfig.instructionDescription"
+            defaultMessage="To enroll an agent with this configuration, copy and run the following command on your host."
+          />
+        </EuiText>
+        <EuiSpacer size="m" />
+        {apiKeyRequest.data && (
+          <ShellEnrollmentInstructions
+            apiKey={apiKeyRequest.data.item}
+            kibanaUrl={`${window.location.origin}${core.http.basePath.get()}`}
+          />
+        )}
+      </EuiFlexItem>
+    </EuiFlexGroup>
+  );
+});
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/details_page/index.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/details_page/index.tsx
index efb96f6459254..450f86df5c03a 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/details_page/index.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/details_page/index.tsx
@@ -31,6 +31,7 @@ import { LinkedAgentCount } from '../components';
 import { useAgentConfigLink } from './hooks/use_details_uri';
 import { DETAILS_ROUTER_PATH, DETAILS_ROUTER_SUB_PATH } from './constants';
 import { ConfigDatasourcesView } from './components/datasources';
+import { ConfigYamlView } from './components/yaml';
 
 const Divider = styled.div`
   width: 0;
@@ -282,8 +283,7 @@ export const AgentConfigDetailsLayout: React.FunctionComponent = () => {
             <Route
               path={`${DETAILS_ROUTER_PATH}/yaml`}
               render={() => {
-                // TODO: YAML implementation tracked via https://github.com/elastic/kibana/issues/57958
-                return <div>YAML placeholder</div>;
+                return <ConfigYamlView config={agentConfig} />;
               }}
             />
             <Route
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/agent_list_page/components/agent_enrollment_flyout/instructions.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/agent_list_page/components/agent_enrollment_flyout/instructions.tsx
index 97434d2178852..1bc20c2baf660 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/agent_list_page/components/agent_enrollment_flyout/instructions.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/agent_list_page/components/agent_enrollment_flyout/instructions.tsx
@@ -8,7 +8,10 @@ import { i18n } from '@kbn/i18n';
 import { EuiSpacer, EuiText, EuiButtonGroup, EuiSteps } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n/react';
 import { useEnrollmentApiKey } from '../enrollment_api_keys';
-import { ShellEnrollmentInstructions, ManualInstructions } from '../enrollment_instructions';
+import {
+  ShellEnrollmentInstructions,
+  ManualInstructions,
+} from '../../../../../components/enrollment_instructions';
 import { useCore, useGetAgents } from '../../../../../hooks';
 import { Loading } from '../../../components';
 

From 3c924d9f8723e088958aae3fbbe601e3dd926198 Mon Sep 17 00:00:00 2001
From: Wylie Conlon <william.conlon@elastic.co>
Date: Mon, 23 Mar 2020 16:44:57 -0400
Subject: [PATCH 039/179] [Lens] Use new charts APIs to simplify series naming
 (#60708)

* build: update @elastic/charts to v18.1.0

* tests: fix breaking-change on legendItem className

* fix: type changes and ml custom tooltip data

* tests: fix snapshot test

* [Lens] Use new charts APIs to simplify series naming

* Fix types

* Fix naming

* Remove accidental file

* Update snapshots

Co-authored-by: Marco Vettorello <vettorello.marco@gmail.com>
Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 .../__snapshots__/xy_expression.test.tsx.snap | 119 +++++++++---------
 .../xy_visualization/xy_expression.test.tsx   |  48 +++++--
 .../public/xy_visualization/xy_expression.tsx |  83 ++++--------
 3 files changed, 121 insertions(+), 129 deletions(-)

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 44398c929a2b9..4b19ad288ddaa 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
@@ -29,24 +29,23 @@ exports[`xy_expression XYChart component it renders area 1`] = `
     data={
       Array [
         Object {
-          "Label A": 1,
-          "Label B": 2,
-          "Label D": "Foo",
+          "a": 1,
+          "b": 2,
           "c": "I",
           "d": "Foo",
         },
         Object {
-          "Label A": 1,
-          "Label B": 5,
-          "Label D": "Bar",
+          "a": 1,
+          "b": 5,
           "c": "J",
           "d": "Bar",
         },
       ]
     }
     enableHistogramMode={false}
-    id="Label D"
+    id="d"
     key="0"
+    name={[Function]}
     splitSeriesAccessors={
       Array [
         "d",
@@ -58,8 +57,8 @@ exports[`xy_expression XYChart component it renders area 1`] = `
     xScaleType="ordinal"
     yAccessors={
       Array [
-        "Label A",
-        "Label B",
+        "a",
+        "b",
       ]
     }
     yScaleType="linear"
@@ -96,24 +95,23 @@ exports[`xy_expression XYChart component it renders bar 1`] = `
     data={
       Array [
         Object {
-          "Label A": 1,
-          "Label B": 2,
-          "Label D": "Foo",
+          "a": 1,
+          "b": 2,
           "c": "I",
           "d": "Foo",
         },
         Object {
-          "Label A": 1,
-          "Label B": 5,
-          "Label D": "Bar",
+          "a": 1,
+          "b": 5,
           "c": "J",
           "d": "Bar",
         },
       ]
     }
     enableHistogramMode={false}
-    id="Label D"
+    id="d"
     key="0"
+    name={[Function]}
     splitSeriesAccessors={
       Array [
         "d",
@@ -125,8 +123,8 @@ exports[`xy_expression XYChart component it renders bar 1`] = `
     xScaleType="ordinal"
     yAccessors={
       Array [
-        "Label A",
-        "Label B",
+        "a",
+        "b",
       ]
     }
     yScaleType="linear"
@@ -163,24 +161,23 @@ exports[`xy_expression XYChart component it renders horizontal bar 1`] = `
     data={
       Array [
         Object {
-          "Label A": 1,
-          "Label B": 2,
-          "Label D": "Foo",
+          "a": 1,
+          "b": 2,
           "c": "I",
           "d": "Foo",
         },
         Object {
-          "Label A": 1,
-          "Label B": 5,
-          "Label D": "Bar",
+          "a": 1,
+          "b": 5,
           "c": "J",
           "d": "Bar",
         },
       ]
     }
     enableHistogramMode={false}
-    id="Label D"
+    id="d"
     key="0"
+    name={[Function]}
     splitSeriesAccessors={
       Array [
         "d",
@@ -192,8 +189,8 @@ exports[`xy_expression XYChart component it renders horizontal bar 1`] = `
     xScaleType="ordinal"
     yAccessors={
       Array [
-        "Label A",
-        "Label B",
+        "a",
+        "b",
       ]
     }
     yScaleType="linear"
@@ -230,24 +227,23 @@ exports[`xy_expression XYChart component it renders line 1`] = `
     data={
       Array [
         Object {
-          "Label A": 1,
-          "Label B": 2,
-          "Label D": "Foo",
+          "a": 1,
+          "b": 2,
           "c": "I",
           "d": "Foo",
         },
         Object {
-          "Label A": 1,
-          "Label B": 5,
-          "Label D": "Bar",
+          "a": 1,
+          "b": 5,
           "c": "J",
           "d": "Bar",
         },
       ]
     }
     enableHistogramMode={false}
-    id="Label D"
+    id="d"
     key="0"
+    name={[Function]}
     splitSeriesAccessors={
       Array [
         "d",
@@ -259,8 +255,8 @@ exports[`xy_expression XYChart component it renders line 1`] = `
     xScaleType="ordinal"
     yAccessors={
       Array [
-        "Label A",
-        "Label B",
+        "a",
+        "b",
       ]
     }
     yScaleType="linear"
@@ -297,24 +293,23 @@ exports[`xy_expression XYChart component it renders stacked area 1`] = `
     data={
       Array [
         Object {
-          "Label A": 1,
-          "Label B": 2,
-          "Label D": "Foo",
+          "a": 1,
+          "b": 2,
           "c": "I",
           "d": "Foo",
         },
         Object {
-          "Label A": 1,
-          "Label B": 5,
-          "Label D": "Bar",
+          "a": 1,
+          "b": 5,
           "c": "J",
           "d": "Bar",
         },
       ]
     }
     enableHistogramMode={false}
-    id="Label D"
+    id="d"
     key="0"
+    name={[Function]}
     splitSeriesAccessors={
       Array [
         "d",
@@ -330,8 +325,8 @@ exports[`xy_expression XYChart component it renders stacked area 1`] = `
     xScaleType="ordinal"
     yAccessors={
       Array [
-        "Label A",
-        "Label B",
+        "a",
+        "b",
       ]
     }
     yScaleType="linear"
@@ -368,24 +363,23 @@ exports[`xy_expression XYChart component it renders stacked bar 1`] = `
     data={
       Array [
         Object {
-          "Label A": 1,
-          "Label B": 2,
-          "Label D": "Foo",
+          "a": 1,
+          "b": 2,
           "c": "I",
           "d": "Foo",
         },
         Object {
-          "Label A": 1,
-          "Label B": 5,
-          "Label D": "Bar",
+          "a": 1,
+          "b": 5,
           "c": "J",
           "d": "Bar",
         },
       ]
     }
     enableHistogramMode={false}
-    id="Label D"
+    id="d"
     key="0"
+    name={[Function]}
     splitSeriesAccessors={
       Array [
         "d",
@@ -401,8 +395,8 @@ exports[`xy_expression XYChart component it renders stacked bar 1`] = `
     xScaleType="ordinal"
     yAccessors={
       Array [
-        "Label A",
-        "Label B",
+        "a",
+        "b",
       ]
     }
     yScaleType="linear"
@@ -439,24 +433,23 @@ exports[`xy_expression XYChart component it renders stacked horizontal bar 1`] =
     data={
       Array [
         Object {
-          "Label A": 1,
-          "Label B": 2,
-          "Label D": "Foo",
+          "a": 1,
+          "b": 2,
           "c": "I",
           "d": "Foo",
         },
         Object {
-          "Label A": 1,
-          "Label B": 5,
-          "Label D": "Bar",
+          "a": 1,
+          "b": 5,
           "c": "J",
           "d": "Bar",
         },
       ]
     }
     enableHistogramMode={false}
-    id="Label D"
+    id="d"
     key="0"
+    name={[Function]}
     splitSeriesAccessors={
       Array [
         "d",
@@ -472,8 +465,8 @@ exports[`xy_expression XYChart component it renders stacked horizontal bar 1`] =
     xScaleType="ordinal"
     yAccessors={
       Array [
-        "Label A",
-        "Label B",
+        "a",
+        "b",
       ]
     }
     yScaleType="linear"
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 6323a063c988b..adf64fece2942 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
@@ -12,6 +12,7 @@ import {
   LineSeries,
   Settings,
   ScaleType,
+  SeriesNameFn,
 } from '@elastic/charts';
 import { xyChart, XYChart } from './xy_expression';
 import { LensMultiTable } from '../types';
@@ -367,7 +368,7 @@ describe('xy_expression', () => {
       expect(component.find(BarSeries).prop('enableHistogramMode')).toEqual(false);
     });
 
-    test('it rewrites the rows based on provided labels', () => {
+    test('it names the series for multiple accessors', () => {
       const { data, args } = sampleArgs();
 
       const component = shallow(
@@ -379,25 +380,56 @@ describe('xy_expression', () => {
           chartTheme={{}}
         />
       );
-      expect(component.find(LineSeries).prop('data')).toEqual([
-        { 'Label A': 1, 'Label B': 2, c: 'I', 'Label D': 'Foo', d: 'Foo' },
-        { 'Label A': 1, 'Label B': 5, c: 'J', 'Label D': 'Bar', d: 'Bar' },
-      ]);
+      const nameFn = component.find(LineSeries).prop('name') as SeriesNameFn;
+
+      expect(
+        nameFn(
+          {
+            seriesKeys: ['a', 'b', 'c', 'd'],
+            key: '',
+            specId: 'a',
+            yAccessor: '',
+            splitAccessors: new Map(),
+          },
+          false
+        )
+      ).toEqual('Label A - Label B - c - Label D');
     });
 
-    test('it uses labels as Y accessors', () => {
+    test('it names the series for a single accessor', () => {
       const { data, args } = sampleArgs();
 
       const component = shallow(
         <XYChart
           data={data}
-          args={args}
+          args={{
+            ...args,
+            layers: [
+              {
+                ...args.layers[0],
+                accessors: ['a'],
+              },
+            ],
+          }}
           formatFactory={getFormatSpy}
           timeZone="UTC"
           chartTheme={{}}
         />
       );
-      expect(component.find(LineSeries).prop('yAccessors')).toEqual(['Label A', 'Label B']);
+      const nameFn = component.find(LineSeries).prop('name') as SeriesNameFn;
+
+      expect(
+        nameFn(
+          {
+            seriesKeys: ['a', 'b', 'c', 'd'],
+            key: '',
+            specId: 'a',
+            yAccessor: '',
+            splitAccessors: new Map(),
+          },
+          false
+        )
+      ).toEqual('Label A');
     });
 
     test('it set the scale of the x axis according to the args prop', () => {
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 cc30e5d18a7f7..ce966ee6150a0 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
@@ -18,7 +18,6 @@ import {
 } from '@elastic/charts';
 import { I18nProvider } from '@kbn/i18n/react';
 import {
-  KibanaDatatable,
   IInterpreterRenderHandlers,
   ExpressionRenderDefinition,
   ExpressionFunctionDefinition,
@@ -33,6 +32,11 @@ import { XYArgs, SeriesType, visualizationTypes } from './types';
 import { VisualizationContainer } from '../visualization_container';
 import { isHorizontalChart } from './state_helpers';
 
+type InferPropType<T> = T extends React.FunctionComponent<infer P> ? P : T;
+type SeriesSpec = InferPropType<typeof LineSeries> &
+  InferPropType<typeof BarSeries> &
+  InferPropType<typeof AreaSeries>;
+
 export interface XYChartProps {
   data: LensMultiTable;
   args: XYArgs;
@@ -247,80 +251,43 @@ export function XYChart({ data, args, formatFactory, timeZone, chartTheme }: XYC
             return;
           }
 
-          const columnToLabelMap = columnToLabel ? JSON.parse(columnToLabel) : {};
-          const splitAccessorLabel = splitAccessor ? columnToLabelMap[splitAccessor] : '';
-          const yAccessors = accessors.map(accessor => columnToLabelMap[accessor] || accessor);
-          const idForLegend = splitAccessorLabel || yAccessors;
-          const sanitized = sanitizeRows({
-            splitAccessor,
-            formatFactory,
-            columnToLabelMap,
-            table: data.tables[layerId],
-          });
-
-          const seriesProps = {
-            key: index,
-            splitSeriesAccessors: sanitized.splitAccessor ? [sanitized.splitAccessor] : [],
+          const columnToLabelMap: Record<string, string> = columnToLabel
+            ? JSON.parse(columnToLabel)
+            : {};
+          const table = data.tables[layerId];
+          const seriesProps: SeriesSpec = {
+            splitSeriesAccessors: splitAccessor ? [splitAccessor] : [],
             stackAccessors: seriesType.includes('stacked') ? [xAccessor] : [],
-            id: idForLegend,
+            id: splitAccessor || accessors.join(','),
             xAccessor,
-            yAccessors,
-            data: sanitized.rows,
+            yAccessors: accessors,
+            data: table.rows,
             xScaleType,
             yScaleType,
             enableHistogramMode: isHistogram && (seriesType.includes('stacked') || !splitAccessor),
             timeZone,
+            name(d) {
+              if (accessors.length > 1) {
+                return d.seriesKeys
+                  .map((key: string | number) => columnToLabelMap[key] || key)
+                  .join(' - ');
+              }
+              return columnToLabelMap[d.seriesKeys[0]] ?? d.seriesKeys[0];
+            },
           };
 
           return seriesType === 'line' ? (
-            <LineSeries {...seriesProps} />
+            <LineSeries key={index} {...seriesProps} />
           ) : seriesType === 'bar' ||
             seriesType === 'bar_stacked' ||
             seriesType === 'bar_horizontal' ||
             seriesType === 'bar_horizontal_stacked' ? (
-            <BarSeries {...seriesProps} />
+            <BarSeries key={index} {...seriesProps} />
           ) : (
-            <AreaSeries {...seriesProps} />
+            <AreaSeries key={index} {...seriesProps} />
           );
         }
       )}
     </Chart>
   );
 }
-
-/**
- * Renames the columns to match the user-configured accessors in
- * columnToLabelMap. If a splitAccessor is provided, formats the
- * values in that column.
- */
-function sanitizeRows({
-  splitAccessor,
-  table,
-  formatFactory,
-  columnToLabelMap,
-}: {
-  splitAccessor?: string;
-  table: KibanaDatatable;
-  formatFactory: FormatFactory;
-  columnToLabelMap: Record<string, string | undefined>;
-}) {
-  const column = table.columns.find(c => c.id === splitAccessor);
-  const formatter = formatFactory(column && column.formatHint);
-
-  return {
-    splitAccessor: column && column.id,
-    rows: table.rows.map(r => {
-      const newRow: typeof r = {};
-
-      if (column) {
-        newRow[column.id] = formatter.convert(r[column.id]);
-      }
-
-      Object.keys(r).forEach(key => {
-        const newKey = columnToLabelMap[key] || key;
-        newRow[newKey] = r[key];
-      });
-      return newRow;
-    }),
-  };
-}

From ec2972c224a7360decf948c1368e1f8f08ba2f58 Mon Sep 17 00:00:00 2001
From: Devon Thomson <devon.thomson@elastic.co>
Date: Mon, 23 Mar 2020 17:03:01 -0400
Subject: [PATCH 040/179] Dashboard/add panel flow (#59918)

Added an emphasize prop to the top nav menu item and used it for a new 'Create new' button which redirects to the 'new visualization' modal.

Co-authored-by: Ryan Keairns <rkeairns@chef.io>
---
 .../np_ready/dashboard_app_controller.tsx     |  5 +-
 .../np_ready/top_nav/get_top_nav_config.ts    | 22 ++++++-
 .../dashboard/np_ready/top_nav/top_nav_ids.ts |  2 +-
 .../top_nav_menu_item.test.tsx.snap           | 19 ++++++
 .../public/top_nav_menu/_index.scss           |  8 ++-
 .../public/top_nav_menu/top_nav_menu.tsx      |  7 ++-
 .../public/top_nav_menu/top_nav_menu_data.tsx |  5 ++
 .../top_nav_menu/top_nav_menu_item.test.tsx   | 60 +++++++++++++++----
 .../public/top_nav_menu/top_nav_menu_item.tsx | 26 ++++----
 .../dashboard/create_and_add_embeddables.js   | 17 +++++-
 .../services/dashboard/add_panel.js           |  7 +++
 11 files changed, 148 insertions(+), 30 deletions(-)
 create mode 100644 src/plugins/navigation/public/top_nav_menu/__snapshots__/top_nav_menu_item.test.tsx.snap

diff --git a/src/legacy/core_plugins/kibana/public/dashboard/np_ready/dashboard_app_controller.tsx b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/dashboard_app_controller.tsx
index d1e4c9d2d2a0c..f1e1f20de1ce6 100644
--- a/src/legacy/core_plugins/kibana/public/dashboard/np_ready/dashboard_app_controller.tsx
+++ b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/dashboard_app_controller.tsx
@@ -754,7 +754,7 @@ export class DashboardAppController {
        * When de-angularizing this code, please call the underlaying action function
        * directly and not via the top nav object.
        **/
-      navActions[TopNavIds.ADD]();
+      navActions[TopNavIds.ADD_EXISTING]();
     };
     $scope.enterEditMode = () => {
       dashboardStateManager.setFullScreenMode(false);
@@ -847,7 +847,8 @@ export class DashboardAppController {
 
       showCloneModal(onClone, currentTitle);
     };
-    navActions[TopNavIds.ADD] = () => {
+
+    navActions[TopNavIds.ADD_EXISTING] = () => {
       if (dashboardContainer && !isErrorEmbeddable(dashboardContainer)) {
         openAddPanelFlyout({
           embeddable: dashboardContainer,
diff --git a/src/legacy/core_plugins/kibana/public/dashboard/np_ready/top_nav/get_top_nav_config.ts b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/top_nav/get_top_nav_config.ts
index 7188fab19d6f2..7a3cb4b7dad56 100644
--- a/src/legacy/core_plugins/kibana/public/dashboard/np_ready/top_nav/get_top_nav_config.ts
+++ b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/top_nav/get_top_nav_config.ts
@@ -48,9 +48,10 @@ export function getTopNavConfig(
           ];
     case ViewMode.EDIT:
       return [
+        getCreateNewConfig(actions[TopNavIds.VISUALIZE]),
         getSaveConfig(actions[TopNavIds.SAVE]),
         getViewConfig(actions[TopNavIds.EXIT_EDIT_MODE]),
-        getAddConfig(actions[TopNavIds.ADD]),
+        getAddConfig(actions[TopNavIds.ADD_EXISTING]),
         getOptionsConfig(actions[TopNavIds.OPTIONS]),
         getShareConfig(actions[TopNavIds.SHARE]),
       ];
@@ -161,6 +162,25 @@ function getAddConfig(action: NavAction) {
   };
 }
 
+/**
+ * @returns {kbnTopNavConfig}
+ */
+function getCreateNewConfig(action: NavAction) {
+  return {
+    emphasize: true,
+    iconType: 'plusInCircle',
+    id: 'addNew',
+    label: i18n.translate('kbn.dashboard.topNave.addNewButtonAriaLabel', {
+      defaultMessage: 'Create new',
+    }),
+    description: i18n.translate('kbn.dashboard.topNave.addNewConfigDescription', {
+      defaultMessage: 'Create a new panel on this dashboard',
+    }),
+    testId: 'dashboardAddNewPanelButton',
+    run: action,
+  };
+}
+
 /**
  * @returns {kbnTopNavConfig}
  */
diff --git a/src/legacy/core_plugins/kibana/public/dashboard/np_ready/top_nav/top_nav_ids.ts b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/top_nav/top_nav_ids.ts
index c67d6891c18e7..748bfaaab6141 100644
--- a/src/legacy/core_plugins/kibana/public/dashboard/np_ready/top_nav/top_nav_ids.ts
+++ b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/top_nav/top_nav_ids.ts
@@ -18,7 +18,6 @@
  */
 
 export const TopNavIds = {
-  ADD: 'add',
   SHARE: 'share',
   OPTIONS: 'options',
   SAVE: 'save',
@@ -27,4 +26,5 @@ export const TopNavIds = {
   CLONE: 'clone',
   FULL_SCREEN: 'fullScreenMode',
   VISUALIZE: 'visualize',
+  ADD_EXISTING: 'addExisting',
 };
diff --git a/src/plugins/navigation/public/top_nav_menu/__snapshots__/top_nav_menu_item.test.tsx.snap b/src/plugins/navigation/public/top_nav_menu/__snapshots__/top_nav_menu_item.test.tsx.snap
new file mode 100644
index 0000000000000..0d54d5d3e9c4a
--- /dev/null
+++ b/src/plugins/navigation/public/top_nav_menu/__snapshots__/top_nav_menu_item.test.tsx.snap
@@ -0,0 +1,19 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`TopNavMenu Should render emphasized item which should be clickable 1`] = `
+<EuiButton
+  fill={true}
+  iconSide="right"
+  iconType="beaker"
+  isDisabled={false}
+  onClick={[Function]}
+  size="s"
+  style={
+    Object {
+      "fontSize": "smaller",
+    }
+  }
+>
+  Test
+</EuiButton>
+`;
diff --git a/src/plugins/navigation/public/top_nav_menu/_index.scss b/src/plugins/navigation/public/top_nav_menu/_index.scss
index 4a0e6af3f7f70..5befe4789dd6c 100644
--- a/src/plugins/navigation/public/top_nav_menu/_index.scss
+++ b/src/plugins/navigation/public/top_nav_menu/_index.scss
@@ -1,7 +1,11 @@
 .kbnTopNavMenu__wrapper {
   z-index: 5;
 
-  .kbnTopNavMenu {      
-    padding: $euiSizeS 0px $euiSizeXS;
+  .kbnTopNavMenu {
+    padding: $euiSizeS 0;
+
+    .kbnTopNavItemEmphasized {
+      padding: 0 $euiSizeS;
+    }
   }
 }
diff --git a/src/plugins/navigation/public/top_nav_menu/top_nav_menu.tsx b/src/plugins/navigation/public/top_nav_menu/top_nav_menu.tsx
index 80d1a53cd417f..14ad40f13e388 100644
--- a/src/plugins/navigation/public/top_nav_menu/top_nav_menu.tsx
+++ b/src/plugins/navigation/public/top_nav_menu/top_nav_menu.tsx
@@ -46,7 +46,11 @@ export function TopNavMenu(props: TopNavMenuProps) {
     if (!config) return;
     return config.map((menuItem: TopNavMenuData, i: number) => {
       return (
-        <EuiFlexItem grow={false} key={`nav-menu-${i}`}>
+        <EuiFlexItem
+          grow={false}
+          key={`nav-menu-${i}`}
+          className={menuItem.emphasize ? 'kbnTopNavItemEmphasized' : ''}
+        >
           <TopNavMenuItem {...menuItem} />
         </EuiFlexItem>
       );
@@ -66,6 +70,7 @@ export function TopNavMenu(props: TopNavMenuProps) {
         <EuiFlexGroup
           data-test-subj="top-nav"
           justifyContent="flexStart"
+          alignItems="center"
           gutterSize="none"
           className="kbnTopNavMenu"
           responsive={false}
diff --git a/src/plugins/navigation/public/top_nav_menu/top_nav_menu_data.tsx b/src/plugins/navigation/public/top_nav_menu/top_nav_menu_data.tsx
index f709985bcf453..2b7466ffd6ab3 100644
--- a/src/plugins/navigation/public/top_nav_menu/top_nav_menu_data.tsx
+++ b/src/plugins/navigation/public/top_nav_menu/top_nav_menu_data.tsx
@@ -17,6 +17,8 @@
  * under the License.
  */
 
+import { ButtonIconSide } from '@elastic/eui';
+
 export type TopNavMenuAction = (anchorElement: EventTarget) => void;
 
 export interface TopNavMenuData {
@@ -28,6 +30,9 @@ export interface TopNavMenuData {
   className?: string;
   disableButton?: boolean | (() => boolean);
   tooltip?: string | (() => string);
+  emphasize?: boolean;
+  iconType?: string;
+  iconSide?: ButtonIconSide;
 }
 
 export interface RegisteredTopNavMenuData extends TopNavMenuData {
diff --git a/src/plugins/navigation/public/top_nav_menu/top_nav_menu_item.test.tsx b/src/plugins/navigation/public/top_nav_menu/top_nav_menu_item.test.tsx
index 4816ef3c95869..9ba58379c5ce1 100644
--- a/src/plugins/navigation/public/top_nav_menu/top_nav_menu_item.test.tsx
+++ b/src/plugins/navigation/public/top_nav_menu/top_nav_menu_item.test.tsx
@@ -23,6 +23,15 @@ import { TopNavMenuData } from './top_nav_menu_data';
 import { shallowWithIntl } from 'test_utils/enzyme_helpers';
 
 describe('TopNavMenu', () => {
+  const ensureMenuItemDisabled = (data: TopNavMenuData) => {
+    const component = shallowWithIntl(<TopNavMenuItem {...data} />);
+    expect(component.prop('isDisabled')).toEqual(true);
+
+    const event = { currentTarget: { value: 'a' } };
+    component.simulate('click', event);
+    expect(data.run).toHaveBeenCalledTimes(0);
+  };
+
   it('Should render and click an item', () => {
     const data: TopNavMenuData = {
       id: 'test',
@@ -60,35 +69,62 @@ describe('TopNavMenu', () => {
     expect(data.run).toHaveBeenCalled();
   });
 
-  it('Should render disabled item and it shouldnt be clickable', () => {
+  it('Should render emphasized item which should be clickable', () => {
     const data: TopNavMenuData = {
       id: 'test',
       label: 'test',
-      disableButton: true,
+      iconType: 'beaker',
+      iconSide: 'right',
+      emphasize: true,
       run: jest.fn(),
     };
 
     const component = shallowWithIntl(<TopNavMenuItem {...data} />);
-    expect(component.prop('isDisabled')).toEqual(true);
-
     const event = { currentTarget: { value: 'a' } };
     component.simulate('click', event);
-    expect(data.run).toHaveBeenCalledTimes(0);
+    expect(data.run).toHaveBeenCalledTimes(1);
+    expect(component).toMatchSnapshot();
+  });
+
+  it('Should render disabled item and it shouldnt be clickable', () => {
+    ensureMenuItemDisabled({
+      id: 'test',
+      label: 'test',
+      disableButton: true,
+      run: jest.fn(),
+    });
   });
 
   it('Should render item with disable function and it shouldnt be clickable', () => {
-    const data: TopNavMenuData = {
+    ensureMenuItemDisabled({
       id: 'test',
       label: 'test',
       disableButton: () => true,
       run: jest.fn(),
-    };
+    });
+  });
 
-    const component = shallowWithIntl(<TopNavMenuItem {...data} />);
-    expect(component.prop('isDisabled')).toEqual(true);
+  it('Should render disabled emphasized item which shouldnt be clickable', () => {
+    ensureMenuItemDisabled({
+      id: 'test',
+      label: 'test',
+      iconType: 'beaker',
+      iconSide: 'right',
+      emphasize: true,
+      disableButton: true,
+      run: jest.fn(),
+    });
+  });
 
-    const event = { currentTarget: { value: 'a' } };
-    component.simulate('click', event);
-    expect(data.run).toHaveBeenCalledTimes(0);
+  it('Should render emphasized item with disable function and it shouldnt be clickable', () => {
+    ensureMenuItemDisabled({
+      id: 'test',
+      label: 'test',
+      iconType: 'beaker',
+      iconSide: 'right',
+      emphasize: true,
+      disableButton: () => true,
+      run: jest.fn(),
+    });
   });
 });
diff --git a/src/plugins/navigation/public/top_nav_menu/top_nav_menu_item.tsx b/src/plugins/navigation/public/top_nav_menu/top_nav_menu_item.tsx
index 4d3b72bae6411..92e267f17d08e 100644
--- a/src/plugins/navigation/public/top_nav_menu/top_nav_menu_item.tsx
+++ b/src/plugins/navigation/public/top_nav_menu/top_nav_menu_item.tsx
@@ -21,6 +21,7 @@ import { capitalize, isFunction } from 'lodash';
 import React, { MouseEvent } from 'react';
 import { EuiButtonEmpty, EuiToolTip } from '@elastic/eui';
 
+import { EuiButton } from '@elastic/eui';
 import { TopNavMenuData } from './top_nav_menu_data';
 
 export function TopNavMenuItem(props: TopNavMenuData) {
@@ -39,14 +40,20 @@ export function TopNavMenuItem(props: TopNavMenuData) {
     props.run(e.currentTarget);
   }
 
-  const btn = (
-    <EuiButtonEmpty
-      size="xs"
-      isDisabled={isDisabled()}
-      onClick={handleClick}
-      data-test-subj={props.testId}
-      className={props.className}
-    >
+  const commonButtonProps = {
+    isDisabled: isDisabled(),
+    onClick: handleClick,
+    iconType: props.iconType,
+    iconSide: props.iconSide,
+    'data-test-subj': props.testId,
+  };
+
+  const btn = props.emphasize ? (
+    <EuiButton {...commonButtonProps} size="s" fill style={{ fontSize: 'smaller' }}>
+      {capitalize(props.label || props.id!)}
+    </EuiButton>
+  ) : (
+    <EuiButtonEmpty {...commonButtonProps} size="xs">
       {capitalize(props.label || props.id!)}
     </EuiButtonEmpty>
   );
@@ -54,9 +61,8 @@ export function TopNavMenuItem(props: TopNavMenuData) {
   const tooltip = getTooltip();
   if (tooltip) {
     return <EuiToolTip content={tooltip}>{btn}</EuiToolTip>;
-  } else {
-    return btn;
   }
+  return btn;
 }
 
 TopNavMenuItem.defaultProps = {
diff --git a/test/functional/apps/dashboard/create_and_add_embeddables.js b/test/functional/apps/dashboard/create_and_add_embeddables.js
index 5ebb9fdf6330f..3ce8e353e61fc 100644
--- a/test/functional/apps/dashboard/create_and_add_embeddables.js
+++ b/test/functional/apps/dashboard/create_and_add_embeddables.js
@@ -41,9 +41,24 @@ export default function({ getService, getPageObjects }) {
     });
 
     describe('add new visualization link', () => {
-      it('adds a new visualization', async () => {
+      it('adds new visualiztion via the top nav link', async () => {
         const originalPanelCount = await PageObjects.dashboard.getPanelCount();
         await PageObjects.dashboard.switchToEditMode();
+        await dashboardAddPanel.clickCreateNewLink();
+        await PageObjects.visualize.clickAreaChart();
+        await PageObjects.visualize.clickNewSearch();
+        await PageObjects.visualize.saveVisualizationExpectSuccess(
+          'visualization from top nav add new panel'
+        );
+        await retry.try(async () => {
+          const panelCount = await PageObjects.dashboard.getPanelCount();
+          expect(panelCount).to.eql(originalPanelCount + 1);
+        });
+        await PageObjects.dashboard.waitForRenderComplete();
+      });
+
+      it('adds a new visualization', async () => {
+        const originalPanelCount = await PageObjects.dashboard.getPanelCount();
         await dashboardAddPanel.ensureAddPanelIsShowing();
         await dashboardAddPanel.clickAddNewEmbeddableLink('visualization');
         await PageObjects.visualize.clickAreaChart();
diff --git a/test/functional/services/dashboard/add_panel.js b/test/functional/services/dashboard/add_panel.js
index 91e7c15c4f1d9..6259203982161 100644
--- a/test/functional/services/dashboard/add_panel.js
+++ b/test/functional/services/dashboard/add_panel.js
@@ -32,6 +32,13 @@ export function DashboardAddPanelProvider({ getService, getPageObjects }) {
       await PageObjects.common.sleep(500);
     }
 
+    async clickCreateNewLink() {
+      log.debug('DashboardAddPanel.clickAddNewPanelButton');
+      await testSubjects.click('dashboardAddNewPanelButton');
+      // Give some time for the animation to complete
+      await PageObjects.common.sleep(500);
+    }
+
     async clickAddNewEmbeddableLink(type) {
       await testSubjects.click('createNew');
       await testSubjects.click(`createNew-${type}`);

From f7a30498439c7cce2a856cd480ab8afed7eafdac Mon Sep 17 00:00:00 2001
From: Wylie Conlon <william.conlon@elastic.co>
Date: Mon, 23 Mar 2020 17:11:09 -0400
Subject: [PATCH 041/179] [Lens] Improve suggestions when dragging field for
 the second time (#60687)

* [Lens] Improve suggestions when dragging into an existing visualization

* Include 0 metrics case

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 .../indexpattern_suggestions.test.tsx         | 90 ++++++++++++++++---
 .../indexpattern_suggestions.ts               | 62 +++++++++----
 2 files changed, 120 insertions(+), 32 deletions(-)

diff --git a/x-pack/legacy/plugins/lens/public/indexpattern_datasource/indexpattern_suggestions.test.tsx b/x-pack/legacy/plugins/lens/public/indexpattern_datasource/indexpattern_suggestions.test.tsx
index 4e48d0c0987b5..e36622f876acd 100644
--- a/x-pack/legacy/plugins/lens/public/indexpattern_datasource/indexpattern_suggestions.test.tsx
+++ b/x-pack/legacy/plugins/lens/public/indexpattern_datasource/indexpattern_suggestions.test.tsx
@@ -780,7 +780,7 @@ describe('IndexPattern Data Source suggestions', () => {
         expect(suggestions[0].table.columns[0].operation.isBucketed).toBeFalsy();
       });
 
-      it('prepends a terms column on string field', () => {
+      it('appends a terms column on string field', () => {
         const initialState = stateWithNonEmptyTables();
         const suggestions = getDatasourceSuggestionsForField(initialState, '1', {
           name: 'dest',
@@ -795,7 +795,7 @@ describe('IndexPattern Data Source suggestions', () => {
               layers: {
                 previousLayer: initialState.layers.previousLayer,
                 currentLayer: expect.objectContaining({
-                  columnOrder: ['id1', 'cola', 'colb'],
+                  columnOrder: ['cola', 'id1', 'colb'],
                   columns: {
                     ...initialState.layers.currentLayer.columns,
                     id1: expect.objectContaining({
@@ -810,7 +810,7 @@ describe('IndexPattern Data Source suggestions', () => {
         );
       });
 
-      it('appends a metric column on a number field', () => {
+      it('replaces a metric column on a number field if only one other metric is already set', () => {
         const initialState = stateWithNonEmptyTables();
         const suggestions = getDatasourceSuggestionsForField(initialState, '1', {
           name: 'memory',
@@ -819,15 +819,57 @@ describe('IndexPattern Data Source suggestions', () => {
           searchable: true,
         });
 
+        expect(suggestions).toContainEqual(
+          expect.objectContaining({
+            state: expect.objectContaining({
+              layers: expect.objectContaining({
+                currentLayer: expect.objectContaining({
+                  columnOrder: ['cola', 'id1'],
+                  columns: {
+                    cola: initialState.layers.currentLayer.columns.cola,
+                    id1: expect.objectContaining({
+                      operationType: 'avg',
+                      sourceField: 'memory',
+                    }),
+                  },
+                }),
+              }),
+            }),
+          })
+        );
+      });
+
+      it('adds a metric column on a number field if no other metrics set', () => {
+        const initialState = stateWithNonEmptyTables();
+        const modifiedState: IndexPatternPrivateState = {
+          ...initialState,
+          layers: {
+            ...initialState.layers,
+            currentLayer: {
+              ...initialState.layers.currentLayer,
+              columns: {
+                cola: initialState.layers.currentLayer.columns.cola,
+              },
+              columnOrder: ['cola'],
+            },
+          },
+        };
+        const suggestions = getDatasourceSuggestionsForField(modifiedState, '1', {
+          name: 'memory',
+          type: 'number',
+          aggregatable: true,
+          searchable: true,
+        });
+
         expect(suggestions).toContainEqual(
           expect.objectContaining({
             state: expect.objectContaining({
               layers: {
-                previousLayer: initialState.layers.previousLayer,
+                previousLayer: modifiedState.layers.previousLayer,
                 currentLayer: expect.objectContaining({
-                  columnOrder: ['cola', 'colb', 'id1'],
+                  columnOrder: ['cola', 'id1'],
                   columns: {
-                    ...initialState.layers.currentLayer.columns,
+                    ...modifiedState.layers.currentLayer.columns,
                     id1: expect.objectContaining({
                       operationType: 'avg',
                       sourceField: 'memory',
@@ -840,10 +882,30 @@ describe('IndexPattern Data Source suggestions', () => {
         );
       });
 
-      it('appends a metric column with a different operation on a number field if field is already in use', () => {
+      it('adds a metric column on a number field if 2 or more other metric', () => {
         const initialState = stateWithNonEmptyTables();
-        const suggestions = getDatasourceSuggestionsForField(initialState, '1', {
-          name: 'bytes',
+        const modifiedState: IndexPatternPrivateState = {
+          ...initialState,
+          layers: {
+            ...initialState.layers,
+            currentLayer: {
+              ...initialState.layers.currentLayer,
+              columns: {
+                ...initialState.layers.currentLayer.columns,
+                colc: {
+                  dataType: 'number',
+                  isBucketed: false,
+                  sourceField: 'dest',
+                  label: 'Unique count of dest',
+                  operationType: 'cardinality',
+                },
+              },
+              columnOrder: ['cola', 'colb', 'colc'],
+            },
+          },
+        };
+        const suggestions = getDatasourceSuggestionsForField(modifiedState, '1', {
+          name: 'memory',
           type: 'number',
           aggregatable: true,
           searchable: true,
@@ -853,14 +915,14 @@ describe('IndexPattern Data Source suggestions', () => {
           expect.objectContaining({
             state: expect.objectContaining({
               layers: {
-                previousLayer: initialState.layers.previousLayer,
+                previousLayer: modifiedState.layers.previousLayer,
                 currentLayer: expect.objectContaining({
-                  columnOrder: ['cola', 'colb', 'id1'],
+                  columnOrder: ['cola', 'colb', 'colc', 'id1'],
                   columns: {
-                    ...initialState.layers.currentLayer.columns,
+                    ...modifiedState.layers.currentLayer.columns,
                     id1: expect.objectContaining({
-                      operationType: 'sum',
-                      sourceField: 'bytes',
+                      operationType: 'avg',
+                      sourceField: 'memory',
                     }),
                   },
                 }),
diff --git a/x-pack/legacy/plugins/lens/public/indexpattern_datasource/indexpattern_suggestions.ts b/x-pack/legacy/plugins/lens/public/indexpattern_datasource/indexpattern_suggestions.ts
index 35e99fc4fe98d..96127caa67bb4 100644
--- a/x-pack/legacy/plugins/lens/public/indexpattern_datasource/indexpattern_suggestions.ts
+++ b/x-pack/legacy/plugins/lens/public/indexpattern_datasource/indexpattern_suggestions.ts
@@ -197,16 +197,29 @@ function addFieldAsMetricOperation(
     field,
   });
   const newColumnId = generateId();
-  const updatedColumns = {
-    ...layer.columns,
-    [newColumnId]: newColumn,
-  };
-  const updatedColumnOrder = [...layer.columnOrder, newColumnId];
+
+  const [, metrics] = separateBucketColumns(layer);
+
+  // Add metrics if there are 0 or > 1 metric
+  if (metrics.length !== 1) {
+    return {
+      indexPatternId: indexPattern.id,
+      columns: {
+        ...layer.columns,
+        [newColumnId]: newColumn,
+      },
+      columnOrder: [...layer.columnOrder, newColumnId],
+    };
+  }
+
+  // If only one metric, replace instead of add
+  const newColumns = { ...layer.columns, [newColumnId]: newColumn };
+  delete newColumns[metrics[0]];
 
   return {
     indexPatternId: indexPattern.id,
-    columns: updatedColumns,
-    columnOrder: updatedColumnOrder,
+    columns: newColumns,
+    columnOrder: [...layer.columnOrder.filter(c => c !== metrics[0]), newColumnId],
   };
 }
 
@@ -231,21 +244,34 @@ function addFieldAsBucketOperation(
     ...layer.columns,
     [newColumnId]: newColumn,
   };
+
+  const oldDateHistogramIndex = layer.columnOrder.findIndex(
+    columnId => layer.columns[columnId].operationType === 'date_histogram'
+  );
+  const oldDateHistogramId =
+    oldDateHistogramIndex > -1 ? layer.columnOrder[oldDateHistogramIndex] : null;
+
   let updatedColumnOrder: string[] = [];
-  if (applicableBucketOperation === 'terms') {
-    updatedColumnOrder = [newColumnId, ...buckets, ...metrics];
-  } else {
-    const oldDateHistogramColumn = layer.columnOrder.find(
-      columnId => layer.columns[columnId].operationType === 'date_histogram'
-    );
-    if (oldDateHistogramColumn) {
-      delete updatedColumns[oldDateHistogramColumn];
+  if (oldDateHistogramId) {
+    if (applicableBucketOperation === 'terms') {
+      // Insert the new terms bucket above the first date histogram
+      updatedColumnOrder = [
+        ...buckets.slice(0, oldDateHistogramIndex),
+        newColumnId,
+        ...buckets.slice(oldDateHistogramIndex, buckets.length),
+        ...metrics,
+      ];
+    } else if (applicableBucketOperation === 'date_histogram') {
+      // Replace date histogram with new date histogram
+      delete updatedColumns[oldDateHistogramId];
       updatedColumnOrder = layer.columnOrder.map(columnId =>
-        columnId !== oldDateHistogramColumn ? columnId : newColumnId
+        columnId !== oldDateHistogramId ? columnId : newColumnId
       );
-    } else {
-      updatedColumnOrder = [...buckets, newColumnId, ...metrics];
     }
+  } else {
+    // Insert the new bucket after existing buckets. Users will see the same data
+    // they already had, with an extra level of detail.
+    updatedColumnOrder = [...buckets, newColumnId, ...metrics];
   }
   return {
     indexPatternId: indexPattern.id,

From d5c13c043b9346233c91401091fd19fd607f7193 Mon Sep 17 00:00:00 2001
From: Dario Gieselaar <dario.gieselaar@elastic.co>
Date: Mon, 23 Mar 2020 22:13:32 +0100
Subject: [PATCH 042/179] [APM] use span.destination.service.resource (#60908)

* [APM] use span.destination.service.resource

Closes #60405.

* update snapshots

Co-authored-by: Nathan L Smith <smith@nlsmith.com>
---
 .../app/ServiceMap/cytoscapeOptions.ts        |   8 +-
 .../elasticsearch_fieldnames.test.ts.snap     |   6 +
 .../apm/common/elasticsearch_fieldnames.ts    |   2 +
 x-pack/plugins/apm/common/service_map.ts      |   6 +-
 .../dedupe_connections/index.test.ts          | 143 ++++++++++++++++++
 .../index.ts}                                 | 104 ++++++++++---
 .../get_service_map_from_trace_ids.ts         |  16 +-
 .../lib/service_map/get_trace_sample_ids.ts   |  25 +--
 8 files changed, 250 insertions(+), 60 deletions(-)
 create mode 100644 x-pack/plugins/apm/server/lib/service_map/dedupe_connections/index.test.ts
 rename x-pack/plugins/apm/server/lib/service_map/{dedupe_connections.ts => dedupe_connections/index.ts} (54%)

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 e19cb8ae4b646..e92a4fe797855 100644
--- a/x-pack/legacy/plugins/apm/public/components/app/ServiceMap/cytoscapeOptions.ts
+++ b/x-pack/legacy/plugins/apm/public/components/app/ServiceMap/cytoscapeOptions.ts
@@ -7,8 +7,8 @@ import theme from '@elastic/eui/dist/eui_theme_light.json';
 import cytoscape from 'cytoscape';
 import { CSSProperties } from 'react';
 import {
-  DESTINATION_ADDRESS,
-  SERVICE_NAME
+  SERVICE_NAME,
+  SPAN_DESTINATION_SERVICE_RESOURCE
 } from '../../../../../../../plugins/apm/common/elasticsearch_fieldnames';
 import { defaultIcon, iconForNode } from './icons';
 
@@ -59,7 +59,9 @@ const style: cytoscape.Stylesheet[] = [
       'ghost-opacity': 0.15,
       height: nodeHeight,
       label: (el: cytoscape.NodeSingular) =>
-        isService(el) ? el.data(SERVICE_NAME) : el.data(DESTINATION_ADDRESS),
+        isService(el)
+          ? el.data(SERVICE_NAME)
+          : el.data(SPAN_DESTINATION_SERVICE_RESOURCE),
       'min-zoomed-font-size': theme.euiSizeL,
       'overlay-opacity': 0,
       shape: (el: cytoscape.NodeSingular) =>
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 9a557532aae93..897d4e979fce3 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
@@ -76,6 +76,8 @@ exports[`Error SERVICE_VERSION 1`] = `undefined`;
 
 exports[`Error SPAN_ACTION 1`] = `undefined`;
 
+exports[`Error SPAN_DESTINATION_SERVICE_RESOURCE 1`] = `undefined`;
+
 exports[`Error SPAN_DURATION 1`] = `undefined`;
 
 exports[`Error SPAN_ID 1`] = `undefined`;
@@ -188,6 +190,8 @@ exports[`Span SERVICE_VERSION 1`] = `undefined`;
 
 exports[`Span SPAN_ACTION 1`] = `"my action"`;
 
+exports[`Span SPAN_DESTINATION_SERVICE_RESOURCE 1`] = `undefined`;
+
 exports[`Span SPAN_DURATION 1`] = `1337`;
 
 exports[`Span SPAN_ID 1`] = `"span id"`;
@@ -300,6 +304,8 @@ exports[`Transaction SERVICE_VERSION 1`] = `undefined`;
 
 exports[`Transaction SPAN_ACTION 1`] = `undefined`;
 
+exports[`Transaction SPAN_DESTINATION_SERVICE_RESOURCE 1`] = `undefined`;
+
 exports[`Transaction SPAN_DURATION 1`] = `undefined`;
 
 exports[`Transaction SPAN_ID 1`] = `undefined`;
diff --git a/x-pack/plugins/apm/common/elasticsearch_fieldnames.ts b/x-pack/plugins/apm/common/elasticsearch_fieldnames.ts
index 8f1b306a34eb0..822201baddd88 100644
--- a/x-pack/plugins/apm/common/elasticsearch_fieldnames.ts
+++ b/x-pack/plugins/apm/common/elasticsearch_fieldnames.ts
@@ -39,6 +39,8 @@ export const SPAN_SELF_TIME_SUM = 'span.self_time.sum.us';
 export const SPAN_ACTION = 'span.action';
 export const SPAN_NAME = 'span.name';
 export const SPAN_ID = 'span.id';
+export const SPAN_DESTINATION_SERVICE_RESOURCE =
+  'span.destination.service.resource';
 
 // Parent ID for a transaction or span
 export const PARENT_ID = 'parent.id';
diff --git a/x-pack/plugins/apm/common/service_map.ts b/x-pack/plugins/apm/common/service_map.ts
index 8c749cd00bd32..4a8608199c037 100644
--- a/x-pack/plugins/apm/common/service_map.ts
+++ b/x-pack/plugins/apm/common/service_map.ts
@@ -8,12 +8,12 @@ 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
+  SPAN_TYPE,
+  SPAN_DESTINATION_SERVICE_RESOURCE
 } from './elasticsearch_fieldnames';
 
 export interface ServiceConnectionNode {
@@ -23,7 +23,7 @@ export interface ServiceConnectionNode {
   [AGENT_NAME]: string;
 }
 export interface ExternalConnectionNode {
-  [DESTINATION_ADDRESS]: string;
+  [SPAN_DESTINATION_SERVICE_RESOURCE]: string;
   [SPAN_TYPE]: string;
   [SPAN_SUBTYPE]: string;
 }
diff --git a/x-pack/plugins/apm/server/lib/service_map/dedupe_connections/index.test.ts b/x-pack/plugins/apm/server/lib/service_map/dedupe_connections/index.test.ts
new file mode 100644
index 0000000000000..01d6a2e2e81bc
--- /dev/null
+++ b/x-pack/plugins/apm/server/lib/service_map/dedupe_connections/index.test.ts
@@ -0,0 +1,143 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { ServiceMapResponse } from './';
+import {
+  SPAN_DESTINATION_SERVICE_RESOURCE,
+  SERVICE_NAME,
+  SERVICE_ENVIRONMENT,
+  SERVICE_FRAMEWORK_NAME,
+  AGENT_NAME,
+  SPAN_TYPE,
+  SPAN_SUBTYPE
+} from '../../../../common/elasticsearch_fieldnames';
+import { dedupeConnections } from './';
+
+const nodejsService = {
+  [SERVICE_NAME]: 'opbeans-node',
+  [SERVICE_ENVIRONMENT]: 'production',
+  [SERVICE_FRAMEWORK_NAME]: null,
+  [AGENT_NAME]: 'nodejs'
+};
+
+const nodejsExternal = {
+  [SPAN_DESTINATION_SERVICE_RESOURCE]: 'opbeans-node',
+  [SPAN_TYPE]: 'external',
+  [SPAN_SUBTYPE]: 'aa'
+};
+
+const javaService = {
+  [SERVICE_NAME]: 'opbeans-java',
+  [SERVICE_ENVIRONMENT]: 'production',
+  [SERVICE_FRAMEWORK_NAME]: null,
+  [AGENT_NAME]: 'java'
+};
+
+describe('dedupeConnections', () => {
+  it('maps external destinations to internal services', () => {
+    const response: ServiceMapResponse = {
+      services: [nodejsService, javaService],
+      discoveredServices: [
+        {
+          from: nodejsExternal,
+          to: nodejsService
+        }
+      ],
+      connections: [
+        {
+          source: javaService,
+          destination: nodejsExternal
+        }
+      ]
+    };
+
+    const { elements } = dedupeConnections(response);
+
+    const connection = elements.find(
+      element => 'source' in element.data && 'target' in element.data
+    );
+
+    // @ts-ignore
+    expect(connection?.data.target).toBe('opbeans-node');
+
+    expect(
+      elements.find(element => element.data.id === '>opbeans-node')
+    ).toBeUndefined();
+  });
+
+  it('collapses external destinations based on span.destination.resource.name', () => {
+    const response: ServiceMapResponse = {
+      services: [nodejsService, javaService],
+      discoveredServices: [
+        {
+          from: nodejsExternal,
+          to: nodejsService
+        }
+      ],
+      connections: [
+        {
+          source: javaService,
+          destination: nodejsExternal
+        },
+        {
+          source: javaService,
+          destination: {
+            ...nodejsExternal,
+            [SPAN_TYPE]: 'foo'
+          }
+        }
+      ]
+    };
+
+    const { elements } = dedupeConnections(response);
+
+    const connections = elements.filter(element => 'source' in element.data);
+
+    expect(connections.length).toBe(1);
+
+    const nodes = elements.filter(element => !('source' in element.data));
+
+    expect(nodes.length).toBe(2);
+  });
+
+  it('picks the first span.type/subtype in an alphabetically sorted list', () => {
+    const response: ServiceMapResponse = {
+      services: [javaService],
+      discoveredServices: [],
+      connections: [
+        {
+          source: javaService,
+          destination: nodejsExternal
+        },
+        {
+          source: javaService,
+          destination: {
+            ...nodejsExternal,
+            [SPAN_TYPE]: 'foo'
+          }
+        },
+        {
+          source: javaService,
+          destination: {
+            ...nodejsExternal,
+            [SPAN_SUBTYPE]: 'bb'
+          }
+        }
+      ]
+    };
+
+    const { elements } = dedupeConnections(response);
+
+    const nodes = elements.filter(element => !('source' in element.data));
+
+    const nodejsNode = nodes.find(node => node.data.id === '>opbeans-node');
+
+    // @ts-ignore
+    expect(nodejsNode?.data[SPAN_TYPE]).toBe('external');
+    // @ts-ignore
+    expect(nodejsNode?.data[SPAN_SUBTYPE]).toBe('aa');
+  });
+});
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/index.ts
similarity index 54%
rename from x-pack/plugins/apm/server/lib/service_map/dedupe_connections.ts
rename to x-pack/plugins/apm/server/lib/service_map/dedupe_connections/index.ts
index 485958cc17afd..d256f657bb778 100644
--- a/x-pack/plugins/apm/server/lib/service_map/dedupe_connections.ts
+++ b/x-pack/plugins/apm/server/lib/service_map/dedupe_connections/index.ts
@@ -6,23 +6,25 @@
 import { isEqual, sortBy } from 'lodash';
 import { ValuesType } from 'utility-types';
 import {
-  DESTINATION_ADDRESS,
-  SERVICE_NAME
-} from '../../../common/elasticsearch_fieldnames';
+  SERVICE_NAME,
+  SPAN_DESTINATION_SERVICE_RESOURCE,
+  SPAN_TYPE,
+  SPAN_SUBTYPE
+} from '../../../../common/elasticsearch_fieldnames';
 import {
   Connection,
   ConnectionNode,
-  ExternalConnectionNode,
-  ServiceConnectionNode
-} from '../../../common/service_map';
-import { ConnectionsResponse, ServicesResponse } from './get_service_map';
+  ServiceConnectionNode,
+  ExternalConnectionNode
+} from '../../../../common/service_map';
+import { ConnectionsResponse, ServicesResponse } from '../get_service_map';
 
 function getConnectionNodeId(node: ConnectionNode): string {
-  if (DESTINATION_ADDRESS in node) {
+  if ('span.destination.service.resource' in node) {
     // use a prefix to distinguish exernal destination ids from services
-    return `>${(node as ExternalConnectionNode)[DESTINATION_ADDRESS]}`;
+    return `>${node[SPAN_DESTINATION_SERVICE_RESOURCE]}`;
   }
-  return (node as ServiceConnectionNode)[SERVICE_NAME];
+  return node[SERVICE_NAME];
 }
 
 function getConnectionId(connection: Connection) {
@@ -31,32 +33,86 @@ function getConnectionId(connection: Connection) {
   )}`;
 }
 
-type ServiceMapResponse = ConnectionsResponse & { services: ServicesResponse };
+export type ServiceMapResponse = ConnectionsResponse & {
+  services: ServicesResponse;
+};
 
 export function dedupeConnections(response: ServiceMapResponse) {
   const { discoveredServices, services, connections } = response;
 
-  const serviceNodes = services.map(service => ({
-    ...service,
-    id: service[SERVICE_NAME]
-  }));
+  const allNodes = connections
+    .flatMap(connection => [connection.source, connection.destination])
+    .map(node => ({ ...node, id: getConnectionNodeId(node) }))
+    .concat(
+      services.map(service => ({
+        ...service,
+        id: service[SERVICE_NAME]
+      }))
+    );
 
-  // maps destination.address to service.name if possible
-  function getConnectionNode(node: ConnectionNode) {
-    let mappedNode: ConnectionNode | undefined;
+  const serviceNodes = allNodes.filter(node => SERVICE_NAME in node) as Array<
+    ServiceConnectionNode & {
+      id: string;
+    }
+  >;
 
-    if (DESTINATION_ADDRESS in node) {
-      mappedNode = discoveredServices.find(map => isEqual(map.from, node))?.to;
+  const externalNodes = allNodes.filter(
+    node => SPAN_DESTINATION_SERVICE_RESOURCE in node
+  ) as Array<
+    ExternalConnectionNode & {
+      id: string;
+    }
+  >;
+
+  // 1. maps external nodes to internal services
+  // 2. collapses external nodes into one node based on span.destination.service.resource
+  // 3. picks the first available span.type/span.subtype in an alphabetically sorted list
+  const nodeMap = allNodes.reduce((map, node) => {
+    if (map[node.id]) {
+      return map;
     }
 
-    if (!mappedNode) {
-      mappedNode = node;
+    const service =
+      discoveredServices.find(({ from }) => {
+        if ('span.destination.service.resource' in node) {
+          return (
+            node[SPAN_DESTINATION_SERVICE_RESOURCE] ===
+            from[SPAN_DESTINATION_SERVICE_RESOURCE]
+          );
+        }
+        return false;
+      })?.to ?? serviceNodes.find(serviceNode => serviceNode.id === node.id);
+
+    if (service) {
+      return {
+        ...map,
+        [node.id]: {
+          id: service[SERVICE_NAME],
+          ...service
+        }
+      };
     }
 
+    const allMatchedExternalNodes = externalNodes.filter(n => n.id === node.id);
+
+    const firstMatchedNode = allMatchedExternalNodes[0];
+
     return {
-      ...mappedNode,
-      id: getConnectionNodeId(mappedNode)
+      ...map,
+      [node.id]: {
+        ...firstMatchedNode,
+        label: firstMatchedNode[SPAN_DESTINATION_SERVICE_RESOURCE],
+        [SPAN_TYPE]: allMatchedExternalNodes.map(n => n[SPAN_TYPE]).sort()[0],
+        [SPAN_SUBTYPE]: allMatchedExternalNodes
+          .map(n => n[SPAN_SUBTYPE])
+          .sort()[0]
+      }
     };
+  }, {} as Record<string, ConnectionNode & { id: string }>);
+
+  // maps destination.address to service.name if possible
+  function getConnectionNode(node: ConnectionNode) {
+    return nodeMap[getConnectionNodeId(node)];
   }
 
   // build connections with mapped nodes
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 d6d9e9b875408..eaf3d63521a98 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
@@ -65,7 +65,7 @@ export async function getServiceMapFromTraceIds({
                   'parent.id',
                   'service.name',
                   'service.environment',
-                  'destination.address',
+                  'span.destination.service.resource',
                   'trace.id',
                   'processor.event',
                   'span.type',
@@ -103,7 +103,7 @@ export async function getServiceMapFromTraceIds({
               source: `
               def getDestination ( def event ) {
                 def destination = new HashMap();
-                destination['destination.address'] = event['destination.address'];
+                destination['span.destination.service.resource'] = event['span.destination.service.resource'];
                 destination['span.type'] = event['span.type'];
                 destination['span.subtype'] = event['span.subtype'];
                 return destination;
@@ -138,13 +138,11 @@ export async function getServiceMapFromTraceIds({
                     /* flag parent path for removal, as it has children */
                     context.locationsToRemove.add(parent.path);
 
-                    /* if the parent has 'destination.address' set, and the service is different,
+                    /* if the parent has 'span.destination.service.resource' set, and the service is different,
                     we've discovered a service */
 
-                    if (parent['destination.address'] != null
-                      && parent['destination.address'] != ""
-                      && (parent['span.type'] == 'external'
-                        || parent['span.type'] == 'messaging')
+                    if (parent['span.destination.service.resource'] != null
+                      && parent['span.destination.service.resource'] != ""
                       && (parent['service.name'] != event['service.name']
                         || parent['service.environment'] != event['service.environment']
                       )
@@ -165,8 +163,8 @@ export async function getServiceMapFromTraceIds({
                 }
 
                 /* if there is an outgoing span, create a new path */
-                if (event['destination.address'] != null
-                  && event['destination.address'] != '') {
+                if (event['span.destination.service.resource'] != null
+                  && event['span.destination.service.resource'] != '') {
                   def outgoingLocation = getDestination(event);
                   def outgoingPath = new ArrayList(basePath);
                   outgoingPath.add(outgoingLocation);
diff --git a/x-pack/plugins/apm/server/lib/service_map/get_trace_sample_ids.ts b/x-pack/plugins/apm/server/lib/service_map/get_trace_sample_ids.ts
index f4e12df5d6a66..9cb1a61e1d76f 100644
--- a/x-pack/plugins/apm/server/lib/service_map/get_trace_sample_ids.ts
+++ b/x-pack/plugins/apm/server/lib/service_map/get_trace_sample_ids.ts
@@ -16,9 +16,7 @@ import {
   SERVICE_NAME,
   SERVICE_ENVIRONMENT,
   TRACE_ID,
-  DESTINATION_ADDRESS,
-  SPAN_TYPE,
-  SPAN_SUBTYPE
+  SPAN_DESTINATION_SERVICE_RESOURCE
 } from '../../../common/elasticsearch_fieldnames';
 
 const MAX_TRACES_TO_INSPECT = 1000;
@@ -46,7 +44,7 @@ export async function getTraceSampleIds({
         },
         {
           exists: {
-            field: DESTINATION_ADDRESS
+            field: SPAN_DESTINATION_SERVICE_RESOURCE
           }
         },
         rangeQuery
@@ -82,9 +80,9 @@ export async function getTraceSampleIds({
           composite: {
             sources: [
               {
-                [DESTINATION_ADDRESS]: {
+                [SPAN_DESTINATION_SERVICE_RESOURCE]: {
                   terms: {
-                    field: DESTINATION_ADDRESS
+                    field: SPAN_DESTINATION_SERVICE_RESOURCE
                   }
                 }
               },
@@ -102,21 +100,6 @@ export async function getTraceSampleIds({
                     missing_bucket: true
                   }
                 }
-              },
-              {
-                [SPAN_TYPE]: {
-                  terms: {
-                    field: SPAN_TYPE
-                  }
-                }
-              },
-              {
-                [SPAN_SUBTYPE]: {
-                  terms: {
-                    field: SPAN_SUBTYPE,
-                    missing_bucket: true
-                  }
-                }
               }
             ],
             size: fingerprintBucketSize

From a0a85dbb90a6aca8dc17081ed9168219ab90de36 Mon Sep 17 00:00:00 2001
From: Nathan L Smith <nathan.smith@elastic.co>
Date: Mon, 23 Mar 2020 16:13:56 -0500
Subject: [PATCH 043/179] Simplify service map layout (#60949)

Clean up the cytoscape component and event handlers to simplify the layout logic.

Make all centering animations animated.

Add logging of cytoscape events when we're in debug mode.

Add Elasticsearch icon.
---
 .../app/ServiceMap/Cytoscape.stories.tsx      |  8 ++
 .../components/app/ServiceMap/Cytoscape.tsx   | 94 +++++++++----------
 .../app/ServiceMap/Popover/index.tsx          |  6 +-
 .../app/ServiceMap/cytoscapeOptions.ts        |  5 -
 .../public/components/app/ServiceMap/icons.ts |  9 +-
 .../app/ServiceMap/icons/elasticsearch.svg    |  1 +
 6 files changed, 69 insertions(+), 54 deletions(-)
 create mode 100644 x-pack/legacy/plugins/apm/public/components/app/ServiceMap/icons/elasticsearch.svg

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 155695f7596dd..7a066b520cc3b 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
@@ -77,6 +77,14 @@ storiesOf('app/ServiceMap/Cytoscape', module)
         { data: { id: 'default' } },
         { data: { id: 'cache', label: 'cache', 'span.type': 'cache' } },
         { data: { id: 'database', label: 'database', 'span.type': 'db' } },
+        {
+          data: {
+            id: 'elasticsearch',
+            label: 'elasticsearch',
+            'span.type': 'db',
+            'span.subtype': 'elasticsearch'
+          }
+        },
         {
           data: { id: 'external', label: 'external', 'span.type': 'external' }
         },
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 e0a188b4915a2..a4cd6f4ed09a9 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
@@ -9,7 +9,6 @@ import React, {
   createContext,
   CSSProperties,
   ReactNode,
-  useCallback,
   useEffect,
   useRef,
   useState
@@ -109,23 +108,26 @@ export function Cytoscape({
   serviceName,
   style
 }: CytoscapeProps) {
-  const initialElements = elements.map(element => ({
-    ...element,
-    // prevents flash of unstyled elements
-    classes: [element.classes, 'invisible'].join(' ').trim()
-  }));
-
   const [ref, cy] = useCytoscape({
     ...cytoscapeOptions,
-    elements: initialElements
+    elements
   });
 
   // Add the height to the div style. The height is a separate prop because it
   // is required and can trigger rendering when changed.
   const divStyle = { ...style, height };
 
-  const resetConnectedEdgeStyle = useCallback(
-    (node?: cytoscape.NodeSingular) => {
+  // Trigger a custom "data" event when data changes
+  useEffect(() => {
+    if (cy && elements.length > 0) {
+      cy.add(elements);
+      cy.trigger('data');
+    }
+  }, [cy, elements]);
+
+  // Set up cytoscape event handlers
+  useEffect(() => {
+    const resetConnectedEdgeStyle = (node?: cytoscape.NodeSingular) => {
       if (cy) {
         cy.edges().removeClass('highlight');
 
@@ -133,12 +135,9 @@ export function Cytoscape({
           node.connectedEdges().addClass('highlight');
         }
       }
-    },
-    [cy]
-  );
+    };
 
-  const dataHandler = useCallback<cytoscape.EventHandler>(
-    event => {
+    const dataHandler: cytoscape.EventHandler = event => {
       if (cy) {
         if (serviceName) {
           resetConnectedEdgeStyle(cy.getElementById(serviceName));
@@ -150,36 +149,25 @@ export function Cytoscape({
         } else {
           resetConnectedEdgeStyle();
         }
-        if (event.cy.elements().length > 0) {
-          const selectedRoots = selectRoots(event.cy);
-          const layout = cy.layout(
-            getLayoutOptions(selectedRoots, height, width)
-          );
-          layout.one('layoutstop', () => {
-            if (serviceName) {
-              const focusedNode = cy.getElementById(serviceName);
-              cy.center(focusedNode);
-            }
-            // show elements after layout is applied
-            cy.elements().removeClass('invisible');
-          });
-          layout.run();
-        }
-      }
-    },
-    [cy, resetConnectedEdgeStyle, serviceName, height, width]
-  );
 
-  // Trigger a custom "data" event when data changes
-  useEffect(() => {
-    if (cy) {
-      cy.add(elements);
-      cy.trigger('data');
-    }
-  }, [cy, elements]);
+        const selectedRoots = selectRoots(event.cy);
+        const layout = cy.layout(
+          getLayoutOptions(selectedRoots, height, width)
+        );
 
-  // Set up cytoscape event handlers
-  useEffect(() => {
+        layout.run();
+      }
+    };
+    const layoutstopHandler: cytoscape.EventHandler = event => {
+      event.cy.animate({
+        ...animationOptions,
+        center: {
+          eles: serviceName
+            ? event.cy.getElementById(serviceName)
+            : event.cy.collection()
+        }
+      });
+    };
     const mouseoverHandler: cytoscape.EventHandler = event => {
       event.target.addClass('hover');
       event.target.connectedEdges().addClass('nodeHover');
@@ -194,10 +182,18 @@ export function Cytoscape({
     const unselectHandler: cytoscape.EventHandler = event => {
       resetConnectedEdgeStyle();
     };
+    const debugHandler: cytoscape.EventHandler = event => {
+      const debugEnabled = sessionStorage.getItem('apm_debug') === 'true';
+      if (debugEnabled) {
+        // eslint-disable-next-line no-console
+        console.debug('cytoscape:', event);
+      }
+    };
 
     if (cy) {
+      cy.on('data layoutstop select unselect', debugHandler);
       cy.on('data', dataHandler);
-      cy.ready(dataHandler);
+      cy.on('layoutstop', layoutstopHandler);
       cy.on('mouseover', 'edge, node', mouseoverHandler);
       cy.on('mouseout', 'edge, node', mouseoutHandler);
       cy.on('select', 'node', selectHandler);
@@ -207,15 +203,19 @@ export function Cytoscape({
     return () => {
       if (cy) {
         cy.removeListener(
-          'data',
+          'data layoutstop select unselect',
           undefined,
-          dataHandler as cytoscape.EventHandler
+          debugHandler
         );
+        cy.removeListener('data', undefined, dataHandler);
+        cy.removeListener('layoutstop', undefined, layoutstopHandler);
         cy.removeListener('mouseover', 'edge, node', mouseoverHandler);
         cy.removeListener('mouseout', 'edge, node', mouseoutHandler);
+        cy.removeListener('select', 'node', selectHandler);
+        cy.removeListener('unselect', 'node', unselectHandler);
       }
     };
-  }, [cy, dataHandler, resetConnectedEdgeStyle, serviceName]);
+  }, [cy, height, serviceName, width]);
 
   return (
     <CytoscapeContext.Provider value={cy}>
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 13aa53a8cf4b2..102b135f3cd1f 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
@@ -17,6 +17,7 @@ import React, {
 import { SERVICE_NAME } from '../../../../../../../../plugins/apm/common/elasticsearch_fieldnames';
 import { CytoscapeContext } from '../Cytoscape';
 import { Contents } from './Contents';
+import { animationOptions } from '../cytoscapeOptions';
 
 interface PopoverProps {
   focusedServiceName?: string;
@@ -88,7 +89,10 @@ export function Popover({ focusedServiceName }: PopoverProps) {
 
   const centerSelectedNode = useCallback(() => {
     if (cy) {
-      cy.center(cy.getElementById(selectedNodeServiceName));
+      cy.animate({
+        ...animationOptions,
+        center: { eles: cy.getElementById(selectedNodeServiceName) }
+      });
     }
   }, [cy, selectedNodeServiceName]);
 
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 e92a4fe797855..413458f336e6f 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
@@ -115,11 +115,6 @@ const style: cytoscape.Stylesheet[] = [
     selector: 'edge[isInverseEdge]',
     style: { visibility: 'hidden' }
   },
-  // @ts-ignore
-  {
-    selector: '.invisible',
-    style: { visibility: 'hidden' }
-  },
   {
     selector: 'edge.nodeHover',
     style: {
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 5102dfc02f757..4925ffba310b5 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
@@ -8,12 +8,14 @@ import cytoscape from 'cytoscape';
 import {
   AGENT_NAME,
   SERVICE_NAME,
-  SPAN_TYPE
+  SPAN_TYPE,
+  SPAN_SUBTYPE
 } 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 elasticsearchIcon from './icons/elasticsearch.svg';
 import globeIcon from './icons/globe.svg';
 import goIcon from './icons/go.svg';
 import javaIcon from './icons/java.svg';
@@ -63,6 +65,11 @@ export function iconForNode(node: cytoscape.NodeSingular) {
     return serviceIcons[node.data(AGENT_NAME) as string];
   } else if (isIE11) {
     return defaultIcon;
+  } else if (
+    node.data(SPAN_TYPE) === 'db' &&
+    node.data(SPAN_SUBTYPE) === 'elasticsearch'
+  ) {
+    return elasticsearchIcon;
   } else if (icons[type]) {
     return icons[type];
   } else {
diff --git a/x-pack/legacy/plugins/apm/public/components/app/ServiceMap/icons/elasticsearch.svg b/x-pack/legacy/plugins/apm/public/components/app/ServiceMap/icons/elasticsearch.svg
new file mode 100644
index 0000000000000..4f9fda36ba06a
--- /dev/null
+++ b/x-pack/legacy/plugins/apm/public/components/app/ServiceMap/icons/elasticsearch.svg
@@ -0,0 +1 @@
+<svg width="32" height="32" viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg" class="euiIcon euiIcon--xLarge euiIcon-isLoaded" focusable="false" role="img" aria-hidden="true"><g fill="black" fill-rule="evenodd"><path class="euiIcon__fillNegative" d="M2 16c0 1.384.194 2.72.524 4H22a4 4 0 000-8H2.524A15.984 15.984 0 002 16"></path><path fill="#FEC514" d="M28.924 7.662A15.381 15.381 0 0030.48 6C27.547 2.346 23.05 0 18 0 11.679 0 6.239 3.678 3.644 9H25.51a5.039 5.039 0 003.413-1.338"></path><path fill="#00BFB3" d="M25.51 23H3.645C6.24 28.323 11.679 32 18 32c5.05 0 9.547-2.346 12.48-6a15.381 15.381 0 00-1.556-1.662A5.034 5.034 0 0025.51 23"></path></g></svg>

From dd93a14fefebd70a64165adfae3dcc3512f8e623 Mon Sep 17 00:00:00 2001
From: Brent Kimmel <bkimmel@users.noreply.github.com>
Date: Mon, 23 Mar 2020 17:17:52 -0400
Subject: [PATCH 044/179] Resolver/nodedesign 25 (#60630)

* PR base

* adds designed resolver nodes

* adjust distance between nodes

* WIP remove stroke

* WIP changes to meet mocks

* new boxes

* remove animation

* new box assets

* baby resolver running nodes complete

* cleanup defs, add running trigger cube

* added 2 more defs for process cubes

* adding switched for assets on node component

* vacuuming defs file

* adjusting types and references to new event model

* switch background to full shade for contrast

* switch background to full shade for contrast

* cube, animation and a11y changes to 25% nodes

* PR base

* adds designed resolver nodes

* adjust distance between nodes

* WIP remove stroke

* WIP changes to meet mocks

* new boxes

* remove animation

* new box assets

* baby resolver running nodes complete

* cleanup defs, add running trigger cube

* added 2 more defs for process cubes

* adding switched for assets on node component

* vacuuming defs file

* adjusting types and references to new event model

* switch background to full shade for contrast

* cube, animation and a11y changes to 25% nodes

* merge upstream

* change from Legacy to new Resolver event

* cleaning up unused styles

* fix adjacency map issues

* fix process type to cube mapping

* fix typing on selctor

* set viewport to strict

* remove unused types

* fixes ci / testing issues

* feedback from Jon Buttner

* fix index from Jon Buttner comment

* reset focus state on nodes

* Robert review: changing adjacency map property names for better semantics

* Robert Austin review: changing var name

* Robert Austin review: rearrange code for readability

* Robert Austin review: change const name

* Robert Austin review: rearranging code for readability

* Robert Austin review: adjustments to process_event_dot

* Robert Austin review: replace level getter

* Robert Austin review: removing unnecessary casting

* Robert Austin review: adjust selector

* Robert Austin review: fix setting parent map

* Robert Austin review: replace function with consts

* K Qualters review: change return type of function

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 .../resolver/models/indexed_process_tree.ts   |  82 +++-
 .../embeddables/resolver/store/actions.ts     |  15 +-
 .../data/__snapshots__/graphing.test.ts.snap  | 116 +++---
 .../resolver/store/data/selectors.ts          |  42 +-
 .../embeddables/resolver/store/reducer.ts     |  16 +-
 .../embeddables/resolver/store/selectors.ts   |   5 +
 .../public/embeddables/resolver/types.ts      |  36 ++
 .../public/embeddables/resolver/view/defs.tsx | 381 ++++++++++++++++++
 .../embeddables/resolver/view/edge_line.tsx   |   3 +-
 .../embeddables/resolver/view/index.tsx       |  63 ++-
 .../resolver/view/process_event_dot.tsx       | 245 ++++++++++-
 11 files changed, 887 insertions(+), 117 deletions(-)
 create mode 100644 x-pack/plugins/endpoint/public/embeddables/resolver/view/defs.tsx

diff --git a/x-pack/plugins/endpoint/public/embeddables/resolver/models/indexed_process_tree.ts b/x-pack/plugins/endpoint/public/embeddables/resolver/models/indexed_process_tree.ts
index c9a03f0a47968..967a2c10f14c3 100644
--- a/x-pack/plugins/endpoint/public/embeddables/resolver/models/indexed_process_tree.ts
+++ b/x-pack/plugins/endpoint/public/embeddables/resolver/models/indexed_process_tree.ts
@@ -5,7 +5,7 @@
  */
 
 import { uniquePidForProcess, uniqueParentPidForProcess } from './process_event';
-import { IndexedProcessTree } from '../types';
+import { IndexedProcessTree, AdjacentProcessMap } from '../types';
 import { ResolverEvent } from '../../../../common/types';
 import { levelOrder as baseLevelOrder } from '../lib/tree_sequencers';
 
@@ -15,21 +15,89 @@ import { levelOrder as baseLevelOrder } from '../lib/tree_sequencers';
 export function factory(processes: ResolverEvent[]): IndexedProcessTree {
   const idToChildren = new Map<string | undefined, ResolverEvent[]>();
   const idToValue = new Map<string, ResolverEvent>();
+  const idToAdjacent = new Map<string, AdjacentProcessMap>();
+
+  function emptyAdjacencyMap(id: string): AdjacentProcessMap {
+    return {
+      self: id,
+      parent: null,
+      firstChild: null,
+      previousSibling: null,
+      nextSibling: null,
+      level: 1,
+    };
+  }
+
+  const roots: ResolverEvent[] = [];
 
   for (const process of processes) {
-    idToValue.set(uniquePidForProcess(process), process);
+    const uniqueProcessPid = uniquePidForProcess(process);
+    idToValue.set(uniqueProcessPid, process);
+
+    const currentProcessAdjacencyMap: AdjacentProcessMap =
+      idToAdjacent.get(uniqueProcessPid) || emptyAdjacencyMap(uniqueProcessPid);
+    idToAdjacent.set(uniqueProcessPid, currentProcessAdjacencyMap);
+
     const uniqueParentPid = uniqueParentPidForProcess(process);
-    const processChildren = idToChildren.get(uniqueParentPid);
-    if (processChildren) {
-      processChildren.push(process);
+    const currentProcessSiblings = idToChildren.get(uniqueParentPid);
+
+    if (currentProcessSiblings) {
+      const previousProcessId = uniquePidForProcess(
+        currentProcessSiblings[currentProcessSiblings.length - 1]
+      );
+      currentProcessSiblings.push(process);
+      /**
+       * Update adjacency maps for current and previous entries
+       */
+      idToAdjacent.get(previousProcessId)!.nextSibling = uniqueProcessPid;
+      currentProcessAdjacencyMap.previousSibling = previousProcessId;
+      if (uniqueParentPid) {
+        currentProcessAdjacencyMap.parent = uniqueParentPid;
+      }
     } else {
       idToChildren.set(uniqueParentPid, [process]);
+
+      if (uniqueParentPid) {
+        /**
+         * Get the parent's map, otherwise set an empty one
+         */
+        const parentAdjacencyMap =
+          idToAdjacent.get(uniqueParentPid) ||
+          (idToAdjacent.set(uniqueParentPid, emptyAdjacencyMap(uniqueParentPid)),
+          idToAdjacent.get(uniqueParentPid))!;
+        // set firstChild for parent
+        parentAdjacencyMap.firstChild = uniqueProcessPid;
+        // set parent for current
+        currentProcessAdjacencyMap.parent = uniqueParentPid || null;
+      } else {
+        // In this case (no unique parent id), it must be a root
+        roots.push(process);
+      }
     }
   }
 
+  /**
+   * Scan adjacency maps from the top down and assign levels
+   */
+  function traverseLevels(currentProcessMap: AdjacentProcessMap, level: number = 1): void {
+    const nextLevel = level + 1;
+    if (currentProcessMap.nextSibling) {
+      traverseLevels(idToAdjacent.get(currentProcessMap.nextSibling)!, level);
+    }
+    if (currentProcessMap.firstChild) {
+      traverseLevels(idToAdjacent.get(currentProcessMap.firstChild)!, nextLevel);
+    }
+    currentProcessMap.level = level;
+  }
+
+  for (const treeRoot of roots) {
+    traverseLevels(idToAdjacent.get(uniquePidForProcess(treeRoot))!);
+  }
+
   return {
     idToChildren,
     idToProcess: idToValue,
+    idToAdjacent,
   };
 }
 
@@ -38,8 +106,8 @@ export function factory(processes: ResolverEvent[]): IndexedProcessTree {
  */
 export function children(tree: IndexedProcessTree, process: ResolverEvent): ResolverEvent[] {
   const id = uniquePidForProcess(process);
-  const processChildren = tree.idToChildren.get(id);
-  return processChildren === undefined ? [] : processChildren;
+  const currentProcessSiblings = tree.idToChildren.get(id);
+  return currentProcessSiblings === undefined ? [] : currentProcessSiblings;
 }
 
 /**
diff --git a/x-pack/plugins/endpoint/public/embeddables/resolver/store/actions.ts b/x-pack/plugins/endpoint/public/embeddables/resolver/store/actions.ts
index fec2078cc60c9..ceb5da2ca9098 100644
--- a/x-pack/plugins/endpoint/public/embeddables/resolver/store/actions.ts
+++ b/x-pack/plugins/endpoint/public/embeddables/resolver/store/actions.ts
@@ -43,10 +43,23 @@ interface UserChangedSelectedEvent {
 interface AppRequestedResolverData {
   readonly type: 'appRequestedResolverData';
 }
+/**
+ * When the user switches the active descendent of the Resolver.
+ */
+interface UserFocusedOnResolverNode {
+  readonly type: 'userFocusedOnResolverNode';
+  readonly payload: {
+    /**
+     * Used to identify the process node that should be brought into view.
+     */
+    readonly nodeId: string;
+  };
+}
 
 export type ResolverAction =
   | CameraAction
   | DataAction
   | UserBroughtProcessIntoView
   | UserChangedSelectedEvent
-  | AppRequestedResolverData;
+  | AppRequestedResolverData
+  | UserFocusedOnResolverNode;
diff --git a/x-pack/plugins/endpoint/public/embeddables/resolver/store/data/__snapshots__/graphing.test.ts.snap b/x-pack/plugins/endpoint/public/embeddables/resolver/store/data/__snapshots__/graphing.test.ts.snap
index b88652097eb5c..00abc27b25a83 100644
--- a/x-pack/plugins/endpoint/public/embeddables/resolver/store/data/__snapshots__/graphing.test.ts.snap
+++ b/x-pack/plugins/endpoint/public/embeddables/resolver/store/data/__snapshots__/graphing.test.ts.snap
@@ -41,128 +41,128 @@ Object {
         -0.8164965809277259,
       ],
       Array [
-        35.35533905932738,
-        -21.228911104120876,
+        70.71067811865476,
+        -41.641325627314025,
       ],
     ],
     Array [
       Array [
-        -35.35533905932738,
-        -62.053740150507174,
+        -70.71067811865476,
+        -123.29098372008661,
       ],
       Array [
-        106.06601717798213,
-        19.595917942265423,
+        212.13203435596427,
+        40.00833246545857,
       ],
     ],
     Array [
       Array [
-        -35.35533905932738,
-        -62.053740150507174,
+        -70.71067811865476,
+        -123.29098372008661,
       ],
       Array [
         0,
-        -82.46615467370032,
+        -164.1158127664729,
       ],
     ],
     Array [
       Array [
-        106.06601717798213,
-        19.595917942265423,
+        212.13203435596427,
+        40.00833246545857,
       ],
       Array [
-        141.4213562373095,
+        282.842712474619,
         -0.8164965809277259,
       ],
     ],
     Array [
       Array [
         0,
-        -82.46615467370032,
+        -164.1158127664729,
       ],
       Array [
-        35.35533905932738,
-        -102.87856919689347,
+        70.71067811865476,
+        -204.9406418128592,
       ],
     ],
     Array [
       Array [
         0,
-        -123.2909837200866,
+        -245.76547085924548,
       ],
       Array [
-        70.71067811865476,
-        -82.46615467370032,
+        141.4213562373095,
+        -164.1158127664729,
       ],
     ],
     Array [
       Array [
         0,
-        -123.2909837200866,
+        -245.76547085924548,
       ],
       Array [
-        35.35533905932738,
-        -143.70339824327976,
+        70.71067811865476,
+        -286.5902999056318,
       ],
     ],
     Array [
       Array [
-        70.71067811865476,
-        -82.46615467370032,
+        141.4213562373095,
+        -164.1158127664729,
       ],
       Array [
-        106.06601717798213,
-        -102.87856919689347,
+        212.13203435596427,
+        -204.9406418128592,
       ],
     ],
     Array [
       Array [
-        141.4213562373095,
+        282.842712474619,
         -0.8164965809277259,
       ],
       Array [
-        176.7766952966369,
-        -21.22891110412087,
+        353.5533905932738,
+        -41.64132562731401,
       ],
     ],
     Array [
       Array [
-        141.4213562373095,
-        -41.64132562731402,
+        282.842712474619,
+        -82.4661546737003,
       ],
       Array [
-        212.13203435596427,
+        424.26406871192853,
         -0.8164965809277259,
       ],
     ],
     Array [
       Array [
-        141.4213562373095,
-        -41.64132562731402,
+        282.842712474619,
+        -82.4661546737003,
       ],
       Array [
-        176.7766952966369,
-        -62.053740150507174,
+        353.5533905932738,
+        -123.29098372008661,
       ],
     ],
     Array [
       Array [
-        212.13203435596427,
+        424.26406871192853,
         -0.8164965809277259,
       ],
       Array [
-        247.48737341529164,
-        -21.228911104120883,
+        494.9747468305833,
+        -41.64132562731404,
       ],
     ],
     Array [
       Array [
-        247.48737341529164,
-        -21.228911104120883,
+        494.9747468305833,
+        -41.64132562731404,
       ],
       Array [
-        318.1980515339464,
-        -62.05374015050717,
+        636.3961030678928,
+        -123.2909837200866,
       ],
     ],
   ],
@@ -199,7 +199,7 @@ Object {
       },
     } => Array [
       0,
-      -82.46615467370032,
+      -164.1158127664729,
     ],
     Object {
       "@timestamp": 1582233383000,
@@ -215,7 +215,7 @@ Object {
         "unique_ppid": 0,
       },
     } => Array [
-      141.4213562373095,
+      282.842712474619,
       -0.8164965809277259,
     ],
     Object {
@@ -232,8 +232,8 @@ Object {
         "unique_ppid": 1,
       },
     } => Array [
-      35.35533905932738,
-      -143.70339824327976,
+      70.71067811865476,
+      -286.5902999056318,
     ],
     Object {
       "@timestamp": 1582233383000,
@@ -249,8 +249,8 @@ Object {
         "unique_ppid": 1,
       },
     } => Array [
-      106.06601717798213,
-      -102.87856919689347,
+      212.13203435596427,
+      -204.9406418128592,
     ],
     Object {
       "@timestamp": 1582233383000,
@@ -266,8 +266,8 @@ Object {
         "unique_ppid": 2,
       },
     } => Array [
-      176.7766952966369,
-      -62.053740150507174,
+      353.5533905932738,
+      -123.29098372008661,
     ],
     Object {
       "@timestamp": 1582233383000,
@@ -283,8 +283,8 @@ Object {
         "unique_ppid": 2,
       },
     } => Array [
-      247.48737341529164,
-      -21.228911104120883,
+      494.9747468305833,
+      -41.64132562731404,
     ],
     Object {
       "@timestamp": 1582233383000,
@@ -300,8 +300,8 @@ Object {
         "unique_ppid": 6,
       },
     } => Array [
-      318.1980515339464,
-      -62.05374015050717,
+      636.3961030678928,
+      -123.2909837200866,
     ],
   },
 }
@@ -316,8 +316,8 @@ Object {
         -0.8164965809277259,
       ],
       Array [
-        70.71067811865476,
-        -41.641325627314025,
+        141.4213562373095,
+        -82.46615467370032,
       ],
     ],
   ],
@@ -353,8 +353,8 @@ Object {
         "unique_ppid": 0,
       },
     } => Array [
-      70.71067811865476,
-      -41.641325627314025,
+      141.4213562373095,
+      -82.46615467370032,
     ],
   },
 }
diff --git a/x-pack/plugins/endpoint/public/embeddables/resolver/store/data/selectors.ts b/x-pack/plugins/endpoint/public/embeddables/resolver/store/data/selectors.ts
index e8007f82e30c2..5dda54d4ed029 100644
--- a/x-pack/plugins/endpoint/public/embeddables/resolver/store/data/selectors.ts
+++ b/x-pack/plugins/endpoint/public/embeddables/resolver/store/data/selectors.ts
@@ -13,11 +13,12 @@ import {
   EdgeLineSegment,
   ProcessWithWidthMetadata,
   Matrix3,
+  AdjacentProcessMap,
 } from '../../types';
 import { ResolverEvent } from '../../../../../common/types';
 import { Vector2 } from '../../types';
 import { add as vector2Add, applyMatrix3 } from '../../lib/vector2';
-import { isGraphableProcess } from '../../models/process_event';
+import { isGraphableProcess, uniquePidForProcess } from '../../models/process_event';
 import {
   factory as indexedProcessTreeFactory,
   children as indexedProcessTreeChildren,
@@ -27,7 +28,7 @@ import {
 } from '../../models/indexed_process_tree';
 
 const unit = 100;
-const distanceBetweenNodesInUnits = 1;
+const distanceBetweenNodesInUnits = 2;
 
 export function isLoading(state: DataState) {
   return state.isLoading;
@@ -392,17 +393,42 @@ function processPositions(
   return positions;
 }
 
-export const processNodePositionsAndEdgeLineSegments = createSelector(
+export const indexedProcessTree = createSelector(graphableProcesses, function indexedTree(
+  /* eslint-disable no-shadow */
+  graphableProcesses
+  /* eslint-enable no-shadow */
+) {
+  return indexedProcessTreeFactory(graphableProcesses);
+});
+
+export const processAdjacencies = createSelector(
+  indexedProcessTree,
   graphableProcesses,
-  function processNodePositionsAndEdgeLineSegments(
+  function selectProcessAdjacencies(
     /* eslint-disable no-shadow */
+    indexedProcessTree,
     graphableProcesses
     /* eslint-enable no-shadow */
   ) {
-    /**
-     * Index the tree, creating maps from id -> node and id -> children
-     */
-    const indexedProcessTree = indexedProcessTreeFactory(graphableProcesses);
+    const processToAdjacencyMap = new Map<ResolverEvent, AdjacentProcessMap>();
+    const { idToAdjacent } = indexedProcessTree;
+
+    for (const graphableProcess of graphableProcesses) {
+      const processPid = uniquePidForProcess(graphableProcess);
+      const adjacencyMap = idToAdjacent.get(processPid)!;
+      processToAdjacencyMap.set(graphableProcess, adjacencyMap);
+    }
+    return { processToAdjacencyMap };
+  }
+);
+
+export const processNodePositionsAndEdgeLineSegments = createSelector(
+  indexedProcessTree,
+  function processNodePositionsAndEdgeLineSegments(
+    /* eslint-disable no-shadow */
+    indexedProcessTree
+    /* eslint-enable no-shadow */
+  ) {
     /**
      * Walk the tree in reverse level order, calculating the 'width' of subtrees.
      */
diff --git a/x-pack/plugins/endpoint/public/embeddables/resolver/store/reducer.ts b/x-pack/plugins/endpoint/public/embeddables/resolver/store/reducer.ts
index 20c490b8998f9..1c66a998a4c22 100644
--- a/x-pack/plugins/endpoint/public/embeddables/resolver/store/reducer.ts
+++ b/x-pack/plugins/endpoint/public/embeddables/resolver/store/reducer.ts
@@ -7,11 +7,25 @@ import { Reducer, combineReducers } from 'redux';
 import { animateProcessIntoView } from './methods';
 import { cameraReducer } from './camera/reducer';
 import { dataReducer } from './data/reducer';
-import { ResolverState, ResolverAction } from '../types';
+import { ResolverState, ResolverAction, ResolverUIState } from '../types';
+
+const uiReducer: Reducer<ResolverUIState, ResolverAction> = (
+  uiState = { activeDescendentId: null },
+  action
+) => {
+  if (action.type === 'userFocusedOnResolverNode') {
+    return {
+      activeDescendentId: action.payload.nodeId,
+    };
+  } else {
+    return uiState;
+  }
+};
 
 const concernReducers = combineReducers({
   camera: cameraReducer,
   data: dataReducer,
+  ui: uiReducer,
 });
 
 export const resolverReducer: Reducer<ResolverState, ResolverAction> = (state, action) => {
diff --git a/x-pack/plugins/endpoint/public/embeddables/resolver/store/selectors.ts b/x-pack/plugins/endpoint/public/embeddables/resolver/store/selectors.ts
index 708eb684ebd3e..37482916496e7 100644
--- a/x-pack/plugins/endpoint/public/embeddables/resolver/store/selectors.ts
+++ b/x-pack/plugins/endpoint/public/embeddables/resolver/store/selectors.ts
@@ -54,6 +54,11 @@ export const processNodePositionsAndEdgeLineSegments = composeSelectors(
   dataSelectors.processNodePositionsAndEdgeLineSegments
 );
 
+export const processAdjacencies = composeSelectors(
+  dataStateSelector,
+  dataSelectors.processAdjacencies
+);
+
 /**
  * Returns the camera state from within ResolverState
  */
diff --git a/x-pack/plugins/endpoint/public/embeddables/resolver/types.ts b/x-pack/plugins/endpoint/public/embeddables/resolver/types.ts
index 4380d3ab98999..674553aba0937 100644
--- a/x-pack/plugins/endpoint/public/embeddables/resolver/types.ts
+++ b/x-pack/plugins/endpoint/public/embeddables/resolver/types.ts
@@ -23,6 +23,21 @@ export interface ResolverState {
    * Contains the state associated with event data (process events and possibly other event types).
    */
   readonly data: DataState;
+
+  /**
+   * Contains the state needed to maintain Resolver UI elements.
+   */
+  readonly ui: ResolverUIState;
+}
+
+/**
+ * Piece of redux state that models an animation for the camera.
+ */
+export interface ResolverUIState {
+  /**
+   * The ID attribute of the resolver's aria-activedescendent.
+   */
+  readonly activeDescendentId: string | null;
 }
 
 /**
@@ -174,9 +189,26 @@ export interface ProcessEvent {
     source_id?: number;
     process_name: string;
     process_path: string;
+    signature_status?: string;
   };
 }
 
+/**
+ * A map of Process Ids that indicate which processes are adjacent to a given process along
+ * directions in two axes: up/down and previous/next.
+ */
+export interface AdjacentProcessMap {
+  readonly self: string;
+  parent: string | null;
+  firstChild: string | null;
+  previousSibling: string | null;
+  nextSibling: string | null;
+  /**
+   * To support aria-level, this must be >= 1
+   */
+  level: number;
+}
+
 /**
  * A represention of a process tree with indices for O(1) access to children and values by id.
  */
@@ -189,6 +221,10 @@ export interface IndexedProcessTree {
    * Map of ID to process
    */
   idToProcess: Map<string, ResolverEvent>;
+  /**
+   * Map of ID to adjacent processes
+   */
+  idToAdjacent: Map<string, AdjacentProcessMap>;
 }
 
 /**
diff --git a/x-pack/plugins/endpoint/public/embeddables/resolver/view/defs.tsx b/x-pack/plugins/endpoint/public/embeddables/resolver/view/defs.tsx
new file mode 100644
index 0000000000000..799f67123ba26
--- /dev/null
+++ b/x-pack/plugins/endpoint/public/embeddables/resolver/view/defs.tsx
@@ -0,0 +1,381 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * 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, { memo } from 'react';
+import { saturate, lighten } from 'polished';
+
+import {
+  htmlIdGenerator,
+  euiPaletteForTemperature,
+  euiPaletteForStatus,
+  colorPalette,
+} from '@elastic/eui';
+
+/**
+ * Generating from `colorPalette` function: This could potentially
+ * pick up a palette shift and decouple from raw hex
+ */
+const [euiColorEmptyShade, , , , , euiColor85Shade, euiColorFullShade] = colorPalette(
+  ['#ffffff', '#000000'],
+  7
+);
+
+/**
+ * Base Colors - sourced from EUI
+ */
+const resolverPalette: Record<string, string | string[]> = {
+  temperatures: euiPaletteForTemperature(7),
+  statii: euiPaletteForStatus(7),
+  fullShade: euiColorFullShade,
+  emptyShade: euiColorEmptyShade,
+};
+
+/**
+ * Defines colors by semantics like so:
+ * `danger`, `attention`, `enabled`, `disabled`
+ * Or by function like:
+ * `colorBlindBackground`, `subMenuForeground`
+ */
+type ResolverColorNames =
+  | 'ok'
+  | 'empty'
+  | 'full'
+  | 'warning'
+  | 'strokeBehindEmpty'
+  | 'resolverBackground'
+  | 'runningProcessStart'
+  | 'runningProcessEnd'
+  | 'runningTriggerStart'
+  | 'runningTriggerEnd'
+  | 'activeNoWarning'
+  | 'activeWarning'
+  | 'fullLabelBackground'
+  | 'inertDescription';
+
+export const NamedColors: Record<ResolverColorNames, string> = {
+  ok: saturate(0.5, resolverPalette.temperatures[0]),
+  empty: euiColorEmptyShade,
+  full: euiColorFullShade,
+  strokeBehindEmpty: euiColor85Shade,
+  warning: resolverPalette.statii[3],
+  resolverBackground: euiColorFullShade,
+  runningProcessStart: '#006BB4',
+  runningProcessEnd: '#017D73',
+  runningTriggerStart: '#BD281E',
+  runningTriggerEnd: '#DD0A73',
+  activeNoWarning: '#0078FF',
+  activeWarning: '#C61F38',
+  fullLabelBackground: '#3B3C41',
+  inertDescription: '#747474',
+};
+
+const idGenerator = htmlIdGenerator();
+
+/**
+ * Ids of paint servers to be referenced by fill and stroke attributes
+ */
+export const PaintServerIds = {
+  runningProcess: idGenerator('psRunningProcess'),
+  runningTrigger: idGenerator('psRunningTrigger'),
+  runningProcessCube: idGenerator('psRunningProcessCube'),
+  runningTriggerCube: idGenerator('psRunningTriggerCube'),
+  terminatedProcessCube: idGenerator('psTerminatedProcessCube'),
+  terminatedTriggerCube: idGenerator('psTerminatedTriggerCube'),
+};
+
+/**
+ * PaintServers: Where color palettes, grandients, patterns and other similar concerns
+ * are exposed to the component
+ */
+const PaintServers = memo(() => (
+  <>
+    <linearGradient
+      id={PaintServerIds.runningProcess}
+      x1="0"
+      y1="0"
+      x2="1"
+      y2="0"
+      spreadMethod="reflect"
+      gradientUnits="objectBoundingBox"
+    >
+      <stop
+        offset="0%"
+        stopColor={saturate(0.7, lighten(0.05, NamedColors.runningProcessStart))}
+        stopOpacity="1"
+      />
+      <stop
+        offset="100%"
+        stopColor={saturate(0.7, lighten(0.05, NamedColors.runningProcessEnd))}
+        stopOpacity="1"
+      />
+    </linearGradient>
+    <linearGradient
+      id={PaintServerIds.runningTrigger}
+      x1="0"
+      y1="0"
+      x2="1"
+      y2="0"
+      spreadMethod="reflect"
+      gradientUnits="objectBoundingBox"
+    >
+      <stop
+        offset="0%"
+        stopColor={saturate(0.7, lighten(0.05, NamedColors.runningTriggerStart))}
+        stopOpacity="1"
+      />
+      <stop
+        offset="100%"
+        stopColor={saturate(0.7, lighten(0.05, NamedColors.runningTriggerEnd))}
+        stopOpacity="1"
+      />
+    </linearGradient>
+    <linearGradient
+      id={PaintServerIds.runningProcessCube}
+      x1="-382.33074"
+      y1="265.24689"
+      x2="-381.88086"
+      y2="264.46019"
+      gradientTransform="matrix(88, 0, 0, -100, 33669, 26535)"
+      gradientUnits="userSpaceOnUse"
+    >
+      <stop offset="0" stopColor={NamedColors.runningProcessStart} />
+      <stop offset="1" stopColor={NamedColors.runningProcessEnd} />
+    </linearGradient>
+    <linearGradient
+      id={PaintServerIds.runningTriggerCube}
+      x1="-382.32713"
+      y1="265.24057"
+      x2="-381.88108"
+      y2="264.46057"
+      gradientTransform="matrix(88, 0, 0, -100, 33669, 26535)"
+      gradientUnits="userSpaceOnUse"
+    >
+      <stop offset="0" stopColor="#bd281f" />
+      <stop offset="1" stopColor="#dc0b72" />
+    </linearGradient>
+    <linearGradient
+      id={PaintServerIds.terminatedProcessCube}
+      x1="-382.33074"
+      y1="265.24689"
+      x2="-381.88086"
+      y2="264.46019"
+      gradientTransform="matrix(88, 0, 0, -100, 33669, 26535)"
+      gradientUnits="userSpaceOnUse"
+    >
+      <stop offset="0" stopColor="#006bb4" />
+      <stop offset="1" stopColor="#017d73" />
+    </linearGradient>
+    <linearGradient
+      id={PaintServerIds.terminatedTriggerCube}
+      x1="-382.33074"
+      y1="265.24689"
+      x2="-381.88086"
+      y2="264.46019"
+      gradientTransform="matrix(88, 0, 0, -100, 33669, 26535)"
+      gradientUnits="userSpaceOnUse"
+    >
+      <stop offset="0" stopColor="#be2820" />
+      <stop offset="1" stopColor="#dc0b72" />
+    </linearGradient>
+  </>
+));
+
+/**
+ * Ids of symbols to be linked by <use> elements
+ */
+export const SymbolIds = {
+  processNode: idGenerator('nodeSymbol'),
+  solidHexagon: idGenerator('hexagon'),
+  runningProcessCube: idGenerator('runningCube'),
+  runningTriggerCube: idGenerator('runningTriggerCube'),
+  terminatedProcessCube: idGenerator('terminatedCube'),
+  terminatedTriggerCube: idGenerator('terminatedTriggerCube'),
+};
+
+/**
+ * Defs entries that define shapes, masks and other spatial elements
+ */
+const SymbolsAndShapes = memo(() => (
+  <>
+    <symbol id={SymbolIds.processNode} viewBox="0 0 144 25" preserveAspectRatio="xMidYMid meet">
+      <rect
+        x="1"
+        y="1"
+        width="142"
+        height="23"
+        fill="inherit"
+        strokeWidth="0"
+        paintOrder="normal"
+      />
+    </symbol>
+    <symbol id={SymbolIds.solidHexagon} viewBox="0 0 200 200" preserveAspectRatio="xMidYMid meet">
+      <g transform="translate(0,-97)">
+        <path
+          transform="matrix(1.6461 0 0 1.6596 -56.401 -64.183)"
+          d="m95.148 97.617 28.238 16.221 23.609 13.713 0.071 32.566-0.071 27.302-28.167 16.344-23.68 13.59-28.238-16.221-23.609-13.713-0.07098-32.566 0.07098-27.302 28.167-16.344z"
+          fill="inherit"
+          strokeWidth="15"
+          stroke="inherit"
+        />
+      </g>
+    </symbol>
+    <symbol id={SymbolIds.runningProcessCube} viewBox="0 0 88 100">
+      <title>Running Process</title>
+      <g>
+        <polygon
+          points="0 25.839 44.23 0 88 25.839 88 74.688 44.23 100 0 74.688 0 25.839"
+          fill="#1d1e24"
+        />
+        <polygon
+          points="44.23 100 44 50 0 25.839 0 74.664 44.23 100"
+          opacity="0.25179"
+          style={{ isolation: 'isolate' }}
+        />
+        <polygon
+          points="27 41.077 44.089 31 61 41.077 61 60.128 44.089 70 27 60.128 27 41.077"
+          fill="#fff"
+        />
+        <polygon points="44 31 61 41.077 61 60.128 44 50 44 31" fill="#d8d8d8" />
+        <polygon points="27 60.128 27 41.077 44 31 44 50 27 60.128" fill="#959595" />
+        <polygon
+          points="0 25.839 44.23 0 88 25.839 88 74.688 44.23 100 0 74.688 0 25.839"
+          opacity="0.74744"
+          fill={`url(#${PaintServerIds.runningProcessCube})`}
+          style={{ isolation: 'isolate' }}
+        />
+        <polygon
+          points="88 25.839 44.23 0 0 25.839 44 50 88 25.839"
+          fill="#fff"
+          opacity="0.13893"
+          style={{ isolation: 'isolate' }}
+        />
+        <polygon
+          points="44.23 100 44 50 0 25.839 0 74.664 44.23 100"
+          opacity="0.25179"
+          style={{ isolation: 'isolate' }}
+        />
+      </g>
+    </symbol>
+    <symbol id={SymbolIds.runningTriggerCube} viewBox="0 0 88 100">
+      <title>Running Trigger Process</title>
+      <g>
+        <polygon
+          points="0 25.839 44.23 0 88 25.839 88 74.688 44.23 100 0 74.688 0 25.839"
+          fill="#1d1e24"
+        />
+        <polygon
+          points="44.23 100 44 50 0 25.839 0 74.664 44.23 100"
+          opacity="0.25179"
+          style={{ isolation: 'isolate' }}
+        />
+        <polygon
+          points="27 41.077 44.089 31 61 41.077 61 60.128 44.089 70 27 60.128 27 41.077"
+          fill="#fff"
+        />
+        <polygon points="44 31 61 41.077 61 60.128 44 50 44 31" fill="#d8d8d8" />
+        <polygon points="27 60.128 27 41.077 44 31 44 50 27 60.128" fill="#959595" />
+        <polygon
+          points="0 25.839 44.23 0 88 25.839 88 74.688 44.23 100 0 74.688 0 25.839"
+          opacity="0.75"
+          fill={`url(#${PaintServerIds.runningTriggerCube})`}
+          style={{ isolation: 'isolate' }}
+        />
+        <polygon
+          points="88 25.839 44.23 0 0 25.839 44 50 88 25.839"
+          fill="#fff"
+          opacity="0.13893"
+          style={{ isolation: 'isolate' }}
+        />
+        <polygon
+          points="44.23 100 44 50 0 25.839 0 74.664 44.23 100"
+          opacity="0.25179"
+          style={{ isolation: 'isolate' }}
+        />
+      </g>
+    </symbol>
+    <symbol viewBox="0 0 88 100" id={SymbolIds.terminatedProcessCube}>
+      <title>Terminated Process</title>
+      <g>
+        <polygon
+          points="0 25.839 44.23 0 88 25.839 88 74.688 44.23 100 0 74.688 0 25.839"
+          fill="#1d1e24"
+        />
+        <polygon
+          points="44.23 100 44 50 0 25.839 0 74.664 44.23 100"
+          opacity="0.25179"
+          style={{ isolation: 'isolate' }}
+        />
+        <polygon
+          id="Path-4-Copy-15"
+          points="0 25.839 44.23 0 88 25.839 88 74.688 44.23 100 0 74.688 0 25.839"
+          opacity="0.35"
+          fill={`url(#${PaintServerIds.terminatedProcessCube})`}
+          style={{ isolation: 'isolate' }}
+        />
+        <polygon
+          id="Path-Copy-20"
+          points="88 25.839 44.23 0 0 25.839 44 50 88 25.839"
+          fill="#fff"
+          opacity="0.13893"
+          style={{ isolation: 'isolate' }}
+        />
+        <polygon
+          id="Path-Copy-21"
+          points="44.23 100 44 50 0 25.839 0 74.664 44.23 100"
+          opacity="0.25179"
+          style={{ isolation: 'isolate' }}
+        />
+      </g>
+    </symbol>
+    <svg id={SymbolIds.terminatedTriggerCube} viewBox="0 0 88 100">
+      <title>Terminated Trigger Process</title>
+      <g>
+        <polygon
+          points="0 25.839 44.23 0 88 25.839 88 74.688 44.23 100 0 74.688 0 25.839"
+          fill="#1d1e24"
+        />
+        <polygon
+          points="44.23 100 44 50 0 25.839 0 74.664 44.23 100"
+          opacity="0.25179"
+          style={{ isolation: 'isolate' }}
+        />
+        <polygon
+          points="0 25.839 44.23 0 88 25.839 88 74.688 44.23 100 0 74.688 0 25.839"
+          opacity="0.35"
+          fill={`url(#${PaintServerIds.terminatedTriggerCube})`}
+          style={{ isolation: 'isolate' }}
+        />
+        <polygon
+          points="88 25.839 44.23 0 0 25.839 44 50 88 25.839"
+          fill="#fff"
+          opacity="0.13893"
+          style={{ isolation: 'isolate' }}
+        />
+        <polygon
+          points="44.23 100 44 50 0 25.839 0 74.664 44.23 100"
+          opacity="0.25179"
+          style={{ isolation: 'isolate' }}
+        />
+      </g>
+    </svg>
+  </>
+));
+
+/**
+ * This <defs> element is used to define the reusable assets for the Resolver
+ * It confers sevral advantages, including but not limited to:
+ * 1) Freedom of form for creative assets (beyond box-model constraints)
+ * 2) Separation of concerns between creative assets and more functional areas of the app
+ * 3) <use> elements can be handled by compositor (faster)
+ */
+export const SymbolDefinitions = memo(() => (
+  <svg>
+    <defs>
+      <PaintServers />
+      <SymbolsAndShapes />
+    </defs>
+  </svg>
+));
diff --git a/x-pack/plugins/endpoint/public/embeddables/resolver/view/edge_line.tsx b/x-pack/plugins/endpoint/public/embeddables/resolver/view/edge_line.tsx
index 3386ed4a448d5..fbd40dda9adfd 100644
--- a/x-pack/plugins/endpoint/public/embeddables/resolver/view/edge_line.tsx
+++ b/x-pack/plugins/endpoint/public/embeddables/resolver/view/edge_line.tsx
@@ -66,7 +66,7 @@ export const EdgeLine = styled(
          */
         transform: `translateY(-50%) rotateZ(${angle(screenStart, screenEnd)}rad)`,
       };
-      return <div className={className} style={style} />;
+      return <div role="presentation" className={className} style={style} />;
     }
   )
 )`
@@ -74,4 +74,5 @@ export const EdgeLine = styled(
   height: 3px;
   background-color: #d4d4d4;
   color: #333333;
+  contain: strict;
 `;
diff --git a/x-pack/plugins/endpoint/public/embeddables/resolver/view/index.tsx b/x-pack/plugins/endpoint/public/embeddables/resolver/view/index.tsx
index eab22f993d0a8..22e9d05ad98ff 100644
--- a/x-pack/plugins/endpoint/public/embeddables/resolver/view/index.tsx
+++ b/x-pack/plugins/endpoint/public/embeddables/resolver/view/index.tsx
@@ -14,6 +14,7 @@ import { Panel } from './panel';
 import { GraphControls } from './graph_controls';
 import { ProcessEventDot } from './process_event_dot';
 import { useCamera } from './use_camera';
+import { SymbolDefinitions, NamedColors } from './defs';
 import { ResolverAction } from '../types';
 import { ResolverEvent } from '../../../../common/types';
 
@@ -33,6 +34,14 @@ const StyledGraphControls = styled(GraphControls)`
   right: 5px;
 `;
 
+const StyledResolverContainer = styled.div`
+  display: flex;
+  flex-grow: 1;
+  contain: layout;
+`;
+
+const bgColor = NamedColors.resolverBackground;
+
 export const Resolver = styled(
   React.memo(function Resolver({
     className,
@@ -46,6 +55,8 @@ export const Resolver = styled(
     );
 
     const dispatch: (action: ResolverAction) => unknown = useDispatch();
+    const { processToAdjacencyMap } = useSelector(selectors.processAdjacencies);
+
     const { projectionMatrix, ref, onMouseDown } = useCamera();
     const isLoading = useSelector(selectors.isLoading);
 
@@ -62,29 +73,35 @@ export const Resolver = styled(
             <EuiLoadingSpinner size="xl" />
           </div>
         ) : (
-          <>
-            <div className="resolver-graph" onMouseDown={onMouseDown} ref={ref}>
-              {Array.from(processNodePositions).map(([processEvent, position], index) => (
-                <ProcessEventDot
-                  key={index}
-                  position={position}
-                  projectionMatrix={projectionMatrix}
-                  event={processEvent}
-                />
-              ))}
-              {edgeLineSegments.map(([startPosition, endPosition], index) => (
-                <EdgeLine
-                  key={index}
-                  startPosition={startPosition}
-                  endPosition={endPosition}
-                  projectionMatrix={projectionMatrix}
-                />
-              ))}
-            </div>
-            <StyledPanel />
-            <StyledGraphControls />
-          </>
+          <StyledResolverContainer
+            className="resolver-graph kbn-resetFocusState"
+            onMouseDown={onMouseDown}
+            ref={ref}
+            role="tree"
+            tabIndex={0}
+          >
+            {edgeLineSegments.map(([startPosition, endPosition], index) => (
+              <EdgeLine
+                key={index}
+                startPosition={startPosition}
+                endPosition={endPosition}
+                projectionMatrix={projectionMatrix}
+              />
+            ))}
+            {Array.from(processNodePositions).map(([processEvent, position], index) => (
+              <ProcessEventDot
+                key={index}
+                position={position}
+                projectionMatrix={projectionMatrix}
+                event={processEvent}
+                adjacentNodeMap={processToAdjacencyMap.get(processEvent)}
+              />
+            ))}
+          </StyledResolverContainer>
         )}
+        <StyledPanel />
+        <StyledGraphControls />
+        <SymbolDefinitions />
       </div>
     );
   })
@@ -111,4 +128,6 @@ export const Resolver = styled(
    * Prevent partially visible components from showing up outside the bounds of Resolver.
    */
   overflow: hidden;
+  contain: strict;
+  background-color: ${bgColor};
 `;
diff --git a/x-pack/plugins/endpoint/public/embeddables/resolver/view/process_event_dot.tsx b/x-pack/plugins/endpoint/public/embeddables/resolver/view/process_event_dot.tsx
index 2241df97291ae..f3086be1598a8 100644
--- a/x-pack/plugins/endpoint/public/embeddables/resolver/view/process_event_dot.tsx
+++ b/x-pack/plugins/endpoint/public/embeddables/resolver/view/process_event_dot.tsx
@@ -4,12 +4,52 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import React from 'react';
+import React, { useCallback, useMemo } from 'react';
 import styled from 'styled-components';
+import { i18n } from '@kbn/i18n';
+import { htmlIdGenerator, EuiKeyboardAccessible } from '@elastic/eui';
 import { applyMatrix3 } from '../lib/vector2';
-import { Vector2, Matrix3 } from '../types';
+import { Vector2, Matrix3, AdjacentProcessMap, ResolverProcessType } from '../types';
+import { SymbolIds, NamedColors, PaintServerIds } from './defs';
 import { ResolverEvent } from '../../../../common/types';
+import { useResolverDispatch } from './use_resolver_dispatch';
 import * as eventModel from '../../../../common/models/event';
+import * as processModel from '../models/process_event';
+
+const nodeAssets = {
+  runningProcessCube: {
+    cubeSymbol: `#${SymbolIds.runningProcessCube}`,
+    labelFill: `url(#${PaintServerIds.runningProcess})`,
+    descriptionFill: NamedColors.activeNoWarning,
+    descriptionText: i18n.translate('xpack.endpoint.resolver.runningProcess', {
+      defaultMessage: 'Running Process',
+    }),
+  },
+  runningTriggerCube: {
+    cubeSymbol: `#${SymbolIds.runningTriggerCube}`,
+    labelFill: `url(#${PaintServerIds.runningTrigger})`,
+    descriptionFill: NamedColors.activeWarning,
+    descriptionText: i18n.translate('xpack.endpoint.resolver.runningTrigger', {
+      defaultMessage: 'Running Trigger',
+    }),
+  },
+  terminatedProcessCube: {
+    cubeSymbol: `#${SymbolIds.terminatedProcessCube}`,
+    labelFill: NamedColors.fullLabelBackground,
+    descriptionFill: NamedColors.inertDescription,
+    descriptionText: i18n.translate('xpack.endpoint.resolver.terminatedProcess', {
+      defaultMessage: 'Terminated Process',
+    }),
+  },
+  terminatedTriggerCube: {
+    cubeSymbol: `#${SymbolIds.terminatedTriggerCube}`,
+    labelFill: NamedColors.fullLabelBackground,
+    descriptionFill: NamedColors.inertDescription,
+    descriptionText: i18n.translate('xpack.endpoint.resolver.terminatedTrigger', {
+      defaultMessage: 'Terminated Trigger',
+    }),
+  },
+};
 
 /**
  * A placeholder view for a process node.
@@ -21,6 +61,7 @@ export const ProcessEventDot = styled(
       position,
       event,
       projectionMatrix,
+      adjacentNodeMap,
     }: {
       /**
        * A `className` string provided by `styled`
@@ -38,39 +79,205 @@ export const ProcessEventDot = styled(
        * projectionMatrix which can be used to convert `position` to screen coordinates.
        */
       projectionMatrix: Matrix3;
+      /**
+       * map of what nodes are "adjacent" to this one in "up, down, previous, next" directions
+       */
+      adjacentNodeMap?: AdjacentProcessMap;
     }) => {
       /**
        * Convert the position, which is in 'world' coordinates, to screen coordinates.
        */
       const [left, top] = applyMatrix3(position, projectionMatrix);
-      const style = {
-        left: (left - 20).toString() + 'px',
-        top: (top - 20).toString() + 'px',
-      };
+
+      const [magFactorX] = projectionMatrix;
+
+      const selfId = adjacentNodeMap?.self;
+
+      const nodeViewportStyle = useMemo(
+        () => ({
+          left: `${left}px`,
+          top: `${top}px`,
+          // Width of symbol viewport scaled to fit
+          width: `${360 * magFactorX}px`,
+          // Height according to symbol viewbox AR
+          height: `${120 * magFactorX}px`,
+          // Adjusted to position/scale with camera
+          transform: `translateX(-${0.172413 * 360 * magFactorX + 10}px) translateY(-${0.73684 *
+            120 *
+            magFactorX}px)`,
+        }),
+        [left, magFactorX, top]
+      );
+
+      const markerBaseSize = 15;
+      const markerSize = markerBaseSize;
+      const markerPositionOffset = -markerBaseSize / 2;
+
+      const labelYOffset = markerPositionOffset + 0.25 * markerSize - 0.5;
+
+      const labelYHeight = markerSize / 1.7647;
+
+      const levelAttribute = adjacentNodeMap?.level
+        ? {
+            'aria-level': adjacentNodeMap.level,
+          }
+        : {};
+
+      const flowToAttribute = adjacentNodeMap?.nextSibling
+        ? {
+            'aria-flowto': adjacentNodeMap.nextSibling,
+          }
+        : {};
+
+      const nodeType = getNodeType(event);
+      const clickTargetRef: { current: SVGAnimationElement | null } = React.createRef();
+      const { cubeSymbol, labelFill, descriptionFill, descriptionText } = nodeAssets[nodeType];
+      const resolverNodeIdGenerator = htmlIdGenerator('resolverNode');
+      const [nodeId, labelId, descriptionId] = [
+        !!selfId ? resolverNodeIdGenerator(String(selfId)) : resolverNodeIdGenerator(),
+        resolverNodeIdGenerator(),
+        resolverNodeIdGenerator(),
+      ] as string[];
+
+      const dispatch = useResolverDispatch();
+
+      const handleFocus = useCallback(
+        (focusEvent: React.FocusEvent<SVGSVGElement>) => {
+          dispatch({
+            type: 'userFocusedOnResolverNode',
+            payload: {
+              nodeId,
+            },
+          });
+          focusEvent.currentTarget.setAttribute('aria-current', 'true');
+        },
+        [dispatch, nodeId]
+      );
+
+      const handleClick = useCallback(
+        (clickEvent: React.MouseEvent<SVGSVGElement, MouseEvent>) => {
+          if (clickTargetRef.current !== null) {
+            (clickTargetRef.current as any).beginElement();
+          }
+        },
+        [clickTargetRef]
+      );
+
       return (
-        <span className={className} style={style} data-test-subj={'resolverNode'}>
-          name: {eventModel.eventName(event)}
-          <br />
-          x: {position[0]}
-          <br />
-          y: {position[1]}
-        </span>
+        <EuiKeyboardAccessible>
+          <svg
+            data-test-subj={'resolverNode'}
+            className={className + ' kbn-resetFocusState'}
+            viewBox="-15 -15 90 30"
+            preserveAspectRatio="xMidYMid meet"
+            role="treeitem"
+            {...levelAttribute}
+            {...flowToAttribute}
+            aria-labelledby={labelId}
+            aria-describedby={descriptionId}
+            aria-haspopup={'true'}
+            style={nodeViewportStyle}
+            id={nodeId}
+            onClick={handleClick}
+            onFocus={handleFocus}
+            tabIndex={-1}
+          >
+            <g>
+              <use
+                role="presentation"
+                xlinkHref={cubeSymbol}
+                x={markerPositionOffset}
+                y={markerPositionOffset}
+                width={markerSize}
+                height={markerSize}
+                opacity="1"
+                className="cube"
+              >
+                <animateTransform
+                  attributeType="XML"
+                  attributeName="transform"
+                  type="scale"
+                  values="1 1; 1 .83; 1 .8; 1 .83; 1 1"
+                  dur="0.2s"
+                  begin="click"
+                  repeatCount="1"
+                  className="squish"
+                  ref={clickTargetRef}
+                />
+              </use>
+              <use
+                role="presentation"
+                xlinkHref={`#${SymbolIds.processNode}`}
+                x={markerPositionOffset + markerSize - 0.5}
+                y={labelYOffset}
+                width={(markerSize / 1.7647) * 5}
+                height={markerSize / 1.7647}
+                opacity="1"
+                fill={labelFill}
+              />
+              <text
+                x={markerPositionOffset + 0.7 * markerSize + 50 / 2}
+                y={labelYOffset + labelYHeight / 2}
+                textAnchor="middle"
+                dominantBaseline="middle"
+                fontSize="3.75"
+                fontWeight="bold"
+                fill={NamedColors.empty}
+                paintOrder="stroke"
+                tabIndex={-1}
+                style={{ letterSpacing: '-0.02px' }}
+                id={labelId}
+              >
+                {eventModel.eventName(event)}
+              </text>
+              <text
+                x={markerPositionOffset + markerSize}
+                y={labelYOffset - 1}
+                textAnchor="start"
+                dominantBaseline="middle"
+                fontSize="2.67"
+                fill={descriptionFill}
+                id={descriptionId}
+                paintOrder="stroke"
+                fontWeight="bold"
+                style={{ textTransform: 'uppercase', letterSpacing: '-0.01px' }}
+              >
+                {descriptionText}
+              </text>
+            </g>
+          </svg>
+        </EuiKeyboardAccessible>
       );
     }
   )
 )`
   position: absolute;
-  width: 40px;
-  height: 40px;
+  display: block;
   text-align: left;
   font-size: 10px;
-  /**
-   * Give the element a button-like appearance.
-   */
   user-select: none;
-  border: 1px solid black;
   box-sizing: border-box;
   border-radius: 10%;
   padding: 4px;
   white-space: nowrap;
+  will-change: left, top, width, height;
+  contain: strict;
 `;
+
+const processTypeToCube: Record<ResolverProcessType, keyof typeof nodeAssets> = {
+  processCreated: 'terminatedProcessCube',
+  processRan: 'runningProcessCube',
+  processTerminated: 'terminatedProcessCube',
+  unknownProcessEvent: 'runningProcessCube',
+  processCausedAlert: 'runningTriggerCube',
+  unknownEvent: 'runningProcessCube',
+};
+
+function getNodeType(processEvent: ResolverEvent): keyof typeof nodeAssets {
+  const processType = processModel.eventType(processEvent);
+
+  if (processType in processTypeToCube) {
+    return processTypeToCube[processType];
+  }
+  return 'runningProcessCube';
+}

From fa69765e4bda11701f70e6a8dd34e0ff07c9c3da Mon Sep 17 00:00:00 2001
From: Aleh Zasypkin <aleh.zasypkin@gmail.com>
Date: Mon, 23 Mar 2020 22:45:26 +0100
Subject: [PATCH 045/179] Implement Kibana Login Selector (#53010)

---
 x-pack/legacy/plugins/security/index.ts       |   5 +-
 x-pack/plugins/security/common/login_state.ts |  20 +
 .../common/model/authenticated_user.mock.ts   |   2 +-
 .../security/common/parse_next.test.ts        |  17 +
 x-pack/plugins/security/common/parse_next.ts  |   2 +-
 .../__snapshots__/login_page.test.tsx.snap    | 113 ++-
 .../basic_login_form.test.tsx.snap            |  95 ---
 .../basic_login_form.test.tsx                 | 111 ---
 .../basic_login_form/basic_login_form.tsx     | 219 -----
 .../authentication/login/components/index.ts  |   2 +-
 .../__snapshots__/login_form.test.tsx.snap    | 240 ++++++
 .../{basic_login_form => login_form}/index.ts |   2 +-
 .../components/login_form/login_form.test.tsx | 272 +++++++
 .../components/login_form/login_form.tsx      | 343 ++++++++
 .../authentication/login/login_app.test.ts    |   6 +-
 .../public/authentication/login/login_app.ts  |   4 +-
 .../authentication/login/login_page.test.tsx  |  56 +-
 .../authentication/login/login_page.tsx       | 180 +++--
 .../authentication/authenticator.test.ts      | 522 ++++++++++--
 .../server/authentication/authenticator.ts    | 278 ++++---
 .../server/authentication/index.mock.ts       |   2 +-
 .../server/authentication/index.test.ts       |  28 +-
 .../security/server/authentication/index.ts   |   4 +-
 .../authentication/providers/base.mock.ts     |   3 +-
 .../server/authentication/providers/base.ts   |  11 +-
 .../authentication/providers/basic.test.ts    |  19 +-
 .../server/authentication/providers/basic.ts  |  23 +-
 .../authentication/providers/http.test.ts     |   2 +-
 .../server/authentication/providers/index.ts  |   4 +-
 .../authentication/providers/kerberos.test.ts | 178 ++--
 .../authentication/providers/kerberos.ts      |  33 +-
 .../authentication/providers/oidc.test.ts     | 195 ++++-
 .../server/authentication/providers/oidc.ts   | 118 ++-
 .../authentication/providers/pki.test.ts      | 313 ++++----
 .../server/authentication/providers/pki.ts    |  31 +-
 .../authentication/providers/saml.test.ts     | 275 +++++--
 .../server/authentication/providers/saml.ts   | 173 ++--
 .../authentication/providers/token.test.ts    |  45 +-
 .../server/authentication/providers/token.ts  |  33 +-
 x-pack/plugins/security/server/config.test.ts | 757 +++++++++++++++++-
 x-pack/plugins/security/server/config.ts      | 246 +++++-
 x-pack/plugins/security/server/index.ts       |  26 +-
 x-pack/plugins/security/server/plugin.test.ts |   6 +-
 x-pack/plugins/security/server/plugin.ts      |  20 +-
 .../routes/authentication/basic.test.ts       |  14 +-
 .../server/routes/authentication/basic.ts     |   7 +-
 .../routes/authentication/common.test.ts      | 264 +++++-
 .../server/routes/authentication/common.ts    |  66 +-
 .../server/routes/authentication/index.ts     |   6 +-
 .../server/routes/authentication/oidc.ts      |  21 +-
 .../server/routes/authentication/saml.test.ts |  12 +-
 .../server/routes/authentication/saml.ts      |  28 +-
 .../security/server/routes/index.mock.ts      |   8 +-
 .../routes/users/change_password.test.ts      |   6 +-
 .../server/routes/users/change_password.ts    |   2 +-
 .../server/routes/views/index.test.ts         |  30 +-
 .../security/server/routes/views/index.ts     |   6 +-
 .../server/routes/views/login.test.ts         | 197 ++++-
 .../security/server/routes/views/login.ts     |  36 +-
 x-pack/scripts/functional_tests.js            |   1 +
 .../apis/security/kerberos_login.ts           |  10 +-
 .../fixtures/kerberos_tools.ts                |  13 +
 .../apis/index.ts                             |  14 +
 .../apis/login_selector.ts                    | 545 +++++++++++++
 .../login_selector_api_integration/config.ts  | 141 ++++
 .../ftr_provider_context.d.ts}                |   9 +-
 .../services.ts                               |  14 +
 .../apis/security/pki_auth.ts                 |   1 -
 x-pack/test/pki_api_integration/config.ts     |   1 -
 .../apis/security/saml_login.ts               |  43 +-
 x-pack/test/saml_api_integration/config.ts    |   2 +-
 .../fixtures/idp_metadata.xml                 |   2 +-
 .../fixtures/idp_metadata_2.xml               |  41 +
 .../fixtures/saml_tools.ts                    |  17 +-
 74 files changed, 5201 insertions(+), 1390 deletions(-)
 create mode 100644 x-pack/plugins/security/common/login_state.ts
 delete mode 100644 x-pack/plugins/security/public/authentication/login/components/basic_login_form/__snapshots__/basic_login_form.test.tsx.snap
 delete mode 100644 x-pack/plugins/security/public/authentication/login/components/basic_login_form/basic_login_form.test.tsx
 delete mode 100644 x-pack/plugins/security/public/authentication/login/components/basic_login_form/basic_login_form.tsx
 create mode 100644 x-pack/plugins/security/public/authentication/login/components/login_form/__snapshots__/login_form.test.tsx.snap
 rename x-pack/plugins/security/public/authentication/login/components/{basic_login_form => login_form}/index.ts (82%)
 create mode 100644 x-pack/plugins/security/public/authentication/login/components/login_form/login_form.test.tsx
 create mode 100644 x-pack/plugins/security/public/authentication/login/components/login_form/login_form.tsx
 create mode 100644 x-pack/test/kerberos_api_integration/fixtures/kerberos_tools.ts
 create mode 100644 x-pack/test/login_selector_api_integration/apis/index.ts
 create mode 100644 x-pack/test/login_selector_api_integration/apis/login_selector.ts
 create mode 100644 x-pack/test/login_selector_api_integration/config.ts
 rename x-pack/{plugins/security/public/authentication/login/login_state.ts => test/login_selector_api_integration/ftr_provider_context.d.ts} (56%)
 create mode 100644 x-pack/test/login_selector_api_integration/services.ts
 create mode 100644 x-pack/test/saml_api_integration/fixtures/idp_metadata_2.xml

diff --git a/x-pack/legacy/plugins/security/index.ts b/x-pack/legacy/plugins/security/index.ts
index deebbccf5aa49..5b2218af1fd52 100644
--- a/x-pack/legacy/plugins/security/index.ts
+++ b/x-pack/legacy/plugins/security/index.ts
@@ -51,10 +51,7 @@ export const security = (kibana: Record<string, any>) =>
     uiExports: {
       hacks: ['plugins/security/hacks/legacy'],
       injectDefaultVars: (server: Server) => {
-        return {
-          secureCookies: getSecurityPluginSetup(server).__legacyCompat.config.secureCookies,
-          enableSpaceAwarePrivileges: server.config().get('xpack.spaces.enabled'),
-        };
+        return { enableSpaceAwarePrivileges: server.config().get('xpack.spaces.enabled') };
       },
     },
 
diff --git a/x-pack/plugins/security/common/login_state.ts b/x-pack/plugins/security/common/login_state.ts
new file mode 100644
index 0000000000000..4342e82d2f90b
--- /dev/null
+++ b/x-pack/plugins/security/common/login_state.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 { LoginLayout } from './licensing';
+
+export interface LoginSelector {
+  enabled: boolean;
+  providers: Array<{ type: string; name: string; description?: string }>;
+}
+
+export interface LoginState {
+  layout: LoginLayout;
+  allowLogin: boolean;
+  showLoginForm: boolean;
+  requiresSecureConnection: boolean;
+  selector: LoginSelector;
+}
diff --git a/x-pack/plugins/security/common/model/authenticated_user.mock.ts b/x-pack/plugins/security/common/model/authenticated_user.mock.ts
index 220b284e76591..f8b0d27efcbf4 100644
--- a/x-pack/plugins/security/common/model/authenticated_user.mock.ts
+++ b/x-pack/plugins/security/common/model/authenticated_user.mock.ts
@@ -15,7 +15,7 @@ export function mockAuthenticatedUser(user: Partial<AuthenticatedUser> = {}) {
     enabled: true,
     authentication_realm: { name: 'native1', type: 'native' },
     lookup_realm: { name: 'native1', type: 'native' },
-    authentication_provider: 'basic',
+    authentication_provider: 'basic1',
     ...user,
   };
 }
diff --git a/x-pack/plugins/security/common/parse_next.test.ts b/x-pack/plugins/security/common/parse_next.test.ts
index b5e6c7dca41d8..11a843d397ded 100644
--- a/x-pack/plugins/security/common/parse_next.test.ts
+++ b/x-pack/plugins/security/common/parse_next.test.ts
@@ -34,6 +34,15 @@ describe('parseNext', () => {
       expect(parseNext(href, basePath)).toEqual(`${next}#${hash}`);
     });
 
+    it('should properly handle multiple next with hash', () => {
+      const basePath = '/iqf';
+      const next1 = `${basePath}/app/kibana`;
+      const next2 = `${basePath}/app/ml`;
+      const hash = '/discover/New-Saved-Search';
+      const href = `${basePath}/login?next=${next1}&next=${next2}#${hash}`;
+      expect(parseNext(href, basePath)).toEqual(`${next1}#${hash}`);
+    });
+
     it('should properly decode special characters', () => {
       const basePath = '/iqf';
       const next = `${encodeURIComponent(basePath)}%2Fapp%2Fkibana`;
@@ -118,6 +127,14 @@ describe('parseNext', () => {
       expect(parseNext(href)).toEqual(`${next}#${hash}`);
     });
 
+    it('should properly handle multiple next with hash', () => {
+      const next1 = '/app/kibana';
+      const next2 = '/app/ml';
+      const hash = '/discover/New-Saved-Search';
+      const href = `/login?next=${next1}&next=${next2}#${hash}`;
+      expect(parseNext(href)).toEqual(`${next1}#${hash}`);
+    });
+
     it('should properly decode special characters', () => {
       const next = '%2Fapp%2Fkibana';
       const hash = '/discover/New-Saved-Search';
diff --git a/x-pack/plugins/security/common/parse_next.ts b/x-pack/plugins/security/common/parse_next.ts
index 834acd783abbe..7cbe335825a5a 100644
--- a/x-pack/plugins/security/common/parse_next.ts
+++ b/x-pack/plugins/security/common/parse_next.ts
@@ -40,5 +40,5 @@ export function parseNext(href: string, basePath = '') {
     return `${basePath}/`;
   }
 
-  return query.next + (hash || '');
+  return next + (hash || '');
 }
diff --git a/x-pack/plugins/security/public/authentication/login/__snapshots__/login_page.test.tsx.snap b/x-pack/plugins/security/public/authentication/login/__snapshots__/login_page.test.tsx.snap
index 30715be1db232..ecbdfedac1dd3 100644
--- a/x-pack/plugins/security/public/authentication/login/__snapshots__/login_page.test.tsx.snap
+++ b/x-pack/plugins/security/public/authentication/login/__snapshots__/login_page.test.tsx.snap
@@ -23,7 +23,7 @@ exports[`LoginPage disabled form states renders as expected when an unknown logi
 <DisabledLoginForm
   message={
     <FormattedMessage
-      defaultMessage="Refer to the Kibana logs for more details and refresh to try again."
+      defaultMessage="See the Kibana logs for details and try reloading the page."
       id="xpack.security.loginPage.unknownLayoutMessage"
       values={Object {}}
     />
@@ -38,6 +38,25 @@ exports[`LoginPage disabled form states renders as expected when an unknown logi
 />
 `;
 
+exports[`LoginPage disabled form states renders as expected when login is not enabled 1`] = `
+<DisabledLoginForm
+  message={
+    <FormattedMessage
+      defaultMessage="Contact your system administrator."
+      id="xpack.security.loginPage.noLoginMethodsAvailableMessage"
+      values={Object {}}
+    />
+  }
+  title={
+    <FormattedMessage
+      defaultMessage="Login is disabled."
+      id="xpack.security.loginPage.noLoginMethodsAvailableTitle"
+      values={Object {}}
+    />
+  }
+/>
+`;
+
 exports[`LoginPage disabled form states renders as expected when secure connection is required but not present 1`] = `
 <DisabledLoginForm
   message={
@@ -77,7 +96,7 @@ exports[`LoginPage disabled form states renders as expected when xpack is not av
 `;
 
 exports[`LoginPage enabled form state renders as expected 1`] = `
-<BasicLoginForm
+<LoginForm
   http={
     Object {
       "addLoadingCountSource": [MockFunction],
@@ -85,11 +104,32 @@ exports[`LoginPage enabled form state renders as expected 1`] = `
     }
   }
   loginAssistanceMessage=""
+  notifications={
+    Object {
+      "toasts": Object {
+        "add": [MockFunction],
+        "addDanger": [MockFunction],
+        "addError": [MockFunction],
+        "addInfo": [MockFunction],
+        "addSuccess": [MockFunction],
+        "addWarning": [MockFunction],
+        "get$": [MockFunction],
+        "remove": [MockFunction],
+      },
+    }
+  }
+  selector={
+    Object {
+      "enabled": false,
+      "providers": Array [],
+    }
+  }
+  showLoginForm={true}
 />
 `;
 
 exports[`LoginPage enabled form state renders as expected when info message is set 1`] = `
-<BasicLoginForm
+<LoginForm
   http={
     Object {
       "addLoadingCountSource": [MockFunction],
@@ -98,11 +138,32 @@ exports[`LoginPage enabled form state renders as expected when info message is s
   }
   infoMessage="Your session has timed out. Please log in again."
   loginAssistanceMessage=""
+  notifications={
+    Object {
+      "toasts": Object {
+        "add": [MockFunction],
+        "addDanger": [MockFunction],
+        "addError": [MockFunction],
+        "addInfo": [MockFunction],
+        "addSuccess": [MockFunction],
+        "addWarning": [MockFunction],
+        "get$": [MockFunction],
+        "remove": [MockFunction],
+      },
+    }
+  }
+  selector={
+    Object {
+      "enabled": false,
+      "providers": Array [],
+    }
+  }
+  showLoginForm={true}
 />
 `;
 
 exports[`LoginPage enabled form state renders as expected when loginAssistanceMessage is set 1`] = `
-<BasicLoginForm
+<LoginForm
   http={
     Object {
       "addLoadingCountSource": [MockFunction],
@@ -111,6 +172,27 @@ exports[`LoginPage enabled form state renders as expected when loginAssistanceMe
   }
   infoMessage="Your session has timed out. Please log in again."
   loginAssistanceMessage="This is an *important* message"
+  notifications={
+    Object {
+      "toasts": Object {
+        "add": [MockFunction],
+        "addDanger": [MockFunction],
+        "addError": [MockFunction],
+        "addInfo": [MockFunction],
+        "addSuccess": [MockFunction],
+        "addWarning": [MockFunction],
+        "get$": [MockFunction],
+        "remove": [MockFunction],
+      },
+    }
+  }
+  selector={
+    Object {
+      "enabled": false,
+      "providers": Array [],
+    }
+  }
+  showLoginForm={true}
 />
 `;
 
@@ -172,7 +254,7 @@ exports[`LoginPage page renders as expected 1`] = `
       gutterSize="l"
     >
       <EuiFlexItem>
-        <BasicLoginForm
+        <LoginForm
           http={
             Object {
               "addLoadingCountSource": [MockFunction],
@@ -180,6 +262,27 @@ exports[`LoginPage page renders as expected 1`] = `
             }
           }
           loginAssistanceMessage=""
+          notifications={
+            Object {
+              "toasts": Object {
+                "add": [MockFunction],
+                "addDanger": [MockFunction],
+                "addError": [MockFunction],
+                "addInfo": [MockFunction],
+                "addSuccess": [MockFunction],
+                "addWarning": [MockFunction],
+                "get$": [MockFunction],
+                "remove": [MockFunction],
+              },
+            }
+          }
+          selector={
+            Object {
+              "enabled": false,
+              "providers": Array [],
+            }
+          }
+          showLoginForm={true}
         />
       </EuiFlexItem>
     </EuiFlexGroup>
diff --git a/x-pack/plugins/security/public/authentication/login/components/basic_login_form/__snapshots__/basic_login_form.test.tsx.snap b/x-pack/plugins/security/public/authentication/login/components/basic_login_form/__snapshots__/basic_login_form.test.tsx.snap
deleted file mode 100644
index b09f398ed5ed9..0000000000000
--- a/x-pack/plugins/security/public/authentication/login/components/basic_login_form/__snapshots__/basic_login_form.test.tsx.snap
+++ /dev/null
@@ -1,95 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`BasicLoginForm renders as expected 1`] = `
-<Fragment>
-  <EuiText
-    size="s"
-  >
-    <ReactMarkdown
-      astPlugins={Array []}
-      escapeHtml={true}
-      plugins={Array []}
-      rawSourcePos={false}
-      renderers={Object {}}
-      skipHtml={false}
-      sourcePos={false}
-      transformLinkUri={[Function]}
-    />
-  </EuiText>
-  <EuiPanel>
-    <form
-      onSubmit={[Function]}
-    >
-      <EuiFormRow
-        describedByIds={Array []}
-        display="row"
-        fullWidth={false}
-        hasChildLabel={true}
-        hasEmptyLabelSpace={false}
-        label={
-          <FormattedMessage
-            defaultMessage="Username"
-            id="xpack.security.login.basicLoginForm.usernameFormRowLabel"
-            values={Object {}}
-          />
-        }
-        labelType="label"
-      >
-        <EuiFieldText
-          aria-required={true}
-          data-test-subj="loginUsername"
-          disabled={false}
-          id="username"
-          inputRef={[Function]}
-          isInvalid={false}
-          name="username"
-          onChange={[Function]}
-          value=""
-        />
-      </EuiFormRow>
-      <EuiFormRow
-        describedByIds={Array []}
-        display="row"
-        fullWidth={false}
-        hasChildLabel={true}
-        hasEmptyLabelSpace={false}
-        label={
-          <FormattedMessage
-            defaultMessage="Password"
-            id="xpack.security.login.basicLoginForm.passwordFormRowLabel"
-            values={Object {}}
-          />
-        }
-        labelType="label"
-      >
-        <EuiFieldText
-          aria-required={true}
-          autoComplete="off"
-          data-test-subj="loginPassword"
-          disabled={false}
-          id="password"
-          isInvalid={false}
-          name="password"
-          onChange={[Function]}
-          type="password"
-          value=""
-        />
-      </EuiFormRow>
-      <EuiButton
-        color="primary"
-        data-test-subj="loginSubmit"
-        fill={true}
-        isLoading={false}
-        onClick={[Function]}
-        type="submit"
-      >
-        <FormattedMessage
-          defaultMessage="Log in"
-          id="xpack.security.login.basicLoginForm.logInButtonLabel"
-          values={Object {}}
-        />
-      </EuiButton>
-    </form>
-  </EuiPanel>
-</Fragment>
-`;
diff --git a/x-pack/plugins/security/public/authentication/login/components/basic_login_form/basic_login_form.test.tsx b/x-pack/plugins/security/public/authentication/login/components/basic_login_form/basic_login_form.test.tsx
deleted file mode 100644
index e62fd7191dfae..0000000000000
--- a/x-pack/plugins/security/public/authentication/login/components/basic_login_form/basic_login_form.test.tsx
+++ /dev/null
@@ -1,111 +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 { act } from '@testing-library/react';
-import { EuiButton, EuiCallOut } from '@elastic/eui';
-import { mountWithIntl, nextTick, shallowWithIntl } from 'test_utils/enzyme_helpers';
-import { BasicLoginForm } from './basic_login_form';
-
-import { coreMock } from '../../../../../../../../src/core/public/mocks';
-
-describe('BasicLoginForm', () => {
-  beforeAll(() => {
-    Object.defineProperty(window, 'location', {
-      value: { href: 'https://some-host/bar' },
-      writable: true,
-    });
-  });
-
-  afterAll(() => {
-    delete (window as any).location;
-  });
-
-  it('renders as expected', () => {
-    expect(
-      shallowWithIntl(
-        <BasicLoginForm http={coreMock.createStart().http} loginAssistanceMessage="" />
-      )
-    ).toMatchSnapshot();
-  });
-
-  it('renders an info message when provided.', () => {
-    const wrapper = shallowWithIntl(
-      <BasicLoginForm
-        http={coreMock.createStart().http}
-        infoMessage={'Hey this is an info message'}
-        loginAssistanceMessage=""
-      />
-    );
-
-    expect(wrapper.find(EuiCallOut).props().title).toEqual('Hey this is an info message');
-  });
-
-  it('renders an invalid credentials message', async () => {
-    const mockHTTP = coreMock.createStart({ basePath: '/some-base-path' }).http;
-    mockHTTP.post.mockRejectedValue({ response: { status: 401 } });
-
-    const wrapper = mountWithIntl(<BasicLoginForm http={mockHTTP} loginAssistanceMessage="" />);
-
-    wrapper.find('input[name="username"]').simulate('change', { target: { value: 'username' } });
-    wrapper.find('input[name="password"]').simulate('change', { target: { value: 'password' } });
-    wrapper.find(EuiButton).simulate('click');
-
-    await act(async () => {
-      await nextTick();
-      wrapper.update();
-    });
-
-    expect(wrapper.find(EuiCallOut).props().title).toEqual(
-      `Invalid username or password. Please try again.`
-    );
-  });
-
-  it('renders unknown error message', async () => {
-    const mockHTTP = coreMock.createStart({ basePath: '/some-base-path' }).http;
-    mockHTTP.post.mockRejectedValue({ response: { status: 500 } });
-
-    const wrapper = mountWithIntl(<BasicLoginForm http={mockHTTP} loginAssistanceMessage="" />);
-
-    wrapper.find('input[name="username"]').simulate('change', { target: { value: 'username' } });
-    wrapper.find('input[name="password"]').simulate('change', { target: { value: 'password' } });
-    wrapper.find(EuiButton).simulate('click');
-
-    await act(async () => {
-      await nextTick();
-      wrapper.update();
-    });
-
-    expect(wrapper.find(EuiCallOut).props().title).toEqual(`Oops! Error. Try again.`);
-  });
-
-  it('properly redirects after successful login', async () => {
-    window.location.href = `https://some-host/login?next=${encodeURIComponent(
-      '/some-base-path/app/kibana#/home?_g=()'
-    )}`;
-    const mockHTTP = coreMock.createStart({ basePath: '/some-base-path' }).http;
-    mockHTTP.post.mockResolvedValue({});
-
-    const wrapper = mountWithIntl(<BasicLoginForm http={mockHTTP} loginAssistanceMessage="" />);
-
-    wrapper.find('input[name="username"]').simulate('change', { target: { value: 'username1' } });
-    wrapper.find('input[name="password"]').simulate('change', { target: { value: 'password1' } });
-    wrapper.find(EuiButton).simulate('click');
-
-    await act(async () => {
-      await nextTick();
-      wrapper.update();
-    });
-
-    expect(mockHTTP.post).toHaveBeenCalledTimes(1);
-    expect(mockHTTP.post).toHaveBeenCalledWith('/internal/security/login', {
-      body: JSON.stringify({ username: 'username1', password: 'password1' }),
-    });
-
-    expect(window.location.href).toBe('/some-base-path/app/kibana#/home?_g=()');
-    expect(wrapper.find(EuiCallOut).exists()).toBe(false);
-  });
-});
diff --git a/x-pack/plugins/security/public/authentication/login/components/basic_login_form/basic_login_form.tsx b/x-pack/plugins/security/public/authentication/login/components/basic_login_form/basic_login_form.tsx
deleted file mode 100644
index 7302ee9bf9851..0000000000000
--- a/x-pack/plugins/security/public/authentication/login/components/basic_login_form/basic_login_form.tsx
+++ /dev/null
@@ -1,219 +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, { ChangeEvent, Component, FormEvent, Fragment, MouseEvent } from 'react';
-import ReactMarkdown from 'react-markdown';
-import {
-  EuiButton,
-  EuiCallOut,
-  EuiFieldText,
-  EuiFormRow,
-  EuiPanel,
-  EuiSpacer,
-  EuiText,
-} from '@elastic/eui';
-import { i18n } from '@kbn/i18n';
-import { FormattedMessage } from '@kbn/i18n/react';
-import { HttpStart, IHttpFetchError } from 'src/core/public';
-import { parseNext } from '../../../../../common/parse_next';
-
-interface Props {
-  http: HttpStart;
-  infoMessage?: string;
-  loginAssistanceMessage: string;
-}
-
-interface State {
-  hasError: boolean;
-  isLoading: boolean;
-  username: string;
-  password: string;
-  message: string;
-}
-
-export class BasicLoginForm extends Component<Props, State> {
-  public state = {
-    hasError: false,
-    isLoading: false,
-    username: '',
-    password: '',
-    message: '',
-  };
-
-  public render() {
-    return (
-      <Fragment>
-        {this.renderLoginAssistanceMessage()}
-        {this.renderMessage()}
-        <EuiPanel>
-          <form onSubmit={this.submit}>
-            <EuiFormRow
-              label={
-                <FormattedMessage
-                  id="xpack.security.login.basicLoginForm.usernameFormRowLabel"
-                  defaultMessage="Username"
-                />
-              }
-            >
-              <EuiFieldText
-                id="username"
-                name="username"
-                data-test-subj="loginUsername"
-                value={this.state.username}
-                onChange={this.onUsernameChange}
-                disabled={this.state.isLoading}
-                isInvalid={false}
-                aria-required={true}
-                inputRef={this.setUsernameInputRef}
-              />
-            </EuiFormRow>
-
-            <EuiFormRow
-              label={
-                <FormattedMessage
-                  id="xpack.security.login.basicLoginForm.passwordFormRowLabel"
-                  defaultMessage="Password"
-                />
-              }
-            >
-              <EuiFieldText
-                autoComplete="off"
-                id="password"
-                name="password"
-                data-test-subj="loginPassword"
-                type="password"
-                value={this.state.password}
-                onChange={this.onPasswordChange}
-                disabled={this.state.isLoading}
-                isInvalid={false}
-                aria-required={true}
-              />
-            </EuiFormRow>
-
-            <EuiButton
-              fill
-              type="submit"
-              color="primary"
-              onClick={this.submit}
-              isLoading={this.state.isLoading}
-              data-test-subj="loginSubmit"
-            >
-              <FormattedMessage
-                id="xpack.security.login.basicLoginForm.logInButtonLabel"
-                defaultMessage="Log in"
-              />
-            </EuiButton>
-          </form>
-        </EuiPanel>
-      </Fragment>
-    );
-  }
-
-  private renderLoginAssistanceMessage = () => {
-    return (
-      <Fragment>
-        <EuiText size="s">
-          <ReactMarkdown>{this.props.loginAssistanceMessage}</ReactMarkdown>
-        </EuiText>
-      </Fragment>
-    );
-  };
-
-  private renderMessage = () => {
-    if (this.state.message) {
-      return (
-        <Fragment>
-          <EuiCallOut
-            size="s"
-            color="danger"
-            data-test-subj="loginErrorMessage"
-            title={this.state.message}
-            role="alert"
-          />
-          <EuiSpacer size="l" />
-        </Fragment>
-      );
-    }
-
-    if (this.props.infoMessage) {
-      return (
-        <Fragment>
-          <EuiCallOut
-            size="s"
-            color="primary"
-            data-test-subj="loginInfoMessage"
-            title={this.props.infoMessage}
-            role="status"
-          />
-          <EuiSpacer size="l" />
-        </Fragment>
-      );
-    }
-
-    return null;
-  };
-
-  private setUsernameInputRef(ref: HTMLInputElement) {
-    if (ref) {
-      ref.focus();
-    }
-  }
-
-  private isFormValid = () => {
-    const { username, password } = this.state;
-
-    return username && password;
-  };
-
-  private onUsernameChange = (e: ChangeEvent<HTMLInputElement>) => {
-    this.setState({
-      username: e.target.value,
-    });
-  };
-
-  private onPasswordChange = (e: ChangeEvent<HTMLInputElement>) => {
-    this.setState({
-      password: e.target.value,
-    });
-  };
-
-  private submit = async (e: MouseEvent<HTMLButtonElement> | FormEvent<HTMLFormElement>) => {
-    e.preventDefault();
-
-    if (!this.isFormValid()) {
-      return;
-    }
-
-    this.setState({
-      isLoading: true,
-      message: '',
-    });
-
-    const { http } = this.props;
-    const { username, password } = this.state;
-
-    try {
-      await http.post('/internal/security/login', { body: JSON.stringify({ username, password }) });
-      window.location.href = parseNext(window.location.href, http.basePath.serverBasePath);
-    } catch (error) {
-      const message =
-        (error as IHttpFetchError).response?.status === 401
-          ? i18n.translate(
-              'xpack.security.login.basicLoginForm.invalidUsernameOrPasswordErrorMessage',
-              { defaultMessage: 'Invalid username or password. Please try again.' }
-            )
-          : i18n.translate('xpack.security.login.basicLoginForm.unknownErrorMessage', {
-              defaultMessage: 'Oops! Error. Try again.',
-            });
-
-      this.setState({
-        hasError: true,
-        message,
-        isLoading: false,
-      });
-    }
-  };
-}
diff --git a/x-pack/plugins/security/public/authentication/login/components/index.ts b/x-pack/plugins/security/public/authentication/login/components/index.ts
index 5f267f7c4caa2..3113a177d433e 100644
--- a/x-pack/plugins/security/public/authentication/login/components/index.ts
+++ b/x-pack/plugins/security/public/authentication/login/components/index.ts
@@ -4,5 +4,5 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-export { BasicLoginForm } from './basic_login_form';
+export { LoginForm } from './login_form';
 export { DisabledLoginForm } from './disabled_login_form';
diff --git a/x-pack/plugins/security/public/authentication/login/components/login_form/__snapshots__/login_form.test.tsx.snap b/x-pack/plugins/security/public/authentication/login/components/login_form/__snapshots__/login_form.test.tsx.snap
new file mode 100644
index 0000000000000..a25498a637c2f
--- /dev/null
+++ b/x-pack/plugins/security/public/authentication/login/components/login_form/__snapshots__/login_form.test.tsx.snap
@@ -0,0 +1,240 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`LoginForm login selector renders as expected with login form 1`] = `
+<Fragment>
+  <EuiButton
+    fullWidth={true}
+    isDisabled={false}
+    isLoading={false}
+    key="saml1"
+    onClick={[Function]}
+  >
+    Login w/SAML
+  </EuiButton>
+  <EuiSpacer
+    size="m"
+  />
+  <EuiButton
+    fullWidth={true}
+    isDisabled={false}
+    isLoading={false}
+    key="pki1"
+    onClick={[Function]}
+  >
+    Login w/PKI
+  </EuiButton>
+  <EuiSpacer
+    size="m"
+  />
+  <EuiText
+    color="subdued"
+    textAlign="center"
+  >
+    ―――  
+    <FormattedMessage
+      defaultMessage="OR"
+      id="xpack.security.loginPage.loginSelectorOR"
+      values={Object {}}
+    />
+      ―――
+  </EuiText>
+  <EuiSpacer
+    size="m"
+  />
+  <EuiPanel>
+    <form
+      onSubmit={[Function]}
+    >
+      <EuiFormRow
+        describedByIds={Array []}
+        display="row"
+        fullWidth={false}
+        hasChildLabel={true}
+        hasEmptyLabelSpace={false}
+        label={
+          <FormattedMessage
+            defaultMessage="Username"
+            id="xpack.security.login.basicLoginForm.usernameFormRowLabel"
+            values={Object {}}
+          />
+        }
+        labelType="label"
+      >
+        <EuiFieldText
+          aria-required={true}
+          data-test-subj="loginUsername"
+          disabled={false}
+          id="username"
+          inputRef={[Function]}
+          isInvalid={false}
+          name="username"
+          onChange={[Function]}
+          value=""
+        />
+      </EuiFormRow>
+      <EuiFormRow
+        describedByIds={Array []}
+        display="row"
+        fullWidth={false}
+        hasChildLabel={true}
+        hasEmptyLabelSpace={false}
+        label={
+          <FormattedMessage
+            defaultMessage="Password"
+            id="xpack.security.login.basicLoginForm.passwordFormRowLabel"
+            values={Object {}}
+          />
+        }
+        labelType="label"
+      >
+        <EuiFieldText
+          aria-required={true}
+          autoComplete="off"
+          data-test-subj="loginPassword"
+          disabled={false}
+          id="password"
+          isInvalid={false}
+          name="password"
+          onChange={[Function]}
+          type="password"
+          value=""
+        />
+      </EuiFormRow>
+      <EuiButton
+        color="primary"
+        data-test-subj="loginSubmit"
+        fill={true}
+        isDisabled={false}
+        isLoading={false}
+        onClick={[Function]}
+        type="submit"
+      >
+        <FormattedMessage
+          defaultMessage="Log in"
+          id="xpack.security.login.basicLoginForm.logInButtonLabel"
+          values={Object {}}
+        />
+      </EuiButton>
+    </form>
+  </EuiPanel>
+</Fragment>
+`;
+
+exports[`LoginForm login selector renders as expected without login form for providers with and without description 1`] = `
+<Fragment>
+  <EuiButton
+    fullWidth={true}
+    isDisabled={false}
+    isLoading={false}
+    key="saml1"
+    onClick={[Function]}
+  >
+    Login w/SAML
+  </EuiButton>
+  <EuiSpacer
+    size="m"
+  />
+  <EuiButton
+    fullWidth={true}
+    isDisabled={false}
+    isLoading={false}
+    key="pki1"
+    onClick={[Function]}
+  >
+    <FormattedMessage
+      defaultMessage="Login with {providerType}/{providerName}"
+      id="xpack.security.loginPage.loginProviderDescription"
+      values={
+        Object {
+          "providerName": "pki1",
+          "providerType": "pki",
+        }
+      }
+    />
+  </EuiButton>
+  <EuiSpacer
+    size="m"
+  />
+</Fragment>
+`;
+
+exports[`LoginForm renders as expected 1`] = `
+<Fragment>
+  <EuiPanel>
+    <form
+      onSubmit={[Function]}
+    >
+      <EuiFormRow
+        describedByIds={Array []}
+        display="row"
+        fullWidth={false}
+        hasChildLabel={true}
+        hasEmptyLabelSpace={false}
+        label={
+          <FormattedMessage
+            defaultMessage="Username"
+            id="xpack.security.login.basicLoginForm.usernameFormRowLabel"
+            values={Object {}}
+          />
+        }
+        labelType="label"
+      >
+        <EuiFieldText
+          aria-required={true}
+          data-test-subj="loginUsername"
+          disabled={false}
+          id="username"
+          inputRef={[Function]}
+          isInvalid={false}
+          name="username"
+          onChange={[Function]}
+          value=""
+        />
+      </EuiFormRow>
+      <EuiFormRow
+        describedByIds={Array []}
+        display="row"
+        fullWidth={false}
+        hasChildLabel={true}
+        hasEmptyLabelSpace={false}
+        label={
+          <FormattedMessage
+            defaultMessage="Password"
+            id="xpack.security.login.basicLoginForm.passwordFormRowLabel"
+            values={Object {}}
+          />
+        }
+        labelType="label"
+      >
+        <EuiFieldText
+          aria-required={true}
+          autoComplete="off"
+          data-test-subj="loginPassword"
+          disabled={false}
+          id="password"
+          isInvalid={false}
+          name="password"
+          onChange={[Function]}
+          type="password"
+          value=""
+        />
+      </EuiFormRow>
+      <EuiButton
+        color="primary"
+        data-test-subj="loginSubmit"
+        fill={true}
+        isDisabled={false}
+        isLoading={false}
+        onClick={[Function]}
+        type="submit"
+      >
+        <FormattedMessage
+          defaultMessage="Log in"
+          id="xpack.security.login.basicLoginForm.logInButtonLabel"
+          values={Object {}}
+        />
+      </EuiButton>
+    </form>
+  </EuiPanel>
+</Fragment>
+`;
diff --git a/x-pack/plugins/security/public/authentication/login/components/basic_login_form/index.ts b/x-pack/plugins/security/public/authentication/login/components/login_form/index.ts
similarity index 82%
rename from x-pack/plugins/security/public/authentication/login/components/basic_login_form/index.ts
rename to x-pack/plugins/security/public/authentication/login/components/login_form/index.ts
index 3c1350ba590a6..c09a8dad4945c 100644
--- a/x-pack/plugins/security/public/authentication/login/components/basic_login_form/index.ts
+++ b/x-pack/plugins/security/public/authentication/login/components/login_form/index.ts
@@ -4,4 +4,4 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-export { BasicLoginForm } from './basic_login_form';
+export { LoginForm } from './login_form';
diff --git a/x-pack/plugins/security/public/authentication/login/components/login_form/login_form.test.tsx b/x-pack/plugins/security/public/authentication/login/components/login_form/login_form.test.tsx
new file mode 100644
index 0000000000000..c17c10a2c5148
--- /dev/null
+++ b/x-pack/plugins/security/public/authentication/login/components/login_form/login_form.test.tsx
@@ -0,0 +1,272 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * 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 { act } from '@testing-library/react';
+import { EuiButton, EuiCallOut } from '@elastic/eui';
+import { mountWithIntl, nextTick, shallowWithIntl } from 'test_utils/enzyme_helpers';
+import { LoginForm } from './login_form';
+
+import { coreMock } from '../../../../../../../../src/core/public/mocks';
+
+describe('LoginForm', () => {
+  beforeAll(() => {
+    Object.defineProperty(window, 'location', {
+      value: { href: 'https://some-host/bar' },
+      writable: true,
+    });
+  });
+
+  afterAll(() => {
+    delete (window as any).location;
+  });
+
+  it('renders as expected', () => {
+    const coreStartMock = coreMock.createStart();
+    expect(
+      shallowWithIntl(
+        <LoginForm
+          http={coreStartMock.http}
+          notifications={coreStartMock.notifications}
+          loginAssistanceMessage=""
+          showLoginForm={true}
+          selector={{ enabled: false, providers: [] }}
+        />
+      )
+    ).toMatchSnapshot();
+  });
+
+  it('renders an info message when provided.', () => {
+    const coreStartMock = coreMock.createStart();
+    const wrapper = shallowWithIntl(
+      <LoginForm
+        http={coreStartMock.http}
+        notifications={coreStartMock.notifications}
+        infoMessage={'Hey this is an info message'}
+        loginAssistanceMessage=""
+        showLoginForm={true}
+        selector={{ enabled: false, providers: [] }}
+      />
+    );
+
+    expect(wrapper.find(EuiCallOut).props().title).toEqual('Hey this is an info message');
+  });
+
+  it('renders an invalid credentials message', async () => {
+    const coreStartMock = coreMock.createStart({ basePath: '/some-base-path' });
+    coreStartMock.http.post.mockRejectedValue({ response: { status: 401 } });
+
+    const wrapper = mountWithIntl(
+      <LoginForm
+        http={coreStartMock.http}
+        notifications={coreStartMock.notifications}
+        loginAssistanceMessage=""
+        showLoginForm={true}
+        selector={{ enabled: false, providers: [] }}
+      />
+    );
+
+    wrapper.find('input[name="username"]').simulate('change', { target: { value: 'username' } });
+    wrapper.find('input[name="password"]').simulate('change', { target: { value: 'password' } });
+    wrapper.find(EuiButton).simulate('click');
+
+    await act(async () => {
+      await nextTick();
+      wrapper.update();
+    });
+
+    expect(wrapper.find(EuiCallOut).props().title).toEqual(
+      `Invalid username or password. Please try again.`
+    );
+  });
+
+  it('renders unknown error message', async () => {
+    const coreStartMock = coreMock.createStart({ basePath: '/some-base-path' });
+    coreStartMock.http.post.mockRejectedValue({ response: { status: 500 } });
+
+    const wrapper = mountWithIntl(
+      <LoginForm
+        http={coreStartMock.http}
+        notifications={coreStartMock.notifications}
+        loginAssistanceMessage=""
+        showLoginForm={true}
+        selector={{ enabled: false, providers: [] }}
+      />
+    );
+
+    wrapper.find('input[name="username"]').simulate('change', { target: { value: 'username' } });
+    wrapper.find('input[name="password"]').simulate('change', { target: { value: 'password' } });
+    wrapper.find(EuiButton).simulate('click');
+
+    await act(async () => {
+      await nextTick();
+      wrapper.update();
+    });
+
+    expect(wrapper.find(EuiCallOut).props().title).toEqual(`Oops! Error. Try again.`);
+  });
+
+  it('properly redirects after successful login', async () => {
+    window.location.href = `https://some-host/login?next=${encodeURIComponent(
+      '/some-base-path/app/kibana#/home?_g=()'
+    )}`;
+    const coreStartMock = coreMock.createStart({ basePath: '/some-base-path' });
+    coreStartMock.http.post.mockResolvedValue({});
+
+    const wrapper = mountWithIntl(
+      <LoginForm
+        http={coreStartMock.http}
+        notifications={coreStartMock.notifications}
+        loginAssistanceMessage=""
+        showLoginForm={true}
+        selector={{ enabled: false, providers: [] }}
+      />
+    );
+
+    wrapper.find('input[name="username"]').simulate('change', { target: { value: 'username1' } });
+    wrapper.find('input[name="password"]').simulate('change', { target: { value: 'password1' } });
+    wrapper.find(EuiButton).simulate('click');
+
+    await act(async () => {
+      await nextTick();
+      wrapper.update();
+    });
+
+    expect(coreStartMock.http.post).toHaveBeenCalledTimes(1);
+    expect(coreStartMock.http.post).toHaveBeenCalledWith('/internal/security/login', {
+      body: JSON.stringify({ username: 'username1', password: 'password1' }),
+    });
+
+    expect(window.location.href).toBe('/some-base-path/app/kibana#/home?_g=()');
+    expect(wrapper.find(EuiCallOut).exists()).toBe(false);
+  });
+
+  describe('login selector', () => {
+    it('renders as expected with login form', async () => {
+      const coreStartMock = coreMock.createStart();
+      expect(
+        shallowWithIntl(
+          <LoginForm
+            http={coreStartMock.http}
+            notifications={coreStartMock.notifications}
+            loginAssistanceMessage=""
+            showLoginForm={true}
+            selector={{
+              enabled: true,
+              providers: [
+                { type: 'saml', name: 'saml1', description: 'Login w/SAML' },
+                { type: 'pki', name: 'pki1', description: 'Login w/PKI' },
+              ],
+            }}
+          />
+        )
+      ).toMatchSnapshot();
+    });
+
+    it('renders as expected without login form for providers with and without description', async () => {
+      const coreStartMock = coreMock.createStart();
+      expect(
+        shallowWithIntl(
+          <LoginForm
+            http={coreStartMock.http}
+            notifications={coreStartMock.notifications}
+            loginAssistanceMessage=""
+            showLoginForm={false}
+            selector={{
+              enabled: true,
+              providers: [
+                { type: 'saml', name: 'saml1', description: 'Login w/SAML' },
+                { type: 'pki', name: 'pki1' },
+              ],
+            }}
+          />
+        )
+      ).toMatchSnapshot();
+    });
+
+    it('properly redirects after successful login', async () => {
+      const currentURL = `https://some-host/login?next=${encodeURIComponent(
+        '/some-base-path/app/kibana#/home?_g=()'
+      )}`;
+
+      const coreStartMock = coreMock.createStart({ basePath: '/some-base-path' });
+      coreStartMock.http.post.mockResolvedValue({
+        location: 'https://external-idp/login?optional-arg=2#optional-hash',
+      });
+
+      window.location.href = currentURL;
+      const wrapper = mountWithIntl(
+        <LoginForm
+          http={coreStartMock.http}
+          notifications={coreStartMock.notifications}
+          loginAssistanceMessage=""
+          showLoginForm={true}
+          selector={{
+            enabled: true,
+            providers: [
+              { type: 'saml', name: 'saml1', description: 'Login w/SAML' },
+              { type: 'pki', name: 'pki1', description: 'Login w/PKI' },
+            ],
+          }}
+        />
+      );
+
+      wrapper.findWhere(node => node.key() === 'saml1').simulate('click');
+
+      await act(async () => {
+        await nextTick();
+        wrapper.update();
+      });
+
+      expect(coreStartMock.http.post).toHaveBeenCalledTimes(1);
+      expect(coreStartMock.http.post).toHaveBeenCalledWith('/internal/security/login_with', {
+        body: JSON.stringify({ providerType: 'saml', providerName: 'saml1', currentURL }),
+      });
+
+      expect(window.location.href).toBe('https://external-idp/login?optional-arg=2#optional-hash');
+      expect(wrapper.find(EuiCallOut).exists()).toBe(false);
+      expect(coreStartMock.notifications.toasts.addError).not.toHaveBeenCalled();
+    });
+
+    it('shows error toast if login fails', async () => {
+      const currentURL = `https://some-host/login?next=${encodeURIComponent(
+        '/some-base-path/app/kibana#/home?_g=()'
+      )}`;
+
+      const failureReason = new Error('Oh no!');
+      const coreStartMock = coreMock.createStart({ basePath: '/some-base-path' });
+      coreStartMock.http.post.mockRejectedValue(failureReason);
+
+      window.location.href = currentURL;
+      const wrapper = mountWithIntl(
+        <LoginForm
+          http={coreStartMock.http}
+          notifications={coreStartMock.notifications}
+          loginAssistanceMessage=""
+          showLoginForm={true}
+          selector={{ enabled: true, providers: [{ type: 'saml', name: 'saml1' }] }}
+        />
+      );
+
+      wrapper.findWhere(node => node.key() === 'saml1').simulate('click');
+
+      await act(async () => {
+        await nextTick();
+        wrapper.update();
+      });
+
+      expect(coreStartMock.http.post).toHaveBeenCalledTimes(1);
+      expect(coreStartMock.http.post).toHaveBeenCalledWith('/internal/security/login_with', {
+        body: JSON.stringify({ providerType: 'saml', providerName: 'saml1', currentURL }),
+      });
+
+      expect(window.location.href).toBe(currentURL);
+      expect(coreStartMock.notifications.toasts.addError).toHaveBeenCalledWith(failureReason, {
+        title: 'Could not perform login.',
+      });
+    });
+  });
+});
diff --git a/x-pack/plugins/security/public/authentication/login/components/login_form/login_form.tsx b/x-pack/plugins/security/public/authentication/login/components/login_form/login_form.tsx
new file mode 100644
index 0000000000000..a028eb1ba4b70
--- /dev/null
+++ b/x-pack/plugins/security/public/authentication/login/components/login_form/login_form.tsx
@@ -0,0 +1,343 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * 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, { ChangeEvent, Component, FormEvent, Fragment, MouseEvent } from 'react';
+import ReactMarkdown from 'react-markdown';
+import {
+  EuiButton,
+  EuiCallOut,
+  EuiFieldText,
+  EuiFormRow,
+  EuiPanel,
+  EuiSpacer,
+  EuiText,
+} from '@elastic/eui';
+import { i18n } from '@kbn/i18n';
+import { FormattedMessage } from '@kbn/i18n/react';
+import { HttpStart, IHttpFetchError, NotificationsStart } from 'src/core/public';
+import { parseNext } from '../../../../../common/parse_next';
+import { LoginSelector } from '../../../../../common/login_state';
+
+interface Props {
+  http: HttpStart;
+  notifications: NotificationsStart;
+  selector: LoginSelector;
+  showLoginForm: boolean;
+  infoMessage?: string;
+  loginAssistanceMessage: string;
+}
+
+interface State {
+  loadingState:
+    | { type: LoadingStateType.None }
+    | { type: LoadingStateType.Form }
+    | { type: LoadingStateType.Selector; providerName: string };
+  username: string;
+  password: string;
+  message:
+    | { type: MessageType.None }
+    | { type: MessageType.Danger | MessageType.Info; content: string };
+}
+
+enum LoadingStateType {
+  None,
+  Form,
+  Selector,
+}
+
+enum MessageType {
+  None,
+  Info,
+  Danger,
+}
+
+export class LoginForm extends Component<Props, State> {
+  public state: State = {
+    loadingState: { type: LoadingStateType.None },
+    username: '',
+    password: '',
+    message: this.props.infoMessage
+      ? { type: MessageType.Info, content: this.props.infoMessage }
+      : { type: MessageType.None },
+  };
+
+  public render() {
+    return (
+      <Fragment>
+        {this.renderLoginAssistanceMessage()}
+        {this.renderMessage()}
+        {this.renderSelector()}
+        {this.renderLoginForm()}
+      </Fragment>
+    );
+  }
+
+  private renderLoginForm = () => {
+    if (!this.props.showLoginForm) {
+      return null;
+    }
+
+    return (
+      <EuiPanel>
+        <form onSubmit={this.submitLoginForm}>
+          <EuiFormRow
+            label={
+              <FormattedMessage
+                id="xpack.security.login.basicLoginForm.usernameFormRowLabel"
+                defaultMessage="Username"
+              />
+            }
+          >
+            <EuiFieldText
+              id="username"
+              name="username"
+              data-test-subj="loginUsername"
+              value={this.state.username}
+              onChange={this.onUsernameChange}
+              disabled={!this.isLoadingState(LoadingStateType.None)}
+              isInvalid={false}
+              aria-required={true}
+              inputRef={this.setUsernameInputRef}
+            />
+          </EuiFormRow>
+
+          <EuiFormRow
+            label={
+              <FormattedMessage
+                id="xpack.security.login.basicLoginForm.passwordFormRowLabel"
+                defaultMessage="Password"
+              />
+            }
+          >
+            <EuiFieldText
+              autoComplete="off"
+              id="password"
+              name="password"
+              data-test-subj="loginPassword"
+              type="password"
+              value={this.state.password}
+              onChange={this.onPasswordChange}
+              disabled={!this.isLoadingState(LoadingStateType.None)}
+              isInvalid={false}
+              aria-required={true}
+            />
+          </EuiFormRow>
+
+          <EuiButton
+            fill
+            type="submit"
+            color="primary"
+            onClick={this.submitLoginForm}
+            isDisabled={!this.isLoadingState(LoadingStateType.None)}
+            isLoading={this.isLoadingState(LoadingStateType.Form)}
+            data-test-subj="loginSubmit"
+          >
+            <FormattedMessage
+              id="xpack.security.login.basicLoginForm.logInButtonLabel"
+              defaultMessage="Log in"
+            />
+          </EuiButton>
+        </form>
+      </EuiPanel>
+    );
+  };
+
+  private renderLoginAssistanceMessage = () => {
+    if (!this.props.loginAssistanceMessage) {
+      return null;
+    }
+
+    return (
+      <Fragment>
+        <EuiText size="s">
+          <ReactMarkdown>{this.props.loginAssistanceMessage}</ReactMarkdown>
+        </EuiText>
+      </Fragment>
+    );
+  };
+
+  private renderMessage = () => {
+    const { message } = this.state;
+    if (message.type === MessageType.Danger) {
+      return (
+        <Fragment>
+          <EuiCallOut
+            size="s"
+            color="danger"
+            data-test-subj="loginErrorMessage"
+            title={message.content}
+            role="alert"
+          />
+          <EuiSpacer size="l" />
+        </Fragment>
+      );
+    }
+
+    if (message.type === MessageType.Info) {
+      return (
+        <Fragment>
+          <EuiCallOut
+            size="s"
+            color="primary"
+            data-test-subj="loginInfoMessage"
+            title={message.content}
+            role="status"
+          />
+          <EuiSpacer size="l" />
+        </Fragment>
+      );
+    }
+
+    return null;
+  };
+
+  private renderSelector = () => {
+    const showLoginSelector =
+      this.props.selector.enabled && this.props.selector.providers.length > 0;
+    if (!showLoginSelector) {
+      return null;
+    }
+
+    const loginSelectorAndLoginFormSeparator = showLoginSelector && this.props.showLoginForm && (
+      <>
+        <EuiText textAlign="center" color="subdued">
+          ―――&nbsp;&nbsp;
+          <FormattedMessage id="xpack.security.loginPage.loginSelectorOR" defaultMessage="OR" />
+          &nbsp;&nbsp;―――
+        </EuiText>
+        <EuiSpacer size="m" />
+      </>
+    );
+
+    return (
+      <>
+        {this.props.selector.providers.map((provider, index) => (
+          <Fragment key={index}>
+            <EuiButton
+              key={provider.name}
+              fullWidth={true}
+              isDisabled={!this.isLoadingState(LoadingStateType.None)}
+              isLoading={this.isLoadingState(LoadingStateType.Selector, provider.name)}
+              onClick={() => this.loginWithSelector(provider.type, provider.name)}
+            >
+              {provider.description ?? (
+                <FormattedMessage
+                  id="xpack.security.loginPage.loginProviderDescription"
+                  defaultMessage="Login with {providerType}/{providerName}"
+                  values={{
+                    providerType: provider.type,
+                    providerName: provider.name,
+                  }}
+                />
+              )}
+            </EuiButton>
+            <EuiSpacer size="m" />
+          </Fragment>
+        ))}
+        {loginSelectorAndLoginFormSeparator}
+      </>
+    );
+  };
+
+  private setUsernameInputRef(ref: HTMLInputElement) {
+    if (ref) {
+      ref.focus();
+    }
+  }
+
+  private isFormValid = () => {
+    const { username, password } = this.state;
+
+    return username && password;
+  };
+
+  private onUsernameChange = (e: ChangeEvent<HTMLInputElement>) => {
+    this.setState({
+      username: e.target.value,
+    });
+  };
+
+  private onPasswordChange = (e: ChangeEvent<HTMLInputElement>) => {
+    this.setState({
+      password: e.target.value,
+    });
+  };
+
+  private submitLoginForm = async (
+    e: MouseEvent<HTMLButtonElement> | FormEvent<HTMLFormElement>
+  ) => {
+    e.preventDefault();
+
+    if (!this.isFormValid()) {
+      return;
+    }
+
+    this.setState({
+      loadingState: { type: LoadingStateType.Form },
+      message: { type: MessageType.None },
+    });
+
+    const { http } = this.props;
+    const { username, password } = this.state;
+
+    try {
+      await http.post('/internal/security/login', { body: JSON.stringify({ username, password }) });
+      window.location.href = parseNext(window.location.href, http.basePath.serverBasePath);
+    } catch (error) {
+      const message =
+        (error as IHttpFetchError).response?.status === 401
+          ? i18n.translate(
+              'xpack.security.login.basicLoginForm.invalidUsernameOrPasswordErrorMessage',
+              { defaultMessage: 'Invalid username or password. Please try again.' }
+            )
+          : i18n.translate('xpack.security.login.basicLoginForm.unknownErrorMessage', {
+              defaultMessage: 'Oops! Error. Try again.',
+            });
+
+      this.setState({
+        message: { type: MessageType.Danger, content: message },
+        loadingState: { type: LoadingStateType.None },
+      });
+    }
+  };
+
+  private loginWithSelector = async (providerType: string, providerName: string) => {
+    this.setState({
+      loadingState: { type: LoadingStateType.Selector, providerName },
+      message: { type: MessageType.None },
+    });
+
+    try {
+      const { location } = await this.props.http.post<{ location: string }>(
+        '/internal/security/login_with',
+        { body: JSON.stringify({ providerType, providerName, currentURL: window.location.href }) }
+      );
+
+      window.location.href = location;
+    } catch (err) {
+      this.props.notifications.toasts.addError(err, {
+        title: i18n.translate('xpack.security.loginPage.loginSelectorErrorMessage', {
+          defaultMessage: 'Could not perform login.',
+        }),
+      });
+
+      this.setState({ loadingState: { type: LoadingStateType.None } });
+    }
+  };
+
+  private isLoadingState(type: LoadingStateType.None | LoadingStateType.Form): boolean;
+  private isLoadingState(type: LoadingStateType.Selector, providerName: string): boolean;
+  private isLoadingState(type: LoadingStateType, providerName?: string) {
+    const { loadingState } = this.state;
+    if (loadingState.type !== type) {
+      return false;
+    }
+
+    return (
+      loadingState.type !== LoadingStateType.Selector || loadingState.providerName === providerName
+    );
+  }
+}
diff --git a/x-pack/plugins/security/public/authentication/login/login_app.test.ts b/x-pack/plugins/security/public/authentication/login/login_app.test.ts
index 051f08058ed8d..2597a935f45df 100644
--- a/x-pack/plugins/security/public/authentication/login/login_app.test.ts
+++ b/x-pack/plugins/security/public/authentication/login/login_app.test.ts
@@ -38,7 +38,6 @@ describe('loginApp', () => {
   it('properly renders application', async () => {
     const coreSetupMock = coreMock.createSetup();
     const coreStartMock = coreMock.createStart();
-    coreStartMock.injectedMetadata.getInjectedVar.mockReturnValue(true);
     coreSetupMock.getStartServices.mockResolvedValue([coreStartMock, {}]);
     const containerMock = document.createElement('div');
 
@@ -55,16 +54,13 @@ describe('loginApp', () => {
       history: (scopedHistoryMock.create() as unknown) as ScopedHistory,
     });
 
-    expect(coreStartMock.injectedMetadata.getInjectedVar).toHaveBeenCalledTimes(1);
-    expect(coreStartMock.injectedMetadata.getInjectedVar).toHaveBeenCalledWith('secureCookies');
-
     const mockRenderApp = jest.requireMock('./login_page').renderLoginPage;
     expect(mockRenderApp).toHaveBeenCalledTimes(1);
     expect(mockRenderApp).toHaveBeenCalledWith(coreStartMock.i18n, containerMock, {
       http: coreStartMock.http,
+      notifications: coreStartMock.notifications,
       fatalErrors: coreStartMock.fatalErrors,
       loginAssistanceMessage: 'some-message',
-      requiresSecureConnection: true,
     });
   });
 });
diff --git a/x-pack/plugins/security/public/authentication/login/login_app.ts b/x-pack/plugins/security/public/authentication/login/login_app.ts
index 4f4bf3903a1fa..1642aba51c1ae 100644
--- a/x-pack/plugins/security/public/authentication/login/login_app.ts
+++ b/x-pack/plugins/security/public/authentication/login/login_app.ts
@@ -31,11 +31,9 @@ export const loginApp = Object.freeze({
         ]);
         return renderLoginPage(coreStart.i18n, element, {
           http: coreStart.http,
+          notifications: coreStart.notifications,
           fatalErrors: coreStart.fatalErrors,
           loginAssistanceMessage: config.loginAssistanceMessage,
-          requiresSecureConnection: coreStart.injectedMetadata.getInjectedVar(
-            'secureCookies'
-          ) as boolean,
         });
       },
     });
diff --git a/x-pack/plugins/security/public/authentication/login/login_page.test.tsx b/x-pack/plugins/security/public/authentication/login/login_page.test.tsx
index 294434cd08ebc..c4be57d8d7db7 100644
--- a/x-pack/plugins/security/public/authentication/login/login_page.test.tsx
+++ b/x-pack/plugins/security/public/authentication/login/login_page.test.tsx
@@ -8,15 +8,18 @@ import React from 'react';
 import { shallow } from 'enzyme';
 import { act } from '@testing-library/react';
 import { nextTick } from 'test_utils/enzyme_helpers';
-import { LoginState } from './login_state';
+import { LoginState } from '../../../common/login_state';
 import { LoginPage } from './login_page';
 import { coreMock } from '../../../../../../src/core/public/mocks';
-import { DisabledLoginForm, BasicLoginForm } from './components';
+import { DisabledLoginForm, LoginForm } from './components';
 
 const createLoginState = (options?: Partial<LoginState>) => {
   return {
     allowLogin: true,
     layout: 'form',
+    requiresSecureConnection: false,
+    showLoginForm: true,
+    selector: { enabled: false, providers: [] },
     ...options,
   } as LoginState;
 };
@@ -55,9 +58,9 @@ describe('LoginPage', () => {
       const wrapper = shallow(
         <LoginPage
           http={httpMock}
+          notifications={coreStartMock.notifications}
           fatalErrors={coreStartMock.fatalErrors}
           loginAssistanceMessage=""
-          requiresSecureConnection={false}
         />
       );
 
@@ -74,14 +77,14 @@ describe('LoginPage', () => {
   describe('disabled form states', () => {
     it('renders as expected when secure connection is required but not present', async () => {
       const coreStartMock = coreMock.createStart();
-      httpMock.get.mockResolvedValue(createLoginState());
+      httpMock.get.mockResolvedValue(createLoginState({ requiresSecureConnection: true }));
 
       const wrapper = shallow(
         <LoginPage
           http={httpMock}
+          notifications={coreStartMock.notifications}
           fatalErrors={coreStartMock.fatalErrors}
           loginAssistanceMessage=""
-          requiresSecureConnection={true}
         />
       );
 
@@ -100,9 +103,9 @@ describe('LoginPage', () => {
       const wrapper = shallow(
         <LoginPage
           http={httpMock}
+          notifications={coreStartMock.notifications}
           fatalErrors={coreStartMock.fatalErrors}
           loginAssistanceMessage=""
-          requiresSecureConnection={false}
         />
       );
 
@@ -121,9 +124,9 @@ describe('LoginPage', () => {
       const wrapper = shallow(
         <LoginPage
           http={httpMock}
+          notifications={coreStartMock.notifications}
           fatalErrors={coreStartMock.fatalErrors}
           loginAssistanceMessage=""
-          requiresSecureConnection={false}
         />
       );
 
@@ -144,9 +147,30 @@ describe('LoginPage', () => {
       const wrapper = shallow(
         <LoginPage
           http={httpMock}
+          notifications={coreStartMock.notifications}
+          fatalErrors={coreStartMock.fatalErrors}
+          loginAssistanceMessage=""
+        />
+      );
+
+      await act(async () => {
+        await nextTick();
+        wrapper.update();
+      });
+
+      expect(wrapper.find(DisabledLoginForm)).toMatchSnapshot();
+    });
+
+    it('renders as expected when login is not enabled', async () => {
+      const coreStartMock = coreMock.createStart();
+      httpMock.get.mockResolvedValue(createLoginState({ showLoginForm: false }));
+
+      const wrapper = shallow(
+        <LoginPage
+          http={httpMock}
+          notifications={coreStartMock.notifications}
           fatalErrors={coreStartMock.fatalErrors}
           loginAssistanceMessage=""
-          requiresSecureConnection={false}
         />
       );
 
@@ -167,9 +191,9 @@ describe('LoginPage', () => {
       const wrapper = shallow(
         <LoginPage
           http={httpMock}
+          notifications={coreStartMock.notifications}
           fatalErrors={coreStartMock.fatalErrors}
           loginAssistanceMessage=""
-          requiresSecureConnection={false}
         />
       );
 
@@ -179,7 +203,7 @@ describe('LoginPage', () => {
         resetHttpMock(); // so the calls don't show in the BasicLoginForm snapshot
       });
 
-      expect(wrapper.find(BasicLoginForm)).toMatchSnapshot();
+      expect(wrapper.find(LoginForm)).toMatchSnapshot();
     });
 
     it('renders as expected when info message is set', async () => {
@@ -190,9 +214,9 @@ describe('LoginPage', () => {
       const wrapper = shallow(
         <LoginPage
           http={httpMock}
+          notifications={coreStartMock.notifications}
           fatalErrors={coreStartMock.fatalErrors}
           loginAssistanceMessage=""
-          requiresSecureConnection={false}
         />
       );
 
@@ -202,7 +226,7 @@ describe('LoginPage', () => {
         resetHttpMock(); // so the calls don't show in the BasicLoginForm snapshot
       });
 
-      expect(wrapper.find(BasicLoginForm)).toMatchSnapshot();
+      expect(wrapper.find(LoginForm)).toMatchSnapshot();
     });
 
     it('renders as expected when loginAssistanceMessage is set', async () => {
@@ -212,9 +236,9 @@ describe('LoginPage', () => {
       const wrapper = shallow(
         <LoginPage
           http={httpMock}
+          notifications={coreStartMock.notifications}
           fatalErrors={coreStartMock.fatalErrors}
           loginAssistanceMessage="This is an *important* message"
-          requiresSecureConnection={false}
         />
       );
 
@@ -224,7 +248,7 @@ describe('LoginPage', () => {
         resetHttpMock(); // so the calls don't show in the BasicLoginForm snapshot
       });
 
-      expect(wrapper.find(BasicLoginForm)).toMatchSnapshot();
+      expect(wrapper.find(LoginForm)).toMatchSnapshot();
     });
   });
 
@@ -236,9 +260,9 @@ describe('LoginPage', () => {
       const wrapper = shallow(
         <LoginPage
           http={httpMock}
+          notifications={coreStartMock.notifications}
           fatalErrors={coreStartMock.fatalErrors}
           loginAssistanceMessage=""
-          requiresSecureConnection={false}
         />
       );
 
@@ -261,9 +285,9 @@ describe('LoginPage', () => {
       const wrapper = shallow(
         <LoginPage
           http={httpMock}
+          notifications={coreStartMock.notifications}
           fatalErrors={coreStartMock.fatalErrors}
           loginAssistanceMessage=""
-          requiresSecureConnection={false}
         />
       );
 
diff --git a/x-pack/plugins/security/public/authentication/login/login_page.tsx b/x-pack/plugins/security/public/authentication/login/login_page.tsx
index d38dee74faedf..70f8f76ee0a9c 100644
--- a/x-pack/plugins/security/public/authentication/login/login_page.tsx
+++ b/x-pack/plugins/security/public/authentication/login/login_page.tsx
@@ -12,16 +12,15 @@ import { parse } from 'url';
 import { EuiFlexGroup, EuiFlexItem, EuiIcon, EuiSpacer, EuiText, EuiTitle } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n/react';
-import { CoreStart, FatalErrorsStart, HttpStart } from 'src/core/public';
-import { LoginLayout } from '../../../common/licensing';
-import { BasicLoginForm, DisabledLoginForm } from './components';
-import { LoginState } from './login_state';
+import { CoreStart, FatalErrorsStart, HttpStart, NotificationsStart } from 'src/core/public';
+import { LoginState } from '../../../common/login_state';
+import { LoginForm, DisabledLoginForm } from './components';
 
 interface Props {
   http: HttpStart;
+  notifications: NotificationsStart;
   fatalErrors: FatalErrorsStart;
   loginAssistanceMessage: string;
-  requiresSecureConnection: boolean;
 }
 
 interface State {
@@ -44,7 +43,7 @@ const infoMessageMap = new Map([
 ]);
 
 export class LoginPage extends Component<Props, State> {
-  state = { loginState: null };
+  state = { loginState: null } as State;
 
   public async componentDidMount() {
     const loadingCount$ = new BehaviorSubject(1);
@@ -67,12 +66,10 @@ export class LoginPage extends Component<Props, State> {
     }
 
     const isSecureConnection = !!window.location.protocol.match(/^https/);
-    const { allowLogin, layout } = loginState;
+    const { allowLogin, layout, requiresSecureConnection } = loginState;
 
     const loginIsSupported =
-      this.props.requiresSecureConnection && !isSecureConnection
-        ? false
-        : allowLogin && layout === 'form';
+      requiresSecureConnection && !isSecureConnection ? false : allowLogin && layout === 'form';
 
     const contentHeaderClasses = classNames('loginWelcome__content', 'eui-textCenter', {
       ['loginWelcome__contentDisabledForm']: !loginIsSupported,
@@ -111,7 +108,7 @@ export class LoginPage extends Component<Props, State> {
         </header>
         <div className={contentBodyClasses}>
           <EuiFlexGroup gutterSize="l">
-            <EuiFlexItem>{this.getLoginForm({ isSecureConnection, layout })}</EuiFlexItem>
+            <EuiFlexItem>{this.getLoginForm({ ...loginState, isSecureConnection })}</EuiFlexItem>
           </EuiFlexGroup>
         </div>
       </div>
@@ -119,13 +116,34 @@ export class LoginPage extends Component<Props, State> {
   }
 
   private getLoginForm = ({
-    isSecureConnection,
     layout,
-  }: {
-    isSecureConnection: boolean;
-    layout: LoginLayout;
-  }) => {
-    if (this.props.requiresSecureConnection && !isSecureConnection) {
+    requiresSecureConnection,
+    isSecureConnection,
+    selector,
+    showLoginForm,
+  }: LoginState & { isSecureConnection: boolean }) => {
+    const isLoginExplicitlyDisabled =
+      !showLoginForm && (!selector.enabled || selector.providers.length === 0);
+    if (isLoginExplicitlyDisabled) {
+      return (
+        <DisabledLoginForm
+          title={
+            <FormattedMessage
+              id="xpack.security.loginPage.noLoginMethodsAvailableTitle"
+              defaultMessage="Login is disabled."
+            />
+          }
+          message={
+            <FormattedMessage
+              id="xpack.security.loginPage.noLoginMethodsAvailableMessage"
+              defaultMessage="Contact your system administrator."
+            />
+          }
+        />
+      );
+    }
+
+    if (requiresSecureConnection && !isSecureConnection) {
       return (
         <DisabledLoginForm
           title={
@@ -144,69 +162,73 @@ export class LoginPage extends Component<Props, State> {
       );
     }
 
-    switch (layout) {
-      case 'form':
-        return (
-          <BasicLoginForm
-            http={this.props.http}
-            infoMessage={infoMessageMap.get(
-              parse(window.location.href, true).query.msg?.toString()
-            )}
-            loginAssistanceMessage={this.props.loginAssistanceMessage}
-          />
-        );
-      case 'error-es-unavailable':
-        return (
-          <DisabledLoginForm
-            title={
-              <FormattedMessage
-                id="xpack.security.loginPage.esUnavailableTitle"
-                defaultMessage="Cannot connect to the Elasticsearch cluster"
-              />
-            }
-            message={
-              <FormattedMessage
-                id="xpack.security.loginPage.esUnavailableMessage"
-                defaultMessage="See the Kibana logs for details and try reloading the page."
-              />
-            }
-          />
-        );
-      case 'error-xpack-unavailable':
-        return (
-          <DisabledLoginForm
-            title={
-              <FormattedMessage
-                id="xpack.security.loginPage.xpackUnavailableTitle"
-                defaultMessage="Cannot connect to the Elasticsearch cluster currently configured for Kibana."
-              />
-            }
-            message={
-              <FormattedMessage
-                id="xpack.security.loginPage.xpackUnavailableMessage"
-                defaultMessage="To use the full set of free features in this distribution of Kibana, please update Elasticsearch to the default distribution."
-              />
-            }
-          />
-        );
-      default:
-        return (
-          <DisabledLoginForm
-            title={
-              <FormattedMessage
-                id="xpack.security.loginPage.unknownLayoutTitle"
-                defaultMessage="Unsupported login form layout."
-              />
-            }
-            message={
-              <FormattedMessage
-                id="xpack.security.loginPage.unknownLayoutMessage"
-                defaultMessage="Refer to the Kibana logs for more details and refresh to try again."
-              />
-            }
-          />
-        );
+    if (layout === 'error-es-unavailable') {
+      return (
+        <DisabledLoginForm
+          title={
+            <FormattedMessage
+              id="xpack.security.loginPage.esUnavailableTitle"
+              defaultMessage="Cannot connect to the Elasticsearch cluster"
+            />
+          }
+          message={
+            <FormattedMessage
+              id="xpack.security.loginPage.esUnavailableMessage"
+              defaultMessage="See the Kibana logs for details and try reloading the page."
+            />
+          }
+        />
+      );
+    }
+
+    if (layout === 'error-xpack-unavailable') {
+      return (
+        <DisabledLoginForm
+          title={
+            <FormattedMessage
+              id="xpack.security.loginPage.xpackUnavailableTitle"
+              defaultMessage="Cannot connect to the Elasticsearch cluster currently configured for Kibana."
+            />
+          }
+          message={
+            <FormattedMessage
+              id="xpack.security.loginPage.xpackUnavailableMessage"
+              defaultMessage="To use the full set of free features in this distribution of Kibana, please update Elasticsearch to the default distribution."
+            />
+          }
+        />
+      );
+    }
+
+    if (layout !== 'form') {
+      return (
+        <DisabledLoginForm
+          title={
+            <FormattedMessage
+              id="xpack.security.loginPage.unknownLayoutTitle"
+              defaultMessage="Unsupported login form layout."
+            />
+          }
+          message={
+            <FormattedMessage
+              id="xpack.security.loginPage.unknownLayoutMessage"
+              defaultMessage="See the Kibana logs for details and try reloading the page."
+            />
+          }
+        />
+      );
     }
+
+    return (
+      <LoginForm
+        http={this.props.http}
+        notifications={this.props.notifications}
+        showLoginForm={showLoginForm}
+        selector={selector}
+        infoMessage={infoMessageMap.get(parse(window.location.href, true).query.msg?.toString())}
+        loginAssistanceMessage={this.props.loginAssistanceMessage}
+      />
+    );
   };
 }
 
diff --git a/x-pack/plugins/security/server/authentication/authenticator.test.ts b/x-pack/plugins/security/server/authentication/authenticator.test.ts
index af019ff10dedc..a595b63faaf9b 100644
--- a/x-pack/plugins/security/server/authentication/authenticator.test.ts
+++ b/x-pack/plugins/security/server/authentication/authenticator.test.ts
@@ -5,6 +5,7 @@
  */
 
 jest.mock('./providers/basic');
+jest.mock('./providers/token');
 jest.mock('./providers/saml');
 jest.mock('./providers/http');
 
@@ -20,33 +21,32 @@ import {
   sessionStorageMock,
 } from '../../../../../src/core/server/mocks';
 import { mockAuthenticatedUser } from '../../common/model/authenticated_user.mock';
+import { ConfigSchema, createConfig } from '../config';
 import { AuthenticationResult } from './authentication_result';
 import { Authenticator, AuthenticatorOptions, ProviderSession } from './authenticator';
 import { DeauthenticationResult } from './deauthentication_result';
-import { BasicAuthenticationProvider } from './providers';
+import { BasicAuthenticationProvider, SAMLAuthenticationProvider } from './providers';
 
 function getMockOptions({
   session,
   providers,
   http = {},
+  selector,
 }: {
   session?: AuthenticatorOptions['config']['session'];
-  providers?: string[];
+  providers?: Record<string, unknown> | string[];
   http?: Partial<AuthenticatorOptions['config']['authc']['http']>;
+  selector?: AuthenticatorOptions['config']['authc']['selector'];
 } = {}) {
   return {
     clusterClient: elasticsearchServiceMock.createClusterClient(),
     basePath: httpServiceMock.createSetupContract().basePath,
     loggers: loggingServiceMock.create(),
-    config: {
-      session: { idleTimeout: null, lifespan: null, ...(session || {}) },
-      authc: {
-        providers: providers || [],
-        oidc: {},
-        saml: {},
-        http: { enabled: true, autoSchemesEnabled: true, schemes: ['apikey'], ...http },
-      },
-    },
+    config: createConfig(
+      ConfigSchema.validate({ session, authc: { selector, providers, http } }),
+      loggingServiceMock.create().get(),
+      { isTLSEnabled: false }
+    ),
     sessionStorageFactory: sessionStorageMock.createFactory<ProviderSession>(),
   };
 }
@@ -56,26 +56,36 @@ describe('Authenticator', () => {
   beforeEach(() => {
     mockBasicAuthenticationProvider = {
       login: jest.fn(),
-      authenticate: jest.fn(),
-      logout: jest.fn(),
+      authenticate: jest.fn().mockResolvedValue(AuthenticationResult.notHandled()),
+      logout: jest.fn().mockResolvedValue(DeauthenticationResult.notHandled()),
       getHTTPAuthenticationScheme: jest.fn(),
     };
 
     jest.requireMock('./providers/http').HTTPAuthenticationProvider.mockImplementation(() => ({
+      type: 'http',
       authenticate: jest.fn().mockResolvedValue(AuthenticationResult.notHandled()),
+      logout: jest.fn().mockResolvedValue(DeauthenticationResult.notHandled()),
+    }));
+
+    jest.requireMock('./providers/basic').BasicAuthenticationProvider.mockImplementation(() => ({
+      type: 'basic',
+      ...mockBasicAuthenticationProvider,
     }));
 
-    jest
-      .requireMock('./providers/basic')
-      .BasicAuthenticationProvider.mockImplementation(() => mockBasicAuthenticationProvider);
+    jest.requireMock('./providers/saml').SAMLAuthenticationProvider.mockImplementation(() => ({
+      type: 'saml',
+      getHTTPAuthenticationScheme: jest.fn(),
+    }));
   });
 
   afterEach(() => jest.clearAllMocks());
 
   describe('initialization', () => {
     it('fails if authentication providers are not configured.', () => {
-      expect(() => new Authenticator(getMockOptions())).toThrowError(
-        'No authentication provider is configured. Verify `xpack.security.authc.providers` config value.'
+      expect(
+        () => new Authenticator(getMockOptions({ providers: {}, http: { enabled: false } }))
+      ).toThrowError(
+        'No authentication provider is configured. Verify `xpack.security.authc.*` config value.'
       );
     });
 
@@ -85,11 +95,19 @@ describe('Authenticator', () => {
       );
     });
 
+    it('fails if any of the user specified provider uses reserved __http__ name.', () => {
+      expect(
+        () =>
+          new Authenticator(getMockOptions({ providers: { basic: { __http__: { order: 0 } } } }))
+      ).toThrowError('Provider name "__http__" is reserved.');
+    });
+
     describe('HTTP authentication provider', () => {
       beforeEach(() => {
         jest
           .requireMock('./providers/basic')
           .BasicAuthenticationProvider.mockImplementation(() => ({
+            type: 'basic',
             getHTTPAuthenticationScheme: jest.fn().mockReturnValue('basic'),
           }));
       });
@@ -97,9 +115,9 @@ describe('Authenticator', () => {
       afterEach(() => jest.resetAllMocks());
 
       it('enabled by default', () => {
-        const authenticator = new Authenticator(getMockOptions({ providers: ['basic'] }));
-        expect(authenticator.isProviderEnabled('basic')).toBe(true);
-        expect(authenticator.isProviderEnabled('http')).toBe(true);
+        const authenticator = new Authenticator(getMockOptions());
+        expect(authenticator.isProviderTypeEnabled('basic')).toBe(true);
+        expect(authenticator.isProviderTypeEnabled('http')).toBe(true);
 
         expect(
           jest.requireMock('./providers/http').HTTPAuthenticationProvider
@@ -110,11 +128,13 @@ describe('Authenticator', () => {
 
       it('includes all required schemes if `autoSchemesEnabled` is enabled', () => {
         const authenticator = new Authenticator(
-          getMockOptions({ providers: ['basic', 'kerberos'] })
+          getMockOptions({
+            providers: { basic: { basic1: { order: 0 } }, kerberos: { kerberos1: { order: 1 } } },
+          })
         );
-        expect(authenticator.isProviderEnabled('basic')).toBe(true);
-        expect(authenticator.isProviderEnabled('kerberos')).toBe(true);
-        expect(authenticator.isProviderEnabled('http')).toBe(true);
+        expect(authenticator.isProviderTypeEnabled('basic')).toBe(true);
+        expect(authenticator.isProviderTypeEnabled('kerberos')).toBe(true);
+        expect(authenticator.isProviderTypeEnabled('http')).toBe(true);
 
         expect(
           jest.requireMock('./providers/http').HTTPAuthenticationProvider
@@ -125,11 +145,14 @@ describe('Authenticator', () => {
 
       it('does not include additional schemes if `autoSchemesEnabled` is disabled', () => {
         const authenticator = new Authenticator(
-          getMockOptions({ providers: ['basic', 'kerberos'], http: { autoSchemesEnabled: false } })
+          getMockOptions({
+            providers: { basic: { basic1: { order: 0 } }, kerberos: { kerberos1: { order: 1 } } },
+            http: { autoSchemesEnabled: false },
+          })
         );
-        expect(authenticator.isProviderEnabled('basic')).toBe(true);
-        expect(authenticator.isProviderEnabled('kerberos')).toBe(true);
-        expect(authenticator.isProviderEnabled('http')).toBe(true);
+        expect(authenticator.isProviderTypeEnabled('basic')).toBe(true);
+        expect(authenticator.isProviderTypeEnabled('kerberos')).toBe(true);
+        expect(authenticator.isProviderTypeEnabled('http')).toBe(true);
 
         expect(
           jest.requireMock('./providers/http').HTTPAuthenticationProvider
@@ -138,10 +161,13 @@ describe('Authenticator', () => {
 
       it('disabled if explicitly disabled', () => {
         const authenticator = new Authenticator(
-          getMockOptions({ providers: ['basic'], http: { enabled: false } })
+          getMockOptions({
+            providers: { basic: { basic1: { order: 0 } } },
+            http: { enabled: false },
+          })
         );
-        expect(authenticator.isProviderEnabled('basic')).toBe(true);
-        expect(authenticator.isProviderEnabled('http')).toBe(false);
+        expect(authenticator.isProviderTypeEnabled('basic')).toBe(true);
+        expect(authenticator.isProviderTypeEnabled('http')).toBe(false);
 
         expect(
           jest.requireMock('./providers/http').HTTPAuthenticationProvider
@@ -156,14 +182,15 @@ describe('Authenticator', () => {
     let mockSessionStorage: jest.Mocked<SessionStorage<ProviderSession>>;
     let mockSessVal: any;
     beforeEach(() => {
-      mockOptions = getMockOptions({ providers: ['basic'] });
+      mockOptions = getMockOptions({ providers: { basic: { basic1: { order: 0 } } } });
       mockSessionStorage = sessionStorageMock.create();
+      mockSessionStorage.get.mockResolvedValue(null);
       mockOptions.sessionStorageFactory.asScoped.mockReturnValue(mockSessionStorage);
       mockSessVal = {
         idleTimeoutExpiration: null,
         lifespanExpiration: null,
         state: { authorization: 'Basic xxx' },
-        provider: 'basic',
+        provider: { type: 'basic', name: 'basic1' },
         path: mockOptions.basePath.serverBasePath,
       };
 
@@ -176,17 +203,26 @@ describe('Authenticator', () => {
       );
     });
 
-    it('fails if login attempt is not provided.', async () => {
+    it('fails if login attempt is not provided or invalid.', async () => {
       await expect(
         authenticator.login(httpServerMock.createKibanaRequest(), undefined as any)
       ).rejects.toThrowError(
-        'Login attempt should be an object with non-empty "provider" property.'
+        'Login attempt should be an object with non-empty "provider.type" or "provider.name" property.'
       );
 
       await expect(
         authenticator.login(httpServerMock.createKibanaRequest(), {} as any)
       ).rejects.toThrowError(
-        'Login attempt should be an object with non-empty "provider" property.'
+        'Login attempt should be an object with non-empty "provider.type" or "provider.name" property.'
+      );
+
+      await expect(
+        authenticator.login(httpServerMock.createKibanaRequest(), {
+          provider: 'basic',
+          value: {},
+        } as any)
+      ).rejects.toThrowError(
+        'Login attempt should be an object with non-empty "provider.type" or "provider.name" property.'
       );
     });
 
@@ -198,9 +234,9 @@ describe('Authenticator', () => {
         AuthenticationResult.failed(failureReason)
       );
 
-      await expect(authenticator.login(request, { provider: 'basic', value: {} })).resolves.toEqual(
-        AuthenticationResult.failed(failureReason)
-      );
+      await expect(
+        authenticator.login(request, { provider: { type: 'basic' }, value: {} })
+      ).resolves.toEqual(AuthenticationResult.failed(failureReason));
     });
 
     it('returns user that authentication provider returns.', async () => {
@@ -211,7 +247,9 @@ describe('Authenticator', () => {
         AuthenticationResult.succeeded(user, { authHeaders: { authorization: 'Basic .....' } })
       );
 
-      await expect(authenticator.login(request, { provider: 'basic', value: {} })).resolves.toEqual(
+      await expect(
+        authenticator.login(request, { provider: { type: 'basic' }, value: {} })
+      ).resolves.toEqual(
         AuthenticationResult.succeeded(user, { authHeaders: { authorization: 'Basic .....' } })
       );
     });
@@ -225,9 +263,9 @@ describe('Authenticator', () => {
         AuthenticationResult.succeeded(user, { state: { authorization } })
       );
 
-      await expect(authenticator.login(request, { provider: 'basic', value: {} })).resolves.toEqual(
-        AuthenticationResult.succeeded(user, { state: { authorization } })
-      );
+      await expect(
+        authenticator.login(request, { provider: { type: 'basic' }, value: {} })
+      ).resolves.toEqual(AuthenticationResult.succeeded(user, { state: { authorization } }));
 
       expect(mockSessionStorage.set).toHaveBeenCalledTimes(1);
       expect(mockSessionStorage.set).toHaveBeenCalledWith({
@@ -238,9 +276,171 @@ describe('Authenticator', () => {
 
     it('returns `notHandled` if login attempt is targeted to not configured provider.', async () => {
       const request = httpServerMock.createKibanaRequest();
-      await expect(authenticator.login(request, { provider: 'token', value: {} })).resolves.toEqual(
-        AuthenticationResult.notHandled()
-      );
+      await expect(
+        authenticator.login(request, { provider: { type: 'token' }, value: {} })
+      ).resolves.toEqual(AuthenticationResult.notHandled());
+
+      await expect(
+        authenticator.login(request, { provider: { name: 'basic2' }, value: {} })
+      ).resolves.toEqual(AuthenticationResult.notHandled());
+    });
+
+    describe('multi-provider scenarios', () => {
+      let mockSAMLAuthenticationProvider1: jest.Mocked<PublicMethodsOf<SAMLAuthenticationProvider>>;
+      let mockSAMLAuthenticationProvider2: jest.Mocked<PublicMethodsOf<SAMLAuthenticationProvider>>;
+
+      beforeEach(() => {
+        mockSAMLAuthenticationProvider1 = {
+          login: jest.fn().mockResolvedValue(AuthenticationResult.notHandled()),
+          authenticate: jest.fn(),
+          logout: jest.fn(),
+          getHTTPAuthenticationScheme: jest.fn(),
+        };
+
+        mockSAMLAuthenticationProvider2 = {
+          login: jest.fn().mockResolvedValue(AuthenticationResult.notHandled()),
+          authenticate: jest.fn(),
+          logout: jest.fn(),
+          getHTTPAuthenticationScheme: jest.fn(),
+        };
+
+        jest
+          .requireMock('./providers/saml')
+          .SAMLAuthenticationProvider.mockImplementationOnce(() => ({
+            type: 'saml',
+            ...mockSAMLAuthenticationProvider1,
+          }))
+          .mockImplementationOnce(() => ({
+            type: 'saml',
+            ...mockSAMLAuthenticationProvider2,
+          }));
+
+        mockOptions = getMockOptions({
+          providers: {
+            basic: { basic1: { order: 0 } },
+            saml: {
+              saml1: { realm: 'saml1-realm', order: 1 },
+              saml2: { realm: 'saml2-realm', order: 2 },
+            },
+          },
+        });
+        mockSessionStorage = sessionStorageMock.create();
+        mockSessionStorage.get.mockResolvedValue(null);
+        mockOptions.sessionStorageFactory.asScoped.mockReturnValue(mockSessionStorage);
+
+        authenticator = new Authenticator(mockOptions);
+      });
+
+      it('tries to login only with the provider that has specified name', async () => {
+        const user = mockAuthenticatedUser();
+        const request = httpServerMock.createKibanaRequest();
+
+        mockSAMLAuthenticationProvider2.login.mockResolvedValue(
+          AuthenticationResult.succeeded(user, { state: { token: 'access-token' } })
+        );
+
+        await expect(
+          authenticator.login(request, { provider: { name: 'saml2' }, value: {} })
+        ).resolves.toEqual(
+          AuthenticationResult.succeeded(user, { state: { token: 'access-token' } })
+        );
+
+        expect(mockSessionStorage.set).toHaveBeenCalledTimes(1);
+        expect(mockSessionStorage.set).toHaveBeenCalledWith({
+          ...mockSessVal,
+          provider: { type: 'saml', name: 'saml2' },
+          state: { token: 'access-token' },
+        });
+
+        expect(mockBasicAuthenticationProvider.login).not.toHaveBeenCalled();
+        expect(mockSAMLAuthenticationProvider1.login).not.toHaveBeenCalled();
+      });
+
+      it('tries to login only with the provider that has specified type', async () => {
+        const request = httpServerMock.createKibanaRequest();
+
+        await expect(
+          authenticator.login(request, { provider: { type: 'saml' }, value: {} })
+        ).resolves.toEqual(AuthenticationResult.notHandled());
+
+        expect(mockSessionStorage.set).not.toHaveBeenCalled();
+
+        expect(mockBasicAuthenticationProvider.login).not.toHaveBeenCalled();
+        expect(mockSAMLAuthenticationProvider1.login).toHaveBeenCalledTimes(1);
+        expect(mockSAMLAuthenticationProvider2.login).toHaveBeenCalledTimes(1);
+        expect(mockSAMLAuthenticationProvider1.login.mock.invocationCallOrder[0]).toBeLessThan(
+          mockSAMLAuthenticationProvider2.login.mock.invocationCallOrder[0]
+        );
+      });
+
+      it('returns as soon as provider handles request', async () => {
+        const request = httpServerMock.createKibanaRequest();
+
+        const authenticationResults = [
+          AuthenticationResult.failed(new Error('Fail')),
+          AuthenticationResult.succeeded(mockAuthenticatedUser(), { state: { result: '200' } }),
+          AuthenticationResult.redirectTo('/some/url', { state: { result: '302' } }),
+        ];
+
+        for (const result of authenticationResults) {
+          mockSAMLAuthenticationProvider1.login.mockResolvedValue(result);
+
+          await expect(
+            authenticator.login(request, { provider: { type: 'saml' }, value: {} })
+          ).resolves.toEqual(result);
+        }
+
+        expect(mockSessionStorage.set).toHaveBeenCalledTimes(2);
+        expect(mockSessionStorage.set).toHaveBeenCalledWith({
+          ...mockSessVal,
+          provider: { type: 'saml', name: 'saml1' },
+          state: { result: '200' },
+        });
+        expect(mockSessionStorage.set).toHaveBeenCalledWith({
+          ...mockSessVal,
+          provider: { type: 'saml', name: 'saml1' },
+          state: { result: '302' },
+        });
+
+        expect(mockBasicAuthenticationProvider.login).not.toHaveBeenCalled();
+        expect(mockSAMLAuthenticationProvider2.login).not.toHaveBeenCalled();
+        expect(mockSAMLAuthenticationProvider1.login).toHaveBeenCalledTimes(3);
+      });
+
+      it('provides session only if provider name matches', async () => {
+        const request = httpServerMock.createKibanaRequest();
+
+        mockSessionStorage.get.mockResolvedValue({
+          ...mockSessVal,
+          provider: { type: 'saml', name: 'saml2' },
+        });
+
+        const loginAttemptValue = Symbol('attempt');
+        await expect(
+          authenticator.login(request, { provider: { type: 'saml' }, value: loginAttemptValue })
+        ).resolves.toEqual(AuthenticationResult.notHandled());
+
+        expect(mockBasicAuthenticationProvider.login).not.toHaveBeenCalled();
+
+        expect(mockSAMLAuthenticationProvider1.login).toHaveBeenCalledTimes(1);
+        expect(mockSAMLAuthenticationProvider1.login).toHaveBeenCalledWith(
+          request,
+          loginAttemptValue,
+          null
+        );
+
+        expect(mockSAMLAuthenticationProvider2.login).toHaveBeenCalledTimes(1);
+        expect(mockSAMLAuthenticationProvider2.login).toHaveBeenCalledWith(
+          request,
+          loginAttemptValue,
+          mockSessVal.state
+        );
+
+        // Presence of the session has precedence over order.
+        expect(mockSAMLAuthenticationProvider2.login.mock.invocationCallOrder[0]).toBeLessThan(
+          mockSAMLAuthenticationProvider1.login.mock.invocationCallOrder[0]
+        );
+      });
     });
 
     it('clears session if it belongs to a different provider.', async () => {
@@ -249,10 +449,13 @@ describe('Authenticator', () => {
       const request = httpServerMock.createKibanaRequest();
 
       mockBasicAuthenticationProvider.login.mockResolvedValue(AuthenticationResult.succeeded(user));
-      mockSessionStorage.get.mockResolvedValue({ ...mockSessVal, provider: 'token' });
+      mockSessionStorage.get.mockResolvedValue({
+        ...mockSessVal,
+        provider: { type: 'token', name: 'token1' },
+      });
 
       await expect(
-        authenticator.login(request, { provider: 'basic', value: credentials })
+        authenticator.login(request, { provider: { type: 'basic' }, value: credentials })
       ).resolves.toEqual(AuthenticationResult.succeeded(user));
 
       expect(mockBasicAuthenticationProvider.login).toHaveBeenCalledWith(
@@ -265,17 +468,67 @@ describe('Authenticator', () => {
       expect(mockSessionStorage.clear).toHaveBeenCalled();
     });
 
+    it('clears session if it belongs to a provider with the name that is registered but has different type.', async () => {
+      const user = mockAuthenticatedUser();
+      const credentials = { username: 'user', password: 'password' };
+      const request = httpServerMock.createKibanaRequest();
+
+      // Re-configure authenticator with `token` provider that uses the name of `basic`.
+      const loginMock = jest.fn().mockResolvedValue(AuthenticationResult.succeeded(user));
+      jest.requireMock('./providers/token').TokenAuthenticationProvider.mockImplementation(() => ({
+        type: 'token',
+        login: loginMock,
+        getHTTPAuthenticationScheme: jest.fn(),
+      }));
+      mockOptions = getMockOptions({ providers: { token: { basic1: { order: 0 } } } });
+      mockOptions.sessionStorageFactory.asScoped.mockReturnValue(mockSessionStorage);
+      authenticator = new Authenticator(mockOptions);
+
+      mockBasicAuthenticationProvider.login.mockResolvedValue(AuthenticationResult.succeeded(user));
+      mockSessionStorage.get.mockResolvedValue(mockSessVal);
+
+      await expect(
+        authenticator.login(request, { provider: { name: 'basic1' }, value: credentials })
+      ).resolves.toEqual(AuthenticationResult.succeeded(user));
+
+      expect(loginMock).toHaveBeenCalledWith(request, credentials, null);
+
+      expect(mockSessionStorage.set).not.toHaveBeenCalled();
+      expect(mockSessionStorage.clear).toHaveBeenCalled();
+    });
+
     it('clears session if provider asked to do so.', async () => {
       const user = mockAuthenticatedUser();
       const request = httpServerMock.createKibanaRequest();
+      mockSessionStorage.get.mockResolvedValue(mockSessVal);
 
       mockBasicAuthenticationProvider.login.mockResolvedValue(
         AuthenticationResult.succeeded(user, { state: null })
       );
 
-      await expect(authenticator.login(request, { provider: 'basic', value: {} })).resolves.toEqual(
-        AuthenticationResult.succeeded(user, { state: null })
-      );
+      await expect(
+        authenticator.login(request, { provider: { type: 'basic' }, value: {} })
+      ).resolves.toEqual(AuthenticationResult.succeeded(user, { state: null }));
+
+      expect(mockSessionStorage.set).not.toHaveBeenCalled();
+      expect(mockSessionStorage.clear).toHaveBeenCalled();
+    });
+
+    it('clears legacy session.', async () => {
+      const user = mockAuthenticatedUser();
+      const request = httpServerMock.createKibanaRequest();
+
+      // Use string format for the `provider` session value field to emulate legacy session.
+      mockSessionStorage.get.mockResolvedValue({ ...mockSessVal, provider: 'basic' });
+
+      mockBasicAuthenticationProvider.login.mockResolvedValue(AuthenticationResult.succeeded(user));
+
+      await expect(
+        authenticator.login(request, { provider: { type: 'basic' }, value: {} })
+      ).resolves.toEqual(AuthenticationResult.succeeded(user));
+
+      expect(mockBasicAuthenticationProvider.login).toHaveBeenCalledTimes(1);
+      expect(mockBasicAuthenticationProvider.login).toHaveBeenCalledWith(request, {}, null);
 
       expect(mockSessionStorage.set).not.toHaveBeenCalled();
       expect(mockSessionStorage.clear).toHaveBeenCalled();
@@ -288,14 +541,15 @@ describe('Authenticator', () => {
     let mockSessionStorage: jest.Mocked<SessionStorage<ProviderSession>>;
     let mockSessVal: any;
     beforeEach(() => {
-      mockOptions = getMockOptions({ providers: ['basic'] });
+      mockOptions = getMockOptions({ providers: { basic: { basic1: { order: 0 } } } });
       mockSessionStorage = sessionStorageMock.create<ProviderSession>();
+      mockSessionStorage.get.mockResolvedValue(null);
       mockOptions.sessionStorageFactory.asScoped.mockReturnValue(mockSessionStorage);
       mockSessVal = {
         idleTimeoutExpiration: null,
         lifespanExpiration: null,
         state: { authorization: 'Basic xxx' },
-        provider: 'basic',
+        provider: { type: 'basic', name: 'basic1' },
         path: mockOptions.basePath.serverBasePath,
       };
 
@@ -430,7 +684,7 @@ describe('Authenticator', () => {
           idleTimeout: duration(3600 * 24),
           lifespan: null,
         },
-        providers: ['basic'],
+        providers: { basic: { basic1: { order: 0 } } },
       });
 
       mockSessionStorage = sessionStorageMock.create();
@@ -469,7 +723,7 @@ describe('Authenticator', () => {
           idleTimeout: duration(hr * 2),
           lifespan: duration(hr * 8),
         },
-        providers: ['basic'],
+        providers: { basic: { basic1: { order: 0 } } },
       });
 
       mockSessionStorage = sessionStorageMock.create();
@@ -521,7 +775,7 @@ describe('Authenticator', () => {
             idleTimeout: null,
             lifespan,
           },
-          providers: ['basic'],
+          providers: { basic: { basic1: { order: 0 } } },
         });
 
         mockSessionStorage = sessionStorageMock.create();
@@ -703,14 +957,33 @@ describe('Authenticator', () => {
       expect(mockSessionStorage.clear).toHaveBeenCalled();
     });
 
+    it('clears legacy session.', async () => {
+      const user = mockAuthenticatedUser();
+      const request = httpServerMock.createKibanaRequest();
+
+      // Use string format for the `provider` session value field to emulate legacy session.
+      mockSessionStorage.get.mockResolvedValue({ ...mockSessVal, provider: 'basic' });
+
+      mockBasicAuthenticationProvider.authenticate.mockResolvedValue(
+        AuthenticationResult.succeeded(user)
+      );
+
+      await expect(authenticator.authenticate(request)).resolves.toEqual(
+        AuthenticationResult.succeeded(user)
+      );
+
+      expect(mockBasicAuthenticationProvider.authenticate).toHaveBeenCalledTimes(1);
+      expect(mockBasicAuthenticationProvider.authenticate).toHaveBeenCalledWith(request, null);
+
+      expect(mockSessionStorage.set).not.toHaveBeenCalled();
+      expect(mockSessionStorage.clear).toHaveBeenCalled();
+    });
+
     it('does not clear session if provider can not handle system API request authentication with active session.', async () => {
       const request = httpServerMock.createKibanaRequest({
         headers: { 'kbn-system-request': 'true' },
       });
 
-      mockBasicAuthenticationProvider.authenticate.mockResolvedValue(
-        AuthenticationResult.notHandled()
-      );
       mockSessionStorage.get.mockResolvedValue(mockSessVal);
 
       await expect(authenticator.authenticate(request)).resolves.toEqual(
@@ -726,9 +999,6 @@ describe('Authenticator', () => {
         headers: { 'kbn-system-request': 'false' },
       });
 
-      mockBasicAuthenticationProvider.authenticate.mockResolvedValue(
-        AuthenticationResult.notHandled()
-      );
       mockSessionStorage.get.mockResolvedValue(mockSessVal);
 
       await expect(authenticator.authenticate(request)).resolves.toEqual(
@@ -744,10 +1014,10 @@ describe('Authenticator', () => {
         headers: { 'kbn-system-request': 'true' },
       });
 
-      mockBasicAuthenticationProvider.authenticate.mockResolvedValue(
-        AuthenticationResult.notHandled()
-      );
-      mockSessionStorage.get.mockResolvedValue({ ...mockSessVal, provider: 'token' });
+      mockSessionStorage.get.mockResolvedValue({
+        ...mockSessVal,
+        provider: { type: 'token', name: 'token1' },
+      });
 
       await expect(authenticator.authenticate(request)).resolves.toEqual(
         AuthenticationResult.notHandled()
@@ -762,10 +1032,10 @@ describe('Authenticator', () => {
         headers: { 'kbn-system-request': 'false' },
       });
 
-      mockBasicAuthenticationProvider.authenticate.mockResolvedValue(
-        AuthenticationResult.notHandled()
-      );
-      mockSessionStorage.get.mockResolvedValue({ ...mockSessVal, provider: 'token' });
+      mockSessionStorage.get.mockResolvedValue({
+        ...mockSessVal,
+        provider: { type: 'token', name: 'token1' },
+      });
 
       await expect(authenticator.authenticate(request)).resolves.toEqual(
         AuthenticationResult.notHandled()
@@ -774,6 +1044,70 @@ describe('Authenticator', () => {
       expect(mockSessionStorage.set).not.toHaveBeenCalled();
       expect(mockSessionStorage.clear).toHaveBeenCalled();
     });
+
+    describe('with Login Selector', () => {
+      beforeEach(() => {
+        mockOptions = getMockOptions({
+          selector: { enabled: true },
+          providers: { basic: { basic1: { order: 0 } } },
+        });
+        mockOptions.sessionStorageFactory.asScoped.mockReturnValue(mockSessionStorage);
+
+        authenticator = new Authenticator(mockOptions);
+      });
+
+      it('does not redirect to Login Selector if there is an active session', async () => {
+        const request = httpServerMock.createKibanaRequest();
+        mockSessionStorage.get.mockResolvedValue(mockSessVal);
+
+        await expect(authenticator.authenticate(request)).resolves.toEqual(
+          AuthenticationResult.notHandled()
+        );
+        expect(mockBasicAuthenticationProvider.authenticate).toHaveBeenCalled();
+      });
+
+      it('does not redirect AJAX requests to Login Selector', async () => {
+        const request = httpServerMock.createKibanaRequest({ headers: { 'kbn-xsrf': 'xsrf' } });
+
+        await expect(authenticator.authenticate(request)).resolves.toEqual(
+          AuthenticationResult.notHandled()
+        );
+        expect(mockBasicAuthenticationProvider.authenticate).toHaveBeenCalled();
+      });
+
+      it('does not redirect to Login Selector if request has `Authorization` header', async () => {
+        const request = httpServerMock.createKibanaRequest({
+          headers: { authorization: 'Basic ***' },
+        });
+
+        await expect(authenticator.authenticate(request)).resolves.toEqual(
+          AuthenticationResult.notHandled()
+        );
+        expect(mockBasicAuthenticationProvider.authenticate).toHaveBeenCalled();
+      });
+
+      it('does not redirect to Login Selector if it is not enabled', async () => {
+        mockOptions = getMockOptions({ providers: { basic: { basic1: { order: 0 } } } });
+        mockOptions.sessionStorageFactory.asScoped.mockReturnValue(mockSessionStorage);
+        authenticator = new Authenticator(mockOptions);
+
+        const request = httpServerMock.createKibanaRequest();
+        await expect(authenticator.authenticate(request)).resolves.toEqual(
+          AuthenticationResult.notHandled()
+        );
+        expect(mockBasicAuthenticationProvider.authenticate).toHaveBeenCalled();
+      });
+
+      it('redirects to the Login Selector when needed.', async () => {
+        const request = httpServerMock.createKibanaRequest();
+        await expect(authenticator.authenticate(request)).resolves.toEqual(
+          AuthenticationResult.redirectTo(
+            '/mock-server-basepath/login?next=%2Fmock-server-basepath%2Fpath'
+          )
+        );
+        expect(mockBasicAuthenticationProvider.authenticate).not.toHaveBeenCalled();
+      });
+    });
   });
 
   describe('`logout` method', () => {
@@ -782,14 +1116,14 @@ describe('Authenticator', () => {
     let mockSessionStorage: jest.Mocked<SessionStorage<ProviderSession>>;
     let mockSessVal: any;
     beforeEach(() => {
-      mockOptions = getMockOptions({ providers: ['basic'] });
+      mockOptions = getMockOptions({ providers: { basic: { basic1: { order: 0 } } } });
       mockSessionStorage = sessionStorageMock.create();
       mockOptions.sessionStorageFactory.asScoped.mockReturnValue(mockSessionStorage);
       mockSessVal = {
         idleTimeoutExpiration: null,
         lifespanExpiration: null,
         state: { authorization: 'Basic xxx' },
-        provider: 'basic',
+        provider: { type: 'basic', name: 'basic1' },
         path: mockOptions.basePath.serverBasePath,
       };
 
@@ -805,6 +1139,7 @@ describe('Authenticator', () => {
     it('returns `notHandled` if session does not exist.', async () => {
       const request = httpServerMock.createKibanaRequest();
       mockSessionStorage.get.mockResolvedValue(null);
+      mockBasicAuthenticationProvider.logout.mockResolvedValue(DeauthenticationResult.notHandled());
 
       await expect(authenticator.logout(request)).resolves.toEqual(
         DeauthenticationResult.notHandled()
@@ -829,7 +1164,7 @@ describe('Authenticator', () => {
     });
 
     it('if session does not exist but provider name is valid, returns whatever authentication provider returns.', async () => {
-      const request = httpServerMock.createKibanaRequest({ query: { provider: 'basic' } });
+      const request = httpServerMock.createKibanaRequest({ query: { provider: 'basic1' } });
       mockSessionStorage.get.mockResolvedValue(null);
 
       mockBasicAuthenticationProvider.logout.mockResolvedValue(
@@ -855,16 +1190,20 @@ describe('Authenticator', () => {
       expect(mockSessionStorage.clear).not.toHaveBeenCalled();
     });
 
-    it('only clears session if it belongs to not configured provider.', async () => {
+    it('clears session if it belongs to not configured provider.', async () => {
       const request = httpServerMock.createKibanaRequest();
       const state = { authorization: 'Bearer xxx' };
-      mockSessionStorage.get.mockResolvedValue({ ...mockSessVal, state, provider: 'token' });
+      mockSessionStorage.get.mockResolvedValue({
+        ...mockSessVal,
+        state,
+        provider: { type: 'token', name: 'token1' },
+      });
 
       await expect(authenticator.logout(request)).resolves.toEqual(
         DeauthenticationResult.notHandled()
       );
 
-      expect(mockBasicAuthenticationProvider.logout).not.toHaveBeenCalled();
+      expect(mockBasicAuthenticationProvider.logout).toHaveBeenCalledTimes(1);
       expect(mockSessionStorage.clear).toHaveBeenCalled();
     });
   });
@@ -874,7 +1213,7 @@ describe('Authenticator', () => {
     let mockOptions: ReturnType<typeof getMockOptions>;
     let mockSessionStorage: jest.Mocked<SessionStorage<ProviderSession>>;
     beforeEach(() => {
-      mockOptions = getMockOptions({ providers: ['basic'] });
+      mockOptions = getMockOptions({ providers: { basic: { basic1: { order: 0 } } } });
       mockSessionStorage = sessionStorageMock.create();
       mockOptions.sessionStorageFactory.asScoped.mockReturnValue(mockSessionStorage);
 
@@ -889,13 +1228,13 @@ describe('Authenticator', () => {
         now: currentDate,
         idleTimeoutExpiration: currentDate + 60000,
         lifespanExpiration: currentDate + 120000,
-        provider: 'basic',
+        provider: 'basic1',
       };
       mockSessionStorage.get.mockResolvedValue({
         idleTimeoutExpiration: mockInfo.idleTimeoutExpiration,
         lifespanExpiration: mockInfo.lifespanExpiration,
         state,
-        provider: mockInfo.provider,
+        provider: { type: 'basic', name: mockInfo.provider },
         path: mockOptions.basePath.serverBasePath,
       });
       jest.spyOn(Date, 'now').mockImplementation(() => currentDate);
@@ -917,13 +1256,22 @@ describe('Authenticator', () => {
 
   describe('`isProviderEnabled` method', () => {
     it('returns `true` only if specified provider is enabled', () => {
-      let authenticator = new Authenticator(getMockOptions({ providers: ['basic'] }));
-      expect(authenticator.isProviderEnabled('basic')).toBe(true);
-      expect(authenticator.isProviderEnabled('saml')).toBe(false);
-
-      authenticator = new Authenticator(getMockOptions({ providers: ['basic', 'saml'] }));
-      expect(authenticator.isProviderEnabled('basic')).toBe(true);
-      expect(authenticator.isProviderEnabled('saml')).toBe(true);
+      let authenticator = new Authenticator(
+        getMockOptions({ providers: { basic: { basic1: { order: 0 } } } })
+      );
+      expect(authenticator.isProviderTypeEnabled('basic')).toBe(true);
+      expect(authenticator.isProviderTypeEnabled('saml')).toBe(false);
+
+      authenticator = new Authenticator(
+        getMockOptions({
+          providers: {
+            basic: { basic1: { order: 0 } },
+            saml: { saml1: { order: 1, realm: 'test' } },
+          },
+        })
+      );
+      expect(authenticator.isProviderTypeEnabled('basic')).toBe(true);
+      expect(authenticator.isProviderTypeEnabled('saml')).toBe(true);
     });
   });
 });
diff --git a/x-pack/plugins/security/server/authentication/authenticator.ts b/x-pack/plugins/security/server/authentication/authenticator.ts
index e2e2d12917394..caf5b485d05e3 100644
--- a/x-pack/plugins/security/server/authentication/authenticator.ts
+++ b/x-pack/plugins/security/server/authentication/authenticator.ts
@@ -28,21 +28,22 @@ import {
   OIDCAuthenticationProvider,
   PKIAuthenticationProvider,
   HTTPAuthenticationProvider,
-  isSAMLRequestQuery,
 } from './providers';
 import { AuthenticationResult } from './authentication_result';
 import { DeauthenticationResult } from './deauthentication_result';
 import { Tokens } from './tokens';
 import { SessionInfo } from '../../public';
+import { canRedirectRequest } from './can_redirect_request';
+import { HTTPAuthorizationHeader } from './http_authentication';
 
 /**
  * The shape of the session that is actually stored in the cookie.
  */
 export interface ProviderSession {
   /**
-   * Name/type of the provider this session belongs to.
+   * Name and type of the provider this session belongs to.
    */
-  provider: string;
+  provider: { type: string; name: string };
 
   /**
    * The Unix time in ms when the session should be considered expired. If `null`, session will stay
@@ -73,9 +74,9 @@ export interface ProviderSession {
  */
 export interface ProviderLoginAttempt {
   /**
-   * Name/type of the provider this login attempt is targeted for.
+   * Name or type of the provider this login attempt is targeted for.
    */
-  provider: string;
+  provider: { name: string } | { type: string };
 
   /**
    * Login attempt can have any form and defined by the specific provider.
@@ -115,11 +116,42 @@ function assertRequest(request: KibanaRequest) {
 }
 
 function assertLoginAttempt(attempt: ProviderLoginAttempt) {
-  if (!attempt || !attempt.provider || typeof attempt.provider !== 'string') {
-    throw new Error('Login attempt should be an object with non-empty "provider" property.');
+  if (!isLoginAttemptWithProviderType(attempt) && !isLoginAttemptWithProviderName(attempt)) {
+    throw new Error(
+      'Login attempt should be an object with non-empty "provider.type" or "provider.name" property.'
+    );
   }
 }
 
+function isLoginAttemptWithProviderName(
+  attempt: unknown
+): attempt is { value: unknown; provider: { name: string } } {
+  return (
+    typeof attempt === 'object' &&
+    (attempt as any)?.provider?.name &&
+    typeof (attempt as any)?.provider?.name === 'string'
+  );
+}
+
+function isLoginAttemptWithProviderType(
+  attempt: unknown
+): attempt is { value: unknown; provider: { type: string } } {
+  return (
+    typeof attempt === 'object' &&
+    (attempt as any)?.provider?.type &&
+    typeof (attempt as any)?.provider?.type === 'string'
+  );
+}
+
+/**
+ * Determines if session value was created by the previous Kibana versions which had a different
+ * session value format.
+ * @param sessionValue The session value to check.
+ */
+function isLegacyProviderSession(sessionValue: any) {
+  return typeof sessionValue?.provider === 'string';
+}
+
 /**
  * Instantiates authentication provider based on the provider key from config.
  * @param providerType Provider type key.
@@ -194,29 +226,22 @@ export class Authenticator {
       }),
     };
 
-    const authProviders = this.options.config.authc.providers;
-    if (authProviders.length === 0) {
-      throw new Error(
-        'No authentication provider is configured. Verify `xpack.security.authc.providers` config value.'
-      );
-    }
-
     this.providers = new Map(
-      authProviders.map(providerType => {
-        const providerSpecificOptions = this.options.config.authc.hasOwnProperty(providerType)
-          ? (this.options.config.authc as Record<string, any>)[providerType]
-          : undefined;
-
-        this.logger.debug(`Enabling "${providerType}" authentication provider.`);
+      this.options.config.authc.sortedProviders.map(({ type, name }) => {
+        this.logger.debug(`Enabling "${name}" (${type}) authentication provider.`);
 
         return [
-          providerType,
+          name,
           instantiateProvider(
-            providerType,
-            Object.freeze({ ...providerCommonOptions, logger: options.loggers.get(providerType) }),
-            providerSpecificOptions
+            type,
+            Object.freeze({
+              ...providerCommonOptions,
+              name,
+              logger: options.loggers.get(type, name),
+            }),
+            this.options.config.authc.providers[type]?.[name]
           ),
-        ] as [string, BaseAuthenticationProvider];
+        ];
       })
     );
 
@@ -225,11 +250,18 @@ export class Authenticator {
       this.setupHTTPAuthenticationProvider(
         Object.freeze({
           ...providerCommonOptions,
+          name: '__http__',
           logger: options.loggers.get(HTTPAuthenticationProvider.type),
         })
       );
     }
 
+    if (this.providers.size === 0) {
+      throw new Error(
+        'No authentication provider is configured. Verify `xpack.security.authc.*` config value.'
+      );
+    }
+
     this.serverBasePath = this.options.basePath.serverBasePath || '/';
 
     this.idleTimeout = this.options.config.session.idleTimeout;
@@ -245,60 +277,58 @@ export class Authenticator {
     assertRequest(request);
     assertLoginAttempt(attempt);
 
-    // If there is an attempt to login with a provider that isn't enabled, we should fail.
-    const provider = this.providers.get(attempt.provider);
-    if (provider === undefined) {
+    const sessionStorage = this.options.sessionStorageFactory.asScoped(request);
+    const existingSession = await this.getSessionValue(sessionStorage);
+
+    // Login attempt can target specific provider by its name (e.g. chosen at the Login Selector UI)
+    // or a group of providers with the specified type (e.g. in case of 3rd-party initiated login
+    // attempts we may not know what provider exactly can handle that attempt and we have to try
+    // every enabled provider of the specified type).
+    const providers: Array<[string, BaseAuthenticationProvider]> =
+      isLoginAttemptWithProviderName(attempt) && this.providers.has(attempt.provider.name)
+        ? [[attempt.provider.name, this.providers.get(attempt.provider.name)!]]
+        : isLoginAttemptWithProviderType(attempt)
+        ? [...this.providerIterator(existingSession)].filter(
+            ([, { type }]) => type === attempt.provider.type
+          )
+        : [];
+
+    if (providers.length === 0) {
       this.logger.debug(
-        `Login attempt for provider "${attempt.provider}" is detected, but it isn't enabled.`
+        `Login attempt for provider with ${
+          isLoginAttemptWithProviderName(attempt)
+            ? `name ${attempt.provider.name}`
+            : `type "${(attempt.provider as Record<string, string>).type}"`
+        } is detected, but it isn't enabled.`
       );
       return AuthenticationResult.notHandled();
     }
 
-    this.logger.debug(`Performing login using "${attempt.provider}" provider.`);
-
-    const sessionStorage = this.options.sessionStorageFactory.asScoped(request);
+    for (const [providerName, provider] of providers) {
+      // Check if current session has been set by this provider.
+      const ownsSession =
+        existingSession?.provider.name === providerName &&
+        existingSession?.provider.type === provider.type;
 
-    // If we detect an existing session that belongs to a different provider than the one requested
-    // to perform a login we should clear such session.
-    let existingSession = await this.getSessionValue(sessionStorage);
-    if (existingSession && existingSession.provider !== attempt.provider) {
-      this.logger.debug(
-        `Clearing existing session of another ("${existingSession.provider}") provider.`
+      const authenticationResult = await provider.login(
+        request,
+        attempt.value,
+        ownsSession ? existingSession!.state : null
       );
-      sessionStorage.clear();
-      existingSession = null;
-    }
-
-    const authenticationResult = await provider.login(
-      request,
-      attempt.value,
-      existingSession && existingSession.state
-    );
 
-    // There are two possible cases when we'd want to clear existing state:
-    // 1. If provider owned the state (e.g. intermediate state used for multi step login), but failed
-    // to login, that likely means that state is not valid anymore and we should clear it.
-    // 2. Also provider can specifically ask to clear state by setting it to `null` even if
-    // authentication attempt didn't fail (e.g. custom realm could "pin" client/request identity to
-    // a server-side only session established during multi step login that relied on intermediate
-    // client-side state which isn't needed anymore).
-    const shouldClearSession =
-      authenticationResult.shouldClearState() ||
-      (authenticationResult.failed() && getErrorStatusCode(authenticationResult.error) === 401);
-    if (existingSession && shouldClearSession) {
-      sessionStorage.clear();
-    } else if (authenticationResult.shouldUpdateState()) {
-      const { idleTimeoutExpiration, lifespanExpiration } = this.calculateExpiry(existingSession);
-      sessionStorage.set({
-        state: authenticationResult.state,
-        provider: attempt.provider,
-        idleTimeoutExpiration,
-        lifespanExpiration,
-        path: this.serverBasePath,
+      this.updateSessionValue(sessionStorage, {
+        provider: { type: provider.type, name: providerName },
+        isSystemRequest: request.isSystemRequest,
+        authenticationResult,
+        existingSession: ownsSession ? existingSession : null,
       });
+
+      if (!authenticationResult.notHandled()) {
+        return authenticationResult;
+      }
     }
 
-    return authenticationResult;
+    return AuthenticationResult.notHandled();
   }
 
   /**
@@ -311,33 +341,46 @@ export class Authenticator {
     const sessionStorage = this.options.sessionStorageFactory.asScoped(request);
     const existingSession = await this.getSessionValue(sessionStorage);
 
-    let authenticationResult = AuthenticationResult.notHandled();
-    for (const [providerType, provider] of this.providerIterator(existingSession)) {
+    // If request doesn't have any session information, isn't attributed with HTTP Authorization
+    // header and Login Selector is enabled, we must redirect user to the login selector.
+    const useLoginSelector =
+      !existingSession &&
+      this.options.config.authc.selector.enabled &&
+      canRedirectRequest(request) &&
+      HTTPAuthorizationHeader.parseFromRequest(request) == null;
+    if (useLoginSelector) {
+      this.logger.debug('Redirecting request to Login Selector.');
+      return AuthenticationResult.redirectTo(
+        `${this.options.basePath.serverBasePath}/login?next=${encodeURIComponent(
+          `${this.options.basePath.get(request)}${request.url.path}`
+        )}`
+      );
+    }
+
+    for (const [providerName, provider] of this.providerIterator(existingSession)) {
       // Check if current session has been set by this provider.
-      const ownsSession = existingSession && existingSession.provider === providerType;
+      const ownsSession =
+        existingSession?.provider.name === providerName &&
+        existingSession?.provider.type === provider.type;
 
-      authenticationResult = await provider.authenticate(
+      const authenticationResult = await provider.authenticate(
         request,
         ownsSession ? existingSession!.state : null
       );
 
       this.updateSessionValue(sessionStorage, {
-        providerType,
+        provider: { type: provider.type, name: providerName },
         isSystemRequest: request.isSystemRequest,
         authenticationResult,
         existingSession: ownsSession ? existingSession : null,
       });
 
-      if (
-        authenticationResult.failed() ||
-        authenticationResult.succeeded() ||
-        authenticationResult.redirected()
-      ) {
+      if (!authenticationResult.notHandled()) {
         return authenticationResult;
       }
     }
 
-    return authenticationResult;
+    return AuthenticationResult.notHandled();
   }
 
   /**
@@ -349,28 +392,33 @@ export class Authenticator {
 
     const sessionStorage = this.options.sessionStorageFactory.asScoped(request);
     const sessionValue = await this.getSessionValue(sessionStorage);
-    const providerName = this.getProviderName(request.query);
     if (sessionValue) {
       sessionStorage.clear();
 
-      return this.providers.get(sessionValue.provider)!.logout(request, sessionValue.state);
-    } else if (providerName) {
+      return this.providers.get(sessionValue.provider.name)!.logout(request, sessionValue.state);
+    }
+
+    const providerName = this.getProviderName(request.query);
+    if (providerName) {
       // provider name is passed in a query param and sourced from the browser's local storage;
       // hence, we can't assume that this provider exists, so we have to check it
       const provider = this.providers.get(providerName);
       if (provider) {
         return provider.logout(request, null);
       }
-    }
-
-    // Normally when there is no active session in Kibana, `logout` method shouldn't do anything
-    // and user will eventually be redirected to the home page to log in. But if SAML is supported there
-    // is a special case when logout is initiated by the IdP or another SP, then IdP will request _every_
-    // SP associated with the current user session to do the logout. So if Kibana (without active session)
-    // receives such a request it shouldn't redirect user to the home page, but rather redirect back to IdP
-    // with correct logout response and only Elasticsearch knows how to do that.
-    if (isSAMLRequestQuery(request.query) && this.providers.has('saml')) {
-      return this.providers.get('saml')!.logout(request);
+    } else {
+      // In case logout is called and we cannot figure out what provider is supposed to handle it,
+      // we should iterate through all providers and let them decide if they can perform a logout.
+      // This can be necessary if some 3rd-party initiates logout. And even if user doesn't have an
+      // active session already some providers can still properly respond to the 3rd-party logout
+      // request. For example SAML provider can process logout request encoded in `SAMLRequest`
+      // query string parameter.
+      for (const [, provider] of this.providerIterator(null)) {
+        const deauthenticationResult = await provider.logout(request);
+        if (!deauthenticationResult.notHandled()) {
+          return deauthenticationResult;
+        }
+      }
     }
 
     return DeauthenticationResult.notHandled();
@@ -393,7 +441,7 @@ export class Authenticator {
         now: Date.now(),
         idleTimeoutExpiration: sessionValue.idleTimeoutExpiration,
         lifespanExpiration: sessionValue.lifespanExpiration,
-        provider: sessionValue.provider,
+        provider: sessionValue.provider.name,
       };
     }
     return null;
@@ -403,8 +451,8 @@ export class Authenticator {
    * Checks whether specified provider type is currently enabled.
    * @param providerType Type of the provider (`basic`, `saml`, `pki` etc.).
    */
-  isProviderEnabled(providerType: string) {
-    return this.providers.has(providerType);
+  isProviderTypeEnabled(providerType: string) {
+    return [...this.providers.values()].some(provider => provider.type === providerType);
   }
 
   /**
@@ -428,10 +476,11 @@ export class Authenticator {
       }
     }
 
-    this.providers.set(
-      HTTPAuthenticationProvider.type,
-      new HTTPAuthenticationProvider(options, { supportedSchemes })
-    );
+    if (this.providers.has(options.name)) {
+      throw new Error(`Provider name "${options.name}" is reserved.`);
+    }
+
+    this.providers.set(options.name, new HTTPAuthenticationProvider(options, { supportedSchemes }));
   }
 
   /**
@@ -447,11 +496,11 @@ export class Authenticator {
     if (!sessionValue) {
       yield* this.providers;
     } else {
-      yield [sessionValue.provider, this.providers.get(sessionValue.provider)!];
+      yield [sessionValue.provider.name, this.providers.get(sessionValue.provider.name)!];
 
-      for (const [providerType, provider] of this.providers) {
-        if (providerType !== sessionValue.provider) {
-          yield [providerType, provider];
+      for (const [providerName, provider] of this.providers) {
+        if (providerName !== sessionValue.provider.name) {
+          yield [providerName, provider];
         }
       }
     }
@@ -463,14 +512,19 @@ export class Authenticator {
    * @param sessionStorage Session storage instance.
    */
   private async getSessionValue(sessionStorage: SessionStorage<ProviderSession>) {
-    let sessionValue = await sessionStorage.get();
+    const sessionValue = await sessionStorage.get();
 
-    // If for some reason we have a session stored for the provider that is not available
-    // (e.g. when user was logged in with one provider, but then configuration has changed
-    // and that provider is no longer available), then we should clear session entirely.
-    if (sessionValue && !this.providers.has(sessionValue.provider)) {
+    // If we detect that session is in incompatible format or for some reason we have a session
+    // stored for the provider that is not available anymore (e.g. when user was logged in with one
+    // provider, but then configuration has changed and that provider is no longer available), then
+    // we should clear session entirely.
+    if (
+      sessionValue &&
+      (isLegacyProviderSession(sessionValue) ||
+        this.providers.get(sessionValue.provider.name)?.type !== sessionValue.provider.type)
+    ) {
       sessionStorage.clear();
-      sessionValue = null;
+      return null;
     }
 
     return sessionValue;
@@ -479,12 +533,12 @@ export class Authenticator {
   private updateSessionValue(
     sessionStorage: SessionStorage<ProviderSession>,
     {
-      providerType,
+      provider,
       authenticationResult,
       existingSession,
       isSystemRequest,
     }: {
-      providerType: string;
+      provider: { type: string; name: string };
       authenticationResult: AuthenticationResult;
       existingSession: ProviderSession | null;
       isSystemRequest: boolean;
@@ -515,7 +569,7 @@ export class Authenticator {
         state: authenticationResult.shouldUpdateState()
           ? authenticationResult.state
           : existingSession!.state,
-        provider: providerType,
+        provider,
         idleTimeoutExpiration,
         lifespanExpiration,
         path: this.serverBasePath,
diff --git a/x-pack/plugins/security/server/authentication/index.mock.ts b/x-pack/plugins/security/server/authentication/index.mock.ts
index 43892753f0d3f..8092c1c81017b 100644
--- a/x-pack/plugins/security/server/authentication/index.mock.ts
+++ b/x-pack/plugins/security/server/authentication/index.mock.ts
@@ -10,7 +10,7 @@ export const authenticationMock = {
   create: (): jest.Mocked<Authentication> => ({
     login: jest.fn(),
     logout: jest.fn(),
-    isProviderEnabled: jest.fn(),
+    isProviderTypeEnabled: jest.fn(),
     createAPIKey: jest.fn(),
     getCurrentUser: jest.fn(),
     grantAPIKeyAsInternalUser: jest.fn(),
diff --git a/x-pack/plugins/security/server/authentication/index.test.ts b/x-pack/plugins/security/server/authentication/index.test.ts
index 21e5f18bc0282..6609f8707976b 100644
--- a/x-pack/plugins/security/server/authentication/index.test.ts
+++ b/x-pack/plugins/security/server/authentication/index.test.ts
@@ -10,7 +10,6 @@ jest.mock('./api_keys');
 jest.mock('./authenticator');
 
 import Boom from 'boom';
-import { first } from 'rxjs/operators';
 
 import {
   loggingServiceMock,
@@ -31,7 +30,7 @@ import {
   ScopedClusterClient,
 } from '../../../../../src/core/server';
 import { AuthenticatedUser } from '../../common/model';
-import { ConfigType, createConfig$ } from '../config';
+import { ConfigSchema, ConfigType, createConfig } from '../config';
 import { AuthenticationResult } from './authentication_result';
 import { Authentication, setupAuthentication } from '.';
 import {
@@ -51,23 +50,18 @@ describe('setupAuthentication()', () => {
     license: jest.Mocked<SecurityLicense>;
   };
   let mockScopedClusterClient: jest.Mocked<PublicMethodsOf<ScopedClusterClient>>;
-  beforeEach(async () => {
-    const mockConfig$ = createConfig$(
-      coreMock.createPluginInitializerContext({
-        encryptionKey: 'ab'.repeat(16),
-        secureCookies: true,
-        session: {
-          idleTimeout: null,
-          lifespan: null,
-        },
-        cookieName: 'my-sid-cookie',
-        authc: { providers: ['basic'], http: { enabled: true } },
-      }),
-      true
-    );
+  beforeEach(() => {
     mockSetupAuthenticationParams = {
       http: coreMock.createSetup().http,
-      config: await mockConfig$.pipe(first()).toPromise(),
+      config: createConfig(
+        ConfigSchema.validate({
+          encryptionKey: 'ab'.repeat(16),
+          secureCookies: true,
+          cookieName: 'my-sid-cookie',
+        }),
+        loggingServiceMock.create().get(),
+        { isTLSEnabled: false }
+      ),
       clusterClient: elasticsearchServiceMock.createClusterClient(),
       license: licenseMock.create(),
       loggers: loggingServiceMock.create(),
diff --git a/x-pack/plugins/security/server/authentication/index.ts b/x-pack/plugins/security/server/authentication/index.ts
index c5c72853e68e1..30ac84632cb7e 100644
--- a/x-pack/plugins/security/server/authentication/index.ts
+++ b/x-pack/plugins/security/server/authentication/index.ts
@@ -21,7 +21,7 @@ export { canRedirectRequest } from './can_redirect_request';
 export { Authenticator, ProviderLoginAttempt } from './authenticator';
 export { AuthenticationResult } from './authentication_result';
 export { DeauthenticationResult } from './deauthentication_result';
-export { OIDCAuthenticationFlow, SAMLLoginStep } from './providers';
+export { OIDCLogin, SAMLLogin } from './providers';
 export {
   CreateAPIKeyResult,
   InvalidateAPIKeyResult,
@@ -169,7 +169,7 @@ export async function setupAuthentication({
     login: authenticator.login.bind(authenticator),
     logout: authenticator.logout.bind(authenticator),
     getSessionInfo: authenticator.getSessionInfo.bind(authenticator),
-    isProviderEnabled: authenticator.isProviderEnabled.bind(authenticator),
+    isProviderTypeEnabled: authenticator.isProviderTypeEnabled.bind(authenticator),
     getCurrentUser,
     createAPIKey: (request: KibanaRequest, params: CreateAPIKeyParams) =>
       apiKeys.create(request, params),
diff --git a/x-pack/plugins/security/server/authentication/providers/base.mock.ts b/x-pack/plugins/security/server/authentication/providers/base.mock.ts
index 0781608f8bc4c..1dcd2885f66dc 100644
--- a/x-pack/plugins/security/server/authentication/providers/base.mock.ts
+++ b/x-pack/plugins/security/server/authentication/providers/base.mock.ts
@@ -14,7 +14,7 @@ export type MockAuthenticationProviderOptions = ReturnType<
   typeof mockAuthenticationProviderOptions
 >;
 
-export function mockAuthenticationProviderOptions() {
+export function mockAuthenticationProviderOptions(options?: { name: string }) {
   const basePath = httpServiceMock.createSetupContract().basePath;
   basePath.get.mockReturnValue('/base-path');
 
@@ -23,5 +23,6 @@ export function mockAuthenticationProviderOptions() {
     logger: loggingServiceMock.create().get(),
     basePath,
     tokens: { refresh: jest.fn(), invalidate: jest.fn() },
+    name: options?.name ?? 'basic1',
   };
 }
diff --git a/x-pack/plugins/security/server/authentication/providers/base.ts b/x-pack/plugins/security/server/authentication/providers/base.ts
index 300e59d9ea3da..48a73586a6fed 100644
--- a/x-pack/plugins/security/server/authentication/providers/base.ts
+++ b/x-pack/plugins/security/server/authentication/providers/base.ts
@@ -21,6 +21,7 @@ import { Tokens } from '../tokens';
  * Represents available provider options.
  */
 export interface AuthenticationProviderOptions {
+  name: string;
   basePath: HttpServiceSetup['basePath'];
   client: IClusterClient;
   logger: Logger;
@@ -41,6 +42,12 @@ export abstract class BaseAuthenticationProvider {
    */
   static readonly type: string;
 
+  /**
+   * Type of the provider. We use `this.constructor` trick to get access to the static `type` field
+   * of the specific `BaseAuthenticationProvider` subclass.
+   */
+  public readonly type = (this.constructor as any).type as string;
+
   /**
    * Logger instance bound to a specific provider context.
    */
@@ -102,9 +109,7 @@ export abstract class BaseAuthenticationProvider {
       ...(await this.options.client
         .asScoped({ headers: { ...request.headers, ...authHeaders } })
         .callAsCurrentUser('shield.authenticate')),
-      // We use `this.constructor` trick to get access to the static `type` field of the specific
-      // `BaseAuthenticationProvider` subclass.
-      authentication_provider: (this.constructor as any).type,
+      authentication_provider: this.options.name,
     } as AuthenticatedUser);
   }
 }
diff --git a/x-pack/plugins/security/server/authentication/providers/basic.test.ts b/x-pack/plugins/security/server/authentication/providers/basic.test.ts
index b7bdff0531fc2..97ca4e46d3eb5 100644
--- a/x-pack/plugins/security/server/authentication/providers/basic.test.ts
+++ b/x-pack/plugins/security/server/authentication/providers/basic.test.ts
@@ -91,6 +91,12 @@ describe('BasicAuthenticationProvider', () => {
       ).resolves.toEqual(AuthenticationResult.notHandled());
     });
 
+    it('does not redirect requests that do not require authentication to the login page.', async () => {
+      await expect(
+        provider.authenticate(httpServerMock.createKibanaRequest({ routeAuthRequired: false }))
+      ).resolves.toEqual(AuthenticationResult.notHandled());
+    });
+
     it('redirects non-AJAX requests that can not be authenticated to the login page.', async () => {
       await expect(
         provider.authenticate(
@@ -172,8 +178,14 @@ describe('BasicAuthenticationProvider', () => {
   });
 
   describe('`logout` method', () => {
-    it('always redirects to the login page.', async () => {
+    it('does not handle logout if state is not present', async () => {
       await expect(provider.logout(httpServerMock.createKibanaRequest())).resolves.toEqual(
+        DeauthenticationResult.notHandled()
+      );
+    });
+
+    it('always redirects to the login page.', async () => {
+      await expect(provider.logout(httpServerMock.createKibanaRequest(), {})).resolves.toEqual(
         DeauthenticationResult.redirectTo('/base-path/login?msg=LOGGED_OUT')
       );
     });
@@ -181,7 +193,10 @@ describe('BasicAuthenticationProvider', () => {
     it('passes query string parameters to the login page.', async () => {
       await expect(
         provider.logout(
-          httpServerMock.createKibanaRequest({ query: { next: '/app/ml', msg: 'SESSION_EXPIRED' } })
+          httpServerMock.createKibanaRequest({
+            query: { next: '/app/ml', msg: 'SESSION_EXPIRED' },
+          }),
+          {}
         )
       ).resolves.toEqual(
         DeauthenticationResult.redirectTo('/base-path/login?next=%2Fapp%2Fml&msg=SESSION_EXPIRED')
diff --git a/x-pack/plugins/security/server/authentication/providers/basic.ts b/x-pack/plugins/security/server/authentication/providers/basic.ts
index 76a9f936eca48..83d4ea689f46a 100644
--- a/x-pack/plugins/security/server/authentication/providers/basic.ts
+++ b/x-pack/plugins/security/server/authentication/providers/basic.ts
@@ -34,6 +34,16 @@ interface ProviderState {
   authorization?: string;
 }
 
+/**
+ * Checks whether current request can initiate new session.
+ * @param request Request instance.
+ */
+function canStartNewSession(request: KibanaRequest) {
+  // We should try to establish new session only if request requires authentication and client
+  // can be redirected to the login page where they can enter username and password.
+  return canRedirectRequest(request) && request.route.options.authRequired === true;
+}
+
 /**
  * Provider that supports request authentication via Basic HTTP Authentication.
  */
@@ -92,7 +102,7 @@ export class BasicAuthenticationProvider extends BaseAuthenticationProvider {
     }
 
     // If state isn't present let's redirect user to the login page.
-    if (canRedirectRequest(request)) {
+    if (canStartNewSession(request)) {
       this.logger.debug('Redirecting request to Login page.');
       const basePath = this.options.basePath.get(request);
       return AuthenticationResult.redirectTo(
@@ -106,8 +116,15 @@ export class BasicAuthenticationProvider extends BaseAuthenticationProvider {
   /**
    * Redirects user to the login page preserving query string parameters.
    * @param request Request instance.
+   * @param [state] Optional state object associated with the provider.
    */
-  public async logout(request: KibanaRequest) {
+  public async logout(request: KibanaRequest, state?: ProviderState | null) {
+    this.logger.debug(`Trying to log user out via ${request.url.path}.`);
+
+    if (!state) {
+      return DeauthenticationResult.notHandled();
+    }
+
     // Query string may contain the path where logout has been called or
     // logout reason that login page may need to know.
     const queryString = request.url.search || `?msg=LOGGED_OUT`;
@@ -134,7 +151,7 @@ export class BasicAuthenticationProvider extends BaseAuthenticationProvider {
     this.logger.debug('Trying to authenticate via state.');
 
     if (!authorization) {
-      this.logger.debug('Access token is not found in state.');
+      this.logger.debug('Authorization header is not found in state.');
       return AuthenticationResult.notHandled();
     }
 
diff --git a/x-pack/plugins/security/server/authentication/providers/http.test.ts b/x-pack/plugins/security/server/authentication/providers/http.test.ts
index 65fbd7cd9f4ad..47715670e4697 100644
--- a/x-pack/plugins/security/server/authentication/providers/http.test.ts
+++ b/x-pack/plugins/security/server/authentication/providers/http.test.ts
@@ -32,7 +32,7 @@ function expectAuthenticateCall(
 describe('HTTPAuthenticationProvider', () => {
   let mockOptions: MockAuthenticationProviderOptions;
   beforeEach(() => {
-    mockOptions = mockAuthenticationProviderOptions();
+    mockOptions = mockAuthenticationProviderOptions({ name: 'http' });
   });
 
   it('throws if `schemes` are not specified', () => {
diff --git a/x-pack/plugins/security/server/authentication/providers/index.ts b/x-pack/plugins/security/server/authentication/providers/index.ts
index cd8f5a70c64e3..048afb6190d18 100644
--- a/x-pack/plugins/security/server/authentication/providers/index.ts
+++ b/x-pack/plugins/security/server/authentication/providers/index.ts
@@ -11,8 +11,8 @@ export {
 } from './base';
 export { BasicAuthenticationProvider } from './basic';
 export { KerberosAuthenticationProvider } from './kerberos';
-export { SAMLAuthenticationProvider, isSAMLRequestQuery, SAMLLoginStep } from './saml';
+export { SAMLAuthenticationProvider, SAMLLogin } from './saml';
 export { TokenAuthenticationProvider } from './token';
-export { OIDCAuthenticationProvider, OIDCAuthenticationFlow } from './oidc';
+export { OIDCAuthenticationProvider, OIDCLogin } from './oidc';
 export { PKIAuthenticationProvider } from './pki';
 export { HTTPAuthenticationProvider } from './http';
diff --git a/x-pack/plugins/security/server/authentication/providers/kerberos.test.ts b/x-pack/plugins/security/server/authentication/providers/kerberos.test.ts
index 955805296e2bd..6eb47cfa83e32 100644
--- a/x-pack/plugins/security/server/authentication/providers/kerberos.test.ts
+++ b/x-pack/plugins/security/server/authentication/providers/kerberos.test.ts
@@ -14,6 +14,7 @@ import { MockAuthenticationProviderOptions, mockAuthenticationProviderOptions }
 import {
   ElasticsearchErrorHelpers,
   IClusterClient,
+  KibanaRequest,
   ScopeableRequest,
 } from '../../../../../../src/core/server';
 import { AuthenticationResult } from '../authentication_result';
@@ -36,43 +37,13 @@ describe('KerberosAuthenticationProvider', () => {
   let provider: KerberosAuthenticationProvider;
   let mockOptions: MockAuthenticationProviderOptions;
   beforeEach(() => {
-    mockOptions = mockAuthenticationProviderOptions();
+    mockOptions = mockAuthenticationProviderOptions({ name: 'kerberos' });
     provider = new KerberosAuthenticationProvider(mockOptions);
   });
 
-  describe('`authenticate` method', () => {
-    it('does not handle authentication via `authorization` header with non-negotiate scheme.', async () => {
-      const request = httpServerMock.createKibanaRequest({
-        headers: { authorization: 'Bearer some-token' },
-      });
-
-      await expect(provider.authenticate(request)).resolves.toEqual(
-        AuthenticationResult.notHandled()
-      );
-
-      expect(mockOptions.client.asScoped).not.toHaveBeenCalled();
-      expect(mockOptions.client.callAsInternalUser).not.toHaveBeenCalled();
-      expect(request.headers.authorization).toBe('Bearer some-token');
-    });
-
-    it('does not handle authentication via `authorization` header with non-negotiate scheme even if state contains a valid token.', async () => {
-      const request = httpServerMock.createKibanaRequest({
-        headers: { authorization: 'Bearer some-token' },
-      });
-      const tokenPair = {
-        accessToken: 'some-valid-token',
-        refreshToken: 'some-valid-refresh-token',
-      };
-
-      await expect(provider.authenticate(request, tokenPair)).resolves.toEqual(
-        AuthenticationResult.notHandled()
-      );
-
-      expect(mockOptions.client.asScoped).not.toHaveBeenCalled();
-      expect(mockOptions.client.callAsInternalUser).not.toHaveBeenCalled();
-      expect(request.headers.authorization).toBe('Bearer some-token');
-    });
-
+  function defineCommonLoginAndAuthenticateTests(
+    operation: (request: KibanaRequest) => Promise<AuthenticationResult>
+  ) {
     it('does not handle requests that can be authenticated without `Negotiate` header.', async () => {
       const request = httpServerMock.createKibanaRequest({ headers: {} });
 
@@ -80,9 +51,7 @@ describe('KerberosAuthenticationProvider', () => {
       mockScopedClusterClient.callAsCurrentUser.mockResolvedValue({});
       mockOptions.client.asScoped.mockReturnValue(mockScopedClusterClient);
 
-      await expect(provider.authenticate(request, null)).resolves.toEqual(
-        AuthenticationResult.notHandled()
-      );
+      await expect(operation(request)).resolves.toEqual(AuthenticationResult.notHandled());
 
       expectAuthenticateCall(mockOptions.client, {
         headers: { authorization: `Negotiate ${Buffer.from('__fake__').toString('base64')}` },
@@ -98,33 +67,13 @@ describe('KerberosAuthenticationProvider', () => {
       );
       mockOptions.client.asScoped.mockReturnValue(mockScopedClusterClient);
 
-      await expect(provider.authenticate(request, null)).resolves.toEqual(
-        AuthenticationResult.notHandled()
-      );
+      await expect(operation(request)).resolves.toEqual(AuthenticationResult.notHandled());
 
       expectAuthenticateCall(mockOptions.client, {
         headers: { authorization: `Negotiate ${Buffer.from('__fake__').toString('base64')}` },
       });
     });
 
-    it('fails if state is present, but backend does not support Kerberos.', async () => {
-      const request = httpServerMock.createKibanaRequest();
-      const tokenPair = { accessToken: 'token', refreshToken: 'refresh-token' };
-
-      const failureReason = ElasticsearchErrorHelpers.decorateNotAuthorizedError(new Error());
-      const mockScopedClusterClient = elasticsearchServiceMock.createScopedClusterClient();
-      mockScopedClusterClient.callAsCurrentUser.mockRejectedValue(failureReason);
-      mockOptions.client.asScoped.mockReturnValue(mockScopedClusterClient);
-      mockOptions.tokens.refresh.mockResolvedValue(null);
-
-      await expect(provider.authenticate(request, tokenPair)).resolves.toEqual(
-        AuthenticationResult.failed(failureReason)
-      );
-
-      expect(mockOptions.tokens.refresh).toHaveBeenCalledTimes(1);
-      expect(mockOptions.tokens.refresh).toHaveBeenCalledWith(tokenPair.refreshToken);
-    });
-
     it('fails with `Negotiate` challenge if backend supports Kerberos.', async () => {
       const request = httpServerMock.createKibanaRequest({ headers: {} });
 
@@ -137,7 +86,7 @@ describe('KerberosAuthenticationProvider', () => {
       mockScopedClusterClient.callAsCurrentUser.mockRejectedValue(failureReason);
       mockOptions.client.asScoped.mockReturnValue(mockScopedClusterClient);
 
-      await expect(provider.authenticate(request, null)).resolves.toEqual(
+      await expect(operation(request)).resolves.toEqual(
         AuthenticationResult.failed(failureReason, {
           authResponseHeaders: { 'WWW-Authenticate': 'Negotiate' },
         })
@@ -156,9 +105,7 @@ describe('KerberosAuthenticationProvider', () => {
       mockScopedClusterClient.callAsCurrentUser.mockRejectedValue(failureReason);
       mockOptions.client.asScoped.mockReturnValue(mockScopedClusterClient);
 
-      await expect(provider.authenticate(request, null)).resolves.toEqual(
-        AuthenticationResult.failed(failureReason)
-      );
+      await expect(operation(request)).resolves.toEqual(AuthenticationResult.failed(failureReason));
 
       expectAuthenticateCall(mockOptions.client, {
         headers: { authorization: `Negotiate ${Buffer.from('__fake__').toString('base64')}` },
@@ -179,7 +126,7 @@ describe('KerberosAuthenticationProvider', () => {
         refresh_token: 'some-refresh-token',
       });
 
-      await expect(provider.authenticate(request)).resolves.toEqual(
+      await expect(operation(request)).resolves.toEqual(
         AuthenticationResult.succeeded(
           { ...user, authentication_provider: 'kerberos' },
           {
@@ -215,7 +162,7 @@ describe('KerberosAuthenticationProvider', () => {
         kerberos_authentication_response_token: 'response-token',
       });
 
-      await expect(provider.authenticate(request)).resolves.toEqual(
+      await expect(operation(request)).resolves.toEqual(
         AuthenticationResult.succeeded(
           { ...user, authentication_provider: 'kerberos' },
           {
@@ -249,7 +196,7 @@ describe('KerberosAuthenticationProvider', () => {
       );
       mockOptions.client.callAsInternalUser.mockRejectedValue(failureReason);
 
-      await expect(provider.authenticate(request)).resolves.toEqual(
+      await expect(operation(request)).resolves.toEqual(
         AuthenticationResult.failed(Boom.unauthorized(), {
           authResponseHeaders: { 'WWW-Authenticate': 'Negotiate response-token' },
         })
@@ -274,7 +221,7 @@ describe('KerberosAuthenticationProvider', () => {
       );
       mockOptions.client.callAsInternalUser.mockRejectedValue(failureReason);
 
-      await expect(provider.authenticate(request)).resolves.toEqual(
+      await expect(operation(request)).resolves.toEqual(
         AuthenticationResult.failed(Boom.unauthorized(), {
           authResponseHeaders: { 'WWW-Authenticate': 'Negotiate' },
         })
@@ -295,9 +242,7 @@ describe('KerberosAuthenticationProvider', () => {
       const failureReason = ElasticsearchErrorHelpers.decorateNotAuthorizedError(new Error());
       mockOptions.client.callAsInternalUser.mockRejectedValue(failureReason);
 
-      await expect(provider.authenticate(request)).resolves.toEqual(
-        AuthenticationResult.failed(failureReason)
-      );
+      await expect(operation(request)).resolves.toEqual(AuthenticationResult.failed(failureReason));
 
       expect(mockOptions.client.callAsInternalUser).toHaveBeenCalledWith('shield.getAccessToken', {
         body: { grant_type: '_kerberos', kerberos_ticket: 'spnego' },
@@ -320,9 +265,7 @@ describe('KerberosAuthenticationProvider', () => {
         refresh_token: 'some-refresh-token',
       });
 
-      await expect(provider.authenticate(request)).resolves.toEqual(
-        AuthenticationResult.failed(failureReason)
-      );
+      await expect(operation(request)).resolves.toEqual(AuthenticationResult.failed(failureReason));
 
       expectAuthenticateCall(mockOptions.client, {
         headers: { authorization: 'Bearer some-token' },
@@ -334,6 +277,74 @@ describe('KerberosAuthenticationProvider', () => {
 
       expect(request.headers.authorization).toBe('negotiate spnego');
     });
+  }
+
+  describe('`login` method', () => {
+    defineCommonLoginAndAuthenticateTests(request => provider.login(request));
+  });
+
+  describe('`authenticate` method', () => {
+    defineCommonLoginAndAuthenticateTests(request => provider.authenticate(request, null));
+
+    it('does not handle authentication via `authorization` header with non-negotiate scheme.', async () => {
+      const request = httpServerMock.createKibanaRequest({
+        headers: { authorization: 'Bearer some-token' },
+      });
+
+      await expect(provider.authenticate(request)).resolves.toEqual(
+        AuthenticationResult.notHandled()
+      );
+
+      expect(mockOptions.client.asScoped).not.toHaveBeenCalled();
+      expect(mockOptions.client.callAsInternalUser).not.toHaveBeenCalled();
+      expect(request.headers.authorization).toBe('Bearer some-token');
+    });
+
+    it('does not handle authentication via `authorization` header with non-negotiate scheme even if state contains a valid token.', async () => {
+      const request = httpServerMock.createKibanaRequest({
+        headers: { authorization: 'Bearer some-token' },
+      });
+      const tokenPair = {
+        accessToken: 'some-valid-token',
+        refreshToken: 'some-valid-refresh-token',
+      };
+
+      await expect(provider.authenticate(request, tokenPair)).resolves.toEqual(
+        AuthenticationResult.notHandled()
+      );
+
+      expect(mockOptions.client.asScoped).not.toHaveBeenCalled();
+      expect(mockOptions.client.callAsInternalUser).not.toHaveBeenCalled();
+      expect(request.headers.authorization).toBe('Bearer some-token');
+    });
+
+    it('fails if state is present, but backend does not support Kerberos.', async () => {
+      const request = httpServerMock.createKibanaRequest();
+      const tokenPair = { accessToken: 'token', refreshToken: 'refresh-token' };
+
+      const failureReason = ElasticsearchErrorHelpers.decorateNotAuthorizedError(new Error());
+      const mockScopedClusterClient = elasticsearchServiceMock.createScopedClusterClient();
+      mockScopedClusterClient.callAsCurrentUser.mockRejectedValue(failureReason);
+      mockOptions.client.asScoped.mockReturnValue(mockScopedClusterClient);
+      mockOptions.tokens.refresh.mockResolvedValue(null);
+
+      await expect(provider.authenticate(request, tokenPair)).resolves.toEqual(
+        AuthenticationResult.failed(failureReason)
+      );
+
+      expect(mockOptions.tokens.refresh).toHaveBeenCalledTimes(1);
+      expect(mockOptions.tokens.refresh).toHaveBeenCalledWith(tokenPair.refreshToken);
+    });
+
+    it('does not start SPNEGO if request does not require authentication.', async () => {
+      const request = httpServerMock.createKibanaRequest({ routeAuthRequired: false });
+      await expect(provider.authenticate(request)).resolves.toEqual(
+        AuthenticationResult.notHandled()
+      );
+
+      expect(mockOptions.client.asScoped).not.toHaveBeenCalled();
+      expect(mockOptions.client.callAsInternalUser).not.toHaveBeenCalled();
+    });
 
     it('succeeds if state contains a valid token.', async () => {
       const user = mockAuthenticatedUser();
@@ -454,6 +465,29 @@ describe('KerberosAuthenticationProvider', () => {
       expect(mockOptions.tokens.refresh).toHaveBeenCalledTimes(1);
       expect(mockOptions.tokens.refresh).toHaveBeenCalledWith(tokenPair.refreshToken);
     });
+
+    it('does not re-start SPNEGO if both access and refresh tokens from the state are expired.', async () => {
+      const request = httpServerMock.createKibanaRequest({ routeAuthRequired: false });
+      const tokenPair = { accessToken: 'expired-token', refreshToken: 'some-valid-refresh-token' };
+
+      const failureReason = ElasticsearchErrorHelpers.decorateNotAuthorizedError(
+        new (errors.AuthenticationException as any)('Unauthorized', {
+          body: { error: { header: { 'WWW-Authenticate': 'Negotiate' } } },
+        })
+      );
+      const mockScopedClusterClient = elasticsearchServiceMock.createScopedClusterClient();
+      mockScopedClusterClient.callAsCurrentUser.mockRejectedValue(failureReason);
+      mockOptions.client.asScoped.mockReturnValue(mockScopedClusterClient);
+
+      mockOptions.tokens.refresh.mockResolvedValue(null);
+
+      await expect(provider.authenticate(request, tokenPair)).resolves.toEqual(
+        AuthenticationResult.notHandled()
+      );
+
+      expect(mockOptions.tokens.refresh).toHaveBeenCalledTimes(1);
+      expect(mockOptions.tokens.refresh).toHaveBeenCalledWith(tokenPair.refreshToken);
+    });
   });
 
   describe('`logout` method', () => {
diff --git a/x-pack/plugins/security/server/authentication/providers/kerberos.ts b/x-pack/plugins/security/server/authentication/providers/kerberos.ts
index dbd0a438d71c9..c4bbe554a3da1 100644
--- a/x-pack/plugins/security/server/authentication/providers/kerberos.ts
+++ b/x-pack/plugins/security/server/authentication/providers/kerberos.ts
@@ -27,6 +27,15 @@ type ProviderState = TokenPair;
  */
 const WWWAuthenticateHeaderName = 'WWW-Authenticate';
 
+/**
+ * Checks whether current request can initiate new session.
+ * @param request Request instance.
+ */
+function canStartNewSession(request: KibanaRequest) {
+  // We should try to establish new session only if request requires authentication.
+  return request.route.options.authRequired === true;
+}
+
 /**
  * Provider that supports Kerberos request authentication.
  */
@@ -36,6 +45,20 @@ export class KerberosAuthenticationProvider extends BaseAuthenticationProvider {
    */
   static readonly type = 'kerberos';
 
+  /**
+   * Performs initial login request.
+   * @param request Request instance.
+   */
+  public async login(request: KibanaRequest) {
+    this.logger.debug('Trying to perform a login.');
+
+    if (HTTPAuthorizationHeader.parseFromRequest(request)?.scheme.toLowerCase() === 'negotiate') {
+      return await this.authenticateWithNegotiateScheme(request);
+    }
+
+    return await this.authenticateViaSPNEGO(request);
+  }
+
   /**
    * Performs Kerberos request authentication.
    * @param request Request instance.
@@ -66,7 +89,7 @@ export class KerberosAuthenticationProvider extends BaseAuthenticationProvider {
 
     // If we couldn't authenticate by means of all methods above, let's try to check if Elasticsearch can
     // start authentication mechanism negotiation, otherwise just return authentication result we have.
-    return authenticationResult.notHandled()
+    return authenticationResult.notHandled() && canStartNewSession(request)
       ? await this.authenticateViaSPNEGO(request, state)
       : authenticationResult;
   }
@@ -239,10 +262,10 @@ export class KerberosAuthenticationProvider extends BaseAuthenticationProvider {
 
     // If refresh token is no longer valid, then we should clear session and renegotiate using SPNEGO.
     if (refreshedTokenPair === null) {
-      this.logger.debug(
-        'Both access and refresh tokens are expired. Re-initiating SPNEGO handshake.'
-      );
-      return this.authenticateViaSPNEGO(request, state);
+      this.logger.debug('Both access and refresh tokens are expired.');
+      return canStartNewSession(request)
+        ? this.authenticateViaSPNEGO(request, state)
+        : AuthenticationResult.notHandled();
     }
 
     try {
diff --git a/x-pack/plugins/security/server/authentication/providers/oidc.test.ts b/x-pack/plugins/security/server/authentication/providers/oidc.test.ts
index 6a4ba1ccb41e2..14fe42aac7599 100644
--- a/x-pack/plugins/security/server/authentication/providers/oidc.test.ts
+++ b/x-pack/plugins/security/server/authentication/providers/oidc.test.ts
@@ -18,7 +18,7 @@ import {
 } from '../../../../../../src/core/server';
 import { AuthenticationResult } from '../authentication_result';
 import { DeauthenticationResult } from '../deauthentication_result';
-import { OIDCAuthenticationProvider, OIDCAuthenticationFlow, ProviderLoginAttempt } from './oidc';
+import { OIDCAuthenticationProvider, OIDCLogin, ProviderLoginAttempt } from './oidc';
 
 function expectAuthenticateCall(
   mockClusterClient: jest.Mocked<IClusterClient>,
@@ -36,7 +36,7 @@ describe('OIDCAuthenticationProvider', () => {
   let provider: OIDCAuthenticationProvider;
   let mockOptions: MockAuthenticationProviderOptions;
   beforeEach(() => {
-    mockOptions = mockAuthenticationProviderOptions();
+    mockOptions = mockAuthenticationProviderOptions({ name: 'oidc' });
     provider = new OIDCAuthenticationProvider(mockOptions, { realm: 'oidc1' });
   });
 
@@ -72,7 +72,7 @@ describe('OIDCAuthenticationProvider', () => {
 
       await expect(
         provider.login(request, {
-          flow: OIDCAuthenticationFlow.InitiatedBy3rdParty,
+          type: OIDCLogin.LoginInitiatedBy3rdParty,
           iss: 'theissuer',
           loginHint: 'loginhint',
         })
@@ -84,7 +84,14 @@ describe('OIDCAuthenticationProvider', () => {
             '&state=statevalue' +
             '&redirect_uri=https%3A%2F%2Ftest-hostname:1234%2Ftest-base-path%2Fapi%2Fsecurity%2Fv1%2F/oidc' +
             '&login_hint=loginhint',
-          { state: { state: 'statevalue', nonce: 'noncevalue', nextURL: '/base-path/' } }
+          {
+            state: {
+              state: 'statevalue',
+              nonce: 'noncevalue',
+              nextURL: '/mock-server-basepath/',
+              realm: 'oidc1',
+            },
+          }
         )
       );
 
@@ -93,6 +100,50 @@ describe('OIDCAuthenticationProvider', () => {
       });
     });
 
+    it('redirects user initiated login attempts to the OpenId Connect Provider.', async () => {
+      const request = httpServerMock.createKibanaRequest();
+
+      mockOptions.client.callAsInternalUser.mockResolvedValue({
+        state: 'statevalue',
+        nonce: 'noncevalue',
+        redirect:
+          'https://op-host/path/login?response_type=code' +
+          '&scope=openid%20profile%20email' +
+          '&client_id=s6BhdRkqt3' +
+          '&state=statevalue' +
+          '&redirect_uri=https%3A%2F%2Ftest-hostname:1234%2Ftest-base-path%2Fapi%2Fsecurity%2Fv1%2F/oidc' +
+          '&login_hint=loginhint',
+      });
+
+      await expect(
+        provider.login(request, {
+          type: OIDCLogin.LoginInitiatedByUser,
+          redirectURLPath: '/mock-server-basepath/app/super-kibana',
+        })
+      ).resolves.toEqual(
+        AuthenticationResult.redirectTo(
+          'https://op-host/path/login?response_type=code' +
+            '&scope=openid%20profile%20email' +
+            '&client_id=s6BhdRkqt3' +
+            '&state=statevalue' +
+            '&redirect_uri=https%3A%2F%2Ftest-hostname:1234%2Ftest-base-path%2Fapi%2Fsecurity%2Fv1%2F/oidc' +
+            '&login_hint=loginhint',
+          {
+            state: {
+              state: 'statevalue',
+              nonce: 'noncevalue',
+              nextURL: '/mock-server-basepath/app/super-kibana',
+              realm: 'oidc1',
+            },
+          }
+        )
+      );
+
+      expect(mockOptions.client.callAsInternalUser).toHaveBeenCalledWith('shield.oidcPrepare', {
+        body: { realm: 'oidc1' },
+      });
+    });
+
     function defineAuthenticationFlowTests(
       getMocks: () => {
         request: KibanaRequest;
@@ -113,10 +164,15 @@ describe('OIDCAuthenticationProvider', () => {
             state: 'statevalue',
             nonce: 'noncevalue',
             nextURL: '/base-path/some-path',
+            realm: 'oidc1',
           })
         ).resolves.toEqual(
           AuthenticationResult.redirectTo('/base-path/some-path', {
-            state: { accessToken: 'some-token', refreshToken: 'some-refresh-token' },
+            state: {
+              accessToken: 'some-token',
+              refreshToken: 'some-refresh-token',
+              realm: 'oidc1',
+            },
           })
         );
 
@@ -137,7 +193,7 @@ describe('OIDCAuthenticationProvider', () => {
         const { request, attempt } = getMocks();
 
         await expect(
-          provider.login(request, attempt, { nextURL: '/base-path/some-path' })
+          provider.login(request, attempt, { nextURL: '/base-path/some-path', realm: 'oidc1' })
         ).resolves.toEqual(
           AuthenticationResult.failed(
             Boom.badRequest(
@@ -153,7 +209,11 @@ describe('OIDCAuthenticationProvider', () => {
         const { request, attempt } = getMocks();
 
         await expect(
-          provider.login(request, attempt, { state: 'statevalue', nonce: 'noncevalue' })
+          provider.login(request, attempt, {
+            state: 'statevalue',
+            nonce: 'noncevalue',
+            realm: 'oidc1',
+          })
         ).resolves.toEqual(
           AuthenticationResult.failed(
             Boom.badRequest(
@@ -168,7 +228,7 @@ describe('OIDCAuthenticationProvider', () => {
       it('fails if session state is not presented.', async () => {
         const { request, attempt } = getMocks();
 
-        await expect(provider.login(request, attempt, {})).resolves.toEqual(
+        await expect(provider.login(request, attempt, {} as any)).resolves.toEqual(
           AuthenticationResult.failed(
             Boom.badRequest(
               'Response session state does not have corresponding state or nonce parameters or redirect URL.'
@@ -192,6 +252,7 @@ describe('OIDCAuthenticationProvider', () => {
             state: 'statevalue',
             nonce: 'noncevalue',
             nextURL: '/base-path/some-path',
+            realm: 'oidc1',
           })
         ).resolves.toEqual(AuthenticationResult.failed(failureReason));
 
@@ -207,6 +268,20 @@ describe('OIDCAuthenticationProvider', () => {
           }
         );
       });
+
+      it('fails if realm from state is different from the realm provider is configured with.', async () => {
+        const { request, attempt } = getMocks();
+
+        await expect(provider.login(request, attempt, { realm: 'other-realm' })).resolves.toEqual(
+          AuthenticationResult.failed(
+            Boom.unauthorized(
+              'State based on realm "other-realm", but provider with the name "oidc" is configured to use realm "oidc1".'
+            )
+          )
+        );
+
+        expect(mockOptions.client.callAsInternalUser).not.toHaveBeenCalled();
+      });
     }
 
     describe('authorization code flow', () => {
@@ -215,7 +290,7 @@ describe('OIDCAuthenticationProvider', () => {
           path: '/api/security/oidc/callback?code=somecodehere&state=somestatehere',
         }),
         attempt: {
-          flow: OIDCAuthenticationFlow.AuthorizationCode,
+          type: OIDCLogin.LoginWithAuthorizationCodeFlow,
           authenticationResponseURI:
             '/api/security/oidc/callback?code=somecodehere&state=somestatehere',
         },
@@ -230,7 +305,7 @@ describe('OIDCAuthenticationProvider', () => {
             '/api/security/oidc/callback?authenticationResponseURI=http://kibana/api/security/oidc/implicit#id_token=sometoken',
         }),
         attempt: {
-          flow: OIDCAuthenticationFlow.Implicit,
+          type: OIDCLogin.LoginWithImplicitFlow,
           authenticationResponseURI: 'http://kibana/api/security/oidc/implicit#id_token=sometoken',
         },
         expectedRedirectURI: 'http://kibana/api/security/oidc/implicit#id_token=sometoken',
@@ -246,6 +321,13 @@ describe('OIDCAuthenticationProvider', () => {
       );
     });
 
+    it('does not handle non-AJAX request that does not require authentication.', async () => {
+      const request = httpServerMock.createKibanaRequest({ routeAuthRequired: false });
+      await expect(provider.authenticate(request)).resolves.toEqual(
+        AuthenticationResult.notHandled()
+      );
+    });
+
     it('redirects non-AJAX request that can not be authenticated to the OpenId Connect Provider.', async () => {
       const request = httpServerMock.createKibanaRequest({ path: '/s/foo/some-path' });
 
@@ -272,6 +354,7 @@ describe('OIDCAuthenticationProvider', () => {
               state: 'statevalue',
               nonce: 'noncevalue',
               nextURL: '/base-path/s/foo/some-path',
+              realm: 'oidc1',
             },
           }
         )
@@ -310,7 +393,9 @@ describe('OIDCAuthenticationProvider', () => {
       mockScopedClusterClient.callAsCurrentUser.mockResolvedValue(user);
       mockOptions.client.asScoped.mockReturnValue(mockScopedClusterClient);
 
-      await expect(provider.authenticate(request, tokenPair)).resolves.toEqual(
+      await expect(
+        provider.authenticate(request, { ...tokenPair, realm: 'oidc1' })
+      ).resolves.toEqual(
         AuthenticationResult.succeeded(
           { ...user, authentication_provider: 'oidc' },
           { authHeaders: { authorization } }
@@ -344,6 +429,7 @@ describe('OIDCAuthenticationProvider', () => {
         provider.authenticate(request, {
           accessToken: 'some-valid-token',
           refreshToken: 'some-valid-refresh-token',
+          realm: 'oidc1',
         })
       ).resolves.toEqual(AuthenticationResult.notHandled());
 
@@ -364,9 +450,9 @@ describe('OIDCAuthenticationProvider', () => {
       mockScopedClusterClient.callAsCurrentUser.mockRejectedValue(failureReason);
       mockOptions.client.asScoped.mockReturnValue(mockScopedClusterClient);
 
-      await expect(provider.authenticate(request, tokenPair)).resolves.toEqual(
-        AuthenticationResult.failed(failureReason)
-      );
+      await expect(
+        provider.authenticate(request, { ...tokenPair, realm: 'oidc1' })
+      ).resolves.toEqual(AuthenticationResult.failed(failureReason));
 
       expectAuthenticateCall(mockOptions.client, { headers: { authorization } });
 
@@ -401,12 +487,18 @@ describe('OIDCAuthenticationProvider', () => {
         refreshToken: 'new-refresh-token',
       });
 
-      await expect(provider.authenticate(request, tokenPair)).resolves.toEqual(
+      await expect(
+        provider.authenticate(request, { ...tokenPair, realm: 'oidc1' })
+      ).resolves.toEqual(
         AuthenticationResult.succeeded(
           { ...user, authentication_provider: 'oidc' },
           {
             authHeaders: { authorization: 'Bearer new-access-token' },
-            state: { accessToken: 'new-access-token', refreshToken: 'new-refresh-token' },
+            state: {
+              accessToken: 'new-access-token',
+              refreshToken: 'new-refresh-token',
+              realm: 'oidc1',
+            },
           }
         )
       );
@@ -434,9 +526,9 @@ describe('OIDCAuthenticationProvider', () => {
       };
       mockOptions.tokens.refresh.mockRejectedValue(refreshFailureReason);
 
-      await expect(provider.authenticate(request, tokenPair)).resolves.toEqual(
-        AuthenticationResult.failed(refreshFailureReason as any)
-      );
+      await expect(
+        provider.authenticate(request, { ...tokenPair, realm: 'oidc1' })
+      ).resolves.toEqual(AuthenticationResult.failed(refreshFailureReason as any));
 
       expect(mockOptions.tokens.refresh).toHaveBeenCalledTimes(1);
       expect(mockOptions.tokens.refresh).toHaveBeenCalledWith(tokenPair.refreshToken);
@@ -470,7 +562,9 @@ describe('OIDCAuthenticationProvider', () => {
 
       mockOptions.tokens.refresh.mockResolvedValue(null);
 
-      await expect(provider.authenticate(request, tokenPair)).resolves.toEqual(
+      await expect(
+        provider.authenticate(request, { ...tokenPair, realm: 'oidc1' })
+      ).resolves.toEqual(
         AuthenticationResult.redirectTo(
           'https://op-host/path/login?response_type=code' +
             '&scope=openid%20profile%20email' +
@@ -482,6 +576,7 @@ describe('OIDCAuthenticationProvider', () => {
               state: 'statevalue',
               nonce: 'noncevalue',
               nextURL: '/base-path/s/foo/some-path',
+              realm: 'oidc1',
             },
           }
         )
@@ -515,7 +610,9 @@ describe('OIDCAuthenticationProvider', () => {
 
       mockOptions.tokens.refresh.mockResolvedValue(null);
 
-      await expect(provider.authenticate(request, tokenPair)).resolves.toEqual(
+      await expect(
+        provider.authenticate(request, { ...tokenPair, realm: 'oidc1' })
+      ).resolves.toEqual(
         AuthenticationResult.failed(Boom.badRequest('Both access and refresh tokens are expired.'))
       );
 
@@ -528,6 +625,44 @@ describe('OIDCAuthenticationProvider', () => {
 
       expect(request.headers).not.toHaveProperty('authorization');
     });
+
+    it('fails for non-AJAX requests that do not require authentication with user friendly message if refresh token is expired.', async () => {
+      const request = httpServerMock.createKibanaRequest({ routeAuthRequired: false, headers: {} });
+      const tokenPair = { accessToken: 'expired-token', refreshToken: 'expired-refresh-token' };
+      const authorization = `Bearer ${tokenPair.accessToken}`;
+
+      const mockScopedClusterClient = elasticsearchServiceMock.createScopedClusterClient();
+      mockScopedClusterClient.callAsCurrentUser.mockRejectedValue(
+        ElasticsearchErrorHelpers.decorateNotAuthorizedError(new Error())
+      );
+      mockOptions.client.asScoped.mockReturnValue(mockScopedClusterClient);
+
+      mockOptions.tokens.refresh.mockResolvedValue(null);
+
+      await expect(
+        provider.authenticate(request, { ...tokenPair, realm: 'oidc1' })
+      ).resolves.toEqual(
+        AuthenticationResult.failed(Boom.badRequest('Both access and refresh tokens are expired.'))
+      );
+
+      expect(mockOptions.tokens.refresh).toHaveBeenCalledTimes(1);
+      expect(mockOptions.tokens.refresh).toHaveBeenCalledWith(tokenPair.refreshToken);
+
+      expectAuthenticateCall(mockOptions.client, { headers: { authorization } });
+
+      expect(request.headers).not.toHaveProperty('authorization');
+    });
+
+    it('fails if realm from state is different from the realm provider is configured with.', async () => {
+      const request = httpServerMock.createKibanaRequest();
+      await expect(provider.authenticate(request, { realm: 'other-realm' })).resolves.toEqual(
+        AuthenticationResult.failed(
+          Boom.unauthorized(
+            'State based on realm "other-realm", but provider with the name "oidc" is configured to use realm "oidc1".'
+          )
+        )
+      );
+    });
   });
 
   describe('`logout` method', () => {
@@ -538,11 +673,11 @@ describe('OIDCAuthenticationProvider', () => {
         DeauthenticationResult.notHandled()
       );
 
-      await expect(provider.logout(request, {})).resolves.toEqual(
+      await expect(provider.logout(request, {} as any)).resolves.toEqual(
         DeauthenticationResult.notHandled()
       );
 
-      await expect(provider.logout(request, { nonce: 'x' })).resolves.toEqual(
+      await expect(provider.logout(request, { nonce: 'x', realm: 'oidc1' })).resolves.toEqual(
         DeauthenticationResult.notHandled()
       );
 
@@ -557,9 +692,9 @@ describe('OIDCAuthenticationProvider', () => {
       const failureReason = new Error('Realm is misconfigured!');
       mockOptions.client.callAsInternalUser.mockRejectedValue(failureReason);
 
-      await expect(provider.logout(request, { accessToken, refreshToken })).resolves.toEqual(
-        DeauthenticationResult.failed(failureReason)
-      );
+      await expect(
+        provider.logout(request, { accessToken, refreshToken, realm: 'oidc1' })
+      ).resolves.toEqual(DeauthenticationResult.failed(failureReason));
 
       expect(mockOptions.client.callAsInternalUser).toHaveBeenCalledTimes(1);
       expect(mockOptions.client.callAsInternalUser).toHaveBeenCalledWith('shield.oidcLogout', {
@@ -574,7 +709,9 @@ describe('OIDCAuthenticationProvider', () => {
 
       mockOptions.client.callAsInternalUser.mockResolvedValue({ redirect: null });
 
-      await expect(provider.logout(request, { accessToken, refreshToken })).resolves.toEqual(
+      await expect(
+        provider.logout(request, { accessToken, refreshToken, realm: 'oidc1' })
+      ).resolves.toEqual(
         DeauthenticationResult.redirectTo('/mock-server-basepath/security/logged_out')
       );
 
@@ -593,7 +730,9 @@ describe('OIDCAuthenticationProvider', () => {
         redirect: 'http://fake-idp/logout&id_token_hint=thehint',
       });
 
-      await expect(provider.logout(request, { accessToken, refreshToken })).resolves.toEqual(
+      await expect(
+        provider.logout(request, { accessToken, refreshToken, realm: 'oidc1' })
+      ).resolves.toEqual(
         DeauthenticationResult.redirectTo('http://fake-idp/logout&id_token_hint=thehint')
       );
 
diff --git a/x-pack/plugins/security/server/authentication/providers/oidc.ts b/x-pack/plugins/security/server/authentication/providers/oidc.ts
index 21bce028b0d98..f8e6ac0f9b5d0 100644
--- a/x-pack/plugins/security/server/authentication/providers/oidc.ts
+++ b/x-pack/plugins/security/server/authentication/providers/oidc.ts
@@ -19,23 +19,25 @@ import {
 } from './base';
 
 /**
- * Describes possible OpenID Connect authentication flows.
+ * Describes possible OpenID Connect login flows.
  */
-export enum OIDCAuthenticationFlow {
-  Implicit = 'implicit',
-  AuthorizationCode = 'authorization-code',
-  InitiatedBy3rdParty = 'initiated-by-3rd-party',
+export enum OIDCLogin {
+  LoginInitiatedByUser = 'login-by-user',
+  LoginWithImplicitFlow = 'login-implicit',
+  LoginWithAuthorizationCodeFlow = 'login-authorization-code',
+  LoginInitiatedBy3rdParty = 'login-initiated-by-3rd-party',
 }
 
 /**
  * Describes the parameters that are required by the provider to process the initial login request.
  */
 export type ProviderLoginAttempt =
+  | { type: OIDCLogin.LoginInitiatedByUser; redirectURLPath: string }
   | {
-      flow: OIDCAuthenticationFlow.Implicit | OIDCAuthenticationFlow.AuthorizationCode;
+      type: OIDCLogin.LoginWithImplicitFlow | OIDCLogin.LoginWithAuthorizationCodeFlow;
       authenticationResponseURI: string;
     }
-  | { flow: OIDCAuthenticationFlow.InitiatedBy3rdParty; iss: string; loginHint?: string };
+  | { type: OIDCLogin.LoginInitiatedBy3rdParty; iss: string; loginHint?: string };
 
 /**
  * The state supported by the provider (for the OpenID Connect handshake or established session).
@@ -57,6 +59,21 @@ interface ProviderState extends Partial<TokenPair> {
    * URL to redirect user to after successful OpenID Connect handshake.
    */
   nextURL?: string;
+
+  /**
+   * The name of the OpenID Connect realm that was used to establish session.
+   */
+  realm: string;
+}
+
+/**
+ * Checks whether current request can initiate new session.
+ * @param request Request instance.
+ */
+function canStartNewSession(request: KibanaRequest) {
+  // We should try to establish new session only if request requires authentication and client
+  // can be redirected to the Identity Provider where they can authenticate.
+  return canRedirectRequest(request) && request.route.options.authRequired === true;
 }
 
 /**
@@ -102,15 +119,38 @@ export class OIDCAuthenticationProvider extends BaseAuthenticationProvider {
   ) {
     this.logger.debug('Trying to perform a login.');
 
-    if (attempt.flow === OIDCAuthenticationFlow.InitiatedBy3rdParty) {
-      this.logger.debug('Authentication has been initiated by a Third Party.');
+    // It may happen that Kibana is re-configured to use different realm for the same provider name,
+    // we should clear such session an log user out.
+    if (state?.realm && state.realm !== this.realm) {
+      const message = `State based on realm "${state.realm}", but provider with the name "${this.options.name}" is configured to use realm "${this.realm}".`;
+      this.logger.debug(message);
+      return AuthenticationResult.failed(Boom.unauthorized(message));
+    }
+
+    if (attempt.type === OIDCLogin.LoginInitiatedBy3rdParty) {
+      this.logger.debug('Login has been initiated by a Third Party.');
       // We might already have a state and nonce generated by Elasticsearch (from an unfinished authentication in
       // another tab)
       const oidcPrepareParams = attempt.loginHint
         ? { iss: attempt.iss, login_hint: attempt.loginHint }
         : { iss: attempt.iss };
-      return this.initiateOIDCAuthentication(request, oidcPrepareParams);
-    } else if (attempt.flow === OIDCAuthenticationFlow.Implicit) {
+      return this.initiateOIDCAuthentication(
+        request,
+        oidcPrepareParams,
+        `${this.options.basePath.serverBasePath}/`
+      );
+    }
+
+    if (attempt.type === OIDCLogin.LoginInitiatedByUser) {
+      this.logger.debug(`Login has been initiated by a user.`);
+      return this.initiateOIDCAuthentication(
+        request,
+        { realm: this.realm },
+        attempt.redirectURLPath
+      );
+    }
+
+    if (attempt.type === OIDCLogin.LoginWithImplicitFlow) {
       this.logger.debug('OpenID Connect Implicit Authentication flow is used.');
     } else {
       this.logger.debug('OpenID Connect Authorization Code Authentication flow is used.');
@@ -136,6 +176,14 @@ export class OIDCAuthenticationProvider extends BaseAuthenticationProvider {
       return AuthenticationResult.notHandled();
     }
 
+    // It may happen that Kibana is re-configured to use different realm for the same provider name,
+    // we should clear such session an log user out.
+    if (state?.realm && state.realm !== this.realm) {
+      const message = `State based on realm "${state.realm}", but provider with the name "${this.options.name}" is configured to use realm "${this.realm}".`;
+      this.logger.debug(message);
+      return AuthenticationResult.failed(Boom.unauthorized(message));
+    }
+
     let authenticationResult = AuthenticationResult.notHandled();
     if (state) {
       authenticationResult = await this.authenticateViaState(request, state);
@@ -151,7 +199,7 @@ export class OIDCAuthenticationProvider extends BaseAuthenticationProvider {
     // initiate an OpenID Connect based authentication, otherwise just return the authentication result we have.
     // We might already have a state and nonce generated by Elasticsearch (from an unfinished authentication in
     // another tab)
-    return authenticationResult.notHandled()
+    return authenticationResult.notHandled() && canStartNewSession(request)
       ? await this.initiateOIDCAuthentication(request, { realm: this.realm })
       : authenticationResult;
   }
@@ -211,7 +259,7 @@ export class OIDCAuthenticationProvider extends BaseAuthenticationProvider {
       this.logger.debug('Request has been authenticated via OpenID Connect.');
 
       return AuthenticationResult.redirectTo(stateRedirectURL, {
-        state: { accessToken, refreshToken },
+        state: { accessToken, refreshToken, realm: this.realm },
       });
     } catch (err) {
       this.logger.debug(`Failed to authenticate request via OpenID Connect: ${err.message}`);
@@ -224,49 +272,30 @@ export class OIDCAuthenticationProvider extends BaseAuthenticationProvider {
    *
    * @param request Request instance.
    * @param params OIDC authentication parameters.
-   * @param [sessionState] Optional state object associated with the provider.
+   * @param [redirectURLPath] Optional URL user is supposed to be redirected to after successful
+   * login. If not provided the URL of the specified request is used.
    */
   private async initiateOIDCAuthentication(
     request: KibanaRequest,
     params: { realm: string } | { iss: string; login_hint?: string },
-    sessionState?: ProviderState | null
+    redirectURLPath = `${this.options.basePath.get(request)}${request.url.path}`
   ) {
     this.logger.debug('Trying to initiate OpenID Connect authentication.');
 
-    // If client can't handle redirect response, we shouldn't initiate OpenID Connect authentication.
-    if (!canRedirectRequest(request)) {
-      this.logger.debug('OpenID Connect authentication can not be initiated by AJAX requests.');
-      return AuthenticationResult.notHandled();
-    }
-
     try {
-      /*
-       * Possibly adds the state and nonce parameter that was saved in the user's session state to
-       * the params. There is no use case where we would have only a state parameter or only a nonce
-       * parameter in the session state so we only enrich the params object if we have both
-       */
-      const oidcPrepareParams =
-        sessionState && sessionState.nonce && sessionState.state
-          ? { ...params, nonce: sessionState.nonce, state: sessionState.state }
-          : params;
       // This operation should be performed on behalf of the user with a privilege that normal
       // user usually doesn't have `cluster:admin/xpack/security/oidc/prepare`.
-      const { state, nonce, redirect } = await this.options.client.callAsInternalUser(
-        'shield.oidcPrepare',
-        {
-          body: oidcPrepareParams,
-        }
-      );
+      const {
+        state,
+        nonce,
+        redirect,
+      } = await this.options.client.callAsInternalUser('shield.oidcPrepare', { body: params });
 
       this.logger.debug('Redirecting to OpenID Connect Provider with authentication request.');
-      // If this is a third party initiated login, redirect to the base path
-      const redirectAfterLogin = `${this.options.basePath.get(request)}${
-        'iss' in params ? '/' : request.url.path
-      }`;
       return AuthenticationResult.redirectTo(
         redirect,
         // Store the state and nonce parameters in the session state of the user
-        { state: { state, nonce, nextURL: redirectAfterLogin } }
+        { state: { state, nonce, nextURL: redirectURLPath, realm: this.realm } }
       );
     } catch (err) {
       this.logger.debug(`Failed to initiate OpenID Connect authentication: ${err.message}`);
@@ -334,7 +363,7 @@ export class OIDCAuthenticationProvider extends BaseAuthenticationProvider {
     // seems logical to do the same on Kibana side and `401` would force user to logout and do full SLO if it's
     // supported.
     if (refreshedTokenPair === null) {
-      if (canRedirectRequest(request)) {
+      if (canStartNewSession(request)) {
         this.logger.debug(
           'Both elasticsearch access and refresh tokens are expired. Re-initiating OpenID Connect authentication.'
         );
@@ -356,7 +385,10 @@ export class OIDCAuthenticationProvider extends BaseAuthenticationProvider {
       const user = await this.getUser(request, authHeaders);
 
       this.logger.debug('Request has been authenticated via refreshed token.');
-      return AuthenticationResult.succeeded(user, { authHeaders, state: refreshedTokenPair });
+      return AuthenticationResult.succeeded(user, {
+        authHeaders,
+        state: { ...refreshedTokenPair, realm: this.realm },
+      });
     } catch (err) {
       this.logger.debug(`Failed to refresh elasticsearch access token: ${err.message}`);
       return AuthenticationResult.failed(err);
diff --git a/x-pack/plugins/security/server/authentication/providers/pki.test.ts b/x-pack/plugins/security/server/authentication/providers/pki.test.ts
index 044416032a4c3..638bb5732f3c0 100644
--- a/x-pack/plugins/security/server/authentication/providers/pki.test.ts
+++ b/x-pack/plugins/security/server/authentication/providers/pki.test.ts
@@ -19,6 +19,7 @@ import { MockAuthenticationProviderOptions, mockAuthenticationProviderOptions }
 import {
   ElasticsearchErrorHelpers,
   IClusterClient,
+  KibanaRequest,
   ScopeableRequest,
 } from '../../../../../../src/core/server';
 import { AuthenticationResult } from '../authentication_result';
@@ -78,53 +79,21 @@ describe('PKIAuthenticationProvider', () => {
   let provider: PKIAuthenticationProvider;
   let mockOptions: MockAuthenticationProviderOptions;
   beforeEach(() => {
-    mockOptions = mockAuthenticationProviderOptions();
+    mockOptions = mockAuthenticationProviderOptions({ name: 'pki' });
     provider = new PKIAuthenticationProvider(mockOptions);
   });
 
   afterEach(() => jest.clearAllMocks());
 
-  describe('`authenticate` method', () => {
-    it('does not handle authentication via `authorization` header.', async () => {
-      const request = httpServerMock.createKibanaRequest({
-        headers: { authorization: 'Bearer some-token' },
-      });
-
-      await expect(provider.authenticate(request)).resolves.toEqual(
-        AuthenticationResult.notHandled()
-      );
-
-      expect(mockOptions.client.asScoped).not.toHaveBeenCalled();
-      expect(mockOptions.client.callAsInternalUser).not.toHaveBeenCalled();
-      expect(request.headers.authorization).toBe('Bearer some-token');
-    });
-
-    it('does not handle authentication via `authorization` header even if state contains a valid token.', async () => {
-      const request = httpServerMock.createKibanaRequest({
-        headers: { authorization: 'Bearer some-token' },
-      });
-      const state = {
-        accessToken: 'some-valid-token',
-        peerCertificateFingerprint256: '2A:7A:C2:DD',
-      };
-
-      await expect(provider.authenticate(request, state)).resolves.toEqual(
-        AuthenticationResult.notHandled()
-      );
-
-      expect(mockOptions.client.asScoped).not.toHaveBeenCalled();
-      expect(mockOptions.client.callAsInternalUser).not.toHaveBeenCalled();
-      expect(request.headers.authorization).toBe('Bearer some-token');
-    });
-
+  function defineCommonLoginAndAuthenticateTests(
+    operation: (request: KibanaRequest) => Promise<AuthenticationResult>
+  ) {
     it('does not handle requests without certificate.', async () => {
       const request = httpServerMock.createKibanaRequest({
         socket: getMockSocket({ authorized: true }),
       });
 
-      await expect(provider.authenticate(request, null)).resolves.toEqual(
-        AuthenticationResult.notHandled()
-      );
+      await expect(operation(request)).resolves.toEqual(AuthenticationResult.notHandled());
 
       expect(mockOptions.client.asScoped).not.toHaveBeenCalled();
       expect(mockOptions.client.callAsInternalUser).not.toHaveBeenCalled();
@@ -135,58 +104,12 @@ describe('PKIAuthenticationProvider', () => {
         socket: getMockSocket({ peerCertificate: getMockPeerCertificate('2A:7A:C2:DD') }),
       });
 
-      await expect(provider.authenticate(request, null)).resolves.toEqual(
-        AuthenticationResult.notHandled()
-      );
+      await expect(operation(request)).resolves.toEqual(AuthenticationResult.notHandled());
 
       expect(mockOptions.client.asScoped).not.toHaveBeenCalled();
       expect(mockOptions.client.callAsInternalUser).not.toHaveBeenCalled();
     });
 
-    it('fails with non-401 error if state is available, peer is authorized, but certificate is not available.', async () => {
-      const request = httpServerMock.createKibanaRequest({
-        socket: getMockSocket({ authorized: true }),
-      });
-
-      const state = { accessToken: 'token', peerCertificateFingerprint256: '2A:7A:C2:DD' };
-
-      await expect(provider.authenticate(request, state)).resolves.toEqual(
-        AuthenticationResult.failed(new Error('Peer certificate is not available'))
-      );
-
-      expect(mockOptions.tokens.invalidate).not.toHaveBeenCalled();
-    });
-
-    it('invalidates token and fails with 401 if state is present, but peer certificate is not.', async () => {
-      const request = httpServerMock.createKibanaRequest({ socket: getMockSocket() });
-      const state = { accessToken: 'token', peerCertificateFingerprint256: '2A:7A:C2:DD' };
-
-      await expect(provider.authenticate(request, state)).resolves.toEqual(
-        AuthenticationResult.failed(Boom.unauthorized())
-      );
-
-      expect(mockOptions.tokens.invalidate).toHaveBeenCalledTimes(1);
-      expect(mockOptions.tokens.invalidate).toHaveBeenCalledWith({
-        accessToken: state.accessToken,
-      });
-    });
-
-    it('invalidates token and fails with 401 if new certificate is present, but not authorized.', async () => {
-      const request = httpServerMock.createKibanaRequest({
-        socket: getMockSocket({ peerCertificate: getMockPeerCertificate('2A:7A:C2:DD') }),
-      });
-      const state = { accessToken: 'token', peerCertificateFingerprint256: '2A:7A:C2:DD' };
-
-      await expect(provider.authenticate(request, state)).resolves.toEqual(
-        AuthenticationResult.failed(Boom.unauthorized())
-      );
-
-      expect(mockOptions.tokens.invalidate).toHaveBeenCalledTimes(1);
-      expect(mockOptions.tokens.invalidate).toHaveBeenCalledWith({
-        accessToken: state.accessToken,
-      });
-    });
-
     it('gets an access token in exchange to peer certificate chain and stores it in the state.', async () => {
       const user = mockAuthenticatedUser();
       const request = httpServerMock.createKibanaRequest({
@@ -202,7 +125,7 @@ describe('PKIAuthenticationProvider', () => {
       mockOptions.client.asScoped.mockReturnValue(mockScopedClusterClient);
       mockOptions.client.callAsInternalUser.mockResolvedValue({ access_token: 'access-token' });
 
-      await expect(provider.authenticate(request)).resolves.toEqual(
+      await expect(operation(request)).resolves.toEqual(
         AuthenticationResult.succeeded(
           { ...user, authentication_provider: 'pki' },
           {
@@ -244,7 +167,7 @@ describe('PKIAuthenticationProvider', () => {
       mockOptions.client.asScoped.mockReturnValue(mockScopedClusterClient);
       mockOptions.client.callAsInternalUser.mockResolvedValue({ access_token: 'access-token' });
 
-      await expect(provider.authenticate(request)).resolves.toEqual(
+      await expect(operation(request)).resolves.toEqual(
         AuthenticationResult.succeeded(
           { ...user, authentication_provider: 'pki' },
           {
@@ -266,6 +189,156 @@ describe('PKIAuthenticationProvider', () => {
       expect(request.headers).not.toHaveProperty('authorization');
     });
 
+    it('fails if could not retrieve an access token in exchange to peer certificate chain.', async () => {
+      const request = httpServerMock.createKibanaRequest({
+        socket: getMockSocket({
+          authorized: true,
+          peerCertificate: getMockPeerCertificate('2A:7A:C2:DD'),
+        }),
+      });
+
+      const failureReason = ElasticsearchErrorHelpers.decorateNotAuthorizedError(new Error());
+      mockOptions.client.callAsInternalUser.mockRejectedValue(failureReason);
+
+      await expect(operation(request)).resolves.toEqual(AuthenticationResult.failed(failureReason));
+
+      expect(mockOptions.client.callAsInternalUser).toHaveBeenCalledTimes(1);
+      expect(mockOptions.client.callAsInternalUser).toHaveBeenCalledWith('shield.delegatePKI', {
+        body: { x509_certificate_chain: ['fingerprint:2A:7A:C2:DD:base64'] },
+      });
+
+      expect(request.headers).not.toHaveProperty('authorization');
+    });
+
+    it('fails if could not retrieve user using the new access token.', async () => {
+      const request = httpServerMock.createKibanaRequest({
+        headers: {},
+        socket: getMockSocket({
+          authorized: true,
+          peerCertificate: getMockPeerCertificate('2A:7A:C2:DD'),
+        }),
+      });
+
+      const failureReason = ElasticsearchErrorHelpers.decorateNotAuthorizedError(new Error());
+      const mockScopedClusterClient = elasticsearchServiceMock.createScopedClusterClient();
+      mockScopedClusterClient.callAsCurrentUser.mockRejectedValue(failureReason);
+      mockOptions.client.asScoped.mockReturnValue(mockScopedClusterClient);
+      mockOptions.client.callAsInternalUser.mockResolvedValue({ access_token: 'access-token' });
+
+      await expect(operation(request)).resolves.toEqual(AuthenticationResult.failed(failureReason));
+
+      expect(mockOptions.client.callAsInternalUser).toHaveBeenCalledTimes(1);
+      expect(mockOptions.client.callAsInternalUser).toHaveBeenCalledWith('shield.delegatePKI', {
+        body: { x509_certificate_chain: ['fingerprint:2A:7A:C2:DD:base64'] },
+      });
+
+      expectAuthenticateCall(mockOptions.client, {
+        headers: { authorization: 'Bearer access-token' },
+      });
+
+      expect(request.headers).not.toHaveProperty('authorization');
+    });
+  }
+
+  describe('`login` method', () => {
+    defineCommonLoginAndAuthenticateTests(request => provider.login(request));
+  });
+
+  describe('`authenticate` method', () => {
+    defineCommonLoginAndAuthenticateTests(request => provider.authenticate(request, null));
+
+    it('does not handle authentication via `authorization` header.', async () => {
+      const request = httpServerMock.createKibanaRequest({
+        headers: { authorization: 'Bearer some-token' },
+      });
+
+      await expect(provider.authenticate(request)).resolves.toEqual(
+        AuthenticationResult.notHandled()
+      );
+
+      expect(mockOptions.client.asScoped).not.toHaveBeenCalled();
+      expect(mockOptions.client.callAsInternalUser).not.toHaveBeenCalled();
+      expect(request.headers.authorization).toBe('Bearer some-token');
+    });
+
+    it('does not handle authentication via `authorization` header even if state contains a valid token.', async () => {
+      const request = httpServerMock.createKibanaRequest({
+        headers: { authorization: 'Bearer some-token' },
+      });
+      const state = {
+        accessToken: 'some-valid-token',
+        peerCertificateFingerprint256: '2A:7A:C2:DD',
+      };
+
+      await expect(provider.authenticate(request, state)).resolves.toEqual(
+        AuthenticationResult.notHandled()
+      );
+
+      expect(mockOptions.client.asScoped).not.toHaveBeenCalled();
+      expect(mockOptions.client.callAsInternalUser).not.toHaveBeenCalled();
+      expect(request.headers.authorization).toBe('Bearer some-token');
+    });
+
+    it('does not exchange peer certificate to access token if request does not require authentication.', async () => {
+      const request = httpServerMock.createKibanaRequest({
+        routeAuthRequired: false,
+        socket: getMockSocket({
+          authorized: true,
+          peerCertificate: getMockPeerCertificate(['2A:7A:C2:DD', '3B:8B:D3:EE']),
+        }),
+      });
+      await expect(provider.authenticate(request)).resolves.toEqual(
+        AuthenticationResult.notHandled()
+      );
+
+      expect(mockOptions.client.asScoped).not.toHaveBeenCalled();
+      expect(mockOptions.client.callAsInternalUser).not.toHaveBeenCalled();
+    });
+
+    it('fails with non-401 error if state is available, peer is authorized, but certificate is not available.', async () => {
+      const request = httpServerMock.createKibanaRequest({
+        socket: getMockSocket({ authorized: true }),
+      });
+
+      const state = { accessToken: 'token', peerCertificateFingerprint256: '2A:7A:C2:DD' };
+
+      await expect(provider.authenticate(request, state)).resolves.toEqual(
+        AuthenticationResult.failed(new Error('Peer certificate is not available'))
+      );
+
+      expect(mockOptions.tokens.invalidate).not.toHaveBeenCalled();
+    });
+
+    it('invalidates token and fails with 401 if state is present, but peer certificate is not.', async () => {
+      const request = httpServerMock.createKibanaRequest({ socket: getMockSocket() });
+      const state = { accessToken: 'token', peerCertificateFingerprint256: '2A:7A:C2:DD' };
+
+      await expect(provider.authenticate(request, state)).resolves.toEqual(
+        AuthenticationResult.failed(Boom.unauthorized())
+      );
+
+      expect(mockOptions.tokens.invalidate).toHaveBeenCalledTimes(1);
+      expect(mockOptions.tokens.invalidate).toHaveBeenCalledWith({
+        accessToken: state.accessToken,
+      });
+    });
+
+    it('invalidates token and fails with 401 if new certificate is present, but not authorized.', async () => {
+      const request = httpServerMock.createKibanaRequest({
+        socket: getMockSocket({ peerCertificate: getMockPeerCertificate('2A:7A:C2:DD') }),
+      });
+      const state = { accessToken: 'token', peerCertificateFingerprint256: '2A:7A:C2:DD' };
+
+      await expect(provider.authenticate(request, state)).resolves.toEqual(
+        AuthenticationResult.failed(Boom.unauthorized())
+      );
+
+      expect(mockOptions.tokens.invalidate).toHaveBeenCalledTimes(1);
+      expect(mockOptions.tokens.invalidate).toHaveBeenCalledWith({
+        accessToken: state.accessToken,
+      });
+    });
+
     it('invalidates existing token and gets a new one if fingerprints do not match.', async () => {
       const user = mockAuthenticatedUser();
       const request = httpServerMock.createKibanaRequest({
@@ -351,75 +424,45 @@ describe('PKIAuthenticationProvider', () => {
       expect(request.headers).not.toHaveProperty('authorization');
     });
 
-    it('fails with 401 if existing token is expired, but certificate is not present.', async () => {
-      const request = httpServerMock.createKibanaRequest({ socket: getMockSocket() });
+    it('does not exchange peer certificate to a new access token even if existing token is expired and request does not require authentication.', async () => {
+      const request = httpServerMock.createKibanaRequest({
+        routeAuthRequired: false,
+        socket: getMockSocket({
+          authorized: true,
+          peerCertificate: getMockPeerCertificate(['2A:7A:C2:DD', '3B:8B:D3:EE']),
+        }),
+      });
       const state = { accessToken: 'existing-token', peerCertificateFingerprint256: '2A:7A:C2:DD' };
 
       const mockScopedClusterClient = elasticsearchServiceMock.createScopedClusterClient();
-      mockScopedClusterClient.callAsCurrentUser.mockRejectedValue(
+      mockScopedClusterClient.callAsCurrentUser.mockRejectedValueOnce(
         ElasticsearchErrorHelpers.decorateNotAuthorizedError(new Error())
       );
       mockOptions.client.asScoped.mockReturnValue(mockScopedClusterClient);
 
       await expect(provider.authenticate(request, state)).resolves.toEqual(
-        AuthenticationResult.failed(Boom.unauthorized())
+        AuthenticationResult.notHandled()
       );
 
       expect(mockOptions.client.callAsInternalUser).not.toHaveBeenCalled();
-
-      expect(request.headers).not.toHaveProperty('authorization');
-    });
-
-    it('fails if could not retrieve an access token in exchange to peer certificate chain.', async () => {
-      const request = httpServerMock.createKibanaRequest({
-        socket: getMockSocket({
-          authorized: true,
-          peerCertificate: getMockPeerCertificate('2A:7A:C2:DD'),
-        }),
-      });
-
-      const failureReason = ElasticsearchErrorHelpers.decorateNotAuthorizedError(new Error());
-      mockOptions.client.callAsInternalUser.mockRejectedValue(failureReason);
-
-      await expect(provider.authenticate(request)).resolves.toEqual(
-        AuthenticationResult.failed(failureReason)
-      );
-
-      expect(mockOptions.client.callAsInternalUser).toHaveBeenCalledTimes(1);
-      expect(mockOptions.client.callAsInternalUser).toHaveBeenCalledWith('shield.delegatePKI', {
-        body: { x509_certificate_chain: ['fingerprint:2A:7A:C2:DD:base64'] },
-      });
-
       expect(request.headers).not.toHaveProperty('authorization');
     });
 
-    it('fails if could not retrieve user using the new access token.', async () => {
-      const request = httpServerMock.createKibanaRequest({
-        headers: {},
-        socket: getMockSocket({
-          authorized: true,
-          peerCertificate: getMockPeerCertificate('2A:7A:C2:DD'),
-        }),
-      });
+    it('fails with 401 if existing token is expired, but certificate is not present.', async () => {
+      const request = httpServerMock.createKibanaRequest({ socket: getMockSocket() });
+      const state = { accessToken: 'existing-token', peerCertificateFingerprint256: '2A:7A:C2:DD' };
 
-      const failureReason = ElasticsearchErrorHelpers.decorateNotAuthorizedError(new Error());
       const mockScopedClusterClient = elasticsearchServiceMock.createScopedClusterClient();
-      mockScopedClusterClient.callAsCurrentUser.mockRejectedValue(failureReason);
+      mockScopedClusterClient.callAsCurrentUser.mockRejectedValue(
+        ElasticsearchErrorHelpers.decorateNotAuthorizedError(new Error())
+      );
       mockOptions.client.asScoped.mockReturnValue(mockScopedClusterClient);
-      mockOptions.client.callAsInternalUser.mockResolvedValue({ access_token: 'access-token' });
 
-      await expect(provider.authenticate(request)).resolves.toEqual(
-        AuthenticationResult.failed(failureReason)
+      await expect(provider.authenticate(request, state)).resolves.toEqual(
+        AuthenticationResult.failed(Boom.unauthorized())
       );
 
-      expect(mockOptions.client.callAsInternalUser).toHaveBeenCalledTimes(1);
-      expect(mockOptions.client.callAsInternalUser).toHaveBeenCalledWith('shield.delegatePKI', {
-        body: { x509_certificate_chain: ['fingerprint:2A:7A:C2:DD:base64'] },
-      });
-
-      expectAuthenticateCall(mockOptions.client, {
-        headers: { authorization: 'Bearer access-token' },
-      });
+      expect(mockOptions.client.callAsInternalUser).not.toHaveBeenCalled();
 
       expect(request.headers).not.toHaveProperty('authorization');
     });
diff --git a/x-pack/plugins/security/server/authentication/providers/pki.ts b/x-pack/plugins/security/server/authentication/providers/pki.ts
index db022ff355702..243e5415ad2c2 100644
--- a/x-pack/plugins/security/server/authentication/providers/pki.ts
+++ b/x-pack/plugins/security/server/authentication/providers/pki.ts
@@ -28,6 +28,15 @@ interface ProviderState {
   peerCertificateFingerprint256: string;
 }
 
+/**
+ * Checks whether current request can initiate new session.
+ * @param request Request instance.
+ */
+function canStartNewSession(request: KibanaRequest) {
+  // We should try to establish new session only if request requires authentication.
+  return request.route.options.authRequired === true;
+}
+
 /**
  * Provider that supports PKI request authentication.
  */
@@ -37,6 +46,15 @@ export class PKIAuthenticationProvider extends BaseAuthenticationProvider {
    */
   static readonly type = 'pki';
 
+  /**
+   * Performs initial login request.
+   * @param request Request instance.
+   */
+  public async login(request: KibanaRequest) {
+    this.logger.debug('Trying to perform a login.');
+    return await this.authenticateViaPeerCertificate(request);
+  }
+
   /**
    * Performs PKI request authentication.
    * @param request Request instance.
@@ -55,12 +73,12 @@ export class PKIAuthenticationProvider extends BaseAuthenticationProvider {
       authenticationResult = await this.authenticateViaState(request, state);
 
       // If access token expired or doesn't match to the certificate fingerprint we should try to get
-      // a new one in exchange to peer certificate chain.
-      if (
+      // a new one in exchange to peer certificate chain assuming request can initiate new session.
+      const invalidAccessToken =
         authenticationResult.notHandled() ||
         (authenticationResult.failed() &&
-          Tokens.isAccessTokenExpiredError(authenticationResult.error))
-      ) {
+          Tokens.isAccessTokenExpiredError(authenticationResult.error));
+      if (invalidAccessToken && canStartNewSession(request)) {
         authenticationResult = await this.authenticateViaPeerCertificate(request);
         // If we have an active session that we couldn't use to authenticate user and at the same time
         // we couldn't use peer's certificate to establish a new one, then we should respond with 401
@@ -68,12 +86,15 @@ export class PKIAuthenticationProvider extends BaseAuthenticationProvider {
         if (authenticationResult.notHandled()) {
           return AuthenticationResult.failed(Boom.unauthorized());
         }
+      } else if (invalidAccessToken) {
+        return AuthenticationResult.notHandled();
       }
     }
 
     // If we couldn't authenticate by means of all methods above, let's try to check if we can authenticate
     // request using its peer certificate chain, otherwise just return authentication result we have.
-    return authenticationResult.notHandled()
+    // We shouldn't establish new session if authentication isn't required for this particular request.
+    return authenticationResult.notHandled() && canStartNewSession(request)
       ? await this.authenticateViaPeerCertificate(request)
       : authenticationResult;
   }
diff --git a/x-pack/plugins/security/server/authentication/providers/saml.test.ts b/x-pack/plugins/security/server/authentication/providers/saml.test.ts
index e00d3b89fb0bf..a7a43a3031571 100644
--- a/x-pack/plugins/security/server/authentication/providers/saml.test.ts
+++ b/x-pack/plugins/security/server/authentication/providers/saml.test.ts
@@ -18,7 +18,7 @@ import {
 } from '../../../../../../src/core/server';
 import { AuthenticationResult } from '../authentication_result';
 import { DeauthenticationResult } from '../deauthentication_result';
-import { SAMLAuthenticationProvider, SAMLLoginStep } from './saml';
+import { SAMLAuthenticationProvider, SAMLLogin } from './saml';
 
 function expectAuthenticateCall(
   mockClusterClient: jest.Mocked<IClusterClient>,
@@ -36,7 +36,7 @@ describe('SAMLAuthenticationProvider', () => {
   let provider: SAMLAuthenticationProvider;
   let mockOptions: MockAuthenticationProviderOptions;
   beforeEach(() => {
-    mockOptions = mockAuthenticationProviderOptions();
+    mockOptions = mockAuthenticationProviderOptions({ name: 'saml' });
     provider = new SAMLAuthenticationProvider(mockOptions, {
       realm: 'test-realm',
       maxRedirectURLSize: new ByteSizeValue(100),
@@ -86,8 +86,12 @@ describe('SAMLAuthenticationProvider', () => {
       await expect(
         provider.login(
           request,
-          { step: SAMLLoginStep.SAMLResponseReceived, samlResponse: 'saml-response-xml' },
-          { requestId: 'some-request-id', redirectURL: '/test-base-path/some-path#some-app' }
+          { type: SAMLLogin.LoginWithSAMLResponse, samlResponse: 'saml-response-xml' },
+          {
+            requestId: 'some-request-id',
+            redirectURL: '/test-base-path/some-path#some-app',
+            realm: 'test-realm',
+          }
         )
       ).resolves.toEqual(
         AuthenticationResult.redirectTo('/test-base-path/some-path#some-app', {
@@ -95,6 +99,7 @@ describe('SAMLAuthenticationProvider', () => {
             username: 'user',
             accessToken: 'some-token',
             refreshToken: 'some-refresh-token',
+            realm: 'test-realm',
           },
         })
       );
@@ -111,8 +116,8 @@ describe('SAMLAuthenticationProvider', () => {
       await expect(
         provider.login(
           request,
-          { step: SAMLLoginStep.SAMLResponseReceived, samlResponse: 'saml-response-xml' },
-          {}
+          { type: SAMLLogin.LoginWithSAMLResponse, samlResponse: 'saml-response-xml' },
+          {} as any
         )
       ).resolves.toEqual(
         AuthenticationResult.failed(
@@ -123,6 +128,26 @@ describe('SAMLAuthenticationProvider', () => {
       expect(mockOptions.client.callAsInternalUser).not.toHaveBeenCalled();
     });
 
+    it('fails if realm from state is different from the realm provider is configured with.', async () => {
+      const request = httpServerMock.createKibanaRequest();
+
+      await expect(
+        provider.login(
+          request,
+          { type: SAMLLogin.LoginWithSAMLResponse, samlResponse: 'saml-response-xml' },
+          { realm: 'other-realm' }
+        )
+      ).resolves.toEqual(
+        AuthenticationResult.failed(
+          Boom.unauthorized(
+            'State based on realm "other-realm", but provider with the name "saml" is configured to use realm "test-realm".'
+          )
+        )
+      );
+
+      expect(mockOptions.client.callAsInternalUser).not.toHaveBeenCalled();
+    });
+
     it('redirects to the default location if state contains empty redirect URL.', async () => {
       const request = httpServerMock.createKibanaRequest();
 
@@ -134,14 +159,15 @@ describe('SAMLAuthenticationProvider', () => {
       await expect(
         provider.login(
           request,
-          { step: SAMLLoginStep.SAMLResponseReceived, samlResponse: 'saml-response-xml' },
-          { requestId: 'some-request-id', redirectURL: '' }
+          { type: SAMLLogin.LoginWithSAMLResponse, samlResponse: 'saml-response-xml' },
+          { requestId: 'some-request-id', redirectURL: '', realm: 'test-realm' }
         )
       ).resolves.toEqual(
         AuthenticationResult.redirectTo('/base-path/', {
           state: {
             accessToken: 'user-initiated-login-token',
             refreshToken: 'user-initiated-login-refresh-token',
+            realm: 'test-realm',
           },
         })
       );
@@ -162,7 +188,7 @@ describe('SAMLAuthenticationProvider', () => {
 
       await expect(
         provider.login(request, {
-          step: SAMLLoginStep.SAMLResponseReceived,
+          type: SAMLLogin.LoginWithSAMLResponse,
           samlResponse: 'saml-response-xml',
         })
       ).resolves.toEqual(
@@ -170,6 +196,7 @@ describe('SAMLAuthenticationProvider', () => {
           state: {
             accessToken: 'idp-initiated-login-token',
             refreshToken: 'idp-initiated-login-refresh-token',
+            realm: 'test-realm',
           },
         })
       );
@@ -189,8 +216,12 @@ describe('SAMLAuthenticationProvider', () => {
       await expect(
         provider.login(
           request,
-          { step: SAMLLoginStep.SAMLResponseReceived, samlResponse: 'saml-response-xml' },
-          { requestId: 'some-request-id', redirectURL: '/test-base-path/some-path' }
+          { type: SAMLLogin.LoginWithSAMLResponse, samlResponse: 'saml-response-xml' },
+          {
+            requestId: 'some-request-id',
+            redirectURL: '/test-base-path/some-path',
+            realm: 'test-realm',
+          }
         )
       ).resolves.toEqual(AuthenticationResult.failed(failureReason));
 
@@ -201,7 +232,7 @@ describe('SAMLAuthenticationProvider', () => {
     });
 
     describe('IdP initiated login with existing session', () => {
-      it('fails if new SAML Response is rejected.', async () => {
+      it('returns `notHandled` if new SAML Response is rejected.', async () => {
         const request = httpServerMock.createKibanaRequest({ headers: {} });
         const authorization = 'Bearer some-valid-token';
 
@@ -216,14 +247,15 @@ describe('SAMLAuthenticationProvider', () => {
         await expect(
           provider.login(
             request,
-            { step: SAMLLoginStep.SAMLResponseReceived, samlResponse: 'saml-response-xml' },
+            { type: SAMLLogin.LoginWithSAMLResponse, samlResponse: 'saml-response-xml' },
             {
               username: 'user',
               accessToken: 'some-valid-token',
               refreshToken: 'some-valid-refresh-token',
+              realm: 'test-realm',
             }
           )
-        ).resolves.toEqual(AuthenticationResult.failed(failureReason));
+        ).resolves.toEqual(AuthenticationResult.notHandled());
 
         expectAuthenticateCall(mockOptions.client, { headers: { authorization } });
 
@@ -241,6 +273,7 @@ describe('SAMLAuthenticationProvider', () => {
           username: 'user',
           accessToken: 'existing-valid-token',
           refreshToken: 'existing-valid-refresh-token',
+          realm: 'test-realm',
         };
         const authorization = `Bearer ${state.accessToken}`;
 
@@ -261,7 +294,7 @@ describe('SAMLAuthenticationProvider', () => {
         await expect(
           provider.login(
             request,
-            { step: SAMLLoginStep.SAMLResponseReceived, samlResponse: 'saml-response-xml' },
+            { type: SAMLLogin.LoginWithSAMLResponse, samlResponse: 'saml-response-xml' },
             state
           )
         ).resolves.toEqual(AuthenticationResult.failed(failureReason));
@@ -288,6 +321,7 @@ describe('SAMLAuthenticationProvider', () => {
           username: 'user',
           accessToken: 'existing-valid-token',
           refreshToken: 'existing-valid-refresh-token',
+          realm: 'test-realm',
         };
         const authorization = `Bearer ${state.accessToken}`;
 
@@ -307,7 +341,7 @@ describe('SAMLAuthenticationProvider', () => {
         await expect(
           provider.login(
             request,
-            { step: SAMLLoginStep.SAMLResponseReceived, samlResponse: 'saml-response-xml' },
+            { type: SAMLLogin.LoginWithSAMLResponse, samlResponse: 'saml-response-xml' },
             state
           )
         ).resolves.toEqual(
@@ -316,6 +350,7 @@ describe('SAMLAuthenticationProvider', () => {
               username: 'user',
               accessToken: 'new-valid-token',
               refreshToken: 'new-valid-refresh-token',
+              realm: 'test-realm',
             },
           })
         );
@@ -342,6 +377,7 @@ describe('SAMLAuthenticationProvider', () => {
           username: 'user',
           accessToken: 'existing-valid-token',
           refreshToken: 'existing-valid-refresh-token',
+          realm: 'test-realm',
         };
         const authorization = `Bearer ${state.accessToken}`;
 
@@ -361,7 +397,7 @@ describe('SAMLAuthenticationProvider', () => {
         await expect(
           provider.login(
             request,
-            { step: SAMLLoginStep.SAMLResponseReceived, samlResponse: 'saml-response-xml' },
+            { type: SAMLLogin.LoginWithSAMLResponse, samlResponse: 'saml-response-xml' },
             state
           )
         ).resolves.toEqual(
@@ -370,6 +406,7 @@ describe('SAMLAuthenticationProvider', () => {
               username: 'new-user',
               accessToken: 'new-valid-token',
               refreshToken: 'new-valid-refresh-token',
+              realm: 'test-realm',
             },
           })
         );
@@ -392,41 +429,61 @@ describe('SAMLAuthenticationProvider', () => {
     });
 
     describe('User initiated login with captured redirect URL', () => {
-      it('fails if state is not available', async () => {
+      it('fails if redirectURLPath is not available', async () => {
         const request = httpServerMock.createKibanaRequest();
 
         await expect(
           provider.login(request, {
-            step: SAMLLoginStep.RedirectURLFragmentCaptured,
+            type: SAMLLogin.LoginInitiatedByUser,
             redirectURLFragment: '#some-fragment',
           })
         ).resolves.toEqual(
           AuthenticationResult.failed(
-            Boom.badRequest('State does not include URL path to redirect to.')
+            Boom.badRequest('State or login attempt does not include URL path to redirect to.')
           )
         );
 
         expect(mockOptions.client.callAsInternalUser).not.toHaveBeenCalled();
       });
 
-      it('does not handle AJAX requests.', async () => {
-        const request = httpServerMock.createKibanaRequest({ headers: { 'kbn-xsrf': 'xsrf' } });
+      it('redirects requests to the IdP remembering combined redirect URL.', async () => {
+        const request = httpServerMock.createKibanaRequest();
+
+        mockOptions.client.callAsInternalUser.mockResolvedValue({
+          id: 'some-request-id',
+          redirect: 'https://idp-host/path/login?SAMLRequest=some%20request%20',
+        });
 
         await expect(
           provider.login(
             request,
             {
-              step: SAMLLoginStep.RedirectURLFragmentCaptured,
+              type: SAMLLogin.LoginInitiatedByUser,
               redirectURLFragment: '#some-fragment',
             },
-            { redirectURL: '/test-base-path/some-path' }
+            { redirectURL: '/test-base-path/some-path', realm: 'test-realm' }
           )
-        ).resolves.toEqual(AuthenticationResult.notHandled());
+        ).resolves.toEqual(
+          AuthenticationResult.redirectTo(
+            'https://idp-host/path/login?SAMLRequest=some%20request%20',
+            {
+              state: {
+                requestId: 'some-request-id',
+                redirectURL: '/test-base-path/some-path#some-fragment',
+                realm: 'test-realm',
+              },
+            }
+          )
+        );
 
-        expect(mockOptions.client.callAsInternalUser).not.toHaveBeenCalled();
+        expect(mockOptions.client.callAsInternalUser).toHaveBeenCalledWith('shield.samlPrepare', {
+          body: { realm: 'test-realm' },
+        });
+
+        expect(mockOptions.logger.warn).not.toHaveBeenCalled();
       });
 
-      it('redirects non-AJAX requests to the IdP remembering combined redirect URL.', async () => {
+      it('redirects requests to the IdP remembering combined redirect URL if path is provided in attempt.', async () => {
         const request = httpServerMock.createKibanaRequest();
 
         mockOptions.client.callAsInternalUser.mockResolvedValue({
@@ -438,10 +495,11 @@ describe('SAMLAuthenticationProvider', () => {
           provider.login(
             request,
             {
-              step: SAMLLoginStep.RedirectURLFragmentCaptured,
+              type: SAMLLogin.LoginInitiatedByUser,
+              redirectURLPath: '/test-base-path/some-path',
               redirectURLFragment: '#some-fragment',
             },
-            { redirectURL: '/test-base-path/some-path' }
+            null
           )
         ).resolves.toEqual(
           AuthenticationResult.redirectTo(
@@ -450,6 +508,7 @@ describe('SAMLAuthenticationProvider', () => {
               state: {
                 requestId: 'some-request-id',
                 redirectURL: '/test-base-path/some-path#some-fragment',
+                realm: 'test-realm',
               },
             }
           )
@@ -474,10 +533,10 @@ describe('SAMLAuthenticationProvider', () => {
           provider.login(
             request,
             {
-              step: SAMLLoginStep.RedirectURLFragmentCaptured,
+              type: SAMLLogin.LoginInitiatedByUser,
               redirectURLFragment: '../some-fragment',
             },
-            { redirectURL: '/test-base-path/some-path' }
+            { redirectURL: '/test-base-path/some-path', realm: 'test-realm' }
           )
         ).resolves.toEqual(
           AuthenticationResult.redirectTo(
@@ -486,6 +545,7 @@ describe('SAMLAuthenticationProvider', () => {
               state: {
                 requestId: 'some-request-id',
                 redirectURL: '/test-base-path/some-path#../some-fragment',
+                realm: 'test-realm',
               },
             }
           )
@@ -501,7 +561,7 @@ describe('SAMLAuthenticationProvider', () => {
         );
       });
 
-      it('redirects non-AJAX requests to the IdP remembering only redirect URL path if fragment is too large.', async () => {
+      it('redirects requests to the IdP remembering only redirect URL path if fragment is too large.', async () => {
         const request = httpServerMock.createKibanaRequest();
 
         mockOptions.client.callAsInternalUser.mockResolvedValue({
@@ -513,10 +573,10 @@ describe('SAMLAuthenticationProvider', () => {
           provider.login(
             request,
             {
-              step: SAMLLoginStep.RedirectURLFragmentCaptured,
+              type: SAMLLogin.LoginInitiatedByUser,
               redirectURLFragment: '#some-fragment'.repeat(10),
             },
-            { redirectURL: '/test-base-path/some-path' }
+            { redirectURL: '/test-base-path/some-path', realm: 'test-realm' }
           )
         ).resolves.toEqual(
           AuthenticationResult.redirectTo(
@@ -525,6 +585,7 @@ describe('SAMLAuthenticationProvider', () => {
               state: {
                 requestId: 'some-request-id',
                 redirectURL: '/test-base-path/some-path',
+                realm: 'test-realm',
               },
             }
           )
@@ -540,6 +601,40 @@ describe('SAMLAuthenticationProvider', () => {
         );
       });
 
+      it('redirects requests to the IdP remembering base path if redirect URL path in attempt is too large.', async () => {
+        const request = httpServerMock.createKibanaRequest();
+        mockOptions.client.callAsInternalUser.mockResolvedValue({
+          id: 'some-request-id',
+          redirect: 'https://idp-host/path/login?SAMLRequest=some%20request%20',
+        });
+
+        await expect(
+          provider.login(
+            request,
+            {
+              type: SAMLLogin.LoginInitiatedByUser,
+              redirectURLPath: `/s/foo/${'some-path'.repeat(11)}`,
+              redirectURLFragment: '#some-fragment',
+            },
+            null
+          )
+        ).resolves.toEqual(
+          AuthenticationResult.redirectTo(
+            'https://idp-host/path/login?SAMLRequest=some%20request%20',
+            { state: { requestId: 'some-request-id', redirectURL: '', realm: 'test-realm' } }
+          )
+        );
+
+        expect(mockOptions.client.callAsInternalUser).toHaveBeenCalledWith('shield.samlPrepare', {
+          body: { realm: 'test-realm' },
+        });
+
+        expect(mockOptions.logger.warn).toHaveBeenCalledTimes(1);
+        expect(mockOptions.logger.warn).toHaveBeenCalledWith(
+          'Max URL path size should not exceed 100b but it was 106b. URL is not captured.'
+        );
+      });
+
       it('fails if SAML request preparation fails.', async () => {
         const request = httpServerMock.createKibanaRequest();
 
@@ -550,10 +645,10 @@ describe('SAMLAuthenticationProvider', () => {
           provider.login(
             request,
             {
-              step: SAMLLoginStep.RedirectURLFragmentCaptured,
+              type: SAMLLogin.LoginInitiatedByUser,
               redirectURLFragment: '#some-fragment',
             },
-            { redirectURL: '/test-base-path/some-path' }
+            { redirectURL: '/test-base-path/some-path', realm: 'test-realm' }
           )
         ).resolves.toEqual(AuthenticationResult.failed(failureReason));
 
@@ -573,6 +668,13 @@ describe('SAMLAuthenticationProvider', () => {
       );
     });
 
+    it('does not handle non-AJAX request that does not require authentication.', async () => {
+      const request = httpServerMock.createKibanaRequest({ routeAuthRequired: false });
+      await expect(provider.authenticate(request)).resolves.toEqual(
+        AuthenticationResult.notHandled()
+      );
+    });
+
     it('does not handle authentication via `authorization` header.', async () => {
       const request = httpServerMock.createKibanaRequest({
         headers: { authorization: 'Bearer some-token' },
@@ -596,6 +698,7 @@ describe('SAMLAuthenticationProvider', () => {
           username: 'user',
           accessToken: 'some-valid-token',
           refreshToken: 'some-valid-refresh-token',
+          realm: 'test-realm',
         })
       ).resolves.toEqual(AuthenticationResult.notHandled());
 
@@ -613,8 +716,8 @@ describe('SAMLAuthenticationProvider', () => {
 
       await expect(provider.authenticate(request)).resolves.toEqual(
         AuthenticationResult.redirectTo(
-          '/mock-server-basepath/api/security/saml/capture-url-fragment',
-          { state: { redirectURL: '/base-path/s/foo/some-path' } }
+          '/mock-server-basepath/internal/security/saml/capture-url-fragment',
+          { state: { redirectURL: '/base-path/s/foo/some-path', realm: 'test-realm' } }
         )
       );
 
@@ -634,7 +737,7 @@ describe('SAMLAuthenticationProvider', () => {
       await expect(provider.authenticate(request)).resolves.toEqual(
         AuthenticationResult.redirectTo(
           'https://idp-host/path/login?SAMLRequest=some%20request%20',
-          { state: { requestId: 'some-request-id', redirectURL: '' } }
+          { state: { requestId: 'some-request-id', redirectURL: '', realm: 'test-realm' } }
         )
       );
 
@@ -672,6 +775,7 @@ describe('SAMLAuthenticationProvider', () => {
         username: 'user',
         accessToken: 'some-valid-token',
         refreshToken: 'some-valid-refresh-token',
+        realm: 'test-realm',
       };
       const authorization = `Bearer ${state.accessToken}`;
 
@@ -697,6 +801,7 @@ describe('SAMLAuthenticationProvider', () => {
         username: 'user',
         accessToken: 'some-valid-token',
         refreshToken: 'some-valid-refresh-token',
+        realm: 'test-realm',
       };
       const authorization = `Bearer ${state.accessToken}`;
 
@@ -721,6 +826,7 @@ describe('SAMLAuthenticationProvider', () => {
         username: 'user',
         accessToken: 'expired-token',
         refreshToken: 'valid-refresh-token',
+        realm: 'test-realm',
       };
 
       mockOptions.client.asScoped.mockImplementation(scopeableRequest => {
@@ -755,6 +861,7 @@ describe('SAMLAuthenticationProvider', () => {
               username: 'user',
               accessToken: 'new-access-token',
               refreshToken: 'new-refresh-token',
+              realm: 'test-realm',
             },
           }
         )
@@ -772,6 +879,7 @@ describe('SAMLAuthenticationProvider', () => {
         username: 'user',
         accessToken: 'expired-token',
         refreshToken: 'invalid-refresh-token',
+        realm: 'test-realm',
       };
       const authorization = `Bearer ${state.accessToken}`;
 
@@ -805,6 +913,7 @@ describe('SAMLAuthenticationProvider', () => {
         username: 'user',
         accessToken: 'expired-token',
         refreshToken: 'expired-refresh-token',
+        realm: 'test-realm',
       };
       const authorization = `Bearer ${state.accessToken}`;
 
@@ -830,12 +939,45 @@ describe('SAMLAuthenticationProvider', () => {
       expect(request.headers).not.toHaveProperty('authorization');
     });
 
+    it('fails for non-AJAX requests that do not require authentication with user friendly message if refresh token is expired.', async () => {
+      const request = httpServerMock.createKibanaRequest({ routeAuthRequired: false, headers: {} });
+      const state = {
+        username: 'user',
+        accessToken: 'expired-token',
+        refreshToken: 'expired-refresh-token',
+        realm: 'test-realm',
+      };
+      const authorization = `Bearer ${state.accessToken}`;
+
+      const mockScopedClusterClient = elasticsearchServiceMock.createScopedClusterClient();
+      mockScopedClusterClient.callAsCurrentUser.mockRejectedValue(
+        ElasticsearchErrorHelpers.decorateNotAuthorizedError(new Error())
+      );
+      mockOptions.client.asScoped.mockReturnValue(mockScopedClusterClient);
+
+      mockOptions.tokens.refresh.mockResolvedValue(null);
+
+      await expect(provider.authenticate(request, state)).resolves.toEqual(
+        AuthenticationResult.failed(Boom.badRequest('Both access and refresh tokens are expired.'))
+      );
+
+      expect(mockOptions.tokens.refresh).toHaveBeenCalledTimes(1);
+      expect(mockOptions.tokens.refresh).toHaveBeenCalledWith(state.refreshToken);
+
+      expectAuthenticateCall(mockOptions.client, {
+        headers: { authorization },
+      });
+
+      expect(request.headers).not.toHaveProperty('authorization');
+    });
+
     it('re-capture URL for non-AJAX requests if refresh token is expired.', async () => {
       const request = httpServerMock.createKibanaRequest({ path: '/s/foo/some-path', headers: {} });
       const state = {
         username: 'user',
         accessToken: 'expired-token',
         refreshToken: 'expired-refresh-token',
+        realm: 'test-realm',
       };
       const authorization = `Bearer ${state.accessToken}`;
 
@@ -849,8 +991,8 @@ describe('SAMLAuthenticationProvider', () => {
 
       await expect(provider.authenticate(request, state)).resolves.toEqual(
         AuthenticationResult.redirectTo(
-          '/mock-server-basepath/api/security/saml/capture-url-fragment',
-          { state: { redirectURL: '/base-path/s/foo/some-path' } }
+          '/mock-server-basepath/internal/security/saml/capture-url-fragment',
+          { state: { redirectURL: '/base-path/s/foo/some-path', realm: 'test-realm' } }
         )
       );
 
@@ -871,6 +1013,7 @@ describe('SAMLAuthenticationProvider', () => {
         username: 'user',
         accessToken: 'expired-token',
         refreshToken: 'expired-refresh-token',
+        realm: 'test-realm',
       };
       const authorization = `Bearer ${state.accessToken}`;
 
@@ -890,7 +1033,7 @@ describe('SAMLAuthenticationProvider', () => {
       await expect(provider.authenticate(request, state)).resolves.toEqual(
         AuthenticationResult.redirectTo(
           'https://idp-host/path/login?SAMLRequest=some%20request%20',
-          { state: { requestId: 'some-request-id', redirectURL: '' } }
+          { state: { requestId: 'some-request-id', redirectURL: '', realm: 'test-realm' } }
         )
       );
 
@@ -908,6 +1051,17 @@ describe('SAMLAuthenticationProvider', () => {
         'Max URL path size should not exceed 100b but it was 107b. URL is not captured.'
       );
     });
+
+    it('fails if realm from state is different from the realm provider is configured with.', async () => {
+      const request = httpServerMock.createKibanaRequest();
+      await expect(provider.authenticate(request, { realm: 'other-realm' })).resolves.toEqual(
+        AuthenticationResult.failed(
+          Boom.unauthorized(
+            'State based on realm "other-realm", but provider with the name "saml" is configured to use realm "test-realm".'
+          )
+        )
+      );
+    });
   });
 
   describe('`logout` method', () => {
@@ -934,7 +1088,12 @@ describe('SAMLAuthenticationProvider', () => {
       mockOptions.client.callAsInternalUser.mockRejectedValue(failureReason);
 
       await expect(
-        provider.logout(request, { username: 'user', accessToken, refreshToken })
+        provider.logout(request, {
+          username: 'user',
+          accessToken,
+          refreshToken,
+          realm: 'test-realm',
+        })
       ).resolves.toEqual(DeauthenticationResult.failed(failureReason));
 
       expect(mockOptions.client.callAsInternalUser).toHaveBeenCalledTimes(1);
@@ -967,7 +1126,12 @@ describe('SAMLAuthenticationProvider', () => {
       mockOptions.client.callAsInternalUser.mockResolvedValue({ redirect: null });
 
       await expect(
-        provider.logout(request, { username: 'user', accessToken, refreshToken })
+        provider.logout(request, {
+          username: 'user',
+          accessToken,
+          refreshToken,
+          realm: 'test-realm',
+        })
       ).resolves.toEqual(
         DeauthenticationResult.redirectTo('/mock-server-basepath/security/logged_out')
       );
@@ -986,7 +1150,12 @@ describe('SAMLAuthenticationProvider', () => {
       mockOptions.client.callAsInternalUser.mockResolvedValue({ redirect: undefined });
 
       await expect(
-        provider.logout(request, { username: 'user', accessToken, refreshToken })
+        provider.logout(request, {
+          username: 'user',
+          accessToken,
+          refreshToken,
+          realm: 'test-realm',
+        })
       ).resolves.toEqual(
         DeauthenticationResult.redirectTo('/mock-server-basepath/security/logged_out')
       );
@@ -1007,7 +1176,12 @@ describe('SAMLAuthenticationProvider', () => {
       mockOptions.client.callAsInternalUser.mockResolvedValue({ redirect: null });
 
       await expect(
-        provider.logout(request, { username: 'user', accessToken, refreshToken })
+        provider.logout(request, {
+          username: 'user',
+          accessToken,
+          refreshToken,
+          realm: 'test-realm',
+        })
       ).resolves.toEqual(
         DeauthenticationResult.redirectTo('/mock-server-basepath/security/logged_out')
       );
@@ -1028,6 +1202,7 @@ describe('SAMLAuthenticationProvider', () => {
           username: 'user',
           accessToken: 'x-saml-token',
           refreshToken: 'x-saml-refresh-token',
+          realm: 'test-realm',
         })
       ).resolves.toEqual(
         DeauthenticationResult.redirectTo('/mock-server-basepath/security/logged_out')
@@ -1079,7 +1254,12 @@ describe('SAMLAuthenticationProvider', () => {
       });
 
       await expect(
-        provider.logout(request, { username: 'user', accessToken, refreshToken })
+        provider.logout(request, {
+          username: 'user',
+          accessToken,
+          refreshToken,
+          realm: 'test-realm',
+        })
       ).resolves.toEqual(
         DeauthenticationResult.redirectTo('http://fake-idp/SLO?SAMLRequest=7zlH37H')
       );
@@ -1099,6 +1279,7 @@ describe('SAMLAuthenticationProvider', () => {
           username: 'user',
           accessToken: 'x-saml-token',
           refreshToken: 'x-saml-refresh-token',
+          realm: 'test-realm',
         })
       ).resolves.toEqual(
         DeauthenticationResult.redirectTo('http://fake-idp/SLO?SAMLRequest=7zlH37H')
diff --git a/x-pack/plugins/security/server/authentication/providers/saml.ts b/x-pack/plugins/security/server/authentication/providers/saml.ts
index ddf6814989a49..e14d34d1901eb 100644
--- a/x-pack/plugins/security/server/authentication/providers/saml.ts
+++ b/x-pack/plugins/security/server/authentication/providers/saml.ts
@@ -32,37 +32,53 @@ interface ProviderState extends Partial<TokenPair> {
    * initiate SAML handshake and where we should redirect user after successful authentication.
    */
   redirectURL?: string;
+
+  /**
+   * The name of the SAML realm that was used to establish session.
+   */
+  realm: string;
 }
 
 /**
- * Describes possible SAML Login steps.
+ * Describes possible SAML Login flows.
  */
-export enum SAMLLoginStep {
+export enum SAMLLogin {
   /**
-   * The final login step when IdP responds with SAML Response payload.
+   * The login flow when user initiates SAML handshake (SP Initiated Login).
    */
-  SAMLResponseReceived = 'saml-response-received',
+  LoginInitiatedByUser = 'login-by-user',
   /**
-   * The login step when we've captured user URL fragment and ready to start SAML handshake.
+   * The login flow when IdP responds with SAML Response payload (last step of the SP Initiated
+   * Login or IdP initiated Login).
    */
-  RedirectURLFragmentCaptured = 'redirect-url-fragment-captured',
+  LoginWithSAMLResponse = 'login-saml-response',
 }
 
 /**
  * Describes the parameters that are required by the provider to process the initial login request.
  */
 type ProviderLoginAttempt =
-  | { step: SAMLLoginStep.RedirectURLFragmentCaptured; redirectURLFragment: string }
-  | { step: SAMLLoginStep.SAMLResponseReceived; samlResponse: string };
+  | { type: SAMLLogin.LoginInitiatedByUser; redirectURLPath?: string; redirectURLFragment?: string }
+  | { type: SAMLLogin.LoginWithSAMLResponse; samlResponse: string };
 
 /**
  * Checks whether request query includes SAML request from IdP.
  * @param query Parsed HTTP request query.
  */
-export function isSAMLRequestQuery(query: any): query is { SAMLRequest: string } {
+function isSAMLRequestQuery(query: any): query is { SAMLRequest: string } {
   return query && query.SAMLRequest;
 }
 
+/**
+ * Checks whether current request can initiate new session.
+ * @param request Request instance.
+ */
+function canStartNewSession(request: KibanaRequest) {
+  // We should try to establish new session only if request requires authentication and client
+  // can be redirected to the Identity Provider where they can authenticate.
+  return canRedirectRequest(request) && request.route.options.authRequired === true;
+}
+
 /**
  * Provider that supports SAML request authentication.
  */
@@ -113,31 +129,23 @@ export class SAMLAuthenticationProvider extends BaseAuthenticationProvider {
   ) {
     this.logger.debug('Trying to perform a login.');
 
-    if (attempt.step === SAMLLoginStep.RedirectURLFragmentCaptured) {
-      if (!state || !state.redirectURL) {
-        const message = 'State does not include URL path to redirect to.';
+    // It may happen that Kibana is re-configured to use different realm for the same provider name,
+    // we should clear such session an log user out.
+    if (state?.realm && state.realm !== this.realm) {
+      const message = `State based on realm "${state.realm}", but provider with the name "${this.options.name}" is configured to use realm "${this.realm}".`;
+      this.logger.debug(message);
+      return AuthenticationResult.failed(Boom.unauthorized(message));
+    }
+
+    if (attempt.type === SAMLLogin.LoginInitiatedByUser) {
+      const redirectURLPath = attempt.redirectURLPath || state?.redirectURL;
+      if (!redirectURLPath) {
+        const message = 'State or login attempt does not include URL path to redirect to.';
         this.logger.debug(message);
         return AuthenticationResult.failed(Boom.badRequest(message));
       }
 
-      let redirectURLFragment = attempt.redirectURLFragment;
-      if (redirectURLFragment.length > 0 && !redirectURLFragment.startsWith('#')) {
-        this.logger.warn('Redirect URL fragment does not start with `#`.');
-        redirectURLFragment = `#${redirectURLFragment}`;
-      }
-
-      let redirectURL = `${state.redirectURL}${redirectURLFragment}`;
-      const redirectURLSize = new ByteSizeValue(Buffer.byteLength(redirectURL));
-      if (this.maxRedirectURLSize.isLessThan(redirectURLSize)) {
-        this.logger.warn(
-          `Max URL size should not exceed ${this.maxRedirectURLSize.toString()} but it was ${redirectURLSize.toString()}. Only URL path is captured.`
-        );
-        redirectURL = state.redirectURL;
-      } else {
-        this.logger.debug('Captured redirect URL.');
-      }
-
-      return this.authenticateViaHandshake(request, redirectURL);
+      return this.captureRedirectURL(request, redirectURLPath, attempt.redirectURLFragment);
     }
 
     const { samlResponse } = attempt;
@@ -186,6 +194,14 @@ export class SAMLAuthenticationProvider extends BaseAuthenticationProvider {
       return AuthenticationResult.notHandled();
     }
 
+    // It may happen that Kibana is re-configured to use different realm for the same provider name,
+    // we should clear such session an log user out.
+    if (state?.realm && state.realm !== this.realm) {
+      const message = `State based on realm "${state.realm}", but provider with the name "${this.options.name}" is configured to use realm "${this.realm}".`;
+      this.logger.debug(message);
+      return AuthenticationResult.failed(Boom.unauthorized(message));
+    }
+
     let authenticationResult = AuthenticationResult.notHandled();
     if (state) {
       authenticationResult = await this.authenticateViaState(request, state);
@@ -199,7 +215,7 @@ export class SAMLAuthenticationProvider extends BaseAuthenticationProvider {
 
     // If we couldn't authenticate by means of all methods above, let's try to capture user URL and
     // initiate SAML handshake, otherwise just return authentication result we have.
-    return authenticationResult.notHandled() && canRedirectRequest(request)
+    return authenticationResult.notHandled() && canStartNewSession(request)
       ? this.captureRedirectURL(request)
       : authenticationResult;
   }
@@ -212,15 +228,23 @@ export class SAMLAuthenticationProvider extends BaseAuthenticationProvider {
   public async logout(request: KibanaRequest, state?: ProviderState) {
     this.logger.debug(`Trying to log user out via ${request.url.path}.`);
 
-    if ((!state || !state.accessToken) && !isSAMLRequestQuery(request.query)) {
-      this.logger.debug('There is neither access token nor SAML session to invalidate.');
+    // Normally when there is no active session in Kibana, `logout` method shouldn't do anything
+    // and user will eventually be redirected to the home page to log in. But when SAML is enabled
+    // there is a special case when logout is initiated by the IdP or another SP, then IdP will
+    // request _every_ SP associated with the current user session to do the logout. So if Kibana,
+    // without an active session, receives such request it shouldn't redirect user to the home page,
+    // but rather redirect back to IdP with correct logout response and only Elasticsearch knows how
+    // to do that.
+    const isIdPInitiatedSLO = isSAMLRequestQuery(request.query);
+    if (!state?.accessToken && !isIdPInitiatedSLO) {
+      this.logger.debug('There is no SAML session to invalidate.');
       return DeauthenticationResult.notHandled();
     }
 
     try {
-      const redirect = isSAMLRequestQuery(request.query)
+      const redirect = isIdPInitiatedSLO
         ? await this.performIdPInitiatedSingleLogout(request)
-        : await this.performUserInitiatedSingleLogout(state!.accessToken!, state!.refreshToken!);
+        : await this.performUserInitiatedSingleLogout(state?.accessToken!, state?.refreshToken!);
 
       // Having non-null `redirect` field within logout response means that IdP
       // supports SAML Single Logout and we should redirect user to the specified
@@ -283,8 +307,9 @@ export class SAMLAuthenticationProvider extends BaseAuthenticationProvider {
     }
 
     // When we don't have state and hence request id we assume that SAMLResponse came from the IdP initiated login.
+    const isIdPInitiatedLogin = !stateRequestId;
     this.logger.debug(
-      stateRequestId
+      !isIdPInitiatedLogin
         ? 'Login has been previously initiated by Kibana.'
         : 'Login has been initiated by Identity Provider.'
     );
@@ -298,7 +323,7 @@ export class SAMLAuthenticationProvider extends BaseAuthenticationProvider {
         refresh_token: refreshToken,
       } = await this.options.client.callAsInternalUser('shield.samlAuthenticate', {
         body: {
-          ids: stateRequestId ? [stateRequestId] : [],
+          ids: !isIdPInitiatedLogin ? [stateRequestId] : [],
           content: samlResponse,
           realm: this.realm,
         },
@@ -307,11 +332,17 @@ export class SAMLAuthenticationProvider extends BaseAuthenticationProvider {
       this.logger.debug('Login has been performed with SAML response.');
       return AuthenticationResult.redirectTo(
         stateRedirectURL || `${this.options.basePath.get(request)}/`,
-        { state: { username, accessToken, refreshToken } }
+        { state: { username, accessToken, refreshToken, realm: this.realm } }
       );
     } catch (err) {
       this.logger.debug(`Failed to log in with SAML response: ${err.message}`);
-      return AuthenticationResult.failed(err);
+
+      // Since we don't know upfront what realm is targeted by the Identity Provider initiated login
+      // there is a chance that it failed because of realm mismatch and hence we should return
+      // `notHandled` and give other SAML providers a chance to properly handle it instead.
+      return isIdPInitiatedLogin
+        ? AuthenticationResult.notHandled()
+        : AuthenticationResult.failed(err);
     }
   }
 
@@ -336,7 +367,7 @@ export class SAMLAuthenticationProvider extends BaseAuthenticationProvider {
 
     // First let's try to authenticate via SAML Response payload.
     const payloadAuthenticationResult = await this.loginWithSAMLResponse(request, samlResponse);
-    if (payloadAuthenticationResult.failed()) {
+    if (payloadAuthenticationResult.failed() || payloadAuthenticationResult.notHandled()) {
       return payloadAuthenticationResult;
     }
 
@@ -434,7 +465,7 @@ export class SAMLAuthenticationProvider extends BaseAuthenticationProvider {
     // There are two reasons for `400` and not `401`: Elasticsearch search responds with `400` so it seems logical
     // to do the same on Kibana side and `401` would force user to logout and do full SLO if it's supported.
     if (refreshedTokenPair === null) {
-      if (canRedirectRequest(request)) {
+      if (canStartNewSession(request)) {
         this.logger.debug(
           'Both access and refresh tokens are expired. Capturing redirect URL and re-initiating SAML handshake.'
         );
@@ -458,7 +489,7 @@ export class SAMLAuthenticationProvider extends BaseAuthenticationProvider {
       this.logger.debug('Request has been authenticated via refreshed token.');
       return AuthenticationResult.succeeded(user, {
         authHeaders,
-        state: { username, ...refreshedTokenPair },
+        state: { username, realm: this.realm, ...refreshedTokenPair },
       });
     } catch (err) {
       this.logger.debug(
@@ -476,12 +507,6 @@ export class SAMLAuthenticationProvider extends BaseAuthenticationProvider {
   private async authenticateViaHandshake(request: KibanaRequest, redirectURL: string) {
     this.logger.debug('Trying to initiate SAML handshake.');
 
-    // If client can't handle redirect response, we shouldn't initiate SAML handshake.
-    if (!canRedirectRequest(request)) {
-      this.logger.debug('SAML handshake can not be initiated by AJAX requests.');
-      return AuthenticationResult.notHandled();
-    }
-
     try {
       // This operation should be performed on behalf of the user with a privilege that normal
       // user usually doesn't have `cluster:admin/xpack/security/saml/prepare`.
@@ -495,7 +520,9 @@ export class SAMLAuthenticationProvider extends BaseAuthenticationProvider {
       this.logger.debug('Redirecting to Identity Provider with SAML request.');
 
       // Store request id in the state so that we can reuse it once we receive `SAMLResponse`.
-      return AuthenticationResult.redirectTo(redirect, { state: { requestId, redirectURL } });
+      return AuthenticationResult.redirectTo(redirect, {
+        state: { requestId, redirectURL, realm: this.realm },
+      });
     } catch (err) {
       this.logger.debug(`Failed to initiate SAML handshake: ${err.message}`);
       return AuthenticationResult.failed(err);
@@ -545,18 +572,23 @@ export class SAMLAuthenticationProvider extends BaseAuthenticationProvider {
   }
 
   /**
-   * Redirects user to the client-side page that will grab URL fragment and redirect user back to Kibana
-   * to initiate SAML handshake.
+   * Tries to capture full redirect URL (both path and fragment) and initiate SAML handshake.
    * @param request Request instance.
+   * @param [redirectURLPath] Optional URL path user is supposed to be redirected to after successful
+   * login. If not provided the URL path of the specified request is used.
+   * @param [redirectURLFragment] Optional URL fragment of the URL user is supposed to be redirected
+   * to after successful login. If not provided user will be redirected to the client-side page that
+   * will grab it and redirect user back to Kibana to initiate SAML handshake.
    */
-  private captureRedirectURL(request: KibanaRequest) {
-    const basePath = this.options.basePath.get(request);
-    const redirectURL = `${basePath}${request.url.path}`;
-
+  private captureRedirectURL(
+    request: KibanaRequest,
+    redirectURLPath = `${this.options.basePath.get(request)}${request.url.path}`,
+    redirectURLFragment?: string
+  ) {
     // If the size of the path already exceeds the maximum allowed size of the URL to store in the
     // session there is no reason to try to capture URL fragment and we start handshake immediately.
     // In this case user will be redirected to the Kibana home/root after successful login.
-    const redirectURLSize = new ByteSizeValue(Buffer.byteLength(redirectURL));
+    let redirectURLSize = new ByteSizeValue(Buffer.byteLength(redirectURLPath));
     if (this.maxRedirectURLSize.isLessThan(redirectURLSize)) {
       this.logger.warn(
         `Max URL path size should not exceed ${this.maxRedirectURLSize.toString()} but it was ${redirectURLSize.toString()}. URL is not captured.`
@@ -564,9 +596,30 @@ export class SAMLAuthenticationProvider extends BaseAuthenticationProvider {
       return this.authenticateViaHandshake(request, '');
     }
 
-    return AuthenticationResult.redirectTo(
-      `${this.options.basePath.serverBasePath}/api/security/saml/capture-url-fragment`,
-      { state: { redirectURL } }
-    );
+    // If URL fragment wasn't specified at all, let's try to capture it.
+    if (redirectURLFragment === undefined) {
+      return AuthenticationResult.redirectTo(
+        `${this.options.basePath.serverBasePath}/internal/security/saml/capture-url-fragment`,
+        { state: { redirectURL: redirectURLPath, realm: this.realm } }
+      );
+    }
+
+    if (redirectURLFragment.length > 0 && !redirectURLFragment.startsWith('#')) {
+      this.logger.warn('Redirect URL fragment does not start with `#`.');
+      redirectURLFragment = `#${redirectURLFragment}`;
+    }
+
+    let redirectURL = `${redirectURLPath}${redirectURLFragment}`;
+    redirectURLSize = new ByteSizeValue(Buffer.byteLength(redirectURL));
+    if (this.maxRedirectURLSize.isLessThan(redirectURLSize)) {
+      this.logger.warn(
+        `Max URL size should not exceed ${this.maxRedirectURLSize.toString()} but it was ${redirectURLSize.toString()}. Only URL path is captured.`
+      );
+      redirectURL = redirectURLPath;
+    } else {
+      this.logger.debug('Captured redirect URL.');
+    }
+
+    return this.authenticateViaHandshake(request, redirectURL);
   }
 }
diff --git a/x-pack/plugins/security/server/authentication/providers/token.test.ts b/x-pack/plugins/security/server/authentication/providers/token.test.ts
index e81d14e8bf9f3..7472adb30307c 100644
--- a/x-pack/plugins/security/server/authentication/providers/token.test.ts
+++ b/x-pack/plugins/security/server/authentication/providers/token.test.ts
@@ -36,7 +36,7 @@ describe('TokenAuthenticationProvider', () => {
   let provider: TokenAuthenticationProvider;
   let mockOptions: MockAuthenticationProviderOptions;
   beforeEach(() => {
-    mockOptions = mockAuthenticationProviderOptions();
+    mockOptions = mockAuthenticationProviderOptions({ name: 'token' });
     provider = new TokenAuthenticationProvider(mockOptions);
   });
 
@@ -163,6 +163,12 @@ describe('TokenAuthenticationProvider', () => {
       ).resolves.toEqual(AuthenticationResult.notHandled());
     });
 
+    it('does not redirect requests that do not require authentication to the login page.', async () => {
+      await expect(
+        provider.authenticate(httpServerMock.createKibanaRequest({ routeAuthRequired: false }))
+      ).resolves.toEqual(AuthenticationResult.notHandled());
+    });
+
     it('redirects non-AJAX requests that can not be authenticated to the login page.', async () => {
       await expect(
         provider.authenticate(
@@ -346,6 +352,35 @@ describe('TokenAuthenticationProvider', () => {
       expect(request.headers).not.toHaveProperty('authorization');
     });
 
+    it('does not redirect non-AJAX requests that do not require authentication if token token cannot be refreshed', async () => {
+      const request = httpServerMock.createKibanaRequest({
+        headers: {},
+        routeAuthRequired: false,
+        path: '/some-path',
+      });
+      const tokenPair = { accessToken: 'foo', refreshToken: 'bar' };
+      const authorization = `Bearer ${tokenPair.accessToken}`;
+
+      const mockScopedClusterClient = elasticsearchServiceMock.createScopedClusterClient();
+      mockScopedClusterClient.callAsCurrentUser.mockRejectedValue(
+        ElasticsearchErrorHelpers.decorateNotAuthorizedError(new Error())
+      );
+      mockOptions.client.asScoped.mockReturnValue(mockScopedClusterClient);
+
+      mockOptions.tokens.refresh.mockResolvedValue(null);
+
+      await expect(provider.authenticate(request, tokenPair)).resolves.toEqual(
+        AuthenticationResult.failed(Boom.badRequest('Both access and refresh tokens are expired.'))
+      );
+
+      expect(mockOptions.tokens.refresh).toHaveBeenCalledTimes(1);
+      expect(mockOptions.tokens.refresh).toHaveBeenCalledWith(tokenPair.refreshToken);
+
+      expectAuthenticateCall(mockOptions.client, { headers: { authorization } });
+
+      expect(request.headers).not.toHaveProperty('authorization');
+    });
+
     it('fails if new access token is rejected after successful refresh', async () => {
       const request = httpServerMock.createKibanaRequest();
       const tokenPair = { accessToken: 'foo', refreshToken: 'bar' };
@@ -386,15 +421,13 @@ describe('TokenAuthenticationProvider', () => {
   });
 
   describe('`logout` method', () => {
-    it('returns `redirected` if state is not presented.', async () => {
+    it('returns `notHandled` if state is not presented.', async () => {
       const request = httpServerMock.createKibanaRequest();
 
-      await expect(provider.logout(request)).resolves.toEqual(
-        DeauthenticationResult.redirectTo('/base-path/login?msg=LOGGED_OUT')
-      );
+      await expect(provider.logout(request)).resolves.toEqual(DeauthenticationResult.notHandled());
 
       await expect(provider.logout(request, null)).resolves.toEqual(
-        DeauthenticationResult.redirectTo('/base-path/login?msg=LOGGED_OUT')
+        DeauthenticationResult.notHandled()
       );
 
       expect(mockOptions.tokens.invalidate).not.toHaveBeenCalled();
diff --git a/x-pack/plugins/security/server/authentication/providers/token.ts b/x-pack/plugins/security/server/authentication/providers/token.ts
index 91808c22c4300..abf4c293c4c53 100644
--- a/x-pack/plugins/security/server/authentication/providers/token.ts
+++ b/x-pack/plugins/security/server/authentication/providers/token.ts
@@ -26,6 +26,16 @@ interface ProviderLoginAttempt {
  */
 type ProviderState = TokenPair;
 
+/**
+ * Checks whether current request can initiate new session.
+ * @param request Request instance.
+ */
+function canStartNewSession(request: KibanaRequest) {
+  // We should try to establish new session only if request requires authentication and client
+  // can be redirected to the login page where they can enter username and password.
+  return canRedirectRequest(request) && request.route.options.authRequired === true;
+}
+
 /**
  * Provider that supports token-based request authentication.
  */
@@ -102,7 +112,7 @@ export class TokenAuthenticationProvider extends BaseAuthenticationProvider {
 
     // finally, if authentication still can not be handled for this
     // request/state combination, redirect to the login page if appropriate
-    if (authenticationResult.notHandled() && canRedirectRequest(request)) {
+    if (authenticationResult.notHandled() && canStartNewSession(request)) {
       this.logger.debug('Redirecting request to Login page.');
       authenticationResult = AuthenticationResult.redirectTo(this.getLoginPageURL(request));
     }
@@ -118,16 +128,17 @@ export class TokenAuthenticationProvider extends BaseAuthenticationProvider {
   public async logout(request: KibanaRequest, state?: ProviderState | null) {
     this.logger.debug(`Trying to log user out via ${request.url.path}.`);
 
-    if (state) {
-      this.logger.debug('Token-based logout has been initiated by the user.');
-      try {
-        await this.options.tokens.invalidate(state);
-      } catch (err) {
-        this.logger.debug(`Failed invalidating user's access token: ${err.message}`);
-        return DeauthenticationResult.failed(err);
-      }
-    } else {
+    if (!state) {
       this.logger.debug('There are no access and refresh tokens to invalidate.');
+      return DeauthenticationResult.notHandled();
+    }
+
+    this.logger.debug('Token-based logout has been initiated by the user.');
+    try {
+      await this.options.tokens.invalidate(state);
+    } catch (err) {
+      this.logger.debug(`Failed invalidating user's access token: ${err.message}`);
+      return DeauthenticationResult.failed(err);
     }
 
     const queryString = request.url.search || `?msg=LOGGED_OUT`;
@@ -190,7 +201,7 @@ export class TokenAuthenticationProvider extends BaseAuthenticationProvider {
     // If refresh token is no longer valid, then we should clear session and redirect user to the
     // login page to re-authenticate, or fail if redirect isn't possible.
     if (refreshedTokenPair === null) {
-      if (canRedirectRequest(request)) {
+      if (canStartNewSession(request)) {
         this.logger.debug('Clearing session since both access and refresh tokens are expired.');
 
         // Set state to `null` to let `Authenticator` know that we want to clear current session.
diff --git a/x-pack/plugins/security/server/config.test.ts b/x-pack/plugins/security/server/config.test.ts
index 03285184d6572..46a7ee79ee60c 100644
--- a/x-pack/plugins/security/server/config.test.ts
+++ b/x-pack/plugins/security/server/config.test.ts
@@ -6,9 +6,8 @@
 
 jest.mock('crypto', () => ({ randomBytes: jest.fn() }));
 
-import { first } from 'rxjs/operators';
-import { loggingServiceMock, coreMock } from '../../../../src/core/server/mocks';
-import { createConfig$, ConfigSchema } from './config';
+import { loggingServiceMock } from '../../../../src/core/server/mocks';
+import { createConfig, ConfigSchema } from './config';
 
 describe('config schema', () => {
   it('generates proper defaults', () => {
@@ -25,9 +24,22 @@ describe('config schema', () => {
               "apikey",
             ],
           },
-          "providers": Array [
-            "basic",
-          ],
+          "providers": Object {
+            "basic": Object {
+              "basic": Object {
+                "description": undefined,
+                "enabled": true,
+                "order": 0,
+                "showInSelector": true,
+              },
+            },
+            "kerberos": undefined,
+            "oidc": undefined,
+            "pki": undefined,
+            "saml": undefined,
+            "token": undefined,
+          },
+          "selector": Object {},
         },
         "cookieName": "sid",
         "enabled": true,
@@ -54,9 +66,22 @@ describe('config schema', () => {
               "apikey",
             ],
           },
-          "providers": Array [
-            "basic",
-          ],
+          "providers": Object {
+            "basic": Object {
+              "basic": Object {
+                "description": undefined,
+                "enabled": true,
+                "order": 0,
+                "showInSelector": true,
+              },
+            },
+            "kerberos": undefined,
+            "oidc": undefined,
+            "pki": undefined,
+            "saml": undefined,
+            "token": undefined,
+          },
+          "selector": Object {},
         },
         "cookieName": "sid",
         "enabled": true,
@@ -83,9 +108,22 @@ describe('config schema', () => {
               "apikey",
             ],
           },
-          "providers": Array [
-            "basic",
-          ],
+          "providers": Object {
+            "basic": Object {
+              "basic": Object {
+                "description": undefined,
+                "enabled": true,
+                "order": 0,
+                "showInSelector": true,
+              },
+            },
+            "kerberos": undefined,
+            "oidc": undefined,
+            "pki": undefined,
+            "saml": undefined,
+            "token": undefined,
+          },
+          "selector": Object {},
         },
         "cookieName": "sid",
         "enabled": true,
@@ -148,6 +186,7 @@ describe('config schema', () => {
           "providers": Array [
             "oidc",
           ],
+          "selector": Object {},
         }
       `);
     });
@@ -181,6 +220,7 @@ describe('config schema', () => {
             "oidc",
             "basic",
           ],
+          "selector": Object {},
         }
       `);
     });
@@ -228,6 +268,7 @@ describe('config schema', () => {
             },
             "realm": "realm-1",
           },
+          "selector": Object {},
         }
       `);
     });
@@ -305,27 +346,476 @@ describe('config schema', () => {
             `);
     });
   });
+
+  describe('authc.providers (extended format)', () => {
+    describe('`basic` provider', () => {
+      it('requires `order`', () => {
+        expect(() =>
+          ConfigSchema.validate({
+            authc: { providers: { basic: { basic1: { enabled: true } } } },
+          })
+        ).toThrowErrorMatchingInlineSnapshot(`
+"[authc.providers]: types that failed validation:
+- [authc.providers.0]: expected value of type [array] but got [Object]
+- [authc.providers.1.basic.basic1.order]: expected value of type [number] but got [undefined]"
+`);
+      });
+
+      it('does not allow custom description', () => {
+        expect(() =>
+          ConfigSchema.validate({
+            authc: {
+              providers: { basic: { basic1: { order: 0, description: 'Some description' } } },
+            },
+          })
+        ).toThrowErrorMatchingInlineSnapshot(`
+"[authc.providers]: types that failed validation:
+- [authc.providers.0]: expected value of type [array] but got [Object]
+- [authc.providers.1.basic.basic1.description]: \`basic\` provider does not support custom description."
+`);
+      });
+
+      it('cannot be hidden from selector', () => {
+        expect(() =>
+          ConfigSchema.validate({
+            authc: {
+              providers: { basic: { basic1: { order: 0, showInSelector: false } } },
+            },
+          })
+        ).toThrowErrorMatchingInlineSnapshot(`
+"[authc.providers]: types that failed validation:
+- [authc.providers.0]: expected value of type [array] but got [Object]
+- [authc.providers.1.basic.basic1.showInSelector]: \`basic\` provider only supports \`true\` in \`showInSelector\`."
+`);
+      });
+
+      it('can have only provider of this type', () => {
+        expect(() =>
+          ConfigSchema.validate({
+            authc: { providers: { basic: { basic1: { order: 0 }, basic2: { order: 1 } } } },
+          })
+        ).toThrowErrorMatchingInlineSnapshot(`
+"[authc.providers]: types that failed validation:
+- [authc.providers.0]: expected value of type [array] but got [Object]
+- [authc.providers.1.basic]: Only one \\"basic\\" provider can be configured."
+`);
+      });
+
+      it('can be successfully validated', () => {
+        expect(
+          ConfigSchema.validate({
+            authc: { providers: { basic: { basic1: { order: 0 } } } },
+          }).authc.providers
+        ).toMatchInlineSnapshot(`
+          Object {
+            "basic": Object {
+              "basic1": Object {
+                "enabled": true,
+                "order": 0,
+                "showInSelector": true,
+              },
+            },
+          }
+        `);
+      });
+    });
+
+    describe('`token` provider', () => {
+      it('requires `order`', () => {
+        expect(() =>
+          ConfigSchema.validate({
+            authc: { providers: { token: { token1: { enabled: true } } } },
+          })
+        ).toThrowErrorMatchingInlineSnapshot(`
+"[authc.providers]: types that failed validation:
+- [authc.providers.0]: expected value of type [array] but got [Object]
+- [authc.providers.1.token.token1.order]: expected value of type [number] but got [undefined]"
+`);
+      });
+
+      it('does not allow custom description', () => {
+        expect(() =>
+          ConfigSchema.validate({
+            authc: {
+              providers: { token: { token1: { order: 0, description: 'Some description' } } },
+            },
+          })
+        ).toThrowErrorMatchingInlineSnapshot(`
+"[authc.providers]: types that failed validation:
+- [authc.providers.0]: expected value of type [array] but got [Object]
+- [authc.providers.1.token.token1.description]: \`token\` provider does not support custom description."
+`);
+      });
+
+      it('cannot be hidden from selector', () => {
+        expect(() =>
+          ConfigSchema.validate({
+            authc: {
+              providers: { token: { token1: { order: 0, showInSelector: false } } },
+            },
+          })
+        ).toThrowErrorMatchingInlineSnapshot(`
+"[authc.providers]: types that failed validation:
+- [authc.providers.0]: expected value of type [array] but got [Object]
+- [authc.providers.1.token.token1.showInSelector]: \`token\` provider only supports \`true\` in \`showInSelector\`."
+`);
+      });
+
+      it('can have only provider of this type', () => {
+        expect(() =>
+          ConfigSchema.validate({
+            authc: { providers: { token: { token1: { order: 0 }, token2: { order: 1 } } } },
+          })
+        ).toThrowErrorMatchingInlineSnapshot(`
+"[authc.providers]: types that failed validation:
+- [authc.providers.0]: expected value of type [array] but got [Object]
+- [authc.providers.1.token]: Only one \\"token\\" provider can be configured."
+`);
+      });
+
+      it('can be successfully validated', () => {
+        expect(
+          ConfigSchema.validate({
+            authc: { providers: { token: { token1: { order: 0 } } } },
+          }).authc.providers
+        ).toMatchInlineSnapshot(`
+          Object {
+            "token": Object {
+              "token1": Object {
+                "enabled": true,
+                "order": 0,
+                "showInSelector": true,
+              },
+            },
+          }
+        `);
+      });
+    });
+
+    describe('`pki` provider', () => {
+      it('requires `order`', () => {
+        expect(() =>
+          ConfigSchema.validate({
+            authc: { providers: { pki: { pki1: { enabled: true } } } },
+          })
+        ).toThrowErrorMatchingInlineSnapshot(`
+"[authc.providers]: types that failed validation:
+- [authc.providers.0]: expected value of type [array] but got [Object]
+- [authc.providers.1.pki.pki1.order]: expected value of type [number] but got [undefined]"
+`);
+      });
+
+      it('can have only provider of this type', () => {
+        expect(() =>
+          ConfigSchema.validate({
+            authc: { providers: { pki: { pki1: { order: 0 }, pki2: { order: 1 } } } },
+          })
+        ).toThrowErrorMatchingInlineSnapshot(`
+"[authc.providers]: types that failed validation:
+- [authc.providers.0]: expected value of type [array] but got [Object]
+- [authc.providers.1.pki]: Only one \\"pki\\" provider can be configured."
+`);
+      });
+
+      it('can be successfully validated', () => {
+        expect(
+          ConfigSchema.validate({
+            authc: { providers: { pki: { pki1: { order: 0 } } } },
+          }).authc.providers
+        ).toMatchInlineSnapshot(`
+          Object {
+            "pki": Object {
+              "pki1": Object {
+                "enabled": true,
+                "order": 0,
+                "showInSelector": true,
+              },
+            },
+          }
+        `);
+      });
+    });
+
+    describe('`kerberos` provider', () => {
+      it('requires `order`', () => {
+        expect(() =>
+          ConfigSchema.validate({
+            authc: { providers: { kerberos: { kerberos1: { enabled: true } } } },
+          })
+        ).toThrowErrorMatchingInlineSnapshot(`
+"[authc.providers]: types that failed validation:
+- [authc.providers.0]: expected value of type [array] but got [Object]
+- [authc.providers.1.kerberos.kerberos1.order]: expected value of type [number] but got [undefined]"
+`);
+      });
+
+      it('can have only provider of this type', () => {
+        expect(() =>
+          ConfigSchema.validate({
+            authc: {
+              providers: { kerberos: { kerberos1: { order: 0 }, kerberos2: { order: 1 } } },
+            },
+          })
+        ).toThrowErrorMatchingInlineSnapshot(`
+"[authc.providers]: types that failed validation:
+- [authc.providers.0]: expected value of type [array] but got [Object]
+- [authc.providers.1.kerberos]: Only one \\"kerberos\\" provider can be configured."
+`);
+      });
+
+      it('can be successfully validated', () => {
+        expect(
+          ConfigSchema.validate({
+            authc: { providers: { kerberos: { kerberos1: { order: 0 } } } },
+          }).authc.providers
+        ).toMatchInlineSnapshot(`
+          Object {
+            "kerberos": Object {
+              "kerberos1": Object {
+                "enabled": true,
+                "order": 0,
+                "showInSelector": true,
+              },
+            },
+          }
+        `);
+      });
+    });
+
+    describe('`oidc` provider', () => {
+      it('requires `order`', () => {
+        expect(() =>
+          ConfigSchema.validate({
+            authc: { providers: { oidc: { oidc1: { enabled: true } } } },
+          })
+        ).toThrowErrorMatchingInlineSnapshot(`
+"[authc.providers]: types that failed validation:
+- [authc.providers.0]: expected value of type [array] but got [Object]
+- [authc.providers.1.oidc.oidc1.order]: expected value of type [number] but got [undefined]"
+`);
+      });
+
+      it('requires `realm`', () => {
+        expect(() =>
+          ConfigSchema.validate({
+            authc: { providers: { oidc: { oidc1: { order: 0 } } } },
+          })
+        ).toThrowErrorMatchingInlineSnapshot(`
+"[authc.providers]: types that failed validation:
+- [authc.providers.0]: expected value of type [array] but got [Object]
+- [authc.providers.1.oidc.oidc1.realm]: expected value of type [string] but got [undefined]"
+`);
+      });
+
+      it('can be successfully validated', () => {
+        expect(
+          ConfigSchema.validate({
+            authc: {
+              providers: {
+                oidc: { oidc1: { order: 0, realm: 'oidc1' }, oidc2: { order: 1, realm: 'oidc2' } },
+              },
+            },
+          }).authc.providers
+        ).toMatchInlineSnapshot(`
+          Object {
+            "oidc": Object {
+              "oidc1": Object {
+                "enabled": true,
+                "order": 0,
+                "realm": "oidc1",
+                "showInSelector": true,
+              },
+              "oidc2": Object {
+                "enabled": true,
+                "order": 1,
+                "realm": "oidc2",
+                "showInSelector": true,
+              },
+            },
+          }
+        `);
+      });
+    });
+
+    describe('`saml` provider', () => {
+      it('requires `order`', () => {
+        expect(() =>
+          ConfigSchema.validate({
+            authc: { providers: { saml: { saml1: { enabled: true } } } },
+          })
+        ).toThrowErrorMatchingInlineSnapshot(`
+"[authc.providers]: types that failed validation:
+- [authc.providers.0]: expected value of type [array] but got [Object]
+- [authc.providers.1.saml.saml1.order]: expected value of type [number] but got [undefined]"
+`);
+      });
+
+      it('requires `realm`', () => {
+        expect(() =>
+          ConfigSchema.validate({
+            authc: { providers: { saml: { saml1: { order: 0 } } } },
+          })
+        ).toThrowErrorMatchingInlineSnapshot(`
+"[authc.providers]: types that failed validation:
+- [authc.providers.0]: expected value of type [array] but got [Object]
+- [authc.providers.1.saml.saml1.realm]: expected value of type [string] but got [undefined]"
+`);
+      });
+
+      it('can be successfully validated', () => {
+        expect(
+          ConfigSchema.validate({
+            authc: {
+              providers: {
+                saml: {
+                  saml1: { order: 0, realm: 'saml1' },
+                  saml2: { order: 1, realm: 'saml2', maxRedirectURLSize: '1kb' },
+                },
+              },
+            },
+          }).authc.providers
+        ).toMatchInlineSnapshot(`
+          Object {
+            "saml": Object {
+              "saml1": Object {
+                "enabled": true,
+                "maxRedirectURLSize": ByteSizeValue {
+                  "valueInBytes": 2048,
+                },
+                "order": 0,
+                "realm": "saml1",
+                "showInSelector": true,
+              },
+              "saml2": Object {
+                "enabled": true,
+                "maxRedirectURLSize": ByteSizeValue {
+                  "valueInBytes": 1024,
+                },
+                "order": 1,
+                "realm": "saml2",
+                "showInSelector": true,
+              },
+            },
+          }
+        `);
+      });
+    });
+
+    it('`name` should be unique across all provider types', () => {
+      expect(() =>
+        ConfigSchema.validate({
+          authc: {
+            providers: {
+              basic: { provider1: { order: 0 } },
+              saml: {
+                provider2: { order: 1, realm: 'saml1' },
+                provider1: { order: 2, realm: 'saml2' },
+              },
+            },
+          },
+        })
+      ).toThrowErrorMatchingInlineSnapshot(`
+"[authc.providers]: types that failed validation:
+- [authc.providers.0]: expected value of type [array] but got [Object]
+- [authc.providers.1]: Found multiple providers configured with the same name \\"provider1\\": [xpack.security.authc.providers.basic.provider1, xpack.security.authc.providers.saml.provider1]"
+`);
+    });
+
+    it('`order` should be unique across all provider types', () => {
+      expect(() =>
+        ConfigSchema.validate({
+          authc: {
+            providers: {
+              basic: { provider1: { order: 0 } },
+              saml: {
+                provider2: { order: 0, realm: 'saml1' },
+                provider3: { order: 2, realm: 'saml2' },
+              },
+            },
+          },
+        })
+      ).toThrowErrorMatchingInlineSnapshot(`
+"[authc.providers]: types that failed validation:
+- [authc.providers.0]: expected value of type [array] but got [Object]
+- [authc.providers.1]: Found multiple providers configured with the same order \\"0\\": [xpack.security.authc.providers.basic.provider1, xpack.security.authc.providers.saml.provider2]"
+`);
+    });
+
+    it('can be successfully validated with multiple providers ignoring uniqueness violations in disabled ones', () => {
+      expect(
+        ConfigSchema.validate({
+          authc: {
+            providers: {
+              basic: { basic1: { order: 0 }, basic2: { enabled: false, order: 1 } },
+              saml: {
+                saml1: { order: 1, realm: 'saml1' },
+                saml2: { order: 2, realm: 'saml2' },
+                basic1: { order: 3, realm: 'saml3', enabled: false },
+              },
+            },
+          },
+        }).authc.providers
+      ).toMatchInlineSnapshot(`
+        Object {
+          "basic": Object {
+            "basic1": Object {
+              "enabled": true,
+              "order": 0,
+              "showInSelector": true,
+            },
+            "basic2": Object {
+              "enabled": false,
+              "order": 1,
+              "showInSelector": true,
+            },
+          },
+          "saml": Object {
+            "basic1": Object {
+              "enabled": false,
+              "maxRedirectURLSize": ByteSizeValue {
+                "valueInBytes": 2048,
+              },
+              "order": 3,
+              "realm": "saml3",
+              "showInSelector": true,
+            },
+            "saml1": Object {
+              "enabled": true,
+              "maxRedirectURLSize": ByteSizeValue {
+                "valueInBytes": 2048,
+              },
+              "order": 1,
+              "realm": "saml1",
+              "showInSelector": true,
+            },
+            "saml2": Object {
+              "enabled": true,
+              "maxRedirectURLSize": ByteSizeValue {
+                "valueInBytes": 2048,
+              },
+              "order": 2,
+              "realm": "saml2",
+              "showInSelector": true,
+            },
+          },
+        }
+      `);
+    });
+  });
 });
 
-describe('createConfig$()', () => {
-  const mockAndCreateConfig = async (isTLSEnabled: boolean, value = {}, context?: any) => {
-    const contextMock = coreMock.createPluginInitializerContext(
-      // we must use validate to avoid errors in `createConfig$`
-      ConfigSchema.validate(value, context)
-    );
-    return await createConfig$(contextMock, isTLSEnabled)
-      .pipe(first())
-      .toPromise()
-      .then(config => ({ contextMock, config }));
-  };
+describe('createConfig()', () => {
   it('should log a warning and set xpack.security.encryptionKey if not set', async () => {
     const mockRandomBytes = jest.requireMock('crypto').randomBytes;
     mockRandomBytes.mockReturnValue('ab'.repeat(16));
 
-    const { contextMock, config } = await mockAndCreateConfig(true, {}, { dist: true });
+    const logger = loggingServiceMock.create().get();
+    const config = createConfig(ConfigSchema.validate({}, { dist: true }), logger, {
+      isTLSEnabled: true,
+    });
     expect(config.encryptionKey).toEqual('ab'.repeat(16));
 
-    expect(loggingServiceMock.collect(contextMock.logger).warn).toMatchInlineSnapshot(`
+    expect(loggingServiceMock.collect(logger).warn).toMatchInlineSnapshot(`
                         Array [
                           Array [
                             "Generating a random key for xpack.security.encryptionKey. To prevent sessions from being invalidated on restart, please set xpack.security.encryptionKey in kibana.yml",
@@ -335,10 +825,11 @@ describe('createConfig$()', () => {
   });
 
   it('should log a warning if SSL is not configured', async () => {
-    const { contextMock, config } = await mockAndCreateConfig(false, {});
+    const logger = loggingServiceMock.create().get();
+    const config = createConfig(ConfigSchema.validate({}), logger, { isTLSEnabled: false });
     expect(config.secureCookies).toEqual(false);
 
-    expect(loggingServiceMock.collect(contextMock.logger).warn).toMatchInlineSnapshot(`
+    expect(loggingServiceMock.collect(logger).warn).toMatchInlineSnapshot(`
                         Array [
                           Array [
                             "Session cookies will be transmitted over insecure connections. This is not recommended.",
@@ -348,10 +839,13 @@ describe('createConfig$()', () => {
   });
 
   it('should log a warning if SSL is not configured yet secure cookies are being used', async () => {
-    const { contextMock, config } = await mockAndCreateConfig(false, { secureCookies: true });
+    const logger = loggingServiceMock.create().get();
+    const config = createConfig(ConfigSchema.validate({ secureCookies: true }), logger, {
+      isTLSEnabled: false,
+    });
     expect(config.secureCookies).toEqual(true);
 
-    expect(loggingServiceMock.collect(contextMock.logger).warn).toMatchInlineSnapshot(`
+    expect(loggingServiceMock.collect(logger).warn).toMatchInlineSnapshot(`
                         Array [
                           Array [
                             "Using secure cookies, but SSL is not enabled inside Kibana. SSL must be configured outside of Kibana to function properly.",
@@ -361,9 +855,210 @@ describe('createConfig$()', () => {
   });
 
   it('should set xpack.security.secureCookies if SSL is configured', async () => {
-    const { contextMock, config } = await mockAndCreateConfig(true, {});
+    const logger = loggingServiceMock.create().get();
+    const config = createConfig(ConfigSchema.validate({}), logger, { isTLSEnabled: true });
     expect(config.secureCookies).toEqual(true);
 
-    expect(loggingServiceMock.collect(contextMock.logger).warn).toEqual([]);
+    expect(loggingServiceMock.collect(logger).warn).toEqual([]);
+  });
+
+  it('transforms legacy `authc.providers` into new format', () => {
+    const logger = loggingServiceMock.create().get();
+
+    expect(
+      createConfig(
+        ConfigSchema.validate({
+          authc: {
+            providers: ['saml', 'basic'],
+            saml: { realm: 'saml-realm' },
+          },
+        }),
+        logger,
+        { isTLSEnabled: true }
+      ).authc
+    ).toMatchInlineSnapshot(`
+      Object {
+        "http": Object {
+          "autoSchemesEnabled": true,
+          "enabled": true,
+          "schemes": Array [
+            "apikey",
+          ],
+        },
+        "providers": Object {
+          "basic": Object {
+            "basic": Object {
+              "enabled": true,
+              "order": 1,
+              "showInSelector": true,
+            },
+          },
+          "saml": Object {
+            "saml": Object {
+              "enabled": true,
+              "maxRedirectURLSize": ByteSizeValue {
+                "valueInBytes": 2048,
+              },
+              "order": 0,
+              "realm": "saml-realm",
+              "showInSelector": true,
+            },
+          },
+        },
+        "selector": Object {
+          "enabled": false,
+        },
+        "sortedProviders": Array [
+          Object {
+            "name": "saml",
+            "options": Object {
+              "description": undefined,
+              "order": 0,
+              "showInSelector": true,
+            },
+            "type": "saml",
+          },
+          Object {
+            "name": "basic",
+            "options": Object {
+              "description": undefined,
+              "order": 1,
+              "showInSelector": true,
+            },
+            "type": "basic",
+          },
+        ],
+      }
+    `);
+  });
+
+  it('does not automatically set `authc.selector.enabled` to `true` if legacy `authc.providers` format is used', () => {
+    expect(
+      createConfig(
+        ConfigSchema.validate({
+          authc: { providers: ['saml', 'basic'], saml: { realm: 'saml-realm' } },
+        }),
+        loggingServiceMock.create().get(),
+        { isTLSEnabled: true }
+      ).authc.selector.enabled
+    ).toBe(false);
+
+    // But keep it as `true` if it's explicitly set.
+    expect(
+      createConfig(
+        ConfigSchema.validate({
+          authc: {
+            selector: { enabled: true },
+            providers: ['saml', 'basic'],
+            saml: { realm: 'saml-realm' },
+          },
+        }),
+        loggingServiceMock.create().get(),
+        { isTLSEnabled: true }
+      ).authc.selector.enabled
+    ).toBe(true);
+  });
+
+  it('does not automatically set `authc.selector.enabled` to `true` if less than 2 providers must be shown there', () => {
+    expect(
+      createConfig(
+        ConfigSchema.validate({
+          authc: {
+            providers: {
+              basic: { basic1: { order: 0 } },
+              saml: {
+                saml1: { order: 1, realm: 'saml1', showInSelector: false },
+                saml2: { enabled: false, order: 2, realm: 'saml2' },
+              },
+            },
+          },
+        }),
+        loggingServiceMock.create().get(),
+        { isTLSEnabled: true }
+      ).authc.selector.enabled
+    ).toBe(false);
+  });
+
+  it('automatically set `authc.selector.enabled` to `true` if more than 1 provider must be shown there', () => {
+    expect(
+      createConfig(
+        ConfigSchema.validate({
+          authc: {
+            providers: {
+              basic: { basic1: { order: 0 } },
+              saml: { saml1: { order: 1, realm: 'saml1' }, saml2: { order: 2, realm: 'saml2' } },
+            },
+          },
+        }),
+        loggingServiceMock.create().get(),
+        { isTLSEnabled: true }
+      ).authc.selector.enabled
+    ).toBe(true);
+  });
+
+  it('correctly sorts providers based on the `order`', () => {
+    expect(
+      createConfig(
+        ConfigSchema.validate({
+          authc: {
+            providers: {
+              basic: { basic1: { order: 3 } },
+              saml: { saml1: { order: 2, realm: 'saml1' }, saml2: { order: 1, realm: 'saml2' } },
+              oidc: { oidc1: { order: 0, realm: 'oidc1' }, oidc2: { order: 4, realm: 'oidc2' } },
+            },
+          },
+        }),
+        loggingServiceMock.create().get(),
+        { isTLSEnabled: true }
+      ).authc.sortedProviders
+    ).toMatchInlineSnapshot(`
+      Array [
+        Object {
+          "name": "oidc1",
+          "options": Object {
+            "description": undefined,
+            "order": 0,
+            "showInSelector": true,
+          },
+          "type": "oidc",
+        },
+        Object {
+          "name": "saml2",
+          "options": Object {
+            "description": undefined,
+            "order": 1,
+            "showInSelector": true,
+          },
+          "type": "saml",
+        },
+        Object {
+          "name": "saml1",
+          "options": Object {
+            "description": undefined,
+            "order": 2,
+            "showInSelector": true,
+          },
+          "type": "saml",
+        },
+        Object {
+          "name": "basic1",
+          "options": Object {
+            "description": undefined,
+            "order": 3,
+            "showInSelector": true,
+          },
+          "type": "basic",
+        },
+        Object {
+          "name": "oidc2",
+          "options": Object {
+            "description": undefined,
+            "order": 4,
+            "showInSelector": true,
+          },
+          "type": "oidc",
+        },
+      ]
+    `);
   });
 });
diff --git a/x-pack/plugins/security/server/config.ts b/x-pack/plugins/security/server/config.ts
index 2345249e94bc8..97ff7d00a4336 100644
--- a/x-pack/plugins/security/server/config.ts
+++ b/x-pack/plugins/security/server/config.ts
@@ -5,14 +5,10 @@
  */
 
 import crypto from 'crypto';
-import { Observable } from 'rxjs';
-import { map } from 'rxjs/operators';
 import { schema, Type, TypeOf } from '@kbn/config-schema';
-import { PluginInitializerContext } from '../../../../src/core/server';
+import { Logger } from '../../../../src/core/server';
 
-export type ConfigType = ReturnType<typeof createConfig$> extends Observable<infer P>
-  ? P
-  : ReturnType<typeof createConfig$>;
+export type ConfigType = ReturnType<typeof createConfig>;
 
 const providerOptionsSchema = (providerType: string, optionsSchema: Type<any>) =>
   schema.conditional(
@@ -24,6 +20,114 @@ const providerOptionsSchema = (providerType: string, optionsSchema: Type<any>) =
     schema.never()
   );
 
+type ProvidersCommonConfigType = Record<
+  'enabled' | 'showInSelector' | 'order' | 'description',
+  Type<any>
+>;
+function getCommonProviderSchemaProperties(overrides: Partial<ProvidersCommonConfigType> = {}) {
+  return {
+    enabled: schema.boolean({ defaultValue: true }),
+    showInSelector: schema.boolean({ defaultValue: true }),
+    order: schema.number({ min: 0 }),
+    description: schema.maybe(schema.string()),
+    ...overrides,
+  };
+}
+
+function getUniqueProviderSchema(
+  providerType: string,
+  overrides?: Partial<ProvidersCommonConfigType>
+) {
+  return schema.maybe(
+    schema.recordOf(schema.string(), schema.object(getCommonProviderSchemaProperties(overrides)), {
+      validate(config) {
+        if (Object.values(config).filter(provider => provider.enabled).length > 1) {
+          return `Only one "${providerType}" provider can be configured.`;
+        }
+      },
+    })
+  );
+}
+
+type ProvidersConfigType = TypeOf<typeof providersConfigSchema>;
+const providersConfigSchema = schema.object(
+  {
+    basic: getUniqueProviderSchema('basic', {
+      description: schema.maybe(
+        schema.any({
+          validate: () => '`basic` provider does not support custom description.',
+        })
+      ),
+      showInSelector: schema.boolean({
+        defaultValue: true,
+        validate: value => {
+          if (!value) {
+            return '`basic` provider only supports `true` in `showInSelector`.';
+          }
+        },
+      }),
+    }),
+    token: getUniqueProviderSchema('token', {
+      description: schema.maybe(
+        schema.any({
+          validate: () => '`token` provider does not support custom description.',
+        })
+      ),
+      showInSelector: schema.boolean({
+        defaultValue: true,
+        validate: value => {
+          if (!value) {
+            return '`token` provider only supports `true` in `showInSelector`.';
+          }
+        },
+      }),
+    }),
+    kerberos: getUniqueProviderSchema('kerberos'),
+    pki: getUniqueProviderSchema('pki'),
+    saml: schema.maybe(
+      schema.recordOf(
+        schema.string(),
+        schema.object({
+          ...getCommonProviderSchemaProperties(),
+          realm: schema.string(),
+          maxRedirectURLSize: schema.byteSize({ defaultValue: '2kb' }),
+        })
+      )
+    ),
+    oidc: schema.maybe(
+      schema.recordOf(
+        schema.string(),
+        schema.object({ ...getCommonProviderSchemaProperties(), realm: schema.string() })
+      )
+    ),
+  },
+  {
+    validate(config) {
+      const checks = { sameOrder: new Map<number, string>(), sameName: new Map<string, string>() };
+      for (const [providerType, providerGroup] of Object.entries(config)) {
+        for (const [providerName, { enabled, order }] of Object.entries(providerGroup ?? {})) {
+          if (!enabled) {
+            continue;
+          }
+
+          const providerPath = `xpack.security.authc.providers.${providerType}.${providerName}`;
+          const providerWithSameOrderPath = checks.sameOrder.get(order);
+          if (providerWithSameOrderPath) {
+            return `Found multiple providers configured with the same order "${order}": [${providerWithSameOrderPath}, ${providerPath}]`;
+          }
+          checks.sameOrder.set(order, providerPath);
+
+          const providerWithSameName = checks.sameName.get(providerName);
+          if (providerWithSameName) {
+            return `Found multiple providers configured with the same name "${providerName}": [${providerWithSameName}, ${providerPath}]`;
+          }
+          checks.sameName.set(providerName, providerPath);
+        }
+      }
+    },
+  }
+);
+
 export const ConfigSchema = schema.object({
   enabled: schema.boolean({ defaultValue: true }),
   loginAssistanceMessage: schema.string({ defaultValue: '' }),
@@ -40,7 +144,17 @@ export const ConfigSchema = schema.object({
   }),
   secureCookies: schema.boolean({ defaultValue: false }),
   authc: schema.object({
-    providers: schema.arrayOf(schema.string(), { defaultValue: ['basic'], minSize: 1 }),
+    selector: schema.object({ enabled: schema.maybe(schema.boolean()) }),
+    providers: schema.oneOf([schema.arrayOf(schema.string()), providersConfigSchema], {
+      defaultValue: {
+        basic: { basic: { enabled: true, showInSelector: true, order: 0, description: undefined } },
+        token: undefined,
+        saml: undefined,
+        oidc: undefined,
+        pki: undefined,
+        kerberos: undefined,
+      },
+    }),
     oidc: providerOptionsSchema('oidc', schema.object({ realm: schema.string() })),
     saml: providerOptionsSchema(
       'saml',
@@ -60,42 +174,96 @@ export const ConfigSchema = schema.object({
   }),
 });
 
-export function createConfig$(context: PluginInitializerContext, isTLSEnabled: boolean) {
-  return context.config.create<TypeOf<typeof ConfigSchema>>().pipe(
-    map(config => {
-      const logger = context.logger.get('config');
+export function createConfig(
+  config: TypeOf<typeof ConfigSchema>,
+  logger: Logger,
+  { isTLSEnabled }: { isTLSEnabled: boolean }
+) {
+  let encryptionKey = config.encryptionKey;
+  if (encryptionKey === undefined) {
+    logger.warn(
+      'Generating a random key for xpack.security.encryptionKey. To prevent sessions from being invalidated on ' +
+        'restart, please set xpack.security.encryptionKey in kibana.yml'
+    );
 
-      let encryptionKey = config.encryptionKey;
-      if (encryptionKey === undefined) {
-        logger.warn(
-          'Generating a random key for xpack.security.encryptionKey. To prevent sessions from being invalidated on ' +
-            'restart, please set xpack.security.encryptionKey in kibana.yml'
-        );
+    encryptionKey = crypto.randomBytes(16).toString('hex');
+  }
 
-        encryptionKey = crypto.randomBytes(16).toString('hex');
-      }
+  let secureCookies = config.secureCookies;
+  if (!isTLSEnabled) {
+    if (secureCookies) {
+      logger.warn(
+        'Using secure cookies, but SSL is not enabled inside Kibana. SSL must be configured outside of Kibana to ' +
+          'function properly.'
+      );
+    } else {
+      logger.warn(
+        'Session cookies will be transmitted over insecure connections. This is not recommended.'
+      );
+    }
+  } else if (!secureCookies) {
+    secureCookies = true;
+  }
 
-      let secureCookies = config.secureCookies;
-      if (!isTLSEnabled) {
-        if (secureCookies) {
-          logger.warn(
-            'Using secure cookies, but SSL is not enabled inside Kibana. SSL must be configured outside of Kibana to ' +
-              'function properly.'
-          );
-        } else {
-          logger.warn(
-            'Session cookies will be transmitted over insecure connections. This is not recommended.'
-          );
-        }
-      } else if (!secureCookies) {
-        secureCookies = true;
+  const isUsingLegacyProvidersFormat = Array.isArray(config.authc.providers);
+  const providers = (isUsingLegacyProvidersFormat
+    ? [...new Set(config.authc.providers as Array<keyof ProvidersConfigType>)].reduce(
+        (legacyProviders, providerType, order) => {
+          legacyProviders[providerType] = {
+            [providerType]:
+              providerType === 'saml' || providerType === 'oidc'
+                ? { enabled: true, showInSelector: true, order, ...config.authc[providerType] }
+                : { enabled: true, showInSelector: true, order },
+          };
+          return legacyProviders;
+        },
+        {} as Record<string, unknown>
+      )
+    : config.authc.providers) as ProvidersConfigType;
+
+  // Remove disabled providers and sort the rest.
+  const sortedProviders: Array<{
+    type: keyof ProvidersConfigType;
+    name: string;
+    options: { order: number; showInSelector: boolean; description?: string };
+  }> = [];
+  for (const [type, providerGroup] of Object.entries(providers)) {
+    for (const [name, { enabled, showInSelector, order, description }] of Object.entries(
+      providerGroup ?? {}
+    )) {
+      if (!enabled) {
+        delete providerGroup![name];
+      } else {
+        sortedProviders.push({
+          type: type as any,
+          name,
+          options: { order, showInSelector, description },
+        });
       }
+    }
+  }
 
-      return {
-        ...config,
-        encryptionKey,
-        secureCookies,
-      };
-    })
+  sortedProviders.sort(({ options: { order: orderA } }, { options: { order: orderB } }) =>
+    orderA < orderB ? -1 : orderA > orderB ? 1 : 0
   );
+
+  // We enable Login Selector by default if a) it's not explicitly disabled, b) new config
+  // format of providers is used and c) we have more than one provider enabled.
+  const isLoginSelectorEnabled =
+    typeof config.authc.selector.enabled === 'boolean'
+      ? config.authc.selector.enabled
+      : !isUsingLegacyProvidersFormat &&
+        sortedProviders.filter(provider => provider.options.showInSelector).length > 1;
+
+  return {
+    ...config,
+    authc: {
+      selector: { ...config.authc.selector, enabled: isLoginSelectorEnabled },
+      providers,
+      sortedProviders: Object.freeze(sortedProviders),
+      http: config.authc.http,
+    },
+    encryptionKey,
+    secureCookies,
+  };
 }
diff --git a/x-pack/plugins/security/server/index.ts b/x-pack/plugins/security/server/index.ts
index 0b17f0554fac8..caeb06e6f3153 100644
--- a/x-pack/plugins/security/server/index.ts
+++ b/x-pack/plugins/security/server/index.ts
@@ -23,6 +23,8 @@ export {
   CreateAPIKeyResult,
   InvalidateAPIKeyParams,
   InvalidateAPIKeyResult,
+  SAMLLogin,
+  OIDCLogin,
 } from './authentication';
 export { SecurityPluginSetup };
 export { AuthenticatedUser } from '../common/model';
@@ -32,11 +34,29 @@ export const config: PluginConfigDescriptor<TypeOf<typeof ConfigSchema>> = {
   deprecations: ({ rename, unused }) => [
     rename('sessionTimeout', 'session.idleTimeout'),
     unused('authorization.legacyFallback.enabled'),
+    // Deprecation warning for the old array-based format of `xpack.security.authc.providers`.
     (settings, fromPath, log) => {
-      const hasProvider = (provider: string) =>
-        settings?.xpack?.security?.authc?.providers?.includes(provider) ?? false;
+      if (Array.isArray(settings?.xpack?.security?.authc?.providers)) {
+        log(
+          'Defining `xpack.security.authc.providers` as an array of provider types is deprecated. Use extended `object` format instead.'
+        );
+      }
+
+      return settings;
+    },
+    (settings, fromPath, log) => {
+      const hasProviderType = (providerType: string) => {
+        const providers = settings?.xpack?.security?.authc?.providers;
+        if (Array.isArray(providers)) {
+          return providers.includes(providerType);
+        }
+
+        return Object.values(providers?.[providerType] || {}).some(
+          provider => (provider as { enabled: boolean | undefined })?.enabled !== false
+        );
+      };
 
-      if (hasProvider('basic') && hasProvider('token')) {
+      if (hasProviderType('basic') && hasProviderType('token')) {
         log(
           'Enabling both `basic` and `token` authentication providers in `xpack.security.authc.providers` is deprecated. Login page will only use `token` provider.'
         );
diff --git a/x-pack/plugins/security/server/plugin.test.ts b/x-pack/plugins/security/server/plugin.test.ts
index a011f7e7be11e..a23c826b32fbd 100644
--- a/x-pack/plugins/security/server/plugin.test.ts
+++ b/x-pack/plugins/security/server/plugin.test.ts
@@ -26,6 +26,7 @@ describe('Security Plugin', () => {
           lifespan: null,
         },
         authc: {
+          selector: { enabled: false },
           providers: ['saml', 'token'],
           saml: { realm: 'saml1', maxRedirectURLSize: new ByteSizeValue(2048) },
           http: { enabled: true, autoSchemesEnabled: true, schemes: ['apikey'] },
@@ -49,9 +50,6 @@ describe('Security Plugin', () => {
       await expect(plugin.setup(mockCoreSetup, mockDependencies)).resolves.toMatchInlineSnapshot(`
               Object {
                 "__legacyCompat": Object {
-                  "config": Object {
-                    "secureCookies": true,
-                  },
                   "license": Object {
                     "features$": Observable {
                       "_isScalar": false,
@@ -78,7 +76,7 @@ describe('Security Plugin', () => {
                   "invalidateAPIKey": [Function],
                   "invalidateAPIKeyAsInternalUser": [Function],
                   "isAuthenticated": [Function],
-                  "isProviderEnabled": [Function],
+                  "isProviderTypeEnabled": [Function],
                   "login": [Function],
                   "logout": [Function],
                 },
diff --git a/x-pack/plugins/security/server/plugin.ts b/x-pack/plugins/security/server/plugin.ts
index 13300ee55eba0..032d231fe798f 100644
--- a/x-pack/plugins/security/server/plugin.ts
+++ b/x-pack/plugins/security/server/plugin.ts
@@ -5,13 +5,13 @@
  */
 
 import { combineLatest } from 'rxjs';
-import { first } from 'rxjs/operators';
+import { first, map } from 'rxjs/operators';
+import { TypeOf } from '@kbn/config-schema';
 import {
   ICustomClusterClient,
   CoreSetup,
   Logger,
   PluginInitializerContext,
-  RecursiveReadonly,
 } from '../../../../src/core/server';
 import { deepFreeze } from '../../../../src/core/utils';
 import { SpacesPluginSetup } from '../../spaces/server';
@@ -20,7 +20,7 @@ import { LicensingPluginSetup } from '../../licensing/server';
 
 import { Authentication, setupAuthentication } from './authentication';
 import { Authorization, setupAuthorization } from './authorization';
-import { createConfig$ } from './config';
+import { ConfigSchema, createConfig } from './config';
 import { defineRoutes } from './routes';
 import { SecurityLicenseService, SecurityLicense } from '../common/licensing';
 import { setupSavedObjects } from './saved_objects';
@@ -65,7 +65,6 @@ export interface SecurityPluginSetup {
     registerLegacyAPI: (legacyAPI: LegacyAPI) => void;
     registerPrivilegesWithCluster: () => void;
     license: SecurityLicense;
-    config: RecursiveReadonly<{ secureCookies: boolean }>;
   };
 }
 
@@ -106,7 +105,13 @@ export class Plugin {
 
   public async setup(core: CoreSetup, { features, licensing }: PluginSetupDependencies) {
     const [config, legacyConfig] = await combineLatest([
-      createConfig$(this.initializerContext, core.http.isTlsEnabled),
+      this.initializerContext.config.create<TypeOf<typeof ConfigSchema>>().pipe(
+        map(rawConfig =>
+          createConfig(rawConfig, this.initializerContext.logger.get('config'), {
+            isTLSEnabled: core.http.isTlsEnabled,
+          })
+        )
+      ),
       this.initializerContext.config.legacy.globalConfig$,
     ])
       .pipe(first())
@@ -183,11 +188,6 @@ export class Plugin {
         registerPrivilegesWithCluster: async () => await authz.registerPrivilegesWithCluster(),
 
         license,
-
-        // We should stop exposing this config as soon as only new platform plugin consumes it.
-        // This is only currently required because we use legacy code to inject this as metadata
-        // for consumption by public code in the new platform.
-        config: { secureCookies: config.secureCookies },
       },
     });
   }
diff --git a/x-pack/plugins/security/server/routes/authentication/basic.test.ts b/x-pack/plugins/security/server/routes/authentication/basic.test.ts
index cd3b871671551..3c114978f26d2 100644
--- a/x-pack/plugins/security/server/routes/authentication/basic.test.ts
+++ b/x-pack/plugins/security/server/routes/authentication/basic.test.ts
@@ -29,7 +29,7 @@ describe('Basic authentication routes', () => {
     router = routeParamsMock.router;
 
     authc = routeParamsMock.authc;
-    authc.isProviderEnabled.mockImplementation(provider => provider === 'basic');
+    authc.isProviderTypeEnabled.mockImplementation(provider => provider === 'basic');
 
     mockContext = ({
       licensing: {
@@ -108,7 +108,7 @@ describe('Basic authentication routes', () => {
       expect(response.status).toBe(500);
       expect(response.payload).toEqual(unhandledException);
       expect(authc.login).toHaveBeenCalledWith(mockRequest, {
-        provider: 'basic',
+        provider: { type: 'basic' },
         value: { username: 'user', password: 'password' },
       });
     });
@@ -122,7 +122,7 @@ describe('Basic authentication routes', () => {
       expect(response.status).toBe(401);
       expect(response.payload).toEqual(failureReason);
       expect(authc.login).toHaveBeenCalledWith(mockRequest, {
-        provider: 'basic',
+        provider: { type: 'basic' },
         value: { username: 'user', password: 'password' },
       });
     });
@@ -135,7 +135,7 @@ describe('Basic authentication routes', () => {
       expect(response.status).toBe(401);
       expect(response.payload).toEqual('Unauthorized');
       expect(authc.login).toHaveBeenCalledWith(mockRequest, {
-        provider: 'basic',
+        provider: { type: 'basic' },
         value: { username: 'user', password: 'password' },
       });
     });
@@ -149,14 +149,14 @@ describe('Basic authentication routes', () => {
         expect(response.status).toBe(204);
         expect(response.payload).toBeUndefined();
         expect(authc.login).toHaveBeenCalledWith(mockRequest, {
-          provider: 'basic',
+          provider: { type: 'basic' },
           value: { username: 'user', password: 'password' },
         });
       });
 
       it('prefers `token` authentication provider if it is enabled', async () => {
         authc.login.mockResolvedValue(AuthenticationResult.succeeded(mockAuthenticatedUser()));
-        authc.isProviderEnabled.mockImplementation(
+        authc.isProviderTypeEnabled.mockImplementation(
           provider => provider === 'token' || provider === 'basic'
         );
 
@@ -165,7 +165,7 @@ describe('Basic authentication routes', () => {
         expect(response.status).toBe(204);
         expect(response.payload).toBeUndefined();
         expect(authc.login).toHaveBeenCalledWith(mockRequest, {
-          provider: 'token',
+          provider: { type: 'token' },
           value: { username: 'user', password: 'password' },
         });
       });
diff --git a/x-pack/plugins/security/server/routes/authentication/basic.ts b/x-pack/plugins/security/server/routes/authentication/basic.ts
index db36e45fc07e8..ccc6a8df24d6e 100644
--- a/x-pack/plugins/security/server/routes/authentication/basic.ts
+++ b/x-pack/plugins/security/server/routes/authentication/basic.ts
@@ -26,9 +26,10 @@ export function defineBasicRoutes({ router, authc, config }: RouteDefinitionPara
     },
     createLicensedRouteHandler(async (context, request, response) => {
       // We should prefer `token` over `basic` if possible.
-      const loginAttempt = authc.isProviderEnabled('token')
-        ? { provider: 'token', value: request.body }
-        : { provider: 'basic', value: request.body };
+      const loginAttempt = {
+        provider: { type: authc.isProviderTypeEnabled('token') ? 'token' : 'basic' },
+        value: request.body,
+      };
 
       try {
         const authenticationResult = await authc.login(request, loginAttempt);
diff --git a/x-pack/plugins/security/server/routes/authentication/common.test.ts b/x-pack/plugins/security/server/routes/authentication/common.test.ts
index b611ffffee935..e2f9593bc09ee 100644
--- a/x-pack/plugins/security/server/routes/authentication/common.test.ts
+++ b/x-pack/plugins/security/server/routes/authentication/common.test.ts
@@ -13,7 +13,13 @@ import {
   RouteConfig,
 } from '../../../../../../src/core/server';
 import { LICENSE_CHECK_STATE } from '../../../../licensing/server';
-import { Authentication, DeauthenticationResult } from '../../authentication';
+import {
+  Authentication,
+  AuthenticationResult,
+  DeauthenticationResult,
+  OIDCLogin,
+  SAMLLogin,
+} from '../../authentication';
 import { defineCommonRoutes } from './common';
 
 import { httpServerMock } from '../../../../../../src/core/server/mocks';
@@ -172,4 +178,260 @@ describe('Common authentication routes', () => {
       expect(authc.getCurrentUser).toHaveBeenCalledWith(mockRequest);
     });
   });
+
+  describe('login_with', () => {
+    let routeHandler: RequestHandler<any, any, any>;
+    let routeConfig: RouteConfig<any, any, any, any>;
+    beforeEach(() => {
+      const [acsRouteConfig, acsRouteHandler] = router.post.mock.calls.find(
+        ([{ path }]) => path === '/internal/security/login_with'
+      )!;
+
+      routeConfig = acsRouteConfig;
+      routeHandler = acsRouteHandler;
+    });
+
+    it('correctly defines route.', () => {
+      expect(routeConfig.options).toEqual({ authRequired: false });
+      expect(routeConfig.validate).toEqual({
+        body: expect.any(Type),
+        query: undefined,
+        params: undefined,
+      });
+
+      const bodyValidator = (routeConfig.validate as any).body as Type<any>;
+      expect(
+        bodyValidator.validate({
+          providerType: 'saml',
+          providerName: 'saml1',
+          currentURL: '/some-url',
+        })
+      ).toEqual({
+        providerType: 'saml',
+        providerName: 'saml1',
+        currentURL: '/some-url',
+      });
+
+      expect(
+        bodyValidator.validate({
+          providerType: 'saml',
+          providerName: 'saml1',
+          currentURL: '',
+        })
+      ).toEqual({
+        providerType: 'saml',
+        providerName: 'saml1',
+        currentURL: '',
+      });
+
+      expect(() => bodyValidator.validate({})).toThrowErrorMatchingInlineSnapshot(
+        `"[providerType]: expected value of type [string] but got [undefined]"`
+      );
+
+      expect(() =>
+        bodyValidator.validate({ providerType: 'saml' })
+      ).toThrowErrorMatchingInlineSnapshot(
+        `"[providerName]: expected value of type [string] but got [undefined]"`
+      );
+
+      expect(() =>
+        bodyValidator.validate({ providerType: 'saml', providerName: 'saml1' })
+      ).toThrowErrorMatchingInlineSnapshot(
+        `"[currentURL]: expected value of type [string] but got [undefined]"`
+      );
+
+      expect(() =>
+        bodyValidator.validate({
+          providerType: 'saml',
+          providerName: 'saml1',
+          currentURL: '/some-url',
+          UnknownArg: 'arg',
+        })
+      ).toThrowErrorMatchingInlineSnapshot(`"[UnknownArg]: definition for this key is missing"`);
+    });
+
+    it('returns 500 if login throws unhandled exception.', async () => {
+      const unhandledException = new Error('Something went wrong.');
+      authc.login.mockRejectedValue(unhandledException);
+
+      const request = httpServerMock.createKibanaRequest({
+        body: { providerType: 'saml', providerName: 'saml1', currentURL: '/some-url' },
+      });
+
+      await expect(routeHandler(mockContext, request, kibanaResponseFactory)).resolves.toEqual({
+        status: 500,
+        payload: 'Internal Error',
+        options: {},
+      });
+    });
+
+    it('returns 401 if login fails.', async () => {
+      const failureReason = new Error('Something went wrong.');
+      authc.login.mockResolvedValue(
+        AuthenticationResult.failed(failureReason, {
+          authResponseHeaders: { 'WWW-Something': 'something' },
+        })
+      );
+
+      const request = httpServerMock.createKibanaRequest({
+        body: { providerType: 'saml', providerName: 'saml1', currentURL: '/some-url' },
+      });
+
+      await expect(routeHandler(mockContext, request, kibanaResponseFactory)).resolves.toEqual({
+        status: 401,
+        payload: failureReason,
+        options: { body: failureReason, headers: { 'WWW-Something': 'something' } },
+      });
+    });
+
+    it('returns 401 if login is not handled.', async () => {
+      authc.login.mockResolvedValue(AuthenticationResult.notHandled());
+
+      const request = httpServerMock.createKibanaRequest({
+        body: { providerType: 'saml', providerName: 'saml1', currentURL: '/some-url' },
+      });
+
+      await expect(routeHandler(mockContext, request, kibanaResponseFactory)).resolves.toEqual({
+        status: 401,
+        payload: 'Unauthorized',
+        options: {},
+      });
+    });
+
+    it('returns redirect location from authentication result if any.', async () => {
+      authc.login.mockResolvedValue(AuthenticationResult.redirectTo('http://redirect-to/path'));
+
+      const request = httpServerMock.createKibanaRequest({
+        body: { providerType: 'saml', providerName: 'saml1', currentURL: '/some-url' },
+      });
+
+      await expect(routeHandler(mockContext, request, kibanaResponseFactory)).resolves.toEqual({
+        status: 200,
+        payload: { location: 'http://redirect-to/path' },
+        options: { body: { location: 'http://redirect-to/path' } },
+      });
+    });
+
+    it('returns location extracted from `next` parameter if authentication result does not specify any.', async () => {
+      authc.login.mockResolvedValue(AuthenticationResult.succeeded(mockAuthenticatedUser()));
+
+      const request = httpServerMock.createKibanaRequest({
+        body: {
+          providerType: 'saml',
+          providerName: 'saml1',
+          currentURL: 'https://kibana.com/?next=/mock-server-basepath/some-url#/app/nav',
+        },
+      });
+
+      await expect(routeHandler(mockContext, request, kibanaResponseFactory)).resolves.toEqual({
+        status: 200,
+        payload: { location: '/mock-server-basepath/some-url#/app/nav' },
+        options: { body: { location: '/mock-server-basepath/some-url#/app/nav' } },
+      });
+    });
+
+    it('returns base path if location cannot be extracted from `currentURL` parameter and authentication result does not specify any.', async () => {
+      authc.login.mockResolvedValue(AuthenticationResult.succeeded(mockAuthenticatedUser()));
+
+      const invalidCurrentURLs = [
+        'https://kibana.com/?next=https://evil.com/mock-server-basepath/some-url#/app/nav',
+        'https://kibana.com/?next=https://kibana.com:9000/mock-server-basepath/some-url#/app/nav',
+        'https://kibana.com/?next=kibana.com/mock-server-basepath/some-url#/app/nav',
+        'https://kibana.com/?next=//mock-server-basepath/some-url#/app/nav',
+        'https://kibana.com/?next=../mock-server-basepath/some-url#/app/nav',
+        'https://kibana.com/?next=/some-url#/app/nav',
+        '',
+      ];
+
+      for (const currentURL of invalidCurrentURLs) {
+        const request = httpServerMock.createKibanaRequest({
+          body: { providerType: 'saml', providerName: 'saml1', currentURL },
+        });
+
+        await expect(routeHandler(mockContext, request, kibanaResponseFactory)).resolves.toEqual({
+          status: 200,
+          payload: { location: '/mock-server-basepath/' },
+          options: { body: { location: '/mock-server-basepath/' } },
+        });
+      }
+    });
+
+    it('correctly performs SAML login.', async () => {
+      authc.login.mockResolvedValue(AuthenticationResult.redirectTo('http://redirect-to/path'));
+
+      const request = httpServerMock.createKibanaRequest({
+        body: {
+          providerType: 'saml',
+          providerName: 'saml1',
+          currentURL: 'https://kibana.com/?next=/mock-server-basepath/some-url#/app/nav',
+        },
+      });
+
+      await expect(routeHandler(mockContext, request, kibanaResponseFactory)).resolves.toEqual({
+        status: 200,
+        payload: { location: 'http://redirect-to/path' },
+        options: { body: { location: 'http://redirect-to/path' } },
+      });
+
+      expect(authc.login).toHaveBeenCalledTimes(1);
+      expect(authc.login).toHaveBeenCalledWith(request, {
+        provider: { name: 'saml1' },
+        value: {
+          type: SAMLLogin.LoginInitiatedByUser,
+          redirectURLPath: '/mock-server-basepath/some-url',
+          redirectURLFragment: '#/app/nav',
+        },
+      });
+    });
+
+    it('correctly performs OIDC login.', async () => {
+      authc.login.mockResolvedValue(AuthenticationResult.redirectTo('http://redirect-to/path'));
+
+      const request = httpServerMock.createKibanaRequest({
+        body: {
+          providerType: 'oidc',
+          providerName: 'oidc1',
+          currentURL: 'https://kibana.com/?next=/mock-server-basepath/some-url#/app/nav',
+        },
+      });
+
+      await expect(routeHandler(mockContext, request, kibanaResponseFactory)).resolves.toEqual({
+        status: 200,
+        payload: { location: 'http://redirect-to/path' },
+        options: { body: { location: 'http://redirect-to/path' } },
+      });
+
+      expect(authc.login).toHaveBeenCalledTimes(1);
+      expect(authc.login).toHaveBeenCalledWith(request, {
+        provider: { name: 'oidc1' },
+        value: {
+          type: OIDCLogin.LoginInitiatedByUser,
+          redirectURLPath: '/mock-server-basepath/some-url',
+        },
+      });
+    });
+
+    it('correctly performs generic login.', async () => {
+      authc.login.mockResolvedValue(AuthenticationResult.redirectTo('http://redirect-to/path'));
+
+      const request = httpServerMock.createKibanaRequest({
+        body: {
+          providerType: 'some-type',
+          providerName: 'some-name',
+          currentURL: 'https://kibana.com/?next=/mock-server-basepath/some-url#/app/nav',
+        },
+      });
+
+      await expect(routeHandler(mockContext, request, kibanaResponseFactory)).resolves.toEqual({
+        status: 200,
+        payload: { location: 'http://redirect-to/path' },
+        options: { body: { location: 'http://redirect-to/path' } },
+      });
+
+      expect(authc.login).toHaveBeenCalledTimes(1);
+      expect(authc.login).toHaveBeenCalledWith(request, {
+        provider: { name: 'some-name' },
+      });
+    });
+  });
 });
diff --git a/x-pack/plugins/security/server/routes/authentication/common.ts b/x-pack/plugins/security/server/routes/authentication/common.ts
index 19d197b63f540..abab67c9cd1d2 100644
--- a/x-pack/plugins/security/server/routes/authentication/common.ts
+++ b/x-pack/plugins/security/server/routes/authentication/common.ts
@@ -5,9 +5,14 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { canRedirectRequest } from '../../authentication';
+import { parseNext } from '../../../common/parse_next';
+import { canRedirectRequest, OIDCLogin, SAMLLogin } from '../../authentication';
 import { wrapIntoCustomErrorResponse } from '../../errors';
 import { createLicensedRouteHandler } from '../licensed_route_handler';
+import {
+  OIDCAuthenticationProvider,
+  SAMLAuthenticationProvider,
+} from '../../authentication/providers';
 import { RouteDefinitionParams } from '..';
 
 /**
@@ -71,4 +76,63 @@ export function defineCommonRoutes({ router, authc, basePath, logger }: RouteDef
       })
     );
   }
+
+  function getLoginAttemptForProviderType(providerType: string, redirectURL: string) {
+    const [redirectURLPath] = redirectURL.split('#');
+    const redirectURLFragment =
+      redirectURL.length > redirectURLPath.length
+        ? redirectURL.substring(redirectURLPath.length)
+        : '';
+
+    if (providerType === SAMLAuthenticationProvider.type) {
+      return { type: SAMLLogin.LoginInitiatedByUser, redirectURLPath, redirectURLFragment };
+    }
+
+    if (providerType === OIDCAuthenticationProvider.type) {
+      return { type: OIDCLogin.LoginInitiatedByUser, redirectURLPath };
+    }
+
+    return undefined;
+  }
+
+  router.post(
+    {
+      path: '/internal/security/login_with',
+      validate: {
+        body: schema.object({
+          providerType: schema.string(),
+          providerName: schema.string(),
+          currentURL: schema.string(),
+        }),
+      },
+      options: { authRequired: false },
+    },
+    createLicensedRouteHandler(async (context, request, response) => {
+      const { providerType, providerName, currentURL } = request.body;
+      logger.info(`Logging in with provider "${providerName}" (${providerType})`);
+
+      const redirectURL = parseNext(currentURL, basePath.serverBasePath);
+      try {
+        const authenticationResult = await authc.login(request, {
+          provider: { name: providerName },
+          value: getLoginAttemptForProviderType(providerType, redirectURL),
+        });
+
+        if (authenticationResult.redirected() || authenticationResult.succeeded()) {
+          return response.ok({
+            body: { location: authenticationResult.redirectURL || redirectURL },
+            headers: authenticationResult.authResponseHeaders,
+          });
+        }
+
+        return response.unauthorized({
+          body: authenticationResult.error,
+          headers: authenticationResult.authResponseHeaders,
+        });
+      } catch (err) {
+        logger.error(err);
+        return response.internalError();
+      }
+    })
+  );
 }
diff --git a/x-pack/plugins/security/server/routes/authentication/index.ts b/x-pack/plugins/security/server/routes/authentication/index.ts
index a774edfb4ab2c..f3082b089faf5 100644
--- a/x-pack/plugins/security/server/routes/authentication/index.ts
+++ b/x-pack/plugins/security/server/routes/authentication/index.ts
@@ -27,15 +27,15 @@ export function defineAuthenticationRoutes(params: RouteDefinitionParams) {
   defineSessionRoutes(params);
   defineCommonRoutes(params);
 
-  if (params.authc.isProviderEnabled('basic') || params.authc.isProviderEnabled('token')) {
+  if (params.authc.isProviderTypeEnabled('basic') || params.authc.isProviderTypeEnabled('token')) {
     defineBasicRoutes(params);
   }
 
-  if (params.authc.isProviderEnabled('saml')) {
+  if (params.authc.isProviderTypeEnabled('saml')) {
     defineSAMLRoutes(params);
   }
 
-  if (params.authc.isProviderEnabled('oidc')) {
+  if (params.authc.isProviderTypeEnabled('oidc')) {
     defineOIDCRoutes(params);
   }
 }
diff --git a/x-pack/plugins/security/server/routes/authentication/oidc.ts b/x-pack/plugins/security/server/routes/authentication/oidc.ts
index 96c36af20e982..d325a453af9d1 100644
--- a/x-pack/plugins/security/server/routes/authentication/oidc.ts
+++ b/x-pack/plugins/security/server/routes/authentication/oidc.ts
@@ -7,11 +7,14 @@
 import { schema } from '@kbn/config-schema';
 import { i18n } from '@kbn/i18n';
 import { KibanaRequest, KibanaResponseFactory } from '../../../../../../src/core/server';
-import { OIDCAuthenticationFlow } from '../../authentication';
+import { OIDCLogin } from '../../authentication';
 import { createCustomResourceResponse } from '.';
 import { createLicensedRouteHandler } from '../licensed_route_handler';
 import { wrapIntoCustomErrorResponse } from '../../errors';
-import { ProviderLoginAttempt } from '../../authentication/providers/oidc';
+import {
+  OIDCAuthenticationProvider,
+  ProviderLoginAttempt,
+} from '../../authentication/providers/oidc';
 import { RouteDefinitionParams } from '..';
 
 /**
@@ -118,7 +121,7 @@ export function defineOIDCRoutes({ router, logger, authc, csp, basePath }: Route
         let loginAttempt: ProviderLoginAttempt | undefined;
         if (request.query.authenticationResponseURI) {
           loginAttempt = {
-            flow: OIDCAuthenticationFlow.Implicit,
+            type: OIDCLogin.LoginWithImplicitFlow,
             authenticationResponseURI: request.query.authenticationResponseURI,
           };
         } else if (request.query.code || request.query.error) {
@@ -133,7 +136,7 @@ export function defineOIDCRoutes({ router, logger, authc, csp, basePath }: Route
           // failed) authentication from an OpenID Connect Provider during authorization code authentication flow.
           // See more details at https://openid.net/specs/openid-connect-core-1_0.html#CodeFlowAuth.
           loginAttempt = {
-            flow: OIDCAuthenticationFlow.AuthorizationCode,
+            type: OIDCLogin.LoginWithAuthorizationCodeFlow,
             //  We pass the path only as we can't be sure of the full URL and Elasticsearch doesn't need it anyway.
             authenticationResponseURI: request.url.path!,
           };
@@ -145,7 +148,7 @@ export function defineOIDCRoutes({ router, logger, authc, csp, basePath }: Route
           // An HTTP GET request with a query parameter named `iss` as part of a 3rd party initiated authentication.
           // See more details at https://openid.net/specs/openid-connect-core-1_0.html#ThirdPartyInitiatedLogin
           loginAttempt = {
-            flow: OIDCAuthenticationFlow.InitiatedBy3rdParty,
+            type: OIDCLogin.LoginInitiatedBy3rdParty,
             iss: request.query.iss,
             loginHint: request.query.login_hint,
           };
@@ -181,7 +184,7 @@ export function defineOIDCRoutes({ router, logger, authc, csp, basePath }: Route
             { unknowns: 'allow' }
           ),
         },
-        options: { authRequired: false },
+        options: { authRequired: false, xsrfRequired: false },
       },
       createLicensedRouteHandler(async (context, request, response) => {
         const serverBasePath = basePath.serverBasePath;
@@ -193,7 +196,7 @@ export function defineOIDCRoutes({ router, logger, authc, csp, basePath }: Route
         }
 
         return performOIDCLogin(request, response, {
-          flow: OIDCAuthenticationFlow.InitiatedBy3rdParty,
+          type: OIDCLogin.LoginInitiatedBy3rdParty,
           iss: request.body.iss,
           loginHint: request.body.login_hint,
         });
@@ -224,7 +227,7 @@ export function defineOIDCRoutes({ router, logger, authc, csp, basePath }: Route
     },
     createLicensedRouteHandler(async (context, request, response) => {
       return performOIDCLogin(request, response, {
-        flow: OIDCAuthenticationFlow.InitiatedBy3rdParty,
+        type: OIDCLogin.LoginInitiatedBy3rdParty,
         iss: request.query.iss,
         loginHint: request.query.login_hint,
       });
@@ -240,7 +243,7 @@ export function defineOIDCRoutes({ router, logger, authc, csp, basePath }: Route
       // We handle the fact that the user might get redirected to Kibana while already having a session
       // Return an error notifying the user they are already logged in.
       const authenticationResult = await authc.login(request, {
-        provider: 'oidc',
+        provider: { type: OIDCAuthenticationProvider.type },
         value: loginAttempt,
       });
 
diff --git a/x-pack/plugins/security/server/routes/authentication/saml.test.ts b/x-pack/plugins/security/server/routes/authentication/saml.test.ts
index b4434715a72ba..af63dfa2f4471 100644
--- a/x-pack/plugins/security/server/routes/authentication/saml.test.ts
+++ b/x-pack/plugins/security/server/routes/authentication/saml.test.ts
@@ -5,7 +5,7 @@
  */
 
 import { Type } from '@kbn/config-schema';
-import { Authentication, AuthenticationResult, SAMLLoginStep } from '../../authentication';
+import { Authentication, AuthenticationResult, SAMLLogin } from '../../authentication';
 import { defineSAMLRoutes } from './saml';
 import { IRouter, RequestHandler, RouteConfig } from '../../../../../../src/core/server';
 
@@ -37,7 +37,7 @@ describe('SAML authentication routes', () => {
     });
 
     it('correctly defines route.', () => {
-      expect(routeConfig.options).toEqual({ authRequired: false });
+      expect(routeConfig.options).toEqual({ authRequired: false, xsrfRequired: false });
       expect(routeConfig.validate).toEqual({
         body: expect.any(Type),
         query: undefined,
@@ -84,9 +84,9 @@ describe('SAML authentication routes', () => {
       );
 
       expect(authc.login).toHaveBeenCalledWith(request, {
-        provider: 'saml',
+        provider: { type: 'saml' },
         value: {
-          step: SAMLLoginStep.SAMLResponseReceived,
+          type: SAMLLogin.LoginWithSAMLResponse,
           samlResponse: 'saml-response',
         },
       });
@@ -163,9 +163,9 @@ describe('SAML authentication routes', () => {
       );
 
       expect(authc.login).toHaveBeenCalledWith(request, {
-        provider: 'saml',
+        provider: { type: 'saml' },
         value: {
-          step: SAMLLoginStep.SAMLResponseReceived,
+          type: SAMLLogin.LoginWithSAMLResponse,
           samlResponse: 'saml-response',
         },
       });
diff --git a/x-pack/plugins/security/server/routes/authentication/saml.ts b/x-pack/plugins/security/server/routes/authentication/saml.ts
index 465ea61e12a4e..8f08f250a1c75 100644
--- a/x-pack/plugins/security/server/routes/authentication/saml.ts
+++ b/x-pack/plugins/security/server/routes/authentication/saml.ts
@@ -5,7 +5,8 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { SAMLLoginStep } from '../../authentication';
+import { SAMLLogin } from '../../authentication';
+import { SAMLAuthenticationProvider } from '../../authentication/providers';
 import { createCustomResourceResponse } from '.';
 import { RouteDefinitionParams } from '..';
 
@@ -15,7 +16,7 @@ import { RouteDefinitionParams } from '..';
 export function defineSAMLRoutes({ router, logger, authc, csp, basePath }: RouteDefinitionParams) {
   router.get(
     {
-      path: '/api/security/saml/capture-url-fragment',
+      path: '/internal/security/saml/capture-url-fragment',
       validate: false,
       options: { authRequired: false },
     },
@@ -27,7 +28,7 @@ export function defineSAMLRoutes({ router, logger, authc, csp, basePath }: Route
           <!DOCTYPE html>
           <title>Kibana SAML Login</title>
           <link rel="icon" href="data:,">
-          <script src="${basePath.serverBasePath}/api/security/saml/capture-url-fragment.js"></script>
+          <script src="${basePath.serverBasePath}/internal/security/saml/capture-url-fragment.js"></script>
         `,
           'text/html',
           csp.header
@@ -38,7 +39,7 @@ export function defineSAMLRoutes({ router, logger, authc, csp, basePath }: Route
 
   router.get(
     {
-      path: '/api/security/saml/capture-url-fragment.js',
+      path: '/internal/security/saml/capture-url-fragment.js',
       validate: false,
       options: { authRequired: false },
     },
@@ -47,7 +48,7 @@ export function defineSAMLRoutes({ router, logger, authc, csp, basePath }: Route
         createCustomResourceResponse(
           `
           window.location.replace(
-            '${basePath.serverBasePath}/api/security/saml/start?redirectURLFragment=' + encodeURIComponent(window.location.hash)
+            '${basePath.serverBasePath}/internal/security/saml/start?redirectURLFragment=' + encodeURIComponent(window.location.hash)
           );
         `,
           'text/javascript',
@@ -59,7 +60,7 @@ export function defineSAMLRoutes({ router, logger, authc, csp, basePath }: Route
 
   router.get(
     {
-      path: '/api/security/saml/start',
+      path: '/internal/security/saml/start',
       validate: {
         query: schema.object({ redirectURLFragment: schema.string() }),
       },
@@ -68,9 +69,9 @@ export function defineSAMLRoutes({ router, logger, authc, csp, basePath }: Route
     async (context, request, response) => {
       try {
         const authenticationResult = await authc.login(request, {
-          provider: 'saml',
+          provider: { type: SAMLAuthenticationProvider.type },
           value: {
-            step: SAMLLoginStep.RedirectURLFragmentCaptured,
+            type: SAMLLogin.LoginInitiatedByUser,
             redirectURLFragment: request.query.redirectURLFragment,
           },
         });
@@ -97,17 +98,14 @@ export function defineSAMLRoutes({ router, logger, authc, csp, basePath }: Route
           RelayState: schema.maybe(schema.string()),
         }),
       },
-      options: { authRequired: false },
+      options: { authRequired: false, xsrfRequired: false },
     },
     async (context, request, response) => {
       try {
-        // When authenticating using SAML we _expect_ to redirect to the SAML Identity provider.
+        // When authenticating using SAML we _expect_ to redirect to the Kibana target location.
         const authenticationResult = await authc.login(request, {
-          provider: 'saml',
-          value: {
-            step: SAMLLoginStep.SAMLResponseReceived,
-            samlResponse: request.body.SAMLResponse,
-          },
+          provider: { type: SAMLAuthenticationProvider.type },
+          value: { type: SAMLLogin.LoginWithSAMLResponse, samlResponse: request.body.SAMLResponse },
         });
 
         if (authenticationResult.redirected()) {
diff --git a/x-pack/plugins/security/server/routes/index.mock.ts b/x-pack/plugins/security/server/routes/index.mock.ts
index 0821ed8b96af9..aaefdad6c221a 100644
--- a/x-pack/plugins/security/server/routes/index.mock.ts
+++ b/x-pack/plugins/security/server/routes/index.mock.ts
@@ -11,17 +11,19 @@ import {
 } from '../../../../../src/core/server/mocks';
 import { authenticationMock } from '../authentication/index.mock';
 import { authorizationMock } from '../authorization/index.mock';
-import { ConfigSchema } from '../config';
+import { ConfigSchema, createConfig } from '../config';
 import { licenseMock } from '../../common/licensing/index.mock';
 
 export const routeDefinitionParamsMock = {
-  create: () => ({
+  create: (config: Record<string, unknown> = {}) => ({
     router: httpServiceMock.createRouter(),
     basePath: httpServiceMock.createBasePath(),
     csp: httpServiceMock.createSetupContract().csp,
     logger: loggingServiceMock.create().get(),
     clusterClient: elasticsearchServiceMock.createClusterClient(),
-    config: { ...ConfigSchema.validate({}), encryptionKey: 'some-enc-key' },
+    config: createConfig(ConfigSchema.validate(config), loggingServiceMock.create().get(), {
+      isTLSEnabled: false,
+    }),
     authc: authenticationMock.create(),
     authz: authorizationMock.create(),
     license: licenseMock.create(),
diff --git a/x-pack/plugins/security/server/routes/users/change_password.test.ts b/x-pack/plugins/security/server/routes/users/change_password.test.ts
index c2db34dc3c33c..bac40202ee6ef 100644
--- a/x-pack/plugins/security/server/routes/users/change_password.test.ts
+++ b/x-pack/plugins/security/server/routes/users/change_password.test.ts
@@ -188,7 +188,7 @@ describe('Change password', () => {
 
       expect(authc.login).toHaveBeenCalledTimes(1);
       expect(authc.login).toHaveBeenCalledWith(mockRequest, {
-        provider: 'basic',
+        provider: { name: 'basic1' },
         value: { username, password: 'new-password' },
       });
     });
@@ -196,7 +196,7 @@ describe('Change password', () => {
     it('successfully changes own password if provided old password is correct for non-basic provider.', async () => {
       const mockUser = mockAuthenticatedUser({
         username: 'user',
-        authentication_provider: 'token',
+        authentication_provider: 'token1',
       });
       authc.getCurrentUser.mockReturnValue(mockUser);
       authc.login.mockResolvedValue(AuthenticationResult.succeeded(mockUser));
@@ -215,7 +215,7 @@ describe('Change password', () => {
 
       expect(authc.login).toHaveBeenCalledTimes(1);
       expect(authc.login).toHaveBeenCalledWith(mockRequest, {
-        provider: 'token',
+        provider: { name: 'token1' },
         value: { username, password: 'new-password' },
       });
     });
diff --git a/x-pack/plugins/security/server/routes/users/change_password.ts b/x-pack/plugins/security/server/routes/users/change_password.ts
index aa7e8bc26cc1f..e915cd8759ff1 100644
--- a/x-pack/plugins/security/server/routes/users/change_password.ts
+++ b/x-pack/plugins/security/server/routes/users/change_password.ts
@@ -81,7 +81,7 @@ export function defineChangeUserPasswordRoutes({
       if (isUserChangingOwnPassword && currentSession) {
         try {
           const authenticationResult = await authc.login(request, {
-            provider: currentUser!.authentication_provider,
+            provider: { name: currentUser!.authentication_provider },
             value: { username, password: newPassword },
           });
 
diff --git a/x-pack/plugins/security/server/routes/views/index.test.ts b/x-pack/plugins/security/server/routes/views/index.test.ts
index 63e8a518c6198..80f7f62a5ff43 100644
--- a/x-pack/plugins/security/server/routes/views/index.test.ts
+++ b/x-pack/plugins/security/server/routes/views/index.test.ts
@@ -11,7 +11,7 @@ import { routeDefinitionParamsMock } from '../index.mock';
 describe('View routes', () => {
   it('does not register Login routes if both `basic` and `token` providers are disabled', () => {
     const routeParamsMock = routeDefinitionParamsMock.create();
-    routeParamsMock.authc.isProviderEnabled.mockImplementation(
+    routeParamsMock.authc.isProviderTypeEnabled.mockImplementation(
       provider => provider !== 'basic' && provider !== 'token'
     );
 
@@ -29,7 +29,9 @@ describe('View routes', () => {
 
   it('registers Login routes if `basic` provider is enabled', () => {
     const routeParamsMock = routeDefinitionParamsMock.create();
-    routeParamsMock.authc.isProviderEnabled.mockImplementation(provider => provider !== 'token');
+    routeParamsMock.authc.isProviderTypeEnabled.mockImplementation(
+      provider => provider !== 'token'
+    );
 
     defineViewRoutes(routeParamsMock);
 
@@ -47,7 +49,29 @@ describe('View routes', () => {
 
   it('registers Login routes if `token` provider is enabled', () => {
     const routeParamsMock = routeDefinitionParamsMock.create();
-    routeParamsMock.authc.isProviderEnabled.mockImplementation(provider => provider !== 'basic');
+    routeParamsMock.authc.isProviderTypeEnabled.mockImplementation(
+      provider => provider !== 'basic'
+    );
+
+    defineViewRoutes(routeParamsMock);
+
+    expect(routeParamsMock.router.get.mock.calls.map(([{ path }]) => path)).toMatchInlineSnapshot(`
+      Array [
+        "/login",
+        "/internal/security/login_state",
+        "/security/account",
+        "/security/logged_out",
+        "/logout",
+        "/security/overwritten_session",
+      ]
+    `);
+  });
+
+  it('registers Login routes if Login Selector is enabled even if both `token` and `basic` providers are not enabled', () => {
+    const routeParamsMock = routeDefinitionParamsMock.create({
+      authc: { selector: { enabled: true } },
+    });
+    routeParamsMock.authc.isProviderTypeEnabled.mockReturnValue(false);
 
     defineViewRoutes(routeParamsMock);
 
diff --git a/x-pack/plugins/security/server/routes/views/index.ts b/x-pack/plugins/security/server/routes/views/index.ts
index 91e57aed44ab6..255989dfeb90c 100644
--- a/x-pack/plugins/security/server/routes/views/index.ts
+++ b/x-pack/plugins/security/server/routes/views/index.ts
@@ -12,7 +12,11 @@ import { defineOverwrittenSessionRoutes } from './overwritten_session';
 import { RouteDefinitionParams } from '..';
 
 export function defineViewRoutes(params: RouteDefinitionParams) {
-  if (params.authc.isProviderEnabled('basic') || params.authc.isProviderEnabled('token')) {
+  if (
+    params.config.authc.selector.enabled ||
+    params.authc.isProviderTypeEnabled('basic') ||
+    params.authc.isProviderTypeEnabled('token')
+  ) {
     defineLoginRoutes(params);
   }
 
diff --git a/x-pack/plugins/security/server/routes/views/login.test.ts b/x-pack/plugins/security/server/routes/views/login.test.ts
index d14aa226e17ba..9217d5a437f9c 100644
--- a/x-pack/plugins/security/server/routes/views/login.test.ts
+++ b/x-pack/plugins/security/server/routes/views/login.test.ts
@@ -13,21 +13,22 @@ import {
   IRouter,
 } from '../../../../../../src/core/server';
 import { SecurityLicense } from '../../../common/licensing';
-import { Authentication } from '../../authentication';
+import { LoginState } from '../../../common/login_state';
+import { ConfigType } from '../../config';
 import { defineLoginRoutes } from './login';
 
 import { coreMock, httpServerMock } from '../../../../../../src/core/server/mocks';
 import { routeDefinitionParamsMock } from '../index.mock';
 
 describe('Login view routes', () => {
-  let authc: jest.Mocked<Authentication>;
   let router: jest.Mocked<IRouter>;
   let license: jest.Mocked<SecurityLicense>;
+  let config: ConfigType;
   beforeEach(() => {
     const routeParamsMock = routeDefinitionParamsMock.create();
-    authc = routeParamsMock.authc;
     router = routeParamsMock.router;
     license = routeParamsMock.license;
+    config = routeParamsMock.config;
 
     defineLoginRoutes(routeParamsMock);
   });
@@ -45,7 +46,7 @@ describe('Login view routes', () => {
     });
 
     it('correctly defines route.', () => {
-      expect(routeConfig.options).toEqual({ authRequired: false });
+      expect(routeConfig.options).toEqual({ authRequired: 'optional' });
 
       expect(routeConfig.validate).toEqual({
         body: undefined,
@@ -73,7 +74,7 @@ describe('Login view routes', () => {
       );
     });
 
-    it('redirects user to the root page if they have a session already or login is disabled.', async () => {
+    it('redirects user to the root page if they are authenticated or login is disabled.', async () => {
       for (const { query, expectedLocation } of [
         { query: {}, expectedLocation: '/mock-server-basepath/' },
         {
@@ -85,27 +86,27 @@ describe('Login view routes', () => {
           expectedLocation: '/mock-server-basepath/',
         },
       ]) {
-        const request = httpServerMock.createKibanaRequest({ query });
+        // Redirect if user is authenticated even if `showLogin` is `true`.
+        let request = httpServerMock.createKibanaRequest({
+          query,
+          auth: { isAuthenticated: true },
+        });
         (request as any).url = new URL(
           `${request.url.path}${request.url.search}`,
           'https://kibana.co'
         );
-
-        // Redirect if user has an active session even if `showLogin` is `true`.
-        authc.getSessionInfo.mockResolvedValue({
-          provider: 'basic',
-          now: 0,
-          idleTimeoutExpiration: null,
-          lifespanExpiration: null,
-        });
         license.getFeatures.mockReturnValue({ showLogin: true } as any);
         await expect(routeHandler({} as any, request, kibanaResponseFactory)).resolves.toEqual({
           options: { headers: { location: `${expectedLocation}` } },
           status: 302,
         });
 
-        // Redirect if `showLogin` is `false` even if user doesn't have an active session even.
-        authc.getSessionInfo.mockResolvedValue(null);
+        // Redirect if `showLogin` is `false` even if user is not authenticated.
+        request = httpServerMock.createKibanaRequest({ query, auth: { isAuthenticated: false } });
+        (request as any).url = new URL(
+          `${request.url.path}${request.url.search}`,
+          'https://kibana.co'
+        );
         license.getFeatures.mockReturnValue({ showLogin: false } as any);
         await expect(routeHandler({} as any, request, kibanaResponseFactory)).resolves.toEqual({
           options: { headers: { location: `${expectedLocation}` } },
@@ -114,11 +115,10 @@ describe('Login view routes', () => {
       }
     });
 
-    it('renders view if user does not have an active session and login page can be shown.', async () => {
-      authc.getSessionInfo.mockResolvedValue(null);
+    it('renders view if user is not authenticated and login page can be shown.', async () => {
       license.getFeatures.mockReturnValue({ showLogin: true } as any);
 
-      const request = httpServerMock.createKibanaRequest();
+      const request = httpServerMock.createKibanaRequest({ auth: { isAuthenticated: false } });
       const contextMock = coreMock.createRequestHandlerContext();
 
       await expect(
@@ -133,7 +133,6 @@ describe('Login view routes', () => {
         status: 200,
       });
 
-      expect(authc.getSessionInfo).toHaveBeenCalledWith(request);
       expect(contextMock.rendering.render).toHaveBeenCalledWith({ includeUserSettings: false });
     });
   });
@@ -170,11 +169,18 @@ describe('Login view routes', () => {
       const request = httpServerMock.createKibanaRequest();
       const contextMock = coreMock.createRequestHandlerContext();
 
+      const expectedPayload = {
+        allowLogin: true,
+        layout: 'error-es-unavailable',
+        showLoginForm: true,
+        requiresSecureConnection: false,
+        selector: { enabled: false, providers: [] },
+      };
       await expect(
         routeHandler({ core: contextMock } as any, request, kibanaResponseFactory)
       ).resolves.toEqual({
-        options: { body: { allowLogin: true, layout: 'error-es-unavailable', showLogin: true } },
-        payload: { allowLogin: true, layout: 'error-es-unavailable', showLogin: true },
+        options: { body: expectedPayload },
+        payload: expectedPayload,
         status: 200,
       });
     });
@@ -185,13 +191,156 @@ describe('Login view routes', () => {
       const request = httpServerMock.createKibanaRequest();
       const contextMock = coreMock.createRequestHandlerContext();
 
+      const expectedPayload = {
+        allowLogin: true,
+        layout: 'form',
+        showLoginForm: true,
+        requiresSecureConnection: false,
+        selector: { enabled: false, providers: [] },
+      };
+      await expect(
+        routeHandler({ core: contextMock } as any, request, kibanaResponseFactory)
+      ).resolves.toEqual({
+        options: { body: expectedPayload },
+        payload: expectedPayload,
+        status: 200,
+      });
+    });
+
+    it('returns `requiresSecureConnection: true` if `secureCookies` is enabled in config.', async () => {
+      license.getFeatures.mockReturnValue({ allowLogin: true, showLogin: true } as any);
+
+      const request = httpServerMock.createKibanaRequest();
+      const contextMock = coreMock.createRequestHandlerContext();
+
+      config.secureCookies = true;
+
+      const expectedPayload = expect.objectContaining({ requiresSecureConnection: true });
       await expect(
         routeHandler({ core: contextMock } as any, request, kibanaResponseFactory)
       ).resolves.toEqual({
-        options: { body: { allowLogin: true, layout: 'form', showLogin: true } },
-        payload: { allowLogin: true, layout: 'form', showLogin: true },
+        options: { body: expectedPayload },
+        payload: expectedPayload,
         status: 200,
       });
     });
+
+    it('returns `showLoginForm: true` only if either `basic` or `token` provider is enabled.', async () => {
+      license.getFeatures.mockReturnValue({ allowLogin: true, showLogin: true } as any);
+
+      const request = httpServerMock.createKibanaRequest();
+      const contextMock = coreMock.createRequestHandlerContext();
+
+      const cases: Array<[boolean, ConfigType['authc']['sortedProviders']]> = [
+        [false, []],
+        [true, [{ type: 'basic', name: 'basic1', options: { order: 0, showInSelector: true } }]],
+        [true, [{ type: 'token', name: 'token1', options: { order: 0, showInSelector: true } }]],
+      ];
+
+      for (const [showLoginForm, sortedProviders] of cases) {
+        config.authc.sortedProviders = sortedProviders;
+
+        const expectedPayload = expect.objectContaining({ showLoginForm });
+        await expect(
+          routeHandler({ core: contextMock } as any, request, kibanaResponseFactory)
+        ).resolves.toEqual({
+          options: { body: expectedPayload },
+          payload: expectedPayload,
+          status: 200,
+        });
+      }
+    });
+
+    it('correctly returns `selector` information.', async () => {
+      license.getFeatures.mockReturnValue({ allowLogin: true, showLogin: true } as any);
+
+      const request = httpServerMock.createKibanaRequest();
+      const contextMock = coreMock.createRequestHandlerContext();
+
+      const cases: Array<[
+        boolean,
+        ConfigType['authc']['sortedProviders'],
+        LoginState['selector']['providers']
+      ]> = [
+        // selector is disabled, providers shouldn't be returned.
+        [
+          false,
+          [
+            { type: 'basic', name: 'basic1', options: { order: 0, showInSelector: true } },
+            { type: 'saml', name: 'saml1', options: { order: 1, showInSelector: true } },
+          ],
+          [],
+        ],
+        // selector is enabled, but only basic/token is available, providers shouldn't be returned.
+        [
+          true,
+          [{ type: 'basic', name: 'basic1', options: { order: 0, showInSelector: true } }],
+          [],
+        ],
+        // selector is enabled, non-basic/token providers should be returned
+        [
+          true,
+          [
+            {
+              type: 'basic',
+              name: 'basic1',
+              options: { order: 0, showInSelector: true, description: 'some-desc1' },
+            },
+            {
+              type: 'saml',
+              name: 'saml1',
+              options: { order: 1, showInSelector: true, description: 'some-desc2' },
+            },
+            {
+              type: 'saml',
+              name: 'saml2',
+              options: { order: 2, showInSelector: true, description: 'some-desc3' },
+            },
+          ],
+          [
+            { type: 'saml', name: 'saml1', description: 'some-desc2' },
+            { type: 'saml', name: 'saml2', description: 'some-desc3' },
+          ],
+        ],
+        // selector is enabled, only non-basic/token providers that are enabled in selector should be returned.
+        [
+          true,
+          [
+            {
+              type: 'basic',
+              name: 'basic1',
+              options: { order: 0, showInSelector: true, description: 'some-desc1' },
+            },
+            {
+              type: 'saml',
+              name: 'saml1',
+              options: { order: 1, showInSelector: false, description: 'some-desc2' },
+            },
+            {
+              type: 'saml',
+              name: 'saml2',
+              options: { order: 2, showInSelector: true, description: 'some-desc3' },
+            },
+          ],
+          [{ type: 'saml', name: 'saml2', description: 'some-desc3' }],
+        ],
+      ];
+
+      for (const [selectorEnabled, sortedProviders, expectedProviders] of cases) {
+        config.authc.selector.enabled = selectorEnabled;
+        config.authc.sortedProviders = sortedProviders;
+
+        const expectedPayload = expect.objectContaining({
+          selector: { enabled: selectorEnabled, providers: expectedProviders },
+        });
+        await expect(
+          routeHandler({ core: contextMock } as any, request, kibanaResponseFactory)
+        ).resolves.toEqual({
+          options: { body: expectedPayload },
+          payload: expectedPayload,
+          status: 200,
+        });
+      }
+    });
   });
 });
diff --git a/x-pack/plugins/security/server/routes/views/login.ts b/x-pack/plugins/security/server/routes/views/login.ts
index ee1fe01ab1b22..4cabd4337971c 100644
--- a/x-pack/plugins/security/server/routes/views/login.ts
+++ b/x-pack/plugins/security/server/routes/views/login.ts
@@ -6,15 +6,16 @@
 
 import { schema } from '@kbn/config-schema';
 import { parseNext } from '../../../common/parse_next';
+import { LoginState } from '../../../common/login_state';
 import { RouteDefinitionParams } from '..';
 
 /**
  * Defines routes required for the Login view.
  */
 export function defineLoginRoutes({
+  config,
   router,
   logger,
-  authc,
   csp,
   basePath,
   license,
@@ -31,15 +32,12 @@ export function defineLoginRoutes({
           { unknowns: 'allow' }
         ),
       },
-      options: { authRequired: false },
+      options: { authRequired: 'optional' },
     },
     async (context, request, response) => {
       // Default to true if license isn't available or it can't be resolved for some reason.
       const shouldShowLogin = license.isEnabled() ? license.getFeatures().showLogin : true;
-
-      // Authentication flow isn't triggered automatically for this route, so we should explicitly
-      // check whether user has an active session already.
-      const isUserAlreadyLoggedIn = (await authc.getSessionInfo(request)) !== null;
+      const isUserAlreadyLoggedIn = request.auth.isAuthenticated;
       if (isUserAlreadyLoggedIn || !shouldShowLogin) {
         logger.debug('User is already authenticated, redirecting...');
         return response.redirected({
@@ -57,8 +55,30 @@ export function defineLoginRoutes({
   router.get(
     { path: '/internal/security/login_state', validate: false, options: { authRequired: false } },
     async (context, request, response) => {
-      const { showLogin, allowLogin, layout = 'form' } = license.getFeatures();
-      return response.ok({ body: { showLogin, allowLogin, layout } });
+      const { allowLogin, layout = 'form' } = license.getFeatures();
+      const { sortedProviders, selector } = config.authc;
+
+      let showLoginForm = false;
+      const providers = [];
+      for (const { type, name, options } of sortedProviders) {
+        if (options.showInSelector) {
+          if (type === 'basic' || type === 'token') {
+            showLoginForm = true;
+          } else if (selector.enabled) {
+            providers.push({ type, name, description: options.description });
+          }
+        }
+      }
+
+      const loginState: LoginState = {
+        allowLogin,
+        layout,
+        requiresSecureConnection: config.secureCookies,
+        showLoginForm,
+        selector: { enabled: selector.enabled, providers },
+      };
+
+      return response.ok({ body: loginState });
     }
   );
 }
diff --git a/x-pack/scripts/functional_tests.js b/x-pack/scripts/functional_tests.js
index 06ee0b91c8a5d..242ee890d4847 100644
--- a/x-pack/scripts/functional_tests.js
+++ b/x-pack/scripts/functional_tests.js
@@ -26,6 +26,7 @@ const onlyNotInCoverageTests = [
   require.resolve('../test/oidc_api_integration/config.ts'),
   require.resolve('../test/oidc_api_integration/implicit_flow.config.ts'),
   require.resolve('../test/pki_api_integration/config.ts'),
+  require.resolve('../test/login_selector_api_integration/config.ts'),
   require.resolve('../test/spaces_api_integration/spaces_only/config.ts'),
   require.resolve('../test/spaces_api_integration/security_and_spaces/config_trial.ts'),
   require.resolve('../test/spaces_api_integration/security_and_spaces/config_basic.ts'),
diff --git a/x-pack/test/kerberos_api_integration/apis/security/kerberos_login.ts b/x-pack/test/kerberos_api_integration/apis/security/kerberos_login.ts
index b561c9ea47513..81999826adbb1 100644
--- a/x-pack/test/kerberos_api_integration/apis/security/kerberos_login.ts
+++ b/x-pack/test/kerberos_api_integration/apis/security/kerberos_login.ts
@@ -8,10 +8,14 @@ import expect from '@kbn/expect';
 import request, { Cookie } from 'request';
 import { delay } from 'bluebird';
 import { FtrProviderContext } from '../../ftr_provider_context';
+import {
+  getMutualAuthenticationResponseToken,
+  getSPNEGOToken,
+} from '../../fixtures/kerberos_tools';
 
 export default function({ getService }: FtrProviderContext) {
-  const spnegoToken =
-    'YIIChwYGKwYBBQUCoIICezCCAnegDTALBgkqhkiG9xIBAgKiggJkBIICYGCCAlwGCSqGSIb3EgECAgEAboICSzCCAkegAwIBBaEDAgEOogcDBQAAAAAAo4IBW2GCAVcwggFToAMCAQWhERsPVEVTVC5FTEFTVElDLkNPohwwGqADAgEDoRMwERsESFRUUBsJbG9jYWxob3N0o4IBGTCCARWgAwIBEqEDAgECooIBBwSCAQNBN2a1Rso+KEJsDwICYLCt7ACLzdlbhEZF5YNsehO109b/WiZR1VTK6kCQyDdBdQFefyvV8EiC35mz7XnTb239nWz6xBGbdmtjSfF0XzpXKbL/zGzLEKkEXQuqFLPUN6qEJXsh0OoNdj9OWwmTr93FVyugs1hO/E5wjlAe2SDYpBN6uZICXu6dFg9nLQKkb/XgbgKM7ZZvgA/UElWDgHav4nPO1VWppCCLKHqXTRnvpr/AsxeON4qeJLaukxBigfIaJlLFMNQal5H7MyXa0j3Y1sckbURnWoBt6r4XE7c8F8cz0rYoGwoCO+Cs5tNutKY6XcsAFbLh59hjgIkhVBhhyTeypIHSMIHPoAMCARKigccEgcSsXqIRAcHfZivrbHfsnvbFgmzmnrKVPFNtJ9Hl23KunCsNW49nP4VF2dEf9n12prDaIguJDV5LPHpTew9rmCj1GCahKJ9bJbRKIgImLFd+nelm3E2zxRqAhrgM1469oDg0ksE3+5lJBuJlVEECMp0F/gxvEiL7DhasICqw+FOJ/jD9QUYvg+E6BIxWgZyPszaxerzBBszAhIF1rxCHRRL1KLjskNeJlBhH77DkAO6AEmsYGdsgEq7b7uCov9PKPiiPAuFF';
+  const spnegoToken = getSPNEGOToken();
+
   const supertest = getService('supertestWithoutAuth');
   const config = getService('config');
 
@@ -105,7 +109,7 @@ export default function({ getService }: FtrProviderContext) {
 
         // Verify that mutual authentication works.
         expect(response.headers['www-authenticate']).to.be(
-          'Negotiate oRQwEqADCgEAoQsGCSqGSIb3EgECAg=='
+          `Negotiate ${getMutualAuthenticationResponseToken()}`
         );
 
         const cookies = response.headers['set-cookie'];
diff --git a/x-pack/test/kerberos_api_integration/fixtures/kerberos_tools.ts b/x-pack/test/kerberos_api_integration/fixtures/kerberos_tools.ts
new file mode 100644
index 0000000000000..2fed5d475cd5c
--- /dev/null
+++ b/x-pack/test/kerberos_api_integration/fixtures/kerberos_tools.ts
@@ -0,0 +1,13 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+export function getSPNEGOToken() {
+  return 'YIIChwYGKwYBBQUCoIICezCCAnegDTALBgkqhkiG9xIBAgKiggJkBIICYGCCAlwGCSqGSIb3EgECAgEAboICSzCCAkegAwIBBaEDAgEOogcDBQAAAAAAo4IBW2GCAVcwggFToAMCAQWhERsPVEVTVC5FTEFTVElDLkNPohwwGqADAgEDoRMwERsESFRUUBsJbG9jYWxob3N0o4IBGTCCARWgAwIBEqEDAgECooIBBwSCAQNBN2a1Rso+KEJsDwICYLCt7ACLzdlbhEZF5YNsehO109b/WiZR1VTK6kCQyDdBdQFefyvV8EiC35mz7XnTb239nWz6xBGbdmtjSfF0XzpXKbL/zGzLEKkEXQuqFLPUN6qEJXsh0OoNdj9OWwmTr93FVyugs1hO/E5wjlAe2SDYpBN6uZICXu6dFg9nLQKkb/XgbgKM7ZZvgA/UElWDgHav4nPO1VWppCCLKHqXTRnvpr/AsxeON4qeJLaukxBigfIaJlLFMNQal5H7MyXa0j3Y1sckbURnWoBt6r4XE7c8F8cz0rYoGwoCO+Cs5tNutKY6XcsAFbLh59hjgIkhVBhhyTeypIHSMIHPoAMCARKigccEgcSsXqIRAcHfZivrbHfsnvbFgmzmnrKVPFNtJ9Hl23KunCsNW49nP4VF2dEf9n12prDaIguJDV5LPHpTew9rmCj1GCahKJ9bJbRKIgImLFd+nelm3E2zxRqAhrgM1469oDg0ksE3+5lJBuJlVEECMp0F/gxvEiL7DhasICqw+FOJ/jD9QUYvg+E6BIxWgZyPszaxerzBBszAhIF1rxCHRRL1KLjskNeJlBhH77DkAO6AEmsYGdsgEq7b7uCov9PKPiiPAuFF';
+}
+
+export function getMutualAuthenticationResponseToken() {
+  return 'oRQwEqADCgEAoQsGCSqGSIb3EgECAg==';
+}
diff --git a/x-pack/test/login_selector_api_integration/apis/index.ts b/x-pack/test/login_selector_api_integration/apis/index.ts
new file mode 100644
index 0000000000000..35f83733a7105
--- /dev/null
+++ b/x-pack/test/login_selector_api_integration/apis/index.ts
@@ -0,0 +1,14 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { FtrProviderContext } from '../ftr_provider_context';
+
+export default function({ loadTestFile }: FtrProviderContext) {
+  describe('apis', function() {
+    this.tags('ciGroup6');
+    loadTestFile(require.resolve('./login_selector'));
+  });
+}
diff --git a/x-pack/test/login_selector_api_integration/apis/login_selector.ts b/x-pack/test/login_selector_api_integration/apis/login_selector.ts
new file mode 100644
index 0000000000000..3be96d27186d9
--- /dev/null
+++ b/x-pack/test/login_selector_api_integration/apis/login_selector.ts
@@ -0,0 +1,545 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import request, { Cookie } from 'request';
+import { readFileSync } from 'fs';
+import { resolve } from 'path';
+import url from 'url';
+import { CA_CERT_PATH } from '@kbn/dev-utils';
+import expect from '@kbn/expect';
+import { getStateAndNonce } from '../../oidc_api_integration/fixtures/oidc_tools';
+import {
+  getMutualAuthenticationResponseToken,
+  getSPNEGOToken,
+} from '../../kerberos_api_integration/fixtures/kerberos_tools';
+import { getSAMLRequestId, getSAMLResponse } from '../../saml_api_integration/fixtures/saml_tools';
+import { FtrProviderContext } from '../ftr_provider_context';
+
+export default function({ getService }: FtrProviderContext) {
+  const randomness = getService('randomness');
+  const supertest = getService('supertestWithoutAuth');
+  const config = getService('config');
+
+  const kibanaServerConfig = config.get('servers.kibana');
+  const validUsername = kibanaServerConfig.username;
+  const validPassword = kibanaServerConfig.password;
+
+  const CA_CERT = readFileSync(CA_CERT_PATH);
+  const CLIENT_CERT = readFileSync(
+    resolve(__dirname, '../../pki_api_integration/fixtures/first_client.p12')
+  );
+
+  async function checkSessionCookie(sessionCookie: Cookie, username: string, providerName: string) {
+    expect(sessionCookie.key).to.be('sid');
+    expect(sessionCookie.value).to.not.be.empty();
+    expect(sessionCookie.path).to.be('/');
+    expect(sessionCookie.httpOnly).to.be(true);
+
+    const apiResponse = await supertest
+      .get('/internal/security/me')
+      .ca(CA_CERT)
+      .pfx(CLIENT_CERT)
+      .set('kbn-xsrf', 'xxx')
+      .set('Cookie', sessionCookie.cookieString())
+      .expect(200);
+
+    expect(apiResponse.body).to.only.have.keys([
+      'username',
+      'full_name',
+      'email',
+      'roles',
+      'metadata',
+      'enabled',
+      'authentication_realm',
+      'lookup_realm',
+      'authentication_provider',
+    ]);
+
+    expect(apiResponse.body.username).to.be(username);
+    expect(apiResponse.body.authentication_provider).to.be(providerName);
+  }
+
+  describe('Login Selector', () => {
+    it('should redirect user to a login selector', async () => {
+      const response = await supertest
+        .get('/abc/xyz/handshake?one=two three')
+        .ca(CA_CERT)
+        .expect(302);
+      expect(response.headers['set-cookie']).to.be(undefined);
+      expect(response.headers.location).to.be(
+        '/login?next=%2Fabc%2Fxyz%2Fhandshake%3Fone%3Dtwo%2520three'
+      );
+    });
+
+    it('should allow access to login selector with intermediate authentication cookie', async () => {
+      const handshakeResponse = await supertest
+        .post('/internal/security/login_with')
+        .ca(CA_CERT)
+        .set('kbn-xsrf', 'xxx')
+        .send({ providerType: 'saml', providerName: 'saml1', currentURL: 'https://kibana.com/' })
+        .expect(200);
+
+      // The cookie that includes some state of the in-progress authentication, that doesn't allow
+      // to fully authenticate user yet.
+      const intermediateAuthCookie = request.cookie(handshakeResponse.headers['set-cookie'][0])!;
+
+      await supertest
+        .get('/login')
+        .ca(CA_CERT)
+        .set('Cookie', intermediateAuthCookie.cookieString())
+        .expect(200);
+    });
+
+    describe('SAML', () => {
+      function createSAMLResponse(options = {}) {
+        return getSAMLResponse({
+          destination: `http://localhost:${kibanaServerConfig.port}/api/security/saml/callback`,
+          sessionIndex: String(randomness.naturalNumber()),
+          ...options,
+        });
+      }
+
+      it('should be able to log in via IdP initiated login for any configured realm', async () => {
+        for (const providerName of ['saml1', 'saml2']) {
+          const authenticationResponse = await supertest
+            .post('/api/security/saml/callback')
+            .ca(CA_CERT)
+            .send({
+              SAMLResponse: await createSAMLResponse({
+                issuer: `http://www.elastic.co/${providerName}`,
+              }),
+            })
+            .expect(302);
+
+          // User should be redirected to the base URL.
+          expect(authenticationResponse.headers.location).to.be('/');
+
+          const cookies = authenticationResponse.headers['set-cookie'];
+          expect(cookies).to.have.length(1);
+
+          await checkSessionCookie(request.cookie(cookies[0])!, 'a@b.c', providerName);
+        }
+      });
+
+      it('should be able to log in via IdP initiated login even if session with other provider type exists', async () => {
+        const basicAuthenticationResponse = await supertest
+          .post('/internal/security/login')
+          .ca(CA_CERT)
+          .set('kbn-xsrf', 'xxx')
+          .send({ username: validUsername, password: validPassword })
+          .expect(204);
+
+        const basicSessionCookie = request.cookie(
+          basicAuthenticationResponse.headers['set-cookie'][0]
+        )!;
+        await checkSessionCookie(basicSessionCookie, 'elastic', 'basic1');
+
+        for (const providerName of ['saml1', 'saml2']) {
+          const authenticationResponse = await supertest
+            .post('/api/security/saml/callback')
+            .ca(CA_CERT)
+            .set('Cookie', basicSessionCookie.cookieString())
+            .send({
+              SAMLResponse: await createSAMLResponse({
+                issuer: `http://www.elastic.co/${providerName}`,
+              }),
+            })
+            .expect(302);
+
+          // It should be `/overwritten_session` instead of `/` once it's generalized.
+          expect(authenticationResponse.headers.location).to.be('/');
+
+          const cookies = authenticationResponse.headers['set-cookie'];
+          expect(cookies).to.have.length(1);
+
+          await checkSessionCookie(request.cookie(cookies[0])!, 'a@b.c', providerName);
+        }
+      });
+
+      it('should be able to log in via IdP initiated login even if session with other SAML provider exists', async () => {
+        // First login with `saml1`.
+        const saml1AuthenticationResponse = await supertest
+          .post('/api/security/saml/callback')
+          .ca(CA_CERT)
+          .send({
+            SAMLResponse: await createSAMLResponse({ issuer: `http://www.elastic.co/saml1` }),
+          })
+          .expect(302);
+
+        const saml1SessionCookie = request.cookie(
+          saml1AuthenticationResponse.headers['set-cookie'][0]
+        )!;
+        await checkSessionCookie(saml1SessionCookie, 'a@b.c', 'saml1');
+
+        // And now try to login with `saml2`.
+        const saml2AuthenticationResponse = await supertest
+          .post('/api/security/saml/callback')
+          .ca(CA_CERT)
+          .set('Cookie', saml1SessionCookie.cookieString())
+          .send({
+            SAMLResponse: await createSAMLResponse({ issuer: `http://www.elastic.co/saml2` }),
+          })
+          .expect(302);
+
+        // It should be `/overwritten_session` instead of `/` once it's generalized.
+        expect(saml2AuthenticationResponse.headers.location).to.be('/');
+
+        const saml2SessionCookie = request.cookie(
+          saml2AuthenticationResponse.headers['set-cookie'][0]
+        )!;
+        await checkSessionCookie(saml2SessionCookie, 'a@b.c', 'saml2');
+      });
+
+      // Ideally we should be able to abandon intermediate session and let user log in, but for the
+      // time being we cannot distinguish errors coming from Elasticsearch for the case when SAML
+      // response just doesn't correspond to request ID we have in intermediate cookie and the case
+      // when something else has happened.
+      it('should fail for IdP initiated login if intermediate session with other SAML provider exists', async () => {
+        // First start authentication flow with `saml1`.
+        const saml1HandshakeResponse = await supertest
+          .post('/internal/security/login_with')
+          .ca(CA_CERT)
+          .set('kbn-xsrf', 'xxx')
+          .send({
+            providerType: 'saml',
+            providerName: 'saml1',
+            currentURL: 'https://kibana.com/login?next=/abc/xyz/handshake?one=two%20three#/workpad',
+          })
+          .expect(200);
+
+        expect(
+          saml1HandshakeResponse.body.location.startsWith(`https://elastic.co/sso/saml`)
+        ).to.be(true);
+
+        const saml1HandshakeCookie = request.cookie(
+          saml1HandshakeResponse.headers['set-cookie'][0]
+        )!;
+
+        // And now try to login with `saml2`.
+        await supertest
+          .post('/api/security/saml/callback')
+          .ca(CA_CERT)
+          .set('Cookie', saml1HandshakeCookie.cookieString())
+          .send({
+            SAMLResponse: await createSAMLResponse({ issuer: `http://www.elastic.co/saml2` }),
+          })
+          .expect(401);
+      });
+
+      it('should be able to log in via SP initiated login with any configured realm', async () => {
+        for (const providerName of ['saml1', 'saml2']) {
+          const handshakeResponse = await supertest
+            .post('/internal/security/login_with')
+            .ca(CA_CERT)
+            .set('kbn-xsrf', 'xxx')
+            .send({
+              providerType: 'saml',
+              providerName,
+              currentURL:
+                'https://kibana.com/login?next=/abc/xyz/handshake?one=two%20three#/workpad',
+            })
+            .expect(200);
+
+          expect(handshakeResponse.body.location.startsWith(`https://elastic.co/sso/saml`)).to.be(
+            true
+          );
+
+          const handshakeCookie = request.cookie(handshakeResponse.headers['set-cookie'][0])!;
+          const samlRequestId = await getSAMLRequestId(handshakeResponse.body.location);
+
+          const authenticationResponse = await supertest
+            .post('/api/security/saml/callback')
+            .ca(CA_CERT)
+            .set('kbn-xsrf', 'xxx')
+            .set('Cookie', handshakeCookie.cookieString())
+            .send({
+              SAMLResponse: await createSAMLResponse({
+                inResponseTo: samlRequestId,
+                issuer: `http://www.elastic.co/${providerName}`,
+              }),
+            })
+            .expect(302);
+
+          // User should be redirected to the URL that initiated handshake.
+          expect(authenticationResponse.headers.location).to.be(
+            '/abc/xyz/handshake?one=two three#/workpad'
+          );
+
+          const cookies = authenticationResponse.headers['set-cookie'];
+          expect(cookies).to.have.length(1);
+
+          await checkSessionCookie(request.cookie(cookies[0])!, 'a@b.c', providerName);
+        }
+      });
+
+      it('should be able to log in via SP initiated login even if intermediate session with other SAML provider exists', async () => {
+        // First start authentication flow with `saml1`.
+        const saml1HandshakeResponse = await supertest
+          .post('/internal/security/login_with')
+          .ca(CA_CERT)
+          .set('kbn-xsrf', 'xxx')
+          .send({
+            providerType: 'saml',
+            providerName: 'saml1',
+            currentURL: 'https://kibana.com/login?next=/abc/xyz/handshake?one=two%20three#/saml1',
+          })
+          .expect(200);
+
+        expect(
+          saml1HandshakeResponse.body.location.startsWith(`https://elastic.co/sso/saml`)
+        ).to.be(true);
+
+        const saml1HandshakeCookie = request.cookie(
+          saml1HandshakeResponse.headers['set-cookie'][0]
+        )!;
+
+        // And now try to login with `saml2`.
+        const saml2HandshakeResponse = await supertest
+          .post('/internal/security/login_with')
+          .ca(CA_CERT)
+          .set('kbn-xsrf', 'xxx')
+          .set('Cookie', saml1HandshakeCookie.cookieString())
+          .send({
+            providerType: 'saml',
+            providerName: 'saml2',
+            currentURL: 'https://kibana.com/login?next=/abc/xyz/handshake?one=two%20three#/saml2',
+          })
+          .expect(200);
+
+        expect(
+          saml2HandshakeResponse.body.location.startsWith(`https://elastic.co/sso/saml`)
+        ).to.be(true);
+
+        const saml2HandshakeCookie = request.cookie(
+          saml2HandshakeResponse.headers['set-cookie'][0]
+        )!;
+
+        const saml2AuthenticationResponse = await supertest
+          .post('/api/security/saml/callback')
+          .ca(CA_CERT)
+          .set('Cookie', saml2HandshakeCookie.cookieString())
+          .send({
+            SAMLResponse: await createSAMLResponse({ issuer: `http://www.elastic.co/saml2` }),
+          })
+          .expect(302);
+
+        expect(saml2AuthenticationResponse.headers.location).to.be(
+          '/abc/xyz/handshake?one=two three#/saml2'
+        );
+
+        const saml2SessionCookie = request.cookie(
+          saml2AuthenticationResponse.headers['set-cookie'][0]
+        )!;
+        await checkSessionCookie(saml2SessionCookie, 'a@b.c', 'saml2');
+      });
+    });
+
+    describe('Kerberos', () => {
+      it('should be able to log in from Login Selector', async () => {
+        const spnegoResponse = await supertest
+          .post('/internal/security/login_with')
+          .ca(CA_CERT)
+          .set('kbn-xsrf', 'xxx')
+          .send({
+            providerType: 'kerberos',
+            providerName: 'kerberos1',
+            currentURL: 'https://kibana.com/login?next=/abc/xyz/handshake?one=two%20three#/workpad',
+          })
+          .expect(401);
+
+        expect(spnegoResponse.headers['set-cookie']).to.be(undefined);
+        expect(spnegoResponse.headers['www-authenticate']).to.be('Negotiate');
+
+        const authenticationResponse = await supertest
+          .post('/internal/security/login_with')
+          .ca(CA_CERT)
+          .set('kbn-xsrf', 'xxx')
+          .set('Authorization', `Negotiate ${getSPNEGOToken()}`)
+          .send({
+            providerType: 'kerberos',
+            providerName: 'kerberos1',
+            currentURL: 'https://kibana.com/login?next=/abc/xyz/handshake?one=two%20three#/workpad',
+          })
+          .expect(200);
+
+        // Verify that mutual authentication works.
+        expect(authenticationResponse.headers['www-authenticate']).to.be(
+          `Negotiate ${getMutualAuthenticationResponseToken()}`
+        );
+
+        const cookies = authenticationResponse.headers['set-cookie'];
+        expect(cookies).to.have.length(1);
+
+        await checkSessionCookie(
+          request.cookie(cookies[0])!,
+          'tester@TEST.ELASTIC.CO',
+          'kerberos1'
+        );
+      });
+
+      it('should be able to log in from Login Selector even if client provides certificate and PKI is enabled', async () => {
+        const spnegoResponse = await supertest
+          .post('/internal/security/login_with')
+          .ca(CA_CERT)
+          .pfx(CLIENT_CERT)
+          .set('kbn-xsrf', 'xxx')
+          .send({
+            providerType: 'kerberos',
+            providerName: 'kerberos1',
+            currentURL: 'https://kibana.com/login?next=/abc/xyz/handshake?one=two%20three#/workpad',
+          })
+          .expect(401);
+
+        expect(spnegoResponse.headers['set-cookie']).to.be(undefined);
+        expect(spnegoResponse.headers['www-authenticate']).to.be('Negotiate');
+
+        const authenticationResponse = await supertest
+          .post('/internal/security/login_with')
+          .ca(CA_CERT)
+          .pfx(CLIENT_CERT)
+          .set('kbn-xsrf', 'xxx')
+          .set('Authorization', `Negotiate ${getSPNEGOToken()}`)
+          .send({
+            providerType: 'kerberos',
+            providerName: 'kerberos1',
+            currentURL: 'https://kibana.com/login?next=/abc/xyz/handshake?one=two%20three#/workpad',
+          })
+          .expect(200);
+
+        // Verify that mutual authentication works.
+        expect(authenticationResponse.headers['www-authenticate']).to.be(
+          `Negotiate ${getMutualAuthenticationResponseToken()}`
+        );
+
+        const cookies = authenticationResponse.headers['set-cookie'];
+        expect(cookies).to.have.length(1);
+
+        await checkSessionCookie(
+          request.cookie(cookies[0])!,
+          'tester@TEST.ELASTIC.CO',
+          'kerberos1'
+        );
+      });
+    });
+
+    describe('OpenID Connect', () => {
+      it('should be able to log in via IdP initiated login', async () => {
+        const handshakeResponse = await supertest
+          .get('/api/security/oidc/initiate_login?iss=https://test-op.elastic.co')
+          .ca(CA_CERT)
+          .expect(302);
+        const handshakeCookie = request.cookie(handshakeResponse.headers['set-cookie'][0])!;
+
+        // Set the nonce in our mock OIDC Provider so that it can generate the ID Tokens
+        const { state, nonce } = getStateAndNonce(handshakeResponse.headers.location);
+        await supertest
+          .post('/api/oidc_provider/setup')
+          .ca(CA_CERT)
+          .set('kbn-xsrf', 'xxx')
+          .send({ nonce })
+          .expect(200);
+
+        const authenticationResponse = await supertest
+          .get(`/api/security/oidc/callback?code=code2&state=${state}`)
+          .ca(CA_CERT)
+          .set('Cookie', handshakeCookie.cookieString())
+          .expect(302);
+
+        // User should be redirected to the base URL.
+        expect(authenticationResponse.headers.location).to.be('/');
+
+        const cookies = authenticationResponse.headers['set-cookie'];
+        expect(cookies).to.have.length(1);
+
+        await checkSessionCookie(request.cookie(cookies[0])!, 'user2', 'oidc1');
+      });
+
+      it('should be able to log in via SP initiated login', async () => {
+        const handshakeResponse = await supertest
+          .post('/internal/security/login_with')
+          .ca(CA_CERT)
+          .set('kbn-xsrf', 'xxx')
+          .send({
+            providerType: 'oidc',
+            providerName: 'oidc1',
+            currentURL: 'https://kibana.com/login?next=/abc/xyz/handshake?one=two%20three',
+          })
+          .expect(200);
+
+        const handshakeCookie = request.cookie(handshakeResponse.headers['set-cookie'][0])!;
+        const redirectURL = url.parse(handshakeResponse.body.location, true /* parseQueryString */);
+        expect(
+          handshakeResponse.body.location.startsWith(
+            `https://test-op.elastic.co/oauth2/v1/authorize`
+          )
+        ).to.be(true);
+
+        expect(redirectURL.query.scope).to.not.be.empty();
+        expect(redirectURL.query.response_type).to.not.be.empty();
+        expect(redirectURL.query.client_id).to.not.be.empty();
+        expect(redirectURL.query.redirect_uri).to.not.be.empty();
+        expect(redirectURL.query.state).to.not.be.empty();
+        expect(redirectURL.query.nonce).to.not.be.empty();
+
+        // Set the nonce in our mock OIDC Provider so that it can generate the ID Tokens
+        const { state, nonce } = redirectURL.query;
+        await supertest
+          .post('/api/oidc_provider/setup')
+          .ca(CA_CERT)
+          .set('kbn-xsrf', 'xxx')
+          .send({ nonce })
+          .expect(200);
+
+        const authenticationResponse = await supertest
+          .get(`/api/security/oidc/callback?code=code1&state=${state}`)
+          .ca(CA_CERT)
+          .set('Cookie', handshakeCookie.cookieString())
+          .expect(302);
+
+        // User should be redirected to the URL that initiated handshake.
+        expect(authenticationResponse.headers.location).to.be('/abc/xyz/handshake?one=two three');
+
+        const cookies = authenticationResponse.headers['set-cookie'];
+        expect(cookies).to.have.length(1);
+
+        await checkSessionCookie(request.cookie(cookies[0])!, 'user1', 'oidc1');
+      });
+    });
+
+    describe('PKI', () => {
+      it('should redirect user to a login selector even if client provides certificate', async () => {
+        const response = await supertest
+          .get('/abc/xyz/handshake?one=two three')
+          .ca(CA_CERT)
+          .pfx(CLIENT_CERT)
+          .expect(302);
+        expect(response.headers['set-cookie']).to.be(undefined);
+        expect(response.headers.location).to.be(
+          '/login?next=%2Fabc%2Fxyz%2Fhandshake%3Fone%3Dtwo%2520three'
+        );
+      });
+
+      it('should be able to log in from Login Selector', async () => {
+        const authenticationResponse = await supertest
+          .post('/internal/security/login_with')
+          .ca(CA_CERT)
+          .pfx(CLIENT_CERT)
+          .set('kbn-xsrf', 'xxx')
+          .send({
+            providerType: 'pki',
+            providerName: 'pki1',
+            currentURL: 'https://kibana.com/login?next=/abc/xyz/handshake?one=two%20three#/workpad',
+          })
+          .expect(200);
+
+        const cookies = authenticationResponse.headers['set-cookie'];
+        expect(cookies).to.have.length(1);
+
+        await checkSessionCookie(request.cookie(cookies[0])!, 'first_client', 'pki1');
+      });
+    });
+  });
+}
diff --git a/x-pack/test/login_selector_api_integration/config.ts b/x-pack/test/login_selector_api_integration/config.ts
new file mode 100644
index 0000000000000..6ca9d19b74c17
--- /dev/null
+++ b/x-pack/test/login_selector_api_integration/config.ts
@@ -0,0 +1,141 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * 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 { CA_CERT_PATH, KBN_CERT_PATH, KBN_KEY_PATH } from '@kbn/dev-utils';
+import { FtrConfigProviderContext } from '@kbn/test/types/ftr';
+
+export default async function({ readConfigFile }: FtrConfigProviderContext) {
+  const kibanaAPITestsConfig = await readConfigFile(
+    require.resolve('../../../test/api_integration/config.js')
+  );
+  const xPackAPITestsConfig = await readConfigFile(require.resolve('../api_integration/config.js'));
+  const kibanaPort = xPackAPITestsConfig.get('servers.kibana.port');
+
+  const kerberosKeytabPath = resolve(__dirname, '../kerberos_api_integration/fixtures/krb5.keytab');
+  const kerberosConfigPath = resolve(__dirname, '../kerberos_api_integration/fixtures/krb5.conf');
+
+  const oidcJWKSPath = resolve(__dirname, '../oidc_api_integration/fixtures/jwks.json');
+  const oidcIdPPlugin = resolve(__dirname, '../oidc_api_integration/fixtures/oidc_provider');
+
+  const pkiKibanaCAPath = resolve(__dirname, '../pki_api_integration/fixtures/kibana_ca.crt');
+
+  const saml1IdPMetadataPath = resolve(
+    __dirname,
+    '../saml_api_integration/fixtures/idp_metadata.xml'
+  );
+  const saml2IdPMetadataPath = resolve(
+    __dirname,
+    '../saml_api_integration/fixtures/idp_metadata_2.xml'
+  );
+
+  const servers = {
+    ...xPackAPITestsConfig.get('servers'),
+    elasticsearch: {
+      ...xPackAPITestsConfig.get('servers.elasticsearch'),
+      protocol: 'https',
+    },
+    kibana: {
+      ...xPackAPITestsConfig.get('servers.kibana'),
+      protocol: 'https',
+    },
+  };
+
+  return {
+    testFiles: [require.resolve('./apis')],
+    servers,
+    security: { disableTestUser: true },
+    services: {
+      randomness: kibanaAPITestsConfig.get('services.randomness'),
+      legacyEs: kibanaAPITestsConfig.get('services.legacyEs'),
+      supertestWithoutAuth: xPackAPITestsConfig.get('services.supertestWithoutAuth'),
+    },
+    junit: {
+      reportName: 'X-Pack Login Selector API Integration Tests',
+    },
+
+    esTestCluster: {
+      ...xPackAPITestsConfig.get('esTestCluster'),
+      ssl: true,
+      serverArgs: [
+        ...xPackAPITestsConfig.get('esTestCluster.serverArgs'),
+        'xpack.security.authc.token.enabled=true',
+        'xpack.security.authc.token.timeout=15s',
+        'xpack.security.http.ssl.client_authentication=optional',
+        'xpack.security.http.ssl.verification_mode=certificate',
+        'xpack.security.authc.realms.native.native1.order=0',
+        'xpack.security.authc.realms.kerberos.kerb1.order=1',
+        `xpack.security.authc.realms.kerberos.kerb1.keytab.path=${kerberosKeytabPath}`,
+        'xpack.security.authc.realms.pki.pki1.order=2',
+        'xpack.security.authc.realms.pki.pki1.delegation.enabled=true',
+        `xpack.security.authc.realms.pki.pki1.certificate_authorities=${CA_CERT_PATH}`,
+        'xpack.security.authc.realms.saml.saml1.order=3',
+        `xpack.security.authc.realms.saml.saml1.idp.metadata.path=${saml1IdPMetadataPath}`,
+        'xpack.security.authc.realms.saml.saml1.idp.entity_id=http://www.elastic.co/saml1',
+        `xpack.security.authc.realms.saml.saml1.sp.entity_id=http://localhost:${kibanaPort}`,
+        `xpack.security.authc.realms.saml.saml1.sp.logout=http://localhost:${kibanaPort}/logout`,
+        `xpack.security.authc.realms.saml.saml1.sp.acs=http://localhost:${kibanaPort}/api/security/saml/callback`,
+        'xpack.security.authc.realms.saml.saml1.attributes.principal=urn:oid:0.0.7',
+        'xpack.security.authc.realms.oidc.oidc1.order=4',
+        `xpack.security.authc.realms.oidc.oidc1.rp.client_id=0oa8sqpov3TxMWJOt356`,
+        `xpack.security.authc.realms.oidc.oidc1.rp.client_secret=0oa8sqpov3TxMWJOt356`,
+        `xpack.security.authc.realms.oidc.oidc1.rp.response_type=code`,
+        `xpack.security.authc.realms.oidc.oidc1.rp.redirect_uri=https://localhost:${kibanaPort}/api/security/oidc/callback`,
+        `xpack.security.authc.realms.oidc.oidc1.op.authorization_endpoint=https://test-op.elastic.co/oauth2/v1/authorize`,
+        `xpack.security.authc.realms.oidc.oidc1.op.endsession_endpoint=https://test-op.elastic.co/oauth2/v1/endsession`,
+        `xpack.security.authc.realms.oidc.oidc1.op.token_endpoint=https://localhost:${kibanaPort}/api/oidc_provider/token_endpoint`,
+        `xpack.security.authc.realms.oidc.oidc1.op.userinfo_endpoint=https://localhost:${kibanaPort}/api/oidc_provider/userinfo_endpoint`,
+        `xpack.security.authc.realms.oidc.oidc1.op.issuer=https://test-op.elastic.co`,
+        `xpack.security.authc.realms.oidc.oidc1.op.jwkset_path=${oidcJWKSPath}`,
+        `xpack.security.authc.realms.oidc.oidc1.claims.principal=sub`,
+        `xpack.security.authc.realms.oidc.oidc1.ssl.certificate_authorities=${CA_CERT_PATH}`,
+        'xpack.security.authc.realms.saml.saml2.order=5',
+        `xpack.security.authc.realms.saml.saml2.idp.metadata.path=${saml2IdPMetadataPath}`,
+        'xpack.security.authc.realms.saml.saml2.idp.entity_id=http://www.elastic.co/saml2',
+        `xpack.security.authc.realms.saml.saml2.sp.entity_id=http://localhost:${kibanaPort}`,
+        `xpack.security.authc.realms.saml.saml2.sp.logout=http://localhost:${kibanaPort}/logout`,
+        `xpack.security.authc.realms.saml.saml2.sp.acs=http://localhost:${kibanaPort}/api/security/saml/callback`,
+        'xpack.security.authc.realms.saml.saml2.attributes.principal=urn:oid:0.0.7',
+      ],
+      serverEnvVars: {
+        // We're going to use the same TGT multiple times and during a short period of time, so we
+        // have to disable replay cache so that ES doesn't complain about that.
+        ES_JAVA_OPTS: `-Djava.security.krb5.conf=${kerberosConfigPath} -Dsun.security.krb5.rcache=none`,
+      },
+    },
+
+    kbnTestServer: {
+      ...xPackAPITestsConfig.get('kbnTestServer'),
+      serverArgs: [
+        ...xPackAPITestsConfig.get('kbnTestServer.serverArgs'),
+        `--plugin-path=${oidcIdPPlugin}`,
+        '--optimize.enabled=false',
+        '--server.ssl.enabled=true',
+        `--server.ssl.key=${KBN_KEY_PATH}`,
+        `--server.ssl.certificate=${KBN_CERT_PATH}`,
+        `--server.ssl.certificateAuthorities=${JSON.stringify([CA_CERT_PATH, pkiKibanaCAPath])}`,
+        `--server.ssl.clientAuthentication=optional`,
+        `--elasticsearch.hosts=${servers.elasticsearch.protocol}://${servers.elasticsearch.hostname}:${servers.elasticsearch.port}`,
+        `--elasticsearch.ssl.certificateAuthorities=${CA_CERT_PATH}`,
+        `--xpack.security.authc.providers=${JSON.stringify({
+          basic: { basic1: { order: 0 } },
+          kerberos: { kerberos1: { order: 4 } },
+          pki: { pki1: { order: 2 } },
+          oidc: { oidc1: { order: 3, realm: 'oidc1' } },
+          saml: {
+            saml1: { order: 1, realm: 'saml1' },
+            saml2: { order: 5, realm: 'saml2', maxRedirectURLSize: '100b' },
+          },
+        })}`,
+        '--server.xsrf.whitelist',
+        JSON.stringify([
+          '/api/oidc_provider/token_endpoint',
+          '/api/oidc_provider/userinfo_endpoint',
+        ]),
+      ],
+    },
+  };
+}
diff --git a/x-pack/plugins/security/public/authentication/login/login_state.ts b/x-pack/test/login_selector_api_integration/ftr_provider_context.d.ts
similarity index 56%
rename from x-pack/plugins/security/public/authentication/login/login_state.ts
rename to x-pack/test/login_selector_api_integration/ftr_provider_context.d.ts
index 6ca38296706fe..e3add3748f56d 100644
--- a/x-pack/plugins/security/public/authentication/login/login_state.ts
+++ b/x-pack/test/login_selector_api_integration/ftr_provider_context.d.ts
@@ -4,9 +4,8 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { LoginLayout } from '../../../common/licensing';
+import { GenericFtrProviderContext } from '@kbn/test/types/ftr';
 
-export interface LoginState {
-  layout: LoginLayout;
-  allowLogin: boolean;
-}
+import { services } from './services';
+
+export type FtrProviderContext = GenericFtrProviderContext<typeof services, {}>;
diff --git a/x-pack/test/login_selector_api_integration/services.ts b/x-pack/test/login_selector_api_integration/services.ts
new file mode 100644
index 0000000000000..8bb2dae90bf59
--- /dev/null
+++ b/x-pack/test/login_selector_api_integration/services.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 { services as commonServices } from '../common/services';
+import { services as apiIntegrationServices } from '../api_integration/services';
+
+export const services = {
+  ...commonServices,
+  randomness: apiIntegrationServices.randomness,
+  supertestWithoutAuth: apiIntegrationServices.supertestWithoutAuth,
+};
diff --git a/x-pack/test/pki_api_integration/apis/security/pki_auth.ts b/x-pack/test/pki_api_integration/apis/security/pki_auth.ts
index fe772a3b1d460..ac16335b7f466 100644
--- a/x-pack/test/pki_api_integration/apis/security/pki_auth.ts
+++ b/x-pack/test/pki_api_integration/apis/security/pki_auth.ts
@@ -9,7 +9,6 @@ import request, { Cookie } from 'request';
 import { delay } from 'bluebird';
 import { readFileSync } from 'fs';
 import { resolve } from 'path';
-// @ts-ignore
 import { CA_CERT_PATH } from '@kbn/dev-utils';
 import { FtrProviderContext } from '../../ftr_provider_context';
 
diff --git a/x-pack/test/pki_api_integration/config.ts b/x-pack/test/pki_api_integration/config.ts
index 21ae1b40efa16..8177e4aa1afba 100644
--- a/x-pack/test/pki_api_integration/config.ts
+++ b/x-pack/test/pki_api_integration/config.ts
@@ -6,7 +6,6 @@
 
 import { resolve } from 'path';
 import { FtrConfigProviderContext } from '@kbn/test/types/ftr';
-// @ts-ignore
 import { CA_CERT_PATH, KBN_CERT_PATH, KBN_KEY_PATH } from '@kbn/dev-utils';
 import { services } from './services';
 
diff --git a/x-pack/test/saml_api_integration/apis/security/saml_login.ts b/x-pack/test/saml_api_integration/apis/security/saml_login.ts
index e49d95f2ec6c2..a4cb34c13c0e1 100644
--- a/x-pack/test/saml_api_integration/apis/security/saml_login.ts
+++ b/x-pack/test/saml_api_integration/apis/security/saml_login.ts
@@ -108,11 +108,15 @@ export default function({ getService }: FtrProviderContext) {
         expect(handshakeCookie.path).to.be('/');
         expect(handshakeCookie.httpOnly).to.be(true);
 
-        expect(handshakeResponse.headers.location).to.be('/api/security/saml/capture-url-fragment');
+        expect(handshakeResponse.headers.location).to.be(
+          '/internal/security/saml/capture-url-fragment'
+        );
       });
 
       it('should return an HTML page that will extract URL fragment', async () => {
-        const response = await supertest.get('/api/security/saml/capture-url-fragment').expect(200);
+        const response = await supertest
+          .get('/internal/security/saml/capture-url-fragment')
+          .expect(200);
 
         const kibanaBaseURL = url.format({ ...config.get('servers.kibana'), auth: false });
         const dom = new JSDOM(response.text, {
@@ -127,7 +131,7 @@ export default function({ getService }: FtrProviderContext) {
               Object.defineProperty(window, 'location', {
                 value: {
                   hash: '#/workpad',
-                  href: `${kibanaBaseURL}/api/security/saml/capture-url-fragment#/workpad`,
+                  href: `${kibanaBaseURL}/internal/security/saml/capture-url-fragment#/workpad`,
                   replace(newLocation: string) {
                     this.href = newLocation;
                     resolve();
@@ -149,13 +153,13 @@ export default function({ getService }: FtrProviderContext) {
 
         // Check that script that forwards URL fragment worked correctly.
         expect(dom.window.location.href).to.be(
-          '/api/security/saml/start?redirectURLFragment=%23%2Fworkpad'
+          '/internal/security/saml/start?redirectURLFragment=%23%2Fworkpad'
         );
       });
     });
 
     describe('initiating handshake', () => {
-      const initiateHandshakeURL = `/api/security/saml/start?redirectURLFragment=%23%2Fworkpad`;
+      const initiateHandshakeURL = `/internal/security/saml/start?redirectURLFragment=%23%2Fworkpad`;
 
       let captureURLCookie: Cookie;
       beforeEach(async () => {
@@ -202,9 +206,8 @@ export default function({ getService }: FtrProviderContext) {
 
       it('AJAX requests should not initiate handshake', async () => {
         const ajaxResponse = await supertest
-          .get(initiateHandshakeURL)
+          .get('/abc/xyz/handshake?one=two three')
           .set('kbn-xsrf', 'xxx')
-          .set('Cookie', captureURLCookie.cookieString())
           .expect(401);
 
         expect(ajaxResponse.headers['set-cookie']).to.be(undefined);
@@ -222,7 +225,7 @@ export default function({ getService }: FtrProviderContext) {
         const captureURLCookie = request.cookie(captureURLResponse.headers['set-cookie'][0])!;
 
         const handshakeResponse = await supertest
-          .get(`/api/security/saml/start?redirectURLFragment=%23%2Fworkpad`)
+          .get(`/internal/security/saml/start?redirectURLFragment=%23%2Fworkpad`)
           .set('Cookie', captureURLCookie.cookieString())
           .expect(302);
 
@@ -360,7 +363,9 @@ export default function({ getService }: FtrProviderContext) {
         const captureURLCookie = request.cookie(captureURLResponse.headers['set-cookie'][0])!;
 
         const handshakeResponse = await supertest
-          .get(`/api/security/saml/start?redirectURLFragment=${encodeURIComponent('#workpad')}`)
+          .get(
+            `/internal/security/saml/start?redirectURLFragment=${encodeURIComponent('#workpad')}`
+          )
           .set('Cookie', captureURLCookie.cookieString())
           .expect(302);
 
@@ -515,7 +520,9 @@ export default function({ getService }: FtrProviderContext) {
         const captureURLCookie = request.cookie(captureURLResponse.headers['set-cookie'][0])!;
 
         const handshakeResponse = await supertest
-          .get(`/api/security/saml/start?redirectURLFragment=${encodeURIComponent('#workpad')}`)
+          .get(
+            `/internal/security/saml/start?redirectURLFragment=${encodeURIComponent('#workpad')}`
+          )
           .set('Cookie', captureURLCookie.cookieString())
           .expect(302);
 
@@ -603,7 +610,9 @@ export default function({ getService }: FtrProviderContext) {
         const captureURLCookie = request.cookie(captureURLResponse.headers['set-cookie'][0])!;
 
         const handshakeResponse = await supertest
-          .get(`/api/security/saml/start?redirectURLFragment=${encodeURIComponent('#workpad')}`)
+          .get(
+            `/internal/security/saml/start?redirectURLFragment=${encodeURIComponent('#workpad')}`
+          )
           .set('Cookie', captureURLCookie.cookieString())
           .expect(302);
 
@@ -647,7 +656,9 @@ export default function({ getService }: FtrProviderContext) {
         expect(handshakeCookie.path).to.be('/');
         expect(handshakeCookie.httpOnly).to.be(true);
 
-        expect(handshakeResponse.headers.location).to.be('/api/security/saml/capture-url-fragment');
+        expect(handshakeResponse.headers.location).to.be(
+          '/internal/security/saml/capture-url-fragment'
+        );
       });
     });
 
@@ -662,7 +673,9 @@ export default function({ getService }: FtrProviderContext) {
         const captureURLCookie = request.cookie(captureURLResponse.headers['set-cookie'][0])!;
 
         const handshakeResponse = await supertest
-          .get(`/api/security/saml/start?redirectURLFragment=${encodeURIComponent('#workpad')}`)
+          .get(
+            `/internal/security/saml/start?redirectURLFragment=${encodeURIComponent('#workpad')}`
+          )
           .set('Cookie', captureURLCookie.cookieString())
           .expect(302);
 
@@ -798,12 +811,12 @@ export default function({ getService }: FtrProviderContext) {
         const captureURLCookie = request.cookie(captureURLResponse.headers['set-cookie'][0])!;
 
         expect(captureURLResponse.headers.location).to.be(
-          '/api/security/saml/capture-url-fragment'
+          '/internal/security/saml/capture-url-fragment'
         );
 
         // 2. Initiate SAML handshake.
         const handshakeResponse = await supertest
-          .get(`/api/security/saml/start?redirectURLFragment=%23%2F${'workpad'.repeat(10)}`)
+          .get(`/internal/security/saml/start?redirectURLFragment=%23%2F${'workpad'.repeat(10)}`)
           .set('Cookie', captureURLCookie.cookieString())
           .expect(302);
 
diff --git a/x-pack/test/saml_api_integration/config.ts b/x-pack/test/saml_api_integration/config.ts
index 502d34d4c9e5d..0580c28555d16 100644
--- a/x-pack/test/saml_api_integration/config.ts
+++ b/x-pack/test/saml_api_integration/config.ts
@@ -37,7 +37,7 @@ export default async function({ readConfigFile }: FtrConfigProviderContext) {
         'xpack.security.authc.token.timeout=15s',
         'xpack.security.authc.realms.saml.saml1.order=0',
         `xpack.security.authc.realms.saml.saml1.idp.metadata.path=${idpPath}`,
-        'xpack.security.authc.realms.saml.saml1.idp.entity_id=http://www.elastic.co',
+        'xpack.security.authc.realms.saml.saml1.idp.entity_id=http://www.elastic.co/saml1',
         `xpack.security.authc.realms.saml.saml1.sp.entity_id=http://localhost:${kibanaPort}`,
         `xpack.security.authc.realms.saml.saml1.sp.logout=http://localhost:${kibanaPort}/logout`,
         `xpack.security.authc.realms.saml.saml1.sp.acs=http://localhost:${kibanaPort}/api/security/saml/callback`,
diff --git a/x-pack/test/saml_api_integration/fixtures/idp_metadata.xml b/x-pack/test/saml_api_integration/fixtures/idp_metadata.xml
index a890fe812987b..57b9e824c9d53 100644
--- a/x-pack/test/saml_api_integration/fixtures/idp_metadata.xml
+++ b/x-pack/test/saml_api_integration/fixtures/idp_metadata.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"
-                     entityID="http://www.elastic.co">
+                     entityID="http://www.elastic.co/saml1">
   <md:IDPSSODescriptor WantAuthnRequestsSigned="false"
                        protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:KeyDescriptor use="signing">
diff --git a/x-pack/test/saml_api_integration/fixtures/idp_metadata_2.xml b/x-pack/test/saml_api_integration/fixtures/idp_metadata_2.xml
new file mode 100644
index 0000000000000..ff67779d7732c
--- /dev/null
+++ b/x-pack/test/saml_api_integration/fixtures/idp_metadata_2.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"
+                     entityID="http://www.elastic.co/saml2">
+  <md:IDPSSODescriptor WantAuthnRequestsSigned="false"
+                       protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <!-- This certificate is extracted from KBN_CERT_PATH in @kbn/dev-utils and should always be in sync with it -->
+          <ds:X509Certificate>MIIDOTCCAiGgAwIBAgIVANNWkg9lzNiLqNkMFhFKHcXyaZmqMA0GCSqGSIb3DQEB
+CwUAMDQxMjAwBgNVBAMTKUVsYXN0aWMgQ2VydGlmaWNhdGUgVG9vbCBBdXRvZ2Vu
+ZXJhdGVkIENBMCAXDTE5MTIyNzE3MDM0MloYDzIwNjkxMjE0MTcwMzQyWjARMQ8w
+DQYDVQQDEwZraWJhbmEwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCQ
+wYYbQtbRBKJ4uNZc2+IgRU+7NNL21ZebQlEIMgK7jAqOMrsW2b5DATz41Fd+GQFU
+FUYYjwo+PQj6sJHshOJo/gNb32HrydvMI7YPvevkszkuEGCfXxQ3Dw2RTACLgD0Q
+OCkwHvn3TMf0loloV/ePGWaZDYZaXi3a5DdWi/HFFoJysgF0JV2f6XyKhJkGaEfJ
+s9pWX269zH/XQvGNx4BEimJpYB8h4JnDYPFIiQdqj+sl2b+kS1hH9kL5gBAMXjFU
+vcNnX+PmyTjyJrGo75k0ku+spBf1bMwuQt3uSmM+TQIXkvFDmS0DOVESrpA5EC1T
+BUGRz6o/I88Xx4Mud771AgMBAAGjYzBhMB0GA1UdDgQWBBQLB1Eo23M3Ss8MsFaz
+V+Twcb3PmDAfBgNVHSMEGDAWgBQa7SYOe8NGcF00EbwPHA91YCsHSTAUBgNVHREE
+DTALgglsb2NhbGhvc3QwCQYDVR0TBAIwADANBgkqhkiG9w0BAQsFAAOCAQEAnEl/
+z5IElIjvkK4AgMPrNcRlvIGDt2orEik7b6Jsq6/RiJQ7cSsYTZf7xbqyxNsUOTxv
++frj47MEN448H2nRvUxH29YR3XygV5aEwADSAhwaQWn0QfWTCZbJTmSoNEDtDOzX
+TGDlAoCD9s9Xz9S1JpxY4H+WWRZrBSDM6SC1c6CzuEeZRuScNAjYD5mh2v6fOlSy
+b8xJWSg0AFlJPCa3ZsA2SKbNqI0uNfJTnkXRm88Z2NHcgtlADbOLKauWfCrpgsCk
+cZgo6yAYkOM148h/8wGla1eX+iE1R72NUABGydu8MSQKvc0emWJkGsC1/KqPlf/O
+eOUsdwn1yDKHRxDHyA==
+          </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
+                            Location="https://elastic.co/slo/saml"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
+                            Location="https://elastic.co/slo/saml"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
+                            Location="https://elastic.co/sso/saml"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
+                            Location="https://elastic.co/sso/saml"/>
+  </md:IDPSSODescriptor>
+</md:EntityDescriptor>
diff --git a/x-pack/test/saml_api_integration/fixtures/saml_tools.ts b/x-pack/test/saml_api_integration/fixtures/saml_tools.ts
index bbe0df7ff3a2c..a924d0964c245 100644
--- a/x-pack/test/saml_api_integration/fixtures/saml_tools.ts
+++ b/x-pack/test/saml_api_integration/fixtures/saml_tools.ts
@@ -45,14 +45,21 @@ export async function getSAMLResponse({
   inResponseTo,
   sessionIndex,
   username = 'a@b.c',
-}: { destination?: string; inResponseTo?: string; sessionIndex?: string; username?: string } = {}) {
+  issuer = 'http://www.elastic.co/saml1',
+}: {
+  destination?: string;
+  inResponseTo?: string;
+  sessionIndex?: string;
+  username?: string;
+  issuer?: string;
+} = {}) {
   const issueInstant = new Date().toISOString();
   const notOnOrAfter = new Date(Date.now() + 3600 * 1000).toISOString();
 
   const samlAssertionTemplateXML = `
     <saml:Assertion xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Version="2.0"
                     ID="_RPs1WfOkul8lZ72DtJtes0BKyPgaCamg" IssueInstant="${issueInstant}">
-      <saml:Issuer>http://www.elastic.co</saml:Issuer>
+      <saml:Issuer>${issuer}</saml:Issuer>
       <saml:Subject>
         <saml:NameID Format="urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified">a@b.c</saml:NameID>
         <saml:SubjectConfirmation Method="urn:oasis:names:tc:SAML:2.0:cm:bearer">
@@ -99,7 +106,7 @@ export async function getSAMLResponse({
                   ${inResponseTo ? `InResponseTo="${inResponseTo}"` : ''} Version="2.0"
                   IssueInstant="${issueInstant}"
                   Destination="${destination}">
-      <saml:Issuer xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion">http://www.elastic.co</saml:Issuer>
+      <saml:Issuer xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion">${issuer}</saml:Issuer>
       <samlp:Status>
         <samlp:StatusCode Value="urn:oasis:names:tc:SAML:2.0:status:Success"/>
       </samlp:Status>${signature.getSignedXml()}
@@ -111,9 +118,11 @@ export async function getSAMLResponse({
 export async function getLogoutRequest({
   destination,
   sessionIndex,
+  issuer = 'http://www.elastic.co/saml1',
 }: {
   destination: string;
   sessionIndex: string;
+  issuer?: string;
 }) {
   const issueInstant = new Date().toISOString();
   const logoutRequestTemplateXML = `
@@ -121,7 +130,7 @@ export async function getLogoutRequest({
                          Destination="${destination}"
                          Consent="urn:oasis:names:tc:SAML:2.0:consent:unspecified"
                          xmlns:samlp="urn:oasis:names:tc:SAML:2.0:protocol">
-      <Issuer xmlns="urn:oasis:names:tc:SAML:2.0:assertion">http://www.elastic.co</Issuer>
+      <Issuer xmlns="urn:oasis:names:tc:SAML:2.0:assertion">${issuer}</Issuer>
       <NameID xmlns="urn:oasis:names:tc:SAML:2.0:assertion"
               Format="urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified">a@b.c</NameID>
       <samlp:SessionIndex>${sessionIndex}</samlp:SessionIndex>

From 13baa5156151af258249afc6468f15b53fffeee0 Mon Sep 17 00:00:00 2001
From: Dario Gieselaar <dario.gieselaar@elastic.co>
Date: Mon, 23 Mar 2020 23:08:44 +0100
Subject: [PATCH 046/179] [APM] Collect telemetry about data/API performance
 (#51612)

* [APM] Collect telemetry about data/API performance

Closes #50757.

* Ignore apm scripts package.json

* Config flag for enabling/disabling telemetry collection
---
 src/dev/run_check_lockfile_symlinks.js        |   2 +
 x-pack/legacy/plugins/apm/index.ts            |  19 +-
 x-pack/legacy/plugins/apm/mappings.json       | 773 +++++++++++++++++-
 x-pack/legacy/plugins/apm/scripts/.gitignore  |   1 +
 .../legacy/plugins/apm/scripts/package.json   |  10 +
 .../apm/scripts/setup-kibana-security.js      |   1 +
 .../apm/scripts/upload-telemetry-data.js      |  21 +
 .../download-telemetry-template.ts            |  26 +
 .../generate-sample-documents.ts              | 124 +++
 .../scripts/upload-telemetry-data/index.ts    | 208 +++++
 .../elasticsearch_fieldnames.test.ts.snap     |  48 +-
 x-pack/plugins/apm/common/agent_name.ts       |  44 +-
 .../apm/common/apm_saved_object_constants.ts  |  10 +-
 .../common/elasticsearch_fieldnames.test.ts   |  15 +-
 .../apm/common/elasticsearch_fieldnames.ts    |  11 +-
 x-pack/plugins/apm/kibana.json                |   7 +-
 x-pack/plugins/apm/server/index.ts            |   6 +-
 .../lib/apm_telemetry/__test__/index.test.ts  |  83 --
 .../collect_data_telemetry/index.ts           |  77 ++
 .../collect_data_telemetry/tasks.ts           | 725 ++++++++++++++++
 .../apm/server/lib/apm_telemetry/index.ts     | 155 +++-
 .../apm/server/lib/apm_telemetry/types.ts     | 118 +++
 .../server/lib/helpers/setup_request.test.ts  |  13 +
 x-pack/plugins/apm/server/plugin.ts           |  37 +-
 .../server/routes/create_api/index.test.ts    |   1 +
 x-pack/plugins/apm/server/routes/services.ts  |  16 -
 .../apm/typings/elasticsearch/aggregations.ts |  26 +-
 .../apm/typings/es_schemas/raw/error_raw.ts   |   2 +
 .../typings/es_schemas/raw/fields/observer.ts |  10 +
 .../apm/typings/es_schemas/raw/span_raw.ts    |   2 +
 .../typings/es_schemas/raw/transaction_raw.ts |   2 +
 31 files changed, 2387 insertions(+), 206 deletions(-)
 create mode 100644 x-pack/legacy/plugins/apm/scripts/.gitignore
 create mode 100644 x-pack/legacy/plugins/apm/scripts/package.json
 create mode 100644 x-pack/legacy/plugins/apm/scripts/upload-telemetry-data.js
 create mode 100644 x-pack/legacy/plugins/apm/scripts/upload-telemetry-data/download-telemetry-template.ts
 create mode 100644 x-pack/legacy/plugins/apm/scripts/upload-telemetry-data/generate-sample-documents.ts
 create mode 100644 x-pack/legacy/plugins/apm/scripts/upload-telemetry-data/index.ts
 delete mode 100644 x-pack/plugins/apm/server/lib/apm_telemetry/__test__/index.test.ts
 create mode 100644 x-pack/plugins/apm/server/lib/apm_telemetry/collect_data_telemetry/index.ts
 create mode 100644 x-pack/plugins/apm/server/lib/apm_telemetry/collect_data_telemetry/tasks.ts
 create mode 100644 x-pack/plugins/apm/server/lib/apm_telemetry/types.ts
 create mode 100644 x-pack/plugins/apm/typings/es_schemas/raw/fields/observer.ts

diff --git a/src/dev/run_check_lockfile_symlinks.js b/src/dev/run_check_lockfile_symlinks.js
index 54a8cdf638a78..6c6fc54638ee8 100644
--- a/src/dev/run_check_lockfile_symlinks.js
+++ b/src/dev/run_check_lockfile_symlinks.js
@@ -36,6 +36,8 @@ const IGNORE_FILE_GLOBS = [
   '**/*fixtures*/**/*',
   // cypress isn't used in production, ignore it
   'x-pack/legacy/plugins/apm/e2e/*',
+  // apm scripts aren't used in production, ignore them
+  'x-pack/legacy/plugins/apm/scripts/*',
 ];
 
 run(async ({ log }) => {
diff --git a/x-pack/legacy/plugins/apm/index.ts b/x-pack/legacy/plugins/apm/index.ts
index 0107997f233fe..594e8a4a7af72 100644
--- a/x-pack/legacy/plugins/apm/index.ts
+++ b/x-pack/legacy/plugins/apm/index.ts
@@ -14,7 +14,13 @@ import mappings from './mappings.json';
 
 export const apm: LegacyPluginInitializer = kibana => {
   return new kibana.Plugin({
-    require: ['kibana', 'elasticsearch', 'xpack_main', 'apm_oss'],
+    require: [
+      'kibana',
+      'elasticsearch',
+      'xpack_main',
+      'apm_oss',
+      'task_manager'
+    ],
     id: 'apm',
     configPrefix: 'xpack.apm',
     publicDir: resolve(__dirname, 'public'),
@@ -71,7 +77,10 @@ export const apm: LegacyPluginInitializer = kibana => {
         autocreateApmIndexPattern: Joi.boolean().default(true),
 
         // service map
-        serviceMapEnabled: Joi.boolean().default(true)
+        serviceMapEnabled: Joi.boolean().default(true),
+
+        // telemetry
+        telemetryCollectionEnabled: Joi.boolean().default(true)
       }).default();
     },
 
@@ -107,10 +116,12 @@ export const apm: LegacyPluginInitializer = kibana => {
           }
         }
       });
-
       const apmPlugin = server.newPlatform.setup.plugins
         .apm as APMPluginContract;
-      apmPlugin.registerLegacyAPI({ server });
+
+      apmPlugin.registerLegacyAPI({
+        server
+      });
     }
   });
 };
diff --git a/x-pack/legacy/plugins/apm/mappings.json b/x-pack/legacy/plugins/apm/mappings.json
index 61bc90da28756..ba4c7a89ceaa8 100644
--- a/x-pack/legacy/plugins/apm/mappings.json
+++ b/x-pack/legacy/plugins/apm/mappings.json
@@ -1,20 +1,659 @@
 {
-  "apm-services-telemetry": {
+  "apm-telemetry": {
     "properties": {
+      "agents": {
+        "properties": {
+          "dotnet": {
+            "properties": {
+              "agent": {
+                "properties": {
+                  "version": {
+                    "type": "keyword",
+                    "ignore_above": 256
+                  }
+                }
+              },
+              "service": {
+                "properties": {
+                  "framework": {
+                    "properties": {
+                      "composite": {
+                        "type": "keyword",
+                        "ignore_above": 256
+                      },
+                      "name": {
+                        "type": "keyword",
+                        "ignore_above": 256
+                      },
+                      "version": {
+                        "type": "keyword",
+                        "ignore_above": 256
+                      }
+                    }
+                  },
+                  "language": {
+                    "properties": {
+                      "name": {
+                        "type": "keyword",
+                        "ignore_above": 256
+                      }
+                    }
+                  },
+                  "runtime": {
+                    "properties": {
+                      "composite": {
+                        "type": "keyword",
+                        "ignore_above": 256
+                      },
+                      "name": {
+                        "type": "keyword",
+                        "ignore_above": 256
+                      },
+                      "version": {
+                        "type": "keyword",
+                        "ignore_above": 256
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          },
+          "go": {
+            "properties": {
+              "agent": {
+                "properties": {
+                  "version": {
+                    "type": "keyword",
+                    "ignore_above": 256
+                  }
+                }
+              },
+              "service": {
+                "properties": {
+                  "framework": {
+                    "properties": {
+                      "composite": {
+                        "type": "keyword",
+                        "ignore_above": 256
+                      },
+                      "name": {
+                        "type": "keyword",
+                        "ignore_above": 256
+                      },
+                      "version": {
+                        "type": "keyword",
+                        "ignore_above": 256
+                      }
+                    }
+                  },
+                  "language": {
+                    "properties": {
+                      "composite": {
+                        "type": "keyword",
+                        "ignore_above": 256
+                      },
+                      "name": {
+                        "type": "keyword",
+                        "ignore_above": 256
+                      },
+                      "version": {
+                        "type": "keyword",
+                        "ignore_above": 256
+                      }
+                    }
+                  },
+                  "runtime": {
+                    "properties": {
+                      "composite": {
+                        "type": "keyword",
+                        "ignore_above": 256
+                      },
+                      "name": {
+                        "type": "keyword",
+                        "ignore_above": 256
+                      },
+                      "version": {
+                        "type": "keyword",
+                        "ignore_above": 256
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          },
+          "java": {
+            "properties": {
+              "agent": {
+                "properties": {
+                  "version": {
+                    "type": "keyword",
+                    "ignore_above": 256
+                  }
+                }
+              },
+              "service": {
+                "properties": {
+                  "framework": {
+                    "type": "object"
+                  },
+                  "language": {
+                    "properties": {
+                      "composite": {
+                        "type": "keyword",
+                        "ignore_above": 256
+                      },
+                      "name": {
+                        "type": "keyword",
+                        "ignore_above": 256
+                      },
+                      "version": {
+                        "type": "keyword",
+                        "ignore_above": 256
+                      }
+                    }
+                  },
+                  "runtime": {
+                    "properties": {
+                      "composite": {
+                        "type": "keyword",
+                        "ignore_above": 256
+                      },
+                      "name": {
+                        "type": "keyword",
+                        "ignore_above": 256
+                      },
+                      "version": {
+                        "type": "keyword",
+                        "ignore_above": 256
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          },
+          "js-base": {
+            "properties": {
+              "agent": {
+                "properties": {
+                  "version": {
+                    "type": "keyword",
+                    "ignore_above": 256
+                  }
+                }
+              },
+              "service": {
+                "properties": {
+                  "framework": {
+                    "type": "object"
+                  },
+                  "language": {
+                    "properties": {
+                      "name": {
+                        "type": "keyword",
+                        "ignore_above": 256
+                      }
+                    }
+                  },
+                  "runtime": {
+                    "type": "object"
+                  }
+                }
+              }
+            }
+          },
+          "nodejs": {
+            "properties": {
+              "agent": {
+                "properties": {
+                  "version": {
+                    "type": "keyword",
+                    "ignore_above": 256
+                  }
+                }
+              },
+              "service": {
+                "properties": {
+                  "framework": {
+                    "properties": {
+                      "composite": {
+                        "type": "keyword",
+                        "ignore_above": 256
+                      },
+                      "name": {
+                        "type": "keyword",
+                        "ignore_above": 256
+                      },
+                      "version": {
+                        "type": "keyword",
+                        "ignore_above": 256
+                      }
+                    }
+                  },
+                  "language": {
+                    "properties": {
+                      "name": {
+                        "type": "keyword",
+                        "ignore_above": 256
+                      }
+                    }
+                  },
+                  "runtime": {
+                    "properties": {
+                      "composite": {
+                        "type": "keyword",
+                        "ignore_above": 256
+                      },
+                      "name": {
+                        "type": "keyword",
+                        "ignore_above": 256
+                      },
+                      "version": {
+                        "type": "keyword",
+                        "ignore_above": 256
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          },
+          "python": {
+            "properties": {
+              "agent": {
+                "properties": {
+                  "version": {
+                    "type": "keyword",
+                    "ignore_above": 256
+                  }
+                }
+              },
+              "service": {
+                "properties": {
+                  "framework": {
+                    "properties": {
+                      "composite": {
+                        "type": "keyword",
+                        "ignore_above": 256
+                      },
+                      "name": {
+                        "type": "keyword",
+                        "ignore_above": 256
+                      },
+                      "version": {
+                        "type": "keyword",
+                        "ignore_above": 256
+                      }
+                    }
+                  },
+                  "language": {
+                    "properties": {
+                      "composite": {
+                        "type": "keyword",
+                        "ignore_above": 256
+                      },
+                      "name": {
+                        "type": "keyword",
+                        "ignore_above": 256
+                      },
+                      "version": {
+                        "type": "keyword",
+                        "ignore_above": 256
+                      }
+                    }
+                  },
+                  "runtime": {
+                    "properties": {
+                      "composite": {
+                        "type": "keyword",
+                        "ignore_above": 256
+                      },
+                      "name": {
+                        "type": "keyword",
+                        "ignore_above": 256
+                      },
+                      "version": {
+                        "type": "keyword",
+                        "ignore_above": 256
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          },
+          "ruby": {
+            "properties": {
+              "agent": {
+                "properties": {
+                  "version": {
+                    "type": "keyword",
+                    "ignore_above": 256
+                  }
+                }
+              },
+              "service": {
+                "properties": {
+                  "framework": {
+                    "properties": {
+                      "composite": {
+                        "type": "keyword",
+                        "ignore_above": 256
+                      },
+                      "name": {
+                        "type": "keyword",
+                        "ignore_above": 256
+                      },
+                      "version": {
+                        "type": "keyword",
+                        "ignore_above": 256
+                      }
+                    }
+                  },
+                  "language": {
+                    "properties": {
+                      "composite": {
+                        "type": "keyword",
+                        "ignore_above": 256
+                      },
+                      "name": {
+                        "type": "keyword",
+                        "ignore_above": 256
+                      },
+                      "version": {
+                        "type": "keyword",
+                        "ignore_above": 256
+                      }
+                    }
+                  },
+                  "runtime": {
+                    "properties": {
+                      "composite": {
+                        "type": "keyword",
+                        "ignore_above": 256
+                      },
+                      "name": {
+                        "type": "keyword",
+                        "ignore_above": 256
+                      },
+                      "version": {
+                        "type": "keyword",
+                        "ignore_above": 256
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          },
+          "rum-js": {
+            "properties": {
+              "agent": {
+                "type": "object"
+              },
+              "service": {
+                "properties": {
+                  "framework": {
+                    "type": "object"
+                  },
+                  "language": {
+                    "type": "object"
+                  },
+                  "runtime": {
+                    "type": "object"
+                  }
+                }
+              }
+            }
+          }
+        }
+      },
+      "counts": {
+        "properties": {
+          "agent_configuration": {
+            "properties": {
+              "all": {
+                "type": "long"
+              }
+            }
+          },
+          "error": {
+            "properties": {
+              "1d": {
+                "type": "long"
+              },
+              "all": {
+                "type": "long"
+              }
+            }
+          },
+          "max_error_groups_per_service": {
+            "properties": {
+              "1d": {
+                "type": "long"
+              }
+            }
+          },
+          "max_transaction_groups_per_service": {
+            "properties": {
+              "1d": {
+                "type": "long"
+              }
+            }
+          },
+          "metric": {
+            "properties": {
+              "1d": {
+                "type": "long"
+              },
+              "all": {
+                "type": "long"
+              }
+            }
+          },
+          "onboarding": {
+            "properties": {
+              "1d": {
+                "type": "long"
+              },
+              "all": {
+                "type": "long"
+              }
+            }
+          },
+          "services": {
+            "properties": {
+              "1d": {
+                "type": "long"
+              }
+            }
+          },
+          "sourcemap": {
+            "properties": {
+              "1d": {
+                "type": "long"
+              },
+              "all": {
+                "type": "long"
+              }
+            }
+          },
+          "span": {
+            "properties": {
+              "1d": {
+                "type": "long"
+              },
+              "all": {
+                "type": "long"
+              }
+            }
+          },
+          "traces": {
+            "properties": {
+              "1d": {
+                "type": "long"
+              }
+            }
+          },
+          "transaction": {
+            "properties": {
+              "1d": {
+                "type": "long"
+              },
+              "all": {
+                "type": "long"
+              }
+            }
+          }
+        }
+      },
+      "cardinality": {
+        "properties": {
+          "user_agent": {
+            "properties": {
+              "original": {
+                "properties": {
+                  "all_agents": {
+                    "properties": {
+                      "1d": {
+                        "type": "long"
+                      }
+                    }
+                  },
+                  "rum": {
+                    "properties": {
+                      "1d": {
+                        "type": "long"
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          },
+          "transaction": {
+            "properties": {
+              "name": {
+                "properties": {
+                  "all_agents": {
+                    "properties": {
+                      "1d": {
+                        "type": "long"
+                      }
+                    }
+                  },
+                  "rum": {
+                    "properties": {
+                      "1d": {
+                        "type": "long"
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      },
       "has_any_services": {
         "type": "boolean"
       },
+      "indices": {
+        "properties": {
+          "all": {
+            "properties": {
+              "total": {
+                "properties": {
+                  "docs": {
+                    "properties": {
+                      "count": {
+                        "type": "long"
+                      }
+                    }
+                  },
+                  "store": {
+                    "properties": {
+                      "size_in_bytes": {
+                        "type": "long"
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          },
+          "shards": {
+            "properties": {
+              "total": {
+                "type": "long"
+              }
+            }
+          }
+        }
+      },
+      "integrations": {
+        "properties": {
+          "ml": {
+            "properties": {
+              "all_jobs_count": {
+                "type": "long"
+              }
+            }
+          }
+        }
+      },
+      "retainment": {
+        "properties": {
+          "error": {
+            "properties": {
+              "ms": {
+                "type": "long"
+              }
+            }
+          },
+          "metric": {
+            "properties": {
+              "ms": {
+                "type": "long"
+              }
+            }
+          },
+          "onboarding": {
+            "properties": {
+              "ms": {
+                "type": "long"
+              }
+            }
+          },
+          "span": {
+            "properties": {
+              "ms": {
+                "type": "long"
+              }
+            }
+          },
+          "transaction": {
+            "properties": {
+              "ms": {
+                "type": "long"
+              }
+            }
+          }
+        }
+      },
       "services_per_agent": {
         "properties": {
-          "python": {
+          "dotnet": {
             "type": "long",
             "null_value": 0
           },
-          "java": {
+          "go": {
             "type": "long",
             "null_value": 0
           },
-          "nodejs": {
+          "java": {
             "type": "long",
             "null_value": 0
           },
@@ -22,11 +661,11 @@
             "type": "long",
             "null_value": 0
           },
-          "rum-js": {
+          "nodejs": {
             "type": "long",
             "null_value": 0
           },
-          "dotnet": {
+          "python": {
             "type": "long",
             "null_value": 0
           },
@@ -34,11 +673,131 @@
             "type": "long",
             "null_value": 0
           },
-          "go": {
+          "rum-js": {
             "type": "long",
             "null_value": 0
           }
         }
+      },
+      "tasks": {
+        "properties": {
+          "agent_configuration": {
+            "properties": {
+              "took": {
+                "properties": {
+                  "ms": {
+                    "type": "long"
+                  }
+                }
+              }
+            }
+          },
+          "agents": {
+            "properties": {
+              "took": {
+                "properties": {
+                  "ms": {
+                    "type": "long"
+                  }
+                }
+              }
+            }
+          },
+          "cardinality": {
+            "properties": {
+              "took": {
+                "properties": {
+                  "ms": {
+                    "type": "long"
+                  }
+                }
+              }
+            }
+          },
+          "groupings": {
+            "properties": {
+              "took": {
+                "properties": {
+                  "ms": {
+                    "type": "long"
+                  }
+                }
+              }
+            }
+          },
+          "indices_stats": {
+            "properties": {
+              "took": {
+                "properties": {
+                  "ms": {
+                    "type": "long"
+                  }
+                }
+              }
+            }
+          },
+          "integrations": {
+            "properties": {
+              "took": {
+                "properties": {
+                  "ms": {
+                    "type": "long"
+                  }
+                }
+              }
+            }
+          },
+          "processor_events": {
+            "properties": {
+              "took": {
+                "properties": {
+                  "ms": {
+                    "type": "long"
+                  }
+                }
+              }
+            }
+          },
+          "services": {
+            "properties": {
+              "took": {
+                "properties": {
+                  "ms": {
+                    "type": "long"
+                  }
+                }
+              }
+            }
+          },
+          "versions": {
+            "properties": {
+              "took": {
+                "properties": {
+                  "ms": {
+                    "type": "long"
+                  }
+                }
+              }
+            }
+          }
+        }
+      },
+      "version": {
+        "properties": {
+          "apm_server": {
+            "properties": {
+              "major": {
+                "type": "long"
+              },
+              "minor": {
+                "type": "long"
+              },
+              "patch": {
+                "type": "long"
+              }
+            }
+          }
+        }
       }
     }
   },
diff --git a/x-pack/legacy/plugins/apm/scripts/.gitignore b/x-pack/legacy/plugins/apm/scripts/.gitignore
new file mode 100644
index 0000000000000..8ee01d321b721
--- /dev/null
+++ b/x-pack/legacy/plugins/apm/scripts/.gitignore
@@ -0,0 +1 @@
+yarn.lock
diff --git a/x-pack/legacy/plugins/apm/scripts/package.json b/x-pack/legacy/plugins/apm/scripts/package.json
new file mode 100644
index 0000000000000..9121449c53619
--- /dev/null
+++ b/x-pack/legacy/plugins/apm/scripts/package.json
@@ -0,0 +1,10 @@
+{
+  "name": "apm-scripts",
+  "version": "1.0.0",
+  "main": "index.js",
+  "license": "MIT",
+  "dependencies": {
+    "@octokit/rest": "^16.35.0",
+    "console-stamp": "^0.2.9"
+  }
+}
diff --git a/x-pack/legacy/plugins/apm/scripts/setup-kibana-security.js b/x-pack/legacy/plugins/apm/scripts/setup-kibana-security.js
index 825c1a526fcc5..61ba2fdc7f7e3 100644
--- a/x-pack/legacy/plugins/apm/scripts/setup-kibana-security.js
+++ b/x-pack/legacy/plugins/apm/scripts/setup-kibana-security.js
@@ -16,6 +16,7 @@
  ******************************/
 
 // compile typescript on the fly
+// eslint-disable-next-line import/no-extraneous-dependencies
 require('@babel/register')({
   extensions: ['.ts'],
   plugins: ['@babel/plugin-proposal-optional-chaining'],
diff --git a/x-pack/legacy/plugins/apm/scripts/upload-telemetry-data.js b/x-pack/legacy/plugins/apm/scripts/upload-telemetry-data.js
new file mode 100644
index 0000000000000..a99651c62dd7a
--- /dev/null
+++ b/x-pack/legacy/plugins/apm/scripts/upload-telemetry-data.js
@@ -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.
+ */
+
+// compile typescript on the fly
+// eslint-disable-next-line import/no-extraneous-dependencies
+require('@babel/register')({
+  extensions: ['.ts'],
+  plugins: [
+    '@babel/plugin-proposal-optional-chaining',
+    '@babel/plugin-proposal-nullish-coalescing-operator'
+  ],
+  presets: [
+    '@babel/typescript',
+    ['@babel/preset-env', { targets: { node: 'current' } }]
+  ]
+});
+
+require('./upload-telemetry-data/index.ts');
diff --git a/x-pack/legacy/plugins/apm/scripts/upload-telemetry-data/download-telemetry-template.ts b/x-pack/legacy/plugins/apm/scripts/upload-telemetry-data/download-telemetry-template.ts
new file mode 100644
index 0000000000000..dfed9223ef708
--- /dev/null
+++ b/x-pack/legacy/plugins/apm/scripts/upload-telemetry-data/download-telemetry-template.ts
@@ -0,0 +1,26 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+// @ts-ignore
+import { Octokit } from '@octokit/rest';
+
+export async function downloadTelemetryTemplate(octokit: Octokit) {
+  const file = await octokit.repos.getContents({
+    owner: 'elastic',
+    repo: 'telemetry',
+    path: 'config/templates/xpack-phone-home.json',
+    // @ts-ignore
+    mediaType: {
+      format: 'application/vnd.github.VERSION.raw'
+    }
+  });
+
+  if (Array.isArray(file.data)) {
+    throw new Error('Expected single response, got array');
+  }
+
+  return JSON.parse(Buffer.from(file.data.content!, 'base64').toString());
+}
diff --git a/x-pack/legacy/plugins/apm/scripts/upload-telemetry-data/generate-sample-documents.ts b/x-pack/legacy/plugins/apm/scripts/upload-telemetry-data/generate-sample-documents.ts
new file mode 100644
index 0000000000000..8d76063a7fdf6
--- /dev/null
+++ b/x-pack/legacy/plugins/apm/scripts/upload-telemetry-data/generate-sample-documents.ts
@@ -0,0 +1,124 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+import { DeepPartial } from 'utility-types';
+import {
+  merge,
+  omit,
+  defaultsDeep,
+  range,
+  mapValues,
+  isPlainObject,
+  flatten
+} from 'lodash';
+import uuid from 'uuid';
+import {
+  CollectTelemetryParams,
+  collectDataTelemetry
+  // eslint-disable-next-line @kbn/eslint/no-restricted-paths
+} from '../../../../../plugins/apm/server/lib/apm_telemetry/collect_data_telemetry';
+
+interface GenerateOptions {
+  days: number;
+  instances: number;
+  variation: {
+    min: number;
+    max: number;
+  };
+}
+
+const randomize = (
+  value: unknown,
+  instanceVariation: number,
+  dailyGrowth: number
+) => {
+  if (typeof value === 'boolean') {
+    return Math.random() > 0.5;
+  }
+  if (typeof value === 'number') {
+    return Math.round(instanceVariation * dailyGrowth * value);
+  }
+  return value;
+};
+
+const mapValuesDeep = (
+  obj: Record<string, any>,
+  iterator: (value: unknown, key: string, obj: Record<string, any>) => unknown
+): Record<string, any> =>
+  mapValues(obj, (val, key) =>
+    isPlainObject(val) ? mapValuesDeep(val, iterator) : iterator(val, key!, obj)
+  );
+
+export async function generateSampleDocuments(
+  options: DeepPartial<GenerateOptions> & {
+    collectTelemetryParams: CollectTelemetryParams;
+  }
+) {
+  const { collectTelemetryParams, ...preferredOptions } = options;
+
+  const opts: GenerateOptions = defaultsDeep(
+    {
+      days: 100,
+      instances: 50,
+      variation: {
+        min: 0.1,
+        max: 4
+      }
+    },
+    preferredOptions
+  );
+
+  const sample = await collectDataTelemetry(collectTelemetryParams);
+
+  console.log('Collected telemetry'); // eslint-disable-line no-console
+  console.log('\n' + JSON.stringify(sample, null, 2)); // eslint-disable-line no-console
+
+  const dateOfScriptExecution = new Date();
+
+  return flatten(
+    range(0, opts.instances).map(instanceNo => {
+      const instanceId = uuid.v4();
+      const defaults = {
+        cluster_uuid: instanceId,
+        stack_stats: {
+          kibana: {
+            versions: {
+              version: '8.0.0'
+            }
+          }
+        }
+      };
+
+      const instanceVariation =
+        Math.random() * (opts.variation.max - opts.variation.min) +
+        opts.variation.min;
+
+      return range(0, opts.days).map(dayNo => {
+        const dailyGrowth = Math.pow(1.005, opts.days - 1 - dayNo);
+
+        const timestamp = Date.UTC(
+          dateOfScriptExecution.getFullYear(),
+          dateOfScriptExecution.getMonth(),
+          -dayNo
+        );
+
+        const generated = mapValuesDeep(omit(sample, 'versions'), value =>
+          randomize(value, instanceVariation, dailyGrowth)
+        );
+
+        return merge({}, defaults, {
+          timestamp,
+          stack_stats: {
+            kibana: {
+              plugins: {
+                apm: merge({}, sample, generated)
+              }
+            }
+          }
+        });
+      });
+    })
+  );
+}
diff --git a/x-pack/legacy/plugins/apm/scripts/upload-telemetry-data/index.ts b/x-pack/legacy/plugins/apm/scripts/upload-telemetry-data/index.ts
new file mode 100644
index 0000000000000..bdc57eac412fc
--- /dev/null
+++ b/x-pack/legacy/plugins/apm/scripts/upload-telemetry-data/index.ts
@@ -0,0 +1,208 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+// This script downloads the telemetry mapping, runs the APM telemetry tasks,
+// generates a bunch of randomized data based on the downloaded sample,
+// and uploads it to a cluster of your choosing in the same format as it is
+// stored in the telemetry cluster. Its purpose is twofold:
+// - Easier testing of the telemetry tasks
+// - Validate whether we can run the queries we want to on the telemetry data
+
+import fs from 'fs';
+import path from 'path';
+// @ts-ignore
+import { Octokit } from '@octokit/rest';
+import { merge, chunk, flatten, pick, identity } from 'lodash';
+import axios from 'axios';
+import yaml from 'js-yaml';
+import { Client } from 'elasticsearch';
+import { argv } from 'yargs';
+import { promisify } from 'util';
+import { Logger } from 'kibana/server';
+// @ts-ignore
+import consoleStamp from 'console-stamp';
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import { CollectTelemetryParams } from '../../../../../plugins/apm/server/lib/apm_telemetry/collect_data_telemetry';
+import { downloadTelemetryTemplate } from './download-telemetry-template';
+import mapping from '../../mappings.json';
+import { generateSampleDocuments } from './generate-sample-documents';
+
+consoleStamp(console, '[HH:MM:ss.l]');
+
+const githubToken = process.env.GITHUB_TOKEN;
+
+if (!githubToken) {
+  throw new Error('GITHUB_TOKEN was not provided.');
+}
+
+const kibanaConfigDir = path.join(__filename, '../../../../../../../config');
+const kibanaDevConfig = path.join(kibanaConfigDir, 'kibana.dev.yml');
+const kibanaConfig = path.join(kibanaConfigDir, 'kibana.yml');
+
+const xpackTelemetryIndexName = 'xpack-phone-home';
+
+const loadedKibanaConfig = (yaml.safeLoad(
+  fs.readFileSync(
+    fs.existsSync(kibanaDevConfig) ? kibanaDevConfig : kibanaConfig,
+    'utf8'
+  )
+) || {}) as {};
+
+const cliEsCredentials = pick(
+  {
+    'elasticsearch.username': process.env.ELASTICSEARCH_USERNAME,
+    'elasticsearch.password': process.env.ELASTICSEARCH_PASSWORD,
+    'elasticsearch.hosts': process.env.ELASTICSEARCH_HOST
+  },
+  identity
+) as {
+  'elasticsearch.username': string;
+  'elasticsearch.password': string;
+  'elasticsearch.hosts': string;
+};
+
+const config = {
+  'apm_oss.transactionIndices': 'apm-*',
+  'apm_oss.metricsIndices': 'apm-*',
+  'apm_oss.errorIndices': 'apm-*',
+  'apm_oss.spanIndices': 'apm-*',
+  'apm_oss.onboardingIndices': 'apm-*',
+  'apm_oss.sourcemapIndices': 'apm-*',
+  'elasticsearch.hosts': 'http://localhost:9200',
+  ...loadedKibanaConfig,
+  ...cliEsCredentials
+};
+
+async function uploadData() {
+  const octokit = new Octokit({
+    auth: githubToken
+  });
+
+  const telemetryTemplate = await downloadTelemetryTemplate(octokit);
+
+  const kibanaMapping = mapping['apm-telemetry'];
+
+  const httpAuth =
+    config['elasticsearch.username'] && config['elasticsearch.password']
+      ? {
+          username: config['elasticsearch.username'],
+          password: config['elasticsearch.password']
+        }
+      : null;
+
+  const client = new Client({
+    host: config['elasticsearch.hosts'],
+    ...(httpAuth
+      ? {
+          httpAuth: `${httpAuth.username}:${httpAuth.password}`
+        }
+      : {})
+  });
+
+  if (argv.clear) {
+    try {
+      await promisify(client.indices.delete.bind(client))({
+        index: xpackTelemetryIndexName
+      });
+    } catch (err) {
+      // 404 = index not found, totally okay
+      if (err.status !== 404) {
+        throw err;
+      }
+    }
+  }
+
+  const axiosInstance = axios.create({
+    baseURL: config['elasticsearch.hosts'],
+    ...(httpAuth ? { auth: httpAuth } : {})
+  });
+
+  const newTemplate = merge(telemetryTemplate, {
+    settings: {
+      index: { mapping: { total_fields: { limit: 10000 } } }
+    }
+  });
+
+  // override apm mapping instead of merging
+  newTemplate.mappings.properties.stack_stats.properties.kibana.properties.plugins.properties.apm = kibanaMapping;
+
+  await axiosInstance.put(`/_template/xpack-phone-home`, newTemplate);
+
+  const sampleDocuments = await generateSampleDocuments({
+    collectTelemetryParams: {
+      logger: (console as unknown) as Logger,
+      indices: {
+        ...config,
+        apmCustomLinkIndex: '.apm-custom-links',
+        apmAgentConfigurationIndex: '.apm-agent-configuration'
+      },
+      search: body => {
+        return promisify(client.search.bind(client))({
+          ...body,
+          requestTimeout: 120000
+        }) as any;
+      },
+      indicesStats: body => {
+        return promisify(client.indices.stats.bind(client))({
+          ...body,
+          requestTimeout: 120000
+        }) as any;
+      },
+      transportRequest: (params => {
+        return axiosInstance[params.method](params.path);
+      }) as CollectTelemetryParams['transportRequest']
+    }
+  });
+
+  const chunks = chunk(sampleDocuments, 250);
+
+  await chunks.reduce<Promise<any>>((prev, documents) => {
+    return prev.then(async () => {
+      const body = flatten(
+        documents.map(doc => [{ index: { _index: 'xpack-phone-home' } }, doc])
+      );
+
+      return promisify(client.bulk.bind(client))({
+        body,
+        refresh: true
+      }).then((response: any) => {
+        if (response.errors) {
+          const firstError = response.items.filter(
+            (item: any) => item.index.status >= 400
+          )[0].index.error;
+          throw new Error(`Failed to upload documents: ${firstError.reason} `);
+        }
+      });
+    });
+  }, Promise.resolve());
+}
+
+uploadData()
+  .catch(e => {
+    if ('response' in e) {
+      if (typeof e.response === 'string') {
+        // eslint-disable-next-line no-console
+        console.log(e.response);
+      } else {
+        // eslint-disable-next-line no-console
+        console.log(
+          JSON.stringify(
+            e.response,
+            ['status', 'statusText', 'headers', 'data'],
+            2
+          )
+        );
+      }
+    } else {
+      // eslint-disable-next-line no-console
+      console.log(e);
+    }
+    process.exit(1);
+  })
+  .then(() => {
+    // eslint-disable-next-line no-console
+    console.log('Finished uploading generated telemetry data');
+  });
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 897d4e979fce3..5de82a9ee8788 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
@@ -2,6 +2,8 @@
 
 exports[`Error AGENT_NAME 1`] = `"java"`;
 
+exports[`Error AGENT_VERSION 1`] = `"agent version"`;
+
 exports[`Error CLIENT_GEO_COUNTRY_ISO_CODE 1`] = `undefined`;
 
 exports[`Error CONTAINER_ID 1`] = `undefined`;
@@ -56,7 +58,7 @@ exports[`Error METRIC_SYSTEM_TOTAL_MEMORY 1`] = `undefined`;
 
 exports[`Error OBSERVER_LISTENING 1`] = `undefined`;
 
-exports[`Error OBSERVER_VERSION_MAJOR 1`] = `undefined`;
+exports[`Error OBSERVER_VERSION_MAJOR 1`] = `8`;
 
 exports[`Error PARENT_ID 1`] = `"parentId"`;
 
@@ -68,10 +70,20 @@ exports[`Error SERVICE_ENVIRONMENT 1`] = `undefined`;
 
 exports[`Error SERVICE_FRAMEWORK_NAME 1`] = `undefined`;
 
+exports[`Error SERVICE_FRAMEWORK_VERSION 1`] = `undefined`;
+
+exports[`Error SERVICE_LANGUAGE_NAME 1`] = `"nodejs"`;
+
+exports[`Error SERVICE_LANGUAGE_VERSION 1`] = `"v1337"`;
+
 exports[`Error SERVICE_NAME 1`] = `"service name"`;
 
 exports[`Error SERVICE_NODE_NAME 1`] = `undefined`;
 
+exports[`Error SERVICE_RUNTIME_NAME 1`] = `undefined`;
+
+exports[`Error SERVICE_RUNTIME_VERSION 1`] = `undefined`;
+
 exports[`Error SERVICE_VERSION 1`] = `undefined`;
 
 exports[`Error SPAN_ACTION 1`] = `undefined`;
@@ -112,10 +124,14 @@ exports[`Error URL_FULL 1`] = `undefined`;
 
 exports[`Error USER_AGENT_NAME 1`] = `undefined`;
 
+exports[`Error USER_AGENT_ORIGINAL 1`] = `undefined`;
+
 exports[`Error USER_ID 1`] = `undefined`;
 
 exports[`Span AGENT_NAME 1`] = `"java"`;
 
+exports[`Span AGENT_VERSION 1`] = `"agent version"`;
+
 exports[`Span CLIENT_GEO_COUNTRY_ISO_CODE 1`] = `undefined`;
 
 exports[`Span CONTAINER_ID 1`] = `undefined`;
@@ -170,7 +186,7 @@ exports[`Span METRIC_SYSTEM_TOTAL_MEMORY 1`] = `undefined`;
 
 exports[`Span OBSERVER_LISTENING 1`] = `undefined`;
 
-exports[`Span OBSERVER_VERSION_MAJOR 1`] = `undefined`;
+exports[`Span OBSERVER_VERSION_MAJOR 1`] = `8`;
 
 exports[`Span PARENT_ID 1`] = `"parentId"`;
 
@@ -182,10 +198,20 @@ exports[`Span SERVICE_ENVIRONMENT 1`] = `undefined`;
 
 exports[`Span SERVICE_FRAMEWORK_NAME 1`] = `undefined`;
 
+exports[`Span SERVICE_FRAMEWORK_VERSION 1`] = `undefined`;
+
+exports[`Span SERVICE_LANGUAGE_NAME 1`] = `undefined`;
+
+exports[`Span SERVICE_LANGUAGE_VERSION 1`] = `undefined`;
+
 exports[`Span SERVICE_NAME 1`] = `"service name"`;
 
 exports[`Span SERVICE_NODE_NAME 1`] = `undefined`;
 
+exports[`Span SERVICE_RUNTIME_NAME 1`] = `undefined`;
+
+exports[`Span SERVICE_RUNTIME_VERSION 1`] = `undefined`;
+
 exports[`Span SERVICE_VERSION 1`] = `undefined`;
 
 exports[`Span SPAN_ACTION 1`] = `"my action"`;
@@ -226,10 +252,14 @@ exports[`Span URL_FULL 1`] = `undefined`;
 
 exports[`Span USER_AGENT_NAME 1`] = `undefined`;
 
+exports[`Span USER_AGENT_ORIGINAL 1`] = `undefined`;
+
 exports[`Span USER_ID 1`] = `undefined`;
 
 exports[`Transaction AGENT_NAME 1`] = `"java"`;
 
+exports[`Transaction AGENT_VERSION 1`] = `"agent version"`;
+
 exports[`Transaction CLIENT_GEO_COUNTRY_ISO_CODE 1`] = `undefined`;
 
 exports[`Transaction CONTAINER_ID 1`] = `"container1234567890abcdef"`;
@@ -284,7 +314,7 @@ exports[`Transaction METRIC_SYSTEM_TOTAL_MEMORY 1`] = `undefined`;
 
 exports[`Transaction OBSERVER_LISTENING 1`] = `undefined`;
 
-exports[`Transaction OBSERVER_VERSION_MAJOR 1`] = `undefined`;
+exports[`Transaction OBSERVER_VERSION_MAJOR 1`] = `8`;
 
 exports[`Transaction PARENT_ID 1`] = `"parentId"`;
 
@@ -296,10 +326,20 @@ exports[`Transaction SERVICE_ENVIRONMENT 1`] = `undefined`;
 
 exports[`Transaction SERVICE_FRAMEWORK_NAME 1`] = `undefined`;
 
+exports[`Transaction SERVICE_FRAMEWORK_VERSION 1`] = `undefined`;
+
+exports[`Transaction SERVICE_LANGUAGE_NAME 1`] = `"nodejs"`;
+
+exports[`Transaction SERVICE_LANGUAGE_VERSION 1`] = `"v1337"`;
+
 exports[`Transaction SERVICE_NAME 1`] = `"service name"`;
 
 exports[`Transaction SERVICE_NODE_NAME 1`] = `undefined`;
 
+exports[`Transaction SERVICE_RUNTIME_NAME 1`] = `undefined`;
+
+exports[`Transaction SERVICE_RUNTIME_VERSION 1`] = `undefined`;
+
 exports[`Transaction SERVICE_VERSION 1`] = `undefined`;
 
 exports[`Transaction SPAN_ACTION 1`] = `undefined`;
@@ -340,4 +380,6 @@ exports[`Transaction URL_FULL 1`] = `"http://www.elastic.co"`;
 
 exports[`Transaction USER_AGENT_NAME 1`] = `"Other"`;
 
+exports[`Transaction USER_AGENT_ORIGINAL 1`] = `"test original"`;
+
 exports[`Transaction USER_ID 1`] = `"1337"`;
diff --git a/x-pack/plugins/apm/common/agent_name.ts b/x-pack/plugins/apm/common/agent_name.ts
index bb68eb88b8e18..085828b729ea5 100644
--- a/x-pack/plugins/apm/common/agent_name.ts
+++ b/x-pack/plugins/apm/common/agent_name.ts
@@ -4,36 +4,40 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+import { AgentName } from '../typings/es_schemas/ui/fields/agent';
+
 /*
  * Agent names can be any string. This list only defines the official agents
  * that we might want to target specifically eg. linking to their documentation
  * & telemetry reporting. Support additional agent types by appending
  * definitions in mappings.json (for telemetry), the AgentName type, and the
- * agentNames object.
+ * AGENT_NAMES array.
  */
-import { AgentName } from '../typings/es_schemas/ui/fields/agent';
 
-const agentNames: { [agentName in AgentName]: agentName } = {
-  python: 'python',
-  java: 'java',
-  nodejs: 'nodejs',
-  'js-base': 'js-base',
-  'rum-js': 'rum-js',
-  dotnet: 'dotnet',
-  ruby: 'ruby',
-  go: 'go'
-};
+export const AGENT_NAMES: AgentName[] = [
+  'java',
+  'js-base',
+  'rum-js',
+  'dotnet',
+  'go',
+  'java',
+  'nodejs',
+  'python',
+  'ruby'
+];
 
-export function isAgentName(agentName: string): boolean {
-  return Object.values(agentNames).includes(agentName as AgentName);
+export function isAgentName(agentName: string): agentName is AgentName {
+  return AGENT_NAMES.includes(agentName as AgentName);
 }
 
-export function isRumAgentName(agentName: string | undefined) {
-  return (
-    agentName === agentNames['js-base'] || agentName === agentNames['rum-js']
-  );
+export function isRumAgentName(
+  agentName: string | undefined
+): agentName is 'js-base' | 'rum-js' {
+  return agentName === 'js-base' || agentName === 'rum-js';
 }
 
-export function isJavaAgentName(agentName: string | undefined) {
-  return agentName === agentNames.java;
+export function isJavaAgentName(
+  agentName: string | undefined
+): agentName is 'java' {
+  return agentName === 'java';
 }
diff --git a/x-pack/plugins/apm/common/apm_saved_object_constants.ts b/x-pack/plugins/apm/common/apm_saved_object_constants.ts
index ac43b700117c6..0529d90fe940a 100644
--- a/x-pack/plugins/apm/common/apm_saved_object_constants.ts
+++ b/x-pack/plugins/apm/common/apm_saved_object_constants.ts
@@ -4,11 +4,13 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-// APM Services telemetry
-export const APM_SERVICES_TELEMETRY_SAVED_OBJECT_TYPE =
-  'apm-services-telemetry';
-export const APM_SERVICES_TELEMETRY_SAVED_OBJECT_ID = 'apm-services-telemetry';
+// the types have to match the names of the saved object mappings
+// in /x-pack/legacy/plugins/apm/mappings.json
 
 // APM indices
 export const APM_INDICES_SAVED_OBJECT_TYPE = 'apm-indices';
 export const APM_INDICES_SAVED_OBJECT_ID = 'apm-indices';
+
+// APM telemetry
+export const APM_TELEMETRY_SAVED_OBJECT_TYPE = 'apm-telemetry';
+export const APM_TELEMETRY_SAVED_OBJECT_ID = 'apm-telemetry';
diff --git a/x-pack/plugins/apm/common/elasticsearch_fieldnames.test.ts b/x-pack/plugins/apm/common/elasticsearch_fieldnames.test.ts
index 1add2427d16a0..63fa749cd9f2c 100644
--- a/x-pack/plugins/apm/common/elasticsearch_fieldnames.test.ts
+++ b/x-pack/plugins/apm/common/elasticsearch_fieldnames.test.ts
@@ -15,7 +15,10 @@ describe('Transaction', () => {
   const transaction: AllowUnknownProperties<Transaction> = {
     '@timestamp': new Date().toString(),
     '@metadata': 'whatever',
-    observer: 'whatever',
+    observer: {
+      version: 'whatever',
+      version_major: 8
+    },
     agent: {
       name: 'java',
       version: 'agent version'
@@ -63,7 +66,10 @@ describe('Span', () => {
   const span: AllowUnknownProperties<Span> = {
     '@timestamp': new Date().toString(),
     '@metadata': 'whatever',
-    observer: 'whatever',
+    observer: {
+      version: 'whatever',
+      version_major: 8
+    },
     agent: {
       name: 'java',
       version: 'agent version'
@@ -107,7 +113,10 @@ describe('Span', () => {
 describe('Error', () => {
   const errorDoc: AllowUnknownProperties<APMError> = {
     '@metadata': 'whatever',
-    observer: 'whatever',
+    observer: {
+      version: 'whatever',
+      version_major: 8
+    },
     agent: {
       name: 'java',
       version: 'agent version'
diff --git a/x-pack/plugins/apm/common/elasticsearch_fieldnames.ts b/x-pack/plugins/apm/common/elasticsearch_fieldnames.ts
index 822201baddd88..bc1b346f50da7 100644
--- a/x-pack/plugins/apm/common/elasticsearch_fieldnames.ts
+++ b/x-pack/plugins/apm/common/elasticsearch_fieldnames.ts
@@ -4,15 +4,24 @@
  * 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_FRAMEWORK_NAME = 'service.framework.name';
+export const SERVICE_FRAMEWORK_VERSION = 'service.framework.version';
+export const SERVICE_LANGUAGE_NAME = 'service.language.name';
+export const SERVICE_LANGUAGE_VERSION = 'service.language.version';
+export const SERVICE_RUNTIME_NAME = 'service.runtime.name';
+export const SERVICE_RUNTIME_VERSION = 'service.runtime.version';
 export const SERVICE_NODE_NAME = 'service.node.name';
 export const SERVICE_VERSION = 'service.version';
+
+export const AGENT_NAME = 'agent.name';
+export const AGENT_VERSION = 'agent.version';
+
 export const URL_FULL = 'url.full';
 export const HTTP_REQUEST_METHOD = 'http.request.method';
 export const USER_ID = 'user.id';
+export const USER_AGENT_ORIGINAL = 'user_agent.original';
 export const USER_AGENT_NAME = 'user_agent.name';
 
 export const DESTINATION_ADDRESS = 'destination.address';
diff --git a/x-pack/plugins/apm/kibana.json b/x-pack/plugins/apm/kibana.json
index 96579377c95e8..dadb1dff6d7a9 100644
--- a/x-pack/plugins/apm/kibana.json
+++ b/x-pack/plugins/apm/kibana.json
@@ -3,8 +3,11 @@
   "server": true,
   "version": "8.0.0",
   "kibanaVersion": "kibana",
-  "configPath": ["xpack", "apm"],
+  "configPath": [
+    "xpack",
+    "apm"
+  ],
   "ui": false,
   "requiredPlugins": ["apm_oss", "data", "home", "licensing"],
-  "optionalPlugins": ["cloud", "usageCollection"]
+  "optionalPlugins": ["cloud", "usageCollection", "taskManager"]
 }
diff --git a/x-pack/plugins/apm/server/index.ts b/x-pack/plugins/apm/server/index.ts
index 8afdb9e99c1a3..77655568a7e9c 100644
--- a/x-pack/plugins/apm/server/index.ts
+++ b/x-pack/plugins/apm/server/index.ts
@@ -29,7 +29,8 @@ export const config = {
       enabled: schema.boolean({ defaultValue: true }),
       transactionGroupBucketSize: schema.number({ defaultValue: 100 }),
       maxTraceItems: schema.number({ defaultValue: 1000 })
-    })
+    }),
+    telemetryCollectionEnabled: schema.boolean({ defaultValue: true })
   })
 };
 
@@ -62,7 +63,8 @@ export function mergeConfigs(
     'xpack.apm.ui.maxTraceItems': apmConfig.ui.maxTraceItems,
     'xpack.apm.ui.transactionGroupBucketSize':
       apmConfig.ui.transactionGroupBucketSize,
-    'xpack.apm.autocreateApmIndexPattern': apmConfig.autocreateApmIndexPattern
+    'xpack.apm.autocreateApmIndexPattern': apmConfig.autocreateApmIndexPattern,
+    'xpack.apm.telemetryCollectionEnabled': apmConfig.telemetryCollectionEnabled
   };
 }
 
diff --git a/x-pack/plugins/apm/server/lib/apm_telemetry/__test__/index.test.ts b/x-pack/plugins/apm/server/lib/apm_telemetry/__test__/index.test.ts
deleted file mode 100644
index c45c74a791aee..0000000000000
--- a/x-pack/plugins/apm/server/lib/apm_telemetry/__test__/index.test.ts
+++ /dev/null
@@ -1,83 +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 { SavedObjectAttributes } from '../../../../../../../src/core/server';
-import { createApmTelementry, storeApmServicesTelemetry } from '../index';
-import {
-  APM_SERVICES_TELEMETRY_SAVED_OBJECT_TYPE,
-  APM_SERVICES_TELEMETRY_SAVED_OBJECT_ID
-} from '../../../../common/apm_saved_object_constants';
-
-describe('apm_telemetry', () => {
-  describe('createApmTelementry', () => {
-    it('should create a ApmTelemetry object with boolean flag and frequency map of the given list of AgentNames', () => {
-      const apmTelemetry = createApmTelementry([
-        'go',
-        'nodejs',
-        'go',
-        'js-base'
-      ]);
-      expect(apmTelemetry.has_any_services).toBe(true);
-      expect(apmTelemetry.services_per_agent).toMatchObject({
-        go: 2,
-        nodejs: 1,
-        'js-base': 1
-      });
-    });
-    it('should ignore undefined or unknown AgentName values', () => {
-      const apmTelemetry = createApmTelementry([
-        'go',
-        'nodejs',
-        'go',
-        'js-base',
-        'example-platform' as any,
-        undefined as any
-      ]);
-      expect(apmTelemetry.services_per_agent).toMatchObject({
-        go: 2,
-        nodejs: 1,
-        'js-base': 1
-      });
-    });
-  });
-
-  describe('storeApmServicesTelemetry', () => {
-    let apmTelemetry: SavedObjectAttributes;
-    let savedObjectsClient: any;
-
-    beforeEach(() => {
-      apmTelemetry = {
-        has_any_services: true,
-        services_per_agent: {
-          go: 2,
-          nodejs: 1,
-          'js-base': 1
-        }
-      };
-      savedObjectsClient = { create: jest.fn() };
-    });
-
-    it('should call savedObjectsClient create with the given ApmTelemetry object', () => {
-      storeApmServicesTelemetry(savedObjectsClient, apmTelemetry);
-      expect(savedObjectsClient.create.mock.calls[0][1]).toBe(apmTelemetry);
-    });
-
-    it('should call savedObjectsClient create with the apm-telemetry document type and ID', () => {
-      storeApmServicesTelemetry(savedObjectsClient, apmTelemetry);
-      expect(savedObjectsClient.create.mock.calls[0][0]).toBe(
-        APM_SERVICES_TELEMETRY_SAVED_OBJECT_TYPE
-      );
-      expect(savedObjectsClient.create.mock.calls[0][2].id).toBe(
-        APM_SERVICES_TELEMETRY_SAVED_OBJECT_ID
-      );
-    });
-
-    it('should call savedObjectsClient create with overwrite: true', () => {
-      storeApmServicesTelemetry(savedObjectsClient, apmTelemetry);
-      expect(savedObjectsClient.create.mock.calls[0][2].overwrite).toBe(true);
-    });
-  });
-});
diff --git a/x-pack/plugins/apm/server/lib/apm_telemetry/collect_data_telemetry/index.ts b/x-pack/plugins/apm/server/lib/apm_telemetry/collect_data_telemetry/index.ts
new file mode 100644
index 0000000000000..729ccb73d73f3
--- /dev/null
+++ b/x-pack/plugins/apm/server/lib/apm_telemetry/collect_data_telemetry/index.ts
@@ -0,0 +1,77 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+import { merge } from 'lodash';
+import { Logger, CallAPIOptions } from 'kibana/server';
+import { IndicesStatsParams, Client } from 'elasticsearch';
+import {
+  ESSearchRequest,
+  ESSearchResponse
+} from '../../../../typings/elasticsearch';
+import { ApmIndicesConfig } from '../../settings/apm_indices/get_apm_indices';
+import { tasks } from './tasks';
+import { APMDataTelemetry } from '../types';
+
+type TelemetryTaskExecutor = (params: {
+  indices: ApmIndicesConfig;
+  search<TSearchRequest extends ESSearchRequest>(
+    params: TSearchRequest
+  ): Promise<ESSearchResponse<unknown, TSearchRequest>>;
+  indicesStats(
+    params: IndicesStatsParams,
+    options?: CallAPIOptions
+  ): ReturnType<Client['indices']['stats']>;
+  transportRequest: (params: {
+    path: string;
+    method: 'get';
+  }) => Promise<unknown>;
+}) => Promise<APMDataTelemetry>;
+
+export interface TelemetryTask {
+  name: string;
+  executor: TelemetryTaskExecutor;
+}
+
+export type CollectTelemetryParams = Parameters<TelemetryTaskExecutor>[0] & {
+  logger: Logger;
+};
+
+export function collectDataTelemetry({
+  search,
+  indices,
+  logger,
+  indicesStats,
+  transportRequest
+}: CollectTelemetryParams) {
+  return tasks.reduce((prev, task) => {
+    return prev.then(async data => {
+      logger.debug(`Executing APM telemetry task ${task.name}`);
+      try {
+        const time = process.hrtime();
+        const next = await task.executor({
+          search,
+          indices,
+          indicesStats,
+          transportRequest
+        });
+        const took = process.hrtime(time);
+
+        return merge({}, data, next, {
+          tasks: {
+            [task.name]: {
+              took: {
+                ms: Math.round(took[0] * 1000 + took[1] / 1e6)
+              }
+            }
+          }
+        });
+      } catch (err) {
+        logger.warn(`Failed executing APM telemetry task ${task.name}`);
+        logger.warn(err);
+        return data;
+      }
+    });
+  }, Promise.resolve({} as APMDataTelemetry));
+}
diff --git a/x-pack/plugins/apm/server/lib/apm_telemetry/collect_data_telemetry/tasks.ts b/x-pack/plugins/apm/server/lib/apm_telemetry/collect_data_telemetry/tasks.ts
new file mode 100644
index 0000000000000..415076b6ae116
--- /dev/null
+++ b/x-pack/plugins/apm/server/lib/apm_telemetry/collect_data_telemetry/tasks.ts
@@ -0,0 +1,725 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+import { flatten, merge, sortBy, sum } from 'lodash';
+import { AgentName } from '../../../../typings/es_schemas/ui/fields/agent';
+import { AGENT_NAMES } from '../../../../common/agent_name';
+import { Transaction } from '../../../../typings/es_schemas/ui/transaction';
+import {
+  PROCESSOR_EVENT,
+  SERVICE_NAME,
+  AGENT_NAME,
+  AGENT_VERSION,
+  ERROR_GROUP_ID,
+  TRANSACTION_NAME,
+  PARENT_ID,
+  SERVICE_FRAMEWORK_NAME,
+  SERVICE_FRAMEWORK_VERSION,
+  SERVICE_LANGUAGE_NAME,
+  SERVICE_LANGUAGE_VERSION,
+  SERVICE_RUNTIME_NAME,
+  SERVICE_RUNTIME_VERSION,
+  USER_AGENT_ORIGINAL
+} from '../../../../common/elasticsearch_fieldnames';
+import { Span } from '../../../../typings/es_schemas/ui/span';
+import { APMError } from '../../../../typings/es_schemas/ui/apm_error';
+import { TelemetryTask } from '.';
+import { APMTelemetry } from '../types';
+
+const TIME_RANGES = ['1d', 'all'] as const;
+type TimeRange = typeof TIME_RANGES[number];
+
+export const tasks: TelemetryTask[] = [
+  {
+    name: 'processor_events',
+    executor: async ({ indices, search }) => {
+      const indicesByProcessorEvent = {
+        error: indices['apm_oss.errorIndices'],
+        metric: indices['apm_oss.metricsIndices'],
+        span: indices['apm_oss.spanIndices'],
+        transaction: indices['apm_oss.transactionIndices'],
+        onboarding: indices['apm_oss.onboardingIndices'],
+        sourcemap: indices['apm_oss.sourcemapIndices']
+      };
+
+      type ProcessorEvent = keyof typeof indicesByProcessorEvent;
+
+      const jobs: Array<{
+        processorEvent: ProcessorEvent;
+        timeRange: TimeRange;
+      }> = flatten(
+        (Object.keys(
+          indicesByProcessorEvent
+        ) as ProcessorEvent[]).map(processorEvent =>
+          TIME_RANGES.map(timeRange => ({ processorEvent, timeRange }))
+        )
+      );
+
+      const allData = await jobs.reduce((prevJob, current) => {
+        return prevJob.then(async data => {
+          const { processorEvent, timeRange } = current;
+
+          const response = await search({
+            index: indicesByProcessorEvent[processorEvent],
+            body: {
+              size: 1,
+              query: {
+                bool: {
+                  filter: [
+                    { term: { [PROCESSOR_EVENT]: processorEvent } },
+                    ...(timeRange !== 'all'
+                      ? [
+                          {
+                            range: {
+                              '@timestamp': {
+                                gte: `now-${timeRange}`
+                              }
+                            }
+                          }
+                        ]
+                      : [])
+                  ]
+                }
+              },
+              sort: {
+                '@timestamp': 'asc'
+              },
+              _source: ['@timestamp'],
+              track_total_hits: true
+            }
+          });
+
+          const event = response.hits.hits[0]?._source as {
+            '@timestamp': number;
+          };
+
+          return merge({}, data, {
+            counts: {
+              [processorEvent]: {
+                [timeRange]: response.hits.total.value
+              }
+            },
+            ...(timeRange === 'all' && event
+              ? {
+                  retainment: {
+                    [processorEvent]: {
+                      ms:
+                        new Date().getTime() -
+                        new Date(event['@timestamp']).getTime()
+                    }
+                  }
+                }
+              : {})
+          });
+        });
+      }, Promise.resolve({} as Record<string, { counts: Record<ProcessorEvent, Record<TimeRange, number>> }>));
+
+      return allData;
+    }
+  },
+  {
+    name: 'agent_configuration',
+    executor: async ({ indices, search }) => {
+      const agentConfigurationCount = (
+        await search({
+          index: indices.apmAgentConfigurationIndex,
+          body: {
+            size: 0,
+            track_total_hits: true
+          }
+        })
+      ).hits.total.value;
+
+      return {
+        counts: {
+          agent_configuration: {
+            all: agentConfigurationCount
+          }
+        }
+      };
+    }
+  },
+  {
+    name: 'services',
+    executor: async ({ indices, search }) => {
+      const servicesPerAgent = await AGENT_NAMES.reduce(
+        (prevJob, agentName) => {
+          return prevJob.then(async data => {
+            const response = await search({
+              index: [
+                indices['apm_oss.errorIndices'],
+                indices['apm_oss.spanIndices'],
+                indices['apm_oss.metricsIndices'],
+                indices['apm_oss.transactionIndices']
+              ],
+              body: {
+                size: 0,
+                query: {
+                  bool: {
+                    filter: [
+                      {
+                        term: {
+                          [AGENT_NAME]: agentName
+                        }
+                      },
+                      {
+                        range: {
+                          '@timestamp': {
+                            gte: 'now-1d'
+                          }
+                        }
+                      }
+                    ]
+                  }
+                },
+                aggs: {
+                  services: {
+                    cardinality: {
+                      field: SERVICE_NAME
+                    }
+                  }
+                }
+              }
+            });
+
+            return {
+              ...data,
+              [agentName]: response.aggregations?.services.value || 0
+            };
+          });
+        },
+        Promise.resolve({} as Record<AgentName, number>)
+      );
+
+      return {
+        has_any_services: sum(Object.values(servicesPerAgent)) > 0,
+        services_per_agent: servicesPerAgent
+      };
+    }
+  },
+  {
+    name: 'versions',
+    executor: async ({ search, indices }) => {
+      const response = await search({
+        index: [
+          indices['apm_oss.transactionIndices'],
+          indices['apm_oss.spanIndices'],
+          indices['apm_oss.errorIndices']
+        ],
+        terminateAfter: 1,
+        body: {
+          query: {
+            exists: {
+              field: 'observer.version'
+            }
+          },
+          size: 1,
+          sort: {
+            '@timestamp': 'desc'
+          }
+        }
+      });
+
+      const hit = response.hits.hits[0]?._source as Pick<
+        Transaction | Span | APMError,
+        'observer'
+      >;
+
+      if (!hit || !hit.observer?.version) {
+        return {};
+      }
+
+      const [major, minor, patch] = hit.observer.version
+        .split('.')
+        .map(part => Number(part));
+
+      return {
+        versions: {
+          apm_server: {
+            major,
+            minor,
+            patch
+          }
+        }
+      };
+    }
+  },
+  {
+    name: 'groupings',
+    executor: async ({ search, indices }) => {
+      const range1d = { range: { '@timestamp': { gte: 'now-1d' } } };
+      const errorGroupsCount = (
+        await search({
+          index: indices['apm_oss.errorIndices'],
+          body: {
+            size: 0,
+            query: {
+              bool: {
+                filter: [{ term: { [PROCESSOR_EVENT]: 'error' } }, range1d]
+              }
+            },
+            aggs: {
+              top_service: {
+                terms: {
+                  field: SERVICE_NAME,
+                  order: {
+                    error_groups: 'desc'
+                  },
+                  size: 1
+                },
+                aggs: {
+                  error_groups: {
+                    cardinality: {
+                      field: ERROR_GROUP_ID
+                    }
+                  }
+                }
+              }
+            }
+          }
+        })
+      ).aggregations?.top_service.buckets[0]?.error_groups.value;
+
+      const transactionGroupsCount = (
+        await search({
+          index: indices['apm_oss.transactionIndices'],
+          body: {
+            size: 0,
+            query: {
+              bool: {
+                filter: [
+                  { term: { [PROCESSOR_EVENT]: 'transaction' } },
+                  range1d
+                ]
+              }
+            },
+            aggs: {
+              top_service: {
+                terms: {
+                  field: SERVICE_NAME,
+                  order: {
+                    transaction_groups: 'desc'
+                  },
+                  size: 1
+                },
+                aggs: {
+                  transaction_groups: {
+                    cardinality: {
+                      field: TRANSACTION_NAME
+                    }
+                  }
+                }
+              }
+            }
+          }
+        })
+      ).aggregations?.top_service.buckets[0]?.transaction_groups.value;
+
+      const tracesPerDayCount = (
+        await search({
+          index: indices['apm_oss.transactionIndices'],
+          body: {
+            query: {
+              bool: {
+                filter: [
+                  { term: { [PROCESSOR_EVENT]: 'transaction' } },
+                  range1d
+                ],
+                must_not: {
+                  exists: { field: PARENT_ID }
+                }
+              }
+            },
+            track_total_hits: true,
+            size: 0
+          }
+        })
+      ).hits.total.value;
+
+      const servicesCount = (
+        await search({
+          index: [
+            indices['apm_oss.transactionIndices'],
+            indices['apm_oss.errorIndices'],
+            indices['apm_oss.metricsIndices']
+          ],
+          body: {
+            size: 0,
+            query: {
+              bool: {
+                filter: [range1d]
+              }
+            },
+            aggs: {
+              service_name: {
+                cardinality: {
+                  field: SERVICE_NAME
+                }
+              }
+            }
+          }
+        })
+      ).aggregations?.service_name.value;
+
+      return {
+        counts: {
+          max_error_groups_per_service: {
+            '1d': errorGroupsCount || 0
+          },
+          max_transaction_groups_per_service: {
+            '1d': transactionGroupsCount || 0
+          },
+          traces: {
+            '1d': tracesPerDayCount || 0
+          },
+          services: {
+            '1d': servicesCount || 0
+          }
+        }
+      };
+    }
+  },
+  {
+    name: 'integrations',
+    executor: async ({ transportRequest }) => {
+      const apmJobs = ['*-high_mean_response_time'];
+
+      const response = (await transportRequest({
+        method: 'get',
+        path: `/_ml/anomaly_detectors/${apmJobs.join(',')}`
+      })) as { data?: { count: number } };
+
+      return {
+        integrations: {
+          ml: {
+            all_jobs_count: response.data?.count ?? 0
+          }
+        }
+      };
+    }
+  },
+  {
+    name: 'agents',
+    executor: async ({ search, indices }) => {
+      const size = 3;
+
+      const agentData = await AGENT_NAMES.reduce(async (prevJob, agentName) => {
+        const data = await prevJob;
+
+        const response = await search({
+          index: [
+            indices['apm_oss.errorIndices'],
+            indices['apm_oss.metricsIndices'],
+            indices['apm_oss.transactionIndices']
+          ],
+          body: {
+            size: 0,
+            query: {
+              bool: {
+                filter: [
+                  { term: { [AGENT_NAME]: agentName } },
+                  { range: { '@timestamp': { gte: 'now-1d' } } }
+                ]
+              }
+            },
+            sort: {
+              '@timestamp': 'desc'
+            },
+            aggs: {
+              [AGENT_VERSION]: {
+                terms: {
+                  field: AGENT_VERSION,
+                  size
+                }
+              },
+              [SERVICE_FRAMEWORK_NAME]: {
+                terms: {
+                  field: SERVICE_FRAMEWORK_NAME,
+                  size
+                },
+                aggs: {
+                  [SERVICE_FRAMEWORK_VERSION]: {
+                    terms: {
+                      field: SERVICE_FRAMEWORK_VERSION,
+                      size
+                    }
+                  }
+                }
+              },
+              [SERVICE_FRAMEWORK_VERSION]: {
+                terms: {
+                  field: SERVICE_FRAMEWORK_VERSION,
+                  size
+                }
+              },
+              [SERVICE_LANGUAGE_NAME]: {
+                terms: {
+                  field: SERVICE_LANGUAGE_NAME,
+                  size
+                },
+                aggs: {
+                  [SERVICE_LANGUAGE_VERSION]: {
+                    terms: {
+                      field: SERVICE_LANGUAGE_VERSION,
+                      size
+                    }
+                  }
+                }
+              },
+              [SERVICE_LANGUAGE_VERSION]: {
+                terms: {
+                  field: SERVICE_LANGUAGE_VERSION,
+                  size
+                }
+              },
+              [SERVICE_RUNTIME_NAME]: {
+                terms: {
+                  field: SERVICE_RUNTIME_NAME,
+                  size
+                },
+                aggs: {
+                  [SERVICE_RUNTIME_VERSION]: {
+                    terms: {
+                      field: SERVICE_RUNTIME_VERSION,
+                      size
+                    }
+                  }
+                }
+              },
+              [SERVICE_RUNTIME_VERSION]: {
+                terms: {
+                  field: SERVICE_RUNTIME_VERSION,
+                  size
+                }
+              }
+            }
+          }
+        });
+
+        const { aggregations } = response;
+
+        if (!aggregations) {
+          return data;
+        }
+
+        const toComposite = (
+          outerKey: string | number,
+          innerKey: string | number
+        ) => `${outerKey}/${innerKey}`;
+
+        return {
+          ...data,
+          [agentName]: {
+            agent: {
+              version: aggregations[AGENT_VERSION].buckets.map(
+                bucket => bucket.key as string
+              )
+            },
+            service: {
+              framework: {
+                name: aggregations[SERVICE_FRAMEWORK_NAME].buckets
+                  .map(bucket => bucket.key as string)
+                  .slice(0, size),
+                version: aggregations[SERVICE_FRAMEWORK_VERSION].buckets
+                  .map(bucket => bucket.key as string)
+                  .slice(0, size),
+                composite: sortBy(
+                  flatten(
+                    aggregations[SERVICE_FRAMEWORK_NAME].buckets.map(bucket =>
+                      bucket[SERVICE_FRAMEWORK_VERSION].buckets.map(
+                        versionBucket => ({
+                          doc_count: versionBucket.doc_count,
+                          name: toComposite(bucket.key, versionBucket.key)
+                        })
+                      )
+                    )
+                  ),
+                  'doc_count'
+                )
+                  .reverse()
+                  .slice(0, size)
+                  .map(composite => composite.name)
+              },
+              language: {
+                name: aggregations[SERVICE_LANGUAGE_NAME].buckets
+                  .map(bucket => bucket.key as string)
+                  .slice(0, size),
+                version: aggregations[SERVICE_LANGUAGE_VERSION].buckets
+                  .map(bucket => bucket.key as string)
+                  .slice(0, size),
+                composite: sortBy(
+                  flatten(
+                    aggregations[SERVICE_LANGUAGE_NAME].buckets.map(bucket =>
+                      bucket[SERVICE_LANGUAGE_VERSION].buckets.map(
+                        versionBucket => ({
+                          doc_count: versionBucket.doc_count,
+                          name: toComposite(bucket.key, versionBucket.key)
+                        })
+                      )
+                    )
+                  ),
+                  'doc_count'
+                )
+                  .reverse()
+                  .slice(0, size)
+                  .map(composite => composite.name)
+              },
+              runtime: {
+                name: aggregations[SERVICE_RUNTIME_NAME].buckets
+                  .map(bucket => bucket.key as string)
+                  .slice(0, size),
+                version: aggregations[SERVICE_RUNTIME_VERSION].buckets
+                  .map(bucket => bucket.key as string)
+                  .slice(0, size),
+                composite: sortBy(
+                  flatten(
+                    aggregations[SERVICE_RUNTIME_NAME].buckets.map(bucket =>
+                      bucket[SERVICE_RUNTIME_VERSION].buckets.map(
+                        versionBucket => ({
+                          doc_count: versionBucket.doc_count,
+                          name: toComposite(bucket.key, versionBucket.key)
+                        })
+                      )
+                    )
+                  ),
+                  'doc_count'
+                )
+                  .reverse()
+                  .slice(0, size)
+                  .map(composite => composite.name)
+              }
+            }
+          }
+        };
+      }, Promise.resolve({} as APMTelemetry['agents']));
+
+      return {
+        agents: agentData
+      };
+    }
+  },
+  {
+    name: 'indices_stats',
+    executor: async ({ indicesStats, indices }) => {
+      const response = await indicesStats({
+        index: [
+          indices.apmAgentConfigurationIndex,
+          indices['apm_oss.errorIndices'],
+          indices['apm_oss.metricsIndices'],
+          indices['apm_oss.onboardingIndices'],
+          indices['apm_oss.sourcemapIndices'],
+          indices['apm_oss.spanIndices'],
+          indices['apm_oss.transactionIndices']
+        ]
+      });
+
+      return {
+        indices: {
+          shards: {
+            total: response._shards.total
+          },
+          all: {
+            total: {
+              docs: {
+                count: response._all.total.docs.count
+              },
+              store: {
+                size_in_bytes: response._all.total.store.size_in_bytes
+              }
+            }
+          }
+        }
+      };
+    }
+  },
+  {
+    name: 'cardinality',
+    executor: async ({ search }) => {
+      const allAgentsCardinalityResponse = await search({
+        body: {
+          size: 0,
+          query: {
+            bool: {
+              filter: [{ range: { '@timestamp': { gte: 'now-1d' } } }]
+            }
+          },
+          aggs: {
+            [TRANSACTION_NAME]: {
+              cardinality: {
+                field: TRANSACTION_NAME
+              }
+            },
+            [USER_AGENT_ORIGINAL]: {
+              cardinality: {
+                field: USER_AGENT_ORIGINAL
+              }
+            }
+          }
+        }
+      });
+
+      const rumAgentCardinalityResponse = await search({
+        body: {
+          size: 0,
+          query: {
+            bool: {
+              filter: [
+                { range: { '@timestamp': { gte: 'now-1d' } } },
+                { terms: { [AGENT_NAME]: ['rum-js', 'js-base'] } }
+              ]
+            }
+          },
+          aggs: {
+            [TRANSACTION_NAME]: {
+              cardinality: {
+                field: TRANSACTION_NAME
+              }
+            },
+            [USER_AGENT_ORIGINAL]: {
+              cardinality: {
+                field: USER_AGENT_ORIGINAL
+              }
+            }
+          }
+        }
+      });
+
+      return {
+        cardinality: {
+          transaction: {
+            name: {
+              all_agents: {
+                '1d':
+                  allAgentsCardinalityResponse.aggregations?.[TRANSACTION_NAME]
+                    .value
+              },
+              rum: {
+                '1d':
+                  rumAgentCardinalityResponse.aggregations?.[TRANSACTION_NAME]
+                    .value
+              }
+            }
+          },
+          user_agent: {
+            original: {
+              all_agents: {
+                '1d':
+                  allAgentsCardinalityResponse.aggregations?.[
+                    USER_AGENT_ORIGINAL
+                  ].value
+              },
+              rum: {
+                '1d':
+                  rumAgentCardinalityResponse.aggregations?.[
+                    USER_AGENT_ORIGINAL
+                  ].value
+              }
+            }
+          }
+        }
+      };
+    }
+  }
+];
diff --git a/x-pack/plugins/apm/server/lib/apm_telemetry/index.ts b/x-pack/plugins/apm/server/lib/apm_telemetry/index.ts
index a2b0494730826..c80057a2894dc 100644
--- a/x-pack/plugins/apm/server/lib/apm_telemetry/index.ts
+++ b/x-pack/plugins/apm/server/lib/apm_telemetry/index.ts
@@ -3,60 +3,127 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-
-import { countBy } from 'lodash';
-import { SavedObjectAttributes } from '../../../../../../src/core/server';
-import { isAgentName } from '../../../common/agent_name';
+import { CoreSetup, Logger } from 'src/core/server';
+import { Observable } from 'rxjs';
+import { take } from 'rxjs/operators';
+import { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
+import {
+  TaskManagerStartContract,
+  TaskManagerSetupContract
+} from '../../../../task_manager/server';
+import { getApmIndices } from '../settings/apm_indices/get_apm_indices';
 import {
-  APM_SERVICES_TELEMETRY_SAVED_OBJECT_TYPE,
-  APM_SERVICES_TELEMETRY_SAVED_OBJECT_ID
+  APM_TELEMETRY_SAVED_OBJECT_ID,
+  APM_TELEMETRY_SAVED_OBJECT_TYPE
 } from '../../../common/apm_saved_object_constants';
-import { UsageCollectionSetup } from '../../../../../../src/plugins/usage_collection/server';
-import { InternalSavedObjectsClient } from '../helpers/get_internal_saved_objects_client';
-
-export function createApmTelementry(
-  agentNames: string[] = []
-): SavedObjectAttributes {
-  const validAgentNames = agentNames.filter(isAgentName);
-  return {
-    has_any_services: validAgentNames.length > 0,
-    services_per_agent: countBy(validAgentNames)
+import {
+  collectDataTelemetry,
+  CollectTelemetryParams
+} from './collect_data_telemetry';
+import { APMConfig } from '../..';
+import { getInternalSavedObjectsClient } from '../helpers/get_internal_saved_objects_client';
+
+const APM_TELEMETRY_TASK_NAME = 'apm-telemetry-task';
+
+export async function createApmTelemetry({
+  core,
+  config$,
+  usageCollector,
+  taskManager,
+  logger
+}: {
+  core: CoreSetup;
+  config$: Observable<APMConfig>;
+  usageCollector: UsageCollectionSetup;
+  taskManager: TaskManagerSetupContract;
+  logger: Logger;
+}) {
+  const savedObjectsClient = await getInternalSavedObjectsClient(core);
+
+  const collectAndStore = async () => {
+    const config = await config$.pipe(take(1)).toPromise();
+    const esClient = core.elasticsearch.dataClient;
+
+    const indices = await getApmIndices({
+      config,
+      savedObjectsClient
+    });
+
+    const search = esClient.callAsInternalUser.bind(
+      esClient,
+      'search'
+    ) as CollectTelemetryParams['search'];
+
+    const indicesStats = esClient.callAsInternalUser.bind(
+      esClient,
+      'indices.stats'
+    ) as CollectTelemetryParams['indicesStats'];
+
+    const transportRequest = esClient.callAsInternalUser.bind(
+      esClient,
+      'transport.request'
+    ) as CollectTelemetryParams['transportRequest'];
+
+    const dataTelemetry = await collectDataTelemetry({
+      search,
+      indices,
+      logger,
+      indicesStats,
+      transportRequest
+    });
+
+    await savedObjectsClient.create(
+      APM_TELEMETRY_SAVED_OBJECT_TYPE,
+      dataTelemetry,
+      { id: APM_TELEMETRY_SAVED_OBJECT_TYPE, overwrite: true }
+    );
   };
-}
 
-export async function storeApmServicesTelemetry(
-  savedObjectsClient: InternalSavedObjectsClient,
-  apmTelemetry: SavedObjectAttributes
-) {
-  return savedObjectsClient.create(
-    APM_SERVICES_TELEMETRY_SAVED_OBJECT_TYPE,
-    apmTelemetry,
-    {
-      id: APM_SERVICES_TELEMETRY_SAVED_OBJECT_ID,
-      overwrite: true
+  taskManager.registerTaskDefinitions({
+    [APM_TELEMETRY_TASK_NAME]: {
+      title: 'Collect APM telemetry',
+      type: APM_TELEMETRY_TASK_NAME,
+      createTaskRunner: () => {
+        return {
+          run: async () => {
+            await collectAndStore();
+          }
+        };
+      }
     }
-  );
-}
+  });
 
-export function makeApmUsageCollector(
-  usageCollector: UsageCollectionSetup,
-  savedObjectsRepository: InternalSavedObjectsClient
-) {
-  const apmUsageCollector = usageCollector.makeUsageCollector({
+  const collector = usageCollector.makeUsageCollector({
     type: 'apm',
     fetch: async () => {
-      try {
-        const apmTelemetrySavedObject = await savedObjectsRepository.get(
-          APM_SERVICES_TELEMETRY_SAVED_OBJECT_TYPE,
-          APM_SERVICES_TELEMETRY_SAVED_OBJECT_ID
-        );
-        return apmTelemetrySavedObject.attributes;
-      } catch (err) {
-        return createApmTelementry();
-      }
+      const data = (
+        await savedObjectsClient.get(
+          APM_TELEMETRY_SAVED_OBJECT_TYPE,
+          APM_TELEMETRY_SAVED_OBJECT_ID
+        )
+      ).attributes;
+
+      return data;
     },
     isReady: () => true
   });
 
-  usageCollector.registerCollector(apmUsageCollector);
+  usageCollector.registerCollector(collector);
+
+  core.getStartServices().then(([coreStart, pluginsStart]) => {
+    const { taskManager: taskManagerStart } = pluginsStart as {
+      taskManager: TaskManagerStartContract;
+    };
+
+    taskManagerStart.ensureScheduled({
+      id: APM_TELEMETRY_TASK_NAME,
+      taskType: APM_TELEMETRY_TASK_NAME,
+      schedule: {
+        interval: '720m'
+      },
+      scope: ['apm'],
+      params: {},
+      state: {}
+    });
+  });
 }
diff --git a/x-pack/plugins/apm/server/lib/apm_telemetry/types.ts b/x-pack/plugins/apm/server/lib/apm_telemetry/types.ts
new file mode 100644
index 0000000000000..f68dc517a2227
--- /dev/null
+++ b/x-pack/plugins/apm/server/lib/apm_telemetry/types.ts
@@ -0,0 +1,118 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { DeepPartial } from 'utility-types';
+import { AgentName } from '../../../typings/es_schemas/ui/fields/agent';
+
+export interface TimeframeMap {
+  '1d': number;
+  all: number;
+}
+
+export type TimeframeMap1d = Pick<TimeframeMap, '1d'>;
+export type TimeframeMapAll = Pick<TimeframeMap, 'all'>;
+
+export type APMDataTelemetry = DeepPartial<{
+  has_any_services: boolean;
+  services_per_agent: Record<AgentName, number>;
+  versions: {
+    apm_server: {
+      minor: number;
+      major: number;
+      patch: number;
+    };
+  };
+  counts: {
+    transaction: TimeframeMap;
+    span: TimeframeMap;
+    error: TimeframeMap;
+    metric: TimeframeMap;
+    sourcemap: TimeframeMap;
+    onboarding: TimeframeMap;
+    agent_configuration: TimeframeMapAll;
+    max_transaction_groups_per_service: TimeframeMap;
+    max_error_groups_per_service: TimeframeMap;
+    traces: TimeframeMap;
+    services: TimeframeMap;
+  };
+  cardinality: {
+    user_agent: {
+      original: {
+        all_agents: TimeframeMap1d;
+        rum: TimeframeMap1d;
+      };
+    };
+    transaction: {
+      name: {
+        all_agents: TimeframeMap1d;
+        rum: TimeframeMap1d;
+      };
+    };
+  };
+  retainment: Record<
+    'span' | 'transaction' | 'error' | 'metric' | 'sourcemap' | 'onboarding',
+    { ms: number }
+  >;
+  integrations: {
+    ml: {
+      all_jobs_count: number;
+    };
+  };
+  agents: Record<
+    AgentName,
+    {
+      agent: {
+        version: string[];
+      };
+      service: {
+        framework: {
+          name: string[];
+          version: string[];
+          composite: string[];
+        };
+        language: {
+          name: string[];
+          version: string[];
+          composite: string[];
+        };
+        runtime: {
+          name: string[];
+          version: string[];
+          composite: string[];
+        };
+      };
+    }
+  >;
+  indices: {
+    shards: {
+      total: number;
+    };
+    all: {
+      total: {
+        docs: {
+          count: number;
+        };
+        store: {
+          size_in_bytes: number;
+        };
+      };
+    };
+  };
+  tasks: Record<
+    | 'processor_events'
+    | 'agent_configuration'
+    | 'services'
+    | 'versions'
+    | 'groupings'
+    | 'integrations'
+    | 'agents'
+    | 'indices_stats'
+    | 'cardinality',
+    { took: { ms: number } }
+  >;
+}>;
+
+export type APMTelemetry = APMDataTelemetry;
diff --git a/x-pack/plugins/apm/server/lib/helpers/setup_request.test.ts b/x-pack/plugins/apm/server/lib/helpers/setup_request.test.ts
index 40a2a0e7216a0..8e8cf698a84cf 100644
--- a/x-pack/plugins/apm/server/lib/helpers/setup_request.test.ts
+++ b/x-pack/plugins/apm/server/lib/helpers/setup_request.test.ts
@@ -39,6 +39,19 @@ function getMockRequest() {
         _debug: false
       }
     },
+    __LEGACY: {
+      server: {
+        plugins: {
+          elasticsearch: {
+            getCluster: jest.fn().mockReturnValue({ callWithInternalUser: {} })
+          }
+        },
+        savedObjects: {
+          SavedObjectsClient: jest.fn(),
+          getSavedObjectsRepository: jest.fn()
+        }
+      }
+    },
     core: {
       elasticsearch: {
         dataClient: {
diff --git a/x-pack/plugins/apm/server/plugin.ts b/x-pack/plugins/apm/server/plugin.ts
index db14730f802a9..a29b9399d8435 100644
--- a/x-pack/plugins/apm/server/plugin.ts
+++ b/x-pack/plugins/apm/server/plugin.ts
@@ -8,9 +8,9 @@ import { Observable, combineLatest, AsyncSubject } from 'rxjs';
 import { map, take } from 'rxjs/operators';
 import { Server } from 'hapi';
 import { once } from 'lodash';
-import { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
+import { UsageCollectionSetup } from '../../../../src/plugins/usage_collection/server';
+import { TaskManagerSetupContract } from '../../task_manager/server';
 import { APMOSSPluginSetup } from '../../../../src/plugins/apm_oss/server';
-import { makeApmUsageCollector } from './lib/apm_telemetry';
 import { createApmAgentConfigurationIndex } from './lib/settings/agent_configuration/create_agent_config_index';
 import { createApmCustomLinkIndex } from './lib/settings/custom_link/create_custom_link_index';
 import { createApmApi } from './routes/create_apm_api';
@@ -21,6 +21,7 @@ import { tutorialProvider } from './tutorial';
 import { CloudSetup } from '../../cloud/server';
 import { getInternalSavedObjectsClient } from './lib/helpers/get_internal_saved_objects_client';
 import { LicensingPluginSetup } from '../../licensing/public';
+import { createApmTelemetry } from './lib/apm_telemetry';
 
 export interface LegacySetup {
   server: Server;
@@ -47,9 +48,10 @@ export class APMPlugin implements Plugin<APMPluginContract> {
       licensing: LicensingPluginSetup;
       cloud?: CloudSetup;
       usageCollection?: UsageCollectionSetup;
+      taskManager?: TaskManagerSetupContract;
     }
   ) {
-    const logger = this.initContext.logger.get('apm');
+    const logger = this.initContext.logger.get();
     const config$ = this.initContext.config.create<APMXPackConfig>();
     const mergedConfig$ = combineLatest(plugins.apm_oss.config$, config$).pipe(
       map(([apmOssConfig, apmConfig]) => mergeConfigs(apmOssConfig, apmConfig))
@@ -61,6 +63,20 @@ export class APMPlugin implements Plugin<APMPluginContract> {
 
     const currentConfig = await mergedConfig$.pipe(take(1)).toPromise();
 
+    if (
+      plugins.taskManager &&
+      plugins.usageCollection &&
+      currentConfig['xpack.apm.telemetryCollectionEnabled']
+    ) {
+      createApmTelemetry({
+        core,
+        config$: mergedConfig$,
+        usageCollector: plugins.usageCollection,
+        taskManager: plugins.taskManager,
+        logger
+      });
+    }
+
     // create agent configuration index without blocking setup lifecycle
     createApmAgentConfigurationIndex({
       esClient: core.elasticsearch.dataClient,
@@ -89,18 +105,6 @@ export class APMPlugin implements Plugin<APMPluginContract> {
       })
     );
 
-    const usageCollection = plugins.usageCollection;
-    if (usageCollection) {
-      getInternalSavedObjectsClient(core)
-        .then(savedObjectsClient => {
-          makeApmUsageCollector(usageCollection, savedObjectsClient);
-        })
-        .catch(error => {
-          logger.error('Unable to initialize use collection');
-          logger.error(error.message);
-        });
-    }
-
     return {
       config$: mergedConfig$,
       registerLegacyAPI: once((__LEGACY: LegacySetup) => {
@@ -115,6 +119,7 @@ export class APMPlugin implements Plugin<APMPluginContract> {
     };
   }
 
-  public start() {}
+  public async start() {}
+
   public stop() {}
 }
diff --git a/x-pack/plugins/apm/server/routes/create_api/index.test.ts b/x-pack/plugins/apm/server/routes/create_api/index.test.ts
index e639bb5101e2f..312dae1d1f9d2 100644
--- a/x-pack/plugins/apm/server/routes/create_api/index.test.ts
+++ b/x-pack/plugins/apm/server/routes/create_api/index.test.ts
@@ -36,6 +36,7 @@ const getCoreMock = () => {
     put,
     createRouter,
     context: {
+      measure: () => undefined,
       config$: new BehaviorSubject({} as APMConfig),
       logger: ({
         error: jest.fn()
diff --git a/x-pack/plugins/apm/server/routes/services.ts b/x-pack/plugins/apm/server/routes/services.ts
index 2d4fae9d2707a..1c6561ee24c93 100644
--- a/x-pack/plugins/apm/server/routes/services.ts
+++ b/x-pack/plugins/apm/server/routes/services.ts
@@ -5,11 +5,6 @@
  */
 
 import * as t from 'io-ts';
-import { AgentName } from '../../typings/es_schemas/ui/fields/agent';
-import {
-  createApmTelementry,
-  storeApmServicesTelemetry
-} from '../lib/apm_telemetry';
 import { setupRequest } from '../lib/helpers/setup_request';
 import { getServiceAgentName } from '../lib/services/get_service_agent_name';
 import { getServices } from '../lib/services/get_services';
@@ -18,7 +13,6 @@ import { getServiceNodeMetadata } from '../lib/services/get_service_node_metadat
 import { createRoute } from './create_route';
 import { uiFiltersRt, rangeRt } from './default_api_types';
 import { getServiceAnnotations } from '../lib/services/annotations';
-import { getInternalSavedObjectsClient } from '../lib/helpers/get_internal_saved_objects_client';
 
 export const servicesRoute = createRoute(core => ({
   path: '/api/apm/services',
@@ -29,16 +23,6 @@ export const servicesRoute = createRoute(core => ({
     const setup = await setupRequest(context, request);
     const services = await getServices(setup);
 
-    // Store telemetry data derived from services
-    const agentNames = services.items.map(
-      ({ agentName }) => agentName as AgentName
-    );
-    const apmTelemetry = createApmTelementry(agentNames);
-    const savedObjectsClient = await getInternalSavedObjectsClient(core);
-    storeApmServicesTelemetry(savedObjectsClient, apmTelemetry).catch(error => {
-      context.logger.error(error.message);
-    });
-
     return services;
   }
 }));
diff --git a/x-pack/plugins/apm/typings/elasticsearch/aggregations.ts b/x-pack/plugins/apm/typings/elasticsearch/aggregations.ts
index 6d3620f11a87b..8a8d256cf4273 100644
--- a/x-pack/plugins/apm/typings/elasticsearch/aggregations.ts
+++ b/x-pack/plugins/apm/typings/elasticsearch/aggregations.ts
@@ -126,6 +126,16 @@ export interface AggregationOptionsByType {
     combine_script: Script;
     reduce_script: Script;
   };
+  date_range: {
+    field: string;
+    format?: string;
+    ranges: Array<
+      | { from: string | number }
+      | { to: string | number }
+      | { from: string | number; to: string | number }
+    >;
+    keyed?: boolean;
+  };
 }
 
 type AggregationType = keyof AggregationOptionsByType;
@@ -136,6 +146,15 @@ type AggregationOptionsMap = Unionize<
   }
 > & { aggs?: AggregationInputMap };
 
+interface DateRangeBucket {
+  key: string;
+  to?: number;
+  from?: number;
+  to_as_string?: string;
+  from_as_string?: string;
+  doc_count: number;
+}
+
 export interface AggregationInputMap {
   [key: string]: AggregationOptionsMap;
 }
@@ -276,6 +295,11 @@ interface AggregationResponsePart<
   scripted_metric: {
     value: unknown;
   };
+  date_range: {
+    buckets: TAggregationOptionsMap extends { date_range: { keyed: true } }
+      ? Record<string, DateRangeBucket>
+      : { buckets: DateRangeBucket[] };
+  };
 }
 
 // Type for debugging purposes. If you see an error in AggregationResponseMap
@@ -285,7 +309,7 @@ interface AggregationResponsePart<
 
 // type MissingAggregationResponseTypes = Exclude<
 //   AggregationType,
-//   keyof AggregationResponsePart<{}>
+//   keyof AggregationResponsePart<{}, unknown>
 // >;
 
 export type AggregationResponseMap<
diff --git a/x-pack/plugins/apm/typings/es_schemas/raw/error_raw.ts b/x-pack/plugins/apm/typings/es_schemas/raw/error_raw.ts
index daf65e44980b6..8e49d02beb908 100644
--- a/x-pack/plugins/apm/typings/es_schemas/raw/error_raw.ts
+++ b/x-pack/plugins/apm/typings/es_schemas/raw/error_raw.ts
@@ -15,6 +15,7 @@ import { Service } from './fields/service';
 import { IStackframe } from './fields/stackframe';
 import { Url } from './fields/url';
 import { User } from './fields/user';
+import { Observer } from './fields/observer';
 
 interface Processor {
   name: 'error';
@@ -61,4 +62,5 @@ export interface ErrorRaw extends APMBaseDoc {
   service: Service;
   url?: Url;
   user?: User;
+  observer?: Observer;
 }
diff --git a/x-pack/plugins/apm/typings/es_schemas/raw/fields/observer.ts b/x-pack/plugins/apm/typings/es_schemas/raw/fields/observer.ts
new file mode 100644
index 0000000000000..42843130ec47f
--- /dev/null
+++ b/x-pack/plugins/apm/typings/es_schemas/raw/fields/observer.ts
@@ -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.
+ */
+
+export interface Observer {
+  version: string;
+  version_major: number;
+}
diff --git a/x-pack/plugins/apm/typings/es_schemas/raw/span_raw.ts b/x-pack/plugins/apm/typings/es_schemas/raw/span_raw.ts
index dbd9e7ede4256..4d5d2c5c4a12e 100644
--- a/x-pack/plugins/apm/typings/es_schemas/raw/span_raw.ts
+++ b/x-pack/plugins/apm/typings/es_schemas/raw/span_raw.ts
@@ -6,6 +6,7 @@
 
 import { APMBaseDoc } from './apm_base_doc';
 import { IStackframe } from './fields/stackframe';
+import { Observer } from './fields/observer';
 
 interface Processor {
   name: 'transaction';
@@ -50,4 +51,5 @@ export interface SpanRaw extends APMBaseDoc {
   transaction?: {
     id: string;
   };
+  observer?: Observer;
 }
diff --git a/x-pack/plugins/apm/typings/es_schemas/raw/transaction_raw.ts b/x-pack/plugins/apm/typings/es_schemas/raw/transaction_raw.ts
index 3673f1f13c403..b8ebb4cf8da51 100644
--- a/x-pack/plugins/apm/typings/es_schemas/raw/transaction_raw.ts
+++ b/x-pack/plugins/apm/typings/es_schemas/raw/transaction_raw.ts
@@ -15,6 +15,7 @@ import { Service } from './fields/service';
 import { Url } from './fields/url';
 import { User } from './fields/user';
 import { UserAgent } from './fields/user_agent';
+import { Observer } from './fields/observer';
 
 interface Processor {
   name: 'transaction';
@@ -61,4 +62,5 @@ export interface TransactionRaw extends APMBaseDoc {
   url?: Url;
   user?: User;
   user_agent?: UserAgent;
+  observer?: Observer;
 }

From dc31736dd28187750fd3cd51ed3aae7dc230179c Mon Sep 17 00:00:00 2001
From: Nathan Reese <reese.nathan@gmail.com>
Date: Mon, 23 Mar 2020 16:40:43 -0600
Subject: [PATCH 047/179] [Maps] Default ES document layer scaling type to
 clusters and show scaling UI in the create wizard (#60668)

* [Maps] show scaling panel in ES documents create wizard

* minor fix

* remove unused async state

* update create editor to use ScalingForm

* default geo field

* ts lint errors

* remove old dynamic filter behavior

* update jest tests

* eslint

* remove indexCount route

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 .../maps/public/actions/map_actions.d.ts      |   8 +
 .../layer_panel/view.d.ts                     |  14 +
 .../__snapshots__/scaling_form.test.tsx.snap  | 205 ++++++++++++
 .../update_source_editor.test.js.snap         | 315 +-----------------
 .../es_search_source/create_source_editor.js  | 189 +++++------
 .../es_search_source/scaling_form.test.tsx    |  47 +++
 .../sources/es_search_source/scaling_form.tsx | 230 +++++++++++++
 .../es_search_source/update_source_editor.js  | 196 +----------
 .../update_source_editor.test.js              |   8 -
 x-pack/legacy/plugins/maps/server/routes.js   |  20 --
 x-pack/plugins/maps/common/constants.ts       |  14 +-
 .../translations/translations/ja-JP.json      |   3 -
 .../translations/translations/zh-CN.json      |   3 -
 13 files changed, 636 insertions(+), 616 deletions(-)
 create mode 100644 x-pack/legacy/plugins/maps/public/connected_components/layer_panel/view.d.ts
 create mode 100644 x-pack/legacy/plugins/maps/public/layers/sources/es_search_source/__snapshots__/scaling_form.test.tsx.snap
 create mode 100644 x-pack/legacy/plugins/maps/public/layers/sources/es_search_source/scaling_form.test.tsx
 create mode 100644 x-pack/legacy/plugins/maps/public/layers/sources/es_search_source/scaling_form.tsx

diff --git a/x-pack/legacy/plugins/maps/public/actions/map_actions.d.ts b/x-pack/legacy/plugins/maps/public/actions/map_actions.d.ts
index 418f2880c1077..3a61d5affd861 100644
--- a/x-pack/legacy/plugins/maps/public/actions/map_actions.d.ts
+++ b/x-pack/legacy/plugins/maps/public/actions/map_actions.d.ts
@@ -5,6 +5,7 @@
  */
 /* eslint-disable @typescript-eslint/consistent-type-definitions */
 
+import { LAYER_TYPE } from '../../common/constants';
 import { DataMeta, MapFilters } from '../../common/data_request_descriptor_types';
 
 export type SyncContext = {
@@ -16,3 +17,10 @@ export type SyncContext = {
   registerCancelCallback(requestToken: symbol, callback: () => void): void;
   dataFilters: MapFilters;
 };
+
+export function updateSourceProp(
+  layerId: string,
+  propName: string,
+  value: unknown,
+  newLayerType?: LAYER_TYPE
+): void;
diff --git a/x-pack/legacy/plugins/maps/public/connected_components/layer_panel/view.d.ts b/x-pack/legacy/plugins/maps/public/connected_components/layer_panel/view.d.ts
new file mode 100644
index 0000000000000..6d1d076c723ad
--- /dev/null
+++ b/x-pack/legacy/plugins/maps/public/connected_components/layer_panel/view.d.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.
+ */
+/* eslint-disable @typescript-eslint/consistent-type-definitions */
+
+import { LAYER_TYPE } from '../../../common/constants';
+
+export type OnSourceChangeArgs = {
+  propName: string;
+  value: unknown;
+  newLayerType?: LAYER_TYPE;
+};
diff --git a/x-pack/legacy/plugins/maps/public/layers/sources/es_search_source/__snapshots__/scaling_form.test.tsx.snap b/x-pack/legacy/plugins/maps/public/layers/sources/es_search_source/__snapshots__/scaling_form.test.tsx.snap
new file mode 100644
index 0000000000000..967225d6f0fdc
--- /dev/null
+++ b/x-pack/legacy/plugins/maps/public/layers/sources/es_search_source/__snapshots__/scaling_form.test.tsx.snap
@@ -0,0 +1,205 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`should not render clusters option when clustering is not supported 1`] = `
+<Fragment>
+  <EuiTitle
+    size="xs"
+  >
+    <h5>
+      <FormattedMessage
+        defaultMessage="Scaling"
+        id="xpack.maps.esSearch.scaleTitle"
+        values={Object {}}
+      />
+    </h5>
+  </EuiTitle>
+  <EuiSpacer
+    size="m"
+  />
+  <EuiFormRow
+    describedByIds={Array []}
+    display="row"
+    fullWidth={false}
+    hasChildLabel={true}
+    hasEmptyLabelSpace={false}
+    labelType="label"
+  >
+    <EuiRadioGroup
+      idSelected="LIMIT"
+      onChange={[Function]}
+      options={
+        Array [
+          Object {
+            "id": "LIMIT",
+            "label": "Limit results to 10000.",
+          },
+          Object {
+            "id": "TOP_HITS",
+            "label": "Show top hits per entity.",
+          },
+        ]
+      }
+    />
+  </EuiFormRow>
+  <EuiFormRow
+    describedByIds={Array []}
+    display="row"
+    fullWidth={false}
+    hasChildLabel={true}
+    hasEmptyLabelSpace={false}
+    labelType="label"
+  >
+    <EuiSwitch
+      checked={true}
+      compressed={true}
+      label="Dynamically filter for data in the visible map area"
+      onChange={[Function]}
+    />
+  </EuiFormRow>
+</Fragment>
+`;
+
+exports[`should render 1`] = `
+<Fragment>
+  <EuiTitle
+    size="xs"
+  >
+    <h5>
+      <FormattedMessage
+        defaultMessage="Scaling"
+        id="xpack.maps.esSearch.scaleTitle"
+        values={Object {}}
+      />
+    </h5>
+  </EuiTitle>
+  <EuiSpacer
+    size="m"
+  />
+  <EuiFormRow
+    describedByIds={Array []}
+    display="row"
+    fullWidth={false}
+    hasChildLabel={true}
+    hasEmptyLabelSpace={false}
+    labelType="label"
+  >
+    <EuiRadioGroup
+      idSelected="LIMIT"
+      onChange={[Function]}
+      options={
+        Array [
+          Object {
+            "id": "LIMIT",
+            "label": "Limit results to 10000.",
+          },
+          Object {
+            "id": "TOP_HITS",
+            "label": "Show top hits per entity.",
+          },
+          Object {
+            "id": "CLUSTERS",
+            "label": "Show clusters when results exceed 10000.",
+          },
+        ]
+      }
+    />
+  </EuiFormRow>
+  <EuiFormRow
+    describedByIds={Array []}
+    display="row"
+    fullWidth={false}
+    hasChildLabel={true}
+    hasEmptyLabelSpace={false}
+    labelType="label"
+  >
+    <EuiSwitch
+      checked={true}
+      compressed={true}
+      label="Dynamically filter for data in the visible map area"
+      onChange={[Function]}
+    />
+  </EuiFormRow>
+</Fragment>
+`;
+
+exports[`should render top hits form when scaling type is TOP_HITS 1`] = `
+<Fragment>
+  <EuiTitle
+    size="xs"
+  >
+    <h5>
+      <FormattedMessage
+        defaultMessage="Scaling"
+        id="xpack.maps.esSearch.scaleTitle"
+        values={Object {}}
+      />
+    </h5>
+  </EuiTitle>
+  <EuiSpacer
+    size="m"
+  />
+  <EuiFormRow
+    describedByIds={Array []}
+    display="row"
+    fullWidth={false}
+    hasChildLabel={true}
+    hasEmptyLabelSpace={false}
+    labelType="label"
+  >
+    <EuiRadioGroup
+      idSelected="TOP_HITS"
+      onChange={[Function]}
+      options={
+        Array [
+          Object {
+            "id": "LIMIT",
+            "label": "Limit results to 10000.",
+          },
+          Object {
+            "id": "TOP_HITS",
+            "label": "Show top hits per entity.",
+          },
+          Object {
+            "id": "CLUSTERS",
+            "label": "Show clusters when results exceed 10000.",
+          },
+        ]
+      }
+    />
+  </EuiFormRow>
+  <EuiFormRow
+    describedByIds={Array []}
+    display="row"
+    fullWidth={false}
+    hasChildLabel={true}
+    hasEmptyLabelSpace={false}
+    labelType="label"
+  >
+    <EuiSwitch
+      checked={true}
+      compressed={true}
+      label="Dynamically filter for data in the visible map area"
+      onChange={[Function]}
+    />
+  </EuiFormRow>
+  <EuiHorizontalRule
+    margin="xs"
+  />
+  <EuiFormRow
+    describedByIds={Array []}
+    display="columnCompressed"
+    fullWidth={false}
+    hasChildLabel={true}
+    hasEmptyLabelSpace={false}
+    label="Entity"
+    labelType="label"
+  >
+    <SingleFieldSelect
+      compressed={true}
+      fields={Array []}
+      onChange={[Function]}
+      placeholder="Select entity field"
+    />
+  </EuiFormRow>
+</Fragment>
+`;
diff --git a/x-pack/legacy/plugins/maps/public/layers/sources/es_search_source/__snapshots__/update_source_editor.test.js.snap b/x-pack/legacy/plugins/maps/public/layers/sources/es_search_source/__snapshots__/update_source_editor.test.js.snap
index c94f305773f35..0cb7f67fb9c92 100644
--- a/x-pack/legacy/plugins/maps/public/layers/sources/es_search_source/__snapshots__/update_source_editor.test.js.snap
+++ b/x-pack/legacy/plugins/maps/public/layers/sources/es_search_source/__snapshots__/update_source_editor.test.js.snap
@@ -91,253 +91,16 @@ exports[`should enable sort order select when sort field provided 1`] = `
     size="s"
   />
   <EuiPanel>
-    <EuiTitle
-      size="xs"
-    >
-      <h5>
-        <FormattedMessage
-          defaultMessage="Scaling"
-          id="xpack.maps.esSearch.scaleTitle"
-          values={Object {}}
-        />
-      </h5>
-    </EuiTitle>
-    <EuiSpacer
-      size="m"
-    />
-    <EuiFormRow
-      describedByIds={Array []}
-      display="row"
-      fullWidth={false}
-      hasChildLabel={true}
-      hasEmptyLabelSpace={false}
-      labelType="label"
-    >
-      <EuiRadioGroup
-        idSelected="LIMIT"
-        onChange={[Function]}
-        options={
-          Array [
-            Object {
-              "id": "LIMIT",
-              "label": "Limit results to 10000.",
-            },
-            Object {
-              "id": "TOP_HITS",
-              "label": "Show top hits per entity.",
-            },
-          ]
-        }
-      />
-    </EuiFormRow>
-    <EuiFormRow
-      describedByIds={Array []}
-      display="row"
-      fullWidth={false}
-      hasChildLabel={true}
-      hasEmptyLabelSpace={false}
-      labelType="label"
-    >
-      <EuiSwitch
-        checked={true}
-        compressed={true}
-        label="Dynamically filter for data in the visible map area"
-        onChange={[Function]}
-      />
-    </EuiFormRow>
-  </EuiPanel>
-  <EuiSpacer
-    size="s"
-  />
-</Fragment>
-`;
-
-exports[`should render top hits form when scaling type is TOP_HITS 1`] = `
-<Fragment>
-  <EuiPanel>
-    <EuiTitle
-      size="xs"
-    >
-      <h5>
-        <FormattedMessage
-          defaultMessage="Tooltip fields"
-          id="xpack.maps.esSearch.tooltipsTitle"
-          values={Object {}}
-        />
-      </h5>
-    </EuiTitle>
-    <EuiSpacer
-      size="m"
-    />
-    <TooltipSelector
-      fields={null}
+    <ScalingForm
+      filterByMapBounds={true}
+      indexPatternId="indexPattern1"
       onChange={[Function]}
-      tooltipFields={Array []}
-    />
-  </EuiPanel>
-  <EuiSpacer
-    size="s"
-  />
-  <EuiPanel>
-    <EuiTitle
-      size="xs"
-    >
-      <h5>
-        <FormattedMessage
-          defaultMessage="Sorting"
-          id="xpack.maps.esSearch.sortTitle"
-          values={Object {}}
-        />
-      </h5>
-    </EuiTitle>
-    <EuiSpacer
-      size="m"
-    />
-    <EuiFormRow
-      describedByIds={Array []}
-      display="columnCompressed"
-      fullWidth={false}
-      hasChildLabel={true}
-      hasEmptyLabelSpace={false}
-      label="Field"
-      labelType="label"
-    >
-      <SingleFieldSelect
-        compressed={true}
-        fields={null}
-        onChange={[Function]}
-        placeholder="Select sort field"
-      />
-    </EuiFormRow>
-    <EuiFormRow
-      describedByIds={Array []}
-      display="columnCompressed"
-      fullWidth={false}
-      hasChildLabel={true}
-      hasEmptyLabelSpace={false}
-      label="Order"
-      labelType="label"
-    >
-      <EuiSelect
-        compressed={true}
-        disabled={true}
-        onChange={[Function]}
-        options={
-          Array [
-            Object {
-              "text": "ascending",
-              "value": "asc",
-            },
-            Object {
-              "text": "descending",
-              "value": "desc",
-            },
-          ]
-        }
-        value="DESC"
-      />
-    </EuiFormRow>
-  </EuiPanel>
-  <EuiSpacer
-    size="s"
-  />
-  <EuiPanel>
-    <EuiTitle
-      size="xs"
-    >
-      <h5>
-        <FormattedMessage
-          defaultMessage="Scaling"
-          id="xpack.maps.esSearch.scaleTitle"
-          values={Object {}}
-        />
-      </h5>
-    </EuiTitle>
-    <EuiSpacer
-      size="m"
+      scalingType="LIMIT"
+      supportsClustering={false}
+      termFields={null}
+      topHitsSize={1}
+      topHitsSplitField="trackId"
     />
-    <EuiFormRow
-      describedByIds={Array []}
-      display="row"
-      fullWidth={false}
-      hasChildLabel={true}
-      hasEmptyLabelSpace={false}
-      labelType="label"
-    >
-      <EuiRadioGroup
-        idSelected="TOP_HITS"
-        onChange={[Function]}
-        options={
-          Array [
-            Object {
-              "id": "LIMIT",
-              "label": "Limit results to 10000.",
-            },
-            Object {
-              "id": "TOP_HITS",
-              "label": "Show top hits per entity.",
-            },
-          ]
-        }
-      />
-    </EuiFormRow>
-    <EuiFormRow
-      describedByIds={Array []}
-      display="row"
-      fullWidth={false}
-      hasChildLabel={true}
-      hasEmptyLabelSpace={false}
-      labelType="label"
-    >
-      <EuiSwitch
-        checked={true}
-        compressed={true}
-        label="Dynamically filter for data in the visible map area"
-        onChange={[Function]}
-      />
-    </EuiFormRow>
-    <EuiHorizontalRule
-      margin="xs"
-    />
-    <EuiFormRow
-      describedByIds={Array []}
-      display="columnCompressed"
-      fullWidth={false}
-      hasChildLabel={true}
-      hasEmptyLabelSpace={false}
-      label="Entity"
-      labelType="label"
-    >
-      <SingleFieldSelect
-        compressed={true}
-        fields={null}
-        onChange={[Function]}
-        placeholder="Select entity field"
-        value="trackId"
-      />
-    </EuiFormRow>
-    <EuiFormRow
-      describedByIds={Array []}
-      display="columnCompressed"
-      fullWidth={false}
-      hasChildLabel={true}
-      hasEmptyLabelSpace={false}
-      label="Documents per entity"
-      labelType="label"
-    >
-      <ValidatedRange
-        compressed={true}
-        data-test-subj="layerPanelTopHitsSize"
-        max={100}
-        min={1}
-        onChange={[Function]}
-        showInput={true}
-        showLabels={true}
-        showRange={true}
-        step={1}
-        value={1}
-      />
-    </EuiFormRow>
   </EuiPanel>
   <EuiSpacer
     size="s"
@@ -435,60 +198,16 @@ exports[`should render update source editor 1`] = `
     size="s"
   />
   <EuiPanel>
-    <EuiTitle
-      size="xs"
-    >
-      <h5>
-        <FormattedMessage
-          defaultMessage="Scaling"
-          id="xpack.maps.esSearch.scaleTitle"
-          values={Object {}}
-        />
-      </h5>
-    </EuiTitle>
-    <EuiSpacer
-      size="m"
+    <ScalingForm
+      filterByMapBounds={true}
+      indexPatternId="indexPattern1"
+      onChange={[Function]}
+      scalingType="LIMIT"
+      supportsClustering={false}
+      termFields={null}
+      topHitsSize={1}
+      topHitsSplitField="trackId"
     />
-    <EuiFormRow
-      describedByIds={Array []}
-      display="row"
-      fullWidth={false}
-      hasChildLabel={true}
-      hasEmptyLabelSpace={false}
-      labelType="label"
-    >
-      <EuiRadioGroup
-        idSelected="LIMIT"
-        onChange={[Function]}
-        options={
-          Array [
-            Object {
-              "id": "LIMIT",
-              "label": "Limit results to 10000.",
-            },
-            Object {
-              "id": "TOP_HITS",
-              "label": "Show top hits per entity.",
-            },
-          ]
-        }
-      />
-    </EuiFormRow>
-    <EuiFormRow
-      describedByIds={Array []}
-      display="row"
-      fullWidth={false}
-      hasChildLabel={true}
-      hasEmptyLabelSpace={false}
-      labelType="label"
-    >
-      <EuiSwitch
-        checked={true}
-        compressed={true}
-        label="Dynamically filter for data in the visible map area"
-        onChange={[Function]}
-      />
-    </EuiFormRow>
   </EuiPanel>
   <EuiSpacer
     size="s"
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 895ad12f107d9..73bea574ace28 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
@@ -7,24 +7,17 @@
 import _ from 'lodash';
 import React, { Fragment, Component } from 'react';
 import PropTypes from 'prop-types';
-import { EuiFormRow, EuiSpacer, EuiSwitch, EuiCallOut } from '@elastic/eui';
+import { EuiFormRow, EuiSpacer } from '@elastic/eui';
 
 import { SingleFieldSelect } from '../../../components/single_field_select';
-import {
-  getIndexPatternService,
-  getIndexPatternSelectComponent,
-  getHttp,
-} from '../../../kibana_services';
+import { getIndexPatternService, getIndexPatternSelectComponent } from '../../../kibana_services';
 import { NoIndexPatternCallout } from '../../../components/no_index_pattern_callout';
-import { FormattedMessage } from '@kbn/i18n/react';
 import { i18n } from '@kbn/i18n';
-import {
-  ES_GEO_FIELD_TYPE,
-  GIS_API_PATH,
-  DEFAULT_MAX_RESULT_WINDOW,
-} from '../../../../common/constants';
+import { ES_GEO_FIELD_TYPE, SCALING_TYPES } from '../../../../common/constants';
 import { DEFAULT_FILTER_BY_MAP_BOUNDS } from './constants';
 import { indexPatterns } from '../../../../../../../../src/plugins/data/public';
+import { ScalingForm } from './scaling_form';
+import { getTermsFields } from '../../../index_pattern_util';
 
 function getGeoFields(fields) {
   return fields.filter(field => {
@@ -34,11 +27,26 @@ function getGeoFields(fields) {
     );
   });
 }
+
+function isGeoFieldAggregatable(indexPattern, geoFieldName) {
+  if (!indexPattern) {
+    return false;
+  }
+
+  const geoField = indexPattern.fields.getByName(geoFieldName);
+  return geoField && geoField.aggregatable;
+}
+
 const RESET_INDEX_PATTERN_STATE = {
   indexPattern: undefined,
-  geoField: undefined,
+  geoFields: undefined,
+
+  // ES search source descriptor state
+  geoFieldName: undefined,
   filterByMapBounds: DEFAULT_FILTER_BY_MAP_BOUNDS,
-  showFilterByBoundsSwitch: false,
+  scalingType: SCALING_TYPES.CLUSTERS, // turn on clusting by default
+  topHitsSplitField: undefined,
+  topHitsSize: 1,
 };
 
 export class CreateSourceEditor extends Component {
@@ -58,41 +66,28 @@ export class CreateSourceEditor extends Component {
 
   componentDidMount() {
     this._isMounted = true;
-    this.loadIndexPattern(this.state.indexPatternId);
   }
 
-  onIndexPatternSelect = indexPatternId => {
+  _onIndexPatternSelect = indexPatternId => {
     this.setState(
       {
         indexPatternId,
       },
-      this.loadIndexPattern(indexPatternId)
+      this._loadIndexPattern(indexPatternId)
     );
   };
 
-  loadIndexPattern = indexPatternId => {
+  _loadIndexPattern = indexPatternId => {
     this.setState(
       {
         isLoadingIndexPattern: true,
         ...RESET_INDEX_PATTERN_STATE,
       },
-      this.debouncedLoad.bind(null, indexPatternId)
+      this._debouncedLoad.bind(null, indexPatternId)
     );
   };
 
-  loadIndexDocCount = async indexPatternTitle => {
-    const http = getHttp();
-    const { count } = await http.fetch(`../${GIS_API_PATH}/indexCount`, {
-      method: 'GET',
-      credentials: 'same-origin',
-      query: {
-        index: indexPatternTitle,
-      },
-    });
-    return count;
-  };
-
-  debouncedLoad = _.debounce(async indexPatternId => {
+  _debouncedLoad = _.debounce(async indexPatternId => {
     if (!indexPatternId || indexPatternId.length === 0) {
       return;
     }
@@ -105,15 +100,6 @@ export class CreateSourceEditor extends Component {
       return;
     }
 
-    let indexHasSmallDocCount = false;
-    try {
-      const indexDocCount = await this.loadIndexDocCount(indexPattern.title);
-      indexHasSmallDocCount = indexDocCount <= DEFAULT_MAX_RESULT_WINDOW;
-    } catch (error) {
-      // retrieving index count is a nice to have and is not essential
-      // do not interrupt user flow if unable to retrieve count
-    }
-
     if (!this._isMounted) {
       return;
     }
@@ -124,43 +110,71 @@ export class CreateSourceEditor extends Component {
       return;
     }
 
+    const geoFields = getGeoFields(indexPattern.fields);
     this.setState({
       isLoadingIndexPattern: false,
       indexPattern: indexPattern,
-      filterByMapBounds: !indexHasSmallDocCount, // Turn off filterByMapBounds when index contains a limited number of documents
-      showFilterByBoundsSwitch: indexHasSmallDocCount,
+      geoFields,
     });
 
-    //make default selection
-    const geoFields = getGeoFields(indexPattern.fields);
-    if (geoFields[0]) {
-      this.onGeoFieldSelect(geoFields[0].name);
+    if (geoFields.length) {
+      // make default selection, prefer aggregatable field over the first available
+      const firstAggregatableGeoField = geoFields.find(geoField => {
+        return geoField.aggregatable;
+      });
+      const defaultGeoFieldName = firstAggregatableGeoField
+        ? firstAggregatableGeoField
+        : geoFields[0];
+      this._onGeoFieldSelect(defaultGeoFieldName.name);
     }
   }, 300);
 
-  onGeoFieldSelect = geoField => {
+  _onGeoFieldSelect = geoFieldName => {
+    // Respect previous scaling type selection unless newly selected geo field does not support clustering.
+    const scalingType =
+      this.state.scalingType === SCALING_TYPES.CLUSTERS &&
+      !isGeoFieldAggregatable(this.state.indexPattern, geoFieldName)
+        ? SCALING_TYPES.LIMIT
+        : this.state.scalingType;
     this.setState(
       {
-        geoField,
+        geoFieldName,
+        scalingType,
       },
-      this.previewLayer
+      this._previewLayer
     );
   };
 
-  onFilterByMapBoundsChange = event => {
+  _onScalingPropChange = ({ propName, value }) => {
     this.setState(
       {
-        filterByMapBounds: event.target.checked,
+        [propName]: value,
       },
-      this.previewLayer
+      this._previewLayer
     );
   };
 
-  previewLayer = () => {
-    const { indexPatternId, geoField, filterByMapBounds } = this.state;
+  _previewLayer = () => {
+    const {
+      indexPatternId,
+      geoFieldName,
+      filterByMapBounds,
+      scalingType,
+      topHitsSplitField,
+      topHitsSize,
+    } = this.state;
 
     const sourceConfig =
-      indexPatternId && geoField ? { indexPatternId, geoField, filterByMapBounds } : null;
+      indexPatternId && geoFieldName
+        ? {
+            indexPatternId,
+            geoField: geoFieldName,
+            filterByMapBounds,
+            scalingType,
+            topHitsSplitField,
+            topHitsSize,
+          }
+        : null;
     this.props.onSourceConfigChange(sourceConfig);
   };
 
@@ -183,56 +197,35 @@ export class CreateSourceEditor extends Component {
           placeholder={i18n.translate('xpack.maps.source.esSearch.selectLabel', {
             defaultMessage: 'Select geo field',
           })}
-          value={this.state.geoField}
-          onChange={this.onGeoFieldSelect}
-          fields={
-            this.state.indexPattern ? getGeoFields(this.state.indexPattern.fields) : undefined
-          }
+          value={this.state.geoFieldName}
+          onChange={this._onGeoFieldSelect}
+          fields={this.state.geoFields}
         />
       </EuiFormRow>
     );
   }
 
-  _renderFilterByMapBounds() {
-    if (!this.state.showFilterByBoundsSwitch) {
+  _renderScalingPanel() {
+    if (!this.state.indexPattern || !this.state.geoFieldName) {
       return null;
     }
 
     return (
       <Fragment>
-        <EuiCallOut
-          title={i18n.translate('xpack.maps.source.esSearch.disableFilterByMapBoundsTitle', {
-            defaultMessage: `Dynamic data filter disabled`,
-          })}
-        >
-          <p>
-            <FormattedMessage
-              id="xpack.maps.source.esSearch.disableFilterByMapBoundsExplainMsg"
-              defaultMessage="Index '{indexPatternTitle}' has a small number of documents and does not require dynamic filtering."
-              values={{
-                indexPatternTitle: this.state.indexPattern
-                  ? this.state.indexPattern.title
-                  : this.state.indexPatternId,
-              }}
-            />
-          </p>
-          <p>
-            <FormattedMessage
-              id="xpack.maps.source.esSearch.disableFilterByMapBoundsTurnOnMsg"
-              defaultMessage="Turn on dynamic filtering if you expect the number of documents to increase."
-            />
-          </p>
-        </EuiCallOut>
-        <EuiSpacer size="s" />
-        <EuiFormRow>
-          <EuiSwitch
-            label={i18n.translate('xpack.maps.source.esSearch.extentFilterLabel', {
-              defaultMessage: `Dynamically filter for data in the visible map area`,
-            })}
-            checked={this.state.filterByMapBounds}
-            onChange={this.onFilterByMapBoundsChange}
-          />
-        </EuiFormRow>
+        <EuiSpacer size="m" />
+        <ScalingForm
+          filterByMapBounds={this.state.filterByMapBounds}
+          indexPatternId={this.state.indexPatternId}
+          onChange={this._onScalingPropChange}
+          scalingType={this.state.scalingType}
+          supportsClustering={isGeoFieldAggregatable(
+            this.state.indexPattern,
+            this.state.geoFieldName
+          )}
+          termFields={getTermsFields(this.state.indexPattern.fields)}
+          topHitsSplitField={this.state.topHitsSplitField}
+          topHitsSize={this.state.topHitsSize}
+        />
       </Fragment>
     );
   }
@@ -265,7 +258,7 @@ export class CreateSourceEditor extends Component {
           <IndexPatternSelect
             isDisabled={this.state.noGeoIndexPatternsExist}
             indexPatternId={this.state.indexPatternId}
-            onChange={this.onIndexPatternSelect}
+            onChange={this._onIndexPatternSelect}
             placeholder={i18n.translate(
               'xpack.maps.source.esSearch.selectIndexPatternPlaceholder',
               {
@@ -279,7 +272,7 @@ export class CreateSourceEditor extends Component {
 
         {this._renderGeoSelect()}
 
-        {this._renderFilterByMapBounds()}
+        {this._renderScalingPanel()}
       </Fragment>
     );
   }
diff --git a/x-pack/legacy/plugins/maps/public/layers/sources/es_search_source/scaling_form.test.tsx b/x-pack/legacy/plugins/maps/public/layers/sources/es_search_source/scaling_form.test.tsx
new file mode 100644
index 0000000000000..03f29685891ec
--- /dev/null
+++ b/x-pack/legacy/plugins/maps/public/layers/sources/es_search_source/scaling_form.test.tsx
@@ -0,0 +1,47 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+jest.mock('../../../kibana_services', () => ({}));
+
+jest.mock('./load_index_settings', () => ({
+  loadIndexSettings: async () => {
+    return { maxInnerResultWindow: 100, maxResultWindow: 10000 };
+  },
+}));
+
+import React from 'react';
+import { shallow } from 'enzyme';
+
+import { ScalingForm } from './scaling_form';
+import { SCALING_TYPES } from '../../../../common/constants';
+
+const defaultProps = {
+  filterByMapBounds: true,
+  indexPatternId: 'myIndexPattern',
+  onChange: () => {},
+  scalingType: SCALING_TYPES.LIMIT,
+  supportsClustering: true,
+  termFields: [],
+  topHitsSize: 1,
+};
+
+test('should render', async () => {
+  const component = shallow(<ScalingForm {...defaultProps} />);
+
+  expect(component).toMatchSnapshot();
+});
+
+test('should not render clusters option when clustering is not supported', async () => {
+  const component = shallow(<ScalingForm {...defaultProps} supportsClustering={false} />);
+
+  expect(component).toMatchSnapshot();
+});
+
+test('should render top hits form when scaling type is TOP_HITS', async () => {
+  const component = shallow(<ScalingForm {...defaultProps} scalingType={SCALING_TYPES.TOP_HITS} />);
+
+  expect(component).toMatchSnapshot();
+});
diff --git a/x-pack/legacy/plugins/maps/public/layers/sources/es_search_source/scaling_form.tsx b/x-pack/legacy/plugins/maps/public/layers/sources/es_search_source/scaling_form.tsx
new file mode 100644
index 0000000000000..c5950f1132974
--- /dev/null
+++ b/x-pack/legacy/plugins/maps/public/layers/sources/es_search_source/scaling_form.tsx
@@ -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 React, { Fragment, Component } from 'react';
+import {
+  EuiFormRow,
+  EuiSwitch,
+  EuiSwitchEvent,
+  EuiTitle,
+  EuiSpacer,
+  EuiHorizontalRule,
+  EuiRadioGroup,
+} from '@elastic/eui';
+import { i18n } from '@kbn/i18n';
+import { FormattedMessage } from '@kbn/i18n/react';
+// @ts-ignore
+import { SingleFieldSelect } from '../../../components/single_field_select';
+
+// @ts-ignore
+import { indexPatternService } from '../../../kibana_services';
+// @ts-ignore
+import { getTermsFields, getSourceFields } from '../../../index_pattern_util';
+// @ts-ignore
+import { ValidatedRange } from '../../../components/validated_range';
+import {
+  DEFAULT_MAX_INNER_RESULT_WINDOW,
+  DEFAULT_MAX_RESULT_WINDOW,
+  SCALING_TYPES,
+  LAYER_TYPE,
+} from '../../../../common/constants';
+// @ts-ignore
+import { loadIndexSettings } from './load_index_settings';
+import { IFieldType } from '../../../../../../../../src/plugins/data/public';
+import { OnSourceChangeArgs } from '../../../connected_components/layer_panel/view';
+
+interface Props {
+  filterByMapBounds: boolean;
+  indexPatternId: string;
+  onChange: (args: OnSourceChangeArgs) => void;
+  scalingType: SCALING_TYPES;
+  supportsClustering: boolean;
+  termFields: IFieldType[];
+  topHitsSplitField?: string;
+  topHitsSize: number;
+}
+
+interface State {
+  maxInnerResultWindow: number;
+  maxResultWindow: number;
+}
+
+export class ScalingForm extends Component<Props, State> {
+  state = {
+    maxInnerResultWindow: DEFAULT_MAX_INNER_RESULT_WINDOW,
+    maxResultWindow: DEFAULT_MAX_RESULT_WINDOW,
+  };
+  _isMounted = false;
+
+  componentDidMount() {
+    this._isMounted = true;
+    this.loadIndexSettings();
+  }
+
+  componentWillUnmount() {
+    this._isMounted = false;
+  }
+
+  async loadIndexSettings() {
+    try {
+      const indexPattern = await indexPatternService.get(this.props.indexPatternId);
+      const { maxInnerResultWindow, maxResultWindow } = await loadIndexSettings(indexPattern.title);
+      if (this._isMounted) {
+        this.setState({ maxInnerResultWindow, maxResultWindow });
+      }
+    } catch (err) {
+      return;
+    }
+  }
+
+  _onScalingTypeChange = (optionId: string): void => {
+    const layerType =
+      optionId === SCALING_TYPES.CLUSTERS ? LAYER_TYPE.BLENDED_VECTOR : LAYER_TYPE.VECTOR;
+    this.props.onChange({ propName: 'scalingType', value: optionId, newLayerType: layerType });
+  };
+
+  _onFilterByMapBoundsChange = (event: EuiSwitchEvent) => {
+    this.props.onChange({ propName: 'filterByMapBounds', value: event.target.checked });
+  };
+
+  _onTopHitsSplitFieldChange = (topHitsSplitField: string) => {
+    this.props.onChange({ propName: 'topHitsSplitField', value: topHitsSplitField });
+  };
+
+  _onTopHitsSizeChange = (size: number) => {
+    this.props.onChange({ propName: 'topHitsSize', value: size });
+  };
+
+  _renderTopHitsForm() {
+    let sizeSlider;
+    if (this.props.topHitsSplitField) {
+      sizeSlider = (
+        <EuiFormRow
+          label={i18n.translate('xpack.maps.source.esSearch.topHitsSizeLabel', {
+            defaultMessage: 'Documents per entity',
+          })}
+          display="columnCompressed"
+        >
+          <ValidatedRange
+            min={1}
+            max={this.state.maxInnerResultWindow}
+            step={1}
+            value={this.props.topHitsSize}
+            onChange={this._onTopHitsSizeChange}
+            showLabels
+            showInput
+            showRange
+            data-test-subj="layerPanelTopHitsSize"
+            compressed
+          />
+        </EuiFormRow>
+      );
+    }
+
+    return (
+      <Fragment>
+        <EuiFormRow
+          label={i18n.translate('xpack.maps.source.esSearch.topHitsSplitFieldLabel', {
+            defaultMessage: 'Entity',
+          })}
+          display="columnCompressed"
+        >
+          <SingleFieldSelect
+            placeholder={i18n.translate(
+              'xpack.maps.source.esSearch.topHitsSplitFieldSelectPlaceholder',
+              {
+                defaultMessage: 'Select entity field',
+              }
+            )}
+            value={this.props.topHitsSplitField}
+            onChange={this._onTopHitsSplitFieldChange}
+            fields={this.props.termFields}
+            compressed
+          />
+        </EuiFormRow>
+
+        {sizeSlider}
+      </Fragment>
+    );
+  }
+
+  render() {
+    const scalingOptions = [
+      {
+        id: SCALING_TYPES.LIMIT,
+        label: i18n.translate('xpack.maps.source.esSearch.limitScalingLabel', {
+          defaultMessage: 'Limit results to {maxResultWindow}.',
+          values: { maxResultWindow: this.state.maxResultWindow },
+        }),
+      },
+      {
+        id: SCALING_TYPES.TOP_HITS,
+        label: i18n.translate('xpack.maps.source.esSearch.useTopHitsLabel', {
+          defaultMessage: 'Show top hits per entity.',
+        }),
+      },
+    ];
+    if (this.props.supportsClustering) {
+      scalingOptions.push({
+        id: SCALING_TYPES.CLUSTERS,
+        label: i18n.translate('xpack.maps.source.esSearch.clusterScalingLabel', {
+          defaultMessage: 'Show clusters when results exceed {maxResultWindow}.',
+          values: { maxResultWindow: this.state.maxResultWindow },
+        }),
+      });
+    }
+
+    let filterByBoundsSwitch;
+    if (this.props.scalingType !== SCALING_TYPES.CLUSTERS) {
+      filterByBoundsSwitch = (
+        <EuiFormRow>
+          <EuiSwitch
+            label={i18n.translate('xpack.maps.source.esSearch.extentFilterLabel', {
+              defaultMessage: 'Dynamically filter for data in the visible map area',
+            })}
+            checked={this.props.filterByMapBounds}
+            onChange={this._onFilterByMapBoundsChange}
+            compressed
+          />
+        </EuiFormRow>
+      );
+    }
+
+    let scalingForm = null;
+    if (this.props.scalingType === SCALING_TYPES.TOP_HITS) {
+      scalingForm = (
+        <Fragment>
+          <EuiHorizontalRule margin="xs" />
+          {this._renderTopHitsForm()}
+        </Fragment>
+      );
+    }
+
+    return (
+      <Fragment>
+        <EuiTitle size="xs">
+          <h5>
+            <FormattedMessage id="xpack.maps.esSearch.scaleTitle" defaultMessage="Scaling" />
+          </h5>
+        </EuiTitle>
+
+        <EuiSpacer size="m" />
+
+        <EuiFormRow>
+          <EuiRadioGroup
+            options={scalingOptions}
+            idSelected={this.props.scalingType}
+            onChange={this._onScalingTypeChange}
+          />
+        </EuiFormRow>
+
+        {filterByBoundsSwitch}
+
+        {scalingForm}
+      </Fragment>
+    );
+  }
+}
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 4d1e32087ab8c..9c92ec5801e49 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
@@ -6,34 +6,18 @@
 
 import React, { Fragment, Component } from 'react';
 import PropTypes from 'prop-types';
-import {
-  EuiFormRow,
-  EuiSwitch,
-  EuiSelect,
-  EuiTitle,
-  EuiPanel,
-  EuiSpacer,
-  EuiHorizontalRule,
-  EuiRadioGroup,
-} from '@elastic/eui';
+import { EuiFormRow, EuiSelect, EuiTitle, EuiPanel, EuiSpacer } from '@elastic/eui';
 import { SingleFieldSelect } from '../../../components/single_field_select';
 import { TooltipSelector } from '../../../components/tooltip_selector';
 
 import { getIndexPatternService } from '../../../kibana_services';
 import { i18n } from '@kbn/i18n';
 import { getTermsFields, getSourceFields } from '../../../index_pattern_util';
-import { ValidatedRange } from '../../../components/validated_range';
-import {
-  DEFAULT_MAX_INNER_RESULT_WINDOW,
-  DEFAULT_MAX_RESULT_WINDOW,
-  SORT_ORDER,
-  SCALING_TYPES,
-  LAYER_TYPE,
-} from '../../../../common/constants';
+import { SORT_ORDER } from '../../../../common/constants';
 import { ESDocField } from '../../fields/es_doc_field';
 import { FormattedMessage } from '@kbn/i18n/react';
-import { loadIndexSettings } from './load_index_settings';
 import { indexPatterns } from '../../../../../../../../src/plugins/data/public';
+import { ScalingForm } from './scaling_form';
 
 export class UpdateSourceEditor extends Component {
   static propTypes = {
@@ -52,33 +36,18 @@ export class UpdateSourceEditor extends Component {
     sourceFields: null,
     termFields: null,
     sortFields: null,
-    maxInnerResultWindow: DEFAULT_MAX_INNER_RESULT_WINDOW,
-    maxResultWindow: DEFAULT_MAX_RESULT_WINDOW,
     supportsClustering: false,
   };
 
   componentDidMount() {
     this._isMounted = true;
     this.loadFields();
-    this.loadIndexSettings();
   }
 
   componentWillUnmount() {
     this._isMounted = false;
   }
 
-  async loadIndexSettings() {
-    try {
-      const indexPattern = await getIndexPatternService().get(this.props.indexPatternId);
-      const { maxInnerResultWindow, maxResultWindow } = await loadIndexSettings(indexPattern.title);
-      if (this._isMounted) {
-        this.setState({ maxInnerResultWindow, maxResultWindow });
-      }
-    } catch (err) {
-      return;
-    }
-  }
-
   async loadFields() {
     let indexPattern;
     try {
@@ -133,85 +102,14 @@ export class UpdateSourceEditor extends Component {
     this.props.onChange({ propName: 'tooltipProperties', value: propertyNames });
   };
 
-  _onScalingTypeChange = optionId => {
-    const layerType =
-      optionId === SCALING_TYPES.CLUSTERS ? LAYER_TYPE.BLENDED_VECTOR : LAYER_TYPE.VECTOR;
-    this.props.onChange({ propName: 'scalingType', value: optionId, newLayerType: layerType });
-  };
-
-  _onFilterByMapBoundsChange = event => {
-    this.props.onChange({ propName: 'filterByMapBounds', value: event.target.checked });
-  };
-
-  onTopHitsSplitFieldChange = topHitsSplitField => {
-    this.props.onChange({ propName: 'topHitsSplitField', value: topHitsSplitField });
-  };
-
-  onSortFieldChange = sortField => {
+  _onSortFieldChange = sortField => {
     this.props.onChange({ propName: 'sortField', value: sortField });
   };
 
-  onSortOrderChange = e => {
+  _onSortOrderChange = e => {
     this.props.onChange({ propName: 'sortOrder', value: e.target.value });
   };
 
-  onTopHitsSizeChange = size => {
-    this.props.onChange({ propName: 'topHitsSize', value: size });
-  };
-
-  _renderTopHitsForm() {
-    let sizeSlider;
-    if (this.props.topHitsSplitField) {
-      sizeSlider = (
-        <EuiFormRow
-          label={i18n.translate('xpack.maps.source.esSearch.topHitsSizeLabel', {
-            defaultMessage: 'Documents per entity',
-          })}
-          display="columnCompressed"
-        >
-          <ValidatedRange
-            min={1}
-            max={this.state.maxInnerResultWindow}
-            step={1}
-            value={this.props.topHitsSize}
-            onChange={this.onTopHitsSizeChange}
-            showLabels
-            showInput
-            showRange
-            data-test-subj="layerPanelTopHitsSize"
-            compressed
-          />
-        </EuiFormRow>
-      );
-    }
-
-    return (
-      <Fragment>
-        <EuiFormRow
-          label={i18n.translate('xpack.maps.source.esSearch.topHitsSplitFieldLabel', {
-            defaultMessage: 'Entity',
-          })}
-          display="columnCompressed"
-        >
-          <SingleFieldSelect
-            placeholder={i18n.translate(
-              'xpack.maps.source.esSearch.topHitsSplitFieldSelectPlaceholder',
-              {
-                defaultMessage: 'Select entity field',
-              }
-            )}
-            value={this.props.topHitsSplitField}
-            onChange={this.onTopHitsSplitFieldChange}
-            fields={this.state.termFields}
-            compressed
-          />
-        </EuiFormRow>
-
-        {sizeSlider}
-      </Fragment>
-    );
-  }
-
   _renderTooltipsPanel() {
     return (
       <EuiPanel>
@@ -257,7 +155,7 @@ export class UpdateSourceEditor extends Component {
               defaultMessage: 'Select sort field',
             })}
             value={this.props.sortField}
-            onChange={this.onSortFieldChange}
+            onChange={this._onSortFieldChange}
             fields={this.state.sortFields}
             compressed
           />
@@ -286,7 +184,7 @@ export class UpdateSourceEditor extends Component {
               },
             ]}
             value={this.props.sortOrder}
-            onChange={this.onSortOrderChange}
+            onChange={this._onSortOrderChange}
             compressed
           />
         </EuiFormRow>
@@ -295,78 +193,18 @@ export class UpdateSourceEditor extends Component {
   }
 
   _renderScalingPanel() {
-    const scalingOptions = [
-      {
-        id: SCALING_TYPES.LIMIT,
-        label: i18n.translate('xpack.maps.source.esSearch.limitScalingLabel', {
-          defaultMessage: 'Limit results to {maxResultWindow}.',
-          values: { maxResultWindow: this.state.maxResultWindow },
-        }),
-      },
-      {
-        id: SCALING_TYPES.TOP_HITS,
-        label: i18n.translate('xpack.maps.source.esSearch.useTopHitsLabel', {
-          defaultMessage: 'Show top hits per entity.',
-        }),
-      },
-    ];
-    if (this.state.supportsClustering) {
-      scalingOptions.push({
-        id: SCALING_TYPES.CLUSTERS,
-        label: i18n.translate('xpack.maps.source.esSearch.clusterScalingLabel', {
-          defaultMessage: 'Show clusters when results exceed {maxResultWindow}.',
-          values: { maxResultWindow: this.state.maxResultWindow },
-        }),
-      });
-    }
-
-    let filterByBoundsSwitch;
-    if (this.props.scalingType !== SCALING_TYPES.CLUSTERS) {
-      filterByBoundsSwitch = (
-        <EuiFormRow>
-          <EuiSwitch
-            label={i18n.translate('xpack.maps.source.esSearch.extentFilterLabel', {
-              defaultMessage: 'Dynamically filter for data in the visible map area',
-            })}
-            checked={this.props.filterByMapBounds}
-            onChange={this._onFilterByMapBoundsChange}
-            compressed
-          />
-        </EuiFormRow>
-      );
-    }
-
-    let scalingForm = null;
-    if (this.props.scalingType === SCALING_TYPES.TOP_HITS) {
-      scalingForm = (
-        <Fragment>
-          <EuiHorizontalRule margin="xs" />
-          {this._renderTopHitsForm()}
-        </Fragment>
-      );
-    }
-
     return (
       <EuiPanel>
-        <EuiTitle size="xs">
-          <h5>
-            <FormattedMessage id="xpack.maps.esSearch.scaleTitle" defaultMessage="Scaling" />
-          </h5>
-        </EuiTitle>
-
-        <EuiSpacer size="m" />
-
-        <EuiFormRow>
-          <EuiRadioGroup
-            options={scalingOptions}
-            idSelected={this.props.scalingType}
-            onChange={this._onScalingTypeChange}
-          />
-        </EuiFormRow>
-
-        {filterByBoundsSwitch}
-
-        {scalingForm}
+        <ScalingForm
+          filterByMapBounds={this.props.filterByMapBounds}
+          indexPatternId={this.props.indexPatternId}
+          onChange={this.props.onChange}
+          scalingType={this.props.scalingType}
+          supportsClustering={this.state.supportsClustering}
+          termFields={this.state.termFields}
+          topHitsSplitField={this.props.topHitsSplitField}
+          topHitsSize={this.props.topHitsSize}
+        />
       </EuiPanel>
     );
   }
diff --git a/x-pack/legacy/plugins/maps/public/layers/sources/es_search_source/update_source_editor.test.js b/x-pack/legacy/plugins/maps/public/layers/sources/es_search_source/update_source_editor.test.js
index e8a845c4b1669..65a91ce03994a 100644
--- a/x-pack/legacy/plugins/maps/public/layers/sources/es_search_source/update_source_editor.test.js
+++ b/x-pack/legacy/plugins/maps/public/layers/sources/es_search_source/update_source_editor.test.js
@@ -40,11 +40,3 @@ test('should enable sort order select when sort field provided', async () => {
 
   expect(component).toMatchSnapshot();
 });
-
-test('should render top hits form when scaling type is TOP_HITS', async () => {
-  const component = shallow(
-    <UpdateSourceEditor {...defaultProps} scalingType={SCALING_TYPES.TOP_HITS} />
-  );
-
-  expect(component).toMatchSnapshot();
-});
diff --git a/x-pack/legacy/plugins/maps/server/routes.js b/x-pack/legacy/plugins/maps/server/routes.js
index 7ca659148449f..6aacfdc41aeea 100644
--- a/x-pack/legacy/plugins/maps/server/routes.js
+++ b/x-pack/legacy/plugins/maps/server/routes.js
@@ -409,26 +409,6 @@ export function initRoutes(server, licenseUid) {
     },
   });
 
-  server.route({
-    method: 'GET',
-    path: `${ROOT}/indexCount`,
-    handler: async (request, h) => {
-      const { server, query } = request;
-
-      if (!query.index) {
-        return h.response().code(400);
-      }
-
-      const { callWithRequest } = server.plugins.elasticsearch.getCluster('data');
-      try {
-        const { count } = await callWithRequest(request, 'count', { index: query.index });
-        return { count };
-      } catch (error) {
-        return h.response().code(400);
-      }
-    },
-  });
-
   server.route({
     method: 'GET',
     path: `/${INDEX_SETTINGS_API_PATH}`,
diff --git a/x-pack/plugins/maps/common/constants.ts b/x-pack/plugins/maps/common/constants.ts
index fecf8db0e85de..12b03f0386304 100644
--- a/x-pack/plugins/maps/common/constants.ts
+++ b/x-pack/plugins/maps/common/constants.ts
@@ -43,13 +43,13 @@ export function createMapPath(id: string) {
   return `${MAP_BASE_URL}/${id}`;
 }
 
-export const LAYER_TYPE = {
-  TILE: 'TILE',
-  VECTOR: 'VECTOR',
-  VECTOR_TILE: 'VECTOR_TILE',
-  HEATMAP: 'HEATMAP',
-  BLENDED_VECTOR: 'BLENDED_VECTOR',
-};
+export enum LAYER_TYPE {
+  TILE = 'TILE',
+  VECTOR = 'VECTOR',
+  VECTOR_TILE = 'VECTOR_TILE',
+  HEATMAP = 'HEATMAP',
+  BLENDED_VECTOR = 'BLENDED_VECTOR',
+}
 
 export enum SORT_ORDER {
   ASC = 'asc',
diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json
index ce78847a8e8b3..e8d93ba6d3200 100644
--- a/x-pack/plugins/translations/translations/ja-JP.json
+++ b/x-pack/plugins/translations/translations/ja-JP.json
@@ -7170,9 +7170,6 @@
     "xpack.maps.source.esGridDescription": "それぞれのグリッド付きセルのメトリックでグリッドにグループ分けされた地理空間データです。",
     "xpack.maps.source.esGridTitle": "グリッド集約",
     "xpack.maps.source.esSearch.convertToGeoJsonErrorMsg": "検索への応答を geoJson 機能コレクションに変換できません。エラー: {errorMsg}",
-    "xpack.maps.source.esSearch.disableFilterByMapBoundsExplainMsg": "インデックス「{indexPatternTitle}」はドキュメント数が少なく、ダイナミックフィルターが必要ありません。",
-    "xpack.maps.source.esSearch.disableFilterByMapBoundsTitle": "ダイナミックデータフィルターは無効です",
-    "xpack.maps.source.esSearch.disableFilterByMapBoundsTurnOnMsg": "ドキュメント数が増えると思われる場合はダイナミックフィルターをオンにしてください。",
     "xpack.maps.source.esSearch.extentFilterLabel": "マップの表示範囲でデータを動的にフィルタリング",
     "xpack.maps.source.esSearch.geofieldLabel": "地理空間フィールド",
     "xpack.maps.source.esSearch.geoFieldLabel": "地理空間フィールド",
diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json
index d5d0a2f9e7aff..cfab424935c6d 100644
--- a/x-pack/plugins/translations/translations/zh-CN.json
+++ b/x-pack/plugins/translations/translations/zh-CN.json
@@ -7170,9 +7170,6 @@
     "xpack.maps.source.esGridDescription": "地理空间数据在网格中进行分组，每个网格单元格都具有指标",
     "xpack.maps.source.esGridTitle": "网格聚合",
     "xpack.maps.source.esSearch.convertToGeoJsonErrorMsg": "无法将搜索响应转换成 geoJson 功能集合，错误：{errorMsg}",
-    "xpack.maps.source.esSearch.disableFilterByMapBoundsExplainMsg": "索引“{indexPatternTitle}”具有很少数量的文档，不需要动态筛选。",
-    "xpack.maps.source.esSearch.disableFilterByMapBoundsTitle": "动态数据筛选已禁用",
-    "xpack.maps.source.esSearch.disableFilterByMapBoundsTurnOnMsg": "如果预期文档数量会增加，请打开动态筛选。",
     "xpack.maps.source.esSearch.extentFilterLabel": "在可见地图区域中动态筛留数据",
     "xpack.maps.source.esSearch.geofieldLabel": "地理空间字段",
     "xpack.maps.source.esSearch.geoFieldLabel": "地理空间字段",

From 72bc0eae3268b1dfb7c314e80438c7a88f61352e Mon Sep 17 00:00:00 2001
From: Patrick Mueller <pmuellr@gmail.com>
Date: Mon, 23 Mar 2020 19:02:28 -0400
Subject: [PATCH 048/179] [Alerting] allow email action to not require auth
 (#60839)

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

Currently, the built-in email action requires user/password properties to be
set in it's secrets parameters.  This PR changes that requirement, so they
are no longer required.
---
 .../server/builtin_action_types/email.test.ts | 14 ++--
 .../server/builtin_action_types/email.ts      | 25 +++---
 .../builtin_action_types/email.test.tsx       | 81 +++++++++++++++++++
 .../components/builtin_action_types/email.tsx | 44 +++++-----
 .../components/builtin_action_types/types.ts  |  4 +-
 .../actions/builtin_action_types/email.ts     | 56 +++++++++++++
 6 files changed, 181 insertions(+), 43 deletions(-)

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 0bd3992de30e6..469df4fd86e2c 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
@@ -184,12 +184,14 @@ describe('secrets validation', () => {
     expect(validateSecrets(actionType, secrets)).toEqual(secrets);
   });
 
-  test('secrets validation fails when secrets is not valid', () => {
-    expect(() => {
-      validateSecrets(actionType, {});
-    }).toThrowErrorMatchingInlineSnapshot(
-      `"error validating action type secrets: [user]: expected value of type [string] but got [undefined]"`
-    );
+  test('secrets validation succeeds when secrets props are null/undefined', () => {
+    const secrets: Record<string, any> = {
+      user: null,
+      password: null,
+    };
+    expect(validateSecrets(actionType, {})).toEqual(secrets);
+    expect(validateSecrets(actionType, { user: null })).toEqual(secrets);
+    expect(validateSecrets(actionType, { password: null })).toEqual(secrets);
   });
 });
 
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 16e0168a7deb9..7992920fdfcb4 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/email.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/email.ts
@@ -10,7 +10,6 @@ import { schema, TypeOf } from '@kbn/config-schema';
 import nodemailerGetService from 'nodemailer/lib/well-known';
 
 import { sendEmail, JSON_TRANSPORT_SERVICE } from './lib/send_email';
-import { nullableType } from './lib/nullable';
 import { portSchema } from './lib/schemas';
 import { Logger } from '../../../../../src/core/server';
 import { ActionType, ActionTypeExecutorOptions, ActionTypeExecutorResult } from '../types';
@@ -20,10 +19,10 @@ import { ActionsConfigurationUtilities } from '../actions_config';
 export type ActionTypeConfigType = TypeOf<typeof ConfigSchema>;
 
 const ConfigSchemaProps = {
-  service: nullableType(schema.string()),
-  host: nullableType(schema.string()),
-  port: nullableType(portSchema()),
-  secure: nullableType(schema.boolean()),
+  service: schema.nullable(schema.string()),
+  host: schema.nullable(schema.string()),
+  port: schema.nullable(portSchema()),
+  secure: schema.nullable(schema.boolean()),
   from: schema.string(),
 };
 
@@ -75,8 +74,8 @@ function validateConfig(
 export type ActionTypeSecretsType = TypeOf<typeof SecretsSchema>;
 
 const SecretsSchema = schema.object({
-  user: schema.string(),
-  password: schema.string(),
+  user: schema.nullable(schema.string()),
+  password: schema.nullable(schema.string()),
 });
 
 // params definition
@@ -144,10 +143,14 @@ async function executor(
   const secrets = execOptions.secrets as ActionTypeSecretsType;
   const params = execOptions.params as ActionParamsType;
 
-  const transport: any = {
-    user: secrets.user,
-    password: secrets.password,
-  };
+  const transport: any = {};
+
+  if (secrets.user != null) {
+    transport.user = secrets.user;
+  }
+  if (secrets.password != null) {
+    transport.password = secrets.password;
+  }
 
   if (config.service !== null) {
     transport.service = config.service;
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/email.test.tsx b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/email.test.tsx
index 49a611167cf16..a7d479f922ed1 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/email.test.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/email.test.tsx
@@ -58,6 +58,33 @@ describe('connector validation', () => {
     });
   });
 
+  test('connector validation succeeds when connector config is valid with empty user/password', () => {
+    const actionConnector = {
+      secrets: {
+        user: null,
+        password: null,
+      },
+      id: 'test',
+      actionTypeId: '.email',
+      name: 'email',
+      config: {
+        from: 'test@test.com',
+        port: 2323,
+        host: 'localhost',
+        test: 'test',
+      },
+    } as EmailActionConnector;
+
+    expect(actionTypeModel.validateConnector(actionConnector)).toEqual({
+      errors: {
+        from: [],
+        port: [],
+        host: [],
+        user: [],
+        password: [],
+      },
+    });
+  });
   test('connector validation fails when connector config is not valid', () => {
     const actionConnector = {
       secrets: {
@@ -82,6 +109,60 @@ describe('connector validation', () => {
       },
     });
   });
+  test('connector validation fails when user specified but not password', () => {
+    const actionConnector = {
+      secrets: {
+        user: 'user',
+        password: null,
+      },
+      id: 'test',
+      actionTypeId: '.email',
+      name: 'email',
+      config: {
+        from: 'test@test.com',
+        port: 2323,
+        host: 'localhost',
+        test: 'test',
+      },
+    } as EmailActionConnector;
+
+    expect(actionTypeModel.validateConnector(actionConnector)).toEqual({
+      errors: {
+        from: [],
+        port: [],
+        host: [],
+        user: [],
+        password: ['Password is required when username is used.'],
+      },
+    });
+  });
+  test('connector validation fails when password specified but not user', () => {
+    const actionConnector = {
+      secrets: {
+        user: null,
+        password: 'password',
+      },
+      id: 'test',
+      actionTypeId: '.email',
+      name: 'email',
+      config: {
+        from: 'test@test.com',
+        port: 2323,
+        host: 'localhost',
+        test: 'test',
+      },
+    } as EmailActionConnector;
+
+    expect(actionTypeModel.validateConnector(actionConnector)).toEqual({
+      errors: {
+        from: [],
+        port: [],
+        host: [],
+        user: ['Username is required when password is used.'],
+        password: [],
+      },
+    });
+  });
 });
 
 describe('action params validation', () => {
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/email.tsx b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/email.tsx
index 6c994051ec980..f17180ee74e56 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/email.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/email.tsx
@@ -97,22 +97,22 @@ export function getActionType(): ActionTypeModel {
           )
         );
       }
-      if (!action.secrets.user) {
-        errors.user.push(
+      if (action.secrets.user && !action.secrets.password) {
+        errors.password.push(
           i18n.translate(
-            'xpack.triggersActionsUI.components.builtinActionTypes.error.requiredUserText',
+            'xpack.triggersActionsUI.components.builtinActionTypes.error.requiredPasswordText',
             {
-              defaultMessage: 'Username is required.',
+              defaultMessage: 'Password is required when username is used.',
             }
           )
         );
       }
-      if (!action.secrets.password) {
-        errors.password.push(
+      if (!action.secrets.user && action.secrets.password) {
+        errors.user.push(
           i18n.translate(
-            'xpack.triggersActionsUI.components.builtinActionTypes.error.requiredPasswordText',
+            'xpack.triggersActionsUI.components.builtinActionTypes.error.requiredUserText',
             {
-              defaultMessage: 'Password is required.',
+              defaultMessage: 'Username is required when password is used.',
             }
           )
         );
@@ -303,7 +303,7 @@ const EmailActionConnectorFields: React.FunctionComponent<ActionConnectorFieldsP
             id="emailUser"
             fullWidth
             error={errors.user}
-            isInvalid={errors.user.length > 0 && user !== undefined}
+            isInvalid={errors.user.length > 0}
             label={i18n.translate(
               'xpack.triggersActionsUI.sections.builtinActionTypes.emailAction.userTextFieldLabel',
               {
@@ -313,17 +313,12 @@ const EmailActionConnectorFields: React.FunctionComponent<ActionConnectorFieldsP
           >
             <EuiFieldText
               fullWidth
-              isInvalid={errors.user.length > 0 && user !== undefined}
+              isInvalid={errors.user.length > 0}
               name="user"
               value={user || ''}
               data-test-subj="emailUserInput"
               onChange={e => {
-                editActionSecrets('user', e.target.value);
-              }}
-              onBlur={() => {
-                if (!user) {
-                  editActionSecrets('user', '');
-                }
+                editActionSecrets('user', nullableString(e.target.value));
               }}
             />
           </EuiFormRow>
@@ -333,7 +328,7 @@ const EmailActionConnectorFields: React.FunctionComponent<ActionConnectorFieldsP
             id="emailPassword"
             fullWidth
             error={errors.password}
-            isInvalid={errors.password.length > 0 && password !== undefined}
+            isInvalid={errors.password.length > 0}
             label={i18n.translate(
               'xpack.triggersActionsUI.sections.builtinActionTypes.emailAction.passwordFieldLabel',
               {
@@ -343,17 +338,12 @@ const EmailActionConnectorFields: React.FunctionComponent<ActionConnectorFieldsP
           >
             <EuiFieldPassword
               fullWidth
-              isInvalid={errors.password.length > 0 && password !== undefined}
+              isInvalid={errors.password.length > 0}
               name="password"
               value={password || ''}
               data-test-subj="emailPasswordInput"
               onChange={e => {
-                editActionSecrets('password', e.target.value);
-              }}
-              onBlur={() => {
-                if (!password) {
-                  editActionSecrets('password', '');
-                }
+                editActionSecrets('password', nullableString(e.target.value));
               }}
             />
           </EuiFormRow>
@@ -624,3 +614,9 @@ const EmailParamsFields: React.FunctionComponent<ActionParamsProps<EmailActionPa
     </Fragment>
   );
 };
+
+// if the string == null or is empty, return null, else return string
+function nullableString(str: string | null | undefined) {
+  if (str == null || str.trim() === '') return null;
+  return str;
+}
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/types.ts b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/types.ts
index c0ddd6791e90e..2e0576d933f90 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/types.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/types.ts
@@ -72,8 +72,8 @@ interface EmailConfig {
 }
 
 interface EmailSecrets {
-  user: string;
-  password: string;
+  user: string | null;
+  password: string | null;
 }
 
 export interface EmailActionConnector extends ActionConnector {
diff --git a/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/builtin_action_types/email.ts b/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/builtin_action_types/email.ts
index de856492e12fc..e228f6c1f81c6 100644
--- a/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/builtin_action_types/email.ts
+++ b/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/builtin_action_types/email.ts
@@ -227,5 +227,61 @@ export default function emailTest({ getService }: FtrProviderContext) {
         .expect(200);
       expect(typeof createdAction.id).to.be('string');
     });
+
+    it('should handle an email action with no auth', async () => {
+      const { body: createdAction } = await supertest
+        .post('/api/action')
+        .set('kbn-xsrf', 'foo')
+        .send({
+          name: 'An email action with no auth',
+          actionTypeId: '.email',
+          config: {
+            service: '__json',
+            from: 'jim@example.com',
+          },
+        })
+        .expect(200);
+
+      await supertest
+        .post(`/api/action/${createdAction.id}/_execute`)
+        .set('kbn-xsrf', 'foo')
+        .send({
+          params: {
+            to: ['kibana-action-test@elastic.co'],
+            subject: 'email-subject',
+            message: 'email-message',
+          },
+        })
+        .expect(200)
+        .then((resp: any) => {
+          expect(resp.body.data.message.messageId).to.be.a('string');
+          expect(resp.body.data.messageId).to.be.a('string');
+
+          delete resp.body.data.message.messageId;
+          delete resp.body.data.messageId;
+
+          expect(resp.body.data).to.eql({
+            envelope: {
+              from: 'jim@example.com',
+              to: ['kibana-action-test@elastic.co'],
+            },
+            message: {
+              from: { address: 'jim@example.com', name: '' },
+              to: [
+                {
+                  address: 'kibana-action-test@elastic.co',
+                  name: '',
+                },
+              ],
+              cc: null,
+              bcc: null,
+              subject: 'email-subject',
+              html: '<p>email-message</p>\n',
+              text: 'email-message',
+              headers: {},
+            },
+          });
+        });
+    });
   });
 }

From 5755b2ac522483bd71ad0e1b31459338ff69cf93 Mon Sep 17 00:00:00 2001
From: Tim Sullivan <tsullivan@users.noreply.github.com>
Date: Mon, 23 Mar 2020 16:02:44 -0700
Subject: [PATCH 049/179] [Reporting/New Platform Migration] Use a new config
 service on server-side (#55882)

* [Reporting/New Platform Migration] Use a new config service on server-side

* unit test for createConfig

* use promise.all and remove outdated comment

* design feedback to avoid handling the entire config getter

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 .../__snapshots__/index.test.js.snap          | 383 ------------------
 x-pack/legacy/plugins/reporting/config.ts     | 182 ---------
 .../execute_job/decrypt_job_headers.test.ts   |  22 +-
 .../common/execute_job/decrypt_job_headers.ts |   8 +-
 .../get_conditional_headers.test.ts           | 173 ++------
 .../execute_job/get_conditional_headers.ts    |  20 +-
 .../execute_job/get_custom_logo.test.ts       |  14 +-
 .../common/execute_job/get_custom_logo.ts     |  11 +-
 .../common/execute_job/get_full_urls.test.ts  |  80 ++--
 .../common/execute_job/get_full_urls.ts       |  22 +-
 .../common/layouts/create_layout.ts           |   7 +-
 .../common/layouts/print_layout.ts            |   9 +-
 .../lib/screenshots/get_number_of_items.ts    |   7 +-
 .../common/lib/screenshots/observable.test.ts |  19 +-
 .../common/lib/screenshots/observable.ts      |  18 +-
 .../common/lib/screenshots/open_url.ts        |  11 +-
 .../common/lib/screenshots/types.ts           |   2 +-
 .../common/lib/screenshots/wait_for_render.ts |   4 +-
 .../screenshots/wait_for_visualizations.ts    |   7 +-
 .../export_types/csv/server/create_job.ts     |   6 +-
 .../csv/server/execute_job.test.js            | 344 +++-------------
 .../export_types/csv/server/execute_job.ts    |  30 +-
 .../csv/server/lib/hit_iterator.test.ts       |   3 +-
 .../csv/server/lib/hit_iterator.ts            |   5 +-
 .../reporting/export_types/csv/types.d.ts     |   5 +-
 .../server/create_job/create_job.ts           |  19 +-
 .../server/execute_job.ts                     |  23 +-
 .../server/lib/generate_csv.ts                |  16 +-
 .../server/lib/generate_csv_search.ts         |  20 +-
 .../csv_from_savedobject/types.d.ts           |   5 +-
 .../png/server/create_job/index.ts            |   6 +-
 .../png/server/execute_job/index.test.js      |  94 ++---
 .../png/server/execute_job/index.ts           |  23 +-
 .../png/server/lib/generate_png.ts            |   7 +-
 .../printable_pdf/server/create_job/index.ts  |   6 +-
 .../server/execute_job/index.test.js          |  80 ++--
 .../printable_pdf/server/execute_job/index.ts |  25 +-
 .../printable_pdf/server/lib/generate_pdf.ts  |   9 +-
 .../export_types/printable_pdf/types.d.ts     |   2 +-
 x-pack/legacy/plugins/reporting/index.test.js |  34 --
 x-pack/legacy/plugins/reporting/index.ts      |  16 +-
 .../plugins/reporting/log_configuration.ts    |  23 +-
 .../browsers/chromium/driver_factory/args.ts  |   7 +-
 .../browsers/chromium/driver_factory/index.ts |  19 +-
 .../server/browsers/chromium/index.ts         |   5 +-
 .../browsers/create_browser_driver_factory.ts |  22 +-
 .../browsers/download/ensure_downloaded.ts    |  13 +-
 .../server/browsers/network_policy.ts         |   9 +-
 .../reporting/server/browsers/types.d.ts      |   2 -
 .../plugins/reporting/server/config/config.js |  21 -
 .../legacy/plugins/reporting/server/core.ts   |  72 +++-
 .../legacy/plugins/reporting/server/index.ts  |   2 +-
 .../legacy/plugins/reporting/server/legacy.ts |  73 +++-
 .../reporting/server/lib/create_queue.ts      |  20 +-
 .../server/lib/create_worker.test.ts          |  39 +-
 .../reporting/server/lib/create_worker.ts     |  24 +-
 .../plugins/reporting/server/lib/crypto.ts    |   7 +-
 .../reporting/server/lib/enqueue_job.ts       |  31 +-
 .../lib/esqueue/helpers/index_timestamp.js    |   1 +
 .../plugins/reporting/server/lib/get_user.ts  |   4 +-
 .../plugins/reporting/server/lib/index.ts     |   9 +-
 .../reporting/server/lib/jobs_query.ts        |  10 +-
 .../reporting/server/lib/once_per_server.ts   |  43 --
 .../__tests__/validate_encryption_key.js      |  34 --
 .../__tests__/validate_server_host.ts         |  30 --
 .../reporting/server/lib/validate/index.ts    |  13 +-
 .../server/lib/validate/validate_browser.ts   |   4 +-
 .../lib/validate/validate_encryption_key.ts   |  31 --
 .../validate_max_content_length.test.js       |  16 +-
 .../validate/validate_max_content_length.ts   |  14 +-
 .../lib/validate/validate_server_host.ts      |  27 --
 .../legacy/plugins/reporting/server/plugin.ts |  24 +-
 .../server/routes/generate_from_jobparams.ts  |   5 +-
 .../routes/generate_from_savedobject.ts       |   5 +-
 .../generate_from_savedobject_immediate.ts    |  18 +-
 .../server/routes/generation.test.ts          |  11 +-
 .../reporting/server/routes/generation.ts     |  15 +-
 .../plugins/reporting/server/routes/index.ts  |   7 +-
 .../reporting/server/routes/jobs.test.js      |  46 ++-
 .../plugins/reporting/server/routes/jobs.ts   |  15 +-
 .../lib/authorized_user_pre_routing.test.js   | 131 +++---
 .../routes/lib/authorized_user_pre_routing.ts |  16 +-
 .../server/routes/lib/get_document_payload.ts |  31 +-
 .../server/routes/lib/job_response_handler.ts |  15 +-
 .../lib/reporting_feature_pre_routing.ts      |   8 +-
 .../routes/lib/route_config_factories.ts      |  28 +-
 .../plugins/reporting/server/types.d.ts       |  11 +-
 .../server/usage/get_reporting_usage.ts       |  28 +-
 .../usage/reporting_usage_collector.test.js   | 152 +++----
 .../server/usage/reporting_usage_collector.ts |  23 +-
 .../create_mock_browserdriverfactory.ts       |  45 +-
 .../create_mock_layoutinstance.ts             |   8 +-
 .../create_mock_reportingplugin.ts            |  22 +-
 .../test_helpers/create_mock_server.ts        |  34 +-
 x-pack/legacy/plugins/reporting/types.d.ts    |  62 +--
 x-pack/plugins/reporting/config.ts            |  10 -
 x-pack/plugins/reporting/kibana.json          |   6 +-
 .../reporting/server/config/index.test.ts     | 122 ++++++
 .../plugins/reporting/server/config/index.ts  |  85 ++++
 .../reporting/server/config/schema.test.ts    | 103 +++++
 .../plugins/reporting/server/config/schema.ts | 174 ++++++++
 x-pack/plugins/reporting/server/index.ts      |  14 +
 x-pack/plugins/reporting/server/plugin.ts     |  38 ++
 103 files changed, 1522 insertions(+), 2192 deletions(-)
 delete mode 100644 x-pack/legacy/plugins/reporting/__snapshots__/index.test.js.snap
 delete mode 100644 x-pack/legacy/plugins/reporting/config.ts
 delete mode 100644 x-pack/legacy/plugins/reporting/index.test.js
 delete mode 100644 x-pack/legacy/plugins/reporting/server/config/config.js
 delete mode 100644 x-pack/legacy/plugins/reporting/server/lib/once_per_server.ts
 delete mode 100644 x-pack/legacy/plugins/reporting/server/lib/validate/__tests__/validate_encryption_key.js
 delete mode 100644 x-pack/legacy/plugins/reporting/server/lib/validate/__tests__/validate_server_host.ts
 delete mode 100644 x-pack/legacy/plugins/reporting/server/lib/validate/validate_encryption_key.ts
 delete mode 100644 x-pack/legacy/plugins/reporting/server/lib/validate/validate_server_host.ts
 delete mode 100644 x-pack/plugins/reporting/config.ts
 create mode 100644 x-pack/plugins/reporting/server/config/index.test.ts
 create mode 100644 x-pack/plugins/reporting/server/config/index.ts
 create mode 100644 x-pack/plugins/reporting/server/config/schema.test.ts
 create mode 100644 x-pack/plugins/reporting/server/config/schema.ts
 create mode 100644 x-pack/plugins/reporting/server/index.ts
 create mode 100644 x-pack/plugins/reporting/server/plugin.ts

diff --git a/x-pack/legacy/plugins/reporting/__snapshots__/index.test.js.snap b/x-pack/legacy/plugins/reporting/__snapshots__/index.test.js.snap
deleted file mode 100644
index 757677f1d4f82..0000000000000
--- a/x-pack/legacy/plugins/reporting/__snapshots__/index.test.js.snap
+++ /dev/null
@@ -1,383 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`config schema with context {"dev":false,"dist":false} produces correct config 1`] = `
-Object {
-  "capture": Object {
-    "browser": Object {
-      "autoDownload": true,
-      "chromium": Object {
-        "disableSandbox": "<platform dependent>",
-        "maxScreenshotDimension": 1950,
-        "proxy": Object {
-          "enabled": false,
-        },
-      },
-      "type": "chromium",
-    },
-    "concurrency": 4,
-    "loadDelay": 3000,
-    "maxAttempts": 1,
-    "networkPolicy": Object {
-      "enabled": true,
-      "rules": Array [
-        Object {
-          "allow": true,
-          "protocol": "http:",
-        },
-        Object {
-          "allow": true,
-          "protocol": "https:",
-        },
-        Object {
-          "allow": true,
-          "protocol": "ws:",
-        },
-        Object {
-          "allow": true,
-          "protocol": "wss:",
-        },
-        Object {
-          "allow": true,
-          "protocol": "data:",
-        },
-        Object {
-          "allow": false,
-        },
-      ],
-    },
-    "settleTime": 1000,
-    "timeout": 20000,
-    "timeouts": Object {
-      "openUrl": 30000,
-      "renderComplete": 30000,
-      "waitForElements": 30000,
-    },
-    "viewport": Object {
-      "height": 1200,
-      "width": 1950,
-    },
-    "zoom": 2,
-  },
-  "csv": Object {
-    "checkForFormulas": true,
-    "enablePanelActionDownload": true,
-    "maxSizeBytes": 10485760,
-    "scroll": Object {
-      "duration": "30s",
-      "size": 500,
-    },
-  },
-  "enabled": true,
-  "encryptionKey": "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
-  "index": ".reporting",
-  "kibanaServer": Object {},
-  "poll": Object {
-    "jobCompletionNotifier": Object {
-      "interval": 10000,
-      "intervalErrorMultiplier": 5,
-    },
-    "jobsRefresh": Object {
-      "interval": 5000,
-      "intervalErrorMultiplier": 5,
-    },
-  },
-  "queue": Object {
-    "indexInterval": "week",
-    "pollEnabled": true,
-    "pollInterval": 3000,
-    "pollIntervalErrorMultiplier": 10,
-    "timeout": 120000,
-  },
-  "roles": Object {
-    "allow": Array [
-      "reporting_user",
-    ],
-  },
-}
-`;
-
-exports[`config schema with context {"dev":false,"dist":true} produces correct config 1`] = `
-Object {
-  "capture": Object {
-    "browser": Object {
-      "autoDownload": false,
-      "chromium": Object {
-        "disableSandbox": "<platform dependent>",
-        "maxScreenshotDimension": 1950,
-        "proxy": Object {
-          "enabled": false,
-        },
-      },
-      "type": "chromium",
-    },
-    "concurrency": 4,
-    "loadDelay": 3000,
-    "maxAttempts": 3,
-    "networkPolicy": Object {
-      "enabled": true,
-      "rules": Array [
-        Object {
-          "allow": true,
-          "protocol": "http:",
-        },
-        Object {
-          "allow": true,
-          "protocol": "https:",
-        },
-        Object {
-          "allow": true,
-          "protocol": "ws:",
-        },
-        Object {
-          "allow": true,
-          "protocol": "wss:",
-        },
-        Object {
-          "allow": true,
-          "protocol": "data:",
-        },
-        Object {
-          "allow": false,
-        },
-      ],
-    },
-    "settleTime": 1000,
-    "timeout": 20000,
-    "timeouts": Object {
-      "openUrl": 30000,
-      "renderComplete": 30000,
-      "waitForElements": 30000,
-    },
-    "viewport": Object {
-      "height": 1200,
-      "width": 1950,
-    },
-    "zoom": 2,
-  },
-  "csv": Object {
-    "checkForFormulas": true,
-    "enablePanelActionDownload": true,
-    "maxSizeBytes": 10485760,
-    "scroll": Object {
-      "duration": "30s",
-      "size": 500,
-    },
-  },
-  "enabled": true,
-  "index": ".reporting",
-  "kibanaServer": Object {},
-  "poll": Object {
-    "jobCompletionNotifier": Object {
-      "interval": 10000,
-      "intervalErrorMultiplier": 5,
-    },
-    "jobsRefresh": Object {
-      "interval": 5000,
-      "intervalErrorMultiplier": 5,
-    },
-  },
-  "queue": Object {
-    "indexInterval": "week",
-    "pollEnabled": true,
-    "pollInterval": 3000,
-    "pollIntervalErrorMultiplier": 10,
-    "timeout": 120000,
-  },
-  "roles": Object {
-    "allow": Array [
-      "reporting_user",
-    ],
-  },
-}
-`;
-
-exports[`config schema with context {"dev":true,"dist":false} produces correct config 1`] = `
-Object {
-  "capture": Object {
-    "browser": Object {
-      "autoDownload": true,
-      "chromium": Object {
-        "disableSandbox": "<platform dependent>",
-        "maxScreenshotDimension": 1950,
-        "proxy": Object {
-          "enabled": false,
-        },
-      },
-      "type": "chromium",
-    },
-    "concurrency": 4,
-    "loadDelay": 3000,
-    "maxAttempts": 1,
-    "networkPolicy": Object {
-      "enabled": true,
-      "rules": Array [
-        Object {
-          "allow": true,
-          "protocol": "http:",
-        },
-        Object {
-          "allow": true,
-          "protocol": "https:",
-        },
-        Object {
-          "allow": true,
-          "protocol": "ws:",
-        },
-        Object {
-          "allow": true,
-          "protocol": "wss:",
-        },
-        Object {
-          "allow": true,
-          "protocol": "data:",
-        },
-        Object {
-          "allow": false,
-        },
-      ],
-    },
-    "settleTime": 1000,
-    "timeout": 20000,
-    "timeouts": Object {
-      "openUrl": 30000,
-      "renderComplete": 30000,
-      "waitForElements": 30000,
-    },
-    "viewport": Object {
-      "height": 1200,
-      "width": 1950,
-    },
-    "zoom": 2,
-  },
-  "csv": Object {
-    "checkForFormulas": true,
-    "enablePanelActionDownload": true,
-    "maxSizeBytes": 10485760,
-    "scroll": Object {
-      "duration": "30s",
-      "size": 500,
-    },
-  },
-  "enabled": true,
-  "encryptionKey": "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
-  "index": ".reporting",
-  "kibanaServer": Object {},
-  "poll": Object {
-    "jobCompletionNotifier": Object {
-      "interval": 10000,
-      "intervalErrorMultiplier": 5,
-    },
-    "jobsRefresh": Object {
-      "interval": 5000,
-      "intervalErrorMultiplier": 5,
-    },
-  },
-  "queue": Object {
-    "indexInterval": "week",
-    "pollEnabled": true,
-    "pollInterval": 3000,
-    "pollIntervalErrorMultiplier": 10,
-    "timeout": 120000,
-  },
-  "roles": Object {
-    "allow": Array [
-      "reporting_user",
-    ],
-  },
-}
-`;
-
-exports[`config schema with context {"dev":true,"dist":true} produces correct config 1`] = `
-Object {
-  "capture": Object {
-    "browser": Object {
-      "autoDownload": false,
-      "chromium": Object {
-        "disableSandbox": "<platform dependent>",
-        "maxScreenshotDimension": 1950,
-        "proxy": Object {
-          "enabled": false,
-        },
-      },
-      "type": "chromium",
-    },
-    "concurrency": 4,
-    "loadDelay": 3000,
-    "maxAttempts": 3,
-    "networkPolicy": Object {
-      "enabled": true,
-      "rules": Array [
-        Object {
-          "allow": true,
-          "protocol": "http:",
-        },
-        Object {
-          "allow": true,
-          "protocol": "https:",
-        },
-        Object {
-          "allow": true,
-          "protocol": "ws:",
-        },
-        Object {
-          "allow": true,
-          "protocol": "wss:",
-        },
-        Object {
-          "allow": true,
-          "protocol": "data:",
-        },
-        Object {
-          "allow": false,
-        },
-      ],
-    },
-    "settleTime": 1000,
-    "timeout": 20000,
-    "timeouts": Object {
-      "openUrl": 30000,
-      "renderComplete": 30000,
-      "waitForElements": 30000,
-    },
-    "viewport": Object {
-      "height": 1200,
-      "width": 1950,
-    },
-    "zoom": 2,
-  },
-  "csv": Object {
-    "checkForFormulas": true,
-    "enablePanelActionDownload": true,
-    "maxSizeBytes": 10485760,
-    "scroll": Object {
-      "duration": "30s",
-      "size": 500,
-    },
-  },
-  "enabled": true,
-  "index": ".reporting",
-  "kibanaServer": Object {},
-  "poll": Object {
-    "jobCompletionNotifier": Object {
-      "interval": 10000,
-      "intervalErrorMultiplier": 5,
-    },
-    "jobsRefresh": Object {
-      "interval": 5000,
-      "intervalErrorMultiplier": 5,
-    },
-  },
-  "queue": Object {
-    "indexInterval": "week",
-    "pollEnabled": true,
-    "pollInterval": 3000,
-    "pollIntervalErrorMultiplier": 10,
-    "timeout": 120000,
-  },
-  "roles": Object {
-    "allow": Array [
-      "reporting_user",
-    ],
-  },
-}
-`;
diff --git a/x-pack/legacy/plugins/reporting/config.ts b/x-pack/legacy/plugins/reporting/config.ts
deleted file mode 100644
index 211fa70301bbf..0000000000000
--- a/x-pack/legacy/plugins/reporting/config.ts
+++ /dev/null
@@ -1,182 +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 { BROWSER_TYPE } from './common/constants';
-// @ts-ignore untyped module
-import { config as appConfig } from './server/config/config';
-import { getDefaultChromiumSandboxDisabled } from './server/browsers';
-
-export async function config(Joi: any) {
-  return Joi.object({
-    enabled: Joi.boolean().default(true),
-    kibanaServer: Joi.object({
-      protocol: Joi.string().valid(['http', 'https']),
-      hostname: Joi.string().invalid('0'),
-      port: Joi.number().integer(),
-    }).default(),
-    queue: Joi.object({
-      indexInterval: Joi.string().default('week'),
-      pollEnabled: Joi.boolean().default(true),
-      pollInterval: Joi.number()
-        .integer()
-        .default(3000),
-      pollIntervalErrorMultiplier: Joi.number()
-        .integer()
-        .default(10),
-      timeout: Joi.number()
-        .integer()
-        .default(120000),
-    }).default(),
-    capture: Joi.object({
-      timeouts: Joi.object({
-        openUrl: Joi.number()
-          .integer()
-          .default(30000),
-        waitForElements: Joi.number()
-          .integer()
-          .default(30000),
-        renderComplete: Joi.number()
-          .integer()
-          .default(30000),
-      }).default(),
-      networkPolicy: Joi.object({
-        enabled: Joi.boolean().default(true),
-        rules: Joi.array()
-          .items(
-            Joi.object({
-              allow: Joi.boolean().required(),
-              protocol: Joi.string(),
-              host: Joi.string(),
-            })
-          )
-          .default([
-            { allow: true, protocol: 'http:' },
-            { allow: true, protocol: 'https:' },
-            { allow: true, protocol: 'ws:' },
-            { allow: true, protocol: 'wss:' },
-            { allow: true, protocol: 'data:' },
-            { allow: false }, // Default action is to deny!
-          ]),
-      }).default(),
-      zoom: Joi.number()
-        .integer()
-        .default(2),
-      viewport: Joi.object({
-        width: Joi.number()
-          .integer()
-          .default(1950),
-        height: Joi.number()
-          .integer()
-          .default(1200),
-      }).default(),
-      timeout: Joi.number()
-        .integer()
-        .default(20000), // deprecated
-      loadDelay: Joi.number()
-        .integer()
-        .default(3000),
-      settleTime: Joi.number()
-        .integer()
-        .default(1000), // deprecated
-      concurrency: Joi.number()
-        .integer()
-        .default(appConfig.concurrency), // deprecated
-      browser: Joi.object({
-        type: Joi.any()
-          .valid(BROWSER_TYPE)
-          .default(BROWSER_TYPE),
-        autoDownload: Joi.boolean().when('$dist', {
-          is: true,
-          then: Joi.default(false),
-          otherwise: Joi.default(true),
-        }),
-        chromium: Joi.object({
-          inspect: Joi.boolean()
-            .when('$dev', {
-              is: false,
-              then: Joi.valid(false),
-              else: Joi.default(false),
-            })
-            .default(),
-          disableSandbox: Joi.boolean().default(await getDefaultChromiumSandboxDisabled()),
-          proxy: Joi.object({
-            enabled: Joi.boolean().default(false),
-            server: Joi.string()
-              .uri({ scheme: ['http', 'https'] })
-              .when('enabled', {
-                is: Joi.valid(false),
-                then: Joi.valid(null),
-                else: Joi.required(),
-              }),
-            bypass: Joi.array()
-              .items(Joi.string().regex(/^[^\s]+$/))
-              .when('enabled', {
-                is: Joi.valid(false),
-                then: Joi.valid(null),
-                else: Joi.default([]),
-              }),
-          }).default(),
-          maxScreenshotDimension: Joi.number()
-            .integer()
-            .default(1950),
-        }).default(),
-      }).default(),
-      maxAttempts: Joi.number()
-        .integer()
-        .greater(0)
-        .when('$dist', {
-          is: true,
-          then: Joi.default(3),
-          otherwise: Joi.default(1),
-        })
-        .default(),
-    }).default(),
-    csv: Joi.object({
-      checkForFormulas: Joi.boolean().default(true),
-      enablePanelActionDownload: Joi.boolean().default(true),
-      maxSizeBytes: Joi.number()
-        .integer()
-        .default(1024 * 1024 * 10), // bytes in a kB * kB in a mB * 10
-      scroll: Joi.object({
-        duration: Joi.string()
-          .regex(/^[0-9]+(d|h|m|s|ms|micros|nanos)$/, { name: 'DurationString' })
-          .default('30s'),
-        size: Joi.number()
-          .integer()
-          .default(500),
-      }).default(),
-    }).default(),
-    encryptionKey: Joi.when(Joi.ref('$dist'), {
-      is: true,
-      then: Joi.string(),
-      otherwise: Joi.string().default('a'.repeat(32)),
-    }),
-    roles: Joi.object({
-      allow: Joi.array()
-        .items(Joi.string())
-        .default(['reporting_user']),
-    }).default(),
-    index: Joi.string().default('.reporting'),
-    poll: Joi.object({
-      jobCompletionNotifier: Joi.object({
-        interval: Joi.number()
-          .integer()
-          .default(10000),
-        intervalErrorMultiplier: Joi.number()
-          .integer()
-          .default(5),
-      }).default(),
-      jobsRefresh: Joi.object({
-        interval: Joi.number()
-          .integer()
-          .default(5000),
-        intervalErrorMultiplier: Joi.number()
-          .integer()
-          .default(5),
-      }).default(),
-    }).default(),
-  }).default();
-}
diff --git a/x-pack/legacy/plugins/reporting/export_types/common/execute_job/decrypt_job_headers.test.ts b/x-pack/legacy/plugins/reporting/export_types/common/execute_job/decrypt_job_headers.test.ts
index 468caf93ec5dd..9085fb3cbc876 100644
--- a/x-pack/legacy/plugins/reporting/export_types/common/execute_job/decrypt_job_headers.test.ts
+++ b/x-pack/legacy/plugins/reporting/export_types/common/execute_job/decrypt_job_headers.test.ts
@@ -5,33 +5,27 @@
  */
 
 import { cryptoFactory } from '../../../server/lib/crypto';
-import { createMockServer } from '../../../test_helpers';
 import { Logger } from '../../../types';
 import { decryptJobHeaders } from './decrypt_job_headers';
 
-let mockServer: any;
-beforeEach(() => {
-  mockServer = createMockServer('');
-});
-
-const encryptHeaders = async (headers: Record<string, string>) => {
-  const crypto = cryptoFactory(mockServer);
+const encryptHeaders = async (encryptionKey: string, headers: Record<string, string>) => {
+  const crypto = cryptoFactory(encryptionKey);
   return await crypto.encrypt(headers);
 };
 
 describe('headers', () => {
   test(`fails if it can't decrypt headers`, async () => {
-    await expect(
+    const getDecryptedHeaders = () =>
       decryptJobHeaders({
+        encryptionKey: 'abcsecretsauce',
         job: {
           headers: 'Q53+9A+zf+Xe+ceR/uB/aR/Sw/8e+M+qR+WiG+8z+EY+mo+HiU/zQL+Xn',
         },
         logger: ({
           error: jest.fn(),
         } as unknown) as Logger,
-        server: mockServer,
-      })
-    ).rejects.toMatchInlineSnapshot(
+      });
+    await expect(getDecryptedHeaders()).rejects.toMatchInlineSnapshot(
       `[Error: Failed to decrypt report job data. Please ensure that xpack.reporting.encryptionKey is set and re-generate this report. Error: Invalid IV length]`
     );
   });
@@ -42,15 +36,15 @@ describe('headers', () => {
       baz: 'quix',
     };
 
-    const encryptedHeaders = await encryptHeaders(headers);
+    const encryptedHeaders = await encryptHeaders('abcsecretsauce', headers);
     const decryptedHeaders = await decryptJobHeaders({
+      encryptionKey: 'abcsecretsauce',
       job: {
         title: 'cool-job-bro',
         type: 'csv',
         headers: encryptedHeaders,
       },
       logger: {} as Logger,
-      server: mockServer,
     });
     expect(decryptedHeaders).toEqual(headers);
   });
diff --git a/x-pack/legacy/plugins/reporting/export_types/common/execute_job/decrypt_job_headers.ts b/x-pack/legacy/plugins/reporting/export_types/common/execute_job/decrypt_job_headers.ts
index 436b2c2dab1ad..6f415d7ee5ea9 100644
--- a/x-pack/legacy/plugins/reporting/export_types/common/execute_job/decrypt_job_headers.ts
+++ b/x-pack/legacy/plugins/reporting/export_types/common/execute_job/decrypt_job_headers.ts
@@ -6,7 +6,7 @@
 
 import { i18n } from '@kbn/i18n';
 import { cryptoFactory } from '../../../server/lib/crypto';
-import { CryptoFactory, ServerFacade, Logger } from '../../../types';
+import { CryptoFactory, Logger } from '../../../types';
 
 interface HasEncryptedHeaders {
   headers?: string;
@@ -17,15 +17,15 @@ export const decryptJobHeaders = async <
   JobParamsType,
   JobDocPayloadType extends HasEncryptedHeaders
 >({
-  server,
+  encryptionKey,
   job,
   logger,
 }: {
-  server: ServerFacade;
+  encryptionKey?: string;
   job: JobDocPayloadType;
   logger: Logger;
 }): Promise<Record<string, string>> => {
-  const crypto: CryptoFactory = cryptoFactory(server);
+  const crypto: CryptoFactory = cryptoFactory(encryptionKey);
   try {
     const decryptedHeaders: Record<string, string> = await crypto.decrypt(job.headers);
     return decryptedHeaders;
diff --git a/x-pack/legacy/plugins/reporting/export_types/common/execute_job/get_conditional_headers.test.ts b/x-pack/legacy/plugins/reporting/export_types/common/execute_job/get_conditional_headers.test.ts
index eedb742ad7597..09527621fa49f 100644
--- a/x-pack/legacy/plugins/reporting/export_types/common/execute_job/get_conditional_headers.test.ts
+++ b/x-pack/legacy/plugins/reporting/export_types/common/execute_job/get_conditional_headers.test.ts
@@ -4,27 +4,33 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { createMockReportingCore, createMockServer } from '../../../test_helpers';
-import { ReportingCore } from '../../../server';
+import sinon from 'sinon';
+import { createMockReportingCore } from '../../../test_helpers';
+import { ReportingConfig, ReportingCore } from '../../../server/types';
 import { JobDocPayload } from '../../../types';
 import { JobDocPayloadPDF } from '../../printable_pdf/types';
 import { getConditionalHeaders, getCustomLogo } from './index';
 
+let mockConfig: ReportingConfig;
 let mockReportingPlugin: ReportingCore;
-let mockServer: any;
+
+const getMockConfig = (mockConfigGet: sinon.SinonStub) => ({
+  get: mockConfigGet,
+  kbnConfig: { get: mockConfigGet },
+});
+
 beforeEach(async () => {
   mockReportingPlugin = await createMockReportingCore();
-  mockServer = createMockServer('');
+
+  const mockConfigGet = sinon
+    .stub()
+    .withArgs('kibanaServer', 'hostname')
+    .returns('custom-hostname');
+  mockConfig = getMockConfig(mockConfigGet);
 });
 
 describe('conditions', () => {
   test(`uses hostname from reporting config if set`, async () => {
-    const settings: any = {
-      'xpack.reporting.kibanaServer.hostname': 'custom-hostname',
-    };
-
-    mockServer = createMockServer({ settings });
-
     const permittedHeaders = {
       foo: 'bar',
       baz: 'quix',
@@ -33,121 +39,20 @@ describe('conditions', () => {
     const conditionalHeaders = await getConditionalHeaders({
       job: {} as JobDocPayload<any>,
       filteredHeaders: permittedHeaders,
-      server: mockServer,
+      config: mockConfig,
     });
 
     expect(conditionalHeaders.conditions.hostname).toEqual(
-      mockServer.config().get('xpack.reporting.kibanaServer.hostname')
+      mockConfig.get('kibanaServer', 'hostname')
     );
-  });
-
-  test(`uses hostname from server.config if reporting config not set`, async () => {
-    const permittedHeaders = {
-      foo: 'bar',
-      baz: 'quix',
-    };
-
-    const conditionalHeaders = await getConditionalHeaders({
-      job: {} as JobDocPayload<any>,
-      filteredHeaders: permittedHeaders,
-      server: mockServer,
-    });
-
-    expect(conditionalHeaders.conditions.hostname).toEqual(mockServer.config().get('server.host'));
-  });
-
-  test(`uses port from reporting config if set`, async () => {
-    const settings = {
-      'xpack.reporting.kibanaServer.port': 443,
-    };
-
-    mockServer = createMockServer({ settings });
-
-    const permittedHeaders = {
-      foo: 'bar',
-      baz: 'quix',
-    };
-
-    const conditionalHeaders = await getConditionalHeaders({
-      job: {} as JobDocPayload<any>,
-      filteredHeaders: permittedHeaders,
-      server: mockServer,
-    });
-
-    expect(conditionalHeaders.conditions.port).toEqual(
-      mockServer.config().get('xpack.reporting.kibanaServer.port')
+    expect(conditionalHeaders.conditions.port).toEqual(mockConfig.get('kibanaServer', 'port'));
+    expect(conditionalHeaders.conditions.protocol).toEqual(
+      mockConfig.get('kibanaServer', 'protocol')
     );
-  });
-
-  test(`uses port from server if reporting config not set`, async () => {
-    const permittedHeaders = {
-      foo: 'bar',
-      baz: 'quix',
-    };
-
-    const conditionalHeaders = await getConditionalHeaders({
-      job: {} as JobDocPayload<any>,
-      filteredHeaders: permittedHeaders,
-      server: mockServer,
-    });
-
-    expect(conditionalHeaders.conditions.port).toEqual(mockServer.config().get('server.port'));
-  });
-
-  test(`uses basePath from server config`, async () => {
-    const permittedHeaders = {
-      foo: 'bar',
-      baz: 'quix',
-    };
-
-    const conditionalHeaders = await getConditionalHeaders({
-      job: {} as JobDocPayload<any>,
-      filteredHeaders: permittedHeaders,
-      server: mockServer,
-    });
-
     expect(conditionalHeaders.conditions.basePath).toEqual(
-      mockServer.config().get('server.basePath')
+      mockConfig.kbnConfig.get('server', 'basePath')
     );
   });
-
-  test(`uses protocol from reporting config if set`, async () => {
-    const settings = {
-      'xpack.reporting.kibanaServer.protocol': 'https',
-    };
-
-    mockServer = createMockServer({ settings });
-
-    const permittedHeaders = {
-      foo: 'bar',
-      baz: 'quix',
-    };
-
-    const conditionalHeaders = await getConditionalHeaders({
-      job: {} as JobDocPayload<any>,
-      filteredHeaders: permittedHeaders,
-      server: mockServer,
-    });
-
-    expect(conditionalHeaders.conditions.protocol).toEqual(
-      mockServer.config().get('xpack.reporting.kibanaServer.protocol')
-    );
-  });
-
-  test(`uses protocol from server.info`, async () => {
-    const permittedHeaders = {
-      foo: 'bar',
-      baz: 'quix',
-    };
-
-    const conditionalHeaders = await getConditionalHeaders({
-      job: {} as JobDocPayload<any>,
-      filteredHeaders: permittedHeaders,
-      server: mockServer,
-    });
-
-    expect(conditionalHeaders.conditions.protocol).toEqual(mockServer.info.protocol);
-  });
 });
 
 test('uses basePath from job when creating saved object service', async () => {
@@ -161,14 +66,14 @@ test('uses basePath from job when creating saved object service', async () => {
   const conditionalHeaders = await getConditionalHeaders({
     job: {} as JobDocPayload<any>,
     filteredHeaders: permittedHeaders,
-    server: mockServer,
+    config: mockConfig,
   });
   const jobBasePath = '/sbp/s/marketing';
   await getCustomLogo({
     reporting: mockReportingPlugin,
     job: { basePath: jobBasePath } as JobDocPayloadPDF,
     conditionalHeaders,
-    server: mockServer,
+    config: mockConfig,
   });
 
   const getBasePath = mockGetSavedObjectsClient.mock.calls[0][0].getBasePath;
@@ -179,6 +84,11 @@ test(`uses basePath from server if job doesn't have a basePath when creating sav
   const mockGetSavedObjectsClient = jest.fn();
   mockReportingPlugin.getSavedObjectsClient = mockGetSavedObjectsClient;
 
+  const mockConfigGet = sinon.stub();
+  mockConfigGet.withArgs('kibanaServer', 'hostname').returns('localhost');
+  mockConfigGet.withArgs('server', 'basePath').returns('/sbp');
+  mockConfig = getMockConfig(mockConfigGet);
+
   const permittedHeaders = {
     foo: 'bar',
     baz: 'quix',
@@ -186,14 +96,14 @@ test(`uses basePath from server if job doesn't have a basePath when creating sav
   const conditionalHeaders = await getConditionalHeaders({
     job: {} as JobDocPayload<any>,
     filteredHeaders: permittedHeaders,
-    server: mockServer,
+    config: mockConfig,
   });
 
   await getCustomLogo({
     reporting: mockReportingPlugin,
     job: {} as JobDocPayloadPDF,
     conditionalHeaders,
-    server: mockServer,
+    config: mockConfig,
   });
 
   const getBasePath = mockGetSavedObjectsClient.mock.calls[0][0].getBasePath;
@@ -225,19 +135,26 @@ test(`uses basePath from server if job doesn't have a basePath when creating sav
 
 describe('config formatting', () => {
   test(`lowercases server.host`, async () => {
-    mockServer = createMockServer({ settings: { 'server.host': 'COOL-HOSTNAME' } });
+    const mockConfigGet = sinon
+      .stub()
+      .withArgs('server', 'host')
+      .returns('COOL-HOSTNAME');
+    mockConfig = getMockConfig(mockConfigGet);
+
     const conditionalHeaders = await getConditionalHeaders({
       job: {} as JobDocPayload<any>,
       filteredHeaders: {},
-      server: mockServer,
+      config: mockConfig,
     });
     expect(conditionalHeaders.conditions.hostname).toEqual('cool-hostname');
   });
 
-  test(`lowercases xpack.reporting.kibanaServer.hostname`, async () => {
-    mockServer = createMockServer({
-      settings: { 'xpack.reporting.kibanaServer.hostname': 'GREAT-HOSTNAME' },
-    });
+  test(`lowercases kibanaServer.hostname`, async () => {
+    const mockConfigGet = sinon
+      .stub()
+      .withArgs('kibanaServer', 'hostname')
+      .returns('GREAT-HOSTNAME');
+    mockConfig = getMockConfig(mockConfigGet);
     const conditionalHeaders = await getConditionalHeaders({
       job: {
         title: 'cool-job-bro',
@@ -249,7 +166,7 @@ describe('config formatting', () => {
         },
       },
       filteredHeaders: {},
-      server: mockServer,
+      config: mockConfig,
     });
     expect(conditionalHeaders.conditions.hostname).toEqual('great-hostname');
   });
diff --git a/x-pack/legacy/plugins/reporting/export_types/common/execute_job/get_conditional_headers.ts b/x-pack/legacy/plugins/reporting/export_types/common/execute_job/get_conditional_headers.ts
index 975060a8052f0..bd7999d697ca9 100644
--- a/x-pack/legacy/plugins/reporting/export_types/common/execute_job/get_conditional_headers.ts
+++ b/x-pack/legacy/plugins/reporting/export_types/common/execute_job/get_conditional_headers.ts
@@ -3,29 +3,31 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-import { ConditionalHeaders, ServerFacade } from '../../../types';
+
+import { ReportingConfig } from '../../../server/types';
+import { ConditionalHeaders } from '../../../types';
 
 export const getConditionalHeaders = <JobDocPayloadType>({
-  server,
+  config,
   job,
   filteredHeaders,
 }: {
-  server: ServerFacade;
+  config: ReportingConfig;
   job: JobDocPayloadType;
   filteredHeaders: Record<string, string>;
 }) => {
-  const config = server.config();
+  const { kbnConfig } = config;
   const [hostname, port, basePath, protocol] = [
-    config.get('xpack.reporting.kibanaServer.hostname') || config.get('server.host'),
-    config.get('xpack.reporting.kibanaServer.port') || config.get('server.port'),
-    config.get('server.basePath'),
-    config.get('xpack.reporting.kibanaServer.protocol') || server.info.protocol,
+    config.get('kibanaServer', 'hostname'),
+    config.get('kibanaServer', 'port'),
+    kbnConfig.get('server', 'basePath'),
+    config.get('kibanaServer', 'protocol'),
   ] as [string, number, string, string];
 
   const conditionalHeaders: ConditionalHeaders = {
     headers: filteredHeaders,
     conditions: {
-      hostname: hostname.toLowerCase(),
+      hostname: hostname ? hostname.toLowerCase() : hostname,
       port,
       basePath,
       protocol,
diff --git a/x-pack/legacy/plugins/reporting/export_types/common/execute_job/get_custom_logo.test.ts b/x-pack/legacy/plugins/reporting/export_types/common/execute_job/get_custom_logo.test.ts
index fa53f474dfba7..7c4c889e3e14f 100644
--- a/x-pack/legacy/plugins/reporting/export_types/common/execute_job/get_custom_logo.test.ts
+++ b/x-pack/legacy/plugins/reporting/export_types/common/execute_job/get_custom_logo.test.ts
@@ -5,16 +5,18 @@
  */
 
 import { ReportingCore } from '../../../server';
-import { createMockReportingCore, createMockServer } from '../../../test_helpers';
-import { ServerFacade } from '../../../types';
+import { createMockReportingCore } from '../../../test_helpers';
 import { JobDocPayloadPDF } from '../../printable_pdf/types';
 import { getConditionalHeaders, getCustomLogo } from './index';
 
+const mockConfigGet = jest.fn().mockImplementation((key: string) => {
+  return 'localhost';
+});
+const mockConfig = { get: mockConfigGet, kbnConfig: { get: mockConfigGet } };
+
 let mockReportingPlugin: ReportingCore;
-let mockServer: ServerFacade;
 beforeEach(async () => {
   mockReportingPlugin = await createMockReportingCore();
-  mockServer = createMockServer('');
 });
 
 test(`gets logo from uiSettings`, async () => {
@@ -37,14 +39,14 @@ test(`gets logo from uiSettings`, async () => {
   const conditionalHeaders = await getConditionalHeaders({
     job: {} as JobDocPayloadPDF,
     filteredHeaders: permittedHeaders,
-    server: mockServer,
+    config: mockConfig,
   });
 
   const { logo } = await getCustomLogo({
     reporting: mockReportingPlugin,
+    config: mockConfig,
     job: {} as JobDocPayloadPDF,
     conditionalHeaders,
-    server: mockServer,
   });
 
   expect(mockGet).toBeCalledWith('xpackReporting:customPdfLogo');
diff --git a/x-pack/legacy/plugins/reporting/export_types/common/execute_job/get_custom_logo.ts b/x-pack/legacy/plugins/reporting/export_types/common/execute_job/get_custom_logo.ts
index 7af5edab41ab7..a13f992e7867c 100644
--- a/x-pack/legacy/plugins/reporting/export_types/common/execute_job/get_custom_logo.ts
+++ b/x-pack/legacy/plugins/reporting/export_types/common/execute_job/get_custom_logo.ts
@@ -5,23 +5,22 @@
  */
 
 import { UI_SETTINGS_CUSTOM_PDF_LOGO } from '../../../common/constants';
-import { ReportingCore } from '../../../server';
-import { ConditionalHeaders, ServerFacade } from '../../../types';
+import { ReportingConfig, ReportingCore } from '../../../server/types';
+import { ConditionalHeaders } from '../../../types';
 import { JobDocPayloadPDF } from '../../printable_pdf/types'; // Logo is PDF only
 
 export const getCustomLogo = async ({
   reporting,
-  server,
+  config,
   job,
   conditionalHeaders,
 }: {
   reporting: ReportingCore;
-  server: ServerFacade;
+  config: ReportingConfig;
   job: JobDocPayloadPDF;
   conditionalHeaders: ConditionalHeaders;
 }) => {
-  const serverBasePath: string = server.config().get('server.basePath');
-
+  const serverBasePath: string = config.kbnConfig.get('server', 'basePath');
   const fakeRequest: any = {
     headers: conditionalHeaders.headers,
     // This is used by the spaces SavedObjectClientWrapper to determine the existing space.
diff --git a/x-pack/legacy/plugins/reporting/export_types/common/execute_job/get_full_urls.test.ts b/x-pack/legacy/plugins/reporting/export_types/common/execute_job/get_full_urls.test.ts
index 27e772195f726..5f55617724ff6 100644
--- a/x-pack/legacy/plugins/reporting/export_types/common/execute_job/get_full_urls.test.ts
+++ b/x-pack/legacy/plugins/reporting/export_types/common/execute_job/get_full_urls.test.ts
@@ -4,29 +4,41 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { createMockServer } from '../../../test_helpers';
-import { ServerFacade } from '../../../types';
+import { ReportingConfig } from '../../../server';
 import { JobDocPayloadPNG } from '../../png/types';
 import { JobDocPayloadPDF } from '../../printable_pdf/types';
 import { getFullUrls } from './get_full_urls';
 
 interface FullUrlsOpts {
   job: JobDocPayloadPNG & JobDocPayloadPDF;
-  server: ServerFacade;
-  conditionalHeaders: any;
+  config: ReportingConfig;
 }
 
-let mockServer: any;
+let mockConfig: ReportingConfig;
+const getMockConfig = (mockConfigGet: jest.Mock<any, any>) => {
+  return {
+    get: mockConfigGet,
+    kbnConfig: { get: mockConfigGet },
+  };
+};
+
 beforeEach(() => {
-  mockServer = createMockServer('');
+  const reportingConfig: Record<string, any> = {
+    'kibanaServer.hostname': 'localhost',
+    'kibanaServer.port': 5601,
+    'kibanaServer.protocol': 'http',
+    'server.basePath': '/sbp',
+  };
+  const mockConfigGet = jest.fn().mockImplementation((...keys: string[]) => {
+    return reportingConfig[keys.join('.') as string];
+  });
+  mockConfig = getMockConfig(mockConfigGet);
 });
 
+const getMockJob = (base: object) => base as JobDocPayloadPNG & JobDocPayloadPDF;
+
 test(`fails if no URL is passed`, async () => {
-  const fn = () =>
-    getFullUrls({
-      job: {},
-      server: mockServer,
-    } as FullUrlsOpts);
+  const fn = () => getFullUrls({ job: getMockJob({}), config: mockConfig } as FullUrlsOpts);
   expect(fn).toThrowErrorMatchingInlineSnapshot(
     `"No valid URL fields found in Job Params! Expected \`job.relativeUrl: string\` or \`job.relativeUrls: string[]\`"`
   );
@@ -37,8 +49,8 @@ test(`fails if URLs are file-protocols for PNGs`, async () => {
   const relativeUrl = 'file://etc/passwd/#/something';
   const fn = () =>
     getFullUrls({
-      job: { relativeUrl, forceNow },
-      server: mockServer,
+      job: getMockJob({ relativeUrl, forceNow }),
+      config: mockConfig,
     } as FullUrlsOpts);
   expect(fn).toThrowErrorMatchingInlineSnapshot(
     `"Found invalid URL(s), all URLs must be relative: file://etc/passwd/#/something"`
@@ -51,8 +63,8 @@ test(`fails if URLs are absolute for PNGs`, async () => {
     'http://169.254.169.254/latest/meta-data/iam/security-credentials/profileName/#/something';
   const fn = () =>
     getFullUrls({
-      job: { relativeUrl, forceNow },
-      server: mockServer,
+      job: getMockJob({ relativeUrl, forceNow }),
+      config: mockConfig,
     } as FullUrlsOpts);
   expect(fn).toThrowErrorMatchingInlineSnapshot(
     `"Found invalid URL(s), all URLs must be relative: http://169.254.169.254/latest/meta-data/iam/security-credentials/profileName/#/something"`
@@ -64,11 +76,11 @@ test(`fails if URLs are file-protocols for PDF`, async () => {
   const relativeUrl = 'file://etc/passwd/#/something';
   const fn = () =>
     getFullUrls({
-      job: {
+      job: getMockJob({
         relativeUrls: [relativeUrl],
         forceNow,
-      },
-      server: mockServer,
+      }),
+      config: mockConfig,
     } as FullUrlsOpts);
   expect(fn).toThrowErrorMatchingInlineSnapshot(
     `"Found invalid URL(s), all URLs must be relative: file://etc/passwd/#/something"`
@@ -81,11 +93,11 @@ test(`fails if URLs are absolute for PDF`, async () => {
     'http://169.254.169.254/latest/meta-data/iam/security-credentials/profileName/#/something';
   const fn = () =>
     getFullUrls({
-      job: {
+      job: getMockJob({
         relativeUrls: [relativeUrl],
         forceNow,
-      },
-      server: mockServer,
+      }),
+      config: mockConfig,
     } as FullUrlsOpts);
   expect(fn).toThrowErrorMatchingInlineSnapshot(
     `"Found invalid URL(s), all URLs must be relative: http://169.254.169.254/latest/meta-data/iam/security-credentials/profileName/#/something"`
@@ -102,8 +114,8 @@ test(`fails if any URLs are absolute or file's for PDF`, async () => {
 
   const fn = () =>
     getFullUrls({
-      job: { relativeUrls, forceNow },
-      server: mockServer,
+      job: getMockJob({ relativeUrls, forceNow }),
+      config: mockConfig,
     } as FullUrlsOpts);
   expect(fn).toThrowErrorMatchingInlineSnapshot(
     `"Found invalid URL(s), all URLs must be relative: http://169.254.169.254/latest/meta-data/iam/security-credentials/profileName/#/something file://etc/passwd/#/something"`
@@ -113,8 +125,8 @@ test(`fails if any URLs are absolute or file's for PDF`, async () => {
 test(`fails if URL does not route to a visualization`, async () => {
   const fn = () =>
     getFullUrls({
-      job: { relativeUrl: '/app/phoney' },
-      server: mockServer,
+      job: getMockJob({ relativeUrl: '/app/phoney' }),
+      config: mockConfig,
     } as FullUrlsOpts);
   expect(fn).toThrowErrorMatchingInlineSnapshot(
     `"No valid hash in the URL! A hash is expected for the application to route to the intended visualization."`
@@ -124,8 +136,8 @@ test(`fails if URL does not route to a visualization`, async () => {
 test(`adds forceNow to hash's query, if it exists`, async () => {
   const forceNow = '2000-01-01T00:00:00.000Z';
   const urls = await getFullUrls({
-    job: { relativeUrl: '/app/kibana#/something', forceNow },
-    server: mockServer,
+    job: getMockJob({ relativeUrl: '/app/kibana#/something', forceNow }),
+    config: mockConfig,
   } as FullUrlsOpts);
 
   expect(urls[0]).toEqual(
@@ -137,8 +149,8 @@ test(`appends forceNow to hash's query, if it exists`, async () => {
   const forceNow = '2000-01-01T00:00:00.000Z';
 
   const urls = await getFullUrls({
-    job: { relativeUrl: '/app/kibana#/something?_g=something', forceNow },
-    server: mockServer,
+    job: getMockJob({ relativeUrl: '/app/kibana#/something?_g=something', forceNow }),
+    config: mockConfig,
   } as FullUrlsOpts);
 
   expect(urls[0]).toEqual(
@@ -148,8 +160,8 @@ test(`appends forceNow to hash's query, if it exists`, async () => {
 
 test(`doesn't append forceNow query to url, if it doesn't exists`, async () => {
   const urls = await getFullUrls({
-    job: { relativeUrl: '/app/kibana#/something' },
-    server: mockServer,
+    job: getMockJob({ relativeUrl: '/app/kibana#/something' }),
+    config: mockConfig,
   } as FullUrlsOpts);
 
   expect(urls[0]).toEqual('http://localhost:5601/sbp/app/kibana#/something');
@@ -158,7 +170,7 @@ test(`doesn't append forceNow query to url, if it doesn't exists`, async () => {
 test(`adds forceNow to each of multiple urls`, async () => {
   const forceNow = '2000-01-01T00:00:00.000Z';
   const urls = await getFullUrls({
-    job: {
+    job: getMockJob({
       relativeUrls: [
         '/app/kibana#/something_aaa',
         '/app/kibana#/something_bbb',
@@ -166,8 +178,8 @@ test(`adds forceNow to each of multiple urls`, async () => {
         '/app/kibana#/something_ddd',
       ],
       forceNow,
-    },
-    server: mockServer,
+    }),
+    config: mockConfig,
   } as FullUrlsOpts);
 
   expect(urls).toEqual([
diff --git a/x-pack/legacy/plugins/reporting/export_types/common/execute_job/get_full_urls.ts b/x-pack/legacy/plugins/reporting/export_types/common/execute_job/get_full_urls.ts
index ca64d8632dbfe..c4b6f31019fdf 100644
--- a/x-pack/legacy/plugins/reporting/export_types/common/execute_job/get_full_urls.ts
+++ b/x-pack/legacy/plugins/reporting/export_types/common/execute_job/get_full_urls.ts
@@ -12,7 +12,7 @@ import {
 } from 'url';
 import { getAbsoluteUrlFactory } from '../../../common/get_absolute_url';
 import { validateUrls } from '../../../common/validate_urls';
-import { ServerFacade } from '../../../types';
+import { ReportingConfig } from '../../../server/types';
 import { JobDocPayloadPNG } from '../../png/types';
 import { JobDocPayloadPDF } from '../../printable_pdf/types';
 
@@ -24,19 +24,23 @@ function isPdfJob(job: JobDocPayloadPNG | JobDocPayloadPDF): job is JobDocPayloa
 }
 
 export function getFullUrls<JobDocPayloadType>({
-  server,
+  config,
   job,
 }: {
-  server: ServerFacade;
+  config: ReportingConfig;
   job: JobDocPayloadPDF | JobDocPayloadPNG;
 }) {
-  const config = server.config();
-
+  const [basePath, protocol, hostname, port] = [
+    config.kbnConfig.get('server', 'basePath'),
+    config.get('kibanaServer', 'protocol'),
+    config.get('kibanaServer', 'hostname'),
+    config.get('kibanaServer', 'port'),
+  ] as string[];
   const getAbsoluteUrl = getAbsoluteUrlFactory({
-    defaultBasePath: config.get('server.basePath'),
-    protocol: config.get('xpack.reporting.kibanaServer.protocol') || server.info.protocol,
-    hostname: config.get('xpack.reporting.kibanaServer.hostname') || config.get('server.host'),
-    port: config.get('xpack.reporting.kibanaServer.port') || config.get('server.port'),
+    defaultBasePath: basePath,
+    protocol,
+    hostname,
+    port,
   });
 
   // PDF and PNG job params put in the url differently
diff --git a/x-pack/legacy/plugins/reporting/export_types/common/layouts/create_layout.ts b/x-pack/legacy/plugins/reporting/export_types/common/layouts/create_layout.ts
index 0cb83352d4606..07fceb603e451 100644
--- a/x-pack/legacy/plugins/reporting/export_types/common/layouts/create_layout.ts
+++ b/x-pack/legacy/plugins/reporting/export_types/common/layouts/create_layout.ts
@@ -3,17 +3,18 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-import { ServerFacade } from '../../../types';
+
+import { CaptureConfig } from '../../../server/types';
 import { LayoutTypes } from '../constants';
 import { Layout, LayoutParams } from './layout';
 import { PreserveLayout } from './preserve_layout';
 import { PrintLayout } from './print_layout';
 
-export function createLayout(server: ServerFacade, layoutParams?: LayoutParams): Layout {
+export function createLayout(captureConfig: CaptureConfig, layoutParams?: LayoutParams): Layout {
   if (layoutParams && layoutParams.id === LayoutTypes.PRESERVE_LAYOUT) {
     return new PreserveLayout(layoutParams.dimensions);
   }
 
   // this is the default because some jobs won't have anything specified
-  return new PrintLayout(server);
+  return new PrintLayout(captureConfig);
 }
diff --git a/x-pack/legacy/plugins/reporting/export_types/common/layouts/print_layout.ts b/x-pack/legacy/plugins/reporting/export_types/common/layouts/print_layout.ts
index 6007c2960057a..98d8dc2983653 100644
--- a/x-pack/legacy/plugins/reporting/export_types/common/layouts/print_layout.ts
+++ b/x-pack/legacy/plugins/reporting/export_types/common/layouts/print_layout.ts
@@ -3,11 +3,12 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
+
 import path from 'path';
 import { EvaluateFn, SerializableOrJSHandle } from 'puppeteer';
-import { LevelLogger } from '../../../server/lib';
 import { HeadlessChromiumDriver } from '../../../server/browsers';
-import { ServerFacade } from '../../../types';
+import { LevelLogger } from '../../../server/lib';
+import { ReportingConfigType } from '../../../server/core';
 import { LayoutTypes } from '../constants';
 import { getDefaultLayoutSelectors, Layout, LayoutSelectorDictionary, Size } from './layout';
 import { CaptureConfig } from './types';
@@ -20,9 +21,9 @@ export class PrintLayout extends Layout {
   public readonly groupCount = 2;
   private captureConfig: CaptureConfig;
 
-  constructor(server: ServerFacade) {
+  constructor(captureConfig: ReportingConfigType['capture']) {
     super(LayoutTypes.PRINT);
-    this.captureConfig = server.config().get('xpack.reporting.capture');
+    this.captureConfig = captureConfig;
   }
 
   public getCssOverridesPath() {
diff --git a/x-pack/legacy/plugins/reporting/export_types/common/lib/screenshots/get_number_of_items.ts b/x-pack/legacy/plugins/reporting/export_types/common/lib/screenshots/get_number_of_items.ts
index 16eb433e8a75e..57d025890d3e2 100644
--- a/x-pack/legacy/plugins/reporting/export_types/common/lib/screenshots/get_number_of_items.ts
+++ b/x-pack/legacy/plugins/reporting/export_types/common/lib/screenshots/get_number_of_items.ts
@@ -7,17 +7,16 @@
 import { i18n } from '@kbn/i18n';
 import { HeadlessChromiumDriver as HeadlessBrowser } from '../../../../server/browsers';
 import { LevelLogger } from '../../../../server/lib';
-import { ServerFacade } from '../../../../types';
+import { CaptureConfig } from '../../../../server/types';
 import { LayoutInstance } from '../../layouts/layout';
 import { CONTEXT_GETNUMBEROFITEMS, CONTEXT_READMETADATA } from './constants';
 
 export const getNumberOfItems = async (
-  server: ServerFacade,
+  captureConfig: CaptureConfig,
   browser: HeadlessBrowser,
   layout: LayoutInstance,
   logger: LevelLogger
 ): Promise<number> => {
-  const config = server.config();
   const { renderComplete: renderCompleteSelector, itemsCountAttribute } = layout.selectors;
   let itemsCount: number;
 
@@ -33,7 +32,7 @@ export const getNumberOfItems = async (
     // we have to use this hint to wait for all of them
     await browser.waitForSelector(
       `${renderCompleteSelector},[${itemsCountAttribute}]`,
-      { timeout: config.get('xpack.reporting.capture.timeouts.waitForElements') },
+      { timeout: captureConfig.timeouts.waitForElements },
       { context: CONTEXT_READMETADATA },
       logger
     );
diff --git a/x-pack/legacy/plugins/reporting/export_types/common/lib/screenshots/observable.test.ts b/x-pack/legacy/plugins/reporting/export_types/common/lib/screenshots/observable.test.ts
index 13d07bcdd6baf..75ac3dca4ffa0 100644
--- a/x-pack/legacy/plugins/reporting/export_types/common/lib/screenshots/observable.test.ts
+++ b/x-pack/legacy/plugins/reporting/export_types/common/lib/screenshots/observable.test.ts
@@ -19,12 +19,9 @@ import * as Rx from 'rxjs';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
 import { loggingServiceMock } from '../../../../../../../../src/core/server/mocks';
 import { LevelLogger } from '../../../../server/lib';
-import {
-  createMockBrowserDriverFactory,
-  createMockLayoutInstance,
-  createMockServer,
-} from '../../../../test_helpers';
+import { createMockBrowserDriverFactory, createMockLayoutInstance } from '../../../../test_helpers';
 import { ConditionalHeaders, HeadlessChromiumDriver } from '../../../../types';
+import { CaptureConfig } from '../../../../server/types';
 import { screenshotsObservableFactory } from './observable';
 import { ElementsPositionAndAttribute } from './types';
 
@@ -34,8 +31,8 @@ import { ElementsPositionAndAttribute } from './types';
 const mockLogger = jest.fn(loggingServiceMock.create);
 const logger = new LevelLogger(mockLogger());
 
-const __LEGACY = createMockServer({ settings: { 'xpack.reporting.capture': { loadDelay: 13 } } });
-const mockLayout = createMockLayoutInstance(__LEGACY);
+const mockConfig = { timeouts: { openUrl: 13 } } as CaptureConfig;
+const mockLayout = createMockLayoutInstance(mockConfig);
 
 /*
  * Tests
@@ -48,7 +45,7 @@ describe('Screenshot Observable Pipeline', () => {
   });
 
   it('pipelines a single url into screenshot and timeRange', async () => {
-    const getScreenshots$ = screenshotsObservableFactory(__LEGACY, mockBrowserDriverFactory);
+    const getScreenshots$ = screenshotsObservableFactory(mockConfig, mockBrowserDriverFactory);
     const result = await getScreenshots$({
       logger,
       urls: ['/welcome/home/start/index.htm'],
@@ -86,7 +83,7 @@ describe('Screenshot Observable Pipeline', () => {
     });
 
     // test
-    const getScreenshots$ = screenshotsObservableFactory(__LEGACY, mockBrowserDriverFactory);
+    const getScreenshots$ = screenshotsObservableFactory(mockConfig, mockBrowserDriverFactory);
     const result = await getScreenshots$({
       logger,
       urls: ['/welcome/home/start/index2.htm', '/welcome/home/start/index.php3?page=./home.php'],
@@ -136,7 +133,7 @@ describe('Screenshot Observable Pipeline', () => {
       });
 
       // test
-      const getScreenshots$ = screenshotsObservableFactory(__LEGACY, mockBrowserDriverFactory);
+      const getScreenshots$ = screenshotsObservableFactory(mockConfig, mockBrowserDriverFactory);
       const getScreenshot = async () => {
         return await getScreenshots$({
           logger,
@@ -197,7 +194,7 @@ describe('Screenshot Observable Pipeline', () => {
       });
 
       // test
-      const getScreenshots$ = screenshotsObservableFactory(__LEGACY, mockBrowserDriverFactory);
+      const getScreenshots$ = screenshotsObservableFactory(mockConfig, mockBrowserDriverFactory);
       const getScreenshot = async () => {
         return await getScreenshots$({
           logger,
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 44c04c763f840..53a11c18abd79 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
@@ -6,24 +6,22 @@
 
 import * as Rx from 'rxjs';
 import { catchError, concatMap, first, mergeMap, take, takeUntil, toArray } from 'rxjs/operators';
-import { CaptureConfig, HeadlessChromiumDriverFactory, ServerFacade } from '../../../../types';
+import { CaptureConfig } from '../../../../server/types';
+import { HeadlessChromiumDriverFactory } from '../../../../types';
 import { getElementPositionAndAttributes } from './get_element_position_data';
 import { getNumberOfItems } from './get_number_of_items';
 import { getScreenshots } from './get_screenshots';
 import { getTimeRange } from './get_time_range';
+import { injectCustomCss } from './inject_css';
 import { openUrl } from './open_url';
 import { ScreenSetupData, ScreenshotObservableOpts, ScreenshotResults } from './types';
 import { waitForRenderComplete } from './wait_for_render';
 import { waitForVisualizations } from './wait_for_visualizations';
-import { injectCustomCss } from './inject_css';
 
 export function screenshotsObservableFactory(
-  server: ServerFacade,
+  captureConfig: CaptureConfig,
   browserDriverFactory: HeadlessChromiumDriverFactory
 ) {
-  const config = server.config();
-  const captureConfig: CaptureConfig = config.get('xpack.reporting.capture');
-
   return function screenshotsObservable({
     logger,
     urls,
@@ -41,13 +39,13 @@ export function screenshotsObservableFactory(
           mergeMap(({ driver, exit$ }) => {
             const setup$: Rx.Observable<ScreenSetupData> = Rx.of(1).pipe(
               takeUntil(exit$),
-              mergeMap(() => openUrl(server, driver, url, conditionalHeaders, logger)),
-              mergeMap(() => getNumberOfItems(server, driver, layout, logger)),
+              mergeMap(() => openUrl(captureConfig, driver, url, conditionalHeaders, logger)),
+              mergeMap(() => getNumberOfItems(captureConfig, driver, layout, logger)),
               mergeMap(async itemsCount => {
                 const viewport = layout.getViewport(itemsCount);
                 await Promise.all([
                   driver.setViewport(viewport, logger),
-                  waitForVisualizations(server, driver, itemsCount, layout, logger),
+                  waitForVisualizations(captureConfig, driver, itemsCount, layout, logger),
                 ]);
               }),
               mergeMap(async () => {
@@ -60,7 +58,7 @@ export function screenshotsObservableFactory(
                   await layout.positionElements(driver, logger);
                 }
 
-                await waitForRenderComplete(driver, layout, captureConfig, logger);
+                await waitForRenderComplete(captureConfig, driver, layout, logger);
               }),
               mergeMap(async () => {
                 return await Promise.all([
diff --git a/x-pack/legacy/plugins/reporting/export_types/common/lib/screenshots/open_url.ts b/x-pack/legacy/plugins/reporting/export_types/common/lib/screenshots/open_url.ts
index fbae1f91a7a6a..a484dfb243563 100644
--- a/x-pack/legacy/plugins/reporting/export_types/common/lib/screenshots/open_url.ts
+++ b/x-pack/legacy/plugins/reporting/export_types/common/lib/screenshots/open_url.ts
@@ -5,27 +5,26 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { ConditionalHeaders, ServerFacade } from '../../../../types';
-import { LevelLogger } from '../../../../server/lib';
 import { HeadlessChromiumDriver as HeadlessBrowser } from '../../../../server/browsers';
+import { LevelLogger } from '../../../../server/lib';
+import { CaptureConfig } from '../../../../server/types';
+import { ConditionalHeaders } from '../../../../types';
 import { PAGELOAD_SELECTOR } from '../../constants';
 
 export const openUrl = async (
-  server: ServerFacade,
+  captureConfig: CaptureConfig,
   browser: HeadlessBrowser,
   url: string,
   conditionalHeaders: ConditionalHeaders,
   logger: LevelLogger
 ): Promise<void> => {
-  const config = server.config();
-
   try {
     await browser.open(
       url,
       {
         conditionalHeaders,
         waitForSelector: PAGELOAD_SELECTOR,
-        timeout: config.get('xpack.reporting.capture.timeouts.openUrl'),
+        timeout: captureConfig.timeouts.openUrl,
       },
       logger
     );
diff --git a/x-pack/legacy/plugins/reporting/export_types/common/lib/screenshots/types.ts b/x-pack/legacy/plugins/reporting/export_types/common/lib/screenshots/types.ts
index ab81a952f345c..76613c2d631d6 100644
--- a/x-pack/legacy/plugins/reporting/export_types/common/lib/screenshots/types.ts
+++ b/x-pack/legacy/plugins/reporting/export_types/common/lib/screenshots/types.ts
@@ -4,8 +4,8 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { ElementPosition, ConditionalHeaders } from '../../../../types';
 import { LevelLogger } from '../../../../server/lib';
+import { ConditionalHeaders, ElementPosition } from '../../../../types';
 import { LayoutInstance } from '../../layouts/layout';
 
 export interface ScreenshotObservableOpts {
diff --git a/x-pack/legacy/plugins/reporting/export_types/common/lib/screenshots/wait_for_render.ts b/x-pack/legacy/plugins/reporting/export_types/common/lib/screenshots/wait_for_render.ts
index 2f6dc2829dfd8..069896c8d9e90 100644
--- a/x-pack/legacy/plugins/reporting/export_types/common/lib/screenshots/wait_for_render.ts
+++ b/x-pack/legacy/plugins/reporting/export_types/common/lib/screenshots/wait_for_render.ts
@@ -5,16 +5,16 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { CaptureConfig } from '../../../../types';
 import { HeadlessChromiumDriver as HeadlessBrowser } from '../../../../server/browsers';
 import { LevelLogger } from '../../../../server/lib';
+import { CaptureConfig } from '../../../../server/types';
 import { LayoutInstance } from '../../layouts/layout';
 import { CONTEXT_WAITFORRENDER } from './constants';
 
 export const waitForRenderComplete = async (
+  captureConfig: CaptureConfig,
   browser: HeadlessBrowser,
   layout: LayoutInstance,
-  captureConfig: CaptureConfig,
   logger: LevelLogger
 ) => {
   logger.debug(
diff --git a/x-pack/legacy/plugins/reporting/export_types/common/lib/screenshots/wait_for_visualizations.ts b/x-pack/legacy/plugins/reporting/export_types/common/lib/screenshots/wait_for_visualizations.ts
index 93ad40026dff8..7960e1552e559 100644
--- a/x-pack/legacy/plugins/reporting/export_types/common/lib/screenshots/wait_for_visualizations.ts
+++ b/x-pack/legacy/plugins/reporting/export_types/common/lib/screenshots/wait_for_visualizations.ts
@@ -5,9 +5,9 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { ServerFacade } from '../../../../types';
 import { HeadlessChromiumDriver as HeadlessBrowser } from '../../../../server/browsers';
 import { LevelLogger } from '../../../../server/lib';
+import { CaptureConfig } from '../../../../server/types';
 import { LayoutInstance } from '../../layouts/layout';
 import { CONTEXT_WAITFORELEMENTSTOBEINDOM } from './constants';
 
@@ -23,13 +23,12 @@ const getCompletedItemsCount = ({ renderCompleteSelector }: SelectorArgs) => {
  * 3. Wait for the render complete event to be fired once for each item
  */
 export const waitForVisualizations = async (
-  server: ServerFacade,
+  captureConfig: CaptureConfig,
   browser: HeadlessBrowser,
   itemsCount: number,
   layout: LayoutInstance,
   logger: LevelLogger
 ): Promise<void> => {
-  const config = server.config();
   const { renderComplete: renderCompleteSelector } = layout.selectors;
 
   logger.debug(
@@ -45,7 +44,7 @@ export const waitForVisualizations = async (
         fn: getCompletedItemsCount,
         args: [{ renderCompleteSelector }],
         toEqual: itemsCount,
-        timeout: config.get('xpack.reporting.capture.timeouts.renderComplete'),
+        timeout: captureConfig.timeouts.renderComplete,
       },
       { context: CONTEXT_WAITFORELEMENTSTOBEINDOM },
       logger
diff --git a/x-pack/legacy/plugins/reporting/export_types/csv/server/create_job.ts b/x-pack/legacy/plugins/reporting/export_types/csv/server/create_job.ts
index 7ea67277015ab..b87403ac74f89 100644
--- a/x-pack/legacy/plugins/reporting/export_types/csv/server/create_job.ts
+++ b/x-pack/legacy/plugins/reporting/export_types/csv/server/create_job.ts
@@ -11,14 +11,14 @@ import {
   CreateJobFactory,
   ESQueueCreateJobFn,
   RequestFacade,
-  ServerFacade,
 } from '../../../types';
 import { JobParamsDiscoverCsv } from '../types';
 
 export const createJobFactory: CreateJobFactory<ESQueueCreateJobFn<
   JobParamsDiscoverCsv
->> = function createJobFactoryFn(reporting: ReportingCore, server: ServerFacade) {
-  const crypto = cryptoFactory(server);
+>> = async function createJobFactoryFn(reporting: ReportingCore) {
+  const config = await reporting.getConfig();
+  const crypto = cryptoFactory(config.get('encryptionKey'));
 
   return async function createJob(
     jobParams: JobParamsDiscoverCsv,
diff --git a/x-pack/legacy/plugins/reporting/export_types/csv/server/execute_job.test.js b/x-pack/legacy/plugins/reporting/export_types/csv/server/execute_job.test.js
index f12916b734dbf..7dfa705901fbe 100644
--- a/x-pack/legacy/plugins/reporting/export_types/csv/server/execute_job.test.js
+++ b/x-pack/legacy/plugins/reporting/export_types/csv/server/execute_job.test.js
@@ -36,11 +36,12 @@ describe('CSV Execute Job', function() {
   let defaultElasticsearchResponse;
   let encryptedHeaders;
 
-  let cancellationToken;
-  let mockReportingPlugin;
-  let mockServer;
   let clusterStub;
+  let configGetStub;
+  let mockReportingConfig;
+  let mockReportingPlugin;
   let callAsCurrentUserStub;
+  let cancellationToken;
 
   const mockElasticsearch = {
     dataClient: {
@@ -58,7 +59,17 @@ describe('CSV Execute Job', function() {
 
   beforeEach(async function() {
     mockReportingPlugin = await createMockReportingCore();
-    mockReportingPlugin.getUiSettingsServiceFactory = () => mockUiSettingsClient;
+
+    configGetStub = sinon.stub();
+    configGetStub.withArgs('encryptionKey').returns(encryptionKey);
+    configGetStub.withArgs('csv', 'maxSizeBytes').returns(1024 * 1000); // 1mB
+    configGetStub.withArgs('csv', 'scroll').returns({});
+    mockReportingConfig = { get: configGetStub, kbnConfig: { get: configGetStub } };
+
+    mockReportingPlugin.getConfig = () => Promise.resolve(mockReportingConfig);
+    mockReportingPlugin.getUiSettingsServiceFactory = () => Promise.resolve(mockUiSettingsClient);
+    mockReportingPlugin.getElasticsearchService = () => Promise.resolve(mockElasticsearch);
+
     cancellationToken = new CancellationToken();
 
     defaultElasticsearchResponse = {
@@ -75,7 +86,6 @@ describe('CSV Execute Job', function() {
       .stub(clusterStub, 'callAsCurrentUser')
       .resolves(defaultElasticsearchResponse);
 
-    const configGetStub = sinon.stub();
     mockUiSettingsClient.get.withArgs('csv:separator').returns(',');
     mockUiSettingsClient.get.withArgs('csv:quoteValues').returns(true);
 
@@ -93,36 +103,11 @@ describe('CSV Execute Job', function() {
         return fieldFormatsRegistry;
       },
     });
-
-    mockServer = {
-      config: function() {
-        return {
-          get: configGetStub,
-        };
-      },
-    };
-    mockServer
-      .config()
-      .get.withArgs('xpack.reporting.encryptionKey')
-      .returns(encryptionKey);
-    mockServer
-      .config()
-      .get.withArgs('xpack.reporting.csv.maxSizeBytes')
-      .returns(1024 * 1000); // 1mB
-    mockServer
-      .config()
-      .get.withArgs('xpack.reporting.csv.scroll')
-      .returns({});
   });
 
   describe('basic Elasticsearch call behavior', function() {
     it('should decrypt encrypted headers and pass to callAsCurrentUser', async function() {
-      const executeJob = await executeJobFactory(
-        mockReportingPlugin,
-        mockServer,
-        mockElasticsearch,
-        mockLogger
-      );
+      const executeJob = await executeJobFactory(mockReportingPlugin, mockLogger);
       await executeJob(
         'job456',
         { headers: encryptedHeaders, fields: [], searchRequest: { index: null, body: null } },
@@ -138,12 +123,7 @@ describe('CSV Execute Job', function() {
         testBody: true,
       };
 
-      const executeJob = await executeJobFactory(
-        mockReportingPlugin,
-        mockServer,
-        mockElasticsearch,
-        mockLogger
-      );
+      const executeJob = await executeJobFactory(mockReportingPlugin, mockLogger);
       const job = {
         headers: encryptedHeaders,
         fields: [],
@@ -170,12 +150,7 @@ describe('CSV Execute Job', function() {
         _scroll_id: scrollId,
       });
       callAsCurrentUserStub.onSecondCall().resolves(defaultElasticsearchResponse);
-      const executeJob = await executeJobFactory(
-        mockReportingPlugin,
-        mockServer,
-        mockElasticsearch,
-        mockLogger
-      );
+      const executeJob = await executeJobFactory(mockReportingPlugin, mockLogger);
       await executeJob(
         'job456',
         { headers: encryptedHeaders, fields: [], searchRequest: { index: null, body: null } },
@@ -189,12 +164,7 @@ describe('CSV Execute Job', function() {
     });
 
     it('should not execute scroll if there are no hits from the search', async function() {
-      const executeJob = await executeJobFactory(
-        mockReportingPlugin,
-        mockServer,
-        mockElasticsearch,
-        mockLogger
-      );
+      const executeJob = await executeJobFactory(mockReportingPlugin, mockLogger);
       await executeJob(
         'job456',
         { headers: encryptedHeaders, fields: [], searchRequest: { index: null, body: null } },
@@ -224,12 +194,7 @@ describe('CSV Execute Job', function() {
         _scroll_id: 'scrollId',
       });
 
-      const executeJob = await executeJobFactory(
-        mockReportingPlugin,
-        mockServer,
-        mockElasticsearch,
-        mockLogger
-      );
+      const executeJob = await executeJobFactory(mockReportingPlugin, mockLogger);
       await executeJob(
         'job456',
         { headers: encryptedHeaders, fields: [], searchRequest: { index: null, body: null } },
@@ -264,12 +229,7 @@ describe('CSV Execute Job', function() {
         _scroll_id: lastScrollId,
       });
 
-      const executeJob = await executeJobFactory(
-        mockReportingPlugin,
-        mockServer,
-        mockElasticsearch,
-        mockLogger
-      );
+      const executeJob = await executeJobFactory(mockReportingPlugin, mockLogger);
       await executeJob(
         'job456',
         { headers: encryptedHeaders, fields: [], searchRequest: { index: null, body: null } },
@@ -297,12 +257,7 @@ describe('CSV Execute Job', function() {
         _scroll_id: lastScrollId,
       });
 
-      const executeJob = await executeJobFactory(
-        mockReportingPlugin,
-        mockServer,
-        mockElasticsearch,
-        mockLogger
-      );
+      const executeJob = await executeJobFactory(mockReportingPlugin, mockLogger);
       const jobParams = {
         headers: encryptedHeaders,
         fields: ['one', 'two'],
@@ -321,10 +276,7 @@ describe('CSV Execute Job', function() {
 
   describe('Cells with formula values', () => {
     it('returns `csv_contains_formulas` when cells contain formulas', async function() {
-      mockServer
-        .config()
-        .get.withArgs('xpack.reporting.csv.checkForFormulas')
-        .returns(true);
+      configGetStub.withArgs('csv', 'checkForFormulas').returns(true);
       callAsCurrentUserStub.onFirstCall().returns({
         hits: {
           hits: [{ _source: { one: '=SUM(A1:A2)', two: 'bar' } }],
@@ -332,12 +284,7 @@ describe('CSV Execute Job', function() {
         _scroll_id: 'scrollId',
       });
 
-      const executeJob = await executeJobFactory(
-        mockReportingPlugin,
-        mockServer,
-        mockElasticsearch,
-        mockLogger
-      );
+      const executeJob = await executeJobFactory(mockReportingPlugin, mockLogger);
       const jobParams = {
         headers: encryptedHeaders,
         fields: ['one', 'two'],
@@ -354,10 +301,7 @@ describe('CSV Execute Job', function() {
     });
 
     it('returns warnings when headings contain formulas', async function() {
-      mockServer
-        .config()
-        .get.withArgs('xpack.reporting.csv.checkForFormulas')
-        .returns(true);
+      configGetStub.withArgs('csv', 'checkForFormulas').returns(true);
       callAsCurrentUserStub.onFirstCall().returns({
         hits: {
           hits: [{ _source: { '=SUM(A1:A2)': 'foo', two: 'bar' } }],
@@ -365,12 +309,7 @@ describe('CSV Execute Job', function() {
         _scroll_id: 'scrollId',
       });
 
-      const executeJob = await executeJobFactory(
-        mockReportingPlugin,
-        mockServer,
-        mockElasticsearch,
-        mockLogger
-      );
+      const executeJob = await executeJobFactory(mockReportingPlugin, mockLogger);
       const jobParams = {
         headers: encryptedHeaders,
         fields: ['=SUM(A1:A2)', 'two'],
@@ -387,10 +326,7 @@ describe('CSV Execute Job', function() {
     });
 
     it('returns no warnings when cells have no formulas', async function() {
-      mockServer
-        .config()
-        .get.withArgs('xpack.reporting.csv.checkForFormulas')
-        .returns(true);
+      configGetStub.withArgs('csv', 'checkForFormulas').returns(true);
       callAsCurrentUserStub.onFirstCall().returns({
         hits: {
           hits: [{ _source: { one: 'foo', two: 'bar' } }],
@@ -398,12 +334,7 @@ describe('CSV Execute Job', function() {
         _scroll_id: 'scrollId',
       });
 
-      const executeJob = await executeJobFactory(
-        mockReportingPlugin,
-        mockServer,
-        mockElasticsearch,
-        mockLogger
-      );
+      const executeJob = await executeJobFactory(mockReportingPlugin, mockLogger);
       const jobParams = {
         headers: encryptedHeaders,
         fields: ['one', 'two'],
@@ -420,10 +351,7 @@ describe('CSV Execute Job', function() {
     });
 
     it('returns no warnings when configured not to', async () => {
-      mockServer
-        .config()
-        .get.withArgs('xpack.reporting.csv.checkForFormulas')
-        .returns(false);
+      configGetStub.withArgs('csv', 'checkForFormulas').returns(false);
       callAsCurrentUserStub.onFirstCall().returns({
         hits: {
           hits: [{ _source: { one: '=SUM(A1:A2)', two: 'bar' } }],
@@ -431,12 +359,7 @@ describe('CSV Execute Job', function() {
         _scroll_id: 'scrollId',
       });
 
-      const executeJob = await executeJobFactory(
-        mockReportingPlugin,
-        mockServer,
-        mockElasticsearch,
-        mockLogger
-      );
+      const executeJob = await executeJobFactory(mockReportingPlugin, mockLogger);
       const jobParams = {
         headers: encryptedHeaders,
         fields: ['one', 'two'],
@@ -456,12 +379,7 @@ describe('CSV Execute Job', function() {
   describe('Elasticsearch call errors', function() {
     it('should reject Promise if search call errors out', async function() {
       callAsCurrentUserStub.rejects(new Error());
-      const executeJob = await executeJobFactory(
-        mockReportingPlugin,
-        mockServer,
-        mockElasticsearch,
-        mockLogger
-      );
+      const executeJob = await executeJobFactory(mockReportingPlugin, mockLogger);
       const jobParams = {
         headers: encryptedHeaders,
         fields: [],
@@ -480,12 +398,7 @@ describe('CSV Execute Job', function() {
         _scroll_id: 'scrollId',
       });
       callAsCurrentUserStub.onSecondCall().rejects(new Error());
-      const executeJob = await executeJobFactory(
-        mockReportingPlugin,
-        mockServer,
-        mockElasticsearch,
-        mockLogger
-      );
+      const executeJob = await executeJobFactory(mockReportingPlugin, mockLogger);
       const jobParams = {
         headers: encryptedHeaders,
         fields: [],
@@ -506,12 +419,7 @@ describe('CSV Execute Job', function() {
         _scroll_id: undefined,
       });
 
-      const executeJob = await executeJobFactory(
-        mockReportingPlugin,
-        mockServer,
-        mockElasticsearch,
-        mockLogger
-      );
+      const executeJob = await executeJobFactory(mockReportingPlugin, mockLogger);
       const jobParams = {
         headers: encryptedHeaders,
         fields: [],
@@ -532,12 +440,7 @@ describe('CSV Execute Job', function() {
         _scroll_id: undefined,
       });
 
-      const executeJob = await executeJobFactory(
-        mockReportingPlugin,
-        mockServer,
-        mockElasticsearch,
-        mockLogger
-      );
+      const executeJob = await executeJobFactory(mockReportingPlugin, mockLogger);
       const jobParams = {
         headers: encryptedHeaders,
         fields: [],
@@ -565,12 +468,7 @@ describe('CSV Execute Job', function() {
         _scroll_id: undefined,
       });
 
-      const executeJob = await executeJobFactory(
-        mockReportingPlugin,
-        mockServer,
-        mockElasticsearch,
-        mockLogger
-      );
+      const executeJob = await executeJobFactory(mockReportingPlugin, mockLogger);
       const jobParams = {
         headers: encryptedHeaders,
         fields: [],
@@ -598,12 +496,7 @@ describe('CSV Execute Job', function() {
         _scroll_id: undefined,
       });
 
-      const executeJob = await executeJobFactory(
-        mockReportingPlugin,
-        mockServer,
-        mockElasticsearch,
-        mockLogger
-      );
+      const executeJob = await executeJobFactory(mockReportingPlugin, mockLogger);
       const jobParams = {
         headers: encryptedHeaders,
         fields: [],
@@ -639,12 +532,7 @@ describe('CSV Execute Job', function() {
     });
 
     it('should stop calling Elasticsearch when cancellationToken.cancel is called', async function() {
-      const executeJob = await executeJobFactory(
-        mockReportingPlugin,
-        mockServer,
-        mockElasticsearch,
-        mockLogger
-      );
+      const executeJob = await executeJobFactory(mockReportingPlugin, mockLogger);
       executeJob(
         'job345',
         { headers: encryptedHeaders, fields: [], searchRequest: { index: null, body: null } },
@@ -659,12 +547,7 @@ describe('CSV Execute Job', function() {
     });
 
     it(`shouldn't call clearScroll if it never got a scrollId`, async function() {
-      const executeJob = await executeJobFactory(
-        mockReportingPlugin,
-        mockServer,
-        mockElasticsearch,
-        mockLogger
-      );
+      const executeJob = await executeJobFactory(mockReportingPlugin, mockLogger);
       executeJob(
         'job345',
         { headers: encryptedHeaders, fields: [], searchRequest: { index: null, body: null } },
@@ -678,12 +561,7 @@ describe('CSV Execute Job', function() {
     });
 
     it('should call clearScroll if it got a scrollId', async function() {
-      const executeJob = await executeJobFactory(
-        mockReportingPlugin,
-        mockServer,
-        mockElasticsearch,
-        mockLogger
-      );
+      const executeJob = await executeJobFactory(mockReportingPlugin, mockLogger);
       executeJob(
         'job345',
         { headers: encryptedHeaders, fields: [], searchRequest: { index: null, body: null } },
@@ -701,12 +579,7 @@ describe('CSV Execute Job', function() {
 
   describe('csv content', function() {
     it('should write column headers to output, even if there are no results', async function() {
-      const executeJob = await executeJobFactory(
-        mockReportingPlugin,
-        mockServer,
-        mockElasticsearch,
-        mockLogger
-      );
+      const executeJob = await executeJobFactory(mockReportingPlugin, mockLogger);
       const jobParams = {
         headers: encryptedHeaders,
         fields: ['one', 'two'],
@@ -718,12 +591,7 @@ describe('CSV Execute Job', function() {
 
     it('should use custom uiSettings csv:separator for header', async function() {
       mockUiSettingsClient.get.withArgs('csv:separator').returns(';');
-      const executeJob = await executeJobFactory(
-        mockReportingPlugin,
-        mockServer,
-        mockElasticsearch,
-        mockLogger
-      );
+      const executeJob = await executeJobFactory(mockReportingPlugin, mockLogger);
       const jobParams = {
         headers: encryptedHeaders,
         fields: ['one', 'two'],
@@ -735,12 +603,7 @@ describe('CSV Execute Job', function() {
 
     it('should escape column headers if uiSettings csv:quoteValues is true', async function() {
       mockUiSettingsClient.get.withArgs('csv:quoteValues').returns(true);
-      const executeJob = await executeJobFactory(
-        mockReportingPlugin,
-        mockServer,
-        mockElasticsearch,
-        mockLogger
-      );
+      const executeJob = await executeJobFactory(mockReportingPlugin, mockLogger);
       const jobParams = {
         headers: encryptedHeaders,
         fields: ['one and a half', 'two', 'three-and-four', 'five & six'],
@@ -752,12 +615,7 @@ describe('CSV Execute Job', function() {
 
     it(`shouldn't escape column headers if uiSettings csv:quoteValues is false`, async function() {
       mockUiSettingsClient.get.withArgs('csv:quoteValues').returns(false);
-      const executeJob = await executeJobFactory(
-        mockReportingPlugin,
-        mockServer,
-        mockElasticsearch,
-        mockLogger
-      );
+      const executeJob = await executeJobFactory(mockReportingPlugin, mockLogger);
       const jobParams = {
         headers: encryptedHeaders,
         fields: ['one and a half', 'two', 'three-and-four', 'five & six'],
@@ -768,12 +626,7 @@ describe('CSV Execute Job', function() {
     });
 
     it('should write column headers to output, when there are results', async function() {
-      const executeJob = await executeJobFactory(
-        mockReportingPlugin,
-        mockServer,
-        mockElasticsearch,
-        mockLogger
-      );
+      const executeJob = await executeJobFactory(mockReportingPlugin, mockLogger);
       callAsCurrentUserStub.onFirstCall().resolves({
         hits: {
           hits: [{ one: '1', two: '2' }],
@@ -793,12 +646,7 @@ describe('CSV Execute Job', function() {
     });
 
     it('should use comma separated values of non-nested fields from _source', async function() {
-      const executeJob = await executeJobFactory(
-        mockReportingPlugin,
-        mockServer,
-        mockElasticsearch,
-        mockLogger
-      );
+      const executeJob = await executeJobFactory(mockReportingPlugin, mockLogger);
       callAsCurrentUserStub.onFirstCall().resolves({
         hits: {
           hits: [{ _source: { one: 'foo', two: 'bar' } }],
@@ -819,12 +667,7 @@ describe('CSV Execute Job', function() {
     });
 
     it('should concatenate the hits from multiple responses', async function() {
-      const executeJob = await executeJobFactory(
-        mockReportingPlugin,
-        mockServer,
-        mockElasticsearch,
-        mockLogger
-      );
+      const executeJob = await executeJobFactory(mockReportingPlugin, mockLogger);
       callAsCurrentUserStub.onFirstCall().resolves({
         hits: {
           hits: [{ _source: { one: 'foo', two: 'bar' } }],
@@ -852,12 +695,7 @@ describe('CSV Execute Job', function() {
     });
 
     it('should use field formatters to format fields', async function() {
-      const executeJob = await executeJobFactory(
-        mockReportingPlugin,
-        mockServer,
-        mockElasticsearch,
-        mockLogger
-      );
+      const executeJob = await executeJobFactory(mockReportingPlugin, mockLogger);
       callAsCurrentUserStub.onFirstCall().resolves({
         hits: {
           hits: [{ _source: { one: 'foo', two: 'bar' } }],
@@ -897,17 +735,9 @@ describe('CSV Execute Job', function() {
       let maxSizeReached;
 
       beforeEach(async function() {
-        mockServer
-          .config()
-          .get.withArgs('xpack.reporting.csv.maxSizeBytes')
-          .returns(1);
-
-        const executeJob = await executeJobFactory(
-          mockReportingPlugin,
-          mockServer,
-          mockElasticsearch,
-          mockLogger
-        );
+        configGetStub.withArgs('csv', 'maxSizeBytes').returns(1);
+
+        const executeJob = await executeJobFactory(mockReportingPlugin, mockLogger);
         const jobParams = {
           headers: encryptedHeaders,
           fields: ['one', 'two'],
@@ -935,17 +765,9 @@ describe('CSV Execute Job', function() {
       let maxSizeReached;
 
       beforeEach(async function() {
-        mockServer
-          .config()
-          .get.withArgs('xpack.reporting.csv.maxSizeBytes')
-          .returns(9);
-
-        const executeJob = await executeJobFactory(
-          mockReportingPlugin,
-          mockServer,
-          mockElasticsearch,
-          mockLogger
-        );
+        configGetStub.withArgs('csv', 'maxSizeBytes').returns(9);
+
+        const executeJob = await executeJobFactory(mockReportingPlugin, mockLogger);
         const jobParams = {
           headers: encryptedHeaders,
           fields: ['one', 'two'],
@@ -973,10 +795,7 @@ describe('CSV Execute Job', function() {
       let maxSizeReached;
 
       beforeEach(async function() {
-        mockServer
-          .config()
-          .get.withArgs('xpack.reporting.csv.maxSizeBytes')
-          .returns(9);
+        configGetStub.withArgs('csv', 'maxSizeBytes').returns(9);
 
         callAsCurrentUserStub.onFirstCall().returns({
           hits: {
@@ -985,12 +804,7 @@ describe('CSV Execute Job', function() {
           _scroll_id: 'scrollId',
         });
 
-        const executeJob = await executeJobFactory(
-          mockReportingPlugin,
-          mockServer,
-          mockElasticsearch,
-          mockLogger
-        );
+        const executeJob = await executeJobFactory(mockReportingPlugin, mockLogger);
         const jobParams = {
           headers: encryptedHeaders,
           fields: ['one', 'two'],
@@ -1020,10 +834,7 @@ describe('CSV Execute Job', function() {
 
       beforeEach(async function() {
         mockReportingPlugin.getUiSettingsServiceFactory = () => mockUiSettingsClient;
-        mockServer
-          .config()
-          .get.withArgs('xpack.reporting.csv.maxSizeBytes')
-          .returns(18);
+        configGetStub.withArgs('csv', 'maxSizeBytes').returns(18);
 
         callAsCurrentUserStub.onFirstCall().returns({
           hits: {
@@ -1032,12 +843,7 @@ describe('CSV Execute Job', function() {
           _scroll_id: 'scrollId',
         });
 
-        const executeJob = await executeJobFactory(
-          mockReportingPlugin,
-          mockServer,
-          mockElasticsearch,
-          mockLogger
-        );
+        const executeJob = await executeJobFactory(mockReportingPlugin, mockLogger);
         const jobParams = {
           headers: encryptedHeaders,
           fields: ['one', 'two'],
@@ -1065,10 +871,7 @@ describe('CSV Execute Job', function() {
   describe('scroll settings', function() {
     it('passes scroll duration to initial search call', async function() {
       const scrollDuration = 'test';
-      mockServer
-        .config()
-        .get.withArgs('xpack.reporting.csv.scroll')
-        .returns({ duration: scrollDuration });
+      configGetStub.withArgs('csv', 'scroll').returns({ duration: scrollDuration });
 
       callAsCurrentUserStub.onFirstCall().returns({
         hits: {
@@ -1077,12 +880,7 @@ describe('CSV Execute Job', function() {
         _scroll_id: 'scrollId',
       });
 
-      const executeJob = await executeJobFactory(
-        mockReportingPlugin,
-        mockServer,
-        mockElasticsearch,
-        mockLogger
-      );
+      const executeJob = await executeJobFactory(mockReportingPlugin, mockLogger);
       const jobParams = {
         headers: encryptedHeaders,
         fields: ['one', 'two'],
@@ -1099,10 +897,7 @@ describe('CSV Execute Job', function() {
 
     it('passes scroll size to initial search call', async function() {
       const scrollSize = 100;
-      mockServer
-        .config()
-        .get.withArgs('xpack.reporting.csv.scroll')
-        .returns({ size: scrollSize });
+      configGetStub.withArgs('csv', 'scroll').returns({ size: scrollSize });
 
       callAsCurrentUserStub.onFirstCall().resolves({
         hits: {
@@ -1111,12 +906,7 @@ describe('CSV Execute Job', function() {
         _scroll_id: 'scrollId',
       });
 
-      const executeJob = await executeJobFactory(
-        mockReportingPlugin,
-        mockServer,
-        mockElasticsearch,
-        mockLogger
-      );
+      const executeJob = await executeJobFactory(mockReportingPlugin, mockLogger);
       const jobParams = {
         headers: encryptedHeaders,
         fields: ['one', 'two'],
@@ -1133,10 +923,7 @@ describe('CSV Execute Job', function() {
 
     it('passes scroll duration to subsequent scroll call', async function() {
       const scrollDuration = 'test';
-      mockServer
-        .config()
-        .get.withArgs('xpack.reporting.csv.scroll')
-        .returns({ duration: scrollDuration });
+      configGetStub.withArgs('csv', 'scroll').returns({ duration: scrollDuration });
 
       callAsCurrentUserStub.onFirstCall().resolves({
         hits: {
@@ -1145,12 +932,7 @@ describe('CSV Execute Job', function() {
         _scroll_id: 'scrollId',
       });
 
-      const executeJob = await executeJobFactory(
-        mockReportingPlugin,
-        mockServer,
-        mockElasticsearch,
-        mockLogger
-      );
+      const executeJob = await executeJobFactory(mockReportingPlugin, mockLogger);
       const jobParams = {
         headers: encryptedHeaders,
         fields: ['one', 'two'],
diff --git a/x-pack/legacy/plugins/reporting/export_types/csv/server/execute_job.ts b/x-pack/legacy/plugins/reporting/export_types/csv/server/execute_job.ts
index 1579985891053..a8249e5810d3c 100644
--- a/x-pack/legacy/plugins/reporting/export_types/csv/server/execute_job.ts
+++ b/x-pack/legacy/plugins/reporting/export_types/csv/server/execute_job.ts
@@ -6,32 +6,26 @@
 
 import { i18n } from '@kbn/i18n';
 import Hapi from 'hapi';
-import {
-  ElasticsearchServiceSetup,
-  IUiSettingsClient,
-  KibanaRequest,
-} from '../../../../../../../src/core/server';
+import { IUiSettingsClient, KibanaRequest } from '../../../../../../../src/core/server';
 import { CSV_JOB_TYPE } from '../../../common/constants';
 import { ReportingCore } from '../../../server';
 import { cryptoFactory } from '../../../server/lib';
 import { getFieldFormats } from '../../../server/services';
-import { ESQueueWorkerExecuteFn, ExecuteJobFactory, Logger, ServerFacade } from '../../../types';
+import { ESQueueWorkerExecuteFn, ExecuteJobFactory, Logger } from '../../../types';
 import { JobDocPayloadDiscoverCsv } from '../types';
 import { fieldFormatMapFactory } from './lib/field_format_map';
 import { createGenerateCsv } from './lib/generate_csv';
 
 export const executeJobFactory: ExecuteJobFactory<ESQueueWorkerExecuteFn<
   JobDocPayloadDiscoverCsv
->> = async function executeJobFactoryFn(
-  reporting: ReportingCore,
-  server: ServerFacade,
-  elasticsearch: ElasticsearchServiceSetup,
-  parentLogger: Logger
-) {
-  const crypto = cryptoFactory(server);
-  const config = server.config();
+>> = async function executeJobFactoryFn(reporting: ReportingCore, parentLogger: Logger) {
+  const [config, elasticsearch] = await Promise.all([
+    reporting.getConfig(),
+    reporting.getElasticsearchService(),
+  ]);
+  const crypto = cryptoFactory(config.get('encryptionKey'));
   const logger = parentLogger.clone([CSV_JOB_TYPE, 'execute-job']);
-  const serverBasePath = config.get('server.basePath');
+  const serverBasePath = config.kbnConfig.get('server', 'basePath');
 
   return async function executeJob(
     jobId: string,
@@ -131,9 +125,9 @@ export const executeJobFactory: ExecuteJobFactory<ESQueueWorkerExecuteFn<
       formatsMap,
       settings: {
         ...uiSettings,
-        checkForFormulas: config.get('xpack.reporting.csv.checkForFormulas'),
-        maxSizeBytes: config.get('xpack.reporting.csv.maxSizeBytes'),
-        scroll: config.get('xpack.reporting.csv.scroll'),
+        checkForFormulas: config.get('csv', 'checkForFormulas'),
+        maxSizeBytes: config.get('csv', 'maxSizeBytes'),
+        scroll: config.get('csv', 'scroll'),
       },
     });
 
diff --git a/x-pack/legacy/plugins/reporting/export_types/csv/server/lib/hit_iterator.test.ts b/x-pack/legacy/plugins/reporting/export_types/csv/server/lib/hit_iterator.test.ts
index 3765217de9285..a9f0015e49360 100644
--- a/x-pack/legacy/plugins/reporting/export_types/csv/server/lib/hit_iterator.test.ts
+++ b/x-pack/legacy/plugins/reporting/export_types/csv/server/lib/hit_iterator.test.ts
@@ -7,7 +7,8 @@
 import expect from '@kbn/expect';
 import sinon from 'sinon';
 import { CancellationToken } from '../../../../common/cancellation_token';
-import { Logger, ScrollConfig } from '../../../../types';
+import { ScrollConfig } from '../../../../server/types';
+import { Logger } from '../../../../types';
 import { createHitIterator } from './hit_iterator';
 
 const mockLogger = {
diff --git a/x-pack/legacy/plugins/reporting/export_types/csv/server/lib/hit_iterator.ts b/x-pack/legacy/plugins/reporting/export_types/csv/server/lib/hit_iterator.ts
index 90690b62ff4a4..2ca19dd07a627 100644
--- a/x-pack/legacy/plugins/reporting/export_types/csv/server/lib/hit_iterator.ts
+++ b/x-pack/legacy/plugins/reporting/export_types/csv/server/lib/hit_iterator.ts
@@ -4,9 +4,10 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { SearchParams, SearchResponse } from 'elasticsearch';
 import { i18n } from '@kbn/i18n';
-import { CancellationToken, ScrollConfig, Logger } from '../../../../types';
+import { SearchParams, SearchResponse } from 'elasticsearch';
+import { ScrollConfig } from '../../../../server/types';
+import { CancellationToken, Logger } from '../../../../types';
 
 async function parseResponse(request: SearchResponse<any>) {
   const response = await request;
diff --git a/x-pack/legacy/plugins/reporting/export_types/csv/types.d.ts b/x-pack/legacy/plugins/reporting/export_types/csv/types.d.ts
index 842330fa7c93f..529c195486bc6 100644
--- a/x-pack/legacy/plugins/reporting/export_types/csv/types.d.ts
+++ b/x-pack/legacy/plugins/reporting/export_types/csv/types.d.ts
@@ -5,7 +5,8 @@
  */
 
 import { CancellationToken } from '../../common/cancellation_token';
-import { JobDocPayload, JobParamPostPayload, ConditionalHeaders, RequestFacade } from '../../types';
+import { ScrollConfig } from '../../server/types';
+import { JobDocPayload, JobParamPostPayload } from '../../types';
 
 interface DocValueField {
   field: string;
@@ -106,7 +107,7 @@ export interface GenerateCsvParams {
     quoteValues: boolean;
     timezone: string | null;
     maxSizeBytes: number;
-    scroll: { duration: string; size: number };
+    scroll: ScrollConfig;
     checkForFormulas?: boolean;
   };
 }
diff --git a/x-pack/legacy/plugins/reporting/export_types/csv_from_savedobject/server/create_job/create_job.ts b/x-pack/legacy/plugins/reporting/export_types/csv_from_savedobject/server/create_job/create_job.ts
index 17072d311b35f..15a1c3e0a9fad 100644
--- a/x-pack/legacy/plugins/reporting/export_types/csv_from_savedobject/server/create_job/create_job.ts
+++ b/x-pack/legacy/plugins/reporting/export_types/csv_from_savedobject/server/create_job/create_job.ts
@@ -5,18 +5,11 @@
  */
 
 import { notFound, notImplemented } from 'boom';
-import { ElasticsearchServiceSetup } from 'kibana/server';
 import { get } from 'lodash';
 import { CSV_FROM_SAVEDOBJECT_JOB_TYPE } from '../../../../common/constants';
 import { ReportingCore } from '../../../../server';
 import { cryptoFactory } from '../../../../server/lib';
-import {
-  CreateJobFactory,
-  ImmediateCreateJobFn,
-  Logger,
-  RequestFacade,
-  ServerFacade,
-} from '../../../../types';
+import { CreateJobFactory, ImmediateCreateJobFn, Logger, RequestFacade } from '../../../../types';
 import {
   JobDocPayloadPanelCsv,
   JobParamsPanelCsv,
@@ -37,13 +30,9 @@ interface VisData {
 
 export const createJobFactory: CreateJobFactory<ImmediateCreateJobFn<
   JobParamsPanelCsv
->> = function createJobFactoryFn(
-  reporting: ReportingCore,
-  server: ServerFacade,
-  elasticsearch: ElasticsearchServiceSetup,
-  parentLogger: Logger
-) {
-  const crypto = cryptoFactory(server);
+>> = async function createJobFactoryFn(reporting: ReportingCore, parentLogger: Logger) {
+  const config = await reporting.getConfig();
+  const crypto = cryptoFactory(config.get('encryptionKey'));
   const logger = parentLogger.clone([CSV_FROM_SAVEDOBJECT_JOB_TYPE, 'create-job']);
 
   return async function createJob(
diff --git a/x-pack/legacy/plugins/reporting/export_types/csv_from_savedobject/server/execute_job.ts b/x-pack/legacy/plugins/reporting/export_types/csv_from_savedobject/server/execute_job.ts
index 6bb3e73fcfe84..debcdb47919f1 100644
--- a/x-pack/legacy/plugins/reporting/export_types/csv_from_savedobject/server/execute_job.ts
+++ b/x-pack/legacy/plugins/reporting/export_types/csv_from_savedobject/server/execute_job.ts
@@ -5,7 +5,6 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { ElasticsearchServiceSetup } from 'kibana/server';
 import { CONTENT_TYPE_CSV, CSV_FROM_SAVEDOBJECT_JOB_TYPE } from '../../../common/constants';
 import { ReportingCore } from '../../../server';
 import { cryptoFactory } from '../../../server/lib';
@@ -15,7 +14,6 @@ import {
   JobDocOutput,
   Logger,
   RequestFacade,
-  ServerFacade,
 } from '../../../types';
 import { CsvResultFromSearch } from '../../csv/types';
 import { FakeRequest, JobDocPayloadPanelCsv, JobParamsPanelCsv, SearchPanel } from '../types';
@@ -23,15 +21,11 @@ import { createGenerateCsv } from './lib';
 
 export const executeJobFactory: ExecuteJobFactory<ImmediateExecuteFn<
   JobParamsPanelCsv
->> = async function executeJobFactoryFn(
-  reporting: ReportingCore,
-  server: ServerFacade,
-  elasticsearch: ElasticsearchServiceSetup,
-  parentLogger: Logger
-) {
-  const crypto = cryptoFactory(server);
+>> = async function executeJobFactoryFn(reporting: ReportingCore, parentLogger: Logger) {
+  const config = await reporting.getConfig();
+  const crypto = cryptoFactory(config.get('encryptionKey'));
   const logger = parentLogger.clone([CSV_FROM_SAVEDOBJECT_JOB_TYPE, 'execute-job']);
-  const generateCsv = createGenerateCsv(reporting, server, elasticsearch, parentLogger);
+  const generateCsv = await createGenerateCsv(reporting, parentLogger);
 
   return async function executeJob(
     jobId: string | null,
@@ -57,11 +51,11 @@ export const executeJobFactory: ExecuteJobFactory<ImmediateExecuteFn<
 
     let requestObject: RequestFacade | FakeRequest;
     if (isImmediate && realRequest) {
-      jobLogger.info(`Executing job from immediate API`);
+      jobLogger.info(`Executing job from Immediate API using request context`);
       requestObject = realRequest;
     } else {
       jobLogger.info(`Executing job async using encrypted headers`);
-      let decryptedHeaders;
+      let decryptedHeaders: Record<string, unknown>;
       const serializedEncryptedHeaders = job.headers;
       try {
         decryptedHeaders = await crypto.decrypt(serializedEncryptedHeaders);
@@ -79,10 +73,7 @@ export const executeJobFactory: ExecuteJobFactory<ImmediateExecuteFn<
         );
       }
 
-      requestObject = {
-        headers: decryptedHeaders,
-        server,
-      };
+      requestObject = { headers: decryptedHeaders };
     }
 
     let content: string;
diff --git a/x-pack/legacy/plugins/reporting/export_types/csv_from_savedobject/server/lib/generate_csv.ts b/x-pack/legacy/plugins/reporting/export_types/csv_from_savedobject/server/lib/generate_csv.ts
index b18f597cbaa41..c81060d8ca05d 100644
--- a/x-pack/legacy/plugins/reporting/export_types/csv_from_savedobject/server/lib/generate_csv.ts
+++ b/x-pack/legacy/plugins/reporting/export_types/csv_from_savedobject/server/lib/generate_csv.ts
@@ -5,18 +5,12 @@
  */
 
 import { badRequest } from 'boom';
-import { ElasticsearchServiceSetup } from 'kibana/server';
-import { ReportingCore } from '../../../../server';
-import { ServerFacade, RequestFacade, Logger } from '../../../../types';
-import { SearchPanel, VisPanel, JobParamsPanelCsv, FakeRequest } from '../../types';
+import { ReportingCore } from '../../../../server/types';
+import { Logger, RequestFacade } from '../../../../types';
+import { FakeRequest, JobParamsPanelCsv, SearchPanel, VisPanel } from '../../types';
 import { generateCsvSearch } from './generate_csv_search';
 
-export function createGenerateCsv(
-  reporting: ReportingCore,
-  server: ServerFacade,
-  elasticsearch: ElasticsearchServiceSetup,
-  logger: Logger
-) {
+export function createGenerateCsv(reporting: ReportingCore, logger: Logger) {
   return async function generateCsv(
     request: RequestFacade | FakeRequest,
     visType: string,
@@ -33,8 +27,6 @@ export function createGenerateCsv(
         return await generateCsvSearch(
           request as RequestFacade,
           reporting,
-          server,
-          elasticsearch,
           logger,
           panel as SearchPanel,
           jobParams
diff --git a/x-pack/legacy/plugins/reporting/export_types/csv_from_savedobject/server/lib/generate_csv_search.ts b/x-pack/legacy/plugins/reporting/export_types/csv_from_savedobject/server/lib/generate_csv_search.ts
index b1691ec71f520..9a35b96f8a240 100644
--- a/x-pack/legacy/plugins/reporting/export_types/csv_from_savedobject/server/lib/generate_csv_search.ts
+++ b/x-pack/legacy/plugins/reporting/export_types/csv_from_savedobject/server/lib/generate_csv_search.ts
@@ -4,11 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import {
-  ElasticsearchServiceSetup,
-  KibanaRequest,
-  IUiSettingsClient,
-} from '../../../../../../../../src/core/server';
+import { IUiSettingsClient, KibanaRequest } from '../../../../../../../../src/core/server';
 import {
   esQuery,
   EsQueryConfig,
@@ -21,7 +17,7 @@ import {
 } from '../../../../../../../../src/plugins/data/server';
 import { CancellationToken } from '../../../../common/cancellation_token';
 import { ReportingCore } from '../../../../server';
-import { Logger, RequestFacade, ServerFacade } from '../../../../types';
+import { Logger, RequestFacade } from '../../../../types';
 import { createGenerateCsv } from '../../../csv/server/lib/generate_csv';
 import {
   CsvResultFromSearch,
@@ -62,8 +58,6 @@ const getUiSettings = async (config: IUiSettingsClient) => {
 export async function generateCsvSearch(
   req: RequestFacade,
   reporting: ReportingCore,
-  server: ServerFacade,
-  elasticsearch: ElasticsearchServiceSetup,
   logger: Logger,
   searchPanel: SearchPanel,
   jobParams: JobParamsDiscoverCsv
@@ -159,11 +153,15 @@ export async function generateCsvSearch(
     },
   };
 
+  const [elasticsearch, config] = await Promise.all([
+    reporting.getElasticsearchService(),
+    reporting.getConfig(),
+  ]);
+
   const { callAsCurrentUser } = elasticsearch.dataClient.asScoped(
     KibanaRequest.from(req.getRawRequest())
   );
   const callCluster = (...params: [string, object]) => callAsCurrentUser(...params);
-  const config = server.config();
   const uiSettings = await getUiSettings(uiConfig);
 
   const generateCsvParams: GenerateCsvParams = {
@@ -176,8 +174,8 @@ export async function generateCsvSearch(
     cancellationToken: new CancellationToken(),
     settings: {
       ...uiSettings,
-      maxSizeBytes: config.get('xpack.reporting.csv.maxSizeBytes'),
-      scroll: config.get('xpack.reporting.csv.scroll'),
+      maxSizeBytes: config.get('csv', 'maxSizeBytes'),
+      scroll: config.get('csv', 'scroll'),
       timezone,
     },
   };
diff --git a/x-pack/legacy/plugins/reporting/export_types/csv_from_savedobject/types.d.ts b/x-pack/legacy/plugins/reporting/export_types/csv_from_savedobject/types.d.ts
index 6a7d5f336e238..ab14d2dd8a660 100644
--- a/x-pack/legacy/plugins/reporting/export_types/csv_from_savedobject/types.d.ts
+++ b/x-pack/legacy/plugins/reporting/export_types/csv_from_savedobject/types.d.ts
@@ -4,11 +4,10 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { JobParamPostPayload, JobDocPayload, ServerFacade } from '../../types';
+import { JobDocPayload, JobParamPostPayload } from '../../types';
 
 export interface FakeRequest {
-  headers: any;
-  server: ServerFacade;
+  headers: Record<string, unknown>;
 }
 
 export interface JobParamsPostPayloadPanelCsv extends JobParamPostPayload {
diff --git a/x-pack/legacy/plugins/reporting/export_types/png/server/create_job/index.ts b/x-pack/legacy/plugins/reporting/export_types/png/server/create_job/index.ts
index a6911e1f14704..9aac612677094 100644
--- a/x-pack/legacy/plugins/reporting/export_types/png/server/create_job/index.ts
+++ b/x-pack/legacy/plugins/reporting/export_types/png/server/create_job/index.ts
@@ -12,14 +12,14 @@ import {
   CreateJobFactory,
   ESQueueCreateJobFn,
   RequestFacade,
-  ServerFacade,
 } from '../../../../types';
 import { JobParamsPNG } from '../../types';
 
 export const createJobFactory: CreateJobFactory<ESQueueCreateJobFn<
   JobParamsPNG
->> = function createJobFactoryFn(reporting: ReportingCore, server: ServerFacade) {
-  const crypto = cryptoFactory(server);
+>> = async function createJobFactoryFn(reporting: ReportingCore) {
+  const config = await reporting.getConfig();
+  const crypto = cryptoFactory(config.get('encryptionKey'));
 
   return async function createJob(
     { objectType, title, relativeUrl, browserTimezone, layout }: JobParamsPNG,
diff --git a/x-pack/legacy/plugins/reporting/export_types/png/server/execute_job/index.test.js b/x-pack/legacy/plugins/reporting/export_types/png/server/execute_job/index.test.js
index e2e6ba1b89096..267321d33809d 100644
--- a/x-pack/legacy/plugins/reporting/export_types/png/server/execute_job/index.test.js
+++ b/x-pack/legacy/plugins/reporting/export_types/png/server/execute_job/index.test.js
@@ -5,7 +5,6 @@
  */
 
 import * as Rx from 'rxjs';
-import { memoize } from 'lodash';
 import { createMockReportingCore } from '../../../../test_helpers';
 import { cryptoFactory } from '../../../../server/lib/crypto';
 import { executeJobFactory } from './index';
@@ -14,63 +13,70 @@ import { LevelLogger } from '../../../../server/lib';
 
 jest.mock('../lib/generate_png', () => ({ generatePngObservableFactory: jest.fn() }));
 
+let mockReporting;
+let mockReportingConfig;
+
 const cancellationToken = {
   on: jest.fn(),
 };
 
-let config;
-let mockServer;
-let mockReporting;
+const mockLoggerFactory = {
+  get: jest.fn().mockImplementation(() => ({
+    error: jest.fn(),
+    debug: jest.fn(),
+    warn: jest.fn(),
+  })),
+};
+const getMockLogger = () => new LevelLogger(mockLoggerFactory);
+
+const mockEncryptionKey = 'abcabcsecuresecret';
+const encryptHeaders = async headers => {
+  const crypto = cryptoFactory(mockEncryptionKey);
+  return await crypto.encrypt(headers);
+};
 
 beforeEach(async () => {
   mockReporting = await createMockReportingCore();
 
-  config = {
-    'xpack.reporting.encryptionKey': 'testencryptionkey',
+  const kbnConfig = {
     'server.basePath': '/sbp',
-    'server.host': 'localhost',
-    'server.port': 5601,
   };
-  mockServer = {
-    config: memoize(() => ({ get: jest.fn() })),
-    info: {
-      protocol: 'http',
+  const reportingConfig = {
+    encryptionKey: mockEncryptionKey,
+    'kibanaServer.hostname': 'localhost',
+    'kibanaServer.port': 5601,
+    'kibanaServer.protocol': 'http',
+  };
+
+  const mockGetConfig = jest.fn();
+  mockReportingConfig = {
+    get: (...keys) => reportingConfig[keys.join('.')],
+    kbnConfig: { get: (...keys) => kbnConfig[keys.join('.')] },
+  };
+  mockGetConfig.mockImplementation(() => Promise.resolve(mockReportingConfig));
+  mockReporting.getConfig = mockGetConfig;
+
+  const mockElasticsearch = {
+    dataClient: {
+      asScoped: () => ({ callAsCurrentUser: jest.fn() }),
     },
   };
-  mockServer.config().get.mockImplementation(key => {
-    return config[key];
-  });
+  const mockGetElasticsearch = jest.fn();
+  mockGetElasticsearch.mockImplementation(() => Promise.resolve(mockElasticsearch));
+  mockReporting.getElasticsearchService = mockGetElasticsearch;
 
   generatePngObservableFactory.mockReturnValue(jest.fn());
 });
 
 afterEach(() => generatePngObservableFactory.mockReset());
 
-const mockElasticsearch = {
-  dataClient: {
-    asScoped: () => ({ callAsCurrentUser: jest.fn() }),
-  },
-};
-
-const getMockLogger = () => new LevelLogger();
-
-const encryptHeaders = async headers => {
-  const crypto = cryptoFactory(mockServer);
-  return await crypto.encrypt(headers);
-};
-
 test(`passes browserTimezone to generatePng`, async () => {
   const encryptedHeaders = await encryptHeaders({});
 
   const generatePngObservable = generatePngObservableFactory();
   generatePngObservable.mockReturnValue(Rx.of(Buffer.from('')));
 
-  const executeJob = await executeJobFactory(
-    mockReporting,
-    mockServer,
-    mockElasticsearch,
-    getMockLogger()
-  );
+  const executeJob = await executeJobFactory(mockReporting, getMockLogger());
   const browserTimezone = 'UTC';
   await executeJob(
     'pngJobId',
@@ -88,15 +94,7 @@ test(`passes browserTimezone to generatePng`, async () => {
 });
 
 test(`returns content_type of application/png`, async () => {
-  const executeJob = await executeJobFactory(
-    mockReporting,
-    mockServer,
-    mockElasticsearch,
-    getMockLogger(),
-    {
-      browserDriverFactory: {},
-    }
-  );
+  const executeJob = await executeJobFactory(mockReporting, getMockLogger());
   const encryptedHeaders = await encryptHeaders({});
 
   const generatePngObservable = generatePngObservableFactory();
@@ -116,15 +114,7 @@ test(`returns content of generatePng getBuffer base64 encoded`, async () => {
   const generatePngObservable = generatePngObservableFactory();
   generatePngObservable.mockReturnValue(Rx.of({ buffer: Buffer.from(testContent) }));
 
-  const executeJob = await executeJobFactory(
-    mockReporting,
-    mockServer,
-    mockElasticsearch,
-    getMockLogger(),
-    {
-      browserDriverFactory: {},
-    }
-  );
+  const executeJob = await executeJobFactory(mockReporting, getMockLogger());
   const encryptedHeaders = await encryptHeaders({});
   const { content } = await executeJob(
     'pngJobId',
diff --git a/x-pack/legacy/plugins/reporting/export_types/png/server/execute_job/index.ts b/x-pack/legacy/plugins/reporting/export_types/png/server/execute_job/index.ts
index 8670f0027af89..c53c20efec247 100644
--- a/x-pack/legacy/plugins/reporting/export_types/png/server/execute_job/index.ts
+++ b/x-pack/legacy/plugins/reporting/export_types/png/server/execute_job/index.ts
@@ -4,18 +4,11 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { ElasticsearchServiceSetup } from 'kibana/server';
 import * as Rx from 'rxjs';
 import { catchError, map, mergeMap, takeUntil } from 'rxjs/operators';
 import { PNG_JOB_TYPE } from '../../../../common/constants';
 import { ReportingCore } from '../../../../server';
-import {
-  ESQueueWorkerExecuteFn,
-  ExecuteJobFactory,
-  JobDocOutput,
-  Logger,
-  ServerFacade,
-} from '../../../../types';
+import { ESQueueWorkerExecuteFn, ExecuteJobFactory, JobDocOutput, Logger } from '../../../../types';
 import {
   decryptJobHeaders,
   getConditionalHeaders,
@@ -29,22 +22,24 @@ type QueuedPngExecutorFactory = ExecuteJobFactory<ESQueueWorkerExecuteFn<JobDocP
 
 export const executeJobFactory: QueuedPngExecutorFactory = async function executeJobFactoryFn(
   reporting: ReportingCore,
-  server: ServerFacade,
-  elasticsearch: ElasticsearchServiceSetup,
   parentLogger: Logger
 ) {
+  const config = await reporting.getConfig();
+  const captureConfig = config.get('capture');
+  const encryptionKey = config.get('encryptionKey');
+
   const browserDriverFactory = await reporting.getBrowserDriverFactory();
-  const generatePngObservable = generatePngObservableFactory(server, browserDriverFactory);
+  const generatePngObservable = generatePngObservableFactory(captureConfig, browserDriverFactory);
   const logger = parentLogger.clone([PNG_JOB_TYPE, 'execute']);
 
   return function executeJob(jobId: string, job: JobDocPayloadPNG, cancellationToken: any) {
     const jobLogger = logger.clone([jobId]);
     const process$: Rx.Observable<JobDocOutput> = Rx.of(1).pipe(
-      mergeMap(() => decryptJobHeaders({ server, job, logger })),
+      mergeMap(() => decryptJobHeaders({ encryptionKey, job, logger })),
       map(decryptedHeaders => omitBlacklistedHeaders({ job, decryptedHeaders })),
-      map(filteredHeaders => getConditionalHeaders({ server, job, filteredHeaders })),
+      map(filteredHeaders => getConditionalHeaders({ config, job, filteredHeaders })),
       mergeMap(conditionalHeaders => {
-        const urls = getFullUrls({ server, job });
+        const urls = getFullUrls({ config, job });
         const hashUrl = urls[0];
         return generatePngObservable(
           jobLogger,
diff --git a/x-pack/legacy/plugins/reporting/export_types/png/server/lib/generate_png.ts b/x-pack/legacy/plugins/reporting/export_types/png/server/lib/generate_png.ts
index 88e91982adc63..a15541d99f6fb 100644
--- a/x-pack/legacy/plugins/reporting/export_types/png/server/lib/generate_png.ts
+++ b/x-pack/legacy/plugins/reporting/export_types/png/server/lib/generate_png.ts
@@ -7,17 +7,18 @@
 import * as Rx from 'rxjs';
 import { map } from 'rxjs/operators';
 import { LevelLogger } from '../../../../server/lib';
-import { ConditionalHeaders, HeadlessChromiumDriverFactory, ServerFacade } from '../../../../types';
+import { CaptureConfig } from '../../../../server/types';
+import { ConditionalHeaders, HeadlessChromiumDriverFactory } from '../../../../types';
 import { LayoutParams } from '../../../common/layouts/layout';
 import { PreserveLayout } from '../../../common/layouts/preserve_layout';
 import { screenshotsObservableFactory } from '../../../common/lib/screenshots';
 import { ScreenshotResults } from '../../../common/lib/screenshots/types';
 
 export function generatePngObservableFactory(
-  server: ServerFacade,
+  captureConfig: CaptureConfig,
   browserDriverFactory: HeadlessChromiumDriverFactory
 ) {
-  const screenshotsObservable = screenshotsObservableFactory(server, browserDriverFactory);
+  const screenshotsObservable = screenshotsObservableFactory(captureConfig, browserDriverFactory);
 
   return function generatePngObservable(
     logger: LevelLogger,
diff --git a/x-pack/legacy/plugins/reporting/export_types/printable_pdf/server/create_job/index.ts b/x-pack/legacy/plugins/reporting/export_types/printable_pdf/server/create_job/index.ts
index 656c99991e1f6..8e1d5404a5984 100644
--- a/x-pack/legacy/plugins/reporting/export_types/printable_pdf/server/create_job/index.ts
+++ b/x-pack/legacy/plugins/reporting/export_types/printable_pdf/server/create_job/index.ts
@@ -12,14 +12,14 @@ import {
   CreateJobFactory,
   ESQueueCreateJobFn,
   RequestFacade,
-  ServerFacade,
 } from '../../../../types';
 import { JobParamsPDF } from '../../types';
 
 export const createJobFactory: CreateJobFactory<ESQueueCreateJobFn<
   JobParamsPDF
->> = function createJobFactoryFn(reporting: ReportingCore, server: ServerFacade) {
-  const crypto = cryptoFactory(server);
+>> = async function createJobFactoryFn(reporting: ReportingCore) {
+  const config = await reporting.getConfig();
+  const crypto = cryptoFactory(config.get('encryptionKey'));
 
   return async function createJobFn(
     { title, relativeUrls, browserTimezone, layout, objectType }: JobParamsPDF,
diff --git a/x-pack/legacy/plugins/reporting/export_types/printable_pdf/server/execute_job/index.test.js b/x-pack/legacy/plugins/reporting/export_types/printable_pdf/server/execute_job/index.test.js
index 484842ba18f2a..29769108bf4ac 100644
--- a/x-pack/legacy/plugins/reporting/export_types/printable_pdf/server/execute_job/index.test.js
+++ b/x-pack/legacy/plugins/reporting/export_types/printable_pdf/server/execute_job/index.test.js
@@ -5,7 +5,6 @@
  */
 
 import * as Rx from 'rxjs';
-import { memoize } from 'lodash';
 import { createMockReportingCore } from '../../../../test_helpers';
 import { cryptoFactory } from '../../../../server/lib/crypto';
 import { executeJobFactory } from './index';
@@ -14,57 +13,65 @@ import { LevelLogger } from '../../../../server/lib';
 
 jest.mock('../lib/generate_pdf', () => ({ generatePdfObservableFactory: jest.fn() }));
 
+let mockReporting;
+let mockReportingConfig;
+
 const cancellationToken = {
   on: jest.fn(),
 };
 
-let config;
-let mockServer;
-let mockReporting;
+const mockLoggerFactory = {
+  get: jest.fn().mockImplementation(() => ({
+    error: jest.fn(),
+    debug: jest.fn(),
+    warn: jest.fn(),
+  })),
+};
+const getMockLogger = () => new LevelLogger(mockLoggerFactory);
+
+const mockEncryptionKey = 'testencryptionkey';
+const encryptHeaders = async headers => {
+  const crypto = cryptoFactory(mockEncryptionKey);
+  return await crypto.encrypt(headers);
+};
 
 beforeEach(async () => {
   mockReporting = await createMockReportingCore();
 
-  config = {
-    'xpack.reporting.encryptionKey': 'testencryptionkey',
+  const kbnConfig = {
     'server.basePath': '/sbp',
-    'server.host': 'localhost',
-    'server.port': 5601,
   };
-  mockServer = {
-    config: memoize(() => ({ get: jest.fn() })),
-    info: {
-      protocol: 'http',
+  const reportingConfig = {
+    encryptionKey: mockEncryptionKey,
+    'kibanaServer.hostname': 'localhost',
+    'kibanaServer.port': 5601,
+    'kibanaServer.protocol': 'http',
+  };
+
+  const mockGetConfig = jest.fn();
+  mockReportingConfig = {
+    get: (...keys) => reportingConfig[keys.join('.')],
+    kbnConfig: { get: (...keys) => kbnConfig[keys.join('.')] },
+  };
+  mockGetConfig.mockImplementation(() => Promise.resolve(mockReportingConfig));
+  mockReporting.getConfig = mockGetConfig;
+
+  const mockElasticsearch = {
+    dataClient: {
+      asScoped: () => ({ callAsCurrentUser: jest.fn() }),
     },
   };
-  mockServer.config().get.mockImplementation(key => {
-    return config[key];
-  });
+  const mockGetElasticsearch = jest.fn();
+  mockGetElasticsearch.mockImplementation(() => Promise.resolve(mockElasticsearch));
+  mockReporting.getElasticsearchService = mockGetElasticsearch;
 
   generatePdfObservableFactory.mockReturnValue(jest.fn());
 });
 
 afterEach(() => generatePdfObservableFactory.mockReset());
 
-const getMockLogger = () => new LevelLogger();
-const mockElasticsearch = {
-  dataClient: {
-    asScoped: () => ({ callAsCurrentUser: jest.fn() }),
-  },
-};
-
-const encryptHeaders = async headers => {
-  const crypto = cryptoFactory(mockServer);
-  return await crypto.encrypt(headers);
-};
-
 test(`returns content_type of application/pdf`, async () => {
-  const executeJob = await executeJobFactory(
-    mockReporting,
-    mockServer,
-    mockElasticsearch,
-    getMockLogger()
-  );
+  const executeJob = await executeJobFactory(mockReporting, getMockLogger());
   const encryptedHeaders = await encryptHeaders({});
 
   const generatePdfObservable = generatePdfObservableFactory();
@@ -84,12 +91,7 @@ test(`returns content of generatePdf getBuffer base64 encoded`, async () => {
   const generatePdfObservable = generatePdfObservableFactory();
   generatePdfObservable.mockReturnValue(Rx.of({ buffer: Buffer.from(testContent) }));
 
-  const executeJob = await executeJobFactory(
-    mockReporting,
-    mockServer,
-    mockElasticsearch,
-    getMockLogger()
-  );
+  const executeJob = await executeJobFactory(mockReporting, getMockLogger());
   const encryptedHeaders = await encryptHeaders({});
   const { content } = await executeJob(
     'pdfJobId',
diff --git a/x-pack/legacy/plugins/reporting/export_types/printable_pdf/server/execute_job/index.ts b/x-pack/legacy/plugins/reporting/export_types/printable_pdf/server/execute_job/index.ts
index 535c2dcd439a7..e614db46c5730 100644
--- a/x-pack/legacy/plugins/reporting/export_types/printable_pdf/server/execute_job/index.ts
+++ b/x-pack/legacy/plugins/reporting/export_types/printable_pdf/server/execute_job/index.ts
@@ -4,18 +4,11 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { ElasticsearchServiceSetup } from 'kibana/server';
 import * as Rx from 'rxjs';
 import { catchError, map, mergeMap, takeUntil } from 'rxjs/operators';
 import { PDF_JOB_TYPE } from '../../../../common/constants';
 import { ReportingCore } from '../../../../server';
-import {
-  ESQueueWorkerExecuteFn,
-  ExecuteJobFactory,
-  JobDocOutput,
-  Logger,
-  ServerFacade,
-} from '../../../../types';
+import { ESQueueWorkerExecuteFn, ExecuteJobFactory, JobDocOutput, Logger } from '../../../../types';
 import {
   decryptJobHeaders,
   getConditionalHeaders,
@@ -30,23 +23,25 @@ type QueuedPdfExecutorFactory = ExecuteJobFactory<ESQueueWorkerExecuteFn<JobDocP
 
 export const executeJobFactory: QueuedPdfExecutorFactory = async function executeJobFactoryFn(
   reporting: ReportingCore,
-  server: ServerFacade,
-  elasticsearch: ElasticsearchServiceSetup,
   parentLogger: Logger
 ) {
+  const config = await reporting.getConfig();
+  const captureConfig = config.get('capture');
+  const encryptionKey = config.get('encryptionKey');
+
   const browserDriverFactory = await reporting.getBrowserDriverFactory();
-  const generatePdfObservable = generatePdfObservableFactory(server, browserDriverFactory);
+  const generatePdfObservable = generatePdfObservableFactory(captureConfig, browserDriverFactory);
   const logger = parentLogger.clone([PDF_JOB_TYPE, 'execute']);
 
   return function executeJob(jobId: string, job: JobDocPayloadPDF, cancellationToken: any) {
     const jobLogger = logger.clone([jobId]);
     const process$: Rx.Observable<JobDocOutput> = Rx.of(1).pipe(
-      mergeMap(() => decryptJobHeaders({ server, job, logger })),
+      mergeMap(() => decryptJobHeaders({ encryptionKey, job, logger })),
       map(decryptedHeaders => omitBlacklistedHeaders({ job, decryptedHeaders })),
-      map(filteredHeaders => getConditionalHeaders({ server, job, filteredHeaders })),
-      mergeMap(conditionalHeaders => getCustomLogo({ reporting, server, job, conditionalHeaders })),
+      map(filteredHeaders => getConditionalHeaders({ config, job, filteredHeaders })),
+      mergeMap(conditionalHeaders => getCustomLogo({ reporting, config, job, conditionalHeaders })),
       mergeMap(({ logo, conditionalHeaders }) => {
-        const urls = getFullUrls({ server, job });
+        const urls = getFullUrls({ config, job });
 
         const { browserTimezone, layout, title } = job;
         return generatePdfObservable(
diff --git a/x-pack/legacy/plugins/reporting/export_types/printable_pdf/server/lib/generate_pdf.ts b/x-pack/legacy/plugins/reporting/export_types/printable_pdf/server/lib/generate_pdf.ts
index d78effaa1fc2f..7021fae983aa2 100644
--- a/x-pack/legacy/plugins/reporting/export_types/printable_pdf/server/lib/generate_pdf.ts
+++ b/x-pack/legacy/plugins/reporting/export_types/printable_pdf/server/lib/generate_pdf.ts
@@ -8,7 +8,8 @@ import { groupBy } from 'lodash';
 import * as Rx from 'rxjs';
 import { mergeMap } from 'rxjs/operators';
 import { LevelLogger } from '../../../../server/lib';
-import { ConditionalHeaders, HeadlessChromiumDriverFactory, ServerFacade } from '../../../../types';
+import { ReportingConfigType } from '../../../../server/core';
+import { ConditionalHeaders, HeadlessChromiumDriverFactory } from '../../../../types';
 import { createLayout } from '../../../common/layouts';
 import { LayoutInstance, LayoutParams } from '../../../common/layouts/layout';
 import { screenshotsObservableFactory } from '../../../common/lib/screenshots';
@@ -27,10 +28,10 @@ const getTimeRange = (urlScreenshots: ScreenshotResults[]) => {
 };
 
 export function generatePdfObservableFactory(
-  server: ServerFacade,
+  captureConfig: ReportingConfigType['capture'],
   browserDriverFactory: HeadlessChromiumDriverFactory
 ) {
-  const screenshotsObservable = screenshotsObservableFactory(server, browserDriverFactory);
+  const screenshotsObservable = screenshotsObservableFactory(captureConfig, browserDriverFactory);
 
   return function generatePdfObservable(
     logger: LevelLogger,
@@ -41,7 +42,7 @@ export function generatePdfObservableFactory(
     layoutParams: LayoutParams,
     logo?: string
   ): Rx.Observable<{ buffer: Buffer; warnings: string[] }> {
-    const layout = createLayout(server, layoutParams) as LayoutInstance;
+    const layout = createLayout(captureConfig, layoutParams) as LayoutInstance;
     const screenshots$ = screenshotsObservable({
       logger,
       urls,
diff --git a/x-pack/legacy/plugins/reporting/export_types/printable_pdf/types.d.ts b/x-pack/legacy/plugins/reporting/export_types/printable_pdf/types.d.ts
index 0a9dcfe986ca6..e8dd3c5207d92 100644
--- a/x-pack/legacy/plugins/reporting/export_types/printable_pdf/types.d.ts
+++ b/x-pack/legacy/plugins/reporting/export_types/printable_pdf/types.d.ts
@@ -4,8 +4,8 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+import { JobDocPayload } from '../../types';
 import { LayoutInstance, LayoutParams } from '../common/layouts/layout';
-import { JobDocPayload, ServerFacade, RequestFacade } from '../../types';
 
 // Job params: structure of incoming user request data, after being parsed from RISON
 export interface JobParamsPDF {
diff --git a/x-pack/legacy/plugins/reporting/index.test.js b/x-pack/legacy/plugins/reporting/index.test.js
deleted file mode 100644
index 0d9a717bd7d81..0000000000000
--- a/x-pack/legacy/plugins/reporting/index.test.js
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { reporting } from './index';
-import { getConfigSchema } from '../../../test_utils';
-
-// The snapshot records the number of cpus available
-// to make the snapshot deterministic `os.cpus` needs to be mocked
-// but the other members on `os` must remain untouched
-jest.mock('os', () => {
-  const os = jest.requireActual('os');
-  os.cpus = () => [{}, {}, {}, {}];
-  return os;
-});
-
-// eslint-disable-next-line jest/valid-describe
-const describeWithContext = describe.each([
-  [{ dev: false, dist: false }],
-  [{ dev: true, dist: false }],
-  [{ dev: false, dist: true }],
-  [{ dev: true, dist: true }],
-]);
-
-describeWithContext('config schema with context %j', context => {
-  it('produces correct config', async () => {
-    const schema = await getConfigSchema(reporting);
-    const value = await schema.validate({}, { context });
-    value.capture.browser.chromium.disableSandbox = '<platform dependent>';
-    await expect(value).toMatchSnapshot();
-  });
-});
diff --git a/x-pack/legacy/plugins/reporting/index.ts b/x-pack/legacy/plugins/reporting/index.ts
index 89e98302cddc9..fb95e2c2edc24 100644
--- a/x-pack/legacy/plugins/reporting/index.ts
+++ b/x-pack/legacy/plugins/reporting/index.ts
@@ -8,21 +8,16 @@ import { i18n } from '@kbn/i18n';
 import { Legacy } from 'kibana';
 import { resolve } from 'path';
 import { PLUGIN_ID, UI_SETTINGS_CUSTOM_PDF_LOGO } from './common/constants';
-import { config as reportingConfig } from './config';
 import { legacyInit } from './server/legacy';
 import { ReportingPluginSpecOptions } from './types';
 
-const kbToBase64Length = (kb: number) => {
-  return Math.floor((kb * 1024 * 8) / 6);
-};
+const kbToBase64Length = (kb: number) => Math.floor((kb * 1024 * 8) / 6);
 
 export const reporting = (kibana: any) => {
   return new kibana.Plugin({
     id: PLUGIN_ID,
-    configPrefix: 'xpack.reporting',
     publicDir: resolve(__dirname, 'public'),
     require: ['kibana', 'elasticsearch', 'xpack_main'],
-    config: reportingConfig,
 
     uiExports: {
       uiSettingDefaults: {
@@ -49,14 +44,5 @@ export const reporting = (kibana: any) => {
     async init(server: Legacy.Server) {
       return legacyInit(server, this);
     },
-
-    deprecations({ unused }: any) {
-      return [
-        unused('capture.concurrency'),
-        unused('capture.timeout'),
-        unused('capture.settleTime'),
-        unused('kibanaApp'),
-      ];
-    },
   } as ReportingPluginSpecOptions);
 };
diff --git a/x-pack/legacy/plugins/reporting/log_configuration.ts b/x-pack/legacy/plugins/reporting/log_configuration.ts
index b07475df6304f..7aaed2038bd52 100644
--- a/x-pack/legacy/plugins/reporting/log_configuration.ts
+++ b/x-pack/legacy/plugins/reporting/log_configuration.ts
@@ -6,22 +6,23 @@
 
 import getosSync, { LinuxOs } from 'getos';
 import { promisify } from 'util';
-import { ServerFacade, Logger } from './types';
+import { BROWSER_TYPE } from './common/constants';
+import { CaptureConfig } from './server/types';
+import { Logger } from './types';
 
 const getos = promisify(getosSync);
 
-export async function logConfiguration(server: ServerFacade, logger: Logger) {
-  const config = server.config();
+export async function logConfiguration(captureConfig: CaptureConfig, logger: Logger) {
+  const {
+    browser: {
+      type: browserType,
+      chromium: { disableSandbox },
+    },
+  } = captureConfig;
 
-  const browserType = config.get('xpack.reporting.capture.browser.type');
   logger.debug(`Browser type: ${browserType}`);
-
-  if (browserType === 'chromium') {
-    logger.debug(
-      `Chromium sandbox disabled: ${config.get(
-        'xpack.reporting.capture.browser.chromium.disableSandbox'
-      )}`
-    );
+  if (browserType === BROWSER_TYPE) {
+    logger.debug(`Chromium sandbox disabled: ${disableSandbox}`);
   }
 
   const os = await getos();
diff --git a/x-pack/legacy/plugins/reporting/server/browsers/chromium/driver_factory/args.ts b/x-pack/legacy/plugins/reporting/server/browsers/chromium/driver_factory/args.ts
index dc79a6b9db2c1..a2f7a1f3ad0da 100644
--- a/x-pack/legacy/plugins/reporting/server/browsers/chromium/driver_factory/args.ts
+++ b/x-pack/legacy/plugins/reporting/server/browsers/chromium/driver_factory/args.ts
@@ -4,11 +4,14 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { BrowserConfig } from '../../../../types';
+import { CaptureConfig } from '../../../../server/types';
+
+type ViewportConfig = CaptureConfig['viewport'];
+type BrowserConfig = CaptureConfig['browser']['chromium'];
 
 interface LaunchArgs {
   userDataDir: BrowserConfig['userDataDir'];
-  viewport: BrowserConfig['viewport'];
+  viewport: ViewportConfig;
   disableSandbox: BrowserConfig['disableSandbox'];
   proxy: BrowserConfig['proxy'];
 }
diff --git a/x-pack/legacy/plugins/reporting/server/browsers/chromium/driver_factory/index.ts b/x-pack/legacy/plugins/reporting/server/browsers/chromium/driver_factory/index.ts
index f90f2c7aee395..cb228150efbcd 100644
--- a/x-pack/legacy/plugins/reporting/server/browsers/chromium/driver_factory/index.ts
+++ b/x-pack/legacy/plugins/reporting/server/browsers/chromium/driver_factory/index.ts
@@ -19,7 +19,8 @@ import {
 import * as Rx from 'rxjs';
 import { InnerSubscriber } from 'rxjs/internal/InnerSubscriber';
 import { ignoreElements, map, mergeMap, tap } from 'rxjs/operators';
-import { BrowserConfig, CaptureConfig } from '../../../../types';
+import { BROWSER_TYPE } from '../../../../common/constants';
+import { CaptureConfig } from '../../../../server/types';
 import { LevelLogger as Logger } from '../../../lib/level_logger';
 import { safeChildProcess } from '../../safe_child_process';
 import { HeadlessChromiumDriver } from '../driver';
@@ -28,7 +29,8 @@ import { puppeteerLaunch } from '../puppeteer';
 import { args } from './args';
 
 type binaryPath = string;
-type ViewportConfig = BrowserConfig['viewport'];
+type BrowserConfig = CaptureConfig['browser']['chromium'];
+type ViewportConfig = CaptureConfig['viewport'];
 
 export class HeadlessChromiumDriverFactory {
   private binaryPath: binaryPath;
@@ -37,15 +39,10 @@ export class HeadlessChromiumDriverFactory {
   private userDataDir: string;
   private getChromiumArgs: (viewport: ViewportConfig) => string[];
 
-  constructor(
-    binaryPath: binaryPath,
-    logger: Logger,
-    browserConfig: BrowserConfig,
-    captureConfig: CaptureConfig
-  ) {
+  constructor(binaryPath: binaryPath, logger: Logger, captureConfig: CaptureConfig) {
     this.binaryPath = binaryPath;
-    this.browserConfig = browserConfig;
     this.captureConfig = captureConfig;
+    this.browserConfig = captureConfig.browser.chromium;
 
     this.userDataDir = fs.mkdtempSync(path.join(os.tmpdir(), 'chromium-'));
     this.getChromiumArgs = (viewport: ViewportConfig) =>
@@ -57,7 +54,7 @@ export class HeadlessChromiumDriverFactory {
       });
   }
 
-  type = 'chromium';
+  type = BROWSER_TYPE;
 
   test(logger: Logger) {
     const chromiumArgs = args({
@@ -153,7 +150,7 @@ export class HeadlessChromiumDriverFactory {
 
       // HeadlessChromiumDriver: object to "drive" a browser page
       const driver = new HeadlessChromiumDriver(page, {
-        inspect: this.browserConfig.inspect,
+        inspect: !!this.browserConfig.inspect,
         networkPolicy: this.captureConfig.networkPolicy,
       });
 
diff --git a/x-pack/legacy/plugins/reporting/server/browsers/chromium/index.ts b/x-pack/legacy/plugins/reporting/server/browsers/chromium/index.ts
index d32338ae3e311..5f89662c94da2 100644
--- a/x-pack/legacy/plugins/reporting/server/browsers/chromium/index.ts
+++ b/x-pack/legacy/plugins/reporting/server/browsers/chromium/index.ts
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { BrowserConfig, CaptureConfig } from '../../../types';
+import { CaptureConfig } from '../../../server/types';
 import { LevelLogger } from '../../lib';
 import { HeadlessChromiumDriverFactory } from './driver_factory';
 
@@ -13,8 +13,7 @@ export { paths } from './paths';
 export async function createDriverFactory(
   binaryPath: string,
   logger: LevelLogger,
-  browserConfig: BrowserConfig,
   captureConfig: CaptureConfig
 ): Promise<HeadlessChromiumDriverFactory> {
-  return new HeadlessChromiumDriverFactory(binaryPath, logger, browserConfig, captureConfig);
+  return new HeadlessChromiumDriverFactory(binaryPath, logger, captureConfig);
 }
diff --git a/x-pack/legacy/plugins/reporting/server/browsers/create_browser_driver_factory.ts b/x-pack/legacy/plugins/reporting/server/browsers/create_browser_driver_factory.ts
index 49c6222c9f276..af3b86919dc50 100644
--- a/x-pack/legacy/plugins/reporting/server/browsers/create_browser_driver_factory.ts
+++ b/x-pack/legacy/plugins/reporting/server/browsers/create_browser_driver_factory.ts
@@ -4,24 +4,22 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+import { Logger } from '../../types';
+import { ReportingConfig } from '../types';
+import { HeadlessChromiumDriverFactory } from './chromium/driver_factory';
 import { ensureBrowserDownloaded } from './download';
-import { installBrowser } from './install';
-import { ServerFacade, CaptureConfig, Logger } from '../../types';
-import { BROWSER_TYPE } from '../../common/constants';
 import { chromium } from './index';
-import { HeadlessChromiumDriverFactory } from './chromium/driver_factory';
+import { installBrowser } from './install';
 
 export async function createBrowserDriverFactory(
-  server: ServerFacade,
+  config: ReportingConfig,
   logger: Logger
 ): Promise<HeadlessChromiumDriverFactory> {
-  const config = server.config();
-
-  const dataDir: string = config.get('path.data');
-  const captureConfig: CaptureConfig = config.get('xpack.reporting.capture');
-  const browserType = captureConfig.browser.type;
+  const captureConfig = config.get('capture');
+  const browserConfig = captureConfig.browser.chromium;
   const browserAutoDownload = captureConfig.browser.autoDownload;
-  const browserConfig = captureConfig.browser[BROWSER_TYPE];
+  const browserType = captureConfig.browser.type;
+  const dataDir = config.kbnConfig.get('path', 'data');
 
   if (browserConfig.disableSandbox) {
     logger.warning(`Enabling the Chromium sandbox provides an additional layer of protection.`);
@@ -32,7 +30,7 @@ export async function createBrowserDriverFactory(
 
   try {
     const { binaryPath } = await installBrowser(logger, chromium, dataDir);
-    return chromium.createDriverFactory(binaryPath, logger, browserConfig, captureConfig);
+    return chromium.createDriverFactory(binaryPath, logger, captureConfig);
   } catch (error) {
     if (error.cause && ['EACCES', 'EEXIST'].includes(error.cause.code)) {
       logger.error(
diff --git a/x-pack/legacy/plugins/reporting/server/browsers/download/ensure_downloaded.ts b/x-pack/legacy/plugins/reporting/server/browsers/download/ensure_downloaded.ts
index 73186966e3d2f..3697c4b86ce3c 100644
--- a/x-pack/legacy/plugins/reporting/server/browsers/download/ensure_downloaded.ts
+++ b/x-pack/legacy/plugins/reporting/server/browsers/download/ensure_downloaded.ts
@@ -4,16 +4,15 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { resolve as resolvePath } from 'path';
 import { existsSync } from 'fs';
-
+import { resolve as resolvePath } from 'path';
+import { BROWSER_TYPE } from '../../../common/constants';
 import { chromium } from '../index';
-import { BrowserDownload, BrowserType } from '../types';
-
+import { BrowserDownload } from '../types';
 import { md5 } from './checksum';
-import { asyncMap } from './util';
-import { download } from './download';
 import { clean } from './clean';
+import { download } from './download';
+import { asyncMap } from './util';
 
 /**
  * Check for the downloaded archive of each requested browser type and
@@ -21,7 +20,7 @@ import { clean } from './clean';
  * @param  {String} browserType
  * @return {Promise<undefined>}
  */
-export async function ensureBrowserDownloaded(browserType: BrowserType) {
+export async function ensureBrowserDownloaded(browserType = BROWSER_TYPE) {
   await ensureDownloaded([chromium]);
 }
 
diff --git a/x-pack/legacy/plugins/reporting/server/browsers/network_policy.ts b/x-pack/legacy/plugins/reporting/server/browsers/network_policy.ts
index b36345c08bfee..9714c5965a5db 100644
--- a/x-pack/legacy/plugins/reporting/server/browsers/network_policy.ts
+++ b/x-pack/legacy/plugins/reporting/server/browsers/network_policy.ts
@@ -6,12 +6,7 @@
 
 import * as _ from 'lodash';
 import { parse } from 'url';
-
-interface FirewallRule {
-  allow: boolean;
-  host?: string;
-  protocol?: string;
-}
+import { NetworkPolicyRule } from '../../types';
 
 const isHostMatch = (actualHost: string, ruleHost: string) => {
   const hostParts = actualHost.split('.').reverse();
@@ -20,7 +15,7 @@ const isHostMatch = (actualHost: string, ruleHost: string) => {
   return _.every(ruleParts, (part, idx) => part === hostParts[idx]);
 };
 
-export const allowRequest = (url: string, rules: FirewallRule[]) => {
+export const allowRequest = (url: string, rules: NetworkPolicyRule[]) => {
   const parsed = parse(url);
 
   if (!rules.length) {
diff --git a/x-pack/legacy/plugins/reporting/server/browsers/types.d.ts b/x-pack/legacy/plugins/reporting/server/browsers/types.d.ts
index 0c480fc82752b..f096073ec2f5f 100644
--- a/x-pack/legacy/plugins/reporting/server/browsers/types.d.ts
+++ b/x-pack/legacy/plugins/reporting/server/browsers/types.d.ts
@@ -4,8 +4,6 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-export type BrowserType = 'chromium';
-
 export interface BrowserDownload {
   paths: {
     archivesPath: string;
diff --git a/x-pack/legacy/plugins/reporting/server/config/config.js b/x-pack/legacy/plugins/reporting/server/config/config.js
deleted file mode 100644
index 08e4db464b003..0000000000000
--- a/x-pack/legacy/plugins/reporting/server/config/config.js
+++ /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 { cpus } from 'os';
-
-const defaultCPUCount = 2;
-
-function cpuCount() {
-  try {
-    return cpus().length;
-  } catch (e) {
-    return defaultCPUCount;
-  }
-}
-
-export const config = {
-  concurrency: cpuCount(),
-};
diff --git a/x-pack/legacy/plugins/reporting/server/core.ts b/x-pack/legacy/plugins/reporting/server/core.ts
index 4506d41e4f5c3..c233a63833950 100644
--- a/x-pack/legacy/plugins/reporting/server/core.ts
+++ b/x-pack/legacy/plugins/reporting/server/core.ts
@@ -7,12 +7,14 @@
 import * as Rx from 'rxjs';
 import { first, mapTo } from 'rxjs/operators';
 import {
+  ElasticsearchServiceSetup,
   IUiSettingsClient,
   KibanaRequest,
   SavedObjectsClient,
   SavedObjectsServiceStart,
   UiSettingsServiceStart,
 } from 'src/core/server';
+import { ConfigType as ReportingConfigType } from '../../../../plugins/reporting/server';
 // @ts-ignore no module definition
 import { mirrorPluginStatus } from '../../../server/lib/mirror_plugin_status';
 import { XPackMainPlugin } from '../../xpack_main/server/xpack_main';
@@ -25,14 +27,63 @@ import { ReportingSetupDeps } from './types';
 
 interface ReportingInternalSetup {
   browserDriverFactory: HeadlessChromiumDriverFactory;
+  config: ReportingConfig;
+  elasticsearch: ElasticsearchServiceSetup;
 }
 interface ReportingInternalStart {
+  enqueueJob: EnqueueJobFn;
+  esqueue: ESQueueInstance;
   savedObjects: SavedObjectsServiceStart;
   uiSettings: UiSettingsServiceStart;
-  esqueue: ESQueueInstance;
-  enqueueJob: EnqueueJobFn;
 }
 
+// make config.get() aware of the value type it returns
+interface Config<BaseType> {
+  get<Key1 extends keyof BaseType>(key1: Key1): BaseType[Key1];
+  get<Key1 extends keyof BaseType, Key2 extends keyof BaseType[Key1]>(
+    key1: Key1,
+    key2: Key2
+  ): BaseType[Key1][Key2];
+  get<
+    Key1 extends keyof BaseType,
+    Key2 extends keyof BaseType[Key1],
+    Key3 extends keyof BaseType[Key1][Key2]
+  >(
+    key1: Key1,
+    key2: Key2,
+    key3: Key3
+  ): BaseType[Key1][Key2][Key3];
+  get<
+    Key1 extends keyof BaseType,
+    Key2 extends keyof BaseType[Key1],
+    Key3 extends keyof BaseType[Key1][Key2],
+    Key4 extends keyof BaseType[Key1][Key2][Key3]
+  >(
+    key1: Key1,
+    key2: Key2,
+    key3: Key3,
+    key4: Key4
+  ): BaseType[Key1][Key2][Key3][Key4];
+}
+
+interface KbnServerConfigType {
+  path: { data: string };
+  server: {
+    basePath: string;
+    host: string;
+    name: string;
+    port: number;
+    protocol: string;
+    uuid: string;
+  };
+}
+
+export interface ReportingConfig extends Config<ReportingConfigType> {
+  kbnConfig: Config<KbnServerConfigType>;
+}
+
+export { ReportingConfigType };
+
 export class ReportingCore {
   private pluginSetupDeps?: ReportingInternalSetup;
   private pluginStartDeps?: ReportingInternalStart;
@@ -45,6 +96,7 @@ export class ReportingCore {
   legacySetup(
     xpackMainPlugin: XPackMainPlugin,
     reporting: ReportingPluginSpecOptions,
+    config: ReportingConfig,
     __LEGACY: ServerFacade,
     plugins: ReportingSetupDeps
   ) {
@@ -56,7 +108,7 @@ export class ReportingCore {
       xpackMainPlugin.info.feature(PLUGIN_ID).registerLicenseCheckResultsGenerator(checkLicense);
     });
     // Reporting routes
-    registerRoutes(this, __LEGACY, plugins, this.logger);
+    registerRoutes(this, config, __LEGACY, plugins, this.logger);
   }
 
   public pluginSetup(reportingSetupDeps: ReportingInternalSetup) {
@@ -90,23 +142,31 @@ export class ReportingCore {
     return (await this.getPluginSetupDeps()).browserDriverFactory;
   }
 
+  public async getConfig(): Promise<ReportingConfig> {
+    return (await this.getPluginSetupDeps()).config;
+  }
+
   /*
-   * Kibana core module dependencies
+   * Outside dependencies
    */
-  private async getPluginSetupDeps() {
+  private async getPluginSetupDeps(): Promise<ReportingInternalSetup> {
     if (this.pluginSetupDeps) {
       return this.pluginSetupDeps;
     }
     return await this.pluginSetup$.pipe(first()).toPromise();
   }
 
-  private async getPluginStartDeps() {
+  private async getPluginStartDeps(): Promise<ReportingInternalStart> {
     if (this.pluginStartDeps) {
       return this.pluginStartDeps;
     }
     return await this.pluginStart$.pipe(first()).toPromise();
   }
 
+  public async getElasticsearchService(): Promise<ElasticsearchServiceSetup> {
+    return (await this.getPluginSetupDeps()).elasticsearch;
+  }
+
   public async getSavedObjectsClient(fakeRequest: KibanaRequest): Promise<SavedObjectsClient> {
     const { savedObjects } = await this.getPluginStartDeps();
     return savedObjects.getScopedClient(fakeRequest) as SavedObjectsClient;
diff --git a/x-pack/legacy/plugins/reporting/server/index.ts b/x-pack/legacy/plugins/reporting/server/index.ts
index 24e2a954415d9..efcfd6b7f783d 100644
--- a/x-pack/legacy/plugins/reporting/server/index.ts
+++ b/x-pack/legacy/plugins/reporting/server/index.ts
@@ -11,5 +11,5 @@ export const plugin = (context: PluginInitializerContext) => {
   return new Plugin(context);
 };
 
-export { ReportingCore } from './core';
 export { ReportingPlugin } from './plugin';
+export { ReportingConfig, ReportingCore } from './core';
diff --git a/x-pack/legacy/plugins/reporting/server/legacy.ts b/x-pack/legacy/plugins/reporting/server/legacy.ts
index 336ff5f4d2ee7..29e5af529767e 100644
--- a/x-pack/legacy/plugins/reporting/server/legacy.ts
+++ b/x-pack/legacy/plugins/reporting/server/legacy.ts
@@ -4,35 +4,75 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 import { Legacy } from 'kibana';
-import { PluginInitializerContext } from 'src/core/server';
+import { get } from 'lodash';
+import { take } from 'rxjs/operators';
+import { CoreSetup, PluginInitializerContext } from 'src/core/server';
+import { ConfigType, PluginsSetup } from '../../../../plugins/reporting/server';
 import { SecurityPluginSetup } from '../../../../plugins/security/server';
 import { ReportingPluginSpecOptions } from '../types';
 import { plugin } from './index';
-import { LegacySetup, ReportingStartDeps } from './types';
+import { LegacySetup, ReportingConfig, ReportingStartDeps } from './types';
 
 const buildLegacyDependencies = (
+  coreSetup: CoreSetup,
   server: Legacy.Server,
   reportingPlugin: ReportingPluginSpecOptions
-): LegacySetup => ({
-  config: server.config,
-  info: server.info,
-  route: server.route.bind(server),
-  plugins: {
-    elasticsearch: server.plugins.elasticsearch,
-    xpack_main: server.plugins.xpack_main,
-    reporting: reportingPlugin,
-  },
-});
+): LegacySetup => {
+  return {
+    route: server.route.bind(server),
+    plugins: {
+      xpack_main: server.plugins.xpack_main,
+      reporting: reportingPlugin,
+    },
+  };
+};
+
+const buildConfig = (
+  coreSetup: CoreSetup,
+  server: Legacy.Server,
+  reportingConfig: ConfigType
+): ReportingConfig => {
+  const config = server.config();
+  const { http } = coreSetup;
+  const serverInfo = http.getServerInfo();
+
+  const kbnConfig = {
+    path: {
+      data: config.get('path.data'), // FIXME: get from the real PluginInitializerContext
+    },
+    server: {
+      basePath: coreSetup.http.basePath.serverBasePath,
+      host: serverInfo.host,
+      name: serverInfo.name,
+      port: serverInfo.port,
+      uuid: coreSetup.uuid.getInstanceUuid(),
+      protocol: serverInfo.protocol,
+    },
+  };
+
+  // spreading arguments as an array allows the return type to be known by the compiler
+  return {
+    get: (...keys: string[]) => get(reportingConfig, keys.join('.'), null),
+    kbnConfig: {
+      get: (...keys: string[]) => get(kbnConfig, keys.join('.'), null),
+    },
+  };
+};
 
 export const legacyInit = async (
   server: Legacy.Server,
-  reportingPlugin: ReportingPluginSpecOptions
+  reportingLegacyPlugin: ReportingPluginSpecOptions
 ) => {
-  const coreSetup = server.newPlatform.setup.core;
-  const pluginInstance = plugin(server.newPlatform.coreContext as PluginInitializerContext);
+  const { core: coreSetup } = server.newPlatform.setup;
+  const { config$ } = (server.newPlatform.setup.plugins.reporting as PluginsSetup).__legacy;
+  const reportingConfig = await config$.pipe(take(1)).toPromise();
+  const reporting = { config: buildConfig(coreSetup, server, reportingConfig) };
+
+  const __LEGACY = buildLegacyDependencies(coreSetup, server, reportingLegacyPlugin);
 
-  const __LEGACY = buildLegacyDependencies(server, reportingPlugin);
+  const pluginInstance = plugin(server.newPlatform.coreContext as PluginInitializerContext); // NOTE: mocked-out PluginInitializerContext
   await pluginInstance.setup(coreSetup, {
+    reporting,
     elasticsearch: coreSetup.elasticsearch,
     security: server.newPlatform.setup.plugins.security as SecurityPluginSetup,
     usageCollection: server.newPlatform.setup.plugins.usageCollection,
@@ -42,7 +82,6 @@ export const legacyInit = async (
   // Schedule to call the "start" hook only after start dependencies are ready
   coreSetup.getStartServices().then(([core, plugins]) =>
     pluginInstance.start(core, {
-      elasticsearch: coreSetup.elasticsearch,
       data: (plugins as ReportingStartDeps).data,
       __LEGACY,
     })
diff --git a/x-pack/legacy/plugins/reporting/server/lib/create_queue.ts b/x-pack/legacy/plugins/reporting/server/lib/create_queue.ts
index d593e4625cdf4..a05205526dd3e 100644
--- a/x-pack/legacy/plugins/reporting/server/lib/create_queue.ts
+++ b/x-pack/legacy/plugins/reporting/server/lib/create_queue.ts
@@ -4,22 +4,24 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { ElasticsearchServiceSetup } from 'kibana/server';
-import { ESQueueInstance, ServerFacade, QueueConfig, Logger } from '../../types';
+import { ESQueueInstance, Logger } from '../../types';
 import { ReportingCore } from '../core';
+import { createTaggedLogger } from './create_tagged_logger'; // TODO remove createTaggedLogger once esqueue is removed
+import { createWorkerFactory } from './create_worker';
 // @ts-ignore
 import { Esqueue } from './esqueue';
-import { createWorkerFactory } from './create_worker';
-import { createTaggedLogger } from './create_tagged_logger'; // TODO remove createTaggedLogger once esqueue is removed
 
 export async function createQueueFactory<JobParamsType, JobPayloadType>(
   reporting: ReportingCore,
-  server: ServerFacade,
-  elasticsearch: ElasticsearchServiceSetup,
   logger: Logger
 ): Promise<ESQueueInstance> {
-  const queueConfig: QueueConfig = server.config().get('xpack.reporting.queue');
-  const index = server.config().get('xpack.reporting.index');
+  const [config, elasticsearch] = await Promise.all([
+    reporting.getConfig(),
+    reporting.getElasticsearchService(),
+  ]);
+
+  const queueConfig = config.get('queue');
+  const index = config.get('index');
 
   const queueOptions = {
     interval: queueConfig.indexInterval,
@@ -33,7 +35,7 @@ export async function createQueueFactory<JobParamsType, JobPayloadType>(
 
   if (queueConfig.pollEnabled) {
     // create workers to poll the index for idle jobs waiting to be claimed and executed
-    const createWorker = createWorkerFactory(reporting, server, elasticsearch, logger);
+    const createWorker = await createWorkerFactory(reporting, config, logger);
     await createWorker(queue);
   } else {
     logger.info(
diff --git a/x-pack/legacy/plugins/reporting/server/lib/create_worker.test.ts b/x-pack/legacy/plugins/reporting/server/lib/create_worker.test.ts
index d4d913243e18d..01a937a49873a 100644
--- a/x-pack/legacy/plugins/reporting/server/lib/create_worker.test.ts
+++ b/x-pack/legacy/plugins/reporting/server/lib/create_worker.test.ts
@@ -4,11 +4,9 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { ElasticsearchServiceSetup } from 'kibana/server';
 import * as sinon from 'sinon';
-import { ReportingCore } from '../../server';
+import { ReportingConfig, ReportingCore } from '../../server/types';
 import { createMockReportingCore } from '../../test_helpers';
-import { ServerFacade } from '../../types';
 import { createWorkerFactory } from './create_worker';
 // @ts-ignore
 import { Esqueue } from './esqueue';
@@ -17,21 +15,15 @@ import { ClientMock } from './esqueue/__tests__/fixtures/legacy_elasticsearch';
 import { ExportTypesRegistry } from './export_types_registry';
 
 const configGetStub = sinon.stub();
-configGetStub.withArgs('xpack.reporting.queue').returns({
+configGetStub.withArgs('queue').returns({
   pollInterval: 3300,
   pollIntervalErrorMultiplier: 10,
 });
-configGetStub.withArgs('server.name').returns('test-server-123');
-configGetStub.withArgs('server.uuid').returns('g9ymiujthvy6v8yrh7567g6fwzgzftzfr');
+configGetStub.withArgs('server', 'name').returns('test-server-123');
+configGetStub.withArgs('server', 'uuid').returns('g9ymiujthvy6v8yrh7567g6fwzgzftzfr');
 
 const executeJobFactoryStub = sinon.stub();
-
-const getMockServer = (): ServerFacade => {
-  return ({
-    config: () => ({ get: configGetStub }),
-  } as unknown) as ServerFacade;
-};
-const getMockLogger = jest.fn();
+const getMockLogger = sinon.stub();
 
 const getMockExportTypesRegistry = (
   exportTypes: any[] = [{ executeJobFactory: executeJobFactoryStub }]
@@ -41,25 +33,23 @@ const getMockExportTypesRegistry = (
   } as ExportTypesRegistry);
 
 describe('Create Worker', () => {
+  let mockReporting: ReportingCore;
+  let mockConfig: ReportingConfig;
   let queue: Esqueue;
   let client: ClientMock;
-  let mockReporting: ReportingCore;
 
   beforeEach(async () => {
     mockReporting = await createMockReportingCore();
+    mockReporting.getExportTypesRegistry = () => getMockExportTypesRegistry();
+    mockConfig = { get: configGetStub, kbnConfig: { get: configGetStub } };
+    mockReporting.getConfig = () => Promise.resolve(mockConfig);
     client = new ClientMock();
     queue = new Esqueue('reporting-queue', { client });
     executeJobFactoryStub.reset();
   });
 
   test('Creates a single Esqueue worker for Reporting', async () => {
-    mockReporting.getExportTypesRegistry = () => getMockExportTypesRegistry();
-    const createWorker = createWorkerFactory(
-      mockReporting,
-      getMockServer(),
-      {} as ElasticsearchServiceSetup,
-      getMockLogger()
-    );
+    const createWorker = await createWorkerFactory(mockReporting, mockConfig, getMockLogger());
     const registerWorkerSpy = sinon.spy(queue, 'registerWorker');
 
     await createWorker(queue);
@@ -91,12 +81,7 @@ Object {
       { executeJobFactory: executeJobFactoryStub },
     ]);
     mockReporting.getExportTypesRegistry = () => exportTypesRegistry;
-    const createWorker = createWorkerFactory(
-      mockReporting,
-      getMockServer(),
-      {} as ElasticsearchServiceSetup,
-      getMockLogger()
-    );
+    const createWorker = await createWorkerFactory(mockReporting, mockConfig, getMockLogger());
     const registerWorkerSpy = sinon.spy(queue, 'registerWorker');
 
     await createWorker(queue);
diff --git a/x-pack/legacy/plugins/reporting/server/lib/create_worker.ts b/x-pack/legacy/plugins/reporting/server/lib/create_worker.ts
index 3567712367608..e9d0acf29c721 100644
--- a/x-pack/legacy/plugins/reporting/server/lib/create_worker.ts
+++ b/x-pack/legacy/plugins/reporting/server/lib/create_worker.ts
@@ -4,9 +4,9 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { ElasticsearchServiceSetup } from 'kibana/server';
 import { CancellationToken } from '../../common/cancellation_token';
 import { PLUGIN_ID } from '../../common/constants';
+import { ReportingConfig } from '../../server/types';
 import {
   ESQueueInstance,
   ESQueueWorkerExecuteFn,
@@ -15,25 +15,22 @@ import {
   JobDocPayload,
   JobSource,
   Logger,
-  QueueConfig,
   RequestFacade,
-  ServerFacade,
 } from '../../types';
 import { ReportingCore } from '../core';
 // @ts-ignore untyped dependency
 import { events as esqueueEvents } from './esqueue';
 
-export function createWorkerFactory<JobParamsType>(
+export async function createWorkerFactory<JobParamsType>(
   reporting: ReportingCore,
-  server: ServerFacade,
-  elasticsearch: ElasticsearchServiceSetup,
+  config: ReportingConfig,
   logger: Logger
 ) {
   type JobDocPayloadType = JobDocPayload<JobParamsType>;
-  const config = server.config();
-  const queueConfig: QueueConfig = config.get('xpack.reporting.queue');
-  const kibanaName: string = config.get('server.name');
-  const kibanaId: string = config.get('server.uuid');
+
+  const queueConfig = config.get('queue');
+  const kibanaName = config.kbnConfig.get('server', 'name');
+  const kibanaId = config.kbnConfig.get('server', 'uuid');
 
   // Once more document types are added, this will need to be passed in
   return async function createWorker(queue: ESQueueInstance) {
@@ -47,12 +44,7 @@ export function createWorkerFactory<JobParamsType>(
       ExportTypeDefinition<JobParamsType, unknown, unknown, any>
     >) {
       // TODO: the executeJobFn should be unwrapped in the register method of the export types registry
-      const jobExecutor = await exportType.executeJobFactory(
-        reporting,
-        server,
-        elasticsearch,
-        logger
-      );
+      const jobExecutor = await exportType.executeJobFactory(reporting, logger);
       jobExecutors.set(exportType.jobType, jobExecutor);
     }
 
diff --git a/x-pack/legacy/plugins/reporting/server/lib/crypto.ts b/x-pack/legacy/plugins/reporting/server/lib/crypto.ts
index dbc01fc947f8b..97876529ecfa7 100644
--- a/x-pack/legacy/plugins/reporting/server/lib/crypto.ts
+++ b/x-pack/legacy/plugins/reporting/server/lib/crypto.ts
@@ -5,12 +5,7 @@
  */
 
 import nodeCrypto from '@elastic/node-crypto';
-import { oncePerServer } from './once_per_server';
-import { ServerFacade } from '../../types';
 
-function cryptoFn(server: ServerFacade) {
-  const encryptionKey = server.config().get('xpack.reporting.encryptionKey');
+export function cryptoFactory(encryptionKey: string | undefined) {
   return nodeCrypto({ encryptionKey });
 }
-
-export const cryptoFactory = oncePerServer(cryptoFn);
diff --git a/x-pack/legacy/plugins/reporting/server/lib/enqueue_job.ts b/x-pack/legacy/plugins/reporting/server/lib/enqueue_job.ts
index c215bdc398904..bc4754b02ed57 100644
--- a/x-pack/legacy/plugins/reporting/server/lib/enqueue_job.ts
+++ b/x-pack/legacy/plugins/reporting/server/lib/enqueue_job.ts
@@ -5,22 +5,18 @@
  */
 
 import { get } from 'lodash';
-import { ElasticsearchServiceSetup } from 'kibana/server';
-// @ts-ignore
-import { events as esqueueEvents } from './esqueue';
 import {
+  ConditionalHeaders,
   EnqueueJobFn,
   ESQueueCreateJobFn,
   ImmediateCreateJobFn,
   Job,
-  ServerFacade,
-  RequestFacade,
   Logger,
-  CaptureConfig,
-  QueueConfig,
-  ConditionalHeaders,
+  RequestFacade,
 } from '../../types';
 import { ReportingCore } from '../core';
+// @ts-ignore
+import { events as esqueueEvents } from './esqueue';
 
 interface ConfirmedJob {
   id: string;
@@ -29,18 +25,16 @@ interface ConfirmedJob {
   _primary_term: number;
 }
 
-export function enqueueJobFactory(
+export async function enqueueJobFactory(
   reporting: ReportingCore,
-  server: ServerFacade,
-  elasticsearch: ElasticsearchServiceSetup,
   parentLogger: Logger
-): EnqueueJobFn {
+): Promise<EnqueueJobFn> {
+  const config = await reporting.getConfig();
   const logger = parentLogger.clone(['queue-job']);
-  const config = server.config();
-  const captureConfig: CaptureConfig = config.get('xpack.reporting.capture');
+  const captureConfig = config.get('capture');
   const browserType = captureConfig.browser.type;
   const maxAttempts = captureConfig.maxAttempts;
-  const queueConfig: QueueConfig = config.get('xpack.reporting.queue');
+  const queueConfig = config.get('queue');
 
   return async function enqueueJob<JobParamsType>(
     exportTypeId: string,
@@ -59,12 +53,7 @@ export function enqueueJobFactory(
     }
 
     // TODO: the createJobFn should be unwrapped in the register method of the export types registry
-    const createJob = exportType.createJobFactory(
-      reporting,
-      server,
-      elasticsearch,
-      logger
-    ) as CreateJobFn;
+    const createJob = (await exportType.createJobFactory(reporting, logger)) as CreateJobFn;
     const payload = await createJob(jobParams, headers, request);
 
     const options = {
diff --git a/x-pack/legacy/plugins/reporting/server/lib/esqueue/helpers/index_timestamp.js b/x-pack/legacy/plugins/reporting/server/lib/esqueue/helpers/index_timestamp.js
index 6cdbe8f968f75..8e4047e2f22e5 100644
--- a/x-pack/legacy/plugins/reporting/server/lib/esqueue/helpers/index_timestamp.js
+++ b/x-pack/legacy/plugins/reporting/server/lib/esqueue/helpers/index_timestamp.js
@@ -8,6 +8,7 @@ import moment from 'moment';
 
 export const intervals = ['year', 'month', 'week', 'day', 'hour', 'minute'];
 
+// TODO: remove this helper by using `schema.duration` objects in the reporting config schema
 export function indexTimestamp(intervalStr, separator = '-') {
   if (separator.match(/[a-z]/i)) throw new Error('Interval separator can not be a letter');
 
diff --git a/x-pack/legacy/plugins/reporting/server/lib/get_user.ts b/x-pack/legacy/plugins/reporting/server/lib/get_user.ts
index 49d5c568c3981..5e73fe77ecb79 100644
--- a/x-pack/legacy/plugins/reporting/server/lib/get_user.ts
+++ b/x-pack/legacy/plugins/reporting/server/lib/get_user.ts
@@ -6,10 +6,10 @@
 
 import { Legacy } from 'kibana';
 import { KibanaRequest } from '../../../../../../src/core/server';
-import { ServerFacade } from '../../types';
+import { Logger } from '../../types';
 import { ReportingSetupDeps } from '../types';
 
-export function getUserFactory(server: ServerFacade, security: ReportingSetupDeps['security']) {
+export function getUserFactory(security: ReportingSetupDeps['security'], logger: Logger) {
   /*
    * Legacy.Request because this is called from routing middleware
    */
diff --git a/x-pack/legacy/plugins/reporting/server/lib/index.ts b/x-pack/legacy/plugins/reporting/server/lib/index.ts
index 0a2db749cb954..f5ccbe493a91f 100644
--- a/x-pack/legacy/plugins/reporting/server/lib/index.ts
+++ b/x-pack/legacy/plugins/reporting/server/lib/index.ts
@@ -4,11 +4,10 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-export { getExportTypesRegistry } from './export_types_registry';
 export { checkLicenseFactory } from './check_license';
-export { LevelLogger } from './level_logger';
-export { cryptoFactory } from './crypto';
-export { oncePerServer } from './once_per_server';
-export { runValidations } from './validate';
 export { createQueueFactory } from './create_queue';
+export { cryptoFactory } from './crypto';
 export { enqueueJobFactory } from './enqueue_job';
+export { getExportTypesRegistry } from './export_types_registry';
+export { LevelLogger } from './level_logger';
+export { runValidations } from './validate';
diff --git a/x-pack/legacy/plugins/reporting/server/lib/jobs_query.ts b/x-pack/legacy/plugins/reporting/server/lib/jobs_query.ts
index c01e6377b039e..0affc111c1368 100644
--- a/x-pack/legacy/plugins/reporting/server/lib/jobs_query.ts
+++ b/x-pack/legacy/plugins/reporting/server/lib/jobs_query.ts
@@ -9,7 +9,8 @@ import Boom from 'boom';
 import { errors as elasticsearchErrors } from 'elasticsearch';
 import { ElasticsearchServiceSetup } from 'kibana/server';
 import { get } from 'lodash';
-import { JobSource, ServerFacade } from '../../types';
+import { JobSource } from '../../types';
+import { ReportingConfig } from '../types';
 
 const esErrors = elasticsearchErrors as Record<string, any>;
 const defaultSize = 10;
@@ -39,8 +40,11 @@ interface CountAggResult {
   count: number;
 }
 
-export function jobsQueryFactory(server: ServerFacade, elasticsearch: ElasticsearchServiceSetup) {
-  const index = server.config().get('xpack.reporting.index');
+export function jobsQueryFactory(
+  config: ReportingConfig,
+  elasticsearch: ElasticsearchServiceSetup
+) {
+  const index = config.get('index');
   const { callAsInternalUser } = elasticsearch.adminClient;
 
   function getUsername(user: any) {
diff --git a/x-pack/legacy/plugins/reporting/server/lib/once_per_server.ts b/x-pack/legacy/plugins/reporting/server/lib/once_per_server.ts
deleted file mode 100644
index ae3636079a9bb..0000000000000
--- a/x-pack/legacy/plugins/reporting/server/lib/once_per_server.ts
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { memoize, MemoizedFunction } from 'lodash';
-import { ServerFacade } from '../../types';
-
-type ServerFn = (server: ServerFacade) => any;
-type Memo = ((server: ServerFacade) => any) & MemoizedFunction;
-
-/**
- * allow this function to be called multiple times, but
- * ensure that it only received one argument, the server,
- * and cache the return value so that subsequent calls get
- * the exact same value.
- *
- * This is intended to be used by service factories like getObjectQueueFactory
- *
- * @param  {Function} fn - the factory function
- * @return {any}
- */
-export function oncePerServer(fn: ServerFn) {
-  const memoized: Memo = memoize(function(server: ServerFacade) {
-    if (arguments.length !== 1) {
-      throw new TypeError('This function expects to be called with a single argument');
-    }
-
-    // @ts-ignore
-    return fn.call(this, server);
-  });
-
-  // @ts-ignore
-  // Type 'WeakMap<object, any>' is not assignable to type 'MapCache
-
-  // use a weak map a the cache so that:
-  //  1. return values mapped to the actual server instance
-  //  2. return value lifecycle matches that of the server
-  memoized.cache = new WeakMap();
-
-  return memoized;
-}
diff --git a/x-pack/legacy/plugins/reporting/server/lib/validate/__tests__/validate_encryption_key.js b/x-pack/legacy/plugins/reporting/server/lib/validate/__tests__/validate_encryption_key.js
deleted file mode 100644
index 10980f702d849..0000000000000
--- a/x-pack/legacy/plugins/reporting/server/lib/validate/__tests__/validate_encryption_key.js
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import expect from '@kbn/expect';
-import sinon from 'sinon';
-import { validateEncryptionKey } from '../validate_encryption_key';
-
-describe('Reporting: Validate config', () => {
-  const logger = {
-    warning: sinon.spy(),
-  };
-
-  beforeEach(() => {
-    logger.warning.resetHistory();
-  });
-
-  [undefined, null].forEach(value => {
-    it(`should log a warning and set xpack.reporting.encryptionKey if encryptionKey is ${value}`, () => {
-      const config = {
-        get: sinon.stub().returns(value),
-        set: sinon.stub(),
-      };
-
-      expect(() => validateEncryptionKey({ config: () => config }, logger)).not.to.throwError();
-
-      sinon.assert.calledWith(config.set, 'xpack.reporting.encryptionKey');
-      sinon.assert.calledWithMatch(logger.warning, /Generating a random key/);
-      sinon.assert.calledWithMatch(logger.warning, /please set xpack.reporting.encryptionKey/);
-    });
-  });
-});
diff --git a/x-pack/legacy/plugins/reporting/server/lib/validate/__tests__/validate_server_host.ts b/x-pack/legacy/plugins/reporting/server/lib/validate/__tests__/validate_server_host.ts
deleted file mode 100644
index 04f998fd3e5a5..0000000000000
--- a/x-pack/legacy/plugins/reporting/server/lib/validate/__tests__/validate_server_host.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import expect from '@kbn/expect';
-import sinon from 'sinon';
-import { ServerFacade } from '../../../../types';
-import { validateServerHost } from '../validate_server_host';
-
-const configKey = 'xpack.reporting.kibanaServer.hostname';
-
-describe('Reporting: Validate server host setting', () => {
-  it(`should log a warning and set ${configKey} if server.host is "0"`, () => {
-    const getStub = sinon.stub();
-    getStub.withArgs('server.host').returns('0');
-    getStub.withArgs(configKey).returns(undefined);
-    const config = {
-      get: getStub,
-      set: sinon.stub(),
-    };
-
-    expect(() =>
-      validateServerHost(({ config: () => config } as unknown) as ServerFacade)
-    ).to.throwError();
-
-    sinon.assert.calledWith(config.set, configKey);
-  });
-});
diff --git a/x-pack/legacy/plugins/reporting/server/lib/validate/index.ts b/x-pack/legacy/plugins/reporting/server/lib/validate/index.ts
index 0fdbd858b8e3c..85d9f727d7fa7 100644
--- a/x-pack/legacy/plugins/reporting/server/lib/validate/index.ts
+++ b/x-pack/legacy/plugins/reporting/server/lib/validate/index.ts
@@ -6,25 +6,22 @@
 
 import { i18n } from '@kbn/i18n';
 import { ElasticsearchServiceSetup } from 'kibana/server';
-import { Logger, ServerFacade } from '../../../types';
+import { Logger } from '../../../types';
 import { HeadlessChromiumDriverFactory } from '../../browsers/chromium/driver_factory';
+import { ReportingConfig } from '../../types';
 import { validateBrowser } from './validate_browser';
-import { validateEncryptionKey } from './validate_encryption_key';
 import { validateMaxContentLength } from './validate_max_content_length';
-import { validateServerHost } from './validate_server_host';
 
 export async function runValidations(
-  server: ServerFacade,
+  config: ReportingConfig,
   elasticsearch: ElasticsearchServiceSetup,
   browserFactory: HeadlessChromiumDriverFactory,
   logger: Logger
 ) {
   try {
     await Promise.all([
-      validateBrowser(server, browserFactory, logger),
-      validateEncryptionKey(server, logger),
-      validateMaxContentLength(server, elasticsearch, logger),
-      validateServerHost(server),
+      validateBrowser(browserFactory, logger),
+      validateMaxContentLength(config, elasticsearch, logger),
     ]);
     logger.debug(
       i18n.translate('xpack.reporting.selfCheck.ok', {
diff --git a/x-pack/legacy/plugins/reporting/server/lib/validate/validate_browser.ts b/x-pack/legacy/plugins/reporting/server/lib/validate/validate_browser.ts
index 89c49123e85bf..d6512d5eb718b 100644
--- a/x-pack/legacy/plugins/reporting/server/lib/validate/validate_browser.ts
+++ b/x-pack/legacy/plugins/reporting/server/lib/validate/validate_browser.ts
@@ -3,9 +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 { Browser } from 'puppeteer';
 import { BROWSER_TYPE } from '../../../common/constants';
-import { ServerFacade, Logger } from '../../../types';
+import { Logger } from '../../../types';
 import { HeadlessChromiumDriverFactory } from '../../browsers/chromium/driver_factory';
 
 /*
@@ -13,7 +14,6 @@ import { HeadlessChromiumDriverFactory } from '../../browsers/chromium/driver_fa
  * to the locally running Kibana instance.
  */
 export const validateBrowser = async (
-  server: ServerFacade,
   browserFactory: HeadlessChromiumDriverFactory,
   logger: Logger
 ) => {
diff --git a/x-pack/legacy/plugins/reporting/server/lib/validate/validate_encryption_key.ts b/x-pack/legacy/plugins/reporting/server/lib/validate/validate_encryption_key.ts
deleted file mode 100644
index e0af94cbdc29c..0000000000000
--- a/x-pack/legacy/plugins/reporting/server/lib/validate/validate_encryption_key.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { i18n } from '@kbn/i18n';
-import crypto from 'crypto';
-import { ServerFacade, Logger } from '../../../types';
-
-export function validateEncryptionKey(serverFacade: ServerFacade, logger: Logger) {
-  const config = serverFacade.config();
-
-  const encryptionKey = config.get('xpack.reporting.encryptionKey');
-  if (encryptionKey == null) {
-    // TODO this should simply throw an error and let the handler conver it to a warning mesasge. See validateServerHost.
-    logger.warning(
-      i18n.translate('xpack.reporting.selfCheckEncryptionKey.warning', {
-        defaultMessage:
-          `Generating a random key for {setting}. To prevent pending reports ` +
-          `from failing on restart, please set {setting} in kibana.yml`,
-        values: {
-          setting: 'xpack.reporting.encryptionKey',
-        },
-      })
-    );
-
-    // @ts-ignore: No set() method on KibanaConfig, just get() and has()
-    config.set('xpack.reporting.encryptionKey', crypto.randomBytes(16).toString('hex')); // update config in memory to contain a usable encryption key
-  }
-}
diff --git a/x-pack/legacy/plugins/reporting/server/lib/validate/validate_max_content_length.test.js b/x-pack/legacy/plugins/reporting/server/lib/validate/validate_max_content_length.test.js
index 942dcaf842696..2551fd48b91f3 100644
--- a/x-pack/legacy/plugins/reporting/server/lib/validate/validate_max_content_length.test.js
+++ b/x-pack/legacy/plugins/reporting/server/lib/validate/validate_max_content_length.test.js
@@ -32,11 +32,7 @@ describe('Reporting: Validate Max Content Length', () => {
   });
 
   it('should log warning messages when reporting has a higher max-size than elasticsearch', async () => {
-    const server = {
-      config: () => ({
-        get: sinon.stub().returns(FIVE_HUNDRED_MEGABYTES),
-      }),
-    };
+    const config = { get: sinon.stub().returns(FIVE_HUNDRED_MEGABYTES) };
     const elasticsearch = {
       dataClient: {
         callAsInternalUser: () => ({
@@ -49,7 +45,7 @@ describe('Reporting: Validate Max Content Length', () => {
       },
     };
 
-    await validateMaxContentLength(server, elasticsearch, logger);
+    await validateMaxContentLength(config, elasticsearch, logger);
 
     sinon.assert.calledWithMatch(
       logger.warning,
@@ -70,14 +66,10 @@ describe('Reporting: Validate Max Content Length', () => {
   });
 
   it('should do nothing when reporting has the same max-size as elasticsearch', async () => {
-    const server = {
-      config: () => ({
-        get: sinon.stub().returns(ONE_HUNDRED_MEGABYTES),
-      }),
-    };
+    const config = { get: sinon.stub().returns(ONE_HUNDRED_MEGABYTES) };
 
     expect(
-      async () => await validateMaxContentLength(server, elasticsearch, logger.warning)
+      async () => await validateMaxContentLength(config, elasticsearch, logger.warning)
     ).not.toThrow();
     sinon.assert.notCalled(logger.warning);
   });
diff --git a/x-pack/legacy/plugins/reporting/server/lib/validate/validate_max_content_length.ts b/x-pack/legacy/plugins/reporting/server/lib/validate/validate_max_content_length.ts
index ce4a5b93e7431..a20905ba093d4 100644
--- a/x-pack/legacy/plugins/reporting/server/lib/validate/validate_max_content_length.ts
+++ b/x-pack/legacy/plugins/reporting/server/lib/validate/validate_max_content_length.ts
@@ -7,17 +7,17 @@
 import numeral from '@elastic/numeral';
 import { ElasticsearchServiceSetup } from 'kibana/server';
 import { defaults, get } from 'lodash';
-import { Logger, ServerFacade } from '../../../types';
+import { Logger } from '../../../types';
+import { ReportingConfig } from '../../types';
 
-const KIBANA_MAX_SIZE_BYTES_PATH = 'xpack.reporting.csv.maxSizeBytes';
+const KIBANA_MAX_SIZE_BYTES_PATH = 'csv.maxSizeBytes';
 const ES_MAX_SIZE_BYTES_PATH = 'http.max_content_length';
 
 export async function validateMaxContentLength(
-  server: ServerFacade,
+  config: ReportingConfig,
   elasticsearch: ElasticsearchServiceSetup,
   logger: Logger
 ) {
-  const config = server.config();
   const { callAsInternalUser } = elasticsearch.dataClient;
 
   const elasticClusterSettingsResponse = await callAsInternalUser('cluster.getSettings', {
@@ -28,13 +28,13 @@ export async function validateMaxContentLength(
 
   const elasticSearchMaxContent = get(elasticClusterSettings, 'http.max_content_length', '100mb');
   const elasticSearchMaxContentBytes = numeral().unformat(elasticSearchMaxContent.toUpperCase());
-  const kibanaMaxContentBytes: number = config.get(KIBANA_MAX_SIZE_BYTES_PATH);
+  const kibanaMaxContentBytes = config.get('csv', 'maxSizeBytes');
 
   if (kibanaMaxContentBytes > elasticSearchMaxContentBytes) {
     // TODO this should simply throw an error and let the handler conver it to a warning mesasge. See validateServerHost.
     logger.warning(
-      `${KIBANA_MAX_SIZE_BYTES_PATH} (${kibanaMaxContentBytes}) is higher than ElasticSearch's ${ES_MAX_SIZE_BYTES_PATH} (${elasticSearchMaxContentBytes}). ` +
-        `Please set ${ES_MAX_SIZE_BYTES_PATH} in ElasticSearch to match, or lower your ${KIBANA_MAX_SIZE_BYTES_PATH} in Kibana to avoid this warning.`
+      `xpack.reporting.${KIBANA_MAX_SIZE_BYTES_PATH} (${kibanaMaxContentBytes}) is higher than ElasticSearch's ${ES_MAX_SIZE_BYTES_PATH} (${elasticSearchMaxContentBytes}). ` +
+        `Please set ${ES_MAX_SIZE_BYTES_PATH} in ElasticSearch to match, or lower your xpack.reporting.${KIBANA_MAX_SIZE_BYTES_PATH} in Kibana to avoid this warning.`
     );
   }
 }
diff --git a/x-pack/legacy/plugins/reporting/server/lib/validate/validate_server_host.ts b/x-pack/legacy/plugins/reporting/server/lib/validate/validate_server_host.ts
deleted file mode 100644
index f4f4d61246b6a..0000000000000
--- a/x-pack/legacy/plugins/reporting/server/lib/validate/validate_server_host.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { ServerFacade } from '../../../types';
-
-const configKey = 'xpack.reporting.kibanaServer.hostname';
-
-export function validateServerHost(serverFacade: ServerFacade) {
-  const config = serverFacade.config();
-
-  const serverHost = config.get('server.host');
-  const reportingKibanaHostName = config.get(configKey);
-
-  if (!reportingKibanaHostName && serverHost === '0') {
-    // @ts-ignore: No set() method on KibanaConfig, just get() and has()
-    config.set(configKey, '0.0.0.0'); // update config in memory to allow Reporting to work
-
-    throw new Error(
-      `Found 'server.host: "0"' in settings. This is incompatible with Reporting. ` +
-        `To enable Reporting to work, '${configKey}: 0.0.0.0' is being automatically to the configuration. ` +
-        `You can change to 'server.host: 0.0.0.0' or add '${configKey}: 0.0.0.0' in kibana.yml to prevent this message.`
-    );
-  }
-}
diff --git a/x-pack/legacy/plugins/reporting/server/plugin.ts b/x-pack/legacy/plugins/reporting/server/plugin.ts
index 4f24cc16b2277..1d7cc075b690d 100644
--- a/x-pack/legacy/plugins/reporting/server/plugin.ts
+++ b/x-pack/legacy/plugins/reporting/server/plugin.ts
@@ -12,8 +12,6 @@ import { createQueueFactory, enqueueJobFactory, LevelLogger, runValidations } fr
 import { setFieldFormats } from './services';
 import { ReportingSetup, ReportingSetupDeps, ReportingStart, ReportingStartDeps } from './types';
 import { registerReportingUsageCollector } from './usage';
-// @ts-ignore no module definition
-import { mirrorPluginStatus } from '../../../server/lib/mirror_plugin_status';
 
 export class ReportingPlugin
   implements Plugin<ReportingSetup, ReportingStart, ReportingSetupDeps, ReportingStartDeps> {
@@ -26,29 +24,29 @@ export class ReportingPlugin
   }
 
   public async setup(core: CoreSetup, plugins: ReportingSetupDeps) {
-    const { elasticsearch, usageCollection, __LEGACY } = plugins;
+    const { reporting: reportingNewPlatform, elasticsearch, __LEGACY } = plugins;
+    const { config } = reportingNewPlatform;
 
-    const browserDriverFactory = await createBrowserDriverFactory(__LEGACY, this.logger); // required for validations :(
-    runValidations(__LEGACY, elasticsearch, browserDriverFactory, this.logger); // this must run early, as it sets up config defaults
+    const browserDriverFactory = await createBrowserDriverFactory(config, this.logger); // required for validations :(
+    runValidations(config, elasticsearch, browserDriverFactory, this.logger); // this must run early, as it sets up config defaults
 
     const { xpack_main: xpackMainLegacy, reporting: reportingLegacy } = __LEGACY.plugins;
-    this.reportingCore.legacySetup(xpackMainLegacy, reportingLegacy, __LEGACY, plugins);
+    this.reportingCore.legacySetup(xpackMainLegacy, reportingLegacy, config, __LEGACY, plugins);
 
     // Register a function with server to manage the collection of usage stats
-    registerReportingUsageCollector(this.reportingCore, __LEGACY, usageCollection);
+    registerReportingUsageCollector(this.reportingCore, config, plugins);
 
     // regsister setup internals
-    this.reportingCore.pluginSetup({ browserDriverFactory });
+    this.reportingCore.pluginSetup({ browserDriverFactory, config, elasticsearch });
 
     return {};
   }
 
   public async start(core: CoreStart, plugins: ReportingStartDeps) {
     const { reportingCore, logger } = this;
-    const { elasticsearch, __LEGACY } = plugins;
 
-    const esqueue = await createQueueFactory(reportingCore, __LEGACY, elasticsearch, logger);
-    const enqueueJob = enqueueJobFactory(reportingCore, __LEGACY, elasticsearch, logger);
+    const esqueue = await createQueueFactory(reportingCore, logger);
+    const enqueueJob = await enqueueJobFactory(reportingCore, logger);
 
     this.reportingCore.pluginStart({
       savedObjects: core.savedObjects,
@@ -58,7 +56,9 @@ export class ReportingPlugin
     });
 
     setFieldFormats(plugins.data.fieldFormats);
-    logConfiguration(__LEGACY, this.logger);
+
+    const config = await reportingCore.getConfig();
+    logConfiguration(config.get('capture'), this.logger);
 
     return {};
   }
diff --git a/x-pack/legacy/plugins/reporting/server/routes/generate_from_jobparams.ts b/x-pack/legacy/plugins/reporting/server/routes/generate_from_jobparams.ts
index 56622617586f7..dc58e97ff3e41 100644
--- a/x-pack/legacy/plugins/reporting/server/routes/generate_from_jobparams.ts
+++ b/x-pack/legacy/plugins/reporting/server/routes/generate_from_jobparams.ts
@@ -10,7 +10,7 @@ import { Legacy } from 'kibana';
 import rison from 'rison-node';
 import { API_BASE_URL } from '../../common/constants';
 import { Logger, ReportingResponseToolkit, ServerFacade } from '../../types';
-import { ReportingSetupDeps } from '../types';
+import { ReportingConfig, ReportingSetupDeps } from '../types';
 import { makeRequestFacade } from './lib/make_request_facade';
 import {
   GetRouteConfigFactoryFn,
@@ -22,6 +22,7 @@ import { HandlerErrorFunction, HandlerFunction } from './types';
 const BASE_GENERATE = `${API_BASE_URL}/generate`;
 
 export function registerGenerateFromJobParams(
+  config: ReportingConfig,
   server: ServerFacade,
   plugins: ReportingSetupDeps,
   handler: HandlerFunction,
@@ -30,7 +31,7 @@ export function registerGenerateFromJobParams(
 ) {
   const getRouteConfig = () => {
     const getOriginalRouteConfig: GetRouteConfigFactoryFn = getRouteConfigFactoryReportingPre(
-      server,
+      config,
       plugins,
       logger
     );
diff --git a/x-pack/legacy/plugins/reporting/server/routes/generate_from_savedobject.ts b/x-pack/legacy/plugins/reporting/server/routes/generate_from_savedobject.ts
index 415b6b7d64366..23ab7ee0d9e6b 100644
--- a/x-pack/legacy/plugins/reporting/server/routes/generate_from_savedobject.ts
+++ b/x-pack/legacy/plugins/reporting/server/routes/generate_from_savedobject.ts
@@ -9,7 +9,7 @@ import { get } from 'lodash';
 import { API_BASE_GENERATE_V1, CSV_FROM_SAVEDOBJECT_JOB_TYPE } from '../../common/constants';
 import { getJobParamsFromRequest } from '../../export_types/csv_from_savedobject/server/lib/get_job_params_from_request';
 import { Logger, ReportingResponseToolkit, ServerFacade } from '../../types';
-import { ReportingSetupDeps } from '../types';
+import { ReportingConfig, ReportingSetupDeps } from '../types';
 import { makeRequestFacade } from './lib/make_request_facade';
 import { getRouteOptionsCsv } from './lib/route_config_factories';
 import { HandlerErrorFunction, HandlerFunction, QueuedJobPayload } from './types';
@@ -24,13 +24,14 @@ import { HandlerErrorFunction, HandlerFunction, QueuedJobPayload } from './types
  *     - local (transient) changes the user made to the saved object
  */
 export function registerGenerateCsvFromSavedObject(
+  config: ReportingConfig,
   server: ServerFacade,
   plugins: ReportingSetupDeps,
   handleRoute: HandlerFunction,
   handleRouteError: HandlerErrorFunction,
   logger: Logger
 ) {
-  const routeOptions = getRouteOptionsCsv(server, plugins, logger);
+  const routeOptions = getRouteOptionsCsv(config, plugins, logger);
 
   server.route({
     path: `${API_BASE_GENERATE_V1}/csv/saved-object/{savedObjectType}:{savedObjectId}`,
diff --git a/x-pack/legacy/plugins/reporting/server/routes/generate_from_savedobject_immediate.ts b/x-pack/legacy/plugins/reporting/server/routes/generate_from_savedobject_immediate.ts
index 5d17fa2e82b8c..5bd07aa6049ed 100644
--- a/x-pack/legacy/plugins/reporting/server/routes/generate_from_savedobject_immediate.ts
+++ b/x-pack/legacy/plugins/reporting/server/routes/generate_from_savedobject_immediate.ts
@@ -16,7 +16,7 @@ import {
   ResponseFacade,
   ServerFacade,
 } from '../../types';
-import { ReportingSetupDeps, ReportingCore } from '../types';
+import { ReportingConfig, ReportingCore, ReportingSetupDeps } from '../types';
 import { makeRequestFacade } from './lib/make_request_facade';
 import { getRouteOptionsCsv } from './lib/route_config_factories';
 
@@ -31,12 +31,12 @@ import { getRouteOptionsCsv } from './lib/route_config_factories';
  */
 export function registerGenerateCsvFromSavedObjectImmediate(
   reporting: ReportingCore,
+  config: ReportingConfig,
   server: ServerFacade,
   plugins: ReportingSetupDeps,
   parentLogger: Logger
 ) {
-  const routeOptions = getRouteOptionsCsv(server, plugins, parentLogger);
-  const { elasticsearch } = plugins;
+  const routeOptions = getRouteOptionsCsv(config, plugins, parentLogger);
 
   /*
    * CSV export with the `immediate` option does not queue a job with Reporting's ESQueue to run the job async. Instead, this does:
@@ -52,14 +52,10 @@ export function registerGenerateCsvFromSavedObjectImmediate(
       const logger = parentLogger.clone(['savedobject-csv']);
       const jobParams = getJobParamsFromRequest(request, { isImmediate: true });
 
-      /* TODO these functions should be made available in the export types registry:
-       *
-       *     const { createJobFn, executeJobFn } = exportTypesRegistry.getById(CSV_FROM_SAVEDOBJECT_JOB_TYPE)
-       *
-       * Calling an execute job factory requires passing a browserDriverFactory option, so we should not call the factory from here
-       */
-      const createJobFn = createJobFactory(reporting, server, elasticsearch, logger);
-      const executeJobFn = await executeJobFactory(reporting, server, elasticsearch, logger);
+      const [createJobFn, executeJobFn] = await Promise.all([
+        createJobFactory(reporting, logger),
+        executeJobFactory(reporting, logger),
+      ]);
       const jobDocPayload: JobDocPayloadPanelCsv = await createJobFn(
         jobParams,
         request.headers,
diff --git a/x-pack/legacy/plugins/reporting/server/routes/generation.test.ts b/x-pack/legacy/plugins/reporting/server/routes/generation.test.ts
index 54d9671692c5d..44a98dac2d4a9 100644
--- a/x-pack/legacy/plugins/reporting/server/routes/generation.test.ts
+++ b/x-pack/legacy/plugins/reporting/server/routes/generation.test.ts
@@ -7,7 +7,7 @@
 import Hapi from 'hapi';
 import { createMockReportingCore } from '../../test_helpers';
 import { Logger, ServerFacade } from '../../types';
-import { ReportingCore, ReportingSetupDeps } from '../../server/types';
+import { ReportingConfig, ReportingCore, ReportingSetupDeps } from '../types';
 
 jest.mock('./lib/authorized_user_pre_routing', () => ({
   authorizedUserPreRoutingFactory: () => () => ({}),
@@ -22,6 +22,8 @@ import { registerJobGenerationRoutes } from './generation';
 
 let mockServer: Hapi.Server;
 let mockReportingPlugin: ReportingCore;
+let mockReportingConfig: ReportingConfig;
+
 const mockLogger = ({
   error: jest.fn(),
   debug: jest.fn(),
@@ -33,10 +35,12 @@ beforeEach(async () => {
     port: 8080,
     routes: { log: { collect: true } },
   });
-  mockServer.config = () => ({ get: jest.fn(), has: jest.fn() });
+
   mockReportingPlugin = await createMockReportingCore();
   mockReportingPlugin.getEnqueueJob = async () =>
     jest.fn().mockImplementation(() => ({ toJSON: () => '{ "job": "data" }' }));
+
+  mockReportingConfig = { get: jest.fn(), kbnConfig: { get: jest.fn() } };
 });
 
 const mockPlugins = {
@@ -54,6 +58,7 @@ const getErrorsFromRequest = (request: Hapi.Request) => {
 test(`returns 400 if there are no job params`, async () => {
   registerJobGenerationRoutes(
     mockReportingPlugin,
+    (mockReportingConfig as unknown) as ReportingConfig,
     (mockServer as unknown) as ServerFacade,
     (mockPlugins as unknown) as ReportingSetupDeps,
     mockLogger
@@ -80,6 +85,7 @@ test(`returns 400 if there are no job params`, async () => {
 test(`returns 400 if job params is invalid`, async () => {
   registerJobGenerationRoutes(
     mockReportingPlugin,
+    (mockReportingConfig as unknown) as ReportingConfig,
     (mockServer as unknown) as ServerFacade,
     (mockPlugins as unknown) as ReportingSetupDeps,
     mockLogger
@@ -114,6 +120,7 @@ test(`returns 500 if job handler throws an error`, async () => {
 
   registerJobGenerationRoutes(
     mockReportingPlugin,
+    (mockReportingConfig as unknown) as ReportingConfig,
     (mockServer as unknown) as ServerFacade,
     (mockPlugins as unknown) as ReportingSetupDeps,
     mockLogger
diff --git a/x-pack/legacy/plugins/reporting/server/routes/generation.ts b/x-pack/legacy/plugins/reporting/server/routes/generation.ts
index 096ba84b63d1a..0ac6a34dd75bb 100644
--- a/x-pack/legacy/plugins/reporting/server/routes/generation.ts
+++ b/x-pack/legacy/plugins/reporting/server/routes/generation.ts
@@ -9,7 +9,7 @@ import { errors as elasticsearchErrors } from 'elasticsearch';
 import { Legacy } from 'kibana';
 import { API_BASE_URL } from '../../common/constants';
 import { Logger, ReportingResponseToolkit, ServerFacade } from '../../types';
-import { ReportingSetupDeps, ReportingCore } from '../types';
+import { ReportingConfig, ReportingCore, ReportingSetupDeps } from '../types';
 import { registerGenerateFromJobParams } from './generate_from_jobparams';
 import { registerGenerateCsvFromSavedObject } from './generate_from_savedobject';
 import { registerGenerateCsvFromSavedObjectImmediate } from './generate_from_savedobject_immediate';
@@ -19,12 +19,13 @@ const esErrors = elasticsearchErrors as Record<string, any>;
 
 export function registerJobGenerationRoutes(
   reporting: ReportingCore,
+  config: ReportingConfig,
   server: ServerFacade,
   plugins: ReportingSetupDeps,
   logger: Logger
 ) {
-  const config = server.config();
-  const DOWNLOAD_BASE_URL = config.get('server.basePath') + `${API_BASE_URL}/jobs/download`;
+  const DOWNLOAD_BASE_URL =
+    `${config.kbnConfig.get('server', 'basePath')}` + `${API_BASE_URL}/jobs/download`;
 
   /*
    * Generates enqueued job details to use in responses
@@ -66,11 +67,11 @@ export function registerJobGenerationRoutes(
     return err;
   }
 
-  registerGenerateFromJobParams(server, plugins, handler, handleError, logger);
+  registerGenerateFromJobParams(config, server, plugins, handler, handleError, logger);
 
   // Register beta panel-action download-related API's
-  if (config.get('xpack.reporting.csv.enablePanelActionDownload')) {
-    registerGenerateCsvFromSavedObject(server, plugins, handler, handleError, logger);
-    registerGenerateCsvFromSavedObjectImmediate(reporting, server, plugins, logger);
+  if (config.get('csv', 'enablePanelActionDownload')) {
+    registerGenerateCsvFromSavedObject(config, server, plugins, handler, handleError, logger);
+    registerGenerateCsvFromSavedObjectImmediate(reporting, config, server, plugins, logger);
   }
 }
diff --git a/x-pack/legacy/plugins/reporting/server/routes/index.ts b/x-pack/legacy/plugins/reporting/server/routes/index.ts
index 610ab4907d369..21eeb901d9b96 100644
--- a/x-pack/legacy/plugins/reporting/server/routes/index.ts
+++ b/x-pack/legacy/plugins/reporting/server/routes/index.ts
@@ -5,16 +5,17 @@
  */
 
 import { Logger, ServerFacade } from '../../types';
-import { ReportingCore, ReportingSetupDeps } from '../types';
+import { ReportingConfig, ReportingCore, ReportingSetupDeps } from '../types';
 import { registerJobGenerationRoutes } from './generation';
 import { registerJobInfoRoutes } from './jobs';
 
 export function registerRoutes(
   reporting: ReportingCore,
+  config: ReportingConfig,
   server: ServerFacade,
   plugins: ReportingSetupDeps,
   logger: Logger
 ) {
-  registerJobGenerationRoutes(reporting, server, plugins, logger);
-  registerJobInfoRoutes(reporting, server, plugins, logger);
+  registerJobGenerationRoutes(reporting, config, server, plugins, logger);
+  registerJobInfoRoutes(reporting, config, server, plugins, logger);
 }
diff --git a/x-pack/legacy/plugins/reporting/server/routes/jobs.test.js b/x-pack/legacy/plugins/reporting/server/routes/jobs.test.js
index 071b401d2321b..b12aa44487523 100644
--- a/x-pack/legacy/plugins/reporting/server/routes/jobs.test.js
+++ b/x-pack/legacy/plugins/reporting/server/routes/jobs.test.js
@@ -5,7 +5,6 @@
  */
 
 import Hapi from 'hapi';
-import { memoize } from 'lodash';
 import { createMockReportingCore } from '../../test_helpers';
 import { ExportTypesRegistry } from '../lib/export_types_registry';
 
@@ -23,6 +22,7 @@ import { registerJobInfoRoutes } from './jobs';
 let mockServer;
 let exportTypesRegistry;
 let mockReportingPlugin;
+let mockReportingConfig;
 const mockLogger = {
   error: jest.fn(),
   debug: jest.fn(),
@@ -30,7 +30,6 @@ const mockLogger = {
 
 beforeEach(async () => {
   mockServer = new Hapi.Server({ debug: false, port: 8080, routes: { log: { collect: true } } });
-  mockServer.config = memoize(() => ({ get: jest.fn() }));
   exportTypesRegistry = new ExportTypesRegistry();
   exportTypesRegistry.register({
     id: 'unencoded',
@@ -43,8 +42,11 @@ beforeEach(async () => {
     jobContentEncoding: 'base64',
     jobContentExtension: 'pdf',
   });
+
   mockReportingPlugin = await createMockReportingCore();
   mockReportingPlugin.getExportTypesRegistry = () => exportTypesRegistry;
+
+  mockReportingConfig = { get: jest.fn(), kbnConfig: { get: jest.fn() } };
 });
 
 const mockPlugins = {
@@ -70,7 +72,13 @@ test(`returns 404 if job not found`, async () => {
     callAsInternalUser: jest.fn().mockReturnValue(Promise.resolve(getHits())),
   };
 
-  registerJobInfoRoutes(mockReportingPlugin, mockServer, mockPlugins, mockLogger);
+  registerJobInfoRoutes(
+    mockReportingPlugin,
+    mockReportingConfig,
+    mockServer,
+    mockPlugins,
+    mockLogger
+  );
 
   const request = {
     method: 'GET',
@@ -89,7 +97,13 @@ test(`returns 401 if not valid job type`, async () => {
       .mockReturnValue(Promise.resolve(getHits({ jobtype: 'invalidJobType' }))),
   };
 
-  registerJobInfoRoutes(mockReportingPlugin, mockServer, mockPlugins, mockLogger);
+  registerJobInfoRoutes(
+    mockReportingPlugin,
+    mockReportingConfig,
+    mockServer,
+    mockPlugins,
+    mockLogger
+  );
 
   const request = {
     method: 'GET',
@@ -110,7 +124,13 @@ describe(`when job is incomplete`, () => {
         ),
     };
 
-    registerJobInfoRoutes(mockReportingPlugin, mockServer, mockPlugins, mockLogger);
+    registerJobInfoRoutes(
+      mockReportingPlugin,
+      mockReportingConfig,
+      mockServer,
+      mockPlugins,
+      mockLogger
+    );
 
     const request = {
       method: 'GET',
@@ -152,7 +172,13 @@ describe(`when job is failed`, () => {
       callAsInternalUser: jest.fn().mockReturnValue(Promise.resolve(hits)),
     };
 
-    registerJobInfoRoutes(mockReportingPlugin, mockServer, mockPlugins, mockLogger);
+    registerJobInfoRoutes(
+      mockReportingPlugin,
+      mockReportingConfig,
+      mockServer,
+      mockPlugins,
+      mockLogger
+    );
 
     const request = {
       method: 'GET',
@@ -197,7 +223,13 @@ describe(`when job is completed`, () => {
       callAsInternalUser: jest.fn().mockReturnValue(Promise.resolve(hits)),
     };
 
-    registerJobInfoRoutes(mockReportingPlugin, mockServer, mockPlugins, mockLogger);
+    registerJobInfoRoutes(
+      mockReportingPlugin,
+      mockReportingConfig,
+      mockServer,
+      mockPlugins,
+      mockLogger
+    );
 
     const request = {
       method: 'GET',
diff --git a/x-pack/legacy/plugins/reporting/server/routes/jobs.ts b/x-pack/legacy/plugins/reporting/server/routes/jobs.ts
index b9aa75e0ddd00..4f29e561431fa 100644
--- a/x-pack/legacy/plugins/reporting/server/routes/jobs.ts
+++ b/x-pack/legacy/plugins/reporting/server/routes/jobs.ts
@@ -17,7 +17,7 @@ import {
   ServerFacade,
 } from '../../types';
 import { jobsQueryFactory } from '../lib/jobs_query';
-import { ReportingSetupDeps, ReportingCore } from '../types';
+import { ReportingConfig, ReportingCore, ReportingSetupDeps } from '../types';
 import {
   deleteJobResponseHandlerFactory,
   downloadJobResponseHandlerFactory,
@@ -37,13 +37,14 @@ function isResponse(response: Boom<null> | ResponseObject): response is Response
 
 export function registerJobInfoRoutes(
   reporting: ReportingCore,
+  config: ReportingConfig,
   server: ServerFacade,
   plugins: ReportingSetupDeps,
   logger: Logger
 ) {
   const { elasticsearch } = plugins;
-  const jobsQuery = jobsQueryFactory(server, elasticsearch);
-  const getRouteConfig = getRouteConfigFactoryManagementPre(server, plugins, logger);
+  const jobsQuery = jobsQueryFactory(config, elasticsearch);
+  const getRouteConfig = getRouteConfigFactoryManagementPre(config, plugins, logger);
 
   // list jobs in the queue, paginated
   server.route({
@@ -141,8 +142,8 @@ export function registerJobInfoRoutes(
 
   // trigger a download of the output from a job
   const exportTypesRegistry = reporting.getExportTypesRegistry();
-  const getRouteConfigDownload = getRouteConfigFactoryDownloadPre(server, plugins, logger);
-  const downloadResponseHandler = downloadJobResponseHandlerFactory(server, elasticsearch, exportTypesRegistry); // prettier-ignore
+  const getRouteConfigDownload = getRouteConfigFactoryDownloadPre(config, plugins, logger);
+  const downloadResponseHandler = downloadJobResponseHandlerFactory(config, elasticsearch, exportTypesRegistry); // prettier-ignore
   server.route({
     path: `${MAIN_ENTRY}/download/{docId}`,
     method: 'GET',
@@ -181,8 +182,8 @@ export function registerJobInfoRoutes(
   });
 
   // allow a report to be deleted
-  const getRouteConfigDelete = getRouteConfigFactoryDeletePre(server, plugins, logger);
-  const deleteResponseHandler = deleteJobResponseHandlerFactory(server, elasticsearch);
+  const getRouteConfigDelete = getRouteConfigFactoryDeletePre(config, plugins, logger);
+  const deleteResponseHandler = deleteJobResponseHandlerFactory(config, elasticsearch);
   server.route({
     path: `${MAIN_ENTRY}/delete/{docId}`,
     method: 'DELETE',
diff --git a/x-pack/legacy/plugins/reporting/server/routes/lib/authorized_user_pre_routing.test.js b/x-pack/legacy/plugins/reporting/server/routes/lib/authorized_user_pre_routing.test.js
index 3460d22592e3d..b5d6ae59ce5dd 100644
--- a/x-pack/legacy/plugins/reporting/server/routes/lib/authorized_user_pre_routing.test.js
+++ b/x-pack/legacy/plugins/reporting/server/routes/lib/authorized_user_pre_routing.test.js
@@ -7,56 +7,48 @@
 import { authorizedUserPreRoutingFactory } from './authorized_user_pre_routing';
 
 describe('authorized_user_pre_routing', function() {
-  // the getClientShield is using `once` which forces us to use a constant mock
-  // which makes testing anything that is dependent on `oncePerServer` confusing.
-  // so createMockServer reuses the same 'instance' of the server and overwrites
-  // the properties to contain different values
-  const createMockServer = (function() {
-    const getUserStub = jest.fn();
-    let mockConfig;
-
-    const mockServer = {
-      expose() {},
-      config() {
-        return {
-          get(key) {
-            return mockConfig[key];
-          },
-        };
-      },
-      log: function() {},
-      plugins: {
-        xpack_main: {},
-        security: { getUser: getUserStub },
-      },
+  const createMockConfig = (mockConfig = {}) => {
+    return {
+      get: (...keys) => mockConfig[keys.join('.')],
+      kbnConfig: { get: (...keys) => mockConfig[keys.join('.')] },
     };
+  };
+  const createMockPlugins = (function() {
+    const getUserStub = jest.fn();
 
     return function({
       securityEnabled = true,
       xpackInfoUndefined = false,
       xpackInfoAvailable = true,
+      getCurrentUser = undefined,
       user = undefined,
-      config = {},
     }) {
-      mockConfig = config;
-
-      mockServer.plugins.xpack_main = {
-        info: !xpackInfoUndefined && {
-          isAvailable: () => xpackInfoAvailable,
-          feature(featureName) {
-            if (featureName === 'security') {
-              return {
-                isEnabled: () => securityEnabled,
-                isAvailable: () => xpackInfoAvailable,
-              };
+      getUserStub.mockReset();
+      getUserStub.mockResolvedValue(user);
+      return {
+        security: securityEnabled
+          ? {
+              authc: { getCurrentUser },
             }
+          : null,
+        __LEGACY: {
+          plugins: {
+            xpack_main: {
+              info: !xpackInfoUndefined && {
+                isAvailable: () => xpackInfoAvailable,
+                feature(featureName) {
+                  if (featureName === 'security') {
+                    return {
+                      isEnabled: () => securityEnabled,
+                      isAvailable: () => xpackInfoAvailable,
+                    };
+                  }
+                },
+              },
+            },
           },
         },
       };
-
-      getUserStub.mockReset();
-      getUserStub.mockResolvedValue(user);
-      return mockServer;
     };
   })();
 
@@ -75,10 +67,6 @@ describe('authorized_user_pre_routing', function() {
     raw: { req: mockRequestRaw },
   });
 
-  const getMockPlugins = pluginSet => {
-    return pluginSet || { security: null };
-  };
-
   const getMockLogger = () => ({
     warn: jest.fn(),
     error: msg => {
@@ -87,11 +75,9 @@ describe('authorized_user_pre_routing', function() {
   });
 
   it('should return with boom notFound when xpackInfo is undefined', async function() {
-    const mockServer = createMockServer({ xpackInfoUndefined: true });
-
     const authorizedUserPreRouting = authorizedUserPreRoutingFactory(
-      mockServer,
-      getMockPlugins(),
+      createMockConfig(),
+      createMockPlugins({ xpackInfoUndefined: true }),
       getMockLogger()
     );
     const response = await authorizedUserPreRouting(getMockRequest());
@@ -100,11 +86,9 @@ describe('authorized_user_pre_routing', function() {
   });
 
   it(`should return with boom notFound when xpackInfo isn't available`, async function() {
-    const mockServer = createMockServer({ xpackInfoAvailable: false });
-
     const authorizedUserPreRouting = authorizedUserPreRoutingFactory(
-      mockServer,
-      getMockPlugins(),
+      createMockConfig(),
+      createMockPlugins({ xpackInfoAvailable: false }),
       getMockLogger()
     );
     const response = await authorizedUserPreRouting(getMockRequest());
@@ -113,11 +97,9 @@ describe('authorized_user_pre_routing', function() {
   });
 
   it('should return with null user when security is disabled in Elasticsearch', async function() {
-    const mockServer = createMockServer({ securityEnabled: false });
-
     const authorizedUserPreRouting = authorizedUserPreRoutingFactory(
-      mockServer,
-      getMockPlugins(),
+      createMockConfig(),
+      createMockPlugins({ securityEnabled: false }),
       getMockLogger()
     );
     const response = await authorizedUserPreRouting(getMockRequest());
@@ -125,16 +107,14 @@ describe('authorized_user_pre_routing', function() {
   });
 
   it('should return with boom unauthenticated when security is enabled but no authenticated user', async function() {
-    const mockServer = createMockServer({
+    const mockPlugins = createMockPlugins({
       user: null,
       config: { 'xpack.reporting.roles.allow': ['.reporting_user'] },
     });
-    const mockPlugins = getMockPlugins({
-      security: { authc: { getCurrentUser: () => null } },
-    });
+    mockPlugins.security = { authc: { getCurrentUser: () => null } };
 
     const authorizedUserPreRouting = authorizedUserPreRoutingFactory(
-      mockServer,
+      createMockConfig(),
       mockPlugins,
       getMockLogger()
     );
@@ -144,16 +124,14 @@ describe('authorized_user_pre_routing', function() {
   });
 
   it(`should return with boom forbidden when security is enabled but user doesn't have allowed role`, async function() {
-    const mockServer = createMockServer({
+    const mockConfig = createMockConfig({ 'roles.allow': ['.reporting_user'] });
+    const mockPlugins = createMockPlugins({
       user: { roles: [] },
-      config: { 'xpack.reporting.roles.allow': ['.reporting_user'] },
-    });
-    const mockPlugins = getMockPlugins({
-      security: { authc: { getCurrentUser: () => ({ roles: ['something_else'] }) } },
+      getCurrentUser: () => ({ roles: ['something_else'] }),
     });
 
     const authorizedUserPreRouting = authorizedUserPreRoutingFactory(
-      mockServer,
+      mockConfig,
       mockPlugins,
       getMockLogger()
     );
@@ -164,18 +142,14 @@ describe('authorized_user_pre_routing', function() {
 
   it('should return with user when security is enabled and user has explicitly allowed role', async function() {
     const user = { roles: ['.reporting_user', 'something_else'] };
-    const mockServer = createMockServer({
+    const mockConfig = createMockConfig({ 'roles.allow': ['.reporting_user'] });
+    const mockPlugins = createMockPlugins({
       user,
-      config: { 'xpack.reporting.roles.allow': ['.reporting_user'] },
-    });
-    const mockPlugins = getMockPlugins({
-      security: {
-        authc: { getCurrentUser: () => ({ roles: ['.reporting_user', 'something_else'] }) },
-      },
+      getCurrentUser: () => ({ roles: ['.reporting_user', 'something_else'] }),
     });
 
     const authorizedUserPreRouting = authorizedUserPreRoutingFactory(
-      mockServer,
+      mockConfig,
       mockPlugins,
       getMockLogger()
     );
@@ -185,16 +159,13 @@ describe('authorized_user_pre_routing', function() {
 
   it('should return with user when security is enabled and user has superuser role', async function() {
     const user = { roles: ['superuser', 'something_else'] };
-    const mockServer = createMockServer({
-      user,
-      config: { 'xpack.reporting.roles.allow': [] },
-    });
-    const mockPlugins = getMockPlugins({
-      security: { authc: { getCurrentUser: () => ({ roles: ['superuser', 'something_else'] }) } },
+    const mockConfig = createMockConfig({ 'roles.allow': [] });
+    const mockPlugins = createMockPlugins({
+      getCurrentUser: () => ({ roles: ['superuser', 'something_else'] }),
     });
 
     const authorizedUserPreRouting = authorizedUserPreRoutingFactory(
-      mockServer,
+      mockConfig,
       mockPlugins,
       getMockLogger()
     );
diff --git a/x-pack/legacy/plugins/reporting/server/routes/lib/authorized_user_pre_routing.ts b/x-pack/legacy/plugins/reporting/server/routes/lib/authorized_user_pre_routing.ts
index c5f8c78016f61..1ca28ca62a7f2 100644
--- a/x-pack/legacy/plugins/reporting/server/routes/lib/authorized_user_pre_routing.ts
+++ b/x-pack/legacy/plugins/reporting/server/routes/lib/authorized_user_pre_routing.ts
@@ -7,7 +7,8 @@
 import Boom from 'boom';
 import { Legacy } from 'kibana';
 import { AuthenticatedUser } from '../../../../../../plugins/security/server';
-import { Logger, ServerFacade } from '../../../types';
+import { ReportingConfig } from '../../../server';
+import { Logger } from '../../../types';
 import { getUserFactory } from '../../lib/get_user';
 import { ReportingSetupDeps } from '../../types';
 
@@ -18,16 +19,14 @@ export type PreRoutingFunction = (
 ) => Promise<Boom<null> | AuthenticatedUser | null>;
 
 export const authorizedUserPreRoutingFactory = function authorizedUserPreRoutingFn(
-  server: ServerFacade,
+  config: ReportingConfig,
   plugins: ReportingSetupDeps,
   logger: Logger
 ) {
-  const getUser = getUserFactory(server, plugins.security);
-  const config = server.config();
+  const getUser = getUserFactory(plugins.security, logger);
+  const { info: xpackInfo } = plugins.__LEGACY.plugins.xpack_main;
 
   return async function authorizedUserPreRouting(request: Legacy.Request) {
-    const xpackInfo = server.plugins.xpack_main.info;
-
     if (!xpackInfo || !xpackInfo.isAvailable()) {
       logger.warn('Unable to authorize user before xpack info is available.', [
         'authorizedUserPreRouting',
@@ -46,10 +45,7 @@ export const authorizedUserPreRoutingFactory = function authorizedUserPreRouting
       return Boom.unauthorized(`Sorry, you aren't authenticated`);
     }
 
-    const authorizedRoles = [
-      superuserRole,
-      ...(config.get('xpack.reporting.roles.allow') as string[]),
-    ];
+    const authorizedRoles = [superuserRole, ...(config.get('roles', 'allow') as string[])];
     if (!user.roles.find(role => authorizedRoles.includes(role))) {
       return Boom.forbidden(`Sorry, you don't have access to Reporting`);
     }
diff --git a/x-pack/legacy/plugins/reporting/server/routes/lib/get_document_payload.ts b/x-pack/legacy/plugins/reporting/server/routes/lib/get_document_payload.ts
index fb3944ea33552..aef37754681ec 100644
--- a/x-pack/legacy/plugins/reporting/server/routes/lib/get_document_payload.ts
+++ b/x-pack/legacy/plugins/reporting/server/routes/lib/get_document_payload.ts
@@ -8,13 +8,7 @@
 import contentDisposition from 'content-disposition';
 import * as _ from 'lodash';
 import { CSV_JOB_TYPE } from '../../../common/constants';
-import {
-  ExportTypeDefinition,
-  ExportTypesRegistry,
-  JobDocOutput,
-  JobSource,
-  ServerFacade,
-} from '../../../types';
+import { ExportTypeDefinition, ExportTypesRegistry, JobDocOutput, JobSource } from '../../../types';
 
 interface ICustomHeaders {
   [x: string]: any;
@@ -22,9 +16,15 @@ interface ICustomHeaders {
 
 type ExportTypeType = ExportTypeDefinition<unknown, unknown, unknown, unknown>;
 
+interface ErrorFromPayload {
+  message: string;
+  reason: string | null;
+}
+
+// A camelCase version of JobDocOutput
 interface Payload {
   statusCode: number;
-  content: any;
+  content: string | Buffer | ErrorFromPayload;
   contentType: string;
   headers: Record<string, any>;
 }
@@ -48,20 +48,17 @@ const getReportingHeaders = (output: JobDocOutput, exportType: ExportTypeType) =
   return metaDataHeaders;
 };
 
-export function getDocumentPayloadFactory(
-  server: ServerFacade,
-  exportTypesRegistry: ExportTypesRegistry
-) {
-  function encodeContent(content: string | null, exportType: ExportTypeType) {
+export function getDocumentPayloadFactory(exportTypesRegistry: ExportTypesRegistry) {
+  function encodeContent(content: string | null, exportType: ExportTypeType): Buffer | string {
     switch (exportType.jobContentEncoding) {
       case 'base64':
-        return content ? Buffer.from(content, 'base64') : content; // Buffer.from rejects null
+        return content ? Buffer.from(content, 'base64') : ''; // convert null to empty string
       default:
-        return content;
+        return content ? content : ''; // convert null to empty string
     }
   }
 
-  function getCompleted(output: JobDocOutput, jobType: string, title: string) {
+  function getCompleted(output: JobDocOutput, jobType: string, title: string): Payload {
     const exportType = exportTypesRegistry.get((item: ExportTypeType) => item.jobType === jobType);
     const filename = getTitle(exportType, title);
     const headers = getReportingHeaders(output, exportType);
@@ -77,7 +74,7 @@ export function getDocumentPayloadFactory(
     };
   }
 
-  function getFailure(output: JobDocOutput) {
+  function getFailure(output: JobDocOutput): Payload {
     return {
       statusCode: 500,
       content: {
diff --git a/x-pack/legacy/plugins/reporting/server/routes/lib/job_response_handler.ts b/x-pack/legacy/plugins/reporting/server/routes/lib/job_response_handler.ts
index 30627d5b23230..e7e7c866db96a 100644
--- a/x-pack/legacy/plugins/reporting/server/routes/lib/job_response_handler.ts
+++ b/x-pack/legacy/plugins/reporting/server/routes/lib/job_response_handler.ts
@@ -5,11 +5,12 @@
  */
 
 import Boom from 'boom';
-import { ElasticsearchServiceSetup } from 'kibana/server';
 import { ResponseToolkit } from 'hapi';
+import { ElasticsearchServiceSetup } from 'kibana/server';
 import { WHITELISTED_JOB_CONTENT_TYPES } from '../../../common/constants';
-import { ExportTypesRegistry, ServerFacade } from '../../../types';
+import { ExportTypesRegistry } from '../../../types';
 import { jobsQueryFactory } from '../../lib/jobs_query';
+import { ReportingConfig } from '../../types';
 import { getDocumentPayloadFactory } from './get_document_payload';
 
 interface JobResponseHandlerParams {
@@ -21,12 +22,12 @@ interface JobResponseHandlerOpts {
 }
 
 export function downloadJobResponseHandlerFactory(
-  server: ServerFacade,
+  config: ReportingConfig,
   elasticsearch: ElasticsearchServiceSetup,
   exportTypesRegistry: ExportTypesRegistry
 ) {
-  const jobsQuery = jobsQueryFactory(server, elasticsearch);
-  const getDocumentPayload = getDocumentPayloadFactory(server, exportTypesRegistry);
+  const jobsQuery = jobsQueryFactory(config, elasticsearch);
+  const getDocumentPayload = getDocumentPayloadFactory(exportTypesRegistry);
 
   return function jobResponseHandler(
     validJobTypes: string[],
@@ -70,10 +71,10 @@ export function downloadJobResponseHandlerFactory(
 }
 
 export function deleteJobResponseHandlerFactory(
-  server: ServerFacade,
+  config: ReportingConfig,
   elasticsearch: ElasticsearchServiceSetup
 ) {
-  const jobsQuery = jobsQueryFactory(server, elasticsearch);
+  const jobsQuery = jobsQueryFactory(config, elasticsearch);
 
   return async function deleteJobResponseHander(
     validJobTypes: string[],
diff --git a/x-pack/legacy/plugins/reporting/server/routes/lib/reporting_feature_pre_routing.ts b/x-pack/legacy/plugins/reporting/server/routes/lib/reporting_feature_pre_routing.ts
index 9e618ff1fe40a..8a79566aafae2 100644
--- a/x-pack/legacy/plugins/reporting/server/routes/lib/reporting_feature_pre_routing.ts
+++ b/x-pack/legacy/plugins/reporting/server/routes/lib/reporting_feature_pre_routing.ts
@@ -6,17 +6,17 @@
 
 import Boom from 'boom';
 import { Legacy } from 'kibana';
-import { Logger, ServerFacade } from '../../../types';
-import { ReportingSetupDeps } from '../../types';
+import { Logger } from '../../../types';
+import { ReportingConfig, ReportingSetupDeps } from '../../types';
 
 export type GetReportingFeatureIdFn = (request: Legacy.Request) => string;
 
 export const reportingFeaturePreRoutingFactory = function reportingFeaturePreRoutingFn(
-  server: ServerFacade,
+  config: ReportingConfig,
   plugins: ReportingSetupDeps,
   logger: Logger
 ) {
-  const xpackMainPlugin = server.plugins.xpack_main;
+  const xpackMainPlugin = plugins.__LEGACY.plugins.xpack_main;
   const pluginId = 'reporting';
 
   // License checking and enable/disable logic
diff --git a/x-pack/legacy/plugins/reporting/server/routes/lib/route_config_factories.ts b/x-pack/legacy/plugins/reporting/server/routes/lib/route_config_factories.ts
index 3d275d34e2f7d..06f7efaa9dcbb 100644
--- a/x-pack/legacy/plugins/reporting/server/routes/lib/route_config_factories.ts
+++ b/x-pack/legacy/plugins/reporting/server/routes/lib/route_config_factories.ts
@@ -6,8 +6,8 @@
 
 import Joi from 'joi';
 import { CSV_FROM_SAVEDOBJECT_JOB_TYPE } from '../../../common/constants';
-import { Logger, ServerFacade } from '../../../types';
-import { ReportingSetupDeps } from '../../types';
+import { Logger } from '../../../types';
+import { ReportingConfig, ReportingSetupDeps } from '../../types';
 import { authorizedUserPreRoutingFactory } from './authorized_user_pre_routing';
 import {
   GetReportingFeatureIdFn,
@@ -29,12 +29,12 @@ export type GetRouteConfigFactoryFn = (
 ) => RouteConfigFactory;
 
 export function getRouteConfigFactoryReportingPre(
-  server: ServerFacade,
+  config: ReportingConfig,
   plugins: ReportingSetupDeps,
   logger: Logger
 ): GetRouteConfigFactoryFn {
-  const authorizedUserPreRouting = authorizedUserPreRoutingFactory(server, plugins, logger);
-  const reportingFeaturePreRouting = reportingFeaturePreRoutingFactory(server, plugins, logger);
+  const authorizedUserPreRouting = authorizedUserPreRoutingFactory(config, plugins, logger);
+  const reportingFeaturePreRouting = reportingFeaturePreRoutingFactory(config, plugins, logger);
 
   return (getFeatureId?: GetReportingFeatureIdFn): RouteConfigFactory => {
     const preRouting: any[] = [{ method: authorizedUserPreRouting, assign: 'user' }];
@@ -50,11 +50,11 @@ export function getRouteConfigFactoryReportingPre(
 }
 
 export function getRouteOptionsCsv(
-  server: ServerFacade,
+  config: ReportingConfig,
   plugins: ReportingSetupDeps,
   logger: Logger
 ) {
-  const getRouteConfig = getRouteConfigFactoryReportingPre(server, plugins, logger);
+  const getRouteConfig = getRouteConfigFactoryReportingPre(config, plugins, logger);
   return {
     ...getRouteConfig(() => CSV_FROM_SAVEDOBJECT_JOB_TYPE),
     validate: {
@@ -75,12 +75,12 @@ export function getRouteOptionsCsv(
 }
 
 export function getRouteConfigFactoryManagementPre(
-  server: ServerFacade,
+  config: ReportingConfig,
   plugins: ReportingSetupDeps,
   logger: Logger
 ): GetRouteConfigFactoryFn {
-  const authorizedUserPreRouting = authorizedUserPreRoutingFactory(server, plugins, logger);
-  const reportingFeaturePreRouting = reportingFeaturePreRoutingFactory(server, plugins, logger);
+  const authorizedUserPreRouting = authorizedUserPreRoutingFactory(config, plugins, logger);
+  const reportingFeaturePreRouting = reportingFeaturePreRoutingFactory(config, plugins, logger);
   const managementPreRouting = reportingFeaturePreRouting(() => 'management');
 
   return (): RouteConfigFactory => {
@@ -99,11 +99,11 @@ export function getRouteConfigFactoryManagementPre(
 // Additionally, the range-request doesn't alleviate any performance issues on the server as the entire
 // download is loaded into memory.
 export function getRouteConfigFactoryDownloadPre(
-  server: ServerFacade,
+  config: ReportingConfig,
   plugins: ReportingSetupDeps,
   logger: Logger
 ): GetRouteConfigFactoryFn {
-  const getManagementRouteConfig = getRouteConfigFactoryManagementPre(server, plugins, logger);
+  const getManagementRouteConfig = getRouteConfigFactoryManagementPre(config, plugins, logger);
   return (): RouteConfigFactory => ({
     ...getManagementRouteConfig(),
     tags: [API_TAG, 'download'],
@@ -114,11 +114,11 @@ export function getRouteConfigFactoryDownloadPre(
 }
 
 export function getRouteConfigFactoryDeletePre(
-  server: ServerFacade,
+  config: ReportingConfig,
   plugins: ReportingSetupDeps,
   logger: Logger
 ): GetRouteConfigFactoryFn {
-  const getManagementRouteConfig = getRouteConfigFactoryManagementPre(server, plugins, logger);
+  const getManagementRouteConfig = getRouteConfigFactoryManagementPre(config, plugins, logger);
   return (): RouteConfigFactory => ({
     ...getManagementRouteConfig(),
     tags: [API_TAG, 'delete'],
diff --git a/x-pack/legacy/plugins/reporting/server/types.d.ts b/x-pack/legacy/plugins/reporting/server/types.d.ts
index 59b7bc2020ad9..c773e2d556648 100644
--- a/x-pack/legacy/plugins/reporting/server/types.d.ts
+++ b/x-pack/legacy/plugins/reporting/server/types.d.ts
@@ -11,16 +11,17 @@ import { PluginStart as DataPluginStart } from '../../../../../src/plugins/data/
 import { SecurityPluginSetup } from '../../../../plugins/security/server';
 import { XPackMainPlugin } from '../../xpack_main/server/xpack_main';
 import { ReportingPluginSpecOptions } from '../types';
+import { ReportingConfig, ReportingConfigType } from './core';
 
 export interface ReportingSetupDeps {
   elasticsearch: ElasticsearchServiceSetup;
   security: SecurityPluginSetup;
   usageCollection: UsageCollectionSetup;
+  reporting: { config: ReportingConfig };
   __LEGACY: LegacySetup;
 }
 
 export interface ReportingStartDeps {
-  elasticsearch: ElasticsearchServiceSetup;
   data: DataPluginStart;
   __LEGACY: LegacySetup;
 }
@@ -30,10 +31,7 @@ export type ReportingSetup = object;
 export type ReportingStart = object;
 
 export interface LegacySetup {
-  config: Legacy.Server['config'];
-  info: Legacy.Server['info'];
   plugins: {
-    elasticsearch: Legacy.Server['plugins']['elasticsearch'];
     xpack_main: XPackMainPlugin & {
       status?: any;
     };
@@ -42,4 +40,7 @@ export interface LegacySetup {
   route: Legacy.Server['route'];
 }
 
-export { ReportingCore } from './core';
+export { ReportingConfig, ReportingCore } from './core';
+
+export type CaptureConfig = ReportingConfigType['capture'];
+export type ScrollConfig = ReportingConfigType['csv']['scroll'];
diff --git a/x-pack/legacy/plugins/reporting/server/usage/get_reporting_usage.ts b/x-pack/legacy/plugins/reporting/server/usage/get_reporting_usage.ts
index bd2d0cb835a79..5f12f2b7f044d 100644
--- a/x-pack/legacy/plugins/reporting/server/usage/get_reporting_usage.ts
+++ b/x-pack/legacy/plugins/reporting/server/usage/get_reporting_usage.ts
@@ -5,7 +5,10 @@
  */
 
 import { get } from 'lodash';
-import { ServerFacade, ExportTypesRegistry, ESCallCluster } from '../../types';
+import { ESCallCluster, ExportTypesRegistry } from '../../types';
+import { ReportingConfig, ReportingSetupDeps } from '../types';
+import { decorateRangeStats } from './decorate_range_stats';
+import { getExportTypesHandler } from './get_export_type_handler';
 import {
   AggregationBuckets,
   AggregationResults,
@@ -15,8 +18,6 @@ import {
   RangeAggregationResults,
   RangeStats,
 } from './types';
-import { decorateRangeStats } from './decorate_range_stats';
-import { getExportTypesHandler } from './get_export_type_handler';
 
 const JOB_TYPES_KEY = 'jobTypes';
 const JOB_TYPES_FIELD = 'jobtype';
@@ -79,10 +80,7 @@ type RangeStatSets = Partial<
     last7Days: RangeStats;
   }
 >;
-async function handleResponse(
-  server: ServerFacade,
-  response: AggregationResults
-): Promise<RangeStatSets> {
+async function handleResponse(response: AggregationResults): Promise<RangeStatSets> {
   const buckets = get(response, 'aggregations.ranges.buckets');
   if (!buckets) {
     return {};
@@ -101,12 +99,12 @@ async function handleResponse(
 }
 
 export async function getReportingUsage(
-  server: ServerFacade,
+  config: ReportingConfig,
+  plugins: ReportingSetupDeps,
   callCluster: ESCallCluster,
   exportTypesRegistry: ExportTypesRegistry
 ) {
-  const config = server.config();
-  const reportingIndex = config.get('xpack.reporting.index');
+  const reportingIndex = config.get('index');
 
   const params = {
     index: `${reportingIndex}-*`,
@@ -139,16 +137,18 @@ export async function getReportingUsage(
     },
   };
 
+  const { info: xpackMainInfo } = plugins.__LEGACY.plugins.xpack_main;
   return callCluster('search', params)
-    .then((response: AggregationResults) => handleResponse(server, response))
+    .then((response: AggregationResults) => handleResponse(response))
     .then((usage: RangeStatSets) => {
       // Allow this to explicitly throw an exception if/when this config is deprecated,
       // because we shouldn't collect browserType in that case!
-      const browserType = config.get('xpack.reporting.capture.browser.type');
+      const browserType = config.get('capture', 'browser', 'type');
 
-      const xpackInfo = server.plugins.xpack_main.info;
       const exportTypesHandler = getExportTypesHandler(exportTypesRegistry);
-      const availability = exportTypesHandler.getAvailability(xpackInfo) as FeatureAvailabilityMap;
+      const availability = exportTypesHandler.getAvailability(
+        xpackMainInfo
+      ) as FeatureAvailabilityMap;
 
       const { lastDay, last7Days, ...all } = usage;
 
diff --git a/x-pack/legacy/plugins/reporting/server/usage/reporting_usage_collector.test.js b/x-pack/legacy/plugins/reporting/server/usage/reporting_usage_collector.test.js
index a6d753f9b107a..905d2fe9b995c 100644
--- a/x-pack/legacy/plugins/reporting/server/usage/reporting_usage_collector.test.js
+++ b/x-pack/legacy/plugins/reporting/server/usage/reporting_usage_collector.test.js
@@ -24,62 +24,52 @@ function getMockUsageCollection() {
     makeUsageCollector: options => {
       return new MockUsageCollector(this, options);
     },
+    registerCollector: sinon.stub(),
   };
 }
 
-function getServerMock(customization) {
-  const getLicenseCheckResults = sinon.stub().returns({});
-  const defaultServerMock = {
-    plugins: {
-      security: {
-        isAuthenticated: sinon.stub().returns(true),
-      },
-      xpack_main: {
-        info: {
-          isAvailable: sinon.stub().returns(true),
-          feature: () => ({
-            getLicenseCheckResults,
-          }),
-          license: {
-            isOneOf: sinon.stub().returns(false),
-            getType: sinon.stub().returns('platinum'),
-          },
-          toJSON: () => ({ b: 1 }),
-        },
+function getPluginsMock(
+  { license, usageCollection = getMockUsageCollection() } = { license: 'platinum' }
+) {
+  const mockXpackMain = {
+    info: {
+      isAvailable: sinon.stub().returns(true),
+      feature: () => ({
+        getLicenseCheckResults: sinon.stub(),
+      }),
+      license: {
+        isOneOf: sinon.stub().returns(false),
+        getType: sinon.stub().returns(license),
       },
+      toJSON: () => ({ b: 1 }),
     },
-    log: () => {},
-    config: () => ({
-      get: key => {
-        if (key === 'xpack.reporting.enabled') {
-          return true;
-        } else if (key === 'xpack.reporting.index') {
-          return '.reporting-index';
-        }
+  };
+  return {
+    usageCollection,
+    __LEGACY: {
+      plugins: {
+        xpack_main: mockXpackMain,
       },
-    }),
+    },
   };
-  return Object.assign(defaultServerMock, customization);
 }
 
 const getResponseMock = (customization = {}) => customization;
 
 describe('license checks', () => {
+  let mockConfig;
+  beforeAll(async () => {
+    const mockReporting = await createMockReportingCore();
+    mockConfig = await mockReporting.getConfig();
+  });
+
   describe('with a basic license', () => {
     let usageStats;
     beforeAll(async () => {
-      const serverWithBasicLicenseMock = getServerMock();
-      serverWithBasicLicenseMock.plugins.xpack_main.info.license.getType = sinon
-        .stub()
-        .returns('basic');
+      const plugins = getPluginsMock({ license: 'basic' });
       const callClusterMock = jest.fn(() => Promise.resolve(getResponseMock()));
-      const usageCollection = getMockUsageCollection();
-      const { fetch: getReportingUsage } = getReportingUsageCollector(
-        serverWithBasicLicenseMock,
-        usageCollection,
-        exportTypesRegistry
-      );
-      usageStats = await getReportingUsage(callClusterMock, exportTypesRegistry);
+      const { fetch } = getReportingUsageCollector(mockConfig, plugins, exportTypesRegistry);
+      usageStats = await fetch(callClusterMock, exportTypesRegistry);
     });
 
     test('sets enables to true', async () => {
@@ -98,18 +88,10 @@ describe('license checks', () => {
   describe('with no license', () => {
     let usageStats;
     beforeAll(async () => {
-      const serverWithNoLicenseMock = getServerMock();
-      serverWithNoLicenseMock.plugins.xpack_main.info.license.getType = sinon
-        .stub()
-        .returns('none');
+      const plugins = getPluginsMock({ license: 'none' });
       const callClusterMock = jest.fn(() => Promise.resolve(getResponseMock()));
-      const usageCollection = getMockUsageCollection();
-      const { fetch: getReportingUsage } = getReportingUsageCollector(
-        serverWithNoLicenseMock,
-        usageCollection,
-        exportTypesRegistry
-      );
-      usageStats = await getReportingUsage(callClusterMock, exportTypesRegistry);
+      const { fetch } = getReportingUsageCollector(mockConfig, plugins, exportTypesRegistry);
+      usageStats = await fetch(callClusterMock, exportTypesRegistry);
     });
 
     test('sets enables to true', async () => {
@@ -128,18 +110,10 @@ describe('license checks', () => {
   describe('with platinum license', () => {
     let usageStats;
     beforeAll(async () => {
-      const serverWithPlatinumLicenseMock = getServerMock();
-      serverWithPlatinumLicenseMock.plugins.xpack_main.info.license.getType = sinon
-        .stub()
-        .returns('platinum');
+      const plugins = getPluginsMock({ license: 'platinum' });
       const callClusterMock = jest.fn(() => Promise.resolve(getResponseMock()));
-      const usageCollection = getMockUsageCollection();
-      const { fetch: getReportingUsage } = getReportingUsageCollector(
-        serverWithPlatinumLicenseMock,
-        usageCollection,
-        exportTypesRegistry
-      );
-      usageStats = await getReportingUsage(callClusterMock, exportTypesRegistry);
+      const { fetch } = getReportingUsageCollector(mockConfig, plugins, exportTypesRegistry);
+      usageStats = await fetch(callClusterMock, exportTypesRegistry);
     });
 
     test('sets enables to true', async () => {
@@ -158,18 +132,10 @@ describe('license checks', () => {
   describe('with no usage data', () => {
     let usageStats;
     beforeAll(async () => {
-      const serverWithBasicLicenseMock = getServerMock();
-      serverWithBasicLicenseMock.plugins.xpack_main.info.license.getType = sinon
-        .stub()
-        .returns('basic');
+      const plugins = getPluginsMock({ license: 'basic' });
       const callClusterMock = jest.fn(() => Promise.resolve({}));
-      const usageCollection = getMockUsageCollection();
-      const { fetch: getReportingUsage } = getReportingUsageCollector(
-        serverWithBasicLicenseMock,
-        usageCollection,
-        exportTypesRegistry
-      );
-      usageStats = await getReportingUsage(callClusterMock, exportTypesRegistry);
+      const { fetch } = getReportingUsageCollector(mockConfig, plugins, exportTypesRegistry);
+      usageStats = await fetch(callClusterMock, exportTypesRegistry);
     });
 
     test('sets enables to true', async () => {
@@ -183,21 +149,11 @@ describe('license checks', () => {
 });
 
 describe('data modeling', () => {
-  let getReportingUsage;
-  beforeAll(async () => {
-    const usageCollection = getMockUsageCollection();
-    const serverWithPlatinumLicenseMock = getServerMock();
-    serverWithPlatinumLicenseMock.plugins.xpack_main.info.license.getType = sinon
-      .stub()
-      .returns('platinum');
-    ({ fetch: getReportingUsage } = getReportingUsageCollector(
-      serverWithPlatinumLicenseMock,
-      usageCollection,
-      exportTypesRegistry
-    ));
-  });
-
   test('with normal looking usage data', async () => {
+    const mockReporting = await createMockReportingCore();
+    const mockConfig = await mockReporting.getConfig();
+    const plugins = getPluginsMock();
+    const { fetch } = getReportingUsageCollector(mockConfig, plugins, exportTypesRegistry);
     const callClusterMock = jest.fn(() =>
       Promise.resolve(
         getResponseMock({
@@ -320,7 +276,7 @@ describe('data modeling', () => {
       )
     );
 
-    const usageStats = await getReportingUsage(callClusterMock);
+    const usageStats = await fetch(callClusterMock);
     expect(usageStats).toMatchInlineSnapshot(`
       Object {
         "PNG": Object {
@@ -415,20 +371,16 @@ describe('data modeling', () => {
 });
 
 describe('Ready for collection observable', () => {
-  let mockReporting;
-
-  beforeEach(async () => {
-    mockReporting = await createMockReportingCore();
-  });
-
   test('converts observable to promise', async () => {
-    const serverWithBasicLicenseMock = getServerMock();
+    const mockReporting = await createMockReportingCore();
+    const mockConfig = await mockReporting.getConfig();
+
+    const usageCollection = getMockUsageCollection();
     const makeCollectorSpy = sinon.spy();
-    const usageCollection = {
-      makeUsageCollector: makeCollectorSpy,
-      registerCollector: sinon.stub(),
-    };
-    registerReportingUsageCollector(mockReporting, serverWithBasicLicenseMock, usageCollection);
+    usageCollection.makeUsageCollector = makeCollectorSpy;
+
+    const plugins = getPluginsMock({ usageCollection });
+    registerReportingUsageCollector(mockReporting, mockConfig, plugins);
 
     const [args] = makeCollectorSpy.firstCall.args;
     expect(args).toMatchInlineSnapshot(`
diff --git a/x-pack/legacy/plugins/reporting/server/usage/reporting_usage_collector.ts b/x-pack/legacy/plugins/reporting/server/usage/reporting_usage_collector.ts
index 14202530fb6c7..ab4ec3a0edf57 100644
--- a/x-pack/legacy/plugins/reporting/server/usage/reporting_usage_collector.ts
+++ b/x-pack/legacy/plugins/reporting/server/usage/reporting_usage_collector.ts
@@ -4,10 +4,9 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
 import { KIBANA_REPORTING_TYPE } from '../../common/constants';
-import { ReportingCore } from '../../server';
-import { ESCallCluster, ExportTypesRegistry, ServerFacade } from '../../types';
+import { ReportingConfig, ReportingCore, ReportingSetupDeps } from '../../server/types';
+import { ESCallCluster, ExportTypesRegistry } from '../../types';
 import { getReportingUsage } from './get_reporting_usage';
 import { RangeStats } from './types';
 
@@ -15,19 +14,19 @@ import { RangeStats } from './types';
 const METATYPE = 'kibana_stats';
 
 /*
- * @param {Object} server
  * @return {Object} kibana usage stats type collection object
  */
 export function getReportingUsageCollector(
-  server: ServerFacade,
-  usageCollection: UsageCollectionSetup,
+  config: ReportingConfig,
+  plugins: ReportingSetupDeps,
   exportTypesRegistry: ExportTypesRegistry,
   isReady: () => Promise<boolean>
 ) {
+  const { usageCollection } = plugins;
   return usageCollection.makeUsageCollector({
     type: KIBANA_REPORTING_TYPE,
     fetch: (callCluster: ESCallCluster) =>
-      getReportingUsage(server, callCluster, exportTypesRegistry),
+      getReportingUsage(config, plugins, callCluster, exportTypesRegistry),
     isReady,
 
     /*
@@ -52,17 +51,17 @@ export function getReportingUsageCollector(
 
 export function registerReportingUsageCollector(
   reporting: ReportingCore,
-  server: ServerFacade,
-  usageCollection: UsageCollectionSetup
+  config: ReportingConfig,
+  plugins: ReportingSetupDeps
 ) {
   const exportTypesRegistry = reporting.getExportTypesRegistry();
   const collectionIsReady = reporting.pluginHasStarted.bind(reporting);
 
   const collector = getReportingUsageCollector(
-    server,
-    usageCollection,
+    config,
+    plugins,
     exportTypesRegistry,
     collectionIsReady
   );
-  usageCollection.registerCollector(collector);
+  plugins.usageCollection.registerCollector(collector);
 }
diff --git a/x-pack/legacy/plugins/reporting/test_helpers/create_mock_browserdriverfactory.ts b/x-pack/legacy/plugins/reporting/test_helpers/create_mock_browserdriverfactory.ts
index 883276d43e27e..930aa7601b8cb 100644
--- a/x-pack/legacy/plugins/reporting/test_helpers/create_mock_browserdriverfactory.ts
+++ b/x-pack/legacy/plugins/reporting/test_helpers/create_mock_browserdriverfactory.ts
@@ -10,7 +10,8 @@ import * as contexts from '../export_types/common/lib/screenshots/constants';
 import { ElementsPositionAndAttribute } from '../export_types/common/lib/screenshots/types';
 import { HeadlessChromiumDriver, HeadlessChromiumDriverFactory } from '../server/browsers';
 import { createDriverFactory } from '../server/browsers/chromium';
-import { BrowserConfig, CaptureConfig, Logger } from '../types';
+import { CaptureConfig } from '../server/types';
+import { Logger } from '../types';
 
 interface CreateMockBrowserDriverFactoryOpts {
   evaluate: jest.Mock<Promise<any>, any[]>;
@@ -93,24 +94,34 @@ export const createMockBrowserDriverFactory = async (
   logger: Logger,
   opts: Partial<CreateMockBrowserDriverFactoryOpts>
 ): Promise<HeadlessChromiumDriverFactory> => {
-  const browserConfig = {
-    inspect: true,
-    userDataDir: '/usr/data/dir',
-    viewport: { width: 12, height: 12 },
-    disableSandbox: false,
-    proxy: { enabled: false },
-  } as BrowserConfig;
+  const captureConfig = {
+    timeouts: { openUrl: 30000, waitForElements: 30000, renderComplete: 30000 },
+    browser: {
+      type: 'chromium',
+      chromium: {
+        inspect: false,
+        disableSandbox: false,
+        userDataDir: '/usr/data/dir',
+        viewport: { width: 12, height: 12 },
+        proxy: { enabled: false, server: undefined, bypass: undefined },
+      },
+      autoDownload: false,
+      inspect: true,
+      userDataDir: '/usr/data/dir',
+      viewport: { width: 12, height: 12 },
+      disableSandbox: false,
+      proxy: { enabled: false, server: undefined, bypass: undefined },
+      maxScreenshotDimension: undefined,
+    },
+    networkPolicy: { enabled: true, rules: [] },
+    viewport: { width: 800, height: 600 },
+    loadDelay: 2000,
+    zoom: 1,
+    maxAttempts: 1,
+  } as CaptureConfig;
 
   const binaryPath = '/usr/local/share/common/secure/';
-  const captureConfig = { networkPolicy: {}, timeouts: {} } as CaptureConfig;
-
-  const mockBrowserDriverFactory = await createDriverFactory(
-    binaryPath,
-    logger,
-    browserConfig,
-    captureConfig
-  );
-
+  const mockBrowserDriverFactory = await createDriverFactory(binaryPath, logger, captureConfig);
   const mockPage = {} as Page;
   const mockBrowserDriver = new HeadlessChromiumDriver(mockPage, {
     inspect: true,
diff --git a/x-pack/legacy/plugins/reporting/test_helpers/create_mock_layoutinstance.ts b/x-pack/legacy/plugins/reporting/test_helpers/create_mock_layoutinstance.ts
index 0250e6c0a9afd..be60b56dcc0c1 100644
--- a/x-pack/legacy/plugins/reporting/test_helpers/create_mock_layoutinstance.ts
+++ b/x-pack/legacy/plugins/reporting/test_helpers/create_mock_layoutinstance.ts
@@ -4,13 +4,13 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { createLayout } from '../export_types/common/layouts';
 import { LayoutTypes } from '../export_types/common/constants';
+import { createLayout } from '../export_types/common/layouts';
 import { LayoutInstance } from '../export_types/common/layouts/layout';
-import { ServerFacade } from '../types';
+import { CaptureConfig } from '../server/types';
 
-export const createMockLayoutInstance = (__LEGACY: ServerFacade) => {
-  const mockLayout = createLayout(__LEGACY, {
+export const createMockLayoutInstance = (captureConfig: CaptureConfig) => {
+  const mockLayout = createLayout(captureConfig, {
     id: LayoutTypes.PRESERVE_LAYOUT,
     dimensions: { height: 12, width: 12 },
   }) as LayoutInstance;
diff --git a/x-pack/legacy/plugins/reporting/test_helpers/create_mock_reportingplugin.ts b/x-pack/legacy/plugins/reporting/test_helpers/create_mock_reportingplugin.ts
index 2cd129d47b3f9..332b37b58cb7d 100644
--- a/x-pack/legacy/plugins/reporting/test_helpers/create_mock_reportingplugin.ts
+++ b/x-pack/legacy/plugins/reporting/test_helpers/create_mock_reportingplugin.ts
@@ -19,16 +19,24 @@ import { coreMock } from 'src/core/server/mocks';
 import { ReportingPlugin, ReportingCore } from '../server';
 import { ReportingSetupDeps, ReportingStartDeps } from '../server/types';
 
-export const createMockSetupDeps = (setupMock?: any): ReportingSetupDeps => ({
-  elasticsearch: setupMock.elasticsearch,
-  security: setupMock.security,
-  usageCollection: {} as any,
-  __LEGACY: { plugins: { xpack_main: { status: new EventEmitter() } } } as any,
-});
+const createMockSetupDeps = (setupMock?: any): ReportingSetupDeps => {
+  const configGetStub = jest.fn();
+  return {
+    elasticsearch: setupMock.elasticsearch,
+    security: setupMock.security,
+    usageCollection: {} as any,
+    reporting: {
+      config: {
+        get: configGetStub,
+        kbnConfig: { get: configGetStub },
+      },
+    },
+    __LEGACY: { plugins: { xpack_main: { status: new EventEmitter() } } } as any,
+  };
+};
 
 export const createMockStartDeps = (startMock?: any): ReportingStartDeps => ({
   data: startMock.data,
-  elasticsearch: startMock.elasticsearch,
   __LEGACY: {} as any,
 });
 
diff --git a/x-pack/legacy/plugins/reporting/test_helpers/create_mock_server.ts b/x-pack/legacy/plugins/reporting/test_helpers/create_mock_server.ts
index bb7851ba036a9..531e1dcaf84e0 100644
--- a/x-pack/legacy/plugins/reporting/test_helpers/create_mock_server.ts
+++ b/x-pack/legacy/plugins/reporting/test_helpers/create_mock_server.ts
@@ -3,36 +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 { memoize } from 'lodash';
-import { ServerFacade } from '../types';
-
-export const createMockServer = ({ settings = {} }: any): ServerFacade => {
-  const mockServer = {
-    config: memoize(() => ({ get: jest.fn() })),
-    info: {
-      protocol: 'http',
-    },
-    plugins: {
-      elasticsearch: {
-        getCluster: memoize(() => {
-          return {
-            callWithRequest: jest.fn(),
-          };
-        }),
-      },
-    },
-  };
 
-  const defaultSettings: any = {
-    'xpack.reporting.encryptionKey': 'testencryptionkey',
-    'server.basePath': '/sbp',
-    'server.host': 'localhost',
-    'server.port': 5601,
-    'xpack.reporting.kibanaServer': {},
-  };
-  mockServer.config().get.mockImplementation((key: any) => {
-    return key in settings ? settings[key] : defaultSettings[key];
-  });
+import { ServerFacade } from '../types';
 
-  return (mockServer as unknown) as ServerFacade;
+export const createMockServer = (): ServerFacade => {
+  const mockServer = {};
+  return mockServer as any;
 };
diff --git a/x-pack/legacy/plugins/reporting/types.d.ts b/x-pack/legacy/plugins/reporting/types.d.ts
index 238079ba92a29..76253752be1b7 100644
--- a/x-pack/legacy/plugins/reporting/types.d.ts
+++ b/x-pack/legacy/plugins/reporting/types.d.ts
@@ -7,14 +7,11 @@
 import { EventEmitter } from 'events';
 import { ResponseObject } from 'hapi';
 import { Legacy } from 'kibana';
-import { ElasticsearchServiceSetup } from 'kibana/server';
 import { CallCluster } from '../../../../src/legacy/core_plugins/elasticsearch';
 import { CancellationToken } from './common/cancellation_token';
-import { HeadlessChromiumDriverFactory } from './server/browsers/chromium/driver_factory';
-import { BrowserType } from './server/browsers/types';
-import { LevelLogger } from './server/lib/level_logger';
 import { ReportingCore } from './server/core';
-import { LegacySetup, ReportingStartDeps, ReportingSetup, ReportingStart } from './server/types';
+import { LevelLogger } from './server/lib/level_logger';
+import { LegacySetup } from './server/types';
 
 export type Job = EventEmitter & {
   id: string;
@@ -25,8 +22,8 @@ export type Job = EventEmitter & {
 
 export interface NetworkPolicyRule {
   allow: boolean;
-  protocol: string;
-  host: string;
+  protocol?: string;
+  host?: string;
 }
 
 export interface NetworkPolicy {
@@ -93,51 +90,6 @@ export type ReportingResponseToolkit = Legacy.ResponseToolkit;
 
 export type ESCallCluster = CallCluster;
 
-/*
- * Reporting Config
- */
-
-export interface CaptureConfig {
-  browser: {
-    type: BrowserType;
-    autoDownload: boolean;
-    chromium: BrowserConfig;
-  };
-  maxAttempts: number;
-  networkPolicy: NetworkPolicy;
-  loadDelay: number;
-  timeouts: {
-    openUrl: number;
-    waitForElements: number;
-    renderComplet: number;
-  };
-}
-
-export interface BrowserConfig {
-  inspect: boolean;
-  userDataDir: string;
-  viewport: { width: number; height: number };
-  disableSandbox: boolean;
-  proxy: {
-    enabled: boolean;
-    server: string;
-    bypass?: string[];
-  };
-}
-
-export interface QueueConfig {
-  indexInterval: string;
-  pollEnabled: boolean;
-  pollInterval: number;
-  pollIntervalErrorMultiplier: number;
-  timeout: number;
-}
-
-export interface ScrollConfig {
-  duration: string;
-  size: number;
-}
-
 export interface ElementPosition {
   boundingClientRect: {
     // modern browsers support x/y, but older ones don't
@@ -274,14 +226,10 @@ export interface ESQueueInstance {
 
 export type CreateJobFactory<CreateJobFnType> = (
   reporting: ReportingCore,
-  server: ServerFacade,
-  elasticsearch: ElasticsearchServiceSetup,
   logger: LevelLogger
-) => CreateJobFnType;
+) => Promise<CreateJobFnType>;
 export type ExecuteJobFactory<ExecuteJobFnType> = (
   reporting: ReportingCore,
-  server: ServerFacade,
-  elasticsearch: ElasticsearchServiceSetup,
   logger: LevelLogger
 ) => Promise<ExecuteJobFnType>;
 
diff --git a/x-pack/plugins/reporting/config.ts b/x-pack/plugins/reporting/config.ts
deleted file mode 100644
index f1d6b1a8f248f..0000000000000
--- a/x-pack/plugins/reporting/config.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.
- */
-
-export const reportingPollConfig = {
-  jobCompletionNotifier: { interval: 10000, intervalErrorMultiplier: 5 },
-  jobsRefresh: { interval: 5000, intervalErrorMultiplier: 5 },
-};
diff --git a/x-pack/plugins/reporting/kibana.json b/x-pack/plugins/reporting/kibana.json
index a7e2bd288f0b1..d330eb9b7872a 100644
--- a/x-pack/plugins/reporting/kibana.json
+++ b/x-pack/plugins/reporting/kibana.json
@@ -1,7 +1,11 @@
 {
+  "configPath": [ "xpack", "reporting" ],
   "id": "reporting",
   "version": "8.0.0",
   "kibanaVersion": "kibana",
+  "optionalPlugins": [
+    "usageCollection"
+  ],
   "requiredPlugins": [
     "home",
     "management",
@@ -11,6 +15,6 @@
     "share",
     "kibanaLegacy"
   ],
-  "server": false,
+  "server": true,
   "ui": true
 }
diff --git a/x-pack/plugins/reporting/server/config/index.test.ts b/x-pack/plugins/reporting/server/config/index.test.ts
new file mode 100644
index 0000000000000..08fe2c5861311
--- /dev/null
+++ b/x-pack/plugins/reporting/server/config/index.test.ts
@@ -0,0 +1,122 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import * as Rx from 'rxjs';
+import { CoreSetup, Logger, PluginInitializerContext } from '../../../../../src/core/server';
+import { createConfig$ } from './';
+
+interface KibanaServer {
+  host?: string;
+  port?: number;
+  protocol?: string;
+}
+interface ReportingKibanaServer {
+  hostname?: string;
+  port?: number;
+  protocol?: string;
+}
+
+const makeMockInitContext = (config: {
+  encryptionKey?: string;
+  kibanaServer: ReportingKibanaServer;
+}): PluginInitializerContext =>
+  ({
+    config: { create: () => Rx.of(config) },
+  } as PluginInitializerContext);
+
+const makeMockCoreSetup = (serverInfo: KibanaServer): CoreSetup =>
+  ({ http: { getServerInfo: () => serverInfo } } as any);
+
+describe('Reporting server createConfig$', () => {
+  let mockCoreSetup: CoreSetup;
+  let mockInitContext: PluginInitializerContext;
+  let mockLogger: Logger;
+
+  beforeEach(() => {
+    mockCoreSetup = makeMockCoreSetup({ host: 'kibanaHost', port: 5601, protocol: 'http' });
+    mockInitContext = makeMockInitContext({
+      kibanaServer: {},
+    });
+    mockLogger = ({ warn: jest.fn() } as unknown) as Logger;
+  });
+
+  afterEach(() => {
+    jest.resetAllMocks();
+  });
+
+  it('creates random encryption key and default config using host, protocol, and port from server info', async () => {
+    const result = await createConfig$(mockCoreSetup, mockInitContext, mockLogger).toPromise();
+
+    expect(result.encryptionKey).toMatch(/\S{32,}/);
+    expect(result.kibanaServer).toMatchInlineSnapshot(`
+      Object {
+        "hostname": "kibanaHost",
+        "port": 5601,
+        "protocol": "http",
+      }
+    `);
+    expect((mockLogger.warn as any).mock.calls.length).toBe(1);
+    expect((mockLogger.warn as any).mock.calls[0]).toMatchObject([
+      'Generating a random key for xpack.reporting.encryptionKey. To prevent sessions from being invalidated on restart, please set xpack.reporting.encryptionKey in kibana.yml',
+    ]);
+  });
+
+  it('uses the encryption key', async () => {
+    mockInitContext = makeMockInitContext({
+      encryptionKey: 'iiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii',
+      kibanaServer: {},
+    });
+    const result = await createConfig$(mockCoreSetup, mockInitContext, mockLogger).toPromise();
+
+    expect(result.encryptionKey).toMatch('iiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii');
+    expect((mockLogger.warn as any).mock.calls.length).toBe(0);
+  });
+
+  it('uses the encryption key, reporting kibanaServer settings to override server info', async () => {
+    mockInitContext = makeMockInitContext({
+      encryptionKey: 'iiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii',
+      kibanaServer: {
+        hostname: 'reportingHost',
+        port: 5677,
+        protocol: 'httpsa',
+      },
+    });
+    const result = await createConfig$(mockCoreSetup, mockInitContext, mockLogger).toPromise();
+
+    expect(result).toMatchInlineSnapshot(`
+      Object {
+        "encryptionKey": "iiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii",
+        "kibanaServer": Object {
+          "hostname": "reportingHost",
+          "port": 5677,
+          "protocol": "httpsa",
+        },
+      }
+    `);
+    expect((mockLogger.warn as any).mock.calls.length).toBe(0);
+  });
+
+  it('show warning when kibanaServer.hostName === "0"', async () => {
+    mockInitContext = makeMockInitContext({
+      encryptionKey: 'aaaaaaaaaaaaabbbbbbbbbbbbaaaaaaaaa',
+      kibanaServer: { hostname: '0' },
+    });
+    const result = await createConfig$(mockCoreSetup, mockInitContext, mockLogger).toPromise();
+
+    expect(result.kibanaServer).toMatchInlineSnapshot(`
+      Object {
+        "hostname": "0.0.0.0",
+        "port": 5601,
+        "protocol": "http",
+      }
+    `);
+    expect((mockLogger.warn as any).mock.calls.length).toBe(1);
+    expect((mockLogger.warn as any).mock.calls[0]).toMatchObject([
+      `Found 'server.host: \"0\" in Kibana configuration. This is incompatible with Reporting. To enable Reporting to work, 'xpack.reporting.kibanaServer.hostname: 0.0.0.0' is being automatically ` +
+        `to the configuration. You can change the setting to 'server.host: 0.0.0.0' or add 'xpack.reporting.kibanaServer.hostname: 0.0.0.0' in kibana.yml to prevent this message.`,
+    ]);
+  });
+});
diff --git a/x-pack/plugins/reporting/server/config/index.ts b/x-pack/plugins/reporting/server/config/index.ts
new file mode 100644
index 0000000000000..ac51b39ae23b4
--- /dev/null
+++ b/x-pack/plugins/reporting/server/config/index.ts
@@ -0,0 +1,85 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { i18n } from '@kbn/i18n/';
+import { TypeOf } from '@kbn/config-schema';
+import crypto from 'crypto';
+import { map } from 'rxjs/operators';
+import { PluginConfigDescriptor } from 'kibana/server';
+import { CoreSetup, Logger, PluginInitializerContext } from '../../../../../src/core/server';
+import { ConfigSchema, ConfigType } from './schema';
+
+export function createConfig$(core: CoreSetup, context: PluginInitializerContext, logger: Logger) {
+  return context.config.create<TypeOf<typeof ConfigSchema>>().pipe(
+    map(config => {
+      // encryption key
+      let encryptionKey = config.encryptionKey;
+      if (encryptionKey === undefined) {
+        logger.warn(
+          i18n.translate('xpack.reporting.serverConfig.randomEncryptionKey', {
+            defaultMessage:
+              'Generating a random key for xpack.reporting.encryptionKey. To prevent sessions from being invalidated on ' +
+              'restart, please set xpack.reporting.encryptionKey in kibana.yml',
+          })
+        );
+        encryptionKey = crypto.randomBytes(16).toString('hex');
+      }
+
+      const { kibanaServer: reportingServer } = config;
+      const serverInfo = core.http.getServerInfo();
+
+      // kibanaServer.hostname, default to server.host, don't allow "0"
+      let kibanaServerHostname = reportingServer.hostname
+        ? reportingServer.hostname
+        : serverInfo.host;
+      if (kibanaServerHostname === '0') {
+        logger.warn(
+          i18n.translate('xpack.reporting.serverConfig.invalidServerHostname', {
+            defaultMessage:
+              `Found 'server.host: "0" in Kibana configuration. This is incompatible with Reporting. ` +
+              `To enable Reporting to work, '{configKey}: 0.0.0.0' is being automatically to the configuration. ` +
+              `You can change the setting to 'server.host: 0.0.0.0' or add '{configKey}: 0.0.0.0' in kibana.yml to prevent this message.`,
+            values: { configKey: 'xpack.reporting.kibanaServer.hostname' },
+          })
+        );
+        kibanaServerHostname = '0.0.0.0';
+      }
+
+      // kibanaServer.port, default to server.port
+      const kibanaServerPort = reportingServer.port
+        ? reportingServer.port
+        : serverInfo.port; // prettier-ignore
+
+      // kibanaServer.protocol, default to server.protocol
+      const kibanaServerProtocol = reportingServer.protocol
+        ? reportingServer.protocol
+        : serverInfo.protocol;
+
+      return {
+        ...config,
+        encryptionKey,
+        kibanaServer: {
+          hostname: kibanaServerHostname,
+          port: kibanaServerPort,
+          protocol: kibanaServerProtocol,
+        },
+      };
+    })
+  );
+}
+
+export const config: PluginConfigDescriptor<ConfigType> = {
+  schema: ConfigSchema,
+  deprecations: ({ unused }) => [
+    unused('capture.browser.chromium.maxScreenshotDimension'),
+    unused('capture.concurrency'),
+    unused('capture.settleTime'),
+    unused('capture.timeout'),
+    unused('kibanaApp'),
+  ],
+};
+
+export { ConfigSchema, ConfigType };
diff --git a/x-pack/plugins/reporting/server/config/schema.test.ts b/x-pack/plugins/reporting/server/config/schema.test.ts
new file mode 100644
index 0000000000000..d8fe6d1ff084a
--- /dev/null
+++ b/x-pack/plugins/reporting/server/config/schema.test.ts
@@ -0,0 +1,103 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { ConfigSchema } from './schema';
+
+describe('Reporting Config Schema', () => {
+  it(`context {"dev":false,"dist":false} produces correct config`, () => {
+    expect(ConfigSchema.validate({}, { dev: false, dist: false })).toMatchObject({
+      capture: {
+        browser: {
+          autoDownload: true,
+          chromium: { disableSandbox: false, proxy: { enabled: false } },
+          type: 'chromium',
+        },
+        loadDelay: 3000,
+        maxAttempts: 1,
+        networkPolicy: {
+          enabled: true,
+          rules: [
+            { allow: true, host: undefined, protocol: 'http:' },
+            { allow: true, host: undefined, protocol: 'https:' },
+            { allow: true, host: undefined, protocol: 'ws:' },
+            { allow: true, host: undefined, protocol: 'wss:' },
+            { allow: true, host: undefined, protocol: 'data:' },
+            { allow: false, host: undefined, protocol: undefined },
+          ],
+        },
+        viewport: { height: 1200, width: 1950 },
+        zoom: 2,
+      },
+      csv: {
+        checkForFormulas: true,
+        enablePanelActionDownload: true,
+        maxSizeBytes: 10485760,
+        scroll: { duration: '30s', size: 500 },
+      },
+      encryptionKey: 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa',
+      index: '.reporting',
+      kibanaServer: {},
+      poll: {
+        jobCompletionNotifier: { interval: 10000, intervalErrorMultiplier: 5 },
+        jobsRefresh: { interval: 5000, intervalErrorMultiplier: 5 },
+      },
+      queue: {
+        indexInterval: 'week',
+        pollEnabled: true,
+        pollInterval: 3000,
+        pollIntervalErrorMultiplier: 10,
+        timeout: 120000,
+      },
+      roles: { allow: ['reporting_user'] },
+    });
+  });
+  it(`context {"dev":false,"dist":true} produces correct config`, () => {
+    expect(ConfigSchema.validate({}, { dev: false, dist: true })).toMatchObject({
+      capture: {
+        browser: {
+          autoDownload: false,
+          chromium: { disableSandbox: false, inspect: false, proxy: { enabled: false } },
+          type: 'chromium',
+        },
+        loadDelay: 3000,
+        maxAttempts: 3,
+        networkPolicy: {
+          enabled: true,
+          rules: [
+            { allow: true, host: undefined, protocol: 'http:' },
+            { allow: true, host: undefined, protocol: 'https:' },
+            { allow: true, host: undefined, protocol: 'ws:' },
+            { allow: true, host: undefined, protocol: 'wss:' },
+            { allow: true, host: undefined, protocol: 'data:' },
+            { allow: false, host: undefined, protocol: undefined },
+          ],
+        },
+        viewport: { height: 1200, width: 1950 },
+        zoom: 2,
+      },
+      csv: {
+        checkForFormulas: true,
+        enablePanelActionDownload: true,
+        maxSizeBytes: 10485760,
+        scroll: { duration: '30s', size: 500 },
+      },
+      index: '.reporting',
+      kibanaServer: {},
+      poll: {
+        jobCompletionNotifier: { interval: 10000, intervalErrorMultiplier: 5 },
+        jobsRefresh: { interval: 5000, intervalErrorMultiplier: 5 },
+      },
+      queue: {
+        indexInterval: 'week',
+        pollEnabled: true,
+        pollInterval: 3000,
+        pollIntervalErrorMultiplier: 10,
+        timeout: 120000,
+      },
+      roles: { allow: ['reporting_user'] },
+    });
+  });
+});
diff --git a/x-pack/plugins/reporting/server/config/schema.ts b/x-pack/plugins/reporting/server/config/schema.ts
new file mode 100644
index 0000000000000..0058b7a5096f0
--- /dev/null
+++ b/x-pack/plugins/reporting/server/config/schema.ts
@@ -0,0 +1,174 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { schema, TypeOf } from '@kbn/config-schema';
+import moment from 'moment';
+
+const KibanaServerSchema = schema.object({
+  hostname: schema.maybe(
+    schema.string({
+      validate(value) {
+        if (value === '0') {
+          return 'must not be "0" for the headless browser to correctly resolve the host';
+        }
+      },
+      hostname: true,
+    })
+  ),
+  port: schema.maybe(schema.number()),
+  protocol: schema.maybe(
+    schema.string({
+      validate(value) {
+        if (!/^https?$/.test(value)) {
+          return 'must be "http" or "https"';
+        }
+      },
+    })
+  ),
+});
+
+const QueueSchema = schema.object({
+  indexInterval: schema.string({ defaultValue: 'week' }),
+  pollEnabled: schema.boolean({ defaultValue: true }),
+  pollInterval: schema.number({ defaultValue: 3000 }),
+  pollIntervalErrorMultiplier: schema.number({ defaultValue: 10 }),
+  timeout: schema.number({ defaultValue: moment.duration(2, 'm').asMilliseconds() }),
+});
+
+const RulesSchema = schema.object({
+  allow: schema.boolean(),
+  host: schema.maybe(schema.string()),
+  protocol: schema.maybe(schema.string()),
+});
+
+const CaptureSchema = schema.object({
+  timeouts: schema.object({
+    openUrl: schema.number({ defaultValue: 30000 }),
+    waitForElements: schema.number({ defaultValue: 30000 }),
+    renderComplete: schema.number({ defaultValue: 30000 }),
+  }),
+  networkPolicy: schema.object({
+    enabled: schema.boolean({ defaultValue: true }),
+    rules: schema.arrayOf(RulesSchema, {
+      defaultValue: [
+        { host: undefined, allow: true, protocol: 'http:' },
+        { host: undefined, allow: true, protocol: 'https:' },
+        { host: undefined, allow: true, protocol: 'ws:' },
+        { host: undefined, allow: true, protocol: 'wss:' },
+        { host: undefined, allow: true, protocol: 'data:' },
+        { host: undefined, allow: false, protocol: undefined }, // Default action is to deny!
+      ],
+    }),
+  }),
+  zoom: schema.number({ defaultValue: 2 }),
+  viewport: schema.object({
+    width: schema.number({ defaultValue: 1950 }),
+    height: schema.number({ defaultValue: 1200 }),
+  }),
+  loadDelay: schema.number({
+    defaultValue: moment.duration(3, 's').asMilliseconds(),
+  }), // TODO: use schema.duration
+  browser: schema.object({
+    autoDownload: schema.conditional(
+      schema.contextRef('dist'),
+      true,
+      schema.boolean({ defaultValue: false }),
+      schema.boolean({ defaultValue: true })
+    ),
+    chromium: schema.object({
+      inspect: schema.conditional(
+        schema.contextRef('dist'),
+        true,
+        schema.boolean({ defaultValue: false }),
+        schema.maybe(schema.never())
+      ),
+      disableSandbox: schema.boolean({ defaultValue: false }),
+      proxy: schema.object({
+        enabled: schema.boolean({ defaultValue: false }),
+        server: schema.conditional(
+          schema.siblingRef('enabled'),
+          true,
+          schema.uri({ scheme: ['http', 'https'] }),
+          schema.maybe(schema.never())
+        ),
+        bypass: schema.conditional(
+          schema.siblingRef('enabled'),
+          true,
+          schema.arrayOf(schema.string({ hostname: true })),
+          schema.maybe(schema.never())
+        ),
+      }),
+      userDataDir: schema.maybe(schema.string()), // FIXME unused?
+    }),
+    type: schema.string({ defaultValue: 'chromium' }),
+  }),
+  maxAttempts: schema.conditional(
+    schema.contextRef('dist'),
+    true,
+    schema.number({ defaultValue: 3 }),
+    schema.number({ defaultValue: 1 })
+  ),
+});
+
+const CsvSchema = schema.object({
+  checkForFormulas: schema.boolean({ defaultValue: true }),
+  enablePanelActionDownload: schema.boolean({ defaultValue: true }),
+  maxSizeBytes: schema.number({
+    defaultValue: 1024 * 1024 * 10, // 10MB
+  }), // TODO: use schema.byteSize
+  scroll: schema.object({
+    duration: schema.string({
+      defaultValue: '30s',
+      validate(value) {
+        if (!/^[0-9]+(d|h|m|s|ms|micros|nanos)$/.test(value)) {
+          return 'must be a duration string';
+        }
+      },
+    }),
+    size: schema.number({ defaultValue: 500 }),
+  }),
+});
+
+const EncryptionKeySchema = schema.conditional(
+  schema.contextRef('dist'),
+  true,
+  schema.maybe(schema.string({ minLength: 32 })),
+  schema.string({ minLength: 32, defaultValue: 'a'.repeat(32) })
+);
+
+const RolesSchema = schema.object({
+  allow: schema.arrayOf(schema.string(), { defaultValue: ['reporting_user'] }),
+});
+
+const IndexSchema = schema.string({ defaultValue: '.reporting' });
+
+const PollSchema = schema.object({
+  jobCompletionNotifier: schema.object({
+    interval: schema.number({
+      defaultValue: moment.duration(10, 's').asMilliseconds(),
+    }), // TODO: use schema.duration
+    intervalErrorMultiplier: schema.number({ defaultValue: 5 }),
+  }),
+  jobsRefresh: schema.object({
+    interval: schema.number({
+      defaultValue: moment.duration(5, 's').asMilliseconds(),
+    }), // TODO: use schema.duration
+    intervalErrorMultiplier: schema.number({ defaultValue: 5 }),
+  }),
+});
+
+export const ConfigSchema = schema.object({
+  kibanaServer: KibanaServerSchema,
+  queue: QueueSchema,
+  capture: CaptureSchema,
+  csv: CsvSchema,
+  encryptionKey: EncryptionKeySchema,
+  roles: RolesSchema,
+  index: IndexSchema,
+  poll: PollSchema,
+});
+
+export type ConfigType = TypeOf<typeof ConfigSchema>;
diff --git a/x-pack/plugins/reporting/server/index.ts b/x-pack/plugins/reporting/server/index.ts
new file mode 100644
index 0000000000000..2b1844cf2e10e
--- /dev/null
+++ b/x-pack/plugins/reporting/server/index.ts
@@ -0,0 +1,14 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { PluginInitializerContext } from 'src/core/server';
+import { ReportingPlugin } from './plugin';
+
+export { config, ConfigSchema } from './config';
+export { ConfigType, PluginsSetup } from './plugin';
+
+export const plugin = (initializerContext: PluginInitializerContext) =>
+  new ReportingPlugin(initializerContext);
diff --git a/x-pack/plugins/reporting/server/plugin.ts b/x-pack/plugins/reporting/server/plugin.ts
new file mode 100644
index 0000000000000..53d821cffbb1f
--- /dev/null
+++ b/x-pack/plugins/reporting/server/plugin.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 { Observable } from 'rxjs';
+import { first } from 'rxjs/operators';
+import { CoreSetup, Logger, Plugin, PluginInitializerContext } from '../../../../src/core/server';
+import { ConfigType, createConfig$ } from './config';
+
+export interface PluginsSetup {
+  /** @deprecated */
+  __legacy: {
+    config$: Observable<ConfigType>;
+  };
+}
+
+export class ReportingPlugin implements Plugin<PluginsSetup> {
+  private readonly log: Logger;
+
+  constructor(private readonly initializerContext: PluginInitializerContext) {
+    this.log = this.initializerContext.logger.get();
+  }
+
+  public async setup(core: CoreSetup): Promise<PluginsSetup> {
+    return {
+      __legacy: {
+        config$: createConfig$(core, this.initializerContext, this.log).pipe(first()),
+      },
+    };
+  }
+
+  public start() {}
+  public stop() {}
+}
+
+export { ConfigType };

From e3431752f3a45ce41100201f7c447aa1fb65d439 Mon Sep 17 00:00:00 2001
From: Ryland Herrick <ryalnd@gmail.com>
Date: Mon, 23 Mar 2020 18:09:30 -0500
Subject: [PATCH 050/179] [SIEM] Move Timeline Template field to first step of
 rule creation (#60840)

* Move timeline template to Define step of Rule creation

This required a refactor/simplification of the step_define_rule logic to
make things work. In retrospect I think that the issue was we were not
handling incoming `defaultValues` props well, which was causing local
component state to be lost.

Now that we're doing a merge and removed a few unneeded local useStates,
things are a) working and b) cleaner

* Fix Rule details/edit view with updated data

We need to fix the other side of the equation to get these to work: the
timeline data was moved to a different step during creation, but when
viewing on the frontend we split the rule data back into the separate
"steps."

* Remove unused import

* Fix bug in formatDefineStepData

I neglected to pass through index in a previous commit.

* Update tests now that timeline has movied to a different step

* Fix more tests

* Update StepRuleDescription snapshots

* Fix cypress Rule Creation test

Timeline template moved, and so tests broke.

* Add unit tests for filterRuleFieldsForType
---
 .../signal_detection_rules.spec.ts            |  10 +-
 .../siem/cypress/screens/rule_details.ts      |  12 +-
 .../rules/all/__mocks__/mock.ts               |   8 +-
 .../__snapshots__/index.test.tsx.snap         |  34 +-
 .../description_step/index.test.tsx           |   9 +-
 .../step_about_rule/default_value.ts          |   5 -
 .../components/step_about_rule/index.tsx      |  10 -
 .../components/step_about_rule/schema.tsx     |  15 -
 .../components/step_define_rule/index.tsx     |  75 ++--
 .../components/step_define_rule/schema.tsx    |  15 +
 .../rules/create/helpers.test.ts              | 320 +++++++++---------
 .../detection_engine/rules/create/helpers.ts  |  65 ++--
 .../detection_engine/rules/helpers.test.tsx   |  36 +-
 .../pages/detection_engine/rules/helpers.tsx  |  36 +-
 .../pages/detection_engine/rules/types.ts     |   6 +-
 15 files changed, 308 insertions(+), 348 deletions(-)

diff --git a/x-pack/legacy/plugins/siem/cypress/integration/signal_detection_rules.spec.ts b/x-pack/legacy/plugins/siem/cypress/integration/signal_detection_rules.spec.ts
index ce73fe1b7c2a5..70e4fb052e172 100644
--- a/x-pack/legacy/plugins/siem/cypress/integration/signal_detection_rules.spec.ts
+++ b/x-pack/legacy/plugins/siem/cypress/integration/signal_detection_rules.spec.ts
@@ -13,10 +13,10 @@ import {
   ABOUT_SEVERITY,
   ABOUT_STEP,
   ABOUT_TAGS,
-  ABOUT_TIMELINE,
   ABOUT_URLS,
   DEFINITION_CUSTOM_QUERY,
   DEFINITION_INDEX_PATTERNS,
+  DEFINITION_TIMELINE,
   DEFINITION_STEP,
   RULE_NAME_HEADER,
   SCHEDULE_LOOPBACK,
@@ -170,10 +170,6 @@ describe('Signal detection rules', () => {
       .eq(ABOUT_RISK)
       .invoke('text')
       .should('eql', newRule.riskScore);
-    cy.get(ABOUT_STEP)
-      .eq(ABOUT_TIMELINE)
-      .invoke('text')
-      .should('eql', 'Default blank timeline');
     cy.get(ABOUT_STEP)
       .eq(ABOUT_URLS)
       .invoke('text')
@@ -202,6 +198,10 @@ describe('Signal detection rules', () => {
       .eq(DEFINITION_CUSTOM_QUERY)
       .invoke('text')
       .should('eql', `${newRule.customQuery} `);
+    cy.get(DEFINITION_STEP)
+      .eq(DEFINITION_TIMELINE)
+      .invoke('text')
+      .should('eql', 'Default blank timeline');
 
     cy.get(SCHEDULE_STEP)
       .eq(SCHEDULE_RUNS)
diff --git a/x-pack/legacy/plugins/siem/cypress/screens/rule_details.ts b/x-pack/legacy/plugins/siem/cypress/screens/rule_details.ts
index 6c16735ba5f24..06e535b37708c 100644
--- a/x-pack/legacy/plugins/siem/cypress/screens/rule_details.ts
+++ b/x-pack/legacy/plugins/siem/cypress/screens/rule_details.ts
@@ -4,9 +4,9 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-export const ABOUT_FALSE_POSITIVES = 4;
+export const ABOUT_FALSE_POSITIVES = 3;
 
-export const ABOUT_MITRE = 5;
+export const ABOUT_MITRE = 4;
 
 export const ABOUT_RULE_DESCRIPTION = '[data-test-subj=stepAboutRuleDetailsToggleDescriptionText]';
 
@@ -16,14 +16,14 @@ export const ABOUT_SEVERITY = 0;
 
 export const ABOUT_STEP = '[data-test-subj="aboutRule"] .euiDescriptionList__description';
 
-export const ABOUT_TAGS = 6;
+export const ABOUT_TAGS = 5;
 
-export const ABOUT_TIMELINE = 2;
-
-export const ABOUT_URLS = 3;
+export const ABOUT_URLS = 2;
 
 export const DEFINITION_CUSTOM_QUERY = 1;
 
+export const DEFINITION_TIMELINE = 3;
+
 export const DEFINITION_INDEX_PATTERNS =
   '[data-test-subj=definitionRule] [data-test-subj="listItemColumnStepRuleDescription"] .euiDescriptionList__description .euiBadge__text';
 
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/all/__mocks__/mock.ts b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/all/__mocks__/mock.ts
index 011a2614c1af9..a6aefefedd5c3 100644
--- a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/all/__mocks__/mock.ts
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/all/__mocks__/mock.ts
@@ -155,10 +155,6 @@ export const mockAboutStepRule = (isNew = false): AboutStepRule => ({
   references: ['www.test.co'],
   falsePositives: ['test'],
   tags: ['tag1', 'tag2'],
-  timeline: {
-    id: '86aa74d0-2136-11ea-9864-ebc8cc1cb8c2',
-    title: 'Titled timeline',
-  },
   threat: [
     {
       framework: 'mockFramework',
@@ -186,6 +182,10 @@ export const mockDefineStepRule = (isNew = false): DefineStepRule => ({
   machineLearningJobId: '',
   index: ['filebeat-'],
   queryBar: mockQueryBar,
+  timeline: {
+    id: '86aa74d0-2136-11ea-9864-ebc8cc1cb8c2',
+    title: 'Titled timeline',
+  },
 });
 
 export const mockScheduleStepRule = (isNew = false, enabled = false): ScheduleStepRule => ({
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/description_step/__snapshots__/index.test.tsx.snap b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/description_step/__snapshots__/index.test.tsx.snap
index 4d416e70a096c..9a534297e5e29 100644
--- a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/description_step/__snapshots__/index.test.tsx.snap
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/description_step/__snapshots__/index.test.tsx.snap
@@ -27,21 +27,6 @@ exports[`description_step StepRuleDescriptionComponent renders correctly against
             "description": 21,
             "title": "Risk score",
           },
-          Object {
-            "description": "Titled timeline",
-            "title": "Timeline template",
-          },
-        ]
-      }
-    />
-  </EuiFlexItem>
-  <EuiFlexItem
-    data-test-subj="listItemColumnStepRuleDescription"
-    key="description-step-rule-1"
-  >
-    <EuiDescriptionList
-      listItems={
-        Array [
           Object {
             "description": <EuiText
               size="s"
@@ -62,6 +47,17 @@ exports[`description_step StepRuleDescriptionComponent renders correctly against
             </EuiText>,
             "title": "Reference URLs",
           },
+        ]
+      }
+    />
+  </EuiFlexItem>
+  <EuiFlexItem
+    data-test-subj="listItemColumnStepRuleDescription"
+    key="description-step-rule-1"
+  >
+    <EuiDescriptionList
+      listItems={
+        Array [
           Object {
             "description": <EuiText
               size="s"
@@ -184,10 +180,6 @@ exports[`description_step StepRuleDescriptionComponent renders correctly against
             "description": 21,
             "title": "Risk score",
           },
-          Object {
-            "description": "Titled timeline",
-            "title": "Timeline template",
-          },
           Object {
             "description": <EuiText
               size="s"
@@ -331,10 +323,6 @@ exports[`description_step StepRuleDescriptionComponent renders correctly against
             "description": 21,
             "title": "Risk score",
           },
-          Object {
-            "description": "Titled timeline",
-            "title": "Timeline template",
-          },
           Object {
             "description": <EuiText
               size="s"
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/description_step/index.test.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/description_step/index.test.tsx
index 2c6f47fd27c44..557da8677f777 100644
--- a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/description_step/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/description_step/index.test.tsx
@@ -18,7 +18,7 @@ import {
   Filter,
   FilterManager,
 } from '../../../../../../../../../../src/plugins/data/public';
-import { mockAboutStepRule } from '../../all/__mocks__/mock';
+import { mockAboutStepRule, mockDefineStepRule } from '../../all/__mocks__/mock';
 import { coreMock } from '../../../../../../../../../../src/core/public/mocks';
 import { DEFAULT_TIMELINE_TITLE } from '../../../../../components/timeline/translations';
 import * as i18n from './translations';
@@ -263,7 +263,7 @@ describe('description_step', () => {
     test('returns expected ListItems array when given valid inputs', () => {
       const result: ListItems[] = buildListItems(mockAboutStep, schema, mockFilterManager);
 
-      expect(result.length).toEqual(10);
+      expect(result.length).toEqual(9);
     });
   });
 
@@ -431,10 +431,11 @@ describe('description_step', () => {
 
     describe('timeline', () => {
       test('returns timeline title if one exists', () => {
+        const mockDefineStep = mockDefineStepRule();
         const result: ListItems[] = getDescriptionItem(
           'timeline',
           'Timeline label',
-          mockAboutStep,
+          mockDefineStep,
           mockFilterManager
         );
 
@@ -444,7 +445,7 @@ describe('description_step', () => {
 
       test('returns default timeline title if none exists', () => {
         const mockStep = {
-          ...mockAboutStep,
+          ...mockDefineStepRule(),
           timeline: {
             id: '12345',
           },
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/step_about_rule/default_value.ts b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/step_about_rule/default_value.ts
index 417133f230610..52b0038507b59 100644
--- a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/step_about_rule/default_value.ts
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/step_about_rule/default_value.ts
@@ -5,7 +5,6 @@
  */
 
 import { AboutStepRule } from '../../types';
-import { DEFAULT_TIMELINE_TITLE } from '../../../../../components/timeline/translations';
 
 export const threatDefault = [
   {
@@ -24,10 +23,6 @@ export const stepAboutDefaultValue: AboutStepRule = {
   references: [''],
   falsePositives: [''],
   tags: [],
-  timeline: {
-    id: null,
-    title: DEFAULT_TIMELINE_TITLE,
-  },
   threat: threatDefault,
   note: '',
 };
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/step_about_rule/index.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/step_about_rule/index.tsx
index bfb123f3f3204..58b6ca54f5bbd 100644
--- a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/step_about_rule/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/step_about_rule/index.tsx
@@ -37,7 +37,6 @@ import { stepAboutDefaultValue } from './default_value';
 import { isUrlInvalid } from './helpers';
 import { schema } from './schema';
 import * as I18n from './translations';
-import { PickTimeline } from '../pick_timeline';
 import { StepContentWrapper } from '../step_content_wrapper';
 import { MarkdownEditorForm } from '../../../../../components/markdown_editor/form';
 
@@ -216,15 +215,6 @@ const StepAboutRuleComponent: FC<StepAboutRuleProps> = ({
             buttonContent={AdvancedSettingsAccordionButton}
           >
             <EuiSpacer size="m" />
-            <UseField
-              path="timeline"
-              component={PickTimeline}
-              componentProps={{
-                idAria: 'detectionEngineStepAboutRuleTimeline',
-                isDisabled: isLoading,
-                dataTestSubj: 'detectionEngineStepAboutRuleTimeline',
-              }}
-            />
             <UseField
               path="references"
               component={AddItem}
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/step_about_rule/schema.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/step_about_rule/schema.tsx
index 7c1ab09b7309c..8cb38b9dc7393 100644
--- a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/step_about_rule/schema.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/step_about_rule/schema.tsx
@@ -91,21 +91,6 @@ export const schema: FormSchema = {
       }
     ),
   },
-  timeline: {
-    label: i18n.translate(
-      'xpack.siem.detectionEngine.createRule.stepAboutRule.fieldTimelineTemplateLabel',
-      {
-        defaultMessage: 'Timeline template',
-      }
-    ),
-    helpText: i18n.translate(
-      'xpack.siem.detectionEngine.createRule.stepAboutRule.fieldTimelineTemplateHelpText',
-      {
-        defaultMessage:
-          'Select an existing timeline to use as a template when investigating generated signals.',
-      }
-    ),
-  },
   references: {
     label: i18n.translate(
       'xpack.siem.detectionEngine.createRule.stepAboutRule.fieldReferenceUrlsLabel',
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/step_define_rule/index.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/step_define_rule/index.tsx
index cf8cc4b87b388..4027c98a52ace 100644
--- a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/step_define_rule/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/step_define_rule/index.tsx
@@ -12,7 +12,6 @@ import {
   EuiFormRow,
   EuiButton,
 } from '@elastic/eui';
-import { isEmpty } from 'lodash/fp';
 import React, { FC, memo, useCallback, useState, useEffect, useContext } from 'react';
 import styled from 'styled-components';
 import deepEqual from 'fast-deep-equal';
@@ -20,6 +19,7 @@ import deepEqual from 'fast-deep-equal';
 import { IIndexPattern } from '../../../../../../../../../../src/plugins/data/public';
 import { useFetchIndexPatterns } from '../../../../../containers/detection_engine/rules';
 import { DEFAULT_INDEX_KEY } from '../../../../../../common/constants';
+import { DEFAULT_TIMELINE_TITLE } from '../../../../../components/timeline/translations';
 import { MlCapabilitiesContext } from '../../../../../components/ml/permissions/ml_capabilities_provider';
 import { useUiSetting$ } from '../../../../../lib/kibana';
 import { setFieldValue, isMlRule } from '../../helpers';
@@ -30,6 +30,7 @@ import { QueryBarDefineRule } from '../query_bar';
 import { SelectRuleType } from '../select_rule_type';
 import { AnomalyThresholdSlider } from '../anomaly_threshold_slider';
 import { MlJobSelect } from '../ml_job_select';
+import { PickTimeline } from '../pick_timeline';
 import { StepContentWrapper } from '../step_content_wrapper';
 import {
   Field,
@@ -61,6 +62,10 @@ const stepDefineDefaultValue: DefineStepRule = {
     filters: [],
     saved_id: undefined,
   },
+  timeline: {
+    id: null,
+    title: DEFAULT_TIMELINE_TITLE,
+  },
 };
 
 const MyLabelButton = styled(EuiButtonEmpty)`
@@ -77,23 +82,6 @@ MyLabelButton.defaultProps = {
   flush: 'right',
 };
 
-const getStepDefaultValue = (
-  indicesConfig: string[],
-  defaultValues: DefineStepRule | null
-): DefineStepRule => {
-  if (defaultValues != null) {
-    return {
-      ...defaultValues,
-      isNew: false,
-    };
-  } else {
-    return {
-      ...stepDefineDefaultValue,
-      index: indicesConfig != null ? indicesConfig : [],
-    };
-  }
-};
-
 const StepDefineRuleComponent: FC<StepDefineRuleProps> = ({
   addPadding = false,
   defaultValues,
@@ -106,18 +94,16 @@ const StepDefineRuleComponent: FC<StepDefineRuleProps> = ({
 }) => {
   const mlCapabilities = useContext(MlCapabilitiesContext);
   const [openTimelineSearch, setOpenTimelineSearch] = useState(false);
-  const [localUseIndicesConfig, setLocalUseIndicesConfig] = useState(false);
+  const [indexModified, setIndexModified] = useState(false);
   const [localIsMlRule, setIsMlRule] = useState(false);
   const [indicesConfig] = useUiSetting$<string[]>(DEFAULT_INDEX_KEY);
-  const [mylocalIndicesConfig, setMyLocalIndicesConfig] = useState(
-    defaultValues != null ? defaultValues.index : indicesConfig ?? []
-  );
+  const [myStepData, setMyStepData] = useState<DefineStepRule>({
+    ...stepDefineDefaultValue,
+    index: indicesConfig ?? [],
+  });
   const [
     { browserFields, indexPatterns: indexPatternQueryBar, isLoading: indexPatternLoadingQueryBar },
-  ] = useFetchIndexPatterns(mylocalIndicesConfig);
-  const [myStepData, setMyStepData] = useState<DefineStepRule>(
-    getStepDefaultValue(indicesConfig, null)
-  );
+  ] = useFetchIndexPatterns(myStepData.index);
 
   const { form } = useForm({
     defaultValue: myStepData,
@@ -138,15 +124,13 @@ const StepDefineRuleComponent: FC<StepDefineRuleProps> = ({
   }, [form]);
 
   useEffect(() => {
-    if (indicesConfig != null && defaultValues != null) {
-      const myDefaultValues = getStepDefaultValue(indicesConfig, defaultValues);
-      if (!deepEqual(myDefaultValues, myStepData)) {
-        setMyStepData(myDefaultValues);
-        setLocalUseIndicesConfig(deepEqual(myDefaultValues.index, indicesConfig));
-        setFieldValue(form, schema, myDefaultValues);
-      }
+    const { isNew, ...values } = myStepData;
+    if (defaultValues != null && !deepEqual(values, defaultValues)) {
+      const newValues = { ...values, ...defaultValues, isNew: false };
+      setMyStepData(newValues);
+      setFieldValue(form, schema, newValues);
     }
-  }, [defaultValues, indicesConfig]);
+  }, [defaultValues, setMyStepData, setFieldValue]);
 
   useEffect(() => {
     if (setForm != null) {
@@ -195,7 +179,7 @@ const StepDefineRuleComponent: FC<StepDefineRuleProps> = ({
                 path="index"
                 config={{
                   ...schema.index,
-                  labelAppend: !localUseIndicesConfig ? (
+                  labelAppend: indexModified ? (
                     <MyLabelButton onClick={handleResetIndices} iconType="refresh">
                       {i18n.RESET_DEFAULT_INDEX}
                     </MyLabelButton>
@@ -253,17 +237,22 @@ const StepDefineRuleComponent: FC<StepDefineRuleProps> = ({
               />
             </>
           </EuiFormRow>
+          <UseField
+            path="timeline"
+            component={PickTimeline}
+            componentProps={{
+              idAria: 'detectionEngineStepDefineRuleTimeline',
+              isDisabled: isLoading,
+              dataTestSubj: 'detectionEngineStepDefineRuleTimeline',
+            }}
+          />
           <FormDataProvider pathsToWatch={['index', 'ruleType']}>
             {({ index, ruleType }) => {
               if (index != null) {
-                if (deepEqual(index, indicesConfig) && !localUseIndicesConfig) {
-                  setLocalUseIndicesConfig(true);
-                }
-                if (!deepEqual(index, indicesConfig) && localUseIndicesConfig) {
-                  setLocalUseIndicesConfig(false);
-                }
-                if (index != null && !isEmpty(index) && !deepEqual(index, mylocalIndicesConfig)) {
-                  setMyLocalIndicesConfig(index);
+                if (deepEqual(index, indicesConfig) && indexModified) {
+                  setIndexModified(false);
+                } else if (!deepEqual(index, indicesConfig) && !indexModified) {
+                  setIndexModified(true);
                 }
               }
 
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/step_define_rule/schema.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/step_define_rule/schema.tsx
index bcfcd4f4ee09d..271c8fabed3a5 100644
--- a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/step_define_rule/schema.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/step_define_rule/schema.tsx
@@ -158,4 +158,19 @@ export const schema: FormSchema = {
       },
     ],
   },
+  timeline: {
+    label: i18n.translate(
+      'xpack.siem.detectionEngine.createRule.stepAboutRule.fieldTimelineTemplateLabel',
+      {
+        defaultMessage: 'Timeline template',
+      }
+    ),
+    helpText: i18n.translate(
+      'xpack.siem.detectionEngine.createRule.stepAboutRule.fieldTimelineTemplateHelpText',
+      {
+        defaultMessage:
+          'Select an existing timeline to use as a template when investigating generated signals.',
+      }
+    ),
+  },
 };
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/create/helpers.test.ts b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/create/helpers.test.ts
index ea6b02924cb3e..dc0459c54adb0 100644
--- a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/create/helpers.test.ts
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/create/helpers.test.ts
@@ -19,6 +19,7 @@ import {
   formatScheduleStepData,
   formatAboutStepData,
   formatRule,
+  filterRuleFieldsForType,
 } from './helpers';
 import {
   mockDefineStepRule,
@@ -88,6 +89,8 @@ describe('helpers', () => {
         saved_id: 'test123',
         index: ['filebeat-'],
         type: 'saved_query',
+        timeline_id: '86aa74d0-2136-11ea-9864-ebc8cc1cb8c2',
+        timeline_title: 'Titled timeline',
       };
 
       expect(result).toEqual(expected);
@@ -109,6 +112,119 @@ describe('helpers', () => {
         index: ['filebeat-'],
         saved_id: '',
         type: 'query',
+        timeline_id: '86aa74d0-2136-11ea-9864-ebc8cc1cb8c2',
+        timeline_title: 'Titled timeline',
+      };
+
+      expect(result).toEqual(expected);
+    });
+
+    test('returns formatted object without timeline_id and timeline_title if timeline.id is null', () => {
+      const mockStepData = {
+        ...mockData,
+      };
+      delete mockStepData.timeline.id;
+
+      const result: DefineStepRuleJson = formatDefineStepData(mockStepData);
+
+      const expected = {
+        language: 'kuery',
+        filters: mockQueryBar.filters,
+        query: 'test query',
+        index: ['filebeat-'],
+        saved_id: 'test123',
+        type: 'saved_query',
+      };
+
+      expect(result).toEqual(expected);
+    });
+
+    test('returns formatted object with timeline_id and timeline_title if timeline.id is "', () => {
+      const mockStepData = {
+        ...mockData,
+        timeline: {
+          ...mockData.timeline,
+          id: '',
+        },
+      };
+      const result: DefineStepRuleJson = formatDefineStepData(mockStepData);
+
+      const expected = {
+        language: 'kuery',
+        filters: mockQueryBar.filters,
+        query: 'test query',
+        index: ['filebeat-'],
+        saved_id: 'test123',
+        type: 'saved_query',
+        timeline_id: '',
+        timeline_title: 'Titled timeline',
+      };
+
+      expect(result).toEqual(expected);
+    });
+
+    test('returns formatted object without timeline_id and timeline_title if timeline.title is null', () => {
+      const mockStepData = {
+        ...mockData,
+        timeline: {
+          ...mockData.timeline,
+          id: '86aa74d0-2136-11ea-9864-ebc8cc1cb8c2',
+        },
+      };
+      delete mockStepData.timeline.title;
+      const result: DefineStepRuleJson = formatDefineStepData(mockStepData);
+
+      const expected = {
+        language: 'kuery',
+        filters: mockQueryBar.filters,
+        query: 'test query',
+        index: ['filebeat-'],
+        saved_id: 'test123',
+        type: 'saved_query',
+      };
+
+      expect(result).toEqual(expected);
+    });
+
+    test('returns formatted object with timeline_id and timeline_title if timeline.title is "', () => {
+      const mockStepData = {
+        ...mockData,
+        timeline: {
+          ...mockData.timeline,
+          title: '',
+        },
+      };
+      const result: DefineStepRuleJson = formatDefineStepData(mockStepData);
+
+      const expected = {
+        language: 'kuery',
+        filters: mockQueryBar.filters,
+        query: 'test query',
+        index: ['filebeat-'],
+        saved_id: 'test123',
+        type: 'saved_query',
+        timeline_id: '86aa74d0-2136-11ea-9864-ebc8cc1cb8c2',
+        timeline_title: '',
+      };
+
+      expect(result).toEqual(expected);
+    });
+
+    test('returns ML fields if type is machine_learning', () => {
+      const mockStepData: DefineStepRule = {
+        ...mockData,
+        ruleType: 'machine_learning',
+        anomalyThreshold: 44,
+        machineLearningJobId: 'some_jobert_id',
+      };
+      const result: DefineStepRuleJson = formatDefineStepData(mockStepData);
+
+      const expected = {
+        type: 'machine_learning',
+        anomaly_threshold: 44,
+        machine_learning_job_id: 'some_jobert_id',
+        timeline_id: '86aa74d0-2136-11ea-9864-ebc8cc1cb8c2',
+        timeline_title: 'Titled timeline',
       };
 
       expect(result).toEqual(expected);
@@ -249,8 +365,6 @@ describe('helpers', () => {
             ],
           },
         ],
-        timeline_id: '86aa74d0-2136-11ea-9864-ebc8cc1cb8c2',
-        timeline_title: 'Titled timeline',
       };
 
       expect(result).toEqual(expected);
@@ -289,8 +403,6 @@ describe('helpers', () => {
             ],
           },
         ],
-        timeline_id: '86aa74d0-2136-11ea-9864-ebc8cc1cb8c2',
-        timeline_title: 'Titled timeline',
       };
 
       expect(result).toEqual(expected);
@@ -327,160 +439,6 @@ describe('helpers', () => {
             ],
           },
         ],
-        timeline_id: '86aa74d0-2136-11ea-9864-ebc8cc1cb8c2',
-        timeline_title: 'Titled timeline',
-      };
-
-      expect(result).toEqual(expected);
-    });
-
-    test('returns formatted object without timeline_id and timeline_title if timeline.id is null', () => {
-      const mockStepData = {
-        ...mockData,
-      };
-      delete mockStepData.timeline.id;
-      const result: AboutStepRuleJson = formatAboutStepData(mockStepData);
-      const expected = {
-        description: '24/7',
-        false_positives: ['test'],
-        name: 'Query with rule-id',
-        note: '# this is some markdown documentation',
-        references: ['www.test.co'],
-        risk_score: 21,
-        severity: 'low',
-        tags: ['tag1', 'tag2'],
-        threat: [
-          {
-            framework: 'MITRE ATT&CK',
-            tactic: {
-              id: '1234',
-              name: 'tactic1',
-              reference: 'reference1',
-            },
-            technique: [
-              {
-                id: '456',
-                name: 'technique1',
-                reference: 'technique reference',
-              },
-            ],
-          },
-        ],
-      };
-
-      expect(result).toEqual(expected);
-    });
-
-    test('returns formatted object with timeline_id and timeline_title if timeline.id is "', () => {
-      const mockStepData = {
-        ...mockData,
-        timeline: {
-          ...mockData.timeline,
-          id: '',
-        },
-      };
-      const result: AboutStepRuleJson = formatAboutStepData(mockStepData);
-      const expected = {
-        description: '24/7',
-        false_positives: ['test'],
-        name: 'Query with rule-id',
-        note: '# this is some markdown documentation',
-        references: ['www.test.co'],
-        risk_score: 21,
-        severity: 'low',
-        tags: ['tag1', 'tag2'],
-        threat: [
-          {
-            framework: 'MITRE ATT&CK',
-            tactic: {
-              id: '1234',
-              name: 'tactic1',
-              reference: 'reference1',
-            },
-            technique: [
-              {
-                id: '456',
-                name: 'technique1',
-                reference: 'technique reference',
-              },
-            ],
-          },
-        ],
-        timeline_id: '',
-        timeline_title: 'Titled timeline',
-      };
-
-      expect(result).toEqual(expected);
-    });
-
-    test('returns formatted object without timeline_id and timeline_title if timeline.title is null', () => {
-      const mockStepData = {
-        ...mockData,
-        timeline: {
-          ...mockData.timeline,
-          id: '86aa74d0-2136-11ea-9864-ebc8cc1cb8c2',
-        },
-      };
-      delete mockStepData.timeline.title;
-      const result: AboutStepRuleJson = formatAboutStepData(mockStepData);
-      const expected = {
-        description: '24/7',
-        false_positives: ['test'],
-        name: 'Query with rule-id',
-        note: '# this is some markdown documentation',
-        references: ['www.test.co'],
-        risk_score: 21,
-        severity: 'low',
-        tags: ['tag1', 'tag2'],
-        threat: [
-          {
-            framework: 'MITRE ATT&CK',
-            tactic: {
-              id: '1234',
-              name: 'tactic1',
-              reference: 'reference1',
-            },
-            technique: [
-              {
-                id: '456',
-                name: 'technique1',
-                reference: 'technique reference',
-              },
-            ],
-          },
-        ],
-      };
-
-      expect(result).toEqual(expected);
-    });
-
-    test('returns formatted object with timeline_id and timeline_title if timeline.title is "', () => {
-      const mockStepData = {
-        ...mockData,
-        timeline: {
-          id: '86aa74d0-2136-11ea-9864-ebc8cc1cb8c2',
-          title: '',
-        },
-      };
-      const result: AboutStepRuleJson = formatAboutStepData(mockStepData);
-      const expected = {
-        description: '24/7',
-        false_positives: ['test'],
-        name: 'Query with rule-id',
-        note: '# this is some markdown documentation',
-        references: ['www.test.co'],
-        risk_score: 21,
-        severity: 'low',
-        tags: ['tag1', 'tag2'],
-        threat: [
-          {
-            framework: 'MITRE ATT&CK',
-            tactic: { id: '1234', name: 'tactic1', reference: 'reference1' },
-            technique: [{ id: '456', name: 'technique1', reference: 'technique reference' }],
-          },
-        ],
-        timeline_id: '86aa74d0-2136-11ea-9864-ebc8cc1cb8c2',
-        timeline_title: '',
       };
 
       expect(result).toEqual(expected);
@@ -539,8 +497,6 @@ describe('helpers', () => {
             technique: [{ id: '456', name: 'technique1', reference: 'technique reference' }],
           },
         ],
-        timeline_id: '86aa74d0-2136-11ea-9864-ebc8cc1cb8c2',
-        timeline_title: 'Titled timeline',
       };
 
       expect(result).toEqual(expected);
@@ -583,4 +539,48 @@ describe('helpers', () => {
       expect(result.id).toBeUndefined();
     });
   });
+
+  describe('filterRuleFieldsForType', () => {
+    let fields: DefineStepRule;
+
+    beforeEach(() => {
+      fields = mockDefineStepRule();
+    });
+
+    it('removes query fields if the type is machine learning', () => {
+      const result = filterRuleFieldsForType(fields, 'machine_learning');
+      expect(result).not.toHaveProperty('index');
+      expect(result).not.toHaveProperty('queryBar');
+    });
+
+    it('leaves ML fields if the type is machine learning', () => {
+      const result = filterRuleFieldsForType(fields, 'machine_learning');
+      expect(result).toHaveProperty('anomalyThreshold');
+      expect(result).toHaveProperty('machineLearningJobId');
+    });
+
+    it('leaves arbitrary fields if the type is machine learning', () => {
+      const result = filterRuleFieldsForType(fields, 'machine_learning');
+      expect(result).toHaveProperty('timeline');
+      expect(result).toHaveProperty('ruleType');
+    });
+
+    it('removes ML fields if the type is not machine learning', () => {
+      const result = filterRuleFieldsForType(fields, 'query');
+      expect(result).not.toHaveProperty('anomalyThreshold');
+      expect(result).not.toHaveProperty('machineLearningJobId');
+    });
+
+    it('leaves query fields if the type is query', () => {
+      const result = filterRuleFieldsForType(fields, 'query');
+      expect(result).toHaveProperty('index');
+      expect(result).toHaveProperty('queryBar');
+    });
+
+    it('leaves arbitrary fields if the type is query', () => {
+      const result = filterRuleFieldsForType(fields, 'query');
+      expect(result).toHaveProperty('timeline');
+      expect(result).toHaveProperty('ruleType');
+    });
+  });
 });
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/create/helpers.ts b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/create/helpers.ts
index 1f3379bf681bb..f8900e6a1129e 100644
--- a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/create/helpers.ts
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/create/helpers.ts
@@ -64,27 +64,35 @@ export const filterRuleFieldsForType = <T extends RuleFields>(fields: T, type: R
 
 export const formatDefineStepData = (defineStepData: DefineStepRule): DefineStepRuleJson => {
   const ruleFields = filterRuleFieldsForType(defineStepData, defineStepData.ruleType);
+  const { ruleType, timeline } = ruleFields;
+  const baseFields = {
+    type: ruleType,
+    ...(timeline.id != null &&
+      timeline.title != null && {
+        timeline_id: timeline.id,
+        timeline_title: timeline.title,
+      }),
+  };
 
-  if (isMlFields(ruleFields)) {
-    const { anomalyThreshold, machineLearningJobId, isNew, ruleType, ...rest } = ruleFields;
-    return {
-      ...rest,
-      type: ruleType,
-      anomaly_threshold: anomalyThreshold,
-      machine_learning_job_id: machineLearningJobId,
-    };
-  } else {
-    const { queryBar, isNew, ruleType, ...rest } = ruleFields;
-    return {
-      ...rest,
-      type: ruleType,
-      filters: queryBar?.filters,
-      language: queryBar?.query?.language,
-      query: queryBar?.query?.query as string,
-      saved_id: queryBar?.saved_id,
-      ...(ruleType === 'query' && queryBar?.saved_id ? { type: 'saved_query' as RuleType } : {}),
-    };
-  }
+  const typeFields = isMlFields(ruleFields)
+    ? {
+        anomaly_threshold: ruleFields.anomalyThreshold,
+        machine_learning_job_id: ruleFields.machineLearningJobId,
+      }
+    : {
+        index: ruleFields.index,
+        filters: ruleFields.queryBar?.filters,
+        language: ruleFields.queryBar?.query?.language,
+        query: ruleFields.queryBar?.query?.query as string,
+        saved_id: ruleFields.queryBar?.saved_id,
+        ...(ruleType === 'query' &&
+          ruleFields.queryBar?.saved_id && { type: 'saved_query' as RuleType }),
+      };
+
+  return {
+    ...baseFields,
+    ...typeFields,
+  };
 };
 
 export const formatScheduleStepData = (scheduleData: ScheduleStepRule): ScheduleStepRuleJson => {
@@ -108,26 +116,11 @@ export const formatScheduleStepData = (scheduleData: ScheduleStepRule): Schedule
 };
 
 export const formatAboutStepData = (aboutStepData: AboutStepRule): AboutStepRuleJson => {
-  const {
-    falsePositives,
-    references,
-    riskScore,
-    threat,
-    timeline,
-    isNew,
-    note,
-    ...rest
-  } = aboutStepData;
+  const { falsePositives, references, riskScore, threat, isNew, note, ...rest } = aboutStepData;
   return {
     false_positives: falsePositives.filter(item => !isEmpty(item)),
     references: references.filter(item => !isEmpty(item)),
     risk_score: riskScore,
-    ...(timeline.id != null && timeline.title != null
-      ? {
-          timeline_id: timeline.id,
-          timeline_title: timeline.title,
-        }
-      : {}),
     threat: threat
       .filter(singleThreat => singleThreat.tactic.name !== 'none')
       .map(singleThreat => ({
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/helpers.test.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/helpers.test.tsx
index ee43ae5f1d6e2..3224c605192e6 100644
--- a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/helpers.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/helpers.test.tsx
@@ -65,6 +65,10 @@ describe('rule helpers', () => {
           ],
           saved_id: 'test123',
         },
+        timeline: {
+          id: '86aa74d0-2136-11ea-9864-ebc8cc1cb8c2',
+          title: 'Titled timeline',
+        },
       };
       const aboutRuleStepData = {
         description: '24/7',
@@ -93,10 +97,6 @@ describe('rule helpers', () => {
             ],
           },
         ],
-        timeline: {
-          id: '86aa74d0-2136-11ea-9864-ebc8cc1cb8c2',
-          title: 'Titled timeline',
-        },
       };
       const scheduleRuleStepData = { enabled: true, from: '0s', interval: '5m', isNew: false };
       const aboutRuleDataDetailsData = {
@@ -112,16 +112,6 @@ describe('rule helpers', () => {
   });
 
   describe('getAboutStepsData', () => {
-    test('returns timeline id and title of null if they do not exist on rule', () => {
-      const mockedRule = mockRuleWithEverything('test-id');
-      delete mockedRule.timeline_id;
-      delete mockedRule.timeline_title;
-      const result: AboutStepRule = getAboutStepsData(mockedRule, false);
-
-      expect(result.timeline.id).toBeNull();
-      expect(result.timeline.title).toBeNull();
-    });
-
     test('returns name, description, and note as empty string if detailsView is true', () => {
       const result: AboutStepRule = getAboutStepsData(mockRuleWithEverything('test-id'), true);
 
@@ -195,6 +185,10 @@ describe('rule helpers', () => {
           filters: [],
           saved_id: "Garrett's IP",
         },
+        timeline: {
+          id: '86aa74d0-2136-11ea-9864-ebc8cc1cb8c2',
+          title: 'Untitled timeline',
+        },
       };
 
       expect(result).toEqual(expected);
@@ -220,10 +214,24 @@ describe('rule helpers', () => {
           filters: [],
           saved_id: undefined,
         },
+        timeline: {
+          id: '86aa74d0-2136-11ea-9864-ebc8cc1cb8c2',
+          title: 'Untitled timeline',
+        },
       };
 
       expect(result).toEqual(expected);
     });
+
+    test('returns timeline id and title of null if they do not exist on rule', () => {
+      const mockedRule = mockRuleWithEverything('test-id');
+      delete mockedRule.timeline_id;
+      delete mockedRule.timeline_title;
+      const result: DefineStepRule = getDefineStepsData(mockedRule);
+
+      expect(result.timeline.id).toBeNull();
+      expect(result.timeline.title).toBeNull();
+    });
   });
 
   describe('getHumanizedDuration', () => {
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/helpers.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/helpers.tsx
index e59ca5e7e14e5..2ace154482a27 100644
--- a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/helpers.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/helpers.tsx
@@ -42,20 +42,22 @@ export const getStepsData = ({
   return { aboutRuleData, modifiedAboutRuleDetailsData, defineRuleData, scheduleRuleData };
 };
 
-export const getDefineStepsData = (rule: Rule): DefineStepRule => {
-  return {
-    isNew: false,
-    ruleType: rule.type,
-    anomalyThreshold: rule.anomaly_threshold ?? 50,
-    machineLearningJobId: rule.machine_learning_job_id ?? '',
-    index: rule.index ?? [],
-    queryBar: {
-      query: { query: rule.query ?? '', language: rule.language ?? '' },
-      filters: (rule.filters ?? []) as Filter[],
-      saved_id: rule.saved_id,
-    },
-  };
-};
+export const getDefineStepsData = (rule: Rule): DefineStepRule => ({
+  isNew: false,
+  ruleType: rule.type,
+  anomalyThreshold: rule.anomaly_threshold ?? 50,
+  machineLearningJobId: rule.machine_learning_job_id ?? '',
+  index: rule.index ?? [],
+  queryBar: {
+    query: { query: rule.query ?? '', language: rule.language ?? '' },
+    filters: (rule.filters ?? []) as Filter[],
+    saved_id: rule.saved_id,
+  },
+  timeline: {
+    id: rule.timeline_id ?? null,
+    title: rule.timeline_title ?? null,
+  },
+});
 
 export const getScheduleStepsData = (rule: Rule): ScheduleStepRule => {
   const { enabled, interval, from } = rule;
@@ -94,8 +96,6 @@ export const getAboutStepsData = (rule: Rule, detailsView: boolean): AboutStepRu
     risk_score: riskScore,
     tags,
     threat,
-    timeline_id: timelineId,
-    timeline_title: timelineTitle,
   } = rule;
 
   return {
@@ -109,10 +109,6 @@ export const getAboutStepsData = (rule: Rule, detailsView: boolean): AboutStepRu
     riskScore,
     falsePositives,
     threat: threat as IMitreEnterpriseAttack[],
-    timeline: {
-      id: timelineId ?? null,
-      title: timelineTitle ?? null,
-    },
   };
 };
 
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/types.ts b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/types.ts
index 447b5dc6325ee..d4caa4639f338 100644
--- a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/types.ts
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/types.ts
@@ -57,7 +57,6 @@ export interface AboutStepRule extends StepRuleData {
   references: string[];
   falsePositives: string[];
   tags: string[];
-  timeline: FieldValueTimeline;
   threat: IMitreEnterpriseAttack[];
   note: string;
 }
@@ -73,6 +72,7 @@ export interface DefineStepRule extends StepRuleData {
   machineLearningJobId: string;
   queryBar: FieldValueQueryBar;
   ruleType: RuleType;
+  timeline: FieldValueTimeline;
 }
 
 export interface ScheduleStepRule extends StepRuleData {
@@ -90,6 +90,8 @@ export interface DefineStepRuleJson {
   saved_id?: string;
   query?: string;
   language?: string;
+  timeline_id?: string;
+  timeline_title?: string;
   type: RuleType;
 }
 
@@ -101,8 +103,6 @@ export interface AboutStepRuleJson {
   references: string[];
   false_positives: string[];
   tags: string[];
-  timeline_id?: string;
-  timeline_title?: string;
   threat: IMitreEnterpriseAttack[];
   note?: string;
 }

From f32a8483bcc5d88b56a9a9aa03466aa2d7457555 Mon Sep 17 00:00:00 2001
From: CJ Cenizal <cj@cenizal.com>
Date: Mon, 23 Mar 2020 16:10:12 -0700
Subject: [PATCH 051/179] Create Painless Lab app (#57538)

* Create Painless Playground app (#54578)

* Replace heart script with smiley face script. (#57755)

* Rename Painless Playground -> Painless Lab. (#57545)

* Fix i18n namespace.

* Improve smiley face proportions.
- Add def keyword to Painless spec.
- Temporarily fix broken highlighting.
- Add small padding to main controls.

* [Painless Lab] Minor Fixes (#58135)

* Code restructure, improve types, add plugin id, introduced hook

Moved the code execution hook to a custom hook outside of main,
also chaining off promise to avoid lower level handling of
sequencing.

* Re-instated formatting code

To improve DX the execution error response from the painless API
was massaged to a more reader friendly state, only giving non-repeating
information.

Currently it is hard to determine the line and character information from
the painless endpoint. If the user wishes to see this raw information it
will be available in the API response flyout.

* Remove leading new line in default script

* Remove registration of feature flag

* Fix types

* Restore previous auto-submit request behaviour

* Remove use of null and remove old comment

Stick with "undefined" as the designation for something not existing.

* [Painless Lab] NP migration (#59794)

* Fix sample document editor.

* [Painless Lab] Fix float -> integer coercion bug (#60201)

* Clarify data and persistence flow. Fix floating point precision bug.
* Send a string to API and ES client instead of an object.

* Rename helpers lib to format. Add tests for formatRequestPayload.

* Add query parameter to score context (#60414)

* Fix typo and i18n

* Make state init lazy

Otherwise we are needlessly reading and JSON.parse'ing on every
state update

* Support the query parameter in requests to Painless

* Fix borked i18n

* Fix i18n

* Another i18n issue

* [Painless] Minor state update model refactor (#60532)

* Fix typo and i18n

* Make state init lazy

Otherwise we are needlessly reading and JSON.parse'ing on every
state update

* Support the query parameter in requests to Painless

* WiP on state refactor

* Some cleanup after manual testing

* Fix types and i18n

* Fix i18n in context_tab

* i18n

* [Painless] Language Service (#60612)

* Added language service

* Use the correct monaco instance and add wordwise operations

* Remove plugin context initializer for now

* [Painless] Replace hard-coded links (#60603)

* Replace hard-coded links

Also remove all props from Main component

* Pass the new links object to the request flyout too

* Link directly to painless execute API's contexts

* Remove responsive stacking from tabs with icons in them.

* Resize Painless Lab bottom bar to accommodate nav drawer width (#60833)

* Validate Painless Lab index field (#60841)

* Make JSON format of parameters field more prominent. Set default parameters to provide an example to users.
* Set default document to provide an example to users.
* Simplify context's updateState interface.
* Refactor store and context file organization.
  - Remove common directory, move constants and types files to root.
  - Move initialState into context file, where it's being used.
* Add validation for index input.
* Create context directory.

* Fix bottom bar z-index.

* Position flyout help link so it's bottom-aligned with the title and farther from the close button.

Co-authored-by: Matthias Wilhelm <matthias.wilhelm@elastic.co>
Co-authored-by: Jean-Louis Leysens <jloleysens@gmail.com>
Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
Co-authored-by: Alison Goryachev <alison.goryachev@elastic.co>
---
 .github/CODEOWNERS                            |   1 +
 packages/kbn-ui-shared-deps/monaco.ts         |   2 +
 src/plugins/dev_tools/public/plugin.ts        |   2 +
 x-pack/.i18nrc.json                           |   1 +
 .../plugins/painless_lab/common/constants.ts  |  15 ++
 x-pack/plugins/painless_lab/kibana.json       |  16 ++
 .../public/application/components/editor.tsx  |  35 +++
 .../public/application/components/main.tsx    |  94 ++++++++
 .../application/components/main_controls.tsx  | 145 +++++++++++++
 .../components/output_pane/context_tab.tsx    | 202 +++++++++++++++++
 .../components/output_pane/index.ts           |   7 +
 .../components/output_pane/output_pane.tsx    |  79 +++++++
 .../components/output_pane/output_tab.tsx     |  26 +++
 .../components/output_pane/parameters_tab.tsx |  87 ++++++++
 .../application/components/request_flyout.tsx |  98 +++++++++
 .../public/application/constants.tsx          | 135 ++++++++++++
 .../public/application/context/context.tsx    |  95 ++++++++
 .../public/application/context/index.tsx      |   7 +
 .../application/context/initial_payload.ts    |  22 ++
 .../public/application/hooks/index.ts         |   7 +
 .../application/hooks/use_submit_code.ts      |  64 ++++++
 .../painless_lab/public/application/index.tsx |  46 ++++
 .../lib/__snapshots__/format.test.ts.snap     | 205 ++++++++++++++++++
 .../public/application/lib/format.test.ts     |  86 ++++++++
 .../public/application/lib/format.ts          | 117 ++++++++++
 .../painless_lab/public/application/types.ts  |  58 +++++
 x-pack/plugins/painless_lab/public/index.scss |   1 +
 x-pack/plugins/painless_lab/public/index.ts   |  12 +
 .../plugins/painless_lab/public/lib/index.ts  |   7 +
 .../public/lib/monaco_painless_lang.ts        | 174 +++++++++++++++
 x-pack/plugins/painless_lab/public/links.ts   |  20 ++
 x-pack/plugins/painless_lab/public/plugin.tsx | 114 ++++++++++
 .../painless_lab/public/services/index.ts     |   7 +
 .../public/services/language_service.ts       |  45 ++++
 .../painless_lab/public/styles/_index.scss    |  58 +++++
 x-pack/plugins/painless_lab/public/types.ts   |  15 ++
 x-pack/plugins/painless_lab/server/index.ts   |  11 +
 .../plugins/painless_lab/server/lib/index.ts  |   7 +
 .../painless_lab/server/lib/is_es_error.ts    |  13 ++
 x-pack/plugins/painless_lab/server/plugin.ts  |  47 ++++
 .../painless_lab/server/routes/api/execute.ts |  46 ++++
 .../painless_lab/server/routes/api/index.ts   |   7 +
 .../painless_lab/server/services/index.ts     |   7 +
 .../painless_lab/server/services/license.ts   |  82 +++++++
 x-pack/plugins/painless_lab/server/types.ts   |  17 ++
 45 files changed, 2342 insertions(+)
 create mode 100644 x-pack/plugins/painless_lab/common/constants.ts
 create mode 100644 x-pack/plugins/painless_lab/kibana.json
 create mode 100644 x-pack/plugins/painless_lab/public/application/components/editor.tsx
 create mode 100644 x-pack/plugins/painless_lab/public/application/components/main.tsx
 create mode 100644 x-pack/plugins/painless_lab/public/application/components/main_controls.tsx
 create mode 100644 x-pack/plugins/painless_lab/public/application/components/output_pane/context_tab.tsx
 create mode 100644 x-pack/plugins/painless_lab/public/application/components/output_pane/index.ts
 create mode 100644 x-pack/plugins/painless_lab/public/application/components/output_pane/output_pane.tsx
 create mode 100644 x-pack/plugins/painless_lab/public/application/components/output_pane/output_tab.tsx
 create mode 100644 x-pack/plugins/painless_lab/public/application/components/output_pane/parameters_tab.tsx
 create mode 100644 x-pack/plugins/painless_lab/public/application/components/request_flyout.tsx
 create mode 100644 x-pack/plugins/painless_lab/public/application/constants.tsx
 create mode 100644 x-pack/plugins/painless_lab/public/application/context/context.tsx
 create mode 100644 x-pack/plugins/painless_lab/public/application/context/index.tsx
 create mode 100644 x-pack/plugins/painless_lab/public/application/context/initial_payload.ts
 create mode 100644 x-pack/plugins/painless_lab/public/application/hooks/index.ts
 create mode 100644 x-pack/plugins/painless_lab/public/application/hooks/use_submit_code.ts
 create mode 100644 x-pack/plugins/painless_lab/public/application/index.tsx
 create mode 100644 x-pack/plugins/painless_lab/public/application/lib/__snapshots__/format.test.ts.snap
 create mode 100644 x-pack/plugins/painless_lab/public/application/lib/format.test.ts
 create mode 100644 x-pack/plugins/painless_lab/public/application/lib/format.ts
 create mode 100644 x-pack/plugins/painless_lab/public/application/types.ts
 create mode 100644 x-pack/plugins/painless_lab/public/index.scss
 create mode 100644 x-pack/plugins/painless_lab/public/index.ts
 create mode 100644 x-pack/plugins/painless_lab/public/lib/index.ts
 create mode 100644 x-pack/plugins/painless_lab/public/lib/monaco_painless_lang.ts
 create mode 100644 x-pack/plugins/painless_lab/public/links.ts
 create mode 100644 x-pack/plugins/painless_lab/public/plugin.tsx
 create mode 100644 x-pack/plugins/painless_lab/public/services/index.ts
 create mode 100644 x-pack/plugins/painless_lab/public/services/language_service.ts
 create mode 100644 x-pack/plugins/painless_lab/public/styles/_index.scss
 create mode 100644 x-pack/plugins/painless_lab/public/types.ts
 create mode 100644 x-pack/plugins/painless_lab/server/index.ts
 create mode 100644 x-pack/plugins/painless_lab/server/lib/index.ts
 create mode 100644 x-pack/plugins/painless_lab/server/lib/is_es_error.ts
 create mode 100644 x-pack/plugins/painless_lab/server/plugin.ts
 create mode 100644 x-pack/plugins/painless_lab/server/routes/api/execute.ts
 create mode 100644 x-pack/plugins/painless_lab/server/routes/api/index.ts
 create mode 100644 x-pack/plugins/painless_lab/server/services/index.ts
 create mode 100644 x-pack/plugins/painless_lab/server/services/license.ts
 create mode 100644 x-pack/plugins/painless_lab/server/types.ts

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index df3a56dd35130..2db898fab68bf 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -181,6 +181,7 @@
 /x-pack/plugins/remote_clusters/  @elastic/es-ui
 /x-pack/legacy/plugins/rollup/  @elastic/es-ui
 /x-pack/plugins/searchprofiler/  @elastic/es-ui
+/x-pack/plugins/painless_lab/  @elastic/es-ui
 /x-pack/legacy/plugins/snapshot_restore/  @elastic/es-ui
 /x-pack/legacy/plugins/upgrade_assistant/  @elastic/es-ui
 /x-pack/plugins/upgrade_assistant/  @elastic/es-ui
diff --git a/packages/kbn-ui-shared-deps/monaco.ts b/packages/kbn-ui-shared-deps/monaco.ts
index 570aca86c484c..42801c69a3e2c 100644
--- a/packages/kbn-ui-shared-deps/monaco.ts
+++ b/packages/kbn-ui-shared-deps/monaco.ts
@@ -25,6 +25,8 @@ import 'monaco-editor/esm/vs/base/worker/defaultWorkerFactory';
 import 'monaco-editor/esm/vs/editor/browser/controller/coreCommands.js';
 import 'monaco-editor/esm/vs/editor/browser/widget/codeEditorWidget.js';
 
+import 'monaco-editor/esm/vs/editor/contrib/wordOperations/wordOperations.js'; // Needed for word-wise char navigation
+
 import 'monaco-editor/esm/vs/editor/contrib/suggest/suggestController.js'; // Needed for suggestions
 import 'monaco-editor/esm/vs/editor/contrib/hover/hover.js'; // Needed for hover
 import 'monaco-editor/esm/vs/editor/contrib/parameterHints/parameterHints.js'; // Needed for signature
diff --git a/src/plugins/dev_tools/public/plugin.ts b/src/plugins/dev_tools/public/plugin.ts
index 9ebfeb5387b26..df61271baf879 100644
--- a/src/plugins/dev_tools/public/plugin.ts
+++ b/src/plugins/dev_tools/public/plugin.ts
@@ -132,4 +132,6 @@ export class DevToolsPlugin implements Plugin<DevToolsSetup, DevToolsStart> {
       getSortedDevTools: this.getSortedDevTools.bind(this),
     };
   }
+
+  public stop() {}
 }
diff --git a/x-pack/.i18nrc.json b/x-pack/.i18nrc.json
index a8bb989f6bff3..2a28e349ace99 100644
--- a/x-pack/.i18nrc.json
+++ b/x-pack/.i18nrc.json
@@ -30,6 +30,7 @@
     "xpack.ml": ["plugins/ml", "legacy/plugins/ml"],
     "xpack.monitoring": ["plugins/monitoring", "legacy/plugins/monitoring"],
     "xpack.remoteClusters": "plugins/remote_clusters",
+    "xpack.painlessLab": "plugins/painless_lab",
     "xpack.reporting": ["plugins/reporting", "legacy/plugins/reporting"],
     "xpack.rollupJobs": "legacy/plugins/rollup",
     "xpack.searchProfiler": "plugins/searchprofiler",
diff --git a/x-pack/plugins/painless_lab/common/constants.ts b/x-pack/plugins/painless_lab/common/constants.ts
new file mode 100644
index 0000000000000..dfc7d8ae85a2c
--- /dev/null
+++ b/x-pack/plugins/painless_lab/common/constants.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 { LicenseType } from '../../licensing/common/types';
+
+const basicLicense: LicenseType = 'basic';
+
+export const PLUGIN = {
+  id: 'painlessLab',
+  minimumLicenseType: basicLicense,
+};
+
+export const API_BASE_PATH = '/api/painless_lab';
diff --git a/x-pack/plugins/painless_lab/kibana.json b/x-pack/plugins/painless_lab/kibana.json
new file mode 100644
index 0000000000000..4b4ea24202846
--- /dev/null
+++ b/x-pack/plugins/painless_lab/kibana.json
@@ -0,0 +1,16 @@
+{
+  "id": "painlessLab",
+  "version": "8.0.0",
+  "kibanaVersion": "kibana",
+  "requiredPlugins": [
+    "devTools",
+    "licensing",
+    "home"
+  ],
+  "configPath": [
+    "xpack",
+    "painless_lab"
+  ],
+  "server": true,
+  "ui": true
+}
diff --git a/x-pack/plugins/painless_lab/public/application/components/editor.tsx b/x-pack/plugins/painless_lab/public/application/components/editor.tsx
new file mode 100644
index 0000000000000..b8891ce6524f5
--- /dev/null
+++ b/x-pack/plugins/painless_lab/public/application/components/editor.tsx
@@ -0,0 +1,35 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+import React from 'react';
+import { CodeEditor } from '../../../../../../src/plugins/kibana_react/public';
+
+interface Props {
+  code: string;
+  onChange: (code: string) => void;
+}
+
+export function Editor({ code, onChange }: Props) {
+  return (
+    <CodeEditor
+      languageId="painless"
+      // 99% width allows the editor to resize horizontally. 100% prevents it from resizing.
+      width="99%"
+      height="100%"
+      value={code}
+      onChange={onChange}
+      options={{
+        fontSize: 12,
+        minimap: {
+          enabled: false,
+        },
+        scrollBeyondLastLine: false,
+        wordWrap: 'on',
+        wrappingIndent: 'indent',
+        automaticLayout: true,
+      }}
+    />
+  );
+}
diff --git a/x-pack/plugins/painless_lab/public/application/components/main.tsx b/x-pack/plugins/painless_lab/public/application/components/main.tsx
new file mode 100644
index 0000000000000..10907536e9cc2
--- /dev/null
+++ b/x-pack/plugins/painless_lab/public/application/components/main.tsx
@@ -0,0 +1,94 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React, { useState, useEffect } from 'react';
+import { EuiFlexGroup, EuiFlexItem, EuiTitle } from '@elastic/eui';
+import { i18n } from '@kbn/i18n';
+import { formatRequestPayload, formatJson } from '../lib/format';
+import { exampleScript } from '../constants';
+import { PayloadFormat } from '../types';
+import { useSubmitCode } from '../hooks';
+import { useAppContext } from '../context';
+import { OutputPane } from './output_pane';
+import { MainControls } from './main_controls';
+import { Editor } from './editor';
+import { RequestFlyout } from './request_flyout';
+
+export const Main: React.FunctionComponent = () => {
+  const {
+    store: { payload, validation },
+    updatePayload,
+    services: {
+      http,
+      chrome: { getIsNavDrawerLocked$ },
+    },
+    links,
+  } = useAppContext();
+
+  const [isRequestFlyoutOpen, setRequestFlyoutOpen] = useState(false);
+  const { inProgress, response, submit } = useSubmitCode(http);
+
+  // Live-update the output and persist payload state as the user changes it.
+  useEffect(() => {
+    if (validation.isValid) {
+      submit(payload);
+    }
+  }, [payload, submit, validation.isValid]);
+
+  const toggleRequestFlyout = () => {
+    setRequestFlyoutOpen(!isRequestFlyoutOpen);
+  };
+
+  const [isNavDrawerLocked, setIsNavDrawerLocked] = useState(false);
+
+  useEffect(() => {
+    const subscription = getIsNavDrawerLocked$().subscribe((newIsNavDrawerLocked: boolean) => {
+      setIsNavDrawerLocked(newIsNavDrawerLocked);
+    });
+
+    return () => subscription.unsubscribe();
+  });
+
+  return (
+    <div className="painlessLabMainContainer">
+      <EuiFlexGroup className="painlessLabPanelsContainer" responsive={false} gutterSize="none">
+        <EuiFlexItem>
+          <EuiTitle className="euiScreenReaderOnly">
+            <h1>
+              {i18n.translate('xpack.painlessLab.title', {
+                defaultMessage: 'Painless Lab',
+              })}
+            </h1>
+          </EuiTitle>
+
+          <Editor code={payload.code} onChange={nextCode => updatePayload({ code: nextCode })} />
+        </EuiFlexItem>
+
+        <EuiFlexItem>
+          <OutputPane isLoading={inProgress} response={response} />
+        </EuiFlexItem>
+      </EuiFlexGroup>
+
+      <MainControls
+        links={links}
+        isLoading={inProgress}
+        toggleRequestFlyout={toggleRequestFlyout}
+        isRequestFlyoutOpen={isRequestFlyoutOpen}
+        isNavDrawerLocked={isNavDrawerLocked}
+        reset={() => updatePayload({ code: exampleScript })}
+      />
+
+      {isRequestFlyoutOpen && (
+        <RequestFlyout
+          links={links}
+          onClose={() => setRequestFlyoutOpen(false)}
+          requestBody={formatRequestPayload(payload, PayloadFormat.PRETTY)}
+          response={response ? formatJson(response.result || response.error) : ''}
+        />
+      )}
+    </div>
+  );
+};
diff --git a/x-pack/plugins/painless_lab/public/application/components/main_controls.tsx b/x-pack/plugins/painless_lab/public/application/components/main_controls.tsx
new file mode 100644
index 0000000000000..6307c21e26dc4
--- /dev/null
+++ b/x-pack/plugins/painless_lab/public/application/components/main_controls.tsx
@@ -0,0 +1,145 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+import React, { useState } from 'react';
+import classNames from 'classnames';
+import {
+  EuiPopover,
+  EuiBottomBar,
+  EuiContextMenuItem,
+  EuiContextMenuPanel,
+  EuiFlexGroup,
+  EuiFlexItem,
+  EuiButtonEmpty,
+} from '@elastic/eui';
+import { i18n } from '@kbn/i18n';
+
+import { Links } from '../../links';
+
+interface Props {
+  toggleRequestFlyout: () => void;
+  isRequestFlyoutOpen: boolean;
+  isLoading: boolean;
+  reset: () => void;
+  links: Links;
+  isNavDrawerLocked: boolean;
+}
+
+export function MainControls({
+  toggleRequestFlyout,
+  isRequestFlyoutOpen,
+  reset,
+  links,
+  isNavDrawerLocked,
+}: Props) {
+  const [isHelpOpen, setIsHelpOpen] = useState(false);
+
+  const items = [
+    <EuiContextMenuItem
+      key="walkthrough"
+      icon="popout"
+      href={links.painlessWalkthrough}
+      target="_blank"
+      onClick={() => setIsHelpOpen(false)}
+    >
+      {i18n.translate('xpack.painlessLab.walkthroughButtonLabel', {
+        defaultMessage: 'Walkthrough',
+      })}
+    </EuiContextMenuItem>,
+
+    <EuiContextMenuItem
+      key="api"
+      icon="popout"
+      href={links.painlessAPIReference}
+      target="_blank"
+      onClick={() => setIsHelpOpen(false)}
+    >
+      {i18n.translate('xpack.painlessLab.apiReferenceButtonLabel', {
+        defaultMessage: 'API reference',
+      })}
+    </EuiContextMenuItem>,
+
+    <EuiContextMenuItem
+      key="languageSpec"
+      icon="popout"
+      href={links.painlessLangSpec}
+      target="_blank"
+      onClick={() => setIsHelpOpen(false)}
+    >
+      {i18n.translate('xpack.painlessLab.languageSpecButtonLabel', {
+        defaultMessage: 'Language spec',
+      })}
+    </EuiContextMenuItem>,
+
+    <EuiContextMenuItem
+      key="reset"
+      icon="bolt"
+      onClick={() => {
+        reset();
+        setIsHelpOpen(false);
+      }}
+    >
+      {i18n.translate('xpack.painlessLab.resetButtonLabel', {
+        defaultMessage: 'Reset script',
+      })}
+    </EuiContextMenuItem>,
+  ];
+
+  const classes = classNames('painlessLab__bottomBar', {
+    'painlessLab__bottomBar-isNavDrawerLocked': isNavDrawerLocked,
+  });
+
+  return (
+    <EuiBottomBar paddingSize="s" className={classes}>
+      <EuiFlexGroup gutterSize="s" justifyContent="spaceBetween">
+        <EuiFlexItem grow={false}>
+          <EuiFlexGroup gutterSize="s" justifyContent="flexStart">
+            <EuiFlexItem grow={false}>
+              <EuiPopover
+                id="painlessLabHelpContextMenu"
+                button={
+                  <EuiButtonEmpty
+                    size="s"
+                    iconType="help"
+                    iconSide="left"
+                    color="ghost"
+                    onClick={() => setIsHelpOpen(!isHelpOpen)}
+                  >
+                    {i18n.translate('xpack.painlessLab.helpButtonLabel', {
+                      defaultMessage: 'Help',
+                    })}
+                  </EuiButtonEmpty>
+                }
+                isOpen={isHelpOpen}
+                closePopover={() => setIsHelpOpen(false)}
+                panelPaddingSize="none"
+                withTitle
+                anchorPosition="upRight"
+              >
+                <EuiContextMenuPanel items={items} />
+              </EuiPopover>
+            </EuiFlexItem>
+          </EuiFlexGroup>
+        </EuiFlexItem>
+        <EuiFlexItem grow={false}>
+          <EuiButtonEmpty
+            size="s"
+            color="ghost"
+            onClick={toggleRequestFlyout}
+            data-test-subj="btnViewRequest"
+          >
+            {isRequestFlyoutOpen
+              ? i18n.translate('xpack.painlessLab.hideRequestButtonLabel', {
+                  defaultMessage: 'Hide API request',
+                })
+              : i18n.translate('xpack.painlessLab.showRequestButtonLabel', {
+                  defaultMessage: 'Show API request',
+                })}
+          </EuiButtonEmpty>
+        </EuiFlexItem>
+      </EuiFlexGroup>
+    </EuiBottomBar>
+  );
+}
diff --git a/x-pack/plugins/painless_lab/public/application/components/output_pane/context_tab.tsx b/x-pack/plugins/painless_lab/public/application/components/output_pane/context_tab.tsx
new file mode 100644
index 0000000000000..47efd524f092a
--- /dev/null
+++ b/x-pack/plugins/painless_lab/public/application/components/output_pane/context_tab.tsx
@@ -0,0 +1,202 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * 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 {
+  EuiFieldText,
+  EuiFormRow,
+  EuiPanel,
+  EuiSpacer,
+  EuiIcon,
+  EuiToolTip,
+  EuiLink,
+  EuiText,
+  EuiSuperSelect,
+} from '@elastic/eui';
+import { FormattedMessage } from '@kbn/i18n/react';
+import { i18n } from '@kbn/i18n';
+
+import { CodeEditor } from '../../../../../../../src/plugins/kibana_react/public';
+import { painlessContextOptions } from '../../constants';
+import { useAppContext } from '../../context';
+
+export const ContextTab: FunctionComponent = () => {
+  const {
+    store: { payload, validation },
+    updatePayload,
+    links,
+  } = useAppContext();
+  const { context, document, index, query } = payload;
+
+  return (
+    <>
+      <EuiSpacer size="m" />
+      <EuiFormRow
+        label={
+          <EuiToolTip
+            content={i18n.translate('xpack.painlessLab.contextFieldTooltipText', {
+              defaultMessage: 'Different contexts provide different functions on the ctx object',
+            })}
+          >
+            <span>
+              <FormattedMessage
+                id="xpack.painlessLab.contextFieldLabel"
+                defaultMessage="Execution context"
+              />{' '}
+              <EuiIcon type="questionInCircle" color="subdued" />
+            </span>
+          </EuiToolTip>
+        }
+        labelAppend={
+          <EuiText size="xs">
+            <EuiLink href={links.painlessExecuteAPIContexts} target="_blank">
+              {i18n.translate('xpack.painlessLab.contextFieldDocLinkText', {
+                defaultMessage: 'Context docs',
+              })}
+            </EuiLink>
+          </EuiText>
+        }
+        fullWidth
+      >
+        <EuiSuperSelect
+          options={painlessContextOptions}
+          valueOfSelected={context}
+          onChange={nextContext => updatePayload({ context: nextContext })}
+          itemLayoutAlign="top"
+          hasDividers
+          fullWidth
+        />
+      </EuiFormRow>
+
+      {['filter', 'score'].indexOf(context) !== -1 && (
+        <EuiFormRow
+          label={
+            <EuiToolTip
+              content={i18n.translate('xpack.painlessLab.indexFieldTooltipText', {
+                defaultMessage: `Index mappings must be compatible with the sample document's fields`,
+              })}
+            >
+              <span>
+                <FormattedMessage
+                  id="xpack.painlessLab.indexFieldLabel"
+                  defaultMessage="Index name"
+                />{' '}
+                <EuiIcon type="questionInCircle" color="subdued" />
+              </span>
+            </EuiToolTip>
+          }
+          fullWidth
+          isInvalid={!validation.fields.index}
+          error={
+            validation.fields.index
+              ? []
+              : [
+                  i18n.translate('xpack.painlessLab.indexFieldMissingErrorMessage', {
+                    defaultMessage: 'Enter an index name',
+                  }),
+                ]
+          }
+        >
+          <EuiFieldText
+            fullWidth
+            value={index || ''}
+            onChange={e => {
+              const nextIndex = e.target.value;
+              updatePayload({ index: nextIndex });
+            }}
+            isInvalid={!validation.fields.index}
+          />
+        </EuiFormRow>
+      )}
+      {/* Query DSL Code Editor */}
+      {'score'.indexOf(context) !== -1 && (
+        <EuiFormRow
+          label={
+            <EuiToolTip
+              content={i18n.translate('xpack.painlessLab.queryFieldTooltipText', {
+                defaultMessage:
+                  'Use query to specify that that _score will be used to calculate score.',
+              })}
+            >
+              <span>
+                <FormattedMessage id="xpack.painlessLab.queryFieldLabel" defaultMessage="Query" />{' '}
+                <EuiIcon type="questionInCircle" color="subdued" />
+              </span>
+            </EuiToolTip>
+          }
+          labelAppend={
+            <EuiText size="xs">
+              <EuiLink href={links.esQueryDSL} target="_blank">
+                {i18n.translate('xpack.painlessLab.queryFieldDocLinkText', {
+                  defaultMessage: 'Query DSL docs',
+                })}
+              </EuiLink>
+            </EuiText>
+          }
+          fullWidth
+        >
+          <EuiPanel paddingSize="s">
+            <CodeEditor
+              languageId="json"
+              height={150}
+              value={query}
+              onChange={nextQuery => updatePayload({ query: nextQuery })}
+              options={{
+                fontSize: 12,
+                minimap: {
+                  enabled: false,
+                },
+                scrollBeyondLastLine: false,
+                wordWrap: 'on',
+                wrappingIndent: 'indent',
+                automaticLayout: true,
+              }}
+            />
+          </EuiPanel>
+        </EuiFormRow>
+      )}
+      {['filter', 'score'].indexOf(context) !== -1 && (
+        <EuiFormRow
+          label={
+            <EuiToolTip
+              content={i18n.translate('xpack.painlessLab.documentFieldTooltipText', {
+                defaultMessage: "Your script can access this document's fields",
+              })}
+            >
+              <span>
+                <FormattedMessage
+                  id="xpack.painlessLab.documentFieldLabel"
+                  defaultMessage="Sample document (JSON)"
+                />{' '}
+                <EuiIcon type="questionInCircle" color="subdued" />
+              </span>
+            </EuiToolTip>
+          }
+          fullWidth
+        >
+          <EuiPanel paddingSize="s">
+            <CodeEditor
+              languageId="json"
+              height={400}
+              value={document}
+              onChange={nextDocument => updatePayload({ document: nextDocument })}
+              options={{
+                fontSize: 12,
+                minimap: {
+                  enabled: false,
+                },
+                scrollBeyondLastLine: false,
+                wordWrap: 'on',
+                wrappingIndent: 'indent',
+                automaticLayout: true,
+              }}
+            />
+          </EuiPanel>
+        </EuiFormRow>
+      )}
+    </>
+  );
+};
diff --git a/x-pack/plugins/painless_lab/public/application/components/output_pane/index.ts b/x-pack/plugins/painless_lab/public/application/components/output_pane/index.ts
new file mode 100644
index 0000000000000..85b7a7816b5aa
--- /dev/null
+++ b/x-pack/plugins/painless_lab/public/application/components/output_pane/index.ts
@@ -0,0 +1,7 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+export { OutputPane } from './output_pane';
diff --git a/x-pack/plugins/painless_lab/public/application/components/output_pane/output_pane.tsx b/x-pack/plugins/painless_lab/public/application/components/output_pane/output_pane.tsx
new file mode 100644
index 0000000000000..e6a97bb02f738
--- /dev/null
+++ b/x-pack/plugins/painless_lab/public/application/components/output_pane/output_pane.tsx
@@ -0,0 +1,79 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React, { FunctionComponent } from 'react';
+import {
+  EuiIcon,
+  EuiFlexGroup,
+  EuiFlexItem,
+  EuiLoadingSpinner,
+  EuiPanel,
+  EuiTabbedContent,
+} from '@elastic/eui';
+import { i18n } from '@kbn/i18n';
+
+import { Response } from '../../types';
+import { OutputTab } from './output_tab';
+import { ParametersTab } from './parameters_tab';
+import { ContextTab } from './context_tab';
+
+interface Props {
+  isLoading: boolean;
+  response?: Response;
+}
+
+export const OutputPane: FunctionComponent<Props> = ({ isLoading, response }) => {
+  const outputTabLabel = (
+    <EuiFlexGroup gutterSize="s" alignItems="center" responsive={false}>
+      <EuiFlexItem grow={false}>
+        {isLoading ? (
+          <EuiLoadingSpinner size="m" />
+        ) : response && response.error ? (
+          <EuiIcon type="alert" color="danger" />
+        ) : (
+          <EuiIcon type="check" color="secondary" />
+        )}
+      </EuiFlexItem>
+
+      <EuiFlexItem grow={false}>
+        {i18n.translate('xpack.painlessLab.outputTabLabel', {
+          defaultMessage: 'Output',
+        })}
+      </EuiFlexItem>
+    </EuiFlexGroup>
+  );
+
+  return (
+    <EuiPanel className="painlessLabRightPane">
+      <EuiTabbedContent
+        className="painlessLabRightPane__tabs"
+        size="s"
+        tabs={[
+          {
+            id: 'output',
+            // TODO: Currently this causes an Eui prop error because it is expecting string, but we give it React.ReactNode - should fix.
+            name: outputTabLabel as any,
+            content: <OutputTab response={response} />,
+          },
+          {
+            id: 'parameters',
+            name: i18n.translate('xpack.painlessLab.parametersTabLabel', {
+              defaultMessage: 'Parameters',
+            }),
+            content: <ParametersTab />,
+          },
+          {
+            id: 'context',
+            name: i18n.translate('xpack.painlessLab.contextTabLabel', {
+              defaultMessage: 'Context',
+            }),
+            content: <ContextTab />,
+          },
+        ]}
+      />
+    </EuiPanel>
+  );
+};
diff --git a/x-pack/plugins/painless_lab/public/application/components/output_pane/output_tab.tsx b/x-pack/plugins/painless_lab/public/application/components/output_pane/output_tab.tsx
new file mode 100644
index 0000000000000..8969e5421640a
--- /dev/null
+++ b/x-pack/plugins/painless_lab/public/application/components/output_pane/output_tab.tsx
@@ -0,0 +1,26 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React from 'react';
+import { EuiCodeBlock, EuiSpacer } from '@elastic/eui';
+
+import { formatResponse } from '../../lib/format';
+import { Response } from '../../types';
+
+interface Props {
+  response?: Response;
+}
+
+export function OutputTab({ response }: Props) {
+  return (
+    <>
+      <EuiSpacer size="m" />
+      <EuiCodeBlock language="json" paddingSize="s" isCopyable>
+        {formatResponse(response)}
+      </EuiCodeBlock>
+    </>
+  );
+}
diff --git a/x-pack/plugins/painless_lab/public/application/components/output_pane/parameters_tab.tsx b/x-pack/plugins/painless_lab/public/application/components/output_pane/parameters_tab.tsx
new file mode 100644
index 0000000000000..7c8bce0f7b21b
--- /dev/null
+++ b/x-pack/plugins/painless_lab/public/application/components/output_pane/parameters_tab.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 React, { FunctionComponent } from 'react';
+import {
+  EuiFormRow,
+  EuiPanel,
+  EuiSpacer,
+  EuiIcon,
+  EuiToolTip,
+  EuiLink,
+  EuiText,
+} from '@elastic/eui';
+import { FormattedMessage } from '@kbn/i18n/react';
+import { monaco } from '@kbn/ui-shared-deps/monaco';
+import { i18n } from '@kbn/i18n';
+import { CodeEditor } from '../../../../../../../src/plugins/kibana_react/public';
+
+import { useAppContext } from '../../context';
+
+export const ParametersTab: FunctionComponent = () => {
+  const {
+    store: { payload },
+    updatePayload,
+    links,
+  } = useAppContext();
+  return (
+    <>
+      <EuiSpacer size="m" />
+      <EuiFormRow
+        label={
+          <EuiToolTip
+            content={i18n.translate('xpack.painlessLab.parametersFieldTooltipText', {
+              defaultMessage: 'These variables are assigned to the "params" object in your script',
+            })}
+          >
+            <span>
+              <FormattedMessage
+                id="xpack.painlessLab.parametersFieldLabel"
+                defaultMessage="Parameters (JSON)"
+              />{' '}
+              <EuiIcon type="questionInCircle" color="subdued" />
+            </span>
+          </EuiToolTip>
+        }
+        fullWidth
+        labelAppend={
+          <EuiText size="xs">
+            <EuiLink href={links.modulesScriptingPreferParams} target="_blank">
+              {i18n.translate('xpack.painlessLab.parametersFieldDocLinkText', {
+                defaultMessage: 'Parameters docs',
+              })}
+            </EuiLink>
+          </EuiText>
+        }
+      >
+        <EuiPanel paddingSize="s">
+          <CodeEditor
+            languageId="json"
+            height={600}
+            value={payload.parameters}
+            onChange={nextParams => updatePayload({ parameters: nextParams })}
+            options={{
+              fontSize: 12,
+              minimap: {
+                enabled: false,
+              },
+              scrollBeyondLastLine: false,
+              wordWrap: 'on',
+              wrappingIndent: 'indent',
+              automaticLayout: true,
+            }}
+            editorDidMount={(editor: monaco.editor.IStandaloneCodeEditor) => {
+              // Updating tab size for the editor
+              const model = editor.getModel();
+              if (model) {
+                model.updateOptions({ tabSize: 2 });
+              }
+            }}
+          />
+        </EuiPanel>
+      </EuiFormRow>
+    </>
+  );
+};
diff --git a/x-pack/plugins/painless_lab/public/application/components/request_flyout.tsx b/x-pack/plugins/painless_lab/public/application/components/request_flyout.tsx
new file mode 100644
index 0000000000000..123df91f4346a
--- /dev/null
+++ b/x-pack/plugins/painless_lab/public/application/components/request_flyout.tsx
@@ -0,0 +1,98 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * 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 {
+  EuiCodeBlock,
+  EuiTabbedContent,
+  EuiTitle,
+  EuiFlyout,
+  EuiFlyoutHeader,
+  EuiFlyoutBody,
+  EuiButtonEmpty,
+  EuiFlexGroup,
+  EuiFlexItem,
+} from '@elastic/eui';
+import { i18n } from '@kbn/i18n';
+import { Links } from '../../links';
+
+interface Props {
+  onClose: any;
+  requestBody: string;
+  links: Links;
+  response?: string;
+}
+
+export const RequestFlyout: FunctionComponent<Props> = ({
+  onClose,
+  requestBody,
+  response,
+  links,
+}) => {
+  return (
+    <EuiFlyout onClose={onClose} maxWidth={640}>
+      <EuiFlyoutHeader>
+        <EuiFlexGroup gutterSize="xs" alignItems="flexEnd">
+          <EuiFlexItem>
+            {/* We need an extra div to get out of flex grow */}
+            <div>
+              <EuiTitle size="m">
+                <h2>
+                  {i18n.translate('xpack.painlessLab.flyoutTitle', {
+                    defaultMessage: 'API request',
+                  })}
+                </h2>
+              </EuiTitle>
+            </div>
+          </EuiFlexItem>
+
+          <EuiFlexItem grow={false}>
+            <EuiButtonEmpty
+              size="s"
+              flush="right"
+              href={links.painlessExecuteAPI}
+              target="_blank"
+              iconType="help"
+            >
+              {i18n.translate('xpack.painlessLab.flyoutDocLink', {
+                defaultMessage: 'API documentation',
+              })}
+            </EuiButtonEmpty>
+          </EuiFlexItem>
+        </EuiFlexGroup>
+      </EuiFlyoutHeader>
+
+      <EuiFlyoutBody>
+        <EuiTabbedContent
+          size="s"
+          tabs={[
+            {
+              id: 'request',
+              name: 'Request',
+              content: (
+                <EuiCodeBlock language="json" paddingSize="s" isCopyable>
+                  {'POST _scripts/painless/_execute\n'}
+                  {requestBody}
+                </EuiCodeBlock>
+              ),
+            },
+            {
+              id: 'response',
+              name: 'Response',
+              content: (
+                <EuiCodeBlock language="json" paddingSize="s" isCopyable>
+                  {response}
+                </EuiCodeBlock>
+              ),
+            },
+          ]}
+        />
+
+        <div className="painlessLabBottomBarPlaceholder" />
+      </EuiFlyoutBody>
+    </EuiFlyout>
+  );
+};
diff --git a/x-pack/plugins/painless_lab/public/application/constants.tsx b/x-pack/plugins/painless_lab/public/application/constants.tsx
new file mode 100644
index 0000000000000..d8430dbfc7d9d
--- /dev/null
+++ b/x-pack/plugins/painless_lab/public/application/constants.tsx
@@ -0,0 +1,135 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React from 'react';
+
+import { EuiText } from '@elastic/eui';
+import { i18n } from '@kbn/i18n';
+
+const defaultLabel = i18n.translate('xpack.painlessLab.contextDefaultLabel', {
+  defaultMessage: 'Basic',
+});
+
+const filterLabel = i18n.translate('xpack.painlessLab.contextFilterLabel', {
+  defaultMessage: 'Filter',
+});
+
+const scoreLabel = i18n.translate('xpack.painlessLab.contextScoreLabel', {
+  defaultMessage: 'Score',
+});
+
+export const painlessContextOptions = [
+  {
+    value: 'painless_test',
+    inputDisplay: defaultLabel,
+    dropdownDisplay: (
+      <>
+        <strong>{defaultLabel}</strong>
+        <EuiText size="s" color="subdued">
+          <p className="euiTextColor--subdued">
+            {i18n.translate('xpack.painlessLab.context.defaultLabel', {
+              defaultMessage: 'The script result will be converted to a string',
+            })}
+          </p>
+        </EuiText>
+      </>
+    ),
+  },
+  {
+    value: 'filter',
+    inputDisplay: filterLabel,
+    dropdownDisplay: (
+      <>
+        <strong>{filterLabel}</strong>
+        <EuiText size="s" color="subdued">
+          <p className="euiTextColor--subdued">
+            {i18n.translate('xpack.painlessLab.context.filterLabel', {
+              defaultMessage: "Use the context of a filter's script query",
+            })}
+          </p>
+        </EuiText>
+      </>
+    ),
+  },
+  {
+    value: 'score',
+    inputDisplay: scoreLabel,
+    dropdownDisplay: (
+      <>
+        <strong>{scoreLabel}</strong>
+        <EuiText size="s" color="subdued">
+          <p className="euiTextColor--subdued">
+            {i18n.translate('xpack.painlessLab.context.scoreLabel', {
+              defaultMessage: 'Use the context of a script_score function in function_score query',
+            })}
+          </p>
+        </EuiText>
+      </>
+    ),
+  },
+];
+
+// Render a smiley face as an example.
+export const exampleScript = `boolean isInCircle(def posX, def posY, def circleX, def circleY, def radius) {
+  double distanceFromCircleCenter = Math.sqrt(Math.pow(circleX - posX, 2) + Math.pow(circleY - posY, 2));
+  return distanceFromCircleCenter <= radius;
+}
+
+boolean isOnCircle(def posX, def posY, def circleX, def circleY, def radius, def thickness, def squashY) {
+  double distanceFromCircleCenter = Math.sqrt(Math.pow(circleX - posX, 2) + Math.pow((circleY - posY) / squashY, 2));
+  return (
+    distanceFromCircleCenter >= radius - thickness
+    && distanceFromCircleCenter <= radius + thickness
+  );
+}
+
+def result = '';
+int charCount = 0;
+
+// Canvas dimensions
+int width = 31;
+int height = 31;
+double halfWidth = Math.floor(width * 0.5);
+double halfHeight = Math.floor(height * 0.5);
+
+// Style constants
+double strokeWidth = 0.6;
+
+// Smiley face configuration
+int headSize = 13;
+double headSquashY = 0.78;
+int eyePositionX = 10;
+int eyePositionY = 12;
+int eyeSize = 1;
+int mouthSize = 15;
+int mouthPositionX = width / 2;
+int mouthPositionY = 5;
+int mouthOffsetY = 11;
+
+for (int y = 0; y < height; y++) {
+  for (int x = 0; x < width; x++) {
+    boolean isHead = isOnCircle(x, y, halfWidth, halfHeight, headSize, strokeWidth, headSquashY);
+    boolean isLeftEye = isInCircle(x, y, eyePositionX, eyePositionY, eyeSize);
+    boolean isRightEye = isInCircle(x, y, width - eyePositionX - 1, eyePositionY, eyeSize);
+    boolean isMouth = isOnCircle(x, y, mouthPositionX, mouthPositionY, mouthSize, strokeWidth, 1) && y > mouthPositionY + mouthOffsetY;
+
+    if (isLeftEye || isRightEye || isMouth || isHead) {
+      result += "*";
+    } else {
+      result += ".";
+    }
+
+    result += " ";
+
+    // Make sure the smiley face doesn't deform as the container changes width.
+    charCount++;
+    if (charCount % width === 0) {
+      result += "\\\\n";
+    }
+  }
+}
+
+return result;`;
diff --git a/x-pack/plugins/painless_lab/public/application/context/context.tsx b/x-pack/plugins/painless_lab/public/application/context/context.tsx
new file mode 100644
index 0000000000000..0fb5842dfea58
--- /dev/null
+++ b/x-pack/plugins/painless_lab/public/application/context/context.tsx
@@ -0,0 +1,95 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * 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, { createContext, ReactNode, useState, useContext } from 'react';
+import { HttpSetup, ChromeStart } from 'src/core/public';
+
+import { Links } from '../../links';
+import { Store, Payload, Validation } from '../types';
+import { initialPayload } from './initial_payload';
+
+interface AppContextProviderArgs {
+  children: ReactNode;
+  value: {
+    http: HttpSetup;
+    links: Links;
+    chrome: ChromeStart;
+  };
+}
+
+interface ContextValue {
+  store: Store;
+  updatePayload: (changes: Partial<Payload>) => void;
+  services: {
+    http: HttpSetup;
+    chrome: ChromeStart;
+  };
+  links: Links;
+}
+
+const AppContext = createContext<ContextValue>(undefined as any);
+
+const validatePayload = (payload: Payload): Validation => {
+  const { index } = payload;
+
+  // For now just validate that the user has entered an index.
+  const indexExists = Boolean(index || index.trim());
+
+  return {
+    isValid: indexExists,
+    fields: {
+      index: indexExists,
+    },
+  };
+};
+
+export const AppContextProvider = ({
+  children,
+  value: { http, links, chrome },
+}: AppContextProviderArgs) => {
+  const PAINLESS_LAB_KEY = 'painlessLabState';
+
+  const [store, setStore] = useState<Store>(() => {
+    // Using a callback here ensures these values are only calculated on the first render.
+    const defaultPayload = {
+      ...initialPayload,
+      ...JSON.parse(localStorage.getItem(PAINLESS_LAB_KEY) || '{}'),
+    };
+
+    return {
+      payload: defaultPayload,
+      validation: validatePayload(defaultPayload),
+    };
+  });
+
+  const updatePayload = (changes: Partial<Payload>): void => {
+    const nextPayload = {
+      ...store.payload,
+      ...changes,
+    };
+    // Persist state locally so we can load it up when the user reopens the app.
+    localStorage.setItem(PAINLESS_LAB_KEY, JSON.stringify(nextPayload));
+
+    setStore({
+      payload: nextPayload,
+      validation: validatePayload(nextPayload),
+    });
+  };
+
+  return (
+    <AppContext.Provider value={{ updatePayload, store, services: { http, chrome }, links }}>
+      {children}
+    </AppContext.Provider>
+  );
+};
+
+export const useAppContext = () => {
+  const ctx = useContext(AppContext);
+  if (!ctx) {
+    throw new Error('AppContext can only be used inside of AppContextProvider!');
+  }
+  return ctx;
+};
diff --git a/x-pack/plugins/painless_lab/public/application/context/index.tsx b/x-pack/plugins/painless_lab/public/application/context/index.tsx
new file mode 100644
index 0000000000000..7a685137b7a4f
--- /dev/null
+++ b/x-pack/plugins/painless_lab/public/application/context/index.tsx
@@ -0,0 +1,7 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+export { AppContextProvider, useAppContext } from './context';
diff --git a/x-pack/plugins/painless_lab/public/application/context/initial_payload.ts b/x-pack/plugins/painless_lab/public/application/context/initial_payload.ts
new file mode 100644
index 0000000000000..4d9d8ad8b3ae7
--- /dev/null
+++ b/x-pack/plugins/painless_lab/public/application/context/initial_payload.ts
@@ -0,0 +1,22 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { exampleScript, painlessContextOptions } from '../constants';
+
+export const initialPayload = {
+  context: painlessContextOptions[0].value,
+  code: exampleScript,
+  parameters: `{
+  "string_parameter": "string value",
+  "number_parameter": 1.5,
+  "boolean_parameter": true
+}`,
+  index: 'my-index',
+  document: `{
+  "my_field": "field_value"
+}`,
+  query: '',
+};
diff --git a/x-pack/plugins/painless_lab/public/application/hooks/index.ts b/x-pack/plugins/painless_lab/public/application/hooks/index.ts
new file mode 100644
index 0000000000000..159ff96d2278c
--- /dev/null
+++ b/x-pack/plugins/painless_lab/public/application/hooks/index.ts
@@ -0,0 +1,7 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+export { useSubmitCode } from './use_submit_code';
diff --git a/x-pack/plugins/painless_lab/public/application/hooks/use_submit_code.ts b/x-pack/plugins/painless_lab/public/application/hooks/use_submit_code.ts
new file mode 100644
index 0000000000000..36cd4f280ac4c
--- /dev/null
+++ b/x-pack/plugins/painless_lab/public/application/hooks/use_submit_code.ts
@@ -0,0 +1,64 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { useRef, useCallback, useState } from 'react';
+import { HttpSetup } from 'kibana/public';
+import { debounce } from 'lodash';
+
+import { API_BASE_PATH } from '../../../common/constants';
+import { Response, PayloadFormat, Payload } from '../types';
+import { formatRequestPayload } from '../lib/format';
+
+const DEBOUNCE_MS = 800;
+
+export const useSubmitCode = (http: HttpSetup) => {
+  const currentRequestIdRef = useRef(0);
+  const [response, setResponse] = useState<Response | undefined>(undefined);
+  const [inProgress, setInProgress] = useState(false);
+
+  const submit = useCallback(
+    debounce(
+      async (config: Payload) => {
+        setInProgress(true);
+
+        // Prevent an older request that resolves after a more recent request from clobbering it.
+        // We store the resulting ID in this closure for comparison when the request resolves.
+        const requestId = ++currentRequestIdRef.current;
+
+        try {
+          const result = await http.post(`${API_BASE_PATH}/execute`, {
+            // Stringify the string, because http runs it through JSON.parse, and we want to actually
+            // send a JSON string.
+            body: JSON.stringify(formatRequestPayload(config, PayloadFormat.UGLY)),
+          });
+
+          if (currentRequestIdRef.current === requestId) {
+            setResponse(result);
+            setInProgress(false);
+          }
+          // else ignore this response...
+        } catch (error) {
+          if (currentRequestIdRef.current === requestId) {
+            setResponse({
+              error,
+            });
+            setInProgress(false);
+          }
+          // else ignore this response...
+        }
+      },
+      DEBOUNCE_MS,
+      { trailing: true }
+    ),
+    [http]
+  );
+
+  return {
+    response,
+    inProgress,
+    submit,
+  };
+};
diff --git a/x-pack/plugins/painless_lab/public/application/index.tsx b/x-pack/plugins/painless_lab/public/application/index.tsx
new file mode 100644
index 0000000000000..ebcb84bbce83c
--- /dev/null
+++ b/x-pack/plugins/painless_lab/public/application/index.tsx
@@ -0,0 +1,46 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React from 'react';
+import { render, unmountComponentAtNode } from 'react-dom';
+import { CoreSetup, CoreStart } from 'kibana/public';
+import { HttpSetup, ChromeStart } from 'src/core/public';
+import { createKibanaReactContext } from '../../../../../src/plugins/kibana_react/public';
+
+import { Links } from '../links';
+import { AppContextProvider } from './context';
+import { Main } from './components/main';
+
+interface AppDependencies {
+  http: HttpSetup;
+  I18nContext: CoreStart['i18n']['Context'];
+  uiSettings: CoreSetup['uiSettings'];
+  links: Links;
+  chrome: ChromeStart;
+}
+
+export function renderApp(
+  element: HTMLElement | null,
+  { http, I18nContext, uiSettings, links, chrome }: AppDependencies
+) {
+  if (!element) {
+    return () => undefined;
+  }
+  const { Provider: KibanaReactContextProvider } = createKibanaReactContext({
+    uiSettings,
+  });
+  render(
+    <I18nContext>
+      <KibanaReactContextProvider>
+        <AppContextProvider value={{ http, links, chrome }}>
+          <Main />
+        </AppContextProvider>
+      </KibanaReactContextProvider>
+    </I18nContext>,
+    element
+  );
+  return () => unmountComponentAtNode(element);
+}
diff --git a/x-pack/plugins/painless_lab/public/application/lib/__snapshots__/format.test.ts.snap b/x-pack/plugins/painless_lab/public/application/lib/__snapshots__/format.test.ts.snap
new file mode 100644
index 0000000000000..4df90d1b3abe1
--- /dev/null
+++ b/x-pack/plugins/painless_lab/public/application/lib/__snapshots__/format.test.ts.snap
@@ -0,0 +1,205 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`formatRequestPayload pretty formats a complex multi-line script 1`] = `
+"{
+  \\"script\\": {
+    \\"source\\": \\"\\"\\"// Here's a comment and a variable, then a loop.
+    double halfWidth = Math.floor(width * 0.5);
+    for (int y = 0; y < height; y++) {
+      return \\"results here\\\\\\\\n\\";
+    }
+    
+    return result;\\"\\"\\"
+  }
+}"
+`;
+
+exports[`formatRequestPayload pretty formats a single-line script 1`] = `
+"{
+  \\"script\\": {
+    \\"source\\": \\"\\"\\"return \\"ok\\";\\"\\"\\"
+  }
+}"
+`;
+
+exports[`formatRequestPayload pretty formats code and parameters 1`] = `
+"{
+  \\"script\\": {
+    \\"source\\": \\"\\"\\"return \\"ok\\";\\"\\"\\",
+    \\"params\\": {
+      \\"a\\": {
+        \\"b\\": \\"c\\",
+        \\"d\\": \\"e\\"
+      }
+    }
+  }
+}"
+`;
+
+exports[`formatRequestPayload pretty formats code, context, index, and document 1`] = `
+"{
+  \\"script\\": {
+    \\"source\\": \\"\\"\\"return \\"ok\\";\\"\\"\\"
+  },
+  \\"context\\": \\"filter\\",
+  \\"context_setup\\": {
+    \\"index\\": \\"index\\",
+    \\"document\\": {
+      \\"a\\": {
+        \\"b\\": \\"c\\",
+        \\"d\\": \\"e\\"
+      }
+    }
+  }
+}"
+`;
+
+exports[`formatRequestPayload pretty formats code, parameters, and context 1`] = `
+"{
+  \\"script\\": {
+    \\"source\\": \\"\\"\\"return \\"ok\\";\\"\\"\\",
+    \\"params\\": {
+      \\"a\\": {
+        \\"b\\": \\"c\\",
+        \\"d\\": \\"e\\"
+      }
+    }
+  },
+  \\"context\\": \\"filter\\",
+  \\"context_setup\\": {
+    \\"index\\": \\"\\",
+    \\"document\\": 
+  }
+}"
+`;
+
+exports[`formatRequestPayload pretty formats code, parameters, context, index, and document 1`] = `
+"{
+  \\"script\\": {
+    \\"source\\": \\"\\"\\"return \\"ok\\";\\"\\"\\",
+    \\"params\\": {
+      \\"a\\": {
+        \\"b\\": \\"c\\",
+        \\"d\\": \\"e\\"
+      }
+    }
+  },
+  \\"context\\": \\"filter\\",
+  \\"context_setup\\": {
+    \\"index\\": \\"index\\",
+    \\"document\\": {
+      \\"a\\": {
+        \\"b\\": \\"c\\",
+        \\"d\\": \\"e\\"
+      }
+    }
+  }
+}"
+`;
+
+exports[`formatRequestPayload pretty formats no script 1`] = `
+"{
+  \\"script\\": {
+    \\"source\\": \\"\\"\\"\\"\\"\\"
+  }
+}"
+`;
+
+exports[`formatRequestPayload ugly formats a complex multi-line script 1`] = `
+"{
+  \\"script\\": {
+    \\"source\\": \\"// Here's a comment and a variable, then a loop.\\\\ndouble halfWidth = Math.floor(width * 0.5);\\\\nfor (int y = 0; y < height; y++) {\\\\n  return \\\\\\"results here\\\\\\\\\\\\\\\\n\\\\\\";\\\\n}\\\\n\\\\nreturn result;\\"
+  }
+}"
+`;
+
+exports[`formatRequestPayload ugly formats a single-line script 1`] = `
+"{
+  \\"script\\": {
+    \\"source\\": \\"return \\\\\\"ok\\\\\\";\\"
+  }
+}"
+`;
+
+exports[`formatRequestPayload ugly formats code and parameters 1`] = `
+"{
+  \\"script\\": {
+    \\"source\\": \\"return \\\\\\"ok\\\\\\";\\",
+    \\"params\\": {
+  \\"a\\": {
+    \\"b\\": \\"c\\",
+    \\"d\\": \\"e\\"
+  }
+}
+  }
+}"
+`;
+
+exports[`formatRequestPayload ugly formats code, context, index, and document 1`] = `
+"{
+  \\"script\\": {
+    \\"source\\": \\"return \\\\\\"ok\\\\\\";\\"
+  },
+  \\"context\\": \\"filter\\",
+  \\"context_setup\\": {
+    \\"index\\": \\"index\\",
+    \\"document\\": {
+  \\"a\\": {
+    \\"b\\": \\"c\\",
+    \\"d\\": \\"e\\"
+  }
+}
+  }
+}"
+`;
+
+exports[`formatRequestPayload ugly formats code, parameters, and context 1`] = `
+"{
+  \\"script\\": {
+    \\"source\\": \\"return \\\\\\"ok\\\\\\";\\",
+    \\"params\\": {
+  \\"a\\": {
+    \\"b\\": \\"c\\",
+    \\"d\\": \\"e\\"
+  }
+}
+  },
+  \\"context\\": \\"filter\\",
+  \\"context_setup\\": {
+    \\"index\\": \\"undefined\\",
+    \\"document\\": undefined
+  }
+}"
+`;
+
+exports[`formatRequestPayload ugly formats code, parameters, context, index, and document 1`] = `
+"{
+  \\"script\\": {
+    \\"source\\": \\"return \\\\\\"ok\\\\\\";\\",
+    \\"params\\": {
+  \\"a\\": {
+    \\"b\\": \\"c\\",
+    \\"d\\": \\"e\\"
+  }
+}
+  },
+  \\"context\\": \\"filter\\",
+  \\"context_setup\\": {
+    \\"index\\": \\"index\\",
+    \\"document\\": {
+  \\"a\\": {
+    \\"b\\": \\"c\\",
+    \\"d\\": \\"e\\"
+  }
+}
+  }
+}"
+`;
+
+exports[`formatRequestPayload ugly formats no script 1`] = `
+"{
+  \\"script\\": {
+    \\"source\\": undefined
+  }
+}"
+`;
diff --git a/x-pack/plugins/painless_lab/public/application/lib/format.test.ts b/x-pack/plugins/painless_lab/public/application/lib/format.test.ts
new file mode 100644
index 0000000000000..5f0022ebbc089
--- /dev/null
+++ b/x-pack/plugins/painless_lab/public/application/lib/format.test.ts
@@ -0,0 +1,86 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { PayloadFormat } from '../types';
+import { formatRequestPayload } from './format';
+
+describe('formatRequestPayload', () => {
+  Object.values(PayloadFormat).forEach(format => {
+    describe(`${format} formats`, () => {
+      test('no script', () => {
+        expect(formatRequestPayload({}, format)).toMatchSnapshot();
+      });
+
+      test('a single-line script', () => {
+        const code = 'return "ok";';
+        expect(formatRequestPayload({ code }, format)).toMatchSnapshot();
+      });
+
+      test('a complex multi-line script', () => {
+        const code = `// Here's a comment and a variable, then a loop.
+double halfWidth = Math.floor(width * 0.5);
+for (int y = 0; y < height; y++) {
+  return "results here\\\\n";
+}
+
+return result;`;
+        expect(formatRequestPayload({ code }, format)).toMatchSnapshot();
+      });
+
+      test('code and parameters', () => {
+        const code = 'return "ok";';
+        const parameters = `{
+  "a": {
+    "b": "c",
+    "d": "e"
+  }
+}`;
+        expect(formatRequestPayload({ code, parameters }, format)).toMatchSnapshot();
+      });
+
+      test('code, parameters, and context', () => {
+        const code = 'return "ok";';
+        const parameters = `{
+  "a": {
+    "b": "c",
+    "d": "e"
+  }
+}`;
+        const context = 'filter';
+        expect(formatRequestPayload({ code, parameters, context }, format)).toMatchSnapshot();
+      });
+
+      test('code, context, index, and document', () => {
+        const code = 'return "ok";';
+        const context = 'filter';
+        const index = 'index';
+        const document = `{
+  "a": {
+    "b": "c",
+    "d": "e"
+  }
+}`;
+        expect(formatRequestPayload({ code, context, index, document }, format)).toMatchSnapshot();
+      });
+
+      test('code, parameters, context, index, and document', () => {
+        const code = 'return "ok";';
+        const parameters = `{
+  "a": {
+    "b": "c",
+    "d": "e"
+  }
+}`;
+        const context = 'filter';
+        const index = 'index';
+        const document = parameters;
+        expect(
+          formatRequestPayload({ code, parameters, context, index, document }, format)
+        ).toMatchSnapshot();
+      });
+    });
+  });
+});
diff --git a/x-pack/plugins/painless_lab/public/application/lib/format.ts b/x-pack/plugins/painless_lab/public/application/lib/format.ts
new file mode 100644
index 0000000000000..15ecdf682d247
--- /dev/null
+++ b/x-pack/plugins/painless_lab/public/application/lib/format.ts
@@ -0,0 +1,117 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { Response, ExecutionError, PayloadFormat, Payload } from '../types';
+
+function prettifyPayload(payload = '', indentationLevel = 0) {
+  const indentation = new Array(indentationLevel + 1).join(' ');
+  return payload.replace(/\n/g, `\n${indentation}`);
+}
+
+/**
+ * Values should be preserved as strings so that floating point precision,
+ * e.g. 1.0, is preserved instead of being coerced to an integer, e.g. 1.
+ */
+export function formatRequestPayload(
+  { code, context, parameters, index, document, query }: Partial<Payload>,
+  format: PayloadFormat = PayloadFormat.UGLY
+): string {
+  const isAdvancedContext = context === 'filter' || context === 'score';
+
+  let formattedCode: string | undefined;
+  let formattedParameters: string | undefined;
+  let formattedContext: string | undefined;
+  let formattedIndex: string | undefined;
+  let formattedDocument: string | undefined;
+  let formattedQuery: string | undefined;
+
+  if (format === PayloadFormat.UGLY) {
+    formattedCode = JSON.stringify(code);
+    formattedParameters = parameters;
+    formattedContext = context;
+    formattedIndex = index;
+    formattedDocument = document;
+    formattedQuery = query;
+  } else {
+    // Triple quote the code because it's multiline.
+    formattedCode = `"""${prettifyPayload(code, 4)}"""`;
+    formattedParameters = prettifyPayload(parameters, 4);
+    formattedContext = prettifyPayload(context, 6);
+    formattedIndex = prettifyPayload(index);
+    formattedDocument = prettifyPayload(document, 4);
+    formattedQuery = prettifyPayload(query, 4);
+  }
+
+  const requestPayload = `{
+  "script": {
+    "source": ${formattedCode}${
+    parameters
+      ? `,
+    "params": ${formattedParameters}`
+      : ``
+  }
+  }${
+    isAdvancedContext
+      ? `,
+  "context": "${formattedContext}",
+  "context_setup": {
+    "index": "${formattedIndex}",
+    "document": ${formattedDocument}${
+          query && context === 'score'
+            ? `,
+    "query": ${formattedQuery}`
+            : ''
+        }
+  }`
+      : ``
+  }
+}`;
+  return requestPayload;
+}
+
+/**
+ * Stringify a given object to JSON in a formatted way
+ */
+export function formatJson(json: unknown): string {
+  try {
+    return JSON.stringify(json, null, 2);
+  } catch (e) {
+    return `Invalid JSON ${String(json)}`;
+  }
+}
+
+export function formatResponse(response?: Response): string {
+  if (!response) {
+    return '';
+  }
+  if (typeof response.result === 'string') {
+    return response.result.replace(/\\n/g, '\n');
+  } else if (response.error) {
+    return formatExecutionError(response.error);
+  }
+  return formatJson(response);
+}
+
+export function formatExecutionError(executionErrorOrError: ExecutionError | Error): string {
+  if (executionErrorOrError instanceof Error) {
+    return executionErrorOrError.message;
+  }
+
+  if (
+    executionErrorOrError.script_stack &&
+    executionErrorOrError.caused_by &&
+    executionErrorOrError.position
+  ) {
+    return `Unhandled Exception ${executionErrorOrError.caused_by.type}
+
+${executionErrorOrError.caused_by.reason}
+
+Stack:
+${formatJson(executionErrorOrError.script_stack)}
+`;
+  }
+  return formatJson(executionErrorOrError);
+}
diff --git a/x-pack/plugins/painless_lab/public/application/types.ts b/x-pack/plugins/painless_lab/public/application/types.ts
new file mode 100644
index 0000000000000..d800558ef7ecc
--- /dev/null
+++ b/x-pack/plugins/painless_lab/public/application/types.ts
@@ -0,0 +1,58 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+export interface Store {
+  payload: Payload;
+  validation: Validation;
+}
+
+export interface Payload {
+  context: string;
+  code: string;
+  parameters: string;
+  index: string;
+  document: string;
+  query: string;
+}
+
+export interface Validation {
+  isValid: boolean;
+  fields: {
+    index: boolean;
+  };
+}
+
+// TODO: This should be an enumerated list
+export type Context = string;
+
+export enum PayloadFormat {
+  UGLY = 'ugly',
+  PRETTY = 'pretty',
+}
+
+export interface Response {
+  error?: ExecutionError | Error;
+  result?: string;
+}
+
+export type ExecutionErrorScriptStack = string[];
+
+export interface ExecutionErrorPosition {
+  start: number;
+  end: number;
+  offset: number;
+}
+
+export interface ExecutionError {
+  script_stack?: ExecutionErrorScriptStack;
+  caused_by?: {
+    type: string;
+    reason: string;
+  };
+  message?: string;
+  position: ExecutionErrorPosition;
+  script: string;
+}
diff --git a/x-pack/plugins/painless_lab/public/index.scss b/x-pack/plugins/painless_lab/public/index.scss
new file mode 100644
index 0000000000000..29a5761255278
--- /dev/null
+++ b/x-pack/plugins/painless_lab/public/index.scss
@@ -0,0 +1 @@
+@import 'styles/index';
diff --git a/x-pack/plugins/painless_lab/public/index.ts b/x-pack/plugins/painless_lab/public/index.ts
new file mode 100644
index 0000000000000..da357e52af676
--- /dev/null
+++ b/x-pack/plugins/painless_lab/public/index.ts
@@ -0,0 +1,12 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import './styles/_index.scss';
+import { PainlessLabUIPlugin } from './plugin';
+
+export function plugin() {
+  return new PainlessLabUIPlugin();
+}
diff --git a/x-pack/plugins/painless_lab/public/lib/index.ts b/x-pack/plugins/painless_lab/public/lib/index.ts
new file mode 100644
index 0000000000000..2421307b7c107
--- /dev/null
+++ b/x-pack/plugins/painless_lab/public/lib/index.ts
@@ -0,0 +1,7 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+export { monacoPainlessLang } from './monaco_painless_lang';
diff --git a/x-pack/plugins/painless_lab/public/lib/monaco_painless_lang.ts b/x-pack/plugins/painless_lab/public/lib/monaco_painless_lang.ts
new file mode 100644
index 0000000000000..602697064a768
--- /dev/null
+++ b/x-pack/plugins/painless_lab/public/lib/monaco_painless_lang.ts
@@ -0,0 +1,174 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import * as monaco from 'monaco-editor';
+
+/**
+ * Extends the default type for a Monarch language so we can use
+ * attribute references (like @keywords to reference the keywords list)
+ * in the defined tokenizer
+ */
+interface Language extends monaco.languages.IMonarchLanguage {
+  default: string;
+  brackets: any;
+  keywords: string[];
+  symbols: RegExp;
+  escapes: RegExp;
+  digits: RegExp;
+  primitives: string[];
+  octaldigits: RegExp;
+  binarydigits: RegExp;
+  constants: string[];
+  operators: string[];
+}
+
+export const monacoPainlessLang = {
+  default: '',
+  // painless does not use < >, so we define our own
+  brackets: [
+    ['{', '}', 'delimiter.curly'],
+    ['[', ']', 'delimiter.square'],
+    ['(', ')', 'delimiter.parenthesis'],
+  ],
+  keywords: [
+    'if',
+    'in',
+    'else',
+    'while',
+    'do',
+    'for',
+    'continue',
+    'break',
+    'return',
+    'new',
+    'try',
+    'catch',
+    'throw',
+    'this',
+    'instanceof',
+  ],
+  primitives: ['void', 'boolean', 'byte', 'short', 'char', 'int', 'long', 'float', 'double', 'def'],
+  constants: ['true', 'false'],
+  operators: [
+    '=',
+    '>',
+    '<',
+    '!',
+    '~',
+    '?',
+    '?:',
+    '?.',
+    ':',
+    '==',
+    '===',
+    '<=',
+    '>=',
+    '!=',
+    '!==',
+    '&&',
+    '||',
+    '++',
+    '--',
+    '+',
+    '-',
+    '*',
+    '/',
+    '&',
+    '|',
+    '^',
+    '%',
+    '<<',
+    '>>',
+    '>>>',
+    '+=',
+    '-=',
+    '*=',
+    '/=',
+    '&=',
+    '|=',
+    '^=',
+    '%=',
+    '<<=',
+    '>>=',
+    '>>>=',
+    '->',
+    '::',
+    '=~',
+    '==~',
+  ],
+  symbols: /[=><!~?:&|+\-*\/^%]+/,
+  escapes: /\\(?:[abfnrtv\\"']|x[0-9A-Fa-f]{1,4}|u[0-9A-Fa-f]{4}|U[0-9A-Fa-f]{8})/,
+  digits: /\d+(_+\d+)*/,
+  octaldigits: /[0-7]+(_+[0-7]+)*/,
+  binarydigits: /[0-1]+(_+[0-1]+)*/,
+  hexdigits: /[[0-9a-fA-F]+(_+[0-9a-fA-F]+)*/,
+  tokenizer: {
+    root: [
+      // identifiers and keywords
+      [
+        /[a-zA-Z_][\w]*/,
+        {
+          cases: {
+            '@keywords': 'keyword',
+            '@primitives': 'type',
+            '@constants': 'constant',
+            '@default': 'identifier',
+          },
+        },
+      ],
+      // whitespace
+      [/[ \t\r\n]+/, '@whitespace'],
+      // comments
+      // [/\/\*/, 'comment', '@comment'],
+      [/\/\/.*$/, 'comment'],
+      // brackets
+      [/[{}()\[\]]/, '@brackets'],
+      // operators
+      [
+        /@symbols/,
+        {
+          cases: {
+            '@operators': 'operators',
+            '@default': '',
+          },
+        },
+      ],
+      // numbers
+      [/(@digits)[eE]([\-+]?(@digits))?[fFdD]?/, 'number.float'],
+      [/(@digits)\.(@digits)([eE][\-+]?(@digits))?[fFdD]?/, 'number.float'],
+      [/0[xX](@hexdigits)[Ll]?/, 'number.hex'],
+      [/0(@octaldigits)[Ll]?/, 'number.octal'],
+      [/0[bB](@binarydigits)[Ll]?/, 'number.binary'],
+      [/(@digits)[fFdD]/, 'number.float'],
+      [/(@digits)[lL]?/, 'number'],
+      // delimiter: after numbers due to conflict with decimals and dot
+      [/[;,.]/, 'delimiter'],
+      // strings double quoted
+      [/"([^"\\]|\\.)*$/, 'string.invalid'], // string without termination
+      [/"/, 'string', '@string_dq'],
+      // strings single quoted
+      [/'([^'\\]|\\.)*$/, 'string.invalid'], // string without termination
+      [/'/, 'string', '@string_sq'],
+    ],
+    comment: [
+      [/[^\/*]+/, 'comment'],
+      [/\*\//, 'comment', '@pop'],
+      [/[\/*]/, 'comment'],
+    ],
+    string_dq: [
+      [/[^\\"]+/, 'string'],
+      [/@escapes/, 'string.escape'],
+      [/\\./, 'string.escape.invalid'],
+      [/"/, 'string', '@pop'],
+    ],
+    string_sq: [
+      [/[^\\']+/, 'string'],
+      [/@escapes/, 'string.escape'],
+      [/\\./, 'string.escape.invalid'],
+      [/'/, 'string', '@pop'],
+    ],
+  },
+} as Language;
diff --git a/x-pack/plugins/painless_lab/public/links.ts b/x-pack/plugins/painless_lab/public/links.ts
new file mode 100644
index 0000000000000..8f610140c3f34
--- /dev/null
+++ b/x-pack/plugins/painless_lab/public/links.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 { DocLinksStart } from 'src/core/public';
+
+export type Links = ReturnType<typeof getLinks>;
+
+export const getLinks = ({ DOC_LINK_VERSION, ELASTIC_WEBSITE_URL }: DocLinksStart) =>
+  Object.freeze({
+    painlessExecuteAPI: `${ELASTIC_WEBSITE_URL}guide/en/elasticsearch/painless/${DOC_LINK_VERSION}/painless-execute-api.html`,
+    painlessExecuteAPIContexts: `${ELASTIC_WEBSITE_URL}guide/en/elasticsearch/painless/${DOC_LINK_VERSION}/painless-execute-api.html#_contexts`,
+    painlessAPIReference: `${ELASTIC_WEBSITE_URL}guide/en/elasticsearch/painless/${DOC_LINK_VERSION}/painless-api-reference.html`,
+    painlessWalkthrough: `${ELASTIC_WEBSITE_URL}guide/en/elasticsearch/painless/${DOC_LINK_VERSION}/painless-walkthrough.html`,
+    painlessLangSpec: `${ELASTIC_WEBSITE_URL}guide/en/elasticsearch/painless/${DOC_LINK_VERSION}/painless-lang-spec.html`,
+    esQueryDSL: `${ELASTIC_WEBSITE_URL}guide/en/elasticsearch/reference/${DOC_LINK_VERSION}/query-dsl.html`,
+    modulesScriptingPreferParams: `${ELASTIC_WEBSITE_URL}guide/en/elasticsearch/reference/${DOC_LINK_VERSION}/modules-scripting-using.html#prefer-params`,
+  });
diff --git a/x-pack/plugins/painless_lab/public/plugin.tsx b/x-pack/plugins/painless_lab/public/plugin.tsx
new file mode 100644
index 0000000000000..b9ca7031cf670
--- /dev/null
+++ b/x-pack/plugins/painless_lab/public/plugin.tsx
@@ -0,0 +1,114 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * 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 { Plugin, CoreStart, CoreSetup } from 'kibana/public';
+import { first } from 'rxjs/operators';
+import { EuiBetaBadge, EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
+
+import { FeatureCatalogueCategory } from '../../../../src/plugins/home/public';
+import { LICENSE_CHECK_STATE } from '../../licensing/public';
+
+import { PLUGIN } from '../common/constants';
+
+import { PluginDependencies } from './types';
+import { getLinks } from './links';
+import { LanguageService } from './services';
+
+export class PainlessLabUIPlugin implements Plugin<void, void, PluginDependencies> {
+  languageService = new LanguageService();
+
+  async setup(
+    { http, getStartServices, uiSettings }: CoreSetup,
+    { devTools, home, licensing }: PluginDependencies
+  ) {
+    home.featureCatalogue.register({
+      id: PLUGIN.id,
+      title: i18n.translate('xpack.painlessLab.registryProviderTitle', {
+        defaultMessage: 'Painless Lab (beta)',
+      }),
+      description: i18n.translate('xpack.painlessLab.registryProviderDescription', {
+        defaultMessage: 'Simulate and debug painless code.',
+      }),
+      icon: '',
+      path: '/app/kibana#/dev_tools/painless_lab',
+      showOnHomePage: false,
+      category: FeatureCatalogueCategory.ADMIN,
+    });
+
+    devTools.register({
+      id: 'painless_lab',
+      order: 7,
+      title: (
+        <EuiFlexGroup gutterSize="s" alignItems="center" responsive={false}>
+          <EuiFlexItem grow={false}>
+            {i18n.translate('xpack.painlessLab.displayName', {
+              defaultMessage: 'Painless Lab',
+            })}
+          </EuiFlexItem>
+
+          <EuiFlexItem grow={false} className="painlessLab__betaLabelContainer">
+            <EuiBetaBadge
+              label={i18n.translate('xpack.painlessLab.displayNameBetaLabel', {
+                defaultMessage: 'Beta',
+              })}
+              tooltipContent={i18n.translate('xpack.painlessLab.displayNameBetaTooltipText', {
+                defaultMessage: 'This feature might change drastically in future releases',
+              })}
+            />
+          </EuiFlexItem>
+        </EuiFlexGroup>
+      ) as any,
+      enableRouting: false,
+      disabled: false,
+      mount: async (ctx, { element }) => {
+        const [core] = await getStartServices();
+
+        const {
+          i18n: { Context: I18nContext },
+          notifications,
+          docLinks,
+          chrome,
+        } = core;
+
+        this.languageService.setup();
+
+        const license = await licensing.license$.pipe(first()).toPromise();
+        const { state, message: invalidLicenseMessage } = license.check(
+          PLUGIN.id,
+          PLUGIN.minimumLicenseType
+        );
+        const isValidLicense = state === LICENSE_CHECK_STATE.Valid;
+
+        if (!isValidLicense) {
+          notifications.toasts.addDanger(invalidLicenseMessage as string);
+          window.location.hash = '/dev_tools';
+          return () => {};
+        }
+
+        const { renderApp } = await import('./application');
+        const tearDownApp = renderApp(element, {
+          I18nContext,
+          http,
+          uiSettings,
+          links: getLinks(docLinks),
+          chrome,
+        });
+
+        return () => {
+          tearDownApp();
+        };
+      },
+    });
+  }
+
+  async start(core: CoreStart, plugins: any) {}
+
+  async stop() {
+    this.languageService.stop();
+  }
+}
diff --git a/x-pack/plugins/painless_lab/public/services/index.ts b/x-pack/plugins/painless_lab/public/services/index.ts
new file mode 100644
index 0000000000000..20bec9de24550
--- /dev/null
+++ b/x-pack/plugins/painless_lab/public/services/index.ts
@@ -0,0 +1,7 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+export { LanguageService } from './language_service';
diff --git a/x-pack/plugins/painless_lab/public/services/language_service.ts b/x-pack/plugins/painless_lab/public/services/language_service.ts
new file mode 100644
index 0000000000000..efff9cd0e78d5
--- /dev/null
+++ b/x-pack/plugins/painless_lab/public/services/language_service.ts
@@ -0,0 +1,45 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+// It is important that we use this specific monaco instance so that
+// editor settings are registered against the instance our React component
+// uses.
+import { monaco } from '@kbn/ui-shared-deps/monaco';
+
+// @ts-ignore
+import workerSrc from 'raw-loader!monaco-editor/min/vs/base/worker/workerMain.js';
+
+import { monacoPainlessLang } from '../lib';
+
+const LANGUAGE_ID = 'painless';
+
+// Safely check whether these globals are present
+const CAN_CREATE_WORKER = typeof Blob === 'function' && typeof Worker === 'function';
+
+export class LanguageService {
+  private originalMonacoEnvironment: any;
+
+  public setup() {
+    monaco.languages.register({ id: LANGUAGE_ID });
+    monaco.languages.setMonarchTokensProvider(LANGUAGE_ID, monacoPainlessLang);
+
+    if (CAN_CREATE_WORKER) {
+      this.originalMonacoEnvironment = (window as any).MonacoEnvironment;
+      (window as any).MonacoEnvironment = {
+        getWorker: () => {
+          const blob = new Blob([workerSrc], { type: 'application/javascript' });
+          return new Worker(window.URL.createObjectURL(blob));
+        },
+      };
+    }
+  }
+
+  public stop() {
+    if (CAN_CREATE_WORKER) {
+      (window as any).MonacoEnvironment = this.originalMonacoEnvironment;
+    }
+  }
+}
diff --git a/x-pack/plugins/painless_lab/public/styles/_index.scss b/x-pack/plugins/painless_lab/public/styles/_index.scss
new file mode 100644
index 0000000000000..f68dbe302511a
--- /dev/null
+++ b/x-pack/plugins/painless_lab/public/styles/_index.scss
@@ -0,0 +1,58 @@
+@import '@elastic/eui/src/components/header/variables';
+@import '@elastic/eui/src/components/nav_drawer/variables';
+
+/**
+ * This is a very brittle way of preventing the editor and other content from disappearing
+ * behind the bottom bar.
+ */
+$bottomBarHeight:  calc(#{$euiSize} * 3);
+
+.painlessLabBottomBarPlaceholder {
+  height: $bottomBarHeight
+}
+
+.painlessLabRightPane {
+  border-right: none;
+  border-top: none;
+  border-bottom: none;
+  border-radius: 0;
+  padding-top: 0;
+  height: 100%;
+}
+
+.painlessLabRightPane__tabs {
+  display: flex;
+  flex-direction: column;
+  height: 100%;
+
+  [role="tabpanel"] {
+    height: 100%;
+    overflow-y: auto;
+  }
+}
+
+.painlessLab__betaLabelContainer {
+  line-height: 0;
+}
+
+.painlessLabMainContainer {
+  height: calc(100vh - calc(#{$euiHeaderChildSize} * 2) - #{$bottomBarHeight});
+}
+
+.painlessLabPanelsContainer {
+  // The panels container should adopt the height of the main container
+  height: 100%;
+}
+
+/**
+ * 1. Hack EUI so the bottom bar doesn't obscure the nav drawer flyout, but is also not obscured
+ *    by the main content area.
+ */
+.painlessLab__bottomBar {
+  z-index: 5; /* 1 */
+  left: $euiNavDrawerWidthCollapsed;
+}
+
+.painlessLab__bottomBar-isNavDrawerLocked {
+  left: $euiNavDrawerWidthExpanded;
+}
diff --git a/x-pack/plugins/painless_lab/public/types.ts b/x-pack/plugins/painless_lab/public/types.ts
new file mode 100644
index 0000000000000..9153f4c28de8d
--- /dev/null
+++ b/x-pack/plugins/painless_lab/public/types.ts
@@ -0,0 +1,15 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { HomePublicPluginSetup } from '../../../../src/plugins/home/public';
+import { DevToolsSetup } from '../../../../src/plugins/dev_tools/public';
+import { LicensingPluginSetup } from '../../licensing/public';
+
+export interface PluginDependencies {
+  licensing: LicensingPluginSetup;
+  home: HomePublicPluginSetup;
+  devTools: DevToolsSetup;
+}
diff --git a/x-pack/plugins/painless_lab/server/index.ts b/x-pack/plugins/painless_lab/server/index.ts
new file mode 100644
index 0000000000000..96ea9a163deca
--- /dev/null
+++ b/x-pack/plugins/painless_lab/server/index.ts
@@ -0,0 +1,11 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+import { PluginInitializerContext } from 'kibana/server';
+import { PainlessLabServerPlugin } from './plugin';
+
+export const plugin = (ctx: PluginInitializerContext) => {
+  return new PainlessLabServerPlugin(ctx);
+};
diff --git a/x-pack/plugins/painless_lab/server/lib/index.ts b/x-pack/plugins/painless_lab/server/lib/index.ts
new file mode 100644
index 0000000000000..a9a3c61472d8c
--- /dev/null
+++ b/x-pack/plugins/painless_lab/server/lib/index.ts
@@ -0,0 +1,7 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+export { isEsError } from './is_es_error';
diff --git a/x-pack/plugins/painless_lab/server/lib/is_es_error.ts b/x-pack/plugins/painless_lab/server/lib/is_es_error.ts
new file mode 100644
index 0000000000000..4137293cf39c0
--- /dev/null
+++ b/x-pack/plugins/painless_lab/server/lib/is_es_error.ts
@@ -0,0 +1,13 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import * as legacyElasticsearch from 'elasticsearch';
+
+const esErrorsParent = legacyElasticsearch.errors._Abstract;
+
+export function isEsError(err: Error) {
+  return err instanceof esErrorsParent;
+}
diff --git a/x-pack/plugins/painless_lab/server/plugin.ts b/x-pack/plugins/painless_lab/server/plugin.ts
new file mode 100644
index 0000000000000..74629a0b035ed
--- /dev/null
+++ b/x-pack/plugins/painless_lab/server/plugin.ts
@@ -0,0 +1,47 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { i18n } from '@kbn/i18n';
+import { CoreSetup, Logger, Plugin, PluginInitializerContext } from 'kibana/server';
+
+import { PLUGIN } from '../common/constants';
+import { License } from './services';
+import { Dependencies } from './types';
+import { registerExecuteRoute } from './routes/api';
+
+export class PainlessLabServerPlugin implements Plugin {
+  private readonly license: License;
+  private readonly logger: Logger;
+
+  constructor({ logger }: PluginInitializerContext) {
+    this.logger = logger.get();
+    this.license = new License();
+  }
+
+  async setup({ http }: CoreSetup, { licensing }: Dependencies) {
+    const router = http.createRouter();
+
+    this.license.setup(
+      {
+        pluginId: PLUGIN.id,
+        minimumLicenseType: PLUGIN.minimumLicenseType,
+        defaultErrorMessage: i18n.translate('xpack.painlessLab.licenseCheckErrorMessage', {
+          defaultMessage: 'License check failed',
+        }),
+      },
+      {
+        licensing,
+        logger: this.logger,
+      }
+    );
+
+    registerExecuteRoute({ router, license: this.license });
+  }
+
+  start() {}
+
+  stop() {}
+}
diff --git a/x-pack/plugins/painless_lab/server/routes/api/execute.ts b/x-pack/plugins/painless_lab/server/routes/api/execute.ts
new file mode 100644
index 0000000000000..55adb5e0410cc
--- /dev/null
+++ b/x-pack/plugins/painless_lab/server/routes/api/execute.ts
@@ -0,0 +1,46 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+import { schema } from '@kbn/config-schema';
+
+import { API_BASE_PATH } from '../../../common/constants';
+import { RouteDependencies } from '../../types';
+import { isEsError } from '../../lib';
+
+const bodySchema = schema.string();
+
+export function registerExecuteRoute({ router, license }: RouteDependencies) {
+  router.post(
+    {
+      path: `${API_BASE_PATH}/execute`,
+      validate: {
+        body: bodySchema,
+      },
+    },
+    license.guardApiRoute(async (ctx, req, res) => {
+      const body = req.body;
+
+      try {
+        const callAsCurrentUser = ctx.core.elasticsearch.dataClient.callAsCurrentUser;
+        const response = await callAsCurrentUser('scriptsPainlessExecute', {
+          body,
+        });
+
+        return res.ok({
+          body: response,
+        });
+      } catch (e) {
+        if (isEsError(e)) {
+          // Assume invalid painless script was submitted
+          // Return 200 with error object
+          return res.ok({
+            body: e.body,
+          });
+        }
+        return res.internalError({ body: e });
+      }
+    })
+  );
+}
diff --git a/x-pack/plugins/painless_lab/server/routes/api/index.ts b/x-pack/plugins/painless_lab/server/routes/api/index.ts
new file mode 100644
index 0000000000000..62f05971d59cc
--- /dev/null
+++ b/x-pack/plugins/painless_lab/server/routes/api/index.ts
@@ -0,0 +1,7 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+export { registerExecuteRoute } from './execute';
diff --git a/x-pack/plugins/painless_lab/server/services/index.ts b/x-pack/plugins/painless_lab/server/services/index.ts
new file mode 100644
index 0000000000000..b7a45e59549eb
--- /dev/null
+++ b/x-pack/plugins/painless_lab/server/services/index.ts
@@ -0,0 +1,7 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+export { License } from './license';
diff --git a/x-pack/plugins/painless_lab/server/services/license.ts b/x-pack/plugins/painless_lab/server/services/license.ts
new file mode 100644
index 0000000000000..1c9d77198f928
--- /dev/null
+++ b/x-pack/plugins/painless_lab/server/services/license.ts
@@ -0,0 +1,82 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+import { Logger } from 'src/core/server';
+import {
+  KibanaRequest,
+  KibanaResponseFactory,
+  RequestHandler,
+  RequestHandlerContext,
+} from 'kibana/server';
+
+import { LicensingPluginSetup } from '../../../licensing/server';
+import { LicenseType, LICENSE_CHECK_STATE } from '../../../licensing/common/types';
+
+export interface LicenseStatus {
+  isValid: boolean;
+  message?: string;
+}
+
+interface SetupSettings {
+  pluginId: string;
+  minimumLicenseType: LicenseType;
+  defaultErrorMessage: string;
+}
+
+export class License {
+  private licenseStatus: LicenseStatus = {
+    isValid: false,
+    message: 'Invalid License',
+  };
+
+  setup(
+    { pluginId, minimumLicenseType, defaultErrorMessage }: SetupSettings,
+    { licensing, logger }: { licensing: LicensingPluginSetup; logger: Logger }
+  ) {
+    licensing.license$.subscribe(license => {
+      const { state, message } = license.check(pluginId, minimumLicenseType);
+      const hasRequiredLicense = state === LICENSE_CHECK_STATE.Valid;
+
+      if (hasRequiredLicense) {
+        this.licenseStatus = { isValid: true };
+      } else {
+        this.licenseStatus = {
+          isValid: false,
+          message: message || defaultErrorMessage,
+        };
+        if (message) {
+          logger.info(message);
+        }
+      }
+    });
+  }
+
+  guardApiRoute<P, Q, B>(handler: RequestHandler<P, Q, B>) {
+    const license = this;
+
+    return function licenseCheck(
+      ctx: RequestHandlerContext,
+      request: KibanaRequest<P, Q, B>,
+      response: KibanaResponseFactory
+    ) {
+      const licenseStatus = license.getStatus();
+
+      if (!licenseStatus.isValid) {
+        return response.customError({
+          body: {
+            message: licenseStatus.message || '',
+          },
+          statusCode: 403,
+        });
+      }
+
+      return handler(ctx, request, response);
+    };
+  }
+
+  getStatus() {
+    return this.licenseStatus;
+  }
+}
diff --git a/x-pack/plugins/painless_lab/server/types.ts b/x-pack/plugins/painless_lab/server/types.ts
new file mode 100644
index 0000000000000..541a31dd175ec
--- /dev/null
+++ b/x-pack/plugins/painless_lab/server/types.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 { IRouter } from 'src/core/server';
+import { LicensingPluginSetup } from '../../licensing/server';
+import { License } from './services';
+
+export interface RouteDependencies {
+  router: IRouter;
+  license: License;
+}
+
+export interface Dependencies {
+  licensing: LicensingPluginSetup;
+}

From 81b372363367e8fe6085ecaf25b009d84674a1b2 Mon Sep 17 00:00:00 2001
From: Xavier Mouligneau <189600+XavierM@users.noreply.github.com>
Date: Mon, 23 Mar 2020 19:26:49 -0400
Subject: [PATCH 052/179] [SIEM] [CASES] Build lego blocks case details view
 (#60864)

* modify API to get the total comments in _find + Add user action to track what user are doing + create _pushed api to know when case have been pushed

* fix rebase

* add connector name in case configuration saved object

* fix total comment in all cases

* totalComment bug on the API

* integrate user action API with UI

* fix merged issue

* integration APi to push to services with UI

* Fix bugs

* wip to show pushed service in ui

* finish the full flow with pushing to service now

* review about client discrepency

* clean up + review

* merge issue

* update error msgs to info

* add aria label + fix but on add/remove tags

* fix i18n

Co-authored-by: Christos Nasikas <christos.nasikas@elastic.co>
---
 .../components/link_to/redirect_to_case.tsx   |   7 +-
 .../siem/public/components/links/index.tsx    |  28 ++-
 .../components/url_state/index.test.tsx       |   2 +-
 .../siem/public/components/url_state/types.ts |  16 +-
 .../siem/public/containers/case/api.ts        |  64 ++++++
 .../public/containers/case/configure/types.ts |   1 +
 .../case/configure/use_configure.tsx          |  27 ++-
 .../public/containers/case/translations.ts    |   7 +
 .../siem/public/containers/case/types.ts      |  34 ++-
 .../case/use_get_action_license.tsx           |  74 ++++++
 .../public/containers/case/use_get_case.tsx   |   3 +-
 .../case/use_get_case_user_actions.tsx        | 126 ++++++++++
 .../case/use_post_push_to_service.tsx         | 183 +++++++++++++++
 .../containers/case/use_update_case.tsx       |  13 +-
 .../containers/case/use_update_comment.tsx    |  12 +-
 .../siem/public/containers/case/utils.ts      |  16 ++
 .../case/components/add_comment/index.tsx     | 129 ++++++-----
 .../components/all_cases/__mock__/index.tsx   |  19 +-
 .../case/components/all_cases/columns.tsx     |   7 +-
 .../case/components/all_cases/index.test.tsx  |   4 +-
 .../pages/case/components/all_cases/index.tsx |  20 +-
 .../case/components/case_status/index.tsx     |  85 ++++---
 .../components/case_view/__mock__/index.tsx   |  24 +-
 .../case/components/case_view/index.test.tsx  |  42 +++-
 .../pages/case/components/case_view/index.tsx | 118 ++++++++--
 .../components/case_view/push_to_service.tsx  | 185 +++++++++++++++
 .../case/components/case_view/translations.ts |  96 +++++++-
 .../case/components/configure_cases/index.tsx |  10 +-
 .../errors_push_service_callout/index.tsx     |  33 +++
 .../translations.ts                           |  21 ++
 .../components/user_action_tree/helpers.tsx   |  75 ++++++
 .../components/user_action_tree/index.tsx     | 215 ++++++++++++++----
 .../user_action_tree/translations.ts          |  34 +++
 .../user_action_tree/user_action_item.tsx     | 134 ++++++++---
 .../user_action_tree/user_action_title.tsx    | 134 ++++++++---
 .../plugins/siem/public/pages/case/index.tsx  |   4 +
 .../siem/public/pages/case/translations.ts    |  38 +++-
 .../plugins/siem/public/pages/case/utils.ts   |   4 +-
 x-pack/plugins/case/common/api/cases/case.ts  |  85 ++++++-
 .../plugins/case/common/api/cases/comment.ts  |   2 +
 .../case/common/api/cases/configure.ts        |   1 +
 x-pack/plugins/case/common/api/cases/index.ts |   1 +
 .../case/common/api/cases/user_actions.ts     |  59 +++++
 x-pack/plugins/case/server/plugin.ts          |   7 +-
 .../routes/api/__fixtures__/mock_router.ts    |   4 +
 .../api/__fixtures__/mock_saved_objects.ts    |  16 +-
 .../api/cases/comments/delete_all_comments.ts |  29 ++-
 .../api/cases/comments/delete_comment.ts      |  46 ++--
 .../api/cases/comments/find_comments.ts       |   5 +-
 .../api/cases/comments/get_all_comment.ts     |   3 +-
 .../routes/api/cases/comments/get_comment.ts  |  11 -
 .../api/cases/comments/patch_comment.ts       |  50 ++--
 .../routes/api/cases/comments/post_comment.ts |  37 +--
 .../api/cases/configure/patch_configure.ts    |   3 +-
 .../api/cases/configure/post_configure.ts     |   3 +-
 .../server/routes/api/cases/delete_cases.ts   |  27 ++-
 .../server/routes/api/cases/find_cases.ts     |  39 +++-
 .../case/server/routes/api/cases/get_case.ts  |   5 +-
 .../case/server/routes/api/cases/helpers.ts   |  56 ++++-
 .../routes/api/cases/patch_cases.test.ts      |   6 +-
 .../server/routes/api/cases/patch_cases.ts    |  23 +-
 .../case/server/routes/api/cases/post_case.ts |  27 ++-
 .../case/server/routes/api/cases/push_case.ts | 176 ++++++++++++++
 .../api/cases/reporters/get_reporters.ts      |   3 +-
 .../routes/api/cases/status/get_status.ts     |   5 +-
 .../server/routes/api/cases/tags/get_tags.ts  |   3 +-
 .../user_actions/get_all_user_actions.ts      |  46 ++++
 .../plugins/case/server/routes/api/index.ts   |  16 +-
 .../plugins/case/server/routes/api/types.ts   |  12 +-
 .../plugins/case/server/routes/api/utils.ts   |  32 ++-
 .../case/server/saved_object_types/cases.ts   |  39 +++-
 .../server/saved_object_types/comments.ts     |  13 ++
 .../server/saved_object_types/configure.ts    |   9 +
 .../case/server/saved_object_types/index.ts   |   1 +
 .../server/saved_object_types/user_actions.ts |  47 ++++
 x-pack/plugins/case/server/services/index.ts  |  50 +++-
 .../server/services/user_actions/helpers.ts   | 195 ++++++++++++++++
 .../server/services/user_actions/index.ts     |  77 +++++++
 78 files changed, 2875 insertions(+), 438 deletions(-)
 create mode 100644 x-pack/legacy/plugins/siem/public/containers/case/use_get_action_license.tsx
 create mode 100644 x-pack/legacy/plugins/siem/public/containers/case/use_get_case_user_actions.tsx
 create mode 100644 x-pack/legacy/plugins/siem/public/containers/case/use_post_push_to_service.tsx
 create mode 100644 x-pack/legacy/plugins/siem/public/pages/case/components/case_view/push_to_service.tsx
 create mode 100644 x-pack/legacy/plugins/siem/public/pages/case/components/errors_push_service_callout/index.tsx
 create mode 100644 x-pack/legacy/plugins/siem/public/pages/case/components/errors_push_service_callout/translations.ts
 create mode 100644 x-pack/legacy/plugins/siem/public/pages/case/components/user_action_tree/helpers.tsx
 create mode 100644 x-pack/legacy/plugins/siem/public/pages/case/components/user_action_tree/translations.ts
 create mode 100644 x-pack/plugins/case/common/api/cases/user_actions.ts
 create mode 100644 x-pack/plugins/case/server/routes/api/cases/push_case.ts
 create mode 100644 x-pack/plugins/case/server/routes/api/cases/user_actions/get_all_user_actions.ts
 create mode 100644 x-pack/plugins/case/server/saved_object_types/user_actions.ts
 create mode 100644 x-pack/plugins/case/server/services/user_actions/helpers.ts
 create mode 100644 x-pack/plugins/case/server/services/user_actions/index.ts

diff --git a/x-pack/legacy/plugins/siem/public/components/link_to/redirect_to_case.tsx b/x-pack/legacy/plugins/siem/public/components/link_to/redirect_to_case.tsx
index 3056b166c1153..20ba0b50f5126 100644
--- a/x-pack/legacy/plugins/siem/public/components/link_to/redirect_to_case.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/link_to/redirect_to_case.tsx
@@ -31,6 +31,7 @@ export const RedirectToConfigureCasesPage = () => (
 const baseCaseUrl = `#/link-to/${SiemPageName.case}`;
 
 export const getCaseUrl = () => baseCaseUrl;
-export const getCaseDetailsUrl = (detailName: string) => `${baseCaseUrl}/${detailName}`;
-export const getCreateCaseUrl = () => `${baseCaseUrl}/create`;
-export const getConfigureCasesUrl = () => `${baseCaseUrl}/configure`;
+export const getCaseDetailsUrl = (detailName: string, search: string) =>
+  `${baseCaseUrl}/${detailName}${search}`;
+export const getCreateCaseUrl = (search: string) => `${baseCaseUrl}/create${search}`;
+export const getConfigureCasesUrl = (search: string) => `${baseCaseUrl}/configure${search}`;
diff --git a/x-pack/legacy/plugins/siem/public/components/links/index.tsx b/x-pack/legacy/plugins/siem/public/components/links/index.tsx
index 04de0b1d5d3bf..935df9ad3361f 100644
--- a/x-pack/legacy/plugins/siem/public/components/links/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/links/index.tsx
@@ -23,8 +23,10 @@ import {
 import { FlowTarget, FlowTargetSourceDest } from '../../graphql/types';
 import { useUiSetting$ } from '../../lib/kibana';
 import { IP_REPUTATION_LINKS_SETTING } from '../../../common/constants';
+import { navTabs } from '../../pages/home/home_navigations';
 import * as i18n from '../page/network/ip_overview/translations';
 import { isUrlInvalid } from '../../pages/detection_engine/rules/components/step_about_rule/helpers';
+import { useGetUrlSearch } from '../navigation/use_get_url_search';
 import { ExternalLinkIcon } from '../external_link_icon';
 
 export const DEFAULT_NUMBER_OF_LINK = 5;
@@ -89,20 +91,24 @@ export const IPDetailsLink = React.memo(IPDetailsLinkComponent);
 const CaseDetailsLinkComponent: React.FC<{ children?: React.ReactNode; detailName: string }> = ({
   children,
   detailName,
-}) => (
-  <EuiLink
-    href={getCaseDetailsUrl(encodeURIComponent(detailName))}
-    data-test-subj="case-details-link"
-  >
-    {children ? children : detailName}
-  </EuiLink>
-);
+}) => {
+  const urlSearch = useGetUrlSearch(navTabs.case);
+  return (
+    <EuiLink
+      href={getCaseDetailsUrl(encodeURIComponent(detailName), urlSearch)}
+      data-test-subj="case-details-link"
+    >
+      {children ? children : detailName}
+    </EuiLink>
+  );
+};
 export const CaseDetailsLink = React.memo(CaseDetailsLinkComponent);
 CaseDetailsLink.displayName = 'CaseDetailsLink';
 
-export const CreateCaseLink = React.memo<{ children: React.ReactNode }>(({ children }) => (
-  <EuiLink href={getCreateCaseUrl()}>{children}</EuiLink>
-));
+export const CreateCaseLink = React.memo<{ children: React.ReactNode }>(({ children }) => {
+  const urlSearch = useGetUrlSearch(navTabs.case);
+  return <EuiLink href={getCreateCaseUrl(urlSearch)}>{children}</EuiLink>;
+});
 
 CreateCaseLink.displayName = 'CreateCaseLink';
 
diff --git a/x-pack/legacy/plugins/siem/public/components/url_state/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/url_state/index.test.tsx
index 10aa388449d91..6e957313d9b04 100644
--- a/x-pack/legacy/plugins/siem/public/components/url_state/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/url_state/index.test.tsx
@@ -158,7 +158,7 @@ describe('UrlStateContainer', () => {
               hash: '',
               pathname: examplePath,
               search: [CONSTANTS.timelinePage].includes(page)
-                ? '?timerange=(global:(linkTo:!(timeline),timerange:(from:1558048243696,fromStr:now-24h,kind:relative,to:1558134643697,toStr:now)),timeline:(linkTo:!(global),timerange:(from:1558048243696,fromStr:now-24h,kind:relative,to:1558134643697,toStr:now)))'
+                ? `?query=(language:kuery,query:'host.name:%22siem-es%22')&timerange=(global:(linkTo:!(timeline),timerange:(from:1558048243696,fromStr:now-24h,kind:relative,to:1558134643697,toStr:now)),timeline:(linkTo:!(global),timerange:(from:1558048243696,fromStr:now-24h,kind:relative,to:1558134643697,toStr:now)))`
                 : `?query=(language:kuery,query:'host.name:%22siem-es%22')&timerange=(global:(linkTo:!(timeline),timerange:(from:1558048243696,fromStr:now-24h,kind:relative,to:1558134643697,toStr:now)),timeline:(linkTo:!(global),timerange:(from:1558048243696,fromStr:now-24h,kind:relative,to:1558134643697,toStr:now)))`,
               state: '',
             });
diff --git a/x-pack/legacy/plugins/siem/public/components/url_state/types.ts b/x-pack/legacy/plugins/siem/public/components/url_state/types.ts
index 2cb1b0c96ad79..c6f49d8a0e49b 100644
--- a/x-pack/legacy/plugins/siem/public/components/url_state/types.ts
+++ b/x-pack/legacy/plugins/siem/public/components/url_state/types.ts
@@ -60,8 +60,20 @@ export const URL_STATE_KEYS: Record<UrlStateType, KeyUrlState[]> = {
     CONSTANTS.timerange,
     CONSTANTS.timeline,
   ],
-  timeline: [CONSTANTS.timeline, CONSTANTS.timerange],
-  case: [],
+  timeline: [
+    CONSTANTS.appQuery,
+    CONSTANTS.filters,
+    CONSTANTS.savedQuery,
+    CONSTANTS.timeline,
+    CONSTANTS.timerange,
+  ],
+  case: [
+    CONSTANTS.appQuery,
+    CONSTANTS.filters,
+    CONSTANTS.savedQuery,
+    CONSTANTS.timeline,
+    CONSTANTS.timerange,
+  ],
 };
 
 export type LocationTypes =
diff --git a/x-pack/legacy/plugins/siem/public/containers/case/api.ts b/x-pack/legacy/plugins/siem/public/containers/case/api.ts
index 5ba1f010e0d52..16ee294224bb9 100644
--- a/x-pack/legacy/plugins/siem/public/containers/case/api.ts
+++ b/x-pack/legacy/plugins/siem/public/containers/case/api.ts
@@ -13,9 +13,15 @@ import {
   CommentRequest,
   CommentResponse,
   User,
+  CaseUserActionsResponse,
+  CaseExternalServiceRequest,
+  ServiceConnectorCaseParams,
+  ServiceConnectorCaseResponse,
+  ActionTypeExecutorResult,
 } from '../../../../../../plugins/case/common/api';
 import { KibanaServices } from '../../lib/kibana';
 import {
+  ActionLicense,
   AllCases,
   BulkUpdateStatus,
   Case,
@@ -23,16 +29,20 @@ import {
   Comment,
   FetchCasesProps,
   SortFieldCase,
+  CaseUserActions,
 } from './types';
 import { CASES_URL } from './constants';
 import {
   convertToCamelCase,
   convertAllCasesToCamel,
+  convertArrayToCamelCase,
   decodeCaseResponse,
   decodeCasesResponse,
   decodeCasesFindResponse,
   decodeCasesStatusResponse,
   decodeCommentResponse,
+  decodeCaseUserActionsResponse,
+  decodeServiceConnectorCaseResponse,
 } from './utils';
 
 export const getCase = async (caseId: string, includeComments: boolean = true): Promise<Case> => {
@@ -71,6 +81,20 @@ export const getReporters = async (signal: AbortSignal): Promise<User[]> => {
   return response ?? [];
 };
 
+export const getCaseUserActions = async (
+  caseId: string,
+  signal: AbortSignal
+): Promise<CaseUserActions[]> => {
+  const response = await KibanaServices.get().http.fetch<CaseUserActionsResponse>(
+    `${CASES_URL}/${caseId}/user_actions`,
+    {
+      method: 'GET',
+      signal,
+    }
+  );
+  return convertArrayToCamelCase(decodeCaseUserActionsResponse(response)) as CaseUserActions[];
+};
+
 export const getCases = async ({
   filterOptions = {
     search: '',
@@ -161,3 +185,43 @@ export const deleteCases = async (caseIds: string[]): Promise<boolean> => {
   });
   return response === 'true' ? true : false;
 };
+
+export const pushCase = async (
+  caseId: string,
+  push: CaseExternalServiceRequest,
+  signal: AbortSignal
+): Promise<Case> => {
+  const response = await KibanaServices.get().http.fetch<CaseResponse>(
+    `${CASES_URL}/${caseId}/_push`,
+    {
+      method: 'POST',
+      body: JSON.stringify(push),
+      signal,
+    }
+  );
+  return convertToCamelCase<CaseResponse, Case>(decodeCaseResponse(response));
+};
+
+export const pushToService = async (
+  connectorId: string,
+  casePushParams: ServiceConnectorCaseParams,
+  signal: AbortSignal
+): Promise<ServiceConnectorCaseResponse> => {
+  const response = await KibanaServices.get().http.fetch<ActionTypeExecutorResult>(
+    `/api/action/${connectorId}/_execute`,
+    {
+      method: 'POST',
+      body: JSON.stringify({ params: casePushParams }),
+      signal,
+    }
+  );
+  return decodeServiceConnectorCaseResponse(response.data);
+};
+
+export const getActionLicense = async (signal: AbortSignal): Promise<ActionLicense[]> => {
+  const response = await KibanaServices.get().http.fetch<ActionLicense[]>(`/api/action/types`, {
+    method: 'GET',
+    signal,
+  });
+  return response;
+};
diff --git a/x-pack/legacy/plugins/siem/public/containers/case/configure/types.ts b/x-pack/legacy/plugins/siem/public/containers/case/configure/types.ts
index fc7aaa3643d77..d69c23fe02ec9 100644
--- a/x-pack/legacy/plugins/siem/public/containers/case/configure/types.ts
+++ b/x-pack/legacy/plugins/siem/public/containers/case/configure/types.ts
@@ -26,6 +26,7 @@ export interface CaseConfigure {
   createdAt: string;
   createdBy: ElasticUser;
   connectorId: string;
+  connectorName: string;
   closureType: ClosureType;
   updatedAt: string;
   updatedBy: ElasticUser;
diff --git a/x-pack/legacy/plugins/siem/public/containers/case/configure/use_configure.tsx b/x-pack/legacy/plugins/siem/public/containers/case/configure/use_configure.tsx
index 22ac54093d1dc..a24f8303824c5 100644
--- a/x-pack/legacy/plugins/siem/public/containers/case/configure/use_configure.tsx
+++ b/x-pack/legacy/plugins/siem/public/containers/case/configure/use_configure.tsx
@@ -13,6 +13,7 @@ import { ClosureType } from './types';
 
 interface PersistCaseConfigure {
   connectorId: string;
+  connectorName: string;
   closureType: ClosureType;
 }
 
@@ -24,12 +25,12 @@ export interface ReturnUseCaseConfigure {
 }
 
 interface UseCaseConfigure {
-  setConnectorId: (newConnectorId: string) => void;
-  setClosureType: (newClosureType: ClosureType) => void;
+  setConnector: (newConnectorId: string, newConnectorName?: string) => void;
+  setClosureType?: (newClosureType: ClosureType) => void;
 }
 
 export const useCaseConfigure = ({
-  setConnectorId,
+  setConnector,
   setClosureType,
 }: UseCaseConfigure): ReturnUseCaseConfigure => {
   const [, dispatchToaster] = useStateToaster();
@@ -48,8 +49,10 @@ export const useCaseConfigure = ({
         if (!didCancel) {
           setLoading(false);
           if (res != null) {
-            setConnectorId(res.connectorId);
-            setClosureType(res.closureType);
+            setConnector(res.connectorId, res.connectorName);
+            if (setClosureType != null) {
+              setClosureType(res.closureType);
+            }
             setVersion(res.version);
           }
         }
@@ -74,7 +77,7 @@ export const useCaseConfigure = ({
   }, []);
 
   const persistCaseConfigure = useCallback(
-    async ({ connectorId, closureType }: PersistCaseConfigure) => {
+    async ({ connectorId, connectorName, closureType }: PersistCaseConfigure) => {
       let didCancel = false;
       const abortCtrl = new AbortController();
       const saveCaseConfiguration = async () => {
@@ -83,7 +86,11 @@ export const useCaseConfigure = ({
           const res =
             version.length === 0
               ? await postCaseConfigure(
-                  { connector_id: connectorId, closure_type: closureType },
+                  {
+                    connector_id: connectorId,
+                    connector_name: connectorName,
+                    closure_type: closureType,
+                  },
                   abortCtrl.signal
                 )
               : await patchCaseConfigure(
@@ -92,8 +99,10 @@ export const useCaseConfigure = ({
                 );
           if (!didCancel) {
             setPersistLoading(false);
-            setConnectorId(res.connectorId);
-            setClosureType(res.closureType);
+            setConnector(res.connectorId);
+            if (setClosureType) {
+              setClosureType(res.closureType);
+            }
             setVersion(res.version);
           }
         } catch (error) {
diff --git a/x-pack/legacy/plugins/siem/public/containers/case/translations.ts b/x-pack/legacy/plugins/siem/public/containers/case/translations.ts
index 0c8b896e2b426..601db373f041e 100644
--- a/x-pack/legacy/plugins/siem/public/containers/case/translations.ts
+++ b/x-pack/legacy/plugins/siem/public/containers/case/translations.ts
@@ -16,3 +16,10 @@ export const TAG_FETCH_FAILURE = i18n.translate(
     defaultMessage: 'Failed to fetch Tags',
   }
 );
+
+export const SUCCESS_SEND_TO_EXTERNAL_SERVICE = i18n.translate(
+  'xpack.siem.containers.case.pushToExterService',
+  {
+    defaultMessage: 'Successfully sent to ServiceNow',
+  }
+);
diff --git a/x-pack/legacy/plugins/siem/public/containers/case/types.ts b/x-pack/legacy/plugins/siem/public/containers/case/types.ts
index 44519031e91cb..bbbb13788d53a 100644
--- a/x-pack/legacy/plugins/siem/public/containers/case/types.ts
+++ b/x-pack/legacy/plugins/siem/public/containers/case/types.ts
@@ -4,30 +4,53 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { User } from '../../../../../../plugins/case/common/api';
+import { User, UserActionField, UserAction } from '../../../../../../plugins/case/common/api';
 
 export interface Comment {
   id: string;
   createdAt: string;
   createdBy: ElasticUser;
   comment: string;
+  pushedAt: string | null;
+  pushedBy: string | null;
   updatedAt: string | null;
   updatedBy: ElasticUser | null;
   version: string;
 }
+export interface CaseUserActions {
+  actionId: string;
+  actionField: UserActionField;
+  action: UserAction;
+  actionAt: string;
+  actionBy: ElasticUser;
+  caseId: string;
+  commentId: string | null;
+  newValue: string | null;
+  oldValue: string | null;
+}
 
+export interface CaseExternalService {
+  pushedAt: string;
+  pushedBy: string;
+  connectorId: string;
+  connectorName: string;
+  externalId: string;
+  externalTitle: string;
+  externalUrl: string;
+}
 export interface Case {
   id: string;
   closedAt: string | null;
   closedBy: ElasticUser | null;
   comments: Comment[];
-  commentIds: string[];
   createdAt: string;
   createdBy: ElasticUser;
   description: string;
+  externalService: CaseExternalService | null;
   status: string;
   tags: string[];
   title: string;
+  totalComment: number;
   updatedAt: string | null;
   updatedBy: ElasticUser | null;
   version: string;
@@ -84,3 +107,10 @@ export interface BulkUpdateStatus {
   id: string;
   version: string;
 }
+export interface ActionLicense {
+  id: string;
+  name: string;
+  enabled: boolean;
+  enabledInConfig: boolean;
+  enabledInLicense: boolean;
+}
diff --git a/x-pack/legacy/plugins/siem/public/containers/case/use_get_action_license.tsx b/x-pack/legacy/plugins/siem/public/containers/case/use_get_action_license.tsx
new file mode 100644
index 0000000000000..12f92b2db039b
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/public/containers/case/use_get_action_license.tsx
@@ -0,0 +1,74 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { useCallback, useEffect, useState } from 'react';
+
+import { errorToToaster, useStateToaster } from '../../components/toasters';
+import { getActionLicense } from './api';
+import * as i18n from './translations';
+import { ActionLicense } from './types';
+
+interface ActionLicenseState {
+  actionLicense: ActionLicense | null;
+  isLoading: boolean;
+  isError: boolean;
+}
+
+const initialData: ActionLicenseState = {
+  actionLicense: null,
+  isLoading: true,
+  isError: false,
+};
+
+export const useGetActionLicense = (): ActionLicenseState => {
+  const [actionLicenseState, setActionLicensesState] = useState<ActionLicenseState>(initialData);
+
+  const [, dispatchToaster] = useStateToaster();
+
+  const fetchActionLicense = useCallback(() => {
+    let didCancel = false;
+    const abortCtrl = new AbortController();
+    const fetchData = async () => {
+      setActionLicensesState({
+        ...actionLicenseState,
+        isLoading: true,
+      });
+      try {
+        const response = await getActionLicense(abortCtrl.signal);
+        if (!didCancel) {
+          setActionLicensesState({
+            actionLicense: response.find(l => l.id === '.servicenow') ?? null,
+            isLoading: false,
+            isError: false,
+          });
+        }
+      } catch (error) {
+        if (!didCancel) {
+          errorToToaster({
+            title: i18n.ERROR_TITLE,
+            error: error.body && error.body.message ? new Error(error.body.message) : error,
+            dispatchToaster,
+          });
+          setActionLicensesState({
+            actionLicense: null,
+            isLoading: false,
+            isError: true,
+          });
+        }
+      }
+    };
+    fetchData();
+    return () => {
+      didCancel = true;
+      abortCtrl.abort();
+    };
+  }, [actionLicenseState]);
+
+  useEffect(() => {
+    fetchActionLicense();
+  }, []);
+  return { ...actionLicenseState };
+};
diff --git a/x-pack/legacy/plugins/siem/public/containers/case/use_get_case.tsx b/x-pack/legacy/plugins/siem/public/containers/case/use_get_case.tsx
index b70195e2c126f..02b41c9fc720f 100644
--- a/x-pack/legacy/plugins/siem/public/containers/case/use_get_case.tsx
+++ b/x-pack/legacy/plugins/siem/public/containers/case/use_get_case.tsx
@@ -53,14 +53,15 @@ const initialData: Case = {
   closedBy: null,
   createdAt: '',
   comments: [],
-  commentIds: [],
   createdBy: {
     username: '',
   },
   description: '',
+  externalService: null,
   status: '',
   tags: [],
   title: '',
+  totalComment: 0,
   updatedAt: null,
   updatedBy: null,
   version: '',
diff --git a/x-pack/legacy/plugins/siem/public/containers/case/use_get_case_user_actions.tsx b/x-pack/legacy/plugins/siem/public/containers/case/use_get_case_user_actions.tsx
new file mode 100644
index 0000000000000..4c278bc038134
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/public/containers/case/use_get_case_user_actions.tsx
@@ -0,0 +1,126 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { isEmpty, uniqBy } from 'lodash/fp';
+import { useCallback, useEffect, useState } from 'react';
+
+import { errorToToaster, useStateToaster } from '../../components/toasters';
+import { getCaseUserActions } from './api';
+import * as i18n from './translations';
+import { CaseUserActions, ElasticUser } from './types';
+
+interface CaseUserActionsState {
+  caseUserActions: CaseUserActions[];
+  firstIndexPushToService: number;
+  hasDataToPush: boolean;
+  participants: ElasticUser[];
+  isLoading: boolean;
+  isError: boolean;
+  lastIndexPushToService: number;
+}
+
+const initialData: CaseUserActionsState = {
+  caseUserActions: [],
+  firstIndexPushToService: -1,
+  lastIndexPushToService: -1,
+  hasDataToPush: false,
+  isLoading: true,
+  isError: false,
+  participants: [],
+};
+
+interface UseGetCaseUserActions extends CaseUserActionsState {
+  fetchCaseUserActions: (caseId: string) => void;
+}
+
+const getPushedInfo = (
+  caseUserActions: CaseUserActions[]
+): { firstIndexPushToService: number; lastIndexPushToService: number; hasDataToPush: boolean } => {
+  const firstIndexPushToService = caseUserActions.findIndex(
+    cua => cua.action === 'push-to-service'
+  );
+  const lastIndexPushToService = caseUserActions
+    .map(cua => cua.action)
+    .lastIndexOf('push-to-service');
+
+  const hasDataToPush =
+    lastIndexPushToService === -1 || lastIndexPushToService < caseUserActions.length - 1;
+  return {
+    firstIndexPushToService,
+    lastIndexPushToService,
+    hasDataToPush,
+  };
+};
+
+export const useGetCaseUserActions = (caseId: string): UseGetCaseUserActions => {
+  const [caseUserActionsState, setCaseUserActionsState] = useState<CaseUserActionsState>(
+    initialData
+  );
+
+  const [, dispatchToaster] = useStateToaster();
+
+  const fetchCaseUserActions = useCallback(
+    (thisCaseId: string) => {
+      let didCancel = false;
+      const abortCtrl = new AbortController();
+      const fetchData = async () => {
+        setCaseUserActionsState({
+          ...caseUserActionsState,
+          isLoading: true,
+        });
+        try {
+          const response = await getCaseUserActions(thisCaseId, abortCtrl.signal);
+          if (!didCancel) {
+            // Attention Future developer
+            // We are removing the first item because it will always be the creation of the case
+            // and we do not want it to simplify our life
+            const participants = !isEmpty(response)
+              ? uniqBy('actionBy.username', response).map(cau => cau.actionBy)
+              : [];
+            const caseUserActions = !isEmpty(response) ? response.slice(1) : [];
+            setCaseUserActionsState({
+              caseUserActions,
+              ...getPushedInfo(caseUserActions),
+              isLoading: false,
+              isError: false,
+              participants,
+            });
+          }
+        } catch (error) {
+          if (!didCancel) {
+            errorToToaster({
+              title: i18n.ERROR_TITLE,
+              error: error.body && error.body.message ? new Error(error.body.message) : error,
+              dispatchToaster,
+            });
+            setCaseUserActionsState({
+              caseUserActions: [],
+              firstIndexPushToService: -1,
+              lastIndexPushToService: -1,
+              hasDataToPush: false,
+              isLoading: false,
+              isError: true,
+              participants: [],
+            });
+          }
+        }
+      };
+      fetchData();
+      return () => {
+        didCancel = true;
+        abortCtrl.abort();
+      };
+    },
+    [caseUserActionsState]
+  );
+
+  useEffect(() => {
+    if (!isEmpty(caseId)) {
+      fetchCaseUserActions(caseId);
+    }
+  }, [caseId]);
+  return { ...caseUserActionsState, fetchCaseUserActions };
+};
diff --git a/x-pack/legacy/plugins/siem/public/containers/case/use_post_push_to_service.tsx b/x-pack/legacy/plugins/siem/public/containers/case/use_post_push_to_service.tsx
new file mode 100644
index 0000000000000..b6fb15f4fa083
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/public/containers/case/use_post_push_to_service.tsx
@@ -0,0 +1,183 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { useReducer, useCallback } from 'react';
+
+import {
+  ServiceConnectorCaseResponse,
+  ServiceConnectorCaseParams,
+} from '../../../../../../plugins/case/common/api';
+import { errorToToaster, useStateToaster, displaySuccessToast } from '../../components/toasters';
+
+import { getCase, pushToService, pushCase } from './api';
+import * as i18n from './translations';
+import { Case } from './types';
+
+interface PushToServiceState {
+  serviceData: ServiceConnectorCaseResponse | null;
+  pushedCaseData: Case | null;
+  isLoading: boolean;
+  isError: boolean;
+}
+type Action =
+  | { type: 'FETCH_INIT' }
+  | { type: 'FETCH_SUCCESS_PUSH_SERVICE'; payload: ServiceConnectorCaseResponse | null }
+  | { type: 'FETCH_SUCCESS_PUSH_CASE'; payload: Case | null }
+  | { type: 'FETCH_FAILURE' };
+
+const dataFetchReducer = (state: PushToServiceState, action: Action): PushToServiceState => {
+  switch (action.type) {
+    case 'FETCH_INIT':
+      return {
+        ...state,
+        isLoading: true,
+        isError: false,
+      };
+    case 'FETCH_SUCCESS_PUSH_SERVICE':
+      return {
+        ...state,
+        isLoading: false,
+        isError: false,
+        serviceData: action.payload ?? null,
+      };
+    case 'FETCH_SUCCESS_PUSH_CASE':
+      return {
+        ...state,
+        isLoading: false,
+        isError: false,
+        pushedCaseData: action.payload ?? null,
+      };
+    case 'FETCH_FAILURE':
+      return {
+        ...state,
+        isLoading: false,
+        isError: true,
+      };
+    default:
+      return state;
+  }
+};
+
+interface PushToServiceRequest {
+  caseId: string;
+  connectorId: string;
+  connectorName: string;
+  updateCase: (newCase: Case) => void;
+}
+
+interface UsePostPushToService extends PushToServiceState {
+  postPushToService: ({ caseId, connectorId, updateCase }: PushToServiceRequest) => void;
+}
+
+export const usePostPushToService = (): UsePostPushToService => {
+  const [state, dispatch] = useReducer(dataFetchReducer, {
+    serviceData: null,
+    pushedCaseData: null,
+    isLoading: false,
+    isError: false,
+  });
+  const [, dispatchToaster] = useStateToaster();
+
+  const postPushToService = useCallback(
+    async ({ caseId, connectorId, connectorName, updateCase }: PushToServiceRequest) => {
+      let cancel = false;
+      const abortCtrl = new AbortController();
+      try {
+        dispatch({ type: 'FETCH_INIT' });
+        const casePushData = await getCase(caseId);
+        const responseService = await pushToService(
+          connectorId,
+          formatServiceRequestData(casePushData),
+          abortCtrl.signal
+        );
+        const responseCase = await pushCase(
+          caseId,
+          {
+            connector_id: connectorId,
+            connector_name: connectorName,
+            external_id: responseService.incidentId,
+            external_title: responseService.number,
+            external_url: responseService.url,
+          },
+          abortCtrl.signal
+        );
+        if (!cancel) {
+          dispatch({ type: 'FETCH_SUCCESS_PUSH_SERVICE', payload: responseService });
+          dispatch({ type: 'FETCH_SUCCESS_PUSH_CASE', payload: responseCase });
+          updateCase(responseCase);
+          displaySuccessToast(i18n.SUCCESS_SEND_TO_EXTERNAL_SERVICE, dispatchToaster);
+        }
+      } catch (error) {
+        if (!cancel) {
+          errorToToaster({
+            title: i18n.ERROR_TITLE,
+            error: error.body && error.body.message ? new Error(error.body.message) : error,
+            dispatchToaster,
+          });
+          dispatch({ type: 'FETCH_FAILURE' });
+        }
+      }
+      return () => {
+        cancel = true;
+        abortCtrl.abort();
+      };
+    },
+    []
+  );
+
+  return { ...state, postPushToService };
+};
+
+const formatServiceRequestData = (myCase: Case): ServiceConnectorCaseParams => {
+  const {
+    id: caseId,
+    createdAt,
+    createdBy,
+    comments,
+    description,
+    externalService,
+    title,
+    updatedAt,
+    updatedBy,
+  } = myCase;
+
+  return {
+    caseId,
+    createdAt,
+    createdBy: {
+      fullName: createdBy.fullName ?? null,
+      username: createdBy?.username,
+    },
+    comments: comments.map(c => ({
+      commentId: c.id,
+      comment: c.comment,
+      createdAt: c.createdAt,
+      createdBy: {
+        fullName: c.createdBy.fullName ?? null,
+        username: c.createdBy.username,
+      },
+      updatedAt: c.updatedAt,
+      updatedBy:
+        c.updatedBy != null
+          ? {
+              fullName: c.updatedBy.fullName ?? null,
+              username: c.updatedBy.username,
+            }
+          : null,
+    })),
+    description,
+    incidentId: externalService?.externalId ?? null,
+    title,
+    updatedAt,
+    updatedBy:
+      updatedBy != null
+        ? {
+            fullName: updatedBy.fullName ?? null,
+            username: updatedBy.username,
+          }
+        : null,
+  };
+};
diff --git a/x-pack/legacy/plugins/siem/public/containers/case/use_update_case.tsx b/x-pack/legacy/plugins/siem/public/containers/case/use_update_case.tsx
index 987620469901b..f8af088f7e03b 100644
--- a/x-pack/legacy/plugins/siem/public/containers/case/use_update_case.tsx
+++ b/x-pack/legacy/plugins/siem/public/containers/case/use_update_case.tsx
@@ -25,6 +25,7 @@ interface NewCaseState {
 export interface UpdateByKey {
   updateKey: UpdateKey;
   updateValue: CaseRequest[UpdateKey];
+  fetchCaseUserActions?: (caseId: string) => void;
 }
 
 type Action =
@@ -64,6 +65,7 @@ const dataFetchReducer = (state: NewCaseState, action: Action): NewCaseState =>
 
 interface UseUpdateCase extends NewCaseState {
   updateCaseProperty: (updates: UpdateByKey) => void;
+  updateCase: (newCase: Case) => void;
 }
 export const useUpdateCase = (caseId: string, initialData: Case): UseUpdateCase => {
   const [state, dispatch] = useReducer(dataFetchReducer, {
@@ -74,8 +76,12 @@ export const useUpdateCase = (caseId: string, initialData: Case): UseUpdateCase
   });
   const [, dispatchToaster] = useStateToaster();
 
+  const updateCase = useCallback((newCase: Case) => {
+    dispatch({ type: 'FETCH_SUCCESS', payload: newCase });
+  }, []);
+
   const dispatchUpdateCaseProperty = useCallback(
-    async ({ updateKey, updateValue }: UpdateByKey) => {
+    async ({ fetchCaseUserActions, updateKey, updateValue }: UpdateByKey) => {
       let cancel = false;
       try {
         dispatch({ type: 'FETCH_INIT', payload: updateKey });
@@ -85,6 +91,9 @@ export const useUpdateCase = (caseId: string, initialData: Case): UseUpdateCase
           state.caseData.version
         );
         if (!cancel) {
+          if (fetchCaseUserActions != null) {
+            fetchCaseUserActions(caseId);
+          }
           dispatch({ type: 'FETCH_SUCCESS', payload: response[0] });
         }
       } catch (error) {
@@ -104,5 +113,5 @@ export const useUpdateCase = (caseId: string, initialData: Case): UseUpdateCase
     [state]
   );
 
-  return { ...state, updateCaseProperty: dispatchUpdateCaseProperty };
+  return { ...state, updateCase, updateCaseProperty: dispatchUpdateCaseProperty };
 };
diff --git a/x-pack/legacy/plugins/siem/public/containers/case/use_update_comment.tsx b/x-pack/legacy/plugins/siem/public/containers/case/use_update_comment.tsx
index a40a1100ca735..c1b2bfde30126 100644
--- a/x-pack/legacy/plugins/siem/public/containers/case/use_update_comment.tsx
+++ b/x-pack/legacy/plugins/siem/public/containers/case/use_update_comment.tsx
@@ -70,8 +70,15 @@ const dataFetchReducer = (state: CommentUpdateState, action: Action): CommentUpd
   }
 };
 
+interface UpdateComment {
+  caseId: string;
+  commentId: string;
+  commentUpdate: string;
+  fetchUserActions: () => void;
+}
+
 interface UseUpdateComment extends CommentUpdateState {
-  updateComment: (caseId: string, commentId: string, commentUpdate: string) => void;
+  updateComment: ({ caseId, commentId, commentUpdate, fetchUserActions }: UpdateComment) => void;
   addPostedComment: Dispatch<Comment>;
 }
 
@@ -84,7 +91,7 @@ export const useUpdateComment = (comments: Comment[]): UseUpdateComment => {
   const [, dispatchToaster] = useStateToaster();
 
   const dispatchUpdateComment = useCallback(
-    async (caseId: string, commentId: string, commentUpdate: string) => {
+    async ({ caseId, commentId, commentUpdate, fetchUserActions }: UpdateComment) => {
       let cancel = false;
       try {
         dispatch({ type: 'FETCH_INIT', payload: commentId });
@@ -98,6 +105,7 @@ export const useUpdateComment = (comments: Comment[]): UseUpdateComment => {
           currentComment.version
         );
         if (!cancel) {
+          fetchUserActions();
           dispatch({ type: 'FETCH_SUCCESS', payload: { update: response, commentId } });
         }
       } catch (error) {
diff --git a/x-pack/legacy/plugins/siem/public/containers/case/utils.ts b/x-pack/legacy/plugins/siem/public/containers/case/utils.ts
index 8f24d5a435240..ce23ac6c440b6 100644
--- a/x-pack/legacy/plugins/siem/public/containers/case/utils.ts
+++ b/x-pack/legacy/plugins/siem/public/containers/case/utils.ts
@@ -23,6 +23,10 @@ import {
   CommentResponseRt,
   CasesConfigureResponse,
   CaseConfigureResponseRt,
+  CaseUserActionsResponse,
+  CaseUserActionsResponseRt,
+  ServiceConnectorCaseResponseRt,
+  ServiceConnectorCaseResponse,
 } from '../../../../../../plugins/case/common/api';
 import { ToasterError } from '../../components/toasters';
 import { AllCases, Case } from './types';
@@ -86,3 +90,15 @@ export const decodeCaseConfigureResponse = (respCase?: CasesConfigureResponse) =
     CaseConfigureResponseRt.decode(respCase),
     fold(throwErrors(createToasterPlainError), identity)
   );
+
+export const decodeCaseUserActionsResponse = (respUserActions?: CaseUserActionsResponse) =>
+  pipe(
+    CaseUserActionsResponseRt.decode(respUserActions),
+    fold(throwErrors(createToasterPlainError), identity)
+  );
+
+export const decodeServiceConnectorCaseResponse = (respPushCase?: ServiceConnectorCaseResponse) =>
+  pipe(
+    ServiceConnectorCaseResponseRt.decode(respPushCase),
+    fold(throwErrors(createToasterPlainError), identity)
+  );
diff --git a/x-pack/legacy/plugins/siem/public/pages/case/components/add_comment/index.tsx b/x-pack/legacy/plugins/siem/public/pages/case/components/add_comment/index.tsx
index 0b3b0daaf4bbc..836595c7c45d9 100644
--- a/x-pack/legacy/plugins/siem/public/pages/case/components/add_comment/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/case/components/add_comment/index.tsx
@@ -30,72 +30,79 @@ const initialCommentValue: CommentRequest = {
 
 interface AddCommentProps {
   caseId: string;
+  onCommentSaving?: () => void;
   onCommentPosted: (commentResponse: Comment) => void;
+  showLoading?: boolean;
 }
 
-export const AddComment = React.memo<AddCommentProps>(({ caseId, onCommentPosted }) => {
-  const { commentData, isLoading, postComment, resetCommentData } = usePostComment(caseId);
-  const { form } = useForm<CommentRequest>({
-    defaultValue: initialCommentValue,
-    options: { stripEmptyFields: false },
-    schema,
-  });
-  const { handleCursorChange, handleOnTimelineChange } = useInsertTimeline<CommentRequest>(
-    form,
-    'comment'
-  );
+export const AddComment = React.memo<AddCommentProps>(
+  ({ caseId, showLoading = true, onCommentPosted, onCommentSaving }) => {
+    const { commentData, isLoading, postComment, resetCommentData } = usePostComment(caseId);
+    const { form } = useForm<CommentRequest>({
+      defaultValue: initialCommentValue,
+      options: { stripEmptyFields: false },
+      schema,
+    });
+    const { handleCursorChange, handleOnTimelineChange } = useInsertTimeline<CommentRequest>(
+      form,
+      'comment'
+    );
 
-  useEffect(() => {
-    if (commentData !== null) {
-      onCommentPosted(commentData);
-      form.reset();
-      resetCommentData();
-    }
-  }, [commentData]);
+    useEffect(() => {
+      if (commentData !== null) {
+        onCommentPosted(commentData);
+        form.reset();
+        resetCommentData();
+      }
+    }, [commentData]);
 
-  const onSubmit = useCallback(async () => {
-    const { isValid, data } = await form.submit();
-    if (isValid) {
-      await postComment(data);
-    }
-  }, [form]);
+    const onSubmit = useCallback(async () => {
+      const { isValid, data } = await form.submit();
+      if (isValid) {
+        if (onCommentSaving != null) {
+          onCommentSaving();
+        }
+        await postComment(data);
+      }
+    }, [form]);
 
-  return (
-    <>
-      {isLoading && <MySpinner size="xl" />}
-      <Form form={form}>
-        <UseField
-          path="comment"
-          component={MarkdownEditorForm}
-          componentProps={{
-            idAria: 'caseComment',
-            isDisabled: isLoading,
-            dataTestSubj: 'caseComment',
-            placeholder: i18n.ADD_COMMENT_HELP_TEXT,
-            onCursorPositionUpdate: handleCursorChange,
-            bottomRightContent: (
-              <EuiButton
-                iconType="plusInCircle"
-                isDisabled={isLoading}
-                isLoading={isLoading}
-                onClick={onSubmit}
-                size="s"
-              >
-                {i18n.ADD_COMMENT}
-              </EuiButton>
-            ),
-            topRightContent: (
-              <InsertTimelinePopover
-                hideUntitled={true}
-                isDisabled={isLoading}
-                onTimelineChange={handleOnTimelineChange}
-              />
-            ),
-          }}
-        />
-      </Form>
-    </>
-  );
-});
+    return (
+      <>
+        {isLoading && showLoading && <MySpinner size="xl" />}
+        <Form form={form}>
+          <UseField
+            path="comment"
+            component={MarkdownEditorForm}
+            componentProps={{
+              idAria: 'caseComment',
+              isDisabled: isLoading,
+              dataTestSubj: 'caseComment',
+              placeholder: i18n.ADD_COMMENT_HELP_TEXT,
+              onCursorPositionUpdate: handleCursorChange,
+              bottomRightContent: (
+                <EuiButton
+                  iconType="plusInCircle"
+                  isDisabled={isLoading}
+                  isLoading={isLoading}
+                  onClick={onSubmit}
+                  size="s"
+                >
+                  {i18n.ADD_COMMENT}
+                </EuiButton>
+              ),
+              topRightContent: (
+                <InsertTimelinePopover
+                  hideUntitled={true}
+                  isDisabled={isLoading}
+                  onTimelineChange={handleOnTimelineChange}
+                />
+              ),
+            }}
+          />
+        </Form>
+      </>
+    );
+  }
+);
 
 AddComment.displayName = 'AddComment';
diff --git a/x-pack/legacy/plugins/siem/public/pages/case/components/all_cases/__mock__/index.tsx b/x-pack/legacy/plugins/siem/public/pages/case/components/all_cases/__mock__/index.tsx
index 48fbb4e74c407..d4ec32dfd070b 100644
--- a/x-pack/legacy/plugins/siem/public/pages/case/components/all_cases/__mock__/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/case/components/all_cases/__mock__/index.tsx
@@ -18,12 +18,13 @@ export const useGetCasesMockState: UseGetCasesState = {
         id: '3c4ddcc0-4e99-11ea-9290-35d05cb55c15',
         createdAt: '2020-02-13T19:44:23.627Z',
         createdBy: { username: 'elastic' },
-        commentIds: [],
         comments: [],
         description: 'Security banana Issue',
+        externalService: null,
         status: 'open',
         tags: ['defacement'],
         title: 'Another horrible breach',
+        totalComment: 0,
         updatedAt: null,
         updatedBy: null,
         version: 'WzQ3LDFd',
@@ -34,12 +35,13 @@ export const useGetCasesMockState: UseGetCasesState = {
         id: '362a5c10-4e99-11ea-9290-35d05cb55c15',
         createdAt: '2020-02-13T19:44:13.328Z',
         createdBy: { username: 'elastic' },
-        commentIds: [],
         comments: [],
         description: 'Security banana Issue',
+        externalService: null,
         status: 'open',
         tags: ['phishing'],
         title: 'Bad email',
+        totalComment: 0,
         updatedAt: null,
         updatedBy: null,
         version: 'WzQ3LDFd',
@@ -50,12 +52,13 @@ export const useGetCasesMockState: UseGetCasesState = {
         id: '34f8b9e0-4e99-11ea-9290-35d05cb55c15',
         createdAt: '2020-02-13T19:44:11.328Z',
         createdBy: { username: 'elastic' },
-        commentIds: [],
         comments: [],
         description: 'Security banana Issue',
+        externalService: null,
         status: 'open',
         tags: ['phishing'],
         title: 'Bad email',
+        totalComment: 0,
         updatedAt: null,
         updatedBy: null,
         version: 'WzQ3LDFd',
@@ -66,14 +69,15 @@ export const useGetCasesMockState: UseGetCasesState = {
         id: '31890e90-4e99-11ea-9290-35d05cb55c15',
         createdAt: '2020-02-13T19:44:05.563Z',
         createdBy: { username: 'elastic' },
-        commentIds: [],
         comments: [],
         description: 'Security banana Issue',
+        externalService: null,
         status: 'closed',
         tags: ['phishing'],
         title: 'Uh oh',
-        updatedAt: '2020-02-13T19:44:13.328Z',
-        updatedBy: { username: 'elastic' },
+        totalComment: 0,
+        updatedAt: null,
+        updatedBy: null,
         version: 'WzQ3LDFd',
       },
       {
@@ -82,12 +86,13 @@ export const useGetCasesMockState: UseGetCasesState = {
         id: '2f5b3210-4e99-11ea-9290-35d05cb55c15',
         createdAt: '2020-02-13T19:44:01.901Z',
         createdBy: { username: 'elastic' },
-        commentIds: [],
         comments: [],
         description: 'Security banana Issue',
+        externalService: null,
         status: 'open',
         tags: ['phishing'],
         title: 'Uh oh',
+        totalComment: 0,
         updatedAt: null,
         updatedBy: null,
         version: 'WzQ3LDFd',
diff --git a/x-pack/legacy/plugins/siem/public/pages/case/components/all_cases/columns.tsx b/x-pack/legacy/plugins/siem/public/pages/case/components/all_cases/columns.tsx
index b9e1113c486ad..32a29483e9c75 100644
--- a/x-pack/legacy/plugins/siem/public/pages/case/components/all_cases/columns.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/case/components/all_cases/columns.tsx
@@ -35,6 +35,7 @@ const Spacer = styled.span`
 
 const renderStringField = (field: string, dataTestSubj: string) =>
   field != null ? <span data-test-subj={dataTestSubj}>{field}</span> : getEmptyTagValue();
+
 export const getCasesColumns = (
   actions: Array<DefaultItemIconButtonAction<Case>>,
   filterStatus: string
@@ -108,11 +109,11 @@ export const getCasesColumns = (
   },
   {
     align: 'right',
-    field: 'commentIds',
+    field: 'totalComment',
     name: i18n.COMMENTS,
     sortable: true,
-    render: (comments: Case['commentIds']) =>
-      renderStringField(`${comments.length}`, `case-table-column-commentCount`),
+    render: (totalComment: Case['totalComment']) =>
+      renderStringField(`${totalComment}`, `case-table-column-commentCount`),
   },
   filterStatus === 'open'
     ? {
diff --git a/x-pack/legacy/plugins/siem/public/pages/case/components/all_cases/index.test.tsx b/x-pack/legacy/plugins/siem/public/pages/case/components/all_cases/index.test.tsx
index 13869c79c45fd..bdcb87b483851 100644
--- a/x-pack/legacy/plugins/siem/public/pages/case/components/all_cases/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/case/components/all_cases/index.test.tsx
@@ -95,7 +95,9 @@ describe('AllCases', () => {
         .find(`a[data-test-subj="case-details-link"]`)
         .first()
         .prop('href')
-    ).toEqual(`#/link-to/case/${useGetCasesMockState.data.cases[0].id}`);
+    ).toEqual(
+      `#/link-to/case/${useGetCasesMockState.data.cases[0].id}?timerange=(global:(linkTo:!(timeline),timerange:(from:0,fromStr:now-24h,kind:relative,to:1,toStr:now)),timeline:(linkTo:!(global),timerange:(from:0,fromStr:now-24h,kind:relative,to:1,toStr:now)))`
+    );
     expect(
       wrapper
         .find(`a[data-test-subj="case-details-link"]`)
diff --git a/x-pack/legacy/plugins/siem/public/pages/case/components/all_cases/index.tsx b/x-pack/legacy/plugins/siem/public/pages/case/components/all_cases/index.tsx
index e7e1e624ccba2..87a2ea888831a 100644
--- a/x-pack/legacy/plugins/siem/public/pages/case/components/all_cases/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/case/components/all_cases/index.tsx
@@ -35,7 +35,9 @@ import {
   UtilityBarText,
 } from '../../../../components/utility_bar';
 import { getConfigureCasesUrl, getCreateCaseUrl } from '../../../../components/link_to';
-
+import { useUpdateCases } from '../../../../containers/case/use_bulk_update_case';
+import { useGetUrlSearch } from '../../../../components/navigation/use_get_url_search';
+import { navTabs } from '../../../home/home_navigations';
 import { getBulkItems } from '../bulk_actions';
 import { CaseHeaderPage } from '../case_header_page';
 import { ConfirmDeleteCaseModal } from '../confirm_delete_case';
@@ -43,10 +45,6 @@ import { OpenClosedStats } from '../open_closed_stats';
 
 import { getActions } from './actions';
 import { CasesTableFilters } from './table_filters';
-import { useUpdateCases } from '../../../../containers/case/use_bulk_update_case';
-
-const CONFIGURE_CASES_URL = getConfigureCasesUrl();
-const CREATE_CASE_URL = getCreateCaseUrl();
 
 const Div = styled.div`
   margin-top: ${({ theme }) => theme.eui.paddingSizes.m};
@@ -78,6 +76,7 @@ const getSortField = (field: string): SortFieldCase => {
   return SortFieldCase.createdAt;
 };
 export const AllCases = React.memo(() => {
+  const urlSearch = useGetUrlSearch(navTabs.case);
   const {
     countClosedCases,
     countOpenCases,
@@ -276,12 +275,12 @@ export const AllCases = React.memo(() => {
             />
           </FlexItemDivider>
           <EuiFlexItem grow={false}>
-            <EuiButton href={CONFIGURE_CASES_URL} iconType="controlsHorizontal">
+            <EuiButton href={getConfigureCasesUrl(urlSearch)} iconType="controlsHorizontal">
               {i18n.CONFIGURE_CASES_BUTTON}
             </EuiButton>
           </EuiFlexItem>
           <EuiFlexItem grow={false}>
-            <EuiButton fill href={CREATE_CASE_URL} iconType="plusInCircle">
+            <EuiButton fill href={getCreateCaseUrl(urlSearch)} iconType="plusInCircle">
               {i18n.CREATE_TITLE}
             </EuiButton>
           </EuiFlexItem>
@@ -342,7 +341,12 @@ export const AllCases = React.memo(() => {
                   titleSize="xs"
                   body={i18n.NO_CASES_BODY}
                   actions={
-                    <EuiButton fill size="s" href={CREATE_CASE_URL} iconType="plusInCircle">
+                    <EuiButton
+                      fill
+                      size="s"
+                      href={getCreateCaseUrl(urlSearch)}
+                      iconType="plusInCircle"
+                    >
                       {i18n.ADD_NEW_CASE}
                     </EuiButton>
                   }
diff --git a/x-pack/legacy/plugins/siem/public/pages/case/components/case_status/index.tsx b/x-pack/legacy/plugins/siem/public/pages/case/components/case_status/index.tsx
index 9dbd71ea3e34c..0420a71fea907 100644
--- a/x-pack/legacy/plugins/siem/public/pages/case/components/case_status/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/case/components/case_status/index.tsx
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import React, { useCallback } from 'react';
+import React from 'react';
 import styled, { css } from 'styled-components';
 import {
   EuiBadge,
@@ -39,7 +39,7 @@ interface CaseStatusProps {
   isSelected: boolean;
   status: string;
   title: string;
-  toggleStatusCase: (status: string) => void;
+  toggleStatusCase: (evt: unknown) => void;
   value: string | null;
 }
 const CaseStatusComp: React.FC<CaseStatusProps> = ({
@@ -55,51 +55,46 @@ const CaseStatusComp: React.FC<CaseStatusProps> = ({
   title,
   toggleStatusCase,
   value,
-}) => {
-  const onChange = useCallback(e => toggleStatusCase(e.target.checked ? 'closed' : 'open'), [
-    toggleStatusCase,
-  ]);
-  return (
-    <EuiFlexGroup gutterSize="l" justifyContent="flexEnd">
-      <EuiFlexItem grow={false}>
-        <MyDescriptionList compressed>
-          <EuiFlexGroup>
-            <EuiFlexItem grow={false}>
-              <EuiDescriptionListTitle>{i18n.STATUS}</EuiDescriptionListTitle>
-              <EuiDescriptionListDescription>
-                <EuiBadge color={badgeColor} data-test-subj="case-view-status">
-                  {status}
-                </EuiBadge>
-              </EuiDescriptionListDescription>
-            </EuiFlexItem>
-            <EuiFlexItem>
-              <EuiDescriptionListTitle>{title}</EuiDescriptionListTitle>
-              <EuiDescriptionListDescription>
-                <FormattedRelativePreferenceDate data-test-subj={dataTestSubj} value={value} />
-              </EuiDescriptionListDescription>
-            </EuiFlexItem>
-          </EuiFlexGroup>
-        </MyDescriptionList>
-      </EuiFlexItem>
-      <EuiFlexItem grow={false}>
-        <EuiFlexGroup gutterSize="l" alignItems="center">
-          <EuiFlexItem>
-            <EuiButtonToggle
-              data-test-subj="toggle-case-status"
-              iconType={icon}
-              isLoading={isLoading}
-              isSelected={isSelected}
-              label={buttonLabel}
-              onChange={onChange}
-            />
-          </EuiFlexItem>
+}) => (
+  <EuiFlexGroup gutterSize="l" justifyContent="flexEnd">
+    <EuiFlexItem grow={false}>
+      <MyDescriptionList compressed>
+        <EuiFlexGroup>
           <EuiFlexItem grow={false}>
-            <CaseViewActions caseId={caseId} caseTitle={caseTitle} />
+            <EuiDescriptionListTitle>{i18n.STATUS}</EuiDescriptionListTitle>
+            <EuiDescriptionListDescription>
+              <EuiBadge color={badgeColor} data-test-subj="case-view-status">
+                {status}
+              </EuiBadge>
+            </EuiDescriptionListDescription>
+          </EuiFlexItem>
+          <EuiFlexItem>
+            <EuiDescriptionListTitle>{title}</EuiDescriptionListTitle>
+            <EuiDescriptionListDescription>
+              <FormattedRelativePreferenceDate data-test-subj={dataTestSubj} value={value} />
+            </EuiDescriptionListDescription>
           </EuiFlexItem>
         </EuiFlexGroup>
-      </EuiFlexItem>
-    </EuiFlexGroup>
-  );
-};
+      </MyDescriptionList>
+    </EuiFlexItem>
+    <EuiFlexItem grow={false}>
+      <EuiFlexGroup gutterSize="l" alignItems="center">
+        <EuiFlexItem>
+          <EuiButtonToggle
+            data-test-subj="toggle-case-status"
+            iconType={icon}
+            isLoading={isLoading}
+            isSelected={isSelected}
+            label={buttonLabel}
+            onChange={toggleStatusCase}
+          />
+        </EuiFlexItem>
+        <EuiFlexItem grow={false}>
+          <CaseViewActions caseId={caseId} caseTitle={caseTitle} />
+        </EuiFlexItem>
+      </EuiFlexGroup>
+    </EuiFlexItem>
+  </EuiFlexGroup>
+);
 
 export const CaseStatus = React.memo(CaseStatusComp);
diff --git a/x-pack/legacy/plugins/siem/public/pages/case/components/case_view/__mock__/index.tsx b/x-pack/legacy/plugins/siem/public/pages/case/components/case_view/__mock__/index.tsx
index e11441eac3a9d..7aadea1a453a7 100644
--- a/x-pack/legacy/plugins/siem/public/pages/case/components/case_view/__mock__/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/case/components/case_view/__mock__/index.tsx
@@ -13,7 +13,6 @@ export const caseProps: CaseProps = {
     closedAt: null,
     closedBy: null,
     id: '3c4ddcc0-4e99-11ea-9290-35d05cb55c15',
-    commentIds: ['a357c6a0-5435-11ea-b427-fb51a1fcb7b8'],
     comments: [
       {
         comment: 'Solve this fast!',
@@ -24,6 +23,8 @@ export const caseProps: CaseProps = {
           username: 'smilovic',
           email: 'notmyrealemailfool@elastic.co',
         },
+        pushedAt: null,
+        pushedBy: null,
         updatedAt: '2020-02-20T23:06:33.798Z',
         updatedBy: {
           username: 'elastic',
@@ -34,9 +35,11 @@ export const caseProps: CaseProps = {
     createdAt: '2020-02-13T19:44:23.627Z',
     createdBy: { fullName: null, email: 'testemail@elastic.co', username: 'elastic' },
     description: 'Security banana Issue',
+    externalService: null,
     status: 'open',
     tags: ['defacement'],
     title: 'Another horrible breach!!',
+    totalComment: 1,
     updatedAt: '2020-02-19T15:02:57.995Z',
     updatedBy: {
       username: 'elastic',
@@ -44,6 +47,7 @@ export const caseProps: CaseProps = {
     version: 'WzQ3LDFd',
   },
 };
+
 export const caseClosedProps: CaseProps = {
   ...caseProps,
   initialData: {
@@ -63,3 +67,21 @@ export const data: Case = {
 export const dataClosed: Case = {
   ...caseClosedProps.initialData,
 };
+
+export const caseUserActions = [
+  {
+    actionField: ['comment'],
+    action: 'create',
+    actionAt: '2020-03-20T17:10:09.814Z',
+    actionBy: {
+      fullName: 'Steph Milovic',
+      username: 'smilovic',
+      email: 'notmyrealemailfool@elastic.co',
+    },
+    newValue: 'Solve this fast!',
+    oldValue: null,
+    actionId: '3c4ddcc0-4e99-11ea-9290-35d05cb55c15',
+    caseId: '9b833a50-6acd-11ea-8fad-af86b1071bd9',
+    commentId: 'a357c6a0-5435-11ea-b427-fb51a1fcb7b8',
+  },
+];
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 3f4a83d1bff33..18cc33d8a6d4d 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
@@ -11,11 +11,18 @@ import { mount } from 'enzyme';
 import routeData from 'react-router';
 /* eslint-enable @kbn/eslint/module_migration */
 import { CaseComponent } from './';
-import { caseProps, caseClosedProps, data, dataClosed } from './__mock__';
+import { caseProps, caseClosedProps, data, dataClosed, caseUserActions } from './__mock__';
 import { TestProviders } from '../../../../mock';
 import { useUpdateCase } from '../../../../containers/case/use_update_case';
+import { useGetCaseUserActions } from '../../../../containers/case/use_get_case_user_actions';
+import { wait } from '../../../../lib/helpers';
+import { usePushToService } from './push_to_service';
 jest.mock('../../../../containers/case/use_update_case');
+jest.mock('../../../../containers/case/use_get_case_user_actions');
+jest.mock('./push_to_service');
 const useUpdateCaseMock = useUpdateCase as jest.Mock;
+const useGetCaseUserActionsMock = useGetCaseUserActions as jest.Mock;
+const usePushToServiceMock = usePushToService as jest.Mock;
 type Action = 'PUSH' | 'POP' | 'REPLACE';
 const pop: Action = 'POP';
 const location = {
@@ -47,6 +54,7 @@ const mockLocation = {
 
 describe('CaseView ', () => {
   const updateCaseProperty = jest.fn();
+  const fetchCaseUserActions = jest.fn();
   /* eslint-disable no-console */
   // Silence until enzyme fixed to use ReactTestUtils.act()
   const originalError = console.error;
@@ -66,13 +74,31 @@ describe('CaseView ', () => {
     updateCaseProperty,
   };
 
+  const defaultUseGetCaseUserActions = {
+    caseUserActions,
+    fetchCaseUserActions,
+    firstIndexPushToService: -1,
+    hasDataToPush: false,
+    isLoading: false,
+    isError: false,
+    lastIndexPushToService: -1,
+    participants: [data.createdBy],
+  };
+
+  const defaultUsePushToServiceMock = {
+    pushButton: <>{'Hello Button'}</>,
+    pushCallouts: null,
+  };
+
   beforeEach(() => {
     jest.resetAllMocks();
     useUpdateCaseMock.mockImplementation(() => defaultUpdateCaseState);
     jest.spyOn(routeData, 'useLocation').mockReturnValue(mockLocation);
+    useGetCaseUserActionsMock.mockImplementation(() => defaultUseGetCaseUserActions);
+    usePushToServiceMock.mockImplementation(() => defaultUsePushToServiceMock);
   });
 
-  it('should render CaseComponent', () => {
+  it('should render CaseComponent', async () => {
     const wrapper = mount(
       <TestProviders>
         <Router history={mockHistory}>
@@ -80,6 +106,7 @@ describe('CaseView ', () => {
         </Router>
       </TestProviders>
     );
+    await wait();
     expect(
       wrapper
         .find(`[data-test-subj="case-view-title"]`)
@@ -119,7 +146,7 @@ describe('CaseView ', () => {
     ).toEqual(data.description);
   });
 
-  it('should show closed indicators in header when case is closed', () => {
+  it('should show closed indicators in header when case is closed', async () => {
     useUpdateCaseMock.mockImplementation(() => ({
       ...defaultUpdateCaseState,
       caseData: dataClosed,
@@ -131,6 +158,7 @@ describe('CaseView ', () => {
         </Router>
       </TestProviders>
     );
+    await wait();
     expect(wrapper.contains(`[data-test-subj="case-view-createdAt"]`)).toBe(false);
     expect(
       wrapper
@@ -146,7 +174,7 @@ describe('CaseView ', () => {
     ).toEqual(dataClosed.status);
   });
 
-  it('should dispatch update state when button is toggled', () => {
+  it('should dispatch update state when button is toggled', async () => {
     const wrapper = mount(
       <TestProviders>
         <Router history={mockHistory}>
@@ -154,18 +182,19 @@ describe('CaseView ', () => {
         </Router>
       </TestProviders>
     );
-
+    await wait();
     wrapper
       .find('input[data-test-subj="toggle-case-status"]')
       .simulate('change', { target: { checked: true } });
 
     expect(updateCaseProperty).toBeCalledWith({
+      fetchCaseUserActions,
       updateKey: 'status',
       updateValue: 'closed',
     });
   });
 
-  it('should render comments', () => {
+  it('should render comments', async () => {
     const wrapper = mount(
       <TestProviders>
         <Router history={mockHistory}>
@@ -173,6 +202,7 @@ describe('CaseView ', () => {
         </Router>
       </TestProviders>
     );
+    await wait();
     expect(
       wrapper
         .find(
diff --git a/x-pack/legacy/plugins/siem/public/pages/case/components/case_view/index.tsx b/x-pack/legacy/plugins/siem/public/pages/case/components/case_view/index.tsx
index 0ac3adeb860ff..742921cb9f69e 100644
--- a/x-pack/legacy/plugins/siem/public/pages/case/components/case_view/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/case/components/case_view/index.tsx
@@ -4,10 +4,17 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import React, { useCallback, useMemo } from 'react';
-import { EuiFlexGroup, EuiFlexItem, EuiLoadingSpinner } from '@elastic/eui';
-
+import {
+  EuiButtonToggle,
+  EuiFlexGroup,
+  EuiFlexItem,
+  EuiLoadingContent,
+  EuiLoadingSpinner,
+  EuiHorizontalRule,
+} from '@elastic/eui';
+import React, { useCallback, useEffect, useMemo, useState } from 'react';
 import styled from 'styled-components';
+
 import * as i18n from './translations';
 import { Case } from '../../../../containers/case/types';
 import { getCaseUrl } from '../../../../components/link_to';
@@ -24,6 +31,8 @@ import { WhitePageWrapper } from '../wrappers';
 import { useBasePath } from '../../../../lib/kibana';
 import { CaseStatus } from '../case_status';
 import { SpyRoute } from '../../../../utils/route/spy_routes';
+import { useGetCaseUserActions } from '../../../../containers/case/use_get_case_user_actions';
+import { usePushToService } from './push_to_service';
 
 interface Props {
   caseId: string;
@@ -37,6 +46,13 @@ const MyEuiFlexGroup = styled(EuiFlexGroup)`
   height: 100%;
 `;
 
+const MyEuiHorizontalRule = styled(EuiHorizontalRule)`
+  margin-left: 48px;
+  &.euiHorizontalRule--full {
+    width: calc(100% - 48px);
+  }
+`;
+
 export interface CaseProps {
   caseId: string;
   initialData: Case;
@@ -45,7 +61,20 @@ export interface CaseProps {
 export const CaseComponent = React.memo<CaseProps>(({ caseId, initialData }) => {
   const basePath = window.location.origin + useBasePath();
   const caseLink = `${basePath}/app/siem#/case/${caseId}`;
-  const { caseData, isLoading, updateKey, updateCaseProperty } = useUpdateCase(caseId, initialData);
+  const [initLoadingData, setInitLoadingData] = useState(true);
+  const {
+    caseUserActions,
+    fetchCaseUserActions,
+    firstIndexPushToService,
+    hasDataToPush,
+    isLoading: isLoadingUserActions,
+    lastIndexPushToService,
+    participants,
+  } = useGetCaseUserActions(caseId);
+  const { caseData, isLoading, updateKey, updateCase, updateCaseProperty } = useUpdateCase(
+    caseId,
+    initialData
+  );
 
   // Update Fields
   const onUpdateField = useCallback(
@@ -55,6 +84,7 @@ export const CaseComponent = React.memo<CaseProps>(({ caseId, initialData }) =>
           const titleUpdate = getTypedPayload<string>(updateValue);
           if (titleUpdate.length > 0) {
             updateCaseProperty({
+              fetchCaseUserActions,
               updateKey: 'title',
               updateValue: titleUpdate,
             });
@@ -64,6 +94,7 @@ export const CaseComponent = React.memo<CaseProps>(({ caseId, initialData }) =>
           const descriptionUpdate = getTypedPayload<string>(updateValue);
           if (descriptionUpdate.length > 0) {
             updateCaseProperty({
+              fetchCaseUserActions,
               updateKey: 'description',
               updateValue: descriptionUpdate,
             });
@@ -72,6 +103,7 @@ export const CaseComponent = React.memo<CaseProps>(({ caseId, initialData }) =>
         case 'tags':
           const tagsUpdate = getTypedPayload<string[]>(updateValue);
           updateCaseProperty({
+            fetchCaseUserActions,
             updateKey: 'tags',
             updateValue: tagsUpdate,
           });
@@ -80,6 +112,7 @@ export const CaseComponent = React.memo<CaseProps>(({ caseId, initialData }) =>
           const statusUpdate = getTypedPayload<string>(updateValue);
           if (caseData.status !== updateValue) {
             updateCaseProperty({
+              fetchCaseUserActions,
               updateKey: 'status',
               updateValue: statusUpdate,
             });
@@ -88,12 +121,29 @@ export const CaseComponent = React.memo<CaseProps>(({ caseId, initialData }) =>
           return null;
       }
     },
-    [caseData.status]
+    [fetchCaseUserActions, updateCaseProperty, caseData.status]
+  );
+  const handleUpdateCase = useCallback(
+    (newCase: Case) => {
+      updateCase(newCase);
+      fetchCaseUserActions(newCase.id);
+    },
+    [updateCase, fetchCaseUserActions]
   );
+
+  const { pushButton, pushCallouts } = usePushToService({
+    caseId: caseData.id,
+    caseStatus: caseData.status,
+    isNew: caseUserActions.filter(cua => cua.action === 'push-to-service').length === 0,
+    updateCase: handleUpdateCase,
+  });
+
   const onSubmitTags = useCallback(newTags => onUpdateField('tags', newTags), [onUpdateField]);
   const onSubmitTitle = useCallback(newTitle => onUpdateField('title', newTitle), [onUpdateField]);
-  const toggleStatusCase = useCallback(status => onUpdateField('status', status), [onUpdateField]);
-
+  const toggleStatusCase = useCallback(
+    e => onUpdateField('status', e.target.checked ? 'closed' : 'open'),
+    [onUpdateField]
+  );
   const spyState = useMemo(() => ({ caseTitle: caseData.title }), [caseData.title]);
 
   const caseStatusData = useMemo(
@@ -111,7 +161,7 @@ export const CaseComponent = React.memo<CaseProps>(({ caseId, initialData }) =>
           }
         : {
             'data-test-subj': 'case-view-closedAt',
-            value: caseData.closedAt,
+            value: caseData.closedAt ?? '',
             title: i18n.CASE_CLOSED,
             buttonLabel: i18n.REOPEN_CASE,
             status: caseData.status,
@@ -126,8 +176,15 @@ export const CaseComponent = React.memo<CaseProps>(({ caseId, initialData }) =>
       subject: i18n.EMAIL_SUBJECT(caseData.title),
       body: i18n.EMAIL_BODY(caseLink),
     }),
-    [caseData.title]
+    [caseLink, caseData.title]
   );
+
+  useEffect(() => {
+    if (initLoadingData && !isLoadingUserActions) {
+      setInitLoadingData(false);
+    }
+  }, [initLoadingData, isLoadingUserActions]);
+
   return (
     <>
       <MyWrapper>
@@ -157,21 +214,52 @@ export const CaseComponent = React.memo<CaseProps>(({ caseId, initialData }) =>
       </MyWrapper>
       <WhitePageWrapper>
         <MyWrapper>
+          {pushCallouts != null && pushCallouts}
           <EuiFlexGroup>
             <EuiFlexItem grow={6}>
-              <UserActionTree
-                data={caseData}
-                isLoadingDescription={isLoading && updateKey === 'description'}
-                onUpdateField={onUpdateField}
-              />
+              {initLoadingData && <EuiLoadingContent lines={8} />}
+              {!initLoadingData && (
+                <>
+                  <UserActionTree
+                    caseUserActions={caseUserActions}
+                    data={caseData}
+                    fetchUserActions={fetchCaseUserActions.bind(null, caseData.id)}
+                    firstIndexPushToService={firstIndexPushToService}
+                    isLoadingDescription={isLoading && updateKey === 'description'}
+                    isLoadingUserActions={isLoadingUserActions}
+                    lastIndexPushToService={lastIndexPushToService}
+                    onUpdateField={onUpdateField}
+                  />
+                  <MyEuiHorizontalRule margin="s" />
+                  <EuiFlexGroup alignItems="center" gutterSize="s" justifyContent="flexEnd">
+                    <EuiFlexItem grow={false}>
+                      <EuiButtonToggle
+                        data-test-subj={caseStatusData['data-test-subj']}
+                        iconType={caseStatusData.icon}
+                        isSelected={caseStatusData.isSelected}
+                        isLoading={isLoading && updateKey === 'status'}
+                        label={caseStatusData.buttonLabel}
+                        onChange={toggleStatusCase}
+                      />
+                    </EuiFlexItem>
+                    {hasDataToPush && <EuiFlexItem grow={false}>{pushButton}</EuiFlexItem>}
+                  </EuiFlexGroup>
+                </>
+              )}
             </EuiFlexItem>
             <EuiFlexItem grow={2}>
               <UserList
-                data-test-subj="case-view-user-list"
+                data-test-subj="case-view-user-list-reporter"
                 email={emailContent}
                 headline={i18n.REPORTER}
                 users={[caseData.createdBy]}
               />
+              <UserList
+                data-test-subj="case-view-user-list-participants"
+                email={emailContent}
+                headline={i18n.PARTICIPANTS}
+                users={participants}
+              />
               <TagList
                 data-test-subj="case-view-tag-list"
                 tags={caseData.tags}
diff --git a/x-pack/legacy/plugins/siem/public/pages/case/components/case_view/push_to_service.tsx b/x-pack/legacy/plugins/siem/public/pages/case/components/case_view/push_to_service.tsx
new file mode 100644
index 0000000000000..944302c1940ee
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/public/pages/case/components/case_view/push_to_service.tsx
@@ -0,0 +1,185 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { EuiButton, EuiLink, EuiToolTip } from '@elastic/eui';
+import React, { useCallback, useState, useMemo } from 'react';
+import { FormattedMessage } from '@kbn/i18n/react';
+
+import { useCaseConfigure } from '../../../../containers/case/configure/use_configure';
+import { Case } from '../../../../containers/case/types';
+import { useGetActionLicense } from '../../../../containers/case/use_get_action_license';
+import { usePostPushToService } from '../../../../containers/case/use_post_push_to_service';
+import { getConfigureCasesUrl } from '../../../../components/link_to';
+import { useGetUrlSearch } from '../../../../components/navigation/use_get_url_search';
+import { navTabs } from '../../../home/home_navigations';
+import { ErrorsPushServiceCallOut } from '../errors_push_service_callout';
+import * as i18n from './translations';
+
+interface UsePushToService {
+  caseId: string;
+  caseStatus: string;
+  isNew: boolean;
+  updateCase: (newCase: Case) => void;
+}
+
+interface Connector {
+  connectorId: string;
+  connectorName: string;
+}
+
+interface ReturnUsePushToService {
+  pushButton: JSX.Element;
+  pushCallouts: JSX.Element | null;
+}
+
+export const usePushToService = ({
+  caseId,
+  caseStatus,
+  updateCase,
+  isNew,
+}: UsePushToService): ReturnUsePushToService => {
+  const urlSearch = useGetUrlSearch(navTabs.case);
+  const [connector, setConnector] = useState<Connector | null>(null);
+
+  const { isLoading, postPushToService } = usePostPushToService();
+
+  const handleSetConnector = useCallback((connectorId: string, connectorName?: string) => {
+    setConnector({ connectorId, connectorName: connectorName ?? '' });
+  }, []);
+
+  const { loading: loadingCaseConfigure } = useCaseConfigure({
+    setConnector: handleSetConnector,
+  });
+
+  const { isLoading: loadingLicense, actionLicense } = useGetActionLicense();
+
+  const handlePushToService = useCallback(() => {
+    if (connector != null) {
+      postPushToService({
+        caseId,
+        ...connector,
+        updateCase,
+      });
+    }
+  }, [caseId, connector, postPushToService, updateCase]);
+
+  const errorsMsg = useMemo(() => {
+    let errors: Array<{ title: string; description: JSX.Element }> = [];
+    if (actionLicense != null && !actionLicense.enabledInLicense) {
+      errors = [
+        ...errors,
+        {
+          title: i18n.PUSH_DISABLE_BY_LICENSE_TITLE,
+          description: (
+            <FormattedMessage
+              defaultMessage="To open cases in external systems, you must update your license to Platinum, start a free 30-day trial, or spin up a {link} on AWS, GCP, or Azure."
+              id="xpack.siem.case.caseView.pushToServiceDisableByLicenseDescription"
+              values={{
+                link: (
+                  <EuiLink href="https://www.elastic.co/cloud/" target="_blank">
+                    {i18n.LINK_CLOUD_DEPLOYMENT}
+                  </EuiLink>
+                ),
+              }}
+            />
+          ),
+        },
+      ];
+    }
+    if (connector == null && !loadingCaseConfigure && !loadingLicense) {
+      errors = [
+        ...errors,
+        {
+          title: i18n.PUSH_DISABLE_BY_NO_CASE_CONFIG_TITLE,
+          description: (
+            <FormattedMessage
+              defaultMessage="To open and update cases in external systems, you must configure a {link}."
+              id="xpack.siem.case.caseView.pushToServiceDisableByNoCaseConfigDescription"
+              values={{
+                link: (
+                  <EuiLink href={getConfigureCasesUrl(urlSearch)} target="_blank">
+                    {i18n.LINK_CONNECTOR_CONFIGURE}
+                  </EuiLink>
+                ),
+              }}
+            />
+          ),
+        },
+      ];
+    }
+    if (caseStatus === 'closed') {
+      errors = [
+        ...errors,
+        {
+          title: i18n.PUSH_DISABLE_BECAUSE_CASE_CLOSED_TITLE,
+          description: (
+            <FormattedMessage
+              defaultMessage="Closed cases cannot be sent to external systems. Reopen the case if you want to open or update it in an external system."
+              id="xpack.siem.case.caseView.pushToServiceDisableBecauseCaseClosedDescription"
+            />
+          ),
+        },
+      ];
+    }
+    if (actionLicense != null && !actionLicense.enabledInConfig) {
+      errors = [
+        ...errors,
+        {
+          title: i18n.PUSH_DISABLE_BY_KIBANA_CONFIG_TITLE,
+          description: (
+            <FormattedMessage
+              defaultMessage="The kibana.yml file is configured to only allow specific connectors. To enable opening a case in external systems, add .servicenow to the xpack.actions.enabledActiontypes setting. For more information, see {link}."
+              id="xpack.siem.case.caseView.pushToServiceDisableByConfigDescription"
+              values={{
+                link: (
+                  <EuiLink href="#" target="_blank">
+                    {'coming soon...'}
+                  </EuiLink>
+                ),
+              }}
+            />
+          ),
+        },
+      ];
+    }
+    return errors;
+  }, [actionLicense, caseStatus, connector, loadingCaseConfigure, loadingLicense, urlSearch]);
+
+  const pushToServiceButton = useMemo(
+    () => (
+      <EuiButton
+        fill
+        iconType="importAction"
+        onClick={handlePushToService}
+        disabled={isLoading || loadingLicense || loadingCaseConfigure || errorsMsg.length > 0}
+        isLoading={isLoading}
+      >
+        {isNew ? i18n.PUSH_SERVICENOW : i18n.UPDATE_PUSH_SERVICENOW}
+      </EuiButton>
+    ),
+    [isNew, handlePushToService, isLoading, loadingLicense, loadingCaseConfigure, errorsMsg]
+  );
+
+  const objToReturn = useMemo(
+    () => ({
+      pushButton:
+        errorsMsg.length > 0 ? (
+          <EuiToolTip
+            position="top"
+            title={errorsMsg[0].title}
+            content={<p>{errorsMsg[0].description}</p>}
+          >
+            {pushToServiceButton}
+          </EuiToolTip>
+        ) : (
+          <>{pushToServiceButton}</>
+        ),
+      pushCallouts: errorsMsg.length > 0 ? <ErrorsPushServiceCallOut errors={errorsMsg} /> : null,
+    }),
+    [errorsMsg, pushToServiceButton]
+  );
+  return objToReturn;
+};
diff --git a/x-pack/legacy/plugins/siem/public/pages/case/components/case_view/translations.ts b/x-pack/legacy/plugins/siem/public/pages/case/components/case_view/translations.ts
index e5fa3bff51f85..beba80ccd934c 100644
--- a/x-pack/legacy/plugins/siem/public/pages/case/components/case_view/translations.ts
+++ b/x-pack/legacy/plugins/siem/public/pages/case/components/case_view/translations.ts
@@ -18,17 +18,40 @@ export const SHOWING_CASES = (actionDate: string, actionName: string, userName:
     defaultMessage: '{userName} {actionName} on {actionDate}',
   });
 
-export const ADDED_DESCRIPTION = i18n.translate(
-  'xpack.siem.case.caseView.actionLabel.addDescription',
+export const ADDED_FIELD = i18n.translate('xpack.siem.case.caseView.actionLabel.addedField', {
+  defaultMessage: 'added',
+});
+
+export const CHANGED_FIELD = i18n.translate('xpack.siem.case.caseView.actionLabel.changededField', {
+  defaultMessage: 'changed',
+});
+
+export const EDITED_FIELD = i18n.translate('xpack.siem.case.caseView.actionLabel.editedField', {
+  defaultMessage: 'edited',
+});
+
+export const REMOVED_FIELD = i18n.translate('xpack.siem.case.caseView.actionLabel.removedField', {
+  defaultMessage: 'removed',
+});
+
+export const PUSHED_NEW_INCIDENT = i18n.translate(
+  'xpack.siem.case.caseView.actionLabel.pushedNewIncident',
   {
-    defaultMessage: 'added description',
+    defaultMessage: 'pushed as new incident',
+  }
+);
+
+export const UPDATE_INCIDENT = i18n.translate(
+  'xpack.siem.case.caseView.actionLabel.updateIncident',
+  {
+    defaultMessage: 'updated incident',
   }
 );
 
-export const EDITED_DESCRIPTION = i18n.translate(
-  'xpack.siem.case.caseView.actionLabel.editDescription',
+export const ADDED_DESCRIPTION = i18n.translate(
+  'xpack.siem.case.caseView.actionLabel.addDescription',
   {
-    defaultMessage: 'edited description',
+    defaultMessage: 'added description',
   }
 );
 
@@ -52,6 +75,14 @@ export const STATUS = i18n.translate('xpack.siem.case.caseView.statusLabel', {
   defaultMessage: 'Status',
 });
 
+export const CASE = i18n.translate('xpack.siem.case.caseView.case', {
+  defaultMessage: 'case',
+});
+
+export const COMMENT = i18n.translate('xpack.siem.case.caseView.comment', {
+  defaultMessage: 'comment',
+});
+
 export const CASE_OPENED = i18n.translate('xpack.siem.case.caseView.caseOpened', {
   defaultMessage: 'Case opened',
 });
@@ -71,3 +102,56 @@ export const EMAIL_BODY = (caseUrl: string) =>
     values: { caseUrl },
     defaultMessage: 'Case reference: {caseUrl}',
   });
+
+export const PUSH_SERVICENOW = i18n.translate('xpack.siem.case.caseView.pushAsServicenowIncident', {
+  defaultMessage: 'Push as ServiceNow incident',
+});
+
+export const UPDATE_PUSH_SERVICENOW = i18n.translate(
+  'xpack.siem.case.caseView.updatePushAsServicenowIncident',
+  {
+    defaultMessage: 'Update ServiceNow incident',
+  }
+);
+
+export const PUSH_DISABLE_BY_NO_CASE_CONFIG_TITLE = i18n.translate(
+  'xpack.siem.case.caseView.pushToServiceDisableByNoCaseConfigTitle',
+  {
+    defaultMessage: 'Configure external connector',
+  }
+);
+
+export const PUSH_DISABLE_BECAUSE_CASE_CLOSED_TITLE = i18n.translate(
+  'xpack.siem.case.caseView.pushToServiceDisableBecauseCaseClosedTitle',
+  {
+    defaultMessage: 'Reopen the case',
+  }
+);
+
+export const PUSH_DISABLE_BY_KIBANA_CONFIG_TITLE = i18n.translate(
+  'xpack.siem.case.caseView.pushToServiceDisableByConfigTitle',
+  {
+    defaultMessage: 'Enable ServiceNow in Kibana configuration file',
+  }
+);
+
+export const PUSH_DISABLE_BY_LICENSE_TITLE = i18n.translate(
+  'xpack.siem.case.caseView.pushToServiceDisableByLicenseTitle',
+  {
+    defaultMessage: 'Upgrade to Elastic Platinum',
+  }
+);
+
+export const LINK_CLOUD_DEPLOYMENT = i18n.translate(
+  'xpack.siem.case.caseView.cloudDeploymentLink',
+  {
+    defaultMessage: 'cloud deployment',
+  }
+);
+
+export const LINK_CONNECTOR_CONFIGURE = i18n.translate(
+  'xpack.siem.case.caseView.connectorConfigureLink',
+  {
+    defaultMessage: 'connector',
+  }
+);
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 c8ef6e32595d0..fb4d91492c1d4 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
@@ -113,7 +113,7 @@ const ConfigureCasesComponent: React.FC = () => {
   }, []);
 
   const { loading: loadingCaseConfigure, persistLoading, persistCaseConfigure } = useCaseConfigure({
-    setConnectorId,
+    setConnector: setConnectorId,
     setClosureType,
   });
   const { loading: isLoadingConnectors, connectors, refetchConnectors } = useConnectors();
@@ -128,9 +128,13 @@ const ConfigureCasesComponent: React.FC = () => {
     // TO DO give a warning/error to user when field are not mapped so they have chance to do it
     () => {
       setActionBarVisible(false);
-      persistCaseConfigure({ connectorId, closureType });
+      persistCaseConfigure({
+        connectorId,
+        connectorName: connectors.find(c => c.id === connectorId)?.name ?? '',
+        closureType,
+      });
     },
-    [connectorId, closureType, mapping]
+    [connectorId, connectors, closureType, mapping]
   );
 
   const onChangeConnector = useCallback((newConnectorId: string) => {
diff --git a/x-pack/legacy/plugins/siem/public/pages/case/components/errors_push_service_callout/index.tsx b/x-pack/legacy/plugins/siem/public/pages/case/components/errors_push_service_callout/index.tsx
new file mode 100644
index 0000000000000..15b50e4b4cd8d
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/public/pages/case/components/errors_push_service_callout/index.tsx
@@ -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 { EuiCallOut, EuiButton, EuiDescriptionList, EuiSpacer } from '@elastic/eui';
+import React, { memo, useCallback, useState } from 'react';
+
+import * as i18n from './translations';
+
+interface ErrorsPushServiceCallOut {
+  errors: Array<{ title: string; description: JSX.Element }>;
+}
+
+const ErrorsPushServiceCallOutComponent = ({ errors }: ErrorsPushServiceCallOut) => {
+  const [showCallOut, setShowCallOut] = useState(true);
+  const handleCallOut = useCallback(() => setShowCallOut(false), [setShowCallOut]);
+
+  return showCallOut ? (
+    <>
+      <EuiCallOut title={i18n.ERROR_PUSH_SERVICE_CALLOUT_TITLE} color="primary" iconType="gear">
+        <EuiDescriptionList listItems={errors} />
+        <EuiButton color="primary" onClick={handleCallOut}>
+          {i18n.DISMISS_CALLOUT}
+        </EuiButton>
+      </EuiCallOut>
+      <EuiSpacer />
+    </>
+  ) : null;
+};
+
+export const ErrorsPushServiceCallOut = memo(ErrorsPushServiceCallOutComponent);
diff --git a/x-pack/legacy/plugins/siem/public/pages/case/components/errors_push_service_callout/translations.ts b/x-pack/legacy/plugins/siem/public/pages/case/components/errors_push_service_callout/translations.ts
new file mode 100644
index 0000000000000..57712e720f6d0
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/public/pages/case/components/errors_push_service_callout/translations.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 { i18n } from '@kbn/i18n';
+
+export const ERROR_PUSH_SERVICE_CALLOUT_TITLE = i18n.translate(
+  'xpack.siem.case.errorsPushServiceCallOutTitle',
+  {
+    defaultMessage: 'To send cases to external systems, you need to:',
+  }
+);
+
+export const DISMISS_CALLOUT = i18n.translate(
+  'xpack.siem.case.dismissErrorsPushServiceCallOutTitle',
+  {
+    defaultMessage: 'Dismiss',
+  }
+);
diff --git a/x-pack/legacy/plugins/siem/public/pages/case/components/user_action_tree/helpers.tsx b/x-pack/legacy/plugins/siem/public/pages/case/components/user_action_tree/helpers.tsx
new file mode 100644
index 0000000000000..008f4d7048f56
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/public/pages/case/components/user_action_tree/helpers.tsx
@@ -0,0 +1,75 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { EuiFlexGroup, EuiFlexItem, EuiBadge, EuiLink } from '@elastic/eui';
+import React from 'react';
+
+import { CaseFullExternalService } from '../../../../../../../../plugins/case/common/api';
+import { CaseUserActions } from '../../../../containers/case/types';
+import * as i18n from '../case_view/translations';
+
+interface LabelTitle {
+  action: CaseUserActions;
+  field: string;
+  firstIndexPushToService: number;
+  index: number;
+}
+
+export const getLabelTitle = ({ action, field, firstIndexPushToService, index }: LabelTitle) => {
+  if (field === 'tags') {
+    return getTagsLabelTitle(action);
+  } else if (field === 'title' && action.action === 'update') {
+    return `${i18n.CHANGED_FIELD.toLowerCase()} ${i18n.CASE_NAME.toLowerCase()}  ${i18n.TO} "${
+      action.newValue
+    }"`;
+  } else if (field === 'description' && action.action === 'update') {
+    return `${i18n.EDITED_FIELD} ${i18n.DESCRIPTION.toLowerCase()}`;
+  } else if (field === 'status' && action.action === 'update') {
+    return `${
+      action.newValue === 'open' ? i18n.REOPENED_CASE.toLowerCase() : i18n.CLOSED_CASE.toLowerCase()
+    } ${i18n.CASE}`;
+  } else if (field === 'comment' && action.action === 'update') {
+    return `${i18n.EDITED_FIELD} ${i18n.COMMENT.toLowerCase()}`;
+  } else if (field === 'pushed' && action.action === 'push-to-service' && action.newValue != null) {
+    return getPushedServiceLabelTitle(action, firstIndexPushToService, index);
+  }
+  return '';
+};
+
+const getTagsLabelTitle = (action: CaseUserActions) => (
+  <EuiFlexGroup alignItems="baseline" gutterSize="xs" component="span">
+    <EuiFlexItem>
+      {action.action === 'add' && i18n.ADDED_FIELD}
+      {action.action === 'delete' && i18n.REMOVED_FIELD} {i18n.TAGS.toLowerCase()}
+    </EuiFlexItem>
+    {action.newValue != null &&
+      action.newValue.split(',').map(tag => (
+        <EuiFlexItem grow={false} key={tag}>
+          <EuiBadge color="default">{tag}</EuiBadge>
+        </EuiFlexItem>
+      ))}
+  </EuiFlexGroup>
+);
+
+const getPushedServiceLabelTitle = (
+  action: CaseUserActions,
+  firstIndexPushToService: number,
+  index: number
+) => {
+  const pushedVal = JSON.parse(action.newValue ?? '') as CaseFullExternalService;
+  return (
+    <EuiFlexGroup alignItems="baseline" gutterSize="xs">
+      <EuiFlexItem>
+        {firstIndexPushToService === index ? i18n.PUSHED_NEW_INCIDENT : i18n.UPDATE_INCIDENT}
+      </EuiFlexItem>
+      <EuiFlexItem grow={false}>
+        <EuiLink href={pushedVal?.external_url} target="_blank">
+          {pushedVal?.connector_name} {pushedVal?.external_title}
+        </EuiLink>
+      </EuiFlexItem>
+    </EuiFlexGroup>
+  );
+};
diff --git a/x-pack/legacy/plugins/siem/public/pages/case/components/user_action_tree/index.tsx b/x-pack/legacy/plugins/siem/public/pages/case/components/user_action_tree/index.tsx
index 6a3d319561353..8b77186f76f77 100644
--- a/x-pack/legacy/plugins/siem/public/pages/case/components/user_action_tree/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/case/components/user_action_tree/index.tsx
@@ -4,27 +4,54 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import React, { useCallback, useMemo, useState } from 'react';
+import { EuiFlexGroup, EuiFlexItem, EuiLoadingSpinner } from '@elastic/eui';
+import React, { useCallback, useMemo, useRef, useState, useEffect } from 'react';
+import { useParams } from 'react-router-dom';
+import styled from 'styled-components';
+
 import * as i18n from '../case_view/translations';
 
-import { Case } from '../../../../containers/case/types';
+import { Case, CaseUserActions, Comment } from '../../../../containers/case/types';
 import { useUpdateComment } from '../../../../containers/case/use_update_comment';
+import { useCurrentUser } from '../../../../lib/kibana';
+import { AddComment } from '../add_comment';
+import { getLabelTitle } from './helpers';
 import { UserActionItem } from './user_action_item';
 import { UserActionMarkdown } from './user_action_markdown';
-import { AddComment } from '../add_comment';
-import { useCurrentUser } from '../../../../lib/kibana';
 
 export interface UserActionTreeProps {
   data: Case;
+  caseUserActions: CaseUserActions[];
+  fetchUserActions: () => void;
+  firstIndexPushToService: number;
   isLoadingDescription: boolean;
+  isLoadingUserActions: boolean;
+  lastIndexPushToService: number;
   onUpdateField: (updateKey: keyof Case, updateValue: string | string[]) => void;
 }
 
-const DescriptionId = 'description';
-const NewId = 'newComment';
+const MyEuiFlexGroup = styled(EuiFlexGroup)`
+  margin-bottom: 8px;
+`;
+
+const DESCRIPTION_ID = 'description';
+const NEW_ID = 'newComment';
 
 export const UserActionTree = React.memo(
-  ({ data: caseData, onUpdateField, isLoadingDescription }: UserActionTreeProps) => {
+  ({
+    data: caseData,
+    caseUserActions,
+    fetchUserActions,
+    firstIndexPushToService,
+    isLoadingDescription,
+    isLoadingUserActions,
+    lastIndexPushToService,
+    onUpdateField,
+  }: UserActionTreeProps) => {
+    const { commentId } = useParams();
+    const handlerTimeoutId = useRef(0);
+    const [initLoading, setInitLoading] = useState(true);
+    const [selectedOutlineCommentId, setSelectedOutlineCommentId] = useState('');
     const { comments, isLoadingIds, updateComment, addPostedComment } = useUpdateComment(
       caseData.comments
     );
@@ -45,20 +72,54 @@ export const UserActionTree = React.memo(
     const handleSaveComment = useCallback(
       (id: string, content: string) => {
         handleManageMarkdownEditId(id);
-        updateComment(caseData.id, id, content);
+        updateComment({
+          caseId: caseData.id,
+          commentId: id,
+          commentUpdate: content,
+          fetchUserActions,
+        });
       },
       [handleManageMarkdownEditId, updateComment]
     );
 
+    const handleOutlineComment = useCallback(
+      (id: string) => {
+        const moveToTarget = document.getElementById(`${id}-permLink`);
+        if (moveToTarget != null) {
+          const yOffset = -60;
+          const y = moveToTarget.getBoundingClientRect().top + window.pageYOffset + yOffset;
+          window.scrollTo({
+            top: y,
+            behavior: 'smooth',
+          });
+        }
+        window.clearTimeout(handlerTimeoutId.current);
+        setSelectedOutlineCommentId(id);
+        handlerTimeoutId.current = window.setTimeout(() => {
+          setSelectedOutlineCommentId('');
+          window.clearTimeout(handlerTimeoutId.current);
+        }, 2400);
+      },
+      [handlerTimeoutId.current]
+    );
+
+    const handleUpdate = useCallback(
+      (comment: Comment) => {
+        addPostedComment(comment);
+        fetchUserActions();
+      },
+      [addPostedComment, fetchUserActions]
+    );
+
     const MarkdownDescription = useMemo(
       () => (
         <UserActionMarkdown
-          id={DescriptionId}
+          id={DESCRIPTION_ID}
           content={caseData.description}
-          isEditable={manageMarkdownEditIds.includes(DescriptionId)}
+          isEditable={manageMarkdownEditIds.includes(DESCRIPTION_ID)}
           onSaveContent={(content: string) => {
-            handleManageMarkdownEditId(DescriptionId);
-            onUpdateField(DescriptionId, content);
+            handleManageMarkdownEditId(DESCRIPTION_ID);
+            onUpdateField(DESCRIPTION_ID, content);
           }}
           onChangeEditable={handleManageMarkdownEditId}
         />
@@ -67,55 +128,123 @@ export const UserActionTree = React.memo(
     );
 
     const MarkdownNewComment = useMemo(
-      () => <AddComment caseId={caseData.id} onCommentPosted={addPostedComment} />,
-      [caseData.id]
+      () => (
+        <AddComment
+          caseId={caseData.id}
+          onCommentPosted={handleUpdate}
+          onCommentSaving={handleManageMarkdownEditId.bind(null, NEW_ID)}
+          showLoading={false}
+        />
+      ),
+      [caseData.id, handleUpdate]
     );
 
+    useEffect(() => {
+      if (initLoading && !isLoadingUserActions && isLoadingIds.length === 0) {
+        setInitLoading(false);
+        if (commentId != null) {
+          handleOutlineComment(commentId);
+        }
+      }
+    }, [commentId, initLoading, isLoadingUserActions, isLoadingIds]);
+
     return (
       <>
         <UserActionItem
           createdAt={caseData.createdAt}
-          id={DescriptionId}
-          isEditable={manageMarkdownEditIds.includes(DescriptionId)}
+          id={DESCRIPTION_ID}
+          isEditable={manageMarkdownEditIds.includes(DESCRIPTION_ID)}
           isLoading={isLoadingDescription}
           labelEditAction={i18n.EDIT_DESCRIPTION}
-          labelTitle={i18n.ADDED_DESCRIPTION}
+          labelTitle={<>{i18n.ADDED_DESCRIPTION}</>}
           fullName={caseData.createdBy.fullName ?? caseData.createdBy.username}
           markdown={MarkdownDescription}
-          onEdit={handleManageMarkdownEditId.bind(null, DescriptionId)}
+          onEdit={handleManageMarkdownEditId.bind(null, DESCRIPTION_ID)}
           userName={caseData.createdBy.username}
         />
-        {comments.map(comment => (
-          <UserActionItem
-            key={comment.id}
-            createdAt={comment.createdAt}
-            id={comment.id}
-            isEditable={manageMarkdownEditIds.includes(comment.id)}
-            isLoading={isLoadingIds.includes(comment.id)}
-            labelEditAction={i18n.EDIT_COMMENT}
-            labelTitle={i18n.ADDED_COMMENT}
-            fullName={comment.createdBy.fullName ?? comment.createdBy.username}
-            markdown={
-              <UserActionMarkdown
-                id={comment.id}
-                content={comment.comment}
-                isEditable={manageMarkdownEditIds.includes(comment.id)}
-                onChangeEditable={handleManageMarkdownEditId}
-                onSaveContent={handleSaveComment.bind(null, comment.id)}
-              />
+
+        {caseUserActions.map((action, index) => {
+          if (action.commentId != null && action.action === 'create') {
+            const comment = comments.find(c => c.id === action.commentId);
+            if (comment != null) {
+              return (
+                <UserActionItem
+                  key={action.actionId}
+                  createdAt={comment.createdAt}
+                  id={comment.id}
+                  idToOutline={selectedOutlineCommentId}
+                  isEditable={manageMarkdownEditIds.includes(comment.id)}
+                  isLoading={isLoadingIds.includes(comment.id)}
+                  labelEditAction={i18n.EDIT_COMMENT}
+                  labelTitle={<>{i18n.ADDED_COMMENT}</>}
+                  fullName={comment.createdBy.fullName ?? comment.createdBy.username}
+                  markdown={
+                    <UserActionMarkdown
+                      id={comment.id}
+                      content={comment.comment}
+                      isEditable={manageMarkdownEditIds.includes(comment.id)}
+                      onChangeEditable={handleManageMarkdownEditId}
+                      onSaveContent={handleSaveComment.bind(null, comment.id)}
+                    />
+                  }
+                  onEdit={handleManageMarkdownEditId.bind(null, comment.id)}
+                  outlineComment={handleOutlineComment}
+                  userName={comment.createdBy.username}
+                  updatedAt={comment.updatedAt}
+                />
+              );
             }
-            onEdit={handleManageMarkdownEditId.bind(null, comment.id)}
-            userName={comment.createdBy.username}
-          />
-        ))}
+          }
+          if (action.actionField.length === 1) {
+            const myField = action.actionField[0];
+            const labelTitle: string | JSX.Element = getLabelTitle({
+              action,
+              field: myField,
+              firstIndexPushToService,
+              index,
+            });
+
+            return (
+              <UserActionItem
+                key={action.actionId}
+                createdAt={action.actionAt}
+                id={action.actionId}
+                isEditable={false}
+                isLoading={false}
+                labelTitle={<>{labelTitle}</>}
+                linkId={
+                  action.action === 'update' && action.commentId != null ? action.commentId : null
+                }
+                fullName={action.actionBy.fullName ?? action.actionBy.username}
+                outlineComment={handleOutlineComment}
+                showTopFooter={
+                  action.action === 'push-to-service' && index === lastIndexPushToService
+                }
+                showBottomFooter={
+                  action.action === 'push-to-service' &&
+                  index === lastIndexPushToService &&
+                  index < caseUserActions.length - 1
+                }
+                userName={action.actionBy.username}
+              />
+            );
+          }
+          return null;
+        })}
+        {(isLoadingUserActions || isLoadingIds.includes(NEW_ID)) && (
+          <MyEuiFlexGroup justifyContent="center" alignItems="center">
+            <EuiFlexItem grow={false}>
+              <EuiLoadingSpinner size="l" />
+            </EuiFlexItem>
+          </MyEuiFlexGroup>
+        )}
         <UserActionItem
           createdAt={new Date().toISOString()}
-          id={NewId}
+          id={NEW_ID}
           isEditable={true}
-          isLoading={isLoadingIds.includes(NewId)}
+          isLoading={isLoadingIds.includes(NEW_ID)}
           fullName={currentUser != null ? currentUser.fullName : ''}
           markdown={MarkdownNewComment}
-          onEdit={handleManageMarkdownEditId.bind(null, NewId)}
           userName={currentUser != null ? currentUser.username : ''}
         />
       </>
diff --git a/x-pack/legacy/plugins/siem/public/pages/case/components/user_action_tree/translations.ts b/x-pack/legacy/plugins/siem/public/pages/case/components/user_action_tree/translations.ts
new file mode 100644
index 0000000000000..0ca6bcff513fc
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/public/pages/case/components/user_action_tree/translations.ts
@@ -0,0 +1,34 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { i18n } from '@kbn/i18n';
+
+export * from '../case_view/translations';
+
+export const ALREADY_PUSHED_TO_SERVICE = i18n.translate(
+  'xpack.siem.case.caseView.alreadyPushedToService',
+  {
+    defaultMessage: 'Already pushed to Service Now incident',
+  }
+);
+
+export const REQUIRED_UPDATE_TO_SERVICE = i18n.translate(
+  'xpack.siem.case.caseView.requiredUpdateToService',
+  {
+    defaultMessage: 'Requires update to ServiceNow incident',
+  }
+);
+
+export const COPY_LINK_COMMENT = i18n.translate('xpack.siem.case.caseView.copyCommentLinkAria', {
+  defaultMessage: 'click to copy comment link',
+});
+
+export const MOVE_TO_ORIGINAL_COMMENT = i18n.translate(
+  'xpack.siem.case.caseView.moveToCommentAria',
+  {
+    defaultMessage: 'click to highlight the reference comment',
+  }
+);
diff --git a/x-pack/legacy/plugins/siem/public/pages/case/components/user_action_tree/user_action_item.tsx b/x-pack/legacy/plugins/siem/public/pages/case/components/user_action_tree/user_action_item.tsx
index ca73f200f1793..10a7c56e2eb2d 100644
--- a/x-pack/legacy/plugins/siem/public/pages/case/components/user_action_tree/user_action_item.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/case/components/user_action_tree/user_action_item.tsx
@@ -4,12 +4,20 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { EuiFlexGroup, EuiFlexItem, EuiLoadingSpinner, EuiPanel } from '@elastic/eui';
+import {
+  EuiFlexGroup,
+  EuiFlexItem,
+  EuiLoadingSpinner,
+  EuiPanel,
+  EuiHorizontalRule,
+  EuiText,
+} from '@elastic/eui';
 import React from 'react';
-
 import styled, { css } from 'styled-components';
+
 import { UserActionAvatar } from './user_action_avatar';
 import { UserActionTitle } from './user_action_title';
+import * as i18n from './translations';
 
 interface UserActionItemProps {
   createdAt: string;
@@ -17,14 +25,20 @@ interface UserActionItemProps {
   isEditable: boolean;
   isLoading: boolean;
   labelEditAction?: string;
-  labelTitle?: string;
+  labelTitle?: JSX.Element;
+  linkId?: string | null;
   fullName: string;
-  markdown: React.ReactNode;
-  onEdit: (id: string) => void;
+  markdown?: React.ReactNode;
+  onEdit?: (id: string) => void;
   userName: string;
+  updatedAt?: string | null;
+  outlineComment?: (id: string) => void;
+  showBottomFooter?: boolean;
+  showTopFooter?: boolean;
+  idToOutline?: string | null;
 }
 
-const UserActionItemContainer = styled(EuiFlexGroup)`
+export const UserActionItemContainer = styled(EuiFlexGroup)`
   ${({ theme }) => css`
     & {
       background-image: linear-gradient(
@@ -66,42 +80,102 @@ const UserActionItemContainer = styled(EuiFlexGroup)`
   `}
 `;
 
+const MyEuiPanel = styled(EuiPanel)<{ showoutline: string }>`
+  ${({ theme, showoutline }) =>
+    showoutline === 'true'
+      ? `
+      outline: solid 5px ${theme.eui.euiColorVis1_behindText};
+      margin: 0.5em;
+      transition: 0.8s;
+    `
+      : ''}
+`;
+
+const PushedContainer = styled(EuiFlexItem)`
+  ${({ theme }) => `
+    margin-top: ${theme.eui.euiSizeS};
+    margin-bottom: ${theme.eui.euiSizeXL};
+    hr {
+      margin: 5px;
+      height: ${theme.eui.euiBorderWidthThick};
+    }
+  `}
+`;
+
+const PushedInfoContainer = styled.div`
+  margin-left: 48px;
+`;
+
 export const UserActionItem = ({
   createdAt,
   id,
+  idToOutline,
   isEditable,
   isLoading,
   labelEditAction,
   labelTitle,
+  linkId,
   fullName,
   markdown,
   onEdit,
+  outlineComment,
+  showBottomFooter,
+  showTopFooter,
   userName,
+  updatedAt,
 }: UserActionItemProps) => (
-  <UserActionItemContainer gutterSize={'none'}>
-    <EuiFlexItem data-test-subj={`user-action-${id}-avatar`} grow={false}>
-      {fullName.length > 0 || userName.length > 0 ? (
-        <UserActionAvatar name={fullName ?? userName} />
-      ) : (
-        <EuiLoadingSpinner className="userAction_loadingAvatar" />
-      )}
-    </EuiFlexItem>
-    <EuiFlexItem data-test-subj={`user-action-${id}`}>
-      {isEditable && markdown}
-      {!isEditable && (
-        <EuiPanel className="userAction__panel" paddingSize="none">
-          <UserActionTitle
-            createdAt={createdAt}
-            id={id}
-            isLoading={isLoading}
-            labelEditAction={labelEditAction ?? ''}
-            labelTitle={labelTitle ?? ''}
-            userName={userName}
-            onEdit={onEdit}
-          />
-          {markdown}
-        </EuiPanel>
-      )}
+  <UserActionItemContainer gutterSize={'none'} direction="column">
+    <EuiFlexItem>
+      <EuiFlexGroup gutterSize={'none'}>
+        <EuiFlexItem data-test-subj={`user-action-${id}-avatar`} grow={false}>
+          {fullName.length > 0 || userName.length > 0 ? (
+            <UserActionAvatar name={fullName ?? userName} />
+          ) : (
+            <EuiLoadingSpinner className="userAction_loadingAvatar" />
+          )}
+        </EuiFlexItem>
+        <EuiFlexItem data-test-subj={`user-action-${id}`}>
+          {isEditable && markdown}
+          {!isEditable && (
+            <MyEuiPanel
+              className="userAction__panel"
+              paddingSize="none"
+              showoutline={id === idToOutline ? 'true' : 'false'}
+            >
+              <UserActionTitle
+                createdAt={createdAt}
+                id={id}
+                isLoading={isLoading}
+                labelEditAction={labelEditAction}
+                labelTitle={labelTitle ?? <></>}
+                linkId={linkId}
+                userName={userName}
+                updatedAt={updatedAt}
+                onEdit={onEdit}
+                outlineComment={outlineComment}
+              />
+              {markdown}
+            </MyEuiPanel>
+          )}
+        </EuiFlexItem>
+      </EuiFlexGroup>
     </EuiFlexItem>
+    {showTopFooter && (
+      <PushedContainer>
+        <PushedInfoContainer>
+          <EuiText size="xs" color="subdued">
+            {i18n.ALREADY_PUSHED_TO_SERVICE}
+          </EuiText>
+        </PushedInfoContainer>
+        <EuiHorizontalRule />
+        {showBottomFooter && (
+          <PushedInfoContainer>
+            <EuiText size="xs" color="subdued">
+              {i18n.REQUIRED_UPDATE_TO_SERVICE}
+            </EuiText>
+          </PushedInfoContainer>
+        )}
+      </PushedContainer>
+    )}
   </UserActionItemContainer>
 );
diff --git a/x-pack/legacy/plugins/siem/public/pages/case/components/user_action_tree/user_action_title.tsx b/x-pack/legacy/plugins/siem/public/pages/case/components/user_action_tree/user_action_title.tsx
index 0ed081e8852f0..6ca81667d9712 100644
--- a/x-pack/legacy/plugins/siem/public/pages/case/components/user_action_tree/user_action_title.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/case/components/user_action_tree/user_action_title.tsx
@@ -4,16 +4,20 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { EuiLoadingSpinner, EuiFlexGroup, EuiFlexItem, EuiText } from '@elastic/eui';
-import React, { useMemo } from 'react';
+import { EuiLoadingSpinner, EuiFlexGroup, EuiFlexItem, EuiText, EuiButtonIcon } from '@elastic/eui';
+import { FormattedRelative } from '@kbn/i18n/react';
+import copy from 'copy-to-clipboard';
+import { isEmpty } from 'lodash/fp';
+import React, { useMemo, useCallback } from 'react';
 import styled from 'styled-components';
+import { useParams } from 'react-router-dom';
 
-import {
-  FormattedRelativePreferenceDate,
-  FormattedRelativePreferenceLabel,
-} from '../../../../components/formatted_date';
-import * as i18n from '../case_view/translations';
+import { LocalizedDateTooltip } from '../../../../components/localized_date_tooltip';
+import { useGetUrlSearch } from '../../../../components/navigation/use_get_url_search';
+import { navTabs } from '../../../home/home_navigations';
 import { PropertyActions } from '../property_actions';
+import { SiemPageName } from '../../../home/types';
+import * as i18n from './translations';
 
 const MySpinner = styled(EuiLoadingSpinner)`
   .euiLoadingSpinner {
@@ -25,10 +29,13 @@ interface UserActionTitleProps {
   createdAt: string;
   id: string;
   isLoading: boolean;
-  labelEditAction: string;
-  labelTitle: string;
+  labelEditAction?: string;
+  labelTitle: JSX.Element;
+  linkId?: string | null;
+  updatedAt?: string | null;
   userName: string;
-  onEdit: (id: string) => void;
+  onEdit?: (id: string) => void;
+  outlineComment?: (id: string) => void;
 }
 
 export const UserActionTitle = ({
@@ -37,32 +44,107 @@ export const UserActionTitle = ({
   isLoading,
   labelEditAction,
   labelTitle,
+  linkId,
   userName,
+  updatedAt,
   onEdit,
+  outlineComment,
 }: UserActionTitleProps) => {
+  const { detailName: caseId } = useParams();
+  const urlSearch = useGetUrlSearch(navTabs.case);
   const propertyActions = useMemo(() => {
-    return [
+    if (labelEditAction != null && onEdit != null) {
+      return [
+        {
+          iconType: 'pencil',
+          label: labelEditAction,
+          onClick: () => onEdit(id),
+        },
+      ];
+    }
+    return [];
+  }, [id, labelEditAction, onEdit]);
+
+  const handleAnchorLink = useCallback(() => {
+    copy(
+      `${window.location.origin}${window.location.pathname}#${SiemPageName.case}/${caseId}/${id}${urlSearch}`,
       {
-        iconType: 'pencil',
-        label: labelEditAction,
-        onClick: () => onEdit(id),
-      },
-    ];
-  }, [id, onEdit]);
+        debug: true,
+      }
+    );
+  }, [caseId, id, urlSearch]);
+
+  const handleMoveToLink = useCallback(() => {
+    if (outlineComment != null && linkId != null) {
+      outlineComment(linkId);
+    }
+  }, [linkId, outlineComment]);
+
   return (
     <EuiText size="s" className="userAction__title" data-test-subj={`user-action-title`}>
-      <EuiFlexGroup alignItems="baseline" gutterSize="none" justifyContent="spaceBetween">
+      <EuiFlexGroup
+        alignItems="baseline"
+        gutterSize="none"
+        justifyContent="spaceBetween"
+        component="span"
+      >
         <EuiFlexItem grow={false}>
-          <p>
-            <strong>{userName}</strong>
-            {` ${labelTitle} `}
-            <FormattedRelativePreferenceLabel value={createdAt} preferenceLabel={`${i18n.ON} `} />
-            <FormattedRelativePreferenceDate value={createdAt} />
-          </p>
+          <EuiFlexGroup alignItems="baseline" gutterSize="xs" component="span">
+            <EuiFlexItem grow={false}>
+              <strong>{userName}</strong>
+            </EuiFlexItem>
+            <EuiFlexItem grow={false}>{labelTitle}</EuiFlexItem>
+            <EuiFlexItem grow={false}>
+              <LocalizedDateTooltip date={new Date(createdAt)}>
+                <FormattedRelative
+                  data-test-subj="user-action-title-creation-relative-time"
+                  value={createdAt}
+                />
+              </LocalizedDateTooltip>
+            </EuiFlexItem>
+            {updatedAt != null && (
+              <EuiFlexItem>
+                <EuiText size="s" color="subdued">
+                  {'('}
+                  {i18n.EDITED_FIELD}{' '}
+                  <LocalizedDateTooltip date={new Date(updatedAt)}>
+                    <FormattedRelative
+                      data-test-subj="user-action-title-edited-relative-time"
+                      value={updatedAt}
+                    />
+                  </LocalizedDateTooltip>
+                  {')'}
+                </EuiText>
+              </EuiFlexItem>
+            )}
+          </EuiFlexGroup>
         </EuiFlexItem>
         <EuiFlexItem grow={false}>
-          {isLoading && <MySpinner />}
-          {!isLoading && <PropertyActions propertyActions={propertyActions} />}
+          <EuiFlexGroup alignItems="baseline" gutterSize="none">
+            {!isEmpty(linkId) && (
+              <EuiFlexItem grow={false}>
+                <EuiButtonIcon
+                  aria-label={i18n.MOVE_TO_ORIGINAL_COMMENT}
+                  onClick={handleMoveToLink}
+                  iconType="arrowUp"
+                />
+              </EuiFlexItem>
+            )}
+            <EuiFlexItem grow={false}>
+              <EuiButtonIcon
+                aria-label={i18n.COPY_LINK_COMMENT}
+                onClick={handleAnchorLink}
+                iconType="link"
+                id={`${id}-permLink`}
+              />
+            </EuiFlexItem>
+            {propertyActions.length > 0 && (
+              <EuiFlexItem grow={false}>
+                {isLoading && <MySpinner />}
+                {!isLoading && <PropertyActions propertyActions={propertyActions} />}
+              </EuiFlexItem>
+            )}
+          </EuiFlexGroup>
         </EuiFlexItem>
       </EuiFlexGroup>
     </EuiText>
diff --git a/x-pack/legacy/plugins/siem/public/pages/case/index.tsx b/x-pack/legacy/plugins/siem/public/pages/case/index.tsx
index 1bde9de1535b5..124cefa726a8b 100644
--- a/x-pack/legacy/plugins/siem/public/pages/case/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/case/index.tsx
@@ -15,6 +15,7 @@ import { ConfigureCasesPage } from './configure_cases';
 
 const casesPagePath = `/:pageName(${SiemPageName.case})`;
 const caseDetailsPagePath = `${casesPagePath}/:detailName`;
+const caseDetailsPagePathWithCommentId = `${casesPagePath}/:detailName/:commentId`;
 const createCasePagePath = `${casesPagePath}/create`;
 const configureCasesPagePath = `${casesPagePath}/configure`;
 
@@ -29,6 +30,9 @@ const CaseContainerComponent: React.FC = () => (
     <Route strict exact path={configureCasesPagePath}>
       <ConfigureCasesPage />
     </Route>
+    <Route strict path={caseDetailsPagePathWithCommentId}>
+      <CaseDetailsPage />
+    </Route>
     <Route strict path={caseDetailsPagePath}>
       <CaseDetailsPage />
     </Route>
diff --git a/x-pack/legacy/plugins/siem/public/pages/case/translations.ts b/x-pack/legacy/plugins/siem/public/pages/case/translations.ts
index 341a34240fe49..8f9d2087699f8 100644
--- a/x-pack/legacy/plugins/siem/public/pages/case/translations.ts
+++ b/x-pack/legacy/plugins/siem/public/pages/case/translations.ts
@@ -33,17 +33,15 @@ export const OPENED_ON = i18n.translate('xpack.siem.case.caseView.openedOn', {
 export const CLOSED_ON = i18n.translate('xpack.siem.case.caseView.closedOn', {
   defaultMessage: 'Closed on',
 });
-export const REOPEN_CASE = i18n.translate('xpack.siem.case.caseTable.reopenCase', {
-  defaultMessage: 'Reopen case',
-});
-export const CLOSE_CASE = i18n.translate('xpack.siem.case.caseTable.closeCase', {
-  defaultMessage: 'Close case',
-});
 
-export const REPORTER = i18n.translate('xpack.siem.case.caseView.createdBy', {
+export const REPORTER = i18n.translate('xpack.siem.case.caseView.reporterLabel', {
   defaultMessage: 'Reporter',
 });
 
+export const PARTICIPANTS = i18n.translate('xpack.siem.case.caseView.particpantsLabel', {
+  defaultMessage: 'Participants',
+});
+
 export const CREATE_BC_TITLE = i18n.translate('xpack.siem.case.caseView.breadcrumb', {
   defaultMessage: 'Create',
 });
@@ -90,6 +88,30 @@ export const CREATE_CASE = i18n.translate('xpack.siem.case.caseView.createCase',
   defaultMessage: 'Create case',
 });
 
+export const CLOSED_CASE = i18n.translate('xpack.siem.case.caseView.closedCase', {
+  defaultMessage: 'Closed case',
+});
+
+export const CLOSE_CASE = i18n.translate('xpack.siem.case.caseView.closeCase', {
+  defaultMessage: 'Close case',
+});
+
+export const REOPEN_CASE = i18n.translate('xpack.siem.case.caseView.reopenCase', {
+  defaultMessage: 'Reopen case',
+});
+
+export const REOPENED_CASE = i18n.translate('xpack.siem.case.caseView.reopenedCase', {
+  defaultMessage: 'Reopened case',
+});
+
+export const CASE_NAME = i18n.translate('xpack.siem.case.caseView.caseName', {
+  defaultMessage: 'Case name',
+});
+
+export const TO = i18n.translate('xpack.siem.case.caseView.to', {
+  defaultMessage: 'to',
+});
+
 export const TAGS = i18n.translate('xpack.siem.case.caseView.tags', {
   defaultMessage: 'Tags',
 });
@@ -130,7 +152,7 @@ export const CONFIGURE_CASES_PAGE_TITLE = i18n.translate(
 );
 
 export const CONFIGURE_CASES_BUTTON = i18n.translate('xpack.siem.case.configureCasesButton', {
-  defaultMessage: 'Edit third-party connection',
+  defaultMessage: 'Edit external connection',
 });
 
 export const ADD_COMMENT = i18n.translate('xpack.siem.case.caseView.comment.addComment', {
diff --git a/x-pack/legacy/plugins/siem/public/pages/case/utils.ts b/x-pack/legacy/plugins/siem/public/pages/case/utils.ts
index ccb3b71a476ec..3f2964b8cdd6d 100644
--- a/x-pack/legacy/plugins/siem/public/pages/case/utils.ts
+++ b/x-pack/legacy/plugins/siem/public/pages/case/utils.ts
@@ -21,7 +21,7 @@ export const getBreadcrumbs = (params: RouteSpyState): Breadcrumb[] => {
       ...breadcrumb,
       {
         text: i18n.CREATE_BC_TITLE,
-        href: getCreateCaseUrl(),
+        href: getCreateCaseUrl(''),
       },
     ];
   } else if (params.detailName != null) {
@@ -29,7 +29,7 @@ export const getBreadcrumbs = (params: RouteSpyState): Breadcrumb[] => {
       ...breadcrumb,
       {
         text: params.state?.caseTitle ?? '',
-        href: getCaseDetailsUrl(params.detailName),
+        href: getCaseDetailsUrl(params.detailName, ''),
       },
     ];
   }
diff --git a/x-pack/plugins/case/common/api/cases/case.ts b/x-pack/plugins/case/common/api/cases/case.ts
index 6f58e2702ec5b..ee244dd205113 100644
--- a/x-pack/plugins/case/common/api/cases/case.ts
+++ b/x-pack/plugins/case/common/api/cases/case.ts
@@ -11,6 +11,8 @@ import { UserRT } from '../user';
 import { CommentResponseRt } from './comment';
 import { CasesStatusResponseRt } from './status';
 
+export { ActionTypeExecutorResult } from '../../../../actions/server/types';
+
 const StatusRt = rt.union([rt.literal('open'), rt.literal('closed')]);
 
 const CaseBasicRt = rt.type({
@@ -20,14 +22,33 @@ const CaseBasicRt = rt.type({
   title: rt.string,
 });
 
+const CaseExternalServiceBasicRt = rt.type({
+  connector_id: rt.string,
+  connector_name: rt.string,
+  external_id: rt.string,
+  external_title: rt.string,
+  external_url: rt.string,
+});
+
+const CaseFullExternalServiceRt = rt.union([
+  rt.intersection([
+    CaseExternalServiceBasicRt,
+    rt.type({
+      pushed_at: rt.string,
+      pushed_by: UserRT,
+    }),
+  ]),
+  rt.null,
+]);
+
 export const CaseAttributesRt = rt.intersection([
   CaseBasicRt,
   rt.type({
-    comment_ids: rt.array(rt.string),
     closed_at: rt.union([rt.string, rt.null]),
     closed_by: rt.union([UserRT, rt.null]),
     created_at: rt.string,
     created_by: UserRT,
+    external_service: CaseFullExternalServiceRt,
     updated_at: rt.union([rt.string, rt.null]),
     updated_by: rt.union([UserRT, rt.null]),
   }),
@@ -35,6 +56,8 @@ export const CaseAttributesRt = rt.intersection([
 
 export const CaseRequestRt = CaseBasicRt;
 
+export const CaseExternalServiceRequestRt = CaseExternalServiceBasicRt;
+
 export const CasesFindRequestRt = rt.partial({
   tags: rt.union([rt.array(rt.string), rt.string]),
   status: StatusRt,
@@ -53,6 +76,7 @@ export const CaseResponseRt = rt.intersection([
   CaseAttributesRt,
   rt.type({
     id: rt.string,
+    totalComment: rt.number,
     version: rt.string,
   }),
   rt.partial({
@@ -78,6 +102,60 @@ export const CasePatchRequestRt = rt.intersection([
 export const CasesPatchRequestRt = rt.type({ cases: rt.array(CasePatchRequestRt) });
 export const CasesResponseRt = rt.array(CaseResponseRt);
 
+/*
+ * This type are related to this file below
+ * x-pack/plugins/actions/server/builtin_action_types/servicenow/schema.ts
+ * why because this schema is not share in a common folder
+ * so we redefine then so we can use/validate types
+ */
+
+const ServiceConnectorUserParams = rt.type({
+  fullName: rt.union([rt.string, rt.null]),
+  username: rt.string,
+});
+
+export const ServiceConnectorCommentParamsRt = rt.type({
+  commentId: rt.string,
+  comment: rt.string,
+  createdAt: rt.string,
+  createdBy: ServiceConnectorUserParams,
+  updatedAt: rt.union([rt.string, rt.null]),
+  updatedBy: rt.union([ServiceConnectorUserParams, rt.null]),
+});
+
+export const ServiceConnectorCaseParamsRt = rt.intersection([
+  rt.type({
+    caseId: rt.string,
+    createdAt: rt.string,
+    createdBy: ServiceConnectorUserParams,
+    incidentId: rt.union([rt.string, rt.null]),
+    title: rt.string,
+    updatedAt: rt.union([rt.string, rt.null]),
+    updatedBy: rt.union([ServiceConnectorUserParams, rt.null]),
+  }),
+  rt.partial({
+    description: rt.string,
+    comments: rt.array(ServiceConnectorCommentParamsRt),
+  }),
+]);
+
+export const ServiceConnectorCaseResponseRt = rt.intersection([
+  rt.type({
+    number: rt.string,
+    incidentId: rt.string,
+    pushedDate: rt.string,
+    url: rt.string,
+  }),
+  rt.partial({
+    comments: rt.array(
+      rt.type({
+        commentId: rt.string,
+        pushedDate: rt.string,
+      })
+    ),
+  }),
+]);
+
 export type CaseAttributes = rt.TypeOf<typeof CaseAttributesRt>;
 export type CaseRequest = rt.TypeOf<typeof CaseRequestRt>;
 export type CaseResponse = rt.TypeOf<typeof CaseResponseRt>;
@@ -85,3 +163,8 @@ export type CasesResponse = rt.TypeOf<typeof CasesResponseRt>;
 export type CasesFindResponse = rt.TypeOf<typeof CasesFindResponseRt>;
 export type CasePatchRequest = rt.TypeOf<typeof CasePatchRequestRt>;
 export type CasesPatchRequest = rt.TypeOf<typeof CasesPatchRequestRt>;
+export type CaseExternalServiceRequest = rt.TypeOf<typeof CaseExternalServiceRequestRt>;
+export type ServiceConnectorCaseParams = rt.TypeOf<typeof ServiceConnectorCaseParamsRt>;
+export type ServiceConnectorCaseResponse = rt.TypeOf<typeof ServiceConnectorCaseResponseRt>;
+export type CaseFullExternalService = rt.TypeOf<typeof CaseFullExternalServiceRt>;
+export type ServiceConnectorCommentParams = rt.TypeOf<typeof ServiceConnectorCommentParamsRt>;
diff --git a/x-pack/plugins/case/common/api/cases/comment.ts b/x-pack/plugins/case/common/api/cases/comment.ts
index cebfa00425728..4549b1c31a7cf 100644
--- a/x-pack/plugins/case/common/api/cases/comment.ts
+++ b/x-pack/plugins/case/common/api/cases/comment.ts
@@ -17,6 +17,8 @@ export const CommentAttributesRt = rt.intersection([
   rt.type({
     created_at: rt.string,
     created_by: UserRT,
+    pushed_at: rt.union([rt.string, rt.null]),
+    pushed_by: rt.union([UserRT, rt.null]),
     updated_at: rt.union([rt.string, rt.null]),
     updated_by: rt.union([UserRT, rt.null]),
   }),
diff --git a/x-pack/plugins/case/common/api/cases/configure.ts b/x-pack/plugins/case/common/api/cases/configure.ts
index e0489ed7270fa..9b210c2aa05ad 100644
--- a/x-pack/plugins/case/common/api/cases/configure.ts
+++ b/x-pack/plugins/case/common/api/cases/configure.ts
@@ -73,6 +73,7 @@ const ClosureTypeRT = rt.union([rt.literal('close-by-user'), rt.literal('close-b
 
 const CasesConfigureBasicRt = rt.type({
   connector_id: rt.string,
+  connector_name: rt.string,
   closure_type: ClosureTypeRT,
 });
 
diff --git a/x-pack/plugins/case/common/api/cases/index.ts b/x-pack/plugins/case/common/api/cases/index.ts
index 5fbee98bc57ad..ffcd4d25eecf5 100644
--- a/x-pack/plugins/case/common/api/cases/index.ts
+++ b/x-pack/plugins/case/common/api/cases/index.ts
@@ -8,3 +8,4 @@ export * from './case';
 export * from './configure';
 export * from './comment';
 export * from './status';
+export * from './user_actions';
diff --git a/x-pack/plugins/case/common/api/cases/user_actions.ts b/x-pack/plugins/case/common/api/cases/user_actions.ts
new file mode 100644
index 0000000000000..2b70a698a5152
--- /dev/null
+++ b/x-pack/plugins/case/common/api/cases/user_actions.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 * as rt from 'io-ts';
+
+import { UserRT } from '../user';
+
+/* To the next developer, if you add/removed fields here
+ * make sure to check this file (x-pack/plugins/case/server/services/user_actions/helpers.ts) too
+ */
+const UserActionFieldRt = rt.array(
+  rt.union([
+    rt.literal('comment'),
+    rt.literal('description'),
+    rt.literal('pushed'),
+    rt.literal('tags'),
+    rt.literal('title'),
+    rt.literal('status'),
+  ])
+);
+const UserActionRt = rt.union([
+  rt.literal('add'),
+  rt.literal('create'),
+  rt.literal('delete'),
+  rt.literal('update'),
+  rt.literal('push-to-service'),
+]);
+
+// TO DO change state to status
+const CaseUserActionBasicRT = rt.type({
+  action_field: UserActionFieldRt,
+  action: UserActionRt,
+  action_at: rt.string,
+  action_by: UserRT,
+  new_value: rt.union([rt.string, rt.null]),
+  old_value: rt.union([rt.string, rt.null]),
+});
+
+const CaseUserActionResponseRT = rt.intersection([
+  CaseUserActionBasicRT,
+  rt.type({
+    action_id: rt.string,
+    case_id: rt.string,
+    comment_id: rt.union([rt.string, rt.null]),
+  }),
+]);
+
+export const CaseUserActionAttributesRt = CaseUserActionBasicRT;
+
+export const CaseUserActionsResponseRt = rt.array(CaseUserActionResponseRT);
+
+export type CaseUserActionAttributes = rt.TypeOf<typeof CaseUserActionAttributesRt>;
+export type CaseUserActionsResponse = rt.TypeOf<typeof CaseUserActionsResponseRt>;
+
+export type UserAction = rt.TypeOf<typeof UserActionRt>;
+export type UserActionField = rt.TypeOf<typeof UserActionFieldRt>;
diff --git a/x-pack/plugins/case/server/plugin.ts b/x-pack/plugins/case/server/plugin.ts
index 1d6495c2d81f3..a6a459373b0ed 100644
--- a/x-pack/plugins/case/server/plugin.ts
+++ b/x-pack/plugins/case/server/plugin.ts
@@ -16,8 +16,9 @@ import {
   caseSavedObjectType,
   caseConfigureSavedObjectType,
   caseCommentSavedObjectType,
+  caseUserActionSavedObjectType,
 } from './saved_object_types';
-import { CaseConfigureService, CaseService } from './services';
+import { CaseConfigureService, CaseService, CaseUserActionService } from './services';
 
 function createConfig$(context: PluginInitializerContext) {
   return context.config.create<ConfigType>().pipe(map(config => config));
@@ -46,9 +47,11 @@ export class CasePlugin {
     core.savedObjects.registerType(caseSavedObjectType);
     core.savedObjects.registerType(caseCommentSavedObjectType);
     core.savedObjects.registerType(caseConfigureSavedObjectType);
+    core.savedObjects.registerType(caseUserActionSavedObjectType);
 
     const caseServicePlugin = new CaseService(this.log);
     const caseConfigureServicePlugin = new CaseConfigureService(this.log);
+    const userActionServicePlugin = new CaseUserActionService(this.log);
 
     this.log.debug(
       `Setting up Case Workflow with core contract [${Object.keys(
@@ -60,11 +63,13 @@ export class CasePlugin {
       authentication: plugins.security.authc,
     });
     const caseConfigureService = await caseConfigureServicePlugin.setup();
+    const userActionService = await userActionServicePlugin.setup();
 
     const router = core.http.createRouter();
     initCaseApi({
       caseConfigureService,
       caseService,
+      userActionService,
       router,
     });
   }
diff --git a/x-pack/plugins/case/server/routes/api/__fixtures__/mock_router.ts b/x-pack/plugins/case/server/routes/api/__fixtures__/mock_router.ts
index bc41ddbeff1f9..eff91fff32c02 100644
--- a/x-pack/plugins/case/server/routes/api/__fixtures__/mock_router.ts
+++ b/x-pack/plugins/case/server/routes/api/__fixtures__/mock_router.ts
@@ -32,6 +32,10 @@ export const createRoute = async (
     caseConfigureService,
     caseService,
     router,
+    userActionService: {
+      postUserActions: jest.fn(),
+      getUserActions: jest.fn(),
+    },
   });
 
   return router[method].mock.calls[0][1];
diff --git a/x-pack/plugins/case/server/routes/api/__fixtures__/mock_saved_objects.ts b/x-pack/plugins/case/server/routes/api/__fixtures__/mock_saved_objects.ts
index 5aa8b93f17b08..03da50f886fd5 100644
--- a/x-pack/plugins/case/server/routes/api/__fixtures__/mock_saved_objects.ts
+++ b/x-pack/plugins/case/server/routes/api/__fixtures__/mock_saved_objects.ts
@@ -14,7 +14,6 @@ export const mockCases: Array<SavedObject<CaseAttributes>> = [
     attributes: {
       closed_at: null,
       closed_by: null,
-      comment_ids: ['mock-comment-1'],
       created_at: '2019-11-25T21:54:48.952Z',
       created_by: {
         full_name: 'elastic',
@@ -22,6 +21,7 @@ export const mockCases: Array<SavedObject<CaseAttributes>> = [
         username: 'elastic',
       },
       description: 'This is a brand new case of a bad meanie defacing data',
+      external_service: null,
       title: 'Super Bad Security Issue',
       status: 'open',
       tags: ['defacement'],
@@ -42,7 +42,6 @@ export const mockCases: Array<SavedObject<CaseAttributes>> = [
     attributes: {
       closed_at: null,
       closed_by: null,
-      comment_ids: [],
       created_at: '2019-11-25T22:32:00.900Z',
       created_by: {
         full_name: 'elastic',
@@ -50,6 +49,7 @@ export const mockCases: Array<SavedObject<CaseAttributes>> = [
         username: 'elastic',
       },
       description: 'Oh no, a bad meanie destroying data!',
+      external_service: null,
       title: 'Damaging Data Destruction Detected',
       status: 'open',
       tags: ['Data Destruction'],
@@ -70,7 +70,6 @@ export const mockCases: Array<SavedObject<CaseAttributes>> = [
     attributes: {
       closed_at: null,
       closed_by: null,
-      comment_ids: [],
       created_at: '2019-11-25T22:32:17.947Z',
       created_by: {
         full_name: 'elastic',
@@ -78,6 +77,7 @@ export const mockCases: Array<SavedObject<CaseAttributes>> = [
         username: 'elastic',
       },
       description: 'Oh no, a bad meanie going LOLBins all over the place!',
+      external_service: null,
       title: 'Another bad one',
       status: 'open',
       tags: ['LOLBins'],
@@ -102,7 +102,6 @@ export const mockCases: Array<SavedObject<CaseAttributes>> = [
         email: 'testemail@elastic.co',
         username: 'elastic',
       },
-      comment_ids: [],
       created_at: '2019-11-25T22:32:17.947Z',
       created_by: {
         full_name: 'elastic',
@@ -110,8 +109,9 @@ export const mockCases: Array<SavedObject<CaseAttributes>> = [
         username: 'elastic',
       },
       description: 'Oh no, a bad meanie going LOLBins all over the place!',
-      title: 'Another bad one',
+      external_service: null,
       status: 'closed',
+      title: 'Another bad one',
       tags: ['LOLBins'],
       updated_at: '2019-11-25T22:32:17.947Z',
       updated_by: {
@@ -147,6 +147,8 @@ export const mockCaseComments: Array<SavedObject<CommentAttributes>> = [
         email: 'testemail@elastic.co',
         username: 'elastic',
       },
+      pushed_at: null,
+      pushed_by: null,
       updated_at: '2019-11-25T21:55:00.177Z',
       updated_by: {
         full_name: 'elastic',
@@ -175,6 +177,8 @@ export const mockCaseComments: Array<SavedObject<CommentAttributes>> = [
         email: 'testemail@elastic.co',
         username: 'elastic',
       },
+      pushed_at: null,
+      pushed_by: null,
       updated_at: '2019-11-25T21:55:14.633Z',
       updated_by: {
         full_name: 'elastic',
@@ -204,6 +208,8 @@ export const mockCaseComments: Array<SavedObject<CommentAttributes>> = [
         email: 'testemail@elastic.co',
         username: 'elastic',
       },
+      pushed_at: null,
+      pushed_by: null,
       updated_at: '2019-11-25T22:32:30.608Z',
       updated_by: {
         full_name: 'elastic',
diff --git a/x-pack/plugins/case/server/routes/api/cases/comments/delete_all_comments.ts b/x-pack/plugins/case/server/routes/api/cases/comments/delete_all_comments.ts
index 00d06bfdd2677..941ac90f2e90e 100644
--- a/x-pack/plugins/case/server/routes/api/cases/comments/delete_all_comments.ts
+++ b/x-pack/plugins/case/server/routes/api/cases/comments/delete_all_comments.ts
@@ -5,10 +5,12 @@
  */
 
 import { schema } from '@kbn/config-schema';
+
+import { buildCommentUserActionItem } from '../../../../services/user_actions/helpers';
 import { RouteDeps } from '../../types';
 import { wrapError } from '../../utils';
 
-export function initDeleteAllCommentsApi({ caseService, router }: RouteDeps) {
+export function initDeleteAllCommentsApi({ caseService, router, userActionService }: RouteDeps) {
   router.delete(
     {
       path: '/api/cases/{case_id}/comments',
@@ -21,9 +23,11 @@ export function initDeleteAllCommentsApi({ caseService, router }: RouteDeps) {
     async (context, request, response) => {
       try {
         const client = context.core.savedObjects.client;
+        const { username, full_name, email } = await caseService.getUser({ request, response });
+        const deleteDate = new Date().toISOString();
 
         const comments = await caseService.getAllCaseComments({
-          client: context.core.savedObjects.client,
+          client,
           caseId: request.params.case_id,
         });
         await Promise.all(
@@ -35,15 +39,18 @@ export function initDeleteAllCommentsApi({ caseService, router }: RouteDeps) {
           )
         );
 
-        const updateCase = {
-          comment_ids: [],
-        };
-        await caseService.patchCase({
-          client: context.core.savedObjects.client,
-          caseId: request.params.case_id,
-          updatedAttributes: {
-            ...updateCase,
-          },
+        await userActionService.postUserActions({
+          client,
+          actions: comments.saved_objects.map(comment =>
+            buildCommentUserActionItem({
+              action: 'delete',
+              actionAt: deleteDate,
+              actionBy: { username, full_name, email },
+              caseId: request.params.case_id,
+              commentId: comment.id,
+              fields: ['comment'],
+            })
+          ),
         });
 
         return response.ok({ body: 'true' });
diff --git a/x-pack/plugins/case/server/routes/api/cases/comments/delete_comment.ts b/x-pack/plugins/case/server/routes/api/cases/comments/delete_comment.ts
index 85c4701f82e1d..44e57fc809e04 100644
--- a/x-pack/plugins/case/server/routes/api/cases/comments/delete_comment.ts
+++ b/x-pack/plugins/case/server/routes/api/cases/comments/delete_comment.ts
@@ -6,10 +6,13 @@
 
 import Boom from 'boom';
 import { schema } from '@kbn/config-schema';
+
+import { CASE_SAVED_OBJECT } from '../../../../saved_object_types';
+import { buildCommentUserActionItem } from '../../../../services/user_actions/helpers';
 import { RouteDeps } from '../../types';
 import { wrapError } from '../../utils';
 
-export function initDeleteCommentApi({ caseService, router }: RouteDeps) {
+export function initDeleteCommentApi({ caseService, router, userActionService }: RouteDeps) {
   router.delete(
     {
       path: '/api/cases/{case_id}/comments/{comment_id}',
@@ -23,14 +26,22 @@ export function initDeleteCommentApi({ caseService, router }: RouteDeps) {
     async (context, request, response) => {
       try {
         const client = context.core.savedObjects.client;
-        const myCase = await caseService.getCase({
-          client: context.core.savedObjects.client,
-          caseId: request.params.case_id,
+        const { username, full_name, email } = await caseService.getUser({ request, response });
+        const deleteDate = new Date().toISOString();
+
+        const myComment = await caseService.getComment({
+          client,
+          commentId: request.params.comment_id,
         });
 
-        if (!myCase.attributes.comment_ids.includes(request.params.comment_id)) {
+        if (myComment == null) {
+          throw Boom.notFound(`This comment ${request.params.comment_id} does not exist anymore.`);
+        }
+
+        const caseRef = myComment.references.find(c => c.type === CASE_SAVED_OBJECT);
+        if (caseRef == null || (caseRef != null && caseRef.id !== request.params.case_id)) {
           throw Boom.notFound(
-            `This comment ${request.params.comment_id} does not exist in ${myCase.attributes.title} (id: ${request.params.case_id}).`
+            `This comment ${request.params.comment_id} does not exist in ${request.params.case_id}).`
           );
         }
 
@@ -39,17 +50,18 @@ export function initDeleteCommentApi({ caseService, router }: RouteDeps) {
           commentId: request.params.comment_id,
         });
 
-        const updateCase = {
-          comment_ids: myCase.attributes.comment_ids.filter(
-            cId => cId !== request.params.comment_id
-          ),
-        };
-        await caseService.patchCase({
-          client: context.core.savedObjects.client,
-          caseId: request.params.case_id,
-          updatedAttributes: {
-            ...updateCase,
-          },
+        await userActionService.postUserActions({
+          client,
+          actions: [
+            buildCommentUserActionItem({
+              action: 'delete',
+              actionAt: deleteDate,
+              actionBy: { username, full_name, email },
+              caseId: request.params.case_id,
+              commentId: request.params.comment_id,
+              fields: ['comment'],
+            }),
+          ],
         });
 
         return response.ok({ body: 'true' });
diff --git a/x-pack/plugins/case/server/routes/api/cases/comments/find_comments.ts b/x-pack/plugins/case/server/routes/api/cases/comments/find_comments.ts
index dcf70d0d9819c..92da64cebee74 100644
--- a/x-pack/plugins/case/server/routes/api/cases/comments/find_comments.ts
+++ b/x-pack/plugins/case/server/routes/api/cases/comments/find_comments.ts
@@ -32,6 +32,7 @@ export function initFindCaseCommentsApi({ caseService, router }: RouteDeps) {
     },
     async (context, request, response) => {
       try {
+        const client = context.core.savedObjects.client;
         const query = pipe(
           SavedObjectFindOptionsRt.decode(request.query),
           fold(throwErrors(Boom.badRequest), identity)
@@ -39,7 +40,7 @@ export function initFindCaseCommentsApi({ caseService, router }: RouteDeps) {
 
         const args = query
           ? {
-              client: context.core.savedObjects.client,
+              client,
               caseId: request.params.case_id,
               options: {
                 ...query,
@@ -47,7 +48,7 @@ export function initFindCaseCommentsApi({ caseService, router }: RouteDeps) {
               },
             }
           : {
-              client: context.core.savedObjects.client,
+              client,
               caseId: request.params.case_id,
             };
 
diff --git a/x-pack/plugins/case/server/routes/api/cases/comments/get_all_comment.ts b/x-pack/plugins/case/server/routes/api/cases/comments/get_all_comment.ts
index 65f2de7125236..1500039eb2cc2 100644
--- a/x-pack/plugins/case/server/routes/api/cases/comments/get_all_comment.ts
+++ b/x-pack/plugins/case/server/routes/api/cases/comments/get_all_comment.ts
@@ -22,8 +22,9 @@ export function initGetAllCommentsApi({ caseService, router }: RouteDeps) {
     },
     async (context, request, response) => {
       try {
+        const client = context.core.savedObjects.client;
         const comments = await caseService.getAllCaseComments({
-          client: context.core.savedObjects.client,
+          client,
           caseId: request.params.case_id,
         });
         return response.ok({
diff --git a/x-pack/plugins/case/server/routes/api/cases/comments/get_comment.ts b/x-pack/plugins/case/server/routes/api/cases/comments/get_comment.ts
index 06619abae8487..24f44a5f5129b 100644
--- a/x-pack/plugins/case/server/routes/api/cases/comments/get_comment.ts
+++ b/x-pack/plugins/case/server/routes/api/cases/comments/get_comment.ts
@@ -5,7 +5,6 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import Boom from 'boom';
 
 import { CommentResponseRt } from '../../../../../common/api';
 import { RouteDeps } from '../../types';
@@ -25,16 +24,6 @@ export function initGetCommentApi({ caseService, router }: RouteDeps) {
     async (context, request, response) => {
       try {
         const client = context.core.savedObjects.client;
-        const myCase = await caseService.getCase({
-          client,
-          caseId: request.params.case_id,
-        });
-
-        if (!myCase.attributes.comment_ids.includes(request.params.comment_id)) {
-          throw Boom.notFound(
-            `This comment ${request.params.comment_id} does not exist in ${myCase.attributes.title} (id: ${request.params.case_id}).`
-          );
-        }
 
         const comment = await caseService.getComment({
           client,
diff --git a/x-pack/plugins/case/server/routes/api/cases/comments/patch_comment.ts b/x-pack/plugins/case/server/routes/api/cases/comments/patch_comment.ts
index c14a94e84e51c..c67ad1bdaea71 100644
--- a/x-pack/plugins/case/server/routes/api/cases/comments/patch_comment.ts
+++ b/x-pack/plugins/case/server/routes/api/cases/comments/patch_comment.ts
@@ -11,11 +11,12 @@ import { fold } from 'fp-ts/lib/Either';
 import { identity } from 'fp-ts/lib/function';
 
 import { CommentPatchRequestRt, CommentResponseRt, throwErrors } from '../../../../../common/api';
-
+import { CASE_SAVED_OBJECT } from '../../../../saved_object_types';
+import { buildCommentUserActionItem } from '../../../../services/user_actions/helpers';
 import { RouteDeps } from '../../types';
 import { escapeHatch, wrapError, flattenCommentSavedObject } from '../../utils';
 
-export function initPatchCommentApi({ caseService, router }: RouteDeps) {
+export function initPatchCommentApi({ caseService, router, userActionService }: RouteDeps) {
   router.patch(
     {
       path: '/api/cases/{case_id}/comments',
@@ -28,46 +29,63 @@ export function initPatchCommentApi({ caseService, router }: RouteDeps) {
     },
     async (context, request, response) => {
       try {
+        const client = context.core.savedObjects.client;
         const query = pipe(
           CommentPatchRequestRt.decode(request.body),
           fold(throwErrors(Boom.badRequest), identity)
         );
 
-        const myCase = await caseService.getCase({
-          client: context.core.savedObjects.client,
-          caseId: request.params.case_id,
+        const myComment = await caseService.getComment({
+          client,
+          commentId: query.id,
         });
 
-        if (!myCase.attributes.comment_ids.includes(query.id)) {
+        if (myComment == null) {
+          throw Boom.notFound(`This comment ${query.id} does not exist anymore.`);
+        }
+
+        const caseRef = myComment.references.find(c => c.type === CASE_SAVED_OBJECT);
+        if (caseRef == null || (caseRef != null && caseRef.id !== request.params.case_id)) {
           throw Boom.notFound(
-            `This comment ${query.id} does not exist in ${myCase.attributes.title} (id: ${request.params.case_id}).`
+            `This comment ${query.id} does not exist in ${request.params.case_id}).`
           );
         }
 
-        const myComment = await caseService.getComment({
-          client: context.core.savedObjects.client,
-          commentId: query.id,
-        });
-
         if (query.version !== myComment.version) {
           throw Boom.conflict(
             'This case has been updated. Please refresh before saving additional updates.'
           );
         }
 
-        const updatedBy = await caseService.getUser({ request, response });
-        const { email, full_name, username } = updatedBy;
+        const { username, full_name, email } = await caseService.getUser({ request, response });
+        const updatedDate = new Date().toISOString();
         const updatedComment = await caseService.patchComment({
-          client: context.core.savedObjects.client,
+          client,
           commentId: query.id,
           updatedAttributes: {
             comment: query.comment,
-            updated_at: new Date().toISOString(),
+            updated_at: updatedDate,
             updated_by: { email, full_name, username },
           },
           version: query.version,
         });
 
+        await userActionService.postUserActions({
+          client,
+          actions: [
+            buildCommentUserActionItem({
+              action: 'update',
+              actionAt: updatedDate,
+              actionBy: { username, full_name, email },
+              caseId: request.params.case_id,
+              commentId: updatedComment.id,
+              fields: ['comment'],
+              newValue: query.comment,
+              oldValue: myComment.attributes.comment,
+            }),
+          ],
+        });
+
         return response.ok({
           body: CommentResponseRt.encode(
             flattenCommentSavedObject({
diff --git a/x-pack/plugins/case/server/routes/api/cases/comments/post_comment.ts b/x-pack/plugins/case/server/routes/api/cases/comments/post_comment.ts
index 9e82a8ffaaec7..2410505872a3a 100644
--- a/x-pack/plugins/case/server/routes/api/cases/comments/post_comment.ts
+++ b/x-pack/plugins/case/server/routes/api/cases/comments/post_comment.ts
@@ -12,6 +12,7 @@ import { identity } from 'fp-ts/lib/function';
 
 import { CommentRequestRt, CommentResponseRt, throwErrors } from '../../../../../common/api';
 import { CASE_SAVED_OBJECT } from '../../../../saved_object_types';
+import { buildCommentUserActionItem } from '../../../../services/user_actions/helpers';
 import {
   escapeHatch,
   transformNewComment,
@@ -20,7 +21,7 @@ import {
 } from '../../utils';
 import { RouteDeps } from '../../types';
 
-export function initPostCommentApi({ caseService, router }: RouteDeps) {
+export function initPostCommentApi({ caseService, router, userActionService }: RouteDeps) {
   router.post(
     {
       path: '/api/cases/{case_id}/comments',
@@ -33,25 +34,28 @@ export function initPostCommentApi({ caseService, router }: RouteDeps) {
     },
     async (context, request, response) => {
       try {
+        const client = context.core.savedObjects.client;
         const query = pipe(
           CommentRequestRt.decode(request.body),
           fold(throwErrors(Boom.badRequest), identity)
         );
 
         const myCase = await caseService.getCase({
-          client: context.core.savedObjects.client,
+          client,
           caseId: request.params.case_id,
         });
 
-        const createdBy = await caseService.getUser({ request, response });
+        const { username, full_name, email } = await caseService.getUser({ request, response });
         const createdDate = new Date().toISOString();
 
         const newComment = await caseService.postNewComment({
-          client: context.core.savedObjects.client,
+          client,
           attributes: transformNewComment({
             createdDate,
             ...query,
-            ...createdBy,
+            username,
+            full_name,
+            email,
           }),
           references: [
             {
@@ -62,16 +66,19 @@ export function initPostCommentApi({ caseService, router }: RouteDeps) {
           ],
         });
 
-        const updateCase = {
-          comment_ids: [...myCase.attributes.comment_ids, newComment.id],
-        };
-
-        await caseService.patchCase({
-          client: context.core.savedObjects.client,
-          caseId: request.params.case_id,
-          updatedAttributes: {
-            ...updateCase,
-          },
+        await userActionService.postUserActions({
+          client,
+          actions: [
+            buildCommentUserActionItem({
+              action: 'create',
+              actionAt: createdDate,
+              actionBy: { username, full_name, email },
+              caseId: myCase.id,
+              commentId: newComment.id,
+              fields: ['comment'],
+              newValue: query.comment,
+            }),
+          ],
         });
 
         return response.ok({
diff --git a/x-pack/plugins/case/server/routes/api/cases/configure/patch_configure.ts b/x-pack/plugins/case/server/routes/api/cases/configure/patch_configure.ts
index 1542394fc438d..3a1b9d5059cbc 100644
--- a/x-pack/plugins/case/server/routes/api/cases/configure/patch_configure.ts
+++ b/x-pack/plugins/case/server/routes/api/cases/configure/patch_configure.ts
@@ -48,8 +48,7 @@ export function initPatchCaseConfigure({ caseConfigureService, caseService, rout
           );
         }
 
-        const updatedBy = await caseService.getUser({ request, response });
-        const { email, full_name, username } = updatedBy;
+        const { username, full_name, email } = await caseService.getUser({ request, response });
 
         const updateDate = new Date().toISOString();
         const patch = await caseConfigureService.patch({
diff --git a/x-pack/plugins/case/server/routes/api/cases/configure/post_configure.ts b/x-pack/plugins/case/server/routes/api/cases/configure/post_configure.ts
index c839d36dcf4df..2a23abf0cbf21 100644
--- a/x-pack/plugins/case/server/routes/api/cases/configure/post_configure.ts
+++ b/x-pack/plugins/case/server/routes/api/cases/configure/post_configure.ts
@@ -42,8 +42,7 @@ export function initPostCaseConfigure({ caseConfigureService, caseService, route
             )
           );
         }
-        const updatedBy = await caseService.getUser({ request, response });
-        const { email, full_name, username } = updatedBy;
+        const { email, full_name, username } = await caseService.getUser({ request, response });
 
         const creationDate = new Date().toISOString();
         const post = await caseConfigureService.post({
diff --git a/x-pack/plugins/case/server/routes/api/cases/delete_cases.ts b/x-pack/plugins/case/server/routes/api/cases/delete_cases.ts
index 559a477a83a6c..8b0384c12edce 100644
--- a/x-pack/plugins/case/server/routes/api/cases/delete_cases.ts
+++ b/x-pack/plugins/case/server/routes/api/cases/delete_cases.ts
@@ -5,10 +5,12 @@
  */
 
 import { schema } from '@kbn/config-schema';
+
+import { buildCaseUserActionItem } from '../../../services/user_actions/helpers';
 import { RouteDeps } from '../types';
 import { wrapError } from '../utils';
 
-export function initDeleteCasesApi({ caseService, router }: RouteDeps) {
+export function initDeleteCasesApi({ caseService, router, userActionService }: RouteDeps) {
   router.delete(
     {
       path: '/api/cases',
@@ -20,10 +22,11 @@ export function initDeleteCasesApi({ caseService, router }: RouteDeps) {
     },
     async (context, request, response) => {
       try {
+        const client = context.core.savedObjects.client;
         await Promise.all(
           request.query.ids.map(id =>
             caseService.deleteCase({
-              client: context.core.savedObjects.client,
+              client,
               caseId: id,
             })
           )
@@ -31,7 +34,7 @@ export function initDeleteCasesApi({ caseService, router }: RouteDeps) {
         const comments = await Promise.all(
           request.query.ids.map(id =>
             caseService.getAllCaseComments({
-              client: context.core.savedObjects.client,
+              client,
               caseId: id,
             })
           )
@@ -43,7 +46,7 @@ export function initDeleteCasesApi({ caseService, router }: RouteDeps) {
               Promise.all(
                 c.saved_objects.map(({ id }) =>
                   caseService.deleteComment({
-                    client: context.core.savedObjects.client,
+                    client,
                     commentId: id,
                   })
                 )
@@ -51,6 +54,22 @@ export function initDeleteCasesApi({ caseService, router }: RouteDeps) {
             )
           );
         }
+        const { username, full_name, email } = await caseService.getUser({ request, response });
+        const deleteDate = new Date().toISOString();
+
+        await userActionService.postUserActions({
+          client,
+          actions: request.query.ids.map(id =>
+            buildCaseUserActionItem({
+              action: 'create',
+              actionAt: deleteDate,
+              actionBy: { username, full_name, email },
+              caseId: id,
+              fields: ['comment', 'description', 'status', 'tags', 'title'],
+            })
+          ),
+        });
+
         return response.ok({ body: 'true' });
       } catch (error) {
         return response.customError(wrapError(error));
diff --git a/x-pack/plugins/case/server/routes/api/cases/find_cases.ts b/x-pack/plugins/case/server/routes/api/cases/find_cases.ts
index 76a1992c64270..e7b2044f2badf 100644
--- a/x-pack/plugins/case/server/routes/api/cases/find_cases.ts
+++ b/x-pack/plugins/case/server/routes/api/cases/find_cases.ts
@@ -13,7 +13,7 @@ import { identity } from 'fp-ts/lib/function';
 import { isEmpty } from 'lodash';
 import { CasesFindResponseRt, CasesFindRequestRt, throwErrors } from '../../../../common/api';
 import { transformCases, sortToSnake, wrapError, escapeHatch } from '../utils';
-import { RouteDeps } from '../types';
+import { RouteDeps, TotalCommentByCase } from '../types';
 import { CASE_SAVED_OBJECT } from '../../../saved_object_types';
 
 const combineFilters = (filters: string[], operator: 'OR' | 'AND'): string =>
@@ -97,9 +97,44 @@ export function initFindCasesApi({ caseService, router }: RouteDeps) {
           caseService.findCases(argsOpenCases),
           caseService.findCases(argsClosedCases),
         ]);
+
+        const totalCommentsFindByCases = await Promise.all(
+          cases.saved_objects.map(c =>
+            caseService.getAllCaseComments({
+              client,
+              caseId: c.id,
+              options: {
+                fields: [],
+                page: 1,
+                perPage: 1,
+              },
+            })
+          )
+        );
+
+        const totalCommentsByCases = totalCommentsFindByCases.reduce<TotalCommentByCase[]>(
+          (acc, itemFind) => {
+            if (itemFind.saved_objects.length > 0) {
+              const caseId =
+                itemFind.saved_objects[0].references.find(r => r.type === CASE_SAVED_OBJECT)?.id ??
+                null;
+              if (caseId != null) {
+                return [...acc, { caseId, totalComments: itemFind.total }];
+              }
+            }
+            return [...acc];
+          },
+          []
+        );
+
         return response.ok({
           body: CasesFindResponseRt.encode(
-            transformCases(cases, openCases.total ?? 0, closesCases.total ?? 0)
+            transformCases(
+              cases,
+              openCases.total ?? 0,
+              closesCases.total ?? 0,
+              totalCommentsByCases
+            )
           ),
         });
       } catch (error) {
diff --git a/x-pack/plugins/case/server/routes/api/cases/get_case.ts b/x-pack/plugins/case/server/routes/api/cases/get_case.ts
index 1415513bca346..e947118a39e8e 100644
--- a/x-pack/plugins/case/server/routes/api/cases/get_case.ts
+++ b/x-pack/plugins/case/server/routes/api/cases/get_case.ts
@@ -25,10 +25,11 @@ export function initGetCaseApi({ caseService, router }: RouteDeps) {
     },
     async (context, request, response) => {
       try {
+        const client = context.core.savedObjects.client;
         const includeComments = JSON.parse(request.query.includeComments);
 
         const theCase = await caseService.getCase({
-          client: context.core.savedObjects.client,
+          client,
           caseId: request.params.case_id,
         });
 
@@ -37,7 +38,7 @@ export function initGetCaseApi({ caseService, router }: RouteDeps) {
         }
 
         const theComments = await caseService.getAllCaseComments({
-          client: context.core.savedObjects.client,
+          client,
           caseId: request.params.case_id,
         });
 
diff --git a/x-pack/plugins/case/server/routes/api/cases/helpers.ts b/x-pack/plugins/case/server/routes/api/cases/helpers.ts
index 3bf46cadc83c8..747b5195da7ec 100644
--- a/x-pack/plugins/case/server/routes/api/cases/helpers.ts
+++ b/x-pack/plugins/case/server/routes/api/cases/helpers.ts
@@ -4,10 +4,57 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { difference, get } from 'lodash';
+import { get } from 'lodash';
 
 import { CaseAttributes, CasePatchRequest } from '../../../../common/api';
 
+interface CompareArrays {
+  addedItems: string[];
+  deletedItems: string[];
+}
+export const compareArrays = ({
+  originalValue,
+  updatedValue,
+}: {
+  originalValue: string[];
+  updatedValue: string[];
+}): CompareArrays => {
+  const result: CompareArrays = {
+    addedItems: [],
+    deletedItems: [],
+  };
+  originalValue.forEach(origVal => {
+    if (!updatedValue.includes(origVal)) {
+      result.deletedItems = [...result.deletedItems, origVal];
+    }
+  });
+  updatedValue.forEach(updatedVal => {
+    if (!originalValue.includes(updatedVal)) {
+      result.addedItems = [...result.addedItems, updatedVal];
+    }
+  });
+
+  return result;
+};
+
+export const isTwoArraysDifference = (
+  originalValue: unknown,
+  updatedValue: unknown
+): CompareArrays | null => {
+  if (
+    originalValue != null &&
+    updatedValue != null &&
+    Array.isArray(updatedValue) &&
+    Array.isArray(originalValue)
+  ) {
+    const compObj = compareArrays({ originalValue, updatedValue });
+    if (compObj.addedItems.length > 0 || compObj.deletedItems.length > 0) {
+      return compObj;
+    }
+  }
+  return null;
+};
+
 export const getCaseToUpdate = (
   currentCase: CaseAttributes,
   queryCase: CasePatchRequest
@@ -15,12 +62,7 @@ export const getCaseToUpdate = (
   Object.entries(queryCase).reduce(
     (acc, [key, value]) => {
       const currentValue = get(currentCase, key);
-      if (
-        currentValue != null &&
-        Array.isArray(value) &&
-        Array.isArray(currentValue) &&
-        difference(value, currentValue).length !== 0
-      ) {
+      if (isTwoArraysDifference(value, currentValue)) {
         return {
           ...acc,
           [key]: value,
diff --git a/x-pack/plugins/case/server/routes/api/cases/patch_cases.test.ts b/x-pack/plugins/case/server/routes/api/cases/patch_cases.test.ts
index 19ff7f0734a77..ac1e67cec52bd 100644
--- a/x-pack/plugins/case/server/routes/api/cases/patch_cases.test.ts
+++ b/x-pack/plugins/case/server/routes/api/cases/patch_cases.test.ts
@@ -52,15 +52,16 @@ describe('PATCH cases', () => {
       {
         closed_at: '2019-11-25T21:54:48.952Z',
         closed_by: { email: 'd00d@awesome.com', full_name: 'Awesome D00d', username: 'awesome' },
-        comment_ids: ['mock-comment-1'],
         comments: [],
         created_at: '2019-11-25T21:54:48.952Z',
         created_by: { email: 'testemail@elastic.co', full_name: 'elastic', username: 'elastic' },
         description: 'This is a brand new case of a bad meanie defacing data',
         id: 'mock-id-1',
+        external_service: null,
         status: 'closed',
         tags: ['defacement'],
         title: 'Super Bad Security Issue',
+        totalComment: 0,
         updated_at: '2019-11-25T21:54:48.952Z',
         updated_by: { email: 'd00d@awesome.com', full_name: 'Awesome D00d', username: 'awesome' },
         version: 'WzE3LDFd',
@@ -94,15 +95,16 @@ describe('PATCH cases', () => {
       {
         closed_at: null,
         closed_by: null,
-        comment_ids: [],
         comments: [],
         created_at: '2019-11-25T22:32:17.947Z',
         created_by: { email: 'testemail@elastic.co', full_name: 'elastic', username: 'elastic' },
         description: 'Oh no, a bad meanie going LOLBins all over the place!',
         id: 'mock-id-4',
+        external_service: null,
         status: 'open',
         tags: ['LOLBins'],
         title: 'Another bad one',
+        totalComment: 0,
         updated_at: '2019-11-25T21:54:48.952Z',
         updated_by: { email: 'd00d@awesome.com', full_name: 'Awesome D00d', username: 'awesome' },
         version: 'WzE3LDFd',
diff --git a/x-pack/plugins/case/server/routes/api/cases/patch_cases.ts b/x-pack/plugins/case/server/routes/api/cases/patch_cases.ts
index 4aa0d8daf5b34..3d0b7bc79f88b 100644
--- a/x-pack/plugins/case/server/routes/api/cases/patch_cases.ts
+++ b/x-pack/plugins/case/server/routes/api/cases/patch_cases.ts
@@ -18,8 +18,9 @@ import {
 import { escapeHatch, wrapError, flattenCaseSavedObject } from '../utils';
 import { RouteDeps } from '../types';
 import { getCaseToUpdate } from './helpers';
+import { buildCaseUserActions } from '../../../services/user_actions/helpers';
 
-export function initPatchCasesApi({ caseService, router }: RouteDeps) {
+export function initPatchCasesApi({ caseService, router, userActionService }: RouteDeps) {
   router.patch(
     {
       path: '/api/cases',
@@ -29,12 +30,13 @@ export function initPatchCasesApi({ caseService, router }: RouteDeps) {
     },
     async (context, request, response) => {
       try {
+        const client = context.core.savedObjects.client;
         const query = pipe(
           CasesPatchRequestRt.decode(request.body),
           fold(throwErrors(Boom.badRequest), identity)
         );
         const myCases = await caseService.getCases({
-          client: context.core.savedObjects.client,
+          client,
           caseIds: query.cases.map(q => q.id),
         });
         let nonExistingCases: CasePatchRequest[] = [];
@@ -72,11 +74,10 @@ export function initPatchCasesApi({ caseService, router }: RouteDeps) {
           return Object.keys(updateCaseAttributes).length > 0;
         });
         if (updateFilterCases.length > 0) {
-          const updatedBy = await caseService.getUser({ request, response });
-          const { email, full_name, username } = updatedBy;
+          const { username, full_name, email } = await caseService.getUser({ request, response });
           const updatedDt = new Date().toISOString();
           const updatedCases = await caseService.patchCases({
-            client: context.core.savedObjects.client,
+            client,
             cases: updateFilterCases.map(thisCase => {
               const { id: caseId, version, ...updateCaseAttributes } = thisCase;
               let closedInfo = {};
@@ -103,6 +104,7 @@ export function initPatchCasesApi({ caseService, router }: RouteDeps) {
               };
             }),
           });
+
           const returnUpdatedCase = myCases.saved_objects
             .filter(myCase =>
               updatedCases.saved_objects.some(updatedCase => updatedCase.id === myCase.id)
@@ -116,6 +118,17 @@ export function initPatchCasesApi({ caseService, router }: RouteDeps) {
                 references: myCase.references,
               });
             });
+
+          await userActionService.postUserActions({
+            client,
+            actions: buildCaseUserActions({
+              originalCases: myCases.saved_objects,
+              updatedCases: updatedCases.saved_objects,
+              actionDate: updatedDt,
+              actionBy: { email, full_name, username },
+            }),
+          });
+
           return response.ok({
             body: CasesResponseRt.encode(returnUpdatedCase),
           });
diff --git a/x-pack/plugins/case/server/routes/api/cases/post_case.ts b/x-pack/plugins/case/server/routes/api/cases/post_case.ts
index 9e854c3178e1e..75be68013bcd4 100644
--- a/x-pack/plugins/case/server/routes/api/cases/post_case.ts
+++ b/x-pack/plugins/case/server/routes/api/cases/post_case.ts
@@ -12,9 +12,10 @@ import { identity } from 'fp-ts/lib/function';
 import { flattenCaseSavedObject, transformNewCase, wrapError, escapeHatch } from '../utils';
 
 import { CaseRequestRt, throwErrors, CaseResponseRt } from '../../../../common/api';
+import { buildCaseUserActionItem } from '../../../services/user_actions/helpers';
 import { RouteDeps } from '../types';
 
-export function initPostCaseApi({ caseService, router }: RouteDeps) {
+export function initPostCaseApi({ caseService, router, userActionService }: RouteDeps) {
   router.post(
     {
       path: '/api/cases',
@@ -24,21 +25,39 @@ export function initPostCaseApi({ caseService, router }: RouteDeps) {
     },
     async (context, request, response) => {
       try {
+        const client = context.core.savedObjects.client;
         const query = pipe(
           CaseRequestRt.decode(request.body),
           fold(throwErrors(Boom.badRequest), identity)
         );
 
-        const createdBy = await caseService.getUser({ request, response });
+        const { username, full_name, email } = await caseService.getUser({ request, response });
         const createdDate = new Date().toISOString();
         const newCase = await caseService.postNewCase({
-          client: context.core.savedObjects.client,
+          client,
           attributes: transformNewCase({
             createdDate,
             newCase: query,
-            ...createdBy,
+            username,
+            full_name,
+            email,
           }),
         });
+
+        await userActionService.postUserActions({
+          client,
+          actions: [
+            buildCaseUserActionItem({
+              action: 'create',
+              actionAt: createdDate,
+              actionBy: { username, full_name, email },
+              caseId: newCase.id,
+              fields: ['description', 'status', 'tags', 'title'],
+              newValue: JSON.stringify(query),
+            }),
+          ],
+        });
+
         return response.ok({ body: CaseResponseRt.encode(flattenCaseSavedObject(newCase, [])) });
       } catch (error) {
         return response.customError(wrapError(error));
diff --git a/x-pack/plugins/case/server/routes/api/cases/push_case.ts b/x-pack/plugins/case/server/routes/api/cases/push_case.ts
new file mode 100644
index 0000000000000..6ae3df180d9e4
--- /dev/null
+++ b/x-pack/plugins/case/server/routes/api/cases/push_case.ts
@@ -0,0 +1,176 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { schema } from '@kbn/config-schema';
+import Boom from 'boom';
+import { pipe } from 'fp-ts/lib/pipeable';
+import { fold } from 'fp-ts/lib/Either';
+import { identity } from 'fp-ts/lib/function';
+
+import { flattenCaseSavedObject, wrapError, escapeHatch } from '../utils';
+
+import { CaseExternalServiceRequestRt, CaseResponseRt, throwErrors } from '../../../../common/api';
+import { buildCaseUserActionItem } from '../../../services/user_actions/helpers';
+import { RouteDeps } from '../types';
+
+export function initPushCaseUserActionApi({
+  caseConfigureService,
+  caseService,
+  router,
+  userActionService,
+}: RouteDeps) {
+  router.post(
+    {
+      path: '/api/cases/{case_id}/_push',
+      validate: {
+        params: schema.object({
+          case_id: schema.string(),
+        }),
+        body: escapeHatch,
+      },
+    },
+    async (context, request, response) => {
+      try {
+        const client = context.core.savedObjects.client;
+        const caseId = request.params.case_id;
+        const query = pipe(
+          CaseExternalServiceRequestRt.decode(request.body),
+          fold(throwErrors(Boom.badRequest), identity)
+        );
+        const { username, full_name, email } = await caseService.getUser({ request, response });
+        const pushedDate = new Date().toISOString();
+
+        const [myCase, myCaseConfigure, totalCommentsFindByCases] = await Promise.all([
+          caseService.getCase({
+            client,
+            caseId: request.params.case_id,
+          }),
+          caseConfigureService.find({ client }),
+          caseService.getAllCaseComments({
+            client,
+            caseId,
+            options: {
+              fields: [],
+              page: 1,
+              perPage: 1,
+            },
+          }),
+        ]);
+
+        if (myCase.attributes.status === 'closed') {
+          throw Boom.conflict(
+            `This case ${myCase.attributes.title} is closed. You can not pushed if the case is closed.`
+          );
+        }
+
+        const comments = await caseService.getAllCaseComments({
+          client,
+          caseId,
+          options: {
+            fields: [],
+            page: 1,
+            perPage: totalCommentsFindByCases.total,
+          },
+        });
+
+        const externalService = {
+          pushed_at: pushedDate,
+          pushed_by: { username, full_name, email },
+          ...query,
+        };
+
+        const [updatedCase, updatedComments] = await Promise.all([
+          caseService.patchCase({
+            client,
+            caseId,
+            updatedAttributes: {
+              ...(myCaseConfigure.saved_objects[0].attributes.closure_type === 'close-by-pushing'
+                ? {
+                    status: 'closed',
+                    closed_at: pushedDate,
+                    closed_by: { email, full_name, username },
+                  }
+                : {}),
+              external_service: externalService,
+              updated_at: pushedDate,
+              updated_by: { username, full_name, email },
+            },
+            version: myCase.version,
+          }),
+          caseService.patchComments({
+            client,
+            comments: comments.saved_objects.map(comment => ({
+              commentId: comment.id,
+              updatedAttributes: {
+                pushed_at: pushedDate,
+                pushed_by: { username, full_name, email },
+                updated_at: pushedDate,
+                updated_by: { username, full_name, email },
+              },
+              version: comment.version,
+            })),
+          }),
+          userActionService.postUserActions({
+            client,
+            actions: [
+              ...(myCaseConfigure.saved_objects[0].attributes.closure_type === 'close-by-pushing'
+                ? [
+                    buildCaseUserActionItem({
+                      action: 'update',
+                      actionAt: pushedDate,
+                      actionBy: { username, full_name, email },
+                      caseId,
+                      fields: ['status'],
+                      newValue: 'closed',
+                      oldValue: myCase.attributes.status,
+                    }),
+                  ]
+                : []),
+              buildCaseUserActionItem({
+                action: 'push-to-service',
+                actionAt: pushedDate,
+                actionBy: { username, full_name, email },
+                caseId,
+                fields: ['pushed'],
+                newValue: JSON.stringify(externalService),
+              }),
+            ],
+          }),
+        ]);
+
+        return response.ok({
+          body: CaseResponseRt.encode(
+            flattenCaseSavedObject(
+              {
+                ...myCase,
+                ...updatedCase,
+                attributes: { ...myCase.attributes, ...updatedCase?.attributes },
+                references: myCase.references,
+              },
+              comments.saved_objects.map(origComment => {
+                const updatedComment = updatedComments.saved_objects.find(
+                  c => c.id === origComment.id
+                );
+                return {
+                  ...origComment,
+                  ...updatedComment,
+                  attributes: {
+                    ...origComment.attributes,
+                    ...updatedComment?.attributes,
+                  },
+                  version: updatedComment?.version ?? origComment.version,
+                  references: origComment?.references ?? [],
+                };
+              })
+            )
+          ),
+        });
+      } catch (error) {
+        return response.customError(wrapError(error));
+      }
+    }
+  );
+}
diff --git a/x-pack/plugins/case/server/routes/api/cases/reporters/get_reporters.ts b/x-pack/plugins/case/server/routes/api/cases/reporters/get_reporters.ts
index 519bb198f5f9e..56862a96e0563 100644
--- a/x-pack/plugins/case/server/routes/api/cases/reporters/get_reporters.ts
+++ b/x-pack/plugins/case/server/routes/api/cases/reporters/get_reporters.ts
@@ -16,8 +16,9 @@ export function initGetReportersApi({ caseService, router }: RouteDeps) {
     },
     async (context, request, response) => {
       try {
+        const client = context.core.savedObjects.client;
         const reporters = await caseService.getReporters({
-          client: context.core.savedObjects.client,
+          client,
         });
         return response.ok({ body: UsersRt.encode(reporters) });
       } catch (error) {
diff --git a/x-pack/plugins/case/server/routes/api/cases/status/get_status.ts b/x-pack/plugins/case/server/routes/api/cases/status/get_status.ts
index b4fc90d702604..f7431729d398c 100644
--- a/x-pack/plugins/case/server/routes/api/cases/status/get_status.ts
+++ b/x-pack/plugins/case/server/routes/api/cases/status/get_status.ts
@@ -18,8 +18,9 @@ export function initGetCasesStatusApi({ caseService, router }: RouteDeps) {
     },
     async (context, request, response) => {
       try {
+        const client = context.core.savedObjects.client;
         const argsOpenCases = {
-          client: context.core.savedObjects.client,
+          client,
           options: {
             fields: [],
             page: 1,
@@ -29,7 +30,7 @@ export function initGetCasesStatusApi({ caseService, router }: RouteDeps) {
         };
 
         const argsClosedCases = {
-          client: context.core.savedObjects.client,
+          client,
           options: {
             fields: [],
             page: 1,
diff --git a/x-pack/plugins/case/server/routes/api/cases/tags/get_tags.ts b/x-pack/plugins/case/server/routes/api/cases/tags/get_tags.ts
index ca51f421f4f56..55e8fe2af128c 100644
--- a/x-pack/plugins/case/server/routes/api/cases/tags/get_tags.ts
+++ b/x-pack/plugins/case/server/routes/api/cases/tags/get_tags.ts
@@ -15,8 +15,9 @@ export function initGetTagsApi({ caseService, router }: RouteDeps) {
     },
     async (context, request, response) => {
       try {
+        const client = context.core.savedObjects.client;
         const tags = await caseService.getTags({
-          client: context.core.savedObjects.client,
+          client,
         });
         return response.ok({ body: tags });
       } catch (error) {
diff --git a/x-pack/plugins/case/server/routes/api/cases/user_actions/get_all_user_actions.ts b/x-pack/plugins/case/server/routes/api/cases/user_actions/get_all_user_actions.ts
new file mode 100644
index 0000000000000..2d4f16e46d561
--- /dev/null
+++ b/x-pack/plugins/case/server/routes/api/cases/user_actions/get_all_user_actions.ts
@@ -0,0 +1,46 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { schema } from '@kbn/config-schema';
+
+import { CaseUserActionsResponseRt } from '../../../../../common/api';
+import { CASE_SAVED_OBJECT, CASE_COMMENT_SAVED_OBJECT } from '../../../../saved_object_types';
+import { RouteDeps } from '../../types';
+import { wrapError } from '../../utils';
+
+export function initGetAllUserActionsApi({ userActionService, router }: RouteDeps) {
+  router.get(
+    {
+      path: '/api/cases/{case_id}/user_actions',
+      validate: {
+        params: schema.object({
+          case_id: schema.string(),
+        }),
+      },
+    },
+    async (context, request, response) => {
+      try {
+        const client = context.core.savedObjects.client;
+        const userActions = await userActionService.getUserActions({
+          client,
+          caseId: request.params.case_id,
+        });
+        return response.ok({
+          body: CaseUserActionsResponseRt.encode(
+            userActions.saved_objects.map(ua => ({
+              ...ua.attributes,
+              action_id: ua.id,
+              case_id: ua.references.find(r => r.type === CASE_SAVED_OBJECT)?.id ?? '',
+              comment_id: ua.references.find(r => r.type === CASE_COMMENT_SAVED_OBJECT)?.id ?? null,
+            }))
+          ),
+        });
+      } catch (error) {
+        return response.customError(wrapError(error));
+      }
+    }
+  );
+}
diff --git a/x-pack/plugins/case/server/routes/api/index.ts b/x-pack/plugins/case/server/routes/api/index.ts
index 60ee57a0efea7..ced88fabf3160 100644
--- a/x-pack/plugins/case/server/routes/api/index.ts
+++ b/x-pack/plugins/case/server/routes/api/index.ts
@@ -9,6 +9,11 @@ import { initFindCasesApi } from '././cases/find_cases';
 import { initGetCaseApi } from './cases/get_case';
 import { initPatchCasesApi } from './cases/patch_cases';
 import { initPostCaseApi } from './cases/post_case';
+import { initPushCaseUserActionApi } from './cases/push_case';
+import { initGetReportersApi } from './cases/reporters/get_reporters';
+import { initGetCasesStatusApi } from './cases/status/get_status';
+import { initGetTagsApi } from './cases/tags/get_tags';
+import { initGetAllUserActionsApi } from './cases/user_actions/get_all_user_actions';
 
 import { initDeleteCommentApi } from './cases/comments/delete_comment';
 import { initDeleteAllCommentsApi } from './cases/comments/delete_all_comments';
@@ -18,18 +23,13 @@ import { initGetCommentApi } from './cases/comments/get_comment';
 import { initPatchCommentApi } from './cases/comments/patch_comment';
 import { initPostCommentApi } from './cases/comments/post_comment';
 
-import { initGetReportersApi } from './cases/reporters/get_reporters';
-
-import { initGetCasesStatusApi } from './cases/status/get_status';
-
-import { initGetTagsApi } from './cases/tags/get_tags';
-
-import { RouteDeps } from './types';
 import { initCaseConfigureGetActionConnector } from './cases/configure/get_connectors';
 import { initGetCaseConfigure } from './cases/configure/get_configure';
 import { initPatchCaseConfigure } from './cases/configure/patch_configure';
 import { initPostCaseConfigure } from './cases/configure/post_configure';
 
+import { RouteDeps } from './types';
+
 export function initCaseApi(deps: RouteDeps) {
   // Cases
   initDeleteCasesApi(deps);
@@ -37,6 +37,8 @@ export function initCaseApi(deps: RouteDeps) {
   initGetCaseApi(deps);
   initPatchCasesApi(deps);
   initPostCaseApi(deps);
+  initPushCaseUserActionApi(deps);
+  initGetAllUserActionsApi(deps);
   // Comments
   initDeleteCommentApi(deps);
   initDeleteAllCommentsApi(deps);
diff --git a/x-pack/plugins/case/server/routes/api/types.ts b/x-pack/plugins/case/server/routes/api/types.ts
index 7af3e7b70d96f..e532a7b618b5c 100644
--- a/x-pack/plugins/case/server/routes/api/types.ts
+++ b/x-pack/plugins/case/server/routes/api/types.ts
@@ -5,11 +5,16 @@
  */
 
 import { IRouter } from 'src/core/server';
-import { CaseConfigureServiceSetup, CaseServiceSetup } from '../../services';
+import {
+  CaseConfigureServiceSetup,
+  CaseServiceSetup,
+  CaseUserActionServiceSetup,
+} from '../../services';
 
 export interface RouteDeps {
   caseConfigureService: CaseConfigureServiceSetup;
   caseService: CaseServiceSetup;
+  userActionService: CaseUserActionServiceSetup;
   router: IRouter;
 }
 
@@ -18,3 +23,8 @@ export enum SortFieldCase {
   createdAt = 'created_at',
   status = 'status',
 }
+
+export interface TotalCommentByCase {
+  caseId: string;
+  totalComments: number;
+}
diff --git a/x-pack/plugins/case/server/routes/api/utils.ts b/x-pack/plugins/case/server/routes/api/utils.ts
index 19dbb024d1e0b..9d90eb8ef4a6d 100644
--- a/x-pack/plugins/case/server/routes/api/utils.ts
+++ b/x-pack/plugins/case/server/routes/api/utils.ts
@@ -22,7 +22,8 @@ import {
   CommentsResponse,
   CommentAttributes,
 } from '../../../common/api';
-import { SortFieldCase } from './types';
+
+import { SortFieldCase, TotalCommentByCase } from './types';
 
 export const transformNewCase = ({
   createdDate,
@@ -37,11 +38,11 @@ export const transformNewCase = ({
   newCase: CaseRequest;
   username: string;
 }): CaseAttributes => ({
-  closed_at: newCase.status === 'closed' ? createdDate : null,
-  closed_by: newCase.status === 'closed' ? { email, full_name, username } : null,
-  comment_ids: [],
+  closed_at: null,
+  closed_by: null,
   created_at: createdDate,
   created_by: { email, full_name, username },
+  external_service: null,
   updated_at: null,
   updated_by: null,
   ...newCase,
@@ -64,6 +65,8 @@ export const transformNewComment = ({
   comment,
   created_at: createdDate,
   created_by: { email, full_name, username },
+  pushed_at: null,
+  pushed_by: null,
   updated_at: null,
   updated_by: null,
 });
@@ -81,30 +84,41 @@ export function wrapError(error: any): CustomHttpResponseOptions<ResponseError>
 export const transformCases = (
   cases: SavedObjectsFindResponse<CaseAttributes>,
   countOpenCases: number,
-  countClosedCases: number
+  countClosedCases: number,
+  totalCommentByCase: TotalCommentByCase[]
 ): CasesFindResponse => ({
   page: cases.page,
   per_page: cases.per_page,
   total: cases.total,
-  cases: flattenCaseSavedObjects(cases.saved_objects),
+  cases: flattenCaseSavedObjects(cases.saved_objects, totalCommentByCase),
   count_open_cases: countOpenCases,
   count_closed_cases: countClosedCases,
 });
 
 export const flattenCaseSavedObjects = (
-  savedObjects: SavedObjectsFindResponse<CaseAttributes>['saved_objects']
+  savedObjects: SavedObjectsFindResponse<CaseAttributes>['saved_objects'],
+  totalCommentByCase: TotalCommentByCase[]
 ): CaseResponse[] =>
   savedObjects.reduce((acc: CaseResponse[], savedObject: SavedObject<CaseAttributes>) => {
-    return [...acc, flattenCaseSavedObject(savedObject, [])];
+    return [
+      ...acc,
+      flattenCaseSavedObject(
+        savedObject,
+        [],
+        totalCommentByCase.find(tc => tc.caseId === savedObject.id)?.totalComments ?? 0
+      ),
+    ];
   }, []);
 
 export const flattenCaseSavedObject = (
   savedObject: SavedObject<CaseAttributes>,
-  comments: Array<SavedObject<CommentAttributes>> = []
+  comments: Array<SavedObject<CommentAttributes>> = [],
+  totalComment: number = 0
 ): CaseResponse => ({
   id: savedObject.id,
   version: savedObject.version ?? '0',
   comments: flattenCommentSavedObjects(comments),
+  totalComment,
   ...savedObject.attributes,
 });
 
diff --git a/x-pack/plugins/case/server/saved_object_types/cases.ts b/x-pack/plugins/case/server/saved_object_types/cases.ts
index 8eab040b9ca9c..a4c5dab0feeb7 100644
--- a/x-pack/plugins/case/server/saved_object_types/cases.ts
+++ b/x-pack/plugins/case/server/saved_object_types/cases.ts
@@ -30,9 +30,6 @@ export const caseSavedObjectType: SavedObjectsType = {
           },
         },
       },
-      comment_ids: {
-        type: 'keyword',
-      },
       created_at: {
         type: 'date',
       },
@@ -52,6 +49,41 @@ export const caseSavedObjectType: SavedObjectsType = {
       description: {
         type: 'text',
       },
+      external_service: {
+        properties: {
+          pushed_at: {
+            type: 'date',
+          },
+          pushed_by: {
+            properties: {
+              username: {
+                type: 'keyword',
+              },
+              full_name: {
+                type: 'keyword',
+              },
+              email: {
+                type: 'keyword',
+              },
+            },
+          },
+          connector_id: {
+            type: 'keyword',
+          },
+          connector_name: {
+            type: 'keyword',
+          },
+          external_id: {
+            type: 'keyword',
+          },
+          external_title: {
+            type: 'text',
+          },
+          external_url: {
+            type: 'text',
+          },
+        },
+      },
       title: {
         type: 'keyword',
       },
@@ -61,6 +93,7 @@ export const caseSavedObjectType: SavedObjectsType = {
       tags: {
         type: 'keyword',
       },
+
       updated_at: {
         type: 'date',
       },
diff --git a/x-pack/plugins/case/server/saved_object_types/comments.ts b/x-pack/plugins/case/server/saved_object_types/comments.ts
index f52da886e7611..8776dd39b11fa 100644
--- a/x-pack/plugins/case/server/saved_object_types/comments.ts
+++ b/x-pack/plugins/case/server/saved_object_types/comments.ts
@@ -33,6 +33,19 @@ export const caseCommentSavedObjectType: SavedObjectsType = {
           },
         },
       },
+      pushed_at: {
+        type: 'date',
+      },
+      pushed_by: {
+        properties: {
+          username: {
+            type: 'keyword',
+          },
+          full_name: {
+            type: 'keyword',
+          },
+        },
+      },
       updated_at: {
         type: 'date',
       },
diff --git a/x-pack/plugins/case/server/saved_object_types/configure.ts b/x-pack/plugins/case/server/saved_object_types/configure.ts
index 8ea6f6bba7d4f..d66c38b6ea8ff 100644
--- a/x-pack/plugins/case/server/saved_object_types/configure.ts
+++ b/x-pack/plugins/case/server/saved_object_types/configure.ts
@@ -19,6 +19,9 @@ export const caseConfigureSavedObjectType: SavedObjectsType = {
       },
       created_by: {
         properties: {
+          email: {
+            type: 'keyword',
+          },
           username: {
             type: 'keyword',
           },
@@ -30,6 +33,9 @@ export const caseConfigureSavedObjectType: SavedObjectsType = {
       connector_id: {
         type: 'keyword',
       },
+      connector_name: {
+        type: 'keyword',
+      },
       closure_type: {
         type: 'keyword',
       },
@@ -38,6 +44,9 @@ export const caseConfigureSavedObjectType: SavedObjectsType = {
       },
       updated_by: {
         properties: {
+          email: {
+            type: 'keyword',
+          },
           username: {
             type: 'keyword',
           },
diff --git a/x-pack/plugins/case/server/saved_object_types/index.ts b/x-pack/plugins/case/server/saved_object_types/index.ts
index 978b3d35ee5c6..0e4b9fa3e2eee 100644
--- a/x-pack/plugins/case/server/saved_object_types/index.ts
+++ b/x-pack/plugins/case/server/saved_object_types/index.ts
@@ -7,3 +7,4 @@
 export { caseSavedObjectType, CASE_SAVED_OBJECT } from './cases';
 export { caseConfigureSavedObjectType, CASE_CONFIGURE_SAVED_OBJECT } from './configure';
 export { caseCommentSavedObjectType, CASE_COMMENT_SAVED_OBJECT } from './comments';
+export { caseUserActionSavedObjectType, CASE_USER_ACTION_SAVED_OBJECT } from './user_actions';
diff --git a/x-pack/plugins/case/server/saved_object_types/user_actions.ts b/x-pack/plugins/case/server/saved_object_types/user_actions.ts
new file mode 100644
index 0000000000000..b61bfafc3b33c
--- /dev/null
+++ b/x-pack/plugins/case/server/saved_object_types/user_actions.ts
@@ -0,0 +1,47 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { SavedObjectsType } from 'src/core/server';
+
+export const CASE_USER_ACTION_SAVED_OBJECT = 'cases-user-actions';
+
+export const caseUserActionSavedObjectType: SavedObjectsType = {
+  name: CASE_USER_ACTION_SAVED_OBJECT,
+  hidden: false,
+  namespaceAgnostic: false,
+  mappings: {
+    properties: {
+      action_field: {
+        type: 'keyword',
+      },
+      action: {
+        type: 'keyword',
+      },
+      action_at: {
+        type: 'date',
+      },
+      action_by: {
+        properties: {
+          email: {
+            type: 'keyword',
+          },
+          username: {
+            type: 'keyword',
+          },
+          full_name: {
+            type: 'keyword',
+          },
+        },
+      },
+      new_value: {
+        type: 'text',
+      },
+      old_value: {
+        type: 'text',
+      },
+    },
+  },
+};
diff --git a/x-pack/plugins/case/server/services/index.ts b/x-pack/plugins/case/server/services/index.ts
index 4bbffddf63251..09d726228d309 100644
--- a/x-pack/plugins/case/server/services/index.ts
+++ b/x-pack/plugins/case/server/services/index.ts
@@ -24,11 +24,17 @@ import { readReporters } from './reporters/read_reporters';
 import { readTags } from './tags/read_tags';
 
 export { CaseConfigureService, CaseConfigureServiceSetup } from './configure';
+export { CaseUserActionService, CaseUserActionServiceSetup } from './user_actions';
 
-interface ClientArgs {
+export interface ClientArgs {
   client: SavedObjectsClientContract;
 }
 
+interface PushedArgs {
+  pushed_at: string;
+  pushed_by: User;
+}
+
 interface GetCaseArgs extends ClientArgs {
   caseId: string;
 }
@@ -37,7 +43,7 @@ interface GetCasesArgs extends ClientArgs {
   caseIds: string[];
 }
 
-interface GetCommentsArgs extends GetCaseArgs {
+interface FindCommentsArgs extends GetCaseArgs {
   options?: SavedObjectFindOptions;
 }
 
@@ -47,6 +53,7 @@ interface FindCasesArgs extends ClientArgs {
 interface GetCommentArgs extends ClientArgs {
   commentId: string;
 }
+
 interface PostCaseArgs extends ClientArgs {
   attributes: CaseAttributes;
 }
@@ -58,7 +65,7 @@ interface PostCommentArgs extends ClientArgs {
 
 interface PatchCase {
   caseId: string;
-  updatedAttributes: Partial<CaseAttributes>;
+  updatedAttributes: Partial<CaseAttributes & PushedArgs>;
   version?: string;
 }
 type PatchCaseArgs = PatchCase & ClientArgs;
@@ -68,10 +75,20 @@ interface PatchCasesArgs extends ClientArgs {
 }
 interface UpdateCommentArgs extends ClientArgs {
   commentId: string;
-  updatedAttributes: Partial<CommentAttributes>;
+  updatedAttributes: Partial<CommentAttributes & PushedArgs>;
   version?: string;
 }
 
+interface PatchComment {
+  commentId: string;
+  updatedAttributes: Partial<CommentAttributes & PushedArgs>;
+  version?: string;
+}
+
+interface PatchComments extends ClientArgs {
+  comments: PatchComment[];
+}
+
 interface GetUserArgs {
   request: KibanaRequest;
   response: KibanaResponseFactory;
@@ -84,7 +101,7 @@ export interface CaseServiceSetup {
   deleteCase(args: GetCaseArgs): Promise<{}>;
   deleteComment(args: GetCommentArgs): Promise<{}>;
   findCases(args: FindCasesArgs): Promise<SavedObjectsFindResponse<CaseAttributes>>;
-  getAllCaseComments(args: GetCommentsArgs): Promise<SavedObjectsFindResponse<CommentAttributes>>;
+  getAllCaseComments(args: FindCommentsArgs): Promise<SavedObjectsFindResponse<CommentAttributes>>;
   getCase(args: GetCaseArgs): Promise<SavedObject<CaseAttributes>>;
   getCases(args: GetCasesArgs): Promise<SavedObjectsBulkResponse<CaseAttributes>>;
   getComment(args: GetCommentArgs): Promise<SavedObject<CommentAttributes>>;
@@ -96,6 +113,7 @@ export interface CaseServiceSetup {
   patchCase(args: PatchCaseArgs): Promise<SavedObjectsUpdateResponse<CaseAttributes>>;
   patchCases(args: PatchCasesArgs): Promise<SavedObjectsBulkUpdateResponse<CaseAttributes>>;
   patchComment(args: UpdateCommentArgs): Promise<SavedObjectsUpdateResponse<CommentAttributes>>;
+  patchComments(args: PatchComments): Promise<SavedObjectsBulkUpdateResponse<CommentAttributes>>;
 }
 
 export class CaseService {
@@ -157,7 +175,7 @@ export class CaseService {
         throw error;
       }
     },
-    getAllCaseComments: async ({ client, caseId, options }: GetCommentsArgs) => {
+    getAllCaseComments: async ({ client, caseId, options }: FindCommentsArgs) => {
       try {
         this.log.debug(`Attempting to GET all comments for case ${caseId}`);
         return await client.find({
@@ -261,5 +279,25 @@ export class CaseService {
         throw error;
       }
     },
+    patchComments: async ({ client, comments }: PatchComments) => {
+      try {
+        this.log.debug(
+          `Attempting to UPDATE comments ${comments.map(c => c.commentId).join(', ')}`
+        );
+        return await client.bulkUpdate(
+          comments.map(c => ({
+            type: CASE_COMMENT_SAVED_OBJECT,
+            id: c.commentId,
+            attributes: c.updatedAttributes,
+            version: c.version,
+          }))
+        );
+      } catch (error) {
+        this.log.debug(
+          `Error on UPDATE comments ${comments.map(c => c.commentId).join(', ')}: ${error}`
+        );
+        throw error;
+      }
+    },
   });
 }
diff --git a/x-pack/plugins/case/server/services/user_actions/helpers.ts b/x-pack/plugins/case/server/services/user_actions/helpers.ts
new file mode 100644
index 0000000000000..59d193f0f30d5
--- /dev/null
+++ b/x-pack/plugins/case/server/services/user_actions/helpers.ts
@@ -0,0 +1,195 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { SavedObject, SavedObjectsUpdateResponse } from 'kibana/server';
+import { get } from 'lodash';
+
+import {
+  CaseUserActionAttributes,
+  UserAction,
+  UserActionField,
+  CaseAttributes,
+  User,
+} from '../../../common/api';
+import { isTwoArraysDifference } from '../../routes/api/cases/helpers';
+import { UserActionItem } from '.';
+import { CASE_SAVED_OBJECT, CASE_COMMENT_SAVED_OBJECT } from '../../saved_object_types';
+
+export const transformNewUserAction = ({
+  actionField,
+  action,
+  actionAt,
+  email,
+  full_name,
+  newValue = null,
+  oldValue = null,
+  username,
+}: {
+  actionField: UserActionField;
+  action: UserAction;
+  actionAt: string;
+  email?: string;
+  full_name?: string;
+  newValue?: string | null;
+  oldValue?: string | null;
+  username: string;
+}): CaseUserActionAttributes => ({
+  action_field: actionField,
+  action,
+  action_at: actionAt,
+  action_by: { email, full_name, username },
+  new_value: newValue,
+  old_value: oldValue,
+});
+
+interface BuildCaseUserAction {
+  action: UserAction;
+  actionAt: string;
+  actionBy: User;
+  caseId: string;
+  fields: UserActionField | unknown[];
+  newValue?: string | unknown;
+  oldValue?: string | unknown;
+}
+
+interface BuildCommentUserActionItem extends BuildCaseUserAction {
+  commentId: string;
+}
+
+export const buildCommentUserActionItem = ({
+  action,
+  actionAt,
+  actionBy,
+  caseId,
+  commentId,
+  fields,
+  newValue,
+  oldValue,
+}: BuildCommentUserActionItem): UserActionItem => ({
+  attributes: transformNewUserAction({
+    actionField: fields as UserActionField,
+    action,
+    actionAt,
+    ...actionBy,
+    newValue: newValue as string,
+    oldValue: oldValue as string,
+  }),
+  references: [
+    {
+      type: CASE_SAVED_OBJECT,
+      name: `associated-${CASE_SAVED_OBJECT}`,
+      id: caseId,
+    },
+    {
+      type: CASE_COMMENT_SAVED_OBJECT,
+      name: `associated-${CASE_COMMENT_SAVED_OBJECT}`,
+      id: commentId,
+    },
+  ],
+});
+
+export const buildCaseUserActionItem = ({
+  action,
+  actionAt,
+  actionBy,
+  caseId,
+  fields,
+  newValue,
+  oldValue,
+}: BuildCaseUserAction): UserActionItem => ({
+  attributes: transformNewUserAction({
+    actionField: fields as UserActionField,
+    action,
+    actionAt,
+    ...actionBy,
+    newValue: newValue as string,
+    oldValue: oldValue as string,
+  }),
+  references: [
+    {
+      type: CASE_SAVED_OBJECT,
+      name: `associated-${CASE_SAVED_OBJECT}`,
+      id: caseId,
+    },
+  ],
+});
+
+const userActionFieldsAllowed: UserActionField = [
+  'comment',
+  'description',
+  'tags',
+  'title',
+  'status',
+];
+
+export const buildCaseUserActions = ({
+  actionDate,
+  actionBy,
+  originalCases,
+  updatedCases,
+}: {
+  actionDate: string;
+  actionBy: User;
+  originalCases: Array<SavedObject<CaseAttributes>>;
+  updatedCases: Array<SavedObjectsUpdateResponse<CaseAttributes>>;
+}): UserActionItem[] =>
+  updatedCases.reduce<UserActionItem[]>((acc, updatedItem) => {
+    const originalItem = originalCases.find(oItem => oItem.id === updatedItem.id);
+    if (originalItem != null) {
+      let userActions: UserActionItem[] = [];
+      const updatedFields = Object.keys(updatedItem.attributes) as UserActionField;
+      updatedFields.forEach(field => {
+        if (userActionFieldsAllowed.includes(field)) {
+          const origValue = get(originalItem, ['attributes', field]);
+          const updatedValue = get(updatedItem, ['attributes', field]);
+          const compareValues = isTwoArraysDifference(origValue, updatedValue);
+          if (compareValues != null) {
+            if (compareValues.addedItems.length > 0) {
+              userActions = [
+                ...userActions,
+                buildCaseUserActionItem({
+                  action: 'add',
+                  actionAt: actionDate,
+                  actionBy,
+                  caseId: updatedItem.id,
+                  fields: [field],
+                  newValue: compareValues.addedItems.join(', '),
+                }),
+              ];
+            }
+            if (compareValues.deletedItems.length > 0) {
+              userActions = [
+                ...userActions,
+                buildCaseUserActionItem({
+                  action: 'delete',
+                  actionAt: actionDate,
+                  actionBy,
+                  caseId: updatedItem.id,
+                  fields: [field],
+                  newValue: compareValues.deletedItems.join(', '),
+                }),
+              ];
+            }
+          } else if (origValue !== updatedValue) {
+            userActions = [
+              ...userActions,
+              buildCaseUserActionItem({
+                action: 'update',
+                actionAt: actionDate,
+                actionBy,
+                caseId: updatedItem.id,
+                fields: [field],
+                newValue: updatedValue,
+                oldValue: origValue,
+              }),
+            ];
+          }
+        }
+      });
+      return [...acc, ...userActions];
+    }
+    return acc;
+  }, []);
diff --git a/x-pack/plugins/case/server/services/user_actions/index.ts b/x-pack/plugins/case/server/services/user_actions/index.ts
new file mode 100644
index 0000000000000..0e9babf9d81af
--- /dev/null
+++ b/x-pack/plugins/case/server/services/user_actions/index.ts
@@ -0,0 +1,77 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import {
+  SavedObjectsFindResponse,
+  Logger,
+  SavedObjectsBulkResponse,
+  SavedObjectReference,
+} from 'kibana/server';
+
+import { CaseUserActionAttributes } from '../../../common/api';
+import { CASE_USER_ACTION_SAVED_OBJECT, CASE_SAVED_OBJECT } from '../../saved_object_types';
+import { ClientArgs } from '..';
+
+interface GetCaseUserActionArgs extends ClientArgs {
+  caseId: string;
+}
+
+export interface UserActionItem {
+  attributes: CaseUserActionAttributes;
+  references: SavedObjectReference[];
+}
+
+interface PostCaseUserActionArgs extends ClientArgs {
+  actions: UserActionItem[];
+}
+
+export interface CaseUserActionServiceSetup {
+  getUserActions(
+    args: GetCaseUserActionArgs
+  ): Promise<SavedObjectsFindResponse<CaseUserActionAttributes>>;
+  postUserActions(
+    args: PostCaseUserActionArgs
+  ): Promise<SavedObjectsBulkResponse<CaseUserActionAttributes>>;
+}
+
+export class CaseUserActionService {
+  constructor(private readonly log: Logger) {}
+  public setup = async (): Promise<CaseUserActionServiceSetup> => ({
+    getUserActions: async ({ client, caseId }: GetCaseUserActionArgs) => {
+      try {
+        const caseUserActionInfo = await client.find({
+          type: CASE_USER_ACTION_SAVED_OBJECT,
+          fields: [],
+          hasReference: { type: CASE_SAVED_OBJECT, id: caseId },
+          page: 1,
+          perPage: 1,
+        });
+        return await client.find({
+          type: CASE_USER_ACTION_SAVED_OBJECT,
+          hasReference: { type: CASE_SAVED_OBJECT, id: caseId },
+          page: 1,
+          perPage: caseUserActionInfo.total,
+          sortField: 'action_at',
+          sortOrder: 'asc',
+        });
+      } catch (error) {
+        this.log.debug(`Error on GET case user action: ${error}`);
+        throw error;
+      }
+    },
+    postUserActions: async ({ client, actions }: PostCaseUserActionArgs) => {
+      try {
+        this.log.debug(`Attempting to POST a new case user action`);
+        return await client.bulkCreate(
+          actions.map(action => ({ type: CASE_USER_ACTION_SAVED_OBJECT, ...action }))
+        );
+      } catch (error) {
+        this.log.debug(`Error on POST a new case user action: ${error}`);
+        throw error;
+      }
+    },
+  });
+}

From 35b222a8401b4c429fc6eb0fb847ecb65f571cca Mon Sep 17 00:00:00 2001
From: Tiago Costa <tiagoffcc@hotmail.com>
Date: Tue, 24 Mar 2020 02:56:04 +0000
Subject: [PATCH 053/179] fix(NA): log rotation watchers usage (#60956)

* fix(NA): log rotation watchers usage

* docs(NA): add old value to the example

* chore(NA): change warning messages
---
 docs/setup/settings.asciidoc                     |  4 ++--
 src/legacy/server/config/schema.js               |  4 ++--
 .../server/logging/rotate/log_rotator.test.ts    | 10 ++++++----
 src/legacy/server/logging/rotate/log_rotator.ts  | 16 +++++++++++++---
 4 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/docs/setup/settings.asciidoc b/docs/setup/settings.asciidoc
index 71bb7b81ea420..a72c15190840a 100644
--- a/docs/setup/settings.asciidoc
+++ b/docs/setup/settings.asciidoc
@@ -193,7 +193,7 @@ that feature would not take any effect.
 
 `logging.rotate.everyBytes:`:: [experimental] *Default: 10485760* The maximum size of a log file (that is `not an exact` limit). After the
 limit is reached, a new log file is generated. The default size limit is 10485760 (10 MB) and
-this option should be in the range of 102400 (100KB) to 1073741824 (1GB).
+this option should be in the range of 1048576 (1 MB) to 1073741824 (1 GB).
 
 `logging.rotate.keepFiles:`:: [experimental] *Default: 7* The number of most recent rotated log files to keep
 on disk. Older files are deleted during log rotation. The default value is 7. The `logging.rotate.keepFiles`
@@ -203,7 +203,7 @@ option has to be in the range of 2 to 1024 files.
 the `logging.rotate.usePolling` is enabled. That option has to be in the range of 5000 to 3600000 milliseconds.
 
 `logging.rotate.usePolling:`:: [experimental] *Default: false* By default we try to understand the best way to monitoring
-the log file. However, there is some systems where it could not be always accurate. In those cases, if needed,
+the log file and warning about it. Please be aware there are some systems where watch api is not accurate. In those cases, in order to get the feature working,
 the `polling` method could be used enabling that option.
 
 `logging.silent:`:: *Default: false* Set the value of this setting to `true` to
diff --git a/src/legacy/server/config/schema.js b/src/legacy/server/config/schema.js
index a24ffcbaaa49f..769d9ba311281 100644
--- a/src/legacy/server/config/schema.js
+++ b/src/legacy/server/config/schema.js
@@ -133,8 +133,8 @@ export default () =>
           .keys({
             enabled: Joi.boolean().default(false),
             everyBytes: Joi.number()
-              // > 100KB
-              .greater(102399)
+              // > 1MB
+              .greater(1048576)
               // < 1GB
               .less(1073741825)
               // 10MB
diff --git a/src/legacy/server/logging/rotate/log_rotator.test.ts b/src/legacy/server/logging/rotate/log_rotator.test.ts
index c2100546364d4..70842d42f5e1f 100644
--- a/src/legacy/server/logging/rotate/log_rotator.test.ts
+++ b/src/legacy/server/logging/rotate/log_rotator.test.ts
@@ -204,8 +204,8 @@ describe('LogRotator', () => {
     expect(logRotator.running).toBe(true);
     expect(logRotator.usePolling).toBe(false);
 
-    const usePolling = await logRotator._shouldUsePolling();
-    expect(usePolling).toBe(false);
+    const shouldUsePolling = await logRotator._shouldUsePolling();
+    expect(shouldUsePolling).toBe(false);
 
     await logRotator.stop();
   });
@@ -231,7 +231,8 @@ describe('LogRotator', () => {
     await logRotator.start();
 
     expect(logRotator.running).toBe(true);
-    expect(logRotator.usePolling).toBe(true);
+    expect(logRotator.usePolling).toBe(false);
+    expect(logRotator.shouldUsePolling).toBe(true);
 
     await logRotator.stop();
   });
@@ -257,7 +258,8 @@ describe('LogRotator', () => {
     await logRotator.start();
 
     expect(logRotator.running).toBe(true);
-    expect(logRotator.usePolling).toBe(true);
+    expect(logRotator.usePolling).toBe(false);
+    expect(logRotator.shouldUsePolling).toBe(true);
 
     await logRotator.stop();
     jest.useRealTimers();
diff --git a/src/legacy/server/logging/rotate/log_rotator.ts b/src/legacy/server/logging/rotate/log_rotator.ts
index 3662910ca5a7b..eeb91fd0f2636 100644
--- a/src/legacy/server/logging/rotate/log_rotator.ts
+++ b/src/legacy/server/logging/rotate/log_rotator.ts
@@ -50,6 +50,7 @@ export class LogRotator {
   public usePolling: boolean;
   public pollingInterval: number;
   private stalkerUsePollingPolicyTestTimeout: NodeJS.Timeout | null;
+  public shouldUsePolling: boolean;
 
   constructor(config: KibanaConfig, server: Server) {
     this.config = config;
@@ -64,6 +65,7 @@ export class LogRotator {
     this.stalker = null;
     this.usePolling = config.get('logging.rotate.usePolling');
     this.pollingInterval = config.get('logging.rotate.pollingInterval');
+    this.shouldUsePolling = false;
     this.stalkerUsePollingPolicyTestTimeout = null;
   }
 
@@ -150,12 +152,20 @@ export class LogRotator {
   }
 
   async _startLogFileSizeMonitor() {
-    this.usePolling = await this._shouldUsePolling();
+    this.usePolling = this.config.get('logging.rotate.usePolling');
+    this.shouldUsePolling = await this._shouldUsePolling();
 
-    if (this.usePolling && this.usePolling !== this.config.get('logging.rotate.usePolling')) {
+    if (this.usePolling && !this.shouldUsePolling) {
       this.log(
         ['warning', 'logging:rotate'],
-        'The current environment does not support `fs.watch`. Falling back to polling using `fs.watchFile`'
+        'Looks like your current environment support a faster algorithm then polling. You can try to disable `usePolling`'
+      );
+    }
+
+    if (!this.usePolling && this.shouldUsePolling) {
+      this.log(
+        ['error', 'logging:rotate'],
+        'Looks like within your current environment you need to use polling in order to enable log rotator. Please enable `usePolling`'
       );
     }
 

From 6de7f2a62b2b078b703bbe6f18475909e1224f57 Mon Sep 17 00:00:00 2001
From: spalger <spalger@users.noreply.github.com>
Date: Mon, 23 Mar 2020 22:26:15 -0700
Subject: [PATCH 054/179] Revert "[APM] Collect telemetry about data/API
 performance (#51612)"

This reverts commit 13baa5156151af258249afc6468f15b53fffeee0.
---
 src/dev/run_check_lockfile_symlinks.js        |   2 -
 x-pack/legacy/plugins/apm/index.ts            |  19 +-
 x-pack/legacy/plugins/apm/mappings.json       | 773 +-----------------
 x-pack/legacy/plugins/apm/scripts/.gitignore  |   1 -
 .../legacy/plugins/apm/scripts/package.json   |  10 -
 .../apm/scripts/setup-kibana-security.js      |   1 -
 .../apm/scripts/upload-telemetry-data.js      |  21 -
 .../download-telemetry-template.ts            |  26 -
 .../generate-sample-documents.ts              | 124 ---
 .../scripts/upload-telemetry-data/index.ts    | 208 -----
 .../elasticsearch_fieldnames.test.ts.snap     |  48 +-
 x-pack/plugins/apm/common/agent_name.ts       |  44 +-
 .../apm/common/apm_saved_object_constants.ts  |  10 +-
 .../common/elasticsearch_fieldnames.test.ts   |  15 +-
 .../apm/common/elasticsearch_fieldnames.ts    |  11 +-
 x-pack/plugins/apm/kibana.json                |   7 +-
 x-pack/plugins/apm/server/index.ts            |   6 +-
 .../lib/apm_telemetry/__test__/index.test.ts  |  83 ++
 .../collect_data_telemetry/index.ts           |  77 --
 .../collect_data_telemetry/tasks.ts           | 725 ----------------
 .../apm/server/lib/apm_telemetry/index.ts     | 155 +---
 .../apm/server/lib/apm_telemetry/types.ts     | 118 ---
 .../server/lib/helpers/setup_request.test.ts  |  13 -
 x-pack/plugins/apm/server/plugin.ts           |  37 +-
 .../server/routes/create_api/index.test.ts    |   1 -
 x-pack/plugins/apm/server/routes/services.ts  |  16 +
 .../apm/typings/elasticsearch/aggregations.ts |  26 +-
 .../apm/typings/es_schemas/raw/error_raw.ts   |   2 -
 .../typings/es_schemas/raw/fields/observer.ts |  10 -
 .../apm/typings/es_schemas/raw/span_raw.ts    |   2 -
 .../typings/es_schemas/raw/transaction_raw.ts |   2 -
 31 files changed, 206 insertions(+), 2387 deletions(-)
 delete mode 100644 x-pack/legacy/plugins/apm/scripts/.gitignore
 delete mode 100644 x-pack/legacy/plugins/apm/scripts/package.json
 delete mode 100644 x-pack/legacy/plugins/apm/scripts/upload-telemetry-data.js
 delete mode 100644 x-pack/legacy/plugins/apm/scripts/upload-telemetry-data/download-telemetry-template.ts
 delete mode 100644 x-pack/legacy/plugins/apm/scripts/upload-telemetry-data/generate-sample-documents.ts
 delete mode 100644 x-pack/legacy/plugins/apm/scripts/upload-telemetry-data/index.ts
 create mode 100644 x-pack/plugins/apm/server/lib/apm_telemetry/__test__/index.test.ts
 delete mode 100644 x-pack/plugins/apm/server/lib/apm_telemetry/collect_data_telemetry/index.ts
 delete mode 100644 x-pack/plugins/apm/server/lib/apm_telemetry/collect_data_telemetry/tasks.ts
 delete mode 100644 x-pack/plugins/apm/server/lib/apm_telemetry/types.ts
 delete mode 100644 x-pack/plugins/apm/typings/es_schemas/raw/fields/observer.ts

diff --git a/src/dev/run_check_lockfile_symlinks.js b/src/dev/run_check_lockfile_symlinks.js
index 6c6fc54638ee8..54a8cdf638a78 100644
--- a/src/dev/run_check_lockfile_symlinks.js
+++ b/src/dev/run_check_lockfile_symlinks.js
@@ -36,8 +36,6 @@ const IGNORE_FILE_GLOBS = [
   '**/*fixtures*/**/*',
   // cypress isn't used in production, ignore it
   'x-pack/legacy/plugins/apm/e2e/*',
-  // apm scripts aren't used in production, ignore them
-  'x-pack/legacy/plugins/apm/scripts/*',
 ];
 
 run(async ({ log }) => {
diff --git a/x-pack/legacy/plugins/apm/index.ts b/x-pack/legacy/plugins/apm/index.ts
index 594e8a4a7af72..0107997f233fe 100644
--- a/x-pack/legacy/plugins/apm/index.ts
+++ b/x-pack/legacy/plugins/apm/index.ts
@@ -14,13 +14,7 @@ import mappings from './mappings.json';
 
 export const apm: LegacyPluginInitializer = kibana => {
   return new kibana.Plugin({
-    require: [
-      'kibana',
-      'elasticsearch',
-      'xpack_main',
-      'apm_oss',
-      'task_manager'
-    ],
+    require: ['kibana', 'elasticsearch', 'xpack_main', 'apm_oss'],
     id: 'apm',
     configPrefix: 'xpack.apm',
     publicDir: resolve(__dirname, 'public'),
@@ -77,10 +71,7 @@ export const apm: LegacyPluginInitializer = kibana => {
         autocreateApmIndexPattern: Joi.boolean().default(true),
 
         // service map
-        serviceMapEnabled: Joi.boolean().default(true),
-
-        // telemetry
-        telemetryCollectionEnabled: Joi.boolean().default(true)
+        serviceMapEnabled: Joi.boolean().default(true)
       }).default();
     },
 
@@ -116,12 +107,10 @@ export const apm: LegacyPluginInitializer = kibana => {
           }
         }
       });
+
       const apmPlugin = server.newPlatform.setup.plugins
         .apm as APMPluginContract;
-
-      apmPlugin.registerLegacyAPI({
-        server
-      });
+      apmPlugin.registerLegacyAPI({ server });
     }
   });
 };
diff --git a/x-pack/legacy/plugins/apm/mappings.json b/x-pack/legacy/plugins/apm/mappings.json
index ba4c7a89ceaa8..61bc90da28756 100644
--- a/x-pack/legacy/plugins/apm/mappings.json
+++ b/x-pack/legacy/plugins/apm/mappings.json
@@ -1,659 +1,20 @@
 {
-  "apm-telemetry": {
+  "apm-services-telemetry": {
     "properties": {
-      "agents": {
-        "properties": {
-          "dotnet": {
-            "properties": {
-              "agent": {
-                "properties": {
-                  "version": {
-                    "type": "keyword",
-                    "ignore_above": 256
-                  }
-                }
-              },
-              "service": {
-                "properties": {
-                  "framework": {
-                    "properties": {
-                      "composite": {
-                        "type": "keyword",
-                        "ignore_above": 256
-                      },
-                      "name": {
-                        "type": "keyword",
-                        "ignore_above": 256
-                      },
-                      "version": {
-                        "type": "keyword",
-                        "ignore_above": 256
-                      }
-                    }
-                  },
-                  "language": {
-                    "properties": {
-                      "name": {
-                        "type": "keyword",
-                        "ignore_above": 256
-                      }
-                    }
-                  },
-                  "runtime": {
-                    "properties": {
-                      "composite": {
-                        "type": "keyword",
-                        "ignore_above": 256
-                      },
-                      "name": {
-                        "type": "keyword",
-                        "ignore_above": 256
-                      },
-                      "version": {
-                        "type": "keyword",
-                        "ignore_above": 256
-                      }
-                    }
-                  }
-                }
-              }
-            }
-          },
-          "go": {
-            "properties": {
-              "agent": {
-                "properties": {
-                  "version": {
-                    "type": "keyword",
-                    "ignore_above": 256
-                  }
-                }
-              },
-              "service": {
-                "properties": {
-                  "framework": {
-                    "properties": {
-                      "composite": {
-                        "type": "keyword",
-                        "ignore_above": 256
-                      },
-                      "name": {
-                        "type": "keyword",
-                        "ignore_above": 256
-                      },
-                      "version": {
-                        "type": "keyword",
-                        "ignore_above": 256
-                      }
-                    }
-                  },
-                  "language": {
-                    "properties": {
-                      "composite": {
-                        "type": "keyword",
-                        "ignore_above": 256
-                      },
-                      "name": {
-                        "type": "keyword",
-                        "ignore_above": 256
-                      },
-                      "version": {
-                        "type": "keyword",
-                        "ignore_above": 256
-                      }
-                    }
-                  },
-                  "runtime": {
-                    "properties": {
-                      "composite": {
-                        "type": "keyword",
-                        "ignore_above": 256
-                      },
-                      "name": {
-                        "type": "keyword",
-                        "ignore_above": 256
-                      },
-                      "version": {
-                        "type": "keyword",
-                        "ignore_above": 256
-                      }
-                    }
-                  }
-                }
-              }
-            }
-          },
-          "java": {
-            "properties": {
-              "agent": {
-                "properties": {
-                  "version": {
-                    "type": "keyword",
-                    "ignore_above": 256
-                  }
-                }
-              },
-              "service": {
-                "properties": {
-                  "framework": {
-                    "type": "object"
-                  },
-                  "language": {
-                    "properties": {
-                      "composite": {
-                        "type": "keyword",
-                        "ignore_above": 256
-                      },
-                      "name": {
-                        "type": "keyword",
-                        "ignore_above": 256
-                      },
-                      "version": {
-                        "type": "keyword",
-                        "ignore_above": 256
-                      }
-                    }
-                  },
-                  "runtime": {
-                    "properties": {
-                      "composite": {
-                        "type": "keyword",
-                        "ignore_above": 256
-                      },
-                      "name": {
-                        "type": "keyword",
-                        "ignore_above": 256
-                      },
-                      "version": {
-                        "type": "keyword",
-                        "ignore_above": 256
-                      }
-                    }
-                  }
-                }
-              }
-            }
-          },
-          "js-base": {
-            "properties": {
-              "agent": {
-                "properties": {
-                  "version": {
-                    "type": "keyword",
-                    "ignore_above": 256
-                  }
-                }
-              },
-              "service": {
-                "properties": {
-                  "framework": {
-                    "type": "object"
-                  },
-                  "language": {
-                    "properties": {
-                      "name": {
-                        "type": "keyword",
-                        "ignore_above": 256
-                      }
-                    }
-                  },
-                  "runtime": {
-                    "type": "object"
-                  }
-                }
-              }
-            }
-          },
-          "nodejs": {
-            "properties": {
-              "agent": {
-                "properties": {
-                  "version": {
-                    "type": "keyword",
-                    "ignore_above": 256
-                  }
-                }
-              },
-              "service": {
-                "properties": {
-                  "framework": {
-                    "properties": {
-                      "composite": {
-                        "type": "keyword",
-                        "ignore_above": 256
-                      },
-                      "name": {
-                        "type": "keyword",
-                        "ignore_above": 256
-                      },
-                      "version": {
-                        "type": "keyword",
-                        "ignore_above": 256
-                      }
-                    }
-                  },
-                  "language": {
-                    "properties": {
-                      "name": {
-                        "type": "keyword",
-                        "ignore_above": 256
-                      }
-                    }
-                  },
-                  "runtime": {
-                    "properties": {
-                      "composite": {
-                        "type": "keyword",
-                        "ignore_above": 256
-                      },
-                      "name": {
-                        "type": "keyword",
-                        "ignore_above": 256
-                      },
-                      "version": {
-                        "type": "keyword",
-                        "ignore_above": 256
-                      }
-                    }
-                  }
-                }
-              }
-            }
-          },
-          "python": {
-            "properties": {
-              "agent": {
-                "properties": {
-                  "version": {
-                    "type": "keyword",
-                    "ignore_above": 256
-                  }
-                }
-              },
-              "service": {
-                "properties": {
-                  "framework": {
-                    "properties": {
-                      "composite": {
-                        "type": "keyword",
-                        "ignore_above": 256
-                      },
-                      "name": {
-                        "type": "keyword",
-                        "ignore_above": 256
-                      },
-                      "version": {
-                        "type": "keyword",
-                        "ignore_above": 256
-                      }
-                    }
-                  },
-                  "language": {
-                    "properties": {
-                      "composite": {
-                        "type": "keyword",
-                        "ignore_above": 256
-                      },
-                      "name": {
-                        "type": "keyword",
-                        "ignore_above": 256
-                      },
-                      "version": {
-                        "type": "keyword",
-                        "ignore_above": 256
-                      }
-                    }
-                  },
-                  "runtime": {
-                    "properties": {
-                      "composite": {
-                        "type": "keyword",
-                        "ignore_above": 256
-                      },
-                      "name": {
-                        "type": "keyword",
-                        "ignore_above": 256
-                      },
-                      "version": {
-                        "type": "keyword",
-                        "ignore_above": 256
-                      }
-                    }
-                  }
-                }
-              }
-            }
-          },
-          "ruby": {
-            "properties": {
-              "agent": {
-                "properties": {
-                  "version": {
-                    "type": "keyword",
-                    "ignore_above": 256
-                  }
-                }
-              },
-              "service": {
-                "properties": {
-                  "framework": {
-                    "properties": {
-                      "composite": {
-                        "type": "keyword",
-                        "ignore_above": 256
-                      },
-                      "name": {
-                        "type": "keyword",
-                        "ignore_above": 256
-                      },
-                      "version": {
-                        "type": "keyword",
-                        "ignore_above": 256
-                      }
-                    }
-                  },
-                  "language": {
-                    "properties": {
-                      "composite": {
-                        "type": "keyword",
-                        "ignore_above": 256
-                      },
-                      "name": {
-                        "type": "keyword",
-                        "ignore_above": 256
-                      },
-                      "version": {
-                        "type": "keyword",
-                        "ignore_above": 256
-                      }
-                    }
-                  },
-                  "runtime": {
-                    "properties": {
-                      "composite": {
-                        "type": "keyword",
-                        "ignore_above": 256
-                      },
-                      "name": {
-                        "type": "keyword",
-                        "ignore_above": 256
-                      },
-                      "version": {
-                        "type": "keyword",
-                        "ignore_above": 256
-                      }
-                    }
-                  }
-                }
-              }
-            }
-          },
-          "rum-js": {
-            "properties": {
-              "agent": {
-                "type": "object"
-              },
-              "service": {
-                "properties": {
-                  "framework": {
-                    "type": "object"
-                  },
-                  "language": {
-                    "type": "object"
-                  },
-                  "runtime": {
-                    "type": "object"
-                  }
-                }
-              }
-            }
-          }
-        }
-      },
-      "counts": {
-        "properties": {
-          "agent_configuration": {
-            "properties": {
-              "all": {
-                "type": "long"
-              }
-            }
-          },
-          "error": {
-            "properties": {
-              "1d": {
-                "type": "long"
-              },
-              "all": {
-                "type": "long"
-              }
-            }
-          },
-          "max_error_groups_per_service": {
-            "properties": {
-              "1d": {
-                "type": "long"
-              }
-            }
-          },
-          "max_transaction_groups_per_service": {
-            "properties": {
-              "1d": {
-                "type": "long"
-              }
-            }
-          },
-          "metric": {
-            "properties": {
-              "1d": {
-                "type": "long"
-              },
-              "all": {
-                "type": "long"
-              }
-            }
-          },
-          "onboarding": {
-            "properties": {
-              "1d": {
-                "type": "long"
-              },
-              "all": {
-                "type": "long"
-              }
-            }
-          },
-          "services": {
-            "properties": {
-              "1d": {
-                "type": "long"
-              }
-            }
-          },
-          "sourcemap": {
-            "properties": {
-              "1d": {
-                "type": "long"
-              },
-              "all": {
-                "type": "long"
-              }
-            }
-          },
-          "span": {
-            "properties": {
-              "1d": {
-                "type": "long"
-              },
-              "all": {
-                "type": "long"
-              }
-            }
-          },
-          "traces": {
-            "properties": {
-              "1d": {
-                "type": "long"
-              }
-            }
-          },
-          "transaction": {
-            "properties": {
-              "1d": {
-                "type": "long"
-              },
-              "all": {
-                "type": "long"
-              }
-            }
-          }
-        }
-      },
-      "cardinality": {
-        "properties": {
-          "user_agent": {
-            "properties": {
-              "original": {
-                "properties": {
-                  "all_agents": {
-                    "properties": {
-                      "1d": {
-                        "type": "long"
-                      }
-                    }
-                  },
-                  "rum": {
-                    "properties": {
-                      "1d": {
-                        "type": "long"
-                      }
-                    }
-                  }
-                }
-              }
-            }
-          },
-          "transaction": {
-            "properties": {
-              "name": {
-                "properties": {
-                  "all_agents": {
-                    "properties": {
-                      "1d": {
-                        "type": "long"
-                      }
-                    }
-                  },
-                  "rum": {
-                    "properties": {
-                      "1d": {
-                        "type": "long"
-                      }
-                    }
-                  }
-                }
-              }
-            }
-          }
-        }
-      },
       "has_any_services": {
         "type": "boolean"
       },
-      "indices": {
-        "properties": {
-          "all": {
-            "properties": {
-              "total": {
-                "properties": {
-                  "docs": {
-                    "properties": {
-                      "count": {
-                        "type": "long"
-                      }
-                    }
-                  },
-                  "store": {
-                    "properties": {
-                      "size_in_bytes": {
-                        "type": "long"
-                      }
-                    }
-                  }
-                }
-              }
-            }
-          },
-          "shards": {
-            "properties": {
-              "total": {
-                "type": "long"
-              }
-            }
-          }
-        }
-      },
-      "integrations": {
-        "properties": {
-          "ml": {
-            "properties": {
-              "all_jobs_count": {
-                "type": "long"
-              }
-            }
-          }
-        }
-      },
-      "retainment": {
-        "properties": {
-          "error": {
-            "properties": {
-              "ms": {
-                "type": "long"
-              }
-            }
-          },
-          "metric": {
-            "properties": {
-              "ms": {
-                "type": "long"
-              }
-            }
-          },
-          "onboarding": {
-            "properties": {
-              "ms": {
-                "type": "long"
-              }
-            }
-          },
-          "span": {
-            "properties": {
-              "ms": {
-                "type": "long"
-              }
-            }
-          },
-          "transaction": {
-            "properties": {
-              "ms": {
-                "type": "long"
-              }
-            }
-          }
-        }
-      },
       "services_per_agent": {
         "properties": {
-          "dotnet": {
+          "python": {
             "type": "long",
             "null_value": 0
           },
-          "go": {
+          "java": {
             "type": "long",
             "null_value": 0
           },
-          "java": {
+          "nodejs": {
             "type": "long",
             "null_value": 0
           },
@@ -661,11 +22,11 @@
             "type": "long",
             "null_value": 0
           },
-          "nodejs": {
+          "rum-js": {
             "type": "long",
             "null_value": 0
           },
-          "python": {
+          "dotnet": {
             "type": "long",
             "null_value": 0
           },
@@ -673,131 +34,11 @@
             "type": "long",
             "null_value": 0
           },
-          "rum-js": {
+          "go": {
             "type": "long",
             "null_value": 0
           }
         }
-      },
-      "tasks": {
-        "properties": {
-          "agent_configuration": {
-            "properties": {
-              "took": {
-                "properties": {
-                  "ms": {
-                    "type": "long"
-                  }
-                }
-              }
-            }
-          },
-          "agents": {
-            "properties": {
-              "took": {
-                "properties": {
-                  "ms": {
-                    "type": "long"
-                  }
-                }
-              }
-            }
-          },
-          "cardinality": {
-            "properties": {
-              "took": {
-                "properties": {
-                  "ms": {
-                    "type": "long"
-                  }
-                }
-              }
-            }
-          },
-          "groupings": {
-            "properties": {
-              "took": {
-                "properties": {
-                  "ms": {
-                    "type": "long"
-                  }
-                }
-              }
-            }
-          },
-          "indices_stats": {
-            "properties": {
-              "took": {
-                "properties": {
-                  "ms": {
-                    "type": "long"
-                  }
-                }
-              }
-            }
-          },
-          "integrations": {
-            "properties": {
-              "took": {
-                "properties": {
-                  "ms": {
-                    "type": "long"
-                  }
-                }
-              }
-            }
-          },
-          "processor_events": {
-            "properties": {
-              "took": {
-                "properties": {
-                  "ms": {
-                    "type": "long"
-                  }
-                }
-              }
-            }
-          },
-          "services": {
-            "properties": {
-              "took": {
-                "properties": {
-                  "ms": {
-                    "type": "long"
-                  }
-                }
-              }
-            }
-          },
-          "versions": {
-            "properties": {
-              "took": {
-                "properties": {
-                  "ms": {
-                    "type": "long"
-                  }
-                }
-              }
-            }
-          }
-        }
-      },
-      "version": {
-        "properties": {
-          "apm_server": {
-            "properties": {
-              "major": {
-                "type": "long"
-              },
-              "minor": {
-                "type": "long"
-              },
-              "patch": {
-                "type": "long"
-              }
-            }
-          }
-        }
       }
     }
   },
diff --git a/x-pack/legacy/plugins/apm/scripts/.gitignore b/x-pack/legacy/plugins/apm/scripts/.gitignore
deleted file mode 100644
index 8ee01d321b721..0000000000000
--- a/x-pack/legacy/plugins/apm/scripts/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-yarn.lock
diff --git a/x-pack/legacy/plugins/apm/scripts/package.json b/x-pack/legacy/plugins/apm/scripts/package.json
deleted file mode 100644
index 9121449c53619..0000000000000
--- a/x-pack/legacy/plugins/apm/scripts/package.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "name": "apm-scripts",
-  "version": "1.0.0",
-  "main": "index.js",
-  "license": "MIT",
-  "dependencies": {
-    "@octokit/rest": "^16.35.0",
-    "console-stamp": "^0.2.9"
-  }
-}
diff --git a/x-pack/legacy/plugins/apm/scripts/setup-kibana-security.js b/x-pack/legacy/plugins/apm/scripts/setup-kibana-security.js
index 61ba2fdc7f7e3..825c1a526fcc5 100644
--- a/x-pack/legacy/plugins/apm/scripts/setup-kibana-security.js
+++ b/x-pack/legacy/plugins/apm/scripts/setup-kibana-security.js
@@ -16,7 +16,6 @@
  ******************************/
 
 // compile typescript on the fly
-// eslint-disable-next-line import/no-extraneous-dependencies
 require('@babel/register')({
   extensions: ['.ts'],
   plugins: ['@babel/plugin-proposal-optional-chaining'],
diff --git a/x-pack/legacy/plugins/apm/scripts/upload-telemetry-data.js b/x-pack/legacy/plugins/apm/scripts/upload-telemetry-data.js
deleted file mode 100644
index a99651c62dd7a..0000000000000
--- a/x-pack/legacy/plugins/apm/scripts/upload-telemetry-data.js
+++ /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.
- */
-
-// compile typescript on the fly
-// eslint-disable-next-line import/no-extraneous-dependencies
-require('@babel/register')({
-  extensions: ['.ts'],
-  plugins: [
-    '@babel/plugin-proposal-optional-chaining',
-    '@babel/plugin-proposal-nullish-coalescing-operator'
-  ],
-  presets: [
-    '@babel/typescript',
-    ['@babel/preset-env', { targets: { node: 'current' } }]
-  ]
-});
-
-require('./upload-telemetry-data/index.ts');
diff --git a/x-pack/legacy/plugins/apm/scripts/upload-telemetry-data/download-telemetry-template.ts b/x-pack/legacy/plugins/apm/scripts/upload-telemetry-data/download-telemetry-template.ts
deleted file mode 100644
index dfed9223ef708..0000000000000
--- a/x-pack/legacy/plugins/apm/scripts/upload-telemetry-data/download-telemetry-template.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-// @ts-ignore
-import { Octokit } from '@octokit/rest';
-
-export async function downloadTelemetryTemplate(octokit: Octokit) {
-  const file = await octokit.repos.getContents({
-    owner: 'elastic',
-    repo: 'telemetry',
-    path: 'config/templates/xpack-phone-home.json',
-    // @ts-ignore
-    mediaType: {
-      format: 'application/vnd.github.VERSION.raw'
-    }
-  });
-
-  if (Array.isArray(file.data)) {
-    throw new Error('Expected single response, got array');
-  }
-
-  return JSON.parse(Buffer.from(file.data.content!, 'base64').toString());
-}
diff --git a/x-pack/legacy/plugins/apm/scripts/upload-telemetry-data/generate-sample-documents.ts b/x-pack/legacy/plugins/apm/scripts/upload-telemetry-data/generate-sample-documents.ts
deleted file mode 100644
index 8d76063a7fdf6..0000000000000
--- a/x-pack/legacy/plugins/apm/scripts/upload-telemetry-data/generate-sample-documents.ts
+++ /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 { DeepPartial } from 'utility-types';
-import {
-  merge,
-  omit,
-  defaultsDeep,
-  range,
-  mapValues,
-  isPlainObject,
-  flatten
-} from 'lodash';
-import uuid from 'uuid';
-import {
-  CollectTelemetryParams,
-  collectDataTelemetry
-  // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-} from '../../../../../plugins/apm/server/lib/apm_telemetry/collect_data_telemetry';
-
-interface GenerateOptions {
-  days: number;
-  instances: number;
-  variation: {
-    min: number;
-    max: number;
-  };
-}
-
-const randomize = (
-  value: unknown,
-  instanceVariation: number,
-  dailyGrowth: number
-) => {
-  if (typeof value === 'boolean') {
-    return Math.random() > 0.5;
-  }
-  if (typeof value === 'number') {
-    return Math.round(instanceVariation * dailyGrowth * value);
-  }
-  return value;
-};
-
-const mapValuesDeep = (
-  obj: Record<string, any>,
-  iterator: (value: unknown, key: string, obj: Record<string, any>) => unknown
-): Record<string, any> =>
-  mapValues(obj, (val, key) =>
-    isPlainObject(val) ? mapValuesDeep(val, iterator) : iterator(val, key!, obj)
-  );
-
-export async function generateSampleDocuments(
-  options: DeepPartial<GenerateOptions> & {
-    collectTelemetryParams: CollectTelemetryParams;
-  }
-) {
-  const { collectTelemetryParams, ...preferredOptions } = options;
-
-  const opts: GenerateOptions = defaultsDeep(
-    {
-      days: 100,
-      instances: 50,
-      variation: {
-        min: 0.1,
-        max: 4
-      }
-    },
-    preferredOptions
-  );
-
-  const sample = await collectDataTelemetry(collectTelemetryParams);
-
-  console.log('Collected telemetry'); // eslint-disable-line no-console
-  console.log('\n' + JSON.stringify(sample, null, 2)); // eslint-disable-line no-console
-
-  const dateOfScriptExecution = new Date();
-
-  return flatten(
-    range(0, opts.instances).map(instanceNo => {
-      const instanceId = uuid.v4();
-      const defaults = {
-        cluster_uuid: instanceId,
-        stack_stats: {
-          kibana: {
-            versions: {
-              version: '8.0.0'
-            }
-          }
-        }
-      };
-
-      const instanceVariation =
-        Math.random() * (opts.variation.max - opts.variation.min) +
-        opts.variation.min;
-
-      return range(0, opts.days).map(dayNo => {
-        const dailyGrowth = Math.pow(1.005, opts.days - 1 - dayNo);
-
-        const timestamp = Date.UTC(
-          dateOfScriptExecution.getFullYear(),
-          dateOfScriptExecution.getMonth(),
-          -dayNo
-        );
-
-        const generated = mapValuesDeep(omit(sample, 'versions'), value =>
-          randomize(value, instanceVariation, dailyGrowth)
-        );
-
-        return merge({}, defaults, {
-          timestamp,
-          stack_stats: {
-            kibana: {
-              plugins: {
-                apm: merge({}, sample, generated)
-              }
-            }
-          }
-        });
-      });
-    })
-  );
-}
diff --git a/x-pack/legacy/plugins/apm/scripts/upload-telemetry-data/index.ts b/x-pack/legacy/plugins/apm/scripts/upload-telemetry-data/index.ts
deleted file mode 100644
index bdc57eac412fc..0000000000000
--- a/x-pack/legacy/plugins/apm/scripts/upload-telemetry-data/index.ts
+++ /dev/null
@@ -1,208 +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.
- */
-
-// This script downloads the telemetry mapping, runs the APM telemetry tasks,
-// generates a bunch of randomized data based on the downloaded sample,
-// and uploads it to a cluster of your choosing in the same format as it is
-// stored in the telemetry cluster. Its purpose is twofold:
-// - Easier testing of the telemetry tasks
-// - Validate whether we can run the queries we want to on the telemetry data
-
-import fs from 'fs';
-import path from 'path';
-// @ts-ignore
-import { Octokit } from '@octokit/rest';
-import { merge, chunk, flatten, pick, identity } from 'lodash';
-import axios from 'axios';
-import yaml from 'js-yaml';
-import { Client } from 'elasticsearch';
-import { argv } from 'yargs';
-import { promisify } from 'util';
-import { Logger } from 'kibana/server';
-// @ts-ignore
-import consoleStamp from 'console-stamp';
-// eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { CollectTelemetryParams } from '../../../../../plugins/apm/server/lib/apm_telemetry/collect_data_telemetry';
-import { downloadTelemetryTemplate } from './download-telemetry-template';
-import mapping from '../../mappings.json';
-import { generateSampleDocuments } from './generate-sample-documents';
-
-consoleStamp(console, '[HH:MM:ss.l]');
-
-const githubToken = process.env.GITHUB_TOKEN;
-
-if (!githubToken) {
-  throw new Error('GITHUB_TOKEN was not provided.');
-}
-
-const kibanaConfigDir = path.join(__filename, '../../../../../../../config');
-const kibanaDevConfig = path.join(kibanaConfigDir, 'kibana.dev.yml');
-const kibanaConfig = path.join(kibanaConfigDir, 'kibana.yml');
-
-const xpackTelemetryIndexName = 'xpack-phone-home';
-
-const loadedKibanaConfig = (yaml.safeLoad(
-  fs.readFileSync(
-    fs.existsSync(kibanaDevConfig) ? kibanaDevConfig : kibanaConfig,
-    'utf8'
-  )
-) || {}) as {};
-
-const cliEsCredentials = pick(
-  {
-    'elasticsearch.username': process.env.ELASTICSEARCH_USERNAME,
-    'elasticsearch.password': process.env.ELASTICSEARCH_PASSWORD,
-    'elasticsearch.hosts': process.env.ELASTICSEARCH_HOST
-  },
-  identity
-) as {
-  'elasticsearch.username': string;
-  'elasticsearch.password': string;
-  'elasticsearch.hosts': string;
-};
-
-const config = {
-  'apm_oss.transactionIndices': 'apm-*',
-  'apm_oss.metricsIndices': 'apm-*',
-  'apm_oss.errorIndices': 'apm-*',
-  'apm_oss.spanIndices': 'apm-*',
-  'apm_oss.onboardingIndices': 'apm-*',
-  'apm_oss.sourcemapIndices': 'apm-*',
-  'elasticsearch.hosts': 'http://localhost:9200',
-  ...loadedKibanaConfig,
-  ...cliEsCredentials
-};
-
-async function uploadData() {
-  const octokit = new Octokit({
-    auth: githubToken
-  });
-
-  const telemetryTemplate = await downloadTelemetryTemplate(octokit);
-
-  const kibanaMapping = mapping['apm-telemetry'];
-
-  const httpAuth =
-    config['elasticsearch.username'] && config['elasticsearch.password']
-      ? {
-          username: config['elasticsearch.username'],
-          password: config['elasticsearch.password']
-        }
-      : null;
-
-  const client = new Client({
-    host: config['elasticsearch.hosts'],
-    ...(httpAuth
-      ? {
-          httpAuth: `${httpAuth.username}:${httpAuth.password}`
-        }
-      : {})
-  });
-
-  if (argv.clear) {
-    try {
-      await promisify(client.indices.delete.bind(client))({
-        index: xpackTelemetryIndexName
-      });
-    } catch (err) {
-      // 404 = index not found, totally okay
-      if (err.status !== 404) {
-        throw err;
-      }
-    }
-  }
-
-  const axiosInstance = axios.create({
-    baseURL: config['elasticsearch.hosts'],
-    ...(httpAuth ? { auth: httpAuth } : {})
-  });
-
-  const newTemplate = merge(telemetryTemplate, {
-    settings: {
-      index: { mapping: { total_fields: { limit: 10000 } } }
-    }
-  });
-
-  // override apm mapping instead of merging
-  newTemplate.mappings.properties.stack_stats.properties.kibana.properties.plugins.properties.apm = kibanaMapping;
-
-  await axiosInstance.put(`/_template/xpack-phone-home`, newTemplate);
-
-  const sampleDocuments = await generateSampleDocuments({
-    collectTelemetryParams: {
-      logger: (console as unknown) as Logger,
-      indices: {
-        ...config,
-        apmCustomLinkIndex: '.apm-custom-links',
-        apmAgentConfigurationIndex: '.apm-agent-configuration'
-      },
-      search: body => {
-        return promisify(client.search.bind(client))({
-          ...body,
-          requestTimeout: 120000
-        }) as any;
-      },
-      indicesStats: body => {
-        return promisify(client.indices.stats.bind(client))({
-          ...body,
-          requestTimeout: 120000
-        }) as any;
-      },
-      transportRequest: (params => {
-        return axiosInstance[params.method](params.path);
-      }) as CollectTelemetryParams['transportRequest']
-    }
-  });
-
-  const chunks = chunk(sampleDocuments, 250);
-
-  await chunks.reduce<Promise<any>>((prev, documents) => {
-    return prev.then(async () => {
-      const body = flatten(
-        documents.map(doc => [{ index: { _index: 'xpack-phone-home' } }, doc])
-      );
-
-      return promisify(client.bulk.bind(client))({
-        body,
-        refresh: true
-      }).then((response: any) => {
-        if (response.errors) {
-          const firstError = response.items.filter(
-            (item: any) => item.index.status >= 400
-          )[0].index.error;
-          throw new Error(`Failed to upload documents: ${firstError.reason} `);
-        }
-      });
-    });
-  }, Promise.resolve());
-}
-
-uploadData()
-  .catch(e => {
-    if ('response' in e) {
-      if (typeof e.response === 'string') {
-        // eslint-disable-next-line no-console
-        console.log(e.response);
-      } else {
-        // eslint-disable-next-line no-console
-        console.log(
-          JSON.stringify(
-            e.response,
-            ['status', 'statusText', 'headers', 'data'],
-            2
-          )
-        );
-      }
-    } else {
-      // eslint-disable-next-line no-console
-      console.log(e);
-    }
-    process.exit(1);
-  })
-  .then(() => {
-    // eslint-disable-next-line no-console
-    console.log('Finished uploading generated telemetry data');
-  });
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 5de82a9ee8788..897d4e979fce3 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
@@ -2,8 +2,6 @@
 
 exports[`Error AGENT_NAME 1`] = `"java"`;
 
-exports[`Error AGENT_VERSION 1`] = `"agent version"`;
-
 exports[`Error CLIENT_GEO_COUNTRY_ISO_CODE 1`] = `undefined`;
 
 exports[`Error CONTAINER_ID 1`] = `undefined`;
@@ -58,7 +56,7 @@ exports[`Error METRIC_SYSTEM_TOTAL_MEMORY 1`] = `undefined`;
 
 exports[`Error OBSERVER_LISTENING 1`] = `undefined`;
 
-exports[`Error OBSERVER_VERSION_MAJOR 1`] = `8`;
+exports[`Error OBSERVER_VERSION_MAJOR 1`] = `undefined`;
 
 exports[`Error PARENT_ID 1`] = `"parentId"`;
 
@@ -70,20 +68,10 @@ exports[`Error SERVICE_ENVIRONMENT 1`] = `undefined`;
 
 exports[`Error SERVICE_FRAMEWORK_NAME 1`] = `undefined`;
 
-exports[`Error SERVICE_FRAMEWORK_VERSION 1`] = `undefined`;
-
-exports[`Error SERVICE_LANGUAGE_NAME 1`] = `"nodejs"`;
-
-exports[`Error SERVICE_LANGUAGE_VERSION 1`] = `"v1337"`;
-
 exports[`Error SERVICE_NAME 1`] = `"service name"`;
 
 exports[`Error SERVICE_NODE_NAME 1`] = `undefined`;
 
-exports[`Error SERVICE_RUNTIME_NAME 1`] = `undefined`;
-
-exports[`Error SERVICE_RUNTIME_VERSION 1`] = `undefined`;
-
 exports[`Error SERVICE_VERSION 1`] = `undefined`;
 
 exports[`Error SPAN_ACTION 1`] = `undefined`;
@@ -124,14 +112,10 @@ exports[`Error URL_FULL 1`] = `undefined`;
 
 exports[`Error USER_AGENT_NAME 1`] = `undefined`;
 
-exports[`Error USER_AGENT_ORIGINAL 1`] = `undefined`;
-
 exports[`Error USER_ID 1`] = `undefined`;
 
 exports[`Span AGENT_NAME 1`] = `"java"`;
 
-exports[`Span AGENT_VERSION 1`] = `"agent version"`;
-
 exports[`Span CLIENT_GEO_COUNTRY_ISO_CODE 1`] = `undefined`;
 
 exports[`Span CONTAINER_ID 1`] = `undefined`;
@@ -186,7 +170,7 @@ exports[`Span METRIC_SYSTEM_TOTAL_MEMORY 1`] = `undefined`;
 
 exports[`Span OBSERVER_LISTENING 1`] = `undefined`;
 
-exports[`Span OBSERVER_VERSION_MAJOR 1`] = `8`;
+exports[`Span OBSERVER_VERSION_MAJOR 1`] = `undefined`;
 
 exports[`Span PARENT_ID 1`] = `"parentId"`;
 
@@ -198,20 +182,10 @@ exports[`Span SERVICE_ENVIRONMENT 1`] = `undefined`;
 
 exports[`Span SERVICE_FRAMEWORK_NAME 1`] = `undefined`;
 
-exports[`Span SERVICE_FRAMEWORK_VERSION 1`] = `undefined`;
-
-exports[`Span SERVICE_LANGUAGE_NAME 1`] = `undefined`;
-
-exports[`Span SERVICE_LANGUAGE_VERSION 1`] = `undefined`;
-
 exports[`Span SERVICE_NAME 1`] = `"service name"`;
 
 exports[`Span SERVICE_NODE_NAME 1`] = `undefined`;
 
-exports[`Span SERVICE_RUNTIME_NAME 1`] = `undefined`;
-
-exports[`Span SERVICE_RUNTIME_VERSION 1`] = `undefined`;
-
 exports[`Span SERVICE_VERSION 1`] = `undefined`;
 
 exports[`Span SPAN_ACTION 1`] = `"my action"`;
@@ -252,14 +226,10 @@ exports[`Span URL_FULL 1`] = `undefined`;
 
 exports[`Span USER_AGENT_NAME 1`] = `undefined`;
 
-exports[`Span USER_AGENT_ORIGINAL 1`] = `undefined`;
-
 exports[`Span USER_ID 1`] = `undefined`;
 
 exports[`Transaction AGENT_NAME 1`] = `"java"`;
 
-exports[`Transaction AGENT_VERSION 1`] = `"agent version"`;
-
 exports[`Transaction CLIENT_GEO_COUNTRY_ISO_CODE 1`] = `undefined`;
 
 exports[`Transaction CONTAINER_ID 1`] = `"container1234567890abcdef"`;
@@ -314,7 +284,7 @@ exports[`Transaction METRIC_SYSTEM_TOTAL_MEMORY 1`] = `undefined`;
 
 exports[`Transaction OBSERVER_LISTENING 1`] = `undefined`;
 
-exports[`Transaction OBSERVER_VERSION_MAJOR 1`] = `8`;
+exports[`Transaction OBSERVER_VERSION_MAJOR 1`] = `undefined`;
 
 exports[`Transaction PARENT_ID 1`] = `"parentId"`;
 
@@ -326,20 +296,10 @@ exports[`Transaction SERVICE_ENVIRONMENT 1`] = `undefined`;
 
 exports[`Transaction SERVICE_FRAMEWORK_NAME 1`] = `undefined`;
 
-exports[`Transaction SERVICE_FRAMEWORK_VERSION 1`] = `undefined`;
-
-exports[`Transaction SERVICE_LANGUAGE_NAME 1`] = `"nodejs"`;
-
-exports[`Transaction SERVICE_LANGUAGE_VERSION 1`] = `"v1337"`;
-
 exports[`Transaction SERVICE_NAME 1`] = `"service name"`;
 
 exports[`Transaction SERVICE_NODE_NAME 1`] = `undefined`;
 
-exports[`Transaction SERVICE_RUNTIME_NAME 1`] = `undefined`;
-
-exports[`Transaction SERVICE_RUNTIME_VERSION 1`] = `undefined`;
-
 exports[`Transaction SERVICE_VERSION 1`] = `undefined`;
 
 exports[`Transaction SPAN_ACTION 1`] = `undefined`;
@@ -380,6 +340,4 @@ exports[`Transaction URL_FULL 1`] = `"http://www.elastic.co"`;
 
 exports[`Transaction USER_AGENT_NAME 1`] = `"Other"`;
 
-exports[`Transaction USER_AGENT_ORIGINAL 1`] = `"test original"`;
-
 exports[`Transaction USER_ID 1`] = `"1337"`;
diff --git a/x-pack/plugins/apm/common/agent_name.ts b/x-pack/plugins/apm/common/agent_name.ts
index 085828b729ea5..bb68eb88b8e18 100644
--- a/x-pack/plugins/apm/common/agent_name.ts
+++ b/x-pack/plugins/apm/common/agent_name.ts
@@ -4,40 +4,36 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { AgentName } from '../typings/es_schemas/ui/fields/agent';
-
 /*
  * Agent names can be any string. This list only defines the official agents
  * that we might want to target specifically eg. linking to their documentation
  * & telemetry reporting. Support additional agent types by appending
  * definitions in mappings.json (for telemetry), the AgentName type, and the
- * AGENT_NAMES array.
+ * agentNames object.
  */
+import { AgentName } from '../typings/es_schemas/ui/fields/agent';
 
-export const AGENT_NAMES: AgentName[] = [
-  'java',
-  'js-base',
-  'rum-js',
-  'dotnet',
-  'go',
-  'java',
-  'nodejs',
-  'python',
-  'ruby'
-];
+const agentNames: { [agentName in AgentName]: agentName } = {
+  python: 'python',
+  java: 'java',
+  nodejs: 'nodejs',
+  'js-base': 'js-base',
+  'rum-js': 'rum-js',
+  dotnet: 'dotnet',
+  ruby: 'ruby',
+  go: 'go'
+};
 
-export function isAgentName(agentName: string): agentName is AgentName {
-  return AGENT_NAMES.includes(agentName as AgentName);
+export function isAgentName(agentName: string): boolean {
+  return Object.values(agentNames).includes(agentName as AgentName);
 }
 
-export function isRumAgentName(
-  agentName: string | undefined
-): agentName is 'js-base' | 'rum-js' {
-  return agentName === 'js-base' || agentName === 'rum-js';
+export function isRumAgentName(agentName: string | undefined) {
+  return (
+    agentName === agentNames['js-base'] || agentName === agentNames['rum-js']
+  );
 }
 
-export function isJavaAgentName(
-  agentName: string | undefined
-): agentName is 'java' {
-  return agentName === 'java';
+export function isJavaAgentName(agentName: string | undefined) {
+  return agentName === agentNames.java;
 }
diff --git a/x-pack/plugins/apm/common/apm_saved_object_constants.ts b/x-pack/plugins/apm/common/apm_saved_object_constants.ts
index 0529d90fe940a..ac43b700117c6 100644
--- a/x-pack/plugins/apm/common/apm_saved_object_constants.ts
+++ b/x-pack/plugins/apm/common/apm_saved_object_constants.ts
@@ -4,13 +4,11 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-// the types have to match the names of the saved object mappings
-// in /x-pack/legacy/plugins/apm/mappings.json
+// APM Services telemetry
+export const APM_SERVICES_TELEMETRY_SAVED_OBJECT_TYPE =
+  'apm-services-telemetry';
+export const APM_SERVICES_TELEMETRY_SAVED_OBJECT_ID = 'apm-services-telemetry';
 
 // APM indices
 export const APM_INDICES_SAVED_OBJECT_TYPE = 'apm-indices';
 export const APM_INDICES_SAVED_OBJECT_ID = 'apm-indices';
-
-// APM telemetry
-export const APM_TELEMETRY_SAVED_OBJECT_TYPE = 'apm-telemetry';
-export const APM_TELEMETRY_SAVED_OBJECT_ID = 'apm-telemetry';
diff --git a/x-pack/plugins/apm/common/elasticsearch_fieldnames.test.ts b/x-pack/plugins/apm/common/elasticsearch_fieldnames.test.ts
index 63fa749cd9f2c..1add2427d16a0 100644
--- a/x-pack/plugins/apm/common/elasticsearch_fieldnames.test.ts
+++ b/x-pack/plugins/apm/common/elasticsearch_fieldnames.test.ts
@@ -15,10 +15,7 @@ describe('Transaction', () => {
   const transaction: AllowUnknownProperties<Transaction> = {
     '@timestamp': new Date().toString(),
     '@metadata': 'whatever',
-    observer: {
-      version: 'whatever',
-      version_major: 8
-    },
+    observer: 'whatever',
     agent: {
       name: 'java',
       version: 'agent version'
@@ -66,10 +63,7 @@ describe('Span', () => {
   const span: AllowUnknownProperties<Span> = {
     '@timestamp': new Date().toString(),
     '@metadata': 'whatever',
-    observer: {
-      version: 'whatever',
-      version_major: 8
-    },
+    observer: 'whatever',
     agent: {
       name: 'java',
       version: 'agent version'
@@ -113,10 +107,7 @@ describe('Span', () => {
 describe('Error', () => {
   const errorDoc: AllowUnknownProperties<APMError> = {
     '@metadata': 'whatever',
-    observer: {
-      version: 'whatever',
-      version_major: 8
-    },
+    observer: 'whatever',
     agent: {
       name: 'java',
       version: 'agent version'
diff --git a/x-pack/plugins/apm/common/elasticsearch_fieldnames.ts b/x-pack/plugins/apm/common/elasticsearch_fieldnames.ts
index bc1b346f50da7..822201baddd88 100644
--- a/x-pack/plugins/apm/common/elasticsearch_fieldnames.ts
+++ b/x-pack/plugins/apm/common/elasticsearch_fieldnames.ts
@@ -4,24 +4,15 @@
  * 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_FRAMEWORK_NAME = 'service.framework.name';
-export const SERVICE_FRAMEWORK_VERSION = 'service.framework.version';
-export const SERVICE_LANGUAGE_NAME = 'service.language.name';
-export const SERVICE_LANGUAGE_VERSION = 'service.language.version';
-export const SERVICE_RUNTIME_NAME = 'service.runtime.name';
-export const SERVICE_RUNTIME_VERSION = 'service.runtime.version';
 export const SERVICE_NODE_NAME = 'service.node.name';
 export const SERVICE_VERSION = 'service.version';
-
-export const AGENT_NAME = 'agent.name';
-export const AGENT_VERSION = 'agent.version';
-
 export const URL_FULL = 'url.full';
 export const HTTP_REQUEST_METHOD = 'http.request.method';
 export const USER_ID = 'user.id';
-export const USER_AGENT_ORIGINAL = 'user_agent.original';
 export const USER_AGENT_NAME = 'user_agent.name';
 
 export const DESTINATION_ADDRESS = 'destination.address';
diff --git a/x-pack/plugins/apm/kibana.json b/x-pack/plugins/apm/kibana.json
index dadb1dff6d7a9..96579377c95e8 100644
--- a/x-pack/plugins/apm/kibana.json
+++ b/x-pack/plugins/apm/kibana.json
@@ -3,11 +3,8 @@
   "server": true,
   "version": "8.0.0",
   "kibanaVersion": "kibana",
-  "configPath": [
-    "xpack",
-    "apm"
-  ],
+  "configPath": ["xpack", "apm"],
   "ui": false,
   "requiredPlugins": ["apm_oss", "data", "home", "licensing"],
-  "optionalPlugins": ["cloud", "usageCollection", "taskManager"]
+  "optionalPlugins": ["cloud", "usageCollection"]
 }
diff --git a/x-pack/plugins/apm/server/index.ts b/x-pack/plugins/apm/server/index.ts
index 77655568a7e9c..8afdb9e99c1a3 100644
--- a/x-pack/plugins/apm/server/index.ts
+++ b/x-pack/plugins/apm/server/index.ts
@@ -29,8 +29,7 @@ export const config = {
       enabled: schema.boolean({ defaultValue: true }),
       transactionGroupBucketSize: schema.number({ defaultValue: 100 }),
       maxTraceItems: schema.number({ defaultValue: 1000 })
-    }),
-    telemetryCollectionEnabled: schema.boolean({ defaultValue: true })
+    })
   })
 };
 
@@ -63,8 +62,7 @@ export function mergeConfigs(
     'xpack.apm.ui.maxTraceItems': apmConfig.ui.maxTraceItems,
     'xpack.apm.ui.transactionGroupBucketSize':
       apmConfig.ui.transactionGroupBucketSize,
-    'xpack.apm.autocreateApmIndexPattern': apmConfig.autocreateApmIndexPattern,
-    'xpack.apm.telemetryCollectionEnabled': apmConfig.telemetryCollectionEnabled
+    'xpack.apm.autocreateApmIndexPattern': apmConfig.autocreateApmIndexPattern
   };
 }
 
diff --git a/x-pack/plugins/apm/server/lib/apm_telemetry/__test__/index.test.ts b/x-pack/plugins/apm/server/lib/apm_telemetry/__test__/index.test.ts
new file mode 100644
index 0000000000000..c45c74a791aee
--- /dev/null
+++ b/x-pack/plugins/apm/server/lib/apm_telemetry/__test__/index.test.ts
@@ -0,0 +1,83 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { SavedObjectAttributes } from '../../../../../../../src/core/server';
+import { createApmTelementry, storeApmServicesTelemetry } from '../index';
+import {
+  APM_SERVICES_TELEMETRY_SAVED_OBJECT_TYPE,
+  APM_SERVICES_TELEMETRY_SAVED_OBJECT_ID
+} from '../../../../common/apm_saved_object_constants';
+
+describe('apm_telemetry', () => {
+  describe('createApmTelementry', () => {
+    it('should create a ApmTelemetry object with boolean flag and frequency map of the given list of AgentNames', () => {
+      const apmTelemetry = createApmTelementry([
+        'go',
+        'nodejs',
+        'go',
+        'js-base'
+      ]);
+      expect(apmTelemetry.has_any_services).toBe(true);
+      expect(apmTelemetry.services_per_agent).toMatchObject({
+        go: 2,
+        nodejs: 1,
+        'js-base': 1
+      });
+    });
+    it('should ignore undefined or unknown AgentName values', () => {
+      const apmTelemetry = createApmTelementry([
+        'go',
+        'nodejs',
+        'go',
+        'js-base',
+        'example-platform' as any,
+        undefined as any
+      ]);
+      expect(apmTelemetry.services_per_agent).toMatchObject({
+        go: 2,
+        nodejs: 1,
+        'js-base': 1
+      });
+    });
+  });
+
+  describe('storeApmServicesTelemetry', () => {
+    let apmTelemetry: SavedObjectAttributes;
+    let savedObjectsClient: any;
+
+    beforeEach(() => {
+      apmTelemetry = {
+        has_any_services: true,
+        services_per_agent: {
+          go: 2,
+          nodejs: 1,
+          'js-base': 1
+        }
+      };
+      savedObjectsClient = { create: jest.fn() };
+    });
+
+    it('should call savedObjectsClient create with the given ApmTelemetry object', () => {
+      storeApmServicesTelemetry(savedObjectsClient, apmTelemetry);
+      expect(savedObjectsClient.create.mock.calls[0][1]).toBe(apmTelemetry);
+    });
+
+    it('should call savedObjectsClient create with the apm-telemetry document type and ID', () => {
+      storeApmServicesTelemetry(savedObjectsClient, apmTelemetry);
+      expect(savedObjectsClient.create.mock.calls[0][0]).toBe(
+        APM_SERVICES_TELEMETRY_SAVED_OBJECT_TYPE
+      );
+      expect(savedObjectsClient.create.mock.calls[0][2].id).toBe(
+        APM_SERVICES_TELEMETRY_SAVED_OBJECT_ID
+      );
+    });
+
+    it('should call savedObjectsClient create with overwrite: true', () => {
+      storeApmServicesTelemetry(savedObjectsClient, apmTelemetry);
+      expect(savedObjectsClient.create.mock.calls[0][2].overwrite).toBe(true);
+    });
+  });
+});
diff --git a/x-pack/plugins/apm/server/lib/apm_telemetry/collect_data_telemetry/index.ts b/x-pack/plugins/apm/server/lib/apm_telemetry/collect_data_telemetry/index.ts
deleted file mode 100644
index 729ccb73d73f3..0000000000000
--- a/x-pack/plugins/apm/server/lib/apm_telemetry/collect_data_telemetry/index.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 { merge } from 'lodash';
-import { Logger, CallAPIOptions } from 'kibana/server';
-import { IndicesStatsParams, Client } from 'elasticsearch';
-import {
-  ESSearchRequest,
-  ESSearchResponse
-} from '../../../../typings/elasticsearch';
-import { ApmIndicesConfig } from '../../settings/apm_indices/get_apm_indices';
-import { tasks } from './tasks';
-import { APMDataTelemetry } from '../types';
-
-type TelemetryTaskExecutor = (params: {
-  indices: ApmIndicesConfig;
-  search<TSearchRequest extends ESSearchRequest>(
-    params: TSearchRequest
-  ): Promise<ESSearchResponse<unknown, TSearchRequest>>;
-  indicesStats(
-    params: IndicesStatsParams,
-    options?: CallAPIOptions
-  ): ReturnType<Client['indices']['stats']>;
-  transportRequest: (params: {
-    path: string;
-    method: 'get';
-  }) => Promise<unknown>;
-}) => Promise<APMDataTelemetry>;
-
-export interface TelemetryTask {
-  name: string;
-  executor: TelemetryTaskExecutor;
-}
-
-export type CollectTelemetryParams = Parameters<TelemetryTaskExecutor>[0] & {
-  logger: Logger;
-};
-
-export function collectDataTelemetry({
-  search,
-  indices,
-  logger,
-  indicesStats,
-  transportRequest
-}: CollectTelemetryParams) {
-  return tasks.reduce((prev, task) => {
-    return prev.then(async data => {
-      logger.debug(`Executing APM telemetry task ${task.name}`);
-      try {
-        const time = process.hrtime();
-        const next = await task.executor({
-          search,
-          indices,
-          indicesStats,
-          transportRequest
-        });
-        const took = process.hrtime(time);
-
-        return merge({}, data, next, {
-          tasks: {
-            [task.name]: {
-              took: {
-                ms: Math.round(took[0] * 1000 + took[1] / 1e6)
-              }
-            }
-          }
-        });
-      } catch (err) {
-        logger.warn(`Failed executing APM telemetry task ${task.name}`);
-        logger.warn(err);
-        return data;
-      }
-    });
-  }, Promise.resolve({} as APMDataTelemetry));
-}
diff --git a/x-pack/plugins/apm/server/lib/apm_telemetry/collect_data_telemetry/tasks.ts b/x-pack/plugins/apm/server/lib/apm_telemetry/collect_data_telemetry/tasks.ts
deleted file mode 100644
index 415076b6ae116..0000000000000
--- a/x-pack/plugins/apm/server/lib/apm_telemetry/collect_data_telemetry/tasks.ts
+++ /dev/null
@@ -1,725 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-import { flatten, merge, sortBy, sum } from 'lodash';
-import { AgentName } from '../../../../typings/es_schemas/ui/fields/agent';
-import { AGENT_NAMES } from '../../../../common/agent_name';
-import { Transaction } from '../../../../typings/es_schemas/ui/transaction';
-import {
-  PROCESSOR_EVENT,
-  SERVICE_NAME,
-  AGENT_NAME,
-  AGENT_VERSION,
-  ERROR_GROUP_ID,
-  TRANSACTION_NAME,
-  PARENT_ID,
-  SERVICE_FRAMEWORK_NAME,
-  SERVICE_FRAMEWORK_VERSION,
-  SERVICE_LANGUAGE_NAME,
-  SERVICE_LANGUAGE_VERSION,
-  SERVICE_RUNTIME_NAME,
-  SERVICE_RUNTIME_VERSION,
-  USER_AGENT_ORIGINAL
-} from '../../../../common/elasticsearch_fieldnames';
-import { Span } from '../../../../typings/es_schemas/ui/span';
-import { APMError } from '../../../../typings/es_schemas/ui/apm_error';
-import { TelemetryTask } from '.';
-import { APMTelemetry } from '../types';
-
-const TIME_RANGES = ['1d', 'all'] as const;
-type TimeRange = typeof TIME_RANGES[number];
-
-export const tasks: TelemetryTask[] = [
-  {
-    name: 'processor_events',
-    executor: async ({ indices, search }) => {
-      const indicesByProcessorEvent = {
-        error: indices['apm_oss.errorIndices'],
-        metric: indices['apm_oss.metricsIndices'],
-        span: indices['apm_oss.spanIndices'],
-        transaction: indices['apm_oss.transactionIndices'],
-        onboarding: indices['apm_oss.onboardingIndices'],
-        sourcemap: indices['apm_oss.sourcemapIndices']
-      };
-
-      type ProcessorEvent = keyof typeof indicesByProcessorEvent;
-
-      const jobs: Array<{
-        processorEvent: ProcessorEvent;
-        timeRange: TimeRange;
-      }> = flatten(
-        (Object.keys(
-          indicesByProcessorEvent
-        ) as ProcessorEvent[]).map(processorEvent =>
-          TIME_RANGES.map(timeRange => ({ processorEvent, timeRange }))
-        )
-      );
-
-      const allData = await jobs.reduce((prevJob, current) => {
-        return prevJob.then(async data => {
-          const { processorEvent, timeRange } = current;
-
-          const response = await search({
-            index: indicesByProcessorEvent[processorEvent],
-            body: {
-              size: 1,
-              query: {
-                bool: {
-                  filter: [
-                    { term: { [PROCESSOR_EVENT]: processorEvent } },
-                    ...(timeRange !== 'all'
-                      ? [
-                          {
-                            range: {
-                              '@timestamp': {
-                                gte: `now-${timeRange}`
-                              }
-                            }
-                          }
-                        ]
-                      : [])
-                  ]
-                }
-              },
-              sort: {
-                '@timestamp': 'asc'
-              },
-              _source: ['@timestamp'],
-              track_total_hits: true
-            }
-          });
-
-          const event = response.hits.hits[0]?._source as {
-            '@timestamp': number;
-          };
-
-          return merge({}, data, {
-            counts: {
-              [processorEvent]: {
-                [timeRange]: response.hits.total.value
-              }
-            },
-            ...(timeRange === 'all' && event
-              ? {
-                  retainment: {
-                    [processorEvent]: {
-                      ms:
-                        new Date().getTime() -
-                        new Date(event['@timestamp']).getTime()
-                    }
-                  }
-                }
-              : {})
-          });
-        });
-      }, Promise.resolve({} as Record<string, { counts: Record<ProcessorEvent, Record<TimeRange, number>> }>));
-
-      return allData;
-    }
-  },
-  {
-    name: 'agent_configuration',
-    executor: async ({ indices, search }) => {
-      const agentConfigurationCount = (
-        await search({
-          index: indices.apmAgentConfigurationIndex,
-          body: {
-            size: 0,
-            track_total_hits: true
-          }
-        })
-      ).hits.total.value;
-
-      return {
-        counts: {
-          agent_configuration: {
-            all: agentConfigurationCount
-          }
-        }
-      };
-    }
-  },
-  {
-    name: 'services',
-    executor: async ({ indices, search }) => {
-      const servicesPerAgent = await AGENT_NAMES.reduce(
-        (prevJob, agentName) => {
-          return prevJob.then(async data => {
-            const response = await search({
-              index: [
-                indices['apm_oss.errorIndices'],
-                indices['apm_oss.spanIndices'],
-                indices['apm_oss.metricsIndices'],
-                indices['apm_oss.transactionIndices']
-              ],
-              body: {
-                size: 0,
-                query: {
-                  bool: {
-                    filter: [
-                      {
-                        term: {
-                          [AGENT_NAME]: agentName
-                        }
-                      },
-                      {
-                        range: {
-                          '@timestamp': {
-                            gte: 'now-1d'
-                          }
-                        }
-                      }
-                    ]
-                  }
-                },
-                aggs: {
-                  services: {
-                    cardinality: {
-                      field: SERVICE_NAME
-                    }
-                  }
-                }
-              }
-            });
-
-            return {
-              ...data,
-              [agentName]: response.aggregations?.services.value || 0
-            };
-          });
-        },
-        Promise.resolve({} as Record<AgentName, number>)
-      );
-
-      return {
-        has_any_services: sum(Object.values(servicesPerAgent)) > 0,
-        services_per_agent: servicesPerAgent
-      };
-    }
-  },
-  {
-    name: 'versions',
-    executor: async ({ search, indices }) => {
-      const response = await search({
-        index: [
-          indices['apm_oss.transactionIndices'],
-          indices['apm_oss.spanIndices'],
-          indices['apm_oss.errorIndices']
-        ],
-        terminateAfter: 1,
-        body: {
-          query: {
-            exists: {
-              field: 'observer.version'
-            }
-          },
-          size: 1,
-          sort: {
-            '@timestamp': 'desc'
-          }
-        }
-      });
-
-      const hit = response.hits.hits[0]?._source as Pick<
-        Transaction | Span | APMError,
-        'observer'
-      >;
-
-      if (!hit || !hit.observer?.version) {
-        return {};
-      }
-
-      const [major, minor, patch] = hit.observer.version
-        .split('.')
-        .map(part => Number(part));
-
-      return {
-        versions: {
-          apm_server: {
-            major,
-            minor,
-            patch
-          }
-        }
-      };
-    }
-  },
-  {
-    name: 'groupings',
-    executor: async ({ search, indices }) => {
-      const range1d = { range: { '@timestamp': { gte: 'now-1d' } } };
-      const errorGroupsCount = (
-        await search({
-          index: indices['apm_oss.errorIndices'],
-          body: {
-            size: 0,
-            query: {
-              bool: {
-                filter: [{ term: { [PROCESSOR_EVENT]: 'error' } }, range1d]
-              }
-            },
-            aggs: {
-              top_service: {
-                terms: {
-                  field: SERVICE_NAME,
-                  order: {
-                    error_groups: 'desc'
-                  },
-                  size: 1
-                },
-                aggs: {
-                  error_groups: {
-                    cardinality: {
-                      field: ERROR_GROUP_ID
-                    }
-                  }
-                }
-              }
-            }
-          }
-        })
-      ).aggregations?.top_service.buckets[0]?.error_groups.value;
-
-      const transactionGroupsCount = (
-        await search({
-          index: indices['apm_oss.transactionIndices'],
-          body: {
-            size: 0,
-            query: {
-              bool: {
-                filter: [
-                  { term: { [PROCESSOR_EVENT]: 'transaction' } },
-                  range1d
-                ]
-              }
-            },
-            aggs: {
-              top_service: {
-                terms: {
-                  field: SERVICE_NAME,
-                  order: {
-                    transaction_groups: 'desc'
-                  },
-                  size: 1
-                },
-                aggs: {
-                  transaction_groups: {
-                    cardinality: {
-                      field: TRANSACTION_NAME
-                    }
-                  }
-                }
-              }
-            }
-          }
-        })
-      ).aggregations?.top_service.buckets[0]?.transaction_groups.value;
-
-      const tracesPerDayCount = (
-        await search({
-          index: indices['apm_oss.transactionIndices'],
-          body: {
-            query: {
-              bool: {
-                filter: [
-                  { term: { [PROCESSOR_EVENT]: 'transaction' } },
-                  range1d
-                ],
-                must_not: {
-                  exists: { field: PARENT_ID }
-                }
-              }
-            },
-            track_total_hits: true,
-            size: 0
-          }
-        })
-      ).hits.total.value;
-
-      const servicesCount = (
-        await search({
-          index: [
-            indices['apm_oss.transactionIndices'],
-            indices['apm_oss.errorIndices'],
-            indices['apm_oss.metricsIndices']
-          ],
-          body: {
-            size: 0,
-            query: {
-              bool: {
-                filter: [range1d]
-              }
-            },
-            aggs: {
-              service_name: {
-                cardinality: {
-                  field: SERVICE_NAME
-                }
-              }
-            }
-          }
-        })
-      ).aggregations?.service_name.value;
-
-      return {
-        counts: {
-          max_error_groups_per_service: {
-            '1d': errorGroupsCount || 0
-          },
-          max_transaction_groups_per_service: {
-            '1d': transactionGroupsCount || 0
-          },
-          traces: {
-            '1d': tracesPerDayCount || 0
-          },
-          services: {
-            '1d': servicesCount || 0
-          }
-        }
-      };
-    }
-  },
-  {
-    name: 'integrations',
-    executor: async ({ transportRequest }) => {
-      const apmJobs = ['*-high_mean_response_time'];
-
-      const response = (await transportRequest({
-        method: 'get',
-        path: `/_ml/anomaly_detectors/${apmJobs.join(',')}`
-      })) as { data?: { count: number } };
-
-      return {
-        integrations: {
-          ml: {
-            all_jobs_count: response.data?.count ?? 0
-          }
-        }
-      };
-    }
-  },
-  {
-    name: 'agents',
-    executor: async ({ search, indices }) => {
-      const size = 3;
-
-      const agentData = await AGENT_NAMES.reduce(async (prevJob, agentName) => {
-        const data = await prevJob;
-
-        const response = await search({
-          index: [
-            indices['apm_oss.errorIndices'],
-            indices['apm_oss.metricsIndices'],
-            indices['apm_oss.transactionIndices']
-          ],
-          body: {
-            size: 0,
-            query: {
-              bool: {
-                filter: [
-                  { term: { [AGENT_NAME]: agentName } },
-                  { range: { '@timestamp': { gte: 'now-1d' } } }
-                ]
-              }
-            },
-            sort: {
-              '@timestamp': 'desc'
-            },
-            aggs: {
-              [AGENT_VERSION]: {
-                terms: {
-                  field: AGENT_VERSION,
-                  size
-                }
-              },
-              [SERVICE_FRAMEWORK_NAME]: {
-                terms: {
-                  field: SERVICE_FRAMEWORK_NAME,
-                  size
-                },
-                aggs: {
-                  [SERVICE_FRAMEWORK_VERSION]: {
-                    terms: {
-                      field: SERVICE_FRAMEWORK_VERSION,
-                      size
-                    }
-                  }
-                }
-              },
-              [SERVICE_FRAMEWORK_VERSION]: {
-                terms: {
-                  field: SERVICE_FRAMEWORK_VERSION,
-                  size
-                }
-              },
-              [SERVICE_LANGUAGE_NAME]: {
-                terms: {
-                  field: SERVICE_LANGUAGE_NAME,
-                  size
-                },
-                aggs: {
-                  [SERVICE_LANGUAGE_VERSION]: {
-                    terms: {
-                      field: SERVICE_LANGUAGE_VERSION,
-                      size
-                    }
-                  }
-                }
-              },
-              [SERVICE_LANGUAGE_VERSION]: {
-                terms: {
-                  field: SERVICE_LANGUAGE_VERSION,
-                  size
-                }
-              },
-              [SERVICE_RUNTIME_NAME]: {
-                terms: {
-                  field: SERVICE_RUNTIME_NAME,
-                  size
-                },
-                aggs: {
-                  [SERVICE_RUNTIME_VERSION]: {
-                    terms: {
-                      field: SERVICE_RUNTIME_VERSION,
-                      size
-                    }
-                  }
-                }
-              },
-              [SERVICE_RUNTIME_VERSION]: {
-                terms: {
-                  field: SERVICE_RUNTIME_VERSION,
-                  size
-                }
-              }
-            }
-          }
-        });
-
-        const { aggregations } = response;
-
-        if (!aggregations) {
-          return data;
-        }
-
-        const toComposite = (
-          outerKey: string | number,
-          innerKey: string | number
-        ) => `${outerKey}/${innerKey}`;
-
-        return {
-          ...data,
-          [agentName]: {
-            agent: {
-              version: aggregations[AGENT_VERSION].buckets.map(
-                bucket => bucket.key as string
-              )
-            },
-            service: {
-              framework: {
-                name: aggregations[SERVICE_FRAMEWORK_NAME].buckets
-                  .map(bucket => bucket.key as string)
-                  .slice(0, size),
-                version: aggregations[SERVICE_FRAMEWORK_VERSION].buckets
-                  .map(bucket => bucket.key as string)
-                  .slice(0, size),
-                composite: sortBy(
-                  flatten(
-                    aggregations[SERVICE_FRAMEWORK_NAME].buckets.map(bucket =>
-                      bucket[SERVICE_FRAMEWORK_VERSION].buckets.map(
-                        versionBucket => ({
-                          doc_count: versionBucket.doc_count,
-                          name: toComposite(bucket.key, versionBucket.key)
-                        })
-                      )
-                    )
-                  ),
-                  'doc_count'
-                )
-                  .reverse()
-                  .slice(0, size)
-                  .map(composite => composite.name)
-              },
-              language: {
-                name: aggregations[SERVICE_LANGUAGE_NAME].buckets
-                  .map(bucket => bucket.key as string)
-                  .slice(0, size),
-                version: aggregations[SERVICE_LANGUAGE_VERSION].buckets
-                  .map(bucket => bucket.key as string)
-                  .slice(0, size),
-                composite: sortBy(
-                  flatten(
-                    aggregations[SERVICE_LANGUAGE_NAME].buckets.map(bucket =>
-                      bucket[SERVICE_LANGUAGE_VERSION].buckets.map(
-                        versionBucket => ({
-                          doc_count: versionBucket.doc_count,
-                          name: toComposite(bucket.key, versionBucket.key)
-                        })
-                      )
-                    )
-                  ),
-                  'doc_count'
-                )
-                  .reverse()
-                  .slice(0, size)
-                  .map(composite => composite.name)
-              },
-              runtime: {
-                name: aggregations[SERVICE_RUNTIME_NAME].buckets
-                  .map(bucket => bucket.key as string)
-                  .slice(0, size),
-                version: aggregations[SERVICE_RUNTIME_VERSION].buckets
-                  .map(bucket => bucket.key as string)
-                  .slice(0, size),
-                composite: sortBy(
-                  flatten(
-                    aggregations[SERVICE_RUNTIME_NAME].buckets.map(bucket =>
-                      bucket[SERVICE_RUNTIME_VERSION].buckets.map(
-                        versionBucket => ({
-                          doc_count: versionBucket.doc_count,
-                          name: toComposite(bucket.key, versionBucket.key)
-                        })
-                      )
-                    )
-                  ),
-                  'doc_count'
-                )
-                  .reverse()
-                  .slice(0, size)
-                  .map(composite => composite.name)
-              }
-            }
-          }
-        };
-      }, Promise.resolve({} as APMTelemetry['agents']));
-
-      return {
-        agents: agentData
-      };
-    }
-  },
-  {
-    name: 'indices_stats',
-    executor: async ({ indicesStats, indices }) => {
-      const response = await indicesStats({
-        index: [
-          indices.apmAgentConfigurationIndex,
-          indices['apm_oss.errorIndices'],
-          indices['apm_oss.metricsIndices'],
-          indices['apm_oss.onboardingIndices'],
-          indices['apm_oss.sourcemapIndices'],
-          indices['apm_oss.spanIndices'],
-          indices['apm_oss.transactionIndices']
-        ]
-      });
-
-      return {
-        indices: {
-          shards: {
-            total: response._shards.total
-          },
-          all: {
-            total: {
-              docs: {
-                count: response._all.total.docs.count
-              },
-              store: {
-                size_in_bytes: response._all.total.store.size_in_bytes
-              }
-            }
-          }
-        }
-      };
-    }
-  },
-  {
-    name: 'cardinality',
-    executor: async ({ search }) => {
-      const allAgentsCardinalityResponse = await search({
-        body: {
-          size: 0,
-          query: {
-            bool: {
-              filter: [{ range: { '@timestamp': { gte: 'now-1d' } } }]
-            }
-          },
-          aggs: {
-            [TRANSACTION_NAME]: {
-              cardinality: {
-                field: TRANSACTION_NAME
-              }
-            },
-            [USER_AGENT_ORIGINAL]: {
-              cardinality: {
-                field: USER_AGENT_ORIGINAL
-              }
-            }
-          }
-        }
-      });
-
-      const rumAgentCardinalityResponse = await search({
-        body: {
-          size: 0,
-          query: {
-            bool: {
-              filter: [
-                { range: { '@timestamp': { gte: 'now-1d' } } },
-                { terms: { [AGENT_NAME]: ['rum-js', 'js-base'] } }
-              ]
-            }
-          },
-          aggs: {
-            [TRANSACTION_NAME]: {
-              cardinality: {
-                field: TRANSACTION_NAME
-              }
-            },
-            [USER_AGENT_ORIGINAL]: {
-              cardinality: {
-                field: USER_AGENT_ORIGINAL
-              }
-            }
-          }
-        }
-      });
-
-      return {
-        cardinality: {
-          transaction: {
-            name: {
-              all_agents: {
-                '1d':
-                  allAgentsCardinalityResponse.aggregations?.[TRANSACTION_NAME]
-                    .value
-              },
-              rum: {
-                '1d':
-                  rumAgentCardinalityResponse.aggregations?.[TRANSACTION_NAME]
-                    .value
-              }
-            }
-          },
-          user_agent: {
-            original: {
-              all_agents: {
-                '1d':
-                  allAgentsCardinalityResponse.aggregations?.[
-                    USER_AGENT_ORIGINAL
-                  ].value
-              },
-              rum: {
-                '1d':
-                  rumAgentCardinalityResponse.aggregations?.[
-                    USER_AGENT_ORIGINAL
-                  ].value
-              }
-            }
-          }
-        }
-      };
-    }
-  }
-];
diff --git a/x-pack/plugins/apm/server/lib/apm_telemetry/index.ts b/x-pack/plugins/apm/server/lib/apm_telemetry/index.ts
index c80057a2894dc..a2b0494730826 100644
--- a/x-pack/plugins/apm/server/lib/apm_telemetry/index.ts
+++ b/x-pack/plugins/apm/server/lib/apm_telemetry/index.ts
@@ -3,127 +3,60 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-import { CoreSetup, Logger } from 'src/core/server';
-import { Observable } from 'rxjs';
-import { take } from 'rxjs/operators';
-import { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
-import {
-  TaskManagerStartContract,
-  TaskManagerSetupContract
-} from '../../../../task_manager/server';
-import { getApmIndices } from '../settings/apm_indices/get_apm_indices';
+
+import { countBy } from 'lodash';
+import { SavedObjectAttributes } from '../../../../../../src/core/server';
+import { isAgentName } from '../../../common/agent_name';
 import {
-  APM_TELEMETRY_SAVED_OBJECT_ID,
-  APM_TELEMETRY_SAVED_OBJECT_TYPE
+  APM_SERVICES_TELEMETRY_SAVED_OBJECT_TYPE,
+  APM_SERVICES_TELEMETRY_SAVED_OBJECT_ID
 } from '../../../common/apm_saved_object_constants';
-import {
-  collectDataTelemetry,
-  CollectTelemetryParams
-} from './collect_data_telemetry';
-import { APMConfig } from '../..';
-import { getInternalSavedObjectsClient } from '../helpers/get_internal_saved_objects_client';
-
-const APM_TELEMETRY_TASK_NAME = 'apm-telemetry-task';
-
-export async function createApmTelemetry({
-  core,
-  config$,
-  usageCollector,
-  taskManager,
-  logger
-}: {
-  core: CoreSetup;
-  config$: Observable<APMConfig>;
-  usageCollector: UsageCollectionSetup;
-  taskManager: TaskManagerSetupContract;
-  logger: Logger;
-}) {
-  const savedObjectsClient = await getInternalSavedObjectsClient(core);
-
-  const collectAndStore = async () => {
-    const config = await config$.pipe(take(1)).toPromise();
-    const esClient = core.elasticsearch.dataClient;
-
-    const indices = await getApmIndices({
-      config,
-      savedObjectsClient
-    });
-
-    const search = esClient.callAsInternalUser.bind(
-      esClient,
-      'search'
-    ) as CollectTelemetryParams['search'];
-
-    const indicesStats = esClient.callAsInternalUser.bind(
-      esClient,
-      'indices.stats'
-    ) as CollectTelemetryParams['indicesStats'];
-
-    const transportRequest = esClient.callAsInternalUser.bind(
-      esClient,
-      'transport.request'
-    ) as CollectTelemetryParams['transportRequest'];
-
-    const dataTelemetry = await collectDataTelemetry({
-      search,
-      indices,
-      logger,
-      indicesStats,
-      transportRequest
-    });
-
-    await savedObjectsClient.create(
-      APM_TELEMETRY_SAVED_OBJECT_TYPE,
-      dataTelemetry,
-      { id: APM_TELEMETRY_SAVED_OBJECT_TYPE, overwrite: true }
-    );
+import { UsageCollectionSetup } from '../../../../../../src/plugins/usage_collection/server';
+import { InternalSavedObjectsClient } from '../helpers/get_internal_saved_objects_client';
+
+export function createApmTelementry(
+  agentNames: string[] = []
+): SavedObjectAttributes {
+  const validAgentNames = agentNames.filter(isAgentName);
+  return {
+    has_any_services: validAgentNames.length > 0,
+    services_per_agent: countBy(validAgentNames)
   };
+}
 
-  taskManager.registerTaskDefinitions({
-    [APM_TELEMETRY_TASK_NAME]: {
-      title: 'Collect APM telemetry',
-      type: APM_TELEMETRY_TASK_NAME,
-      createTaskRunner: () => {
-        return {
-          run: async () => {
-            await collectAndStore();
-          }
-        };
-      }
+export async function storeApmServicesTelemetry(
+  savedObjectsClient: InternalSavedObjectsClient,
+  apmTelemetry: SavedObjectAttributes
+) {
+  return savedObjectsClient.create(
+    APM_SERVICES_TELEMETRY_SAVED_OBJECT_TYPE,
+    apmTelemetry,
+    {
+      id: APM_SERVICES_TELEMETRY_SAVED_OBJECT_ID,
+      overwrite: true
     }
-  });
+  );
+}
 
-  const collector = usageCollector.makeUsageCollector({
+export function makeApmUsageCollector(
+  usageCollector: UsageCollectionSetup,
+  savedObjectsRepository: InternalSavedObjectsClient
+) {
+  const apmUsageCollector = usageCollector.makeUsageCollector({
     type: 'apm',
     fetch: async () => {
-      const data = (
-        await savedObjectsClient.get(
-          APM_TELEMETRY_SAVED_OBJECT_TYPE,
-          APM_TELEMETRY_SAVED_OBJECT_ID
-        )
-      ).attributes;
-
-      return data;
+      try {
+        const apmTelemetrySavedObject = await savedObjectsRepository.get(
+          APM_SERVICES_TELEMETRY_SAVED_OBJECT_TYPE,
+          APM_SERVICES_TELEMETRY_SAVED_OBJECT_ID
+        );
+        return apmTelemetrySavedObject.attributes;
+      } catch (err) {
+        return createApmTelementry();
+      }
     },
     isReady: () => true
   });
 
-  usageCollector.registerCollector(collector);
-
-  core.getStartServices().then(([coreStart, pluginsStart]) => {
-    const { taskManager: taskManagerStart } = pluginsStart as {
-      taskManager: TaskManagerStartContract;
-    };
-
-    taskManagerStart.ensureScheduled({
-      id: APM_TELEMETRY_TASK_NAME,
-      taskType: APM_TELEMETRY_TASK_NAME,
-      schedule: {
-        interval: '720m'
-      },
-      scope: ['apm'],
-      params: {},
-      state: {}
-    });
-  });
+  usageCollector.registerCollector(apmUsageCollector);
 }
diff --git a/x-pack/plugins/apm/server/lib/apm_telemetry/types.ts b/x-pack/plugins/apm/server/lib/apm_telemetry/types.ts
deleted file mode 100644
index f68dc517a2227..0000000000000
--- a/x-pack/plugins/apm/server/lib/apm_telemetry/types.ts
+++ /dev/null
@@ -1,118 +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 { DeepPartial } from 'utility-types';
-import { AgentName } from '../../../typings/es_schemas/ui/fields/agent';
-
-export interface TimeframeMap {
-  '1d': number;
-  all: number;
-}
-
-export type TimeframeMap1d = Pick<TimeframeMap, '1d'>;
-export type TimeframeMapAll = Pick<TimeframeMap, 'all'>;
-
-export type APMDataTelemetry = DeepPartial<{
-  has_any_services: boolean;
-  services_per_agent: Record<AgentName, number>;
-  versions: {
-    apm_server: {
-      minor: number;
-      major: number;
-      patch: number;
-    };
-  };
-  counts: {
-    transaction: TimeframeMap;
-    span: TimeframeMap;
-    error: TimeframeMap;
-    metric: TimeframeMap;
-    sourcemap: TimeframeMap;
-    onboarding: TimeframeMap;
-    agent_configuration: TimeframeMapAll;
-    max_transaction_groups_per_service: TimeframeMap;
-    max_error_groups_per_service: TimeframeMap;
-    traces: TimeframeMap;
-    services: TimeframeMap;
-  };
-  cardinality: {
-    user_agent: {
-      original: {
-        all_agents: TimeframeMap1d;
-        rum: TimeframeMap1d;
-      };
-    };
-    transaction: {
-      name: {
-        all_agents: TimeframeMap1d;
-        rum: TimeframeMap1d;
-      };
-    };
-  };
-  retainment: Record<
-    'span' | 'transaction' | 'error' | 'metric' | 'sourcemap' | 'onboarding',
-    { ms: number }
-  >;
-  integrations: {
-    ml: {
-      all_jobs_count: number;
-    };
-  };
-  agents: Record<
-    AgentName,
-    {
-      agent: {
-        version: string[];
-      };
-      service: {
-        framework: {
-          name: string[];
-          version: string[];
-          composite: string[];
-        };
-        language: {
-          name: string[];
-          version: string[];
-          composite: string[];
-        };
-        runtime: {
-          name: string[];
-          version: string[];
-          composite: string[];
-        };
-      };
-    }
-  >;
-  indices: {
-    shards: {
-      total: number;
-    };
-    all: {
-      total: {
-        docs: {
-          count: number;
-        };
-        store: {
-          size_in_bytes: number;
-        };
-      };
-    };
-  };
-  tasks: Record<
-    | 'processor_events'
-    | 'agent_configuration'
-    | 'services'
-    | 'versions'
-    | 'groupings'
-    | 'integrations'
-    | 'agents'
-    | 'indices_stats'
-    | 'cardinality',
-    { took: { ms: number } }
-  >;
-}>;
-
-export type APMTelemetry = APMDataTelemetry;
diff --git a/x-pack/plugins/apm/server/lib/helpers/setup_request.test.ts b/x-pack/plugins/apm/server/lib/helpers/setup_request.test.ts
index 8e8cf698a84cf..40a2a0e7216a0 100644
--- a/x-pack/plugins/apm/server/lib/helpers/setup_request.test.ts
+++ b/x-pack/plugins/apm/server/lib/helpers/setup_request.test.ts
@@ -39,19 +39,6 @@ function getMockRequest() {
         _debug: false
       }
     },
-    __LEGACY: {
-      server: {
-        plugins: {
-          elasticsearch: {
-            getCluster: jest.fn().mockReturnValue({ callWithInternalUser: {} })
-          }
-        },
-        savedObjects: {
-          SavedObjectsClient: jest.fn(),
-          getSavedObjectsRepository: jest.fn()
-        }
-      }
-    },
     core: {
       elasticsearch: {
         dataClient: {
diff --git a/x-pack/plugins/apm/server/plugin.ts b/x-pack/plugins/apm/server/plugin.ts
index a29b9399d8435..db14730f802a9 100644
--- a/x-pack/plugins/apm/server/plugin.ts
+++ b/x-pack/plugins/apm/server/plugin.ts
@@ -8,9 +8,9 @@ import { Observable, combineLatest, AsyncSubject } from 'rxjs';
 import { map, take } from 'rxjs/operators';
 import { Server } from 'hapi';
 import { once } from 'lodash';
-import { UsageCollectionSetup } from '../../../../src/plugins/usage_collection/server';
-import { TaskManagerSetupContract } from '../../task_manager/server';
+import { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
 import { APMOSSPluginSetup } from '../../../../src/plugins/apm_oss/server';
+import { makeApmUsageCollector } from './lib/apm_telemetry';
 import { createApmAgentConfigurationIndex } from './lib/settings/agent_configuration/create_agent_config_index';
 import { createApmCustomLinkIndex } from './lib/settings/custom_link/create_custom_link_index';
 import { createApmApi } from './routes/create_apm_api';
@@ -21,7 +21,6 @@ import { tutorialProvider } from './tutorial';
 import { CloudSetup } from '../../cloud/server';
 import { getInternalSavedObjectsClient } from './lib/helpers/get_internal_saved_objects_client';
 import { LicensingPluginSetup } from '../../licensing/public';
-import { createApmTelemetry } from './lib/apm_telemetry';
 
 export interface LegacySetup {
   server: Server;
@@ -48,10 +47,9 @@ export class APMPlugin implements Plugin<APMPluginContract> {
       licensing: LicensingPluginSetup;
       cloud?: CloudSetup;
       usageCollection?: UsageCollectionSetup;
-      taskManager?: TaskManagerSetupContract;
     }
   ) {
-    const logger = this.initContext.logger.get();
+    const logger = this.initContext.logger.get('apm');
     const config$ = this.initContext.config.create<APMXPackConfig>();
     const mergedConfig$ = combineLatest(plugins.apm_oss.config$, config$).pipe(
       map(([apmOssConfig, apmConfig]) => mergeConfigs(apmOssConfig, apmConfig))
@@ -63,20 +61,6 @@ export class APMPlugin implements Plugin<APMPluginContract> {
 
     const currentConfig = await mergedConfig$.pipe(take(1)).toPromise();
 
-    if (
-      plugins.taskManager &&
-      plugins.usageCollection &&
-      currentConfig['xpack.apm.telemetryCollectionEnabled']
-    ) {
-      createApmTelemetry({
-        core,
-        config$: mergedConfig$,
-        usageCollector: plugins.usageCollection,
-        taskManager: plugins.taskManager,
-        logger
-      });
-    }
-
     // create agent configuration index without blocking setup lifecycle
     createApmAgentConfigurationIndex({
       esClient: core.elasticsearch.dataClient,
@@ -105,6 +89,18 @@ export class APMPlugin implements Plugin<APMPluginContract> {
       })
     );
 
+    const usageCollection = plugins.usageCollection;
+    if (usageCollection) {
+      getInternalSavedObjectsClient(core)
+        .then(savedObjectsClient => {
+          makeApmUsageCollector(usageCollection, savedObjectsClient);
+        })
+        .catch(error => {
+          logger.error('Unable to initialize use collection');
+          logger.error(error.message);
+        });
+    }
+
     return {
       config$: mergedConfig$,
       registerLegacyAPI: once((__LEGACY: LegacySetup) => {
@@ -119,7 +115,6 @@ export class APMPlugin implements Plugin<APMPluginContract> {
     };
   }
 
-  public async start() {}
-
+  public start() {}
   public stop() {}
 }
diff --git a/x-pack/plugins/apm/server/routes/create_api/index.test.ts b/x-pack/plugins/apm/server/routes/create_api/index.test.ts
index 312dae1d1f9d2..e639bb5101e2f 100644
--- a/x-pack/plugins/apm/server/routes/create_api/index.test.ts
+++ b/x-pack/plugins/apm/server/routes/create_api/index.test.ts
@@ -36,7 +36,6 @@ const getCoreMock = () => {
     put,
     createRouter,
     context: {
-      measure: () => undefined,
       config$: new BehaviorSubject({} as APMConfig),
       logger: ({
         error: jest.fn()
diff --git a/x-pack/plugins/apm/server/routes/services.ts b/x-pack/plugins/apm/server/routes/services.ts
index 1c6561ee24c93..2d4fae9d2707a 100644
--- a/x-pack/plugins/apm/server/routes/services.ts
+++ b/x-pack/plugins/apm/server/routes/services.ts
@@ -5,6 +5,11 @@
  */
 
 import * as t from 'io-ts';
+import { AgentName } from '../../typings/es_schemas/ui/fields/agent';
+import {
+  createApmTelementry,
+  storeApmServicesTelemetry
+} from '../lib/apm_telemetry';
 import { setupRequest } from '../lib/helpers/setup_request';
 import { getServiceAgentName } from '../lib/services/get_service_agent_name';
 import { getServices } from '../lib/services/get_services';
@@ -13,6 +18,7 @@ import { getServiceNodeMetadata } from '../lib/services/get_service_node_metadat
 import { createRoute } from './create_route';
 import { uiFiltersRt, rangeRt } from './default_api_types';
 import { getServiceAnnotations } from '../lib/services/annotations';
+import { getInternalSavedObjectsClient } from '../lib/helpers/get_internal_saved_objects_client';
 
 export const servicesRoute = createRoute(core => ({
   path: '/api/apm/services',
@@ -23,6 +29,16 @@ export const servicesRoute = createRoute(core => ({
     const setup = await setupRequest(context, request);
     const services = await getServices(setup);
 
+    // Store telemetry data derived from services
+    const agentNames = services.items.map(
+      ({ agentName }) => agentName as AgentName
+    );
+    const apmTelemetry = createApmTelementry(agentNames);
+    const savedObjectsClient = await getInternalSavedObjectsClient(core);
+    storeApmServicesTelemetry(savedObjectsClient, apmTelemetry).catch(error => {
+      context.logger.error(error.message);
+    });
+
     return services;
   }
 }));
diff --git a/x-pack/plugins/apm/typings/elasticsearch/aggregations.ts b/x-pack/plugins/apm/typings/elasticsearch/aggregations.ts
index 8a8d256cf4273..6d3620f11a87b 100644
--- a/x-pack/plugins/apm/typings/elasticsearch/aggregations.ts
+++ b/x-pack/plugins/apm/typings/elasticsearch/aggregations.ts
@@ -126,16 +126,6 @@ export interface AggregationOptionsByType {
     combine_script: Script;
     reduce_script: Script;
   };
-  date_range: {
-    field: string;
-    format?: string;
-    ranges: Array<
-      | { from: string | number }
-      | { to: string | number }
-      | { from: string | number; to: string | number }
-    >;
-    keyed?: boolean;
-  };
 }
 
 type AggregationType = keyof AggregationOptionsByType;
@@ -146,15 +136,6 @@ type AggregationOptionsMap = Unionize<
   }
 > & { aggs?: AggregationInputMap };
 
-interface DateRangeBucket {
-  key: string;
-  to?: number;
-  from?: number;
-  to_as_string?: string;
-  from_as_string?: string;
-  doc_count: number;
-}
-
 export interface AggregationInputMap {
   [key: string]: AggregationOptionsMap;
 }
@@ -295,11 +276,6 @@ interface AggregationResponsePart<
   scripted_metric: {
     value: unknown;
   };
-  date_range: {
-    buckets: TAggregationOptionsMap extends { date_range: { keyed: true } }
-      ? Record<string, DateRangeBucket>
-      : { buckets: DateRangeBucket[] };
-  };
 }
 
 // Type for debugging purposes. If you see an error in AggregationResponseMap
@@ -309,7 +285,7 @@ interface AggregationResponsePart<
 
 // type MissingAggregationResponseTypes = Exclude<
 //   AggregationType,
-//   keyof AggregationResponsePart<{}, unknown>
+//   keyof AggregationResponsePart<{}>
 // >;
 
 export type AggregationResponseMap<
diff --git a/x-pack/plugins/apm/typings/es_schemas/raw/error_raw.ts b/x-pack/plugins/apm/typings/es_schemas/raw/error_raw.ts
index 8e49d02beb908..daf65e44980b6 100644
--- a/x-pack/plugins/apm/typings/es_schemas/raw/error_raw.ts
+++ b/x-pack/plugins/apm/typings/es_schemas/raw/error_raw.ts
@@ -15,7 +15,6 @@ import { Service } from './fields/service';
 import { IStackframe } from './fields/stackframe';
 import { Url } from './fields/url';
 import { User } from './fields/user';
-import { Observer } from './fields/observer';
 
 interface Processor {
   name: 'error';
@@ -62,5 +61,4 @@ export interface ErrorRaw extends APMBaseDoc {
   service: Service;
   url?: Url;
   user?: User;
-  observer?: Observer;
 }
diff --git a/x-pack/plugins/apm/typings/es_schemas/raw/fields/observer.ts b/x-pack/plugins/apm/typings/es_schemas/raw/fields/observer.ts
deleted file mode 100644
index 42843130ec47f..0000000000000
--- a/x-pack/plugins/apm/typings/es_schemas/raw/fields/observer.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.
- */
-
-export interface Observer {
-  version: string;
-  version_major: number;
-}
diff --git a/x-pack/plugins/apm/typings/es_schemas/raw/span_raw.ts b/x-pack/plugins/apm/typings/es_schemas/raw/span_raw.ts
index 4d5d2c5c4a12e..dbd9e7ede4256 100644
--- a/x-pack/plugins/apm/typings/es_schemas/raw/span_raw.ts
+++ b/x-pack/plugins/apm/typings/es_schemas/raw/span_raw.ts
@@ -6,7 +6,6 @@
 
 import { APMBaseDoc } from './apm_base_doc';
 import { IStackframe } from './fields/stackframe';
-import { Observer } from './fields/observer';
 
 interface Processor {
   name: 'transaction';
@@ -51,5 +50,4 @@ export interface SpanRaw extends APMBaseDoc {
   transaction?: {
     id: string;
   };
-  observer?: Observer;
 }
diff --git a/x-pack/plugins/apm/typings/es_schemas/raw/transaction_raw.ts b/x-pack/plugins/apm/typings/es_schemas/raw/transaction_raw.ts
index b8ebb4cf8da51..3673f1f13c403 100644
--- a/x-pack/plugins/apm/typings/es_schemas/raw/transaction_raw.ts
+++ b/x-pack/plugins/apm/typings/es_schemas/raw/transaction_raw.ts
@@ -15,7 +15,6 @@ import { Service } from './fields/service';
 import { Url } from './fields/url';
 import { User } from './fields/user';
 import { UserAgent } from './fields/user_agent';
-import { Observer } from './fields/observer';
 
 interface Processor {
   name: 'transaction';
@@ -62,5 +61,4 @@ export interface TransactionRaw extends APMBaseDoc {
   url?: Url;
   user?: User;
   user_agent?: UserAgent;
-  observer?: Observer;
 }

From 3e26777965a2efa56f7a2040619f016f34af5d0e Mon Sep 17 00:00:00 2001
From: Joe Reuter <johannes.reuter@elastic.co>
Date: Tue, 24 Mar 2020 07:27:15 +0100
Subject: [PATCH 055/179] Migrate doc view part of discover (#58094)

---
 .i18nrc.json                                  |   1 +
 src/core/MIGRATION.md                         |   6 +-
 .../kibana/public/discover/build_services.ts  |  14 ++-
 .../kibana/public/discover/kibana_services.ts |   1 -
 .../np_ready/angular/directives/field_name.js |   2 +-
 .../angular/{doc_viewer.ts => doc_viewer.tsx} |   8 +-
 .../discover/np_ready/components/_index.scss  |   1 -
 .../np_ready/components/doc/doc.test.tsx      |   8 +-
 .../discover/np_ready/components/doc/doc.tsx  |   5 +-
 .../components/doc/use_es_doc_search.ts       |   3 +-
 .../kibana/public/discover/plugin.ts          |  46 ++------
 .../new_platform/new_platform.karma_mock.js   |  11 ++
 .../ui/public/new_platform/new_platform.ts    |   3 +
 src/plugins/discover/kibana.json              |   6 +
 .../discover/public/components/_index.scss    |   1 +
 .../__snapshots__/doc_viewer.test.tsx.snap    |   0
 .../doc_viewer_render_tab.test.tsx.snap       |   0
 .../components/doc_viewer/_doc_viewer.scss    |   0
 .../public}/components/doc_viewer/_index.scss |   0
 .../components/doc_viewer/doc_viewer.test.tsx |  26 ++---
 .../components/doc_viewer/doc_viewer.tsx      |   4 +-
 .../doc_viewer/doc_viewer_render_error.tsx    |   2 +-
 .../doc_viewer/doc_viewer_render_tab.test.tsx |   0
 .../doc_viewer/doc_viewer_render_tab.tsx      |   0
 .../components/doc_viewer/doc_viewer_tab.tsx  |   0
 .../__snapshots__/field_name.test.tsx.snap    |   0
 .../field_name/field_name.test.tsx            |   0
 .../components}/field_name/field_name.tsx     |   4 +-
 .../components}/field_name/field_type_name.ts |  24 ++--
 .../json_code_block.test.tsx.snap             |   0
 .../json_code_block/json_code_block.test.tsx  |   2 +-
 .../json_code_block/json_code_block.tsx       |   2 +-
 .../public}/components/table/table.test.tsx   |   5 +-
 .../public}/components/table/table.tsx        |   0
 .../components/table/table_helper.test.ts     |   0
 .../public}/components/table/table_helper.tsx |   0
 .../public}/components/table/table_row.tsx    |   2 +-
 .../table/table_row_btn_collapse.tsx          |   2 +-
 .../table/table_row_btn_filter_add.tsx        |   6 +-
 .../table/table_row_btn_filter_exists.tsx     |  15 +--
 .../table/table_row_btn_filter_remove.tsx     |   6 +-
 .../table/table_row_btn_toggle_column.tsx     |  20 ++--
 .../table/table_row_icon_no_mapping.tsx       |  11 +-
 .../table/table_row_icon_underscore.tsx       |   4 +-
 .../public}/doc_views/doc_views_helpers.tsx   |   0
 .../public}/doc_views/doc_views_registry.ts   |  12 +-
 .../public}/doc_views/doc_views_types.ts      |   7 +-
 src/plugins/discover/public/helpers/index.ts  |  20 ++++
 .../public/helpers/shorten_dotted_string.ts   |  26 +++++
 src/plugins/discover/public/index.scss        |   1 +
 src/plugins/discover/public/index.ts          |  13 +++
 src/plugins/discover/public/mocks.ts          |  47 ++++++++
 src/plugins/discover/public/plugin.ts         | 110 ++++++++++++++++++
 .../public/saved_searches/_saved_search.ts    |   8 +-
 src/plugins/discover/public/services.ts       |  25 ++++
 test/plugin_functional/config.js              |   1 +
 .../plugins/doc_views_plugin/kibana.json      |   8 ++
 .../plugins/doc_views_plugin/package.json     |  17 +++
 .../plugins/doc_views_plugin/public/index.ts  |  22 ++++
 .../doc_views_plugin/public/plugin.tsx        |  60 ++++++++++
 .../plugins/doc_views_plugin/tsconfig.json    |  14 +++
 .../test_suites/doc_views/doc_views.ts        |  57 +++++++++
 .../test_suites/doc_views/index.ts            |  31 +++++
 .../translations/translations/ja-JP.json      |  22 ++--
 .../translations/translations/zh-CN.json      |  22 ++--
 65 files changed, 606 insertions(+), 168 deletions(-)
 rename src/legacy/core_plugins/kibana/public/discover/np_ready/angular/{doc_viewer.ts => doc_viewer.tsx} (87%)
 create mode 100644 src/plugins/discover/kibana.json
 create mode 100644 src/plugins/discover/public/components/_index.scss
 rename src/{legacy/core_plugins/kibana/public/discover/np_ready => plugins/discover/public}/components/doc_viewer/__snapshots__/doc_viewer.test.tsx.snap (100%)
 rename src/{legacy/core_plugins/kibana/public/discover/np_ready => plugins/discover/public}/components/doc_viewer/__snapshots__/doc_viewer_render_tab.test.tsx.snap (100%)
 rename src/{legacy/core_plugins/kibana/public/discover/np_ready => plugins/discover/public}/components/doc_viewer/_doc_viewer.scss (100%)
 rename src/{legacy/core_plugins/kibana/public/discover/np_ready => plugins/discover/public}/components/doc_viewer/_index.scss (100%)
 rename src/{legacy/core_plugins/kibana/public/discover/np_ready => plugins/discover/public}/components/doc_viewer/doc_viewer.test.tsx (81%)
 rename src/{legacy/core_plugins/kibana/public/discover/np_ready => plugins/discover/public}/components/doc_viewer/doc_viewer.tsx (95%)
 rename src/{legacy/core_plugins/kibana/public/discover/np_ready => plugins/discover/public}/components/doc_viewer/doc_viewer_render_error.tsx (94%)
 rename src/{legacy/core_plugins/kibana/public/discover/np_ready => plugins/discover/public}/components/doc_viewer/doc_viewer_render_tab.test.tsx (100%)
 rename src/{legacy/core_plugins/kibana/public/discover/np_ready => plugins/discover/public}/components/doc_viewer/doc_viewer_render_tab.tsx (100%)
 rename src/{legacy/core_plugins/kibana/public/discover/np_ready => plugins/discover/public}/components/doc_viewer/doc_viewer_tab.tsx (100%)
 rename src/{legacy/core_plugins/kibana/public/discover/np_ready/angular/directives => plugins/discover/public/components}/field_name/__snapshots__/field_name.test.tsx.snap (100%)
 rename src/{legacy/core_plugins/kibana/public/discover/np_ready/angular/directives => plugins/discover/public/components}/field_name/field_name.test.tsx (100%)
 rename src/{legacy/core_plugins/kibana/public/discover/np_ready/angular/directives => plugins/discover/public/components}/field_name/field_name.tsx (94%)
 rename src/{legacy/core_plugins/kibana/public/discover/np_ready/angular/directives => plugins/discover/public/components}/field_name/field_type_name.ts (66%)
 rename src/{legacy/core_plugins/kibana/public/discover/np_ready => plugins/discover/public}/components/json_code_block/__snapshots__/json_code_block.test.tsx.snap (100%)
 rename src/{legacy/core_plugins/kibana/public/discover/np_ready => plugins/discover/public}/components/json_code_block/json_code_block.test.tsx (95%)
 rename src/{legacy/core_plugins/kibana/public/discover/np_ready => plugins/discover/public}/components/json_code_block/json_code_block.tsx (93%)
 rename src/{legacy/core_plugins/kibana/public/discover/np_ready => plugins/discover/public}/components/table/table.test.tsx (98%)
 rename src/{legacy/core_plugins/kibana/public/discover/np_ready => plugins/discover/public}/components/table/table.tsx (100%)
 rename src/{legacy/core_plugins/kibana/public/discover/np_ready => plugins/discover/public}/components/table/table_helper.test.ts (100%)
 rename src/{legacy/core_plugins/kibana/public/discover/np_ready => plugins/discover/public}/components/table/table_helper.tsx (100%)
 rename src/{legacy/core_plugins/kibana/public/discover/np_ready => plugins/discover/public}/components/table/table_row.tsx (98%)
 rename src/{legacy/core_plugins/kibana/public/discover/np_ready => plugins/discover/public}/components/table/table_row_btn_collapse.tsx (94%)
 rename src/{legacy/core_plugins/kibana/public/discover/np_ready => plugins/discover/public}/components/table/table_row_btn_filter_add.tsx (87%)
 rename src/{legacy/core_plugins/kibana/public/discover/np_ready => plugins/discover/public}/components/table/table_row_btn_filter_exists.tsx (80%)
 rename src/{legacy/core_plugins/kibana/public/discover/np_ready => plugins/discover/public}/components/table/table_row_btn_filter_remove.tsx (87%)
 rename src/{legacy/core_plugins/kibana/public/discover/np_ready => plugins/discover/public}/components/table/table_row_btn_toggle_column.tsx (79%)
 rename src/{legacy/core_plugins/kibana/public/discover/np_ready => plugins/discover/public}/components/table/table_row_icon_no_mapping.tsx (86%)
 rename src/{legacy/core_plugins/kibana/public/discover/np_ready => plugins/discover/public}/components/table/table_row_icon_underscore.tsx (89%)
 rename src/{legacy/core_plugins/kibana/public/discover/np_ready => plugins/discover/public}/doc_views/doc_views_helpers.tsx (100%)
 rename src/{legacy/core_plugins/kibana/public/discover/np_ready => plugins/discover/public}/doc_views/doc_views_registry.ts (82%)
 rename src/{legacy/core_plugins/kibana/public/discover/np_ready => plugins/discover/public}/doc_views/doc_views_types.ts (90%)
 create mode 100644 src/plugins/discover/public/helpers/index.ts
 create mode 100644 src/plugins/discover/public/helpers/shorten_dotted_string.ts
 create mode 100644 src/plugins/discover/public/index.scss
 create mode 100644 src/plugins/discover/public/mocks.ts
 create mode 100644 src/plugins/discover/public/plugin.ts
 create mode 100644 src/plugins/discover/public/services.ts
 create mode 100644 test/plugin_functional/plugins/doc_views_plugin/kibana.json
 create mode 100644 test/plugin_functional/plugins/doc_views_plugin/package.json
 create mode 100644 test/plugin_functional/plugins/doc_views_plugin/public/index.ts
 create mode 100644 test/plugin_functional/plugins/doc_views_plugin/public/plugin.tsx
 create mode 100644 test/plugin_functional/plugins/doc_views_plugin/tsconfig.json
 create mode 100644 test/plugin_functional/test_suites/doc_views/doc_views.ts
 create mode 100644 test/plugin_functional/test_suites/doc_views/index.ts

diff --git a/.i18nrc.json b/.i18nrc.json
index 36b28a0f5bd34..78c4be6f4a356 100644
--- a/.i18nrc.json
+++ b/.i18nrc.json
@@ -3,6 +3,7 @@
     "common.ui": "src/legacy/ui",
     "console": "src/plugins/console",
     "core": "src/core",
+    "discover": "src/plugins/discover",
     "dashboard": "src/plugins/dashboard",
     "data": "src/plugins/data",
     "embeddableApi": "src/plugins/embeddable",
diff --git a/src/core/MIGRATION.md b/src/core/MIGRATION.md
index 1ca9b63a51d18..0d5d300ec3b79 100644
--- a/src/core/MIGRATION.md
+++ b/src/core/MIGRATION.md
@@ -1233,11 +1233,11 @@ This table shows where these uiExports have moved to in the New Platform. In mos
 | `chromeNavControls`          | [`core.chrome.navControls.register{Left,Right}`](/docs/development/core/public/kibana-plugin-public.chromenavcontrols.md) |                                                                                                                                       |
 | `contextMenuActions`         |                                                                                                                           | Should be an API on the devTools plugin.                                                                                              |
 | `devTools`                   |                                                                                                                           |                                                                                                                                       |
-| `docViews`                   |                                                                                                                           |                                                                                                                                       |
+| `docViews`                   | [`plugins.discover.docViews.addDocView`](./src/plugins/discover/public/doc_views)                                         | Should be an API on the discover plugin.                                                                                              |
 | `embeddableActions`          |                                                                                                                           | Should be an API on the embeddables plugin.                                                                                           |
 | `embeddableFactories`        |                                                                                                                           | Should be an API on the embeddables plugin.                                                                                           |
-| `fieldFormatEditors`         |                                                                                                                          |                                                                                                                                       |
-| `fieldFormats`               | [`plugins.data.fieldFormats`](./src/plugins/data/public/field_formats)                                                                                                                          |                                                                                                                                       |
+| `fieldFormatEditors`         |                                                                                                                          |                                                                                                                                        |
+| `fieldFormats`               | [`plugins.data.fieldFormats`](./src/plugins/data/public/field_formats)                                                                                                                                                                                            |                                                                                                                                       |
 | `hacks`                      | n/a                                                                                                                       | Just run the code in your plugin's `start` method.                                                                                    |
 | `home`                       | [`plugins.home.featureCatalogue.register`](./src/plugins/home/public/feature_catalogue)                                   | Must add `home` as a dependency in your kibana.json.                                                                                  |
 | `indexManagement`            |                                                                                                                           | Should be an API on the indexManagement plugin.                                                                                       |
diff --git a/src/legacy/core_plugins/kibana/public/discover/build_services.ts b/src/legacy/core_plugins/kibana/public/discover/build_services.ts
index 282eef0c983eb..f881eb96e4e81 100644
--- a/src/legacy/core_plugins/kibana/public/discover/build_services.ts
+++ b/src/legacy/core_plugins/kibana/public/discover/build_services.ts
@@ -35,10 +35,13 @@ import {
 
 import { DiscoverStartPlugins } from './plugin';
 import { SharePluginStart } from '../../../../../plugins/share/public';
-import { DocViewsRegistry } from './np_ready/doc_views/doc_views_registry';
 import { ChartsPluginStart } from '../../../../../plugins/charts/public';
 import { VisualizationsStart } from '../../../visualizations/public';
-import { createSavedSearchesLoader, SavedSearch } from '../../../../../plugins/discover/public';
+import {
+  createSavedSearchesLoader,
+  DocViewerComponent,
+  SavedSearch,
+} from '../../../../../plugins/discover/public';
 
 export interface DiscoverServices {
   addBasePath: (path: string) => string;
@@ -47,7 +50,7 @@ export interface DiscoverServices {
   core: CoreStart;
   data: DataPublicPluginStart;
   docLinks: DocLinksStart;
-  docViewsRegistry: DocViewsRegistry;
+  DocViewer: DocViewerComponent;
   history: History;
   theme: ChartsPluginStart['theme'];
   filterManager: FilterManager;
@@ -64,8 +67,7 @@ export interface DiscoverServices {
 }
 export async function buildServices(
   core: CoreStart,
-  plugins: DiscoverStartPlugins,
-  docViewsRegistry: DocViewsRegistry
+  plugins: DiscoverStartPlugins
 ): Promise<DiscoverServices> {
   const services = {
     savedObjectsClient: core.savedObjects.client,
@@ -81,7 +83,7 @@ export async function buildServices(
     core,
     data: plugins.data,
     docLinks: core.docLinks,
-    docViewsRegistry,
+    DocViewer: plugins.discover.docViews.DocViewer,
     history: createHashHistory(),
     theme: plugins.charts.theme,
     filterManager: plugins.data.query.filterManager,
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 d369eb9679de6..7a3a6949baa94 100644
--- a/src/legacy/core_plugins/kibana/public/discover/kibana_services.ts
+++ b/src/legacy/core_plugins/kibana/public/discover/kibana_services.ts
@@ -75,7 +75,6 @@ export {
   EsQuerySortValue,
   SortDirection,
 } from '../../../../../plugins/data/public';
-export { ElasticSearchHit } from './np_ready/doc_views/doc_views_types';
 export { getFormat } from 'ui/visualize/loader/pipeline_helpers/utilities';
 // @ts-ignore
 export { buildPointSeriesData } from 'ui/agg_response/point_series/point_series';
diff --git a/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/directives/field_name.js b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/directives/field_name.js
index b020113381992..47e50f3cc3d4b 100644
--- a/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/directives/field_name.js
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/directives/field_name.js
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { FieldName } from './field_name/field_name';
+import { FieldName } from '../../../../../../../../plugins/discover/public';
 import { getServices, wrapInI18nContext } from '../../../kibana_services';
 
 export function FieldNameDirectiveProvider(reactDirective) {
diff --git a/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_viewer.ts b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_viewer.tsx
similarity index 87%
rename from src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_viewer.ts
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_viewer.tsx
index 6ba47b839563b..90e061ac1aa05 100644
--- a/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_viewer.ts
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_viewer.tsx
@@ -17,11 +17,15 @@
  * under the License.
  */
 
-import { DocViewer } from '../components/doc_viewer/doc_viewer';
+import React from 'react';
+import { getServices } from '../../kibana_services';
 
 export function createDocViewerDirective(reactDirective: any) {
   return reactDirective(
-    DocViewer,
+    (props: any) => {
+      const { DocViewer } = getServices();
+      return <DocViewer {...props} />;
+    },
     [
       'hit',
       ['indexPattern', { watchDepth: 'reference' }],
diff --git a/src/legacy/core_plugins/kibana/public/discover/np_ready/components/_index.scss b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/_index.scss
index 0491430e5fddd..7161560f8fda4 100644
--- a/src/legacy/core_plugins/kibana/public/discover/np_ready/components/_index.scss
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/_index.scss
@@ -1,3 +1,2 @@
 @import 'fetch_error/index';
 @import 'field_chooser/index';
-@import 'doc_viewer/index';
diff --git a/src/legacy/core_plugins/kibana/public/discover/np_ready/components/doc/doc.test.tsx b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/doc/doc.test.tsx
index 2278b243ecc14..1d19dc112d193 100644
--- a/src/legacy/core_plugins/kibana/public/discover/np_ready/components/doc/doc.test.tsx
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/doc/doc.test.tsx
@@ -24,19 +24,13 @@ import { ReactWrapper } from 'enzyme';
 import { findTestSubject } from '@elastic/eui/lib/test';
 import { Doc, DocProps } from './doc';
 
-jest.mock('../doc_viewer/doc_viewer', () => ({
-  DocViewer: () => null,
-}));
-
 jest.mock('../../../kibana_services', () => {
   return {
     getServices: () => ({
       metadata: {
         branch: 'test',
       },
-      getDocViewsSorted: () => {
-        return [];
-      },
+      DocViewer: () => null,
     }),
   };
 });
diff --git a/src/legacy/core_plugins/kibana/public/discover/np_ready/components/doc/doc.tsx b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/doc/doc.tsx
index 819eb9df592bd..28a17dbdb67b7 100644
--- a/src/legacy/core_plugins/kibana/public/discover/np_ready/components/doc/doc.tsx
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/doc/doc.tsx
@@ -20,9 +20,9 @@ import React from 'react';
 import { FormattedMessage } from '@kbn/i18n/react';
 import { EuiCallOut, EuiLink, EuiLoadingSpinner, EuiPageContent } from '@elastic/eui';
 import { IndexPatternsContract } from 'src/plugins/data/public';
-import { DocViewer } from '../doc_viewer/doc_viewer';
 import { ElasticRequestState, useEsDocSearch } from './use_es_doc_search';
-import { ElasticSearchHit, getServices } from '../../../kibana_services';
+import { getServices } from '../../../kibana_services';
+import { ElasticSearchHit } from '../../../../../../../../plugins/discover/public';
 
 export interface ElasticSearchResult {
   hits: {
@@ -61,6 +61,7 @@ export interface DocProps {
 }
 
 export function Doc(props: DocProps) {
+  const { DocViewer } = getServices();
   const [reqState, hit, indexPattern] = useEsDocSearch(props);
 
   return (
diff --git a/src/legacy/core_plugins/kibana/public/discover/np_ready/components/doc/use_es_doc_search.ts b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/doc/use_es_doc_search.ts
index 6cffc2cc533b0..2cd264578a596 100644
--- a/src/legacy/core_plugins/kibana/public/discover/np_ready/components/doc/use_es_doc_search.ts
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/doc/use_es_doc_search.ts
@@ -17,8 +17,9 @@
  * under the License.
  */
 import { useEffect, useState } from 'react';
-import { ElasticSearchHit, IndexPattern } from '../../../kibana_services';
+import { IndexPattern } from '../../../kibana_services';
 import { DocProps } from './doc';
+import { ElasticSearchHit } from '../../../../../../../../plugins/discover/public';
 
 export enum ElasticRequestState {
   Loading,
diff --git a/src/legacy/core_plugins/kibana/public/discover/plugin.ts b/src/legacy/core_plugins/kibana/public/discover/plugin.ts
index ba671a64592a5..d3cdeb49fba71 100644
--- a/src/legacy/core_plugins/kibana/public/discover/plugin.ts
+++ b/src/legacy/core_plugins/kibana/public/discover/plugin.ts
@@ -19,7 +19,6 @@
 
 import { BehaviorSubject } from 'rxjs';
 import { filter, map } from 'rxjs/operators';
-import { i18n } from '@kbn/i18n';
 import { AppMountParameters, CoreSetup, CoreStart, Plugin } from 'kibana/public';
 import angular, { auto } from 'angular';
 import { UiActionsSetup, UiActionsStart } from 'src/plugins/ui_actions/public';
@@ -41,10 +40,7 @@ import {
   KibanaLegacySetup,
   AngularRenderedAppUpdater,
 } from '../../../../../plugins/kibana_legacy/public';
-import { DocViewsRegistry } from './np_ready/doc_views/doc_views_registry';
-import { DocViewInput, DocViewInputFn } from './np_ready/doc_views/doc_views_types';
-import { DocViewTable } from './np_ready/components/table/table';
-import { JsonCodeBlock } from './np_ready/components/json_code_block/json_code_block';
+import { DiscoverSetup, DiscoverStart } from '../../../../../plugins/discover/public';
 import { HomePublicPluginSetup } from '../../../../../plugins/home/public';
 import {
   VisualizationsStart,
@@ -52,15 +48,6 @@ import {
 } from '../../../visualizations/public/np_ready/public';
 import { createKbnUrlTracker } from '../../../../../plugins/kibana_utils/public';
 
-/**
- * These are the interfaces with your public contracts. You should export these
- * for other plugins to use in _their_ `SetupDeps`/`StartDeps` interfaces.
- * @public
- */
-export interface DiscoverSetup {
-  addDocView(docViewRaw: DocViewInput | DocViewInputFn): void;
-}
-export type DiscoverStart = void;
 export interface DiscoverSetupPlugins {
   uiActions: UiActionsSetup;
   embeddable: EmbeddableSetup;
@@ -68,6 +55,7 @@ export interface DiscoverSetupPlugins {
   home: HomePublicPluginSetup;
   visualizations: VisualizationsSetup;
   data: DataPublicPluginSetup;
+  discover: DiscoverSetup;
 }
 export interface DiscoverStartPlugins {
   uiActions: UiActionsStart;
@@ -78,6 +66,7 @@ export interface DiscoverStartPlugins {
   share: SharePluginStart;
   inspector: any;
   visualizations: VisualizationsStart;
+  discover: DiscoverStart;
 }
 const innerAngularName = 'app/discover';
 const embeddableAngularName = 'app/discoverEmbeddable';
@@ -87,10 +76,9 @@ const embeddableAngularName = 'app/discoverEmbeddable';
  * There are 2 kinds of Angular bootstrapped for rendering, additionally to the main Angular
  * Discover provides embeddables, those contain a slimmer Angular
  */
-export class DiscoverPlugin implements Plugin<DiscoverSetup, DiscoverStart> {
+export class DiscoverPlugin implements Plugin<void, void> {
   private servicesInitialized: boolean = false;
   private innerAngularInitialized: boolean = false;
-  private docViewsRegistry: DocViewsRegistry | null = null;
   private embeddableInjector: auto.IInjectorService | null = null;
   private getEmbeddableInjector: (() => Promise<auto.IInjectorService>) | null = null;
   private appStateUpdater = new BehaviorSubject<AngularRenderedAppUpdater>(() => ({}));
@@ -103,7 +91,7 @@ export class DiscoverPlugin implements Plugin<DiscoverSetup, DiscoverStart> {
   public initializeInnerAngular?: () => void;
   public initializeServices?: () => Promise<{ core: CoreStart; plugins: DiscoverStartPlugins }>;
 
-  setup(core: CoreSetup<DiscoverStartPlugins>, plugins: DiscoverSetupPlugins): DiscoverSetup {
+  setup(core: CoreSetup<DiscoverStartPlugins>, plugins: DiscoverSetupPlugins) {
     const { appMounted, appUnMounted, stop: stopUrlTracker } = createKbnUrlTracker({
       baseUrl: core.http.basePath.prepend('/app/kibana'),
       defaultSubUrl: '#/discover',
@@ -130,21 +118,7 @@ export class DiscoverPlugin implements Plugin<DiscoverSetup, DiscoverStart> {
     };
 
     this.getEmbeddableInjector = this.getInjector.bind(this);
-    this.docViewsRegistry = new DocViewsRegistry(this.getEmbeddableInjector);
-    this.docViewsRegistry.addDocView({
-      title: i18n.translate('kbn.discover.docViews.table.tableTitle', {
-        defaultMessage: 'Table',
-      }),
-      order: 10,
-      component: DocViewTable,
-    });
-    this.docViewsRegistry.addDocView({
-      title: i18n.translate('kbn.discover.docViews.json.jsonTitle', {
-        defaultMessage: 'JSON',
-      }),
-      order: 20,
-      component: JsonCodeBlock,
-    });
+    plugins.discover.docViews.setAngularInjectorGetter(this.getEmbeddableInjector);
     plugins.kibanaLegacy.registerLegacyApp({
       id: 'discover',
       title: 'Discover',
@@ -172,14 +146,10 @@ export class DiscoverPlugin implements Plugin<DiscoverSetup, DiscoverStart> {
       },
     });
     registerFeature(plugins.home);
-
     this.registerEmbeddable(core, plugins);
-    return {
-      addDocView: this.docViewsRegistry.addDocView.bind(this.docViewsRegistry),
-    };
   }
 
-  start(core: CoreStart, plugins: DiscoverStartPlugins): DiscoverStart {
+  start(core: CoreStart, plugins: DiscoverStartPlugins) {
     // we need to register the application service at setup, but to render it
     // there are some start dependencies necessary, for this reason
     // initializeInnerAngular + initializeServices are assigned at start and used
@@ -198,7 +168,7 @@ export class DiscoverPlugin implements Plugin<DiscoverSetup, DiscoverStart> {
       if (this.servicesInitialized) {
         return { core, plugins };
       }
-      const services = await buildServices(core, plugins, this.docViewsRegistry!);
+      const services = await buildServices(core, plugins);
       setServices(services);
       this.servicesInitialized = true;
 
diff --git a/src/legacy/ui/public/new_platform/new_platform.karma_mock.js b/src/legacy/ui/public/new_platform/new_platform.karma_mock.js
index c58a7d2fbb5cd..809022620e69d 100644
--- a/src/legacy/ui/public/new_platform/new_platform.karma_mock.js
+++ b/src/legacy/ui/public/new_platform/new_platform.karma_mock.js
@@ -271,6 +271,12 @@ export const npSetup = {
         }),
       },
     },
+    discover: {
+      docViews: {
+        addDocView: sinon.fake(),
+        setAngularInjectorGetter: sinon.fake(),
+      },
+    },
     visTypeVega: {
       config: sinon.fake(),
     },
@@ -459,6 +465,11 @@ export const npStart = {
         useChartsTheme: sinon.fake(),
       },
     },
+    discover: {
+      docViews: {
+        DocViewer: () => null,
+      },
+    },
   },
 };
 
diff --git a/src/legacy/ui/public/new_platform/new_platform.ts b/src/legacy/ui/public/new_platform/new_platform.ts
index deb8387fee29c..ee14f192a2149 100644
--- a/src/legacy/ui/public/new_platform/new_platform.ts
+++ b/src/legacy/ui/public/new_platform/new_platform.ts
@@ -65,6 +65,7 @@ import {
   NavigationPublicPluginStart,
 } from '../../../../plugins/navigation/public';
 import { VisTypeVegaSetup } from '../../../../plugins/vis_type_vega/public';
+import { DiscoverSetup, DiscoverStart } from '../../../../plugins/discover/public';
 
 export interface PluginsSetup {
   bfetch: BfetchPublicSetup;
@@ -83,6 +84,7 @@ export interface PluginsSetup {
   advancedSettings: AdvancedSettingsSetup;
   management: ManagementSetup;
   visTypeVega: VisTypeVegaSetup;
+  discover: DiscoverSetup;
   telemetry?: TelemetryPluginSetup;
 }
 
@@ -100,6 +102,7 @@ export interface PluginsStart {
   share: SharePluginStart;
   management: ManagementStart;
   advancedSettings: AdvancedSettingsStart;
+  discover: DiscoverStart;
   telemetry?: TelemetryPluginStart;
 }
 
diff --git a/src/plugins/discover/kibana.json b/src/plugins/discover/kibana.json
new file mode 100644
index 0000000000000..91d6358d44c18
--- /dev/null
+++ b/src/plugins/discover/kibana.json
@@ -0,0 +1,6 @@
+{
+  "id": "discover",
+  "version": "kibana",
+  "server": false,
+  "ui": true
+}
diff --git a/src/plugins/discover/public/components/_index.scss b/src/plugins/discover/public/components/_index.scss
new file mode 100644
index 0000000000000..ff50d4b5dca93
--- /dev/null
+++ b/src/plugins/discover/public/components/_index.scss
@@ -0,0 +1 @@
+@import 'doc_viewer/index';
diff --git a/src/legacy/core_plugins/kibana/public/discover/np_ready/components/doc_viewer/__snapshots__/doc_viewer.test.tsx.snap b/src/plugins/discover/public/components/doc_viewer/__snapshots__/doc_viewer.test.tsx.snap
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/np_ready/components/doc_viewer/__snapshots__/doc_viewer.test.tsx.snap
rename to src/plugins/discover/public/components/doc_viewer/__snapshots__/doc_viewer.test.tsx.snap
diff --git a/src/legacy/core_plugins/kibana/public/discover/np_ready/components/doc_viewer/__snapshots__/doc_viewer_render_tab.test.tsx.snap b/src/plugins/discover/public/components/doc_viewer/__snapshots__/doc_viewer_render_tab.test.tsx.snap
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/np_ready/components/doc_viewer/__snapshots__/doc_viewer_render_tab.test.tsx.snap
rename to src/plugins/discover/public/components/doc_viewer/__snapshots__/doc_viewer_render_tab.test.tsx.snap
diff --git a/src/legacy/core_plugins/kibana/public/discover/np_ready/components/doc_viewer/_doc_viewer.scss b/src/plugins/discover/public/components/doc_viewer/_doc_viewer.scss
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/np_ready/components/doc_viewer/_doc_viewer.scss
rename to src/plugins/discover/public/components/doc_viewer/_doc_viewer.scss
diff --git a/src/legacy/core_plugins/kibana/public/discover/np_ready/components/doc_viewer/_index.scss b/src/plugins/discover/public/components/doc_viewer/_index.scss
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/np_ready/components/doc_viewer/_index.scss
rename to src/plugins/discover/public/components/doc_viewer/_index.scss
diff --git a/src/legacy/core_plugins/kibana/public/discover/np_ready/components/doc_viewer/doc_viewer.test.tsx b/src/plugins/discover/public/components/doc_viewer/doc_viewer.test.tsx
similarity index 81%
rename from src/legacy/core_plugins/kibana/public/discover/np_ready/components/doc_viewer/doc_viewer.test.tsx
rename to src/plugins/discover/public/components/doc_viewer/doc_viewer.test.tsx
index 15f0f40700abc..6f29f10ddd026 100644
--- a/src/legacy/core_plugins/kibana/public/discover/np_ready/components/doc_viewer/doc_viewer.test.tsx
+++ b/src/plugins/discover/public/components/doc_viewer/doc_viewer.test.tsx
@@ -21,37 +21,33 @@ import { mount, shallow } from 'enzyme';
 import { DocViewer } from './doc_viewer';
 // @ts-ignore
 import { findTestSubject } from '@elastic/eui/lib/test';
-import { getServices } from '../../../kibana_services';
+import { getDocViewsRegistry } from '../../services';
 import { DocViewRenderProps } from '../../doc_views/doc_views_types';
 
-jest.mock('../../../kibana_services', () => {
+jest.mock('../../services', () => {
   let registry: any[] = [];
   return {
-    getServices: () => ({
-      docViewsRegistry: {
-        addDocView(view: any) {
-          registry.push(view);
-        },
-        getDocViewsSorted() {
-          return registry;
-        },
+    getDocViewsRegistry: () => ({
+      addDocView(view: any) {
+        registry.push(view);
+      },
+      getDocViewsSorted() {
+        return registry;
       },
       resetRegistry: () => {
         registry = [];
       },
     }),
-    formatMsg: (x: any) => String(x),
-    formatStack: (x: any) => String(x),
   };
 });
 
 beforeEach(() => {
-  (getServices() as any).resetRegistry();
+  (getDocViewsRegistry() as any).resetRegistry();
   jest.clearAllMocks();
 });
 
 test('Render <DocViewer/> with 3 different tabs', () => {
-  const registry = getServices().docViewsRegistry;
+  const registry = getDocViewsRegistry();
   registry.addDocView({ order: 10, title: 'Render function', render: jest.fn() });
   registry.addDocView({ order: 20, title: 'React component', component: () => <div>test</div> });
   registry.addDocView({ order: 30, title: 'Invalid doc view' });
@@ -69,7 +65,7 @@ test('Render <DocViewer/> with 1 tab displaying error message', () => {
     return null;
   }
 
-  const registry = getServices().docViewsRegistry;
+  const registry = getDocViewsRegistry();
   registry.addDocView({
     order: 10,
     title: 'React component',
diff --git a/src/legacy/core_plugins/kibana/public/discover/np_ready/components/doc_viewer/doc_viewer.tsx b/src/plugins/discover/public/components/doc_viewer/doc_viewer.tsx
similarity index 95%
rename from src/legacy/core_plugins/kibana/public/discover/np_ready/components/doc_viewer/doc_viewer.tsx
rename to src/plugins/discover/public/components/doc_viewer/doc_viewer.tsx
index a177d8c29304c..792d9c44400d7 100644
--- a/src/legacy/core_plugins/kibana/public/discover/np_ready/components/doc_viewer/doc_viewer.tsx
+++ b/src/plugins/discover/public/components/doc_viewer/doc_viewer.tsx
@@ -18,7 +18,7 @@
  */
 import React from 'react';
 import { EuiTabbedContent } from '@elastic/eui';
-import { getServices } from '../../../kibana_services';
+import { getDocViewsRegistry } from '../../services';
 import { DocViewerTab } from './doc_viewer_tab';
 import { DocView, DocViewRenderProps } from '../../doc_views/doc_views_types';
 
@@ -29,7 +29,7 @@ import { DocView, DocViewRenderProps } from '../../doc_views/doc_views_types';
  * a `render` function.
  */
 export function DocViewer(renderProps: DocViewRenderProps) {
-  const { docViewsRegistry } = getServices();
+  const docViewsRegistry = getDocViewsRegistry();
   const tabs = docViewsRegistry
     .getDocViewsSorted(renderProps.hit)
     .map(({ title, render, component }: DocView, idx: number) => {
diff --git a/src/legacy/core_plugins/kibana/public/discover/np_ready/components/doc_viewer/doc_viewer_render_error.tsx b/src/plugins/discover/public/components/doc_viewer/doc_viewer_render_error.tsx
similarity index 94%
rename from src/legacy/core_plugins/kibana/public/discover/np_ready/components/doc_viewer/doc_viewer_render_error.tsx
rename to src/plugins/discover/public/components/doc_viewer/doc_viewer_render_error.tsx
index 075217add7b52..387e57dc8a7e3 100644
--- a/src/legacy/core_plugins/kibana/public/discover/np_ready/components/doc_viewer/doc_viewer_render_error.tsx
+++ b/src/plugins/discover/public/components/doc_viewer/doc_viewer_render_error.tsx
@@ -18,7 +18,7 @@
  */
 import React from 'react';
 import { EuiCallOut, EuiCodeBlock } from '@elastic/eui';
-import { formatMsg, formatStack } from '../../../kibana_services';
+import { formatMsg, formatStack } from '../../../../kibana_legacy/public';
 
 interface Props {
   error: Error | string;
diff --git a/src/legacy/core_plugins/kibana/public/discover/np_ready/components/doc_viewer/doc_viewer_render_tab.test.tsx b/src/plugins/discover/public/components/doc_viewer/doc_viewer_render_tab.test.tsx
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/np_ready/components/doc_viewer/doc_viewer_render_tab.test.tsx
rename to src/plugins/discover/public/components/doc_viewer/doc_viewer_render_tab.test.tsx
diff --git a/src/legacy/core_plugins/kibana/public/discover/np_ready/components/doc_viewer/doc_viewer_render_tab.tsx b/src/plugins/discover/public/components/doc_viewer/doc_viewer_render_tab.tsx
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/np_ready/components/doc_viewer/doc_viewer_render_tab.tsx
rename to src/plugins/discover/public/components/doc_viewer/doc_viewer_render_tab.tsx
diff --git a/src/legacy/core_plugins/kibana/public/discover/np_ready/components/doc_viewer/doc_viewer_tab.tsx b/src/plugins/discover/public/components/doc_viewer/doc_viewer_tab.tsx
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/np_ready/components/doc_viewer/doc_viewer_tab.tsx
rename to src/plugins/discover/public/components/doc_viewer/doc_viewer_tab.tsx
diff --git a/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/directives/field_name/__snapshots__/field_name.test.tsx.snap b/src/plugins/discover/public/components/field_name/__snapshots__/field_name.test.tsx.snap
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/np_ready/angular/directives/field_name/__snapshots__/field_name.test.tsx.snap
rename to src/plugins/discover/public/components/field_name/__snapshots__/field_name.test.tsx.snap
diff --git a/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/directives/field_name/field_name.test.tsx b/src/plugins/discover/public/components/field_name/field_name.test.tsx
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/np_ready/angular/directives/field_name/field_name.test.tsx
rename to src/plugins/discover/public/components/field_name/field_name.test.tsx
diff --git a/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/directives/field_name/field_name.tsx b/src/plugins/discover/public/components/field_name/field_name.tsx
similarity index 94%
rename from src/legacy/core_plugins/kibana/public/discover/np_ready/angular/directives/field_name/field_name.tsx
rename to src/plugins/discover/public/components/field_name/field_name.tsx
index 1b3b16332fa4f..63518aae28de6 100644
--- a/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/directives/field_name/field_name.tsx
+++ b/src/plugins/discover/public/components/field_name/field_name.tsx
@@ -20,8 +20,8 @@ import React from 'react';
 import classNames from 'classnames';
 import { EuiFlexGroup, EuiFlexItem, EuiToolTip } from '@elastic/eui';
 
-import { FieldIcon, FieldIconProps } from '../../../../../../../../../plugins/kibana_react/public';
-import { shortenDottedString } from '../../../helpers';
+import { FieldIcon, FieldIconProps } from '../../../../kibana_react/public';
+import { shortenDottedString } from '../../helpers';
 import { getFieldTypeName } from './field_type_name';
 
 // property field is provided at discover's field chooser
diff --git a/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/directives/field_name/field_type_name.ts b/src/plugins/discover/public/components/field_name/field_type_name.ts
similarity index 66%
rename from src/legacy/core_plugins/kibana/public/discover/np_ready/angular/directives/field_name/field_type_name.ts
rename to src/plugins/discover/public/components/field_name/field_type_name.ts
index 0cf428ee48b9d..a67c20fc4f353 100644
--- a/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/directives/field_name/field_type_name.ts
+++ b/src/plugins/discover/public/components/field_name/field_type_name.ts
@@ -21,52 +21,52 @@ import { i18n } from '@kbn/i18n';
 export function getFieldTypeName(type: string) {
   switch (type) {
     case 'boolean':
-      return i18n.translate('kbn.discover.fieldNameIcons.booleanAriaLabel', {
+      return i18n.translate('discover.fieldNameIcons.booleanAriaLabel', {
         defaultMessage: 'Boolean field',
       });
     case 'conflict':
-      return i18n.translate('kbn.discover.fieldNameIcons.conflictFieldAriaLabel', {
+      return i18n.translate('discover.fieldNameIcons.conflictFieldAriaLabel', {
         defaultMessage: 'Conflicting field',
       });
     case 'date':
-      return i18n.translate('kbn.discover.fieldNameIcons.dateFieldAriaLabel', {
+      return i18n.translate('discover.fieldNameIcons.dateFieldAriaLabel', {
         defaultMessage: 'Date field',
       });
     case 'geo_point':
-      return i18n.translate('kbn.discover.fieldNameIcons.geoPointFieldAriaLabel', {
+      return i18n.translate('discover.fieldNameIcons.geoPointFieldAriaLabel', {
         defaultMessage: 'Geo point field',
       });
     case 'geo_shape':
-      return i18n.translate('kbn.discover.fieldNameIcons.geoShapeFieldAriaLabel', {
+      return i18n.translate('discover.fieldNameIcons.geoShapeFieldAriaLabel', {
         defaultMessage: 'Geo shape field',
       });
     case 'ip':
-      return i18n.translate('kbn.discover.fieldNameIcons.ipAddressFieldAriaLabel', {
+      return i18n.translate('discover.fieldNameIcons.ipAddressFieldAriaLabel', {
         defaultMessage: 'IP address field',
       });
     case 'murmur3':
-      return i18n.translate('kbn.discover.fieldNameIcons.murmur3FieldAriaLabel', {
+      return i18n.translate('discover.fieldNameIcons.murmur3FieldAriaLabel', {
         defaultMessage: 'Murmur3 field',
       });
     case 'number':
-      return i18n.translate('kbn.discover.fieldNameIcons.numberFieldAriaLabel', {
+      return i18n.translate('discover.fieldNameIcons.numberFieldAriaLabel', {
         defaultMessage: 'Number field',
       });
     case 'source':
       // Note that this type is currently not provided, type for _source is undefined
-      return i18n.translate('kbn.discover.fieldNameIcons.sourceFieldAriaLabel', {
+      return i18n.translate('discover.fieldNameIcons.sourceFieldAriaLabel', {
         defaultMessage: 'Source field',
       });
     case 'string':
-      return i18n.translate('kbn.discover.fieldNameIcons.stringFieldAriaLabel', {
+      return i18n.translate('discover.fieldNameIcons.stringFieldAriaLabel', {
         defaultMessage: 'String field',
       });
     case 'nested':
-      return i18n.translate('kbn.discover.fieldNameIcons.nestedFieldAriaLabel', {
+      return i18n.translate('discover.fieldNameIcons.nestedFieldAriaLabel', {
         defaultMessage: 'Nested field',
       });
     default:
-      return i18n.translate('kbn.discover.fieldNameIcons.unknownFieldAriaLabel', {
+      return i18n.translate('discover.fieldNameIcons.unknownFieldAriaLabel', {
         defaultMessage: 'Unknown field',
       });
   }
diff --git a/src/legacy/core_plugins/kibana/public/discover/np_ready/components/json_code_block/__snapshots__/json_code_block.test.tsx.snap b/src/plugins/discover/public/components/json_code_block/__snapshots__/json_code_block.test.tsx.snap
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/np_ready/components/json_code_block/__snapshots__/json_code_block.test.tsx.snap
rename to src/plugins/discover/public/components/json_code_block/__snapshots__/json_code_block.test.tsx.snap
diff --git a/src/legacy/core_plugins/kibana/public/discover/np_ready/components/json_code_block/json_code_block.test.tsx b/src/plugins/discover/public/components/json_code_block/json_code_block.test.tsx
similarity index 95%
rename from src/legacy/core_plugins/kibana/public/discover/np_ready/components/json_code_block/json_code_block.test.tsx
rename to src/plugins/discover/public/components/json_code_block/json_code_block.test.tsx
index 9cab7974c9eb2..7e7f80c6aaa56 100644
--- a/src/legacy/core_plugins/kibana/public/discover/np_ready/components/json_code_block/json_code_block.test.tsx
+++ b/src/plugins/discover/public/components/json_code_block/json_code_block.test.tsx
@@ -19,7 +19,7 @@
 import React from 'react';
 import { shallow } from 'enzyme';
 import { JsonCodeBlock } from './json_code_block';
-import { IndexPattern } from '../../../kibana_services';
+import { IndexPattern } from '../../../../data/public';
 
 it('returns the `JsonCodeEditor` component', () => {
   const props = {
diff --git a/src/legacy/core_plugins/kibana/public/discover/np_ready/components/json_code_block/json_code_block.tsx b/src/plugins/discover/public/components/json_code_block/json_code_block.tsx
similarity index 93%
rename from src/legacy/core_plugins/kibana/public/discover/np_ready/components/json_code_block/json_code_block.tsx
rename to src/plugins/discover/public/components/json_code_block/json_code_block.tsx
index 3331969e351ab..9297ab0dfcf4d 100644
--- a/src/legacy/core_plugins/kibana/public/discover/np_ready/components/json_code_block/json_code_block.tsx
+++ b/src/plugins/discover/public/components/json_code_block/json_code_block.tsx
@@ -22,7 +22,7 @@ import { i18n } from '@kbn/i18n';
 import { DocViewRenderProps } from '../../doc_views/doc_views_types';
 
 export function JsonCodeBlock({ hit }: DocViewRenderProps) {
-  const label = i18n.translate('kbn.discover.docViews.json.codeEditorAriaLabel', {
+  const label = i18n.translate('discover.docViews.json.codeEditorAriaLabel', {
     defaultMessage: 'Read only JSON view of an elasticsearch document',
   });
   return (
diff --git a/src/legacy/core_plugins/kibana/public/discover/np_ready/components/table/table.test.tsx b/src/plugins/discover/public/components/table/table.test.tsx
similarity index 98%
rename from src/legacy/core_plugins/kibana/public/discover/np_ready/components/table/table.test.tsx
rename to src/plugins/discover/public/components/table/table.test.tsx
index 386f405544a61..91e116c4c6696 100644
--- a/src/legacy/core_plugins/kibana/public/discover/np_ready/components/table/table.test.tsx
+++ b/src/plugins/discover/public/components/table/table.test.tsx
@@ -21,10 +21,7 @@ import { mount } from 'enzyme';
 // @ts-ignore
 import { findTestSubject } from '@elastic/eui/lib/test';
 import { DocViewTable } from './table';
-
-import { IndexPattern, indexPatterns } from '../../../kibana_services';
-
-jest.mock('ui/new_platform');
+import { indexPatterns, IndexPattern } from '../../../../data/public';
 
 const indexPattern = {
   fields: [
diff --git a/src/legacy/core_plugins/kibana/public/discover/np_ready/components/table/table.tsx b/src/plugins/discover/public/components/table/table.tsx
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/np_ready/components/table/table.tsx
rename to src/plugins/discover/public/components/table/table.tsx
diff --git a/src/legacy/core_plugins/kibana/public/discover/np_ready/components/table/table_helper.test.ts b/src/plugins/discover/public/components/table/table_helper.test.ts
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/np_ready/components/table/table_helper.test.ts
rename to src/plugins/discover/public/components/table/table_helper.test.ts
diff --git a/src/legacy/core_plugins/kibana/public/discover/np_ready/components/table/table_helper.tsx b/src/plugins/discover/public/components/table/table_helper.tsx
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/np_ready/components/table/table_helper.tsx
rename to src/plugins/discover/public/components/table/table_helper.tsx
diff --git a/src/legacy/core_plugins/kibana/public/discover/np_ready/components/table/table_row.tsx b/src/plugins/discover/public/components/table/table_row.tsx
similarity index 98%
rename from src/legacy/core_plugins/kibana/public/discover/np_ready/components/table/table_row.tsx
rename to src/plugins/discover/public/components/table/table_row.tsx
index 5b13f6b3655c3..a4d5c57d10b33 100644
--- a/src/legacy/core_plugins/kibana/public/discover/np_ready/components/table/table_row.tsx
+++ b/src/plugins/discover/public/components/table/table_row.tsx
@@ -26,7 +26,7 @@ import { DocViewTableRowBtnCollapse } from './table_row_btn_collapse';
 import { DocViewTableRowBtnFilterExists } from './table_row_btn_filter_exists';
 import { DocViewTableRowIconNoMapping } from './table_row_icon_no_mapping';
 import { DocViewTableRowIconUnderscore } from './table_row_icon_underscore';
-import { FieldName } from '../../angular/directives/field_name/field_name';
+import { FieldName } from '../field_name/field_name';
 
 export interface Props {
   field: string;
diff --git a/src/legacy/core_plugins/kibana/public/discover/np_ready/components/table/table_row_btn_collapse.tsx b/src/plugins/discover/public/components/table/table_row_btn_collapse.tsx
similarity index 94%
rename from src/legacy/core_plugins/kibana/public/discover/np_ready/components/table/table_row_btn_collapse.tsx
rename to src/plugins/discover/public/components/table/table_row_btn_collapse.tsx
index e59f607329d4a..bb5ea4bd20f07 100644
--- a/src/legacy/core_plugins/kibana/public/discover/np_ready/components/table/table_row_btn_collapse.tsx
+++ b/src/plugins/discover/public/components/table/table_row_btn_collapse.tsx
@@ -26,7 +26,7 @@ export interface Props {
 }
 
 export function DocViewTableRowBtnCollapse({ onClick, isCollapsed }: Props) {
-  const label = i18n.translate('kbn.discover.docViews.table.toggleFieldDetails', {
+  const label = i18n.translate('discover.docViews.table.toggleFieldDetails', {
     defaultMessage: 'Toggle field details',
   });
   return (
diff --git a/src/legacy/core_plugins/kibana/public/discover/np_ready/components/table/table_row_btn_filter_add.tsx b/src/plugins/discover/public/components/table/table_row_btn_filter_add.tsx
similarity index 87%
rename from src/legacy/core_plugins/kibana/public/discover/np_ready/components/table/table_row_btn_filter_add.tsx
rename to src/plugins/discover/public/components/table/table_row_btn_filter_add.tsx
index 8e2668e26cf08..bd842eb5c6f72 100644
--- a/src/legacy/core_plugins/kibana/public/discover/np_ready/components/table/table_row_btn_filter_add.tsx
+++ b/src/plugins/discover/public/components/table/table_row_btn_filter_add.tsx
@@ -29,12 +29,12 @@ export interface Props {
 export function DocViewTableRowBtnFilterAdd({ onClick, disabled = false }: Props) {
   const tooltipContent = disabled ? (
     <FormattedMessage
-      id="kbn.discover.docViews.table.unindexedFieldsCanNotBeSearchedTooltip"
+      id="discover.docViews.table.unindexedFieldsCanNotBeSearchedTooltip"
       defaultMessage="Unindexed fields can not be searched"
     />
   ) : (
     <FormattedMessage
-      id="kbn.discover.docViews.table.filterForValueButtonTooltip"
+      id="discover.docViews.table.filterForValueButtonTooltip"
       defaultMessage="Filter for value"
     />
   );
@@ -42,7 +42,7 @@ export function DocViewTableRowBtnFilterAdd({ onClick, disabled = false }: Props
   return (
     <EuiToolTip content={tooltipContent}>
       <EuiButtonIcon
-        aria-label={i18n.translate('kbn.discover.docViews.table.filterForValueButtonAriaLabel', {
+        aria-label={i18n.translate('discover.docViews.table.filterForValueButtonAriaLabel', {
           defaultMessage: 'Filter for value',
         })}
         className="kbnDocViewer__actionButton"
diff --git a/src/legacy/core_plugins/kibana/public/discover/np_ready/components/table/table_row_btn_filter_exists.tsx b/src/plugins/discover/public/components/table/table_row_btn_filter_exists.tsx
similarity index 80%
rename from src/legacy/core_plugins/kibana/public/discover/np_ready/components/table/table_row_btn_filter_exists.tsx
rename to src/plugins/discover/public/components/table/table_row_btn_filter_exists.tsx
index ba1cb4a4db4cf..dab22c103bc48 100644
--- a/src/legacy/core_plugins/kibana/public/discover/np_ready/components/table/table_row_btn_filter_exists.tsx
+++ b/src/plugins/discover/public/components/table/table_row_btn_filter_exists.tsx
@@ -35,18 +35,18 @@ export function DocViewTableRowBtnFilterExists({
   const tooltipContent = disabled ? (
     scripted ? (
       <FormattedMessage
-        id="kbn.discover.docViews.table.unableToFilterForPresenceOfScriptedFieldsTooltip"
+        id="discover.docViews.table.unableToFilterForPresenceOfScriptedFieldsTooltip"
         defaultMessage="Unable to filter for presence of scripted fields"
       />
     ) : (
       <FormattedMessage
-        id="kbn.discover.docViews.table.unableToFilterForPresenceOfMetaFieldsTooltip"
+        id="discover.docViews.table.unableToFilterForPresenceOfMetaFieldsTooltip"
         defaultMessage="Unable to filter for presence of meta fields"
       />
     )
   ) : (
     <FormattedMessage
-      id="kbn.discover.docViews.table.filterForFieldPresentButtonTooltip"
+      id="discover.docViews.table.filterForFieldPresentButtonTooltip"
       defaultMessage="Filter for field present"
     />
   );
@@ -54,12 +54,9 @@ export function DocViewTableRowBtnFilterExists({
   return (
     <EuiToolTip content={tooltipContent}>
       <EuiButtonIcon
-        aria-label={i18n.translate(
-          'kbn.discover.docViews.table.filterForFieldPresentButtonAriaLabel',
-          {
-            defaultMessage: 'Filter for field present',
-          }
-        )}
+        aria-label={i18n.translate('discover.docViews.table.filterForFieldPresentButtonAriaLabel', {
+          defaultMessage: 'Filter for field present',
+        })}
         onClick={onClick}
         className="kbnDocViewer__actionButton"
         data-test-subj="addExistsFilterButton"
diff --git a/src/legacy/core_plugins/kibana/public/discover/np_ready/components/table/table_row_btn_filter_remove.tsx b/src/plugins/discover/public/components/table/table_row_btn_filter_remove.tsx
similarity index 87%
rename from src/legacy/core_plugins/kibana/public/discover/np_ready/components/table/table_row_btn_filter_remove.tsx
rename to src/plugins/discover/public/components/table/table_row_btn_filter_remove.tsx
index 78538f337ba9e..bbef54cb4ecc7 100644
--- a/src/legacy/core_plugins/kibana/public/discover/np_ready/components/table/table_row_btn_filter_remove.tsx
+++ b/src/plugins/discover/public/components/table/table_row_btn_filter_remove.tsx
@@ -29,12 +29,12 @@ export interface Props {
 export function DocViewTableRowBtnFilterRemove({ onClick, disabled = false }: Props) {
   const tooltipContent = disabled ? (
     <FormattedMessage
-      id="kbn.discover.docViews.table.unindexedFieldsCanNotBeSearchedTooltip"
+      id="discover.docViews.table.unindexedFieldsCanNotBeSearchedTooltip"
       defaultMessage="Unindexed fields can not be searched"
     />
   ) : (
     <FormattedMessage
-      id="kbn.discover.docViews.table.filterOutValueButtonTooltip"
+      id="discover.docViews.table.filterOutValueButtonTooltip"
       defaultMessage="Filter out value"
     />
   );
@@ -42,7 +42,7 @@ export function DocViewTableRowBtnFilterRemove({ onClick, disabled = false }: Pr
   return (
     <EuiToolTip content={tooltipContent}>
       <EuiButtonIcon
-        aria-label={i18n.translate('kbn.discover.docViews.table.filterOutValueButtonAriaLabel', {
+        aria-label={i18n.translate('discover.docViews.table.filterOutValueButtonAriaLabel', {
           defaultMessage: 'Filter out value',
         })}
         className="kbnDocViewer__actionButton"
diff --git a/src/legacy/core_plugins/kibana/public/discover/np_ready/components/table/table_row_btn_toggle_column.tsx b/src/plugins/discover/public/components/table/table_row_btn_toggle_column.tsx
similarity index 79%
rename from src/legacy/core_plugins/kibana/public/discover/np_ready/components/table/table_row_btn_toggle_column.tsx
rename to src/plugins/discover/public/components/table/table_row_btn_toggle_column.tsx
index 7a8fca529ec5e..3e5a057929701 100644
--- a/src/legacy/core_plugins/kibana/public/discover/np_ready/components/table/table_row_btn_toggle_column.tsx
+++ b/src/plugins/discover/public/components/table/table_row_btn_toggle_column.tsx
@@ -31,12 +31,9 @@ export function DocViewTableRowBtnToggleColumn({ onClick, active, disabled = fal
   if (disabled) {
     return (
       <EuiButtonIcon
-        aria-label={i18n.translate(
-          'kbn.discover.docViews.table.toggleColumnInTableButtonAriaLabel',
-          {
-            defaultMessage: 'Toggle column in table',
-          }
-        )}
+        aria-label={i18n.translate('discover.docViews.table.toggleColumnInTableButtonAriaLabel', {
+          defaultMessage: 'Toggle column in table',
+        })}
         className="kbnDocViewer__actionButton"
         data-test-subj="toggleColumnButton"
         disabled
@@ -49,18 +46,15 @@ export function DocViewTableRowBtnToggleColumn({ onClick, active, disabled = fal
     <EuiToolTip
       content={
         <FormattedMessage
-          id="kbn.discover.docViews.table.toggleColumnInTableButtonTooltip"
+          id="discover.docViews.table.toggleColumnInTableButtonTooltip"
           defaultMessage="Toggle column in table"
         />
       }
     >
       <EuiButtonIcon
-        aria-label={i18n.translate(
-          'kbn.discover.docViews.table.toggleColumnInTableButtonAriaLabel',
-          {
-            defaultMessage: 'Toggle column in table',
-          }
-        )}
+        aria-label={i18n.translate('discover.docViews.table.toggleColumnInTableButtonAriaLabel', {
+          defaultMessage: 'Toggle column in table',
+        })}
         aria-pressed={active}
         onClick={onClick}
         className="kbnDocViewer__actionButton"
diff --git a/src/legacy/core_plugins/kibana/public/discover/np_ready/components/table/table_row_icon_no_mapping.tsx b/src/plugins/discover/public/components/table/table_row_icon_no_mapping.tsx
similarity index 86%
rename from src/legacy/core_plugins/kibana/public/discover/np_ready/components/table/table_row_icon_no_mapping.tsx
rename to src/plugins/discover/public/components/table/table_row_icon_no_mapping.tsx
index 347deb842c0bc..3094d366ce372 100644
--- a/src/legacy/core_plugins/kibana/public/discover/np_ready/components/table/table_row_icon_no_mapping.tsx
+++ b/src/plugins/discover/public/components/table/table_row_icon_no_mapping.tsx
@@ -21,14 +21,11 @@ import { EuiIconTip } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 
 export function DocViewTableRowIconNoMapping() {
-  const ariaLabel = i18n.translate(
-    'kbn.discover.docViews.table.noCachedMappingForThisFieldAriaLabel',
-    {
-      defaultMessage: 'Warning',
-    }
-  );
+  const ariaLabel = i18n.translate('discover.docViews.table.noCachedMappingForThisFieldAriaLabel', {
+    defaultMessage: 'Warning',
+  });
   const tooltipContent = i18n.translate(
-    'kbn.discover.docViews.table.noCachedMappingForThisFieldTooltip',
+    'discover.docViews.table.noCachedMappingForThisFieldTooltip',
     {
       defaultMessage:
         'No cached mapping for this field. Refresh field list from the Management > Index Patterns page',
diff --git a/src/legacy/core_plugins/kibana/public/discover/np_ready/components/table/table_row_icon_underscore.tsx b/src/plugins/discover/public/components/table/table_row_icon_underscore.tsx
similarity index 89%
rename from src/legacy/core_plugins/kibana/public/discover/np_ready/components/table/table_row_icon_underscore.tsx
rename to src/plugins/discover/public/components/table/table_row_icon_underscore.tsx
index 724b5712cf1fe..791ab18de5175 100644
--- a/src/legacy/core_plugins/kibana/public/discover/np_ready/components/table/table_row_icon_underscore.tsx
+++ b/src/plugins/discover/public/components/table/table_row_icon_underscore.tsx
@@ -22,13 +22,13 @@ import { i18n } from '@kbn/i18n';
 
 export function DocViewTableRowIconUnderscore() {
   const ariaLabel = i18n.translate(
-    'kbn.discover.docViews.table.fieldNamesBeginningWithUnderscoreUnsupportedAriaLabel',
+    'discover.docViews.table.fieldNamesBeginningWithUnderscoreUnsupportedAriaLabel',
     {
       defaultMessage: 'Warning',
     }
   );
   const tooltipContent = i18n.translate(
-    'kbn.discover.docViews.table.fieldNamesBeginningWithUnderscoreUnsupportedTooltip',
+    'discover.docViews.table.fieldNamesBeginningWithUnderscoreUnsupportedTooltip',
     {
       defaultMessage: 'Field names beginning with {underscoreSign} are not supported',
       values: { underscoreSign: '_' },
diff --git a/src/legacy/core_plugins/kibana/public/discover/np_ready/doc_views/doc_views_helpers.tsx b/src/plugins/discover/public/doc_views/doc_views_helpers.tsx
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/np_ready/doc_views/doc_views_helpers.tsx
rename to src/plugins/discover/public/doc_views/doc_views_helpers.tsx
diff --git a/src/legacy/core_plugins/kibana/public/discover/np_ready/doc_views/doc_views_registry.ts b/src/plugins/discover/public/doc_views/doc_views_registry.ts
similarity index 82%
rename from src/legacy/core_plugins/kibana/public/discover/np_ready/doc_views/doc_views_registry.ts
rename to src/plugins/discover/public/doc_views/doc_views_registry.ts
index 91acf1c7ac4ae..8f4518538be72 100644
--- a/src/legacy/core_plugins/kibana/public/discover/np_ready/doc_views/doc_views_registry.ts
+++ b/src/plugins/discover/public/doc_views/doc_views_registry.ts
@@ -23,8 +23,11 @@ import { DocView, DocViewInput, ElasticSearchHit, DocViewInputFn } from './doc_v
 
 export class DocViewsRegistry {
   private docViews: DocView[] = [];
+  private angularInjectorGetter: (() => Promise<auto.IInjectorService>) | null = null;
 
-  constructor(private getInjector: () => Promise<auto.IInjectorService>) {}
+  setAngularInjectorGetter(injectorGetter: () => Promise<auto.IInjectorService>) {
+    this.angularInjectorGetter = injectorGetter;
+  }
 
   /**
    * Extends and adds the given doc view to the registry array
@@ -33,7 +36,12 @@ export class DocViewsRegistry {
     const docView = typeof docViewRaw === 'function' ? docViewRaw() : docViewRaw;
     if (docView.directive) {
       // convert angular directive to render function for backwards compatibility
-      docView.render = convertDirectiveToRenderFn(docView.directive, this.getInjector);
+      docView.render = convertDirectiveToRenderFn(docView.directive, () => {
+        if (!this.angularInjectorGetter) {
+          throw new Error('Angular was not initialized');
+        }
+        return this.angularInjectorGetter();
+      });
     }
     if (typeof docView.shouldShow !== 'function') {
       docView.shouldShow = () => true;
diff --git a/src/legacy/core_plugins/kibana/public/discover/np_ready/doc_views/doc_views_types.ts b/src/plugins/discover/public/doc_views/doc_views_types.ts
similarity index 90%
rename from src/legacy/core_plugins/kibana/public/discover/np_ready/doc_views/doc_views_types.ts
rename to src/plugins/discover/public/doc_views/doc_views_types.ts
index a7828f9f0e7ed..0a4b5bb570bd7 100644
--- a/src/legacy/core_plugins/kibana/public/discover/np_ready/doc_views/doc_views_types.ts
+++ b/src/plugins/discover/public/doc_views/doc_views_types.ts
@@ -18,10 +18,10 @@
  */
 import { ComponentType } from 'react';
 import { IScope } from 'angular';
-import { IndexPattern } from '../../kibana_services';
+import { IndexPattern } from '../../../data/public';
 
 export interface AngularDirective {
-  controller: (scope: AngularScope) => void;
+  controller: (...injectedServices: any[]) => void;
   template: string;
 }
 
@@ -51,13 +51,14 @@ export interface DocViewRenderProps {
   onAddColumn?: (columnName: string) => void;
   onRemoveColumn?: (columnName: string) => void;
 }
+export type DocViewerComponent = ComponentType<DocViewRenderProps>;
 export type DocViewRenderFn = (
   domeNode: HTMLDivElement,
   renderProps: DocViewRenderProps
 ) => () => void;
 
 export interface DocViewInput {
-  component?: ComponentType<DocViewRenderProps>;
+  component?: DocViewerComponent;
   directive?: AngularDirective;
   order: number;
   render?: DocViewRenderFn;
diff --git a/src/plugins/discover/public/helpers/index.ts b/src/plugins/discover/public/helpers/index.ts
new file mode 100644
index 0000000000000..7196c96989e97
--- /dev/null
+++ b/src/plugins/discover/public/helpers/index.ts
@@ -0,0 +1,20 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+export { shortenDottedString } from './shorten_dotted_string';
diff --git a/src/plugins/discover/public/helpers/shorten_dotted_string.ts b/src/plugins/discover/public/helpers/shorten_dotted_string.ts
new file mode 100644
index 0000000000000..9d78a96784339
--- /dev/null
+++ b/src/plugins/discover/public/helpers/shorten_dotted_string.ts
@@ -0,0 +1,26 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+const DOT_PREFIX_RE = /(.).+?\./g;
+
+/**
+ * Convert a dot.notated.string into a short
+ * version (d.n.string)
+ */
+export const shortenDottedString = (input: string) => input.replace(DOT_PREFIX_RE, '$1.');
diff --git a/src/plugins/discover/public/index.scss b/src/plugins/discover/public/index.scss
new file mode 100644
index 0000000000000..841415620d691
--- /dev/null
+++ b/src/plugins/discover/public/index.scss
@@ -0,0 +1 @@
+@import 'components/index';
diff --git a/src/plugins/discover/public/index.ts b/src/plugins/discover/public/index.ts
index c5050147c3d5a..dbc361ee59f49 100644
--- a/src/plugins/discover/public/index.ts
+++ b/src/plugins/discover/public/index.ts
@@ -17,5 +17,18 @@
  * under the License.
  */
 
+import { DiscoverPlugin } from './plugin';
+
+export { DiscoverSetup, DiscoverStart } from './plugin';
+export { DocViewTable } from './components/table/table';
+export { JsonCodeBlock } from './components/json_code_block/json_code_block';
+export { DocViewInput, DocViewInputFn, DocViewerComponent } from './doc_views/doc_views_types';
+export { FieldName } from './components/field_name/field_name';
+export * from './doc_views/doc_views_types';
+
+export function plugin() {
+  return new DiscoverPlugin();
+}
+
 export { createSavedSearchesLoader } from './saved_searches/saved_searches';
 export { SavedSearchLoader, SavedSearch } from './saved_searches/types';
diff --git a/src/plugins/discover/public/mocks.ts b/src/plugins/discover/public/mocks.ts
new file mode 100644
index 0000000000000..bb05e3d412001
--- /dev/null
+++ b/src/plugins/discover/public/mocks.ts
@@ -0,0 +1,47 @@
+/*
+ * 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 { DiscoverSetup, DiscoverStart } from '.';
+
+export type Setup = jest.Mocked<DiscoverSetup>;
+export type Start = jest.Mocked<DiscoverStart>;
+
+const createSetupContract = (): Setup => {
+  const setupContract: Setup = {
+    docViews: {
+      addDocView: jest.fn(),
+      setAngularInjectorGetter: jest.fn(),
+    },
+  };
+  return setupContract;
+};
+
+const createStartContract = (): Start => {
+  const startContract: Start = {
+    docViews: {
+      DocViewer: jest.fn(() => null),
+    },
+  };
+  return startContract;
+};
+
+export const discoverPluginMock = {
+  createSetupContract,
+  createStartContract,
+};
diff --git a/src/plugins/discover/public/plugin.ts b/src/plugins/discover/public/plugin.ts
new file mode 100644
index 0000000000000..d2797586bfdfb
--- /dev/null
+++ b/src/plugins/discover/public/plugin.ts
@@ -0,0 +1,110 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import React from 'react';
+import { i18n } from '@kbn/i18n';
+import { auto } from 'angular';
+import { CoreSetup, Plugin } from 'kibana/public';
+import { DocViewInput, DocViewInputFn, DocViewRenderProps } from './doc_views/doc_views_types';
+import { DocViewsRegistry } from './doc_views/doc_views_registry';
+import { DocViewTable } from './components/table/table';
+import { JsonCodeBlock } from './components/json_code_block/json_code_block';
+import { DocViewer } from './components/doc_viewer/doc_viewer';
+import { setDocViewsRegistry } from './services';
+
+import './index.scss';
+
+/**
+ * @public
+ */
+export interface DiscoverSetup {
+  docViews: {
+    /**
+     * Add new doc view shown along with table view and json view in the details of each document in Discover.
+     * Both react and angular doc views are supported.
+     * @param docViewRaw
+     */
+    addDocView(docViewRaw: DocViewInput | DocViewInputFn): void;
+    /**
+     * Set the angular injector for bootstrapping angular doc views. This is only exposed temporarily to aid
+     * migration to the new platform and will be removed soon.
+     * @deprecated
+     * @param injectorGetter
+     */
+    setAngularInjectorGetter(injectorGetter: () => Promise<auto.IInjectorService>): void;
+  };
+}
+/**
+ * @public
+ */
+export interface DiscoverStart {
+  docViews: {
+    /**
+     * Component rendering all the doc views for a given document.
+     * This is only exposed temporarily to aid migration to the new platform and will be removed soon.
+     * @deprecated
+     */
+    DocViewer: React.ComponentType<DocViewRenderProps>;
+  };
+}
+
+/**
+ * Contains Discover, one of the oldest parts of Kibana
+ * There are 2 kinds of Angular bootstrapped for rendering, additionally to the main Angular
+ * Discover provides embeddables, those contain a slimmer Angular
+ */
+export class DiscoverPlugin implements Plugin<DiscoverSetup, DiscoverStart> {
+  private docViewsRegistry: DocViewsRegistry | null = null;
+
+  setup(core: CoreSetup): DiscoverSetup {
+    this.docViewsRegistry = new DocViewsRegistry();
+    setDocViewsRegistry(this.docViewsRegistry);
+    this.docViewsRegistry.addDocView({
+      title: i18n.translate('discover.docViews.table.tableTitle', {
+        defaultMessage: 'Table',
+      }),
+      order: 10,
+      component: DocViewTable,
+    });
+    this.docViewsRegistry.addDocView({
+      title: i18n.translate('discover.docViews.json.jsonTitle', {
+        defaultMessage: 'JSON',
+      }),
+      order: 20,
+      component: JsonCodeBlock,
+    });
+
+    return {
+      docViews: {
+        addDocView: this.docViewsRegistry.addDocView.bind(this.docViewsRegistry),
+        setAngularInjectorGetter: this.docViewsRegistry.setAngularInjectorGetter.bind(
+          this.docViewsRegistry
+        ),
+      },
+    };
+  }
+
+  start() {
+    return {
+      docViews: {
+        DocViewer,
+      },
+    };
+  }
+}
diff --git a/src/plugins/discover/public/saved_searches/_saved_search.ts b/src/plugins/discover/public/saved_searches/_saved_search.ts
index 72983b7835eee..56360b04a49c8 100644
--- a/src/plugins/discover/public/saved_searches/_saved_search.ts
+++ b/src/plugins/discover/public/saved_searches/_saved_search.ts
@@ -16,7 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { createSavedObjectClass, SavedObjectKibanaServices } from '../../../saved_objects/public';
+import {
+  createSavedObjectClass,
+  SavedObject,
+  SavedObjectKibanaServices,
+} from '../../../saved_objects/public';
 
 export function createSavedSearchClass(services: SavedObjectKibanaServices) {
   const SavedObjectClass = createSavedObjectClass(services);
@@ -66,5 +70,5 @@ export function createSavedSearchClass(services: SavedObjectKibanaServices) {
     }
   }
 
-  return SavedSearch;
+  return SavedSearch as new (id: string) => SavedObject;
 }
diff --git a/src/plugins/discover/public/services.ts b/src/plugins/discover/public/services.ts
new file mode 100644
index 0000000000000..3a28759d82b71
--- /dev/null
+++ b/src/plugins/discover/public/services.ts
@@ -0,0 +1,25 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { createGetterSetter } from '../../kibana_utils/common';
+import { DocViewsRegistry } from './doc_views/doc_views_registry';
+
+export const [getDocViewsRegistry, setDocViewsRegistry] = createGetterSetter<DocViewsRegistry>(
+  'DocViewsRegistry'
+);
diff --git a/test/plugin_functional/config.js b/test/plugin_functional/config.js
index e63054f1b6912..7017c01cc5634 100644
--- a/test/plugin_functional/config.js
+++ b/test/plugin_functional/config.js
@@ -39,6 +39,7 @@ export default async function({ readConfigFile }) {
       require.resolve('./test_suites/core_plugins'),
       require.resolve('./test_suites/management'),
       require.resolve('./test_suites/bfetch_explorer'),
+      require.resolve('./test_suites/doc_views'),
     ],
     services: {
       ...functionalConfig.get('services'),
diff --git a/test/plugin_functional/plugins/doc_views_plugin/kibana.json b/test/plugin_functional/plugins/doc_views_plugin/kibana.json
new file mode 100644
index 0000000000000..f8596aad01e87
--- /dev/null
+++ b/test/plugin_functional/plugins/doc_views_plugin/kibana.json
@@ -0,0 +1,8 @@
+{
+  "id": "docViewPlugin",
+  "version": "0.0.1",
+  "kibanaVersion": "kibana",
+  "server": false,
+  "ui": true,
+  "requiredPlugins": ["discover"]
+}
diff --git a/test/plugin_functional/plugins/doc_views_plugin/package.json b/test/plugin_functional/plugins/doc_views_plugin/package.json
new file mode 100644
index 0000000000000..0cef1bf65c0e8
--- /dev/null
+++ b/test/plugin_functional/plugins/doc_views_plugin/package.json
@@ -0,0 +1,17 @@
+{
+  "name": "docViewPlugin",
+  "version": "1.0.0",
+  "main": "target/test/plugin_functional/plugins/doc_views_plugin",
+  "kibana": {
+    "version": "kibana",
+    "templateVersion": "1.0.0"
+  },
+  "license": "Apache-2.0",
+  "scripts": {
+    "kbn": "node ../../../../scripts/kbn.js",
+    "build": "rm -rf './target' && tsc"
+  },
+  "devDependencies": {
+    "typescript": "3.7.2"
+  }
+}
diff --git a/test/plugin_functional/plugins/doc_views_plugin/public/index.ts b/test/plugin_functional/plugins/doc_views_plugin/public/index.ts
new file mode 100644
index 0000000000000..8097226180763
--- /dev/null
+++ b/test/plugin_functional/plugins/doc_views_plugin/public/index.ts
@@ -0,0 +1,22 @@
+/*
+ * 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 { DocViewsPlugin } from './plugin';
+
+export const plugin = () => new DocViewsPlugin();
diff --git a/test/plugin_functional/plugins/doc_views_plugin/public/plugin.tsx b/test/plugin_functional/plugins/doc_views_plugin/public/plugin.tsx
new file mode 100644
index 0000000000000..4b9823fda3673
--- /dev/null
+++ b/test/plugin_functional/plugins/doc_views_plugin/public/plugin.tsx
@@ -0,0 +1,60 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import angular from 'angular';
+import React from 'react';
+import { Plugin, CoreSetup } from 'kibana/public';
+import { DiscoverSetup } from '../../../../../src/plugins/discover/public';
+
+angular.module('myDocView', []).directive('myHit', () => ({
+  restrict: 'E',
+  scope: {
+    hit: '=hit',
+  },
+  template: '<h1 data-test-subj="angular-docview">{{hit._index}}</h1>',
+}));
+
+function MyHit(props: { index: string }) {
+  return <h1 data-test-subj="react-docview">{props.index}</h1>;
+}
+
+export class DocViewsPlugin implements Plugin<void, void> {
+  public setup(core: CoreSetup, { discover }: { discover: DiscoverSetup }) {
+    discover.docViews.addDocView({
+      directive: {
+        controller: function MyController($injector: any) {
+          $injector.loadNewModules(['myDocView']);
+        },
+        template: `<my-hit hit="hit"></my-hit>`,
+      },
+      order: 1,
+      title: 'Angular doc view',
+    });
+
+    discover.docViews.addDocView({
+      component: props => {
+        return <MyHit index={props.hit._index as string} />;
+      },
+      order: 2,
+      title: 'React doc view',
+    });
+  }
+
+  public start() {}
+}
diff --git a/test/plugin_functional/plugins/doc_views_plugin/tsconfig.json b/test/plugin_functional/plugins/doc_views_plugin/tsconfig.json
new file mode 100644
index 0000000000000..4a564ee1e5578
--- /dev/null
+++ b/test/plugin_functional/plugins/doc_views_plugin/tsconfig.json
@@ -0,0 +1,14 @@
+{
+  "extends": "../../../../tsconfig.json",
+  "compilerOptions": {
+    "outDir": "./target",
+    "skipLibCheck": true
+  },
+  "include": [
+    "index.ts",
+    "public/**/*.ts",
+    "public/**/*.tsx",
+    "../../../../typings/**/*"
+  ],
+  "exclude": []
+}
diff --git a/test/plugin_functional/test_suites/doc_views/doc_views.ts b/test/plugin_functional/test_suites/doc_views/doc_views.ts
new file mode 100644
index 0000000000000..8764f45c2c076
--- /dev/null
+++ b/test/plugin_functional/test_suites/doc_views/doc_views.ts
@@ -0,0 +1,57 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import expect from '@kbn/expect';
+import { PluginFunctionalProviderContext } from '../../services';
+
+// eslint-disable-next-line import/no-default-export
+export default function({ getService, getPageObjects }: PluginFunctionalProviderContext) {
+  const testSubjects = getService('testSubjects');
+  const find = getService('find');
+  const PageObjects = getPageObjects(['common', 'discover', 'timePicker']);
+
+  describe('custom doc views', function() {
+    before(async () => {
+      await PageObjects.common.navigateToApp('discover');
+      await PageObjects.timePicker.setDefaultAbsoluteRange();
+    });
+
+    it('should show custom doc views', async () => {
+      await testSubjects.click('docTableExpandToggleColumn');
+      const angularTab = await find.byButtonText('Angular doc view');
+      const reactTab = await find.byButtonText('React doc view');
+      expect(await angularTab.isDisplayed()).to.be(true);
+      expect(await reactTab.isDisplayed()).to.be(true);
+    });
+
+    it('should render angular doc view', async () => {
+      const angularTab = await find.byButtonText('Angular doc view');
+      await angularTab.click();
+      const angularContent = await testSubjects.find('angular-docview');
+      expect(await angularContent.getVisibleText()).to.be('logstash-2015.09.22');
+    });
+
+    it('should render react doc view', async () => {
+      const reactTab = await find.byButtonText('React doc view');
+      await reactTab.click();
+      const reactContent = await testSubjects.find('react-docview');
+      expect(await reactContent.getVisibleText()).to.be('logstash-2015.09.22');
+    });
+  });
+}
diff --git a/test/plugin_functional/test_suites/doc_views/index.ts b/test/plugin_functional/test_suites/doc_views/index.ts
new file mode 100644
index 0000000000000..dee3a72e3f2c6
--- /dev/null
+++ b/test/plugin_functional/test_suites/doc_views/index.ts
@@ -0,0 +1,31 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+import { PluginFunctionalProviderContext } from '../../services';
+
+export default function({ getService, loadTestFile }: PluginFunctionalProviderContext) {
+  const esArchiver = getService('esArchiver');
+
+  describe('doc views', function() {
+    before(async () => {
+      await esArchiver.loadIfNeeded('../functional/fixtures/es_archiver/discover');
+    });
+
+    loadTestFile(require.resolve('./doc_views'));
+  });
+}
diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json
index e8d93ba6d3200..fe7ad863945c5 100644
--- a/x-pack/plugins/translations/translations/ja-JP.json
+++ b/x-pack/plugins/translations/translations/ja-JP.json
@@ -464,6 +464,17 @@
     "data.search.searchBar.savedQueryPopoverSavedQueryListItemDescriptionAriaLabel": "{savedQueryName} の説明",
     "data.search.searchBar.savedQueryPopoverSavedQueryListItemSelectedButtonAriaLabel": "選択されたクエリボタン {savedQueryName} を保存しました。変更を破棄するには押してください。",
     "data.search.searchBar.savedQueryPopoverTitleText": "保存されたクエリ",
+    "discover.fieldNameIcons.booleanAriaLabel": "ブールフィールド",
+    "discover.fieldNameIcons.conflictFieldAriaLabel": "矛盾フィールド",
+    "discover.fieldNameIcons.dateFieldAriaLabel": "日付フィールド",
+    "discover.fieldNameIcons.geoPointFieldAriaLabel": "地理ポイント",
+    "discover.fieldNameIcons.geoShapeFieldAriaLabel": "地理情報図形",
+    "discover.fieldNameIcons.ipAddressFieldAriaLabel": "IP アドレスフィールド",
+    "discover.fieldNameIcons.murmur3FieldAriaLabel": "Murmur3 フィールド",
+    "discover.fieldNameIcons.numberFieldAriaLabel": "数値フィールド",
+    "discover.fieldNameIcons.sourceFieldAriaLabel": "ソースフィールド",
+    "discover.fieldNameIcons.stringFieldAriaLabel": "文字列フィールド",
+    "discover.fieldNameIcons.unknownFieldAriaLabel": "不明なフィールド",
     "charts.colormaps.bluesText": "青",
     "charts.colormaps.greensText": "緑",
     "charts.colormaps.greenToRedText": "緑から赤",
@@ -1075,17 +1086,6 @@
     "kbn.discover.fieldChooser.searchPlaceHolder": "検索フィールド",
     "kbn.discover.fieldChooser.toggleFieldFilterButtonHideAriaLabel": "フィールド設定を非表示",
     "kbn.discover.fieldChooser.toggleFieldFilterButtonShowAriaLabel": "フィールド設定を表示",
-    "kbn.discover.fieldNameIcons.booleanAriaLabel": "ブールフィールド",
-    "kbn.discover.fieldNameIcons.conflictFieldAriaLabel": "矛盾フィールド",
-    "kbn.discover.fieldNameIcons.dateFieldAriaLabel": "日付フィールド",
-    "kbn.discover.fieldNameIcons.geoPointFieldAriaLabel": "地理ポイント",
-    "kbn.discover.fieldNameIcons.geoShapeFieldAriaLabel": "地理情報図形",
-    "kbn.discover.fieldNameIcons.ipAddressFieldAriaLabel": "IP アドレスフィールド",
-    "kbn.discover.fieldNameIcons.murmur3FieldAriaLabel": "Murmur3 フィールド",
-    "kbn.discover.fieldNameIcons.numberFieldAriaLabel": "数値フィールド",
-    "kbn.discover.fieldNameIcons.sourceFieldAriaLabel": "ソースフィールド",
-    "kbn.discover.fieldNameIcons.stringFieldAriaLabel": "文字列フィールド",
-    "kbn.discover.fieldNameIcons.unknownFieldAriaLabel": "不明なフィールド",
     "kbn.discover.histogram.partialData.bucketTooltipText": "選択された時間範囲にはこのバケット全体は含まれていませんが、一部データが含まれている可能性があります。",
     "kbn.discover.histogramOfFoundDocumentsAriaLabel": "発見されたドキュメントのヒストグラム",
     "kbn.discover.hitsPluralTitle": "{hits, plural, one {ヒット} other {ヒット}}",
diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json
index cfab424935c6d..e1cfa5e4ef358 100644
--- a/x-pack/plugins/translations/translations/zh-CN.json
+++ b/x-pack/plugins/translations/translations/zh-CN.json
@@ -464,6 +464,17 @@
     "data.search.searchBar.savedQueryPopoverSavedQueryListItemDescriptionAriaLabel": "{savedQueryName} 描述",
     "data.search.searchBar.savedQueryPopoverSavedQueryListItemSelectedButtonAriaLabel": "已保存查询按钮已选择 {savedQueryName}。按下可清除任何更改。",
     "data.search.searchBar.savedQueryPopoverTitleText": "已保存查询",
+    "discover.fieldNameIcons.booleanAriaLabel": "布尔字段",
+    "discover.fieldNameIcons.conflictFieldAriaLabel": "冲突字段",
+    "discover.fieldNameIcons.dateFieldAriaLabel": "日期字段",
+    "discover.fieldNameIcons.geoPointFieldAriaLabel": "地理位置点字段",
+    "discover.fieldNameIcons.geoShapeFieldAriaLabel": "几何形状字段",
+    "discover.fieldNameIcons.ipAddressFieldAriaLabel": "IP 地址字段",
+    "discover.fieldNameIcons.murmur3FieldAriaLabel": "Murmur3 字段",
+    "discover.fieldNameIcons.numberFieldAriaLabel": "数字字段",
+    "discover.fieldNameIcons.sourceFieldAriaLabel": "源字段",
+    "discover.fieldNameIcons.stringFieldAriaLabel": "字符串字段",
+    "discover.fieldNameIcons.unknownFieldAriaLabel": "未知字段",
     "charts.colormaps.bluesText": "蓝色",
     "charts.colormaps.greensText": "绿色",
     "charts.colormaps.greenToRedText": "绿到红",
@@ -1075,17 +1086,6 @@
     "kbn.discover.fieldChooser.searchPlaceHolder": "搜索字段",
     "kbn.discover.fieldChooser.toggleFieldFilterButtonHideAriaLabel": "隐藏字段设置",
     "kbn.discover.fieldChooser.toggleFieldFilterButtonShowAriaLabel": "显示字段设置",
-    "kbn.discover.fieldNameIcons.booleanAriaLabel": "布尔字段",
-    "kbn.discover.fieldNameIcons.conflictFieldAriaLabel": "冲突字段",
-    "kbn.discover.fieldNameIcons.dateFieldAriaLabel": "日期字段",
-    "kbn.discover.fieldNameIcons.geoPointFieldAriaLabel": "地理位置点字段",
-    "kbn.discover.fieldNameIcons.geoShapeFieldAriaLabel": "几何形状字段",
-    "kbn.discover.fieldNameIcons.ipAddressFieldAriaLabel": "IP 地址字段",
-    "kbn.discover.fieldNameIcons.murmur3FieldAriaLabel": "Murmur3 字段",
-    "kbn.discover.fieldNameIcons.numberFieldAriaLabel": "数字字段",
-    "kbn.discover.fieldNameIcons.sourceFieldAriaLabel": "源字段",
-    "kbn.discover.fieldNameIcons.stringFieldAriaLabel": "字符串字段",
-    "kbn.discover.fieldNameIcons.unknownFieldAriaLabel": "未知字段",
     "kbn.discover.histogram.partialData.bucketTooltipText": "选定的时间范围不包括此整个存储桶，其可能包含部分数据。",
     "kbn.discover.histogramOfFoundDocumentsAriaLabel": "已找到文档的直方图",
     "kbn.discover.hitsPluralTitle": "{hits, plural, one {次命中} other {次命中}}",

From e6dbc3fc21c89dc82ddf69221695543e4bfa0a4d Mon Sep 17 00:00:00 2001
From: Tudor Golubenco <tudor@elastic.co>
Date: Tue, 24 Mar 2020 08:10:10 +0100
Subject: [PATCH 056/179] [SIEM] Updates process and TLS tables to use ECS 1.5
 fields (#60854)

* Added new process filter
* Use new ECS TLS fields
---
 .../__snapshots__/index.test.tsx.snap         |   35 +-
 .../page/network/tls_table/columns.tsx        |   26 +-
 .../components/page/network/tls_table/mock.ts |   15 +-
 .../page/network/tls_table/translations.ts    |    2 +-
 .../public/containers/tls/index.gql_query.ts  |    5 +-
 .../siem/public/graphql/introspection.json    |   20 +-
 .../plugins/siem/public/graphql/types.ts      |   12 +-
 .../siem/server/graphql/tls/schema.gql.ts     |    5 +-
 .../plugins/siem/server/graphql/types.ts      |   21 +-
 .../server/lib/tls/elasticsearch_adapter.ts   |    5 +-
 .../plugins/siem/server/lib/tls/mock.ts       |  274 +-
 .../siem/server/lib/tls/query_tls.dsl.ts      |   21 +-
 .../plugins/siem/server/lib/tls/types.ts      |    8 +-
 .../lib/uncommon_processes/query.dsl.ts       |   16 +
 x-pack/test/api_integration/apis/siem/tls.ts  |   68 +-
 .../es_archives/packetbeat/tls/data.json.gz   |  Bin 0 -> 3929 bytes
 .../es_archives/packetbeat/tls/mappings.json  | 9583 +++++++++++++++++
 17 files changed, 9739 insertions(+), 377 deletions(-)
 create mode 100644 x-pack/test/functional/es_archives/packetbeat/tls/data.json.gz
 create mode 100644 x-pack/test/functional/es_archives/packetbeat/tls/mappings.json

diff --git a/x-pack/legacy/plugins/siem/public/components/page/network/tls_table/__snapshots__/index.test.tsx.snap b/x-pack/legacy/plugins/siem/public/components/page/network/tls_table/__snapshots__/index.test.tsx.snap
index 85b028cf7cd51..8b7d8efa7ac37 100644
--- a/x-pack/legacy/plugins/siem/public/components/page/network/tls_table/__snapshots__/index.test.tsx.snap
+++ b/x-pack/legacy/plugins/siem/public/components/page/network/tls_table/__snapshots__/index.test.tsx.snap
@@ -10,14 +10,7 @@ exports[`Tls Table Component Rendering it renders the default Domains table 1`]
         },
         "node": Object {
           "_id": "2fe3bdf168af35b9e0ce5dc583bab007c40d47de",
-          "alternativeNames": Array [
-            "*.elastic.co",
-            "elastic.co",
-          ],
-          "commonNames": Array [
-            "*.elastic.co",
-          ],
-          "issuerNames": Array [
+          "issuers": Array [
             "DigiCert SHA2 Secure Server CA",
           ],
           "ja3": Array [
@@ -27,6 +20,9 @@ exports[`Tls Table Component Rendering it renders the default Domains table 1`]
           "notAfter": Array [
             "2021-04-22T12:00:00.000Z",
           ],
+          "subjects": Array [
+            "*.elastic.co",
+          ],
         },
       },
       Object {
@@ -35,13 +31,7 @@ exports[`Tls Table Component Rendering it renders the default Domains table 1`]
         },
         "node": Object {
           "_id": "61749734b3246f1584029deb4f5276c64da00ada",
-          "alternativeNames": Array [
-            "api.snapcraft.io",
-          ],
-          "commonNames": Array [
-            "api.snapcraft.io",
-          ],
-          "issuerNames": Array [
+          "issuers": Array [
             "DigiCert SHA2 Secure Server CA",
           ],
           "ja3": Array [
@@ -50,6 +40,9 @@ exports[`Tls Table Component Rendering it renders the default Domains table 1`]
           "notAfter": Array [
             "2019-05-22T12:00:00.000Z",
           ],
+          "subjects": Array [
+            "api.snapcraft.io",
+          ],
         },
       },
       Object {
@@ -58,14 +51,7 @@ exports[`Tls Table Component Rendering it renders the default Domains table 1`]
         },
         "node": Object {
           "_id": "6560d3b7dd001c989b85962fa64beb778cdae47a",
-          "alternativeNames": Array [
-            "changelogs.ubuntu.com",
-            "manpages.ubuntu.com",
-          ],
-          "commonNames": Array [
-            "changelogs.ubuntu.com",
-          ],
-          "issuerNames": Array [
+          "issuers": Array [
             "Let's Encrypt Authority X3",
           ],
           "ja3": Array [
@@ -74,6 +60,9 @@ exports[`Tls Table Component Rendering it renders the default Domains table 1`]
           "notAfter": Array [
             "2019-06-27T01:09:59.000Z",
           ],
+          "subjects": Array [
+            "changelogs.ubuntu.com",
+          ],
         },
       },
     ]
diff --git a/x-pack/legacy/plugins/siem/public/components/page/network/tls_table/columns.tsx b/x-pack/legacy/plugins/siem/public/components/page/network/tls_table/columns.tsx
index 44a538871d951..f95475819abc9 100644
--- a/x-pack/legacy/plugins/siem/public/components/page/network/tls_table/columns.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/page/network/tls_table/columns.tsx
@@ -32,11 +32,11 @@ export const getTlsColumns = (tableId: string): TlsColumns => [
     truncateText: false,
     hideForMobile: false,
     sortable: false,
-    render: ({ _id, issuerNames }) =>
+    render: ({ _id, issuers }) =>
       getRowItemDraggables({
-        rowItems: issuerNames,
-        attrName: 'tls.server_certificate.issuer.common_name',
-        idPrefix: `${tableId}-${_id}-table-issuerNames`,
+        rowItems: issuers,
+        attrName: 'tls.server.issuer',
+        idPrefix: `${tableId}-${_id}-table-issuers`,
       }),
   },
   {
@@ -45,18 +45,12 @@ export const getTlsColumns = (tableId: string): TlsColumns => [
     truncateText: false,
     hideForMobile: false,
     sortable: false,
-    render: ({ _id, alternativeNames, commonNames }) =>
-      alternativeNames != null && alternativeNames.length > 0
-        ? getRowItemDraggables({
-            rowItems: alternativeNames,
-            attrName: 'tls.server_certificate.alternative_names',
-            idPrefix: `${tableId}-${_id}-table-alternative-name`,
-          })
-        : getRowItemDraggables({
-            rowItems: commonNames,
-            attrName: 'tls.server_certificate.subject.common_name',
-            idPrefix: `${tableId}-${_id}-table-common-name`,
-          }),
+    render: ({ _id, subjects }) =>
+      getRowItemDraggables({
+        rowItems: subjects,
+        attrName: 'tls.server.subject',
+        idPrefix: `${tableId}-${_id}-table-subjects`,
+      }),
   },
   {
     field: 'node._id',
diff --git a/x-pack/legacy/plugins/siem/public/components/page/network/tls_table/mock.ts b/x-pack/legacy/plugins/siem/public/components/page/network/tls_table/mock.ts
index 77148bf50c038..453bd8fc84dfa 100644
--- a/x-pack/legacy/plugins/siem/public/components/page/network/tls_table/mock.ts
+++ b/x-pack/legacy/plugins/siem/public/components/page/network/tls_table/mock.ts
@@ -12,10 +12,9 @@ export const mockTlsData: TlsData = {
     {
       node: {
         _id: '2fe3bdf168af35b9e0ce5dc583bab007c40d47de',
-        alternativeNames: ['*.elastic.co', 'elastic.co'],
-        commonNames: ['*.elastic.co'],
+        subjects: ['*.elastic.co'],
         ja3: ['7851693188210d3b271aa1713d8c68c2', 'fb4726d465c5f28b84cd6d14cedd13a7'],
-        issuerNames: ['DigiCert SHA2 Secure Server CA'],
+        issuers: ['DigiCert SHA2 Secure Server CA'],
         notAfter: ['2021-04-22T12:00:00.000Z'],
       },
       cursor: {
@@ -25,10 +24,9 @@ export const mockTlsData: TlsData = {
     {
       node: {
         _id: '61749734b3246f1584029deb4f5276c64da00ada',
-        alternativeNames: ['api.snapcraft.io'],
-        commonNames: ['api.snapcraft.io'],
+        subjects: ['api.snapcraft.io'],
         ja3: ['839868ad711dc55bde0d37a87f14740d'],
-        issuerNames: ['DigiCert SHA2 Secure Server CA'],
+        issuers: ['DigiCert SHA2 Secure Server CA'],
         notAfter: ['2019-05-22T12:00:00.000Z'],
       },
       cursor: {
@@ -38,10 +36,9 @@ export const mockTlsData: TlsData = {
     {
       node: {
         _id: '6560d3b7dd001c989b85962fa64beb778cdae47a',
-        alternativeNames: ['changelogs.ubuntu.com', 'manpages.ubuntu.com'],
-        commonNames: ['changelogs.ubuntu.com'],
+        subjects: ['changelogs.ubuntu.com'],
         ja3: ['da12c94da8021bbaf502907ad086e7bc'],
-        issuerNames: ["Let's Encrypt Authority X3"],
+        issuers: ["Let's Encrypt Authority X3"],
         notAfter: ['2019-06-27T01:09:59.000Z'],
       },
       cursor: {
diff --git a/x-pack/legacy/plugins/siem/public/components/page/network/tls_table/translations.ts b/x-pack/legacy/plugins/siem/public/components/page/network/tls_table/translations.ts
index 89d0f58684cbe..ff714204144ec 100644
--- a/x-pack/legacy/plugins/siem/public/components/page/network/tls_table/translations.ts
+++ b/x-pack/legacy/plugins/siem/public/components/page/network/tls_table/translations.ts
@@ -16,7 +16,7 @@ export const TRANSPORT_LAYER_SECURITY = i18n.translate(
 export const UNIT = (totalCount: number) =>
   i18n.translate('xpack.siem.network.ipDetails.tlsTable.unit', {
     values: { totalCount },
-    defaultMessage: `{totalCount, plural, =1 {issuer} other {issuers}}`,
+    defaultMessage: `{totalCount, plural, =1 {server certificate} other {server certificates}}`,
   });
 
 // Columns
diff --git a/x-pack/legacy/plugins/siem/public/containers/tls/index.gql_query.ts b/x-pack/legacy/plugins/siem/public/containers/tls/index.gql_query.ts
index bbb92282bee83..f513a94d69667 100644
--- a/x-pack/legacy/plugins/siem/public/containers/tls/index.gql_query.ts
+++ b/x-pack/legacy/plugins/siem/public/containers/tls/index.gql_query.ts
@@ -33,10 +33,9 @@ export const tlsQuery = gql`
         edges {
           node {
             _id
-            alternativeNames
-            commonNames
+            subjects
             ja3
-            issuerNames
+            issuers
             notAfter
           }
           cursor {
diff --git a/x-pack/legacy/plugins/siem/public/graphql/introspection.json b/x-pack/legacy/plugins/siem/public/graphql/introspection.json
index 9802a5f5bd3bf..5d43024625d0d 100644
--- a/x-pack/legacy/plugins/siem/public/graphql/introspection.json
+++ b/x-pack/legacy/plugins/siem/public/graphql/introspection.json
@@ -9213,22 +9213,6 @@
             "isDeprecated": false,
             "deprecationReason": null
           },
-          {
-            "name": "alternativeNames",
-            "description": "",
-            "args": [],
-            "type": {
-              "kind": "LIST",
-              "name": null,
-              "ofType": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": { "kind": "SCALAR", "name": "String", "ofType": null }
-              }
-            },
-            "isDeprecated": false,
-            "deprecationReason": null
-          },
           {
             "name": "notAfter",
             "description": "",
@@ -9246,7 +9230,7 @@
             "deprecationReason": null
           },
           {
-            "name": "commonNames",
+            "name": "subjects",
             "description": "",
             "args": [],
             "type": {
@@ -9278,7 +9262,7 @@
             "deprecationReason": null
           },
           {
-            "name": "issuerNames",
+            "name": "issuers",
             "description": "",
             "args": [],
             "type": {
diff --git a/x-pack/legacy/plugins/siem/public/graphql/types.ts b/x-pack/legacy/plugins/siem/public/graphql/types.ts
index 3528ee6e13a38..a5d1e3fbcba27 100644
--- a/x-pack/legacy/plugins/siem/public/graphql/types.ts
+++ b/x-pack/legacy/plugins/siem/public/graphql/types.ts
@@ -1859,15 +1859,13 @@ export interface TlsNode {
 
   timestamp?: Maybe<string>;
 
-  alternativeNames?: Maybe<string[]>;
-
   notAfter?: Maybe<string[]>;
 
-  commonNames?: Maybe<string[]>;
+  subjects?: Maybe<string[]>;
 
   ja3?: Maybe<string[]>;
 
-  issuerNames?: Maybe<string[]>;
+  issuers?: Maybe<string[]>;
 }
 
 export interface UncommonProcessesData {
@@ -5679,13 +5677,11 @@ export namespace GetTlsQuery {
 
     _id: Maybe<string>;
 
-    alternativeNames: Maybe<string[]>;
-
-    commonNames: Maybe<string[]>;
+    subjects: Maybe<string[]>;
 
     ja3: Maybe<string[]>;
 
-    issuerNames: Maybe<string[]>;
+    issuers: Maybe<string[]>;
 
     notAfter: Maybe<string[]>;
   };
diff --git a/x-pack/legacy/plugins/siem/server/graphql/tls/schema.gql.ts b/x-pack/legacy/plugins/siem/server/graphql/tls/schema.gql.ts
index 301960cea33ef..452c615c65aa5 100644
--- a/x-pack/legacy/plugins/siem/server/graphql/tls/schema.gql.ts
+++ b/x-pack/legacy/plugins/siem/server/graphql/tls/schema.gql.ts
@@ -13,11 +13,10 @@ export const tlsSchema = gql`
   type TlsNode {
     _id: String
     timestamp: Date
-    alternativeNames: [String!]
     notAfter: [String!]
-    commonNames: [String!]
+    subjects: [String!]
     ja3: [String!]
-    issuerNames: [String!]
+    issuers: [String!]
   }
   input TlsSortField {
     field: TlsFields!
diff --git a/x-pack/legacy/plugins/siem/server/graphql/types.ts b/x-pack/legacy/plugins/siem/server/graphql/types.ts
index f42da48f2c1da..e2b365f8bfa5b 100644
--- a/x-pack/legacy/plugins/siem/server/graphql/types.ts
+++ b/x-pack/legacy/plugins/siem/server/graphql/types.ts
@@ -1861,15 +1861,13 @@ export interface TlsNode {
 
   timestamp?: Maybe<string>;
 
-  alternativeNames?: Maybe<string[]>;
-
   notAfter?: Maybe<string[]>;
 
-  commonNames?: Maybe<string[]>;
+  subjects?: Maybe<string[]>;
 
   ja3?: Maybe<string[]>;
 
-  issuerNames?: Maybe<string[]>;
+  issuers?: Maybe<string[]>;
 }
 
 export interface UncommonProcessesData {
@@ -7824,15 +7822,13 @@ export namespace TlsNodeResolvers {
 
     timestamp?: TimestampResolver<Maybe<string>, TypeParent, TContext>;
 
-    alternativeNames?: AlternativeNamesResolver<Maybe<string[]>, TypeParent, TContext>;
-
     notAfter?: NotAfterResolver<Maybe<string[]>, TypeParent, TContext>;
 
-    commonNames?: CommonNamesResolver<Maybe<string[]>, TypeParent, TContext>;
+    subjects?: SubjectsResolver<Maybe<string[]>, TypeParent, TContext>;
 
     ja3?: Ja3Resolver<Maybe<string[]>, TypeParent, TContext>;
 
-    issuerNames?: IssuerNamesResolver<Maybe<string[]>, TypeParent, TContext>;
+    issuers?: IssuersResolver<Maybe<string[]>, TypeParent, TContext>;
   }
 
   export type _IdResolver<R = Maybe<string>, Parent = TlsNode, TContext = SiemContext> = Resolver<
@@ -7845,17 +7841,12 @@ export namespace TlsNodeResolvers {
     Parent = TlsNode,
     TContext = SiemContext
   > = Resolver<R, Parent, TContext>;
-  export type AlternativeNamesResolver<
-    R = Maybe<string[]>,
-    Parent = TlsNode,
-    TContext = SiemContext
-  > = Resolver<R, Parent, TContext>;
   export type NotAfterResolver<
     R = Maybe<string[]>,
     Parent = TlsNode,
     TContext = SiemContext
   > = Resolver<R, Parent, TContext>;
-  export type CommonNamesResolver<
+  export type SubjectsResolver<
     R = Maybe<string[]>,
     Parent = TlsNode,
     TContext = SiemContext
@@ -7865,7 +7856,7 @@ export namespace TlsNodeResolvers {
     Parent,
     TContext
   >;
-  export type IssuerNamesResolver<
+  export type IssuersResolver<
     R = Maybe<string[]>,
     Parent = TlsNode,
     TContext = SiemContext
diff --git a/x-pack/legacy/plugins/siem/server/lib/tls/elasticsearch_adapter.ts b/x-pack/legacy/plugins/siem/server/lib/tls/elasticsearch_adapter.ts
index 716eea3f8df5b..10929c3d03641 100644
--- a/x-pack/legacy/plugins/siem/server/lib/tls/elasticsearch_adapter.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/tls/elasticsearch_adapter.ts
@@ -66,10 +66,9 @@ export const formatTlsEdges = (buckets: TlsBuckets[]): TlsEdges[] => {
     const edge: TlsEdges = {
       node: {
         _id: bucket.key,
-        alternativeNames: bucket.alternative_names.buckets.map(({ key }) => key),
-        commonNames: bucket.common_names.buckets.map(({ key }) => key),
+        subjects: bucket.subjects.buckets.map(({ key }) => key),
         ja3: bucket.ja3.buckets.map(({ key }) => key),
-        issuerNames: bucket.issuer_names.buckets.map(({ key }) => key),
+        issuers: bucket.issuers.buckets.map(({ key }) => key),
         // eslint-disable-next-line @typescript-eslint/camelcase
         notAfter: bucket.not_after.buckets.map(({ key_as_string }) => key_as_string),
       },
diff --git a/x-pack/legacy/plugins/siem/server/lib/tls/mock.ts b/x-pack/legacy/plugins/siem/server/lib/tls/mock.ts
index 4b27d541ec992..b97a6fa509ef2 100644
--- a/x-pack/legacy/plugins/siem/server/lib/tls/mock.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/tls/mock.ts
@@ -20,11 +20,10 @@ export const mockTlsQuery = {
           order: { _key: 'desc' },
         },
         aggs: {
-          issuer_names: { terms: { field: 'tls.server_certificate.issuer.common_name' } },
-          common_names: { terms: { field: 'tls.server_certificate.subject.common_name' } },
-          alternative_names: { terms: { field: 'tls.server_certificate.alternative_names' } },
-          not_after: { terms: { field: 'tls.server_certificate.not_after' } },
-          ja3: { terms: { field: 'tls.fingerprints.ja3.hash' } },
+          issuers: { terms: { field: 'tls.server.issuer' } },
+          subjects: { terms: { field: 'tls.server.subject' } },
+          not_after: { terms: { field: 'tls.server.not_after' } },
+          ja3: { terms: { field: 'tls.server.ja3s' } },
         },
       },
     },
@@ -44,16 +43,8 @@ export const expectedTlsEdges = [
     },
     node: {
       _id: 'fff8dc95436e0e25ce46b1526a1a547e8cf3bb82',
-      alternativeNames: [
-        '*.1.nflxso.net',
-        '*.a.nflxso.net',
-        'assets.nflxext.com',
-        'cast.netflix.com',
-        'codex.nflxext.com',
-        'tvui.netflix.com',
-      ],
-      commonNames: ['*.1.nflxso.net'],
-      issuerNames: ['DigiCert SHA2 Secure Server CA'],
+      subjects: ['*.1.nflxso.net'],
+      issuers: ['DigiCert SHA2 Secure Server CA'],
       ja3: ['95d2dd53a89b334cddd5c22e81e7fe61'],
       notAfter: ['2019-10-27T12:00:00.000Z'],
     },
@@ -65,9 +56,8 @@ export const expectedTlsEdges = [
     },
     node: {
       _id: 'fd8440c4b20978b173e0910e2639d114f0d405c5',
-      alternativeNames: ['*.cogocast.net', 'cogocast.net'],
-      commonNames: ['cogocast.net'],
-      issuerNames: ['Amazon'],
+      subjects: ['cogocast.net'],
+      issuers: ['Amazon'],
       ja3: ['a111d93cdf31f993c40a8a9ef13e8d7e'],
       notAfter: ['2020-02-01T12:00:00.000Z'],
     },
@@ -76,12 +66,8 @@ export const expectedTlsEdges = [
     cursor: { tiebreaker: null, value: 'fcdc16645ebb3386adc96e7ba735c4745709b9dd' },
     node: {
       _id: 'fcdc16645ebb3386adc96e7ba735c4745709b9dd',
-      alternativeNames: [
-        'player-devintever2-imperva.mountain.siriusxm.com',
-        'player-devintever2.mountain.siriusxm.com',
-      ],
-      commonNames: ['player-devintever2.mountain.siriusxm.com'],
-      issuerNames: ['Trustwave Organization Validation SHA256 CA, Level 1'],
+      subjects: ['player-devintever2.mountain.siriusxm.com'],
+      issuers: ['Trustwave Organization Validation SHA256 CA, Level 1'],
       ja3: ['6fa3244afc6bb6f9fad207b6b52af26b'],
       notAfter: ['2020-03-06T21:57:09.000Z'],
     },
@@ -90,15 +76,8 @@ export const expectedTlsEdges = [
     cursor: { tiebreaker: null, value: 'fccf375789cb7e671502a7b0cc969f218a4b2c70' },
     node: {
       _id: 'fccf375789cb7e671502a7b0cc969f218a4b2c70',
-      alternativeNames: [
-        'appleid-nc-s.apple.com',
-        'appleid-nwk-s.apple.com',
-        'appleid-prn-s.apple.com',
-        'appleid-rno-s.apple.com',
-        'appleid.apple.com',
-      ],
-      commonNames: ['appleid.apple.com'],
-      issuerNames: ['DigiCert SHA2 Extended Validation Server CA'],
+      subjects: ['appleid.apple.com'],
+      issuers: ['DigiCert SHA2 Extended Validation Server CA'],
       ja3: ['6fa3244afc6bb6f9fad207b6b52af26b'],
       notAfter: ['2020-07-04T12:00:00.000Z'],
     },
@@ -107,20 +86,8 @@ export const expectedTlsEdges = [
     cursor: { tiebreaker: null, value: 'fc4a296b706fa18ac50b96f5c0327c69db4a8981' },
     node: {
       _id: 'fc4a296b706fa18ac50b96f5c0327c69db4a8981',
-      alternativeNames: [
-        'api.itunes.apple.com',
-        'appsto.re',
-        'ax.init.itunes.apple.com',
-        'bag.itunes.apple.com',
-        'bookkeeper.itunes.apple.com',
-        'c.itunes.apple.com',
-        'carrierbundle.itunes.apple.com',
-        'client-api.itunes.apple.com',
-        'cma.itunes.apple.com',
-        'courses.apple.com',
-      ],
-      commonNames: ['itunes.apple.com'],
-      issuerNames: ['DigiCert SHA2 Extended Validation Server CA'],
+      subjects: ['itunes.apple.com'],
+      issuers: ['DigiCert SHA2 Extended Validation Server CA'],
       ja3: ['a441a33aaee795f498d6b764cc78989a'],
       notAfter: ['2020-03-24T12:00:00.000Z'],
     },
@@ -129,20 +96,8 @@ export const expectedTlsEdges = [
     cursor: { tiebreaker: null, value: 'fc2cbc41f6a0e9c0118de4fe40f299f7207b797e' },
     node: {
       _id: 'fc2cbc41f6a0e9c0118de4fe40f299f7207b797e',
-      alternativeNames: [
-        '*.adlercasino.com',
-        '*.allaustraliancasino.com',
-        '*.alletf.com',
-        '*.appareldesignpartners.com',
-        '*.atmosfir.net',
-        '*.cityofboston.gov',
-        '*.cp.mytoyotaentune.com',
-        '*.decathlon.be',
-        '*.decathlon.co.uk',
-        '*.decathlon.de',
-      ],
-      commonNames: ['incapsula.com'],
-      issuerNames: ['GlobalSign CloudSSL CA - SHA256 - G3'],
+      subjects: ['incapsula.com'],
+      issuers: ['GlobalSign CloudSSL CA - SHA256 - G3'],
       ja3: ['6fa3244afc6bb6f9fad207b6b52af26b'],
       notAfter: ['2020-04-04T14:05:06.000Z'],
     },
@@ -151,9 +106,8 @@ export const expectedTlsEdges = [
     cursor: { tiebreaker: null, value: 'fb70d78ffa663a3a4374d841b3288d2de9759566' },
     node: {
       _id: 'fb70d78ffa663a3a4374d841b3288d2de9759566',
-      alternativeNames: ['*.siriusxm.com', 'siriusxm.com'],
-      commonNames: ['*.siriusxm.com'],
-      issuerNames: ['DigiCert Baltimore CA-2 G2'],
+      subjects: ['*.siriusxm.com'],
+      issuers: ['DigiCert Baltimore CA-2 G2'],
       ja3: ['535aca3d99fc247509cd50933cd71d37', '6fa3244afc6bb6f9fad207b6b52af26b'],
       notAfter: ['2021-10-27T12:00:00.000Z'],
     },
@@ -162,16 +116,8 @@ export const expectedTlsEdges = [
     cursor: { tiebreaker: null, value: 'fb59038dcec33ab3a01a6ae60d0835ad0e04ccf0' },
     node: {
       _id: 'fb59038dcec33ab3a01a6ae60d0835ad0e04ccf0',
-      alternativeNames: [
-        'photos.amazon.co.uk',
-        'photos.amazon.de',
-        'photos.amazon.es',
-        'photos.amazon.eu',
-        'photos.amazon.fr',
-        'photos.amazon.it',
-      ],
-      commonNames: ['photos.amazon.eu'],
-      issuerNames: ['Amazon'],
+      subjects: ['photos.amazon.eu'],
+      issuers: ['Amazon'],
       ja3: ['6fa3244afc6bb6f9fad207b6b52af26b'],
       notAfter: ['2020-04-23T12:00:00.000Z'],
     },
@@ -180,20 +126,8 @@ export const expectedTlsEdges = [
     cursor: { tiebreaker: null, value: 'f9815293c883a6006f0b2d95a4895bdc501fd174' },
     node: {
       _id: 'f9815293c883a6006f0b2d95a4895bdc501fd174',
-      alternativeNames: [
-        '*.api.cdn.hbo.com',
-        '*.artist.cdn.hbo.com',
-        '*.cdn.hbo.com',
-        '*.lv3.cdn.hbo.com',
-        'artist.api.cdn.hbo.com',
-        'artist.api.lv3.cdn.hbo.com',
-        'artist.staging.cdn.hbo.com',
-        'artist.staging.hurley.lv3.cdn.hbo.com',
-        'atv.api.lv3.cdn.hbo.com',
-        'atv.staging.hurley.lv3.cdn.hbo.com',
-      ],
-      commonNames: ['cdn.hbo.com'],
-      issuerNames: ['Sectigo RSA Organization Validation Secure Server CA'],
+      subjects: ['cdn.hbo.com'],
+      issuers: ['Sectigo RSA Organization Validation Secure Server CA'],
       ja3: ['6fa3244afc6bb6f9fad207b6b52af26b'],
       notAfter: ['2021-02-10T23:59:59.000Z'],
     },
@@ -202,9 +136,8 @@ export const expectedTlsEdges = [
     cursor: { tiebreaker: null, value: 'f8db6a69797e383dca2529727369595733123386' },
     node: {
       _id: 'f8db6a69797e383dca2529727369595733123386',
-      alternativeNames: ['www.google.com'],
-      commonNames: ['www.google.com'],
-      issuerNames: ['GTS CA 1O1'],
+      subjects: ['www.google.com'],
+      issuers: ['GTS CA 1O1'],
       ja3: ['a111d93cdf31f993c40a8a9ef13e8d7e'],
       notAfter: ['2019-12-10T13:32:54.000Z'],
     },
@@ -226,7 +159,7 @@ export const mockRequest = {
       timerange: { interval: '12h', from: 1570716261267, to: 1570802661267 },
     },
     query:
-      'query GetTlsQuery($sourceId: ID!, $filterQuery: String, $flowTarget: FlowTarget!, $ip: String!, $pagination: PaginationInputPaginated!, $sort: TlsSortField!, $timerange: TimerangeInput!, $defaultIndex: [String!]!, $inspect: Boolean!) {\n  source(id: $sourceId) {\n    id\n    Tls(filterQuery: $filterQuery, flowTarget: $flowTarget, ip: $ip, pagination: $pagination, sort: $sort, timerange: $timerange, defaultIndex: $defaultIndex) {\n      totalCount\n      edges {\n        node {\n          _id\n          alternativeNames\n          commonNames\n          ja3\n          issuerNames\n          notAfter\n          __typename\n        }\n        cursor {\n          value\n          __typename\n        }\n        __typename\n      }\n      pageInfo {\n        activePage\n        fakeTotalCount\n        showMorePagesIndicator\n        __typename\n      }\n      inspect @include(if: $inspect) {\n        dsl\n        response\n        __typename\n      }\n      __typename\n    }\n    __typename\n  }\n}\n',
+      'query GetTlsQuery($sourceId: ID!, $filterQuery: String, $flowTarget: FlowTarget!, $ip: String!, $pagination: PaginationInputPaginated!, $sort: TlsSortField!, $timerange: TimerangeInput!, $defaultIndex: [String!]!, $inspect: Boolean!) {\n  source(id: $sourceId) {\n    id\n    Tls(filterQuery: $filterQuery, flowTarget: $flowTarget, ip: $ip, pagination: $pagination, sort: $sort, timerange: $timerange, defaultIndex: $defaultIndex) {\n      totalCount\n      edges {\n        node {\n          _id\n          subjects\n          ja3\n          issuers\n          notAfter\n          __typename\n        }\n        cursor {\n          value\n          __typename\n        }\n        __typename\n      }\n      pageInfo {\n        activePage\n        fakeTotalCount\n        showMorePagesIndicator\n        __typename\n      }\n      inspect @include(if: $inspect) {\n        dsl\n        response\n        __typename\n      }\n      __typename\n    }\n    __typename\n  }\n}\n',
   },
 };
 
@@ -250,28 +183,16 @@ export const mockResponse = {
               { key: 1572177600000, key_as_string: '2019-10-27T12:00:00.000Z', doc_count: 1 },
             ],
           },
-          issuer_names: {
+          issuers: {
             doc_count_error_upper_bound: 0,
             sum_other_doc_count: 0,
             buckets: [{ key: 'DigiCert SHA2 Secure Server CA', doc_count: 1 }],
           },
-          common_names: {
+          subjects: {
             doc_count_error_upper_bound: 0,
             sum_other_doc_count: 0,
             buckets: [{ key: '*.1.nflxso.net', doc_count: 1 }],
           },
-          alternative_names: {
-            doc_count_error_upper_bound: 0,
-            sum_other_doc_count: 0,
-            buckets: [
-              { key: '*.1.nflxso.net', doc_count: 1 },
-              { key: '*.a.nflxso.net', doc_count: 1 },
-              { key: 'assets.nflxext.com', doc_count: 1 },
-              { key: 'cast.netflix.com', doc_count: 1 },
-              { key: 'codex.nflxext.com', doc_count: 1 },
-              { key: 'tvui.netflix.com', doc_count: 1 },
-            ],
-          },
           ja3: {
             doc_count_error_upper_bound: 0,
             sum_other_doc_count: 0,
@@ -288,24 +209,16 @@ export const mockResponse = {
               { key: 1580558400000, key_as_string: '2020-02-01T12:00:00.000Z', doc_count: 1 },
             ],
           },
-          issuer_names: {
+          issuers: {
             doc_count_error_upper_bound: 0,
             sum_other_doc_count: 0,
             buckets: [{ key: 'Amazon', doc_count: 1 }],
           },
-          common_names: {
+          subjects: {
             doc_count_error_upper_bound: 0,
             sum_other_doc_count: 0,
             buckets: [{ key: 'cogocast.net', doc_count: 1 }],
           },
-          alternative_names: {
-            doc_count_error_upper_bound: 0,
-            sum_other_doc_count: 0,
-            buckets: [
-              { key: '*.cogocast.net', doc_count: 1 },
-              { key: 'cogocast.net', doc_count: 1 },
-            ],
-          },
           ja3: {
             doc_count_error_upper_bound: 0,
             sum_other_doc_count: 0,
@@ -322,26 +235,18 @@ export const mockResponse = {
               { key: 1583531829000, key_as_string: '2020-03-06T21:57:09.000Z', doc_count: 1 },
             ],
           },
-          issuer_names: {
+          issuers: {
             doc_count_error_upper_bound: 0,
             sum_other_doc_count: 0,
             buckets: [
               { key: 'Trustwave Organization Validation SHA256 CA, Level 1', doc_count: 1 },
             ],
           },
-          common_names: {
+          subjects: {
             doc_count_error_upper_bound: 0,
             sum_other_doc_count: 0,
             buckets: [{ key: 'player-devintever2.mountain.siriusxm.com', doc_count: 1 }],
           },
-          alternative_names: {
-            doc_count_error_upper_bound: 0,
-            sum_other_doc_count: 0,
-            buckets: [
-              { key: 'player-devintever2-imperva.mountain.siriusxm.com', doc_count: 1 },
-              { key: 'player-devintever2.mountain.siriusxm.com', doc_count: 1 },
-            ],
-          },
           ja3: {
             doc_count_error_upper_bound: 0,
             sum_other_doc_count: 0,
@@ -358,27 +263,16 @@ export const mockResponse = {
               { key: 1593864000000, key_as_string: '2020-07-04T12:00:00.000Z', doc_count: 1 },
             ],
           },
-          issuer_names: {
+          issuers: {
             doc_count_error_upper_bound: 0,
             sum_other_doc_count: 0,
             buckets: [{ key: 'DigiCert SHA2 Extended Validation Server CA', doc_count: 1 }],
           },
-          common_names: {
+          subjects: {
             doc_count_error_upper_bound: 0,
             sum_other_doc_count: 0,
             buckets: [{ key: 'appleid.apple.com', doc_count: 1 }],
           },
-          alternative_names: {
-            doc_count_error_upper_bound: 0,
-            sum_other_doc_count: 0,
-            buckets: [
-              { key: 'appleid-nc-s.apple.com', doc_count: 1 },
-              { key: 'appleid-nwk-s.apple.com', doc_count: 1 },
-              { key: 'appleid-prn-s.apple.com', doc_count: 1 },
-              { key: 'appleid-rno-s.apple.com', doc_count: 1 },
-              { key: 'appleid.apple.com', doc_count: 1 },
-            ],
-          },
           ja3: {
             doc_count_error_upper_bound: 0,
             sum_other_doc_count: 0,
@@ -395,32 +289,16 @@ export const mockResponse = {
               { key: 1585051200000, key_as_string: '2020-03-24T12:00:00.000Z', doc_count: 2 },
             ],
           },
-          issuer_names: {
+          issuers: {
             doc_count_error_upper_bound: 0,
             sum_other_doc_count: 0,
             buckets: [{ key: 'DigiCert SHA2 Extended Validation Server CA', doc_count: 2 }],
           },
-          common_names: {
+          subjects: {
             doc_count_error_upper_bound: 0,
             sum_other_doc_count: 0,
             buckets: [{ key: 'itunes.apple.com', doc_count: 2 }],
           },
-          alternative_names: {
-            doc_count_error_upper_bound: 0,
-            sum_other_doc_count: 156,
-            buckets: [
-              { key: 'api.itunes.apple.com', doc_count: 2 },
-              { key: 'appsto.re', doc_count: 2 },
-              { key: 'ax.init.itunes.apple.com', doc_count: 2 },
-              { key: 'bag.itunes.apple.com', doc_count: 2 },
-              { key: 'bookkeeper.itunes.apple.com', doc_count: 2 },
-              { key: 'c.itunes.apple.com', doc_count: 2 },
-              { key: 'carrierbundle.itunes.apple.com', doc_count: 2 },
-              { key: 'client-api.itunes.apple.com', doc_count: 2 },
-              { key: 'cma.itunes.apple.com', doc_count: 2 },
-              { key: 'courses.apple.com', doc_count: 2 },
-            ],
-          },
           ja3: {
             doc_count_error_upper_bound: 0,
             sum_other_doc_count: 0,
@@ -437,32 +315,16 @@ export const mockResponse = {
               { key: 1586009106000, key_as_string: '2020-04-04T14:05:06.000Z', doc_count: 1 },
             ],
           },
-          issuer_names: {
+          issuers: {
             doc_count_error_upper_bound: 0,
             sum_other_doc_count: 0,
             buckets: [{ key: 'GlobalSign CloudSSL CA - SHA256 - G3', doc_count: 1 }],
           },
-          common_names: {
+          subjects: {
             doc_count_error_upper_bound: 0,
             sum_other_doc_count: 0,
             buckets: [{ key: 'incapsula.com', doc_count: 1 }],
           },
-          alternative_names: {
-            doc_count_error_upper_bound: 0,
-            sum_other_doc_count: 110,
-            buckets: [
-              { key: '*.adlercasino.com', doc_count: 1 },
-              { key: '*.allaustraliancasino.com', doc_count: 1 },
-              { key: '*.alletf.com', doc_count: 1 },
-              { key: '*.appareldesignpartners.com', doc_count: 1 },
-              { key: '*.atmosfir.net', doc_count: 1 },
-              { key: '*.cityofboston.gov', doc_count: 1 },
-              { key: '*.cp.mytoyotaentune.com', doc_count: 1 },
-              { key: '*.decathlon.be', doc_count: 1 },
-              { key: '*.decathlon.co.uk', doc_count: 1 },
-              { key: '*.decathlon.de', doc_count: 1 },
-            ],
-          },
           ja3: {
             doc_count_error_upper_bound: 0,
             sum_other_doc_count: 0,
@@ -479,24 +341,16 @@ export const mockResponse = {
               { key: 1635336000000, key_as_string: '2021-10-27T12:00:00.000Z', doc_count: 325 },
             ],
           },
-          issuer_names: {
+          issuers: {
             doc_count_error_upper_bound: 0,
             sum_other_doc_count: 0,
             buckets: [{ key: 'DigiCert Baltimore CA-2 G2', doc_count: 325 }],
           },
-          common_names: {
+          subjects: {
             doc_count_error_upper_bound: 0,
             sum_other_doc_count: 0,
             buckets: [{ key: '*.siriusxm.com', doc_count: 325 }],
           },
-          alternative_names: {
-            doc_count_error_upper_bound: 0,
-            sum_other_doc_count: 0,
-            buckets: [
-              { key: '*.siriusxm.com', doc_count: 325 },
-              { key: 'siriusxm.com', doc_count: 325 },
-            ],
-          },
           ja3: {
             doc_count_error_upper_bound: 0,
             sum_other_doc_count: 0,
@@ -516,28 +370,16 @@ export const mockResponse = {
               { key: 1587643200000, key_as_string: '2020-04-23T12:00:00.000Z', doc_count: 5 },
             ],
           },
-          issuer_names: {
+          issuers: {
             doc_count_error_upper_bound: 0,
             sum_other_doc_count: 0,
             buckets: [{ key: 'Amazon', doc_count: 5 }],
           },
-          common_names: {
+          subjects: {
             doc_count_error_upper_bound: 0,
             sum_other_doc_count: 0,
             buckets: [{ key: 'photos.amazon.eu', doc_count: 5 }],
           },
-          alternative_names: {
-            doc_count_error_upper_bound: 0,
-            sum_other_doc_count: 0,
-            buckets: [
-              { key: 'photos.amazon.co.uk', doc_count: 5 },
-              { key: 'photos.amazon.de', doc_count: 5 },
-              { key: 'photos.amazon.es', doc_count: 5 },
-              { key: 'photos.amazon.eu', doc_count: 5 },
-              { key: 'photos.amazon.fr', doc_count: 5 },
-              { key: 'photos.amazon.it', doc_count: 5 },
-            ],
-          },
           ja3: {
             doc_count_error_upper_bound: 0,
             sum_other_doc_count: 0,
@@ -554,34 +396,18 @@ export const mockResponse = {
               { key: 1613001599000, key_as_string: '2021-02-10T23:59:59.000Z', doc_count: 29 },
             ],
           },
-          issuer_names: {
+          issuers: {
             doc_count_error_upper_bound: 0,
             sum_other_doc_count: 0,
             buckets: [
               { key: 'Sectigo RSA Organization Validation Secure Server CA', doc_count: 29 },
             ],
           },
-          common_names: {
+          subjects: {
             doc_count_error_upper_bound: 0,
             sum_other_doc_count: 0,
             buckets: [{ key: 'cdn.hbo.com', doc_count: 29 }],
           },
-          alternative_names: {
-            doc_count_error_upper_bound: 0,
-            sum_other_doc_count: 29,
-            buckets: [
-              { key: '*.api.cdn.hbo.com', doc_count: 29 },
-              { key: '*.artist.cdn.hbo.com', doc_count: 29 },
-              { key: '*.cdn.hbo.com', doc_count: 29 },
-              { key: '*.lv3.cdn.hbo.com', doc_count: 29 },
-              { key: 'artist.api.cdn.hbo.com', doc_count: 29 },
-              { key: 'artist.api.lv3.cdn.hbo.com', doc_count: 29 },
-              { key: 'artist.staging.cdn.hbo.com', doc_count: 29 },
-              { key: 'artist.staging.hurley.lv3.cdn.hbo.com', doc_count: 29 },
-              { key: 'atv.api.lv3.cdn.hbo.com', doc_count: 29 },
-              { key: 'atv.staging.hurley.lv3.cdn.hbo.com', doc_count: 29 },
-            ],
-          },
           ja3: {
             doc_count_error_upper_bound: 0,
             sum_other_doc_count: 0,
@@ -598,17 +424,12 @@ export const mockResponse = {
               { key: 1575984774000, key_as_string: '2019-12-10T13:32:54.000Z', doc_count: 5 },
             ],
           },
-          issuer_names: {
+          issuers: {
             doc_count_error_upper_bound: 0,
             sum_other_doc_count: 0,
             buckets: [{ key: 'GTS CA 1O1', doc_count: 5 }],
           },
-          common_names: {
-            doc_count_error_upper_bound: 0,
-            sum_other_doc_count: 0,
-            buckets: [{ key: 'www.google.com', doc_count: 5 }],
-          },
-          alternative_names: {
+          subjects: {
             doc_count_error_upper_bound: 0,
             sum_other_doc_count: 0,
             buckets: [{ key: 'www.google.com', doc_count: 5 }],
@@ -643,10 +464,9 @@ export const mockOptions = {
   fields: [
     'totalCount',
     '_id',
-    'alternativeNames',
-    'commonNames',
+    'subjects',
     'ja3',
-    'issuerNames',
+    'issuers',
     'notAfter',
     'edges.cursor.value',
     'pageInfo.activePage',
diff --git a/x-pack/legacy/plugins/siem/server/lib/tls/query_tls.dsl.ts b/x-pack/legacy/plugins/siem/server/lib/tls/query_tls.dsl.ts
index 2ff33a800fcd5..bc65be642dabc 100644
--- a/x-pack/legacy/plugins/siem/server/lib/tls/query_tls.dsl.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/tls/query_tls.dsl.ts
@@ -12,41 +12,36 @@ import { TlsSortField, Direction, TlsFields } from '../../graphql/types';
 const getAggs = (querySize: number, sort: TlsSortField) => ({
   count: {
     cardinality: {
-      field: 'tls.server_certificate.fingerprint.sha1',
+      field: 'tls.server.hash.sha1',
     },
   },
   sha1: {
     terms: {
-      field: 'tls.server_certificate.fingerprint.sha1',
+      field: 'tls.server.hash.sha1',
       size: querySize,
       order: {
         ...getQueryOrder(sort),
       },
     },
     aggs: {
-      issuer_names: {
+      issuers: {
         terms: {
-          field: 'tls.server_certificate.issuer.common_name',
+          field: 'tls.server.issuer',
         },
       },
-      common_names: {
+      subjects: {
         terms: {
-          field: 'tls.server_certificate.subject.common_name',
-        },
-      },
-      alternative_names: {
-        terms: {
-          field: 'tls.server_certificate.alternative_names',
+          field: 'tls.server.subject',
         },
       },
       not_after: {
         terms: {
-          field: 'tls.server_certificate.not_after',
+          field: 'tls.server.not_after',
         },
       },
       ja3: {
         terms: {
-          field: 'tls.fingerprints.ja3.hash',
+          field: 'tls.server.ja3s',
         },
       },
     },
diff --git a/x-pack/legacy/plugins/siem/server/lib/tls/types.ts b/x-pack/legacy/plugins/siem/server/lib/tls/types.ts
index bac5426f72e08..1fbb31ba3e0f3 100644
--- a/x-pack/legacy/plugins/siem/server/lib/tls/types.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/tls/types.ts
@@ -18,11 +18,7 @@ export interface TlsBuckets {
     value_as_string: string;
   };
 
-  alternative_names: {
-    buckets: Readonly<Array<{ key: string; doc_count: number }>>;
-  };
-
-  common_names: {
+  subjects: {
     buckets: Readonly<Array<{ key: string; doc_count: number }>>;
   };
 
@@ -30,7 +26,7 @@ export interface TlsBuckets {
     buckets: Readonly<Array<{ key: string; doc_count: number }>>;
   };
 
-  issuer_names: {
+  issuers: {
     buckets: Readonly<Array<{ key: string; doc_count: number }>>;
   };
 
diff --git a/x-pack/legacy/plugins/siem/server/lib/uncommon_processes/query.dsl.ts b/x-pack/legacy/plugins/siem/server/lib/uncommon_processes/query.dsl.ts
index dc38824989da3..24cae53d5d353 100644
--- a/x-pack/legacy/plugins/siem/server/lib/uncommon_processes/query.dsl.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/uncommon_processes/query.dsl.ts
@@ -191,6 +191,22 @@ export const buildQuery = ({
                 ],
               },
             },
+            {
+              bool: {
+                filter: [
+                  {
+                    term: {
+                      'event.category': 'process',
+                    },
+                  },
+                  {
+                    term: {
+                      'event.type': 'start',
+                    },
+                  },
+                ],
+              },
+            },
           ],
           minimum_should_match: 1,
           filter,
diff --git a/x-pack/test/api_integration/apis/siem/tls.ts b/x-pack/test/api_integration/apis/siem/tls.ts
index 949ed530e9b27..8467308d709af 100644
--- a/x-pack/test/api_integration/apis/siem/tls.ts
+++ b/x-pack/test/api_integration/apis/siem/tls.ts
@@ -16,17 +16,16 @@ import { FtrProviderContext } from '../../ftr_provider_context';
 
 const FROM = new Date('2000-01-01T00:00:00.000Z').valueOf();
 const TO = new Date('3000-01-01T00:00:00.000Z').valueOf();
-const SOURCE_IP = '157.230.208.30';
-const DESTINATION_IP = '91.189.92.20';
+const SOURCE_IP = '10.128.0.35';
+const DESTINATION_IP = '74.125.129.95';
 
 const expectedResult = {
   __typename: 'TlsNode',
-  _id: '61749734b3246f1584029deb4f5276c64da00ada',
-  alternativeNames: ['api.snapcraft.io'],
-  commonNames: ['api.snapcraft.io'],
-  issuerNames: ['DigiCert SHA2 Secure Server CA'],
-  ja3: ['839868ad711dc55bde0d37a87f14740d'],
-  notAfter: ['2019-05-22T12:00:00.000Z'],
+  _id: '16989191B1A93ECECD5FE9E63EBD4B5C3B606D26',
+  subjects: ['CN=edgecert.googleapis.com,O=Google LLC,L=Mountain View,ST=California,C=US'],
+  issuers: ['CN=GTS CA 1O1,O=Google Trust Services,C=US'],
+  ja3: [],
+  notAfter: ['2020-05-06T11:52:15.000Z'],
 };
 
 const expectedOverviewDestinationResult = {
@@ -36,27 +35,29 @@ const expectedOverviewDestinationResult = {
       __typename: 'TlsEdges',
       cursor: {
         __typename: 'CursorType',
-        value: '61749734b3246f1584029deb4f5276c64da00ada',
+        value: 'EB4E81DD7C55BA9715652ECF5647FB8877E55A8F',
       },
       node: {
         __typename: 'TlsNode',
-        _id: '61749734b3246f1584029deb4f5276c64da00ada',
-        alternativeNames: ['api.snapcraft.io'],
-        commonNames: ['api.snapcraft.io'],
-        issuerNames: ['DigiCert SHA2 Secure Server CA'],
-        ja3: ['839868ad711dc55bde0d37a87f14740d'],
-        notAfter: ['2019-05-22T12:00:00.000Z'],
+        _id: 'EB4E81DD7C55BA9715652ECF5647FB8877E55A8F',
+        subjects: [
+          'CN=*.cdn.mozilla.net,OU=Cloud Services,O=Mozilla Corporation,L=Mountain View,ST=California,C=US',
+        ],
+        issuers: ['CN=DigiCert SHA2 Secure Server CA,O=DigiCert Inc,C=US'],
+        ja3: [],
+        notAfter: ['2020-12-09T12:00:00.000Z'],
       },
     },
   ],
   pageInfo: {
     __typename: 'PageInfoPaginated',
     activePage: 0,
-    fakeTotalCount: 1,
+    fakeTotalCount: 3,
     showMorePagesIndicator: false,
   },
-  totalCount: 1,
+  totalCount: 3,
 };
+
 const expectedOverviewSourceResult = {
   __typename: 'TlsData',
   edges: [
@@ -64,26 +65,27 @@ const expectedOverviewSourceResult = {
       __typename: 'TlsEdges',
       cursor: {
         __typename: 'CursorType',
-        value: '61749734b3246f1584029deb4f5276c64da00ada',
+        value: 'EB4E81DD7C55BA9715652ECF5647FB8877E55A8F',
       },
       node: {
         __typename: 'TlsNode',
-        _id: '61749734b3246f1584029deb4f5276c64da00ada',
-        alternativeNames: ['api.snapcraft.io'],
-        commonNames: ['api.snapcraft.io'],
-        issuerNames: ['DigiCert SHA2 Secure Server CA'],
-        ja3: ['839868ad711dc55bde0d37a87f14740d'],
-        notAfter: ['2019-05-22T12:00:00.000Z'],
+        _id: 'EB4E81DD7C55BA9715652ECF5647FB8877E55A8F',
+        subjects: [
+          'CN=*.cdn.mozilla.net,OU=Cloud Services,O=Mozilla Corporation,L=Mountain View,ST=California,C=US',
+        ],
+        issuers: ['CN=DigiCert SHA2 Secure Server CA,O=DigiCert Inc,C=US'],
+        ja3: [],
+        notAfter: ['2020-12-09T12:00:00.000Z'],
       },
     },
   ],
   pageInfo: {
     __typename: 'PageInfoPaginated',
     activePage: 0,
-    fakeTotalCount: 1,
+    fakeTotalCount: 3,
     showMorePagesIndicator: false,
   },
-  totalCount: 1,
+  totalCount: 3,
 };
 
 export default function({ getService }: FtrProviderContext) {
@@ -91,8 +93,8 @@ export default function({ getService }: FtrProviderContext) {
   const client = getService('siemGraphQLClient');
   describe('Tls Test with Packetbeat', () => {
     describe('Tls Test', () => {
-      before(() => esArchiver.load('packetbeat/default'));
-      after(() => esArchiver.unload('packetbeat/default'));
+      before(() => esArchiver.load('packetbeat/tls'));
+      after(() => esArchiver.unload('packetbeat/tls'));
 
       it('Ensure data is returned for FlowTarget.Source', () => {
         return client
@@ -160,8 +162,8 @@ export default function({ getService }: FtrProviderContext) {
     });
 
     describe('Tls Overview Test', () => {
-      before(() => esArchiver.load('packetbeat/default'));
-      after(() => esArchiver.unload('packetbeat/default'));
+      before(() => esArchiver.load('packetbeat/tls'));
+      after(() => esArchiver.unload('packetbeat/tls'));
 
       it('Ensure data is returned for FlowTarget.Source', () => {
         return client
@@ -189,7 +191,8 @@ export default function({ getService }: FtrProviderContext) {
           })
           .then(resp => {
             const tls = resp.data.source.Tls;
-            expect(tls).to.eql(expectedOverviewSourceResult);
+            expect(tls.pageInfo).to.eql(expectedOverviewSourceResult.pageInfo);
+            expect(tls.edges[0]).to.eql(expectedOverviewSourceResult.edges[0]);
           });
       });
 
@@ -219,7 +222,8 @@ export default function({ getService }: FtrProviderContext) {
           })
           .then(resp => {
             const tls = resp.data.source.Tls;
-            expect(tls).to.eql(expectedOverviewDestinationResult);
+            expect(tls.pageInfo).to.eql(expectedOverviewDestinationResult.pageInfo);
+            expect(tls.edges[0]).to.eql(expectedOverviewDestinationResult.edges[0]);
           });
       });
     });
diff --git a/x-pack/test/functional/es_archives/packetbeat/tls/data.json.gz b/x-pack/test/functional/es_archives/packetbeat/tls/data.json.gz
new file mode 100644
index 0000000000000000000000000000000000000000..cf7a5e5f0d4467ffe4a051ee92be733018ff792c
GIT binary patch
literal 3929
zcmV-f52o-RiwFox#dux-17u-zVJ>QOZ*BnXU29X@$eRA1U*Y1@+1=RN_e-i$b-<7?
zH6+XgX3k``rd+L7%jh6W9!VyFQ~B@PEn|=+*_I(dNJJ4QsNcT5_wMHv`Ok}9ZzsQ;
znw?j@9Y4`KFWrL+70uj}|JWbwkD>2cp*h`4<K4af&w=;;<9m7`5H83aMeLi;j%cd%
zxye1F@;)E10q7%uzyM(T-3RUqF1lpNEY-J@*eCzY!->gqHJQ4RT*toa#ZCc#h2bmA
z1`LotulrkiH8ycx8o)j>(=#(MsftGPH46m*LO$(lUxGgI0@fFXz`l^i2v1-EIlCFq
z_CHIqJXVu}8)>4?Z<br)gOP{|tz_R*!0!`HyuJqo>H`fuDgt2)!{uHJ?%uMd+<IZs
zEKFiYP%v!gy6MZ!Hgy!%_8Ar|f?xoV7`V^!kkce}<d6dl8b(WI{_<ezLWPm?!YIry
zM^{N)tag_5wVl?o686;+6Jjf(cu8_4<}geIW?W(*2_~EaNlTqAS%tedO<zh=Oq4zg
z<Jt@hM#iY`mf)+@?~CRUrfKqTqx0r9nn-1NsQX!HCM&yNguY1~^;l2qGV!gRhOx@$
zk}L7jPbMlXq!}ma#4hr3p#69-Nv^^uQiIqm34bm|DF=cK5D^2`Bu7GUZGNM(<#|hL
z1P7!^jm$+&i?qtkI7u&y<(m9clAe#O#DgHz<#qTfSDA5rck(D(YMG@A9w162wDw(U
zHL<_akTLkPJkWVKr=2gd)L;c&Fk!VjsBJU|P2^YDW7XS4SydfUlTDL23%$sU&Sq9x
zg%i|?Z~l3$BLkh3G^93_a~Bm`O0DYVR`q6Sp{t(-8!=Mekxt^=s)$L$E93SYs3<dA
zx*$(-4Y}lj5ZHJ$z&=M16Q5A%11y&2TRm1%V~E@Of_|9T9W0q{peA8dC`)Smvn4m?
zL}=33M6MMNtYZRw2pF=ehzBO(gBl-7D;rvwAD{G&!g%(1nPM8LJg|1;sGK)SvgP)&
z^X&b@t@yvziR)U&D@Kq^CbQVNzUwgeO3}-VzB&8p5Ar6u+BHXUaQrK{h}a?g_<CpA
zOXP`8q6WjTRupH~_Pdi?57H11!s!L6Yj0-Ki^B0dzEi11<a-4gYq|N%Y1q#3&$lr<
zuUO%Z4sFOT9PR1R$>?CXe|RwZaI!o4*H5R1quqm(k)3$-cKB{|a=44=Qm}3ajP~ij
z6)sE!0gn(Hm_0$U36NAC=h((>=mAU+T2`bv*GCJDY{6#NX*P8nF#c%13AeNVD-rbO
zds@4R8>->quKh+}^vm(lM~DGkL+eJgO^Xqi4gQ8|&P)5*ikp>g?L@G8u5GqcnQ{BB
zl|8m)&4;^mYM5)dH+0>$lEKD4H34kbW5c?(onhPYw;B6R<Klfwe6W9TLtLW$t1+kZ
zjSahz@oO=!@FF8^(mb?@k4=e2srh?m6TGJIeB0s7L{U;1%q2aaa}&FuR1L00>u45F
zRhn6sQS%i=JHnM+7f(|Y+dM4~i(G3I#zE3VHFvm+#Wzt<*z}aprl&|WK7~7#hksS6
zcGPqlIX=3zM(WbK)kUBjmA28m|1;Dy>sg*p{}&Eg%x&~&nuKwlja=HG^14ed$Y!yP
z`cs?!SxIajv=kgH^Zo0+HIKY9a<rHwb80iPS?BpY*{-o-Ckw~+&|y={k&0~M9_DA0
z6+1NA&(tV0dTK2yg`@0D)m><X()ztQW!(W*C@F$-N(vhVmRh=LmaUn!M6qJF62-b%
z&ULnKcS|(uW?Im!nCp7)XR6VJmPTlyrni~HI8A2L6*BycD21}o)E9DH)mVsfRbwH&
zrp6%f&kO>j(e#T(3^>|md)Ep2iVa$i-h+cimp5-}6ve!$aRc)vP+Q^B&tH~1-Wc9I
z{RaU-5Gm;+tbG#%!oa{lk1?Oy1Fn$FaIA>sk)hhB08lLg&j??58X1miSxPBMymmQm
zu8GOd62FNpJMVuxI$GX9g~8=h54PMZH7;#!;kQbWtsbsal-qNgb!Zo+aBz)F`tP-Q
za6z)x-BmXbX4$NA##szw4`Y@+i#&Wk9EU@@{GQ7IdnZO)*JuB7+v*Lg2}03*7U%Q(
zjNeY`%}F{|ad@?G-?zj66ziR}Iua-ONCo-)pi*2#K-35F6rxuE*zW-VOBWh9ojemH
z^P2z!pme<;I4!!Y>NTBtHhhlG&E>6=cl~YZvxYPauiPxocx&pNhRTNC*~D8cp9_d7
zgaS!O1cQJuZWjk2#ZpMl8RE4(q$%{c!RD!XzhQCN%xk!UYm#ys^;$33DACH@Ub^;o
zj?^BPd%uU~(`FrbH=njQOj2v7^T%sDSzfy9g5u)B-K7@#7;2N%yA{`n^Q+RGp<SR=
zg*a5}HSN~8@fL<X(r5D<f@RySaek%ct+BngQR1nn_aRC0CZpRZolS<ffxg7=PoF*w
zeB0G+d|;Pb_48k95~$iOF0K&8TDxts+?M^?+ipwiZM0uT7y_6J#u$|dGa?aZ90@9|
z0Rw0)netY-<5~k=Yr^+-)%Vt#jiPThq}yvj_w`qkSv|<XZp9hmYaRBU>R?nmvTVq-
zBCAe~sgUbjWIk(?Ge{}-fRvaLtQ2615(<e4jG|sJ2b??`(E>?5qXGySA-*NS(prkI
zf@)sdI+H5VEfUklI|hedTBFX+imQV>os}>4?S^NQ#w-7ZJ70I|RoPix4T}SYUB|&5
zIS_DvpARYB+m#$rM$y6W4P}JC*%N~E14?(ro7J1Ti3K~u_pjHR@5|%YW#fA}d|k2F
zJ0wVVNsme%$t}8;IJ`Xm?e%g{wkvOl@Gp;EFQo}DPflOo2I%?r8U?%rvn}0)U$=~^
zpumgDAUD_lH;v9AeR=Wa#S16twpje^>9Kf%IxN0eNlS<XHjLI`@sEPVYdcF82ABQ0
z{07;zcewE#E}48;6)7eIDF&PlFl!L$GlAs=ChbvqLcazo?;JyIpB*aSq4Le*YKh7p
zeGqS_e}`|u&kXn<v4`RLhs!H2vco4w<sZwv+y|hqN1x{m&~M4{UI*5%o2vusJFvb3
z>pQUiM+56yMUfUWcEJ4#iVnE1_V0lEhXU>mU=%A(aNtuaDD=2t(kKOh7a&d?SnnPx
z5@;VW1}O8i7ho0Wz@wB^{pxoD+;2>bZzf#t_`W{~AN4_T+x#3Md@P`Y`3Qgjar-4C
z5CS4<|0M|GRM-PlU7;Tm!EdK$9gM%;%sUvrftL-o+rju9j9)%OHksAa9{C>n;Pq68
zs|N@C9~F|1tu`znwo6CauZ-9edSE@!F5v{qeFOlJRD!*OJ$5j}co!1J_x6WxAY8rY
z2Sw~R=R;owv2RKgejM1o|KzZ}1hRwei<PtlPEf;W9c=$NuzeESV4e4Ga-KeF`{FBP
zVz9)wX9n9_xwF=|y~N}z;P!=QsBN^v?K|AQSzIk~`(*6L|8pw-ygGS*d`OO>KY#sv
ze)LQ7S&qe%<Mxl_U+#n3*Tc`V#_hM_c&~%)*Ui<z_8n~B!S)?&|HHxdErLjk2|Lt&
z1x1J2SNnIU{e!)3PXY6hCp_W>L=s>5zR!@5IPfJ<5P^UOTrlk!UjVKGL_h!#<%Ws?
zLDs!)-@R^M?(_{}_1)|C9Zuij^c_y$;q*Vy>-HVG-{y7xAV8WbAPrH#W`F_5Mrnz>
z0C^ZIj*Rg+Q_L5VDFg%&3MmgOYjheCgKI(a`>h@5-uC~I-}Zke=4AuN$G>IgZ=+v6
zpS}O}QOgFzfU)jv|M^OmaU0x-0U<_N!)RUEz@wB6M9Fv@#^b>_Nyd>;(=cm(0hbdi
zL~8%Y=UgfPB@-<x1)Le*zf$1Z8PxXKRSI;K0?p!TSt+37G}TvsU%~X^{U3+FPyg^f
zPUV#{!;|x;t`vAkm(rp-V2dbokLrN7F!qM}03RZowi^$4j0<j<;zB{<qact>BX4be
zz(zjzT9*Xe17rUhp!FT_{5#?5_d@dTQ9;leGQT%4e;4?FTj+efq_)(DhXUp+ys5$S
z>xTbMv3!UjZ$zy&1NH4LexUenFMHYp?kl|V<~ds9=id&3-5$wrgLSt@`?o;F+g1eJ
zBIK*bdN%m^7K?0yf<FP&jktge_|RaY4QCQErVvq7W1lew8PtG!z5$pMPYY^4Jt;^a
zOrQm#5PXkNxADiOfS1-JeDl#_KTSe^Bb^tH-JPx3NLbv)m^4k&)HpV7$U1NP*dvB+
zG5q4RxslQx@`EV()QT|6?OAIhWuPaUX+o<ptww8+lNWT8#GdA?mv2Ejoq5^J+entq
zVs|lVc^QP82fco?%yB+VqRr$}6}OR(%_Q`>pISAp(XO?n)>Rj8PfvQo-5xxyJDzPT
zEZ!FD>z$^vEWZWH*ZQdXRX(8ZvIoLf6upA9RjGyRh58V!@3ji9Epqo3#TJy+{A&fP
zg_v>*0AZA1K{1wqyDL#bDW+6N!kLgjR(=0N7F)D-a1U2<ajg_bN5k)|WMW<^abktn
z2F`9zT`GaN?X)P!==FOaYB~GnN(fk>UGy65BB*U81h=->qTi!bLO>#!lvLVeg$jTf
zkT!?G*18Z84Jq<Nmq4uXn;Y%vZoc!|uY34je-pumH2a=)2*!he6RHeUt^`#`#C;-s
zNjzU02#M8l=0S$AhmjHi#WtjPLSe$RakM{99Rg%hNGRbR+?DuXXd^d$b07~GKG@qQ
zdvu8R7-0K|wX8$9HQ|@XuNw`pRq?^5jO8x*N~QQ<MI66fwhgb(zRqCx-Ey4)`0)Dz
z7<!aC17dd%yE=pUN-7A@(uCItkhL{g$CJ7`gKw<P0CHsYnmgTo&V>fp+F83ogTjvQ
z{a*<zyg_ZBU7<l&XwWRKmW2kNlHWg$|Ml^79Gn~)UtE65&&R*)9qvaTetIs226yr)
zZ7L1g$C<9upx0Fzbd?5Or9oF|&{Z0&8MLc3=qe4mN`t1RhpIFP1T#o0L3KcsG#L7n
zcmf0(5w4ZTC=IMT(?MVi4g#xnz$Q*i6QDFVM5(HO?<x(tN`tP_;Fh|pH0UY~x=Mqt
z(qI)Ex=MpOaaU>3RT?~p<Libr`<|5sfHE$m_8CLM=H2erQhJb6Dm63Ehk=I#;6cEF
nAk;@t8$^i~)Hf9Qh*y8lNLOjlRT_LVl?MM0>i&vvOP~M%xznae

literal 0
HcmV?d00001

diff --git a/x-pack/test/functional/es_archives/packetbeat/tls/mappings.json b/x-pack/test/functional/es_archives/packetbeat/tls/mappings.json
new file mode 100644
index 0000000000000..2b5ed05c7e8a9
--- /dev/null
+++ b/x-pack/test/functional/es_archives/packetbeat/tls/mappings.json
@@ -0,0 +1,9583 @@
+{
+  "type": "index",
+  "value": {
+    "aliases": {
+      "packetbeat-7.6.0": {
+        "is_write_index": false
+      },
+      "packetbeat-tls": {
+        "filter": {
+          "term": {
+            "event.dataset": "tls"
+          }
+        }
+      }
+    },
+    "index": "packetbeat-7.6.0-2020.03.03-000001",
+    "mappings": {
+      "_meta": {
+        "beat": "packetbeat",
+        "version": "7.6.0"
+      },
+      "date_detection": false,
+      "dynamic_templates": [
+        {
+          "labels": {
+            "mapping": {
+              "type": "keyword"
+            },
+            "match_mapping_type": "string",
+            "path_match": "labels.*"
+          }
+        },
+        {
+          "container.labels": {
+            "mapping": {
+              "type": "keyword"
+            },
+            "match_mapping_type": "string",
+            "path_match": "container.labels.*"
+          }
+        },
+        {
+          "dns.answers": {
+            "mapping": {
+              "type": "keyword"
+            },
+            "match_mapping_type": "string",
+            "path_match": "dns.answers.*"
+          }
+        },
+        {
+          "log.syslog": {
+            "mapping": {
+              "type": "keyword"
+            },
+            "match_mapping_type": "string",
+            "path_match": "log.syslog.*"
+          }
+        },
+        {
+          "fields": {
+            "mapping": {
+              "type": "keyword"
+            },
+            "match_mapping_type": "string",
+            "path_match": "fields.*"
+          }
+        },
+        {
+          "docker.container.labels": {
+            "mapping": {
+              "type": "keyword"
+            },
+            "match_mapping_type": "string",
+            "path_match": "docker.container.labels.*"
+          }
+        },
+        {
+          "kubernetes.labels.*": {
+            "mapping": {
+              "type": "keyword"
+            },
+            "path_match": "kubernetes.labels.*"
+          }
+        },
+        {
+          "kubernetes.annotations.*": {
+            "mapping": {
+              "type": "keyword"
+            },
+            "path_match": "kubernetes.annotations.*"
+          }
+        },
+        {
+          "amqp.headers": {
+            "mapping": {
+              "type": "keyword"
+            },
+            "match_mapping_type": "string",
+            "path_match": "amqp.headers.*"
+          }
+        },
+        {
+          "cassandra.response.supported": {
+            "mapping": {
+              "type": "keyword"
+            },
+            "match_mapping_type": "string",
+            "path_match": "cassandra.response.supported.*"
+          }
+        },
+        {
+          "http.request.headers": {
+            "mapping": {
+              "type": "keyword"
+            },
+            "match_mapping_type": "string",
+            "path_match": "http.request.headers.*"
+          }
+        },
+        {
+          "http.response.headers": {
+            "mapping": {
+              "type": "keyword"
+            },
+            "match_mapping_type": "string",
+            "path_match": "http.response.headers.*"
+          }
+        },
+        {
+          "strings_as_keyword": {
+            "mapping": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "match_mapping_type": "string"
+          }
+        }
+      ],
+      "properties": {
+        "@timestamp": {
+          "type": "date"
+        },
+        "agent": {
+          "properties": {
+            "ephemeral_id": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "hostname": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "id": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "name": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "type": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "version": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "amqp": {
+          "properties": {
+            "app-id": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "arguments": {
+              "type": "object"
+            },
+            "auto-delete": {
+              "type": "boolean"
+            },
+            "class-id": {
+              "type": "long"
+            },
+            "consumer-count": {
+              "type": "long"
+            },
+            "consumer-tag": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "content-encoding": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "content-type": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "correlation-id": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "delivery-mode": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "delivery-tag": {
+              "type": "long"
+            },
+            "durable": {
+              "type": "boolean"
+            },
+            "exchange": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "exchange-type": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "exclusive": {
+              "type": "boolean"
+            },
+            "expiration": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "headers": {
+              "type": "object"
+            },
+            "if-empty": {
+              "type": "boolean"
+            },
+            "if-unused": {
+              "type": "boolean"
+            },
+            "immediate": {
+              "type": "boolean"
+            },
+            "mandatory": {
+              "type": "boolean"
+            },
+            "message-count": {
+              "type": "long"
+            },
+            "message-id": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "method-id": {
+              "type": "long"
+            },
+            "multiple": {
+              "type": "boolean"
+            },
+            "no-ack": {
+              "type": "boolean"
+            },
+            "no-local": {
+              "type": "boolean"
+            },
+            "no-wait": {
+              "type": "boolean"
+            },
+            "passive": {
+              "type": "boolean"
+            },
+            "priority": {
+              "type": "long"
+            },
+            "queue": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "redelivered": {
+              "type": "boolean"
+            },
+            "reply-code": {
+              "type": "long"
+            },
+            "reply-text": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "reply-to": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "routing-key": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "timestamp": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "type": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "user-id": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "as": {
+          "properties": {
+            "number": {
+              "type": "long"
+            },
+            "organization": {
+              "properties": {
+                "name": {
+                  "fields": {
+                    "text": {
+                      "norms": false,
+                      "type": "text"
+                    }
+                  },
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            }
+          }
+        },
+        "bytes_in": {
+          "path": "source.bytes",
+          "type": "alias"
+        },
+        "bytes_out": {
+          "path": "destination.bytes",
+          "type": "alias"
+        },
+        "cassandra": {
+          "properties": {
+            "no_request": {
+              "type": "boolean"
+            },
+            "request": {
+              "properties": {
+                "headers": {
+                  "properties": {
+                    "flags": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "length": {
+                      "type": "long"
+                    },
+                    "op": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "stream": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "version": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "query": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "response": {
+              "properties": {
+                "authentication": {
+                  "properties": {
+                    "class": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "error": {
+                  "properties": {
+                    "code": {
+                      "type": "long"
+                    },
+                    "details": {
+                      "properties": {
+                        "alive": {
+                          "type": "long"
+                        },
+                        "arg_types": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "blockfor": {
+                          "type": "long"
+                        },
+                        "data_present": {
+                          "type": "boolean"
+                        },
+                        "function": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "keyspace": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "num_failures": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "read_consistency": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "received": {
+                          "type": "long"
+                        },
+                        "required": {
+                          "type": "long"
+                        },
+                        "stmt_id": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "table": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "write_type": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        }
+                      }
+                    },
+                    "msg": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "type": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "event": {
+                  "properties": {
+                    "change": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "host": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "port": {
+                      "type": "long"
+                    },
+                    "schema_change": {
+                      "properties": {
+                        "args": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "change": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "keyspace": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "name": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "object": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "table": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "target": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        }
+                      }
+                    },
+                    "type": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "headers": {
+                  "properties": {
+                    "flags": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "length": {
+                      "type": "long"
+                    },
+                    "op": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "stream": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "version": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "result": {
+                  "properties": {
+                    "keyspace": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "prepared": {
+                      "properties": {
+                        "prepared_id": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "req_meta": {
+                          "properties": {
+                            "col_count": {
+                              "type": "long"
+                            },
+                            "flags": {
+                              "ignore_above": 1024,
+                              "type": "keyword"
+                            },
+                            "keyspace": {
+                              "ignore_above": 1024,
+                              "type": "keyword"
+                            },
+                            "paging_state": {
+                              "ignore_above": 1024,
+                              "type": "keyword"
+                            },
+                            "pkey_columns": {
+                              "type": "long"
+                            },
+                            "table": {
+                              "ignore_above": 1024,
+                              "type": "keyword"
+                            }
+                          }
+                        },
+                        "resp_meta": {
+                          "properties": {
+                            "col_count": {
+                              "type": "long"
+                            },
+                            "flags": {
+                              "ignore_above": 1024,
+                              "type": "keyword"
+                            },
+                            "keyspace": {
+                              "ignore_above": 1024,
+                              "type": "keyword"
+                            },
+                            "paging_state": {
+                              "ignore_above": 1024,
+                              "type": "keyword"
+                            },
+                            "pkey_columns": {
+                              "type": "long"
+                            },
+                            "table": {
+                              "ignore_above": 1024,
+                              "type": "keyword"
+                            }
+                          }
+                        }
+                      }
+                    },
+                    "rows": {
+                      "properties": {
+                        "meta": {
+                          "properties": {
+                            "col_count": {
+                              "type": "long"
+                            },
+                            "flags": {
+                              "ignore_above": 1024,
+                              "type": "keyword"
+                            },
+                            "keyspace": {
+                              "ignore_above": 1024,
+                              "type": "keyword"
+                            },
+                            "paging_state": {
+                              "ignore_above": 1024,
+                              "type": "keyword"
+                            },
+                            "pkey_columns": {
+                              "type": "long"
+                            },
+                            "table": {
+                              "ignore_above": 1024,
+                              "type": "keyword"
+                            }
+                          }
+                        },
+                        "num_rows": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "schema_change": {
+                      "properties": {
+                        "args": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "change": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "keyspace": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "name": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "object": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "table": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "target": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        }
+                      }
+                    },
+                    "type": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "supported": {
+                  "type": "object"
+                },
+                "warnings": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            }
+          }
+        },
+        "client": {
+          "properties": {
+            "address": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "as": {
+              "properties": {
+                "number": {
+                  "type": "long"
+                },
+                "organization": {
+                  "properties": {
+                    "name": {
+                      "fields": {
+                        "text": {
+                          "norms": false,
+                          "type": "text"
+                        }
+                      },
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                }
+              }
+            },
+            "bytes": {
+              "type": "long"
+            },
+            "domain": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "geo": {
+              "properties": {
+                "city_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "continent_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "country_iso_code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "country_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "location": {
+                  "type": "geo_point"
+                },
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "region_iso_code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "region_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "ip": {
+              "type": "ip"
+            },
+            "mac": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "nat": {
+              "properties": {
+                "ip": {
+                  "type": "ip"
+                },
+                "port": {
+                  "type": "long"
+                }
+              }
+            },
+            "packets": {
+              "type": "long"
+            },
+            "port": {
+              "type": "long"
+            },
+            "process": {
+              "properties": {
+                "args": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "executable": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "start": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "working_directory": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "registered_domain": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "top_level_domain": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "user": {
+              "properties": {
+                "domain": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "email": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "full_name": {
+                  "fields": {
+                    "text": {
+                      "norms": false,
+                      "type": "text"
+                    }
+                  },
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "group": {
+                  "properties": {
+                    "domain": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "id": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "name": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "hash": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "name": {
+                  "fields": {
+                    "text": {
+                      "norms": false,
+                      "type": "text"
+                    }
+                  },
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            }
+          }
+        },
+        "cloud": {
+          "properties": {
+            "account": {
+              "properties": {
+                "id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "availability_zone": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "image": {
+              "properties": {
+                "id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "instance": {
+              "properties": {
+                "id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "machine": {
+              "properties": {
+                "type": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "project": {
+              "properties": {
+                "id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "provider": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "region": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "container": {
+          "properties": {
+            "id": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "image": {
+              "properties": {
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "tag": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "labels": {
+              "type": "object"
+            },
+            "name": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "runtime": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "destination": {
+          "properties": {
+            "address": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "as": {
+              "properties": {
+                "number": {
+                  "type": "long"
+                },
+                "organization": {
+                  "properties": {
+                    "name": {
+                      "fields": {
+                        "text": {
+                          "norms": false,
+                          "type": "text"
+                        }
+                      },
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                }
+              }
+            },
+            "bytes": {
+              "type": "long"
+            },
+            "domain": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "geo": {
+              "properties": {
+                "city_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "continent_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "country_iso_code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "country_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "location": {
+                  "type": "geo_point"
+                },
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "region_iso_code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "region_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "ip": {
+              "type": "ip"
+            },
+            "mac": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "nat": {
+              "properties": {
+                "ip": {
+                  "type": "ip"
+                },
+                "port": {
+                  "type": "long"
+                }
+              }
+            },
+            "packets": {
+              "type": "long"
+            },
+            "port": {
+              "type": "long"
+            },
+            "registered_domain": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "top_level_domain": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "user": {
+              "properties": {
+                "domain": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "email": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "full_name": {
+                  "fields": {
+                    "text": {
+                      "norms": false,
+                      "type": "text"
+                    }
+                  },
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "group": {
+                  "properties": {
+                    "domain": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "id": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "name": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "hash": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "name": {
+                  "fields": {
+                    "text": {
+                      "norms": false,
+                      "type": "text"
+                    }
+                  },
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            }
+          }
+        },
+        "dhcpv4": {
+          "properties": {
+            "assigned_ip": {
+              "type": "ip"
+            },
+            "client_ip": {
+              "type": "ip"
+            },
+            "client_mac": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "flags": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "hardware_type": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "hops": {
+              "type": "long"
+            },
+            "op_code": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "option": {
+              "properties": {
+                "boot_file_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "broadcast_address": {
+                  "type": "ip"
+                },
+                "class_identifier": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "dns_servers": {
+                  "type": "ip"
+                },
+                "domain_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "hostname": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "ip_address_lease_time_sec": {
+                  "type": "long"
+                },
+                "max_dhcp_message_size": {
+                  "type": "long"
+                },
+                "message": {
+                  "norms": false,
+                  "type": "text"
+                },
+                "message_type": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "ntp_servers": {
+                  "type": "ip"
+                },
+                "parameter_request_list": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "rebinding_time_sec": {
+                  "type": "long"
+                },
+                "renewal_time_sec": {
+                  "type": "long"
+                },
+                "requested_ip_address": {
+                  "type": "ip"
+                },
+                "router": {
+                  "type": "ip"
+                },
+                "server_identifier": {
+                  "type": "ip"
+                },
+                "subnet_mask": {
+                  "type": "ip"
+                },
+                "time_servers": {
+                  "type": "ip"
+                },
+                "utc_time_offset_sec": {
+                  "type": "long"
+                },
+                "vendor_identifying_options": {
+                  "type": "object"
+                }
+              }
+            },
+            "relay_ip": {
+              "type": "ip"
+            },
+            "seconds": {
+              "type": "long"
+            },
+            "server_ip": {
+              "type": "ip"
+            },
+            "server_name": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "transaction_id": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "dns": {
+          "properties": {
+            "additionals": {
+              "properties": {
+                "class": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "data": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "ttl": {
+                  "type": "long"
+                },
+                "type": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "additionals_count": {
+              "type": "long"
+            },
+            "answers": {
+              "properties": {
+                "class": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "data": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "ttl": {
+                  "type": "long"
+                },
+                "type": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "answers_count": {
+              "type": "long"
+            },
+            "authorities": {
+              "properties": {
+                "class": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "type": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "authorities_count": {
+              "type": "long"
+            },
+            "flags": {
+              "properties": {
+                "authentic_data": {
+                  "type": "boolean"
+                },
+                "authoritative": {
+                  "type": "boolean"
+                },
+                "checking_disabled": {
+                  "type": "boolean"
+                },
+                "recursion_available": {
+                  "type": "boolean"
+                },
+                "recursion_desired": {
+                  "type": "boolean"
+                },
+                "truncated_response": {
+                  "type": "boolean"
+                }
+              }
+            },
+            "header_flags": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "id": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "op_code": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "opt": {
+              "properties": {
+                "cookie": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "do": {
+                  "type": "boolean"
+                },
+                "ext_rcode": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "udp_size": {
+                  "type": "long"
+                },
+                "version": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "question": {
+              "properties": {
+                "class": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "etld_plus_one": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "registered_domain": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "subdomain": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "top_level_domain": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "type": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "resolved_ip": {
+              "type": "ip"
+            },
+            "response_code": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "type": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "docker": {
+          "properties": {
+            "container": {
+              "properties": {
+                "labels": {
+                  "type": "object"
+                }
+              }
+            }
+          }
+        },
+        "ecs": {
+          "properties": {
+            "version": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "error": {
+          "properties": {
+            "code": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "id": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "message": {
+              "norms": false,
+              "type": "text"
+            },
+            "stack_trace": {
+              "fields": {
+                "text": {
+                  "norms": false,
+                  "type": "text"
+                }
+              },
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "type": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "event": {
+          "properties": {
+            "action": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "category": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "code": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "created": {
+              "type": "date"
+            },
+            "dataset": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "duration": {
+              "type": "long"
+            },
+            "end": {
+              "type": "date"
+            },
+            "hash": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "id": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "ingested": {
+              "type": "date"
+            },
+            "kind": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "module": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "original": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "outcome": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "provider": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "risk_score": {
+              "type": "float"
+            },
+            "risk_score_norm": {
+              "type": "float"
+            },
+            "sequence": {
+              "type": "long"
+            },
+            "severity": {
+              "type": "long"
+            },
+            "start": {
+              "type": "date"
+            },
+            "timezone": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "type": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "fields": {
+          "properties": {
+            "labels": {
+              "properties": {
+                "responsible_human": {
+                  "type": "keyword"
+                }
+              }
+            }
+          }
+        },
+        "file": {
+          "properties": {
+            "accessed": {
+              "type": "date"
+            },
+            "attributes": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "created": {
+              "type": "date"
+            },
+            "ctime": {
+              "type": "date"
+            },
+            "device": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "directory": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "drive_letter": {
+              "ignore_above": 1,
+              "type": "keyword"
+            },
+            "extension": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "gid": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "group": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "hash": {
+              "properties": {
+                "md5": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "sha1": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "sha256": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "sha512": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "inode": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "mode": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "mtime": {
+              "type": "date"
+            },
+            "name": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "owner": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "path": {
+              "fields": {
+                "text": {
+                  "norms": false,
+                  "type": "text"
+                }
+              },
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "size": {
+              "type": "long"
+            },
+            "target_path": {
+              "fields": {
+                "text": {
+                  "norms": false,
+                  "type": "text"
+                }
+              },
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "type": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "uid": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "flow": {
+          "properties": {
+            "final": {
+              "type": "boolean"
+            },
+            "id": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "vlan": {
+              "type": "long"
+            }
+          }
+        },
+        "geo": {
+          "properties": {
+            "city_name": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "continent_name": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "country_iso_code": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "country_name": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "location": {
+              "type": "geo_point"
+            },
+            "name": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "region_iso_code": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "region_name": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "group": {
+          "properties": {
+            "domain": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "id": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "name": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "hash": {
+          "properties": {
+            "md5": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "sha1": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "sha256": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "sha512": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "host": {
+          "properties": {
+            "architecture": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "containerized": {
+              "type": "boolean"
+            },
+            "domain": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "geo": {
+              "properties": {
+                "city_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "continent_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "country_iso_code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "country_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "location": {
+                  "type": "geo_point"
+                },
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "region_iso_code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "region_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "hostname": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "id": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "ip": {
+              "type": "ip"
+            },
+            "mac": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "name": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "os": {
+              "properties": {
+                "build": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "codename": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "family": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "full": {
+                  "fields": {
+                    "text": {
+                      "norms": false,
+                      "type": "text"
+                    }
+                  },
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "kernel": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "name": {
+                  "fields": {
+                    "text": {
+                      "norms": false,
+                      "type": "text"
+                    }
+                  },
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "platform": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "version": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "type": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "uptime": {
+              "type": "long"
+            },
+            "user": {
+              "properties": {
+                "domain": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "email": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "full_name": {
+                  "fields": {
+                    "text": {
+                      "norms": false,
+                      "type": "text"
+                    }
+                  },
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "group": {
+                  "properties": {
+                    "domain": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "id": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "name": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "hash": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "name": {
+                  "fields": {
+                    "text": {
+                      "norms": false,
+                      "type": "text"
+                    }
+                  },
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            }
+          }
+        },
+        "http": {
+          "properties": {
+            "request": {
+              "properties": {
+                "body": {
+                  "properties": {
+                    "bytes": {
+                      "type": "long"
+                    },
+                    "content": {
+                      "fields": {
+                        "text": {
+                          "norms": false,
+                          "type": "text"
+                        }
+                      },
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "bytes": {
+                  "type": "long"
+                },
+                "headers": {
+                  "properties": {
+                    "content-length": {
+                      "type": "long"
+                    },
+                    "content-type": {
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "method": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "referrer": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "response": {
+              "properties": {
+                "body": {
+                  "properties": {
+                    "bytes": {
+                      "type": "long"
+                    },
+                    "content": {
+                      "fields": {
+                        "text": {
+                          "norms": false,
+                          "type": "text"
+                        }
+                      },
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "bytes": {
+                  "type": "long"
+                },
+                "headers": {
+                  "properties": {
+                    "content-length": {
+                      "type": "long"
+                    },
+                    "content-type": {
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "status_code": {
+                  "type": "long"
+                },
+                "status_phrase": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "version": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "icmp": {
+          "properties": {
+            "request": {
+              "properties": {
+                "code": {
+                  "type": "long"
+                },
+                "message": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "type": {
+                  "type": "long"
+                }
+              }
+            },
+            "response": {
+              "properties": {
+                "code": {
+                  "type": "long"
+                },
+                "message": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "type": {
+                  "type": "long"
+                }
+              }
+            },
+            "version": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "jolokia": {
+          "properties": {
+            "agent": {
+              "properties": {
+                "id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "version": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "secured": {
+              "type": "boolean"
+            },
+            "server": {
+              "properties": {
+                "product": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "vendor": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "version": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "url": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "kubernetes": {
+          "properties": {
+            "annotations": {
+              "properties": {
+                "*": {
+                  "type": "object"
+                }
+              }
+            },
+            "container": {
+              "properties": {
+                "image": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "deployment": {
+              "properties": {
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "labels": {
+              "properties": {
+                "*": {
+                  "type": "object"
+                }
+              }
+            },
+            "namespace": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "node": {
+              "properties": {
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "pod": {
+              "properties": {
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "uid": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "replicaset": {
+              "properties": {
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "statefulset": {
+              "properties": {
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            }
+          }
+        },
+        "labels": {
+          "type": "object"
+        },
+        "log": {
+          "properties": {
+            "level": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "logger": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "origin": {
+              "properties": {
+                "file": {
+                  "properties": {
+                    "line": {
+                      "type": "long"
+                    },
+                    "name": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "function": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "original": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "syslog": {
+              "properties": {
+                "facility": {
+                  "properties": {
+                    "code": {
+                      "type": "long"
+                    },
+                    "name": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "priority": {
+                  "type": "long"
+                },
+                "severity": {
+                  "properties": {
+                    "code": {
+                      "type": "long"
+                    },
+                    "name": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                }
+              }
+            }
+          }
+        },
+        "memcache": {
+          "properties": {
+            "protocol_type": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "request": {
+              "properties": {
+                "automove": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "bytes": {
+                  "type": "long"
+                },
+                "cas_unique": {
+                  "type": "long"
+                },
+                "command": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "count_values": {
+                  "type": "long"
+                },
+                "delta": {
+                  "type": "long"
+                },
+                "dest_class": {
+                  "type": "long"
+                },
+                "exptime": {
+                  "type": "long"
+                },
+                "flags": {
+                  "type": "long"
+                },
+                "initial": {
+                  "type": "long"
+                },
+                "line": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "noreply": {
+                  "type": "boolean"
+                },
+                "opaque": {
+                  "type": "long"
+                },
+                "opcode": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "opcode_value": {
+                  "type": "long"
+                },
+                "quiet": {
+                  "type": "boolean"
+                },
+                "raw_args": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "sleep_us": {
+                  "type": "long"
+                },
+                "source_class": {
+                  "type": "long"
+                },
+                "type": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "vbucket": {
+                  "type": "long"
+                },
+                "verbosity": {
+                  "type": "long"
+                }
+              }
+            },
+            "response": {
+              "properties": {
+                "bytes": {
+                  "type": "long"
+                },
+                "cas_unique": {
+                  "type": "long"
+                },
+                "command": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "count_values": {
+                  "type": "long"
+                },
+                "error_msg": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "flags": {
+                  "type": "long"
+                },
+                "opaque": {
+                  "type": "long"
+                },
+                "opcode": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "opcode_value": {
+                  "type": "long"
+                },
+                "status": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "status_code": {
+                  "type": "long"
+                },
+                "type": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "value": {
+                  "type": "long"
+                },
+                "version": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            }
+          }
+        },
+        "message": {
+          "norms": false,
+          "type": "text"
+        },
+        "method": {
+          "ignore_above": 1024,
+          "type": "keyword"
+        },
+        "mongodb": {
+          "properties": {
+            "cursorId": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "error": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "fullCollectionName": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "numberReturned": {
+              "type": "long"
+            },
+            "numberToReturn": {
+              "type": "long"
+            },
+            "numberToSkip": {
+              "type": "long"
+            },
+            "query": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "returnFieldsSelector": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "selector": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "startingFrom": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "update": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "mysql": {
+          "properties": {
+            "affected_rows": {
+              "type": "long"
+            },
+            "error_code": {
+              "type": "long"
+            },
+            "error_message": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "insert_id": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "num_fields": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "num_rows": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "query": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "network": {
+          "properties": {
+            "application": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "bytes": {
+              "type": "long"
+            },
+            "community_id": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "direction": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "forwarded_ip": {
+              "type": "ip"
+            },
+            "iana_number": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "name": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "packets": {
+              "type": "long"
+            },
+            "protocol": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "transport": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "type": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "nfs": {
+          "properties": {
+            "minor_version": {
+              "type": "long"
+            },
+            "opcode": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "status": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "tag": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "version": {
+              "type": "long"
+            }
+          }
+        },
+        "notes": {
+          "path": "error.message",
+          "type": "alias"
+        },
+        "observer": {
+          "properties": {
+            "geo": {
+              "properties": {
+                "city_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "continent_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "country_iso_code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "country_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "location": {
+                  "type": "geo_point"
+                },
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "region_iso_code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "region_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "hostname": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "ip": {
+              "type": "ip"
+            },
+            "mac": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "name": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "os": {
+              "properties": {
+                "family": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "full": {
+                  "fields": {
+                    "text": {
+                      "norms": false,
+                      "type": "text"
+                    }
+                  },
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "kernel": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "name": {
+                  "fields": {
+                    "text": {
+                      "norms": false,
+                      "type": "text"
+                    }
+                  },
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "platform": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "version": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "product": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "serial_number": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "type": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "vendor": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "version": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "organization": {
+          "properties": {
+            "id": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "name": {
+              "fields": {
+                "text": {
+                  "norms": false,
+                  "type": "text"
+                }
+              },
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "os": {
+          "properties": {
+            "family": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "full": {
+              "fields": {
+                "text": {
+                  "norms": false,
+                  "type": "text"
+                }
+              },
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "kernel": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "name": {
+              "fields": {
+                "text": {
+                  "norms": false,
+                  "type": "text"
+                }
+              },
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "platform": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "version": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "package": {
+          "properties": {
+            "architecture": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "build_version": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "checksum": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "description": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "install_scope": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "installed": {
+              "type": "date"
+            },
+            "license": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "name": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "path": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "reference": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "size": {
+              "type": "long"
+            },
+            "type": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "version": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "params": {
+          "norms": false,
+          "type": "text"
+        },
+        "path": {
+          "ignore_above": 1024,
+          "type": "keyword"
+        },
+        "pgsql": {
+          "properties": {
+            "error_code": {
+              "type": "long"
+            },
+            "error_message": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "error_severity": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "num_fields": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "num_rows": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "process": {
+          "properties": {
+            "args": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "args_count": {
+              "type": "long"
+            },
+            "command_line": {
+              "fields": {
+                "text": {
+                  "norms": false,
+                  "type": "text"
+                }
+              },
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "executable": {
+              "fields": {
+                "text": {
+                  "norms": false,
+                  "type": "text"
+                }
+              },
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "exit_code": {
+              "type": "long"
+            },
+            "hash": {
+              "properties": {
+                "md5": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "sha1": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "sha256": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "sha512": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "name": {
+              "fields": {
+                "text": {
+                  "norms": false,
+                  "type": "text"
+                }
+              },
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "parent": {
+              "properties": {
+                "args": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "args_count": {
+                  "type": "long"
+                },
+                "command_line": {
+                  "fields": {
+                    "text": {
+                      "norms": false,
+                      "type": "text"
+                    }
+                  },
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "executable": {
+                  "fields": {
+                    "text": {
+                      "norms": false,
+                      "type": "text"
+                    }
+                  },
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "exit_code": {
+                  "type": "long"
+                },
+                "name": {
+                  "fields": {
+                    "text": {
+                      "norms": false,
+                      "type": "text"
+                    }
+                  },
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "pgid": {
+                  "type": "long"
+                },
+                "pid": {
+                  "type": "long"
+                },
+                "ppid": {
+                  "type": "long"
+                },
+                "start": {
+                  "type": "date"
+                },
+                "thread": {
+                  "properties": {
+                    "id": {
+                      "type": "long"
+                    },
+                    "name": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "title": {
+                  "fields": {
+                    "text": {
+                      "norms": false,
+                      "type": "text"
+                    }
+                  },
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "uptime": {
+                  "type": "long"
+                },
+                "working_directory": {
+                  "fields": {
+                    "text": {
+                      "norms": false,
+                      "type": "text"
+                    }
+                  },
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "pgid": {
+              "type": "long"
+            },
+            "pid": {
+              "type": "long"
+            },
+            "ppid": {
+              "type": "long"
+            },
+            "start": {
+              "type": "date"
+            },
+            "thread": {
+              "properties": {
+                "id": {
+                  "type": "long"
+                },
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "title": {
+              "fields": {
+                "text": {
+                  "norms": false,
+                  "type": "text"
+                }
+              },
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "uptime": {
+              "type": "long"
+            },
+            "working_directory": {
+              "fields": {
+                "text": {
+                  "norms": false,
+                  "type": "text"
+                }
+              },
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "query": {
+          "ignore_above": 1024,
+          "type": "keyword"
+        },
+        "redis": {
+          "properties": {
+            "error": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "return_value": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "registry": {
+          "properties": {
+            "data": {
+              "properties": {
+                "bytes": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "strings": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "type": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "hive": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "key": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "path": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "value": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "related": {
+          "properties": {
+            "ip": {
+              "type": "ip"
+            },
+            "user": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "request": {
+          "norms": false,
+          "type": "text"
+        },
+        "resource": {
+          "ignore_above": 1024,
+          "type": "keyword"
+        },
+        "response": {
+          "norms": false,
+          "type": "text"
+        },
+        "rpc": {
+          "properties": {
+            "auth_flavor": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "cred": {
+              "properties": {
+                "gid": {
+                  "type": "long"
+                },
+                "gids": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "machinename": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "stamp": {
+                  "type": "long"
+                },
+                "uid": {
+                  "type": "long"
+                }
+              }
+            },
+            "status": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "xid": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "rule": {
+          "properties": {
+            "category": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "description": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "id": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "name": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "reference": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "ruleset": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "uuid": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "version": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "server": {
+          "properties": {
+            "address": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "as": {
+              "properties": {
+                "number": {
+                  "type": "long"
+                },
+                "organization": {
+                  "properties": {
+                    "name": {
+                      "fields": {
+                        "text": {
+                          "norms": false,
+                          "type": "text"
+                        }
+                      },
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                }
+              }
+            },
+            "bytes": {
+              "type": "long"
+            },
+            "domain": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "geo": {
+              "properties": {
+                "city_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "continent_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "country_iso_code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "country_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "location": {
+                  "type": "geo_point"
+                },
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "region_iso_code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "region_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "ip": {
+              "type": "ip"
+            },
+            "mac": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "nat": {
+              "properties": {
+                "ip": {
+                  "type": "ip"
+                },
+                "port": {
+                  "type": "long"
+                }
+              }
+            },
+            "packets": {
+              "type": "long"
+            },
+            "port": {
+              "type": "long"
+            },
+            "process": {
+              "properties": {
+                "args": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "executable": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "start": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "working_directory": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "registered_domain": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "top_level_domain": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "user": {
+              "properties": {
+                "domain": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "email": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "full_name": {
+                  "fields": {
+                    "text": {
+                      "norms": false,
+                      "type": "text"
+                    }
+                  },
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "group": {
+                  "properties": {
+                    "domain": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "id": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "name": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "hash": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "name": {
+                  "fields": {
+                    "text": {
+                      "norms": false,
+                      "type": "text"
+                    }
+                  },
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            }
+          }
+        },
+        "service": {
+          "properties": {
+            "ephemeral_id": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "id": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "name": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "node": {
+              "properties": {
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "state": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "type": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "version": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "source": {
+          "properties": {
+            "address": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "as": {
+              "properties": {
+                "number": {
+                  "type": "long"
+                },
+                "organization": {
+                  "properties": {
+                    "name": {
+                      "fields": {
+                        "text": {
+                          "norms": false,
+                          "type": "text"
+                        }
+                      },
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                }
+              }
+            },
+            "bytes": {
+              "type": "long"
+            },
+            "domain": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "geo": {
+              "properties": {
+                "city_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "continent_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "country_iso_code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "country_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "location": {
+                  "type": "geo_point"
+                },
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "region_iso_code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "region_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "ip": {
+              "type": "ip"
+            },
+            "mac": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "nat": {
+              "properties": {
+                "ip": {
+                  "type": "ip"
+                },
+                "port": {
+                  "type": "long"
+                }
+              }
+            },
+            "packets": {
+              "type": "long"
+            },
+            "port": {
+              "type": "long"
+            },
+            "registered_domain": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "top_level_domain": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "user": {
+              "properties": {
+                "domain": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "email": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "full_name": {
+                  "fields": {
+                    "text": {
+                      "norms": false,
+                      "type": "text"
+                    }
+                  },
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "group": {
+                  "properties": {
+                    "domain": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "id": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "name": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "hash": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "name": {
+                  "fields": {
+                    "text": {
+                      "norms": false,
+                      "type": "text"
+                    }
+                  },
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            }
+          }
+        },
+        "status": {
+          "ignore_above": 1024,
+          "type": "keyword"
+        },
+        "tags": {
+          "ignore_above": 1024,
+          "type": "keyword"
+        },
+        "threat": {
+          "properties": {
+            "framework": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "tactic": {
+              "properties": {
+                "id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "reference": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "technique": {
+              "properties": {
+                "id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "name": {
+                  "fields": {
+                    "text": {
+                      "norms": false,
+                      "type": "text"
+                    }
+                  },
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "reference": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            }
+          }
+        },
+        "thrift": {
+          "properties": {
+            "exceptions": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "params": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "return_value": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "service": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "timeseries": {
+          "properties": {
+            "instance": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "tls": {
+          "properties": {
+            "alert_types": {
+              "path": "tls.detailed.alert_types",
+              "type": "alias"
+            },
+            "cipher": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "client": {
+              "properties": {
+                "certificate": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "certificate_chain": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "hash": {
+                  "properties": {
+                    "md5": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "sha1": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "sha256": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "issuer": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "ja3": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "not_after": {
+                  "type": "date"
+                },
+                "not_before": {
+                  "type": "date"
+                },
+                "server_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "subject": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "supported_ciphers": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "client_certificate": {
+              "properties": {
+                "alternative_names": {
+                  "path": "tls.detailed.client_certificate.alternative_names",
+                  "type": "alias"
+                },
+                "issuer": {
+                  "properties": {
+                    "common_name": {
+                      "path": "tls.detailed.client_certificate.issuer.common_name",
+                      "type": "alias"
+                    },
+                    "country": {
+                      "path": "tls.detailed.client_certificate.issuer.country",
+                      "type": "alias"
+                    },
+                    "locality": {
+                      "path": "tls.detailed.client_certificate.issuer.locality",
+                      "type": "alias"
+                    },
+                    "organization": {
+                      "path": "tls.detailed.client_certificate.issuer.organization",
+                      "type": "alias"
+                    },
+                    "organizational_unit": {
+                      "path": "tls.detailed.client_certificate.issuer.organizational_unit",
+                      "type": "alias"
+                    },
+                    "province": {
+                      "path": "tls.detailed.client_certificate.issuer.province",
+                      "type": "alias"
+                    }
+                  }
+                },
+                "not_after": {
+                  "path": "tls.detailed.client_certificate.not_after",
+                  "type": "alias"
+                },
+                "not_before": {
+                  "path": "tls.detailed.client_certificate.not_before",
+                  "type": "alias"
+                },
+                "public_key_algorithm": {
+                  "path": "tls.detailed.client_certificate.public_key_algorithm",
+                  "type": "alias"
+                },
+                "public_key_size": {
+                  "path": "tls.detailed.client_certificate.public_key_size",
+                  "type": "alias"
+                },
+                "serial_number": {
+                  "path": "tls.detailed.client_certificate.serial_number",
+                  "type": "alias"
+                },
+                "signature_algorithm": {
+                  "path": "tls.detailed.client_certificate.signature_algorithm",
+                  "type": "alias"
+                },
+                "subject": {
+                  "properties": {
+                    "common_name": {
+                      "path": "tls.detailed.client_certificate.subject.common_name",
+                      "type": "alias"
+                    },
+                    "country": {
+                      "path": "tls.detailed.client_certificate.subject.country",
+                      "type": "alias"
+                    },
+                    "locality": {
+                      "path": "tls.detailed.client_certificate.subject.locality",
+                      "type": "alias"
+                    },
+                    "organization": {
+                      "path": "tls.detailed.client_certificate.subject.organization",
+                      "type": "alias"
+                    },
+                    "organizational_unit": {
+                      "path": "tls.detailed.client_certificate.subject.organizational_unit",
+                      "type": "alias"
+                    },
+                    "province": {
+                      "path": "tls.detailed.client_certificate.subject.province",
+                      "type": "alias"
+                    }
+                  }
+                },
+                "version": {
+                  "path": "tls.detailed.client_certificate.version",
+                  "type": "alias"
+                }
+              }
+            },
+            "client_certificate_requested": {
+              "path": "tls.detailed.client_certificate_requested",
+              "type": "alias"
+            },
+            "client_hello": {
+              "properties": {
+                "extensions": {
+                  "properties": {
+                    "_unparsed_": {
+                      "path": "tls.detailed.client_hello.extensions._unparsed_",
+                      "type": "alias"
+                    },
+                    "application_layer_protocol_negotiation": {
+                      "path": "tls.detailed.client_hello.extensions.application_layer_protocol_negotiation",
+                      "type": "alias"
+                    },
+                    "ec_points_formats": {
+                      "path": "tls.detailed.client_hello.extensions.ec_points_formats",
+                      "type": "alias"
+                    },
+                    "server_name_indication": {
+                      "path": "tls.detailed.client_hello.extensions.server_name_indication",
+                      "type": "alias"
+                    },
+                    "session_ticket": {
+                      "path": "tls.detailed.client_hello.extensions.session_ticket",
+                      "type": "alias"
+                    },
+                    "signature_algorithms": {
+                      "path": "tls.detailed.client_hello.extensions.signature_algorithms",
+                      "type": "alias"
+                    },
+                    "supported_groups": {
+                      "path": "tls.detailed.client_hello.extensions.supported_groups",
+                      "type": "alias"
+                    },
+                    "supported_versions": {
+                      "path": "tls.detailed.client_hello.extensions.supported_versions",
+                      "type": "alias"
+                    }
+                  }
+                },
+                "session_id": {
+                  "path": "tls.detailed.client_hello.session_id",
+                  "type": "alias"
+                },
+                "supported_ciphers": {
+                  "path": "tls.client.supported_ciphers",
+                  "type": "alias"
+                },
+                "supported_compression_methods": {
+                  "path": "tls.detailed.client_hello.supported_compression_methods",
+                  "type": "alias"
+                },
+                "version": {
+                  "path": "tls.detailed.client_hello.version",
+                  "type": "alias"
+                }
+              }
+            },
+            "curve": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "detailed": {
+              "properties": {
+                "alert_types": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "client_certificate": {
+                  "properties": {
+                    "alternative_names": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "issuer": {
+                      "properties": {
+                        "common_name": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "country": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "locality": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "organization": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "organizational_unit": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "province": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        }
+                      }
+                    },
+                    "not_after": {
+                      "type": "date"
+                    },
+                    "not_before": {
+                      "type": "date"
+                    },
+                    "public_key_algorithm": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "public_key_size": {
+                      "type": "long"
+                    },
+                    "serial_number": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "signature_algorithm": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "subject": {
+                      "properties": {
+                        "common_name": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "country": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "locality": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "organization": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "organizational_unit": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "province": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        }
+                      }
+                    },
+                    "version": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "client_certificate_requested": {
+                  "type": "boolean"
+                },
+                "client_hello": {
+                  "properties": {
+                    "extensions": {
+                      "properties": {
+                        "_unparsed_": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "application_layer_protocol_negotiation": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "ec_points_formats": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "server_name_indication": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "session_ticket": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "signature_algorithms": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "supported_groups": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "supported_versions": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        }
+                      }
+                    },
+                    "session_id": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "supported_compression_methods": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "version": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "resumption_method": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "server_certificate": {
+                  "properties": {
+                    "alternative_names": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "issuer": {
+                      "properties": {
+                        "common_name": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "country": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "locality": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "organization": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "organizational_unit": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "province": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        }
+                      }
+                    },
+                    "not_after": {
+                      "type": "date"
+                    },
+                    "not_before": {
+                      "type": "date"
+                    },
+                    "public_key_algorithm": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "public_key_size": {
+                      "type": "long"
+                    },
+                    "serial_number": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "signature_algorithm": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "subject": {
+                      "properties": {
+                        "common_name": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "country": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "locality": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "organization": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "organizational_unit": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "province": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "serial_number": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        }
+                      }
+                    },
+                    "version": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "server_certificate_chain": {
+                  "properties": {
+                    "issuer": {
+                      "properties": {
+                        "common_name": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "country": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "locality": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "organization": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "organizational_unit": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "province": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        }
+                      }
+                    },
+                    "not_after": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "not_before": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "public_key_algorithm": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "public_key_size": {
+                      "type": "long"
+                    },
+                    "serial_number": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "signature_algorithm": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "subject": {
+                      "properties": {
+                        "common_name": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "country": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "locality": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "organization": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "organizational_unit": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "province": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        }
+                      }
+                    },
+                    "version": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "server_hello": {
+                  "properties": {
+                    "extensions": {
+                      "properties": {
+                        "_unparsed_": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "application_layer_protocol_negotiation": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "ec_points_formats": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "session_ticket": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "supported_versions": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        }
+                      }
+                    },
+                    "selected_compression_method": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "session_id": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "version": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "version": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "established": {
+              "type": "boolean"
+            },
+            "fingerprints": {
+              "properties": {
+                "ja3": {
+                  "path": "tls.client.ja3",
+                  "type": "alias"
+                }
+              }
+            },
+            "handshake_completed": {
+              "path": "tls.established",
+              "type": "alias"
+            },
+            "next_protocol": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "resumed": {
+              "type": "boolean"
+            },
+            "resumption_method": {
+              "path": "tls.detailed.resumption_method",
+              "type": "alias"
+            },
+            "server": {
+              "properties": {
+                "certificate": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "certificate_chain": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "hash": {
+                  "properties": {
+                    "md5": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "sha1": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "sha256": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "issuer": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "ja3s": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "not_after": {
+                  "type": "date"
+                },
+                "not_before": {
+                  "type": "date"
+                },
+                "subject": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "server_certificate": {
+              "properties": {
+                "alternative_names": {
+                  "path": "tls.detailed.server_certificate.alternative_names",
+                  "type": "alias"
+                },
+                "issuer": {
+                  "properties": {
+                    "common_name": {
+                      "path": "tls.detailed.server_certificate.issuer.common_name",
+                      "type": "alias"
+                    },
+                    "country": {
+                      "path": "tls.detailed.server_certificate.issuer.country",
+                      "type": "alias"
+                    },
+                    "locality": {
+                      "path": "tls.detailed.server_certificate.issuer.locality",
+                      "type": "alias"
+                    },
+                    "organization": {
+                      "path": "tls.detailed.server_certificate.issuer.organization",
+                      "type": "alias"
+                    },
+                    "organizational_unit": {
+                      "path": "tls.detailed.server_certificate.issuer.organizational_unit",
+                      "type": "alias"
+                    },
+                    "province": {
+                      "path": "tls.detailed.server_certificate.issuer.province",
+                      "type": "alias"
+                    }
+                  }
+                },
+                "not_after": {
+                  "path": "tls.detailed.server_certificate.not_after",
+                  "type": "alias"
+                },
+                "not_before": {
+                  "path": "tls.detailed.server_certificate.not_before",
+                  "type": "alias"
+                },
+                "public_key_algorithm": {
+                  "path": "tls.detailed.server_certificate.public_key_algorithm",
+                  "type": "alias"
+                },
+                "public_key_size": {
+                  "path": "tls.detailed.server_certificate.public_key_size",
+                  "type": "alias"
+                },
+                "serial_number": {
+                  "path": "tls.detailed.server_certificate.serial_number",
+                  "type": "alias"
+                },
+                "signature_algorithm": {
+                  "path": "tls.detailed.server_certificate.signature_algorithm",
+                  "type": "alias"
+                },
+                "subject": {
+                  "properties": {
+                    "common_name": {
+                      "path": "tls.detailed.server_certificate.subject.common_name",
+                      "type": "alias"
+                    },
+                    "country": {
+                      "path": "tls.detailed.server_certificate.subject.country",
+                      "type": "alias"
+                    },
+                    "locality": {
+                      "path": "tls.detailed.server_certificate.subject.locality",
+                      "type": "alias"
+                    },
+                    "organization": {
+                      "path": "tls.detailed.server_certificate.subject.organization",
+                      "type": "alias"
+                    },
+                    "organizational_unit": {
+                      "path": "tls.detailed.server_certificate.subject.organizational_unit",
+                      "type": "alias"
+                    },
+                    "province": {
+                      "path": "tls.detailed.server_certificate.subject.province",
+                      "type": "alias"
+                    }
+                  }
+                },
+                "version": {
+                  "path": "tls.detailed.server_certificate.version",
+                  "type": "alias"
+                }
+              }
+            },
+            "server_hello": {
+              "properties": {
+                "extensions": {
+                  "properties": {
+                    "_unparsed_": {
+                      "path": "tls.detailed.server_hello.extensions._unparsed_",
+                      "type": "alias"
+                    },
+                    "application_layer_protocol_negotiation": {
+                      "path": "tls.detailed.server_hello.extensions.application_layer_protocol_negotiation",
+                      "type": "alias"
+                    },
+                    "ec_points_formats": {
+                      "path": "tls.detailed.server_hello.extensions.ec_points_formats",
+                      "type": "alias"
+                    },
+                    "session_ticket": {
+                      "path": "tls.detailed.server_hello.extensions.session_ticket",
+                      "type": "alias"
+                    },
+                    "supported_versions": {
+                      "path": "tls.detailed.server_hello.extensions.supported_versions",
+                      "type": "alias"
+                    }
+                  }
+                },
+                "selected_cipher": {
+                  "path": "tls.cipher",
+                  "type": "alias"
+                },
+                "selected_compression_method": {
+                  "path": "tls.detailed.server_hello.selected_compression_method",
+                  "type": "alias"
+                },
+                "session_id": {
+                  "path": "tls.detailed.server_hello.session_id",
+                  "type": "alias"
+                },
+                "version": {
+                  "path": "tls.detailed.server_hello.version",
+                  "type": "alias"
+                }
+              }
+            },
+            "version": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "version_protocol": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "tracing": {
+          "properties": {
+            "trace": {
+              "properties": {
+                "id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "transaction": {
+              "properties": {
+                "id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            }
+          }
+        },
+        "type": {
+          "ignore_above": 1024,
+          "type": "keyword"
+        },
+        "url": {
+          "properties": {
+            "domain": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "extension": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "fragment": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "full": {
+              "fields": {
+                "text": {
+                  "norms": false,
+                  "type": "text"
+                }
+              },
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "original": {
+              "fields": {
+                "text": {
+                  "norms": false,
+                  "type": "text"
+                }
+              },
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "password": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "path": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "port": {
+              "type": "long"
+            },
+            "query": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "registered_domain": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "scheme": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "top_level_domain": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "username": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "user": {
+          "properties": {
+            "domain": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "email": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "full_name": {
+              "fields": {
+                "text": {
+                  "norms": false,
+                  "type": "text"
+                }
+              },
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "group": {
+              "properties": {
+                "domain": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "hash": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "id": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "name": {
+              "fields": {
+                "text": {
+                  "norms": false,
+                  "type": "text"
+                }
+              },
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "user_agent": {
+          "properties": {
+            "device": {
+              "properties": {
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "name": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "original": {
+              "fields": {
+                "text": {
+                  "norms": false,
+                  "type": "text"
+                }
+              },
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "os": {
+              "properties": {
+                "family": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "full": {
+                  "fields": {
+                    "text": {
+                      "norms": false,
+                      "type": "text"
+                    }
+                  },
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "kernel": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "name": {
+                  "fields": {
+                    "text": {
+                      "norms": false,
+                      "type": "text"
+                    }
+                  },
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "platform": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "version": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "version": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "vulnerability": {
+          "properties": {
+            "category": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "classification": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "description": {
+              "fields": {
+                "text": {
+                  "norms": false,
+                  "type": "text"
+                }
+              },
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "enumeration": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "id": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "reference": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "report_id": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "scanner": {
+              "properties": {
+                "vendor": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "score": {
+              "properties": {
+                "base": {
+                  "type": "float"
+                },
+                "environmental": {
+                  "type": "float"
+                },
+                "temporal": {
+                  "type": "float"
+                },
+                "version": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "severity": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        }
+      }
+    },
+    "settings": {
+      "index": {
+        "lifecycle": {
+          "indexing_complete": "true",
+          "name": "packetbeat",
+          "rollover_alias": "packetbeat-7.6.0"
+        },
+        "mapping": {
+          "total_fields": {
+            "limit": "10000"
+          }
+        },
+        "number_of_replicas": "1",
+        "number_of_shards": "1",
+        "query": {
+          "default_field": [
+            "message",
+            "tags",
+            "agent.ephemeral_id",
+            "agent.id",
+            "agent.name",
+            "agent.type",
+            "agent.version",
+            "as.organization.name",
+            "client.address",
+            "client.as.organization.name",
+            "client.domain",
+            "client.geo.city_name",
+            "client.geo.continent_name",
+            "client.geo.country_iso_code",
+            "client.geo.country_name",
+            "client.geo.name",
+            "client.geo.region_iso_code",
+            "client.geo.region_name",
+            "client.mac",
+            "client.registered_domain",
+            "client.top_level_domain",
+            "client.user.domain",
+            "client.user.email",
+            "client.user.full_name",
+            "client.user.group.domain",
+            "client.user.group.id",
+            "client.user.group.name",
+            "client.user.hash",
+            "client.user.id",
+            "client.user.name",
+            "cloud.account.id",
+            "cloud.availability_zone",
+            "cloud.instance.id",
+            "cloud.instance.name",
+            "cloud.machine.type",
+            "cloud.provider",
+            "cloud.region",
+            "container.id",
+            "container.image.name",
+            "container.image.tag",
+            "container.name",
+            "container.runtime",
+            "destination.address",
+            "destination.as.organization.name",
+            "destination.domain",
+            "destination.geo.city_name",
+            "destination.geo.continent_name",
+            "destination.geo.country_iso_code",
+            "destination.geo.country_name",
+            "destination.geo.name",
+            "destination.geo.region_iso_code",
+            "destination.geo.region_name",
+            "destination.mac",
+            "destination.registered_domain",
+            "destination.top_level_domain",
+            "destination.user.domain",
+            "destination.user.email",
+            "destination.user.full_name",
+            "destination.user.group.domain",
+            "destination.user.group.id",
+            "destination.user.group.name",
+            "destination.user.hash",
+            "destination.user.id",
+            "destination.user.name",
+            "dns.answers.class",
+            "dns.answers.data",
+            "dns.answers.name",
+            "dns.answers.type",
+            "dns.header_flags",
+            "dns.id",
+            "dns.op_code",
+            "dns.question.class",
+            "dns.question.name",
+            "dns.question.registered_domain",
+            "dns.question.subdomain",
+            "dns.question.top_level_domain",
+            "dns.question.type",
+            "dns.response_code",
+            "dns.type",
+            "ecs.version",
+            "error.code",
+            "error.id",
+            "error.message",
+            "error.stack_trace",
+            "error.type",
+            "event.action",
+            "event.category",
+            "event.code",
+            "event.dataset",
+            "event.hash",
+            "event.id",
+            "event.kind",
+            "event.module",
+            "event.original",
+            "event.outcome",
+            "event.provider",
+            "event.timezone",
+            "event.type",
+            "file.device",
+            "file.directory",
+            "file.extension",
+            "file.gid",
+            "file.group",
+            "file.hash.md5",
+            "file.hash.sha1",
+            "file.hash.sha256",
+            "file.hash.sha512",
+            "file.inode",
+            "file.mode",
+            "file.name",
+            "file.owner",
+            "file.path",
+            "file.target_path",
+            "file.type",
+            "file.uid",
+            "geo.city_name",
+            "geo.continent_name",
+            "geo.country_iso_code",
+            "geo.country_name",
+            "geo.name",
+            "geo.region_iso_code",
+            "geo.region_name",
+            "group.domain",
+            "group.id",
+            "group.name",
+            "hash.md5",
+            "hash.sha1",
+            "hash.sha256",
+            "hash.sha512",
+            "host.architecture",
+            "host.geo.city_name",
+            "host.geo.continent_name",
+            "host.geo.country_iso_code",
+            "host.geo.country_name",
+            "host.geo.name",
+            "host.geo.region_iso_code",
+            "host.geo.region_name",
+            "host.hostname",
+            "host.id",
+            "host.mac",
+            "host.name",
+            "host.os.family",
+            "host.os.full",
+            "host.os.kernel",
+            "host.os.name",
+            "host.os.platform",
+            "host.os.version",
+            "host.type",
+            "host.user.domain",
+            "host.user.email",
+            "host.user.full_name",
+            "host.user.group.domain",
+            "host.user.group.id",
+            "host.user.group.name",
+            "host.user.hash",
+            "host.user.id",
+            "host.user.name",
+            "http.request.body.content",
+            "http.request.method",
+            "http.request.referrer",
+            "http.response.body.content",
+            "http.version",
+            "log.level",
+            "log.logger",
+            "log.origin.file.name",
+            "log.origin.function",
+            "log.original",
+            "log.syslog.facility.name",
+            "log.syslog.severity.name",
+            "network.application",
+            "network.community_id",
+            "network.direction",
+            "network.iana_number",
+            "network.name",
+            "network.protocol",
+            "network.transport",
+            "network.type",
+            "observer.geo.city_name",
+            "observer.geo.continent_name",
+            "observer.geo.country_iso_code",
+            "observer.geo.country_name",
+            "observer.geo.name",
+            "observer.geo.region_iso_code",
+            "observer.geo.region_name",
+            "observer.hostname",
+            "observer.mac",
+            "observer.name",
+            "observer.os.family",
+            "observer.os.full",
+            "observer.os.kernel",
+            "observer.os.name",
+            "observer.os.platform",
+            "observer.os.version",
+            "observer.product",
+            "observer.serial_number",
+            "observer.type",
+            "observer.vendor",
+            "observer.version",
+            "organization.id",
+            "organization.name",
+            "os.family",
+            "os.full",
+            "os.kernel",
+            "os.name",
+            "os.platform",
+            "os.version",
+            "package.architecture",
+            "package.checksum",
+            "package.description",
+            "package.install_scope",
+            "package.license",
+            "package.name",
+            "package.path",
+            "package.version",
+            "process.args",
+            "text",
+            "process.executable",
+            "process.hash.md5",
+            "process.hash.sha1",
+            "process.hash.sha256",
+            "process.hash.sha512",
+            "process.name",
+            "text",
+            "text",
+            "text",
+            "text",
+            "text",
+            "process.thread.name",
+            "process.title",
+            "process.working_directory",
+            "server.address",
+            "server.as.organization.name",
+            "server.domain",
+            "server.geo.city_name",
+            "server.geo.continent_name",
+            "server.geo.country_iso_code",
+            "server.geo.country_name",
+            "server.geo.name",
+            "server.geo.region_iso_code",
+            "server.geo.region_name",
+            "server.mac",
+            "server.registered_domain",
+            "server.top_level_domain",
+            "server.user.domain",
+            "server.user.email",
+            "server.user.full_name",
+            "server.user.group.domain",
+            "server.user.group.id",
+            "server.user.group.name",
+            "server.user.hash",
+            "server.user.id",
+            "server.user.name",
+            "service.ephemeral_id",
+            "service.id",
+            "service.name",
+            "service.node.name",
+            "service.state",
+            "service.type",
+            "service.version",
+            "source.address",
+            "source.as.organization.name",
+            "source.domain",
+            "source.geo.city_name",
+            "source.geo.continent_name",
+            "source.geo.country_iso_code",
+            "source.geo.country_name",
+            "source.geo.name",
+            "source.geo.region_iso_code",
+            "source.geo.region_name",
+            "source.mac",
+            "source.registered_domain",
+            "source.top_level_domain",
+            "source.user.domain",
+            "source.user.email",
+            "source.user.full_name",
+            "source.user.group.domain",
+            "source.user.group.id",
+            "source.user.group.name",
+            "source.user.hash",
+            "source.user.id",
+            "source.user.name",
+            "threat.framework",
+            "threat.tactic.id",
+            "threat.tactic.name",
+            "threat.tactic.reference",
+            "threat.technique.id",
+            "threat.technique.name",
+            "threat.technique.reference",
+            "tracing.trace.id",
+            "tracing.transaction.id",
+            "url.domain",
+            "url.extension",
+            "url.fragment",
+            "url.full",
+            "url.original",
+            "url.password",
+            "url.path",
+            "url.query",
+            "url.registered_domain",
+            "url.scheme",
+            "url.top_level_domain",
+            "url.username",
+            "user.domain",
+            "user.email",
+            "user.full_name",
+            "user.group.domain",
+            "user.group.id",
+            "user.group.name",
+            "user.hash",
+            "user.id",
+            "user.name",
+            "user_agent.device.name",
+            "user_agent.name",
+            "text",
+            "user_agent.original",
+            "user_agent.os.family",
+            "user_agent.os.full",
+            "user_agent.os.kernel",
+            "user_agent.os.name",
+            "user_agent.os.platform",
+            "user_agent.os.version",
+            "user_agent.version",
+            "text",
+            "agent.hostname",
+            "timeseries.instance",
+            "cloud.project.id",
+            "cloud.image.id",
+            "host.os.build",
+            "host.os.codename",
+            "kubernetes.pod.name",
+            "kubernetes.pod.uid",
+            "kubernetes.namespace",
+            "kubernetes.node.name",
+            "kubernetes.replicaset.name",
+            "kubernetes.deployment.name",
+            "kubernetes.statefulset.name",
+            "kubernetes.container.name",
+            "kubernetes.container.image",
+            "jolokia.agent.version",
+            "jolokia.agent.id",
+            "jolokia.server.product",
+            "jolokia.server.version",
+            "jolokia.server.vendor",
+            "jolokia.url",
+            "type",
+            "server.process.name",
+            "server.process.args",
+            "server.process.executable",
+            "server.process.working_directory",
+            "server.process.start",
+            "client.process.name",
+            "client.process.args",
+            "client.process.executable",
+            "client.process.working_directory",
+            "client.process.start",
+            "flow.id",
+            "status",
+            "method",
+            "resource",
+            "path",
+            "query",
+            "params",
+            "request",
+            "response",
+            "amqp.reply-text",
+            "amqp.exchange",
+            "amqp.exchange-type",
+            "amqp.consumer-tag",
+            "amqp.routing-key",
+            "amqp.queue",
+            "amqp.content-type",
+            "amqp.content-encoding",
+            "amqp.delivery-mode",
+            "amqp.correlation-id",
+            "amqp.reply-to",
+            "amqp.expiration",
+            "amqp.message-id",
+            "amqp.timestamp",
+            "amqp.type",
+            "amqp.user-id",
+            "amqp.app-id",
+            "cassandra.request.headers.flags",
+            "cassandra.request.headers.stream",
+            "cassandra.request.headers.op",
+            "cassandra.request.query",
+            "cassandra.response.headers.flags",
+            "cassandra.response.headers.stream",
+            "cassandra.response.headers.op",
+            "cassandra.response.result.type",
+            "cassandra.response.result.rows.meta.keyspace",
+            "cassandra.response.result.rows.meta.table",
+            "cassandra.response.result.rows.meta.flags",
+            "cassandra.response.result.rows.meta.paging_state",
+            "cassandra.response.result.keyspace",
+            "cassandra.response.result.schema_change.change",
+            "cassandra.response.result.schema_change.keyspace",
+            "cassandra.response.result.schema_change.table",
+            "cassandra.response.result.schema_change.object",
+            "cassandra.response.result.schema_change.target",
+            "cassandra.response.result.schema_change.name",
+            "cassandra.response.result.schema_change.args",
+            "cassandra.response.result.prepared.prepared_id",
+            "cassandra.response.result.prepared.req_meta.keyspace",
+            "cassandra.response.result.prepared.req_meta.table",
+            "cassandra.response.result.prepared.req_meta.flags",
+            "cassandra.response.result.prepared.req_meta.paging_state",
+            "cassandra.response.result.prepared.resp_meta.keyspace",
+            "cassandra.response.result.prepared.resp_meta.table",
+            "cassandra.response.result.prepared.resp_meta.flags",
+            "cassandra.response.result.prepared.resp_meta.paging_state",
+            "cassandra.response.authentication.class",
+            "cassandra.response.warnings",
+            "cassandra.response.event.type",
+            "cassandra.response.event.change",
+            "cassandra.response.event.host",
+            "cassandra.response.event.schema_change.change",
+            "cassandra.response.event.schema_change.keyspace",
+            "cassandra.response.event.schema_change.table",
+            "cassandra.response.event.schema_change.object",
+            "cassandra.response.event.schema_change.target",
+            "cassandra.response.event.schema_change.name",
+            "cassandra.response.event.schema_change.args",
+            "cassandra.response.error.msg",
+            "cassandra.response.error.type",
+            "cassandra.response.error.details.read_consistency",
+            "cassandra.response.error.details.write_type",
+            "cassandra.response.error.details.keyspace",
+            "cassandra.response.error.details.table",
+            "cassandra.response.error.details.stmt_id",
+            "cassandra.response.error.details.num_failures",
+            "cassandra.response.error.details.function",
+            "cassandra.response.error.details.arg_types",
+            "dhcpv4.transaction_id",
+            "dhcpv4.flags",
+            "dhcpv4.client_mac",
+            "dhcpv4.server_name",
+            "dhcpv4.op_code",
+            "dhcpv4.hardware_type",
+            "dhcpv4.option.message_type",
+            "dhcpv4.option.parameter_request_list",
+            "dhcpv4.option.class_identifier",
+            "dhcpv4.option.domain_name",
+            "dhcpv4.option.hostname",
+            "dhcpv4.option.message",
+            "dhcpv4.option.boot_file_name",
+            "dns.question.etld_plus_one",
+            "dns.authorities.name",
+            "dns.authorities.type",
+            "dns.authorities.class",
+            "dns.additionals.name",
+            "dns.additionals.type",
+            "dns.additionals.class",
+            "dns.additionals.data",
+            "dns.opt.version",
+            "dns.opt.ext_rcode",
+            "http.response.status_phrase",
+            "icmp.version",
+            "icmp.request.message",
+            "icmp.response.message",
+            "memcache.protocol_type",
+            "memcache.request.line",
+            "memcache.request.command",
+            "memcache.response.command",
+            "memcache.request.type",
+            "memcache.response.type",
+            "memcache.response.error_msg",
+            "memcache.request.opcode",
+            "memcache.response.opcode",
+            "memcache.response.status",
+            "memcache.request.raw_args",
+            "memcache.request.automove",
+            "memcache.response.version",
+            "mongodb.error",
+            "mongodb.fullCollectionName",
+            "mongodb.startingFrom",
+            "mongodb.query",
+            "mongodb.returnFieldsSelector",
+            "mongodb.selector",
+            "mongodb.update",
+            "mongodb.cursorId",
+            "mysql.insert_id",
+            "mysql.num_fields",
+            "mysql.num_rows",
+            "mysql.query",
+            "mysql.error_message",
+            "nfs.tag",
+            "nfs.opcode",
+            "nfs.status",
+            "rpc.xid",
+            "rpc.status",
+            "rpc.auth_flavor",
+            "rpc.cred.gids",
+            "rpc.cred.machinename",
+            "pgsql.error_message",
+            "pgsql.error_severity",
+            "pgsql.num_fields",
+            "pgsql.num_rows",
+            "redis.return_value",
+            "redis.error",
+            "thrift.params",
+            "thrift.service",
+            "thrift.return_value",
+            "thrift.exceptions",
+            "tls.detailed.version",
+            "tls.detailed.resumption_method",
+            "tls.detailed.client_hello.version",
+            "tls.detailed.client_hello.session_id",
+            "tls.detailed.client_hello.supported_compression_methods",
+            "tls.detailed.client_hello.extensions.server_name_indication",
+            "tls.detailed.client_hello.extensions.application_layer_protocol_negotiation",
+            "tls.detailed.client_hello.extensions.session_ticket",
+            "tls.detailed.client_hello.extensions.supported_versions",
+            "tls.detailed.client_hello.extensions.supported_groups",
+            "tls.detailed.client_hello.extensions.signature_algorithms",
+            "tls.detailed.client_hello.extensions.ec_points_formats",
+            "tls.detailed.client_hello.extensions._unparsed_",
+            "tls.detailed.server_hello.version",
+            "tls.detailed.server_hello.selected_compression_method",
+            "tls.detailed.server_hello.session_id",
+            "tls.detailed.server_hello.extensions.application_layer_protocol_negotiation",
+            "tls.detailed.server_hello.extensions.session_ticket",
+            "tls.detailed.server_hello.extensions.supported_versions",
+            "tls.detailed.server_hello.extensions.ec_points_formats",
+            "tls.detailed.server_hello.extensions._unparsed_",
+            "tls.detailed.client_certificate.serial_number",
+            "tls.detailed.client_certificate.public_key_algorithm",
+            "tls.detailed.client_certificate.signature_algorithm",
+            "tls.detailed.client_certificate.alternative_names",
+            "tls.detailed.client_certificate.subject.country",
+            "tls.detailed.client_certificate.subject.organization",
+            "tls.detailed.client_certificate.subject.organizational_unit",
+            "tls.detailed.client_certificate.subject.province",
+            "tls.detailed.client_certificate.subject.common_name",
+            "tls.detailed.client_certificate.subject.locality",
+            "tls.detailed.client_certificate.issuer.country",
+            "tls.detailed.client_certificate.issuer.organization",
+            "tls.detailed.client_certificate.issuer.organizational_unit",
+            "tls.detailed.client_certificate.issuer.province",
+            "tls.detailed.client_certificate.issuer.common_name",
+            "tls.detailed.client_certificate.issuer.locality",
+            "tls.detailed.server_certificate.serial_number",
+            "tls.detailed.server_certificate.public_key_algorithm",
+            "tls.detailed.server_certificate.signature_algorithm",
+            "tls.detailed.server_certificate.alternative_names",
+            "tls.detailed.server_certificate.subject.country",
+            "tls.detailed.server_certificate.subject.organization",
+            "tls.detailed.server_certificate.subject.organizational_unit",
+            "tls.detailed.server_certificate.subject.province",
+            "tls.detailed.server_certificate.subject.common_name",
+            "tls.detailed.server_certificate.subject.locality",
+            "tls.detailed.server_certificate.issuer.country",
+            "tls.detailed.server_certificate.issuer.organization",
+            "tls.detailed.server_certificate.issuer.organizational_unit",
+            "tls.detailed.server_certificate.issuer.province",
+            "tls.detailed.server_certificate.issuer.common_name",
+            "tls.detailed.server_certificate.issuer.locality",
+            "tls.detailed.alert_types",
+            "fields.*"
+          ]
+        },
+        "refresh_interval": "5s"
+      }
+    }
+  }
+}
+
+{
+  "type": "index",
+  "value": {
+    "aliases": {
+      "beats": {
+      },
+      "packetbeat-8.0.0": {
+        "is_write_index": true
+      },
+      "packetbeat-tls": {
+        "filter": {
+          "term": {
+            "event.dataset": "tls"
+          }
+        }
+      },
+      "siem-read-alias": {
+      }
+    },
+    "index": "packetbeat-8.0.0-2019.08.29-000010",
+    "mappings": {
+      "_meta": {
+        "beat": "packetbeat",
+        "version": "8.0.0"
+      },
+      "date_detection": false,
+      "dynamic_templates": [
+        {
+          "labels": {
+            "mapping": {
+              "type": "keyword"
+            },
+            "match_mapping_type": "string",
+            "path_match": "labels.*"
+          }
+        },
+        {
+          "container.labels": {
+            "mapping": {
+              "type": "keyword"
+            },
+            "match_mapping_type": "string",
+            "path_match": "container.labels.*"
+          }
+        },
+        {
+          "dns.answers": {
+            "mapping": {
+              "type": "keyword"
+            },
+            "match_mapping_type": "string",
+            "path_match": "dns.answers.*"
+          }
+        },
+        {
+          "fields": {
+            "mapping": {
+              "type": "keyword"
+            },
+            "match_mapping_type": "string",
+            "path_match": "fields.*"
+          }
+        },
+        {
+          "docker.container.labels": {
+            "mapping": {
+              "type": "keyword"
+            },
+            "match_mapping_type": "string",
+            "path_match": "docker.container.labels.*"
+          }
+        },
+        {
+          "kubernetes.labels.*": {
+            "mapping": {
+              "type": "keyword"
+            },
+            "path_match": "kubernetes.labels.*"
+          }
+        },
+        {
+          "kubernetes.annotations.*": {
+            "mapping": {
+              "type": "keyword"
+            },
+            "path_match": "kubernetes.annotations.*"
+          }
+        },
+        {
+          "amqp.headers": {
+            "mapping": {
+              "type": "keyword"
+            },
+            "match_mapping_type": "string",
+            "path_match": "amqp.headers.*"
+          }
+        },
+        {
+          "cassandra.response.supported": {
+            "mapping": {
+              "type": "keyword"
+            },
+            "match_mapping_type": "string",
+            "path_match": "cassandra.response.supported.*"
+          }
+        },
+        {
+          "http.request.headers": {
+            "mapping": {
+              "type": "keyword"
+            },
+            "match_mapping_type": "string",
+            "path_match": "http.request.headers.*"
+          }
+        },
+        {
+          "http.response.headers": {
+            "mapping": {
+              "type": "keyword"
+            },
+            "match_mapping_type": "string",
+            "path_match": "http.response.headers.*"
+          }
+        },
+        {
+          "strings_as_keyword": {
+            "mapping": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "match_mapping_type": "string"
+          }
+        }
+      ],
+      "properties": {
+        "@timestamp": {
+          "type": "date"
+        },
+        "@version": {
+          "ignore_above": 1024,
+          "type": "keyword"
+        },
+        "agent": {
+          "properties": {
+            "ephemeral_id": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "hostname": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "id": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "name": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "type": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "version": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "amqp": {
+          "properties": {
+            "app-id": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "arguments": {
+              "type": "object"
+            },
+            "auto-delete": {
+              "type": "boolean"
+            },
+            "class-id": {
+              "type": "long"
+            },
+            "consumer-count": {
+              "type": "long"
+            },
+            "consumer-tag": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "content-encoding": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "content-type": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "correlation-id": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "delivery-mode": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "delivery-tag": {
+              "type": "long"
+            },
+            "durable": {
+              "type": "boolean"
+            },
+            "exchange": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "exchange-type": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "exclusive": {
+              "type": "boolean"
+            },
+            "expiration": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "headers": {
+              "type": "object"
+            },
+            "if-empty": {
+              "type": "boolean"
+            },
+            "if-unused": {
+              "type": "boolean"
+            },
+            "immediate": {
+              "type": "boolean"
+            },
+            "mandatory": {
+              "type": "boolean"
+            },
+            "message-count": {
+              "type": "long"
+            },
+            "message-id": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "method-id": {
+              "type": "long"
+            },
+            "multiple": {
+              "type": "boolean"
+            },
+            "no-ack": {
+              "type": "boolean"
+            },
+            "no-local": {
+              "type": "boolean"
+            },
+            "no-wait": {
+              "type": "boolean"
+            },
+            "passive": {
+              "type": "boolean"
+            },
+            "priority": {
+              "type": "long"
+            },
+            "queue": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "redelivered": {
+              "type": "boolean"
+            },
+            "reply-code": {
+              "type": "long"
+            },
+            "reply-text": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "reply-to": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "routing-key": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "timestamp": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "type": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "user-id": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "as": {
+          "properties": {
+            "number": {
+              "type": "long"
+            },
+            "organization": {
+              "properties": {
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            }
+          }
+        },
+        "bytes_in": {
+          "path": "source.bytes",
+          "type": "alias"
+        },
+        "bytes_out": {
+          "path": "destination.bytes",
+          "type": "alias"
+        },
+        "cassandra": {
+          "properties": {
+            "no_request": {
+              "type": "boolean"
+            },
+            "request": {
+              "properties": {
+                "headers": {
+                  "properties": {
+                    "flags": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "length": {
+                      "type": "long"
+                    },
+                    "op": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "stream": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "version": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "query": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "response": {
+              "properties": {
+                "authentication": {
+                  "properties": {
+                    "class": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "error": {
+                  "properties": {
+                    "code": {
+                      "type": "long"
+                    },
+                    "details": {
+                      "properties": {
+                        "alive": {
+                          "type": "long"
+                        },
+                        "arg_types": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "blockfor": {
+                          "type": "long"
+                        },
+                        "data_present": {
+                          "type": "boolean"
+                        },
+                        "function": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "keyspace": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "num_failures": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "read_consistency": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "received": {
+                          "type": "long"
+                        },
+                        "required": {
+                          "type": "long"
+                        },
+                        "stmt_id": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "table": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "write_type": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        }
+                      }
+                    },
+                    "msg": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "type": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "event": {
+                  "properties": {
+                    "change": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "host": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "port": {
+                      "type": "long"
+                    },
+                    "schema_change": {
+                      "properties": {
+                        "args": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "change": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "keyspace": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "name": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "object": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "table": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "target": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        }
+                      }
+                    },
+                    "type": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "headers": {
+                  "properties": {
+                    "flags": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "length": {
+                      "type": "long"
+                    },
+                    "op": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "stream": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "version": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "result": {
+                  "properties": {
+                    "keyspace": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "prepared": {
+                      "properties": {
+                        "prepared_id": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "req_meta": {
+                          "properties": {
+                            "col_count": {
+                              "type": "long"
+                            },
+                            "flags": {
+                              "ignore_above": 1024,
+                              "type": "keyword"
+                            },
+                            "keyspace": {
+                              "ignore_above": 1024,
+                              "type": "keyword"
+                            },
+                            "paging_state": {
+                              "ignore_above": 1024,
+                              "type": "keyword"
+                            },
+                            "pkey_columns": {
+                              "type": "long"
+                            },
+                            "table": {
+                              "ignore_above": 1024,
+                              "type": "keyword"
+                            }
+                          }
+                        },
+                        "resp_meta": {
+                          "properties": {
+                            "col_count": {
+                              "type": "long"
+                            },
+                            "flags": {
+                              "ignore_above": 1024,
+                              "type": "keyword"
+                            },
+                            "keyspace": {
+                              "ignore_above": 1024,
+                              "type": "keyword"
+                            },
+                            "paging_state": {
+                              "ignore_above": 1024,
+                              "type": "keyword"
+                            },
+                            "pkey_columns": {
+                              "type": "long"
+                            },
+                            "table": {
+                              "ignore_above": 1024,
+                              "type": "keyword"
+                            }
+                          }
+                        }
+                      }
+                    },
+                    "rows": {
+                      "properties": {
+                        "meta": {
+                          "properties": {
+                            "col_count": {
+                              "type": "long"
+                            },
+                            "flags": {
+                              "ignore_above": 1024,
+                              "type": "keyword"
+                            },
+                            "keyspace": {
+                              "ignore_above": 1024,
+                              "type": "keyword"
+                            },
+                            "paging_state": {
+                              "ignore_above": 1024,
+                              "type": "keyword"
+                            },
+                            "pkey_columns": {
+                              "type": "long"
+                            },
+                            "table": {
+                              "ignore_above": 1024,
+                              "type": "keyword"
+                            }
+                          }
+                        },
+                        "num_rows": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "schema_change": {
+                      "properties": {
+                        "args": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "change": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "keyspace": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "name": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "object": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "table": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "target": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        }
+                      }
+                    },
+                    "type": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "supported": {
+                  "type": "object"
+                },
+                "warnings": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            }
+          }
+        },
+        "client": {
+          "properties": {
+            "address": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "as": {
+              "properties": {
+                "number": {
+                  "type": "long"
+                },
+                "organization": {
+                  "properties": {
+                    "name": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                }
+              }
+            },
+            "bytes": {
+              "type": "long"
+            },
+            "domain": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "geo": {
+              "properties": {
+                "city_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "continent_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "country_iso_code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "country_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "location": {
+                  "type": "geo_point"
+                },
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "region_iso_code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "region_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "ip": {
+              "type": "ip"
+            },
+            "mac": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "nat": {
+              "properties": {
+                "ip": {
+                  "type": "ip"
+                },
+                "port": {
+                  "type": "long"
+                }
+              }
+            },
+            "packets": {
+              "type": "long"
+            },
+            "port": {
+              "type": "long"
+            },
+            "process": {
+              "properties": {
+                "args": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "executable": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "start": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "working_directory": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "user": {
+              "properties": {
+                "domain": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "email": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "full_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "group": {
+                  "properties": {
+                    "id": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "name": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "hash": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            }
+          }
+        },
+        "cloud": {
+          "properties": {
+            "account": {
+              "properties": {
+                "id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "availability_zone": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "image": {
+              "properties": {
+                "id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "instance": {
+              "properties": {
+                "id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "machine": {
+              "properties": {
+                "type": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "project": {
+              "properties": {
+                "id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "provider": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "region": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "container": {
+          "properties": {
+            "id": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "image": {
+              "properties": {
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "tag": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "labels": {
+              "type": "object"
+            },
+            "name": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "runtime": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "destination": {
+          "properties": {
+            "address": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "as": {
+              "properties": {
+                "number": {
+                  "type": "long"
+                },
+                "organization": {
+                  "properties": {
+                    "name": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                }
+              }
+            },
+            "bytes": {
+              "type": "long"
+            },
+            "domain": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "domain_top1m_rank": {
+              "type": "long"
+            },
+            "geo": {
+              "properties": {
+                "city_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "continent_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "country_iso_code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "country_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "location": {
+                  "type": "geo_point"
+                },
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "region_iso_code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "region_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "ip": {
+              "type": "ip"
+            },
+            "locality": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "mac": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "nat": {
+              "properties": {
+                "ip": {
+                  "type": "ip"
+                },
+                "port": {
+                  "type": "long"
+                }
+              }
+            },
+            "packets": {
+              "type": "long"
+            },
+            "port": {
+              "type": "long"
+            },
+            "user": {
+              "properties": {
+                "domain": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "email": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "full_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "group": {
+                  "properties": {
+                    "id": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "name": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "hash": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            }
+          }
+        },
+        "dhcpv4": {
+          "properties": {
+            "assigned_ip": {
+              "type": "ip"
+            },
+            "client_ip": {
+              "type": "ip"
+            },
+            "client_mac": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "flags": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "hardware_type": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "hops": {
+              "type": "long"
+            },
+            "op_code": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "option": {
+              "properties": {
+                "boot_file_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "broadcast_address": {
+                  "type": "ip"
+                },
+                "class_identifier": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "dns_servers": {
+                  "type": "ip"
+                },
+                "domain_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "hostname": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "ip_address_lease_time_sec": {
+                  "type": "long"
+                },
+                "max_dhcp_message_size": {
+                  "type": "long"
+                },
+                "message": {
+                  "norms": false,
+                  "type": "text"
+                },
+                "message_type": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "ntp_servers": {
+                  "type": "ip"
+                },
+                "parameter_request_list": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "rebinding_time_sec": {
+                  "type": "long"
+                },
+                "renewal_time_sec": {
+                  "type": "long"
+                },
+                "requested_ip_address": {
+                  "type": "ip"
+                },
+                "router": {
+                  "type": "ip"
+                },
+                "server_identifier": {
+                  "type": "ip"
+                },
+                "subnet_mask": {
+                  "type": "ip"
+                },
+                "time_servers": {
+                  "type": "ip"
+                },
+                "utc_time_offset_sec": {
+                  "type": "long"
+                },
+                "vendor_identifying_options": {
+                  "type": "object"
+                }
+              }
+            },
+            "relay_ip": {
+              "type": "ip"
+            },
+            "seconds": {
+              "type": "long"
+            },
+            "server_ip": {
+              "type": "ip"
+            },
+            "server_name": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "transaction_id": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "dns": {
+          "properties": {
+            "additionals": {
+              "properties": {
+                "class": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "data": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "ttl": {
+                  "type": "long"
+                },
+                "type": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "additionals_count": {
+              "type": "long"
+            },
+            "answers": {
+              "properties": {
+                "algorithm": {
+                  "type": "keyword"
+                },
+                "class": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "data": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "digest_type": {
+                  "type": "keyword"
+                },
+                "expiration": {
+                  "type": "keyword"
+                },
+                "expire": {
+                  "type": "long"
+                },
+                "flags": {
+                  "type": "keyword"
+                },
+                "inception": {
+                  "type": "keyword"
+                },
+                "key_tag": {
+                  "type": "keyword"
+                },
+                "labels": {
+                  "type": "keyword"
+                },
+                "minimum": {
+                  "type": "long"
+                },
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "original_ttl": {
+                  "type": "keyword"
+                },
+                "protocol": {
+                  "type": "keyword"
+                },
+                "refresh": {
+                  "type": "long"
+                },
+                "retry": {
+                  "type": "long"
+                },
+                "rname": {
+                  "type": "keyword"
+                },
+                "serial": {
+                  "type": "long"
+                },
+                "signer_name": {
+                  "type": "keyword"
+                },
+                "ttl": {
+                  "type": "long"
+                },
+                "type": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "type_covered": {
+                  "type": "keyword"
+                }
+              }
+            },
+            "answers_count": {
+              "type": "long"
+            },
+            "authorities": {
+              "properties": {
+                "class": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "data": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "expire": {
+                  "type": "long"
+                },
+                "minimum": {
+                  "type": "long"
+                },
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "refresh": {
+                  "type": "long"
+                },
+                "retry": {
+                  "type": "long"
+                },
+                "rname": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "serial": {
+                  "type": "long"
+                },
+                "ttl": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "type": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "authorities_count": {
+              "type": "long"
+            },
+            "flags": {
+              "properties": {
+                "authentic_data": {
+                  "type": "boolean"
+                },
+                "authoritative": {
+                  "type": "boolean"
+                },
+                "checking_disabled": {
+                  "type": "boolean"
+                },
+                "recursion_available": {
+                  "type": "boolean"
+                },
+                "recursion_desired": {
+                  "type": "boolean"
+                },
+                "truncated_response": {
+                  "type": "boolean"
+                }
+              }
+            },
+            "header_flags": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "id": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "op_code": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "opt": {
+              "properties": {
+                "do": {
+                  "type": "boolean"
+                },
+                "ext_rcode": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "udp_size": {
+                  "type": "long"
+                },
+                "version": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "question": {
+              "properties": {
+                "class": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "etld_plus_one": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "registered_domain": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "type": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "resolved_ip": {
+              "type": "ip"
+            },
+            "response_code": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "type": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "docker": {
+          "properties": {
+            "container": {
+              "properties": {
+                "labels": {
+                  "type": "object"
+                }
+              }
+            }
+          }
+        },
+        "ecs": {
+          "properties": {
+            "version": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "error": {
+          "properties": {
+            "code": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "id": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "message": {
+              "norms": false,
+              "type": "text"
+            },
+            "type": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "event": {
+          "properties": {
+            "action": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "category": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "code": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "created": {
+              "type": "date"
+            },
+            "dataset": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "duration": {
+              "type": "long"
+            },
+            "end": {
+              "type": "date"
+            },
+            "hash": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "id": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "kind": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "module": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "original": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "outcome": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "provider": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "risk_score": {
+              "type": "float"
+            },
+            "risk_score_norm": {
+              "type": "float"
+            },
+            "sequence": {
+              "type": "long"
+            },
+            "severity": {
+              "type": "long"
+            },
+            "start": {
+              "type": "date"
+            },
+            "timezone": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "type": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "fields": {
+          "type": "object"
+        },
+        "file": {
+          "properties": {
+            "accessed": {
+              "type": "date"
+            },
+            "created": {
+              "type": "date"
+            },
+            "ctime": {
+              "type": "date"
+            },
+            "device": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "directory": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "extension": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "gid": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "group": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "hash": {
+              "properties": {
+                "md5": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "sha1": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "sha256": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "sha512": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "inode": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "mode": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "mtime": {
+              "type": "date"
+            },
+            "name": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "owner": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "path": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "size": {
+              "type": "long"
+            },
+            "target_path": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "type": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "uid": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "flow": {
+          "properties": {
+            "final": {
+              "type": "boolean"
+            },
+            "id": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "locality": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "vlan": {
+              "type": "long"
+            }
+          }
+        },
+        "geo": {
+          "properties": {
+            "city_name": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "continent_name": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "country_iso_code": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "country_name": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "location": {
+              "type": "geo_point"
+            },
+            "name": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "region_iso_code": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "region_name": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "group": {
+          "properties": {
+            "id": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "name": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "hash": {
+          "properties": {
+            "md5": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "sha1": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "sha256": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "sha512": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "host": {
+          "properties": {
+            "architecture": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "containerized": {
+              "type": "boolean"
+            },
+            "geo": {
+              "properties": {
+                "city_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "continent_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "country_iso_code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "country_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "location": {
+                  "type": "geo_point"
+                },
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "region_iso_code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "region_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "hostname": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "id": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "ip": {
+              "type": "ip"
+            },
+            "mac": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "name": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "os": {
+              "properties": {
+                "build": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "codename": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "family": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "full": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "kernel": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "platform": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "version": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "type": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "uptime": {
+              "type": "long"
+            },
+            "user": {
+              "properties": {
+                "domain": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "email": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "full_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "group": {
+                  "properties": {
+                    "id": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "name": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "hash": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            }
+          }
+        },
+        "http": {
+          "properties": {
+            "request": {
+              "properties": {
+                "body": {
+                  "properties": {
+                    "bytes": {
+                      "type": "long"
+                    },
+                    "content": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "bytes": {
+                  "type": "long"
+                },
+                "headers": {
+                  "properties": {
+                    "content-length": {
+                      "type": "long"
+                    },
+                    "content-type": {
+                      "type": "keyword"
+                    },
+                    "host": {
+                      "type": "keyword"
+                    },
+                    "referer": {
+                      "type": "keyword"
+                    },
+                    "user-agent": {
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "method": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "referrer": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "response": {
+              "properties": {
+                "body": {
+                  "properties": {
+                    "bytes": {
+                      "type": "long"
+                    },
+                    "content": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "bytes": {
+                  "type": "long"
+                },
+                "headers": {
+                  "properties": {
+                    "content-length": {
+                      "type": "long"
+                    },
+                    "content-type": {
+                      "type": "keyword"
+                    },
+                    "host": {
+                      "type": "keyword"
+                    },
+                    "location": {
+                      "type": "keyword"
+                    },
+                    "user-agent": {
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "status_code": {
+                  "type": "long"
+                },
+                "status_phrase": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "version": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "icmp": {
+          "properties": {
+            "request": {
+              "properties": {
+                "code": {
+                  "type": "long"
+                },
+                "message": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "type": {
+                  "type": "long"
+                }
+              }
+            },
+            "response": {
+              "properties": {
+                "code": {
+                  "type": "long"
+                },
+                "message": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "type": {
+                  "type": "long"
+                }
+              }
+            },
+            "version": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "jolokia": {
+          "properties": {
+            "agent": {
+              "properties": {
+                "id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "version": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "secured": {
+              "type": "boolean"
+            },
+            "server": {
+              "properties": {
+                "product": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "vendor": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "version": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "url": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "kubernetes": {
+          "properties": {
+            "annotations": {
+              "properties": {
+                "*": {
+                  "type": "object"
+                }
+              }
+            },
+            "container": {
+              "properties": {
+                "image": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "deployment": {
+              "properties": {
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "labels": {
+              "properties": {
+                "*": {
+                  "type": "object"
+                }
+              }
+            },
+            "namespace": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "node": {
+              "properties": {
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "pod": {
+              "properties": {
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "uid": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "replicaset": {
+              "properties": {
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "statefulset": {
+              "properties": {
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            }
+          }
+        },
+        "labels": {
+          "type": "object"
+        },
+        "log": {
+          "properties": {
+            "level": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "logger": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "original": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "memcache": {
+          "properties": {
+            "protocol_type": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "request": {
+              "properties": {
+                "automove": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "bytes": {
+                  "type": "long"
+                },
+                "cas_unique": {
+                  "type": "long"
+                },
+                "command": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "count_values": {
+                  "type": "long"
+                },
+                "delta": {
+                  "type": "long"
+                },
+                "dest_class": {
+                  "type": "long"
+                },
+                "exptime": {
+                  "type": "long"
+                },
+                "flags": {
+                  "type": "long"
+                },
+                "initial": {
+                  "type": "long"
+                },
+                "line": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "noreply": {
+                  "type": "boolean"
+                },
+                "opaque": {
+                  "type": "long"
+                },
+                "opcode": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "opcode_value": {
+                  "type": "long"
+                },
+                "quiet": {
+                  "type": "boolean"
+                },
+                "raw_args": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "sleep_us": {
+                  "type": "long"
+                },
+                "source_class": {
+                  "type": "long"
+                },
+                "type": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "vbucket": {
+                  "type": "long"
+                },
+                "verbosity": {
+                  "type": "long"
+                }
+              }
+            },
+            "response": {
+              "properties": {
+                "bytes": {
+                  "type": "long"
+                },
+                "cas_unique": {
+                  "type": "long"
+                },
+                "command": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "count_values": {
+                  "type": "long"
+                },
+                "error_msg": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "flags": {
+                  "type": "long"
+                },
+                "opaque": {
+                  "type": "long"
+                },
+                "opcode": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "opcode_value": {
+                  "type": "long"
+                },
+                "status": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "status_code": {
+                  "type": "long"
+                },
+                "type": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "value": {
+                  "type": "long"
+                },
+                "version": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            }
+          }
+        },
+        "message": {
+          "norms": false,
+          "type": "text"
+        },
+        "method": {
+          "ignore_above": 1024,
+          "type": "keyword"
+        },
+        "mongodb": {
+          "properties": {
+            "cursorId": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "error": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "fullCollectionName": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "numberReturned": {
+              "type": "long"
+            },
+            "numberToReturn": {
+              "type": "long"
+            },
+            "numberToSkip": {
+              "type": "long"
+            },
+            "query": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "returnFieldsSelector": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "selector": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "startingFrom": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "update": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "mysql": {
+          "properties": {
+            "affected_rows": {
+              "type": "long"
+            },
+            "error_code": {
+              "type": "long"
+            },
+            "error_message": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "insert_id": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "num_fields": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "num_rows": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "query": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "network": {
+          "properties": {
+            "application": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "bytes": {
+              "type": "long"
+            },
+            "community_id": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "direction": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "forwarded_ip": {
+              "type": "ip"
+            },
+            "iana_number": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "name": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "packets": {
+              "type": "long"
+            },
+            "protocol": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "transport": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "type": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "nfs": {
+          "properties": {
+            "minor_version": {
+              "type": "long"
+            },
+            "opcode": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "status": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "tag": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "version": {
+              "type": "long"
+            }
+          }
+        },
+        "notes": {
+          "path": "error.message",
+          "type": "alias"
+        },
+        "observer": {
+          "properties": {
+            "geo": {
+              "properties": {
+                "city_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "continent_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "country_iso_code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "country_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "location": {
+                  "type": "geo_point"
+                },
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "region_iso_code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "region_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "hostname": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "ip": {
+              "type": "ip"
+            },
+            "mac": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "os": {
+              "properties": {
+                "family": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "full": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "kernel": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "platform": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "version": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "serial_number": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "type": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "vendor": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "version": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "organization": {
+          "properties": {
+            "id": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "name": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "os": {
+          "properties": {
+            "family": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "full": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "kernel": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "name": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "platform": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "version": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "params": {
+          "norms": false,
+          "type": "text"
+        },
+        "path": {
+          "ignore_above": 1024,
+          "type": "keyword"
+        },
+        "pgsql": {
+          "properties": {
+            "error_code": {
+              "type": "long"
+            },
+            "error_message": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "error_severity": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "num_fields": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "num_rows": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "process": {
+          "properties": {
+            "args": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "executable": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "hash": {
+              "properties": {
+                "md5": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "sha1": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "sha256": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "sha512": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "name": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "pgid": {
+              "type": "long"
+            },
+            "pid": {
+              "type": "long"
+            },
+            "ppid": {
+              "type": "long"
+            },
+            "start": {
+              "type": "date"
+            },
+            "thread": {
+              "properties": {
+                "id": {
+                  "type": "long"
+                },
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "title": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "uptime": {
+              "type": "long"
+            },
+            "working_directory": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "query": {
+          "ignore_above": 1024,
+          "type": "keyword"
+        },
+        "redis": {
+          "properties": {
+            "error": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "return_value": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "related": {
+          "properties": {
+            "ip": {
+              "type": "ip"
+            }
+          }
+        },
+        "request": {
+          "norms": false,
+          "type": "text"
+        },
+        "resource": {
+          "ignore_above": 1024,
+          "type": "keyword"
+        },
+        "response": {
+          "norms": false,
+          "type": "text"
+        },
+        "rpc": {
+          "properties": {
+            "auth_flavor": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "cred": {
+              "properties": {
+                "gid": {
+                  "type": "long"
+                },
+                "gids": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "machinename": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "stamp": {
+                  "type": "long"
+                },
+                "uid": {
+                  "type": "long"
+                }
+              }
+            },
+            "status": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "xid": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "server": {
+          "properties": {
+            "address": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "as": {
+              "properties": {
+                "number": {
+                  "type": "long"
+                },
+                "organization": {
+                  "properties": {
+                    "name": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                }
+              }
+            },
+            "bytes": {
+              "type": "long"
+            },
+            "domain": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "geo": {
+              "properties": {
+                "city_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "continent_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "country_iso_code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "country_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "location": {
+                  "type": "geo_point"
+                },
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "region_iso_code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "region_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "ip": {
+              "type": "ip"
+            },
+            "mac": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "nat": {
+              "properties": {
+                "ip": {
+                  "type": "ip"
+                },
+                "port": {
+                  "type": "long"
+                }
+              }
+            },
+            "packets": {
+              "type": "long"
+            },
+            "port": {
+              "type": "long"
+            },
+            "process": {
+              "properties": {
+                "args": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "executable": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "start": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "working_directory": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "user": {
+              "properties": {
+                "domain": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "email": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "full_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "group": {
+                  "properties": {
+                    "id": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "name": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "hash": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            }
+          }
+        },
+        "service": {
+          "properties": {
+            "ephemeral_id": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "id": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "name": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "state": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "type": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "version": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "source": {
+          "properties": {
+            "address": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "as": {
+              "properties": {
+                "number": {
+                  "type": "long"
+                },
+                "organization": {
+                  "properties": {
+                    "name": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                }
+              }
+            },
+            "bytes": {
+              "type": "long"
+            },
+            "domain": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "domain_top1m_rank": {
+              "type": "long"
+            },
+            "geo": {
+              "properties": {
+                "city_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "continent_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "country_iso_code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "country_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "location": {
+                  "type": "geo_point"
+                },
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "region_iso_code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "region_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "ip": {
+              "type": "ip"
+            },
+            "locality": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "mac": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "nat": {
+              "properties": {
+                "ip": {
+                  "type": "ip"
+                },
+                "port": {
+                  "type": "long"
+                }
+              }
+            },
+            "packets": {
+              "type": "long"
+            },
+            "port": {
+              "type": "long"
+            },
+            "user": {
+              "properties": {
+                "domain": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "email": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "full_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "group": {
+                  "properties": {
+                    "id": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "name": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "hash": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            }
+          }
+        },
+        "status": {
+          "ignore_above": 1024,
+          "type": "keyword"
+        },
+        "tags": {
+          "ignore_above": 1024,
+          "type": "keyword"
+        },
+        "thrift": {
+          "properties": {
+            "exceptions": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "params": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "return_value": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "service": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "timeseries": {
+          "properties": {
+            "instance": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "tls": {
+          "properties": {
+            "alert_types": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "alerts": {
+              "properties": {
+                "code": {
+                  "type": "long"
+                },
+                "severity": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "source": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "type": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "client_certificate": {
+              "properties": {
+                "alternative_names": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "fingerprint": {
+                  "properties": {
+                    "md5": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "sha1": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "sha256": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "issuer": {
+                  "properties": {
+                    "common_name": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "country": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "locality": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "organization": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "organizational_unit": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "province": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "not_after": {
+                  "type": "date"
+                },
+                "not_before": {
+                  "type": "date"
+                },
+                "public_key_algorithm": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "public_key_size": {
+                  "type": "long"
+                },
+                "raw": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "serial_number": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "signature_algorithm": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "subject": {
+                  "properties": {
+                    "common_name": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "country": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "locality": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "organization": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "organizational_unit": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "province": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "version": {
+                  "type": "long"
+                }
+              }
+            },
+            "client_certificate_chain": {
+              "properties": {
+                "fingerprint": {
+                  "properties": {
+                    "sha1": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "issuer": {
+                  "properties": {
+                    "common_name": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "country": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "organization": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "organizational_unit": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "not_after": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "not_before": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "public_key_algorithm": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "public_key_size": {
+                  "type": "long"
+                },
+                "serial_number": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "signature_algorithm": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "subject": {
+                  "properties": {
+                    "common_name": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "country": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "organization": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "organizational_unit": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "version": {
+                  "type": "long"
+                }
+              }
+            },
+            "client_certificate_requested": {
+              "type": "boolean"
+            },
+            "client_hello": {
+              "properties": {
+                "extensions": {
+                  "properties": {
+                    "_unparsed_": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "application_layer_protocol_negotiation": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "ec_points_formats": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "server_name_indication": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "session_ticket": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "signature_algorithms": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "supported_groups": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "supported_versions": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "session_id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "supported_ciphers": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "supported_compression_methods": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "version": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "fingerprints": {
+              "properties": {
+                "ja3": {
+                  "properties": {
+                    "hash": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "str": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                }
+              }
+            },
+            "handshake_completed": {
+              "type": "boolean"
+            },
+            "resumed": {
+              "type": "boolean"
+            },
+            "resumption_method": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "server_certificate": {
+              "properties": {
+                "alternative_names": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "fingerprint": {
+                  "properties": {
+                    "md5": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "sha1": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "sha256": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "issuer": {
+                  "properties": {
+                    "common_name": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "country": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "locality": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "organization": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "organizational_unit": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "province": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "not_after": {
+                  "type": "date"
+                },
+                "not_before": {
+                  "type": "date"
+                },
+                "public_key_algorithm": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "public_key_size": {
+                  "type": "long"
+                },
+                "raw": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "serial_number": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "signature_algorithm": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "subject": {
+                  "properties": {
+                    "common_name": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "country": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "locality": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "organization": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "organizational_unit": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "postal_code": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "province": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "serial_number": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "street_address": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "version": {
+                  "type": "long"
+                }
+              }
+            },
+            "server_certificate_chain": {
+              "properties": {
+                "alternative_names": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "fingerprint": {
+                  "properties": {
+                    "sha1": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "issuer": {
+                  "properties": {
+                    "common_name": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "country": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "locality": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "organization": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "organizational_unit": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "province": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "not_after": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "not_before": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "public_key_algorithm": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "public_key_size": {
+                  "type": "long"
+                },
+                "serial_number": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "signature_algorithm": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "subject": {
+                  "properties": {
+                    "common_name": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "country": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "locality": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "organization": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "organizational_unit": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "province": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "version": {
+                  "type": "long"
+                }
+              }
+            },
+            "server_hello": {
+              "properties": {
+                "extensions": {
+                  "properties": {
+                    "_unparsed_": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "application_layer_protocol_negotiation": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "ec_points_formats": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "session_ticket": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "supported_versions": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "selected_cipher": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "selected_compression_method": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "session_id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "version": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "version": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "tracing": {
+          "properties": {
+            "trace": {
+              "properties": {
+                "id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "transaction": {
+              "properties": {
+                "id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            }
+          }
+        },
+        "type": {
+          "ignore_above": 1024,
+          "type": "keyword"
+        },
+        "url": {
+          "properties": {
+            "domain": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "fragment": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "full": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "original": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "password": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "path": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "port": {
+              "type": "long"
+            },
+            "query": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "scheme": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "username": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "user": {
+          "properties": {
+            "domain": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "email": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "full_name": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "group": {
+              "properties": {
+                "id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "hash": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "id": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "name": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "user_agent": {
+          "properties": {
+            "device": {
+              "properties": {
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "name": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "original": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "os": {
+              "properties": {
+                "family": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "full": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "kernel": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "platform": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "version": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "version": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        }
+      }
+    },
+    "settings": {
+      "index": {
+        "auto_expand_replicas": "0-1",
+        "codec": "best_compression",
+        "lifecycle": {
+          "name": "packetbeat-8.0.0",
+          "rollover_alias": "packetbeat-8.0.0"
+        },
+        "mapping": {
+          "total_fields": {
+            "limit": "10000"
+          }
+        },
+        "number_of_replicas": "1",
+        "number_of_shards": "1",
+        "query": {
+          "default_field": [
+            "message",
+            "tags",
+            "agent.ephemeral_id",
+            "agent.id",
+            "agent.name",
+            "agent.type",
+            "agent.version",
+            "as.organization.name",
+            "client.address",
+            "client.as.organization.name",
+            "client.domain",
+            "client.geo.city_name",
+            "client.geo.continent_name",
+            "client.geo.country_iso_code",
+            "client.geo.country_name",
+            "client.geo.name",
+            "client.geo.region_iso_code",
+            "client.geo.region_name",
+            "client.mac",
+            "client.user.domain",
+            "client.user.email",
+            "client.user.full_name",
+            "client.user.group.id",
+            "client.user.group.name",
+            "client.user.hash",
+            "client.user.id",
+            "client.user.name",
+            "cloud.account.id",
+            "cloud.availability_zone",
+            "cloud.instance.id",
+            "cloud.instance.name",
+            "cloud.machine.type",
+            "cloud.provider",
+            "cloud.region",
+            "container.id",
+            "container.image.name",
+            "container.image.tag",
+            "container.name",
+            "container.runtime",
+            "destination.address",
+            "destination.as.organization.name",
+            "destination.domain",
+            "destination.geo.city_name",
+            "destination.geo.continent_name",
+            "destination.geo.country_iso_code",
+            "destination.geo.country_name",
+            "destination.geo.name",
+            "destination.geo.region_iso_code",
+            "destination.geo.region_name",
+            "destination.mac",
+            "destination.user.domain",
+            "destination.user.email",
+            "destination.user.full_name",
+            "destination.user.group.id",
+            "destination.user.group.name",
+            "destination.user.hash",
+            "destination.user.id",
+            "destination.user.name",
+            "dns.answers.class",
+            "dns.answers.data",
+            "dns.answers.name",
+            "dns.answers.type",
+            "dns.header_flags",
+            "dns.id",
+            "dns.op_code",
+            "dns.question.class",
+            "dns.question.name",
+            "dns.question.registered_domain",
+            "dns.question.type",
+            "dns.response_code",
+            "dns.type",
+            "ecs.version",
+            "error.code",
+            "error.id",
+            "error.message",
+            "event.action",
+            "event.category",
+            "event.code",
+            "event.dataset",
+            "event.hash",
+            "event.id",
+            "event.kind",
+            "event.module",
+            "event.original",
+            "event.outcome",
+            "event.provider",
+            "event.timezone",
+            "event.type",
+            "file.device",
+            "file.directory",
+            "file.extension",
+            "file.gid",
+            "file.group",
+            "file.hash.md5",
+            "file.hash.sha1",
+            "file.hash.sha256",
+            "file.hash.sha512",
+            "file.inode",
+            "file.mode",
+            "file.name",
+            "file.owner",
+            "file.path",
+            "file.target_path",
+            "file.type",
+            "file.uid",
+            "geo.city_name",
+            "geo.continent_name",
+            "geo.country_iso_code",
+            "geo.country_name",
+            "geo.name",
+            "geo.region_iso_code",
+            "geo.region_name",
+            "group.id",
+            "group.name",
+            "hash.md5",
+            "hash.sha1",
+            "hash.sha256",
+            "hash.sha512",
+            "host.architecture",
+            "host.geo.city_name",
+            "host.geo.continent_name",
+            "host.geo.country_iso_code",
+            "host.geo.country_name",
+            "host.geo.name",
+            "host.geo.region_iso_code",
+            "host.geo.region_name",
+            "host.hostname",
+            "host.id",
+            "host.mac",
+            "host.name",
+            "host.os.family",
+            "host.os.full",
+            "host.os.kernel",
+            "host.os.name",
+            "host.os.platform",
+            "host.os.version",
+            "host.type",
+            "host.user.domain",
+            "host.user.email",
+            "host.user.full_name",
+            "host.user.group.id",
+            "host.user.group.name",
+            "host.user.hash",
+            "host.user.id",
+            "host.user.name",
+            "http.request.body.content",
+            "http.request.method",
+            "http.request.referrer",
+            "http.response.body.content",
+            "http.version",
+            "log.level",
+            "log.logger",
+            "log.original",
+            "network.application",
+            "network.community_id",
+            "network.direction",
+            "network.iana_number",
+            "network.name",
+            "network.protocol",
+            "network.transport",
+            "network.type",
+            "observer.geo.city_name",
+            "observer.geo.continent_name",
+            "observer.geo.country_iso_code",
+            "observer.geo.country_name",
+            "observer.geo.name",
+            "observer.geo.region_iso_code",
+            "observer.geo.region_name",
+            "observer.hostname",
+            "observer.mac",
+            "observer.os.family",
+            "observer.os.full",
+            "observer.os.kernel",
+            "observer.os.name",
+            "observer.os.platform",
+            "observer.os.version",
+            "observer.serial_number",
+            "observer.type",
+            "observer.vendor",
+            "observer.version",
+            "organization.id",
+            "organization.name",
+            "os.family",
+            "os.full",
+            "os.kernel",
+            "os.name",
+            "os.platform",
+            "os.version",
+            "process.args",
+            "process.executable",
+            "process.hash.md5",
+            "process.hash.sha1",
+            "process.hash.sha256",
+            "process.hash.sha512",
+            "process.name",
+            "process.thread.name",
+            "process.title",
+            "process.working_directory",
+            "server.address",
+            "server.as.organization.name",
+            "server.domain",
+            "server.geo.city_name",
+            "server.geo.continent_name",
+            "server.geo.country_iso_code",
+            "server.geo.country_name",
+            "server.geo.name",
+            "server.geo.region_iso_code",
+            "server.geo.region_name",
+            "server.mac",
+            "server.user.domain",
+            "server.user.email",
+            "server.user.full_name",
+            "server.user.group.id",
+            "server.user.group.name",
+            "server.user.hash",
+            "server.user.id",
+            "server.user.name",
+            "service.ephemeral_id",
+            "service.id",
+            "service.name",
+            "service.state",
+            "service.type",
+            "service.version",
+            "source.address",
+            "source.as.organization.name",
+            "source.domain",
+            "source.geo.city_name",
+            "source.geo.continent_name",
+            "source.geo.country_iso_code",
+            "source.geo.country_name",
+            "source.geo.name",
+            "source.geo.region_iso_code",
+            "source.geo.region_name",
+            "source.mac",
+            "source.user.domain",
+            "source.user.email",
+            "source.user.full_name",
+            "source.user.group.id",
+            "source.user.group.name",
+            "source.user.hash",
+            "source.user.id",
+            "source.user.name",
+            "tracing.trace.id",
+            "tracing.transaction.id",
+            "url.domain",
+            "url.fragment",
+            "url.full",
+            "url.original",
+            "url.password",
+            "url.path",
+            "url.query",
+            "url.scheme",
+            "url.username",
+            "user.domain",
+            "user.email",
+            "user.full_name",
+            "user.group.id",
+            "user.group.name",
+            "user.hash",
+            "user.id",
+            "user.name",
+            "user_agent.device.name",
+            "user_agent.name",
+            "user_agent.original",
+            "user_agent.os.family",
+            "user_agent.os.full",
+            "user_agent.os.kernel",
+            "user_agent.os.name",
+            "user_agent.os.platform",
+            "user_agent.os.version",
+            "user_agent.version",
+            "agent.hostname",
+            "error.type",
+            "timeseries.instance",
+            "cloud.project.id",
+            "cloud.image.id",
+            "host.os.build",
+            "host.os.codename",
+            "kubernetes.pod.name",
+            "kubernetes.pod.uid",
+            "kubernetes.namespace",
+            "kubernetes.node.name",
+            "kubernetes.replicaset.name",
+            "kubernetes.deployment.name",
+            "kubernetes.statefulset.name",
+            "kubernetes.container.name",
+            "kubernetes.container.image",
+            "jolokia.agent.version",
+            "jolokia.agent.id",
+            "jolokia.server.product",
+            "jolokia.server.version",
+            "jolokia.server.vendor",
+            "jolokia.url",
+            "type",
+            "server.process.name",
+            "server.process.args",
+            "server.process.executable",
+            "server.process.working_directory",
+            "server.process.start",
+            "client.process.name",
+            "client.process.args",
+            "client.process.executable",
+            "client.process.working_directory",
+            "client.process.start",
+            "flow.id",
+            "status",
+            "method",
+            "resource",
+            "path",
+            "query",
+            "params",
+            "request",
+            "response",
+            "amqp.reply-text",
+            "amqp.exchange",
+            "amqp.exchange-type",
+            "amqp.consumer-tag",
+            "amqp.routing-key",
+            "amqp.queue",
+            "amqp.content-type",
+            "amqp.content-encoding",
+            "amqp.delivery-mode",
+            "amqp.correlation-id",
+            "amqp.reply-to",
+            "amqp.expiration",
+            "amqp.message-id",
+            "amqp.timestamp",
+            "amqp.type",
+            "amqp.user-id",
+            "amqp.app-id",
+            "cassandra.request.headers.flags",
+            "cassandra.request.headers.stream",
+            "cassandra.request.headers.op",
+            "cassandra.request.query",
+            "cassandra.response.headers.flags",
+            "cassandra.response.headers.stream",
+            "cassandra.response.headers.op",
+            "cassandra.response.result.type",
+            "cassandra.response.result.rows.meta.keyspace",
+            "cassandra.response.result.rows.meta.table",
+            "cassandra.response.result.rows.meta.flags",
+            "cassandra.response.result.rows.meta.paging_state",
+            "cassandra.response.result.keyspace",
+            "cassandra.response.result.schema_change.change",
+            "cassandra.response.result.schema_change.keyspace",
+            "cassandra.response.result.schema_change.table",
+            "cassandra.response.result.schema_change.object",
+            "cassandra.response.result.schema_change.target",
+            "cassandra.response.result.schema_change.name",
+            "cassandra.response.result.schema_change.args",
+            "cassandra.response.result.prepared.prepared_id",
+            "cassandra.response.result.prepared.req_meta.keyspace",
+            "cassandra.response.result.prepared.req_meta.table",
+            "cassandra.response.result.prepared.req_meta.flags",
+            "cassandra.response.result.prepared.req_meta.paging_state",
+            "cassandra.response.result.prepared.resp_meta.keyspace",
+            "cassandra.response.result.prepared.resp_meta.table",
+            "cassandra.response.result.prepared.resp_meta.flags",
+            "cassandra.response.result.prepared.resp_meta.paging_state",
+            "cassandra.response.authentication.class",
+            "cassandra.response.warnings",
+            "cassandra.response.event.type",
+            "cassandra.response.event.change",
+            "cassandra.response.event.host",
+            "cassandra.response.event.schema_change.change",
+            "cassandra.response.event.schema_change.keyspace",
+            "cassandra.response.event.schema_change.table",
+            "cassandra.response.event.schema_change.object",
+            "cassandra.response.event.schema_change.target",
+            "cassandra.response.event.schema_change.name",
+            "cassandra.response.event.schema_change.args",
+            "cassandra.response.error.msg",
+            "cassandra.response.error.type",
+            "cassandra.response.error.details.read_consistency",
+            "cassandra.response.error.details.write_type",
+            "cassandra.response.error.details.keyspace",
+            "cassandra.response.error.details.table",
+            "cassandra.response.error.details.stmt_id",
+            "cassandra.response.error.details.num_failures",
+            "cassandra.response.error.details.function",
+            "cassandra.response.error.details.arg_types",
+            "dhcpv4.transaction_id",
+            "dhcpv4.flags",
+            "dhcpv4.client_mac",
+            "dhcpv4.server_name",
+            "dhcpv4.op_code",
+            "dhcpv4.hardware_type",
+            "dhcpv4.option.message_type",
+            "dhcpv4.option.parameter_request_list",
+            "dhcpv4.option.class_identifier",
+            "dhcpv4.option.domain_name",
+            "dhcpv4.option.hostname",
+            "dhcpv4.option.message",
+            "dhcpv4.option.boot_file_name",
+            "dns.question.etld_plus_one",
+            "dns.authorities.name",
+            "dns.authorities.type",
+            "dns.authorities.class",
+            "dns.additionals.name",
+            "dns.additionals.type",
+            "dns.additionals.class",
+            "dns.additionals.data",
+            "dns.opt.version",
+            "dns.opt.ext_rcode",
+            "http.response.status_phrase",
+            "icmp.version",
+            "icmp.request.message",
+            "icmp.response.message",
+            "memcache.protocol_type",
+            "memcache.request.line",
+            "memcache.request.command",
+            "memcache.response.command",
+            "memcache.request.type",
+            "memcache.response.type",
+            "memcache.response.error_msg",
+            "memcache.request.opcode",
+            "memcache.response.opcode",
+            "memcache.response.status",
+            "memcache.request.raw_args",
+            "memcache.request.automove",
+            "memcache.response.version",
+            "mongodb.error",
+            "mongodb.fullCollectionName",
+            "mongodb.startingFrom",
+            "mongodb.query",
+            "mongodb.returnFieldsSelector",
+            "mongodb.selector",
+            "mongodb.update",
+            "mongodb.cursorId",
+            "mysql.insert_id",
+            "mysql.num_fields",
+            "mysql.num_rows",
+            "mysql.query",
+            "mysql.error_message",
+            "nfs.tag",
+            "nfs.opcode",
+            "nfs.status",
+            "rpc.xid",
+            "rpc.status",
+            "rpc.auth_flavor",
+            "rpc.cred.gids",
+            "rpc.cred.machinename",
+            "pgsql.error_message",
+            "pgsql.error_severity",
+            "pgsql.num_fields",
+            "pgsql.num_rows",
+            "redis.return_value",
+            "redis.error",
+            "thrift.params",
+            "thrift.service",
+            "thrift.return_value",
+            "thrift.exceptions",
+            "tls.version",
+            "tls.resumption_method",
+            "tls.client_hello.version",
+            "tls.client_hello.extensions.server_name_indication",
+            "tls.client_hello.extensions.application_layer_protocol_negotiation",
+            "tls.client_hello.extensions.session_ticket",
+            "tls.client_hello.extensions.supported_versions",
+            "tls.client_hello.extensions.supported_groups",
+            "tls.client_hello.extensions.signature_algorithms",
+            "tls.client_hello.extensions.ec_points_formats",
+            "tls.client_hello.extensions._unparsed_",
+            "tls.server_hello.version",
+            "tls.server_hello.selected_cipher",
+            "tls.server_hello.selected_compression_method",
+            "tls.server_hello.session_id",
+            "tls.server_hello.extensions.session_ticket",
+            "tls.server_hello.extensions.supported_versions",
+            "tls.server_hello.extensions.ec_points_formats",
+            "tls.server_hello.extensions._unparsed_",
+            "tls.client_certificate.serial_number",
+            "tls.client_certificate.public_key_algorithm",
+            "tls.client_certificate.signature_algorithm",
+            "tls.client_certificate.raw",
+            "tls.client_certificate.subject.country",
+            "tls.client_certificate.subject.organization",
+            "tls.client_certificate.subject.organizational_unit",
+            "tls.client_certificate.subject.province",
+            "tls.client_certificate.subject.common_name",
+            "tls.client_certificate.issuer.country",
+            "tls.client_certificate.issuer.organization",
+            "tls.client_certificate.issuer.organizational_unit",
+            "tls.client_certificate.issuer.province",
+            "tls.client_certificate.issuer.common_name",
+            "tls.client_certificate.fingerprint.md5",
+            "tls.client_certificate.fingerprint.sha1",
+            "tls.client_certificate.fingerprint.sha256",
+            "tls.server_certificate.serial_number",
+            "tls.server_certificate.public_key_algorithm",
+            "tls.server_certificate.signature_algorithm",
+            "tls.server_certificate.raw",
+            "tls.server_certificate.subject.country",
+            "tls.server_certificate.subject.organization",
+            "tls.server_certificate.subject.organizational_unit",
+            "tls.server_certificate.subject.province",
+            "tls.server_certificate.subject.common_name",
+            "tls.server_certificate.issuer.country",
+            "tls.server_certificate.issuer.organization",
+            "tls.server_certificate.issuer.organizational_unit",
+            "tls.server_certificate.issuer.province",
+            "tls.server_certificate.issuer.common_name",
+            "tls.server_certificate.fingerprint.md5",
+            "tls.server_certificate.fingerprint.sha1",
+            "tls.server_certificate.fingerprint.sha256",
+            "tls.alert_types",
+            "tls.fingerprints.ja3.hash",
+            "tls.fingerprints.ja3.str",
+            "fields.*"
+          ]
+        },
+        "refresh_interval": "5s"
+      }
+    }
+  }
+}
\ No newline at end of file

From 1a872752b76bcd66f517dc5afbbbd7e17fe5d081 Mon Sep 17 00:00:00 2001
From: Robert Oskamp <robert.oskamp@elastic.co>
Date: Tue, 24 Mar 2020 08:11:38 +0100
Subject: [PATCH 057/179] [ML] Functional tests - stabilize df analytics clone
 tests (#60497)

This PR stabilizes the data frame analytics clone tests.
---
 .../classification_creation.ts                |  2 +-
 .../data_frame_analytics/cloning.ts           |  9 ++++++---
 .../outlier_detection_creation.ts             |  2 +-
 .../regression_creation.ts                    |  2 +-
 .../services/machine_learning/api.ts          | 19 ++++++++++++-------
 .../data_frame_analytics_creation.ts          | 11 +++++++----
 x-pack/test/functional/services/ml.ts         |  3 ++-
 7 files changed, 30 insertions(+), 18 deletions(-)

diff --git a/x-pack/test/functional/apps/machine_learning/data_frame_analytics/classification_creation.ts b/x-pack/test/functional/apps/machine_learning/data_frame_analytics/classification_creation.ts
index 1bcdeef394c00..a7c92cac2072f 100644
--- a/x-pack/test/functional/apps/machine_learning/data_frame_analytics/classification_creation.ts
+++ b/x-pack/test/functional/apps/machine_learning/data_frame_analytics/classification_creation.ts
@@ -111,7 +111,7 @@ export default function({ getService }: FtrProviderContext) {
 
         it('creates the analytics job', async () => {
           await ml.dataFrameAnalyticsCreation.assertCreateButtonExists();
-          await ml.dataFrameAnalyticsCreation.createAnalyticsJob();
+          await ml.dataFrameAnalyticsCreation.createAnalyticsJob(testData.jobId);
         });
 
         it('starts the analytics job', async () => {
diff --git a/x-pack/test/functional/apps/machine_learning/data_frame_analytics/cloning.ts b/x-pack/test/functional/apps/machine_learning/data_frame_analytics/cloning.ts
index 51155fccc358d..caf382b532273 100644
--- a/x-pack/test/functional/apps/machine_learning/data_frame_analytics/cloning.ts
+++ b/x-pack/test/functional/apps/machine_learning/data_frame_analytics/cloning.ts
@@ -13,8 +13,7 @@ export default function({ getService }: FtrProviderContext) {
   const esArchiver = getService('esArchiver');
   const ml = getService('ml');
 
-  // failing test, see https://github.com/elastic/kibana/issues/60389
-  describe.skip('jobs cloning supported by UI form', function() {
+  describe('jobs cloning supported by UI form', function() {
     this.tags(['smoke']);
 
     const testDataList: Array<{
@@ -173,7 +172,7 @@ export default function({ getService }: FtrProviderContext) {
         });
 
         it('should create a clone job', async () => {
-          await ml.dataFrameAnalyticsCreation.createAnalyticsJob();
+          await ml.dataFrameAnalyticsCreation.createAnalyticsJob(cloneJobId);
         });
 
         it('should start the clone analytics job', async () => {
@@ -186,6 +185,10 @@ export default function({ getService }: FtrProviderContext) {
           await ml.dataFrameAnalyticsCreation.closeCreateAnalyticsJobFlyout();
         });
 
+        it('finishes analytics processing', async () => {
+          await ml.dataFrameAnalytics.waitForAnalyticsCompletion(cloneJobId);
+        });
+
         it('displays the created job in the analytics table', async () => {
           await ml.dataFrameAnalyticsTable.refreshAnalyticsTable();
           await ml.dataFrameAnalyticsTable.filterWithSearchString(cloneJobId);
diff --git a/x-pack/test/functional/apps/machine_learning/data_frame_analytics/outlier_detection_creation.ts b/x-pack/test/functional/apps/machine_learning/data_frame_analytics/outlier_detection_creation.ts
index 173430706f7e7..5481977351d8b 100644
--- a/x-pack/test/functional/apps/machine_learning/data_frame_analytics/outlier_detection_creation.ts
+++ b/x-pack/test/functional/apps/machine_learning/data_frame_analytics/outlier_detection_creation.ts
@@ -107,7 +107,7 @@ export default function({ getService }: FtrProviderContext) {
 
         it('creates the analytics job', async () => {
           await ml.dataFrameAnalyticsCreation.assertCreateButtonExists();
-          await ml.dataFrameAnalyticsCreation.createAnalyticsJob();
+          await ml.dataFrameAnalyticsCreation.createAnalyticsJob(testData.jobId);
         });
 
         it('starts the analytics job', async () => {
diff --git a/x-pack/test/functional/apps/machine_learning/data_frame_analytics/regression_creation.ts b/x-pack/test/functional/apps/machine_learning/data_frame_analytics/regression_creation.ts
index 3bc524a88f787..aa1a133c81187 100644
--- a/x-pack/test/functional/apps/machine_learning/data_frame_analytics/regression_creation.ts
+++ b/x-pack/test/functional/apps/machine_learning/data_frame_analytics/regression_creation.ts
@@ -111,7 +111,7 @@ export default function({ getService }: FtrProviderContext) {
 
         it('creates the analytics job', async () => {
           await ml.dataFrameAnalyticsCreation.assertCreateButtonExists();
-          await ml.dataFrameAnalyticsCreation.createAnalyticsJob();
+          await ml.dataFrameAnalyticsCreation.createAnalyticsJob(testData.jobId);
         });
 
         it('starts the analytics job', async () => {
diff --git a/x-pack/test/functional/services/machine_learning/api.ts b/x-pack/test/functional/services/machine_learning/api.ts
index e305d23c1a124..74dc5912df36f 100644
--- a/x-pack/test/functional/services/machine_learning/api.ts
+++ b/x-pack/test/functional/services/machine_learning/api.ts
@@ -358,9 +358,20 @@ export function MachineLearningAPIProvider({ getService }: FtrProviderContext) {
     },
 
     async getDataFrameAnalyticsJob(analyticsId: string) {
+      log.debug(`Fetching data frame analytics job '${analyticsId}'...`);
       return await esSupertest.get(`/_ml/data_frame/analytics/${analyticsId}`).expect(200);
     },
 
+    async waitForDataFrameAnalyticsJobToExist(analyticsId: string) {
+      await retry.waitForWithTimeout(`'${analyticsId}' to exist`, 5 * 1000, async () => {
+        if (await this.getDataFrameAnalyticsJob(analyticsId)) {
+          return true;
+        } else {
+          throw new Error(`expected data frame analytics job '${analyticsId}' to exist`);
+        }
+      });
+    },
+
     async createDataFrameAnalyticsJob(jobConfig: DataFrameAnalyticsConfig) {
       const { id: analyticsId, ...analyticsConfig } = jobConfig;
       log.debug(`Creating data frame analytic job with id '${analyticsId}'...`);
@@ -369,13 +380,7 @@ export function MachineLearningAPIProvider({ getService }: FtrProviderContext) {
         .send(analyticsConfig)
         .expect(200);
 
-      await retry.waitForWithTimeout(`'${analyticsId}' to be created`, 5 * 1000, async () => {
-        if (await this.getDataFrameAnalyticsJob(analyticsId)) {
-          return true;
-        } else {
-          throw new Error(`expected data frame analytics job '${analyticsId}' to be created`);
-        }
-      });
+      await this.waitForDataFrameAnalyticsJobToExist(analyticsId);
     },
   };
 }
diff --git a/x-pack/test/functional/services/machine_learning/data_frame_analytics_creation.ts b/x-pack/test/functional/services/machine_learning/data_frame_analytics_creation.ts
index 9d5f5753e8b04..49f9b01c96895 100644
--- a/x-pack/test/functional/services/machine_learning/data_frame_analytics_creation.ts
+++ b/x-pack/test/functional/services/machine_learning/data_frame_analytics_creation.ts
@@ -12,6 +12,7 @@ import {
 
 import { FtrProviderContext } from '../../ftr_provider_context';
 import { MlCommon } from './common';
+import { MlApi } from './api';
 
 enum ANALYSIS_CONFIG_TYPE {
   OUTLIER_DETECTION = 'outlier_detection',
@@ -31,7 +32,8 @@ const isClassificationAnalysis = (arg: any): arg is ClassificationAnalysis => {
 
 export function MachineLearningDataFrameAnalyticsCreationProvider(
   { getService }: FtrProviderContext,
-  mlCommon: MlCommon
+  mlCommon: MlCommon,
+  mlApi: MlApi
 ) {
   const testSubjects = getService('testSubjects');
   const comboBox = getService('comboBox');
@@ -333,12 +335,13 @@ export function MachineLearningDataFrameAnalyticsCreationProvider(
       return !isEnabled;
     },
 
-    async createAnalyticsJob() {
+    async createAnalyticsJob(analyticsId: string) {
       await testSubjects.click('mlAnalyticsCreateJobFlyoutCreateButton');
       await retry.tryForTime(5000, async () => {
         await this.assertCreateButtonMissing();
         await this.assertStartButtonExists();
       });
+      await mlApi.waitForDataFrameAnalyticsJobToExist(analyticsId);
     },
 
     async assertStartButtonExists() {
@@ -362,8 +365,8 @@ export function MachineLearningDataFrameAnalyticsCreationProvider(
     },
 
     async closeCreateAnalyticsJobFlyout() {
-      await testSubjects.click('mlAnalyticsCreateJobFlyoutCloseButton');
-      await retry.tryForTime(5000, async () => {
+      await retry.tryForTime(10 * 1000, async () => {
+        await testSubjects.click('mlAnalyticsCreateJobFlyoutCloseButton');
         await testSubjects.missingOrFail('mlAnalyticsCreateJobFlyout');
       });
     },
diff --git a/x-pack/test/functional/services/ml.ts b/x-pack/test/functional/services/ml.ts
index f3981c9edf92f..af7cb51f4e3f0 100644
--- a/x-pack/test/functional/services/ml.ts
+++ b/x-pack/test/functional/services/ml.ts
@@ -45,7 +45,8 @@ export function MachineLearningProvider(context: FtrProviderContext) {
   const dataFrameAnalytics = MachineLearningDataFrameAnalyticsProvider(context, api);
   const dataFrameAnalyticsCreation = MachineLearningDataFrameAnalyticsCreationProvider(
     context,
-    common
+    common,
+    api
   );
   const dataFrameAnalyticsTable = MachineLearningDataFrameAnalyticsTableProvider(context);
   const dataVisualizer = MachineLearningDataVisualizerProvider(context);

From 462be16879539559818649352531b35e9329908a Mon Sep 17 00:00:00 2001
From: Andrew Goldstein <andrew-goldstein@users.noreply.github.com>
Date: Tue, 24 Mar 2020 01:14:41 -0600
Subject: [PATCH 058/179] [SIEM] Overview: Recent cases widget (#60993)

## [SIEM] Overview: Recent cases widget

Implements the new `Recent cases` widget on the Overview page.

Recent cases shows the last 3 recently created cases, per the following animated gif:

![recent-cases](https://user-images.githubusercontent.com/4459398/77357982-ae550a80-6d0e-11ea-90d0-62fa5407eea5.gif)

### Markdown case descriptions

Markdown case descriptions are rendered, per the following animated gif:

![markdown-description](https://user-images.githubusercontent.com/4459398/77358163-f7a55a00-6d0e-11ea-8b85-dd4b3ff093ee.gif)

### My recently reported cases

My recently reported cases filters the widget to show only cases created by the logged-in user, per the following animated gif:

![my-recent-cases](https://user-images.githubusercontent.com/4459398/77358223-14419200-6d0f-11ea-8e4a-25cd55fdfc44.gif)

### No cases state

A message welcoming the user to create a case is displayed when no cases exist, per the following screenshot:

![no-cases-created](https://user-images.githubusercontent.com/4459398/77358338-4ce16b80-6d0f-11ea-98d3-5de1be19a935.png)

### Other changes

- [x] Case-related links were updated to ensure URL state parameters, e.g. global date selection, carry-over as the user navigates through case views
- [x] Recent timelines was updated to only show the last 3 recent timelines (down from 5)
- [x] All sidebar widgets have slightly more compact spacing

Tested in:
* Chrome `80.0.3987.149`
* Firefox `74.0`
* Safari `13.0.5`
---
 .../components/link_to/redirect_to_case.tsx   |  17 ++-
 .../siem/public/components/links/index.tsx    |  13 +-
 .../public/components/markdown/index.test.tsx |  11 ++
 .../siem/public/components/markdown/index.tsx |  90 ++++++-------
 .../navigation/breadcrumbs/index.ts           |  17 ++-
 .../public/components/news_feed/news_feed.tsx |   8 +-
 .../components/news_feed/post/index.tsx       |   1 +
 .../components/recent_cases/filters/index.tsx |  51 ++++++++
 .../public/components/recent_cases/index.tsx  |  80 ++++++++++++
 .../recent_cases/no_cases/index.tsx           |  34 +++++
 .../components/recent_cases/recent_cases.tsx  |  56 ++++++++
 .../components/recent_cases/translations.ts   |  37 ++++++
 .../public/components/recent_cases/types.ts   |   7 +
 .../recent_timelines/counts/index.tsx         |   2 +-
 .../recent_timelines/filters/index.tsx        |   6 +-
 .../components/recent_timelines/index.tsx     |  12 +-
 .../recent_timelines/recent_timelines.tsx     |   9 +-
 .../recent_timelines/translations.ts          |   8 ++
 .../components/url_state/index.test.tsx       |   4 +-
 .../siem/public/components/url_state/types.ts |   4 +-
 .../public/containers/case/use_get_cases.tsx  |  31 +++--
 .../pages/case/components/all_cases/index.tsx |   7 +-
 .../pages/case/components/case_view/index.tsx |   6 +-
 .../case/components/configure_cases/index.tsx |  10 +-
 .../public/pages/case/configure_cases.tsx     |  47 ++++---
 .../siem/public/pages/case/create_case.tsx    |  37 ++++--
 .../plugins/siem/public/pages/case/utils.ts   |  12 +-
 .../public/pages/home/home_navigations.tsx    |   2 +-
 .../public/pages/overview/sidebar/index.tsx   |  20 ++-
 .../public/pages/overview/sidebar/sidebar.tsx | 123 +++++++++++++-----
 .../public/pages/overview/translations.ts     |   4 +
 31 files changed, 594 insertions(+), 172 deletions(-)
 create mode 100644 x-pack/legacy/plugins/siem/public/components/recent_cases/filters/index.tsx
 create mode 100644 x-pack/legacy/plugins/siem/public/components/recent_cases/index.tsx
 create mode 100644 x-pack/legacy/plugins/siem/public/components/recent_cases/no_cases/index.tsx
 create mode 100644 x-pack/legacy/plugins/siem/public/components/recent_cases/recent_cases.tsx
 create mode 100644 x-pack/legacy/plugins/siem/public/components/recent_cases/translations.ts
 create mode 100644 x-pack/legacy/plugins/siem/public/components/recent_cases/types.ts

diff --git a/x-pack/legacy/plugins/siem/public/components/link_to/redirect_to_case.tsx b/x-pack/legacy/plugins/siem/public/components/link_to/redirect_to_case.tsx
index 20ba0b50f5126..6ec15b55ba83d 100644
--- a/x-pack/legacy/plugins/siem/public/components/link_to/redirect_to_case.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/link_to/redirect_to_case.tsx
@@ -6,6 +6,7 @@
 
 import React from 'react';
 import { RouteComponentProps } from 'react-router-dom';
+import { appendSearch } from './helpers';
 import { RedirectWrapper } from './redirect_wrapper';
 import { SiemPageName } from '../../pages/home/types';
 
@@ -30,8 +31,14 @@ export const RedirectToConfigureCasesPage = () => (
 
 const baseCaseUrl = `#/link-to/${SiemPageName.case}`;
 
-export const getCaseUrl = () => baseCaseUrl;
-export const getCaseDetailsUrl = (detailName: string, search: string) =>
-  `${baseCaseUrl}/${detailName}${search}`;
-export const getCreateCaseUrl = (search: string) => `${baseCaseUrl}/create${search}`;
-export const getConfigureCasesUrl = (search: string) => `${baseCaseUrl}/configure${search}`;
+export const getCaseUrl = (search: string | null) =>
+  `${baseCaseUrl}${appendSearch(search ?? undefined)}`;
+
+export const getCaseDetailsUrl = ({ id, search }: { id: string; search: string | null }) =>
+  `${baseCaseUrl}/${encodeURIComponent(id)}${appendSearch(search ?? undefined)}`;
+
+export const getCreateCaseUrl = (search: string | null) =>
+  `${baseCaseUrl}/create${appendSearch(search ?? undefined)}`;
+
+export const getConfigureCasesUrl = (search: string) =>
+  `${baseCaseUrl}/configure${appendSearch(search ?? undefined)}`;
diff --git a/x-pack/legacy/plugins/siem/public/components/links/index.tsx b/x-pack/legacy/plugins/siem/public/components/links/index.tsx
index 935df9ad3361f..14dc5e7999a65 100644
--- a/x-pack/legacy/plugins/siem/public/components/links/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/links/index.tsx
@@ -23,11 +23,11 @@ import {
 import { FlowTarget, FlowTargetSourceDest } from '../../graphql/types';
 import { useUiSetting$ } from '../../lib/kibana';
 import { IP_REPUTATION_LINKS_SETTING } from '../../../common/constants';
-import { navTabs } from '../../pages/home/home_navigations';
 import * as i18n from '../page/network/ip_overview/translations';
 import { isUrlInvalid } from '../../pages/detection_engine/rules/components/step_about_rule/helpers';
-import { useGetUrlSearch } from '../navigation/use_get_url_search';
 import { ExternalLinkIcon } from '../external_link_icon';
+import { navTabs } from '../../pages/home/home_navigations';
+import { useGetUrlSearch } from '../navigation/use_get_url_search';
 
 export const DEFAULT_NUMBER_OF_LINK = 5;
 
@@ -92,10 +92,11 @@ const CaseDetailsLinkComponent: React.FC<{ children?: React.ReactNode; detailNam
   children,
   detailName,
 }) => {
-  const urlSearch = useGetUrlSearch(navTabs.case);
+  const search = useGetUrlSearch(navTabs.case);
+
   return (
     <EuiLink
-      href={getCaseDetailsUrl(encodeURIComponent(detailName), urlSearch)}
+      href={getCaseDetailsUrl({ id: detailName, search })}
       data-test-subj="case-details-link"
     >
       {children ? children : detailName}
@@ -106,8 +107,8 @@ export const CaseDetailsLink = React.memo(CaseDetailsLinkComponent);
 CaseDetailsLink.displayName = 'CaseDetailsLink';
 
 export const CreateCaseLink = React.memo<{ children: React.ReactNode }>(({ children }) => {
-  const urlSearch = useGetUrlSearch(navTabs.case);
-  return <EuiLink href={getCreateCaseUrl(urlSearch)}>{children}</EuiLink>;
+  const search = useGetUrlSearch(navTabs.case);
+  return <EuiLink href={getCreateCaseUrl(search)}>{children}</EuiLink>;
 });
 
 CreateCaseLink.displayName = 'CreateCaseLink';
diff --git a/x-pack/legacy/plugins/siem/public/components/markdown/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/markdown/index.test.tsx
index de662c162fc0a..89af9202a597e 100644
--- a/x-pack/legacy/plugins/siem/public/components/markdown/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/markdown/index.test.tsx
@@ -126,6 +126,17 @@ describe('Markdown', () => {
       ).toHaveProperty('href', 'https://google.com/');
     });
 
+    test('it does NOT render the href if links are disabled', () => {
+      const wrapper = mount(<Markdown disableLinks={true} raw={markdownWithLink} />);
+
+      expect(
+        wrapper
+          .find('[data-test-subj="markdown-link"]')
+          .first()
+          .getDOMNode()
+      ).not.toHaveProperty('href');
+    });
+
     test('it opens links in a new tab via target="_blank"', () => {
       const wrapper = mount(<Markdown raw={markdownWithLink} />);
 
diff --git a/x-pack/legacy/plugins/siem/public/components/markdown/index.tsx b/x-pack/legacy/plugins/siem/public/components/markdown/index.tsx
index 30695c9d0c7e2..1368c13619d6b 100644
--- a/x-pack/legacy/plugins/siem/public/components/markdown/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/markdown/index.tsx
@@ -26,51 +26,53 @@ const REL_NOFOLLOW = 'nofollow';
 /** prevents the browser from sending the current address as referrer via the Referer HTTP header */
 const REL_NOREFERRER = 'noreferrer';
 
-export const Markdown = React.memo<{ raw?: string; size?: 'xs' | 's' | 'm' }>(
-  ({ raw, size = 's' }) => {
-    const markdownRenderers = {
-      root: ({ children }: { children: React.ReactNode[] }) => (
-        <EuiText data-test-subj="markdown-root" grow={true} size={size}>
+export const Markdown = React.memo<{
+  disableLinks?: boolean;
+  raw?: string;
+  size?: 'xs' | 's' | 'm';
+}>(({ disableLinks = false, raw, size = 's' }) => {
+  const markdownRenderers = {
+    root: ({ children }: { children: React.ReactNode[] }) => (
+      <EuiText data-test-subj="markdown-root" grow={true} size={size}>
+        {children}
+      </EuiText>
+    ),
+    table: ({ children }: { children: React.ReactNode[] }) => (
+      <table data-test-subj="markdown-table" className="euiTable euiTable--responsive">
+        {children}
+      </table>
+    ),
+    tableHead: ({ children }: { children: React.ReactNode[] }) => (
+      <TableHeader data-test-subj="markdown-table-header">{children}</TableHeader>
+    ),
+    tableRow: ({ children }: { children: React.ReactNode[] }) => (
+      <EuiTableRow data-test-subj="markdown-table-row">{children}</EuiTableRow>
+    ),
+    tableCell: ({ children }: { children: React.ReactNode[] }) => (
+      <EuiTableRowCell data-test-subj="markdown-table-cell">{children}</EuiTableRowCell>
+    ),
+    link: ({ children, href }: { children: React.ReactNode[]; href?: string }) => (
+      <EuiToolTip content={href}>
+        <EuiLink
+          href={disableLinks ? undefined : href}
+          data-test-subj="markdown-link"
+          rel={`${REL_NOOPENER} ${REL_NOFOLLOW} ${REL_NOREFERRER}`}
+          target="_blank"
+        >
           {children}
-        </EuiText>
-      ),
-      table: ({ children }: { children: React.ReactNode[] }) => (
-        <table data-test-subj="markdown-table" className="euiTable euiTable--responsive">
-          {children}
-        </table>
-      ),
-      tableHead: ({ children }: { children: React.ReactNode[] }) => (
-        <TableHeader data-test-subj="markdown-table-header">{children}</TableHeader>
-      ),
-      tableRow: ({ children }: { children: React.ReactNode[] }) => (
-        <EuiTableRow data-test-subj="markdown-table-row">{children}</EuiTableRow>
-      ),
-      tableCell: ({ children }: { children: React.ReactNode[] }) => (
-        <EuiTableRowCell data-test-subj="markdown-table-cell">{children}</EuiTableRowCell>
-      ),
-      link: ({ children, href }: { children: React.ReactNode[]; href?: string }) => (
-        <EuiToolTip content={href}>
-          <EuiLink
-            href={href}
-            data-test-subj="markdown-link"
-            rel={`${REL_NOOPENER} ${REL_NOFOLLOW} ${REL_NOREFERRER}`}
-            target="_blank"
-          >
-            {children}
-          </EuiLink>
-        </EuiToolTip>
-      ),
-    };
+        </EuiLink>
+      </EuiToolTip>
+    ),
+  };
 
-    return (
-      <ReactMarkdown
-        data-test-subj="markdown"
-        linkTarget="_blank"
-        renderers={markdownRenderers}
-        source={raw}
-      />
-    );
-  }
-);
+  return (
+    <ReactMarkdown
+      data-test-subj="markdown"
+      linkTarget="_blank"
+      renderers={markdownRenderers}
+      source={raw}
+    />
+  );
+});
 
 Markdown.displayName = 'Markdown';
diff --git a/x-pack/legacy/plugins/siem/public/components/navigation/breadcrumbs/index.ts b/x-pack/legacy/plugins/siem/public/components/navigation/breadcrumbs/index.ts
index e25fb4374bb14..155f63145ca95 100644
--- a/x-pack/legacy/plugins/siem/public/components/navigation/breadcrumbs/index.ts
+++ b/x-pack/legacy/plugins/siem/public/components/navigation/breadcrumbs/index.ts
@@ -107,7 +107,22 @@ export const getBreadcrumbsForRoute = (
     ];
   }
   if (isCaseRoutes(spyState) && object.navTabs) {
-    return [...siemRootBreadcrumb, ...getCaseDetailsBreadcrumbs(spyState)];
+    const tempNav: SearchNavTab = { urlKey: 'case', isDetailPage: false };
+    let urlStateKeys = [getOr(tempNav, spyState.pageName, object.navTabs)];
+    if (spyState.tabName != null) {
+      urlStateKeys = [...urlStateKeys, getOr(tempNav, spyState.tabName, object.navTabs)];
+    }
+
+    return [
+      ...siemRootBreadcrumb,
+      ...getCaseDetailsBreadcrumbs(
+        spyState,
+        urlStateKeys.reduce(
+          (acc: string[], item: SearchNavTab) => [...acc, getSearch(item, object)],
+          []
+        )
+      ),
+    ];
   }
   if (
     spyState != null &&
diff --git a/x-pack/legacy/plugins/siem/public/components/news_feed/news_feed.tsx b/x-pack/legacy/plugins/siem/public/components/news_feed/news_feed.tsx
index 98eea1eaa6454..cd356212b4400 100644
--- a/x-pack/legacy/plugins/siem/public/components/news_feed/news_feed.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/news_feed/news_feed.tsx
@@ -4,7 +4,6 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { EuiSpacer } from '@elastic/eui';
 import React from 'react';
 
 import { LoadingPlaceholders } from '../page/overview/loading_placeholders';
@@ -30,12 +29,7 @@ const NewsFeedComponent: React.FC<Props> = ({ news }) => (
     ) : news.length === 0 ? (
       <NoNews />
     ) : (
-      news.map((n: NewsItem) => (
-        <React.Fragment key={n.hash}>
-          <Post newsItem={n} />
-          <EuiSpacer size="l" />
-        </React.Fragment>
-      ))
+      news.map((n: NewsItem) => <Post key={n.hash} newsItem={n} />)
     )}
   </>
 );
diff --git a/x-pack/legacy/plugins/siem/public/components/news_feed/post/index.tsx b/x-pack/legacy/plugins/siem/public/components/news_feed/post/index.tsx
index cb2542a497f08..9cab78c9f20b1 100644
--- a/x-pack/legacy/plugins/siem/public/components/news_feed/post/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/news_feed/post/index.tsx
@@ -45,6 +45,7 @@ export const Post = React.memo<{ newsItem: NewsItem }>(({ newsItem }) => {
           <PreferenceFormattedP1DTDate value={publishOn} />
           <EuiSpacer size="s" />
           <div>{description}</div>
+          <EuiSpacer size="l" />
         </EuiText>
       </EuiFlexItem>
 
diff --git a/x-pack/legacy/plugins/siem/public/components/recent_cases/filters/index.tsx b/x-pack/legacy/plugins/siem/public/components/recent_cases/filters/index.tsx
new file mode 100644
index 0000000000000..edb0b99cbff8b
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/public/components/recent_cases/filters/index.tsx
@@ -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 { EuiButtonGroup, EuiButtonGroupOption } from '@elastic/eui';
+import React, { useCallback, useMemo } from 'react';
+
+import { FilterMode } from '../types';
+
+import * as i18n from '../translations';
+
+const MY_RECENTLY_REPORTED_ID = 'myRecentlyReported';
+
+const toggleButtonIcons: EuiButtonGroupOption[] = [
+  {
+    id: 'recentlyCreated',
+    label: i18n.RECENTLY_CREATED_CASES,
+    iconType: 'folderExclamation',
+  },
+  {
+    id: MY_RECENTLY_REPORTED_ID,
+    label: i18n.MY_RECENTLY_REPORTED_CASES,
+    iconType: 'reporter',
+  },
+];
+
+export const Filters = React.memo<{
+  filterBy: FilterMode;
+  setFilterBy: (filterBy: FilterMode) => void;
+  showMyRecentlyReported: boolean;
+}>(({ filterBy, setFilterBy, showMyRecentlyReported }) => {
+  const options = useMemo(
+    () =>
+      showMyRecentlyReported
+        ? toggleButtonIcons
+        : toggleButtonIcons.filter(x => x.id !== MY_RECENTLY_REPORTED_ID),
+    [showMyRecentlyReported]
+  );
+  const onChange = useCallback(
+    (filterMode: string) => {
+      setFilterBy(filterMode as FilterMode);
+    },
+    [setFilterBy]
+  );
+
+  return <EuiButtonGroup options={options} idSelected={filterBy} onChange={onChange} isIconOnly />;
+});
+
+Filters.displayName = 'Filters';
diff --git a/x-pack/legacy/plugins/siem/public/components/recent_cases/index.tsx b/x-pack/legacy/plugins/siem/public/components/recent_cases/index.tsx
new file mode 100644
index 0000000000000..07246c6c6ec88
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/public/components/recent_cases/index.tsx
@@ -0,0 +1,80 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { EuiHorizontalRule, EuiLink, EuiText } from '@elastic/eui';
+import React, { useEffect, useMemo, useRef } from 'react';
+
+import { FilterOptions, QueryParams } from '../../containers/case/types';
+import { DEFAULT_QUERY_PARAMS, useGetCases } from '../../containers/case/use_get_cases';
+import { getCaseUrl } from '../link_to/redirect_to_case';
+import { useGetUrlSearch } from '../navigation/use_get_url_search';
+import { LoadingPlaceholders } from '../page/overview/loading_placeholders';
+import { navTabs } from '../../pages/home/home_navigations';
+
+import { NoCases } from './no_cases';
+import { RecentCases } from './recent_cases';
+import * as i18n from './translations';
+
+const usePrevious = (value: FilterOptions) => {
+  const ref = useRef();
+  useEffect(() => {
+    (ref.current as unknown) = value;
+  });
+  return ref.current;
+};
+
+const MAX_CASES_TO_SHOW = 3;
+
+const queryParams: QueryParams = {
+  ...DEFAULT_QUERY_PARAMS,
+  perPage: MAX_CASES_TO_SHOW,
+};
+
+const StatefulRecentCasesComponent = React.memo(
+  ({ filterOptions }: { filterOptions: FilterOptions }) => {
+    const previousFilterOptions = usePrevious(filterOptions);
+    const { data, loading, setFilters } = useGetCases(queryParams);
+    const isLoadingCases = useMemo(
+      () => loading.indexOf('cases') > -1 || loading.indexOf('caseUpdate') > -1,
+      [loading]
+    );
+    const search = useGetUrlSearch(navTabs.case);
+    const allCasesLink = useMemo(
+      () => <EuiLink href={getCaseUrl(search)}>{i18n.VIEW_ALL_CASES}</EuiLink>,
+      [search]
+    );
+
+    useEffect(() => {
+      if (previousFilterOptions !== undefined && previousFilterOptions !== filterOptions) {
+        setFilters(filterOptions);
+      }
+    }, [previousFilterOptions, filterOptions, setFilters]);
+
+    const content = useMemo(
+      () =>
+        isLoadingCases ? (
+          <LoadingPlaceholders lines={2} placeholders={3} />
+        ) : !isLoadingCases && data.cases.length === 0 ? (
+          <NoCases />
+        ) : (
+          <RecentCases cases={data.cases} />
+        ),
+      [isLoadingCases, data]
+    );
+
+    return (
+      <EuiText color="subdued" size="s">
+        {content}
+        <EuiHorizontalRule margin="s" />
+        <EuiText size="xs">{allCasesLink}</EuiText>
+      </EuiText>
+    );
+  }
+);
+
+StatefulRecentCasesComponent.displayName = 'StatefulRecentCasesComponent';
+
+export const StatefulRecentCases = React.memo(StatefulRecentCasesComponent);
diff --git a/x-pack/legacy/plugins/siem/public/components/recent_cases/no_cases/index.tsx b/x-pack/legacy/plugins/siem/public/components/recent_cases/no_cases/index.tsx
new file mode 100644
index 0000000000000..9f0361311b7b6
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/public/components/recent_cases/no_cases/index.tsx
@@ -0,0 +1,34 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { EuiLink } from '@elastic/eui';
+import React, { useMemo } from 'react';
+
+import { getCreateCaseUrl } from '../../link_to/redirect_to_case';
+import { useGetUrlSearch } from '../../navigation/use_get_url_search';
+import { navTabs } from '../../../pages/home/home_navigations';
+
+import * as i18n from '../translations';
+
+const NoCasesComponent = () => {
+  const urlSearch = useGetUrlSearch(navTabs.case);
+  const newCaseLink = useMemo(
+    () => <EuiLink href={getCreateCaseUrl(urlSearch)}>{` ${i18n.START_A_NEW_CASE}`}</EuiLink>,
+    [urlSearch]
+  );
+
+  return (
+    <>
+      <span>{i18n.NO_CASES}</span>
+      {newCaseLink}
+      {'!'}
+    </>
+  );
+};
+
+NoCasesComponent.displayName = 'NoCasesComponent';
+
+export const NoCases = React.memo(NoCasesComponent);
diff --git a/x-pack/legacy/plugins/siem/public/components/recent_cases/recent_cases.tsx b/x-pack/legacy/plugins/siem/public/components/recent_cases/recent_cases.tsx
new file mode 100644
index 0000000000000..eb17c75f4111b
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/public/components/recent_cases/recent_cases.tsx
@@ -0,0 +1,56 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { EuiFlexGroup, EuiFlexItem, EuiLink, EuiSpacer, EuiText } from '@elastic/eui';
+import React from 'react';
+import styled from 'styled-components';
+
+import { Case } from '../../containers/case/types';
+import { getCaseDetailsUrl } from '../link_to/redirect_to_case';
+import { Markdown } from '../markdown';
+import { useGetUrlSearch } from '../navigation/use_get_url_search';
+import { navTabs } from '../../pages/home/home_navigations';
+import { IconWithCount } from '../recent_timelines/counts';
+
+import * as i18n from './translations';
+
+const MarkdownContainer = styled.div`
+  max-height: 150px;
+  overflow-y: auto;
+  width: 300px;
+`;
+
+const RecentCasesComponent = ({ cases }: { cases: Case[] }) => {
+  const search = useGetUrlSearch(navTabs.case);
+
+  return (
+    <>
+      {cases.map((c, i) => (
+        <EuiFlexGroup key={c.id} gutterSize="none" justifyContent="spaceBetween">
+          <EuiFlexItem grow={false}>
+            <EuiText size="s">
+              <EuiLink href={getCaseDetailsUrl({ id: c.id, search })}>{c.title}</EuiLink>
+            </EuiText>
+
+            <IconWithCount count={c.totalComment} icon={'editorComment'} tooltip={i18n.COMMENTS} />
+            {c.description && c.description.length && (
+              <MarkdownContainer>
+                <EuiText color="subdued" size="xs">
+                  <Markdown disableLinks={true} raw={c.description} />
+                </EuiText>
+              </MarkdownContainer>
+            )}
+            {i !== cases.length - 1 && <EuiSpacer size="l" />}
+          </EuiFlexItem>
+        </EuiFlexGroup>
+      ))}
+    </>
+  );
+};
+
+RecentCasesComponent.displayName = 'RecentCasesComponent';
+
+export const RecentCases = React.memo(RecentCasesComponent);
diff --git a/x-pack/legacy/plugins/siem/public/components/recent_cases/translations.ts b/x-pack/legacy/plugins/siem/public/components/recent_cases/translations.ts
new file mode 100644
index 0000000000000..d2318e5db88c3
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/public/components/recent_cases/translations.ts
@@ -0,0 +1,37 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { i18n } from '@kbn/i18n';
+
+export const COMMENTS = i18n.translate('xpack.siem.recentCases.commentsTooltip', {
+  defaultMessage: 'Comments',
+});
+
+export const MY_RECENTLY_REPORTED_CASES = i18n.translate(
+  'xpack.siem.overview.myRecentlyReportedCasesButtonLabel',
+  {
+    defaultMessage: 'My recently reported cases',
+  }
+);
+
+export const NO_CASES = i18n.translate('xpack.siem.recentCases.noCasesMessage', {
+  defaultMessage: 'No cases have been created yet. Put your detective hat on and',
+});
+
+export const RECENTLY_CREATED_CASES = i18n.translate(
+  'xpack.siem.overview.recentlyCreatedCasesButtonLabel',
+  {
+    defaultMessage: 'Recently created cases',
+  }
+);
+
+export const START_A_NEW_CASE = i18n.translate('xpack.siem.recentCases.startNewCaseLink', {
+  defaultMessage: 'start a new case',
+});
+
+export const VIEW_ALL_CASES = i18n.translate('xpack.siem.recentCases.viewAllCasesLink', {
+  defaultMessage: 'View all cases',
+});
diff --git a/x-pack/legacy/plugins/siem/public/components/recent_cases/types.ts b/x-pack/legacy/plugins/siem/public/components/recent_cases/types.ts
new file mode 100644
index 0000000000000..29c7072ce0be6
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/public/components/recent_cases/types.ts
@@ -0,0 +1,7 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+export type FilterMode = 'recentlyCreated' | 'myRecentlyReported';
diff --git a/x-pack/legacy/plugins/siem/public/components/recent_timelines/counts/index.tsx b/x-pack/legacy/plugins/siem/public/components/recent_timelines/counts/index.tsx
index e04b6319cfb24..c80530b245cf3 100644
--- a/x-pack/legacy/plugins/siem/public/components/recent_timelines/counts/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/recent_timelines/counts/index.tsx
@@ -21,7 +21,7 @@ const FlexGroup = styled(EuiFlexGroup)`
   margin-right: 16px;
 `;
 
-const IconWithCount = React.memo<{ count: number; icon: string; tooltip: string }>(
+export const IconWithCount = React.memo<{ count: number; icon: string; tooltip: string }>(
   ({ count, icon, tooltip }) => (
     <EuiToolTip content={tooltip}>
       <FlexGroup alignItems="center" gutterSize="none">
diff --git a/x-pack/legacy/plugins/siem/public/components/recent_timelines/filters/index.tsx b/x-pack/legacy/plugins/siem/public/components/recent_timelines/filters/index.tsx
index de8a3de8094d0..d7271197b9cea 100644
--- a/x-pack/legacy/plugins/siem/public/components/recent_timelines/filters/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/recent_timelines/filters/index.tsx
@@ -9,15 +9,17 @@ import React from 'react';
 
 import { FilterMode } from '../types';
 
+import * as i18n from '../translations';
+
 const toggleButtonIcons: EuiButtonGroupOption[] = [
   {
     id: 'favorites',
-    label: 'Favorites',
+    label: i18n.FAVORITES,
     iconType: 'starFilled',
   },
   {
     id: `recently-updated`,
-    label: 'Last updated',
+    label: i18n.LAST_UPDATED,
     iconType: 'documentEdit',
   },
 ];
diff --git a/x-pack/legacy/plugins/siem/public/components/recent_timelines/index.tsx b/x-pack/legacy/plugins/siem/public/components/recent_timelines/index.tsx
index 007665b47dedb..5b851701b973c 100644
--- a/x-pack/legacy/plugins/siem/public/components/recent_timelines/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/recent_timelines/index.tsx
@@ -31,6 +31,8 @@ interface OwnProps {
 
 export type Props = OwnProps & PropsFromRedux;
 
+const PAGE_SIZE = 3;
+
 const StatefulRecentTimelinesComponent = React.memo<Props>(
   ({ apolloClient, filterBy, updateIsLoading, updateTimeline }) => {
     const onOpenTimeline: OnOpenTimeline = useCallback(
@@ -53,12 +55,18 @@ const StatefulRecentTimelinesComponent = React.memo<Props>(
       () => <EuiLink href={getTimelinesUrl(urlSearch)}>{i18n.VIEW_ALL_TIMELINES}</EuiLink>,
       [urlSearch]
     );
+    const loadingPlaceholders = useMemo(
+      () => (
+        <LoadingPlaceholders lines={2} placeholders={filterBy === 'favorites' ? 1 : PAGE_SIZE} />
+      ),
+      [filterBy]
+    );
 
     return (
       <AllTimelinesQuery
         pageInfo={{
           pageIndex: 1,
-          pageSize: 5,
+          pageSize: PAGE_SIZE,
         }}
         search={''}
         sort={{
@@ -70,7 +78,7 @@ const StatefulRecentTimelinesComponent = React.memo<Props>(
         {({ timelines, loading }) => (
           <>
             {loading ? (
-              <LoadingPlaceholders lines={2} placeholders={filterBy === 'favorites' ? 1 : 5} />
+              loadingPlaceholders
             ) : (
               <RecentTimelines
                 noTimelinesMessage={noTimelinesMessage}
diff --git a/x-pack/legacy/plugins/siem/public/components/recent_timelines/recent_timelines.tsx b/x-pack/legacy/plugins/siem/public/components/recent_timelines/recent_timelines.tsx
index fdd206a33ff7e..dbcd3fe721ea3 100644
--- a/x-pack/legacy/plugins/siem/public/components/recent_timelines/recent_timelines.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/recent_timelines/recent_timelines.tsx
@@ -47,12 +47,9 @@ export const RecentTimelines = React.memo<{
                   <RecentTimelineHeader onOpenTimeline={onOpenTimeline} timeline={t} />
                   <RecentTimelineCounts timeline={t} />
                   {t.description && t.description.length && (
-                    <>
-                      <EuiSpacer size="s" />
-                      <EuiText color="subdued" size="xs">
-                        {t.description}
-                      </EuiText>
-                    </>
+                    <EuiText color="subdued" size="xs">
+                      {t.description}
+                    </EuiText>
                   )}
                 </EuiFlexItem>
 
diff --git a/x-pack/legacy/plugins/siem/public/components/recent_timelines/translations.ts b/x-pack/legacy/plugins/siem/public/components/recent_timelines/translations.ts
index e547272fde6e1..f5934aa317242 100644
--- a/x-pack/legacy/plugins/siem/public/components/recent_timelines/translations.ts
+++ b/x-pack/legacy/plugins/siem/public/components/recent_timelines/translations.ts
@@ -13,6 +13,10 @@ export const ERROR_RETRIEVING_USER_DETAILS = i18n.translate(
   }
 );
 
+export const FAVORITES = i18n.translate('xpack.siem.recentTimelines.favoritesButtonLabel', {
+  defaultMessage: 'Favorites',
+});
+
 export const NO_FAVORITE_TIMELINES = i18n.translate(
   'xpack.siem.recentTimelines.noFavoriteTimelinesMessage',
   {
@@ -21,6 +25,10 @@ export const NO_FAVORITE_TIMELINES = i18n.translate(
   }
 );
 
+export const LAST_UPDATED = i18n.translate('xpack.siem.recentTimelines.lastUpdatedButtonLabel', {
+  defaultMessage: 'Last updated',
+});
+
 export const NO_TIMELINES = i18n.translate('xpack.siem.recentTimelines.noTimelinesMessage', {
   defaultMessage: "You haven't created any timelines yet. Get out there and start threat hunting!",
 });
diff --git a/x-pack/legacy/plugins/siem/public/components/url_state/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/url_state/index.test.tsx
index 6e957313d9b04..4d2a717153894 100644
--- a/x-pack/legacy/plugins/siem/public/components/url_state/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/url_state/index.test.tsx
@@ -157,9 +157,7 @@ describe('UrlStateContainer', () => {
             ).toEqual({
               hash: '',
               pathname: examplePath,
-              search: [CONSTANTS.timelinePage].includes(page)
-                ? `?query=(language:kuery,query:'host.name:%22siem-es%22')&timerange=(global:(linkTo:!(timeline),timerange:(from:1558048243696,fromStr:now-24h,kind:relative,to:1558134643697,toStr:now)),timeline:(linkTo:!(global),timerange:(from:1558048243696,fromStr:now-24h,kind:relative,to:1558134643697,toStr:now)))`
-                : `?query=(language:kuery,query:'host.name:%22siem-es%22')&timerange=(global:(linkTo:!(timeline),timerange:(from:1558048243696,fromStr:now-24h,kind:relative,to:1558134643697,toStr:now)),timeline:(linkTo:!(global),timerange:(from:1558048243696,fromStr:now-24h,kind:relative,to:1558134643697,toStr:now)))`,
+              search: `?query=(language:kuery,query:'host.name:%22siem-es%22')&timerange=(global:(linkTo:!(timeline),timerange:(from:1558048243696,fromStr:now-24h,kind:relative,to:1558134643697,toStr:now)),timeline:(linkTo:!(global),timerange:(from:1558048243696,fromStr:now-24h,kind:relative,to:1558134643697,toStr:now)))`,
               state: '',
             });
           }
diff --git a/x-pack/legacy/plugins/siem/public/components/url_state/types.ts b/x-pack/legacy/plugins/siem/public/components/url_state/types.ts
index c6f49d8a0e49b..9d8a4a8e6a908 100644
--- a/x-pack/legacy/plugins/siem/public/components/url_state/types.ts
+++ b/x-pack/legacy/plugins/siem/public/components/url_state/types.ts
@@ -64,15 +64,15 @@ export const URL_STATE_KEYS: Record<UrlStateType, KeyUrlState[]> = {
     CONSTANTS.appQuery,
     CONSTANTS.filters,
     CONSTANTS.savedQuery,
-    CONSTANTS.timeline,
     CONSTANTS.timerange,
+    CONSTANTS.timeline,
   ],
   case: [
     CONSTANTS.appQuery,
     CONSTANTS.filters,
     CONSTANTS.savedQuery,
-    CONSTANTS.timeline,
     CONSTANTS.timerange,
+    CONSTANTS.timeline,
   ],
 };
 
diff --git a/x-pack/legacy/plugins/siem/public/containers/case/use_get_cases.tsx b/x-pack/legacy/plugins/siem/public/containers/case/use_get_cases.tsx
index 6c4a6ac4fe58a..ae7b8f3c043fa 100644
--- a/x-pack/legacy/plugins/siem/public/containers/case/use_get_cases.tsx
+++ b/x-pack/legacy/plugins/siem/public/containers/case/use_get_cases.tsx
@@ -88,6 +88,20 @@ const dataFetchReducer = (state: UseGetCasesState, action: Action): UseGetCasesS
   }
 };
 
+export const DEFAULT_FILTER_OPTIONS: FilterOptions = {
+  search: '',
+  reporters: [],
+  status: 'open',
+  tags: [],
+};
+
+export const DEFAULT_QUERY_PARAMS: QueryParams = {
+  page: DEFAULT_TABLE_ACTIVE_PAGE,
+  perPage: DEFAULT_TABLE_LIMIT,
+  sortField: SortFieldCase.createdAt,
+  sortOrder: 'desc',
+};
+
 const initialData: AllCases = {
   cases: [],
   countClosedCases: null,
@@ -109,23 +123,14 @@ interface UseGetCases extends UseGetCasesState {
   setQueryParams: (queryParams: QueryParams) => void;
   setSelectedCases: (mySelectedCases: Case[]) => void;
 }
-export const useGetCases = (): UseGetCases => {
+
+export const useGetCases = (initialQueryParams?: QueryParams): UseGetCases => {
   const [state, dispatch] = useReducer(dataFetchReducer, {
     data: initialData,
-    filterOptions: {
-      search: '',
-      reporters: [],
-      status: 'open',
-      tags: [],
-    },
+    filterOptions: DEFAULT_FILTER_OPTIONS,
     isError: false,
     loading: [],
-    queryParams: {
-      page: DEFAULT_TABLE_ACTIVE_PAGE,
-      perPage: DEFAULT_TABLE_LIMIT,
-      sortField: SortFieldCase.createdAt,
-      sortOrder: 'desc',
-    },
+    queryParams: initialQueryParams ?? DEFAULT_QUERY_PARAMS,
     selectedCases: [],
   });
   const [, dispatchToaster] = useStateToaster();
diff --git a/x-pack/legacy/plugins/siem/public/pages/case/components/all_cases/index.tsx b/x-pack/legacy/plugins/siem/public/pages/case/components/all_cases/index.tsx
index 87a2ea888831a..cbb9ddae22d04 100644
--- a/x-pack/legacy/plugins/siem/public/pages/case/components/all_cases/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/case/components/all_cases/index.tsx
@@ -26,6 +26,7 @@ import { useGetCases, UpdateCase } from '../../../../containers/case/use_get_cas
 import { useGetCasesStatus } from '../../../../containers/case/use_get_cases_status';
 import { useDeleteCases } from '../../../../containers/case/use_delete_cases';
 import { EuiBasicTableOnChange } from '../../../detection_engine/rules/types';
+import { useGetUrlSearch } from '../../../../components/navigation/use_get_url_search';
 import { Panel } from '../../../../components/panel';
 import {
   UtilityBar,
@@ -35,16 +36,15 @@ import {
   UtilityBarText,
 } from '../../../../components/utility_bar';
 import { getConfigureCasesUrl, getCreateCaseUrl } from '../../../../components/link_to';
-import { useUpdateCases } from '../../../../containers/case/use_bulk_update_case';
-import { useGetUrlSearch } from '../../../../components/navigation/use_get_url_search';
-import { navTabs } from '../../../home/home_navigations';
 import { getBulkItems } from '../bulk_actions';
 import { CaseHeaderPage } from '../case_header_page';
 import { ConfirmDeleteCaseModal } from '../confirm_delete_case';
 import { OpenClosedStats } from '../open_closed_stats';
+import { navTabs } from '../../../home/home_navigations';
 
 import { getActions } from './actions';
 import { CasesTableFilters } from './table_filters';
+import { useUpdateCases } from '../../../../containers/case/use_bulk_update_case';
 
 const Div = styled.div`
   margin-top: ${({ theme }) => theme.eui.paddingSizes.m};
@@ -77,6 +77,7 @@ const getSortField = (field: string): SortFieldCase => {
 };
 export const AllCases = React.memo(() => {
   const urlSearch = useGetUrlSearch(navTabs.case);
+
   const {
     countClosedCases,
     countOpenCases,
diff --git a/x-pack/legacy/plugins/siem/public/pages/case/components/case_view/index.tsx b/x-pack/legacy/plugins/siem/public/pages/case/components/case_view/index.tsx
index 742921cb9f69e..5c20b53f5fcb9 100644
--- a/x-pack/legacy/plugins/siem/public/pages/case/components/case_view/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/case/components/case_view/index.tsx
@@ -25,11 +25,13 @@ import { useGetCase } from '../../../../containers/case/use_get_case';
 import { UserActionTree } from '../user_action_tree';
 import { UserList } from '../user_list';
 import { useUpdateCase } from '../../../../containers/case/use_update_case';
+import { useGetUrlSearch } from '../../../../components/navigation/use_get_url_search';
 import { WrapperPage } from '../../../../components/wrapper_page';
 import { getTypedPayload } from '../../../../containers/case/utils';
 import { WhitePageWrapper } from '../wrappers';
 import { useBasePath } from '../../../../lib/kibana';
 import { CaseStatus } from '../case_status';
+import { navTabs } from '../../../home/home_navigations';
 import { SpyRoute } from '../../../../utils/route/spy_routes';
 import { useGetCaseUserActions } from '../../../../containers/case/use_get_case_user_actions';
 import { usePushToService } from './push_to_service';
@@ -61,6 +63,8 @@ export interface CaseProps {
 export const CaseComponent = React.memo<CaseProps>(({ caseId, initialData }) => {
   const basePath = window.location.origin + useBasePath();
   const caseLink = `${basePath}/app/siem#/case/${caseId}`;
+  const search = useGetUrlSearch(navTabs.case);
+
   const [initLoadingData, setInitLoadingData] = useState(true);
   const {
     caseUserActions,
@@ -190,7 +194,7 @@ export const CaseComponent = React.memo<CaseProps>(({ caseId, initialData }) =>
       <MyWrapper>
         <HeaderPage
           backOptions={{
-            href: getCaseUrl(),
+            href: getCaseUrl(search),
             text: i18n.BACK_TO_ALL,
           }}
           data-test-subj="case-view-title"
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 fb4d91492c1d4..5f99ec362cd5e 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
@@ -28,7 +28,8 @@ import {
 
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
 import { ActionConnectorTableItem } from '../../../../../../../../plugins/triggers_actions_ui/public/types';
-
+import { getCaseUrl } from '../../../../components/link_to';
+import { useGetUrlSearch } from '../../../../components/navigation/use_get_url_search';
 import {
   ClosureType,
   CasesConfigurationMapping,
@@ -38,11 +39,9 @@ import { Connectors } from '../configure_cases/connectors';
 import { ClosureOptions } from '../configure_cases/closure_options';
 import { Mapping } from '../configure_cases/mapping';
 import { SectionWrapper } from '../wrappers';
+import { navTabs } from '../../../../pages/home/home_navigations';
 import { configureCasesReducer, State } from './reducer';
 import * as i18n from './translations';
-import { getCaseUrl } from '../../../../components/link_to';
-
-const CASE_URL = getCaseUrl();
 
 const FormWrapper = styled.div`
   ${({ theme }) => css`
@@ -73,6 +72,7 @@ const actionTypes: ActionType[] = [
 ];
 
 const ConfigureCasesComponent: React.FC = () => {
+  const search = useGetUrlSearch(navTabs.case);
   const { http, triggers_actions_ui, notifications, application } = useKibana().services;
 
   const [connectorIsValid, setConnectorIsValid] = useState(true);
@@ -235,7 +235,7 @@ const ConfigureCasesComponent: React.FC = () => {
                     isDisabled={isLoadingAny}
                     isLoading={persistLoading}
                     aria-label="Cancel"
-                    href={CASE_URL}
+                    href={getCaseUrl(search)}
                   >
                     {i18n.CANCEL}
                   </EuiButtonEmpty>
diff --git a/x-pack/legacy/plugins/siem/public/pages/case/configure_cases.tsx b/x-pack/legacy/plugins/siem/public/pages/case/configure_cases.tsx
index b546a88744439..b7e7ced308331 100644
--- a/x-pack/legacy/plugins/siem/public/pages/case/configure_cases.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/case/configure_cases.tsx
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import React from 'react';
+import React, { useMemo } from 'react';
 
 import { WrapperPage } from '../../components/wrapper_page';
 import { CaseHeaderPage } from './components/case_header_page';
@@ -13,11 +13,8 @@ import { getCaseUrl } from '../../components/link_to';
 import { WhitePageWrapper, SectionWrapper } from './components/wrappers';
 import * as i18n from './translations';
 import { ConfigureCases } from './components/configure_cases';
-
-const backOptions = {
-  href: getCaseUrl(),
-  text: i18n.BACK_TO_ALL,
-};
+import { useGetUrlSearch } from '../../components/navigation/use_get_url_search';
+import { navTabs } from '../home/home_navigations';
 
 const wrapperPageStyle: Record<string, string> = {
   paddingLeft: '0',
@@ -25,18 +22,30 @@ const wrapperPageStyle: Record<string, string> = {
   paddingBottom: '0',
 };
 
-const ConfigureCasesPageComponent: React.FC = () => (
-  <>
-    <WrapperPage style={wrapperPageStyle}>
-      <SectionWrapper>
-        <CaseHeaderPage title={i18n.CONFIGURE_CASES_PAGE_TITLE} backOptions={backOptions} />
-      </SectionWrapper>
-      <WhitePageWrapper>
-        <ConfigureCases />
-      </WhitePageWrapper>
-    </WrapperPage>
-    <SpyRoute />
-  </>
-);
+const ConfigureCasesPageComponent: React.FC = () => {
+  const search = useGetUrlSearch(navTabs.case);
+
+  const backOptions = useMemo(
+    () => ({
+      href: getCaseUrl(search),
+      text: i18n.BACK_TO_ALL,
+    }),
+    [search]
+  );
+
+  return (
+    <>
+      <WrapperPage style={wrapperPageStyle}>
+        <SectionWrapper>
+          <CaseHeaderPage title={i18n.CONFIGURE_CASES_PAGE_TITLE} backOptions={backOptions} />
+        </SectionWrapper>
+        <WhitePageWrapper>
+          <ConfigureCases />
+        </WhitePageWrapper>
+      </WrapperPage>
+      <SpyRoute />
+    </>
+  );
+};
 
 export const ConfigureCasesPage = React.memo(ConfigureCasesPageComponent);
diff --git a/x-pack/legacy/plugins/siem/public/pages/case/create_case.tsx b/x-pack/legacy/plugins/siem/public/pages/case/create_case.tsx
index 2c7525264f71b..bd1f6da0ca28b 100644
--- a/x-pack/legacy/plugins/siem/public/pages/case/create_case.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/case/create_case.tsx
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import React from 'react';
+import React, { useMemo } from 'react';
 
 import { WrapperPage } from '../../components/wrapper_page';
 import { Create } from './components/create';
@@ -12,20 +12,29 @@ import { SpyRoute } from '../../utils/route/spy_routes';
 import { CaseHeaderPage } from './components/case_header_page';
 import * as i18n from './translations';
 import { getCaseUrl } from '../../components/link_to';
+import { useGetUrlSearch } from '../../components/navigation/use_get_url_search';
+import { navTabs } from '../home/home_navigations';
 
-const backOptions = {
-  href: getCaseUrl(),
-  text: i18n.BACK_TO_ALL,
-};
+export const CreateCasePage = React.memo(() => {
+  const search = useGetUrlSearch(navTabs.case);
 
-export const CreateCasePage = React.memo(() => (
-  <>
-    <WrapperPage>
-      <CaseHeaderPage backOptions={backOptions} title={i18n.CREATE_TITLE} />
-      <Create />
-    </WrapperPage>
-    <SpyRoute />
-  </>
-));
+  const backOptions = useMemo(
+    () => ({
+      href: getCaseUrl(search),
+      text: i18n.BACK_TO_ALL,
+    }),
+    [search]
+  );
+
+  return (
+    <>
+      <WrapperPage>
+        <CaseHeaderPage backOptions={backOptions} title={i18n.CREATE_TITLE} />
+        <Create />
+      </WrapperPage>
+      <SpyRoute />
+    </>
+  );
+});
 
 CreateCasePage.displayName = 'CreateCasePage';
diff --git a/x-pack/legacy/plugins/siem/public/pages/case/utils.ts b/x-pack/legacy/plugins/siem/public/pages/case/utils.ts
index 3f2964b8cdd6d..df9f0d08e728c 100644
--- a/x-pack/legacy/plugins/siem/public/pages/case/utils.ts
+++ b/x-pack/legacy/plugins/siem/public/pages/case/utils.ts
@@ -4,16 +4,20 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+import { isEmpty } from 'lodash/fp';
 import { Breadcrumb } from 'ui/chrome';
+
 import { getCaseDetailsUrl, getCaseUrl, getCreateCaseUrl } from '../../components/link_to';
 import { RouteSpyState } from '../../utils/route/types';
 import * as i18n from './translations';
 
-export const getBreadcrumbs = (params: RouteSpyState): Breadcrumb[] => {
+export const getBreadcrumbs = (params: RouteSpyState, search: string[]): Breadcrumb[] => {
+  const queryParameters = !isEmpty(search[0]) ? search[0] : null;
+
   let breadcrumb = [
     {
       text: i18n.PAGE_TITLE,
-      href: getCaseUrl(),
+      href: getCaseUrl(queryParameters),
     },
   ];
   if (params.detailName === 'create') {
@@ -21,7 +25,7 @@ export const getBreadcrumbs = (params: RouteSpyState): Breadcrumb[] => {
       ...breadcrumb,
       {
         text: i18n.CREATE_BC_TITLE,
-        href: getCreateCaseUrl(''),
+        href: getCreateCaseUrl(queryParameters),
       },
     ];
   } else if (params.detailName != null) {
@@ -29,7 +33,7 @@ export const getBreadcrumbs = (params: RouteSpyState): Breadcrumb[] => {
       ...breadcrumb,
       {
         text: params.state?.caseTitle ?? '',
-        href: getCaseDetailsUrl(params.detailName, ''),
+        href: getCaseDetailsUrl({ id: params.detailName, search: queryParameters }),
       },
     ];
   }
diff --git a/x-pack/legacy/plugins/siem/public/pages/home/home_navigations.tsx b/x-pack/legacy/plugins/siem/public/pages/home/home_navigations.tsx
index a087dca38de00..543469e2fddb7 100644
--- a/x-pack/legacy/plugins/siem/public/pages/home/home_navigations.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/home/home_navigations.tsx
@@ -54,7 +54,7 @@ export const navTabs: SiemNavTab = {
   [SiemPageName.case]: {
     id: SiemPageName.case,
     name: i18n.CASE,
-    href: getCaseUrl(),
+    href: getCaseUrl(null),
     disabled: false,
     urlKey: 'case',
   },
diff --git a/x-pack/legacy/plugins/siem/public/pages/overview/sidebar/index.tsx b/x-pack/legacy/plugins/siem/public/pages/overview/sidebar/index.tsx
index ad2821edde411..3797eae2bb853 100644
--- a/x-pack/legacy/plugins/siem/public/pages/overview/sidebar/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/overview/sidebar/index.tsx
@@ -6,13 +6,27 @@
 
 import React, { useState } from 'react';
 
-import { FilterMode } from '../../../components/recent_timelines/types';
+import { FilterMode as RecentTimelinesFilterMode } from '../../../components/recent_timelines/types';
+import { FilterMode as RecentCasesFilterMode } from '../../../components/recent_cases/types';
+
 import { Sidebar } from './sidebar';
 
 export const StatefulSidebar = React.memo(() => {
-  const [filterBy, setFilterBy] = useState<FilterMode>('favorites');
+  const [recentTimelinesFilterBy, setRecentTimelinesFilterBy] = useState<RecentTimelinesFilterMode>(
+    'favorites'
+  );
+  const [recentCasesFilterBy, setRecentCasesFilterBy] = useState<RecentCasesFilterMode>(
+    'recentlyCreated'
+  );
 
-  return <Sidebar filterBy={filterBy} setFilterBy={setFilterBy} />;
+  return (
+    <Sidebar
+      recentCasesFilterBy={recentCasesFilterBy}
+      setRecentCasesFilterBy={setRecentCasesFilterBy}
+      recentTimelinesFilterBy={recentTimelinesFilterBy}
+      setRecentTimelinesFilterBy={setRecentTimelinesFilterBy}
+    />
+  );
 });
 
 StatefulSidebar.displayName = 'StatefulSidebar';
diff --git a/x-pack/legacy/plugins/siem/public/pages/overview/sidebar/sidebar.tsx b/x-pack/legacy/plugins/siem/public/pages/overview/sidebar/sidebar.tsx
index d3b85afe62a2a..52e36b472a0ec 100644
--- a/x-pack/legacy/plugins/siem/public/pages/overview/sidebar/sidebar.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/overview/sidebar/sidebar.tsx
@@ -8,12 +8,17 @@ import { EuiFlexGroup, EuiFlexItem, EuiSpacer } from '@elastic/eui';
 import React, { useMemo } from 'react';
 import styled from 'styled-components';
 
-import { Filters } from '../../../components/recent_timelines/filters';
+import { Filters as RecentCasesFilters } from '../../../components/recent_cases/filters';
+import { Filters as RecentTimelinesFilters } from '../../../components/recent_timelines/filters';
 import { ENABLE_NEWS_FEED_SETTING, NEWS_FEED_URL_SETTING } from '../../../../common/constants';
+import { StatefulRecentCases } from '../../../components/recent_cases';
 import { StatefulRecentTimelines } from '../../../components/recent_timelines';
 import { StatefulNewsFeed } from '../../../components/news_feed';
-import { FilterMode } from '../../../components/recent_timelines/types';
+import { FilterMode as RecentTimelinesFilterMode } from '../../../components/recent_timelines/types';
+import { FilterMode as RecentCasesFilterMode } from '../../../components/recent_cases/types';
+import { DEFAULT_FILTER_OPTIONS } from '../../../containers/case/use_get_cases';
 import { SidebarHeader } from '../../../components/sidebar_header';
+import { useCurrentUser } from '../../../lib/kibana';
 import { useApolloClient } from '../../../utils/apollo_context';
 
 import * as i18n from '../translations';
@@ -22,35 +27,93 @@ const SidebarFlexGroup = styled(EuiFlexGroup)`
   width: 305px;
 `;
 
+const SidebarSpacerComponent = () => (
+  <EuiFlexItem grow={false}>
+    <EuiSpacer size="xxl" />
+  </EuiFlexItem>
+);
+
+SidebarSpacerComponent.displayName = 'SidebarSpacerComponent';
+const Spacer = React.memo(SidebarSpacerComponent);
+
 export const Sidebar = React.memo<{
-  filterBy: FilterMode;
-  setFilterBy: (filterBy: FilterMode) => void;
-}>(({ filterBy, setFilterBy }) => {
-  const apolloClient = useApolloClient();
-  const RecentTimelinesFilters = useMemo(
-    () => <Filters filterBy={filterBy} setFilterBy={setFilterBy} />,
-    [filterBy, setFilterBy]
-  );
-
-  return (
-    <SidebarFlexGroup direction="column" gutterSize="none">
-      <EuiFlexItem grow={false}>
-        <SidebarHeader title={i18n.RECENT_TIMELINES}>{RecentTimelinesFilters}</SidebarHeader>
-        <StatefulRecentTimelines apolloClient={apolloClient!} filterBy={filterBy} />
-      </EuiFlexItem>
-
-      <EuiFlexItem grow={false}>
-        <EuiSpacer size="xxl" />
-      </EuiFlexItem>
-
-      <EuiFlexItem grow={false}>
-        <StatefulNewsFeed
-          enableNewsFeedSetting={ENABLE_NEWS_FEED_SETTING}
-          newsFeedSetting={NEWS_FEED_URL_SETTING}
+  recentCasesFilterBy: RecentCasesFilterMode;
+  recentTimelinesFilterBy: RecentTimelinesFilterMode;
+  setRecentCasesFilterBy: (filterBy: RecentCasesFilterMode) => void;
+  setRecentTimelinesFilterBy: (filterBy: RecentTimelinesFilterMode) => void;
+}>(
+  ({
+    recentCasesFilterBy,
+    recentTimelinesFilterBy,
+    setRecentCasesFilterBy,
+    setRecentTimelinesFilterBy,
+  }) => {
+    const currentUser = useCurrentUser();
+    const apolloClient = useApolloClient();
+    const recentCasesFilters = useMemo(
+      () => (
+        <RecentCasesFilters
+          filterBy={recentCasesFilterBy}
+          setFilterBy={setRecentCasesFilterBy}
+          showMyRecentlyReported={currentUser != null}
         />
-      </EuiFlexItem>
-    </SidebarFlexGroup>
-  );
-});
+      ),
+      [currentUser, recentCasesFilterBy, setRecentCasesFilterBy]
+    );
+    const recentCasesFilterOptions = useMemo(
+      () =>
+        recentCasesFilterBy === 'myRecentlyReported' && currentUser != null
+          ? {
+              ...DEFAULT_FILTER_OPTIONS,
+              reporters: [
+                {
+                  email: currentUser.email,
+                  full_name: currentUser.fullName,
+                  username: currentUser.username,
+                },
+              ],
+            }
+          : DEFAULT_FILTER_OPTIONS,
+      [currentUser, recentCasesFilterBy]
+    );
+    const recentTimelinesFilters = useMemo(
+      () => (
+        <RecentTimelinesFilters
+          filterBy={recentTimelinesFilterBy}
+          setFilterBy={setRecentTimelinesFilterBy}
+        />
+      ),
+      [recentTimelinesFilterBy, setRecentTimelinesFilterBy]
+    );
+
+    return (
+      <SidebarFlexGroup direction="column" gutterSize="none">
+        <EuiFlexItem grow={false}>
+          <SidebarHeader title={i18n.RECENT_CASES}>{recentCasesFilters}</SidebarHeader>
+          <StatefulRecentCases filterOptions={recentCasesFilterOptions} />
+        </EuiFlexItem>
+
+        <Spacer />
+
+        <EuiFlexItem grow={false}>
+          <SidebarHeader title={i18n.RECENT_TIMELINES}>{recentTimelinesFilters}</SidebarHeader>
+          <StatefulRecentTimelines
+            apolloClient={apolloClient!}
+            filterBy={recentTimelinesFilterBy}
+          />
+        </EuiFlexItem>
+
+        <Spacer />
+
+        <EuiFlexItem grow={false}>
+          <StatefulNewsFeed
+            enableNewsFeedSetting={ENABLE_NEWS_FEED_SETTING}
+            newsFeedSetting={NEWS_FEED_URL_SETTING}
+          />
+        </EuiFlexItem>
+      </SidebarFlexGroup>
+    );
+  }
+);
 
 Sidebar.displayName = 'Sidebar';
diff --git a/x-pack/legacy/plugins/siem/public/pages/overview/translations.ts b/x-pack/legacy/plugins/siem/public/pages/overview/translations.ts
index 5ccd25984bc40..601a629d86e57 100644
--- a/x-pack/legacy/plugins/siem/public/pages/overview/translations.ts
+++ b/x-pack/legacy/plugins/siem/public/pages/overview/translations.ts
@@ -26,6 +26,10 @@ export const PAGE_SUBTITLE = i18n.translate('xpack.siem.overview.pageSubtitle',
   defaultMessage: 'Security Information & Event Management with the Elastic Stack',
 });
 
+export const RECENT_CASES = i18n.translate('xpack.siem.overview.recentCasesSidebarTitle', {
+  defaultMessage: 'Recent cases',
+});
+
 export const RECENT_TIMELINES = i18n.translate('xpack.siem.overview.recentTimelinesSidebarTitle', {
   defaultMessage: 'Recent timelines',
 });

From e96ed69bf69a48cd6575d9e10925bf4e1e8685f0 Mon Sep 17 00:00:00 2001
From: Thomas Watson <w@tson.dk>
Date: Tue, 24 Mar 2020 08:26:09 +0100
Subject: [PATCH 059/179] Upgrade mocha dev-dependency from 6.2.2 to 7.1.1
 (#60779)

Co-authored-by: spalger <spalger@users.noreply.github.com>
---
 package.json        |   4 +-
 x-pack/package.json |   4 +-
 yarn.lock           | 237 ++++++++++++++++++++------------------------
 3 files changed, 111 insertions(+), 134 deletions(-)

diff --git a/package.json b/package.json
index 3421bf938cd80..08668730f9a9d 100644
--- a/package.json
+++ b/package.json
@@ -348,7 +348,7 @@
     "@types/lru-cache": "^5.1.0",
     "@types/markdown-it": "^0.0.7",
     "@types/minimatch": "^2.0.29",
-    "@types/mocha": "^5.2.7",
+    "@types/mocha": "^7.0.2",
     "@types/moment-timezone": "^0.5.12",
     "@types/mustache": "^0.8.31",
     "@types/node": ">=10.17.17 <10.20.0",
@@ -456,7 +456,7 @@
     "license-checker": "^16.0.0",
     "listr": "^0.14.1",
     "load-grunt-config": "^3.0.1",
-    "mocha": "^6.2.2",
+    "mocha": "^7.1.1",
     "mock-http-server": "1.3.0",
     "multistream": "^2.1.1",
     "murmurhash3js": "3.0.1",
diff --git a/x-pack/package.json b/x-pack/package.json
index 116bbb92007e7..41674cac01725 100644
--- a/x-pack/package.json
+++ b/x-pack/package.json
@@ -78,7 +78,7 @@
     "@types/mapbox-gl": "^0.54.1",
     "@types/memoize-one": "^4.1.0",
     "@types/mime": "^2.0.1",
-    "@types/mocha": "^5.2.7",
+    "@types/mocha": "^7.0.2",
     "@types/nock": "^10.0.3",
     "@types/node": ">=10.17.17 <10.20.0",
     "@types/node-fetch": "^2.5.0",
@@ -145,7 +145,7 @@
     "loader-utils": "^1.2.3",
     "madge": "3.4.4",
     "marge": "^1.0.1",
-    "mocha": "^6.2.2",
+    "mocha": "^7.1.1",
     "mocha-junit-reporter": "^1.23.1",
     "mochawesome": "^4.1.0",
     "mochawesome-merge": "^2.0.1",
diff --git a/yarn.lock b/yarn.lock
index bb5032f51c6c7..22b087d5a8338 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4841,10 +4841,10 @@
   dependencies:
     "@types/node" "*"
 
-"@types/mocha@^5.2.7":
-  version "5.2.7"
-  resolved "https://registry.yarnpkg.com/@types/mocha/-/mocha-5.2.7.tgz#315d570ccb56c53452ff8638738df60726d5b6ea"
-  integrity sha512-NYrtPht0wGzhwe9+/idPaBB+TqkY9AhTvOLMkThm0IoEfLaiVQZwBwyJ5puCkO3AUCWrmcoePjp2mbFocKy4SQ==
+"@types/mocha@^7.0.2":
+  version "7.0.2"
+  resolved "https://registry.yarnpkg.com/@types/mocha/-/mocha-7.0.2.tgz#b17f16cf933597e10d6d78eae3251e692ce8b0ce"
+  integrity sha512-ZvO2tAcjmMi8V/5Z3JsyofMe3hasRcaw88cto5etSVMwVQfeivGAlEYmaQgceUSVYFofVjT+ioHsATjdWcFt1w==
 
 "@types/moment-timezone@^0.5.12":
   version "0.5.12"
@@ -7934,6 +7934,13 @@ binaryextensions@2:
   resolved "https://registry.yarnpkg.com/binaryextensions/-/binaryextensions-2.1.1.tgz#3209a51ca4a4ad541a3b8d3d6a6d5b83a2485935"
   integrity sha512-XBaoWE9RW8pPdPQNibZsW2zh8TW6gcarXp1FZPwT8Uop8ScSNldJEWf2k9l3HeTqdrEwsOsFcq74RiJECW34yA==
 
+bindings@^1.5.0:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/bindings/-/bindings-1.5.0.tgz#10353c9e945334bc0511a6d90b38fbc7c9c504df"
+  integrity sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==
+  dependencies:
+    file-uri-to-path "1.0.0"
+
 bit-twiddle@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/bit-twiddle/-/bit-twiddle-1.0.2.tgz#0c6c1fabe2b23d17173d9a61b7b7093eb9e1769e"
@@ -9084,6 +9091,21 @@ chokidar@3.2.1:
   optionalDependencies:
     fsevents "~2.1.0"
 
+chokidar@3.3.0:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.3.0.tgz#12c0714668c55800f659e262d4962a97faf554a6"
+  integrity sha512-dGmKLDdT3Gdl7fBUe8XK+gAtGmzy5Fn0XkkWQuYxGIgWVPPse2CxFA5mtrlD0TOHaHjEUqkWNyP1XdHoJES/4A==
+  dependencies:
+    anymatch "~3.1.1"
+    braces "~3.0.2"
+    glob-parent "~5.1.0"
+    is-binary-path "~2.1.0"
+    is-glob "~4.0.1"
+    normalize-path "~3.0.0"
+    readdirp "~3.2.0"
+  optionalDependencies:
+    fsevents "~2.1.1"
+
 chokidar@^2.0.0, chokidar@^2.1.2, chokidar@^2.1.8:
   version "2.1.8"
   resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.1.8.tgz#804b3a7b6a99358c3c5c61e71d8728f041cff917"
@@ -11084,7 +11106,7 @@ debug-fabulous@1.X:
     memoizee "0.4.X"
     object-assign "4.X"
 
-debug@2.6.9, debug@^2.0.0, debug@^2.1.0, debug@^2.1.1, debug@^2.1.2, debug@^2.2.0, debug@^2.3.3, debug@^2.6.0, debug@^2.6.8, debug@^2.6.9:
+debug@2.6.9, debug@^2.0.0, debug@^2.1.0, debug@^2.1.1, debug@^2.2.0, debug@^2.3.3, debug@^2.6.0, debug@^2.6.8, debug@^2.6.9:
   version "2.6.9"
   resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
   integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==
@@ -11478,11 +11500,6 @@ detect-indent@^4.0.0:
   dependencies:
     repeating "^2.0.0"
 
-detect-libc@^1.0.2:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"
-  integrity sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=
-
 detect-newline@2.X, detect-newline@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/detect-newline/-/detect-newline-2.1.0.tgz#f41f1c10be4b00e87b5f13da680759f2c5bfd3e2"
@@ -13852,6 +13869,11 @@ file-type@^9.0.0:
   resolved "https://registry.yarnpkg.com/file-type/-/file-type-9.0.0.tgz#a68d5ad07f486414dfb2c8866f73161946714a18"
   integrity sha512-Qe/5NJrgIOlwijpq3B7BEpzPFcgzggOTagZmkXQY4LA6bsXKTUstK7Wp12lEJ/mLKTpvIZxmIuRcLYWT6ov9lw==
 
+file-uri-to-path@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz#553a7b8446ff6f684359c445f1e37a05dacc33dd"
+  integrity sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==
+
 filename-reserved-regex@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/filename-reserved-regex/-/filename-reserved-regex-2.0.0.tgz#abf73dfab735d045440abfea2d91f389ebbfa229"
@@ -14473,17 +14495,17 @@ fs.realpath@^1.0.0:
   integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8=
 
 fsevents@^1.2.7:
-  version "1.2.7"
-  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.7.tgz#4851b664a3783e52003b3c66eb0eee1074933aa4"
-  integrity sha512-Pxm6sI2MeBD7RdD12RYsqaP0nMiwx8eZBXCa6z2L+mRHm2DYrOYwihmhjpkdjUHwQhslWQjRpEgNq4XvBmaAuw==
+  version "1.2.12"
+  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.12.tgz#db7e0d8ec3b0b45724fd4d83d43554a8f1f0de5c"
+  integrity sha512-Ggd/Ktt7E7I8pxZRbGIs7vwqAPscSESMrCSkx2FtWeqmheJgCo2R74fTsZFCifr0VTPwqRpPv17+6b8Zp7th0Q==
   dependencies:
-    nan "^2.9.2"
-    node-pre-gyp "^0.10.0"
+    bindings "^1.5.0"
+    nan "^2.12.1"
 
-fsevents@~2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.1.0.tgz#ce1a5f9ac71c6d75278b0c5bd236d7dfece4cbaa"
-  integrity sha512-+iXhW3LuDQsno8dOIrCIT/CBjeBWuP7PXe8w9shnj9Lebny/Gx1ZjVBYwexLz36Ri2jKuXMNpV6CYNh8lHHgrQ==
+fsevents@~2.1.0, fsevents@~2.1.1:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.1.2.tgz#4c0a1fb34bc68e543b4b82a9ec392bfbda840805"
+  integrity sha512-R4wDiBwZ0KzpgOWetKDug1FZcYhqYnUYKtfZYt4mD5SBz76q0KR4Q9o7GIPamsVPGmW3EYPPJ0dOOjvx32ldZA==
 
 fstream@^1.0.0, fstream@^1.0.12:
   version "1.0.12"
@@ -16502,7 +16524,7 @@ icalendar@0.7.1:
   resolved "https://registry.yarnpkg.com/icalendar/-/icalendar-0.7.1.tgz#d0d3486795f8f1c5cf4f8cafac081b4b4e7a32ae"
   integrity sha1-0NNIZ5X48cXPT4yvrAgbS056Mq4=
 
-iconv-lite@0.4, iconv-lite@0.4.24, iconv-lite@^0.4.17, iconv-lite@^0.4.22, iconv-lite@^0.4.24, iconv-lite@^0.4.4, iconv-lite@~0.4.13:
+iconv-lite@0.4, iconv-lite@0.4.24, iconv-lite@^0.4.17, iconv-lite@^0.4.22, iconv-lite@^0.4.24, iconv-lite@~0.4.13:
   version "0.4.24"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
   integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==
@@ -16576,13 +16598,6 @@ iferr@^0.1.5:
   resolved "https://registry.yarnpkg.com/iferr/-/iferr-0.1.5.tgz#c60eed69e6d8fdb6b3104a1fcbca1c192dc5b501"
   integrity sha1-xg7taebY/bazEEofy8ocGS3FtQE=
 
-ignore-walk@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-3.0.1.tgz#a83e62e7d272ac0e3b551aaa82831a19b69f82f8"
-  integrity sha512-DTVlMx3IYPe0/JJcYP7Gxg7ttZZu3IInhuEhbchuqneY9wWe5Ojy2mXLBaQFUQmo0AW2r3qG7m1mg86js+gnlQ==
-  dependencies:
-    minimatch "^3.0.4"
-
 ignore@^3.1.2, ignore@^3.3.5:
   version "3.3.10"
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.3.10.tgz#0a97fb876986e8081c631160f8f9f389157f0043"
@@ -20712,6 +20727,11 @@ minimist@^0.1.0:
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.1.0.tgz#99df657a52574c21c9057497df742790b2b4c0de"
   integrity sha1-md9lelJXTCHJBXSX33QnkLK0wN4=
 
+minimist@^1.2.5:
+  version "1.2.5"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602"
+  integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==
+
 minimist@~0.0.1:
   version "0.0.10"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf"
@@ -20754,7 +20774,7 @@ minipass@^2.2.1:
     safe-buffer "^5.1.1"
     yallist "^3.0.0"
 
-minipass@^2.2.4, minipass@^2.3.4:
+minipass@^2.2.4:
   version "2.3.5"
   resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.3.5.tgz#cacebe492022497f656b0f0f51e2682a9ed2d848"
   integrity sha512-Gi1W4k059gyRbyVUZQ4mEqLm0YIUiGYfvxhF6SIlk3ui1WVxMTGfGdQ2SInh3PDrRTVvPKgULkpJtT4RH10+VA==
@@ -20784,13 +20804,6 @@ minizlib@^1.1.0, minizlib@^1.2.1:
   dependencies:
     minipass "^2.2.1"
 
-minizlib@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.1.1.tgz#6734acc045a46e61d596a43bb9d9cd326e19cc42"
-  integrity sha512-TrfjCjk4jLhcJyGMYymBH6oTXcWjYbUAXTHDbtnWHjZC25h0cdajHuPE1zxb4DVmu8crfh+HwH/WMuyLG0nHBg==
-  dependencies:
-    minipass "^2.2.1"
-
 mississippi@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/mississippi/-/mississippi-3.0.0.tgz#ea0a3291f97e0b5e8776b363d5f0a12d94c67022"
@@ -20842,6 +20855,13 @@ mkdirp@0.5.1, mkdirp@0.5.x, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdi
   dependencies:
     minimist "0.0.8"
 
+mkdirp@0.5.3:
+  version "0.5.3"
+  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.3.tgz#5a514b7179259287952881e94410ec5465659f8c"
+  integrity sha512-P+2gwrFqx8lhew375MQHHeTlY8AuOJSrGf0R5ddkEndUkmwpgUob/vQuBD1V22/Cw1/lJr4x+EjllSezBThzBg==
+  dependencies:
+    minimist "^1.2.5"
+
 mkdirp@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.3.tgz#4cf2e30ad45959dddea53ad97d518b6c8205e1ea"
@@ -20858,13 +20878,14 @@ mocha-junit-reporter@^1.23.1:
     strip-ansi "^4.0.0"
     xml "^1.0.0"
 
-mocha@^6.2.2:
-  version "6.2.2"
-  resolved "https://registry.yarnpkg.com/mocha/-/mocha-6.2.2.tgz#5d8987e28940caf8957a7d7664b910dc5b2fea20"
-  integrity sha512-FgDS9Re79yU1xz5d+C4rv1G7QagNGHZ+iXF81hO8zY35YZZcLEsJVfFolfsqKFWunATEvNzMK0r/CwWd/szO9A==
+mocha@^7.1.1:
+  version "7.1.1"
+  resolved "https://registry.yarnpkg.com/mocha/-/mocha-7.1.1.tgz#89fbb30d09429845b1bb893a830bf5771049a441"
+  integrity sha512-3qQsu3ijNS3GkWcccT5Zw0hf/rWvu1fTN9sPvEd81hlwsr30GX2GcDSSoBxo24IR8FelmrAydGC6/1J5QQP4WA==
   dependencies:
     ansi-colors "3.2.3"
     browser-stdout "1.3.1"
+    chokidar "3.3.0"
     debug "3.2.6"
     diff "3.5.0"
     escape-string-regexp "1.0.5"
@@ -20873,18 +20894,18 @@ mocha@^6.2.2:
     growl "1.10.5"
     he "1.2.0"
     js-yaml "3.13.1"
-    log-symbols "2.2.0"
+    log-symbols "3.0.0"
     minimatch "3.0.4"
-    mkdirp "0.5.1"
+    mkdirp "0.5.3"
     ms "2.1.1"
-    node-environment-flags "1.0.5"
+    node-environment-flags "1.0.6"
     object.assign "4.1.0"
     strip-json-comments "2.0.1"
     supports-color "6.0.0"
     which "1.3.1"
     wide-align "1.1.3"
-    yargs "13.3.0"
-    yargs-parser "13.1.1"
+    yargs "13.3.2"
+    yargs-parser "13.1.2"
     yargs-unparser "1.6.0"
 
 mochawesome-merge@^2.0.1:
@@ -21140,7 +21161,7 @@ mute-stream@0.0.8:
   resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.8.tgz#1630c42b2251ff81e2a283de96a5497ea92e5e0d"
   integrity sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==
 
-nan@^2.13.2, nan@^2.9.2:
+nan@^2.12.1, nan@^2.13.2:
   version "2.14.0"
   resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.0.tgz#7818f722027b2459a86f0295d434d1fc2336c52c"
   integrity sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg==
@@ -21222,15 +21243,6 @@ nearley@^2.7.10:
     randexp "0.4.6"
     semver "^5.4.1"
 
-needle@^2.2.1:
-  version "2.2.4"
-  resolved "https://registry.yarnpkg.com/needle/-/needle-2.2.4.tgz#51931bff82533b1928b7d1d69e01f1b00ffd2a4e"
-  integrity sha512-HyoqEb4wr/rsoaIDfTH2aVL9nWtQqba2/HvMv+++m8u0dz808MaagKILxtfeSN7QU7nvbQ79zk3vYOJp9zsNEA==
-  dependencies:
-    debug "^2.1.2"
-    iconv-lite "^0.4.4"
-    sax "^1.2.4"
-
 negotiator@0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.1.tgz#2b327184e8992101177b28563fb5e7102acd0ca9"
@@ -21351,10 +21363,10 @@ node-dir@^0.1.10:
   dependencies:
     minimatch "^3.0.2"
 
-node-environment-flags@1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/node-environment-flags/-/node-environment-flags-1.0.5.tgz#fa930275f5bf5dae188d6192b24b4c8bbac3d76a"
-  integrity sha512-VNYPRfGfmZLx0Ye20jWzHUjyTW/c+6Wq+iLhDzUI4XmhrDd9l/FozXV3F2xOaXjvp0co0+v1YSR3CMP6g+VvLQ==
+node-environment-flags@1.0.6:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/node-environment-flags/-/node-environment-flags-1.0.6.tgz#a30ac13621f6f7d674260a54dede048c3982c088"
+  integrity sha512-5Evy2epuL+6TM0lCQGpFIj6KwiEsGh1SrHUhTbNX+sLbBtjidPZFAnVK9y5yU1+h//RitLbRHTIMyxQPtxMdHw==
   dependencies:
     object.getownpropertydescriptors "^2.0.3"
     semver "^5.7.0"
@@ -21515,22 +21527,6 @@ node-notifier@^5.4.2:
     shellwords "^0.1.1"
     which "^1.3.0"
 
-node-pre-gyp@^0.10.0:
-  version "0.10.3"
-  resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.10.3.tgz#3070040716afdc778747b61b6887bf78880b80fc"
-  integrity sha512-d1xFs+C/IPS8Id0qPTZ4bUT8wWryfR/OzzAFxweG+uLN85oPzyo2Iw6bVlLQ/JOdgNonXLCoRyqDzDWq4iw72A==
-  dependencies:
-    detect-libc "^1.0.2"
-    mkdirp "^0.5.1"
-    needle "^2.2.1"
-    nopt "^4.0.1"
-    npm-packlist "^1.1.6"
-    npmlog "^4.0.2"
-    rc "^1.2.7"
-    rimraf "^2.6.1"
-    semver "^5.3.0"
-    tar "^4"
-
 node-releases@^1.1.25, node-releases@^1.1.46:
   version "1.1.47"
   resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.47.tgz#c59ef739a1fd7ecbd9f0b7cf5b7871e8a8b591e4"
@@ -21600,14 +21596,6 @@ nopt@^2.2.0:
   dependencies:
     abbrev "1"
 
-nopt@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.1.tgz#d0d4685afd5415193c8c7505602d0d17cd64474d"
-  integrity sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=
-  dependencies:
-    abbrev "1"
-    osenv "^0.1.4"
-
 normalize-package-data@^2.0.0, normalize-package-data@^2.3.2, normalize-package-data@^2.3.4:
   version "2.4.0"
   resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.4.0.tgz#12f95a307d58352075a04907b84ac8be98ac012f"
@@ -21676,11 +21664,6 @@ now-and-later@^2.0.0:
   dependencies:
     once "^1.3.2"
 
-npm-bundled@^1.0.1:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.0.3.tgz#7e71703d973af3370a9591bafe3a63aca0be2308"
-  integrity sha512-ByQ3oJ/5ETLyglU2+8dBObvhfWXX8dtPZDMePCahptliFX2iIuhyEszyFk401PZUNQH20vvdW5MLjJxkwU80Ow==
-
 npm-conf@^1.1.0, npm-conf@^1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/npm-conf/-/npm-conf-1.1.3.tgz#256cc47bd0e218c259c4e9550bf413bc2192aff9"
@@ -21697,14 +21680,6 @@ npm-keyword@^5.0.0:
     got "^7.1.0"
     registry-url "^3.0.3"
 
-npm-packlist@^1.1.6:
-  version "1.1.10"
-  resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.1.10.tgz#1039db9e985727e464df066f4cf0ab6ef85c398a"
-  integrity sha512-AQC0Dyhzn4EiYEfIUjCdMl0JJ61I2ER9ukf/sLxJUcZHfo+VyEfz2rMJgLZSS1v30OxPQe1cN0LZA1xbcaVfWA==
-  dependencies:
-    ignore-walk "^3.0.1"
-    npm-bundled "^1.0.1"
-
 npm-run-path@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-1.0.0.tgz#f5c32bf595fe81ae927daec52e82f8b000ac3c8f"
@@ -21742,7 +21717,7 @@ npmconf@^2.1.3:
     semver "2 || 3 || 4"
     uid-number "0.0.5"
 
-"npmlog@0 || 1 || 2 || 3 || 4", npmlog@^4.0.0, npmlog@^4.0.2, npmlog@^4.1.2:
+"npmlog@0 || 1 || 2 || 3 || 4", npmlog@^4.0.0, npmlog@^4.1.2:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b"
   integrity sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==
@@ -22324,14 +22299,6 @@ osenv@0, osenv@^0.1.0:
     os-homedir "^1.0.0"
     os-tmpdir "^1.0.0"
 
-osenv@^0.1.4:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.4.tgz#42fe6d5953df06c8064be6f176c3d05aaaa34644"
-  integrity sha1-Qv5tWVPfBsgGS+bxdsPQWqqjRkQ=
-  dependencies:
-    os-homedir "^1.0.0"
-    os-tmpdir "^1.0.0"
-
 output-file-sync@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/output-file-sync/-/output-file-sync-2.0.1.tgz#f53118282f5f553c2799541792b723a4c71430c0"
@@ -25191,6 +25158,13 @@ readdirp@~3.1.3:
   dependencies:
     picomatch "^2.0.4"
 
+readdirp@~3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.2.0.tgz#c30c33352b12c96dfb4b895421a49fd5a9593839"
+  integrity sha512-crk4Qu3pmXwgxdSgGhgA/eXiJAPQiX4GMOZZMXnqKxHX7TaoL+3gQVo/WeuAiogr07DpnfjIMpXXa+PAIvwPGQ==
+  dependencies:
+    picomatch "^2.0.4"
+
 readline2@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/readline2/-/readline2-1.0.1.tgz#41059608ffc154757b715d9989d199ffbf372e35"
@@ -26564,7 +26538,7 @@ sass-resources-loader@^2.0.1:
     glob "^7.1.1"
     loader-utils "^1.0.4"
 
-sax@>=0.6.0, sax@^1.2.1, sax@^1.2.4, sax@~1.2.4:
+sax@>=0.6.0, sax@^1.2.1, sax@~1.2.4:
   version "1.2.4"
   resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
   integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==
@@ -28627,19 +28601,6 @@ tar@^2.0.0:
     fstream "^1.0.12"
     inherits "2"
 
-tar@^4:
-  version "4.4.8"
-  resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.8.tgz#b19eec3fde2a96e64666df9fdb40c5ca1bc3747d"
-  integrity sha512-LzHF64s5chPQQS0IYBn9IN5h3i98c12bo4NCO7e0sGM2llXQ3p2FGC5sdENN4cTW48O915Sh+x+EXx7XW96xYQ==
-  dependencies:
-    chownr "^1.1.1"
-    fs-minipass "^1.2.5"
-    minipass "^2.3.4"
-    minizlib "^1.1.1"
-    mkdirp "^0.5.0"
-    safe-buffer "^5.1.2"
-    yallist "^3.0.2"
-
 tcomb-validation@^3.3.0:
   version "3.4.1"
   resolved "https://registry.yarnpkg.com/tcomb-validation/-/tcomb-validation-3.4.1.tgz#a7696ec176ce56a081d9e019f8b732a5a8894b65"
@@ -32114,10 +32075,10 @@ yallist@^4.0.0:
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72"
   integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==
 
-yargs-parser@13.1.1, yargs-parser@^13.0.0, yargs-parser@^13.1.0, yargs-parser@^13.1.1:
-  version "13.1.1"
-  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.1.1.tgz#d26058532aa06d365fe091f6a1fc06b2f7e5eca0"
-  integrity sha512-oVAVsHz6uFrg3XQheFII8ESO2ssAf9luWuAd6Wexsu4F3OtIW0o8IribPXYrD4WC24LWtPrJlGy87y5udK+dxQ==
+yargs-parser@13.1.2, yargs-parser@^13.0.0, yargs-parser@^13.1.0, yargs-parser@^13.1.1, yargs-parser@^13.1.2:
+  version "13.1.2"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.1.2.tgz#130f09702ebaeef2650d54ce6e3e5706f7a4fb38"
+  integrity sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==
   dependencies:
     camelcase "^5.0.0"
     decamelize "^1.2.0"
@@ -32138,9 +32099,9 @@ yargs-parser@^11.1.1:
     decamelize "^1.2.0"
 
 yargs-parser@^15.0.0:
-  version "15.0.0"
-  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-15.0.0.tgz#cdd7a97490ec836195f59f3f4dbe5ea9e8f75f08"
-  integrity sha512-xLTUnCMc4JhxrPEPUYD5IBR1mWCK/aT6+RJ/K29JY2y1vD+FhtgKK0AXRWvI262q3QSffAQuTouFIKUuHX89wQ==
+  version "15.0.1"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-15.0.1.tgz#54786af40b820dcb2fb8025b11b4d659d76323b3"
+  integrity sha512-0OAMV2mAZQrs3FkNpDQcBk1x5HXb8X4twADss4S0Iuk+2dGnLOE/fRHrsYm542GduMveyA77OF4wrNJuanRCWw==
   dependencies:
     camelcase "^5.0.0"
     decamelize "^1.2.0"
@@ -32211,10 +32172,10 @@ yargs@13.2.4:
     y18n "^4.0.0"
     yargs-parser "^13.1.0"
 
-yargs@13.3.0, yargs@^13.2.2, yargs@^13.3.0:
-  version "13.3.0"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.3.0.tgz#4c657a55e07e5f2cf947f8a366567c04a0dedc83"
-  integrity sha512-2eehun/8ALW8TLoIl7MVaRUrg+yCnenu8B4kBlRxj3GJGDKU1Og7sMXPNm1BYyM1DOJmTZ4YeN/Nwxv+8XJsUA==
+yargs@13.3.2:
+  version "13.3.2"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.3.2.tgz#ad7ffefec1aa59565ac915f82dccb38a9c31a2dd"
+  integrity sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==
   dependencies:
     cliui "^5.0.0"
     find-up "^3.0.0"
@@ -32225,7 +32186,7 @@ yargs@13.3.0, yargs@^13.2.2, yargs@^13.3.0:
     string-width "^3.0.0"
     which-module "^2.0.0"
     y18n "^4.0.0"
-    yargs-parser "^13.1.1"
+    yargs-parser "^13.1.2"
 
 yargs@4.8.1:
   version "4.8.1"
@@ -32265,6 +32226,22 @@ yargs@^11.0.0:
     y18n "^3.2.1"
     yargs-parser "^9.0.2"
 
+yargs@^13.2.2, yargs@^13.3.0:
+  version "13.3.0"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.3.0.tgz#4c657a55e07e5f2cf947f8a366567c04a0dedc83"
+  integrity sha512-2eehun/8ALW8TLoIl7MVaRUrg+yCnenu8B4kBlRxj3GJGDKU1Og7sMXPNm1BYyM1DOJmTZ4YeN/Nwxv+8XJsUA==
+  dependencies:
+    cliui "^5.0.0"
+    find-up "^3.0.0"
+    get-caller-file "^2.0.1"
+    require-directory "^2.1.1"
+    require-main-filename "^2.0.0"
+    set-blocking "^2.0.0"
+    string-width "^3.0.0"
+    which-module "^2.0.0"
+    y18n "^4.0.0"
+    yargs-parser "^13.1.1"
+
 yargs@^14.2.0:
   version "14.2.0"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-14.2.0.tgz#f116a9242c4ed8668790b40759b4906c276e76c3"

From 5abb2c8c7dbc6dfca05059261708f800ca1807bb Mon Sep 17 00:00:00 2001
From: Vadim Dalecky <streamich@users.noreply.github.com>
Date: Tue, 24 Mar 2020 08:31:29 +0100
Subject: [PATCH 060/179] Drilldowns (#59632)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Add drilldown wizard components

* Dynamic actions (#58216)

* feat: 🎸 add DynamicAction and FactoryAction types

* feat: 🎸 add Mutable<T> type to @kbn/utility-types

* feat: 🎸 add ActionInternal and ActionContract

* chore: 🤖 remove unused file

* feat: 🎸 improve action interfaces

* docs: ✏️ add JSDocs

* feat: 🎸 simplify ui_actions interfaces

* fix: 🐛 fix TypeScript types

* feat: 🎸 add AbstractPresentable interface

* feat: 🎸 add AbstractConfigurable interface

* feat: 🎸 use AbstractPresentable in ActionInternal

* test: 💍 fix ui_actions Jest tests

* feat: 🎸 add state container to action

* perf: ⚡️ convert MenuItem to React component on Action instance

* refactor: 💡 rename AbsractPresentable -> Presentable

* refactor: 💡 rename AbstractConfigurable -> Configurable

* feat: 🎸 add Storybook to ui_actions

* feat: 🎸 add <ErrorConfigureAction> component

* feat: 🎸 improve <ConfigureAction> component

* chore: 🤖 use .story file extension prefix for Storybook

* feat: 🎸 improve <ErrorConfigureAction> component

* feat: 🎸 show error if dynamic action has CollectConfig missing

* feat: 🎸 render sample action configuration component

* feat: 🎸 connect action config to <ConfigureAction>

* feat: 🎸 improve <ConfigureAction> stories

* test: 💍 add ActionInternal serialize/deserialize tests

* feat: 🎸 add ActionContract

* feat: 🎸 split action Context into Execution and Presentation

* fix: 🐛 fix TypeScript error

* refactor: 💡 extract state container hooks to module scope

* docs: ✏️ fix typos

* chore: 🤖 remove Mutable<t> type

* test: 💍 don't cast to any getActions() function

* style: 💄 avoid using unnecessary types

* chore: 🤖 address PR review comments

* chore: 🤖 rename ActionContext generic

* chore: 🤖 remove order from state container

* chore: 🤖 remove deprecation notice on getHref

* test: 💍 fix tests after order field change

* remove comments

Co-authored-by: Matt Kime <matt@mattki.me>
Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>

* Drilldown context menu (#59638)

* fix: 🐛 fix TypeScript error

* feat: 🎸 add CONTEXT_MENU_DRILLDOWNS_TRIGGER trigger

* fix: 🐛 correctly order context menu items

* fix: 🐛 set correct order on drilldown flyout actions

* fix: 🐛 clean up context menu building functions

* feat: 🎸 add context menu separator action

* Add basic ActionFactoryService. Pass data from it into components instead of mocks

* Dashboard x pack (#59653)

* feat: 🎸 add dashboard_enhanced plugin to x-pack

* feat: 🎸 improve context menu separator

* feat: 🎸 move drilldown flyout actions to dashboard_enhanced

* fix: 🐛 fix exports from ui_actions plugin

* feat: 🎸 "implement" registerDrilldown() method

* fix ConfigurableBaseConfig type

* Implement connected flyout_manage_drilldowns component

* Simplify connected flyout manage drilldowns component. Remove intermediate component

* clean up data-testid workaround in new components

* Connect welcome message to storage

Not sure, but use LocalStorage. Didn’t find a way to persist user settings. looks like uiSettings are not user scoped.

* require `context` in Presentable. drill context down through wizard components

* Drilldown factory (#59823)

* refactor: 💡 import storage interface from ui_actions plugin

* refactor: 💡 make actions not-dynamic

* feat: 🎸 fix TypeScript errors, reshuffle types and code

* fix: 🐛 fix more TypeScript errors

* fix: 🐛 fix TypeScript import error

* Drilldown registration (#59834)

* feat: 🎸 improve drilldown registration method

* fix: 🐛 set up translations for dashboard_enhanced plugin

* Drilldown events 3 (#59854)

* feat: 🎸 add serialize/unserialize to action

* feat: 🎸 pass in uiActions service into Embeddable

* feat: 🎸 merge ui_actions oss and basic plugins

* refactor: 💡 move action factory registry to OSS

* fix: 🐛 fix TypeScript errors

* Drilldown events 4 (#59876)

* feat: 🎸 mock sample drilldown execute methods

* feat: 🎸 add .dynamicActions manager to Embeddable

* feat: 🎸 add first version of dynamic action manager

* Drilldown events 5 (#59885)

* feat: 🎸 display drilldowns in context menu only on one embed

* feat: 🎸 clear dynamic actions from registry when embed unloads

* fix: 🐛 fix OSS TypeScript errors

* basic integration of components with dynamicActionManager

* fix: 🐛 don't overwrite explicitInput with combined input (#59938)

* display drilldown count in embeddable edit mode

* display drilldown count in embeddable edit mode

* improve wizard components. more tests.

* partial progress, dashboard drilldowns (#59977)

* partial progress, dashboard drilldowns

* partial progress, dashboard drilldowns

* feat: 🎸 improve dashboard drilldown setup

* feat: 🎸 wire in services into dashboard drilldown

* chore: 🤖 add Storybook to dashboard_enhanced

* feat: 🎸 create presentational <DashboardDrilldownConfig>

* test: 💍 add <DashboardDrilldownConfig> stories

* test: 💍 use presentation dashboar config component

* feat: 🎸 wire in services into React component

* docs: ✏️ add README to /components folder

* feat: 🎸 increase importance of Dashboard drilldown

* feat: 🎸 improve icon definition in drilldowns

* chore: 🤖 remove unnecessary comment

* chore: 🤖 add todos

Co-authored-by: streamich <streamich@gmail.com>

* Manage drilldowns toasts. Add basic error handling.

* support order in action factory selector

* fix column order in manage drilldowns list

* remove accidental debug info

* bunch of nit ui fixes

* Drilldowns reactive action manager (#60099)

* feat: 🎸 improve isConfigValid return type

* feat: 🎸 make DynamicActionManager reactive

* docs: ✏️ add JSDocs to public mehtods of DynamicActionManager

* feat: 🎸 make panel top-right corner number badge reactive

* fix: 🐛 correctly await for .deleteEvents()

* Drilldowns various 2 (#60103)

* chore: 🤖 address review comments

* test: 💍 fix embeddable_panel.test.tsx tests

* chore: 🤖 clean up ActionInternal

* chore: 🤖 make isConfigValid a simple predicate

* chore: 🤖 fix TypeScript type errors

* test: 💍 stub DynamicActionManager tests (#60104)

* Drilldowns review 1 (#60139)

* refactor: 💡 improve generic types

* fix: 🐛 don't overwrite icon

* fix: 🐛 fix x-pack TypeScript errors

* fix: 🐛 fix TypeScript error

* fix: 🐛 correct merge

* Drilldowns various 4 (#60264)

* feat: 🎸 hide "Create drilldown" from context menu when needed

* style: 💄 remove AnyDrilldown type

* feat: 🎸 add drilldown factory context

* chore: 🤖 remove sample drilldown

* fix: 🐛 increase spacing between action factory picker

* workaround issue with closing flyout when navigating away

Adds overlay just like other flyouts which makes this defect harder to bump in

* fix react key issue in action_wizard

* don’t open 2 flyouts

* fix action order

https://github.com/elastic/kibana/issues/60138

* Drilldowns reload stored (#60336)

* style: 💄 don't use double equals __

* feat: 🎸 add reload$ to ActionStorage interface

* feat: 🎸 add reload$ to embeddable event storage

* feat: 🎸 add storage syncing to DynamicActionManager

* refactor: 💡 use state from DynamicActionManager in React

* fix: 🐛 add check for manager being stopped

* Drilldowns triggers (#60339)

* feat: 🎸 make use of supportedTriggers()

* feat: 🎸 pass in context to configuration component

* feat: 🎸 augment factory context

* fix: 🐛 stop infinite re-rendering

* Drilldowns multitrigger (#60357)

* feat: 🎸 add support for multiple triggers

* feat: 🎸 enable Drilldowns for TSVB

Although TSVB brushing event is now broken on master, KibanaApp plans to
fix it in 7.7

* "Create drilldown" flyout - design cleanup (#60309)

* create drilldown flyout cleanup

* remove border from selectedActionFactoryContainer

* adjust callout in DrilldownHello

* update form labels

* remove unused file

* fix type error

Co-authored-by: Anton Dosov <anton.dosov@elastic.co>

* basic unit tests for flyout_create_drildown action

* Drilldowns finalize (#60371)

* fix: 🐛 align flyout content to left side

* fix: 🐛 move context menu item number 1px lower

* fix: 🐛 move flyout back nav chevron up

* fix: 🐛 fix type check after refactor

* basic unit tests for drilldown actions

* Drilldowns finalize 2 (#60510)

* test: 💍 fix test mock

* chore: 🤖 remove unused UiActionsService methods

* refactor: 💡 cleanup UiActionsService action registration

* fix: 🐛 add missing functionality after refactor

* test: 💍 add action factory tests

* test: 💍 add DynamicActionManager tests

* feat: 🎸 capture error if it happens during initial load

* fix: 🐛 register correctly CSV action

* feat: 🎸 don't show "OPTIONS" title on drilldown context menus

* feat: 🎸 add server-side for x-pack dashboard plugin

* feat: 🎸 disable Drilldowns for TSVB

* feat: 🎸 enable drilldowns on kibana.yml feature flag

* feat: 🎸 add feature flag comment to kibana.yml

* feat: 🎸 remove places from drilldown interface

* refactor: 💡 remove place in factory context

* chore: 🤖 remove doExecute

* remove not needed now error_configure_action component

* remove workaround for storybook

* feat: 🎸 improve DrilldownDefinition interface

* style: 💄 replace any by unknown

* chore: 🤖 remove any

* chore: 🤖 make isConfigValid return type a boolean

* refactor: 💡 move getDisplayName to factory, remove deprecated

* style: 💄 remove any

* feat: 🎸 improve ActionFactoryDefinition

* refactor: 💡 change visualize_embeddable params

* feat: 🎸 add dashboard dependency to dashboard_enhanced

* style: 💄 rename drilldown plugin life-cycle contracts

* refactor: 💡 do naming adjustments for dashboard drilldown

* fix: 🐛 fix Type error

* fix: 🐛 fix TypeScript type errors

* test: 💍 fix test after refactor

* refactor: 💡 rename context -> placeContext in React component

* chore: 🤖 remove setting from kibana.yml

* refactor: 💡 change return type of getAction as per review

* remove custom css per review

* refactor: 💡 rename drilldownCount to eventCount

* style: 💄 remove any

* refactor: 💡 change how uiActions are passed to vis embeddable

* style: 💄 remove unused import

Co-authored-by: Anton Dosov <anton.dosov@elastic.co>
Co-authored-by: Matt Kime <matt@mattki.me>
Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
Co-authored-by: Andrea Del Rio <delrio.andre@gmail.com>
---
 .github/CODEOWNERS                            |   1 +
 examples/ui_action_examples/public/plugin.ts  |   2 +-
 examples/ui_actions_explorer/public/app.tsx   |   3 +-
 .../ui_actions_explorer/public/plugin.tsx     |  16 +-
 .../public/overlays/flyout/flyout_service.tsx |   1 +
 src/dev/storybook/aliases.ts                  |   4 +-
 .../public/embeddable/visualize_embeddable.ts |   8 +-
 .../visualize_embeddable_factory.tsx          |  10 +-
 .../public/np_ready/public/mocks.ts           |   5 +-
 .../public/np_ready/public/plugin.ts          |   6 +-
 .../public/actions/replace_panel_action.tsx   |   2 +-
 src/plugins/dashboard/public/plugin.tsx       |   4 +-
 .../public/tests/dashboard_container.test.tsx |   2 +-
 src/plugins/data/public/plugin.ts             |   9 +-
 .../public/lib/actions/edit_panel_action.ts   |   2 +-
 .../public/lib/embeddables/embeddable.tsx     |  73 +-
 .../embeddable_action_storage.test.ts         | 128 ++--
 .../embeddables/embeddable_action_storage.ts  |  53 +-
 .../public/lib/embeddables/i_embeddable.ts    |  16 +-
 .../lib/panel/embeddable_panel.test.tsx       |  14 +-
 .../public/lib/panel/embeddable_panel.tsx     |  38 +-
 .../customize_title/customize_panel_action.ts |   8 +-
 .../panel_actions/inspect_panel_action.ts     |   2 +-
 .../panel_actions/remove_panel_action.ts      |   2 +-
 .../lib/panel/panel_header/panel_header.tsx   |   9 +-
 .../create_state_container_react_helpers.ts   |  69 +-
 .../common/state_containers/types.ts          |   2 +-
 src/plugins/kibana_utils/index.ts             |  20 +
 .../ui_actions/public/actions/action.ts       |  26 +-
 .../public/actions/action_factory.ts          |  71 ++
 .../actions/action_factory_definition.ts      |  46 ++
 .../public/actions/action_internal.test.ts    |  33 +
 .../public/actions/action_internal.ts         |  58 ++
 .../public/actions/create_action.ts           |  14 +-
 .../actions/dynamic_action_manager.test.ts    | 646 ++++++++++++++++++
 .../public/actions/dynamic_action_manager.ts  | 284 ++++++++
 .../actions/dynamic_action_manager_state.ts   | 111 +++
 .../public/actions/dynamic_action_storage.ts  | 102 +++
 .../ui_actions/public/actions/index.ts        |   6 +
 .../ui_actions/public/actions/types.ts        |  24 +
 .../build_eui_context_menu_panels.tsx         |  61 +-
 src/plugins/ui_actions/public/index.ts        |  22 +-
 src/plugins/ui_actions/public/mocks.ts        |  18 +-
 src/plugins/ui_actions/public/plugin.ts       |   8 +-
 .../public/service/ui_actions_service.test.ts | 114 +++-
 .../public/service/ui_actions_service.ts      | 122 +++-
 .../tests/execute_trigger_actions.test.ts     |  10 +-
 .../public/tests/get_trigger_actions.test.ts  |   9 +-
 .../get_trigger_compatible_actions.test.ts    |   6 +-
 .../public/tests/test_samples/index.ts        |   1 +
 .../public/triggers/select_range_trigger.ts   |   2 +-
 .../public/triggers/trigger_internal.ts       |   1 +
 .../public/triggers/value_click_trigger.ts    |   2 +-
 src/plugins/ui_actions/public/types.ts        |   6 +-
 .../ui_actions/public/util/configurable.ts    |  60 ++
 src/plugins/ui_actions/public/util/index.ts   |  21 +
 .../presentable.ts}                           |  47 +-
 src/plugins/ui_actions/scripts/storybook.js   |  26 +
 .../public/np_ready/public/plugin.tsx         |   3 +-
 .../public/sample_panel_action.tsx            |   3 +-
 .../public/sample_panel_link.ts               |   3 +-
 x-pack/.i18nrc.json                           |   1 +
 .../action_wizard/action_wizard.scss          |   5 -
 .../action_wizard/action_wizard.story.tsx     |  24 +-
 .../action_wizard/action_wizard.test.tsx      |  13 +-
 .../action_wizard/action_wizard.tsx           |  95 ++-
 .../public/components/action_wizard/i18n.ts   |   2 +-
 .../public/components/action_wizard/index.ts  |   2 +-
 .../components/action_wizard/test_data.tsx    | 218 +++---
 .../public/components/index.ts}               |   2 +-
 .../public/custom_time_range_action.tsx       |   2 +-
 .../advanced_ui_actions/public/index.ts       |  14 +
 .../advanced_ui_actions/public/plugin.ts      |  28 +-
 .../action_factory_service/action_factory.ts  |  11 +
 .../action_factory_definition.ts              |  11 +
 .../services/action_factory_service/index.ts  |   8 +
 .../public/services}/index.ts                 |   2 +-
 .../advanced_ui_actions/public/util/index.ts  |  10 +
 x-pack/plugins/dashboard_enhanced/README.md   |   1 +
 x-pack/plugins/dashboard_enhanced/kibana.json |   8 +
 .../public/components/README.md               |   5 +
 .../dashboard_drilldown_config.story.tsx      |  54 ++
 .../dashboard_drilldown_config.test.tsx       |  11 +
 .../dashboard_drilldown_config.tsx            |  69 ++
 .../dashboard_drilldown_config/i18n.ts        |  14 +
 .../dashboard_drilldown_config/index.ts       |   7 +
 .../public/components/index.ts                |   7 +
 .../dashboard_enhanced/public/index.ts        |  19 +
 .../dashboard_enhanced/public/mocks.ts        |  27 +
 .../dashboard_enhanced/public/plugin.ts       |  50 ++
 .../flyout_create_drilldown.test.tsx          | 124 ++++
 .../flyout_create_drilldown.tsx               |  74 ++
 .../actions/flyout_create_drilldown/index.ts  |  11 +
 .../flyout_edit_drilldown.test.tsx            | 102 +++
 .../flyout_edit_drilldown.tsx                 |  71 ++
 .../actions/flyout_edit_drilldown}/i18n.ts    |   6 +-
 .../actions/flyout_edit_drilldown/index.tsx   |  11 +
 .../flyout_edit_drilldown/menu_item.test.tsx  |  37 +
 .../flyout_edit_drilldown/menu_item.tsx       |  30 +
 .../services/drilldowns}/actions/index.ts     |   0
 .../drilldowns/actions/test_helpers.ts        |  28 +
 .../dashboard_drilldowns_services.ts          |  60 ++
 .../collect_config.test.tsx                   |   9 +
 .../collect_config.tsx                        |  55 ++
 .../constants.ts                              |   7 +
 .../drilldown.test.tsx                        |  20 +
 .../drilldown.tsx                             |  52 ++
 .../dashboard_to_dashboard_drilldown/i18n.ts  |  11 +
 .../dashboard_to_dashboard_drilldown/index.ts |  16 +
 .../dashboard_to_dashboard_drilldown/types.ts |  22 +
 .../public/services/drilldowns/index.ts       |   7 +
 .../public/services/index.ts                  |   7 +
 .../scripts/storybook.js}                     |  10 +-
 .../dashboard_enhanced/server/config.ts       |  23 +
 .../dashboard_enhanced/server/index.ts        |  12 +
 x-pack/plugins/drilldowns/kibana.json         |   5 +-
 .../actions/flyout_create_drilldown/index.tsx |  52 --
 .../actions/flyout_edit_drilldown/index.tsx   |  72 --
 ...nnected_flyout_manage_drilldowns.story.tsx |  43 ++
 ...onnected_flyout_manage_drilldowns.test.tsx | 221 ++++++
 .../connected_flyout_manage_drilldowns.tsx    | 332 +++++++++
 .../i18n.ts                                   |  88 +++
 .../index.ts                                  |   7 +
 .../test_data.ts                              |  89 +++
 .../drilldown_hello_bar.story.tsx             |  16 +-
 .../drilldown_hello_bar.tsx                   |  58 +-
 .../components/drilldown_hello_bar/i18n.ts    |  29 +
 .../drilldown_picker/drilldown_picker.tsx     |  21 -
 .../flyout_create_drilldown.story.tsx         |  24 -
 .../flyout_create_drilldown.tsx               |  34 -
 .../flyout_drilldown_wizard.story.tsx         |  70 ++
 .../flyout_drilldown_wizard.tsx               | 139 ++++
 .../flyout_drilldown_wizard/i18n.ts           |  42 ++
 .../flyout_drilldown_wizard/index.ts          |   7 +
 .../flyout_frame/flyout_frame.story.tsx       |   7 +
 .../flyout_frame/flyout_frame.test.tsx        |   4 +-
 .../components/flyout_frame/flyout_frame.tsx  |  31 +-
 .../public/components/flyout_frame/i18n.ts    |   6 +-
 .../flyout_list_manage_drilldowns.story.tsx   |  22 +
 .../flyout_list_manage_drilldowns.tsx         |  46 ++
 .../flyout_list_manage_drilldowns/i18n.ts     |  14 +
 .../flyout_list_manage_drilldowns/index.ts    |   7 +
 .../form_create_drilldown.story.tsx           |  34 -
 .../form_create_drilldown.tsx                 |  52 --
 .../form_drilldown_wizard.story.tsx           |  29 +
 .../form_drilldown_wizard.test.tsx}           |  20 +-
 .../form_drilldown_wizard.tsx                 |  79 +++
 .../i18n.ts                                   |   4 +-
 .../index.tsx                                 |   2 +-
 .../components/list_manage_drilldowns/i18n.ts |  36 +
 .../list_manage_drilldowns/index.tsx          |   7 +
 .../list_manage_drilldowns.story.tsx          |  19 +
 .../list_manage_drilldowns.test.tsx           |  70 ++
 .../list_manage_drilldowns.tsx                | 116 ++++
 x-pack/plugins/drilldowns/public/index.ts     |  10 +-
 x-pack/plugins/drilldowns/public/mocks.ts     |  12 +-
 x-pack/plugins/drilldowns/public/plugin.ts    |  54 +-
 .../public/service/drilldown_service.ts       |  32 -
 .../public/services/drilldown_service.ts      |  79 +++
 .../public/{service => services}/index.ts     |   0
 x-pack/plugins/drilldowns/public/types.ts     | 120 ++++
 x-pack/plugins/reporting/public/plugin.tsx    |   3 +-
 .../translations/translations/ja-JP.json      |   1 -
 .../translations/translations/zh-CN.json      |   1 -
 164 files changed, 5368 insertions(+), 898 deletions(-)
 create mode 100644 src/plugins/kibana_utils/index.ts
 create mode 100644 src/plugins/ui_actions/public/actions/action_factory.ts
 create mode 100644 src/plugins/ui_actions/public/actions/action_factory_definition.ts
 create mode 100644 src/plugins/ui_actions/public/actions/action_internal.test.ts
 create mode 100644 src/plugins/ui_actions/public/actions/action_internal.ts
 create mode 100644 src/plugins/ui_actions/public/actions/dynamic_action_manager.test.ts
 create mode 100644 src/plugins/ui_actions/public/actions/dynamic_action_manager.ts
 create mode 100644 src/plugins/ui_actions/public/actions/dynamic_action_manager_state.ts
 create mode 100644 src/plugins/ui_actions/public/actions/dynamic_action_storage.ts
 create mode 100644 src/plugins/ui_actions/public/actions/types.ts
 create mode 100644 src/plugins/ui_actions/public/util/configurable.ts
 create mode 100644 src/plugins/ui_actions/public/util/index.ts
 rename src/plugins/ui_actions/public/{actions/action_definition.ts => util/presentable.ts} (50%)
 create mode 100644 src/plugins/ui_actions/scripts/storybook.js
 rename x-pack/plugins/{drilldowns/public/components/drilldown_picker/index.tsx => advanced_ui_actions/public/components/index.ts} (87%)
 create mode 100644 x-pack/plugins/advanced_ui_actions/public/services/action_factory_service/action_factory.ts
 create mode 100644 x-pack/plugins/advanced_ui_actions/public/services/action_factory_service/action_factory_definition.ts
 create mode 100644 x-pack/plugins/advanced_ui_actions/public/services/action_factory_service/index.ts
 rename x-pack/plugins/{drilldowns/public/components/flyout_create_drilldown => advanced_ui_actions/public/services}/index.ts (84%)
 create mode 100644 x-pack/plugins/advanced_ui_actions/public/util/index.ts
 create mode 100644 x-pack/plugins/dashboard_enhanced/README.md
 create mode 100644 x-pack/plugins/dashboard_enhanced/kibana.json
 create mode 100644 x-pack/plugins/dashboard_enhanced/public/components/README.md
 create mode 100644 x-pack/plugins/dashboard_enhanced/public/components/dashboard_drilldown_config/dashboard_drilldown_config.story.tsx
 create mode 100644 x-pack/plugins/dashboard_enhanced/public/components/dashboard_drilldown_config/dashboard_drilldown_config.test.tsx
 create mode 100644 x-pack/plugins/dashboard_enhanced/public/components/dashboard_drilldown_config/dashboard_drilldown_config.tsx
 create mode 100644 x-pack/plugins/dashboard_enhanced/public/components/dashboard_drilldown_config/i18n.ts
 create mode 100644 x-pack/plugins/dashboard_enhanced/public/components/dashboard_drilldown_config/index.ts
 create mode 100644 x-pack/plugins/dashboard_enhanced/public/components/index.ts
 create mode 100644 x-pack/plugins/dashboard_enhanced/public/index.ts
 create mode 100644 x-pack/plugins/dashboard_enhanced/public/mocks.ts
 create mode 100644 x-pack/plugins/dashboard_enhanced/public/plugin.ts
 create mode 100644 x-pack/plugins/dashboard_enhanced/public/services/drilldowns/actions/flyout_create_drilldown/flyout_create_drilldown.test.tsx
 create mode 100644 x-pack/plugins/dashboard_enhanced/public/services/drilldowns/actions/flyout_create_drilldown/flyout_create_drilldown.tsx
 create mode 100644 x-pack/plugins/dashboard_enhanced/public/services/drilldowns/actions/flyout_create_drilldown/index.ts
 create mode 100644 x-pack/plugins/dashboard_enhanced/public/services/drilldowns/actions/flyout_edit_drilldown/flyout_edit_drilldown.test.tsx
 create mode 100644 x-pack/plugins/dashboard_enhanced/public/services/drilldowns/actions/flyout_edit_drilldown/flyout_edit_drilldown.tsx
 rename x-pack/plugins/{drilldowns/public/components/flyout_create_drilldown => dashboard_enhanced/public/services/drilldowns/actions/flyout_edit_drilldown}/i18n.ts (64%)
 create mode 100644 x-pack/plugins/dashboard_enhanced/public/services/drilldowns/actions/flyout_edit_drilldown/index.tsx
 create mode 100644 x-pack/plugins/dashboard_enhanced/public/services/drilldowns/actions/flyout_edit_drilldown/menu_item.test.tsx
 create mode 100644 x-pack/plugins/dashboard_enhanced/public/services/drilldowns/actions/flyout_edit_drilldown/menu_item.tsx
 rename x-pack/plugins/{drilldowns/public => dashboard_enhanced/public/services/drilldowns}/actions/index.ts (100%)
 create mode 100644 x-pack/plugins/dashboard_enhanced/public/services/drilldowns/actions/test_helpers.ts
 create mode 100644 x-pack/plugins/dashboard_enhanced/public/services/drilldowns/dashboard_drilldowns_services.ts
 create mode 100644 x-pack/plugins/dashboard_enhanced/public/services/drilldowns/dashboard_to_dashboard_drilldown/collect_config.test.tsx
 create mode 100644 x-pack/plugins/dashboard_enhanced/public/services/drilldowns/dashboard_to_dashboard_drilldown/collect_config.tsx
 create mode 100644 x-pack/plugins/dashboard_enhanced/public/services/drilldowns/dashboard_to_dashboard_drilldown/constants.ts
 create mode 100644 x-pack/plugins/dashboard_enhanced/public/services/drilldowns/dashboard_to_dashboard_drilldown/drilldown.test.tsx
 create mode 100644 x-pack/plugins/dashboard_enhanced/public/services/drilldowns/dashboard_to_dashboard_drilldown/drilldown.tsx
 create mode 100644 x-pack/plugins/dashboard_enhanced/public/services/drilldowns/dashboard_to_dashboard_drilldown/i18n.ts
 create mode 100644 x-pack/plugins/dashboard_enhanced/public/services/drilldowns/dashboard_to_dashboard_drilldown/index.ts
 create mode 100644 x-pack/plugins/dashboard_enhanced/public/services/drilldowns/dashboard_to_dashboard_drilldown/types.ts
 create mode 100644 x-pack/plugins/dashboard_enhanced/public/services/drilldowns/index.ts
 create mode 100644 x-pack/plugins/dashboard_enhanced/public/services/index.ts
 rename x-pack/plugins/{drilldowns/public/components/drilldown_picker/drilldown_picker.story.tsx => dashboard_enhanced/scripts/storybook.js} (53%)
 create mode 100644 x-pack/plugins/dashboard_enhanced/server/config.ts
 create mode 100644 x-pack/plugins/dashboard_enhanced/server/index.ts
 delete mode 100644 x-pack/plugins/drilldowns/public/actions/flyout_create_drilldown/index.tsx
 delete mode 100644 x-pack/plugins/drilldowns/public/actions/flyout_edit_drilldown/index.tsx
 create mode 100644 x-pack/plugins/drilldowns/public/components/connected_flyout_manage_drilldowns/connected_flyout_manage_drilldowns.story.tsx
 create mode 100644 x-pack/plugins/drilldowns/public/components/connected_flyout_manage_drilldowns/connected_flyout_manage_drilldowns.test.tsx
 create mode 100644 x-pack/plugins/drilldowns/public/components/connected_flyout_manage_drilldowns/connected_flyout_manage_drilldowns.tsx
 create mode 100644 x-pack/plugins/drilldowns/public/components/connected_flyout_manage_drilldowns/i18n.ts
 create mode 100644 x-pack/plugins/drilldowns/public/components/connected_flyout_manage_drilldowns/index.ts
 create mode 100644 x-pack/plugins/drilldowns/public/components/connected_flyout_manage_drilldowns/test_data.ts
 create mode 100644 x-pack/plugins/drilldowns/public/components/drilldown_hello_bar/i18n.ts
 delete mode 100644 x-pack/plugins/drilldowns/public/components/drilldown_picker/drilldown_picker.tsx
 delete mode 100644 x-pack/plugins/drilldowns/public/components/flyout_create_drilldown/flyout_create_drilldown.story.tsx
 delete mode 100644 x-pack/plugins/drilldowns/public/components/flyout_create_drilldown/flyout_create_drilldown.tsx
 create mode 100644 x-pack/plugins/drilldowns/public/components/flyout_drilldown_wizard/flyout_drilldown_wizard.story.tsx
 create mode 100644 x-pack/plugins/drilldowns/public/components/flyout_drilldown_wizard/flyout_drilldown_wizard.tsx
 create mode 100644 x-pack/plugins/drilldowns/public/components/flyout_drilldown_wizard/i18n.ts
 create mode 100644 x-pack/plugins/drilldowns/public/components/flyout_drilldown_wizard/index.ts
 create mode 100644 x-pack/plugins/drilldowns/public/components/flyout_list_manage_drilldowns/flyout_list_manage_drilldowns.story.tsx
 create mode 100644 x-pack/plugins/drilldowns/public/components/flyout_list_manage_drilldowns/flyout_list_manage_drilldowns.tsx
 create mode 100644 x-pack/plugins/drilldowns/public/components/flyout_list_manage_drilldowns/i18n.ts
 create mode 100644 x-pack/plugins/drilldowns/public/components/flyout_list_manage_drilldowns/index.ts
 delete mode 100644 x-pack/plugins/drilldowns/public/components/form_create_drilldown/form_create_drilldown.story.tsx
 delete mode 100644 x-pack/plugins/drilldowns/public/components/form_create_drilldown/form_create_drilldown.tsx
 create mode 100644 x-pack/plugins/drilldowns/public/components/form_drilldown_wizard/form_drilldown_wizard.story.tsx
 rename x-pack/plugins/drilldowns/public/components/{form_create_drilldown/form_create_drilldown.test.tsx => form_drilldown_wizard/form_drilldown_wizard.test.tsx} (70%)
 create mode 100644 x-pack/plugins/drilldowns/public/components/form_drilldown_wizard/form_drilldown_wizard.tsx
 rename x-pack/plugins/drilldowns/public/components/{form_create_drilldown => form_drilldown_wizard}/i18n.ts (89%)
 rename x-pack/plugins/drilldowns/public/components/{form_create_drilldown => form_drilldown_wizard}/index.tsx (85%)
 create mode 100644 x-pack/plugins/drilldowns/public/components/list_manage_drilldowns/i18n.ts
 create mode 100644 x-pack/plugins/drilldowns/public/components/list_manage_drilldowns/index.tsx
 create mode 100644 x-pack/plugins/drilldowns/public/components/list_manage_drilldowns/list_manage_drilldowns.story.tsx
 create mode 100644 x-pack/plugins/drilldowns/public/components/list_manage_drilldowns/list_manage_drilldowns.test.tsx
 create mode 100644 x-pack/plugins/drilldowns/public/components/list_manage_drilldowns/list_manage_drilldowns.tsx
 delete mode 100644 x-pack/plugins/drilldowns/public/service/drilldown_service.ts
 create mode 100644 x-pack/plugins/drilldowns/public/services/drilldown_service.ts
 rename x-pack/plugins/drilldowns/public/{service => services}/index.ts (100%)
 create mode 100644 x-pack/plugins/drilldowns/public/types.ts

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 2db898fab68bf..d48b29c89ece6 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -3,6 +3,7 @@
 # For more info, see https://help.github.com/articles/about-codeowners/
 
 # App
+/x-pack/legacy/plugins/dashboard_enhanced/ @elastic/kibana-app
 /x-pack/legacy/plugins/lens/ @elastic/kibana-app
 /x-pack/legacy/plugins/graph/ @elastic/kibana-app
 /src/legacy/server/url_shortening/ @elastic/kibana-app
diff --git a/examples/ui_action_examples/public/plugin.ts b/examples/ui_action_examples/public/plugin.ts
index c47746d4b3fd6..d053f7e82862c 100644
--- a/examples/ui_action_examples/public/plugin.ts
+++ b/examples/ui_action_examples/public/plugin.ts
@@ -46,7 +46,7 @@ export class UiActionExamplesPlugin
     }));
 
     uiActions.registerAction(helloWorldAction);
-    uiActions.attachAction(helloWorldTrigger.id, helloWorldAction);
+    uiActions.addTriggerAction(helloWorldTrigger.id, helloWorldAction);
   }
 
   public start() {}
diff --git a/examples/ui_actions_explorer/public/app.tsx b/examples/ui_actions_explorer/public/app.tsx
index 462f5c3bf88ba..f08b8bb29bdd3 100644
--- a/examples/ui_actions_explorer/public/app.tsx
+++ b/examples/ui_actions_explorer/public/app.tsx
@@ -95,8 +95,7 @@ const ActionsExplorer = ({ uiActionsApi, openModal }: Props) => {
                       );
                     },
                   });
-                  uiActionsApi.registerAction(dynamicAction);
-                  uiActionsApi.attachAction(HELLO_WORLD_TRIGGER_ID, dynamicAction);
+                  uiActionsApi.addTriggerAction(HELLO_WORLD_TRIGGER_ID, dynamicAction);
                   setConfirmationText(
                     `You've successfully added a new action: ${dynamicAction.getDisplayName(
                       {}
diff --git a/examples/ui_actions_explorer/public/plugin.tsx b/examples/ui_actions_explorer/public/plugin.tsx
index f1895905a45e1..de86b51aee3a8 100644
--- a/examples/ui_actions_explorer/public/plugin.tsx
+++ b/examples/ui_actions_explorer/public/plugin.tsx
@@ -79,21 +79,21 @@ export class UiActionsExplorerPlugin implements Plugin<void, void, {}, StartDeps
 
     const startServices = core.getStartServices();
 
-    deps.uiActions.attachAction(
+    deps.uiActions.addTriggerAction(
       USER_TRIGGER,
       createPhoneUserAction(async () => (await startServices)[1].uiActions)
     );
-    deps.uiActions.attachAction(
+    deps.uiActions.addTriggerAction(
       USER_TRIGGER,
       createEditUserAction(async () => (await startServices)[0].overlays.openModal)
     );
 
-    deps.uiActions.attachAction(COUNTRY_TRIGGER, viewInMapsAction);
-    deps.uiActions.attachAction(COUNTRY_TRIGGER, lookUpWeatherAction);
-    deps.uiActions.attachAction(COUNTRY_TRIGGER, showcasePluggability);
-    deps.uiActions.attachAction(PHONE_TRIGGER, makePhoneCallAction);
-    deps.uiActions.attachAction(PHONE_TRIGGER, showcasePluggability);
-    deps.uiActions.attachAction(USER_TRIGGER, showcasePluggability);
+    deps.uiActions.addTriggerAction(COUNTRY_TRIGGER, viewInMapsAction);
+    deps.uiActions.addTriggerAction(COUNTRY_TRIGGER, lookUpWeatherAction);
+    deps.uiActions.addTriggerAction(COUNTRY_TRIGGER, showcasePluggability);
+    deps.uiActions.addTriggerAction(PHONE_TRIGGER, makePhoneCallAction);
+    deps.uiActions.addTriggerAction(PHONE_TRIGGER, showcasePluggability);
+    deps.uiActions.addTriggerAction(USER_TRIGGER, showcasePluggability);
 
     core.application.register({
       id: 'uiActionsExplorer',
diff --git a/src/core/public/overlays/flyout/flyout_service.tsx b/src/core/public/overlays/flyout/flyout_service.tsx
index b609b2ce1d741..444430175d4f2 100644
--- a/src/core/public/overlays/flyout/flyout_service.tsx
+++ b/src/core/public/overlays/flyout/flyout_service.tsx
@@ -91,6 +91,7 @@ export interface OverlayFlyoutStart {
 export interface OverlayFlyoutOpenOptions {
   className?: string;
   closeButtonAriaLabel?: string;
+  ownFocus?: boolean;
   'data-test-subj'?: string;
 }
 
diff --git a/src/dev/storybook/aliases.ts b/src/dev/storybook/aliases.ts
index 8ed64f004c9be..370abc120d475 100644
--- a/src/dev/storybook/aliases.ts
+++ b/src/dev/storybook/aliases.ts
@@ -18,12 +18,14 @@
  */
 
 export const storybookAliases = {
+  advanced_ui_actions: 'x-pack/plugins/advanced_ui_actions/scripts/storybook.js',
   apm: 'x-pack/legacy/plugins/apm/scripts/storybook.js',
   canvas: 'x-pack/legacy/plugins/canvas/scripts/storybook_new.js',
   codeeditor: 'src/plugins/kibana_react/public/code_editor/scripts/storybook.ts',
+  dashboard_enhanced: 'x-pack/plugins/dashboard_enhanced/scripts/storybook.js',
   drilldowns: 'x-pack/plugins/drilldowns/scripts/storybook.js',
   embeddable: 'src/plugins/embeddable/scripts/storybook.js',
   infra: 'x-pack/legacy/plugins/infra/scripts/storybook.js',
   siem: 'x-pack/legacy/plugins/siem/scripts/storybook.js',
-  ui_actions: 'x-pack/plugins/advanced_ui_actions/scripts/storybook.js',
+  ui_actions: 'src/plugins/ui_actions/scripts/storybook.js',
 };
diff --git a/src/legacy/core_plugins/visualizations/public/np_ready/public/embeddable/visualize_embeddable.ts b/src/legacy/core_plugins/visualizations/public/np_ready/public/embeddable/visualize_embeddable.ts
index 342824bade3dd..4b21be83f1722 100644
--- a/src/legacy/core_plugins/visualizations/public/np_ready/public/embeddable/visualize_embeddable.ts
+++ b/src/legacy/core_plugins/visualizations/public/np_ready/public/embeddable/visualize_embeddable.ts
@@ -45,6 +45,7 @@ import { PersistedState } from '../../../../../../../plugins/visualizations/publ
 import { buildPipeline } from '../legacy/build_pipeline';
 import { Vis } from '../vis';
 import { getExpressions, getUiActions } from '../services';
+import { VisualizationsStartDeps } from '../plugin';
 import { VIS_EVENT_TO_TRIGGER } from './events';
 
 const getKeys = <T extends {}>(o: T): Array<keyof T> => Object.keys(o) as Array<keyof T>;
@@ -56,6 +57,7 @@ export interface VisualizeEmbeddableConfiguration {
   editable: boolean;
   appState?: { save(): void };
   uiState?: PersistedState;
+  uiActions?: VisualizationsStartDeps['uiActions'];
 }
 
 export interface VisualizeInput extends EmbeddableInput {
@@ -94,7 +96,7 @@ export class VisualizeEmbeddable extends Embeddable<VisualizeInput, VisualizeOut
 
   constructor(
     timefilter: TimefilterContract,
-    { vis, editUrl, indexPatterns, editable }: VisualizeEmbeddableConfiguration,
+    { vis, editUrl, indexPatterns, editable, uiActions }: VisualizeEmbeddableConfiguration,
     initialInput: VisualizeInput,
     parent?: Container
   ) {
@@ -107,7 +109,8 @@ export class VisualizeEmbeddable extends Embeddable<VisualizeInput, VisualizeOut
         editable,
         visTypeName: vis.type.name,
       },
-      parent
+      parent,
+      { uiActions }
     );
     this.timefilter = timefilter;
     this.vis = vis;
@@ -265,6 +268,7 @@ export class VisualizeEmbeddable extends Embeddable<VisualizeInput, VisualizeOut
             timeFieldName: this.vis.data.indexPattern!.timeFieldName!,
             data: event.data,
           };
+
           getUiActions()
             .getTrigger(triggerId)
             .exec(context);
diff --git a/src/legacy/core_plugins/visualizations/public/np_ready/public/embeddable/visualize_embeddable_factory.tsx b/src/legacy/core_plugins/visualizations/public/np_ready/public/embeddable/visualize_embeddable_factory.tsx
index 911f5530e97e3..0fd1352f203db 100644
--- a/src/legacy/core_plugins/visualizations/public/np_ready/public/embeddable/visualize_embeddable_factory.tsx
+++ b/src/legacy/core_plugins/visualizations/public/np_ready/public/embeddable/visualize_embeddable_factory.tsx
@@ -38,6 +38,7 @@ import {
   getTimeFilter,
 } from '../services';
 import { showNewVisModal } from '../wizard';
+import { VisualizationsStartDeps } from '../plugin';
 import { convertToSerializedVis } from '../saved_visualizations/_saved_vis';
 
 interface VisualizationAttributes extends SavedObjectAttributes {
@@ -52,7 +53,11 @@ export class VisualizeEmbeddableFactory extends EmbeddableFactory<
 > {
   public readonly type = VISUALIZE_EMBEDDABLE_TYPE;
 
-  constructor() {
+  constructor(
+    private readonly getUiActions: () => Promise<
+      Pick<VisualizationsStartDeps, 'uiActions'>['uiActions']
+    >
+  ) {
     super({
       savedObjectMetaData: {
         name: i18n.translate('visualizations.savedObjectName', { defaultMessage: 'Visualization' }),
@@ -114,6 +119,8 @@ export class VisualizeEmbeddableFactory extends EmbeddableFactory<
 
       const indexPattern = vis.data.indexPattern;
       const indexPatterns = indexPattern ? [indexPattern] : [];
+      const uiActions = await this.getUiActions();
+
       const editable = await this.isEditable();
       return new VisualizeEmbeddable(
         getTimeFilter(),
@@ -124,6 +131,7 @@ export class VisualizeEmbeddableFactory extends EmbeddableFactory<
           editable,
           appState: input.appState,
           uiState: input.uiState,
+          uiActions,
         },
         input,
         parent
diff --git a/src/legacy/core_plugins/visualizations/public/np_ready/public/mocks.ts b/src/legacy/core_plugins/visualizations/public/np_ready/public/mocks.ts
index 17f777e4e80e1..dcd11c920f17c 100644
--- a/src/legacy/core_plugins/visualizations/public/np_ready/public/mocks.ts
+++ b/src/legacy/core_plugins/visualizations/public/np_ready/public/mocks.ts
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { PluginInitializerContext } from '../../../../../../core/public';
+import { CoreSetup, PluginInitializerContext } from '../../../../../../core/public';
 import { VisualizationsSetup, VisualizationsStart } from './';
 import { VisualizationsPlugin } from './plugin';
 import { coreMock } from '../../../../../../core/public/mocks';
@@ -26,6 +26,7 @@ import { expressionsPluginMock } from '../../../../../../plugins/expressions/pub
 import { dataPluginMock } from '../../../../../../plugins/data/public/mocks';
 import { usageCollectionPluginMock } from '../../../../../../plugins/usage_collection/public/mocks';
 import { uiActionsPluginMock } from '../../../../../../plugins/ui_actions/public/mocks';
+import { VisualizationsStartDeps } from './plugin';
 
 const createSetupContract = (): VisualizationsSetup => ({
   createBaseVisualization: jest.fn(),
@@ -48,7 +49,7 @@ const createStartContract = (): VisualizationsStart => ({
 const createInstance = async () => {
   const plugin = new VisualizationsPlugin({} as PluginInitializerContext);
 
-  const setup = plugin.setup(coreMock.createSetup(), {
+  const setup = plugin.setup(coreMock.createSetup() as CoreSetup<VisualizationsStartDeps>, {
     data: dataPluginMock.createSetupContract(),
     expressions: expressionsPluginMock.createSetupContract(),
     embeddable: embeddablePluginMock.createSetupContract(),
diff --git a/src/legacy/core_plugins/visualizations/public/np_ready/public/plugin.ts b/src/legacy/core_plugins/visualizations/public/np_ready/public/plugin.ts
index 3ade6cee0d4d2..c826841e2bcf3 100644
--- a/src/legacy/core_plugins/visualizations/public/np_ready/public/plugin.ts
+++ b/src/legacy/core_plugins/visualizations/public/np_ready/public/plugin.ts
@@ -111,7 +111,7 @@ export class VisualizationsPlugin
   constructor(initializerContext: PluginInitializerContext) {}
 
   public setup(
-    core: CoreSetup,
+    core: CoreSetup<VisualizationsStartDeps>,
     { expressions, embeddable, usageCollection, data }: VisualizationsSetupDeps
   ): VisualizationsSetup {
     setUISettings(core.uiSettings);
@@ -120,7 +120,9 @@ export class VisualizationsPlugin
     expressions.registerFunction(visualizationFunction);
     expressions.registerRenderer(visualizationRenderer);
 
-    const embeddableFactory = new VisualizeEmbeddableFactory();
+    const embeddableFactory = new VisualizeEmbeddableFactory(
+      async () => (await core.getStartServices())[1].uiActions
+    );
     embeddable.registerEmbeddableFactory(VISUALIZE_EMBEDDABLE_TYPE, embeddableFactory);
 
     return {
diff --git a/src/plugins/dashboard/public/actions/replace_panel_action.tsx b/src/plugins/dashboard/public/actions/replace_panel_action.tsx
index 21ec961917d17..4e20aa3c35088 100644
--- a/src/plugins/dashboard/public/actions/replace_panel_action.tsx
+++ b/src/plugins/dashboard/public/actions/replace_panel_action.tsx
@@ -37,7 +37,7 @@ export interface ReplacePanelActionContext {
 export class ReplacePanelAction implements ActionByType<typeof ACTION_REPLACE_PANEL> {
   public readonly type = ACTION_REPLACE_PANEL;
   public readonly id = ACTION_REPLACE_PANEL;
-  public order = 11;
+  public order = 3;
 
   constructor(
     private core: CoreStart,
diff --git a/src/plugins/dashboard/public/plugin.tsx b/src/plugins/dashboard/public/plugin.tsx
index 8a6e747aac170..d663c736e5aed 100644
--- a/src/plugins/dashboard/public/plugin.tsx
+++ b/src/plugins/dashboard/public/plugin.tsx
@@ -78,7 +78,7 @@ export class DashboardEmbeddableContainerPublicPlugin
   ): Setup {
     const expandPanelAction = new ExpandPanelAction();
     uiActions.registerAction(expandPanelAction);
-    uiActions.attachAction(CONTEXT_MENU_TRIGGER, expandPanelAction);
+    uiActions.attachAction(CONTEXT_MENU_TRIGGER, expandPanelAction.id);
     const startServices = core.getStartServices();
 
     if (share) {
@@ -134,7 +134,7 @@ export class DashboardEmbeddableContainerPublicPlugin
       plugins.embeddable.getEmbeddableFactories
     );
     uiActions.registerAction(changeViewAction);
-    uiActions.attachAction(CONTEXT_MENU_TRIGGER, changeViewAction);
+    uiActions.addTriggerAction(CONTEXT_MENU_TRIGGER, changeViewAction);
   }
 
   public stop() {}
diff --git a/src/plugins/dashboard/public/tests/dashboard_container.test.tsx b/src/plugins/dashboard/public/tests/dashboard_container.test.tsx
index a81d80b440e04..4aede3f3442fb 100644
--- a/src/plugins/dashboard/public/tests/dashboard_container.test.tsx
+++ b/src/plugins/dashboard/public/tests/dashboard_container.test.tsx
@@ -49,7 +49,7 @@ test('DashboardContainer in edit mode shows edit mode actions', async () => {
 
   const editModeAction = createEditModeAction();
   uiActionsSetup.registerAction(editModeAction);
-  uiActionsSetup.attachAction(CONTEXT_MENU_TRIGGER, editModeAction);
+  uiActionsSetup.addTriggerAction(CONTEXT_MENU_TRIGGER, editModeAction);
   setup.registerEmbeddableFactory(
     CONTACT_CARD_EMBEDDABLE,
     new ContactCardEmbeddableFactory({} as any, (() => null) as any, {} as any)
diff --git a/src/plugins/data/public/plugin.ts b/src/plugins/data/public/plugin.ts
index fc5dde94fa851..ea2e85947aa12 100644
--- a/src/plugins/data/public/plugin.ts
+++ b/src/plugins/data/public/plugin.ts
@@ -109,12 +109,12 @@ export class DataPublicPlugin implements Plugin<DataPublicPluginSetup, DataPubli
       createFilterAction(queryService.filterManager, queryService.timefilter.timefilter)
     );
 
-    uiActions.attachAction(
+    uiActions.addTriggerAction(
       SELECT_RANGE_TRIGGER,
       selectRangeAction(queryService.filterManager, queryService.timefilter.timefilter)
     );
 
-    uiActions.attachAction(
+    uiActions.addTriggerAction(
       VALUE_CLICK_TRIGGER,
       valueClickAction(queryService.filterManager, queryService.timefilter.timefilter)
     );
@@ -146,7 +146,10 @@ export class DataPublicPlugin implements Plugin<DataPublicPluginSetup, DataPubli
     const search = this.searchService.start(core);
     setSearchService(search);
 
-    uiActions.attachAction(APPLY_FILTER_TRIGGER, uiActions.getAction(ACTION_GLOBAL_APPLY_FILTER));
+    uiActions.addTriggerAction(
+      APPLY_FILTER_TRIGGER,
+      uiActions.getAction(ACTION_GLOBAL_APPLY_FILTER)
+    );
 
     const dataServices = {
       actions: {
diff --git a/src/plugins/embeddable/public/lib/actions/edit_panel_action.ts b/src/plugins/embeddable/public/lib/actions/edit_panel_action.ts
index 9125dc0813f98..d37cba6f897c8 100644
--- a/src/plugins/embeddable/public/lib/actions/edit_panel_action.ts
+++ b/src/plugins/embeddable/public/lib/actions/edit_panel_action.ts
@@ -33,7 +33,7 @@ interface ActionContext {
 export class EditPanelAction implements Action<ActionContext> {
   public readonly type = ACTION_EDIT_PANEL;
   public readonly id = ACTION_EDIT_PANEL;
-  public order = 15;
+  public order = 50;
 
   constructor(private readonly getEmbeddableFactory: EmbeddableStart['getEmbeddableFactory']) {}
 
diff --git a/src/plugins/embeddable/public/lib/embeddables/embeddable.tsx b/src/plugins/embeddable/public/lib/embeddables/embeddable.tsx
index eb10c16806640..35973cc16cf9b 100644
--- a/src/plugins/embeddable/public/lib/embeddables/embeddable.tsx
+++ b/src/plugins/embeddable/public/lib/embeddables/embeddable.tsx
@@ -16,23 +16,35 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { isEqual, cloneDeep } from 'lodash';
+import { cloneDeep, isEqual } from 'lodash';
 import * as Rx from 'rxjs';
-import { Adapters } from '../types';
+import { Adapters, ViewMode } from '../types';
 import { IContainer } from '../containers';
-import { IEmbeddable, EmbeddableInput, EmbeddableOutput } from './i_embeddable';
-import { ViewMode } from '../types';
+import { EmbeddableInput, EmbeddableOutput, IEmbeddable } from './i_embeddable';
 import { TriggerContextMapping } from '../ui_actions';
 import { EmbeddableActionStorage } from './embeddable_action_storage';
+import {
+  UiActionsDynamicActionManager,
+  UiActionsStart,
+} from '../../../../../plugins/ui_actions/public';
+import { EmbeddableContext } from '../triggers';
 
 function getPanelTitle(input: EmbeddableInput, output: EmbeddableOutput) {
   return input.hidePanelTitles ? '' : input.title === undefined ? output.defaultTitle : input.title;
 }
 
+export interface EmbeddableParams {
+  uiActions?: UiActionsStart;
+}
+
 export abstract class Embeddable<
   TEmbeddableInput extends EmbeddableInput = EmbeddableInput,
   TEmbeddableOutput extends EmbeddableOutput = EmbeddableOutput
 > implements IEmbeddable<TEmbeddableInput, TEmbeddableOutput> {
+  static runtimeId: number = 0;
+
+  public readonly runtimeId = Embeddable.runtimeId++;
+
   public readonly parent?: IContainer;
   public readonly isContainer: boolean = false;
   public abstract readonly type: string;
@@ -48,15 +60,34 @@ export abstract class Embeddable<
   // to update input when the parent changes.
   private parentSubscription?: Rx.Subscription;
 
+  private storageSubscription?: Rx.Subscription;
+
   // TODO: Rename to destroyed.
   private destoyed: boolean = false;
 
-  private __actionStorage?: EmbeddableActionStorage;
-  public get actionStorage(): EmbeddableActionStorage {
-    return this.__actionStorage || (this.__actionStorage = new EmbeddableActionStorage(this));
+  private storage = new EmbeddableActionStorage((this as unknown) as Embeddable);
+
+  private cachedDynamicActions?: UiActionsDynamicActionManager;
+  public get dynamicActions(): UiActionsDynamicActionManager | undefined {
+    if (!this.params.uiActions) return undefined;
+    if (!this.cachedDynamicActions) {
+      this.cachedDynamicActions = new UiActionsDynamicActionManager({
+        isCompatible: async (context: unknown) =>
+          (context as EmbeddableContext).embeddable.runtimeId === this.runtimeId,
+        storage: this.storage,
+        uiActions: this.params.uiActions,
+      });
+    }
+
+    return this.cachedDynamicActions;
   }
 
-  constructor(input: TEmbeddableInput, output: TEmbeddableOutput, parent?: IContainer) {
+  constructor(
+    input: TEmbeddableInput,
+    output: TEmbeddableOutput,
+    parent?: IContainer,
+    public readonly params: EmbeddableParams = {}
+  ) {
     this.id = input.id;
     this.output = {
       title: getPanelTitle(input, output),
@@ -80,6 +111,18 @@ export abstract class Embeddable<
         this.onResetInput(newInput);
       });
     }
+
+    if (this.dynamicActions) {
+      this.dynamicActions.start().catch(error => {
+        /* eslint-disable */
+        console.log('Failed to start embeddable dynamic actions', this);
+        console.error(error);
+        /* eslint-enable */
+      });
+      this.storageSubscription = this.input$.subscribe(() => {
+        this.storage.reload$.next();
+      });
+    }
   }
 
   public getIsContainer(): this is IContainer {
@@ -158,6 +201,20 @@ export abstract class Embeddable<
    */
   public destroy(): void {
     this.destoyed = true;
+
+    if (this.dynamicActions) {
+      this.dynamicActions.stop().catch(error => {
+        /* eslint-disable */
+        console.log('Failed to stop embeddable dynamic actions', this);
+        console.error(error);
+        /* eslint-enable */
+      });
+    }
+
+    if (this.storageSubscription) {
+      this.storageSubscription.unsubscribe();
+    }
+
     if (this.parentSubscription) {
       this.parentSubscription.unsubscribe();
     }
diff --git a/src/plugins/embeddable/public/lib/embeddables/embeddable_action_storage.test.ts b/src/plugins/embeddable/public/lib/embeddables/embeddable_action_storage.test.ts
index 56facc37fc666..83fd3f184e098 100644
--- a/src/plugins/embeddable/public/lib/embeddables/embeddable_action_storage.test.ts
+++ b/src/plugins/embeddable/public/lib/embeddables/embeddable_action_storage.test.ts
@@ -20,7 +20,8 @@
 import { Embeddable } from './embeddable';
 import { EmbeddableInput } from './i_embeddable';
 import { ViewMode } from '../types';
-import { EmbeddableActionStorage, SerializedEvent } from './embeddable_action_storage';
+import { EmbeddableActionStorage } from './embeddable_action_storage';
+import { UiActionsSerializedEvent } from '../../../../ui_actions/public';
 import { of } from '../../../../kibana_utils/common';
 
 class TestEmbeddable extends Embeddable<EmbeddableInput> {
@@ -42,9 +43,9 @@ describe('EmbeddableActionStorage', () => {
     test('can add event to embeddable', async () => {
       const embeddable = new TestEmbeddable();
       const storage = new EmbeddableActionStorage(embeddable);
-      const event: SerializedEvent = {
+      const event: UiActionsSerializedEvent = {
         eventId: 'EVENT_ID',
-        triggerId: 'TRIGGER-ID',
+        triggers: ['TRIGGER-ID'],
         action: {} as any,
       };
 
@@ -57,23 +58,40 @@ describe('EmbeddableActionStorage', () => {
       expect(events2).toEqual([event]);
     });
 
+    test('does not merge .getInput() into .updateInput()', async () => {
+      const embeddable = new TestEmbeddable();
+      const storage = new EmbeddableActionStorage(embeddable);
+      const event: UiActionsSerializedEvent = {
+        eventId: 'EVENT_ID',
+        triggers: ['TRIGGER-ID'],
+        action: {} as any,
+      };
+
+      const spy = jest.spyOn(embeddable, 'updateInput');
+
+      await storage.create(event);
+
+      expect(spy.mock.calls[0][0].id).toBe(undefined);
+      expect(spy.mock.calls[0][0].viewMode).toBe(undefined);
+    });
+
     test('can create multiple events', async () => {
       const embeddable = new TestEmbeddable();
       const storage = new EmbeddableActionStorage(embeddable);
 
-      const event1: SerializedEvent = {
+      const event1: UiActionsSerializedEvent = {
         eventId: 'EVENT_ID1',
-        triggerId: 'TRIGGER-ID',
+        triggers: ['TRIGGER-ID'],
         action: {} as any,
       };
-      const event2: SerializedEvent = {
+      const event2: UiActionsSerializedEvent = {
         eventId: 'EVENT_ID2',
-        triggerId: 'TRIGGER-ID',
+        triggers: ['TRIGGER-ID'],
         action: {} as any,
       };
-      const event3: SerializedEvent = {
+      const event3: UiActionsSerializedEvent = {
         eventId: 'EVENT_ID3',
-        triggerId: 'TRIGGER-ID',
+        triggers: ['TRIGGER-ID'],
         action: {} as any,
       };
 
@@ -95,9 +113,9 @@ describe('EmbeddableActionStorage', () => {
     test('throws when creating an event with the same ID', async () => {
       const embeddable = new TestEmbeddable();
       const storage = new EmbeddableActionStorage(embeddable);
-      const event: SerializedEvent = {
+      const event: UiActionsSerializedEvent = {
         eventId: 'EVENT_ID',
-        triggerId: 'TRIGGER-ID',
+        triggers: ['TRIGGER-ID'],
         action: {} as any,
       };
 
@@ -122,16 +140,16 @@ describe('EmbeddableActionStorage', () => {
       const embeddable = new TestEmbeddable();
       const storage = new EmbeddableActionStorage(embeddable);
 
-      const event1: SerializedEvent = {
+      const event1: UiActionsSerializedEvent = {
         eventId: 'EVENT_ID',
-        triggerId: 'TRIGGER-ID',
+        triggers: ['TRIGGER-ID'],
         action: {
           name: 'foo',
         } as any,
       };
-      const event2: SerializedEvent = {
+      const event2: UiActionsSerializedEvent = {
         eventId: 'EVENT_ID',
-        triggerId: 'TRIGGER-ID',
+        triggers: ['TRIGGER-ID'],
         action: {
           name: 'bar',
         } as any,
@@ -148,30 +166,30 @@ describe('EmbeddableActionStorage', () => {
       const embeddable = new TestEmbeddable();
       const storage = new EmbeddableActionStorage(embeddable);
 
-      const event1: SerializedEvent = {
+      const event1: UiActionsSerializedEvent = {
         eventId: 'EVENT_ID1',
-        triggerId: 'TRIGGER-ID',
+        triggers: ['TRIGGER-ID'],
         action: {
           name: 'foo',
         } as any,
       };
-      const event2: SerializedEvent = {
+      const event2: UiActionsSerializedEvent = {
         eventId: 'EVENT_ID2',
-        triggerId: 'TRIGGER-ID',
+        triggers: ['TRIGGER-ID'],
         action: {
           name: 'bar',
         } as any,
       };
-      const event22: SerializedEvent = {
+      const event22: UiActionsSerializedEvent = {
         eventId: 'EVENT_ID2',
-        triggerId: 'TRIGGER-ID',
+        triggers: ['TRIGGER-ID'],
         action: {
           name: 'baz',
         } as any,
       };
-      const event3: SerializedEvent = {
+      const event3: UiActionsSerializedEvent = {
         eventId: 'EVENT_ID3',
-        triggerId: 'TRIGGER-ID',
+        triggers: ['TRIGGER-ID'],
         action: {
           name: 'qux',
         } as any,
@@ -199,9 +217,9 @@ describe('EmbeddableActionStorage', () => {
       const embeddable = new TestEmbeddable();
       const storage = new EmbeddableActionStorage(embeddable);
 
-      const event: SerializedEvent = {
+      const event: UiActionsSerializedEvent = {
         eventId: 'EVENT_ID',
-        triggerId: 'TRIGGER-ID',
+        triggers: ['TRIGGER-ID'],
         action: {} as any,
       };
 
@@ -217,14 +235,14 @@ describe('EmbeddableActionStorage', () => {
       const embeddable = new TestEmbeddable();
       const storage = new EmbeddableActionStorage(embeddable);
 
-      const event1: SerializedEvent = {
+      const event1: UiActionsSerializedEvent = {
         eventId: 'EVENT_ID1',
-        triggerId: 'TRIGGER-ID',
+        triggers: ['TRIGGER-ID'],
         action: {} as any,
       };
-      const event2: SerializedEvent = {
+      const event2: UiActionsSerializedEvent = {
         eventId: 'EVENT_ID2',
-        triggerId: 'TRIGGER-ID',
+        triggers: ['TRIGGER-ID'],
         action: {} as any,
       };
 
@@ -249,9 +267,9 @@ describe('EmbeddableActionStorage', () => {
       const embeddable = new TestEmbeddable();
       const storage = new EmbeddableActionStorage(embeddable);
 
-      const event: SerializedEvent = {
+      const event: UiActionsSerializedEvent = {
         eventId: 'EVENT_ID',
-        triggerId: 'TRIGGER-ID',
+        triggers: ['TRIGGER-ID'],
         action: {} as any,
       };
 
@@ -266,23 +284,23 @@ describe('EmbeddableActionStorage', () => {
       const embeddable = new TestEmbeddable();
       const storage = new EmbeddableActionStorage(embeddable);
 
-      const event1: SerializedEvent = {
+      const event1: UiActionsSerializedEvent = {
         eventId: 'EVENT_ID1',
-        triggerId: 'TRIGGER-ID',
+        triggers: ['TRIGGER-ID'],
         action: {
           name: 'foo',
         } as any,
       };
-      const event2: SerializedEvent = {
+      const event2: UiActionsSerializedEvent = {
         eventId: 'EVENT_ID2',
-        triggerId: 'TRIGGER-ID',
+        triggers: ['TRIGGER-ID'],
         action: {
           name: 'bar',
         } as any,
       };
-      const event3: SerializedEvent = {
+      const event3: UiActionsSerializedEvent = {
         eventId: 'EVENT_ID3',
-        triggerId: 'TRIGGER-ID',
+        triggers: ['TRIGGER-ID'],
         action: {
           name: 'qux',
         } as any,
@@ -327,9 +345,9 @@ describe('EmbeddableActionStorage', () => {
       const embeddable = new TestEmbeddable();
       const storage = new EmbeddableActionStorage(embeddable);
 
-      const event: SerializedEvent = {
+      const event: UiActionsSerializedEvent = {
         eventId: 'EVENT_ID',
-        triggerId: 'TRIGGER-ID',
+        triggers: ['TRIGGER-ID'],
         action: {} as any,
       };
 
@@ -355,9 +373,9 @@ describe('EmbeddableActionStorage', () => {
       const embeddable = new TestEmbeddable();
       const storage = new EmbeddableActionStorage(embeddable);
 
-      const event: SerializedEvent = {
+      const event: UiActionsSerializedEvent = {
         eventId: 'EVENT_ID',
-        triggerId: 'TRIGGER-ID',
+        triggers: ['TRIGGER-ID'],
         action: {} as any,
       };
 
@@ -383,9 +401,9 @@ describe('EmbeddableActionStorage', () => {
       const embeddable = new TestEmbeddable();
       const storage = new EmbeddableActionStorage(embeddable);
 
-      const event: SerializedEvent = {
+      const event: UiActionsSerializedEvent = {
         eventId: 'EVENT_ID',
-        triggerId: 'TRIGGER-ID',
+        triggers: ['TRIGGER-ID'],
         action: {} as any,
       };
 
@@ -402,19 +420,19 @@ describe('EmbeddableActionStorage', () => {
       const embeddable = new TestEmbeddable();
       const storage = new EmbeddableActionStorage(embeddable);
 
-      const event1: SerializedEvent = {
+      const event1: UiActionsSerializedEvent = {
         eventId: 'EVENT_ID1',
-        triggerId: 'TRIGGER-ID1',
+        triggers: ['TRIGGER-ID'],
         action: {} as any,
       };
-      const event2: SerializedEvent = {
+      const event2: UiActionsSerializedEvent = {
         eventId: 'EVENT_ID2',
-        triggerId: 'TRIGGER-ID2',
+        triggers: ['TRIGGER-ID'],
         action: {} as any,
       };
-      const event3: SerializedEvent = {
+      const event3: UiActionsSerializedEvent = {
         eventId: 'EVENT_ID3',
-        triggerId: 'TRIGGER-ID3',
+        triggers: ['TRIGGER-ID'],
         action: {} as any,
       };
 
@@ -458,7 +476,7 @@ describe('EmbeddableActionStorage', () => {
 
       await storage.create({
         eventId: 'EVENT_ID1',
-        triggerId: 'TRIGGER-ID1',
+        triggers: ['TRIGGER-ID'],
         action: {} as any,
       });
 
@@ -466,7 +484,7 @@ describe('EmbeddableActionStorage', () => {
 
       await storage.create({
         eventId: 'EVENT_ID2',
-        triggerId: 'TRIGGER-ID1',
+        triggers: ['TRIGGER-ID'],
         action: {} as any,
       });
 
@@ -502,15 +520,15 @@ describe('EmbeddableActionStorage', () => {
       const embeddable = new TestEmbeddable();
       const storage = new EmbeddableActionStorage(embeddable);
 
-      const event1: SerializedEvent = {
+      const event1: UiActionsSerializedEvent = {
         eventId: 'EVENT_ID1',
-        triggerId: 'TRIGGER-ID1',
+        triggers: ['TRIGGER-ID'],
         action: {} as any,
       };
 
-      const event2: SerializedEvent = {
+      const event2: UiActionsSerializedEvent = {
         eventId: 'EVENT_ID2',
-        triggerId: 'TRIGGER-ID1',
+        triggers: ['TRIGGER-ID'],
         action: {} as any,
       };
 
diff --git a/src/plugins/embeddable/public/lib/embeddables/embeddable_action_storage.ts b/src/plugins/embeddable/public/lib/embeddables/embeddable_action_storage.ts
index 520f92840c5f9..fad5b4d535d6c 100644
--- a/src/plugins/embeddable/public/lib/embeddables/embeddable_action_storage.ts
+++ b/src/plugins/embeddable/public/lib/embeddables/embeddable_action_storage.ts
@@ -17,32 +17,20 @@
  * under the License.
  */
 
+import {
+  UiActionsAbstractActionStorage,
+  UiActionsSerializedEvent,
+} from '../../../../ui_actions/public';
 import { Embeddable } from '..';
 
-/**
- * Below two interfaces are here temporarily, they will move to `ui_actions`
- * plugin once #58216 is merged.
- */
-export interface SerializedEvent {
-  eventId: string;
-  triggerId: string;
-  action: unknown;
-}
-export interface ActionStorage {
-  create(event: SerializedEvent): Promise<void>;
-  update(event: SerializedEvent): Promise<void>;
-  remove(eventId: string): Promise<void>;
-  read(eventId: string): Promise<SerializedEvent>;
-  count(): Promise<number>;
-  list(): Promise<SerializedEvent[]>;
-}
-
-export class EmbeddableActionStorage implements ActionStorage {
-  constructor(private readonly embbeddable: Embeddable<any, any>) {}
+export class EmbeddableActionStorage extends UiActionsAbstractActionStorage {
+  constructor(private readonly embbeddable: Embeddable) {
+    super();
+  }
 
-  async create(event: SerializedEvent) {
+  async create(event: UiActionsSerializedEvent) {
     const input = this.embbeddable.getInput();
-    const events = (input.events || []) as SerializedEvent[];
+    const events = (input.events || []) as UiActionsSerializedEvent[];
     const exists = !!events.find(({ eventId }) => eventId === event.eventId);
 
     if (exists) {
@@ -53,14 +41,13 @@ export class EmbeddableActionStorage implements ActionStorage {
     }
 
     this.embbeddable.updateInput({
-      ...input,
       events: [...events, event],
     });
   }
 
-  async update(event: SerializedEvent) {
+  async update(event: UiActionsSerializedEvent) {
     const input = this.embbeddable.getInput();
-    const events = (input.events || []) as SerializedEvent[];
+    const events = (input.events || []) as UiActionsSerializedEvent[];
     const index = events.findIndex(({ eventId }) => eventId === event.eventId);
 
     if (index === -1) {
@@ -72,14 +59,13 @@ export class EmbeddableActionStorage implements ActionStorage {
     }
 
     this.embbeddable.updateInput({
-      ...input,
       events: [...events.slice(0, index), event, ...events.slice(index + 1)],
     });
   }
 
   async remove(eventId: string) {
     const input = this.embbeddable.getInput();
-    const events = (input.events || []) as SerializedEvent[];
+    const events = (input.events || []) as UiActionsSerializedEvent[];
     const index = events.findIndex(event => eventId === event.eventId);
 
     if (index === -1) {
@@ -91,14 +77,13 @@ export class EmbeddableActionStorage implements ActionStorage {
     }
 
     this.embbeddable.updateInput({
-      ...input,
       events: [...events.slice(0, index), ...events.slice(index + 1)],
     });
   }
 
-  async read(eventId: string): Promise<SerializedEvent> {
+  async read(eventId: string): Promise<UiActionsSerializedEvent> {
     const input = this.embbeddable.getInput();
-    const events = (input.events || []) as SerializedEvent[];
+    const events = (input.events || []) as UiActionsSerializedEvent[];
     const event = events.find(ev => eventId === ev.eventId);
 
     if (!event) {
@@ -113,14 +98,10 @@ export class EmbeddableActionStorage implements ActionStorage {
 
   private __list() {
     const input = this.embbeddable.getInput();
-    return (input.events || []) as SerializedEvent[];
-  }
-
-  async count(): Promise<number> {
-    return this.__list().length;
+    return (input.events || []) as UiActionsSerializedEvent[];
   }
 
-  async list(): Promise<SerializedEvent[]> {
+  async list(): Promise<UiActionsSerializedEvent[]> {
     return this.__list();
   }
 }
diff --git a/src/plugins/embeddable/public/lib/embeddables/i_embeddable.ts b/src/plugins/embeddable/public/lib/embeddables/i_embeddable.ts
index 6345c34b0dda2..9a4452aceba00 100644
--- a/src/plugins/embeddable/public/lib/embeddables/i_embeddable.ts
+++ b/src/plugins/embeddable/public/lib/embeddables/i_embeddable.ts
@@ -18,6 +18,7 @@
  */
 
 import { Observable } from 'rxjs';
+import { UiActionsDynamicActionManager } from '../../../../../plugins/ui_actions/public';
 import { Adapters } from '../types';
 import { IContainer } from '../containers/i_container';
 import { ViewMode } from '../types';
@@ -33,7 +34,7 @@ export interface EmbeddableInput {
   /**
    * Reserved key for `ui_actions` events.
    */
-  events?: unknown;
+  events?: Array<{ eventId: string }>;
 
   /**
    * List of action IDs that this embeddable should not render.
@@ -82,6 +83,19 @@ export interface IEmbeddable<
    **/
   readonly id: string;
 
+  /**
+   * Unique ID an embeddable is assigned each time it is initialized. This ID
+   * is different for different instances of the same embeddable. For example,
+   * if the same dashboard is rendered twice on the screen, all embeddable
+   * instances will have a unique `runtimeId`.
+   */
+  readonly runtimeId?: number;
+
+  /**
+   * Default implementation of dynamic action API for embeddables.
+   */
+  dynamicActions?: UiActionsDynamicActionManager;
+
   /**
    * A functional representation of the isContainer variable, but helpful for typescript to
    * know the shape if this returns true
diff --git a/src/plugins/embeddable/public/lib/panel/embeddable_panel.test.tsx b/src/plugins/embeddable/public/lib/panel/embeddable_panel.test.tsx
index 757d4e6bfddef..83d3d5e10761b 100644
--- a/src/plugins/embeddable/public/lib/panel/embeddable_panel.test.tsx
+++ b/src/plugins/embeddable/public/lib/panel/embeddable_panel.test.tsx
@@ -44,7 +44,7 @@ import {
 import { inspectorPluginMock } from 'src/plugins/inspector/public/mocks';
 import { EuiBadge } from '@elastic/eui';
 
-const actionRegistry = new Map<string, Action<object | undefined | string | number>>();
+const actionRegistry = new Map<string, Action>();
 const triggerRegistry = new Map<string, Trigger>();
 const embeddableFactories = new Map<string, EmbeddableFactory>();
 const getEmbeddableFactory = (id: string) => embeddableFactories.get(id);
@@ -213,13 +213,17 @@ const renderInEditModeAndOpenContextMenu = async (
 };
 
 test('HelloWorldContainer in edit mode hides disabledActions', async () => {
-  const action: Action = {
+  const action = {
     id: 'FOO',
     type: 'FOO' as ActionType,
     getIconType: () => undefined,
     getDisplayName: () => 'foo',
     isCompatible: async () => true,
     execute: async () => {},
+    order: 10,
+    getHref: () => {
+      return undefined;
+    },
   };
   const getActions = () => Promise.resolve([action]);
 
@@ -245,13 +249,17 @@ test('HelloWorldContainer in edit mode hides disabledActions', async () => {
 });
 
 test('HelloWorldContainer hides disabled badges', async () => {
-  const action: Action = {
+  const action = {
     id: 'BAR',
     type: 'BAR' as ActionType,
     getIconType: () => undefined,
     getDisplayName: () => 'bar',
     isCompatible: async () => true,
     execute: async () => {},
+    order: 10,
+    getHref: () => {
+      return undefined;
+    },
   };
   const getActions = () => Promise.resolve([action]);
 
diff --git a/src/plugins/embeddable/public/lib/panel/embeddable_panel.tsx b/src/plugins/embeddable/public/lib/panel/embeddable_panel.tsx
index b95060a73252f..c6537f2d94994 100644
--- a/src/plugins/embeddable/public/lib/panel/embeddable_panel.tsx
+++ b/src/plugins/embeddable/public/lib/panel/embeddable_panel.tsx
@@ -38,6 +38,14 @@ import { EditPanelAction } from '../actions';
 import { CustomizePanelModal } from './panel_header/panel_actions/customize_title/customize_panel_modal';
 import { EmbeddableStart } from '../../plugin';
 
+const sortByOrderField = (
+  { order: orderA }: { order?: number },
+  { order: orderB }: { order?: number }
+) => (orderB || 0) - (orderA || 0);
+
+const removeById = (disabledActions: string[]) => ({ id }: { id: string }) =>
+  disabledActions.indexOf(id) === -1;
+
 interface Props {
   embeddable: IEmbeddable<any, any>;
   getActions: UiActionsService['getTriggerCompatibleActions'];
@@ -57,12 +65,14 @@ interface State {
   hidePanelTitles: boolean;
   closeContextMenu: boolean;
   badges: Array<Action<EmbeddableContext>>;
+  eventCount?: number;
 }
 
 export class EmbeddablePanel extends React.Component<Props, State> {
   private embeddableRoot: React.RefObject<HTMLDivElement>;
   private parentSubscription?: Subscription;
   private subscription?: Subscription;
+  private eventCountSubscription?: Subscription;
   private mounted: boolean = false;
   private generateId = htmlIdGenerator();
 
@@ -136,6 +146,9 @@ export class EmbeddablePanel extends React.Component<Props, State> {
     if (this.subscription) {
       this.subscription.unsubscribe();
     }
+    if (this.eventCountSubscription) {
+      this.eventCountSubscription.unsubscribe();
+    }
     if (this.parentSubscription) {
       this.parentSubscription.unsubscribe();
     }
@@ -177,6 +190,7 @@ export class EmbeddablePanel extends React.Component<Props, State> {
             badges={this.state.badges}
             embeddable={this.props.embeddable}
             headerId={headerId}
+            eventCount={this.state.eventCount}
           />
         )}
         <div className="embPanel__content" ref={this.embeddableRoot} />
@@ -188,6 +202,15 @@ export class EmbeddablePanel extends React.Component<Props, State> {
     if (this.embeddableRoot.current) {
       this.props.embeddable.render(this.embeddableRoot.current);
     }
+
+    const dynamicActions = this.props.embeddable.dynamicActions;
+    if (dynamicActions) {
+      this.setState({ eventCount: dynamicActions.state.get().events.length });
+      this.eventCountSubscription = dynamicActions.state.state$.subscribe(({ events }) => {
+        if (!this.mounted) return;
+        this.setState({ eventCount: events.length });
+      });
+    }
   }
 
   closeMyContextMenuPanel = () => {
@@ -201,13 +224,14 @@ export class EmbeddablePanel extends React.Component<Props, State> {
   };
 
   private getActionContextMenuPanel = async () => {
-    let actions = await this.props.getActions(CONTEXT_MENU_TRIGGER, {
+    let regularActions = await this.props.getActions(CONTEXT_MENU_TRIGGER, {
       embeddable: this.props.embeddable,
     });
 
     const { disabledActions } = this.props.embeddable.getInput();
     if (disabledActions) {
-      actions = actions.filter(action => disabledActions.indexOf(action.id) === -1);
+      const removeDisabledActions = removeById(disabledActions);
+      regularActions = regularActions.filter(removeDisabledActions);
     }
 
     const createGetUserData = (overlays: OverlayStart) =>
@@ -246,16 +270,10 @@ export class EmbeddablePanel extends React.Component<Props, State> {
       new EditPanelAction(this.props.getEmbeddableFactory),
     ];
 
-    const sorted = actions
-      .concat(extraActions)
-      .sort((a: Action<EmbeddableContext>, b: Action<EmbeddableContext>) => {
-        const bOrder = b.order || 0;
-        const aOrder = a.order || 0;
-        return bOrder - aOrder;
-      });
+    const sortedActions = [...regularActions, ...extraActions].sort(sortByOrderField);
 
     return await buildContextMenuForActions({
-      actions: sorted,
+      actions: sortedActions,
       actionContext: { embeddable: this.props.embeddable },
       closeMenu: this.closeMyContextMenuPanel,
     });
diff --git a/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/customize_title/customize_panel_action.ts b/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/customize_title/customize_panel_action.ts
index c0e43c0538833..36957c3b79491 100644
--- a/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/customize_title/customize_panel_action.ts
+++ b/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/customize_title/customize_panel_action.ts
@@ -33,15 +33,13 @@ interface ActionContext {
 export class CustomizePanelTitleAction implements Action<ActionContext> {
   public readonly type = ACTION_CUSTOMIZE_PANEL;
   public id = ACTION_CUSTOMIZE_PANEL;
-  public order = 10;
+  public order = 40;
 
-  constructor(private readonly getDataFromUser: GetUserData) {
-    this.order = 10;
-  }
+  constructor(private readonly getDataFromUser: GetUserData) {}
 
   public getDisplayName() {
     return i18n.translate('embeddableApi.customizePanel.action.displayName', {
-      defaultMessage: 'Customize panel',
+      defaultMessage: 'Edit panel title',
     });
   }
 
diff --git a/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/inspect_panel_action.ts b/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/inspect_panel_action.ts
index d04f35715537c..ae9645767b267 100644
--- a/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/inspect_panel_action.ts
+++ b/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/inspect_panel_action.ts
@@ -31,7 +31,7 @@ interface ActionContext {
 export class InspectPanelAction implements Action<ActionContext> {
   public readonly type = ACTION_INSPECT_PANEL;
   public readonly id = ACTION_INSPECT_PANEL;
-  public order = 10;
+  public order = 20;
 
   constructor(private readonly inspector: InspectorStartContract) {}
 
diff --git a/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/remove_panel_action.ts b/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/remove_panel_action.ts
index ee7948f3d6a4a..a6d4128f3f106 100644
--- a/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/remove_panel_action.ts
+++ b/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/remove_panel_action.ts
@@ -41,7 +41,7 @@ function hasExpandedPanelInput(
 export class RemovePanelAction implements Action<ActionContext> {
   public readonly type = REMOVE_PANEL_ACTION;
   public readonly id = REMOVE_PANEL_ACTION;
-  public order = 5;
+  public order = 1;
 
   constructor() {}
 
diff --git a/src/plugins/embeddable/public/lib/panel/panel_header/panel_header.tsx b/src/plugins/embeddable/public/lib/panel/panel_header/panel_header.tsx
index 99516a1d21d6f..2a856af7ae916 100644
--- a/src/plugins/embeddable/public/lib/panel/panel_header/panel_header.tsx
+++ b/src/plugins/embeddable/public/lib/panel/panel_header/panel_header.tsx
@@ -23,6 +23,7 @@ import {
   EuiIcon,
   EuiToolTip,
   EuiScreenReaderOnly,
+  EuiNotificationBadge,
 } from '@elastic/eui';
 import classNames from 'classnames';
 import React from 'react';
@@ -40,6 +41,7 @@ export interface PanelHeaderProps {
   badges: Array<Action<EmbeddableContext>>;
   embeddable: IEmbeddable;
   headerId?: string;
+  eventCount?: number;
 }
 
 function renderBadges(badges: Array<Action<EmbeddableContext>>, embeddable: IEmbeddable) {
@@ -90,6 +92,7 @@ export function PanelHeader({
   badges,
   embeddable,
   headerId,
+  eventCount,
 }: PanelHeaderProps) {
   const viewDescription = getViewDescription(embeddable);
   const showTitle = !isViewMode || (title && !hidePanelTitles) || viewDescription !== '';
@@ -147,7 +150,11 @@ export function PanelHeader({
         )}
         {renderBadges(badges, embeddable)}
       </h2>
-
+      {!isViewMode && !!eventCount && (
+        <EuiNotificationBadge style={{ marginTop: '4px', marginRight: '4px' }}>
+          {eventCount}
+        </EuiNotificationBadge>
+      )}
       <PanelOptionsMenu
         isViewMode={isViewMode}
         getActionContextMenuPanel={getActionContextMenuPanel}
diff --git a/src/plugins/kibana_utils/common/state_containers/create_state_container_react_helpers.ts b/src/plugins/kibana_utils/common/state_containers/create_state_container_react_helpers.ts
index 36903f2d7c90f..90823359359a1 100644
--- a/src/plugins/kibana_utils/common/state_containers/create_state_container_react_helpers.ts
+++ b/src/plugins/kibana_utils/common/state_containers/create_state_container_react_helpers.ts
@@ -24,15 +24,58 @@ import { Comparator, Connect, StateContainer, UnboxState } from './types';
 
 const { useContext, useLayoutEffect, useRef, createElement: h } = React;
 
+/**
+ * Returns the latest state of a state container.
+ *
+ * @param container State container which state to track.
+ */
+export const useContainerState = <Container extends StateContainer<any, any>>(
+  container: Container
+): UnboxState<Container> => useObservable(container.state$, container.get());
+
+/**
+ * Apply selector to state container to extract only needed information. Will
+ * re-render your component only when the section changes.
+ *
+ * @param container State container which state to track.
+ * @param selector Function used to pick parts of state.
+ * @param comparator Comparator function used to memoize previous result, to not
+ *    re-render React component if state did not change. By default uses
+ *    `fast-deep-equal` package.
+ */
+export const useContainerSelector = <Container extends StateContainer<any, any>, Result>(
+  container: Container,
+  selector: (state: UnboxState<Container>) => Result,
+  comparator: Comparator<Result> = defaultComparator
+): Result => {
+  const { state$, get } = container;
+  const lastValueRef = useRef<Result>(get());
+  const [value, setValue] = React.useState<Result>(() => {
+    const newValue = selector(get());
+    lastValueRef.current = newValue;
+    return newValue;
+  });
+  useLayoutEffect(() => {
+    const subscription = state$.subscribe((currentState: UnboxState<Container>) => {
+      const newValue = selector(currentState);
+      if (!comparator(lastValueRef.current, newValue)) {
+        lastValueRef.current = newValue;
+        setValue(newValue);
+      }
+    });
+    return () => subscription.unsubscribe();
+  }, [state$, comparator]);
+  return value;
+};
+
 export const createStateContainerReactHelpers = <Container extends StateContainer<any, any>>() => {
   const context = React.createContext<Container>(null as any);
 
   const useContainer = (): Container => useContext(context);
 
   const useState = (): UnboxState<Container> => {
-    const { state$, get } = useContainer();
-    const value = useObservable(state$, get());
-    return value;
+    const container = useContainer();
+    return useContainerState(container);
   };
 
   const useTransitions: () => Container['transitions'] = () => useContainer().transitions;
@@ -41,24 +84,8 @@ export const createStateContainerReactHelpers = <Container extends StateContaine
     selector: (state: UnboxState<Container>) => Result,
     comparator: Comparator<Result> = defaultComparator
   ): Result => {
-    const { state$, get } = useContainer();
-    const lastValueRef = useRef<Result>(get());
-    const [value, setValue] = React.useState<Result>(() => {
-      const newValue = selector(get());
-      lastValueRef.current = newValue;
-      return newValue;
-    });
-    useLayoutEffect(() => {
-      const subscription = state$.subscribe((currentState: UnboxState<Container>) => {
-        const newValue = selector(currentState);
-        if (!comparator(lastValueRef.current, newValue)) {
-          lastValueRef.current = newValue;
-          setValue(newValue);
-        }
-      });
-      return () => subscription.unsubscribe();
-    }, [state$, comparator]);
-    return value;
+    const container = useContainer();
+    return useContainerSelector<Container, Result>(container, selector, comparator);
   };
 
   const connect: Connect<UnboxState<Container>> = mapStateToProp => component => props =>
diff --git a/src/plugins/kibana_utils/common/state_containers/types.ts b/src/plugins/kibana_utils/common/state_containers/types.ts
index 26a29bc470e8a..29ffa4cd486b5 100644
--- a/src/plugins/kibana_utils/common/state_containers/types.ts
+++ b/src/plugins/kibana_utils/common/state_containers/types.ts
@@ -43,7 +43,7 @@ export interface BaseStateContainer<State extends BaseState> {
 
 export interface StateContainer<
   State extends BaseState,
-  PureTransitions extends object,
+  PureTransitions extends object = object,
   PureSelectors extends object = {}
 > extends BaseStateContainer<State> {
   transitions: Readonly<PureTransitionsToTransitions<PureTransitions>>;
diff --git a/src/plugins/kibana_utils/index.ts b/src/plugins/kibana_utils/index.ts
new file mode 100644
index 0000000000000..14d6e52dc0465
--- /dev/null
+++ b/src/plugins/kibana_utils/index.ts
@@ -0,0 +1,20 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+export { createStateContainer, StateContainer, of } from './common';
diff --git a/src/plugins/ui_actions/public/actions/action.ts b/src/plugins/ui_actions/public/actions/action.ts
index 2b2fc004a84c6..15f1d6dd79289 100644
--- a/src/plugins/ui_actions/public/actions/action.ts
+++ b/src/plugins/ui_actions/public/actions/action.ts
@@ -19,10 +19,12 @@
 
 import { UiComponent } from 'src/plugins/kibana_utils/common';
 import { ActionType, ActionContextMapping } from '../types';
+import { Presentable } from '../util/presentable';
 
 export type ActionByType<T extends ActionType> = Action<ActionContextMapping[T], T>;
 
-export interface Action<Context = {}, T = ActionType> {
+export interface Action<Context extends {} = {}, T = ActionType>
+  extends Partial<Presentable<Context>> {
   /**
    * Determined the order when there is more than one action matched to a trigger.
    * Higher numbers are displayed first.
@@ -63,12 +65,30 @@ export interface Action<Context = {}, T = ActionType> {
   isCompatible(context: Context): Promise<boolean>;
 
   /**
-   * If this returns something truthy, this is used in addition to the `execute` method when clicked.
+   * Executes the action.
    */
-  getHref?(context: Context): string | undefined;
+  execute(context: Context): Promise<void>;
+}
+
+/**
+ * A convenience interface used to register an action.
+ */
+export interface ActionDefinition<Context extends object = object>
+  extends Partial<Presentable<Context>> {
+  /**
+   * ID of the action that uniquely identifies this action in the actions registry.
+   */
+  readonly id: string;
+
+  /**
+   * ID of the factory for this action. Used to construct dynamic actions.
+   */
+  readonly type?: ActionType;
 
   /**
    * Executes the action.
    */
   execute(context: Context): Promise<void>;
 }
+
+export type ActionContext<A> = A extends ActionDefinition<infer Context> ? Context : never;
diff --git a/src/plugins/ui_actions/public/actions/action_factory.ts b/src/plugins/ui_actions/public/actions/action_factory.ts
new file mode 100644
index 0000000000000..bc0ec844d00f5
--- /dev/null
+++ b/src/plugins/ui_actions/public/actions/action_factory.ts
@@ -0,0 +1,71 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { uiToReactComponent } from '../../../kibana_react/public';
+import { Presentable } from '../util/presentable';
+import { ActionDefinition } from './action';
+import { ActionFactoryDefinition } from './action_factory_definition';
+import { Configurable } from '../util';
+import { SerializedAction } from './types';
+
+export class ActionFactory<
+  Config extends object = object,
+  FactoryContext extends object = object,
+  ActionContext extends object = object
+> implements Presentable<FactoryContext>, Configurable<Config, FactoryContext> {
+  constructor(
+    protected readonly def: ActionFactoryDefinition<Config, FactoryContext, ActionContext>
+  ) {}
+
+  public readonly id = this.def.id;
+  public readonly order = this.def.order || 0;
+  public readonly MenuItem? = this.def.MenuItem;
+  public readonly ReactMenuItem? = this.MenuItem ? uiToReactComponent(this.MenuItem) : undefined;
+
+  public readonly CollectConfig = this.def.CollectConfig;
+  public readonly ReactCollectConfig = uiToReactComponent(this.CollectConfig);
+  public readonly createConfig = this.def.createConfig;
+  public readonly isConfigValid = this.def.isConfigValid;
+
+  public getIconType(context: FactoryContext): string | undefined {
+    if (!this.def.getIconType) return undefined;
+    return this.def.getIconType(context);
+  }
+
+  public getDisplayName(context: FactoryContext): string {
+    if (!this.def.getDisplayName) return '';
+    return this.def.getDisplayName(context);
+  }
+
+  public async isCompatible(context: FactoryContext): Promise<boolean> {
+    if (!this.def.isCompatible) return true;
+    return await this.def.isCompatible(context);
+  }
+
+  public getHref(context: FactoryContext): string | undefined {
+    if (!this.def.getHref) return undefined;
+    return this.def.getHref(context);
+  }
+
+  public create(
+    serializedAction: Omit<SerializedAction<Config>, 'factoryId'>
+  ): ActionDefinition<ActionContext> {
+    return this.def.create(serializedAction);
+  }
+}
diff --git a/src/plugins/ui_actions/public/actions/action_factory_definition.ts b/src/plugins/ui_actions/public/actions/action_factory_definition.ts
new file mode 100644
index 0000000000000..7ac94a41e7076
--- /dev/null
+++ b/src/plugins/ui_actions/public/actions/action_factory_definition.ts
@@ -0,0 +1,46 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { ActionDefinition } from './action';
+import { Presentable, Configurable } from '../util';
+import { SerializedAction } from './types';
+
+/**
+ * This is a convenience interface for registering new action factories.
+ */
+export interface ActionFactoryDefinition<
+  Config extends object = object,
+  FactoryContext extends object = object,
+  ActionContext extends object = object
+> extends Partial<Presentable<FactoryContext>>, Configurable<Config, FactoryContext> {
+  /**
+   * Unique ID of the action factory. This ID is used to identify this action
+   * factory in the registry as well as to construct actions of this type and
+   * identify this action factory when presenting it to the user in UI.
+   */
+  id: string;
+
+  /**
+   * This method should return a definition of a new action, normally used to
+   * register it in `ui_actions` registry.
+   */
+  create(
+    serializedAction: Omit<SerializedAction<Config>, 'factoryId'>
+  ): ActionDefinition<ActionContext>;
+}
diff --git a/src/plugins/ui_actions/public/actions/action_internal.test.ts b/src/plugins/ui_actions/public/actions/action_internal.test.ts
new file mode 100644
index 0000000000000..b14346180c274
--- /dev/null
+++ b/src/plugins/ui_actions/public/actions/action_internal.test.ts
@@ -0,0 +1,33 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { ActionDefinition } from './action';
+import { ActionInternal } from './action_internal';
+
+const defaultActionDef: ActionDefinition = {
+  id: 'test-action',
+  execute: jest.fn(),
+};
+
+describe('ActionInternal', () => {
+  test('can instantiate from action definition', () => {
+    const action = new ActionInternal(defaultActionDef);
+    expect(action.id).toBe('test-action');
+  });
+});
diff --git a/src/plugins/ui_actions/public/actions/action_internal.ts b/src/plugins/ui_actions/public/actions/action_internal.ts
new file mode 100644
index 0000000000000..245ded991c032
--- /dev/null
+++ b/src/plugins/ui_actions/public/actions/action_internal.ts
@@ -0,0 +1,58 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { Action, ActionContext as Context, ActionDefinition } from './action';
+import { Presentable } from '../util/presentable';
+import { uiToReactComponent } from '../../../kibana_react/public';
+import { ActionType } from '../types';
+
+export class ActionInternal<A extends ActionDefinition = ActionDefinition>
+  implements Action<Context<A>>, Presentable<Context<A>> {
+  constructor(public readonly definition: A) {}
+
+  public readonly id: string = this.definition.id;
+  public readonly type: ActionType = this.definition.type || '';
+  public readonly order: number = this.definition.order || 0;
+  public readonly MenuItem? = this.definition.MenuItem;
+  public readonly ReactMenuItem? = this.MenuItem ? uiToReactComponent(this.MenuItem) : undefined;
+
+  public execute(context: Context<A>) {
+    return this.definition.execute(context);
+  }
+
+  public getIconType(context: Context<A>): string | undefined {
+    if (!this.definition.getIconType) return undefined;
+    return this.definition.getIconType(context);
+  }
+
+  public getDisplayName(context: Context<A>): string {
+    if (!this.definition.getDisplayName) return `Action: ${this.id}`;
+    return this.definition.getDisplayName(context);
+  }
+
+  public async isCompatible(context: Context<A>): Promise<boolean> {
+    if (!this.definition.isCompatible) return true;
+    return await this.definition.isCompatible(context);
+  }
+
+  public getHref(context: Context<A>): string | undefined {
+    if (!this.definition.getHref) return undefined;
+    return this.definition.getHref(context);
+  }
+}
diff --git a/src/plugins/ui_actions/public/actions/create_action.ts b/src/plugins/ui_actions/public/actions/create_action.ts
index 90a9415c0b497..8f1cd23715d3f 100644
--- a/src/plugins/ui_actions/public/actions/create_action.ts
+++ b/src/plugins/ui_actions/public/actions/create_action.ts
@@ -17,11 +17,19 @@
  * under the License.
  */
 
+import { ActionContextMapping } from '../types';
 import { ActionByType } from './action';
 import { ActionType } from '../types';
-import { ActionDefinition } from './action_definition';
+import { ActionDefinition } from './action';
 
-export function createAction<T extends ActionType>(action: ActionDefinition<T>): ActionByType<T> {
+interface ActionDefinitionByType<T extends ActionType>
+  extends Omit<ActionDefinition<ActionContextMapping[T]>, 'id'> {
+  id?: string;
+}
+
+export function createAction<T extends ActionType>(
+  action: ActionDefinitionByType<T>
+): ActionByType<T> {
   return {
     getIconType: () => undefined,
     order: 0,
@@ -30,5 +38,5 @@ export function createAction<T extends ActionType>(action: ActionDefinition<T>):
     getDisplayName: () => '',
     getHref: () => undefined,
     ...action,
-  };
+  } as ActionByType<T>;
 }
diff --git a/src/plugins/ui_actions/public/actions/dynamic_action_manager.test.ts b/src/plugins/ui_actions/public/actions/dynamic_action_manager.test.ts
new file mode 100644
index 0000000000000..2574a9e529ebf
--- /dev/null
+++ b/src/plugins/ui_actions/public/actions/dynamic_action_manager.test.ts
@@ -0,0 +1,646 @@
+/*
+ * 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 { DynamicActionManager } from './dynamic_action_manager';
+import { ActionStorage, MemoryActionStorage, SerializedEvent } from './dynamic_action_storage';
+import { UiActionsService } from '../service';
+import { ActionFactoryDefinition } from './action_factory_definition';
+import { ActionRegistry } from '../types';
+import { SerializedAction } from './types';
+import { of } from '../../../kibana_utils';
+
+const actionFactoryDefinition1: ActionFactoryDefinition = {
+  id: 'ACTION_FACTORY_1',
+  CollectConfig: {} as any,
+  createConfig: () => ({}),
+  isConfigValid: (() => true) as any,
+  create: ({ name }) => ({
+    id: '',
+    execute: async () => {},
+    getDisplayName: () => name,
+  }),
+};
+
+const actionFactoryDefinition2: ActionFactoryDefinition = {
+  id: 'ACTION_FACTORY_2',
+  CollectConfig: {} as any,
+  createConfig: () => ({}),
+  isConfigValid: (() => true) as any,
+  create: ({ name }) => ({
+    id: '',
+    execute: async () => {},
+    getDisplayName: () => name,
+  }),
+};
+
+const event1: SerializedEvent = {
+  eventId: 'EVENT_ID_1',
+  triggers: ['VALUE_CLICK_TRIGGER'],
+  action: {
+    factoryId: actionFactoryDefinition1.id,
+    name: 'Action 1',
+    config: {},
+  },
+};
+
+const event2: SerializedEvent = {
+  eventId: 'EVENT_ID_2',
+  triggers: ['VALUE_CLICK_TRIGGER'],
+  action: {
+    factoryId: actionFactoryDefinition1.id,
+    name: 'Action 2',
+    config: {},
+  },
+};
+
+const event3: SerializedEvent = {
+  eventId: 'EVENT_ID_3',
+  triggers: ['VALUE_CLICK_TRIGGER'],
+  action: {
+    factoryId: actionFactoryDefinition2.id,
+    name: 'Action 3',
+    config: {},
+  },
+};
+
+const setup = (events: readonly SerializedEvent[] = []) => {
+  const isCompatible = async () => true;
+  const storage: ActionStorage = new MemoryActionStorage(events);
+  const actions: ActionRegistry = new Map();
+  const uiActions = new UiActionsService({
+    actions,
+  });
+  const manager = new DynamicActionManager({
+    isCompatible,
+    storage,
+    uiActions,
+  });
+
+  uiActions.registerTrigger({
+    id: 'VALUE_CLICK_TRIGGER',
+  });
+
+  return {
+    isCompatible,
+    actions,
+    storage,
+    uiActions,
+    manager,
+  };
+};
+
+describe('DynamicActionManager', () => {
+  test('can instantiate', () => {
+    const { manager } = setup([event1]);
+    expect(manager).toBeInstanceOf(DynamicActionManager);
+  });
+
+  describe('.start()', () => {
+    test('instantiates stored events', async () => {
+      const { manager, actions, uiActions } = setup([event1]);
+      const create1 = jest.fn();
+      const create2 = jest.fn();
+
+      uiActions.registerActionFactory({ ...actionFactoryDefinition1, create: create1 });
+      uiActions.registerActionFactory({ ...actionFactoryDefinition2, create: create2 });
+
+      expect(create1).toHaveBeenCalledTimes(0);
+      expect(create2).toHaveBeenCalledTimes(0);
+      expect(actions.size).toBe(0);
+
+      await manager.start();
+
+      expect(create1).toHaveBeenCalledTimes(1);
+      expect(create2).toHaveBeenCalledTimes(0);
+      expect(actions.size).toBe(1);
+    });
+
+    test('does nothing when no events stored', async () => {
+      const { manager, actions, uiActions } = setup();
+      const create1 = jest.fn();
+      const create2 = jest.fn();
+
+      uiActions.registerActionFactory({ ...actionFactoryDefinition1, create: create1 });
+      uiActions.registerActionFactory({ ...actionFactoryDefinition2, create: create2 });
+
+      expect(create1).toHaveBeenCalledTimes(0);
+      expect(create2).toHaveBeenCalledTimes(0);
+      expect(actions.size).toBe(0);
+
+      await manager.start();
+
+      expect(create1).toHaveBeenCalledTimes(0);
+      expect(create2).toHaveBeenCalledTimes(0);
+      expect(actions.size).toBe(0);
+    });
+
+    test('UI state is empty before manager starts', async () => {
+      const { manager } = setup([event1]);
+
+      expect(manager.state.get()).toMatchObject({
+        events: [],
+        isFetchingEvents: false,
+        fetchCount: 0,
+      });
+    });
+
+    test('loads events into UI state', async () => {
+      const { manager, uiActions } = setup([event1, event2, event3]);
+
+      uiActions.registerActionFactory(actionFactoryDefinition1);
+      uiActions.registerActionFactory(actionFactoryDefinition2);
+
+      await manager.start();
+
+      expect(manager.state.get()).toMatchObject({
+        events: [event1, event2, event3],
+        isFetchingEvents: false,
+        fetchCount: 1,
+      });
+    });
+
+    test('sets isFetchingEvents to true while fetching events', async () => {
+      const { manager, uiActions } = setup([event1, event2, event3]);
+
+      uiActions.registerActionFactory(actionFactoryDefinition1);
+      uiActions.registerActionFactory(actionFactoryDefinition2);
+
+      const promise = manager.start().catch(() => {});
+
+      expect(manager.state.get().isFetchingEvents).toBe(true);
+
+      await promise;
+
+      expect(manager.state.get().isFetchingEvents).toBe(false);
+    });
+
+    test('throws if storage threw', async () => {
+      const { manager, storage } = setup([event1]);
+
+      storage.list = async () => {
+        throw new Error('baz');
+      };
+
+      const [, error] = await of(manager.start());
+
+      expect(error).toEqual(new Error('baz'));
+    });
+
+    test('sets UI state error if error happened during initial fetch', async () => {
+      const { manager, storage } = setup([event1]);
+
+      storage.list = async () => {
+        throw new Error('baz');
+      };
+
+      await of(manager.start());
+
+      expect(manager.state.get().fetchError!.message).toBe('baz');
+    });
+  });
+
+  describe('.stop()', () => {
+    test('removes events from UI actions registry', async () => {
+      const { manager, actions, uiActions } = setup([event1, event2]);
+      const create1 = jest.fn();
+      const create2 = jest.fn();
+
+      uiActions.registerActionFactory({ ...actionFactoryDefinition1, create: create1 });
+      uiActions.registerActionFactory({ ...actionFactoryDefinition2, create: create2 });
+
+      expect(actions.size).toBe(0);
+
+      await manager.start();
+
+      expect(actions.size).toBe(2);
+
+      await manager.stop();
+
+      expect(actions.size).toBe(0);
+    });
+  });
+
+  describe('.createEvent()', () => {
+    describe('when storage succeeds', () => {
+      test('stores new event in storage', async () => {
+        const { manager, storage, uiActions } = setup([]);
+
+        uiActions.registerActionFactory(actionFactoryDefinition1);
+        await manager.start();
+
+        const action: SerializedAction<unknown> = {
+          factoryId: actionFactoryDefinition1.id,
+          name: 'foo',
+          config: {},
+        };
+
+        expect(await storage.count()).toBe(0);
+
+        await manager.createEvent(action, ['VALUE_CLICK_TRIGGER']);
+
+        expect(await storage.count()).toBe(1);
+
+        const [event] = await storage.list();
+
+        expect(event).toMatchObject({
+          eventId: expect.any(String),
+          triggers: ['VALUE_CLICK_TRIGGER'],
+          action: {
+            factoryId: actionFactoryDefinition1.id,
+            name: 'foo',
+            config: {},
+          },
+        });
+      });
+
+      test('adds event to UI state', async () => {
+        const { manager, uiActions } = setup([]);
+        const action: SerializedAction<unknown> = {
+          factoryId: actionFactoryDefinition1.id,
+          name: 'foo',
+          config: {},
+        };
+
+        uiActions.registerActionFactory(actionFactoryDefinition1);
+
+        await manager.start();
+
+        expect(manager.state.get().events.length).toBe(0);
+
+        await manager.createEvent(action, ['VALUE_CLICK_TRIGGER']);
+
+        expect(manager.state.get().events.length).toBe(1);
+      });
+
+      test('optimistically adds event to UI state', async () => {
+        const { manager, uiActions } = setup([]);
+        const action: SerializedAction<unknown> = {
+          factoryId: actionFactoryDefinition1.id,
+          name: 'foo',
+          config: {},
+        };
+
+        uiActions.registerActionFactory(actionFactoryDefinition1);
+
+        await manager.start();
+
+        expect(manager.state.get().events.length).toBe(0);
+
+        const promise = manager.createEvent(action, ['VALUE_CLICK_TRIGGER']).catch(e => e);
+
+        expect(manager.state.get().events.length).toBe(1);
+
+        await promise;
+
+        expect(manager.state.get().events.length).toBe(1);
+      });
+
+      test('instantiates event in actions service', async () => {
+        const { manager, uiActions, actions } = setup([]);
+        const action: SerializedAction<unknown> = {
+          factoryId: actionFactoryDefinition1.id,
+          name: 'foo',
+          config: {},
+        };
+
+        uiActions.registerActionFactory(actionFactoryDefinition1);
+
+        await manager.start();
+
+        expect(actions.size).toBe(0);
+
+        await manager.createEvent(action, ['VALUE_CLICK_TRIGGER']);
+
+        expect(actions.size).toBe(1);
+      });
+    });
+
+    describe('when storage fails', () => {
+      test('throws an error', async () => {
+        const { manager, storage, uiActions } = setup([]);
+
+        storage.create = async () => {
+          throw new Error('foo');
+        };
+
+        uiActions.registerActionFactory(actionFactoryDefinition1);
+        await manager.start();
+
+        const action: SerializedAction<unknown> = {
+          factoryId: actionFactoryDefinition1.id,
+          name: 'foo',
+          config: {},
+        };
+
+        const [, error] = await of(manager.createEvent(action, ['VALUE_CLICK_TRIGGER']));
+
+        expect(error).toEqual(new Error('foo'));
+      });
+
+      test('does not add even to UI state', async () => {
+        const { manager, storage, uiActions } = setup([]);
+        const action: SerializedAction<unknown> = {
+          factoryId: actionFactoryDefinition1.id,
+          name: 'foo',
+          config: {},
+        };
+
+        storage.create = async () => {
+          throw new Error('foo');
+        };
+        uiActions.registerActionFactory(actionFactoryDefinition1);
+
+        await manager.start();
+        await of(manager.createEvent(action, ['VALUE_CLICK_TRIGGER']));
+
+        expect(manager.state.get().events.length).toBe(0);
+      });
+
+      test('optimistically adds event to UI state and then removes it', async () => {
+        const { manager, storage, uiActions } = setup([]);
+        const action: SerializedAction<unknown> = {
+          factoryId: actionFactoryDefinition1.id,
+          name: 'foo',
+          config: {},
+        };
+
+        storage.create = async () => {
+          throw new Error('foo');
+        };
+        uiActions.registerActionFactory(actionFactoryDefinition1);
+
+        await manager.start();
+
+        expect(manager.state.get().events.length).toBe(0);
+
+        const promise = manager.createEvent(action, ['VALUE_CLICK_TRIGGER']).catch(e => e);
+
+        expect(manager.state.get().events.length).toBe(1);
+
+        await promise;
+
+        expect(manager.state.get().events.length).toBe(0);
+      });
+
+      test('does not instantiate event in actions service', async () => {
+        const { manager, storage, uiActions, actions } = setup([]);
+        const action: SerializedAction<unknown> = {
+          factoryId: actionFactoryDefinition1.id,
+          name: 'foo',
+          config: {},
+        };
+
+        storage.create = async () => {
+          throw new Error('foo');
+        };
+        uiActions.registerActionFactory(actionFactoryDefinition1);
+
+        await manager.start();
+
+        expect(actions.size).toBe(0);
+
+        await of(manager.createEvent(action, ['VALUE_CLICK_TRIGGER']));
+
+        expect(actions.size).toBe(0);
+      });
+    });
+  });
+
+  describe('.updateEvent()', () => {
+    describe('when storage succeeds', () => {
+      test('un-registers old event from ui actions service and registers the new one', async () => {
+        const { manager, actions, uiActions } = setup([event3]);
+
+        uiActions.registerActionFactory(actionFactoryDefinition2);
+        await manager.start();
+
+        expect(actions.size).toBe(1);
+
+        const registeredAction1 = actions.values().next().value;
+
+        expect(registeredAction1.getDisplayName()).toBe('Action 3');
+
+        const action: SerializedAction<unknown> = {
+          factoryId: actionFactoryDefinition2.id,
+          name: 'foo',
+          config: {},
+        };
+
+        await manager.updateEvent(event3.eventId, action, ['VALUE_CLICK_TRIGGER']);
+
+        expect(actions.size).toBe(1);
+
+        const registeredAction2 = actions.values().next().value;
+
+        expect(registeredAction2.getDisplayName()).toBe('foo');
+      });
+
+      test('updates event in storage', async () => {
+        const { manager, storage, uiActions } = setup([event3]);
+        const storageUpdateSpy = jest.spyOn(storage, 'update');
+
+        uiActions.registerActionFactory(actionFactoryDefinition2);
+        await manager.start();
+
+        const action: SerializedAction<unknown> = {
+          factoryId: actionFactoryDefinition2.id,
+          name: 'foo',
+          config: {},
+        };
+
+        expect(storageUpdateSpy).toHaveBeenCalledTimes(0);
+
+        await manager.updateEvent(event3.eventId, action, ['VALUE_CLICK_TRIGGER']);
+
+        expect(storageUpdateSpy).toHaveBeenCalledTimes(1);
+        expect(storageUpdateSpy.mock.calls[0][0]).toMatchObject({
+          eventId: expect.any(String),
+          triggers: ['VALUE_CLICK_TRIGGER'],
+          action: {
+            factoryId: actionFactoryDefinition2.id,
+          },
+        });
+      });
+
+      test('updates event in UI state', async () => {
+        const { manager, uiActions } = setup([event3]);
+
+        uiActions.registerActionFactory(actionFactoryDefinition2);
+        await manager.start();
+
+        const action: SerializedAction<unknown> = {
+          factoryId: actionFactoryDefinition2.id,
+          name: 'foo',
+          config: {},
+        };
+
+        expect(manager.state.get().events[0].action.name).toBe('Action 3');
+
+        await manager.updateEvent(event3.eventId, action, ['VALUE_CLICK_TRIGGER']);
+
+        expect(manager.state.get().events[0].action.name).toBe('foo');
+      });
+
+      test('optimistically updates event in UI state', async () => {
+        const { manager, uiActions } = setup([event3]);
+
+        uiActions.registerActionFactory(actionFactoryDefinition2);
+        await manager.start();
+
+        const action: SerializedAction<unknown> = {
+          factoryId: actionFactoryDefinition2.id,
+          name: 'foo',
+          config: {},
+        };
+
+        expect(manager.state.get().events[0].action.name).toBe('Action 3');
+
+        const promise = manager
+          .updateEvent(event3.eventId, action, ['VALUE_CLICK_TRIGGER'])
+          .catch(e => e);
+
+        expect(manager.state.get().events[0].action.name).toBe('foo');
+
+        await promise;
+      });
+    });
+
+    describe('when storage fails', () => {
+      test('throws error', async () => {
+        const { manager, storage, uiActions } = setup([event3]);
+
+        storage.update = () => {
+          throw new Error('bar');
+        };
+        uiActions.registerActionFactory(actionFactoryDefinition2);
+        await manager.start();
+
+        const action: SerializedAction<unknown> = {
+          factoryId: actionFactoryDefinition2.id,
+          name: 'foo',
+          config: {},
+        };
+
+        const [, error] = await of(
+          manager.updateEvent(event3.eventId, action, ['VALUE_CLICK_TRIGGER'])
+        );
+
+        expect(error).toEqual(new Error('bar'));
+      });
+
+      test('keeps the old action in actions registry', async () => {
+        const { manager, storage, actions, uiActions } = setup([event3]);
+
+        storage.update = () => {
+          throw new Error('bar');
+        };
+        uiActions.registerActionFactory(actionFactoryDefinition2);
+        await manager.start();
+
+        expect(actions.size).toBe(1);
+
+        const registeredAction1 = actions.values().next().value;
+
+        expect(registeredAction1.getDisplayName()).toBe('Action 3');
+
+        const action: SerializedAction<unknown> = {
+          factoryId: actionFactoryDefinition2.id,
+          name: 'foo',
+          config: {},
+        };
+
+        await of(manager.updateEvent(event3.eventId, action, ['VALUE_CLICK_TRIGGER']));
+
+        expect(actions.size).toBe(1);
+
+        const registeredAction2 = actions.values().next().value;
+
+        expect(registeredAction2.getDisplayName()).toBe('Action 3');
+      });
+
+      test('keeps old event in UI state', async () => {
+        const { manager, storage, uiActions } = setup([event3]);
+
+        storage.update = () => {
+          throw new Error('bar');
+        };
+        uiActions.registerActionFactory(actionFactoryDefinition2);
+        await manager.start();
+
+        const action: SerializedAction<unknown> = {
+          factoryId: actionFactoryDefinition2.id,
+          name: 'foo',
+          config: {},
+        };
+
+        expect(manager.state.get().events[0].action.name).toBe('Action 3');
+
+        await of(manager.updateEvent(event3.eventId, action, ['VALUE_CLICK_TRIGGER']));
+
+        expect(manager.state.get().events[0].action.name).toBe('Action 3');
+      });
+    });
+  });
+
+  describe('.deleteEvents()', () => {
+    describe('when storage succeeds', () => {
+      test('removes all actions from uiActions service', async () => {
+        const { manager, actions, uiActions } = setup([event2, event1]);
+
+        uiActions.registerActionFactory(actionFactoryDefinition1);
+
+        await manager.start();
+
+        expect(actions.size).toBe(2);
+
+        await manager.deleteEvents([event1.eventId, event2.eventId]);
+
+        expect(actions.size).toBe(0);
+      });
+
+      test('removes all events from storage', async () => {
+        const { manager, uiActions, storage } = setup([event2, event1]);
+
+        uiActions.registerActionFactory(actionFactoryDefinition1);
+
+        await manager.start();
+
+        expect(await storage.list()).toEqual([event2, event1]);
+
+        await manager.deleteEvents([event1.eventId, event2.eventId]);
+
+        expect(await storage.list()).toEqual([]);
+      });
+
+      test('removes all events from UI state', async () => {
+        const { manager, uiActions } = setup([event2, event1]);
+
+        uiActions.registerActionFactory(actionFactoryDefinition1);
+
+        await manager.start();
+
+        expect(manager.state.get().events).toEqual([event2, event1]);
+
+        await manager.deleteEvents([event1.eventId, event2.eventId]);
+
+        expect(manager.state.get().events).toEqual([]);
+      });
+    });
+  });
+});
diff --git a/src/plugins/ui_actions/public/actions/dynamic_action_manager.ts b/src/plugins/ui_actions/public/actions/dynamic_action_manager.ts
new file mode 100644
index 0000000000000..97eb5b05fbbc2
--- /dev/null
+++ b/src/plugins/ui_actions/public/actions/dynamic_action_manager.ts
@@ -0,0 +1,284 @@
+/*
+ * 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 { v4 as uuidv4 } from 'uuid';
+import { Subscription } from 'rxjs';
+import { ActionStorage, SerializedEvent } from './dynamic_action_storage';
+import { UiActionsService } from '../service';
+import { SerializedAction } from './types';
+import { TriggerContextMapping } from '../types';
+import { ActionDefinition } from './action';
+import { defaultState, transitions, selectors, State } from './dynamic_action_manager_state';
+import { StateContainer, createStateContainer } from '../../../kibana_utils';
+
+const compareEvents = (
+  a: ReadonlyArray<{ eventId: string }>,
+  b: ReadonlyArray<{ eventId: string }>
+) => {
+  if (a.length !== b.length) return false;
+  for (let i = 0; i < a.length; i++) if (a[i].eventId !== b[i].eventId) return false;
+  return true;
+};
+
+export type DynamicActionManagerState = State;
+
+export interface DynamicActionManagerParams {
+  storage: ActionStorage;
+  uiActions: Pick<
+    UiActionsService,
+    'registerAction' | 'attachAction' | 'unregisterAction' | 'detachAction' | 'getActionFactory'
+  >;
+  isCompatible: <C = unknown>(context: C) => Promise<boolean>;
+}
+
+export class DynamicActionManager {
+  static idPrefixCounter = 0;
+
+  private readonly idPrefix = `D_ACTION_${DynamicActionManager.idPrefixCounter++}_`;
+  private stopped: boolean = false;
+  private reloadSubscription?: Subscription;
+
+  /**
+   * UI State of the dynamic action manager.
+   */
+  protected readonly ui = createStateContainer(defaultState, transitions, selectors);
+
+  constructor(protected readonly params: DynamicActionManagerParams) {}
+
+  protected getEvent(eventId: string): SerializedEvent {
+    const oldEvent = this.ui.selectors.getEvent(eventId);
+    if (!oldEvent) throw new Error(`Could not find event [eventId = ${eventId}].`);
+    return oldEvent;
+  }
+
+  /**
+   * We prefix action IDs with a unique `.idPrefix`, so we can render the
+   * same dashboard twice on the screen.
+   */
+  protected generateActionId(eventId: string): string {
+    return this.idPrefix + eventId;
+  }
+
+  protected reviveAction(event: SerializedEvent) {
+    const { eventId, triggers, action } = event;
+    const { uiActions, isCompatible } = this.params;
+
+    const actionId = this.generateActionId(eventId);
+    const factory = uiActions.getActionFactory(event.action.factoryId);
+    const actionDefinition: ActionDefinition = {
+      ...factory.create(action as SerializedAction<object>),
+      id: actionId,
+      isCompatible,
+    };
+
+    uiActions.registerAction(actionDefinition);
+    for (const trigger of triggers) uiActions.attachAction(trigger as any, actionId);
+  }
+
+  protected killAction({ eventId, triggers }: SerializedEvent) {
+    const { uiActions } = this.params;
+    const actionId = this.generateActionId(eventId);
+
+    for (const trigger of triggers) uiActions.detachAction(trigger as any, actionId);
+    uiActions.unregisterAction(actionId);
+  }
+
+  private syncId = 0;
+
+  /**
+   * This function is called every time stored events might have changed not by
+   * us. For example, when in edit mode on dashboard user presses "back" button
+   * in the browser, then contents of storage changes.
+   */
+  private onSync = () => {
+    if (this.stopped) return;
+
+    (async () => {
+      const syncId = ++this.syncId;
+      const events = await this.params.storage.list();
+
+      if (this.stopped) return;
+      if (syncId !== this.syncId) return;
+      if (compareEvents(events, this.ui.get().events)) return;
+
+      for (const event of this.ui.get().events) this.killAction(event);
+      for (const event of events) this.reviveAction(event);
+      this.ui.transitions.finishFetching(events);
+    })().catch(error => {
+      /* eslint-disable */
+      console.log('Dynamic action manager storage reload failed.');
+      console.error(error);
+      /* eslint-enable */
+    });
+  };
+
+  // Public API: ---------------------------------------------------------------
+
+  /**
+   * Read-only state container of dynamic action manager. Use it to perform all
+   * *read* operations.
+   */
+  public readonly state: StateContainer<State> = this.ui;
+
+  /**
+   * 1. Loads all events from  @type {DynamicActionStorage} storage.
+   * 2. Creates actions for each event in `ui_actions` registry.
+   * 3. Adds events to UI state.
+   * 4. Does nothing if dynamic action manager was stopped or if event fetching
+   *    is already taking place.
+   */
+  public async start() {
+    if (this.stopped) return;
+    if (this.ui.get().isFetchingEvents) return;
+
+    this.ui.transitions.startFetching();
+    try {
+      const events = await this.params.storage.list();
+      for (const event of events) this.reviveAction(event);
+      this.ui.transitions.finishFetching(events);
+    } catch (error) {
+      this.ui.transitions.failFetching(error instanceof Error ? error : { message: String(error) });
+      throw error;
+    }
+
+    if (this.params.storage.reload$) {
+      this.reloadSubscription = this.params.storage.reload$.subscribe(this.onSync);
+    }
+  }
+
+  /**
+   * 1. Removes all events from `ui_actions` registry.
+   * 2. Puts dynamic action manager is stopped state.
+   */
+  public async stop() {
+    this.stopped = true;
+    const events = await this.params.storage.list();
+
+    for (const event of events) {
+      this.killAction(event);
+    }
+
+    if (this.reloadSubscription) {
+      this.reloadSubscription.unsubscribe();
+    }
+  }
+
+  /**
+   * Creates a new event.
+   *
+   * 1. Stores event in @type {DynamicActionStorage} storage.
+   * 2. Optimistically adds it to UI state, and rolls back on failure.
+   * 3. Adds action to `ui_actions` registry.
+   *
+   * @param action Dynamic action for which to create an event.
+   * @param triggers List of triggers to which action should react.
+   */
+  public async createEvent(
+    action: SerializedAction<unknown>,
+    triggers: Array<keyof TriggerContextMapping>
+  ) {
+    const event: SerializedEvent = {
+      eventId: uuidv4(),
+      triggers,
+      action,
+    };
+
+    this.ui.transitions.addEvent(event);
+    try {
+      await this.params.storage.create(event);
+      this.reviveAction(event);
+    } catch (error) {
+      this.ui.transitions.removeEvent(event.eventId);
+      throw error;
+    }
+  }
+
+  /**
+   * Updates an existing event. Fails if event with given `eventId` does not
+   * exit.
+   *
+   * 1. Updates the event in @type {DynamicActionStorage} storage.
+   * 2. Optimistically replaces the old event by the new one in UI state, and
+   *    rolls back on failure.
+   * 3. Replaces action in `ui_actions` registry with the new event.
+   *
+   *
+   * @param eventId ID of the event to replace.
+   * @param action New action for which to create the event.
+   * @param triggers List of triggers to which action should react.
+   */
+  public async updateEvent(
+    eventId: string,
+    action: SerializedAction<unknown>,
+    triggers: Array<keyof TriggerContextMapping>
+  ) {
+    const event: SerializedEvent = {
+      eventId,
+      triggers,
+      action,
+    };
+    const oldEvent = this.getEvent(eventId);
+    this.killAction(oldEvent);
+
+    this.reviveAction(event);
+    this.ui.transitions.replaceEvent(event);
+
+    try {
+      await this.params.storage.update(event);
+    } catch (error) {
+      this.killAction(event);
+      this.reviveAction(oldEvent);
+      this.ui.transitions.replaceEvent(oldEvent);
+      throw error;
+    }
+  }
+
+  /**
+   * Removes existing event. Throws if event does not exist.
+   *
+   * 1. Removes the event from @type {DynamicActionStorage} storage.
+   * 2. Optimistically removes event from UI state, and puts it back on failure.
+   * 3. Removes associated action from `ui_actions` registry.
+   *
+   * @param eventId ID of the event to remove.
+   */
+  public async deleteEvent(eventId: string) {
+    const event = this.getEvent(eventId);
+
+    this.killAction(event);
+    this.ui.transitions.removeEvent(eventId);
+
+    try {
+      await this.params.storage.remove(eventId);
+    } catch (error) {
+      this.reviveAction(event);
+      this.ui.transitions.addEvent(event);
+      throw error;
+    }
+  }
+
+  /**
+   * Deletes multiple events at once.
+   *
+   * @param eventIds List of event IDs.
+   */
+  public async deleteEvents(eventIds: string[]) {
+    await Promise.all(eventIds.map(this.deleteEvent.bind(this)));
+  }
+}
diff --git a/src/plugins/ui_actions/public/actions/dynamic_action_manager_state.ts b/src/plugins/ui_actions/public/actions/dynamic_action_manager_state.ts
new file mode 100644
index 0000000000000..636af076ea39f
--- /dev/null
+++ b/src/plugins/ui_actions/public/actions/dynamic_action_manager_state.ts
@@ -0,0 +1,111 @@
+/*
+ * 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 { SerializedEvent } from './dynamic_action_storage';
+
+/**
+ * This interface represents the state of @type {DynamicActionManager} at any
+ * point in time.
+ */
+export interface State {
+  /**
+   * Whether dynamic action manager is currently in process of fetching events
+   * from storage.
+   */
+  readonly isFetchingEvents: boolean;
+
+  /**
+   * Number of times event fetching has been completed.
+   */
+  readonly fetchCount: number;
+
+  /**
+   * Error received last time when fetching events.
+   */
+  readonly fetchError?: {
+    message: string;
+  };
+
+  /**
+   * List of all fetched events.
+   */
+  readonly events: readonly SerializedEvent[];
+}
+
+export interface Transitions {
+  startFetching: (state: State) => () => State;
+  finishFetching: (state: State) => (events: SerializedEvent[]) => State;
+  failFetching: (state: State) => (error: { message: string }) => State;
+  addEvent: (state: State) => (event: SerializedEvent) => State;
+  removeEvent: (state: State) => (eventId: string) => State;
+  replaceEvent: (state: State) => (event: SerializedEvent) => State;
+}
+
+export interface Selectors {
+  getEvent: (state: State) => (eventId: string) => SerializedEvent | null;
+}
+
+export const defaultState: State = {
+  isFetchingEvents: false,
+  fetchCount: 0,
+  events: [],
+};
+
+export const transitions: Transitions = {
+  startFetching: state => () => ({ ...state, isFetchingEvents: true }),
+
+  finishFetching: state => events => ({
+    ...state,
+    isFetchingEvents: false,
+    fetchCount: state.fetchCount + 1,
+    fetchError: undefined,
+    events,
+  }),
+
+  failFetching: state => ({ message }) => ({
+    ...state,
+    isFetchingEvents: false,
+    fetchCount: state.fetchCount + 1,
+    fetchError: { message },
+  }),
+
+  addEvent: state => (event: SerializedEvent) => ({
+    ...state,
+    events: [...state.events, event],
+  }),
+
+  removeEvent: state => (eventId: string) => ({
+    ...state,
+    events: state.events ? state.events.filter(event => event.eventId !== eventId) : state.events,
+  }),
+
+  replaceEvent: state => event => {
+    const index = state.events.findIndex(({ eventId }) => eventId === event.eventId);
+    if (index === -1) return state;
+
+    return {
+      ...state,
+      events: [...state.events.slice(0, index), event, ...state.events.slice(index + 1)],
+    };
+  },
+};
+
+export const selectors: Selectors = {
+  getEvent: state => eventId => state.events.find(event => event.eventId === eventId) || null,
+};
diff --git a/src/plugins/ui_actions/public/actions/dynamic_action_storage.ts b/src/plugins/ui_actions/public/actions/dynamic_action_storage.ts
new file mode 100644
index 0000000000000..28550a671782e
--- /dev/null
+++ b/src/plugins/ui_actions/public/actions/dynamic_action_storage.ts
@@ -0,0 +1,102 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+/* eslint-disable max-classes-per-file */
+
+import { Observable, Subject } from 'rxjs';
+import { SerializedAction } from './types';
+
+/**
+ * Serialized representation of event-action pair, used to persist in storage.
+ */
+export interface SerializedEvent {
+  eventId: string;
+  triggers: string[];
+  action: SerializedAction<unknown>;
+}
+
+/**
+ * This CRUD interface needs to be implemented by dynamic action users if they
+ * want to persist the dynamic actions. It has a default implementation in
+ * Embeddables, however one can use the dynamic actions without Embeddables,
+ * in that case they have to implement this interface.
+ */
+export interface ActionStorage {
+  create(event: SerializedEvent): Promise<void>;
+  update(event: SerializedEvent): Promise<void>;
+  remove(eventId: string): Promise<void>;
+  read(eventId: string): Promise<SerializedEvent>;
+  count(): Promise<number>;
+  list(): Promise<SerializedEvent[]>;
+
+  /**
+   * Triggered every time events changed in storage and should be re-loaded.
+   */
+  readonly reload$?: Observable<void>;
+}
+
+export abstract class AbstractActionStorage implements ActionStorage {
+  public readonly reload$: Observable<void> & Pick<Subject<void>, 'next'> = new Subject<void>();
+
+  public async count(): Promise<number> {
+    return (await this.list()).length;
+  }
+
+  public async read(eventId: string): Promise<SerializedEvent> {
+    const events = await this.list();
+    const event = events.find(ev => ev.eventId === eventId);
+    if (!event) throw new Error(`Event [eventId = ${eventId}] not found.`);
+    return event;
+  }
+
+  abstract create(event: SerializedEvent): Promise<void>;
+  abstract update(event: SerializedEvent): Promise<void>;
+  abstract remove(eventId: string): Promise<void>;
+  abstract list(): Promise<SerializedEvent[]>;
+}
+
+/**
+ * This is an in-memory implementation of ActionStorage. It is used in testing,
+ * but can also be used production code to store events in memory.
+ */
+export class MemoryActionStorage extends AbstractActionStorage {
+  constructor(public events: readonly SerializedEvent[] = []) {
+    super();
+  }
+
+  public async list() {
+    return this.events.map(event => ({ ...event }));
+  }
+
+  public async create(event: SerializedEvent) {
+    this.events = [...this.events, { ...event }];
+  }
+
+  public async update(event: SerializedEvent) {
+    const index = this.events.findIndex(({ eventId }) => eventId === event.eventId);
+    if (index < 0) throw new Error(`Event [eventId = ${event.eventId}] not found`);
+    this.events = [...this.events.slice(0, index), { ...event }, ...this.events.slice(index + 1)];
+  }
+
+  public async remove(eventId: string) {
+    const index = this.events.findIndex(ev => eventId === ev.eventId);
+    if (index < 0) throw new Error(`Event [eventId = ${eventId}] not found`);
+    this.events = [...this.events.slice(0, index), ...this.events.slice(index + 1)];
+  }
+}
diff --git a/src/plugins/ui_actions/public/actions/index.ts b/src/plugins/ui_actions/public/actions/index.ts
index 64bfd368e3dfa..0ddba197aced6 100644
--- a/src/plugins/ui_actions/public/actions/index.ts
+++ b/src/plugins/ui_actions/public/actions/index.ts
@@ -18,5 +18,11 @@
  */
 
 export * from './action';
+export * from './action_internal';
+export * from './action_factory_definition';
+export * from './action_factory';
 export * from './create_action';
 export * from './incompatible_action_error';
+export * from './dynamic_action_storage';
+export * from './dynamic_action_manager';
+export * from './types';
diff --git a/src/plugins/ui_actions/public/actions/types.ts b/src/plugins/ui_actions/public/actions/types.ts
new file mode 100644
index 0000000000000..465f091e45ef1
--- /dev/null
+++ b/src/plugins/ui_actions/public/actions/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.
+ */
+
+export interface SerializedAction<Config> {
+  readonly factoryId: string;
+  readonly name: string;
+  readonly config: Config;
+}
diff --git a/src/plugins/ui_actions/public/context_menu/build_eui_context_menu_panels.tsx b/src/plugins/ui_actions/public/context_menu/build_eui_context_menu_panels.tsx
index 3dce2c1f4c257..ec58261d9e4f7 100644
--- a/src/plugins/ui_actions/public/context_menu/build_eui_context_menu_panels.tsx
+++ b/src/plugins/ui_actions/public/context_menu/build_eui_context_menu_panels.tsx
@@ -24,19 +24,25 @@ import { i18n } from '@kbn/i18n';
 import { uiToReactComponent } from '../../../kibana_react/public';
 import { Action } from '../actions';
 
+export const defaultTitle = i18n.translate('uiActions.actionPanel.title', {
+  defaultMessage: 'Options',
+});
+
 /**
  * Transforms an array of Actions to the shape EuiContextMenuPanel expects.
  */
-export async function buildContextMenuForActions<A>({
+export async function buildContextMenuForActions<Context extends object>({
   actions,
   actionContext,
+  title = defaultTitle,
   closeMenu,
 }: {
-  actions: Array<Action<A>>;
-  actionContext: A;
+  actions: Array<Action<Context>>;
+  actionContext: Context;
+  title?: string;
   closeMenu: () => void;
 }): Promise<EuiContextMenuPanelDescriptor> {
-  const menuItems = await buildEuiContextMenuPanelItems<A>({
+  const menuItems = await buildEuiContextMenuPanelItems<Context>({
     actions,
     actionContext,
     closeMenu,
@@ -44,9 +50,7 @@ export async function buildContextMenuForActions<A>({
 
   return {
     id: 'mainMenu',
-    title: i18n.translate('uiActions.actionPanel.title', {
-      defaultMessage: 'Options',
-    }),
+    title,
     items: menuItems,
   };
 }
@@ -54,49 +58,41 @@ export async function buildContextMenuForActions<A>({
 /**
  * Transform an array of Actions into the shape needed to build an EUIContextMenu
  */
-async function buildEuiContextMenuPanelItems<A>({
+async function buildEuiContextMenuPanelItems<Context extends object>({
   actions,
   actionContext,
   closeMenu,
 }: {
-  actions: Array<Action<A>>;
-  actionContext: A;
+  actions: Array<Action<Context>>;
+  actionContext: Context;
   closeMenu: () => void;
 }) {
-  const items: EuiContextMenuPanelItemDescriptor[] = [];
-  const promises = actions.map(async action => {
+  const items: EuiContextMenuPanelItemDescriptor[] = new Array(actions.length);
+  const promises = actions.map(async (action, index) => {
     const isCompatible = await action.isCompatible(actionContext);
     if (!isCompatible) {
       return;
     }
 
-    items.push(
-      convertPanelActionToContextMenuItem({
-        action,
-        actionContext,
-        closeMenu,
-      })
-    );
+    items[index] = convertPanelActionToContextMenuItem({
+      action,
+      actionContext,
+      closeMenu,
+    });
   });
 
   await Promise.all(promises);
 
-  return items;
+  return items.filter(Boolean);
 }
 
-/**
- *
- * @param {ContextMenuAction} action
- * @param {Embeddable} embeddable
- * @return {EuiContextMenuPanelItemDescriptor}
- */
-function convertPanelActionToContextMenuItem<A>({
+function convertPanelActionToContextMenuItem<Context extends object>({
   action,
   actionContext,
   closeMenu,
 }: {
-  action: Action<A>;
-  actionContext: A;
+  action: Action<Context>;
+  actionContext: Context;
   closeMenu: () => void;
 }): EuiContextMenuPanelItemDescriptor {
   const menuPanelItem: EuiContextMenuPanelItemDescriptor = {
@@ -115,8 +111,11 @@ function convertPanelActionToContextMenuItem<A>({
     closeMenu();
   };
 
-  if (action.getHref && action.getHref(actionContext)) {
-    menuPanelItem.href = action.getHref(actionContext);
+  if (action.getHref) {
+    const href = action.getHref(actionContext);
+    if (href) {
+      menuPanelItem.href = action.getHref(actionContext);
+    }
   }
 
   return menuPanelItem;
diff --git a/src/plugins/ui_actions/public/index.ts b/src/plugins/ui_actions/public/index.ts
index 49b6bd5e17699..9265d35bad9a9 100644
--- a/src/plugins/ui_actions/public/index.ts
+++ b/src/plugins/ui_actions/public/index.ts
@@ -26,8 +26,26 @@ export function plugin(initializerContext: PluginInitializerContext) {
 
 export { UiActionsSetup, UiActionsStart } from './plugin';
 export { UiActionsServiceParams, UiActionsService } from './service';
-export { Action, createAction, IncompatibleActionError } from './actions';
+export {
+  Action,
+  ActionDefinition as UiActionsActionDefinition,
+  ActionFactoryDefinition as UiActionsActionFactoryDefinition,
+  ActionInternal as UiActionsActionInternal,
+  ActionStorage as UiActionsActionStorage,
+  AbstractActionStorage as UiActionsAbstractActionStorage,
+  createAction,
+  DynamicActionManager,
+  DynamicActionManagerState,
+  IncompatibleActionError,
+  SerializedAction as UiActionsSerializedAction,
+  SerializedEvent as UiActionsSerializedEvent,
+} from './actions';
 export { buildContextMenuForActions } from './context_menu';
+export {
+  Presentable as UiActionsPresentable,
+  Configurable as UiActionsConfigurable,
+  CollectConfigProps as UiActionsCollectConfigProps,
+} from './util';
 export {
   Trigger,
   TriggerContext,
@@ -39,4 +57,4 @@ export {
   applyFilterTrigger,
 } from './triggers';
 export { TriggerContextMapping, TriggerId, ActionContextMapping, ActionType } from './types';
-export { ActionByType } from './actions';
+export { ActionByType, DynamicActionManager as UiActionsDynamicActionManager } from './actions';
diff --git a/src/plugins/ui_actions/public/mocks.ts b/src/plugins/ui_actions/public/mocks.ts
index c1be6b2626525..4de38eb5421e9 100644
--- a/src/plugins/ui_actions/public/mocks.ts
+++ b/src/plugins/ui_actions/public/mocks.ts
@@ -28,10 +28,13 @@ export type Start = jest.Mocked<UiActionsStart>;
 
 const createSetupContract = (): Setup => {
   const setupContract: Setup = {
+    addTriggerAction: jest.fn(),
     attachAction: jest.fn(),
     detachAction: jest.fn(),
     registerAction: jest.fn(),
+    registerActionFactory: jest.fn(),
     registerTrigger: jest.fn(),
+    unregisterAction: jest.fn(),
   };
   return setupContract;
 };
@@ -39,16 +42,21 @@ const createSetupContract = (): Setup => {
 const createStartContract = (): Start => {
   const startContract: Start = {
     attachAction: jest.fn(),
-    registerAction: jest.fn(),
-    registerTrigger: jest.fn(),
-    getAction: jest.fn(),
+    unregisterAction: jest.fn(),
+    addTriggerAction: jest.fn(),
+    clear: jest.fn(),
     detachAction: jest.fn(),
     executeTriggerActions: jest.fn(),
+    fork: jest.fn(),
+    getAction: jest.fn(),
+    getActionFactories: jest.fn(),
+    getActionFactory: jest.fn(),
     getTrigger: jest.fn(),
     getTriggerActions: jest.fn((id: TriggerId) => []),
     getTriggerCompatibleActions: jest.fn(),
-    clear: jest.fn(),
-    fork: jest.fn(),
+    registerAction: jest.fn(),
+    registerActionFactory: jest.fn(),
+    registerTrigger: jest.fn(),
   };
 
   return startContract;
diff --git a/src/plugins/ui_actions/public/plugin.ts b/src/plugins/ui_actions/public/plugin.ts
index 928e57937a9b5..88a5cb04eac6f 100644
--- a/src/plugins/ui_actions/public/plugin.ts
+++ b/src/plugins/ui_actions/public/plugin.ts
@@ -23,7 +23,13 @@ import { selectRangeTrigger, valueClickTrigger, applyFilterTrigger } from './tri
 
 export type UiActionsSetup = Pick<
   UiActionsService,
-  'attachAction' | 'detachAction' | 'registerAction' | 'registerTrigger'
+  | 'addTriggerAction'
+  | 'attachAction'
+  | 'detachAction'
+  | 'registerAction'
+  | 'registerActionFactory'
+  | 'registerTrigger'
+  | 'unregisterAction'
 >;
 
 export type UiActionsStart = PublicMethodsOf<UiActionsService>;
diff --git a/src/plugins/ui_actions/public/service/ui_actions_service.test.ts b/src/plugins/ui_actions/public/service/ui_actions_service.test.ts
index bdf71a25e6dbc..41e2b57d53dd8 100644
--- a/src/plugins/ui_actions/public/service/ui_actions_service.test.ts
+++ b/src/plugins/ui_actions/public/service/ui_actions_service.test.ts
@@ -18,7 +18,13 @@
  */
 
 import { UiActionsService } from './ui_actions_service';
-import { Action, createAction } from '../actions';
+import {
+  Action,
+  ActionInternal,
+  createAction,
+  ActionFactoryDefinition,
+  ActionFactory,
+} from '../actions';
 import { createHelloWorldAction } from '../tests/test_samples';
 import { ActionRegistry, TriggerRegistry, TriggerId, ActionType } from '../types';
 import { Trigger } from '../triggers';
@@ -102,6 +108,21 @@ describe('UiActionsService', () => {
         type: 'test' as ActionType,
       });
     });
+
+    test('return action instance', () => {
+      const service = new UiActionsService();
+      const action = service.registerAction({
+        id: 'test',
+        execute: async () => {},
+        getDisplayName: () => 'test',
+        getIconType: () => '',
+        isCompatible: async () => true,
+        type: 'test' as ActionType,
+      });
+
+      expect(action).toBeInstanceOf(ActionInternal);
+      expect(action.id).toBe('test');
+    });
   });
 
   describe('.getTriggerActions()', () => {
@@ -139,13 +160,14 @@ describe('UiActionsService', () => {
 
       expect(list0).toHaveLength(0);
 
-      service.attachAction(FOO_TRIGGER, action1);
+      service.addTriggerAction(FOO_TRIGGER, action1);
       const list1 = service.getTriggerActions(FOO_TRIGGER);
 
       expect(list1).toHaveLength(1);
-      expect(list1).toEqual([action1]);
+      expect(list1[0]).toBeInstanceOf(ActionInternal);
+      expect(list1[0].id).toBe(action1.id);
 
-      service.attachAction(FOO_TRIGGER, action2);
+      service.addTriggerAction(FOO_TRIGGER, action2);
       const list2 = service.getTriggerActions(FOO_TRIGGER);
 
       expect(list2).toHaveLength(2);
@@ -164,7 +186,7 @@ describe('UiActionsService', () => {
       service.registerAction(helloWorldAction);
 
       expect(actions.size - length).toBe(1);
-      expect(actions.get(helloWorldAction.id)).toBe(helloWorldAction);
+      expect(actions.get(helloWorldAction.id)!.id).toBe(helloWorldAction.id);
     });
 
     test('getTriggerCompatibleActions returns attached actions', async () => {
@@ -178,7 +200,7 @@ describe('UiActionsService', () => {
         title: 'My trigger',
       };
       service.registerTrigger(testTrigger);
-      service.attachAction(MY_TRIGGER, helloWorldAction);
+      service.addTriggerAction(MY_TRIGGER, helloWorldAction);
 
       const compatibleActions = await service.getTriggerCompatibleActions(MY_TRIGGER, {
         hi: 'there',
@@ -204,7 +226,7 @@ describe('UiActionsService', () => {
       };
 
       service.registerTrigger(testTrigger);
-      service.attachAction(testTrigger.id, action);
+      service.addTriggerAction(testTrigger.id, action);
 
       const compatibleActions1 = await service.getTriggerCompatibleActions(testTrigger.id, {
         accept: true,
@@ -288,7 +310,7 @@ describe('UiActionsService', () => {
         id: FOO_TRIGGER,
       });
       service1.registerAction(testAction1);
-      service1.attachAction(FOO_TRIGGER, testAction1);
+      service1.addTriggerAction(FOO_TRIGGER, testAction1);
 
       const service2 = service1.fork();
 
@@ -309,14 +331,14 @@ describe('UiActionsService', () => {
       });
       service1.registerAction(testAction1);
       service1.registerAction(testAction2);
-      service1.attachAction(FOO_TRIGGER, testAction1);
+      service1.addTriggerAction(FOO_TRIGGER, testAction1);
 
       const service2 = service1.fork();
 
       expect(service1.getTriggerActions(FOO_TRIGGER)).toHaveLength(1);
       expect(service2.getTriggerActions(FOO_TRIGGER)).toHaveLength(1);
 
-      service2.attachAction(FOO_TRIGGER, testAction2);
+      service2.addTriggerAction(FOO_TRIGGER, testAction2);
 
       expect(service1.getTriggerActions(FOO_TRIGGER)).toHaveLength(1);
       expect(service2.getTriggerActions(FOO_TRIGGER)).toHaveLength(2);
@@ -330,14 +352,14 @@ describe('UiActionsService', () => {
       });
       service1.registerAction(testAction1);
       service1.registerAction(testAction2);
-      service1.attachAction(FOO_TRIGGER, testAction1);
+      service1.addTriggerAction(FOO_TRIGGER, testAction1);
 
       const service2 = service1.fork();
 
       expect(service1.getTriggerActions(FOO_TRIGGER)).toHaveLength(1);
       expect(service2.getTriggerActions(FOO_TRIGGER)).toHaveLength(1);
 
-      service1.attachAction(FOO_TRIGGER, testAction2);
+      service1.addTriggerAction(FOO_TRIGGER, testAction2);
 
       expect(service1.getTriggerActions(FOO_TRIGGER)).toHaveLength(2);
       expect(service2.getTriggerActions(FOO_TRIGGER)).toHaveLength(1);
@@ -392,7 +414,7 @@ describe('UiActionsService', () => {
       } as any;
 
       service.registerTrigger(trigger);
-      service.attachAction(MY_TRIGGER, action);
+      service.addTriggerAction(MY_TRIGGER, action);
 
       const actions = service.getTriggerActions(trigger.id);
 
@@ -400,7 +422,7 @@ describe('UiActionsService', () => {
       expect(actions[0].id).toBe(ACTION_HELLO_WORLD);
     });
 
-    test('can detach an action to a trigger', () => {
+    test('can detach an action from a trigger', () => {
       const service = new UiActionsService();
 
       const trigger: Trigger = {
@@ -413,7 +435,7 @@ describe('UiActionsService', () => {
 
       service.registerTrigger(trigger);
       service.registerAction(action);
-      service.attachAction(trigger.id, action);
+      service.addTriggerAction(trigger.id, action);
       service.detachAction(trigger.id, action.id);
 
       const actions2 = service.getTriggerActions(trigger.id);
@@ -445,7 +467,7 @@ describe('UiActionsService', () => {
       } as any;
 
       service.registerAction(action);
-      expect(() => service.attachAction('i do not exist' as TriggerId, action)).toThrowError(
+      expect(() => service.addTriggerAction('i do not exist' as TriggerId, action)).toThrowError(
         'No trigger [triggerId = i do not exist] exists, for attaching action [actionId = ACTION_HELLO_WORLD].'
       );
     });
@@ -475,4 +497,64 @@ describe('UiActionsService', () => {
       );
     });
   });
+
+  describe('action factories', () => {
+    const factoryDefinition1: ActionFactoryDefinition = {
+      id: 'test-factory-1',
+      CollectConfig: {} as any,
+      createConfig: () => ({}),
+      isConfigValid: () => true,
+      create: () => ({} as any),
+    };
+    const factoryDefinition2: ActionFactoryDefinition = {
+      id: 'test-factory-2',
+      CollectConfig: {} as any,
+      createConfig: () => ({}),
+      isConfigValid: () => true,
+      create: () => ({} as any),
+    };
+
+    test('.getActionFactories() returns empty array if no action factories registered', () => {
+      const service = new UiActionsService();
+
+      const factories = service.getActionFactories();
+
+      expect(factories).toEqual([]);
+    });
+
+    test('can register and retrieve an action factory', () => {
+      const service = new UiActionsService();
+
+      service.registerActionFactory(factoryDefinition1);
+
+      const factory = service.getActionFactory(factoryDefinition1.id);
+
+      expect(factory).toBeInstanceOf(ActionFactory);
+      expect(factory.id).toBe(factoryDefinition1.id);
+    });
+
+    test('can retrieve all action factories', () => {
+      const service = new UiActionsService();
+
+      service.registerActionFactory(factoryDefinition1);
+      service.registerActionFactory(factoryDefinition2);
+
+      const factories = service.getActionFactories();
+      const factoriesSorted = [...factories].sort((f1, f2) => (f1.id > f2.id ? 1 : -1));
+
+      expect(factoriesSorted.length).toBe(2);
+      expect(factoriesSorted[0].id).toBe(factoryDefinition1.id);
+      expect(factoriesSorted[1].id).toBe(factoryDefinition2.id);
+    });
+
+    test('throws when retrieving action factory that does not exist', () => {
+      const service = new UiActionsService();
+
+      service.registerActionFactory(factoryDefinition1);
+
+      expect(() => service.getActionFactory('UNKNOWN_ID')).toThrowError(
+        'Action factory [actionFactoryId = UNKNOWN_ID] does not exist.'
+      );
+    });
+  });
 });
diff --git a/src/plugins/ui_actions/public/service/ui_actions_service.ts b/src/plugins/ui_actions/public/service/ui_actions_service.ts
index f7718e63773f5..8bd3bb34fbbd8 100644
--- a/src/plugins/ui_actions/public/service/ui_actions_service.ts
+++ b/src/plugins/ui_actions/public/service/ui_actions_service.ts
@@ -24,8 +24,17 @@ import {
   TriggerId,
   TriggerContextMapping,
   ActionType,
+  ActionFactoryRegistry,
 } from '../types';
-import { Action, ActionByType } from '../actions';
+import {
+  ActionInternal,
+  Action,
+  ActionByType,
+  ActionFactory,
+  ActionDefinition,
+  ActionFactoryDefinition,
+  ActionContext,
+} from '../actions';
 import { Trigger, TriggerContext } from '../triggers/trigger';
 import { TriggerInternal } from '../triggers/trigger_internal';
 import { TriggerContract } from '../triggers/trigger_contract';
@@ -38,21 +47,25 @@ export interface UiActionsServiceParams {
    * A 1-to-N mapping from `Trigger` to zero or more `Action`.
    */
   readonly triggerToActions?: TriggerToActionsRegistry;
+  readonly actionFactories?: ActionFactoryRegistry;
 }
 
 export class UiActionsService {
   protected readonly triggers: TriggerRegistry;
   protected readonly actions: ActionRegistry;
   protected readonly triggerToActions: TriggerToActionsRegistry;
+  protected readonly actionFactories: ActionFactoryRegistry;
 
   constructor({
     triggers = new Map(),
     actions = new Map(),
     triggerToActions = new Map(),
+    actionFactories = new Map(),
   }: UiActionsServiceParams = {}) {
     this.triggers = triggers;
     this.actions = actions;
     this.triggerToActions = triggerToActions;
+    this.actionFactories = actionFactories;
   }
 
   public readonly registerTrigger = (trigger: Trigger) => {
@@ -76,49 +89,44 @@ export class UiActionsService {
     return trigger.contract;
   };
 
-  public readonly registerAction = <T extends ActionType>(action: ActionByType<T>) => {
-    if (this.actions.has(action.id)) {
-      throw new Error(`Action [action.id = ${action.id}] already registered.`);
+  public readonly registerAction = <A extends ActionDefinition>(
+    definition: A
+  ): ActionInternal<A> => {
+    if (this.actions.has(definition.id)) {
+      throw new Error(`Action [action.id = ${definition.id}] already registered.`);
     }
 
+    const action = new ActionInternal(definition);
+
     this.actions.set(action.id, action);
+
+    return action;
   };
 
-  public readonly getAction = <T extends ActionType>(id: string): ActionByType<T> => {
-    if (!this.actions.has(id)) {
-      throw new Error(`Action [action.id = ${id}] not registered.`);
+  public readonly unregisterAction = (actionId: string): void => {
+    if (!this.actions.has(actionId)) {
+      throw new Error(`Action [action.id = ${actionId}] is not registered.`);
     }
 
-    return this.actions.get(id) as ActionByType<T>;
+    this.actions.delete(actionId);
   };
 
-  public readonly attachAction = <TType extends TriggerId, AType extends ActionType>(
-    triggerId: TType,
-    // The action can accept partial or no context, but if it needs context not provided
-    // by this type of trigger, typescript will complain. yay!
-    action: ActionByType<AType> & Action<TriggerContextMapping[TType]>
+  public readonly attachAction = <TriggerId extends keyof TriggerContextMapping>(
+    triggerId: TriggerId,
+    actionId: string
   ): void => {
-    if (!this.actions.has(action.id)) {
-      this.registerAction(action);
-    } else {
-      const registeredAction = this.actions.get(action.id);
-      if (registeredAction !== action) {
-        throw new Error(`A different action instance with this id is already registered.`);
-      }
-    }
-
     const trigger = this.triggers.get(triggerId);
 
     if (!trigger) {
       throw new Error(
-        `No trigger [triggerId = ${triggerId}] exists, for attaching action [actionId = ${action.id}].`
+        `No trigger [triggerId = ${triggerId}] exists, for attaching action [actionId = ${actionId}].`
       );
     }
 
     const actionIds = this.triggerToActions.get(triggerId);
 
-    if (!actionIds!.find(id => id === action.id)) {
-      this.triggerToActions.set(triggerId, [...actionIds!, action.id]);
+    if (!actionIds!.find(id => id === actionId)) {
+      this.triggerToActions.set(triggerId, [...actionIds!, actionId]);
     }
   };
 
@@ -139,6 +147,26 @@ export class UiActionsService {
     );
   };
 
+  public readonly addTriggerAction = <TType extends TriggerId, AType extends ActionType>(
+    triggerId: TType,
+    // The action can accept partial or no context, but if it needs context not provided
+    // by this type of trigger, typescript will complain. yay!
+    action: ActionByType<AType> & Action<TriggerContextMapping[TType]>
+  ): void => {
+    if (!this.actions.has(action.id)) this.registerAction(action);
+    this.attachAction(triggerId, action.id);
+  };
+
+  public readonly getAction = <T extends ActionDefinition>(
+    id: string
+  ): Action<ActionContext<T>> => {
+    if (!this.actions.has(id)) {
+      throw new Error(`Action [action.id = ${id}] not registered.`);
+    }
+
+    return this.actions.get(id) as ActionInternal<T>;
+  };
+
   public readonly getTriggerActions = <T extends TriggerId>(
     triggerId: T
   ): Array<Action<TriggerContextMapping[T]>> => {
@@ -147,9 +175,9 @@ export class UiActionsService {
 
     const actionIds = this.triggerToActions.get(triggerId);
 
-    const actions = actionIds!.map(actionId => this.actions.get(actionId)).filter(Boolean) as Array<
-      Action<TriggerContextMapping[T]>
-    >;
+    const actions = actionIds!
+      .map(actionId => this.actions.get(actionId) as ActionInternal)
+      .filter(Boolean);
 
     return actions as Array<Action<TriggerContext<T>>>;
   };
@@ -187,6 +215,7 @@ export class UiActionsService {
     this.actions.clear();
     this.triggers.clear();
     this.triggerToActions.clear();
+    this.actionFactories.clear();
   };
 
   /**
@@ -206,4 +235,41 @@ export class UiActionsService {
 
     return new UiActionsService({ triggers, actions, triggerToActions });
   };
+
+  /**
+   * Register an action factory. Action factories are used to configure and
+   * serialize/deserialize dynamic actions.
+   */
+  public readonly registerActionFactory = <
+    Config extends object = object,
+    FactoryContext extends object = object,
+    ActionContext extends object = object
+  >(
+    definition: ActionFactoryDefinition<Config, FactoryContext, ActionContext>
+  ) => {
+    if (this.actionFactories.has(definition.id)) {
+      throw new Error(`ActionFactory [actionFactory.id = ${definition.id}] already registered.`);
+    }
+
+    const actionFactory = new ActionFactory<Config, FactoryContext, ActionContext>(definition);
+
+    this.actionFactories.set(actionFactory.id, actionFactory as ActionFactory<any, any, any>);
+  };
+
+  public readonly getActionFactory = (actionFactoryId: string): ActionFactory => {
+    const actionFactory = this.actionFactories.get(actionFactoryId);
+
+    if (!actionFactory) {
+      throw new Error(`Action factory [actionFactoryId = ${actionFactoryId}] does not exist.`);
+    }
+
+    return actionFactory;
+  };
+
+  /**
+   * Returns an array of all action factories.
+   */
+  public readonly getActionFactories = (): ActionFactory[] => {
+    return [...this.actionFactories.values()];
+  };
 }
diff --git a/src/plugins/ui_actions/public/tests/execute_trigger_actions.test.ts b/src/plugins/ui_actions/public/tests/execute_trigger_actions.test.ts
index 5b427f918c173..ade21ee4b7d91 100644
--- a/src/plugins/ui_actions/public/tests/execute_trigger_actions.test.ts
+++ b/src/plugins/ui_actions/public/tests/execute_trigger_actions.test.ts
@@ -69,7 +69,7 @@ test('executes a single action mapped to a trigger', async () => {
   const action = createTestAction('test1', () => true);
 
   setup.registerTrigger(trigger);
-  setup.attachAction(trigger.id, action);
+  setup.addTriggerAction(trigger.id, action);
 
   const context = {};
   const start = doStart();
@@ -109,7 +109,7 @@ test('does not execute an incompatible action', async () => {
   );
 
   setup.registerTrigger(trigger);
-  setup.attachAction(trigger.id, action);
+  setup.addTriggerAction(trigger.id, action);
 
   const start = doStart();
   const context = {
@@ -130,8 +130,8 @@ test('shows a context menu when more than one action is mapped to a trigger', as
   const action2 = createTestAction('test2', () => true);
 
   setup.registerTrigger(trigger);
-  setup.attachAction(trigger.id, action1);
-  setup.attachAction(trigger.id, action2);
+  setup.addTriggerAction(trigger.id, action1);
+  setup.addTriggerAction(trigger.id, action2);
 
   expect(openContextMenu).toHaveBeenCalledTimes(0);
 
@@ -155,7 +155,7 @@ test('passes whole action context to isCompatible()', async () => {
   });
 
   setup.registerTrigger(trigger);
-  setup.attachAction(trigger.id, action);
+  setup.addTriggerAction(trigger.id, action);
 
   const start = doStart();
 
diff --git a/src/plugins/ui_actions/public/tests/get_trigger_actions.test.ts b/src/plugins/ui_actions/public/tests/get_trigger_actions.test.ts
index f5a6a96fb41a4..55ccac42ff255 100644
--- a/src/plugins/ui_actions/public/tests/get_trigger_actions.test.ts
+++ b/src/plugins/ui_actions/public/tests/get_trigger_actions.test.ts
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { Action } from '../actions';
+import { ActionInternal, Action } from '../actions';
 import { uiActionsPluginMock } from '../mocks';
 import { TriggerId, ActionType } from '../types';
 
@@ -47,13 +47,14 @@ test('returns actions set on trigger', () => {
 
   expect(list0).toHaveLength(0);
 
-  setup.attachAction('trigger' as TriggerId, action1);
+  setup.addTriggerAction('trigger' as TriggerId, action1);
   const list1 = start.getTriggerActions('trigger' as TriggerId);
 
   expect(list1).toHaveLength(1);
-  expect(list1).toEqual([action1]);
+  expect(list1[0]).toBeInstanceOf(ActionInternal);
+  expect(list1[0].id).toBe(action1.id);
 
-  setup.attachAction('trigger' as TriggerId, action2);
+  setup.addTriggerAction('trigger' as TriggerId, action2);
   const list2 = start.getTriggerActions('trigger' as TriggerId);
 
   expect(list2).toHaveLength(2);
diff --git a/src/plugins/ui_actions/public/tests/get_trigger_compatible_actions.test.ts b/src/plugins/ui_actions/public/tests/get_trigger_compatible_actions.test.ts
index c5e68e5d5ca5a..21dd17ed82e3f 100644
--- a/src/plugins/ui_actions/public/tests/get_trigger_compatible_actions.test.ts
+++ b/src/plugins/ui_actions/public/tests/get_trigger_compatible_actions.test.ts
@@ -37,7 +37,7 @@ beforeEach(() => {
     id: 'trigger' as TriggerId,
     title: 'trigger',
   });
-  uiActions.setup.attachAction('trigger' as TriggerId, action);
+  uiActions.setup.addTriggerAction('trigger' as TriggerId, action);
 });
 
 test('can register action', async () => {
@@ -58,7 +58,7 @@ test('getTriggerCompatibleActions returns attached actions', async () => {
     title: 'My trigger',
   };
   setup.registerTrigger(testTrigger);
-  setup.attachAction('MY-TRIGGER' as TriggerId, helloWorldAction);
+  setup.addTriggerAction('MY-TRIGGER' as TriggerId, helloWorldAction);
 
   const start = doStart();
   const actions = await start.getTriggerCompatibleActions('MY-TRIGGER' as TriggerId, {});
@@ -84,7 +84,7 @@ test('filters out actions not applicable based on the context', async () => {
 
   setup.registerTrigger(testTrigger);
   setup.registerAction(action1);
-  setup.attachAction(testTrigger.id, action1);
+  setup.addTriggerAction(testTrigger.id, action1);
 
   const start = doStart();
   let actions = await start.getTriggerCompatibleActions(testTrigger.id, { accept: true });
diff --git a/src/plugins/ui_actions/public/tests/test_samples/index.ts b/src/plugins/ui_actions/public/tests/test_samples/index.ts
index 7d63b1b6d5669..dfa71cec89595 100644
--- a/src/plugins/ui_actions/public/tests/test_samples/index.ts
+++ b/src/plugins/ui_actions/public/tests/test_samples/index.ts
@@ -16,4 +16,5 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+
 export { createHelloWorldAction } from './hello_world_action';
diff --git a/src/plugins/ui_actions/public/triggers/select_range_trigger.ts b/src/plugins/ui_actions/public/triggers/select_range_trigger.ts
index c638db0ce9dab..9758508dc3dac 100644
--- a/src/plugins/ui_actions/public/triggers/select_range_trigger.ts
+++ b/src/plugins/ui_actions/public/triggers/select_range_trigger.ts
@@ -22,6 +22,6 @@ import { Trigger } from '.';
 export const SELECT_RANGE_TRIGGER = 'SELECT_RANGE_TRIGGER';
 export const selectRangeTrigger: Trigger<'SELECT_RANGE_TRIGGER'> = {
   id: SELECT_RANGE_TRIGGER,
-  title: 'Select range',
+  title: '',
   description: 'Applies a range filter',
 };
diff --git a/src/plugins/ui_actions/public/triggers/trigger_internal.ts b/src/plugins/ui_actions/public/triggers/trigger_internal.ts
index 5b670df354f78..9885ed3abe93b 100644
--- a/src/plugins/ui_actions/public/triggers/trigger_internal.ts
+++ b/src/plugins/ui_actions/public/triggers/trigger_internal.ts
@@ -72,6 +72,7 @@ export class TriggerInternal<T extends TriggerId> {
     const panel = await buildContextMenuForActions({
       actions,
       actionContext: context,
+      title: this.trigger.title,
       closeMenu: () => session.close(),
     });
     const session = openContextMenu([panel]);
diff --git a/src/plugins/ui_actions/public/triggers/value_click_trigger.ts b/src/plugins/ui_actions/public/triggers/value_click_trigger.ts
index ad32bdc1b564e..2671584d105c8 100644
--- a/src/plugins/ui_actions/public/triggers/value_click_trigger.ts
+++ b/src/plugins/ui_actions/public/triggers/value_click_trigger.ts
@@ -22,6 +22,6 @@ import { Trigger } from '.';
 export const VALUE_CLICK_TRIGGER = 'VALUE_CLICK_TRIGGER';
 export const valueClickTrigger: Trigger<'VALUE_CLICK_TRIGGER'> = {
   id: VALUE_CLICK_TRIGGER,
-  title: 'Value clicked',
+  title: '',
   description: 'Value was clicked',
 };
diff --git a/src/plugins/ui_actions/public/types.ts b/src/plugins/ui_actions/public/types.ts
index c7e6d61e15f31..2cb4a8f26a879 100644
--- a/src/plugins/ui_actions/public/types.ts
+++ b/src/plugins/ui_actions/public/types.ts
@@ -17,15 +17,17 @@
  * under the License.
  */
 
-import { ActionByType } from './actions/action';
+import { ActionInternal } from './actions/action_internal';
 import { TriggerInternal } from './triggers/trigger_internal';
+import { ActionFactory } from './actions';
 import { EmbeddableVisTriggerContext, IEmbeddable } from '../../embeddable/public';
 import { Filter } from '../../data/public';
 import { SELECT_RANGE_TRIGGER, VALUE_CLICK_TRIGGER, APPLY_FILTER_TRIGGER } from './triggers';
 
 export type TriggerRegistry = Map<TriggerId, TriggerInternal<any>>;
-export type ActionRegistry = Map<string, ActionByType<any>>;
+export type ActionRegistry = Map<string, ActionInternal>;
 export type TriggerToActionsRegistry = Map<TriggerId, string[]>;
+export type ActionFactoryRegistry = Map<string, ActionFactory>;
 
 const DEFAULT_TRIGGER = '';
 
diff --git a/src/plugins/ui_actions/public/util/configurable.ts b/src/plugins/ui_actions/public/util/configurable.ts
new file mode 100644
index 0000000000000..d3a527a2183b1
--- /dev/null
+++ b/src/plugins/ui_actions/public/util/configurable.ts
@@ -0,0 +1,60 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { UiComponent } from 'src/plugins/kibana_utils/common';
+
+/**
+ * Represents something that can be configured by user using UI.
+ */
+export interface Configurable<Config extends object = object, Context = object> {
+  /**
+   * Create default config for this item, used when item is created for the first time.
+   */
+  readonly createConfig: () => Config;
+
+  /**
+   * Is this config valid. Used to validate user's input before saving.
+   */
+  readonly isConfigValid: (config: Config) => boolean;
+
+  /**
+   * `UiComponent` to be rendered when collecting configuration for this item.
+   */
+  readonly CollectConfig: UiComponent<CollectConfigProps<Config, Context>>;
+}
+
+/**
+ * Props provided to `CollectConfig` component on every re-render.
+ */
+export interface CollectConfigProps<Config extends object = object, Context = object> {
+  /**
+   * Current (latest) config of the item.
+   */
+  config: Config;
+
+  /**
+   * Callback called when user updates the config in UI.
+   */
+  onConfig: (config: Config) => void;
+
+  /**
+   * Context information about where component is being rendered.
+   */
+  context: Context;
+}
diff --git a/src/plugins/ui_actions/public/util/index.ts b/src/plugins/ui_actions/public/util/index.ts
new file mode 100644
index 0000000000000..53c6109cac4ca
--- /dev/null
+++ b/src/plugins/ui_actions/public/util/index.ts
@@ -0,0 +1,21 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+export * from './presentable';
+export * from './configurable';
diff --git a/src/plugins/ui_actions/public/actions/action_definition.ts b/src/plugins/ui_actions/public/util/presentable.ts
similarity index 50%
rename from src/plugins/ui_actions/public/actions/action_definition.ts
rename to src/plugins/ui_actions/public/util/presentable.ts
index c590cf8f34ee0..945fd2065ce78 100644
--- a/src/plugins/ui_actions/public/actions/action_definition.ts
+++ b/src/plugins/ui_actions/public/util/presentable.ts
@@ -18,55 +18,46 @@
  */
 
 import { UiComponent } from 'src/plugins/kibana_utils/common';
-import { ActionType, ActionContextMapping } from '../types';
 
-export interface ActionDefinition<T extends ActionType> {
+/**
+ * Represents something that can be displayed to user in UI.
+ */
+export interface Presentable<Context extends object = object> {
   /**
-   * Determined the order when there is more than one action matched to a trigger.
-   * Higher numbers are displayed first.
+   * ID that uniquely identifies this object.
    */
-  order?: number;
+  readonly id: string;
 
   /**
-   * A unique identifier for this action instance.
+   * Determines the display order in relation to other items. Higher numbers are
+   * displayed first.
    */
-  id?: string;
+  readonly order: number;
 
   /**
-   * The action type is what determines the context shape.
+   * `UiComponent` to render when displaying this entity as a context menu item.
+   * If not provided, `getDisplayName` will be used instead.
    */
-  readonly type: T;
+  readonly MenuItem?: UiComponent<{ context: Context }>;
 
   /**
    * Optional EUI icon type that can be displayed along with the title.
    */
-  getIconType?(context: ActionContextMapping[T]): string;
+  getIconType(context: Context): string | undefined;
 
   /**
    * Returns a title to be displayed to the user.
-   * @param context
-   */
-  getDisplayName?(context: ActionContextMapping[T]): string;
-
-  /**
-   * `UiComponent` to render when displaying this action as a context menu item.
-   * If not provided, `getDisplayName` will be used instead.
-   */
-  MenuItem?: UiComponent<{ context: ActionContextMapping[T] }>;
-
-  /**
-   * Returns a promise that resolves to true if this action is compatible given the context,
-   * otherwise resolves to false.
    */
-  isCompatible?(context: ActionContextMapping[T]): Promise<boolean>;
+  getDisplayName(context: Context): string;
 
   /**
-   * If this returns something truthy, this is used in addition to the `execute` method when clicked.
+   * This method should return a link if this item can be clicked on.
    */
-  getHref?(context: ActionContextMapping[T]): string | undefined;
+  getHref?(context: Context): string | undefined;
 
   /**
-   * Executes the action.
+   * Returns a promise that resolves to true if this item is compatible given
+   * the context and should be displayed to user, otherwise resolves to false.
    */
-  execute(context: ActionContextMapping[T]): Promise<void>;
+  isCompatible(context: Context): Promise<boolean>;
 }
diff --git a/src/plugins/ui_actions/scripts/storybook.js b/src/plugins/ui_actions/scripts/storybook.js
new file mode 100644
index 0000000000000..cb2eda610170d
--- /dev/null
+++ b/src/plugins/ui_actions/scripts/storybook.js
@@ -0,0 +1,26 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { join } from 'path';
+
+// eslint-disable-next-line
+require('@kbn/storybook').runStorybookCli({
+  name: 'ui_actions',
+  storyGlobs: [join(__dirname, '..', 'public', 'components', '**', '*.story.tsx')],
+});
diff --git a/test/plugin_functional/plugins/kbn_tp_embeddable_explorer/public/np_ready/public/plugin.tsx b/test/plugin_functional/plugins/kbn_tp_embeddable_explorer/public/np_ready/public/plugin.tsx
index 18ceec652392d..8ddb2e1a4803b 100644
--- a/test/plugin_functional/plugins/kbn_tp_embeddable_explorer/public/np_ready/public/plugin.tsx
+++ b/test/plugin_functional/plugins/kbn_tp_embeddable_explorer/public/np_ready/public/plugin.tsx
@@ -70,11 +70,10 @@ export class EmbeddableExplorerPublicPlugin
     const sayHelloAction = new SayHelloAction(alert);
     const sendMessageAction = createSendMessageAction(core.overlays);
 
-    plugins.uiActions.registerAction(helloWorldAction);
     plugins.uiActions.registerAction(sayHelloAction);
     plugins.uiActions.registerAction(sendMessageAction);
 
-    plugins.uiActions.attachAction(CONTEXT_MENU_TRIGGER, helloWorldAction);
+    plugins.uiActions.addTriggerAction(CONTEXT_MENU_TRIGGER, helloWorldAction);
 
     plugins.__LEGACY.onRenderComplete(() => {
       const root = document.getElementById(REACT_ROOT_ID);
diff --git a/test/plugin_functional/plugins/kbn_tp_sample_panel_action/public/sample_panel_action.tsx b/test/plugin_functional/plugins/kbn_tp_sample_panel_action/public/sample_panel_action.tsx
index 8395fddece2a4..7c7cc689d05e5 100644
--- a/test/plugin_functional/plugins/kbn_tp_sample_panel_action/public/sample_panel_action.tsx
+++ b/test/plugin_functional/plugins/kbn_tp_sample_panel_action/public/sample_panel_action.tsx
@@ -62,5 +62,4 @@ function createSamplePanelAction() {
 }
 
 const action = createSamplePanelAction();
-npSetup.plugins.uiActions.registerAction(action);
-npSetup.plugins.uiActions.attachAction(CONTEXT_MENU_TRIGGER, action);
+npSetup.plugins.uiActions.addTriggerAction(CONTEXT_MENU_TRIGGER, action);
diff --git a/test/plugin_functional/plugins/kbn_tp_sample_panel_action/public/sample_panel_link.ts b/test/plugin_functional/plugins/kbn_tp_sample_panel_action/public/sample_panel_link.ts
index 4b09be4db8a60..e034fbe320608 100644
--- a/test/plugin_functional/plugins/kbn_tp_sample_panel_action/public/sample_panel_link.ts
+++ b/test/plugin_functional/plugins/kbn_tp_sample_panel_action/public/sample_panel_link.ts
@@ -33,5 +33,4 @@ export const createSamplePanelLink = (): Action =>
   });
 
 const action = createSamplePanelLink();
-npStart.plugins.uiActions.registerAction(action);
-npStart.plugins.uiActions.attachAction(CONTEXT_MENU_TRIGGER, action);
+npStart.plugins.uiActions.addTriggerAction(CONTEXT_MENU_TRIGGER, action);
diff --git a/x-pack/.i18nrc.json b/x-pack/.i18nrc.json
index 2a28e349ace99..784b5a5a42ace 100644
--- a/x-pack/.i18nrc.json
+++ b/x-pack/.i18nrc.json
@@ -9,6 +9,7 @@
     "xpack.beatsManagement": "legacy/plugins/beats_management",
     "xpack.canvas": "legacy/plugins/canvas",
     "xpack.crossClusterReplication": "legacy/plugins/cross_cluster_replication",
+    "xpack.dashboard": "plugins/dashboard_enhanced",
     "xpack.dashboardMode": "legacy/plugins/dashboard_mode",
     "xpack.data": "plugins/data_enhanced",
     "xpack.drilldowns": "plugins/drilldowns",
diff --git a/x-pack/plugins/advanced_ui_actions/public/components/action_wizard/action_wizard.scss b/x-pack/plugins/advanced_ui_actions/public/components/action_wizard/action_wizard.scss
index 2ba6f9baca90d..87ec3f8fc7ec1 100644
--- a/x-pack/plugins/advanced_ui_actions/public/components/action_wizard/action_wizard.scss
+++ b/x-pack/plugins/advanced_ui_actions/public/components/action_wizard/action_wizard.scss
@@ -1,8 +1,3 @@
-.auaActionWizard__selectedActionFactoryContainer {
-  background-color: $euiColorLightestShade;
-  padding: $euiSize;
-}
-
 .auaActionWizard__actionFactoryItem {
   .euiKeyPadMenuItem__label {
     height: #{$euiSizeXL};
diff --git a/x-pack/plugins/advanced_ui_actions/public/components/action_wizard/action_wizard.story.tsx b/x-pack/plugins/advanced_ui_actions/public/components/action_wizard/action_wizard.story.tsx
index 62f16890cade2..9c73f07289dc9 100644
--- a/x-pack/plugins/advanced_ui_actions/public/components/action_wizard/action_wizard.story.tsx
+++ b/x-pack/plugins/advanced_ui_actions/public/components/action_wizard/action_wizard.story.tsx
@@ -6,28 +6,26 @@
 
 import React from 'react';
 import { storiesOf } from '@storybook/react';
-import { dashboardDrilldownActionFactory, Demo, urlDrilldownActionFactory } from './test_data';
+import { Demo, dashboardFactory, urlFactory } from './test_data';
 
 storiesOf('components/ActionWizard', module)
-  .add('default', () => (
-    <Demo actionFactories={[dashboardDrilldownActionFactory, urlDrilldownActionFactory]} />
-  ))
+  .add('default', () => <Demo actionFactories={[dashboardFactory, urlFactory]} />)
   .add('Only one factory is available', () => (
     // to make sure layout doesn't break
-    <Demo actionFactories={[dashboardDrilldownActionFactory]} />
+    <Demo actionFactories={[dashboardFactory]} />
   ))
   .add('Long list of action factories', () => (
     // to make sure layout doesn't break
     <Demo
       actionFactories={[
-        dashboardDrilldownActionFactory,
-        urlDrilldownActionFactory,
-        dashboardDrilldownActionFactory,
-        urlDrilldownActionFactory,
-        dashboardDrilldownActionFactory,
-        urlDrilldownActionFactory,
-        dashboardDrilldownActionFactory,
-        urlDrilldownActionFactory,
+        dashboardFactory,
+        urlFactory,
+        dashboardFactory,
+        urlFactory,
+        dashboardFactory,
+        urlFactory,
+        dashboardFactory,
+        urlFactory,
       ]}
     />
   ));
diff --git a/x-pack/plugins/advanced_ui_actions/public/components/action_wizard/action_wizard.test.tsx b/x-pack/plugins/advanced_ui_actions/public/components/action_wizard/action_wizard.test.tsx
index aea47be693b8f..cc56714fcb2f8 100644
--- a/x-pack/plugins/advanced_ui_actions/public/components/action_wizard/action_wizard.test.tsx
+++ b/x-pack/plugins/advanced_ui_actions/public/components/action_wizard/action_wizard.test.tsx
@@ -8,21 +8,14 @@ import React from 'react';
 import { cleanup, fireEvent, render } from '@testing-library/react/pure';
 import '@testing-library/jest-dom/extend-expect'; // TODO: this should be global
 import { TEST_SUBJ_ACTION_FACTORY_ITEM, TEST_SUBJ_SELECTED_ACTION_FACTORY } from './action_wizard';
-import {
-  dashboardDrilldownActionFactory,
-  dashboards,
-  Demo,
-  urlDrilldownActionFactory,
-} from './test_data';
+import { dashboardFactory, dashboards, Demo, urlFactory } from './test_data';
 
 // TODO: afterEach is not available for it globally during setup
 // https://github.com/elastic/kibana/issues/59469
 afterEach(cleanup);
 
 test('Pick and configure action', () => {
-  const screen = render(
-    <Demo actionFactories={[dashboardDrilldownActionFactory, urlDrilldownActionFactory]} />
-  );
+  const screen = render(<Demo actionFactories={[dashboardFactory, urlFactory]} />);
 
   // check that all factories are displayed to pick
   expect(screen.getAllByTestId(TEST_SUBJ_ACTION_FACTORY_ITEM)).toHaveLength(2);
@@ -47,7 +40,7 @@ test('Pick and configure action', () => {
 });
 
 test('If only one actions factory is available then actionFactory selection is emitted without user input', () => {
-  const screen = render(<Demo actionFactories={[urlDrilldownActionFactory]} />);
+  const screen = render(<Demo actionFactories={[urlFactory]} />);
 
   // check that no factories are displayed to pick from
   expect(screen.queryByTestId(TEST_SUBJ_ACTION_FACTORY_ITEM)).not.toBeInTheDocument();
diff --git a/x-pack/plugins/advanced_ui_actions/public/components/action_wizard/action_wizard.tsx b/x-pack/plugins/advanced_ui_actions/public/components/action_wizard/action_wizard.tsx
index 41ef863c00e44..846f6d41eb30d 100644
--- a/x-pack/plugins/advanced_ui_actions/public/components/action_wizard/action_wizard.tsx
+++ b/x-pack/plugins/advanced_ui_actions/public/components/action_wizard/action_wizard.tsx
@@ -16,40 +16,23 @@ import {
 } from '@elastic/eui';
 import { txtChangeButton } from './i18n';
 import './action_wizard.scss';
+import { ActionFactory } from '../../services';
 
-// TODO: this interface is temporary for just moving forward with the component
-// and it will be imported from the ../ui_actions when implemented properly
-// eslint-disable-next-line @typescript-eslint/consistent-type-definitions
-export type ActionBaseConfig = {};
-export interface ActionFactory<Config extends ActionBaseConfig = ActionBaseConfig> {
-  type: string; // TODO: type should be tied to Action and ActionByType
-  displayName: string;
-  iconType?: string;
-  wizard: React.FC<ActionFactoryWizardProps<Config>>;
-  createConfig: () => Config;
-  isValid: (config: Config) => boolean;
-}
-
-export interface ActionFactoryWizardProps<Config extends ActionBaseConfig> {
-  config?: Config;
-
-  /**
-   * Callback called when user updates the config in UI.
-   */
-  onConfig: (config: Config) => void;
-}
+type ActionBaseConfig = object;
+type ActionFactoryBaseContext = object;
 
 export interface ActionWizardProps {
   /**
    * List of available action factories
    */
-  actionFactories: Array<ActionFactory<any>>; // any here to be able to pass array of ActionFactory<Config> with different configs
+  actionFactories: ActionFactory[];
 
   /**
    * Currently selected action factory
    * undefined - is allowed and means that non is selected
    */
   currentActionFactory?: ActionFactory;
+
   /**
    * Action factory selected changed
    * null - means user click "change" and removed action factory selection
@@ -65,6 +48,11 @@ export interface ActionWizardProps {
    * config changed
    */
   onConfigChange: (config: ActionBaseConfig) => void;
+
+  /**
+   * Context will be passed into ActionFactory's methods
+   */
+  context: ActionFactoryBaseContext;
 }
 
 export const ActionWizard: React.FC<ActionWizardProps> = ({
@@ -73,6 +61,7 @@ export const ActionWizard: React.FC<ActionWizardProps> = ({
   onActionFactoryChange,
   onConfigChange,
   config,
+  context,
 }) => {
   // auto pick action factory if there is only 1 available
   if (!currentActionFactory && actionFactories.length === 1) {
@@ -87,6 +76,7 @@ export const ActionWizard: React.FC<ActionWizardProps> = ({
         onDeselect={() => {
           onActionFactoryChange(null);
         }}
+        context={context}
         config={config}
         onConfigChange={newConfig => {
           onConfigChange(newConfig);
@@ -97,6 +87,7 @@ export const ActionWizard: React.FC<ActionWizardProps> = ({
 
   return (
     <ActionFactorySelector
+      context={context}
       actionFactories={actionFactories}
       onActionFactorySelected={actionFactory => {
         onActionFactoryChange(actionFactory);
@@ -105,10 +96,11 @@ export const ActionWizard: React.FC<ActionWizardProps> = ({
   );
 };
 
-interface SelectedActionFactoryProps<Config extends ActionBaseConfig = ActionBaseConfig> {
-  actionFactory: ActionFactory<Config>;
-  config: Config;
-  onConfigChange: (config: Config) => void;
+interface SelectedActionFactoryProps {
+  actionFactory: ActionFactory;
+  config: ActionBaseConfig;
+  context: ActionFactoryBaseContext;
+  onConfigChange: (config: ActionBaseConfig) => void;
   showDeselect: boolean;
   onDeselect: () => void;
 }
@@ -121,28 +113,28 @@ const SelectedActionFactory: React.FC<SelectedActionFactoryProps> = ({
   showDeselect,
   onConfigChange,
   config,
+  context,
 }) => {
   return (
     <div
       className="auaActionWizard__selectedActionFactoryContainer"
       data-test-subj={TEST_SUBJ_SELECTED_ACTION_FACTORY}
-      data-testid={TEST_SUBJ_SELECTED_ACTION_FACTORY}
     >
       <header>
         <EuiFlexGroup alignItems="center" gutterSize="s">
-          {actionFactory.iconType && (
+          {actionFactory.getIconType(context) && (
             <EuiFlexItem grow={false}>
-              <EuiIcon type={actionFactory.iconType} size="m" />
+              <EuiIcon type={actionFactory.getIconType(context)!} size="m" />
             </EuiFlexItem>
           )}
           <EuiFlexItem grow={true}>
             <EuiText>
-              <h4>{actionFactory.displayName}</h4>
+              <h4>{actionFactory.getDisplayName(context)}</h4>
             </EuiText>
           </EuiFlexItem>
           {showDeselect && (
             <EuiFlexItem grow={false}>
-              <EuiButtonEmpty size="s" onClick={() => onDeselect()}>
+              <EuiButtonEmpty size="xs" onClick={() => onDeselect()}>
                 {txtChangeButton}
               </EuiButtonEmpty>
             </EuiFlexItem>
@@ -151,10 +143,11 @@ const SelectedActionFactory: React.FC<SelectedActionFactoryProps> = ({
       </header>
       <EuiSpacer size="m" />
       <div>
-        {actionFactory.wizard({
-          config,
-          onConfig: onConfigChange,
-        })}
+        <actionFactory.ReactCollectConfig
+          config={config}
+          onConfig={onConfigChange}
+          context={context}
+        />
       </div>
     </div>
   );
@@ -162,6 +155,7 @@ const SelectedActionFactory: React.FC<SelectedActionFactoryProps> = ({
 
 interface ActionFactorySelectorProps {
   actionFactories: ActionFactory[];
+  context: ActionFactoryBaseContext;
   onActionFactorySelected: (actionFactory: ActionFactory) => void;
 }
 
@@ -170,6 +164,7 @@ export const TEST_SUBJ_ACTION_FACTORY_ITEM = 'action-factory-item';
 const ActionFactorySelector: React.FC<ActionFactorySelectorProps> = ({
   actionFactories,
   onActionFactorySelected,
+  context,
 }) => {
   if (actionFactories.length === 0) {
     // this is not user facing, as it would be impossible to get into this state
@@ -178,19 +173,23 @@ const ActionFactorySelector: React.FC<ActionFactorySelectorProps> = ({
   }
 
   return (
-    <EuiFlexGroup wrap>
-      {actionFactories.map(actionFactory => (
-        <EuiKeyPadMenuItemButton
-          className="auaActionWizard__actionFactoryItem"
-          key={actionFactory.type}
-          label={actionFactory.displayName}
-          data-testid={TEST_SUBJ_ACTION_FACTORY_ITEM}
-          data-test-subj={TEST_SUBJ_ACTION_FACTORY_ITEM}
-          onClick={() => onActionFactorySelected(actionFactory)}
-        >
-          {actionFactory.iconType && <EuiIcon type={actionFactory.iconType} size="m" />}
-        </EuiKeyPadMenuItemButton>
-      ))}
+    <EuiFlexGroup gutterSize="m" wrap={true}>
+      {[...actionFactories]
+        .sort((f1, f2) => f1.order - f2.order)
+        .map(actionFactory => (
+          <EuiFlexItem grow={false} key={actionFactory.id}>
+            <EuiKeyPadMenuItemButton
+              className="auaActionWizard__actionFactoryItem"
+              label={actionFactory.getDisplayName(context)}
+              data-test-subj={TEST_SUBJ_ACTION_FACTORY_ITEM}
+              onClick={() => onActionFactorySelected(actionFactory)}
+            >
+              {actionFactory.getIconType(context) && (
+                <EuiIcon type={actionFactory.getIconType(context)!} size="m" />
+              )}
+            </EuiKeyPadMenuItemButton>
+          </EuiFlexItem>
+        ))}
     </EuiFlexGroup>
   );
 };
diff --git a/x-pack/plugins/advanced_ui_actions/public/components/action_wizard/i18n.ts b/x-pack/plugins/advanced_ui_actions/public/components/action_wizard/i18n.ts
index 641f25176264a..a315184bf68ef 100644
--- a/x-pack/plugins/advanced_ui_actions/public/components/action_wizard/i18n.ts
+++ b/x-pack/plugins/advanced_ui_actions/public/components/action_wizard/i18n.ts
@@ -9,6 +9,6 @@ import { i18n } from '@kbn/i18n';
 export const txtChangeButton = i18n.translate(
   'xpack.advancedUiActions.components.actionWizard.changeButton',
   {
-    defaultMessage: 'change',
+    defaultMessage: 'Change',
   }
 );
diff --git a/x-pack/plugins/advanced_ui_actions/public/components/action_wizard/index.ts b/x-pack/plugins/advanced_ui_actions/public/components/action_wizard/index.ts
index ed224248ec4cd..a189afbf956ee 100644
--- a/x-pack/plugins/advanced_ui_actions/public/components/action_wizard/index.ts
+++ b/x-pack/plugins/advanced_ui_actions/public/components/action_wizard/index.ts
@@ -4,4 +4,4 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-export { ActionFactory, ActionWizard } from './action_wizard';
+export { ActionWizard } from './action_wizard';
diff --git a/x-pack/plugins/advanced_ui_actions/public/components/action_wizard/test_data.tsx b/x-pack/plugins/advanced_ui_actions/public/components/action_wizard/test_data.tsx
index 8ecdde681069e..167cb130fdb4a 100644
--- a/x-pack/plugins/advanced_ui_actions/public/components/action_wizard/test_data.tsx
+++ b/x-pack/plugins/advanced_ui_actions/public/components/action_wizard/test_data.tsx
@@ -6,124 +6,161 @@
 
 import React, { useState } from 'react';
 import { EuiFieldText, EuiFormRow, EuiSelect, EuiSwitch } from '@elastic/eui';
-import { ActionFactory, ActionBaseConfig, ActionWizard } from './action_wizard';
+import { reactToUiComponent } from '../../../../../../src/plugins/kibana_react/public';
+import { ActionWizard } from './action_wizard';
+import { ActionFactoryDefinition, ActionFactory } from '../../services';
+import { CollectConfigProps } from '../../util';
+
+type ActionBaseConfig = object;
 
 export const dashboards = [
   { id: 'dashboard1', title: 'Dashboard 1' },
   { id: 'dashboard2', title: 'Dashboard 2' },
 ];
 
-export const dashboardDrilldownActionFactory: ActionFactory<{
+interface DashboardDrilldownConfig {
   dashboardId?: string;
-  useCurrentDashboardFilters: boolean;
-  useCurrentDashboardDataRange: boolean;
-}> = {
-  type: 'Dashboard',
-  displayName: 'Go to Dashboard',
-  iconType: 'dashboardApp',
+  useCurrentFilters: boolean;
+  useCurrentDateRange: boolean;
+}
+
+function DashboardDrilldownCollectConfig(props: CollectConfigProps<DashboardDrilldownConfig>) {
+  const config = props.config ?? {
+    dashboardId: undefined,
+    useCurrentFilters: true,
+    useCurrentDateRange: true,
+  };
+  return (
+    <>
+      <EuiFormRow label="Choose destination dashboard:">
+        <EuiSelect
+          name="selectDashboard"
+          hasNoInitialSelection={true}
+          options={dashboards.map(({ id, title }) => ({ value: id, text: title }))}
+          value={config.dashboardId}
+          onChange={e => {
+            props.onConfig({ ...config, dashboardId: e.target.value });
+          }}
+        />
+      </EuiFormRow>
+      <EuiFormRow hasChildLabel={false}>
+        <EuiSwitch
+          name="useCurrentFilters"
+          label="Use current dashboard's filters"
+          checked={config.useCurrentFilters}
+          onChange={() =>
+            props.onConfig({
+              ...config,
+              useCurrentFilters: !config.useCurrentFilters,
+            })
+          }
+        />
+      </EuiFormRow>
+      <EuiFormRow hasChildLabel={false}>
+        <EuiSwitch
+          name="useCurrentDateRange"
+          label="Use current dashboard's date range"
+          checked={config.useCurrentDateRange}
+          onChange={() =>
+            props.onConfig({
+              ...config,
+              useCurrentDateRange: !config.useCurrentDateRange,
+            })
+          }
+        />
+      </EuiFormRow>
+    </>
+  );
+}
+
+export const dashboardDrilldownActionFactory: ActionFactoryDefinition<
+  DashboardDrilldownConfig,
+  any,
+  any
+> = {
+  id: 'Dashboard',
+  getDisplayName: () => 'Go to Dashboard',
+  getIconType: () => 'dashboardApp',
   createConfig: () => {
     return {
       dashboardId: undefined,
-      useCurrentDashboardDataRange: true,
-      useCurrentDashboardFilters: true,
+      useCurrentFilters: true,
+      useCurrentDateRange: true,
     };
   },
-  isValid: config => {
+  isConfigValid: (config: DashboardDrilldownConfig): config is DashboardDrilldownConfig => {
     if (!config.dashboardId) return false;
     return true;
   },
-  wizard: props => {
-    const config = props.config ?? {
-      dashboardId: undefined,
-      useCurrentDashboardDataRange: true,
-      useCurrentDashboardFilters: true,
-    };
-    return (
-      <>
-        <EuiFormRow label="Choose destination dashboard:">
-          <EuiSelect
-            name="selectDashboard"
-            hasNoInitialSelection={true}
-            options={dashboards.map(({ id, title }) => ({ value: id, text: title }))}
-            value={config.dashboardId}
-            onChange={e => {
-              props.onConfig({ ...config, dashboardId: e.target.value });
-            }}
-          />
-        </EuiFormRow>
-        <EuiFormRow hasChildLabel={false}>
-          <EuiSwitch
-            name="useCurrentFilters"
-            label="Use current dashboard's filters"
-            checked={config.useCurrentDashboardFilters}
-            onChange={() =>
-              props.onConfig({
-                ...config,
-                useCurrentDashboardFilters: !config.useCurrentDashboardFilters,
-              })
-            }
-          />
-        </EuiFormRow>
-        <EuiFormRow hasChildLabel={false}>
-          <EuiSwitch
-            name="useCurrentDateRange"
-            label="Use current dashboard's date range"
-            checked={config.useCurrentDashboardDataRange}
-            onChange={() =>
-              props.onConfig({
-                ...config,
-                useCurrentDashboardDataRange: !config.useCurrentDashboardDataRange,
-              })
-            }
-          />
-        </EuiFormRow>
-      </>
-    );
+  CollectConfig: reactToUiComponent(DashboardDrilldownCollectConfig),
+
+  isCompatible(context?: object): Promise<boolean> {
+    return Promise.resolve(true);
   },
+  order: 0,
+  create: () => ({
+    id: 'test',
+    execute: async () => alert('Navigate to dashboard!'),
+  }),
 };
 
-export const urlDrilldownActionFactory: ActionFactory<{ url: string; openInNewTab: boolean }> = {
-  type: 'Url',
-  displayName: 'Go to URL',
-  iconType: 'link',
+export const dashboardFactory = new ActionFactory(dashboardDrilldownActionFactory);
+
+interface UrlDrilldownConfig {
+  url: string;
+  openInNewTab: boolean;
+}
+function UrlDrilldownCollectConfig(props: CollectConfigProps<UrlDrilldownConfig>) {
+  const config = props.config ?? {
+    url: '',
+    openInNewTab: false,
+  };
+  return (
+    <>
+      <EuiFormRow label="Enter target URL">
+        <EuiFieldText
+          placeholder="Enter URL"
+          name="url"
+          value={config.url}
+          onChange={event => props.onConfig({ ...config, url: event.target.value })}
+        />
+      </EuiFormRow>
+      <EuiFormRow hasChildLabel={false}>
+        <EuiSwitch
+          name="openInNewTab"
+          label="Open in new tab?"
+          checked={config.openInNewTab}
+          onChange={() => props.onConfig({ ...config, openInNewTab: !config.openInNewTab })}
+        />
+      </EuiFormRow>
+    </>
+  );
+}
+export const urlDrilldownActionFactory: ActionFactoryDefinition<UrlDrilldownConfig> = {
+  id: 'Url',
+  getDisplayName: () => 'Go to URL',
+  getIconType: () => 'link',
   createConfig: () => {
     return {
       url: '',
       openInNewTab: false,
     };
   },
-  isValid: config => {
+  isConfigValid: (config: UrlDrilldownConfig): config is UrlDrilldownConfig => {
     if (!config.url) return false;
     return true;
   },
-  wizard: props => {
-    const config = props.config ?? {
-      url: '',
-      openInNewTab: false,
-    };
-    return (
-      <>
-        <EuiFormRow label="Enter target URL">
-          <EuiFieldText
-            placeholder="Enter URL"
-            name="url"
-            value={config.url}
-            onChange={event => props.onConfig({ ...config, url: event.target.value })}
-          />
-        </EuiFormRow>
-        <EuiFormRow hasChildLabel={false}>
-          <EuiSwitch
-            name="openInNewTab"
-            label="Open in new tab?"
-            checked={config.openInNewTab}
-            onChange={() => props.onConfig({ ...config, openInNewTab: !config.openInNewTab })}
-          />
-        </EuiFormRow>
-      </>
-    );
+  CollectConfig: reactToUiComponent(UrlDrilldownCollectConfig),
+
+  order: 10,
+  isCompatible(context?: object): Promise<boolean> {
+    return Promise.resolve(true);
   },
+  create: () => null as any,
 };
 
+export const urlFactory = new ActionFactory(urlDrilldownActionFactory);
+
 export function Demo({ actionFactories }: { actionFactories: Array<ActionFactory<any>> }) {
   const [state, setState] = useState<{
     currentActionFactory?: ActionFactory;
@@ -157,14 +194,15 @@ export function Demo({ actionFactories }: { actionFactories: Array<ActionFactory
           changeActionFactory(newActionFactory);
         }}
         currentActionFactory={state.currentActionFactory}
+        context={{}}
       />
       <div style={{ marginTop: '44px' }} />
       <hr />
-      <div>Action Factory Type: {state.currentActionFactory?.type}</div>
+      <div>Action Factory Id: {state.currentActionFactory?.id}</div>
       <div>Action Factory Config: {JSON.stringify(state.config)}</div>
       <div>
         Is config valid:{' '}
-        {JSON.stringify(state.currentActionFactory?.isValid(state.config!) ?? false)}
+        {JSON.stringify(state.currentActionFactory?.isConfigValid(state.config!) ?? false)}
       </div>
     </>
   );
diff --git a/x-pack/plugins/drilldowns/public/components/drilldown_picker/index.tsx b/x-pack/plugins/advanced_ui_actions/public/components/index.ts
similarity index 87%
rename from x-pack/plugins/drilldowns/public/components/drilldown_picker/index.tsx
rename to x-pack/plugins/advanced_ui_actions/public/components/index.ts
index 3be289fe6d46e..236b1a6ec4611 100644
--- a/x-pack/plugins/drilldowns/public/components/drilldown_picker/index.tsx
+++ b/x-pack/plugins/advanced_ui_actions/public/components/index.ts
@@ -4,4 +4,4 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-export * from './drilldown_picker';
+export * from './action_wizard';
diff --git a/x-pack/plugins/advanced_ui_actions/public/custom_time_range_action.tsx b/x-pack/plugins/advanced_ui_actions/public/custom_time_range_action.tsx
index 325a5ddc10179..c0cd8d5540db2 100644
--- a/x-pack/plugins/advanced_ui_actions/public/custom_time_range_action.tsx
+++ b/x-pack/plugins/advanced_ui_actions/public/custom_time_range_action.tsx
@@ -44,7 +44,7 @@ export class CustomTimeRangeAction implements ActionByType<typeof CUSTOM_TIME_RA
   private dateFormat?: string;
   private commonlyUsedRanges: CommonlyUsedRange[];
   public readonly id = CUSTOM_TIME_RANGE;
-  public order = 7;
+  public order = 30;
 
   constructor({
     openModal,
diff --git a/x-pack/plugins/advanced_ui_actions/public/index.ts b/x-pack/plugins/advanced_ui_actions/public/index.ts
index c11c1119a9b13..55361105dcb0f 100644
--- a/x-pack/plugins/advanced_ui_actions/public/index.ts
+++ b/x-pack/plugins/advanced_ui_actions/public/index.ts
@@ -12,3 +12,17 @@ export function plugin(initializerContext: PluginInitializerContext) {
 }
 
 export { AdvancedUiActionsPublicPlugin as Plugin };
+export {
+  SetupContract as AdvancedUiActionsSetup,
+  StartContract as AdvancedUiActionsStart,
+} from './plugin';
+
+export { ActionWizard } from './components';
+export {
+  ActionFactoryDefinition as AdvancedUiActionsActionFactoryDefinition,
+  ActionFactory as AdvancedUiActionsActionFactory,
+} from './services/action_factory_service';
+export {
+  Configurable as AdvancedUiActionsConfigurable,
+  CollectConfigProps as AdvancedUiActionsCollectConfigProps,
+} from './util';
diff --git a/x-pack/plugins/advanced_ui_actions/public/plugin.ts b/x-pack/plugins/advanced_ui_actions/public/plugin.ts
index b9f0ce43d3cdc..71ea72499d87f 100644
--- a/x-pack/plugins/advanced_ui_actions/public/plugin.ts
+++ b/x-pack/plugins/advanced_ui_actions/public/plugin.ts
@@ -11,7 +11,7 @@ import {
   Plugin,
 } from '../../../../src/core/public';
 import { createReactOverlays } from '../../../../src/plugins/kibana_react/public';
-import { UiActionsStart, UiActionsSetup } from '../../../../src/plugins/ui_actions/public';
+import { UiActionsSetup, UiActionsStart } from '../../../../src/plugins/ui_actions/public';
 import {
   CONTEXT_MENU_TRIGGER,
   PANEL_BADGE_TRIGGER,
@@ -41,8 +41,10 @@ interface StartDependencies {
   uiActions: UiActionsStart;
 }
 
-export type Setup = void;
-export type Start = void;
+// eslint-disable-next-line @typescript-eslint/no-empty-interface
+export interface SetupContract extends UiActionsSetup {}
+// eslint-disable-next-line @typescript-eslint/no-empty-interface
+export interface StartContract extends UiActionsStart {}
 
 declare module '../../../../src/plugins/ui_actions/public' {
   export interface ActionContextMapping {
@@ -52,12 +54,16 @@ declare module '../../../../src/plugins/ui_actions/public' {
 }
 
 export class AdvancedUiActionsPublicPlugin
-  implements Plugin<Setup, Start, SetupDependencies, StartDependencies> {
+  implements Plugin<SetupContract, StartContract, SetupDependencies, StartDependencies> {
   constructor(initializerContext: PluginInitializerContext) {}
 
-  public setup(core: CoreSetup, { uiActions }: SetupDependencies): Setup {}
+  public setup(core: CoreSetup, { uiActions }: SetupDependencies): SetupContract {
+    return {
+      ...uiActions,
+    };
+  }
 
-  public start(core: CoreStart, { uiActions }: StartDependencies): Start {
+  public start(core: CoreStart, { uiActions }: StartDependencies): StartContract {
     const dateFormat = core.uiSettings.get('dateFormat') as string;
     const commonlyUsedRanges = core.uiSettings.get('timepicker:quickRanges') as CommonlyUsedRange[];
     const { openModal } = createReactOverlays(core);
@@ -66,16 +72,18 @@ export class AdvancedUiActionsPublicPlugin
       dateFormat,
       commonlyUsedRanges,
     });
-    uiActions.registerAction(timeRangeAction);
-    uiActions.attachAction(CONTEXT_MENU_TRIGGER, timeRangeAction);
+    uiActions.addTriggerAction(CONTEXT_MENU_TRIGGER, timeRangeAction);
 
     const timeRangeBadge = new CustomTimeRangeBadge({
       openModal,
       dateFormat,
       commonlyUsedRanges,
     });
-    uiActions.registerAction(timeRangeBadge);
-    uiActions.attachAction(PANEL_BADGE_TRIGGER, timeRangeBadge);
+    uiActions.addTriggerAction(PANEL_BADGE_TRIGGER, timeRangeBadge);
+
+    return {
+      ...uiActions,
+    };
   }
 
   public stop() {}
diff --git a/x-pack/plugins/advanced_ui_actions/public/services/action_factory_service/action_factory.ts b/x-pack/plugins/advanced_ui_actions/public/services/action_factory_service/action_factory.ts
new file mode 100644
index 0000000000000..66e2a4eafa880
--- /dev/null
+++ b/x-pack/plugins/advanced_ui_actions/public/services/action_factory_service/action_factory.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.
+ */
+
+/* eslint-disable */
+
+export {
+  ActionFactory
+} from '../../../../../../src/plugins/ui_actions/public/actions/action_factory';
diff --git a/x-pack/plugins/advanced_ui_actions/public/services/action_factory_service/action_factory_definition.ts b/x-pack/plugins/advanced_ui_actions/public/services/action_factory_service/action_factory_definition.ts
new file mode 100644
index 0000000000000..f8669a4bf813f
--- /dev/null
+++ b/x-pack/plugins/advanced_ui_actions/public/services/action_factory_service/action_factory_definition.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.
+ */
+
+/* eslint-disable */
+
+export {
+  ActionFactoryDefinition
+} from '../../../../../../src/plugins/ui_actions/public/actions/action_factory_definition';
diff --git a/x-pack/plugins/advanced_ui_actions/public/services/action_factory_service/index.ts b/x-pack/plugins/advanced_ui_actions/public/services/action_factory_service/index.ts
new file mode 100644
index 0000000000000..db5bb3aa62a16
--- /dev/null
+++ b/x-pack/plugins/advanced_ui_actions/public/services/action_factory_service/index.ts
@@ -0,0 +1,8 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+export * from './action_factory_definition';
+export * from './action_factory';
diff --git a/x-pack/plugins/drilldowns/public/components/flyout_create_drilldown/index.ts b/x-pack/plugins/advanced_ui_actions/public/services/index.ts
similarity index 84%
rename from x-pack/plugins/drilldowns/public/components/flyout_create_drilldown/index.ts
rename to x-pack/plugins/advanced_ui_actions/public/services/index.ts
index ce235043b4ef6..0f8b4c8d8f409 100644
--- a/x-pack/plugins/drilldowns/public/components/flyout_create_drilldown/index.ts
+++ b/x-pack/plugins/advanced_ui_actions/public/services/index.ts
@@ -4,4 +4,4 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-export * from './flyout_create_drilldown';
+export * from './action_factory_service';
diff --git a/x-pack/plugins/advanced_ui_actions/public/util/index.ts b/x-pack/plugins/advanced_ui_actions/public/util/index.ts
new file mode 100644
index 0000000000000..fd3ab89973348
--- /dev/null
+++ b/x-pack/plugins/advanced_ui_actions/public/util/index.ts
@@ -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.
+ */
+
+export {
+  UiActionsConfigurable as Configurable,
+  UiActionsCollectConfigProps as CollectConfigProps,
+} from '../../../../../src/plugins/ui_actions/public';
diff --git a/x-pack/plugins/dashboard_enhanced/README.md b/x-pack/plugins/dashboard_enhanced/README.md
new file mode 100644
index 0000000000000..d9296ae158621
--- /dev/null
+++ b/x-pack/plugins/dashboard_enhanced/README.md
@@ -0,0 +1 @@
+# X-Pack part of Dashboard app
diff --git a/x-pack/plugins/dashboard_enhanced/kibana.json b/x-pack/plugins/dashboard_enhanced/kibana.json
new file mode 100644
index 0000000000000..acbca5c33295c
--- /dev/null
+++ b/x-pack/plugins/dashboard_enhanced/kibana.json
@@ -0,0 +1,8 @@
+{
+  "id": "dashboardEnhanced",
+  "version": "kibana",
+  "server": true,
+  "ui": true,
+  "requiredPlugins": ["uiActions", "embeddable", "dashboard", "drilldowns"],
+  "configPath": ["xpack", "dashboardEnhanced"]
+}
diff --git a/x-pack/plugins/dashboard_enhanced/public/components/README.md b/x-pack/plugins/dashboard_enhanced/public/components/README.md
new file mode 100644
index 0000000000000..8081f8a2451cf
--- /dev/null
+++ b/x-pack/plugins/dashboard_enhanced/public/components/README.md
@@ -0,0 +1,5 @@
+# Presentation React components
+
+Here we keep reusable *presentation* (aka *dumb*) React components&mdash;these
+components should not be connected to state and ideally should not know anything
+about Kibana.
diff --git a/x-pack/plugins/dashboard_enhanced/public/components/dashboard_drilldown_config/dashboard_drilldown_config.story.tsx b/x-pack/plugins/dashboard_enhanced/public/components/dashboard_drilldown_config/dashboard_drilldown_config.story.tsx
new file mode 100644
index 0000000000000..8e204b044a136
--- /dev/null
+++ b/x-pack/plugins/dashboard_enhanced/public/components/dashboard_drilldown_config/dashboard_drilldown_config.story.tsx
@@ -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.
+ */
+
+/* eslint-disable no-console */
+
+import * as React from 'react';
+import { storiesOf } from '@storybook/react';
+import { DashboardDrilldownConfig } from '.';
+
+export const dashboards = [
+  { id: 'dashboard1', title: 'Dashboard 1' },
+  { id: 'dashboard2', title: 'Dashboard 2' },
+  { id: 'dashboard3', title: 'Dashboard 3' },
+];
+
+const InteractiveDemo: React.FC = () => {
+  const [activeDashboardId, setActiveDashboardId] = React.useState('dashboard1');
+  const [currentFilters, setCurrentFilters] = React.useState(false);
+  const [keepRange, setKeepRange] = React.useState(false);
+
+  return (
+    <DashboardDrilldownConfig
+      activeDashboardId={activeDashboardId}
+      dashboards={dashboards}
+      currentFilters={currentFilters}
+      keepRange={keepRange}
+      onDashboardSelect={id => setActiveDashboardId(id)}
+      onCurrentFiltersToggle={() => setCurrentFilters(old => !old)}
+      onKeepRangeToggle={() => setKeepRange(old => !old)}
+    />
+  );
+};
+
+storiesOf('components/DashboardDrilldownConfig', module)
+  .add('default', () => (
+    <DashboardDrilldownConfig
+      activeDashboardId={'dashboard2'}
+      dashboards={dashboards}
+      onDashboardSelect={e => console.log('onDashboardSelect', e)}
+    />
+  ))
+  .add('with switches', () => (
+    <DashboardDrilldownConfig
+      activeDashboardId={'dashboard2'}
+      dashboards={dashboards}
+      onDashboardSelect={e => console.log('onDashboardSelect', e)}
+      onCurrentFiltersToggle={() => console.log('onCurrentFiltersToggle')}
+      onKeepRangeToggle={() => console.log('onKeepRangeToggle')}
+    />
+  ))
+  .add('interactive demo', () => <InteractiveDemo />);
diff --git a/x-pack/plugins/dashboard_enhanced/public/components/dashboard_drilldown_config/dashboard_drilldown_config.test.tsx b/x-pack/plugins/dashboard_enhanced/public/components/dashboard_drilldown_config/dashboard_drilldown_config.test.tsx
new file mode 100644
index 0000000000000..911ff6f632635
--- /dev/null
+++ b/x-pack/plugins/dashboard_enhanced/public/components/dashboard_drilldown_config/dashboard_drilldown_config.test.tsx
@@ -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.
+ */
+
+test.todo('renders list of dashboards');
+test.todo('renders correct selected dashboard');
+test.todo('can change dashboard');
+test.todo('can toggle "use current filters" switch');
+test.todo('can toggle "date range" switch');
diff --git a/x-pack/plugins/dashboard_enhanced/public/components/dashboard_drilldown_config/dashboard_drilldown_config.tsx b/x-pack/plugins/dashboard_enhanced/public/components/dashboard_drilldown_config/dashboard_drilldown_config.tsx
new file mode 100644
index 0000000000000..b45ba602b9bb1
--- /dev/null
+++ b/x-pack/plugins/dashboard_enhanced/public/components/dashboard_drilldown_config/dashboard_drilldown_config.tsx
@@ -0,0 +1,69 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React from 'react';
+import { EuiFormRow, EuiSelect, EuiSwitch } from '@elastic/eui';
+import { txtChooseDestinationDashboard } from './i18n';
+
+export interface DashboardItem {
+  id: string;
+  title: string;
+}
+
+export interface DashboardDrilldownConfigProps {
+  activeDashboardId?: string;
+  dashboards: DashboardItem[];
+  currentFilters?: boolean;
+  keepRange?: boolean;
+  onDashboardSelect: (dashboardId: string) => void;
+  onCurrentFiltersToggle?: () => void;
+  onKeepRangeToggle?: () => void;
+}
+
+export const DashboardDrilldownConfig: React.FC<DashboardDrilldownConfigProps> = ({
+  activeDashboardId,
+  dashboards,
+  currentFilters,
+  keepRange,
+  onDashboardSelect,
+  onCurrentFiltersToggle,
+  onKeepRangeToggle,
+}) => {
+  // TODO: use i18n below.
+  return (
+    <>
+      <EuiFormRow label={txtChooseDestinationDashboard}>
+        <EuiSelect
+          name="selectDashboard"
+          hasNoInitialSelection={true}
+          options={dashboards.map(({ id, title }) => ({ value: id, text: title }))}
+          value={activeDashboardId}
+          onChange={e => onDashboardSelect(e.target.value)}
+        />
+      </EuiFormRow>
+      {!!onCurrentFiltersToggle && (
+        <EuiFormRow hasChildLabel={false}>
+          <EuiSwitch
+            name="useCurrentFilters"
+            label="Use current dashboard's filters"
+            checked={!!currentFilters}
+            onChange={onCurrentFiltersToggle}
+          />
+        </EuiFormRow>
+      )}
+      {!!onKeepRangeToggle && (
+        <EuiFormRow hasChildLabel={false}>
+          <EuiSwitch
+            name="useCurrentDateRange"
+            label="Use current dashboard's date range"
+            checked={!!keepRange}
+            onChange={onKeepRangeToggle}
+          />
+        </EuiFormRow>
+      )}
+    </>
+  );
+};
diff --git a/x-pack/plugins/dashboard_enhanced/public/components/dashboard_drilldown_config/i18n.ts b/x-pack/plugins/dashboard_enhanced/public/components/dashboard_drilldown_config/i18n.ts
new file mode 100644
index 0000000000000..38fe6dd150853
--- /dev/null
+++ b/x-pack/plugins/dashboard_enhanced/public/components/dashboard_drilldown_config/i18n.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 { i18n } from '@kbn/i18n';
+
+export const txtChooseDestinationDashboard = i18n.translate(
+  'xpack.dashboard.components.DashboardDrilldownConfig.chooseDestinationDashboard',
+  {
+    defaultMessage: 'Choose destination dashboard',
+  }
+);
diff --git a/x-pack/plugins/dashboard_enhanced/public/components/dashboard_drilldown_config/index.ts b/x-pack/plugins/dashboard_enhanced/public/components/dashboard_drilldown_config/index.ts
new file mode 100644
index 0000000000000..b9a64a3cc17e6
--- /dev/null
+++ b/x-pack/plugins/dashboard_enhanced/public/components/dashboard_drilldown_config/index.ts
@@ -0,0 +1,7 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+export * from './dashboard_drilldown_config';
diff --git a/x-pack/plugins/dashboard_enhanced/public/components/index.ts b/x-pack/plugins/dashboard_enhanced/public/components/index.ts
new file mode 100644
index 0000000000000..b9a64a3cc17e6
--- /dev/null
+++ b/x-pack/plugins/dashboard_enhanced/public/components/index.ts
@@ -0,0 +1,7 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+export * from './dashboard_drilldown_config';
diff --git a/x-pack/plugins/dashboard_enhanced/public/index.ts b/x-pack/plugins/dashboard_enhanced/public/index.ts
new file mode 100644
index 0000000000000..53540a4a1ad2e
--- /dev/null
+++ b/x-pack/plugins/dashboard_enhanced/public/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 { PluginInitializerContext } from 'src/core/public';
+import { DashboardEnhancedPlugin } from './plugin';
+
+export {
+  SetupContract as DashboardEnhancedSetupContract,
+  SetupDependencies as DashboardEnhancedSetupDependencies,
+  StartContract as DashboardEnhancedStartContract,
+  StartDependencies as DashboardEnhancedStartDependencies,
+} from './plugin';
+
+export function plugin(context: PluginInitializerContext) {
+  return new DashboardEnhancedPlugin(context);
+}
diff --git a/x-pack/plugins/dashboard_enhanced/public/mocks.ts b/x-pack/plugins/dashboard_enhanced/public/mocks.ts
new file mode 100644
index 0000000000000..67dc1fd97d521
--- /dev/null
+++ b/x-pack/plugins/dashboard_enhanced/public/mocks.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 { DashboardEnhancedSetupContract, DashboardEnhancedStartContract } from '.';
+
+export type Setup = jest.Mocked<DashboardEnhancedSetupContract>;
+export type Start = jest.Mocked<DashboardEnhancedStartContract>;
+
+const createSetupContract = (): Setup => {
+  const setupContract: Setup = {};
+
+  return setupContract;
+};
+
+const createStartContract = (): Start => {
+  const startContract: Start = {};
+
+  return startContract;
+};
+
+export const dashboardEnhancedPluginMock = {
+  createSetupContract,
+  createStartContract,
+};
diff --git a/x-pack/plugins/dashboard_enhanced/public/plugin.ts b/x-pack/plugins/dashboard_enhanced/public/plugin.ts
new file mode 100644
index 0000000000000..30b3f3c080f49
--- /dev/null
+++ b/x-pack/plugins/dashboard_enhanced/public/plugin.ts
@@ -0,0 +1,50 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { CoreStart, CoreSetup, Plugin, PluginInitializerContext } from 'src/core/public';
+import { UiActionsSetup, UiActionsStart } from '../../../../src/plugins/ui_actions/public';
+import { DashboardDrilldownsService } from './services';
+import { DrilldownsSetup, DrilldownsStart } from '../../drilldowns/public';
+
+export interface SetupDependencies {
+  uiActions: UiActionsSetup;
+  drilldowns: DrilldownsSetup;
+}
+
+export interface StartDependencies {
+  uiActions: UiActionsStart;
+  drilldowns: DrilldownsStart;
+}
+
+// eslint-disable-next-line
+export interface SetupContract {}
+
+// eslint-disable-next-line
+export interface StartContract {}
+
+export class DashboardEnhancedPlugin
+  implements Plugin<SetupContract, StartContract, SetupDependencies, StartDependencies> {
+  public readonly drilldowns = new DashboardDrilldownsService();
+  public readonly config: { drilldowns: { enabled: boolean } };
+
+  constructor(protected readonly context: PluginInitializerContext) {
+    this.config = context.config.get();
+  }
+
+  public setup(core: CoreSetup<StartDependencies>, plugins: SetupDependencies): SetupContract {
+    this.drilldowns.bootstrap(core, plugins, {
+      enableDrilldowns: this.config.drilldowns.enabled,
+    });
+
+    return {};
+  }
+
+  public start(core: CoreStart, plugins: StartDependencies): StartContract {
+    return {};
+  }
+
+  public stop() {}
+}
diff --git a/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/actions/flyout_create_drilldown/flyout_create_drilldown.test.tsx b/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/actions/flyout_create_drilldown/flyout_create_drilldown.test.tsx
new file mode 100644
index 0000000000000..31ee9e29938cb
--- /dev/null
+++ b/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/actions/flyout_create_drilldown/flyout_create_drilldown.test.tsx
@@ -0,0 +1,124 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import {
+  FlyoutCreateDrilldownAction,
+  OpenFlyoutAddDrilldownParams,
+} from './flyout_create_drilldown';
+import { coreMock } from '../../../../../../../../src/core/public/mocks';
+import { drilldownsPluginMock } from '../../../../../../drilldowns/public/mocks';
+import { ViewMode } from '../../../../../../../../src/plugins/embeddable/public';
+import { uiActionsPluginMock } from '../../../../../../../../src/plugins/ui_actions/public/mocks';
+import { TriggerContextMapping } from '../../../../../../../../src/plugins/ui_actions/public';
+import { MockEmbeddable } from '../test_helpers';
+
+const overlays = coreMock.createStart().overlays;
+const drilldowns = drilldownsPluginMock.createStartContract();
+const uiActions = uiActionsPluginMock.createStartContract();
+
+const actionParams: OpenFlyoutAddDrilldownParams = {
+  drilldowns: () => Promise.resolve(drilldowns),
+  overlays: () => Promise.resolve(overlays),
+};
+
+test('should create', () => {
+  expect(() => new FlyoutCreateDrilldownAction(actionParams)).not.toThrow();
+});
+
+test('title is a string', () => {
+  expect(typeof new FlyoutCreateDrilldownAction(actionParams).getDisplayName() === 'string').toBe(
+    true
+  );
+});
+
+test('icon exists', () => {
+  expect(typeof new FlyoutCreateDrilldownAction(actionParams).getIconType() === 'string').toBe(
+    true
+  );
+});
+
+describe('isCompatible', () => {
+  const drilldownAction = new FlyoutCreateDrilldownAction(actionParams);
+
+  function checkCompatibility(params: {
+    isEdit: boolean;
+    withUiActions: boolean;
+    isValueClickTriggerSupported: boolean;
+  }): Promise<boolean> {
+    return drilldownAction.isCompatible({
+      embeddable: new MockEmbeddable(
+        { id: '', viewMode: params.isEdit ? ViewMode.EDIT : ViewMode.VIEW },
+        {
+          supportedTriggers: (params.isValueClickTriggerSupported
+            ? ['VALUE_CLICK_TRIGGER']
+            : []) as Array<keyof TriggerContextMapping>,
+          uiActions: params.withUiActions ? uiActions : undefined, // dynamic actions support
+        }
+      ),
+    });
+  }
+
+  test("compatible if dynamicUiActions enabled, 'VALUE_CLICK_TRIGGER' is supported, in edit mode", async () => {
+    expect(
+      await checkCompatibility({
+        withUiActions: true,
+        isEdit: true,
+        isValueClickTriggerSupported: true,
+      })
+    ).toBe(true);
+  });
+
+  test('not compatible if dynamicUiActions disabled', async () => {
+    expect(
+      await checkCompatibility({
+        withUiActions: false,
+        isEdit: true,
+        isValueClickTriggerSupported: true,
+      })
+    ).toBe(false);
+  });
+
+  test("not compatible if 'VALUE_CLICK_TRIGGER' is not supported", async () => {
+    expect(
+      await checkCompatibility({
+        withUiActions: true,
+        isEdit: true,
+        isValueClickTriggerSupported: false,
+      })
+    ).toBe(false);
+  });
+
+  test('not compatible if in view mode', async () => {
+    expect(
+      await checkCompatibility({
+        withUiActions: true,
+        isEdit: false,
+        isValueClickTriggerSupported: true,
+      })
+    ).toBe(false);
+  });
+});
+
+describe('execute', () => {
+  const drilldownAction = new FlyoutCreateDrilldownAction(actionParams);
+  test('throws error if no dynamicUiActions', async () => {
+    await expect(
+      drilldownAction.execute({
+        embeddable: new MockEmbeddable({ id: '' }, {}),
+      })
+    ).rejects.toThrowErrorMatchingInlineSnapshot(
+      `"Can't execute FlyoutCreateDrilldownAction without dynamicActionsManager"`
+    );
+  });
+
+  test('should open flyout', async () => {
+    const spy = jest.spyOn(overlays, 'openFlyout');
+    await drilldownAction.execute({
+      embeddable: new MockEmbeddable({ id: '' }, { uiActions }),
+    });
+    expect(spy).toBeCalled();
+  });
+});
diff --git a/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/actions/flyout_create_drilldown/flyout_create_drilldown.tsx b/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/actions/flyout_create_drilldown/flyout_create_drilldown.tsx
new file mode 100644
index 0000000000000..00e74ea570a11
--- /dev/null
+++ b/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/actions/flyout_create_drilldown/flyout_create_drilldown.tsx
@@ -0,0 +1,74 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React from 'react';
+import { i18n } from '@kbn/i18n';
+import { CoreStart } from 'src/core/public';
+import { ActionByType } from '../../../../../../../../src/plugins/ui_actions/public';
+import { toMountPoint } from '../../../../../../../../src/plugins/kibana_react/public';
+import { DrilldownsStart } from '../../../../../../drilldowns/public';
+import { EmbeddableContext } from '../../../../../../../../src/plugins/embeddable/public';
+
+export const OPEN_FLYOUT_ADD_DRILLDOWN = 'OPEN_FLYOUT_ADD_DRILLDOWN';
+
+export interface OpenFlyoutAddDrilldownParams {
+  overlays: () => Promise<CoreStart['overlays']>;
+  drilldowns: () => Promise<DrilldownsStart>;
+}
+
+export class FlyoutCreateDrilldownAction implements ActionByType<typeof OPEN_FLYOUT_ADD_DRILLDOWN> {
+  public readonly type = OPEN_FLYOUT_ADD_DRILLDOWN;
+  public readonly id = OPEN_FLYOUT_ADD_DRILLDOWN;
+  public order = 12;
+
+  constructor(protected readonly params: OpenFlyoutAddDrilldownParams) {}
+
+  public getDisplayName() {
+    return i18n.translate('xpack.dashboard.FlyoutCreateDrilldownAction.displayName', {
+      defaultMessage: 'Create drilldown',
+    });
+  }
+
+  public getIconType() {
+    return 'plusInCircle';
+  }
+
+  private isEmbeddableCompatible(context: EmbeddableContext) {
+    if (!context.embeddable.dynamicActions) return false;
+    const supportedTriggers = context.embeddable.supportedTriggers();
+    if (!supportedTriggers || !supportedTriggers.length) return false;
+    return supportedTriggers.indexOf('VALUE_CLICK_TRIGGER') > -1;
+  }
+
+  public async isCompatible(context: EmbeddableContext) {
+    const isEditMode = context.embeddable.getInput().viewMode === 'edit';
+    return isEditMode && this.isEmbeddableCompatible(context);
+  }
+
+  public async execute(context: EmbeddableContext) {
+    const overlays = await this.params.overlays();
+    const drilldowns = await this.params.drilldowns();
+    const dynamicActionManager = context.embeddable.dynamicActions;
+
+    if (!dynamicActionManager) {
+      throw new Error(`Can't execute FlyoutCreateDrilldownAction without dynamicActionsManager`);
+    }
+
+    const handle = overlays.openFlyout(
+      toMountPoint(
+        <drilldowns.FlyoutManageDrilldowns
+          onClose={() => handle.close()}
+          placeContext={context}
+          viewMode={'create'}
+          dynamicActionManager={dynamicActionManager}
+        />
+      ),
+      {
+        ownFocus: true,
+      }
+    );
+  }
+}
diff --git a/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/actions/flyout_create_drilldown/index.ts b/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/actions/flyout_create_drilldown/index.ts
new file mode 100644
index 0000000000000..4d2db209fc961
--- /dev/null
+++ b/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/actions/flyout_create_drilldown/index.ts
@@ -0,0 +1,11 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+export {
+  FlyoutCreateDrilldownAction,
+  OpenFlyoutAddDrilldownParams,
+  OPEN_FLYOUT_ADD_DRILLDOWN,
+} from './flyout_create_drilldown';
diff --git a/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/actions/flyout_edit_drilldown/flyout_edit_drilldown.test.tsx b/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/actions/flyout_edit_drilldown/flyout_edit_drilldown.test.tsx
new file mode 100644
index 0000000000000..a3f11eb976f90
--- /dev/null
+++ b/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/actions/flyout_edit_drilldown/flyout_edit_drilldown.test.tsx
@@ -0,0 +1,102 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { FlyoutEditDrilldownAction, FlyoutEditDrilldownParams } from './flyout_edit_drilldown';
+import { coreMock } from '../../../../../../../../src/core/public/mocks';
+import { drilldownsPluginMock } from '../../../../../../drilldowns/public/mocks';
+import { ViewMode } from '../../../../../../../../src/plugins/embeddable/public';
+import { uiActionsPluginMock } from '../../../../../../../../src/plugins/ui_actions/public/mocks';
+import { MockEmbeddable } from '../test_helpers';
+
+const overlays = coreMock.createStart().overlays;
+const drilldowns = drilldownsPluginMock.createStartContract();
+const uiActions = uiActionsPluginMock.createStartContract();
+
+const actionParams: FlyoutEditDrilldownParams = {
+  drilldowns: () => Promise.resolve(drilldowns),
+  overlays: () => Promise.resolve(overlays),
+};
+
+test('should create', () => {
+  expect(() => new FlyoutEditDrilldownAction(actionParams)).not.toThrow();
+});
+
+test('title is a string', () => {
+  expect(typeof new FlyoutEditDrilldownAction(actionParams).getDisplayName() === 'string').toBe(
+    true
+  );
+});
+
+test('icon exists', () => {
+  expect(typeof new FlyoutEditDrilldownAction(actionParams).getIconType() === 'string').toBe(true);
+});
+
+test('MenuItem exists', () => {
+  expect(new FlyoutEditDrilldownAction(actionParams).MenuItem).toBeDefined();
+});
+
+describe('isCompatible', () => {
+  const drilldownAction = new FlyoutEditDrilldownAction(actionParams);
+
+  function checkCompatibility(params: {
+    isEdit: boolean;
+    withUiActions: boolean;
+  }): Promise<boolean> {
+    return drilldownAction.isCompatible({
+      embeddable: new MockEmbeddable(
+        {
+          id: '',
+          viewMode: params.isEdit ? ViewMode.EDIT : ViewMode.VIEW,
+        },
+        {
+          uiActions: params.withUiActions ? uiActions : undefined, // dynamic actions support
+        }
+      ),
+    });
+  }
+
+  // TODO: need proper DynamicActionsMock and ActionFactory mock
+  test.todo('compatible if dynamicUiActions enabled, in edit view, and have at least 1 drilldown');
+
+  test('not compatible if dynamicUiActions disabled', async () => {
+    expect(
+      await checkCompatibility({
+        withUiActions: false,
+        isEdit: true,
+      })
+    ).toBe(false);
+  });
+
+  test('not compatible if no drilldowns', async () => {
+    expect(
+      await checkCompatibility({
+        withUiActions: true,
+        isEdit: true,
+      })
+    ).toBe(false);
+  });
+});
+
+describe('execute', () => {
+  const drilldownAction = new FlyoutEditDrilldownAction(actionParams);
+  test('throws error if no dynamicUiActions', async () => {
+    await expect(
+      drilldownAction.execute({
+        embeddable: new MockEmbeddable({ id: '' }, {}),
+      })
+    ).rejects.toThrowErrorMatchingInlineSnapshot(
+      `"Can't execute FlyoutEditDrilldownAction without dynamicActionsManager"`
+    );
+  });
+
+  test('should open flyout', async () => {
+    const spy = jest.spyOn(overlays, 'openFlyout');
+    await drilldownAction.execute({
+      embeddable: new MockEmbeddable({ id: '' }, { uiActions }),
+    });
+    expect(spy).toBeCalled();
+  });
+});
diff --git a/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/actions/flyout_edit_drilldown/flyout_edit_drilldown.tsx b/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/actions/flyout_edit_drilldown/flyout_edit_drilldown.tsx
new file mode 100644
index 0000000000000..816b757592a72
--- /dev/null
+++ b/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/actions/flyout_edit_drilldown/flyout_edit_drilldown.tsx
@@ -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 React from 'react';
+import { CoreStart } from 'src/core/public';
+import { ActionByType } from '../../../../../../../../src/plugins/ui_actions/public';
+import {
+  reactToUiComponent,
+  toMountPoint,
+} from '../../../../../../../../src/plugins/kibana_react/public';
+import { EmbeddableContext, ViewMode } from '../../../../../../../../src/plugins/embeddable/public';
+import { DrilldownsStart } from '../../../../../../drilldowns/public';
+import { txtDisplayName } from './i18n';
+import { MenuItem } from './menu_item';
+
+export const OPEN_FLYOUT_EDIT_DRILLDOWN = 'OPEN_FLYOUT_EDIT_DRILLDOWN';
+
+export interface FlyoutEditDrilldownParams {
+  overlays: () => Promise<CoreStart['overlays']>;
+  drilldowns: () => Promise<DrilldownsStart>;
+}
+
+export class FlyoutEditDrilldownAction implements ActionByType<typeof OPEN_FLYOUT_EDIT_DRILLDOWN> {
+  public readonly type = OPEN_FLYOUT_EDIT_DRILLDOWN;
+  public readonly id = OPEN_FLYOUT_EDIT_DRILLDOWN;
+  public order = 10;
+
+  constructor(protected readonly params: FlyoutEditDrilldownParams) {}
+
+  public getDisplayName() {
+    return txtDisplayName;
+  }
+
+  public getIconType() {
+    return 'list';
+  }
+
+  MenuItem = reactToUiComponent(MenuItem);
+
+  public async isCompatible({ embeddable }: EmbeddableContext) {
+    if (embeddable.getInput().viewMode !== ViewMode.EDIT) return false;
+    if (!embeddable.dynamicActions) return false;
+    return embeddable.dynamicActions.state.get().events.length > 0;
+  }
+
+  public async execute(context: EmbeddableContext) {
+    const overlays = await this.params.overlays();
+    const drilldowns = await this.params.drilldowns();
+    const dynamicActionManager = context.embeddable.dynamicActions;
+    if (!dynamicActionManager) {
+      throw new Error(`Can't execute FlyoutEditDrilldownAction without dynamicActionsManager`);
+    }
+
+    const handle = overlays.openFlyout(
+      toMountPoint(
+        <drilldowns.FlyoutManageDrilldowns
+          onClose={() => handle.close()}
+          placeContext={context}
+          viewMode={'manage'}
+          dynamicActionManager={dynamicActionManager}
+        />
+      ),
+      {
+        ownFocus: true,
+      }
+    );
+  }
+}
diff --git a/x-pack/plugins/drilldowns/public/components/flyout_create_drilldown/i18n.ts b/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/actions/flyout_edit_drilldown/i18n.ts
similarity index 64%
rename from x-pack/plugins/drilldowns/public/components/flyout_create_drilldown/i18n.ts
rename to x-pack/plugins/dashboard_enhanced/public/services/drilldowns/actions/flyout_edit_drilldown/i18n.ts
index ceabc6d3a9aa5..4e2e5eb7092e4 100644
--- a/x-pack/plugins/drilldowns/public/components/flyout_create_drilldown/i18n.ts
+++ b/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/actions/flyout_edit_drilldown/i18n.ts
@@ -6,9 +6,9 @@
 
 import { i18n } from '@kbn/i18n';
 
-export const txtCreateDrilldown = i18n.translate(
-  'xpack.drilldowns.components.FlyoutCreateDrilldown.CreateDrilldown',
+export const txtDisplayName = i18n.translate(
+  'xpack.dashboard.panel.openFlyoutEditDrilldown.displayName',
   {
-    defaultMessage: 'Create drilldown',
+    defaultMessage: 'Manage drilldowns',
   }
 );
diff --git a/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/actions/flyout_edit_drilldown/index.tsx b/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/actions/flyout_edit_drilldown/index.tsx
new file mode 100644
index 0000000000000..3e1b37f270708
--- /dev/null
+++ b/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/actions/flyout_edit_drilldown/index.tsx
@@ -0,0 +1,11 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+export {
+  FlyoutEditDrilldownAction,
+  FlyoutEditDrilldownParams,
+  OPEN_FLYOUT_EDIT_DRILLDOWN,
+} from './flyout_edit_drilldown';
diff --git a/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/actions/flyout_edit_drilldown/menu_item.test.tsx b/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/actions/flyout_edit_drilldown/menu_item.test.tsx
new file mode 100644
index 0000000000000..be693fadf9282
--- /dev/null
+++ b/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/actions/flyout_edit_drilldown/menu_item.test.tsx
@@ -0,0 +1,37 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React from 'react';
+import { render, cleanup, act } from '@testing-library/react/pure';
+import { MenuItem } from './menu_item';
+import { createStateContainer } from '../../../../../../../../src/plugins/kibana_utils/common';
+import { DynamicActionManager } from '../../../../../../../../src/plugins/ui_actions/public';
+import { IEmbeddable } from '../../../../../../../../src/plugins/embeddable/public/lib/embeddables';
+import '@testing-library/jest-dom';
+
+afterEach(cleanup);
+
+test('<MenuItem/>', () => {
+  const state = createStateContainer<{ events: object[] }>({ events: [] });
+  const { getByText, queryByText } = render(
+    <MenuItem
+      context={{
+        embeddable: ({
+          dynamicActions: ({ state } as unknown) as DynamicActionManager,
+        } as unknown) as IEmbeddable,
+      }}
+    />
+  );
+
+  expect(getByText(/manage drilldowns/i)).toBeInTheDocument();
+  expect(queryByText('0')).not.toBeInTheDocument();
+
+  act(() => {
+    state.set({ events: [{}] });
+  });
+
+  expect(queryByText('1')).toBeInTheDocument();
+});
diff --git a/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/actions/flyout_edit_drilldown/menu_item.tsx b/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/actions/flyout_edit_drilldown/menu_item.tsx
new file mode 100644
index 0000000000000..4f99fca511b07
--- /dev/null
+++ b/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/actions/flyout_edit_drilldown/menu_item.tsx
@@ -0,0 +1,30 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React from 'react';
+import { EuiNotificationBadge, EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
+import { EmbeddableContext } from '../../../../../../../../src/plugins/embeddable/public';
+import { txtDisplayName } from './i18n';
+import { useContainerState } from '../../../../../../../../src/plugins/kibana_utils/common';
+
+export const MenuItem: React.FC<{ context: EmbeddableContext }> = ({ context }) => {
+  if (!context.embeddable.dynamicActions)
+    throw new Error('Flyout edit drillldown context menu item requires `dynamicActions`');
+
+  const { events } = useContainerState(context.embeddable.dynamicActions.state);
+  const count = events.length;
+
+  return (
+    <EuiFlexGroup alignItems={'center'}>
+      <EuiFlexItem grow={true}>{txtDisplayName}</EuiFlexItem>
+      {count > 0 && (
+        <EuiFlexItem grow={false}>
+          <EuiNotificationBadge>{count}</EuiNotificationBadge>
+        </EuiFlexItem>
+      )}
+    </EuiFlexGroup>
+  );
+};
diff --git a/x-pack/plugins/drilldowns/public/actions/index.ts b/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/actions/index.ts
similarity index 100%
rename from x-pack/plugins/drilldowns/public/actions/index.ts
rename to x-pack/plugins/dashboard_enhanced/public/services/drilldowns/actions/index.ts
diff --git a/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/actions/test_helpers.ts b/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/actions/test_helpers.ts
new file mode 100644
index 0000000000000..9b156b0ba85b4
--- /dev/null
+++ b/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/actions/test_helpers.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 { Embeddable, EmbeddableInput } from '../../../../../../../src/plugins/embeddable/public/';
+import {
+  TriggerContextMapping,
+  UiActionsStart,
+} from '../../../../../../../src/plugins/ui_actions/public';
+
+export class MockEmbeddable extends Embeddable {
+  public readonly type = 'mock';
+  private readonly triggers: Array<keyof TriggerContextMapping> = [];
+  constructor(
+    initialInput: EmbeddableInput,
+    params: { uiActions?: UiActionsStart; supportedTriggers?: Array<keyof TriggerContextMapping> }
+  ) {
+    super(initialInput, {}, undefined, params);
+    this.triggers = params.supportedTriggers ?? [];
+  }
+  public render(node: HTMLElement) {}
+  public reload() {}
+  public supportedTriggers(): Array<keyof TriggerContextMapping> {
+    return this.triggers;
+  }
+}
diff --git a/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/dashboard_drilldowns_services.ts b/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/dashboard_drilldowns_services.ts
new file mode 100644
index 0000000000000..4bdf03dff3531
--- /dev/null
+++ b/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/dashboard_drilldowns_services.ts
@@ -0,0 +1,60 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { CoreSetup } from 'src/core/public';
+import { SetupDependencies } from '../../plugin';
+import {
+  CONTEXT_MENU_TRIGGER,
+  EmbeddableContext,
+} from '../../../../../../src/plugins/embeddable/public';
+import {
+  FlyoutCreateDrilldownAction,
+  FlyoutEditDrilldownAction,
+  OPEN_FLYOUT_ADD_DRILLDOWN,
+  OPEN_FLYOUT_EDIT_DRILLDOWN,
+} from './actions';
+import { DrilldownsStart } from '../../../../drilldowns/public';
+import { DashboardToDashboardDrilldown } from './dashboard_to_dashboard_drilldown';
+
+declare module '../../../../../../src/plugins/ui_actions/public' {
+  export interface ActionContextMapping {
+    [OPEN_FLYOUT_ADD_DRILLDOWN]: EmbeddableContext;
+    [OPEN_FLYOUT_EDIT_DRILLDOWN]: EmbeddableContext;
+  }
+}
+
+interface BootstrapParams {
+  enableDrilldowns: boolean;
+}
+
+export class DashboardDrilldownsService {
+  bootstrap(
+    core: CoreSetup<{ drilldowns: DrilldownsStart }>,
+    plugins: SetupDependencies,
+    { enableDrilldowns }: BootstrapParams
+  ) {
+    if (enableDrilldowns) {
+      this.setupDrilldowns(core, plugins);
+    }
+  }
+
+  setupDrilldowns(core: CoreSetup<{ drilldowns: DrilldownsStart }>, plugins: SetupDependencies) {
+    const overlays = async () => (await core.getStartServices())[0].overlays;
+    const drilldowns = async () => (await core.getStartServices())[1].drilldowns;
+    const savedObjects = async () => (await core.getStartServices())[0].savedObjects.client;
+
+    const actionFlyoutCreateDrilldown = new FlyoutCreateDrilldownAction({ overlays, drilldowns });
+    plugins.uiActions.addTriggerAction(CONTEXT_MENU_TRIGGER, actionFlyoutCreateDrilldown);
+
+    const actionFlyoutEditDrilldown = new FlyoutEditDrilldownAction({ overlays, drilldowns });
+    plugins.uiActions.addTriggerAction(CONTEXT_MENU_TRIGGER, actionFlyoutEditDrilldown);
+
+    const dashboardToDashboardDrilldown = new DashboardToDashboardDrilldown({
+      savedObjects,
+    });
+    plugins.drilldowns.registerDrilldown(dashboardToDashboardDrilldown);
+  }
+}
diff --git a/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/dashboard_to_dashboard_drilldown/collect_config.test.tsx b/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/dashboard_to_dashboard_drilldown/collect_config.test.tsx
new file mode 100644
index 0000000000000..95101605ce468
--- /dev/null
+++ b/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/dashboard_to_dashboard_drilldown/collect_config.test.tsx
@@ -0,0 +1,9 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+test.todo('displays all dashboard in a list');
+test.todo('does not display dashboard on which drilldown is being created');
+test.todo('updates config object correctly');
diff --git a/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/dashboard_to_dashboard_drilldown/collect_config.tsx b/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/dashboard_to_dashboard_drilldown/collect_config.tsx
new file mode 100644
index 0000000000000..e463cc38b6fbf
--- /dev/null
+++ b/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/dashboard_to_dashboard_drilldown/collect_config.tsx
@@ -0,0 +1,55 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React, { useState, useEffect } from 'react';
+import { CollectConfigProps } from './types';
+import { DashboardDrilldownConfig } from '../../../components/dashboard_drilldown_config';
+import { Params } from './drilldown';
+
+export interface CollectConfigContainerProps extends CollectConfigProps {
+  params: Params;
+}
+
+export const CollectConfigContainer: React.FC<CollectConfigContainerProps> = ({
+  config,
+  onConfig,
+  params: { savedObjects },
+}) => {
+  const [dashboards] = useState([
+    { id: 'dashboard1', title: 'Dashboard 1' },
+    { id: 'dashboard2', title: 'Dashboard 2' },
+    { id: 'dashboard3', title: 'Dashboard 3' },
+    { id: 'dashboard4', title: 'Dashboard 4' },
+  ]);
+
+  useEffect(() => {
+    // TODO: Load dashboards...
+  }, [savedObjects]);
+
+  return (
+    <DashboardDrilldownConfig
+      activeDashboardId={config.dashboardId}
+      dashboards={dashboards}
+      currentFilters={config.useCurrentFilters}
+      keepRange={config.useCurrentDateRange}
+      onDashboardSelect={dashboardId => {
+        onConfig({ ...config, dashboardId });
+      }}
+      onCurrentFiltersToggle={() =>
+        onConfig({
+          ...config,
+          useCurrentFilters: !config.useCurrentFilters,
+        })
+      }
+      onKeepRangeToggle={() =>
+        onConfig({
+          ...config,
+          useCurrentDateRange: !config.useCurrentDateRange,
+        })
+      }
+    />
+  );
+};
diff --git a/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/dashboard_to_dashboard_drilldown/constants.ts b/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/dashboard_to_dashboard_drilldown/constants.ts
new file mode 100644
index 0000000000000..e2a530b156da5
--- /dev/null
+++ b/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/dashboard_to_dashboard_drilldown/constants.ts
@@ -0,0 +1,7 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+export const DASHBOARD_TO_DASHBOARD_DRILLDOWN = 'DASHBOARD_TO_DASHBOARD_DRILLDOWN';
diff --git a/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/dashboard_to_dashboard_drilldown/drilldown.test.tsx b/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/dashboard_to_dashboard_drilldown/drilldown.test.tsx
new file mode 100644
index 0000000000000..0fb60bb1064a1
--- /dev/null
+++ b/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/dashboard_to_dashboard_drilldown/drilldown.test.tsx
@@ -0,0 +1,20 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+describe('.isConfigValid()', () => {
+  test.todo('returns false for incorrect config');
+  test.todo('returns true for incorrect config');
+});
+
+describe('.execute()', () => {
+  test.todo('navigates to correct dashboard');
+  test.todo(
+    'when user chooses to keep current filters, current fileters are set on destination dashboard'
+  );
+  test.todo(
+    'when user chooses to keep current time range, current time range is set on destination dashboard'
+  );
+});
diff --git a/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/dashboard_to_dashboard_drilldown/drilldown.tsx b/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/dashboard_to_dashboard_drilldown/drilldown.tsx
new file mode 100644
index 0000000000000..9d2a378f08acd
--- /dev/null
+++ b/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/dashboard_to_dashboard_drilldown/drilldown.tsx
@@ -0,0 +1,52 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * 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 { CoreStart } from 'src/core/public';
+import { reactToUiComponent } from '../../../../../../../src/plugins/kibana_react/public';
+import { PlaceContext, ActionContext, Config, CollectConfigProps } from './types';
+import { CollectConfigContainer } from './collect_config';
+import { DASHBOARD_TO_DASHBOARD_DRILLDOWN } from './constants';
+import { DrilldownDefinition as Drilldown } from '../../../../../drilldowns/public';
+import { txtGoToDashboard } from './i18n';
+
+export interface Params {
+  savedObjects: () => Promise<CoreStart['savedObjects']['client']>;
+}
+
+export class DashboardToDashboardDrilldown
+  implements Drilldown<Config, PlaceContext, ActionContext> {
+  constructor(protected readonly params: Params) {}
+
+  public readonly id = DASHBOARD_TO_DASHBOARD_DRILLDOWN;
+
+  public readonly order = 100;
+
+  public readonly getDisplayName = () => txtGoToDashboard;
+
+  public readonly euiIcon = 'dashboardApp';
+
+  private readonly ReactCollectConfig: React.FC<CollectConfigProps> = props => (
+    <CollectConfigContainer {...props} params={this.params} />
+  );
+
+  public readonly CollectConfig = reactToUiComponent(this.ReactCollectConfig);
+
+  public readonly createConfig = () => ({
+    dashboardId: '123',
+    useCurrentFilters: true,
+    useCurrentDateRange: true,
+  });
+
+  public readonly isConfigValid = (config: Config): config is Config => {
+    if (!config.dashboardId) return false;
+    return true;
+  };
+
+  public readonly execute = () => {
+    alert('Go to another dashboard!');
+  };
+}
diff --git a/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/dashboard_to_dashboard_drilldown/i18n.ts b/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/dashboard_to_dashboard_drilldown/i18n.ts
new file mode 100644
index 0000000000000..98b746bafd24a
--- /dev/null
+++ b/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/dashboard_to_dashboard_drilldown/i18n.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 { i18n } from '@kbn/i18n';
+
+export const txtGoToDashboard = i18n.translate('xpack.dashboard.drilldown.goToDashboard', {
+  defaultMessage: 'Go to Dashboard',
+});
diff --git a/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/dashboard_to_dashboard_drilldown/index.ts b/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/dashboard_to_dashboard_drilldown/index.ts
new file mode 100644
index 0000000000000..9daa485bb6e6c
--- /dev/null
+++ b/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/dashboard_to_dashboard_drilldown/index.ts
@@ -0,0 +1,16 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+export { DASHBOARD_TO_DASHBOARD_DRILLDOWN } from './constants';
+export {
+  DashboardToDashboardDrilldown,
+  Params as DashboardToDashboardDrilldownParams,
+} from './drilldown';
+export {
+  PlaceContext as DashboardToDashboardPlaceContext,
+  ActionContext as DashboardToDashboardActionContext,
+  Config as DashboardToDashboardConfig,
+} from './types';
diff --git a/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/dashboard_to_dashboard_drilldown/types.ts b/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/dashboard_to_dashboard_drilldown/types.ts
new file mode 100644
index 0000000000000..398a259491e3e
--- /dev/null
+++ b/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/dashboard_to_dashboard_drilldown/types.ts
@@ -0,0 +1,22 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import {
+  EmbeddableVisTriggerContext,
+  EmbeddableContext,
+} from '../../../../../../../src/plugins/embeddable/public';
+import { UiActionsCollectConfigProps } from '../../../../../../../src/plugins/ui_actions/public';
+
+export type PlaceContext = EmbeddableContext;
+export type ActionContext = EmbeddableVisTriggerContext;
+
+export interface Config {
+  dashboardId?: string;
+  useCurrentFilters: boolean;
+  useCurrentDateRange: boolean;
+}
+
+export type CollectConfigProps = UiActionsCollectConfigProps<Config>;
diff --git a/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/index.ts b/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/index.ts
new file mode 100644
index 0000000000000..7be8f1c65da12
--- /dev/null
+++ b/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/index.ts
@@ -0,0 +1,7 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+export * from './dashboard_drilldowns_services';
diff --git a/x-pack/plugins/dashboard_enhanced/public/services/index.ts b/x-pack/plugins/dashboard_enhanced/public/services/index.ts
new file mode 100644
index 0000000000000..8cc3e12906531
--- /dev/null
+++ b/x-pack/plugins/dashboard_enhanced/public/services/index.ts
@@ -0,0 +1,7 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+export * from './drilldowns';
diff --git a/x-pack/plugins/drilldowns/public/components/drilldown_picker/drilldown_picker.story.tsx b/x-pack/plugins/dashboard_enhanced/scripts/storybook.js
similarity index 53%
rename from x-pack/plugins/drilldowns/public/components/drilldown_picker/drilldown_picker.story.tsx
rename to x-pack/plugins/dashboard_enhanced/scripts/storybook.js
index 5627a5d6f4522..f2cbe4135f4cb 100644
--- a/x-pack/plugins/drilldowns/public/components/drilldown_picker/drilldown_picker.story.tsx
+++ b/x-pack/plugins/dashboard_enhanced/scripts/storybook.js
@@ -4,10 +4,10 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import * as React from 'react';
-import { storiesOf } from '@storybook/react';
-import { DrilldownPicker } from '.';
+import { join } from 'path';
 
-storiesOf('components/DrilldownPicker', module).add('default', () => {
-  return <DrilldownPicker />;
+// eslint-disable-next-line
+require('@kbn/storybook').runStorybookCli({
+  name: 'dashboard_enhanced',
+  storyGlobs: [join(__dirname, '..', 'public', 'components', '**', '*.story.tsx')],
 });
diff --git a/x-pack/plugins/dashboard_enhanced/server/config.ts b/x-pack/plugins/dashboard_enhanced/server/config.ts
new file mode 100644
index 0000000000000..b75c95d5f8832
--- /dev/null
+++ b/x-pack/plugins/dashboard_enhanced/server/config.ts
@@ -0,0 +1,23 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { schema, TypeOf } from '@kbn/config-schema';
+import { PluginConfigDescriptor } from '../../../../src/core/server';
+
+export const configSchema = schema.object({
+  drilldowns: schema.object({
+    enabled: schema.boolean({ defaultValue: false }),
+  }),
+});
+
+export type ConfigSchema = TypeOf<typeof configSchema>;
+
+export const config: PluginConfigDescriptor<ConfigSchema> = {
+  schema: configSchema,
+  exposeToBrowser: {
+    drilldowns: true,
+  },
+};
diff --git a/x-pack/plugins/dashboard_enhanced/server/index.ts b/x-pack/plugins/dashboard_enhanced/server/index.ts
new file mode 100644
index 0000000000000..e361b9fb075ed
--- /dev/null
+++ b/x-pack/plugins/dashboard_enhanced/server/index.ts
@@ -0,0 +1,12 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+export { config } from './config';
+
+export const plugin = () => ({
+  setup() {},
+  start() {},
+});
diff --git a/x-pack/plugins/drilldowns/kibana.json b/x-pack/plugins/drilldowns/kibana.json
index b951c7dc1fc87..8372d87166364 100644
--- a/x-pack/plugins/drilldowns/kibana.json
+++ b/x-pack/plugins/drilldowns/kibana.json
@@ -3,8 +3,5 @@
   "version": "kibana",
   "server": false,
   "ui": true,
-  "requiredPlugins": [
-    "uiActions",
-    "embeddable"
-  ]
+  "requiredPlugins": ["uiActions", "embeddable", "advancedUiActions"]
 }
diff --git a/x-pack/plugins/drilldowns/public/actions/flyout_create_drilldown/index.tsx b/x-pack/plugins/drilldowns/public/actions/flyout_create_drilldown/index.tsx
deleted file mode 100644
index 4834cc8081374..0000000000000
--- a/x-pack/plugins/drilldowns/public/actions/flyout_create_drilldown/index.tsx
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import React from 'react';
-import { i18n } from '@kbn/i18n';
-import { CoreStart } from 'src/core/public';
-import { ActionByType } from '../../../../../../src/plugins/ui_actions/public';
-import { toMountPoint } from '../../../../../../src/plugins/kibana_react/public';
-import { IEmbeddable } from '../../../../../../src/plugins/embeddable/public';
-import { FlyoutCreateDrilldown } from '../../components/flyout_create_drilldown';
-
-export const OPEN_FLYOUT_ADD_DRILLDOWN = 'OPEN_FLYOUT_ADD_DRILLDOWN';
-
-export interface FlyoutCreateDrilldownActionContext {
-  embeddable: IEmbeddable;
-}
-
-export interface OpenFlyoutAddDrilldownParams {
-  overlays: () => Promise<CoreStart['overlays']>;
-}
-
-export class FlyoutCreateDrilldownAction implements ActionByType<typeof OPEN_FLYOUT_ADD_DRILLDOWN> {
-  public readonly type = OPEN_FLYOUT_ADD_DRILLDOWN;
-  public readonly id = OPEN_FLYOUT_ADD_DRILLDOWN;
-  public order = 100;
-
-  constructor(protected readonly params: OpenFlyoutAddDrilldownParams) {}
-
-  public getDisplayName() {
-    return i18n.translate('xpack.drilldowns.FlyoutCreateDrilldownAction.displayName', {
-      defaultMessage: 'Create drilldown',
-    });
-  }
-
-  public getIconType() {
-    return 'plusInCircle';
-  }
-
-  public async isCompatible({ embeddable }: FlyoutCreateDrilldownActionContext) {
-    return embeddable.getInput().viewMode === 'edit';
-  }
-
-  public async execute(context: FlyoutCreateDrilldownActionContext) {
-    const overlays = await this.params.overlays();
-    const handle = overlays.openFlyout(
-      toMountPoint(<FlyoutCreateDrilldown context={context} onClose={() => handle.close()} />)
-    );
-  }
-}
diff --git a/x-pack/plugins/drilldowns/public/actions/flyout_edit_drilldown/index.tsx b/x-pack/plugins/drilldowns/public/actions/flyout_edit_drilldown/index.tsx
deleted file mode 100644
index f109da94fcaca..0000000000000
--- a/x-pack/plugins/drilldowns/public/actions/flyout_edit_drilldown/index.tsx
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import React from 'react';
-import { i18n } from '@kbn/i18n';
-import { CoreStart } from 'src/core/public';
-import { EuiNotificationBadge } from '@elastic/eui';
-import { ActionByType } from '../../../../../../src/plugins/ui_actions/public';
-import {
-  toMountPoint,
-  reactToUiComponent,
-} from '../../../../../../src/plugins/kibana_react/public';
-import { IEmbeddable } from '../../../../../../src/plugins/embeddable/public';
-import { FormCreateDrilldown } from '../../components/form_create_drilldown';
-
-export const OPEN_FLYOUT_EDIT_DRILLDOWN = 'OPEN_FLYOUT_EDIT_DRILLDOWN';
-
-export interface FlyoutEditDrilldownActionContext {
-  embeddable: IEmbeddable;
-}
-
-export interface FlyoutEditDrilldownParams {
-  overlays: () => Promise<CoreStart['overlays']>;
-}
-
-const displayName = i18n.translate('xpack.drilldowns.panel.openFlyoutEditDrilldown.displayName', {
-  defaultMessage: 'Manage drilldowns',
-});
-
-// mocked data
-const drilldrownCount = 2;
-
-export class FlyoutEditDrilldownAction implements ActionByType<typeof OPEN_FLYOUT_EDIT_DRILLDOWN> {
-  public readonly type = OPEN_FLYOUT_EDIT_DRILLDOWN;
-  public readonly id = OPEN_FLYOUT_EDIT_DRILLDOWN;
-  public order = 100;
-
-  constructor(protected readonly params: FlyoutEditDrilldownParams) {}
-
-  public getDisplayName() {
-    return displayName;
-  }
-
-  public getIconType() {
-    return 'list';
-  }
-
-  private ReactComp: React.FC<{ context: FlyoutEditDrilldownActionContext }> = () => {
-    return (
-      <>
-        {displayName}{' '}
-        <EuiNotificationBadge color="subdued" style={{ float: 'right' }}>
-          {drilldrownCount}
-        </EuiNotificationBadge>
-      </>
-    );
-  };
-
-  MenuItem = reactToUiComponent(this.ReactComp);
-
-  public async isCompatible({ embeddable }: FlyoutEditDrilldownActionContext) {
-    return embeddable.getInput().viewMode === 'edit' && drilldrownCount > 0;
-  }
-
-  public async execute({ embeddable }: FlyoutEditDrilldownActionContext) {
-    const overlays = await this.params.overlays();
-    overlays.openFlyout(toMountPoint(<FormCreateDrilldown />));
-  }
-}
diff --git a/x-pack/plugins/drilldowns/public/components/connected_flyout_manage_drilldowns/connected_flyout_manage_drilldowns.story.tsx b/x-pack/plugins/drilldowns/public/components/connected_flyout_manage_drilldowns/connected_flyout_manage_drilldowns.story.tsx
new file mode 100644
index 0000000000000..16b4d3a25d9e5
--- /dev/null
+++ b/x-pack/plugins/drilldowns/public/components/connected_flyout_manage_drilldowns/connected_flyout_manage_drilldowns.story.tsx
@@ -0,0 +1,43 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import * as React from 'react';
+import { EuiFlyout } from '@elastic/eui';
+import { storiesOf } from '@storybook/react';
+import { createFlyoutManageDrilldowns } from './connected_flyout_manage_drilldowns';
+import {
+  dashboardFactory,
+  urlFactory,
+  // eslint-disable-next-line @kbn/eslint/no-restricted-paths
+} from '../../../../advanced_ui_actions/public/components/action_wizard/test_data';
+import { Storage } from '../../../../../../src/plugins/kibana_utils/public';
+import { StubBrowserStorage } from '../../../../../../src/test_utils/public/stub_browser_storage';
+import { mockDynamicActionManager } from './test_data';
+
+const FlyoutManageDrilldowns = createFlyoutManageDrilldowns({
+  advancedUiActions: {
+    getActionFactories() {
+      return [dashboardFactory, urlFactory];
+    },
+  } as any,
+  storage: new Storage(new StubBrowserStorage()),
+  notifications: {
+    toasts: {
+      addError: (...args: any[]) => {
+        alert(JSON.stringify(args));
+      },
+      addSuccess: (...args: any[]) => {
+        alert(JSON.stringify(args));
+      },
+    } as any,
+  },
+});
+
+storiesOf('components/FlyoutManageDrilldowns', module).add('default', () => (
+  <EuiFlyout onClose={() => {}}>
+    <FlyoutManageDrilldowns placeContext={{}} dynamicActionManager={mockDynamicActionManager} />
+  </EuiFlyout>
+));
diff --git a/x-pack/plugins/drilldowns/public/components/connected_flyout_manage_drilldowns/connected_flyout_manage_drilldowns.test.tsx b/x-pack/plugins/drilldowns/public/components/connected_flyout_manage_drilldowns/connected_flyout_manage_drilldowns.test.tsx
new file mode 100644
index 0000000000000..6749b41e81fc7
--- /dev/null
+++ b/x-pack/plugins/drilldowns/public/components/connected_flyout_manage_drilldowns/connected_flyout_manage_drilldowns.test.tsx
@@ -0,0 +1,221 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * 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 { cleanup, fireEvent, render, wait } from '@testing-library/react/pure';
+import '@testing-library/jest-dom/extend-expect';
+import { createFlyoutManageDrilldowns } from './connected_flyout_manage_drilldowns';
+import {
+  dashboardFactory,
+  urlFactory,
+} from '../../../../advanced_ui_actions/public/components/action_wizard/test_data';
+import { StubBrowserStorage } from '../../../../../../src/test_utils/public/stub_browser_storage';
+import { Storage } from '../../../../../../src/plugins/kibana_utils/public';
+import { mockDynamicActionManager } from './test_data';
+import { TEST_SUBJ_DRILLDOWN_ITEM } from '../list_manage_drilldowns';
+import { WELCOME_MESSAGE_TEST_SUBJ } from '../drilldown_hello_bar';
+import { coreMock } from '../../../../../../src/core/public/mocks';
+import { NotificationsStart } from 'kibana/public';
+import { toastDrilldownsCRUDError } from './i18n';
+
+const storage = new Storage(new StubBrowserStorage());
+const notifications = coreMock.createStart().notifications;
+const FlyoutManageDrilldowns = createFlyoutManageDrilldowns({
+  advancedUiActions: {
+    getActionFactories() {
+      return [dashboardFactory, urlFactory];
+    },
+  } as any,
+  storage,
+  notifications,
+});
+
+// https://github.com/elastic/kibana/issues/59469
+afterEach(cleanup);
+
+beforeEach(() => {
+  storage.clear();
+  (notifications.toasts as jest.Mocked<NotificationsStart['toasts']>).addSuccess.mockClear();
+  (notifications.toasts as jest.Mocked<NotificationsStart['toasts']>).addError.mockClear();
+});
+
+test('Allows to manage drilldowns', async () => {
+  const screen = render(
+    <FlyoutManageDrilldowns placeContext={{}} dynamicActionManager={mockDynamicActionManager} />
+  );
+
+  // wait for initial render. It is async because resolving compatible action factories is async
+  await wait(() => expect(screen.getByText(/Manage Drilldowns/i)).toBeVisible());
+
+  // no drilldowns in the list
+  expect(screen.queryAllByTestId(TEST_SUBJ_DRILLDOWN_ITEM)).toHaveLength(0);
+
+  fireEvent.click(screen.getByText(/Create new/i));
+
+  let [createHeading, createButton] = screen.getAllByText(/Create Drilldown/i);
+  expect(createHeading).toBeVisible();
+  expect(screen.getByLabelText(/Back/i)).toBeVisible();
+
+  expect(createButton).toBeDisabled();
+
+  // input drilldown name
+  const name = 'Test name';
+  fireEvent.change(screen.getByLabelText(/name/i), {
+    target: { value: name },
+  });
+
+  // select URL one
+  fireEvent.click(screen.getByText(/Go to URL/i));
+
+  // Input url
+  const URL = 'https://elastic.co';
+  fireEvent.change(screen.getByLabelText(/url/i), {
+    target: { value: URL },
+  });
+
+  [createHeading, createButton] = screen.getAllByText(/Create Drilldown/i);
+
+  expect(createButton).toBeEnabled();
+  fireEvent.click(createButton);
+
+  expect(screen.getByText(/Manage Drilldowns/i)).toBeVisible();
+
+  await wait(() => expect(screen.queryAllByTestId(TEST_SUBJ_DRILLDOWN_ITEM)).toHaveLength(1));
+  expect(screen.getByText(name)).toBeVisible();
+  const editButton = screen.getByText(/edit/i);
+  fireEvent.click(editButton);
+
+  expect(screen.getByText(/Edit Drilldown/i)).toBeVisible();
+  // check that wizard is prefilled with current drilldown values
+  expect(screen.getByLabelText(/name/i)).toHaveValue(name);
+  expect(screen.getByLabelText(/url/i)).toHaveValue(URL);
+
+  // input new drilldown name
+  const newName = 'New drilldown name';
+  fireEvent.change(screen.getByLabelText(/name/i), {
+    target: { value: newName },
+  });
+  fireEvent.click(screen.getByText(/save/i));
+
+  expect(screen.getByText(/Manage Drilldowns/i)).toBeVisible();
+  await wait(() => screen.getByText(newName));
+
+  // delete drilldown from edit view
+  fireEvent.click(screen.getByText(/edit/i));
+  fireEvent.click(screen.getByText(/delete/i));
+
+  expect(screen.getByText(/Manage Drilldowns/i)).toBeVisible();
+  await wait(() => expect(screen.queryAllByTestId(TEST_SUBJ_DRILLDOWN_ITEM)).toHaveLength(0));
+});
+
+test('Can delete multiple drilldowns', async () => {
+  const screen = render(
+    <FlyoutManageDrilldowns placeContext={{}} dynamicActionManager={mockDynamicActionManager} />
+  );
+  // wait for initial render. It is async because resolving compatible action factories is async
+  await wait(() => expect(screen.getByText(/Manage Drilldowns/i)).toBeVisible());
+
+  const createDrilldown = async () => {
+    const oldCount = screen.queryAllByTestId(TEST_SUBJ_DRILLDOWN_ITEM).length;
+    fireEvent.click(screen.getByText(/Create new/i));
+    fireEvent.change(screen.getByLabelText(/name/i), {
+      target: { value: 'test' },
+    });
+    fireEvent.click(screen.getByText(/Go to URL/i));
+    fireEvent.change(screen.getByLabelText(/url/i), {
+      target: { value: 'https://elastic.co' },
+    });
+    fireEvent.click(screen.getAllByText(/Create Drilldown/i)[1]);
+    await wait(() =>
+      expect(screen.queryAllByTestId(TEST_SUBJ_DRILLDOWN_ITEM)).toHaveLength(oldCount + 1)
+    );
+  };
+
+  await createDrilldown();
+  await createDrilldown();
+  await createDrilldown();
+
+  const checkboxes = screen.getAllByLabelText(/Select this drilldown/i);
+  expect(checkboxes).toHaveLength(3);
+  checkboxes.forEach(checkbox => fireEvent.click(checkbox));
+  expect(screen.queryByText(/Create/i)).not.toBeInTheDocument();
+  fireEvent.click(screen.getByText(/Delete \(3\)/i));
+
+  await wait(() => expect(screen.queryAllByTestId(TEST_SUBJ_DRILLDOWN_ITEM)).toHaveLength(0));
+});
+
+test('Create only mode', async () => {
+  const onClose = jest.fn();
+  const screen = render(
+    <FlyoutManageDrilldowns
+      placeContext={{}}
+      dynamicActionManager={mockDynamicActionManager}
+      viewMode={'create'}
+      onClose={onClose}
+    />
+  );
+  // wait for initial render. It is async because resolving compatible action factories is async
+  await wait(() => expect(screen.getAllByText(/Create/i).length).toBeGreaterThan(0));
+  fireEvent.change(screen.getByLabelText(/name/i), {
+    target: { value: 'test' },
+  });
+  fireEvent.click(screen.getByText(/Go to URL/i));
+  fireEvent.change(screen.getByLabelText(/url/i), {
+    target: { value: 'https://elastic.co' },
+  });
+  fireEvent.click(screen.getAllByText(/Create Drilldown/i)[1]);
+
+  await wait(() => expect(notifications.toasts.addSuccess).toBeCalled());
+  expect(onClose).toBeCalled();
+  expect(await mockDynamicActionManager.state.get().events.length).toBe(1);
+});
+
+test.todo("Error when can't fetch drilldown list");
+
+test("Error when can't save drilldown changes", async () => {
+  const error = new Error('Oops');
+  jest.spyOn(mockDynamicActionManager, 'createEvent').mockImplementationOnce(async () => {
+    throw error;
+  });
+  const screen = render(
+    <FlyoutManageDrilldowns placeContext={{}} dynamicActionManager={mockDynamicActionManager} />
+  );
+  // wait for initial render. It is async because resolving compatible action factories is async
+  await wait(() => expect(screen.getByText(/Manage Drilldowns/i)).toBeVisible());
+  fireEvent.click(screen.getByText(/Create new/i));
+  fireEvent.change(screen.getByLabelText(/name/i), {
+    target: { value: 'test' },
+  });
+  fireEvent.click(screen.getByText(/Go to URL/i));
+  fireEvent.change(screen.getByLabelText(/url/i), {
+    target: { value: 'https://elastic.co' },
+  });
+  fireEvent.click(screen.getAllByText(/Create Drilldown/i)[1]);
+  await wait(() =>
+    expect(notifications.toasts.addError).toBeCalledWith(error, { title: toastDrilldownsCRUDError })
+  );
+});
+
+test('Should show drilldown welcome message. Should be able to dismiss it', async () => {
+  let screen = render(
+    <FlyoutManageDrilldowns placeContext={{}} dynamicActionManager={mockDynamicActionManager} />
+  );
+
+  // wait for initial render. It is async because resolving compatible action factories is async
+  await wait(() => expect(screen.getByText(/Manage Drilldowns/i)).toBeVisible());
+
+  expect(screen.getByTestId(WELCOME_MESSAGE_TEST_SUBJ)).toBeVisible();
+  fireEvent.click(screen.getByText(/hide/i));
+  expect(screen.queryByTestId(WELCOME_MESSAGE_TEST_SUBJ)).toBeNull();
+  cleanup();
+
+  screen = render(
+    <FlyoutManageDrilldowns placeContext={{}} dynamicActionManager={mockDynamicActionManager} />
+  );
+  // wait for initial render. It is async because resolving compatible action factories is async
+  await wait(() => expect(screen.getByText(/Manage Drilldowns/i)).toBeVisible());
+  expect(screen.queryByTestId(WELCOME_MESSAGE_TEST_SUBJ)).toBeNull();
+});
diff --git a/x-pack/plugins/drilldowns/public/components/connected_flyout_manage_drilldowns/connected_flyout_manage_drilldowns.tsx b/x-pack/plugins/drilldowns/public/components/connected_flyout_manage_drilldowns/connected_flyout_manage_drilldowns.tsx
new file mode 100644
index 0000000000000..f22ccc2f26f02
--- /dev/null
+++ b/x-pack/plugins/drilldowns/public/components/connected_flyout_manage_drilldowns/connected_flyout_manage_drilldowns.tsx
@@ -0,0 +1,332 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React, { useEffect, useState } from 'react';
+import useMountedState from 'react-use/lib/useMountedState';
+import {
+  AdvancedUiActionsActionFactory as ActionFactory,
+  AdvancedUiActionsStart,
+} from '../../../../advanced_ui_actions/public';
+import { NotificationsStart } from '../../../../../../src/core/public';
+import { DrilldownWizardConfig, FlyoutDrilldownWizard } from '../flyout_drilldown_wizard';
+import { FlyoutListManageDrilldowns } from '../flyout_list_manage_drilldowns';
+import { IStorageWrapper } from '../../../../../../src/plugins/kibana_utils/public';
+import {
+  DynamicActionManager,
+  UiActionsSerializedEvent,
+  UiActionsSerializedAction,
+  VALUE_CLICK_TRIGGER,
+  SELECT_RANGE_TRIGGER,
+  TriggerContextMapping,
+} from '../../../../../../src/plugins/ui_actions/public';
+import { useContainerState } from '../../../../../../src/plugins/kibana_utils/common';
+import { DrilldownListItem } from '../list_manage_drilldowns';
+import {
+  toastDrilldownCreated,
+  toastDrilldownDeleted,
+  toastDrilldownEdited,
+  toastDrilldownsCRUDError,
+  toastDrilldownsDeleted,
+} from './i18n';
+import { DrilldownFactoryContext } from '../../types';
+
+interface ConnectedFlyoutManageDrilldownsProps<Context extends object = object> {
+  placeContext: Context;
+  dynamicActionManager: DynamicActionManager;
+  viewMode?: 'create' | 'manage';
+  onClose?: () => void;
+}
+
+/**
+ * Represent current state (route) of FlyoutManageDrilldowns
+ */
+enum Routes {
+  Manage = 'manage',
+  Create = 'create',
+  Edit = 'edit',
+}
+
+export function createFlyoutManageDrilldowns({
+  advancedUiActions,
+  storage,
+  notifications,
+}: {
+  advancedUiActions: AdvancedUiActionsStart;
+  storage: IStorageWrapper;
+  notifications: NotificationsStart;
+}) {
+  // fine to assume this is static,
+  // because all action factories should be registered in setup phase
+  const allActionFactories = advancedUiActions.getActionFactories();
+  const allActionFactoriesById = allActionFactories.reduce((acc, next) => {
+    acc[next.id] = next;
+    return acc;
+  }, {} as Record<string, ActionFactory>);
+
+  return (props: ConnectedFlyoutManageDrilldownsProps) => {
+    const isCreateOnly = props.viewMode === 'create';
+
+    const selectedTriggers: Array<keyof TriggerContextMapping> = React.useMemo(
+      () => [VALUE_CLICK_TRIGGER, SELECT_RANGE_TRIGGER],
+      []
+    );
+
+    const factoryContext: DrilldownFactoryContext<unknown> = React.useMemo(
+      () => ({
+        placeContext: props.placeContext,
+        triggers: selectedTriggers,
+      }),
+      [props.placeContext, selectedTriggers]
+    );
+
+    const actionFactories = useCompatibleActionFactoriesForCurrentContext(
+      allActionFactories,
+      factoryContext
+    );
+
+    const [route, setRoute] = useState<Routes>(
+      () => (isCreateOnly ? Routes.Create : Routes.Manage) // initial state is different depending on `viewMode`
+    );
+    const [currentEditId, setCurrentEditId] = useState<string | null>(null);
+
+    const [shouldShowWelcomeMessage, onHideWelcomeMessage] = useWelcomeMessage(storage);
+
+    const {
+      drilldowns,
+      createDrilldown,
+      editDrilldown,
+      deleteDrilldown,
+    } = useDrilldownsStateManager(props.dynamicActionManager, notifications);
+
+    /**
+     * isCompatible promise is not yet resolved.
+     * Skip rendering until it is resolved
+     */
+    if (!actionFactories) return null;
+    /**
+     * Drilldowns are not fetched yet or error happened during fetching
+     * In case of error user is notified with toast
+     */
+    if (!drilldowns) return null;
+
+    /**
+     * Needed for edit mode to prefill wizard fields with data from current edited drilldown
+     */
+    function resolveInitialDrilldownWizardConfig(): DrilldownWizardConfig | undefined {
+      if (route !== Routes.Edit) return undefined;
+      if (!currentEditId) return undefined;
+      const drilldownToEdit = drilldowns?.find(d => d.eventId === currentEditId);
+      if (!drilldownToEdit) return undefined;
+
+      return {
+        actionFactory: allActionFactoriesById[drilldownToEdit.action.factoryId],
+        actionConfig: drilldownToEdit.action.config as object, // TODO: config is unknown, but we know it always extends object
+        name: drilldownToEdit.action.name,
+      };
+    }
+
+    /**
+     * Maps drilldown to list item view model
+     */
+    function mapToDrilldownToDrilldownListItem(
+      drilldown: UiActionsSerializedEvent
+    ): DrilldownListItem {
+      const actionFactory = allActionFactoriesById[drilldown.action.factoryId];
+      return {
+        id: drilldown.eventId,
+        drilldownName: drilldown.action.name,
+        actionName: actionFactory?.getDisplayName(factoryContext) ?? drilldown.action.factoryId,
+        icon: actionFactory?.getIconType(factoryContext),
+      };
+    }
+
+    switch (route) {
+      case Routes.Create:
+      case Routes.Edit:
+        return (
+          <FlyoutDrilldownWizard
+            showWelcomeMessage={shouldShowWelcomeMessage}
+            onWelcomeHideClick={onHideWelcomeMessage}
+            drilldownActionFactories={actionFactories}
+            onClose={props.onClose}
+            mode={route === Routes.Create ? 'create' : 'edit'}
+            onBack={isCreateOnly ? undefined : () => setRoute(Routes.Manage)}
+            onSubmit={({ actionConfig, actionFactory, name }) => {
+              if (route === Routes.Create) {
+                createDrilldown(
+                  {
+                    name,
+                    config: actionConfig,
+                    factoryId: actionFactory.id,
+                  },
+                  selectedTriggers
+                );
+              } else {
+                editDrilldown(
+                  currentEditId!,
+                  {
+                    name,
+                    config: actionConfig,
+                    factoryId: actionFactory.id,
+                  },
+                  selectedTriggers
+                );
+              }
+
+              if (isCreateOnly) {
+                if (props.onClose) {
+                  props.onClose();
+                }
+              } else {
+                setRoute(Routes.Manage);
+              }
+
+              setCurrentEditId(null);
+            }}
+            onDelete={() => {
+              deleteDrilldown(currentEditId!);
+              setRoute(Routes.Manage);
+              setCurrentEditId(null);
+            }}
+            actionFactoryContext={factoryContext}
+            initialDrilldownWizardConfig={resolveInitialDrilldownWizardConfig()}
+          />
+        );
+
+      case Routes.Manage:
+      default:
+        return (
+          <FlyoutListManageDrilldowns
+            showWelcomeMessage={shouldShowWelcomeMessage}
+            onWelcomeHideClick={onHideWelcomeMessage}
+            drilldowns={drilldowns.map(mapToDrilldownToDrilldownListItem)}
+            onDelete={ids => {
+              setCurrentEditId(null);
+              deleteDrilldown(ids);
+            }}
+            onEdit={id => {
+              setCurrentEditId(id);
+              setRoute(Routes.Edit);
+            }}
+            onCreate={() => {
+              setCurrentEditId(null);
+              setRoute(Routes.Create);
+            }}
+            onClose={props.onClose}
+          />
+        );
+    }
+  };
+}
+
+function useCompatibleActionFactoriesForCurrentContext<Context extends object = object>(
+  actionFactories: Array<ActionFactory<any>>,
+  context: Context
+) {
+  const [compatibleActionFactories, setCompatibleActionFactories] = useState<
+    Array<ActionFactory<any>>
+  >();
+  useEffect(() => {
+    let canceled = false;
+    async function updateCompatibleFactoriesForContext() {
+      const compatibility = await Promise.all(
+        actionFactories.map(factory => factory.isCompatible(context))
+      );
+      if (canceled) return;
+      setCompatibleActionFactories(actionFactories.filter((_, i) => compatibility[i]));
+    }
+    updateCompatibleFactoriesForContext();
+    return () => {
+      canceled = true;
+    };
+  }, [context, actionFactories]);
+
+  return compatibleActionFactories;
+}
+
+function useWelcomeMessage(storage: IStorageWrapper): [boolean, () => void] {
+  const key = `drilldowns:hidWelcomeMessage`;
+  const [hidWelcomeMessage, setHidWelcomeMessage] = useState<boolean>(storage.get(key) ?? false);
+
+  return [
+    !hidWelcomeMessage,
+    () => {
+      if (hidWelcomeMessage) return;
+      setHidWelcomeMessage(true);
+      storage.set(key, true);
+    },
+  ];
+}
+
+function useDrilldownsStateManager(
+  actionManager: DynamicActionManager,
+  notifications: NotificationsStart
+) {
+  const { events: drilldowns } = useContainerState(actionManager.state);
+  const [isLoading, setIsLoading] = useState(false);
+  const isMounted = useMountedState();
+
+  async function run(op: () => Promise<void>) {
+    setIsLoading(true);
+    try {
+      await op();
+    } catch (e) {
+      notifications.toasts.addError(e, {
+        title: toastDrilldownsCRUDError,
+      });
+      if (!isMounted) return;
+      setIsLoading(false);
+      return;
+    }
+  }
+
+  async function createDrilldown(
+    action: UiActionsSerializedAction<any>,
+    selectedTriggers: Array<keyof TriggerContextMapping>
+  ) {
+    await run(async () => {
+      await actionManager.createEvent(action, selectedTriggers);
+      notifications.toasts.addSuccess({
+        title: toastDrilldownCreated.title,
+        text: toastDrilldownCreated.text(action.name),
+      });
+    });
+  }
+
+  async function editDrilldown(
+    drilldownId: string,
+    action: UiActionsSerializedAction<any>,
+    selectedTriggers: Array<keyof TriggerContextMapping>
+  ) {
+    await run(async () => {
+      await actionManager.updateEvent(drilldownId, action, selectedTriggers);
+      notifications.toasts.addSuccess({
+        title: toastDrilldownEdited.title,
+        text: toastDrilldownEdited.text(action.name),
+      });
+    });
+  }
+
+  async function deleteDrilldown(drilldownIds: string | string[]) {
+    await run(async () => {
+      drilldownIds = Array.isArray(drilldownIds) ? drilldownIds : [drilldownIds];
+      await actionManager.deleteEvents(drilldownIds);
+      notifications.toasts.addSuccess(
+        drilldownIds.length === 1
+          ? {
+              title: toastDrilldownDeleted.title,
+              text: toastDrilldownDeleted.text,
+            }
+          : {
+              title: toastDrilldownsDeleted.title,
+              text: toastDrilldownsDeleted.text(drilldownIds.length),
+            }
+      );
+    });
+  }
+
+  return { drilldowns, isLoading, createDrilldown, editDrilldown, deleteDrilldown };
+}
diff --git a/x-pack/plugins/drilldowns/public/components/connected_flyout_manage_drilldowns/i18n.ts b/x-pack/plugins/drilldowns/public/components/connected_flyout_manage_drilldowns/i18n.ts
new file mode 100644
index 0000000000000..70f4d735e2a74
--- /dev/null
+++ b/x-pack/plugins/drilldowns/public/components/connected_flyout_manage_drilldowns/i18n.ts
@@ -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 { i18n } from '@kbn/i18n';
+
+export const toastDrilldownCreated = {
+  title: i18n.translate(
+    'xpack.drilldowns.components.flyoutDrilldownWizard.toast.drilldownCreatedTitle',
+    {
+      defaultMessage: 'Drilldown created',
+    }
+  ),
+  text: (drilldownName: string) =>
+    i18n.translate('xpack.drilldowns.components.flyoutDrilldownWizard.toast.drilldownCreatedText', {
+      defaultMessage: 'You created "{drilldownName}"',
+      values: {
+        drilldownName,
+      },
+    }),
+};
+
+export const toastDrilldownEdited = {
+  title: i18n.translate(
+    'xpack.drilldowns.components.flyoutDrilldownWizard.toast.drilldownEditedTitle',
+    {
+      defaultMessage: 'Drilldown edited',
+    }
+  ),
+  text: (drilldownName: string) =>
+    i18n.translate('xpack.drilldowns.components.flyoutDrilldownWizard.toast.drilldownEditedText', {
+      defaultMessage: 'You edited "{drilldownName}"',
+      values: {
+        drilldownName,
+      },
+    }),
+};
+
+export const toastDrilldownDeleted = {
+  title: i18n.translate(
+    'xpack.drilldowns.components.flyoutDrilldownWizard.toast.drilldownDeletedTitle',
+    {
+      defaultMessage: 'Drilldown deleted',
+    }
+  ),
+  text: i18n.translate(
+    'xpack.drilldowns.components.flyoutDrilldownWizard.toast.drilldownDeletedText',
+    {
+      defaultMessage: 'You deleted a drilldown',
+    }
+  ),
+};
+
+export const toastDrilldownsDeleted = {
+  title: i18n.translate(
+    'xpack.drilldowns.components.flyoutDrilldownWizard.toast.drilldownsDeletedTitle',
+    {
+      defaultMessage: 'Drilldowns deleted',
+    }
+  ),
+  text: (n: number) =>
+    i18n.translate(
+      'xpack.drilldowns.components.flyoutDrilldownWizard.toast.drilldownsDeletedText',
+      {
+        defaultMessage: 'You deleted {n} drilldowns',
+        values: {
+          n,
+        },
+      }
+    ),
+};
+
+export const toastDrilldownsCRUDError = i18n.translate(
+  'xpack.drilldowns.components.flyoutDrilldownWizard.toast.drilldownsCRUDErrorTitle',
+  {
+    defaultMessage: 'Error saving drilldown',
+    description: 'Title for generic error toast when persisting drilldown updates failed',
+  }
+);
+
+export const toastDrilldownsFetchError = i18n.translate(
+  'xpack.drilldowns.components.flyoutDrilldownWizard.toast.drilldownsFetchErrorTitle',
+  {
+    defaultMessage: 'Error fetching drilldowns',
+  }
+);
diff --git a/x-pack/plugins/drilldowns/public/components/connected_flyout_manage_drilldowns/index.ts b/x-pack/plugins/drilldowns/public/components/connected_flyout_manage_drilldowns/index.ts
new file mode 100644
index 0000000000000..f084a3e563c23
--- /dev/null
+++ b/x-pack/plugins/drilldowns/public/components/connected_flyout_manage_drilldowns/index.ts
@@ -0,0 +1,7 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+export * from './connected_flyout_manage_drilldowns';
diff --git a/x-pack/plugins/drilldowns/public/components/connected_flyout_manage_drilldowns/test_data.ts b/x-pack/plugins/drilldowns/public/components/connected_flyout_manage_drilldowns/test_data.ts
new file mode 100644
index 0000000000000..b8deaa8b842bc
--- /dev/null
+++ b/x-pack/plugins/drilldowns/public/components/connected_flyout_manage_drilldowns/test_data.ts
@@ -0,0 +1,89 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import uuid from 'uuid';
+import {
+  DynamicActionManager,
+  DynamicActionManagerState,
+  UiActionsSerializedAction,
+  TriggerContextMapping,
+} from '../../../../../../src/plugins/ui_actions/public';
+import { createStateContainer } from '../../../../../../src/plugins/kibana_utils/common';
+
+class MockDynamicActionManager implements PublicMethodsOf<DynamicActionManager> {
+  public readonly state = createStateContainer<DynamicActionManagerState>({
+    isFetchingEvents: false,
+    fetchCount: 0,
+    events: [],
+  });
+
+  async count() {
+    return this.state.get().events.length;
+  }
+
+  async list() {
+    return this.state.get().events;
+  }
+
+  async createEvent(
+    action: UiActionsSerializedAction<any>,
+    triggers: Array<keyof TriggerContextMapping>
+  ) {
+    const event = {
+      action,
+      triggers,
+      eventId: uuid(),
+    };
+    const state = this.state.get();
+    this.state.set({
+      ...state,
+      events: [...state.events, event],
+    });
+  }
+
+  async deleteEvents(eventIds: string[]) {
+    const state = this.state.get();
+    let events = state.events;
+
+    eventIds.forEach(id => {
+      events = events.filter(e => e.eventId !== id);
+    });
+
+    this.state.set({
+      ...state,
+      events,
+    });
+  }
+
+  async updateEvent(
+    eventId: string,
+    action: UiActionsSerializedAction<unknown>,
+    triggers: Array<keyof TriggerContextMapping>
+  ) {
+    const state = this.state.get();
+    const events = state.events;
+    const idx = events.findIndex(e => e.eventId === eventId);
+    const event = {
+      eventId,
+      action,
+      triggers,
+    };
+
+    this.state.set({
+      ...state,
+      events: [...events.slice(0, idx), event, ...events.slice(idx + 1)],
+    });
+  }
+
+  async deleteEvent() {
+    throw new Error('not implemented');
+  }
+
+  async start() {}
+  async stop() {}
+}
+
+export const mockDynamicActionManager = (new MockDynamicActionManager() as unknown) as DynamicActionManager;
diff --git a/x-pack/plugins/drilldowns/public/components/drilldown_hello_bar/drilldown_hello_bar.story.tsx b/x-pack/plugins/drilldowns/public/components/drilldown_hello_bar/drilldown_hello_bar.story.tsx
index 7a9e19342f27c..c4a4630397f1c 100644
--- a/x-pack/plugins/drilldowns/public/components/drilldown_hello_bar/drilldown_hello_bar.story.tsx
+++ b/x-pack/plugins/drilldowns/public/components/drilldown_hello_bar/drilldown_hello_bar.story.tsx
@@ -8,6 +8,16 @@ import * as React from 'react';
 import { storiesOf } from '@storybook/react';
 import { DrilldownHelloBar } from '.';
 
-storiesOf('components/DrilldownHelloBar', module).add('default', () => {
-  return <DrilldownHelloBar />;
-});
+const Demo = () => {
+  const [show, setShow] = React.useState(true);
+  return show ? (
+    <DrilldownHelloBar
+      docsLink={'https://elastic.co'}
+      onHideClick={() => {
+        setShow(false);
+      }}
+    />
+  ) : null;
+};
+
+storiesOf('components/DrilldownHelloBar', module).add('default', () => <Demo />);
diff --git a/x-pack/plugins/drilldowns/public/components/drilldown_hello_bar/drilldown_hello_bar.tsx b/x-pack/plugins/drilldowns/public/components/drilldown_hello_bar/drilldown_hello_bar.tsx
index 1ef714f7b86e2..8c6739a8ad6c8 100644
--- a/x-pack/plugins/drilldowns/public/components/drilldown_hello_bar/drilldown_hello_bar.tsx
+++ b/x-pack/plugins/drilldowns/public/components/drilldown_hello_bar/drilldown_hello_bar.tsx
@@ -5,22 +5,58 @@
  */
 
 import React from 'react';
+import {
+  EuiCallOut,
+  EuiFlexGroup,
+  EuiFlexItem,
+  EuiTextColor,
+  EuiText,
+  EuiLink,
+  EuiSpacer,
+  EuiButtonEmpty,
+  EuiIcon,
+} from '@elastic/eui';
+import { txtHideHelpButtonLabel, txtHelpText, txtViewDocsLinkLabel } from './i18n';
 
 export interface DrilldownHelloBarProps {
   docsLink?: string;
+  onHideClick?: () => void;
 }
 
-/**
- * @todo https://github.com/elastic/kibana/issues/55311
- */
-export const DrilldownHelloBar: React.FC<DrilldownHelloBarProps> = ({ docsLink }) => {
+export const WELCOME_MESSAGE_TEST_SUBJ = 'drilldowns-welcome-message-test-subj';
+
+export const DrilldownHelloBar: React.FC<DrilldownHelloBarProps> = ({
+  docsLink,
+  onHideClick = () => {},
+}) => {
   return (
-    <div>
-      <p>
-        Drilldowns provide the ability to define a new behavior when interacting with a panel. You
-        can add multiple options or simply override the default filtering behavior.
-      </p>
-      <a href={docsLink}>View docs</a>
-    </div>
+    <EuiCallOut
+      data-test-subj={WELCOME_MESSAGE_TEST_SUBJ}
+      title={
+        <EuiFlexGroup className="drdHelloBar__content">
+          <EuiFlexItem grow={false}>
+            <div style={{ marginLeft: '8px' }}>
+              <EuiIcon type="help" />
+            </div>
+          </EuiFlexItem>
+          <EuiFlexItem grow={true}>
+            <EuiText size={'s'}>
+              <EuiTextColor color="subdued">{txtHelpText}</EuiTextColor>
+            </EuiText>
+            {docsLink && (
+              <>
+                <EuiSpacer size={'xs'} />
+                <EuiLink href={docsLink}>{txtViewDocsLinkLabel}</EuiLink>
+              </>
+            )}
+          </EuiFlexItem>
+          <EuiFlexItem grow={false}>
+            <EuiButtonEmpty size="xs" onClick={onHideClick}>
+              {txtHideHelpButtonLabel}
+            </EuiButtonEmpty>
+          </EuiFlexItem>
+        </EuiFlexGroup>
+      }
+    />
   );
 };
diff --git a/x-pack/plugins/drilldowns/public/components/drilldown_hello_bar/i18n.ts b/x-pack/plugins/drilldowns/public/components/drilldown_hello_bar/i18n.ts
new file mode 100644
index 0000000000000..63dc95dabc0fb
--- /dev/null
+++ b/x-pack/plugins/drilldowns/public/components/drilldown_hello_bar/i18n.ts
@@ -0,0 +1,29 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { i18n } from '@kbn/i18n';
+
+export const txtHelpText = i18n.translate(
+  'xpack.drilldowns.components.DrilldownHelloBar.helpText',
+  {
+    defaultMessage:
+      'Drilldowns provide the ability to define a new behavior when interacting with a panel. You can add multiple options or simply override the default filtering behavior.',
+  }
+);
+
+export const txtViewDocsLinkLabel = i18n.translate(
+  'xpack.drilldowns.components.DrilldownHelloBar.viewDocsLinkLabel',
+  {
+    defaultMessage: 'View docs',
+  }
+);
+
+export const txtHideHelpButtonLabel = i18n.translate(
+  'xpack.drilldowns.components.DrilldownHelloBar.hideHelpButtonLabel',
+  {
+    defaultMessage: 'Hide',
+  }
+);
diff --git a/x-pack/plugins/drilldowns/public/components/drilldown_picker/drilldown_picker.tsx b/x-pack/plugins/drilldowns/public/components/drilldown_picker/drilldown_picker.tsx
deleted file mode 100644
index 3748fc666c81c..0000000000000
--- a/x-pack/plugins/drilldowns/public/components/drilldown_picker/drilldown_picker.tsx
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import React from 'react';
-
-// eslint-disable-next-line
-export interface DrilldownPickerProps {}
-
-export const DrilldownPicker: React.FC<DrilldownPickerProps> = () => {
-  return (
-    <img
-      src={
-        'https://user-images.githubusercontent.com/9773803/72725665-9e8e3e00-3b86-11ea-9314-8724c521b41f.png'
-      }
-      alt=""
-    />
-  );
-};
diff --git a/x-pack/plugins/drilldowns/public/components/flyout_create_drilldown/flyout_create_drilldown.story.tsx b/x-pack/plugins/drilldowns/public/components/flyout_create_drilldown/flyout_create_drilldown.story.tsx
deleted file mode 100644
index 4f024b7d9cd6a..0000000000000
--- a/x-pack/plugins/drilldowns/public/components/flyout_create_drilldown/flyout_create_drilldown.story.tsx
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-/* eslint-disable no-console */
-
-import * as React from 'react';
-import { EuiFlyout } from '@elastic/eui';
-import { storiesOf } from '@storybook/react';
-import { FlyoutCreateDrilldown } from '.';
-
-storiesOf('components/FlyoutCreateDrilldown', module)
-  .add('default', () => {
-    return <FlyoutCreateDrilldown context={{} as any} />;
-  })
-  .add('open in flyout', () => {
-    return (
-      <EuiFlyout>
-        <FlyoutCreateDrilldown context={{} as any} />
-      </EuiFlyout>
-    );
-  });
diff --git a/x-pack/plugins/drilldowns/public/components/flyout_create_drilldown/flyout_create_drilldown.tsx b/x-pack/plugins/drilldowns/public/components/flyout_create_drilldown/flyout_create_drilldown.tsx
deleted file mode 100644
index b45ac9197c7e0..0000000000000
--- a/x-pack/plugins/drilldowns/public/components/flyout_create_drilldown/flyout_create_drilldown.tsx
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import React from 'react';
-import { EuiButton } from '@elastic/eui';
-import { FormCreateDrilldown } from '../form_create_drilldown';
-import { FlyoutFrame } from '../flyout_frame';
-import { txtCreateDrilldown } from './i18n';
-import { FlyoutCreateDrilldownActionContext } from '../../actions';
-
-export interface FlyoutCreateDrilldownProps {
-  context: FlyoutCreateDrilldownActionContext;
-  onClose?: () => void;
-}
-
-export const FlyoutCreateDrilldown: React.FC<FlyoutCreateDrilldownProps> = ({
-  context,
-  onClose,
-}) => {
-  const footer = (
-    <EuiButton onClick={() => {}} fill>
-      {txtCreateDrilldown}
-    </EuiButton>
-  );
-
-  return (
-    <FlyoutFrame title={txtCreateDrilldown} footer={footer} onClose={onClose}>
-      <FormCreateDrilldown />
-    </FlyoutFrame>
-  );
-};
diff --git a/x-pack/plugins/drilldowns/public/components/flyout_drilldown_wizard/flyout_drilldown_wizard.story.tsx b/x-pack/plugins/drilldowns/public/components/flyout_drilldown_wizard/flyout_drilldown_wizard.story.tsx
new file mode 100644
index 0000000000000..152cd393b9d3e
--- /dev/null
+++ b/x-pack/plugins/drilldowns/public/components/flyout_drilldown_wizard/flyout_drilldown_wizard.story.tsx
@@ -0,0 +1,70 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+/* eslint-disable no-console */
+
+import * as React from 'react';
+import { EuiFlyout } from '@elastic/eui';
+import { storiesOf } from '@storybook/react';
+import { FlyoutDrilldownWizard } from '.';
+import {
+  dashboardFactory,
+  urlFactory,
+  // eslint-disable-next-line @kbn/eslint/no-restricted-paths
+} from '../../../../advanced_ui_actions/public/components/action_wizard/test_data';
+
+storiesOf('components/FlyoutDrilldownWizard', module)
+  .add('default', () => {
+    return <FlyoutDrilldownWizard drilldownActionFactories={[urlFactory, dashboardFactory]} />;
+  })
+  .add('open in flyout - create', () => {
+    return (
+      <EuiFlyout onClose={() => {}}>
+        <FlyoutDrilldownWizard
+          onClose={() => {}}
+          drilldownActionFactories={[urlFactory, dashboardFactory]}
+        />
+      </EuiFlyout>
+    );
+  })
+  .add('open in flyout - edit', () => {
+    return (
+      <EuiFlyout onClose={() => {}}>
+        <FlyoutDrilldownWizard
+          onClose={() => {}}
+          drilldownActionFactories={[urlFactory, dashboardFactory]}
+          initialDrilldownWizardConfig={{
+            name: 'My fancy drilldown',
+            actionFactory: urlFactory as any,
+            actionConfig: {
+              url: 'https://elastic.co',
+              openInNewTab: true,
+            },
+          }}
+          mode={'edit'}
+        />
+      </EuiFlyout>
+    );
+  })
+  .add('open in flyout - edit, just 1 action type', () => {
+    return (
+      <EuiFlyout onClose={() => {}}>
+        <FlyoutDrilldownWizard
+          onClose={() => {}}
+          drilldownActionFactories={[dashboardFactory]}
+          initialDrilldownWizardConfig={{
+            name: 'My fancy drilldown',
+            actionFactory: urlFactory as any,
+            actionConfig: {
+              url: 'https://elastic.co',
+              openInNewTab: true,
+            },
+          }}
+          mode={'edit'}
+        />
+      </EuiFlyout>
+    );
+  });
diff --git a/x-pack/plugins/drilldowns/public/components/flyout_drilldown_wizard/flyout_drilldown_wizard.tsx b/x-pack/plugins/drilldowns/public/components/flyout_drilldown_wizard/flyout_drilldown_wizard.tsx
new file mode 100644
index 0000000000000..faa965a98a4bb
--- /dev/null
+++ b/x-pack/plugins/drilldowns/public/components/flyout_drilldown_wizard/flyout_drilldown_wizard.tsx
@@ -0,0 +1,139 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * 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, { useState } from 'react';
+import { EuiButton, EuiSpacer } from '@elastic/eui';
+import { FormDrilldownWizard } from '../form_drilldown_wizard';
+import { FlyoutFrame } from '../flyout_frame';
+import {
+  txtCreateDrilldownButtonLabel,
+  txtCreateDrilldownTitle,
+  txtDeleteDrilldownButtonLabel,
+  txtEditDrilldownButtonLabel,
+  txtEditDrilldownTitle,
+} from './i18n';
+import { DrilldownHelloBar } from '../drilldown_hello_bar';
+import { AdvancedUiActionsActionFactory as ActionFactory } from '../../../../advanced_ui_actions/public';
+
+export interface DrilldownWizardConfig<ActionConfig extends object = object> {
+  name: string;
+  actionFactory?: ActionFactory;
+  actionConfig?: ActionConfig;
+}
+
+export interface FlyoutDrilldownWizardProps<CurrentActionConfig extends object = object> {
+  drilldownActionFactories: Array<ActionFactory<any>>;
+
+  onSubmit?: (drilldownWizardConfig: Required<DrilldownWizardConfig>) => void;
+  onDelete?: () => void;
+  onClose?: () => void;
+  onBack?: () => void;
+
+  mode?: 'create' | 'edit';
+  initialDrilldownWizardConfig?: DrilldownWizardConfig<CurrentActionConfig>;
+
+  showWelcomeMessage?: boolean;
+  onWelcomeHideClick?: () => void;
+
+  actionFactoryContext?: object;
+}
+
+export function FlyoutDrilldownWizard<CurrentActionConfig extends object = object>({
+  onClose,
+  onBack,
+  onSubmit = () => {},
+  initialDrilldownWizardConfig,
+  mode = 'create',
+  onDelete = () => {},
+  showWelcomeMessage = true,
+  onWelcomeHideClick,
+  drilldownActionFactories,
+  actionFactoryContext,
+}: FlyoutDrilldownWizardProps<CurrentActionConfig>) {
+  const [wizardConfig, setWizardConfig] = useState<DrilldownWizardConfig>(
+    () =>
+      initialDrilldownWizardConfig ?? {
+        name: '',
+      }
+  );
+
+  const isActionValid = (
+    config: DrilldownWizardConfig
+  ): config is Required<DrilldownWizardConfig> => {
+    if (!wizardConfig.name) return false;
+    if (!wizardConfig.actionFactory) return false;
+    if (!wizardConfig.actionConfig) return false;
+
+    return wizardConfig.actionFactory.isConfigValid(wizardConfig.actionConfig);
+  };
+
+  const footer = (
+    <EuiButton
+      onClick={() => {
+        if (isActionValid(wizardConfig)) {
+          onSubmit(wizardConfig);
+        }
+      }}
+      fill
+      isDisabled={!isActionValid(wizardConfig)}
+    >
+      {mode === 'edit' ? txtEditDrilldownButtonLabel : txtCreateDrilldownButtonLabel}
+    </EuiButton>
+  );
+
+  return (
+    <FlyoutFrame
+      title={mode === 'edit' ? txtEditDrilldownTitle : txtCreateDrilldownTitle}
+      footer={footer}
+      onClose={onClose}
+      onBack={onBack}
+      banner={showWelcomeMessage && <DrilldownHelloBar onHideClick={onWelcomeHideClick} />}
+    >
+      <FormDrilldownWizard
+        name={wizardConfig.name}
+        onNameChange={newName => {
+          setWizardConfig({
+            ...wizardConfig,
+            name: newName,
+          });
+        }}
+        actionConfig={wizardConfig.actionConfig}
+        onActionConfigChange={newActionConfig => {
+          setWizardConfig({
+            ...wizardConfig,
+            actionConfig: newActionConfig,
+          });
+        }}
+        currentActionFactory={wizardConfig.actionFactory}
+        onActionFactoryChange={actionFactory => {
+          if (!actionFactory) {
+            setWizardConfig({
+              ...wizardConfig,
+              actionFactory: undefined,
+              actionConfig: undefined,
+            });
+          } else {
+            setWizardConfig({
+              ...wizardConfig,
+              actionFactory,
+              actionConfig: actionFactory.createConfig(),
+            });
+          }
+        }}
+        actionFactories={drilldownActionFactories}
+        actionFactoryContext={actionFactoryContext!}
+      />
+      {mode === 'edit' && (
+        <>
+          <EuiSpacer size={'xl'} />
+          <EuiButton onClick={onDelete} color={'danger'}>
+            {txtDeleteDrilldownButtonLabel}
+          </EuiButton>
+        </>
+      )}
+    </FlyoutFrame>
+  );
+}
diff --git a/x-pack/plugins/drilldowns/public/components/flyout_drilldown_wizard/i18n.ts b/x-pack/plugins/drilldowns/public/components/flyout_drilldown_wizard/i18n.ts
new file mode 100644
index 0000000000000..a4a2754a444ab
--- /dev/null
+++ b/x-pack/plugins/drilldowns/public/components/flyout_drilldown_wizard/i18n.ts
@@ -0,0 +1,42 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { i18n } from '@kbn/i18n';
+
+export const txtCreateDrilldownTitle = i18n.translate(
+  'xpack.drilldowns.components.flyoutDrilldownWizard.createDrilldownTitle',
+  {
+    defaultMessage: 'Create Drilldown',
+  }
+);
+
+export const txtEditDrilldownTitle = i18n.translate(
+  'xpack.drilldowns.components.flyoutDrilldownWizard.editDrilldownTitle',
+  {
+    defaultMessage: 'Edit Drilldown',
+  }
+);
+
+export const txtCreateDrilldownButtonLabel = i18n.translate(
+  'xpack.drilldowns.components.flyoutDrilldownWizard.createDrilldownButtonLabel',
+  {
+    defaultMessage: 'Create drilldown',
+  }
+);
+
+export const txtEditDrilldownButtonLabel = i18n.translate(
+  'xpack.drilldowns.components.flyoutDrilldownWizard.editDrilldownButtonLabel',
+  {
+    defaultMessage: 'Save',
+  }
+);
+
+export const txtDeleteDrilldownButtonLabel = i18n.translate(
+  'xpack.drilldowns.components.flyoutDrilldownWizard.deleteDrilldownButtonLabel',
+  {
+    defaultMessage: 'Delete drilldown',
+  }
+);
diff --git a/x-pack/plugins/drilldowns/public/components/flyout_drilldown_wizard/index.ts b/x-pack/plugins/drilldowns/public/components/flyout_drilldown_wizard/index.ts
new file mode 100644
index 0000000000000..96ed23bf112c9
--- /dev/null
+++ b/x-pack/plugins/drilldowns/public/components/flyout_drilldown_wizard/index.ts
@@ -0,0 +1,7 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+export * from './flyout_drilldown_wizard';
diff --git a/x-pack/plugins/drilldowns/public/components/flyout_frame/flyout_frame.story.tsx b/x-pack/plugins/drilldowns/public/components/flyout_frame/flyout_frame.story.tsx
index 2715637f6392f..cb223db556f56 100644
--- a/x-pack/plugins/drilldowns/public/components/flyout_frame/flyout_frame.story.tsx
+++ b/x-pack/plugins/drilldowns/public/components/flyout_frame/flyout_frame.story.tsx
@@ -21,6 +21,13 @@ storiesOf('components/FlyoutFrame', module)
   .add('with onClose', () => {
     return <FlyoutFrame onClose={() => console.log('onClose')}>test</FlyoutFrame>;
   })
+  .add('with onBack', () => {
+    return (
+      <FlyoutFrame onBack={() => console.log('onClose')} title={'Title'}>
+        test
+      </FlyoutFrame>
+    );
+  })
   .add('custom footer', () => {
     return <FlyoutFrame footer={<button>click me!</button>}>test</FlyoutFrame>;
   })
diff --git a/x-pack/plugins/drilldowns/public/components/flyout_frame/flyout_frame.test.tsx b/x-pack/plugins/drilldowns/public/components/flyout_frame/flyout_frame.test.tsx
index b5fb52fcf5c18..0a3989487745f 100644
--- a/x-pack/plugins/drilldowns/public/components/flyout_frame/flyout_frame.test.tsx
+++ b/x-pack/plugins/drilldowns/public/components/flyout_frame/flyout_frame.test.tsx
@@ -6,9 +6,11 @@
 
 import React from 'react';
 import { render } from 'react-dom';
-import { render as renderTestingLibrary, fireEvent } from '@testing-library/react';
+import { render as renderTestingLibrary, fireEvent, cleanup } from '@testing-library/react/pure';
 import { FlyoutFrame } from '.';
 
+afterEach(cleanup);
+
 describe('<FlyoutFrame>', () => {
   test('renders without crashing', () => {
     const div = document.createElement('div');
diff --git a/x-pack/plugins/drilldowns/public/components/flyout_frame/flyout_frame.tsx b/x-pack/plugins/drilldowns/public/components/flyout_frame/flyout_frame.tsx
index 2945cfd739482..b55cbd88d0dc0 100644
--- a/x-pack/plugins/drilldowns/public/components/flyout_frame/flyout_frame.tsx
+++ b/x-pack/plugins/drilldowns/public/components/flyout_frame/flyout_frame.tsx
@@ -13,13 +13,16 @@ import {
   EuiFlexGroup,
   EuiFlexItem,
   EuiButtonEmpty,
+  EuiButtonIcon,
 } from '@elastic/eui';
-import { txtClose } from './i18n';
+import { txtClose, txtBack } from './i18n';
 
 export interface FlyoutFrameProps {
   title?: React.ReactNode;
   footer?: React.ReactNode;
+  banner?: React.ReactNode;
   onClose?: () => void;
+  onBack?: () => void;
 }
 
 /**
@@ -30,11 +33,31 @@ export const FlyoutFrame: React.FC<FlyoutFrameProps> = ({
   footer,
   onClose,
   children,
+  onBack,
+  banner,
 }) => {
-  const headerFragment = title && (
+  const headerFragment = (title || onBack) && (
     <EuiFlyoutHeader hasBorder>
       <EuiTitle size="s">
-        <h1>{title}</h1>
+        <EuiFlexGroup alignItems="center" gutterSize={'s'} responsive={false}>
+          {onBack && (
+            <EuiFlexItem grow={false}>
+              <div style={{ marginLeft: '-8px', marginTop: '-4px' }}>
+                <EuiButtonIcon
+                  color={'subdued'}
+                  onClick={onBack}
+                  iconType="arrowLeft"
+                  aria-label={txtBack}
+                />
+              </div>
+            </EuiFlexItem>
+          )}
+          {title && (
+            <EuiFlexItem grow={true}>
+              <h1>{title}</h1>
+            </EuiFlexItem>
+          )}
+        </EuiFlexGroup>
       </EuiTitle>
     </EuiFlyoutHeader>
   );
@@ -64,7 +87,7 @@ export const FlyoutFrame: React.FC<FlyoutFrameProps> = ({
   return (
     <>
       {headerFragment}
-      <EuiFlyoutBody>{children}</EuiFlyoutBody>
+      <EuiFlyoutBody banner={banner}>{children}</EuiFlyoutBody>
       {footerFragment}
     </>
   );
diff --git a/x-pack/plugins/drilldowns/public/components/flyout_frame/i18n.ts b/x-pack/plugins/drilldowns/public/components/flyout_frame/i18n.ts
index 257d7d36dbee1..23af89ebf9bc7 100644
--- a/x-pack/plugins/drilldowns/public/components/flyout_frame/i18n.ts
+++ b/x-pack/plugins/drilldowns/public/components/flyout_frame/i18n.ts
@@ -6,6 +6,10 @@
 
 import { i18n } from '@kbn/i18n';
 
-export const txtClose = i18n.translate('xpack.drilldowns.components.FlyoutFrame.Close', {
+export const txtClose = i18n.translate('xpack.drilldowns.components.FlyoutFrame.CloseButtonLabel', {
   defaultMessage: 'Close',
 });
+
+export const txtBack = i18n.translate('xpack.drilldowns.components.FlyoutFrame.BackButtonLabel', {
+  defaultMessage: 'Back',
+});
diff --git a/x-pack/plugins/drilldowns/public/components/flyout_list_manage_drilldowns/flyout_list_manage_drilldowns.story.tsx b/x-pack/plugins/drilldowns/public/components/flyout_list_manage_drilldowns/flyout_list_manage_drilldowns.story.tsx
new file mode 100644
index 0000000000000..0529f0451b16a
--- /dev/null
+++ b/x-pack/plugins/drilldowns/public/components/flyout_list_manage_drilldowns/flyout_list_manage_drilldowns.story.tsx
@@ -0,0 +1,22 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import * as React from 'react';
+import { EuiFlyout } from '@elastic/eui';
+import { storiesOf } from '@storybook/react';
+import { FlyoutListManageDrilldowns } from './flyout_list_manage_drilldowns';
+
+storiesOf('components/FlyoutListManageDrilldowns', module).add('default', () => (
+  <EuiFlyout onClose={() => {}}>
+    <FlyoutListManageDrilldowns
+      drilldowns={[
+        { id: '1', actionName: 'Dashboard', drilldownName: 'Drilldown 1' },
+        { id: '2', actionName: 'Dashboard', drilldownName: 'Drilldown 2' },
+        { id: '3', actionName: 'Dashboard', drilldownName: 'Drilldown 3' },
+      ]}
+    />
+  </EuiFlyout>
+));
diff --git a/x-pack/plugins/drilldowns/public/components/flyout_list_manage_drilldowns/flyout_list_manage_drilldowns.tsx b/x-pack/plugins/drilldowns/public/components/flyout_list_manage_drilldowns/flyout_list_manage_drilldowns.tsx
new file mode 100644
index 0000000000000..a44a7ccccb4dc
--- /dev/null
+++ b/x-pack/plugins/drilldowns/public/components/flyout_list_manage_drilldowns/flyout_list_manage_drilldowns.tsx
@@ -0,0 +1,46 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React from 'react';
+import { FlyoutFrame } from '../flyout_frame';
+import { DrilldownListItem, ListManageDrilldowns } from '../list_manage_drilldowns';
+import { txtManageDrilldowns } from './i18n';
+import { DrilldownHelloBar } from '../drilldown_hello_bar';
+
+export interface FlyoutListManageDrilldownsProps {
+  drilldowns: DrilldownListItem[];
+  onClose?: () => void;
+  onCreate?: () => void;
+  onEdit?: (drilldownId: string) => void;
+  onDelete?: (drilldownIds: string[]) => void;
+  showWelcomeMessage?: boolean;
+  onWelcomeHideClick?: () => void;
+}
+
+export function FlyoutListManageDrilldowns({
+  drilldowns,
+  onClose = () => {},
+  onCreate,
+  onDelete,
+  onEdit,
+  showWelcomeMessage = true,
+  onWelcomeHideClick,
+}: FlyoutListManageDrilldownsProps) {
+  return (
+    <FlyoutFrame
+      title={txtManageDrilldowns}
+      onClose={onClose}
+      banner={showWelcomeMessage && <DrilldownHelloBar onHideClick={onWelcomeHideClick} />}
+    >
+      <ListManageDrilldowns
+        drilldowns={drilldowns}
+        onCreate={onCreate}
+        onEdit={onEdit}
+        onDelete={onDelete}
+      />
+    </FlyoutFrame>
+  );
+}
diff --git a/x-pack/plugins/drilldowns/public/components/flyout_list_manage_drilldowns/i18n.ts b/x-pack/plugins/drilldowns/public/components/flyout_list_manage_drilldowns/i18n.ts
new file mode 100644
index 0000000000000..0dd4e37d4dddd
--- /dev/null
+++ b/x-pack/plugins/drilldowns/public/components/flyout_list_manage_drilldowns/i18n.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 { i18n } from '@kbn/i18n';
+
+export const txtManageDrilldowns = i18n.translate(
+  'xpack.drilldowns.components.FlyoutListManageDrilldowns.manageDrilldownsTitle',
+  {
+    defaultMessage: 'Manage Drilldowns',
+  }
+);
diff --git a/x-pack/plugins/drilldowns/public/components/flyout_list_manage_drilldowns/index.ts b/x-pack/plugins/drilldowns/public/components/flyout_list_manage_drilldowns/index.ts
new file mode 100644
index 0000000000000..f8c9d224fb292
--- /dev/null
+++ b/x-pack/plugins/drilldowns/public/components/flyout_list_manage_drilldowns/index.ts
@@ -0,0 +1,7 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+export * from './flyout_list_manage_drilldowns';
diff --git a/x-pack/plugins/drilldowns/public/components/form_create_drilldown/form_create_drilldown.story.tsx b/x-pack/plugins/drilldowns/public/components/form_create_drilldown/form_create_drilldown.story.tsx
deleted file mode 100644
index e7e1d67473e8c..0000000000000
--- a/x-pack/plugins/drilldowns/public/components/form_create_drilldown/form_create_drilldown.story.tsx
+++ /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.
- */
-
-/* eslint-disable no-console */
-
-import * as React from 'react';
-import { EuiFlyout } from '@elastic/eui';
-import { storiesOf } from '@storybook/react';
-import { FormCreateDrilldown } from '.';
-
-const DemoEditName: React.FC = () => {
-  const [name, setName] = React.useState('');
-
-  return <FormCreateDrilldown name={name} onNameChange={setName} />;
-};
-
-storiesOf('components/FormCreateDrilldown', module)
-  .add('default', () => {
-    return <FormCreateDrilldown />;
-  })
-  .add('[name=foobar]', () => {
-    return <FormCreateDrilldown name={'foobar'} />;
-  })
-  .add('can edit name', () => <DemoEditName />)
-  .add('open in flyout', () => {
-    return (
-      <EuiFlyout>
-        <FormCreateDrilldown />
-      </EuiFlyout>
-    );
-  });
diff --git a/x-pack/plugins/drilldowns/public/components/form_create_drilldown/form_create_drilldown.tsx b/x-pack/plugins/drilldowns/public/components/form_create_drilldown/form_create_drilldown.tsx
deleted file mode 100644
index 4422de604092b..0000000000000
--- a/x-pack/plugins/drilldowns/public/components/form_create_drilldown/form_create_drilldown.tsx
+++ /dev/null
@@ -1,52 +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 { EuiForm, EuiFormRow, EuiFieldText } from '@elastic/eui';
-import { DrilldownHelloBar } from '../drilldown_hello_bar';
-import { txtNameOfDrilldown, txtUntitledDrilldown, txtDrilldownAction } from './i18n';
-import { DrilldownPicker } from '../drilldown_picker';
-
-const noop = () => {};
-
-export interface FormCreateDrilldownProps {
-  name?: string;
-  onNameChange?: (name: string) => void;
-}
-
-export const FormCreateDrilldown: React.FC<FormCreateDrilldownProps> = ({
-  name = '',
-  onNameChange = noop,
-}) => {
-  const nameFragment = (
-    <EuiFormRow label={txtNameOfDrilldown}>
-      <EuiFieldText
-        name="drilldown_name"
-        placeholder={txtUntitledDrilldown}
-        value={name}
-        disabled={onNameChange === noop}
-        onChange={event => onNameChange(event.target.value)}
-        data-test-subj="dynamicActionNameInput"
-      />
-    </EuiFormRow>
-  );
-
-  const triggerPicker = <div>Trigger Picker will be here</div>;
-  const actionPicker = (
-    <EuiFormRow label={txtDrilldownAction}>
-      <DrilldownPicker />
-    </EuiFormRow>
-  );
-
-  return (
-    <>
-      <DrilldownHelloBar />
-      <EuiForm>{nameFragment}</EuiForm>
-      {triggerPicker}
-      {actionPicker}
-    </>
-  );
-};
diff --git a/x-pack/plugins/drilldowns/public/components/form_drilldown_wizard/form_drilldown_wizard.story.tsx b/x-pack/plugins/drilldowns/public/components/form_drilldown_wizard/form_drilldown_wizard.story.tsx
new file mode 100644
index 0000000000000..2fc35eb6b5298
--- /dev/null
+++ b/x-pack/plugins/drilldowns/public/components/form_drilldown_wizard/form_drilldown_wizard.story.tsx
@@ -0,0 +1,29 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import * as React from 'react';
+import { storiesOf } from '@storybook/react';
+import { FormDrilldownWizard } from '.';
+
+const DemoEditName: React.FC = () => {
+  const [name, setName] = React.useState('');
+
+  return (
+    <>
+      <FormDrilldownWizard name={name} onNameChange={setName} actionFactoryContext={{}} />{' '}
+      <div>name: {name}</div>
+    </>
+  );
+};
+
+storiesOf('components/FormDrilldownWizard', module)
+  .add('default', () => {
+    return <FormDrilldownWizard actionFactoryContext={{}} />;
+  })
+  .add('[name=foobar]', () => {
+    return <FormDrilldownWizard name={'foobar'} actionFactoryContext={{}} />;
+  })
+  .add('can edit name', () => <DemoEditName />);
diff --git a/x-pack/plugins/drilldowns/public/components/form_create_drilldown/form_create_drilldown.test.tsx b/x-pack/plugins/drilldowns/public/components/form_drilldown_wizard/form_drilldown_wizard.test.tsx
similarity index 70%
rename from x-pack/plugins/drilldowns/public/components/form_create_drilldown/form_create_drilldown.test.tsx
rename to x-pack/plugins/drilldowns/public/components/form_drilldown_wizard/form_drilldown_wizard.test.tsx
index 6691966e47e64..4560773cc8a6d 100644
--- a/x-pack/plugins/drilldowns/public/components/form_create_drilldown/form_create_drilldown.test.tsx
+++ b/x-pack/plugins/drilldowns/public/components/form_drilldown_wizard/form_drilldown_wizard.test.tsx
@@ -6,21 +6,23 @@
 
 import React from 'react';
 import { render } from 'react-dom';
-import { FormCreateDrilldown } from '.';
-import { render as renderTestingLibrary, fireEvent } from '@testing-library/react';
+import { FormDrilldownWizard } from './form_drilldown_wizard';
+import { render as renderTestingLibrary, fireEvent, cleanup } from '@testing-library/react/pure';
 import { txtNameOfDrilldown } from './i18n';
 
-describe('<FormCreateDrilldown>', () => {
+afterEach(cleanup);
+
+describe('<FormDrilldownWizard>', () => {
   test('renders without crashing', () => {
     const div = document.createElement('div');
-    render(<FormCreateDrilldown name={''} onNameChange={() => {}} />, div);
+    render(<FormDrilldownWizard onNameChange={() => {}} actionFactoryContext={{}} />, div);
   });
 
   describe('[name=]', () => {
     test('if name not provided, uses to empty string', () => {
       const div = document.createElement('div');
 
-      render(<FormCreateDrilldown />, div);
+      render(<FormDrilldownWizard actionFactoryContext={{}} />, div);
 
       const input = div.querySelector(
         '[data-test-subj="dynamicActionNameInput"]'
@@ -29,10 +31,10 @@ describe('<FormCreateDrilldown>', () => {
       expect(input?.value).toBe('');
     });
 
-    test('can set name input field value', () => {
+    test('can set initial name input field value', () => {
       const div = document.createElement('div');
 
-      render(<FormCreateDrilldown name={'foo'} />, div);
+      render(<FormDrilldownWizard name={'foo'} actionFactoryContext={{}} />, div);
 
       const input = div.querySelector(
         '[data-test-subj="dynamicActionNameInput"]'
@@ -40,7 +42,7 @@ describe('<FormCreateDrilldown>', () => {
 
       expect(input?.value).toBe('foo');
 
-      render(<FormCreateDrilldown name={'bar'} />, div);
+      render(<FormDrilldownWizard name={'bar'} actionFactoryContext={{}} />, div);
 
       expect(input?.value).toBe('bar');
     });
@@ -48,7 +50,7 @@ describe('<FormCreateDrilldown>', () => {
     test('fires onNameChange callback on name change', () => {
       const onNameChange = jest.fn();
       const utils = renderTestingLibrary(
-        <FormCreateDrilldown name={''} onNameChange={onNameChange} />
+        <FormDrilldownWizard name={''} onNameChange={onNameChange} actionFactoryContext={{}} />
       );
       const input = utils.getByLabelText(txtNameOfDrilldown);
 
diff --git a/x-pack/plugins/drilldowns/public/components/form_drilldown_wizard/form_drilldown_wizard.tsx b/x-pack/plugins/drilldowns/public/components/form_drilldown_wizard/form_drilldown_wizard.tsx
new file mode 100644
index 0000000000000..bdafaaf07873c
--- /dev/null
+++ b/x-pack/plugins/drilldowns/public/components/form_drilldown_wizard/form_drilldown_wizard.tsx
@@ -0,0 +1,79 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React from 'react';
+import { EuiFieldText, EuiForm, EuiFormRow, EuiSpacer } from '@elastic/eui';
+import { txtDrilldownAction, txtNameOfDrilldown, txtUntitledDrilldown } from './i18n';
+import {
+  AdvancedUiActionsActionFactory as ActionFactory,
+  ActionWizard,
+} from '../../../../advanced_ui_actions/public';
+
+const noopFn = () => {};
+
+export interface FormDrilldownWizardProps {
+  name?: string;
+  onNameChange?: (name: string) => void;
+
+  currentActionFactory?: ActionFactory;
+  onActionFactoryChange?: (actionFactory: ActionFactory | null) => void;
+  actionFactoryContext: object;
+
+  actionConfig?: object;
+  onActionConfigChange?: (config: object) => void;
+
+  actionFactories?: ActionFactory[];
+}
+
+export const FormDrilldownWizard: React.FC<FormDrilldownWizardProps> = ({
+  name = '',
+  actionConfig,
+  currentActionFactory,
+  onNameChange = noopFn,
+  onActionConfigChange = noopFn,
+  onActionFactoryChange = noopFn,
+  actionFactories = [],
+  actionFactoryContext,
+}) => {
+  const nameFragment = (
+    <EuiFormRow label={txtNameOfDrilldown}>
+      <EuiFieldText
+        name="drilldown_name"
+        placeholder={txtUntitledDrilldown}
+        value={name}
+        disabled={onNameChange === noopFn}
+        onChange={event => onNameChange(event.target.value)}
+        data-test-subj="dynamicActionNameInput"
+      />
+    </EuiFormRow>
+  );
+
+  const actionWizard = (
+    <EuiFormRow
+      label={actionFactories?.length > 1 ? txtDrilldownAction : undefined}
+      fullWidth={true}
+    >
+      <ActionWizard
+        actionFactories={actionFactories}
+        currentActionFactory={currentActionFactory}
+        config={actionConfig}
+        onActionFactoryChange={actionFactory => onActionFactoryChange(actionFactory)}
+        onConfigChange={config => onActionConfigChange(config)}
+        context={actionFactoryContext}
+      />
+    </EuiFormRow>
+  );
+
+  return (
+    <>
+      <EuiForm>
+        {nameFragment}
+        <EuiSpacer size={'xl'} />
+        {actionWizard}
+      </EuiForm>
+    </>
+  );
+};
diff --git a/x-pack/plugins/drilldowns/public/components/form_create_drilldown/i18n.ts b/x-pack/plugins/drilldowns/public/components/form_drilldown_wizard/i18n.ts
similarity index 89%
rename from x-pack/plugins/drilldowns/public/components/form_create_drilldown/i18n.ts
rename to x-pack/plugins/drilldowns/public/components/form_drilldown_wizard/i18n.ts
index 4c0e287935edd..e9b19ab0afa97 100644
--- a/x-pack/plugins/drilldowns/public/components/form_create_drilldown/i18n.ts
+++ b/x-pack/plugins/drilldowns/public/components/form_drilldown_wizard/i18n.ts
@@ -9,7 +9,7 @@ import { i18n } from '@kbn/i18n';
 export const txtNameOfDrilldown = i18n.translate(
   'xpack.drilldowns.components.FormCreateDrilldown.nameOfDrilldown',
   {
-    defaultMessage: 'Name of drilldown',
+    defaultMessage: 'Name',
   }
 );
 
@@ -23,6 +23,6 @@ export const txtUntitledDrilldown = i18n.translate(
 export const txtDrilldownAction = i18n.translate(
   'xpack.drilldowns.components.FormCreateDrilldown.drilldownAction',
   {
-    defaultMessage: 'Drilldown action',
+    defaultMessage: 'Action',
   }
 );
diff --git a/x-pack/plugins/drilldowns/public/components/form_create_drilldown/index.tsx b/x-pack/plugins/drilldowns/public/components/form_drilldown_wizard/index.tsx
similarity index 85%
rename from x-pack/plugins/drilldowns/public/components/form_create_drilldown/index.tsx
rename to x-pack/plugins/drilldowns/public/components/form_drilldown_wizard/index.tsx
index c2c5a7e435b39..4aea824de00d7 100644
--- a/x-pack/plugins/drilldowns/public/components/form_create_drilldown/index.tsx
+++ b/x-pack/plugins/drilldowns/public/components/form_drilldown_wizard/index.tsx
@@ -4,4 +4,4 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-export * from './form_create_drilldown';
+export * from './form_drilldown_wizard';
diff --git a/x-pack/plugins/drilldowns/public/components/list_manage_drilldowns/i18n.ts b/x-pack/plugins/drilldowns/public/components/list_manage_drilldowns/i18n.ts
new file mode 100644
index 0000000000000..fbc7c9dcfb4a1
--- /dev/null
+++ b/x-pack/plugins/drilldowns/public/components/list_manage_drilldowns/i18n.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 { i18n } from '@kbn/i18n';
+
+export const txtCreateDrilldown = i18n.translate(
+  'xpack.drilldowns.components.ListManageDrilldowns.createDrilldownButtonLabel',
+  {
+    defaultMessage: 'Create new',
+  }
+);
+
+export const txtEditDrilldown = i18n.translate(
+  'xpack.drilldowns.components.ListManageDrilldowns.editDrilldownButtonLabel',
+  {
+    defaultMessage: 'Edit',
+  }
+);
+
+export const txtDeleteDrilldowns = (count: number) =>
+  i18n.translate('xpack.drilldowns.components.ListManageDrilldowns.deleteDrilldownsButtonLabel', {
+    defaultMessage: 'Delete ({count})',
+    values: {
+      count,
+    },
+  });
+
+export const txtSelectDrilldown = i18n.translate(
+  'xpack.drilldowns.components.ListManageDrilldowns.selectThisDrilldownCheckboxLabel',
+  {
+    defaultMessage: 'Select this drilldown',
+  }
+);
diff --git a/x-pack/plugins/drilldowns/public/components/list_manage_drilldowns/index.tsx b/x-pack/plugins/drilldowns/public/components/list_manage_drilldowns/index.tsx
new file mode 100644
index 0000000000000..82b6ce27af6d4
--- /dev/null
+++ b/x-pack/plugins/drilldowns/public/components/list_manage_drilldowns/index.tsx
@@ -0,0 +1,7 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+export * from './list_manage_drilldowns';
diff --git a/x-pack/plugins/drilldowns/public/components/list_manage_drilldowns/list_manage_drilldowns.story.tsx b/x-pack/plugins/drilldowns/public/components/list_manage_drilldowns/list_manage_drilldowns.story.tsx
new file mode 100644
index 0000000000000..eafe50bab2016
--- /dev/null
+++ b/x-pack/plugins/drilldowns/public/components/list_manage_drilldowns/list_manage_drilldowns.story.tsx
@@ -0,0 +1,19 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import * as React from 'react';
+import { storiesOf } from '@storybook/react';
+import { ListManageDrilldowns } from './list_manage_drilldowns';
+
+storiesOf('components/ListManageDrilldowns', module).add('default', () => (
+  <ListManageDrilldowns
+    drilldowns={[
+      { id: '1', actionName: 'Dashboard', drilldownName: 'Drilldown 1', icon: 'dashboardApp' },
+      { id: '2', actionName: 'Dashboard', drilldownName: 'Drilldown 2', icon: 'dashboardApp' },
+      { id: '3', actionName: 'Dashboard', drilldownName: 'Drilldown 3' },
+    ]}
+  />
+));
diff --git a/x-pack/plugins/drilldowns/public/components/list_manage_drilldowns/list_manage_drilldowns.test.tsx b/x-pack/plugins/drilldowns/public/components/list_manage_drilldowns/list_manage_drilldowns.test.tsx
new file mode 100644
index 0000000000000..4a4d67b08b1d3
--- /dev/null
+++ b/x-pack/plugins/drilldowns/public/components/list_manage_drilldowns/list_manage_drilldowns.test.tsx
@@ -0,0 +1,70 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React from 'react';
+import { cleanup, fireEvent, render } from '@testing-library/react/pure';
+import '@testing-library/jest-dom/extend-expect'; // TODO: this should be global
+import {
+  DrilldownListItem,
+  ListManageDrilldowns,
+  TEST_SUBJ_DRILLDOWN_ITEM,
+} from './list_manage_drilldowns';
+
+// TODO: for some reason global cleanup from RTL doesn't work
+// afterEach is not available for it globally during setup
+afterEach(cleanup);
+
+const drilldowns: DrilldownListItem[] = [
+  { id: '1', actionName: 'Dashboard', drilldownName: 'Drilldown 1' },
+  { id: '2', actionName: 'Dashboard', drilldownName: 'Drilldown 2' },
+  { id: '3', actionName: 'Dashboard', drilldownName: 'Drilldown 3' },
+];
+
+test('Render list of drilldowns', () => {
+  const screen = render(<ListManageDrilldowns drilldowns={drilldowns} />);
+  expect(screen.getAllByTestId(TEST_SUBJ_DRILLDOWN_ITEM)).toHaveLength(drilldowns.length);
+});
+
+test('Emit onEdit() when clicking on edit drilldown', () => {
+  const fn = jest.fn();
+  const screen = render(<ListManageDrilldowns drilldowns={drilldowns} onEdit={fn} />);
+
+  const editButtons = screen.getAllByText('Edit');
+  expect(editButtons).toHaveLength(drilldowns.length);
+  fireEvent.click(editButtons[1]);
+  expect(fn).toBeCalledWith(drilldowns[1].id);
+});
+
+test('Emit onCreate() when clicking on create drilldown', () => {
+  const fn = jest.fn();
+  const screen = render(<ListManageDrilldowns drilldowns={drilldowns} onCreate={fn} />);
+  fireEvent.click(screen.getByText('Create new'));
+  expect(fn).toBeCalled();
+});
+
+test('Delete button is not visible when non is selected', () => {
+  const fn = jest.fn();
+  const screen = render(<ListManageDrilldowns drilldowns={drilldowns} onCreate={fn} />);
+  expect(screen.queryByText(/Delete/i)).not.toBeInTheDocument();
+  expect(screen.queryByText(/Create/i)).toBeInTheDocument();
+});
+
+test('Can delete drilldowns', () => {
+  const fn = jest.fn();
+  const screen = render(<ListManageDrilldowns drilldowns={drilldowns} onDelete={fn} />);
+
+  const checkboxes = screen.getAllByLabelText(/Select this drilldown/i);
+  expect(checkboxes).toHaveLength(3);
+
+  fireEvent.click(checkboxes[1]);
+  fireEvent.click(checkboxes[2]);
+
+  expect(screen.queryByText(/Create/i)).not.toBeInTheDocument();
+
+  fireEvent.click(screen.getByText(/Delete \(2\)/i));
+
+  expect(fn).toBeCalledWith([drilldowns[1].id, drilldowns[2].id]);
+});
diff --git a/x-pack/plugins/drilldowns/public/components/list_manage_drilldowns/list_manage_drilldowns.tsx b/x-pack/plugins/drilldowns/public/components/list_manage_drilldowns/list_manage_drilldowns.tsx
new file mode 100644
index 0000000000000..5a15781a1faf2
--- /dev/null
+++ b/x-pack/plugins/drilldowns/public/components/list_manage_drilldowns/list_manage_drilldowns.tsx
@@ -0,0 +1,116 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import {
+  EuiBasicTable,
+  EuiBasicTableColumn,
+  EuiButton,
+  EuiButtonEmpty,
+  EuiFlexGroup,
+  EuiFlexItem,
+  EuiIcon,
+  EuiSpacer,
+  EuiTextColor,
+} from '@elastic/eui';
+import React, { useState } from 'react';
+import {
+  txtCreateDrilldown,
+  txtDeleteDrilldowns,
+  txtEditDrilldown,
+  txtSelectDrilldown,
+} from './i18n';
+
+export interface DrilldownListItem {
+  id: string;
+  actionName: string;
+  drilldownName: string;
+  icon?: string;
+}
+
+export interface ListManageDrilldownsProps {
+  drilldowns: DrilldownListItem[];
+
+  onEdit?: (id: string) => void;
+  onCreate?: () => void;
+  onDelete?: (ids: string[]) => void;
+}
+
+const noop = () => {};
+
+export const TEST_SUBJ_DRILLDOWN_ITEM = 'list-manage-drilldowns-item';
+
+export function ListManageDrilldowns({
+  drilldowns,
+  onEdit = noop,
+  onCreate = noop,
+  onDelete = noop,
+}: ListManageDrilldownsProps) {
+  const [selectedDrilldowns, setSelectedDrilldowns] = useState<string[]>([]);
+
+  const columns: Array<EuiBasicTableColumn<DrilldownListItem>> = [
+    {
+      field: 'drilldownName',
+      name: 'Name',
+      truncateText: true,
+      width: '50%',
+    },
+    {
+      name: 'Action',
+      render: (drilldown: DrilldownListItem) => (
+        <EuiFlexGroup responsive={false} alignItems="center" gutterSize={'s'}>
+          {drilldown.icon && (
+            <EuiFlexItem grow={false}>
+              <EuiIcon type={drilldown.icon} />
+            </EuiFlexItem>
+          )}
+          <EuiFlexItem grow={false} className="eui-textTruncate">
+            <EuiTextColor color="subdued">{drilldown.actionName}</EuiTextColor>
+          </EuiFlexItem>
+        </EuiFlexGroup>
+      ),
+    },
+    {
+      align: 'right',
+      render: (drilldown: DrilldownListItem) => (
+        <EuiButtonEmpty size="xs" onClick={() => onEdit(drilldown.id)}>
+          {txtEditDrilldown}
+        </EuiButtonEmpty>
+      ),
+    },
+  ];
+
+  return (
+    <>
+      <EuiBasicTable
+        items={drilldowns}
+        itemId="id"
+        columns={columns}
+        isSelectable={true}
+        responsive={false}
+        selection={{
+          onSelectionChange: selection => {
+            setSelectedDrilldowns(selection.map(drilldown => drilldown.id));
+          },
+          selectableMessage: () => txtSelectDrilldown,
+        }}
+        rowProps={{
+          'data-test-subj': TEST_SUBJ_DRILLDOWN_ITEM,
+        }}
+        hasActions={true}
+      />
+      <EuiSpacer />
+      {selectedDrilldowns.length === 0 ? (
+        <EuiButton fill onClick={() => onCreate()}>
+          {txtCreateDrilldown}
+        </EuiButton>
+      ) : (
+        <EuiButton color="danger" fill onClick={() => onDelete(selectedDrilldowns)}>
+          {txtDeleteDrilldowns(selectedDrilldowns.length)}
+        </EuiButton>
+      )}
+    </>
+  );
+}
diff --git a/x-pack/plugins/drilldowns/public/index.ts b/x-pack/plugins/drilldowns/public/index.ts
index 63e7a12235462..044e29c671de4 100644
--- a/x-pack/plugins/drilldowns/public/index.ts
+++ b/x-pack/plugins/drilldowns/public/index.ts
@@ -7,12 +7,14 @@
 import { DrilldownsPlugin } from './plugin';
 
 export {
-  DrilldownsSetupContract,
-  DrilldownsSetupDependencies,
-  DrilldownsStartContract,
-  DrilldownsStartDependencies,
+  SetupContract as DrilldownsSetup,
+  SetupDependencies as DrilldownsSetupDependencies,
+  StartContract as DrilldownsStart,
+  StartDependencies as DrilldownsStartDependencies,
 } from './plugin';
 
 export function plugin() {
   return new DrilldownsPlugin();
 }
+
+export { DrilldownDefinition } from './types';
diff --git a/x-pack/plugins/drilldowns/public/mocks.ts b/x-pack/plugins/drilldowns/public/mocks.ts
index bfade1674072a..18816243a3572 100644
--- a/x-pack/plugins/drilldowns/public/mocks.ts
+++ b/x-pack/plugins/drilldowns/public/mocks.ts
@@ -4,10 +4,10 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { DrilldownsSetupContract, DrilldownsStartContract } from '.';
+import { DrilldownsSetup, DrilldownsStart } from '.';
 
-export type Setup = jest.Mocked<DrilldownsSetupContract>;
-export type Start = jest.Mocked<DrilldownsStartContract>;
+export type Setup = jest.Mocked<DrilldownsSetup>;
+export type Start = jest.Mocked<DrilldownsStart>;
 
 const createSetupContract = (): Setup => {
   const setupContract: Setup = {
@@ -17,12 +17,14 @@ const createSetupContract = (): Setup => {
 };
 
 const createStartContract = (): Start => {
-  const startContract: Start = {};
+  const startContract: Start = {
+    FlyoutManageDrilldowns: jest.fn(),
+  };
 
   return startContract;
 };
 
-export const bfetchPluginMock = {
+export const drilldownsPluginMock = {
   createSetupContract,
   createStartContract,
 };
diff --git a/x-pack/plugins/drilldowns/public/plugin.ts b/x-pack/plugins/drilldowns/public/plugin.ts
index b89172541b91e..bbc06847d5842 100644
--- a/x-pack/plugins/drilldowns/public/plugin.ts
+++ b/x-pack/plugins/drilldowns/public/plugin.ts
@@ -6,52 +6,46 @@
 
 import { CoreStart, CoreSetup, Plugin } from 'src/core/public';
 import { UiActionsSetup, UiActionsStart } from '../../../../src/plugins/ui_actions/public';
-import { DrilldownService } from './service';
-import {
-  FlyoutCreateDrilldownActionContext,
-  FlyoutEditDrilldownActionContext,
-  OPEN_FLYOUT_ADD_DRILLDOWN,
-  OPEN_FLYOUT_EDIT_DRILLDOWN,
-} from './actions';
-
-export interface DrilldownsSetupDependencies {
+import { AdvancedUiActionsSetup, AdvancedUiActionsStart } from '../../advanced_ui_actions/public';
+import { DrilldownService, DrilldownServiceSetupContract } from './services';
+import { createFlyoutManageDrilldowns } from './components/connected_flyout_manage_drilldowns';
+import { Storage } from '../../../../src/plugins/kibana_utils/public';
+
+export interface SetupDependencies {
   uiActions: UiActionsSetup;
+  advancedUiActions: AdvancedUiActionsSetup;
 }
 
-export interface DrilldownsStartDependencies {
+export interface StartDependencies {
   uiActions: UiActionsStart;
+  advancedUiActions: AdvancedUiActionsStart;
 }
 
-export type DrilldownsSetupContract = Pick<DrilldownService, 'registerDrilldown'>;
+export type SetupContract = DrilldownServiceSetupContract;
 
 // eslint-disable-next-line
-export interface DrilldownsStartContract {}
-
-declare module '../../../../src/plugins/ui_actions/public' {
-  export interface ActionContextMapping {
-    [OPEN_FLYOUT_ADD_DRILLDOWN]: FlyoutCreateDrilldownActionContext;
-    [OPEN_FLYOUT_EDIT_DRILLDOWN]: FlyoutEditDrilldownActionContext;
-  }
+export interface StartContract {
+  FlyoutManageDrilldowns: ReturnType<typeof createFlyoutManageDrilldowns>;
 }
 
 export class DrilldownsPlugin
-  implements
-    Plugin<
-      DrilldownsSetupContract,
-      DrilldownsStartContract,
-      DrilldownsSetupDependencies,
-      DrilldownsStartDependencies
-    > {
+  implements Plugin<SetupContract, StartContract, SetupDependencies, StartDependencies> {
   private readonly service = new DrilldownService();
 
-  public setup(core: CoreSetup, plugins: DrilldownsSetupDependencies): DrilldownsSetupContract {
-    this.service.bootstrap(core, plugins);
+  public setup(core: CoreSetup, plugins: SetupDependencies): SetupContract {
+    const setup = this.service.setup(core, plugins);
 
-    return this.service;
+    return setup;
   }
 
-  public start(core: CoreStart, plugins: DrilldownsStartDependencies): DrilldownsStartContract {
-    return {};
+  public start(core: CoreStart, plugins: StartDependencies): StartContract {
+    return {
+      FlyoutManageDrilldowns: createFlyoutManageDrilldowns({
+        advancedUiActions: plugins.advancedUiActions,
+        storage: new Storage(localStorage),
+        notifications: core.notifications,
+      }),
+    };
   }
 
   public stop() {}
diff --git a/x-pack/plugins/drilldowns/public/service/drilldown_service.ts b/x-pack/plugins/drilldowns/public/service/drilldown_service.ts
deleted file mode 100644
index 7745c30b4e335..0000000000000
--- a/x-pack/plugins/drilldowns/public/service/drilldown_service.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { CoreSetup } from 'src/core/public';
-// import { CONTEXT_MENU_TRIGGER } from '../../../../../src/plugins/embeddable/public';
-import { FlyoutCreateDrilldownAction, FlyoutEditDrilldownAction } from '../actions';
-import { DrilldownsSetupDependencies } from '../plugin';
-
-export class DrilldownService {
-  bootstrap(core: CoreSetup, { uiActions }: DrilldownsSetupDependencies) {
-    const overlays = async () => (await core.getStartServices())[0].overlays;
-
-    const actionFlyoutCreateDrilldown = new FlyoutCreateDrilldownAction({ overlays });
-    uiActions.registerAction(actionFlyoutCreateDrilldown);
-    // uiActions.attachAction(CONTEXT_MENU_TRIGGER, actionFlyoutCreateDrilldown);
-
-    const actionFlyoutEditDrilldown = new FlyoutEditDrilldownAction({ overlays });
-    uiActions.registerAction(actionFlyoutEditDrilldown);
-    // uiActions.attachAction(CONTEXT_MENU_TRIGGER, actionFlyoutEditDrilldown);
-  }
-
-  /**
-   * Convenience method to register a drilldown. (It should set-up all the
-   * necessary triggers and actions.)
-   */
-  registerDrilldown = (): void => {
-    throw new Error('not implemented');
-  };
-}
diff --git a/x-pack/plugins/drilldowns/public/services/drilldown_service.ts b/x-pack/plugins/drilldowns/public/services/drilldown_service.ts
new file mode 100644
index 0000000000000..bfbe514d46095
--- /dev/null
+++ b/x-pack/plugins/drilldowns/public/services/drilldown_service.ts
@@ -0,0 +1,79 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { CoreSetup } from 'src/core/public';
+import { AdvancedUiActionsSetup } from '../../../advanced_ui_actions/public';
+import { DrilldownDefinition, DrilldownFactoryContext } from '../types';
+import { UiActionsActionFactoryDefinition as ActionFactoryDefinition } from '../../../../../src/plugins/ui_actions/public';
+
+export interface DrilldownServiceSetupDeps {
+  advancedUiActions: AdvancedUiActionsSetup;
+}
+
+export interface DrilldownServiceSetupContract {
+  /**
+   * Convenience method to register a drilldown.
+   */
+  registerDrilldown: <
+    Config extends object = object,
+    CreationContext extends object = object,
+    ExecutionContext extends object = object
+  >(
+    drilldown: DrilldownDefinition<Config, CreationContext, ExecutionContext>
+  ) => void;
+}
+
+export class DrilldownService {
+  setup(
+    core: CoreSetup,
+    { advancedUiActions }: DrilldownServiceSetupDeps
+  ): DrilldownServiceSetupContract {
+    const registerDrilldown = <
+      Config extends object = object,
+      CreationContext extends object = object,
+      ExecutionContext extends object = object
+    >({
+      id: factoryId,
+      CollectConfig,
+      createConfig,
+      isConfigValid,
+      getDisplayName,
+      euiIcon,
+      execute,
+    }: DrilldownDefinition<Config, CreationContext, ExecutionContext>) => {
+      const actionFactory: ActionFactoryDefinition<
+        Config,
+        DrilldownFactoryContext<CreationContext>,
+        ExecutionContext
+      > = {
+        id: factoryId,
+        CollectConfig,
+        createConfig,
+        isConfigValid,
+        getDisplayName,
+        getIconType: () => euiIcon,
+        isCompatible: async () => true,
+        create: serializedAction => ({
+          id: '',
+          type: factoryId,
+          getIconType: () => euiIcon,
+          getDisplayName: () => serializedAction.name,
+          execute: async context => await execute(serializedAction.config, context),
+        }),
+      } as ActionFactoryDefinition<
+        Config,
+        DrilldownFactoryContext<CreationContext>,
+        ExecutionContext
+      >;
+
+      advancedUiActions.registerActionFactory(actionFactory);
+    };
+
+    return {
+      registerDrilldown,
+    };
+  }
+}
diff --git a/x-pack/plugins/drilldowns/public/service/index.ts b/x-pack/plugins/drilldowns/public/services/index.ts
similarity index 100%
rename from x-pack/plugins/drilldowns/public/service/index.ts
rename to x-pack/plugins/drilldowns/public/services/index.ts
diff --git a/x-pack/plugins/drilldowns/public/types.ts b/x-pack/plugins/drilldowns/public/types.ts
new file mode 100644
index 0000000000000..a8232887f9ca6
--- /dev/null
+++ b/x-pack/plugins/drilldowns/public/types.ts
@@ -0,0 +1,120 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { AdvancedUiActionsActionFactoryDefinition as ActionFactoryDefinition } from '../../advanced_ui_actions/public';
+
+/**
+ * This is a convenience interface to register a drilldown. Drilldown has
+ * ability to collect configuration from user. Once drilldown is executed it
+ * receives the collected information together with the context of the
+ * user's interaction.
+ *
+ * `Config` is a serializable object containing the configuration that the
+ * drilldown is able to collect using UI.
+ *
+ * `PlaceContext` is an object that the app that opens drilldown management
+ * flyout provides to the React component, specifying the contextual information
+ * about that app. For example, on Dashboard app this context contains
+ * information about the current embeddable and dashboard.
+ *
+ * `ExecutionContext` is an object created in response to user's interaction
+ * and provided to the `execute` function of the drilldown. This object contains
+ * information about the action user performed.
+ */
+export interface DrilldownDefinition<
+  Config extends object = object,
+  PlaceContext extends object = object,
+  ExecutionContext extends object = object
+> {
+  /**
+   * Globally unique identifier for this drilldown.
+   */
+  id: string;
+
+  /**
+   * Function that returns default config for this drilldown.
+   */
+  createConfig: ActionFactoryDefinition<
+    Config,
+    DrilldownFactoryContext<PlaceContext>,
+    ExecutionContext
+  >['createConfig'];
+
+  /**
+   * `UiComponent` that collections config for this drilldown. You can create
+   * a React component and transform it `UiComponent` using `uiToReactComponent`
+   * helper from `kibana_utils` plugin.
+   *
+   * ```tsx
+   * import React from 'react';
+   * import { uiToReactComponent } from 'src/plugins/kibana_utils';
+   * import { UiActionsCollectConfigProps as CollectConfigProps } from 'src/plugins/ui_actions/public';
+   *
+   * type Props = CollectConfigProps<Config>;
+   *
+   * const ReactCollectConfig: React.FC<Props> = () => {
+   *   return <div>Collecting config...'</div>;
+   * };
+   *
+   * export const CollectConfig = uiToReactComponent(ReactCollectConfig);
+   * ```
+   */
+  CollectConfig: ActionFactoryDefinition<
+    Config,
+    DrilldownFactoryContext<PlaceContext>,
+    ExecutionContext
+  >['CollectConfig'];
+
+  /**
+   * A validator function for the config object. Should always return a boolean
+   * given any input.
+   */
+  isConfigValid: ActionFactoryDefinition<
+    Config,
+    DrilldownFactoryContext<PlaceContext>,
+    ExecutionContext
+  >['isConfigValid'];
+
+  /**
+   * Name of EUI icon to display when showing this drilldown to user.
+   */
+  euiIcon?: string;
+
+  /**
+   * Should return an internationalized name of the drilldown, which will be
+   * displayed to the user.
+   */
+  getDisplayName: () => string;
+
+  /**
+   * Implements the "navigation" action of the drilldown. This happens when
+   * user clicks something in the UI that executes a trigger to which this
+   * drilldown was attached.
+   *
+   * @param config Config object that user configured this drilldown with.
+   * @param context Object that represents context in which the underlying
+   *  `UIAction` of this drilldown is being executed in.
+   */
+  execute(config: Config, context: ExecutionContext): void;
+}
+
+/**
+ * Context object used when creating a drilldown.
+ */
+export interface DrilldownFactoryContext<T> {
+  /**
+   * Context provided to the drilldown factory by the place where the UI is
+   * rendered. For example, for the "dashboard" place, this context contains
+   * the ID of the current dashboard, which could be used for filtering it out
+   * of the list.
+   */
+  placeContext: T;
+
+  /**
+   * List of triggers that user selected in the UI.
+   */
+  triggers: string[];
+}
diff --git a/x-pack/plugins/reporting/public/plugin.tsx b/x-pack/plugins/reporting/public/plugin.tsx
index 08ba10ff69207..ac46d84469513 100644
--- a/x-pack/plugins/reporting/public/plugin.tsx
+++ b/x-pack/plugins/reporting/public/plugin.tsx
@@ -143,8 +143,7 @@ export class ReportingPublicPlugin implements Plugin<any, any> {
       },
     });
 
-    uiActions.registerAction(action);
-    uiActions.attachAction(CONTEXT_MENU_TRIGGER, action);
+    uiActions.addTriggerAction(CONTEXT_MENU_TRIGGER, action);
 
     share.register(csvReportingProvider({ apiClient, toasts, license$ }));
     share.register(
diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json
index fe7ad863945c5..6290366e4b93f 100644
--- a/x-pack/plugins/translations/translations/ja-JP.json
+++ b/x-pack/plugins/translations/translations/ja-JP.json
@@ -636,7 +636,6 @@
     "embeddableApi.addPanel.noMatchingObjectsMessage": "一致するオブジェクトが見つかりませんでした。",
     "embeddableApi.addPanel.savedObjectAddedToContainerSuccessMessageTitle": "{savedObjectName} が追加されました",
     "embeddableApi.addPanel.Title": "パネルの追加",
-    "embeddableApi.customizePanel.action.displayName": "パネルをカスタマイズ",
     "embeddableApi.customizePanel.modal.cancel": "キャンセル",
     "embeddableApi.customizePanel.modal.optionsMenuForm.panelTitleFormRowLabel": "パネルタイトル",
     "embeddableApi.customizePanel.modal.optionsMenuForm.panelTitleInputAriaLabel": "パネルのカスタムタイトルを入力してください",
diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json
index e1cfa5e4ef358..37527023d7208 100644
--- a/x-pack/plugins/translations/translations/zh-CN.json
+++ b/x-pack/plugins/translations/translations/zh-CN.json
@@ -636,7 +636,6 @@
     "embeddableApi.addPanel.noMatchingObjectsMessage": "未找到任何匹配对象。",
     "embeddableApi.addPanel.savedObjectAddedToContainerSuccessMessageTitle": "{savedObjectName} 已添加",
     "embeddableApi.addPanel.Title": "添加面板",
-    "embeddableApi.customizePanel.action.displayName": "定制面板",
     "embeddableApi.customizePanel.modal.cancel": "取消",
     "embeddableApi.customizePanel.modal.optionsMenuForm.panelTitleFormRowLabel": "面板标题",
     "embeddableApi.customizePanel.modal.optionsMenuForm.panelTitleInputAriaLabel": "为面板输入定制标题",

From 66b5efd0841a3881ae73ca04882a6c17e43ad830 Mon Sep 17 00:00:00 2001
From: Dima Arnautov <dmitrii.arnautov@elastic.co>
Date: Tue, 24 Mar 2020 08:46:11 +0100
Subject: [PATCH 061/179] [ML] Module setup with dynamic model memory
 estimation (#60656)

* [ML] add estimateModelMemory to the setup endpoint

* [ML] wip caching cardinality checks

* [ML] refactor

* [ML] fix a fallback time range

* [ML] fix typing issue

* [ML] fields_aggs_cache.ts as part of fields_service

* [ML] fix types, add comments

* [ML] check for MML overrides

* [ML] disable estimateModelMemory

* [ML] fix typing

* [ML] check for empty max mml

* [ML] refactor, update types, fix jobsForModelMemoryEstimation

* [ML] fix override lookup

* [ML] resolve nit comments

* [ML] init jobsForModelMemoryEstimation
---
 x-pack/plugins/ml/common/types/modules.ts     |  10 +-
 .../jobs/new_job/recognize/page.tsx           |   1 +
 .../services/ml_api_service/index.ts          |   3 +
 .../calculate_model_memory_limit.ts           | 160 ++++++-------
 .../models/data_recognizer/data_recognizer.ts | 215 +++++++++++++-----
 .../fields_service/fields_aggs_cache.ts       |  66 ++++++
 .../models/fields_service/fields_service.ts   | 128 +++++++----
 x-pack/plugins/ml/server/routes/modules.ts    |  40 ++--
 .../ml/server/routes/schemas/modules.ts       |   5 +
 .../shared_services/providers/modules.ts      |   9 +-
 10 files changed, 443 insertions(+), 194 deletions(-)
 create mode 100644 x-pack/plugins/ml/server/models/fields_service/fields_aggs_cache.ts

diff --git a/x-pack/plugins/ml/common/types/modules.ts b/x-pack/plugins/ml/common/types/modules.ts
index e61ff9972d601..b476762f6efca 100644
--- a/x-pack/plugins/ml/common/types/modules.ts
+++ b/x-pack/plugins/ml/common/types/modules.ts
@@ -90,8 +90,14 @@ export interface DataRecognizerConfigResponse {
   };
 }
 
-export type GeneralOverride = any;
-
 export type JobOverride = Partial<Job>;
+export type GeneralJobsOverride = Omit<JobOverride, 'job_id'>;
+export type JobSpecificOverride = JobOverride & { job_id: Job['job_id'] };
+
+export function isGeneralJobOverride(override: JobOverride): override is GeneralJobsOverride {
+  return override.job_id === undefined;
+}
+
+export type GeneralDatafeedsOverride = Partial<Omit<Datafeed, 'job_id' | 'datafeed_id'>>;
 
 export type DatafeedOverride = Partial<Datafeed>;
diff --git a/x-pack/plugins/ml/public/application/jobs/new_job/recognize/page.tsx b/x-pack/plugins/ml/public/application/jobs/new_job/recognize/page.tsx
index 50c35ec426acb..9b76b9be9bf45 100644
--- a/x-pack/plugins/ml/public/application/jobs/new_job/recognize/page.tsx
+++ b/x-pack/plugins/ml/public/application/jobs/new_job/recognize/page.tsx
@@ -172,6 +172,7 @@ export const Page: FC<PageProps> = ({ moduleId, existingGroupIds }) => {
         startDatafeed: startDatafeedAfterSave,
         ...(jobOverridesPayload !== null ? { jobOverrides: jobOverridesPayload } : {}),
         ...resultTimeRange,
+        estimateModelMemory: false,
       });
       const { datafeeds: datafeedsResponse, jobs: jobsResponse, kibana: kibanaResponse } = response;
 
diff --git a/x-pack/plugins/ml/public/application/services/ml_api_service/index.ts b/x-pack/plugins/ml/public/application/services/ml_api_service/index.ts
index cd4a97bd10ed4..df59678452e2f 100644
--- a/x-pack/plugins/ml/public/application/services/ml_api_service/index.ts
+++ b/x-pack/plugins/ml/public/application/services/ml_api_service/index.ts
@@ -367,6 +367,7 @@ export const ml = {
     start,
     end,
     jobOverrides,
+    estimateModelMemory,
   }: {
     moduleId: string;
     prefix?: string;
@@ -378,6 +379,7 @@ export const ml = {
     start?: number;
     end?: number;
     jobOverrides?: Array<Partial<Job>>;
+    estimateModelMemory?: boolean;
   }) {
     const body = JSON.stringify({
       prefix,
@@ -389,6 +391,7 @@ export const ml = {
       start,
       end,
       jobOverrides,
+      estimateModelMemory,
     });
 
     return http<DataRecognizerConfigResponse>({
diff --git a/x-pack/plugins/ml/server/models/calculate_model_memory_limit/calculate_model_memory_limit.ts b/x-pack/plugins/ml/server/models/calculate_model_memory_limit/calculate_model_memory_limit.ts
index c97bbe07fffda..cd61dd9eddcdd 100644
--- a/x-pack/plugins/ml/server/models/calculate_model_memory_limit/calculate_model_memory_limit.ts
+++ b/x-pack/plugins/ml/server/models/calculate_model_memory_limit/calculate_model_memory_limit.ts
@@ -6,6 +6,7 @@
 
 import numeral from '@elastic/numeral';
 import { APICaller } from 'kibana/server';
+import { MLCATEGORY } from '../../../common/constants/field_types';
 import { AnalysisConfig } from '../../../common/types/anomaly_detection_jobs';
 import { fieldsServiceProvider } from '../fields_service';
 
@@ -34,92 +35,96 @@ export interface ModelMemoryEstimate {
 /**
  * Retrieves overall and max bucket cardinalities.
  */
-async function getCardinalities(
-  callAsCurrentUser: APICaller,
-  analysisConfig: AnalysisConfig,
-  indexPattern: string,
-  query: any,
-  timeFieldName: string,
-  earliestMs: number,
-  latestMs: number
-): Promise<{
-  overallCardinality: { [key: string]: number };
-  maxBucketCardinality: { [key: string]: number };
-}> {
-  /**
-   * Fields not involved in cardinality check
-   */
-  const excludedKeywords = new Set<string>(
-    /**
-     * The keyword which is used to mean the output of categorization,
-     * so it will have cardinality zero in the actual input data.
-     */
-    'mlcategory'
-  );
-
+const cardinalityCheckProvider = (callAsCurrentUser: APICaller) => {
   const fieldsService = fieldsServiceProvider(callAsCurrentUser);
 
-  const { detectors, influencers, bucket_span: bucketSpan } = analysisConfig;
-
-  let overallCardinality = {};
-  let maxBucketCardinality = {};
-  const overallCardinalityFields: Set<string> = detectors.reduce(
-    (
-      acc,
-      {
-        by_field_name: byFieldName,
-        partition_field_name: partitionFieldName,
-        over_field_name: overFieldName,
-      }
-    ) => {
-      [byFieldName, partitionFieldName, overFieldName]
-        .filter(field => field !== undefined && field !== '' && !excludedKeywords.has(field))
-        .forEach(key => {
-          acc.add(key as string);
-        });
-      return acc;
-    },
-    new Set<string>()
-  );
-
-  const maxBucketFieldCardinalities: string[] = influencers.filter(
-    influencerField =>
-      typeof influencerField === 'string' &&
-      !excludedKeywords.has(influencerField) &&
-      !!influencerField &&
-      !overallCardinalityFields.has(influencerField)
-  ) as string[];
-
-  if (overallCardinalityFields.size > 0) {
-    overallCardinality = await fieldsService.getCardinalityOfFields(
-      indexPattern,
-      [...overallCardinalityFields],
-      query,
-      timeFieldName,
-      earliestMs,
-      latestMs
+  return async (
+    analysisConfig: AnalysisConfig,
+    indexPattern: string,
+    query: any,
+    timeFieldName: string,
+    earliestMs: number,
+    latestMs: number
+  ): Promise<{
+    overallCardinality: { [key: string]: number };
+    maxBucketCardinality: { [key: string]: number };
+  }> => {
+    /**
+     * Fields not involved in cardinality check
+     */
+    const excludedKeywords = new Set<string>(
+      /**
+       * The keyword which is used to mean the output of categorization,
+       * so it will have cardinality zero in the actual input data.
+       */
+      MLCATEGORY
     );
-  }
 
-  if (maxBucketFieldCardinalities.length > 0) {
-    maxBucketCardinality = await fieldsService.getMaxBucketCardinalities(
-      indexPattern,
-      maxBucketFieldCardinalities,
-      query,
-      timeFieldName,
-      earliestMs,
-      latestMs,
-      bucketSpan
+    const { detectors, influencers, bucket_span: bucketSpan } = analysisConfig;
+
+    let overallCardinality = {};
+    let maxBucketCardinality = {};
+
+    // Get fields required for the model memory estimation
+    const overallCardinalityFields: Set<string> = detectors.reduce(
+      (
+        acc,
+        {
+          by_field_name: byFieldName,
+          partition_field_name: partitionFieldName,
+          over_field_name: overFieldName,
+        }
+      ) => {
+        [byFieldName, partitionFieldName, overFieldName]
+          .filter(field => field !== undefined && field !== '' && !excludedKeywords.has(field))
+          .forEach(key => {
+            acc.add(key as string);
+          });
+        return acc;
+      },
+      new Set<string>()
     );
-  }
 
-  return {
-    overallCardinality,
-    maxBucketCardinality,
+    const maxBucketFieldCardinalities: string[] = influencers.filter(
+      influencerField =>
+        !!influencerField &&
+        !excludedKeywords.has(influencerField) &&
+        !overallCardinalityFields.has(influencerField)
+    ) as string[];
+
+    if (overallCardinalityFields.size > 0) {
+      overallCardinality = await fieldsService.getCardinalityOfFields(
+        indexPattern,
+        [...overallCardinalityFields],
+        query,
+        timeFieldName,
+        earliestMs,
+        latestMs
+      );
+    }
+
+    if (maxBucketFieldCardinalities.length > 0) {
+      maxBucketCardinality = await fieldsService.getMaxBucketCardinalities(
+        indexPattern,
+        maxBucketFieldCardinalities,
+        query,
+        timeFieldName,
+        earliestMs,
+        latestMs,
+        bucketSpan
+      );
+    }
+
+    return {
+      overallCardinality,
+      maxBucketCardinality,
+    };
   };
-}
+};
 
 export function calculateModelMemoryLimitProvider(callAsCurrentUser: APICaller) {
+  const getCardinalities = cardinalityCheckProvider(callAsCurrentUser);
+
   /**
    * Retrieves an estimated size of the model memory limit used in the job config
    * based on the cardinality of the fields being used to split the data
@@ -145,7 +150,6 @@ export function calculateModelMemoryLimitProvider(callAsCurrentUser: APICaller)
     }
 
     const { overallCardinality, maxBucketCardinality } = await getCardinalities(
-      callAsCurrentUser,
       analysisConfig,
       indexPattern,
       query,
diff --git a/x-pack/plugins/ml/server/models/data_recognizer/data_recognizer.ts b/x-pack/plugins/ml/server/models/data_recognizer/data_recognizer.ts
index a54c2f22a7951..824f9cc57982c 100644
--- a/x-pack/plugins/ml/server/models/data_recognizer/data_recognizer.ts
+++ b/x-pack/plugins/ml/server/models/data_recognizer/data_recognizer.ts
@@ -7,10 +7,12 @@
 import fs from 'fs';
 import Boom from 'boom';
 import numeral from '@elastic/numeral';
-import { CallAPIOptions, APICaller, SavedObjectsClientContract } from 'kibana/server';
+import { APICaller, SavedObjectsClientContract } from 'kibana/server';
+import moment from 'moment';
 import { IndexPatternAttributes } from 'src/plugins/data/server';
 import { merge } from 'lodash';
-import { CombinedJobWithStats } from '../../../common/types/anomaly_detection_jobs';
+import { AnalysisLimits, CombinedJobWithStats } from '../../../common/types/anomaly_detection_jobs';
+import { MlInfoResponse } from '../../../common/types/ml_server_info';
 import {
   KibanaObjects,
   ModuleDataFeed,
@@ -18,14 +20,19 @@ import {
   Module,
   JobOverride,
   DatafeedOverride,
-  GeneralOverride,
+  GeneralJobsOverride,
   DatafeedResponse,
   JobResponse,
   KibanaObjectResponse,
   DataRecognizerConfigResponse,
+  GeneralDatafeedsOverride,
+  JobSpecificOverride,
+  isGeneralJobOverride,
 } from '../../../common/types/modules';
 import { getLatestDataOrBucketTimestamp, prefixDatafeedId } from '../../../common/util/job_utils';
 import { mlLog } from '../../client/log';
+import { calculateModelMemoryLimitProvider } from '../calculate_model_memory_limit';
+import { fieldsServiceProvider } from '../fields_service';
 import { jobServiceProvider } from '../job_service';
 import { resultsServiceProvider } from '../results_service';
 
@@ -107,18 +114,15 @@ export class DataRecognizer {
   modulesDir = `${__dirname}/modules`;
   indexPatternName: string = '';
   indexPatternId: string | undefined = undefined;
-  savedObjectsClient: SavedObjectsClientContract;
+  /**
+   * List of the module jobs that require model memory estimation
+   */
+  jobsForModelMemoryEstimation: ModuleJob[] = [];
 
-  callAsCurrentUser: (
-    endpoint: string,
-    clientParams?: Record<string, any>,
-    options?: CallAPIOptions
-  ) => Promise<any>;
-
-  constructor(callAsCurrentUser: APICaller, savedObjectsClient: SavedObjectsClientContract) {
-    this.callAsCurrentUser = callAsCurrentUser;
-    this.savedObjectsClient = savedObjectsClient;
-  }
+  constructor(
+    private callAsCurrentUser: APICaller,
+    private savedObjectsClient: SavedObjectsClientContract
+  ) {}
 
   // list all directories under the given directory
   async listDirs(dirName: string): Promise<string[]> {
@@ -367,16 +371,17 @@ export class DataRecognizer {
   // if any of the savedObjects already exist, they will not be overwritten.
   async setupModuleItems(
     moduleId: string,
-    jobPrefix: string,
-    groups: string[],
-    indexPatternName: string,
-    query: any,
-    useDedicatedIndex: boolean,
-    startDatafeed: boolean,
-    start: number,
-    end: number,
-    jobOverrides: JobOverride[],
-    datafeedOverrides: DatafeedOverride[]
+    jobPrefix?: string,
+    groups?: string[],
+    indexPatternName?: string,
+    query?: any,
+    useDedicatedIndex?: boolean,
+    startDatafeed?: boolean,
+    start?: number,
+    end?: number,
+    jobOverrides?: JobOverride | JobOverride[],
+    datafeedOverrides?: DatafeedOverride | DatafeedOverride[],
+    estimateModelMemory?: boolean
   ) {
     // load the config from disk
     const moduleConfig = await this.getModule(moduleId, jobPrefix);
@@ -418,11 +423,13 @@ export class DataRecognizer {
       savedObjects: [] as KibanaObjectResponse[],
     };
 
+    this.jobsForModelMemoryEstimation = moduleConfig.jobs;
+
     this.applyJobConfigOverrides(moduleConfig, jobOverrides, jobPrefix);
     this.applyDatafeedConfigOverrides(moduleConfig, datafeedOverrides, jobPrefix);
     this.updateDatafeedIndices(moduleConfig);
     this.updateJobUrlIndexPatterns(moduleConfig);
-    await this.updateModelMemoryLimits(moduleConfig);
+    await this.updateModelMemoryLimits(moduleConfig, estimateModelMemory, start, end);
 
     // create the jobs
     if (moduleConfig.jobs && moduleConfig.jobs.length) {
@@ -689,8 +696,8 @@ export class DataRecognizer {
 
   async startDatafeeds(
     datafeeds: ModuleDataFeed[],
-    start: number,
-    end: number
+    start?: number,
+    end?: number
   ): Promise<{ [key: string]: DatafeedResponse }> {
     const results = {} as { [key: string]: DatafeedResponse };
     for (const datafeed of datafeeds) {
@@ -933,28 +940,117 @@ export class DataRecognizer {
     }
   }
 
-  // ensure the model memory limit for each job is not greater than
-  // the max model memory setting for the cluster
-  async updateModelMemoryLimits(moduleConfig: Module) {
-    const { limits } = await this.callAsCurrentUser('ml.info');
+  /**
+   * Provides a time range of the last 3 months of data
+   */
+  async getFallbackTimeRange(
+    timeField: string,
+    query?: any
+  ): Promise<{ start: number; end: number }> {
+    const fieldsService = fieldsServiceProvider(this.callAsCurrentUser);
+
+    const timeFieldRange = await fieldsService.getTimeFieldRange(
+      this.indexPatternName,
+      timeField,
+      query
+    );
+
+    return {
+      start: timeFieldRange.end.epoch - moment.duration(3, 'months').asMilliseconds(),
+      end: timeFieldRange.end.epoch,
+    };
+  }
+
+  /**
+   * Ensure the model memory limit for each job is not greater than
+   * the max model memory setting for the cluster
+   */
+  async updateModelMemoryLimits(
+    moduleConfig: Module,
+    estimateMML: boolean = false,
+    start?: number,
+    end?: number
+  ) {
+    if (!Array.isArray(moduleConfig.jobs)) {
+      return;
+    }
+
+    if (estimateMML && this.jobsForModelMemoryEstimation.length > 0) {
+      const calculateModelMemoryLimit = calculateModelMemoryLimitProvider(this.callAsCurrentUser);
+      const query = moduleConfig.query ?? null;
+
+      // Checks if all jobs in the module have the same time field configured
+      const isSameTimeFields = this.jobsForModelMemoryEstimation.every(
+        job =>
+          job.config.data_description.time_field ===
+          this.jobsForModelMemoryEstimation[0].config.data_description.time_field
+      );
+
+      if (isSameTimeFields && (start === undefined || end === undefined)) {
+        // In case of time range is not provided and the time field is the same
+        // set the fallback range for all jobs
+        const { start: fallbackStart, end: fallbackEnd } = await this.getFallbackTimeRange(
+          this.jobsForModelMemoryEstimation[0].config.data_description.time_field,
+          query
+        );
+        start = fallbackStart;
+        end = fallbackEnd;
+      }
+
+      for (const job of this.jobsForModelMemoryEstimation) {
+        let earliestMs = start;
+        let latestMs = end;
+        if (earliestMs === undefined || latestMs === undefined) {
+          const timeFieldRange = await this.getFallbackTimeRange(
+            job.config.data_description.time_field,
+            query
+          );
+          earliestMs = timeFieldRange.start;
+          latestMs = timeFieldRange.end;
+        }
+
+        const { modelMemoryLimit } = await calculateModelMemoryLimit(
+          job.config.analysis_config,
+          this.indexPatternName,
+          query,
+          job.config.data_description.time_field,
+          earliestMs,
+          latestMs
+        );
+
+        if (!job.config.analysis_limits) {
+          job.config.analysis_limits = {} as AnalysisLimits;
+        }
+
+        job.config.analysis_limits.model_memory_limit = modelMemoryLimit;
+      }
+    }
+
+    const { limits } = await this.callAsCurrentUser<MlInfoResponse>('ml.info');
     const maxMml = limits.max_model_memory_limit;
-    if (maxMml !== undefined) {
-      // @ts-ignore
-      const maxBytes: number = numeral(maxMml.toUpperCase()).value();
-
-      if (Array.isArray(moduleConfig.jobs)) {
-        moduleConfig.jobs.forEach(job => {
-          const mml = job.config?.analysis_limits?.model_memory_limit;
-          if (mml !== undefined) {
-            // @ts-ignore
-            const mmlBytes: number = numeral(mml.toUpperCase()).value();
-            if (mmlBytes > maxBytes) {
-              // if the job's mml is over the max,
-              // so set the jobs mml to be the max
-              job.config.analysis_limits!.model_memory_limit = maxMml;
-            }
+
+    if (!maxMml) {
+      return;
+    }
+
+    // @ts-ignore
+    const maxBytes: number = numeral(maxMml.toUpperCase()).value();
+
+    for (const job of moduleConfig.jobs) {
+      const mml = job.config?.analysis_limits?.model_memory_limit;
+      if (mml !== undefined) {
+        // @ts-ignore
+        const mmlBytes: number = numeral(mml.toUpperCase()).value();
+        if (mmlBytes > maxBytes) {
+          // if the job's mml is over the max,
+          // so set the jobs mml to be the max
+
+          if (!job.config.analysis_limits) {
+            job.config.analysis_limits = {} as AnalysisLimits;
           }
-        });
+
+          job.config.analysis_limits.model_memory_limit = maxMml;
+        }
       }
     }
   }
@@ -975,7 +1071,11 @@ export class DataRecognizer {
     return false;
   }
 
-  applyJobConfigOverrides(moduleConfig: Module, jobOverrides: JobOverride[], jobPrefix = '') {
+  applyJobConfigOverrides(
+    moduleConfig: Module,
+    jobOverrides?: JobOverride | JobOverride[],
+    jobPrefix = ''
+  ) {
     if (jobOverrides === undefined || jobOverrides === null) {
       return;
     }
@@ -993,17 +1093,26 @@ export class DataRecognizer {
 
     // separate all the overrides.
     // the overrides which don't contain a job id will be applied to all jobs in the module
-    const generalOverrides: GeneralOverride[] = [];
-    const jobSpecificOverrides: JobOverride[] = [];
+    const generalOverrides: GeneralJobsOverride[] = [];
+    const jobSpecificOverrides: JobSpecificOverride[] = [];
 
     overrides.forEach(override => {
-      if (override.job_id === undefined) {
+      if (isGeneralJobOverride(override)) {
         generalOverrides.push(override);
       } else {
         jobSpecificOverrides.push(override);
       }
     });
 
+    if (generalOverrides.some(override => !!override.analysis_limits?.model_memory_limit)) {
+      this.jobsForModelMemoryEstimation = [];
+    } else {
+      this.jobsForModelMemoryEstimation = moduleConfig.jobs.filter(job => {
+        const override = jobSpecificOverrides.find(o => `${jobPrefix}${o.job_id}` === job.id);
+        return override?.analysis_limits?.model_memory_limit === undefined;
+      });
+    }
+
     function processArrayValues(source: any, update: any) {
       if (typeof source !== 'object' || typeof update !== 'object') {
         return;
@@ -1052,7 +1161,7 @@ export class DataRecognizer {
 
   applyDatafeedConfigOverrides(
     moduleConfig: Module,
-    datafeedOverrides: DatafeedOverride | DatafeedOverride[],
+    datafeedOverrides?: DatafeedOverride | DatafeedOverride[],
     jobPrefix = ''
   ) {
     if (datafeedOverrides !== undefined && datafeedOverrides !== null) {
@@ -1069,7 +1178,7 @@ export class DataRecognizer {
 
       // separate all the overrides.
       // the overrides which don't contain a datafeed id or a job id will be applied to all jobs in the module
-      const generalOverrides: GeneralOverride[] = [];
+      const generalOverrides: GeneralDatafeedsOverride[] = [];
       const datafeedSpecificOverrides: DatafeedOverride[] = [];
       overrides.forEach(o => {
         if (o.datafeed_id === undefined && o.job_id === undefined) {
diff --git a/x-pack/plugins/ml/server/models/fields_service/fields_aggs_cache.ts b/x-pack/plugins/ml/server/models/fields_service/fields_aggs_cache.ts
new file mode 100644
index 0000000000000..cdaefe6fdeed7
--- /dev/null
+++ b/x-pack/plugins/ml/server/models/fields_service/fields_aggs_cache.ts
@@ -0,0 +1,66 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { pick } from 'lodash';
+
+/**
+ * Cached aggregation types
+ */
+type AggType = 'overallCardinality' | 'maxBucketCardinality';
+
+type CacheStorage = { [key in AggType]: { [field: string]: number } };
+
+/**
+ * Caches cardinality fields values to avoid
+ * unnecessary aggregations on elasticsearch
+ */
+export const initCardinalityFieldsCache = () => {
+  const cardinalityCache = new Map<string, CacheStorage>();
+
+  return {
+    /**
+     * Gets requested values from cache
+     */
+    getValues(
+      indexPatternName: string | string[],
+      timeField: string,
+      earliestMs: number,
+      latestMs: number,
+      aggType: AggType,
+      fieldNames: string[]
+    ): CacheStorage[AggType] | null {
+      const cacheKey = indexPatternName + timeField + earliestMs + latestMs;
+      const cached = cardinalityCache.get(cacheKey);
+      if (!cached) {
+        return null;
+      }
+      return pick(cached[aggType], fieldNames);
+    },
+    /**
+     * Extends cache with provided values
+     */
+    updateValues(
+      indexPatternName: string | string[],
+      timeField: string,
+      earliestMs: number,
+      latestMs: number,
+      update: Partial<CacheStorage>
+    ): void {
+      const cacheKey = indexPatternName + timeField + earliestMs + latestMs;
+      const cachedValues = cardinalityCache.get(cacheKey);
+      if (cachedValues === undefined) {
+        cardinalityCache.set(cacheKey, {
+          overallCardinality: update.overallCardinality ?? {},
+          maxBucketCardinality: update.maxBucketCardinality ?? {},
+        });
+        return;
+      }
+
+      Object.assign(cachedValues.overallCardinality, update.overallCardinality);
+      Object.assign(cachedValues.maxBucketCardinality, update.maxBucketCardinality);
+    },
+  };
+};
diff --git a/x-pack/plugins/ml/server/models/fields_service/fields_service.ts b/x-pack/plugins/ml/server/models/fields_service/fields_service.ts
index d16984abc5d2a..567c5d2afb7de 100644
--- a/x-pack/plugins/ml/server/models/fields_service/fields_service.ts
+++ b/x-pack/plugins/ml/server/models/fields_service/fields_service.ts
@@ -7,12 +7,15 @@
 import Boom from 'boom';
 import { APICaller } from 'kibana/server';
 import { parseInterval } from '../../../common/util/parse_interval';
+import { initCardinalityFieldsCache } from './fields_aggs_cache';
 
 /**
  * Service for carrying out queries to obtain data
  * specific to fields in Elasticsearch indices.
  */
 export function fieldsServiceProvider(callAsCurrentUser: APICaller) {
+  const fieldsAggsCache = initCardinalityFieldsCache();
+
   /**
    * Gets aggregatable fields.
    */
@@ -58,6 +61,23 @@ export function fieldsServiceProvider(callAsCurrentUser: APICaller) {
       return {};
     }
 
+    const cachedValues =
+      fieldsAggsCache.getValues(
+        index,
+        timeFieldName,
+        earliestMs,
+        latestMs,
+        'overallCardinality',
+        fieldNames
+      ) ?? {};
+
+    // No need to perform aggregation over the cached fields
+    const fieldsToAgg = aggregatableFields.filter(field => !cachedValues.hasOwnProperty(field));
+
+    if (fieldsToAgg.length === 0) {
+      return cachedValues;
+    }
+
     // Build the criteria to use in the bool filter part of the request.
     // Add criteria for the time range and the datafeed config query.
     const mustCriteria = [
@@ -76,7 +96,7 @@ export function fieldsServiceProvider(callAsCurrentUser: APICaller) {
       mustCriteria.push(query);
     }
 
-    const aggs = aggregatableFields.reduce((obj, field) => {
+    const aggs = fieldsToAgg.reduce((obj, field) => {
       obj[field] = { cardinality: { field } };
       return obj;
     }, {} as { [field: string]: { cardinality: { field: string } } });
@@ -105,53 +125,63 @@ export function fieldsServiceProvider(callAsCurrentUser: APICaller) {
       return {};
     }
 
-    return aggregatableFields.reduce((obj, field) => {
+    const aggResult = fieldsToAgg.reduce((obj, field) => {
       obj[field] = (aggregations[field] || { value: 0 }).value;
       return obj;
     }, {} as { [field: string]: number });
+
+    fieldsAggsCache.updateValues(index, timeFieldName, earliestMs, latestMs, {
+      overallCardinality: aggResult,
+    });
+
+    return {
+      ...cachedValues,
+      ...aggResult,
+    };
   }
 
-  function getTimeFieldRange(
+  /**
+   * Gets time boundaries of the index data based on the provided time field.
+   */
+  async function getTimeFieldRange(
     index: string[] | string,
     timeFieldName: string,
     query: any
-  ): Promise<any> {
-    return new Promise((resolve, reject) => {
-      const obj = { success: true, start: { epoch: 0, string: '' }, end: { epoch: 0, string: '' } };
-
-      callAsCurrentUser('search', {
-        index,
-        size: 0,
-        body: {
-          query,
-          aggs: {
-            earliest: {
-              min: {
-                field: timeFieldName,
-              },
+  ): Promise<{
+    success: boolean;
+    start: { epoch: number; string: string };
+    end: { epoch: number; string: string };
+  }> {
+    const obj = { success: true, start: { epoch: 0, string: '' }, end: { epoch: 0, string: '' } };
+
+    const resp = await callAsCurrentUser('search', {
+      index,
+      size: 0,
+      body: {
+        ...(query ? { query } : {}),
+        aggs: {
+          earliest: {
+            min: {
+              field: timeFieldName,
             },
-            latest: {
-              max: {
-                field: timeFieldName,
-              },
+          },
+          latest: {
+            max: {
+              field: timeFieldName,
             },
           },
         },
-      })
-        .then(resp => {
-          if (resp.aggregations && resp.aggregations.earliest && resp.aggregations.latest) {
-            obj.start.epoch = resp.aggregations.earliest.value;
-            obj.start.string = resp.aggregations.earliest.value_as_string;
-
-            obj.end.epoch = resp.aggregations.latest.value;
-            obj.end.string = resp.aggregations.latest.value_as_string;
-          }
-          resolve(obj);
-        })
-        .catch(resp => {
-          reject(resp);
-        });
+      },
     });
+
+    if (resp.aggregations && resp.aggregations.earliest && resp.aggregations.latest) {
+      obj.start.epoch = resp.aggregations.earliest.value;
+      obj.start.string = resp.aggregations.earliest.value_as_string;
+
+      obj.end.epoch = resp.aggregations.latest.value;
+      obj.end.string = resp.aggregations.latest.value_as_string;
+    }
+    return obj;
   }
 
   /**
@@ -213,6 +243,23 @@ export function fieldsServiceProvider(callAsCurrentUser: APICaller) {
       return {};
     }
 
+    const cachedValues =
+      fieldsAggsCache.getValues(
+        index,
+        timeFieldName,
+        earliestMs,
+        latestMs,
+        'maxBucketCardinality',
+        fieldNames
+      ) ?? {};
+
+    // No need to perform aggregation over the cached fields
+    const fieldsToAgg = aggregatableFields.filter(field => !cachedValues.hasOwnProperty(field));
+
+    if (fieldsToAgg.length === 0) {
+      return cachedValues;
+    }
+
     const { start, end } = getSafeTimeRange(earliestMs, latestMs, interval);
 
     const mustCriteria = [
@@ -238,7 +285,7 @@ export function fieldsServiceProvider(callAsCurrentUser: APICaller) {
     const getSafeAggName = (field: string) => field.replace(/\W/g, '');
     const getMaxBucketAggKey = (field: string) => `max_bucket_${field}`;
 
-    const fieldsCardinalityAggs = aggregatableFields.reduce((obj, field) => {
+    const fieldsCardinalityAggs = fieldsToAgg.reduce((obj, field) => {
       obj[getSafeAggName(field)] = { cardinality: { field } };
       return obj;
     }, {} as { [field: string]: { cardinality: { field: string } } });
@@ -279,13 +326,18 @@ export function fieldsServiceProvider(callAsCurrentUser: APICaller) {
     )?.aggregations;
 
     if (!aggregations) {
-      return {};
+      return cachedValues;
     }
 
-    return aggregatableFields.reduce((obj, field) => {
+    const aggResult = fieldsToAgg.reduce((obj, field) => {
       obj[field] = (aggregations[getMaxBucketAggKey(field)] || { value: 0 }).value ?? 0;
       return obj;
     }, {} as { [field: string]: number });
+
+    return {
+      ...cachedValues,
+      ...aggResult,
+    };
   }
 
   return {
diff --git a/x-pack/plugins/ml/server/routes/modules.ts b/x-pack/plugins/ml/server/routes/modules.ts
index 685119672a983..358cd0ac2871c 100644
--- a/x-pack/plugins/ml/server/routes/modules.ts
+++ b/x-pack/plugins/ml/server/routes/modules.ts
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { schema } from '@kbn/config-schema';
+import { schema, TypeOf } from '@kbn/config-schema';
 
 import { RequestHandlerContext } from 'kibana/server';
 import { DatafeedOverride, JobOverride } from '../../common/types/modules';
@@ -36,16 +36,17 @@ function getModule(context: RequestHandlerContext, moduleId: string) {
 function saveModuleItems(
   context: RequestHandlerContext,
   moduleId: string,
-  prefix: string,
-  groups: string[],
-  indexPatternName: string,
-  query: any,
-  useDedicatedIndex: boolean,
-  startDatafeed: boolean,
-  start: number,
-  end: number,
-  jobOverrides: JobOverride[],
-  datafeedOverrides: DatafeedOverride[]
+  prefix?: string,
+  groups?: string[],
+  indexPatternName?: string,
+  query?: any,
+  useDedicatedIndex?: boolean,
+  startDatafeed?: boolean,
+  start?: number,
+  end?: number,
+  jobOverrides?: JobOverride | JobOverride[],
+  datafeedOverrides?: DatafeedOverride | DatafeedOverride[],
+  estimateModelMemory?: boolean
 ) {
   const dr = new DataRecognizer(
     context.ml!.mlClient.callAsCurrentUser,
@@ -62,7 +63,8 @@ function saveModuleItems(
     start,
     end,
     jobOverrides,
-    datafeedOverrides
+    datafeedOverrides,
+    estimateModelMemory
   );
 }
 
@@ -156,9 +158,7 @@ export function dataRecognizer({ router, mlLicense }: RouteInitialization) {
     {
       path: '/api/ml/modules/setup/{moduleId}',
       validate: {
-        params: schema.object({
-          ...getModuleIdParamSchema(),
-        }),
+        params: schema.object(getModuleIdParamSchema()),
         body: setupModuleBodySchema,
       },
     },
@@ -177,7 +177,8 @@ export function dataRecognizer({ router, mlLicense }: RouteInitialization) {
           end,
           jobOverrides,
           datafeedOverrides,
-        } = request.body;
+          estimateModelMemory,
+        } = request.body as TypeOf<typeof setupModuleBodySchema>;
 
         const result = await saveModuleItems(
           context,
@@ -191,7 +192,8 @@ export function dataRecognizer({ router, mlLicense }: RouteInitialization) {
           start,
           end,
           jobOverrides,
-          datafeedOverrides
+          datafeedOverrides,
+          estimateModelMemory
         );
 
         return response.ok({ body: result });
@@ -214,9 +216,7 @@ export function dataRecognizer({ router, mlLicense }: RouteInitialization) {
     {
       path: '/api/ml/modules/jobs_exist/{moduleId}',
       validate: {
-        params: schema.object({
-          ...getModuleIdParamSchema(),
-        }),
+        params: schema.object(getModuleIdParamSchema()),
       },
     },
     mlLicense.fullLicenseAPIGuard(async (context, request, response) => {
diff --git a/x-pack/plugins/ml/server/routes/schemas/modules.ts b/x-pack/plugins/ml/server/routes/schemas/modules.ts
index 46b7e53c22a05..98e3d80f0ff84 100644
--- a/x-pack/plugins/ml/server/routes/schemas/modules.ts
+++ b/x-pack/plugins/ml/server/routes/schemas/modules.ts
@@ -17,6 +17,11 @@ export const setupModuleBodySchema = schema.object({
   end: schema.maybe(schema.number()),
   jobOverrides: schema.maybe(schema.any()),
   datafeedOverrides: schema.maybe(schema.any()),
+  /**
+   * Indicates whether an estimate of the model memory limit
+   * should be made by checking the cardinality of fields in the job configurations.
+   */
+  estimateModelMemory: schema.maybe(schema.boolean()),
 });
 
 export const getModuleIdParamSchema = (optional = false) => {
diff --git a/x-pack/plugins/ml/server/shared_services/providers/modules.ts b/x-pack/plugins/ml/server/shared_services/providers/modules.ts
index ffc977917ae46..ec876273c2c33 100644
--- a/x-pack/plugins/ml/server/shared_services/providers/modules.ts
+++ b/x-pack/plugins/ml/server/shared_services/providers/modules.ts
@@ -32,7 +32,8 @@ export interface ModulesProvider {
       start: number,
       end: number,
       jobOverrides: JobOverride[],
-      datafeedOverrides: DatafeedOverride[]
+      datafeedOverrides: DatafeedOverride[],
+      estimateModelMemory?: boolean
     ): Promise<DataRecognizerConfigResponse>;
   };
 }
@@ -65,7 +66,8 @@ export function getModulesProvider(isFullLicense: LicenseCheck): ModulesProvider
           start: number,
           end: number,
           jobOverrides: JobOverride[],
-          datafeedOverrides: DatafeedOverride[]
+          datafeedOverrides: DatafeedOverride[],
+          estimateModelMemory?: boolean
         ) {
           const dr = dataRecognizerFactory(callAsCurrentUser, savedObjectsClient);
           return dr.setupModuleItems(
@@ -79,7 +81,8 @@ export function getModulesProvider(isFullLicense: LicenseCheck): ModulesProvider
             start,
             end,
             jobOverrides,
-            datafeedOverrides
+            datafeedOverrides,
+            estimateModelMemory
           );
         },
       };

From 8f55a8edc79873bae3a0eb8b61d43f32adde94b3 Mon Sep 17 00:00:00 2001
From: Uladzislau Lasitsa <Uladzislau_Lasitsa@epam.com>
Date: Tue, 24 Mar 2020 11:19:22 +0300
Subject: [PATCH 062/179] Migrated styles for "share" plugin to new platform
 (#59981)

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 src/legacy/ui/public/_index.scss                                | 1 -
 .../share => plugins/share/public/components}/_index.scss       | 0
 .../share/public/components}/_share_context_menu.scss           | 0
 src/plugins/share/public/index.scss                             | 1 +
 src/plugins/share/public/plugin.ts                              | 2 ++
 5 files changed, 3 insertions(+), 1 deletion(-)
 rename src/{legacy/ui/public/share => plugins/share/public/components}/_index.scss (100%)
 rename src/{legacy/ui/public/share => plugins/share/public/components}/_share_context_menu.scss (100%)
 create mode 100644 src/plugins/share/public/index.scss

diff --git a/src/legacy/ui/public/_index.scss b/src/legacy/ui/public/_index.scss
index 3c3067776a161..87006d9347de4 100644
--- a/src/legacy/ui/public/_index.scss
+++ b/src/legacy/ui/public/_index.scss
@@ -15,7 +15,6 @@
 @import './error_url_overflow/index';
 @import './exit_full_screen/index';
 @import './field_editor/index';
-@import './share/index';
 @import './style_compile/index';
 @import '../../../plugins/management/public/components/index';
 
diff --git a/src/legacy/ui/public/share/_index.scss b/src/plugins/share/public/components/_index.scss
similarity index 100%
rename from src/legacy/ui/public/share/_index.scss
rename to src/plugins/share/public/components/_index.scss
diff --git a/src/legacy/ui/public/share/_share_context_menu.scss b/src/plugins/share/public/components/_share_context_menu.scss
similarity index 100%
rename from src/legacy/ui/public/share/_share_context_menu.scss
rename to src/plugins/share/public/components/_share_context_menu.scss
diff --git a/src/plugins/share/public/index.scss b/src/plugins/share/public/index.scss
new file mode 100644
index 0000000000000..0271fbb8e9026
--- /dev/null
+++ b/src/plugins/share/public/index.scss
@@ -0,0 +1 @@
+@import './components/index'
\ No newline at end of file
diff --git a/src/plugins/share/public/plugin.ts b/src/plugins/share/public/plugin.ts
index 5b638174b4dfb..d02f51af42905 100644
--- a/src/plugins/share/public/plugin.ts
+++ b/src/plugins/share/public/plugin.ts
@@ -17,6 +17,8 @@
  * under the License.
  */
 
+import './index.scss';
+
 import { CoreSetup, CoreStart, Plugin } from 'src/core/public';
 import { ShareMenuManager, ShareMenuManagerStart } from './services';
 import { ShareMenuRegistry, ShareMenuRegistrySetup } from './services';

From c26493d56c0b93c9baa7a30a0e1cb65b86f63636 Mon Sep 17 00:00:00 2001
From: Uladzislau Lasitsa <Uladzislau_Lasitsa@epam.com>
Date: Tue, 24 Mar 2020 11:19:42 +0300
Subject: [PATCH 063/179] [App Arch] migrate legacy CSS to new platform
 (core_plugins/kibana_react) (#59882)

* Migrate markdown styles to the new platform

* Removed unused import

* Update index.ts

* Removed not need layer

* Fixed paths

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 .../np_ready/angular/context/query/actions.js |  2 +-
 src/legacy/core_plugins/kibana_react/index.ts | 41 -------------------
 .../core_plugins/kibana_react/package.json    |  4 --
 .../kibana_react/public/index.scss            |  3 --
 .../core_plugins/kibana_react/public/index.ts | 20 ---------
 .../public/markdown_vis_controller.tsx        |  2 +-
 .../components/vis_types/markdown/vis.js      |  2 +-
 .../components/vis_types/timeseries/vis.js    |  2 +-
 .../public/markdown/_markdown.scss            |  0
 .../kibana_react/public/markdown/index.scss}  |  0
 .../public/markdown/{index.ts => index.tsx}   |  0
 .../kibana_react/public/markdown/markdown.tsx |  1 +
 .../renderers/markdown/index.js               |  2 +-
 .../license/logstash_license_service.js       |  2 +-
 14 files changed, 7 insertions(+), 74 deletions(-)
 delete mode 100644 src/legacy/core_plugins/kibana_react/index.ts
 delete mode 100644 src/legacy/core_plugins/kibana_react/package.json
 delete mode 100644 src/legacy/core_plugins/kibana_react/public/index.scss
 delete mode 100644 src/legacy/core_plugins/kibana_react/public/index.ts
 rename src/{legacy/core_plugins => plugins}/kibana_react/public/markdown/_markdown.scss (100%)
 rename src/{legacy/core_plugins/kibana_react/public/markdown/_index.scss => plugins/kibana_react/public/markdown/index.scss} (100%)
 rename src/plugins/kibana_react/public/markdown/{index.ts => index.tsx} (100%)

diff --git a/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/context/query/actions.js b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/context/query/actions.js
index 674f40d0186e5..9efddc5275069 100644
--- a/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/context/query/actions.js
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/context/query/actions.js
@@ -26,7 +26,7 @@ import { fetchAnchorProvider } from '../api/anchor';
 import { fetchContextProvider } from '../api/context';
 import { getQueryParameterActions } from '../query_parameters';
 import { FAILURE_REASONS, LOADING_STATUS } from './constants';
-import { MarkdownSimple } from '../../../../../../../kibana_react/public';
+import { MarkdownSimple } from '../../../../../../../../../plugins/kibana_react/public';
 
 export function QueryActionsProvider(Promise) {
   const { filterManager, indexPatterns } = getServices();
diff --git a/src/legacy/core_plugins/kibana_react/index.ts b/src/legacy/core_plugins/kibana_react/index.ts
deleted file mode 100644
index f4083f3d50c34..0000000000000
--- a/src/legacy/core_plugins/kibana_react/index.ts
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import { resolve } from 'path';
-import { Legacy } from '../../../../kibana';
-
-// eslint-disable-next-line import/no-default-export
-export default function DataPlugin(kibana: any) {
-  const config: Legacy.PluginSpecOptions = {
-    id: 'kibana_react',
-    require: [],
-    config: (Joi: any) => {
-      return Joi.object({
-        enabled: Joi.boolean().default(true),
-      }).default();
-    },
-    init: (server: Legacy.Server) => ({}),
-    uiExports: {
-      injectDefaultVars: () => ({}),
-      styleSheetPaths: resolve(__dirname, 'public/index.scss'),
-    },
-  };
-
-  return new kibana.Plugin(config);
-}
diff --git a/src/legacy/core_plugins/kibana_react/package.json b/src/legacy/core_plugins/kibana_react/package.json
deleted file mode 100644
index 3f7cf717a1963..0000000000000
--- a/src/legacy/core_plugins/kibana_react/package.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "name": "kibana_react",
-  "version": "kibana"
-}
diff --git a/src/legacy/core_plugins/kibana_react/public/index.scss b/src/legacy/core_plugins/kibana_react/public/index.scss
deleted file mode 100644
index 14b4687c459e1..0000000000000
--- a/src/legacy/core_plugins/kibana_react/public/index.scss
+++ /dev/null
@@ -1,3 +0,0 @@
-@import 'src/legacy/ui/public/styles/styling_constants';
-
-@import './markdown/index';
diff --git a/src/legacy/core_plugins/kibana_react/public/index.ts b/src/legacy/core_plugins/kibana_react/public/index.ts
deleted file mode 100644
index a6a7cb72a8dee..0000000000000
--- a/src/legacy/core_plugins/kibana_react/public/index.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-export { Markdown, MarkdownSimple } from '../../../../plugins/kibana_react/public';
diff --git a/src/legacy/core_plugins/vis_type_markdown/public/markdown_vis_controller.tsx b/src/legacy/core_plugins/vis_type_markdown/public/markdown_vis_controller.tsx
index 4e77bb196b713..3260e9f7d8091 100644
--- a/src/legacy/core_plugins/vis_type_markdown/public/markdown_vis_controller.tsx
+++ b/src/legacy/core_plugins/vis_type_markdown/public/markdown_vis_controller.tsx
@@ -18,7 +18,7 @@
  */
 
 import React from 'react';
-import { Markdown } from '../../kibana_react/public';
+import { Markdown } from '../../../../plugins/kibana_react/public';
 import { MarkdownVisParams } from './types';
 
 interface MarkdownVisComponentProps extends MarkdownVisParams {
diff --git a/src/legacy/core_plugins/vis_type_timeseries/public/components/vis_types/markdown/vis.js b/src/legacy/core_plugins/vis_type_timeseries/public/components/vis_types/markdown/vis.js
index a806339085450..d8bcf56b48cb9 100644
--- a/src/legacy/core_plugins/vis_type_timeseries/public/components/vis_types/markdown/vis.js
+++ b/src/legacy/core_plugins/vis_type_timeseries/public/components/vis_types/markdown/vis.js
@@ -21,7 +21,7 @@ import React from 'react';
 import classNames from 'classnames';
 import uuid from 'uuid';
 import { get } from 'lodash';
-import { Markdown } from '../../../../../kibana_react/public';
+import { Markdown } from '../../../../../../../plugins/kibana_react/public';
 
 import { ErrorComponent } from '../../error';
 import { replaceVars } from '../../lib/replace_vars';
diff --git a/src/legacy/core_plugins/vis_type_timeseries/public/components/vis_types/timeseries/vis.js b/src/legacy/core_plugins/vis_type_timeseries/public/components/vis_types/timeseries/vis.js
index 356ba08ac2427..f559bc38b6c58 100644
--- a/src/legacy/core_plugins/vis_type_timeseries/public/components/vis_types/timeseries/vis.js
+++ b/src/legacy/core_plugins/vis_type_timeseries/public/components/vis_types/timeseries/vis.js
@@ -27,7 +27,7 @@ import { ScaleType } from '@elastic/charts';
 
 import { createTickFormatter } from '../../lib/tick_formatter';
 import { TimeSeries } from '../../../visualizations/views/timeseries';
-import { MarkdownSimple } from '../../../../../kibana_react/public';
+import { MarkdownSimple } from '../../../../../../../plugins/kibana_react/public';
 import { replaceVars } from '../../lib/replace_vars';
 import { getAxisLabelString } from '../../lib/get_axis_label_string';
 import { getInterval } from '../../lib/get_interval';
diff --git a/src/legacy/core_plugins/kibana_react/public/markdown/_markdown.scss b/src/plugins/kibana_react/public/markdown/_markdown.scss
similarity index 100%
rename from src/legacy/core_plugins/kibana_react/public/markdown/_markdown.scss
rename to src/plugins/kibana_react/public/markdown/_markdown.scss
diff --git a/src/legacy/core_plugins/kibana_react/public/markdown/_index.scss b/src/plugins/kibana_react/public/markdown/index.scss
similarity index 100%
rename from src/legacy/core_plugins/kibana_react/public/markdown/_index.scss
rename to src/plugins/kibana_react/public/markdown/index.scss
diff --git a/src/plugins/kibana_react/public/markdown/index.ts b/src/plugins/kibana_react/public/markdown/index.tsx
similarity index 100%
rename from src/plugins/kibana_react/public/markdown/index.ts
rename to src/plugins/kibana_react/public/markdown/index.tsx
diff --git a/src/plugins/kibana_react/public/markdown/markdown.tsx b/src/plugins/kibana_react/public/markdown/markdown.tsx
index ba81b5e111cbd..a0c2cdad78c66 100644
--- a/src/plugins/kibana_react/public/markdown/markdown.tsx
+++ b/src/plugins/kibana_react/public/markdown/markdown.tsx
@@ -23,6 +23,7 @@ import MarkdownIt from 'markdown-it';
 import { memoize } from 'lodash';
 import { getSecureRelForTarget } from '@elastic/eui';
 
+import './index.scss';
 /**
  * Return a memoized markdown rendering function that use the specified
  * whiteListedRules and openLinksInNewTab configurations.
diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/markdown/index.js b/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/markdown/index.js
index c1bfd7c99ac41..126699534caad 100644
--- a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/markdown/index.js
+++ b/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/markdown/index.js
@@ -7,7 +7,7 @@
 import React from 'react';
 import ReactDOM from 'react-dom';
 import { RendererStrings } from '../../../i18n';
-import { Markdown } from '../../../../../../../src/legacy/core_plugins/kibana_react/public';
+import { Markdown } from '../../../../../../../src/plugins/kibana_react/public';
 
 const { markdown: strings } = RendererStrings;
 
diff --git a/x-pack/legacy/plugins/logstash/public/services/license/logstash_license_service.js b/x-pack/legacy/plugins/logstash/public/services/license/logstash_license_service.js
index 795899ff32f97..97b336ec0728b 100755
--- a/x-pack/legacy/plugins/logstash/public/services/license/logstash_license_service.js
+++ b/x-pack/legacy/plugins/logstash/public/services/license/logstash_license_service.js
@@ -6,7 +6,7 @@
 
 import React from 'react';
 import { toastNotifications } from 'ui/notify';
-import { MarkdownSimple } from '../../../../../../../src/legacy/core_plugins/kibana_react/public';
+import { MarkdownSimple } from '../../../../../../../src/plugins/kibana_react/public';
 import { PLUGIN } from '../../../common/constants';
 
 export class LogstashLicenseService {

From 8ef35c8f8726278adbd8a354dc992f4bfd559262 Mon Sep 17 00:00:00 2001
From: Dario Gieselaar <dario.gieselaar@elastic.co>
Date: Tue, 24 Mar 2020 09:28:29 +0100
Subject: [PATCH 064/179] [APM] add service map config options to legacy plugin
 (#61002)

---
 x-pack/legacy/plugins/apm/index.ts | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/x-pack/legacy/plugins/apm/index.ts b/x-pack/legacy/plugins/apm/index.ts
index 0107997f233fe..6f238b48d9465 100644
--- a/x-pack/legacy/plugins/apm/index.ts
+++ b/x-pack/legacy/plugins/apm/index.ts
@@ -71,7 +71,12 @@ export const apm: LegacyPluginInitializer = kibana => {
         autocreateApmIndexPattern: Joi.boolean().default(true),
 
         // service map
-        serviceMapEnabled: Joi.boolean().default(true)
+        serviceMapEnabled: Joi.boolean().default(true),
+        serviceMapFingerprintBucketSize: Joi.number().default(100),
+        serviceMapTraceIdBucketSize: Joi.number().default(65),
+        serviceMapFingerprintGlobalBucketSize: Joi.number().default(1000),
+        serviceMapTraceIdGlobalBucketSize: Joi.number().default(6),
+        serviceMapMaxTracesPerRequest: Joi.number().default(50)
       }).default();
     },
 

From a93efedcc55f9c664f2373afd722e8399257b895 Mon Sep 17 00:00:00 2001
From: Tim Roes <tim.roes@elastic.co>
Date: Tue, 24 Mar 2020 09:46:59 +0100
Subject: [PATCH 065/179] Cahgen save object duplicate message (#60901)

---
 .../saved_objects/public/save_modal/saved_object_save_modal.tsx | 2 +-
 x-pack/plugins/translations/translations/ja-JP.json             | 1 -
 x-pack/plugins/translations/translations/zh-CN.json             | 1 -
 3 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/plugins/saved_objects/public/save_modal/saved_object_save_modal.tsx b/src/plugins/saved_objects/public/save_modal/saved_object_save_modal.tsx
index 1d145bc97bdb4..95eb56c0e874b 100644
--- a/src/plugins/saved_objects/public/save_modal/saved_object_save_modal.tsx
+++ b/src/plugins/saved_objects/public/save_modal/saved_object_save_modal.tsx
@@ -289,7 +289,7 @@ export class SavedObjectSaveModal extends React.Component<Props, State> {
             <p>
               <FormattedMessage
                 id="savedObjects.saveModal.duplicateTitleDescription"
-                defaultMessage="Clicking {confirmSaveLabel} overwrites the existing {objectType}."
+                defaultMessage="Clicking {confirmSaveLabel} will save the {objectType} with this duplicate title."
                 values={{
                   objectType: this.props.objectType,
                   confirmSaveLabel: (
diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json
index 6290366e4b93f..b746b659704ff 100644
--- a/x-pack/plugins/translations/translations/ja-JP.json
+++ b/x-pack/plugins/translations/translations/ja-JP.json
@@ -2424,7 +2424,6 @@
     "savedObjects.saveDuplicateRejectedDescription": "重複ファイルの保存確認が拒否されました",
     "savedObjects.saveModal.cancelButtonLabel": "キャンセル",
     "savedObjects.saveModal.descriptionLabel": "説明",
-    "savedObjects.saveModal.duplicateTitleDescription": "{confirmSaveLabel} をクリックすると、既存の {objectType} が上書きされます。",
     "savedObjects.saveModal.duplicateTitleLabel": "「{title}」というタイトルの {objectType} が既に存在します",
     "savedObjects.saveModal.saveAsNewLabel": "新規 {objectType} として保存",
     "savedObjects.saveModal.saveButtonLabel": "保存",
diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json
index 37527023d7208..77c077e653b84 100644
--- a/x-pack/plugins/translations/translations/zh-CN.json
+++ b/x-pack/plugins/translations/translations/zh-CN.json
@@ -2425,7 +2425,6 @@
     "savedObjects.saveDuplicateRejectedDescription": "已拒绝使用重复标题保存确认",
     "savedObjects.saveModal.cancelButtonLabel": "取消",
     "savedObjects.saveModal.descriptionLabel": "描述",
-    "savedObjects.saveModal.duplicateTitleDescription": "单击“{confirmSaveLabel}”可覆盖现有 {objectType}。",
     "savedObjects.saveModal.duplicateTitleLabel": "具有标题“{title}”的 {objectType} 已存在",
     "savedObjects.saveModal.saveAsNewLabel": "另存为新的 {objectType}",
     "savedObjects.saveModal.saveButtonLabel": "保存",

From 57f9a9f95d99ba7d5f9075bcc51a7a0f26c91498 Mon Sep 17 00:00:00 2001
From: Pete Harverson <peteharverson@users.noreply.github.com>
Date: Tue, 24 Mar 2020 09:43:11 +0000
Subject: [PATCH 066/179] [ML] Add support for percentiles aggregation to
 Transform wizard (#60763)

* [ML] Add support for percentiles aggregation to Transform wizard

* [ML] Fix type error and comments from review

* [ML] Remove unused function

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 .../transform/public/app/common/index.ts      |   2 +
 .../transform/public/app/common/pivot_aggs.ts |  22 +++-
 .../aggregation_list/popover_form.tsx         | 104 +++++++++++++++++-
 .../components/step_define/common.test.ts     |   8 ++
 .../components/step_define/common.ts          |  35 +++++-
 .../apps/transform/creation_index_pattern.ts  |  54 +++++++++
 6 files changed, 217 insertions(+), 8 deletions(-)

diff --git a/x-pack/plugins/transform/public/app/common/index.ts b/x-pack/plugins/transform/public/app/common/index.ts
index ee026e2e590a4..f2b31bb5da865 100644
--- a/x-pack/plugins/transform/public/app/common/index.ts
+++ b/x-pack/plugins/transform/public/app/common/index.ts
@@ -40,6 +40,8 @@ export { GetTransformsResponse, PreviewData, PreviewMappings } from './pivot_pre
 export {
   getEsAggFromAggConfig,
   isPivotAggsConfigWithUiSupport,
+  isPivotAggsConfigPercentiles,
+  PERCENTILES_AGG_DEFAULT_PERCENTS,
   PivotAgg,
   PivotAggDict,
   PivotAggsConfig,
diff --git a/x-pack/plugins/transform/public/app/common/pivot_aggs.ts b/x-pack/plugins/transform/public/app/common/pivot_aggs.ts
index 3ea614aaf5c9a..35dad3a8b2153 100644
--- a/x-pack/plugins/transform/public/app/common/pivot_aggs.ts
+++ b/x-pack/plugins/transform/public/app/common/pivot_aggs.ts
@@ -15,10 +15,13 @@ export enum PIVOT_SUPPORTED_AGGS {
   CARDINALITY = 'cardinality',
   MAX = 'max',
   MIN = 'min',
+  PERCENTILES = 'percentiles',
   SUM = 'sum',
   VALUE_COUNT = 'value_count',
 }
 
+export const PERCENTILES_AGG_DEFAULT_PERCENTS = [1, 5, 25, 50, 75, 95, 99];
+
 export const pivotAggsFieldSupport = {
   [KBN_FIELD_TYPES.ATTACHMENT]: [PIVOT_SUPPORTED_AGGS.VALUE_COUNT],
   [KBN_FIELD_TYPES.BOOLEAN]: [PIVOT_SUPPORTED_AGGS.VALUE_COUNT],
@@ -36,6 +39,7 @@ export const pivotAggsFieldSupport = {
     PIVOT_SUPPORTED_AGGS.CARDINALITY,
     PIVOT_SUPPORTED_AGGS.MAX,
     PIVOT_SUPPORTED_AGGS.MIN,
+    PIVOT_SUPPORTED_AGGS.PERCENTILES,
     PIVOT_SUPPORTED_AGGS.SUM,
     PIVOT_SUPPORTED_AGGS.VALUE_COUNT,
   ],
@@ -60,10 +64,17 @@ export interface PivotAggsConfigBase {
   dropDownName: string;
 }
 
-export interface PivotAggsConfigWithUiSupport extends PivotAggsConfigBase {
+interface PivotAggsConfigWithUiBase extends PivotAggsConfigBase {
   field: EsFieldName;
 }
 
+interface PivotAggsConfigPercentiles extends PivotAggsConfigWithUiBase {
+  agg: PIVOT_SUPPORTED_AGGS.PERCENTILES;
+  percents: number[];
+}
+
+export type PivotAggsConfigWithUiSupport = PivotAggsConfigWithUiBase | PivotAggsConfigPercentiles;
+
 export function isPivotAggsConfigWithUiSupport(arg: any): arg is PivotAggsConfigWithUiSupport {
   return (
     arg.hasOwnProperty('agg') &&
@@ -74,6 +85,15 @@ export function isPivotAggsConfigWithUiSupport(arg: any): arg is PivotAggsConfig
   );
 }
 
+export function isPivotAggsConfigPercentiles(arg: any): arg is PivotAggsConfigPercentiles {
+  return (
+    arg.hasOwnProperty('agg') &&
+    arg.hasOwnProperty('field') &&
+    arg.hasOwnProperty('percents') &&
+    arg.agg === PIVOT_SUPPORTED_AGGS.PERCENTILES
+  );
+}
+
 export type PivotAggsConfig = PivotAggsConfigBase | PivotAggsConfigWithUiSupport;
 
 export type PivotAggsConfigWithUiSupportDict = Dictionary<PivotAggsConfigWithUiSupport>;
diff --git a/x-pack/plugins/transform/public/app/sections/create_transform/components/aggregation_list/popover_form.tsx b/x-pack/plugins/transform/public/app/sections/create_transform/components/aggregation_list/popover_form.tsx
index 6c1e119ab38e0..7157586dddda9 100644
--- a/x-pack/plugins/transform/public/app/sections/create_transform/components/aggregation_list/popover_form.tsx
+++ b/x-pack/plugins/transform/public/app/sections/create_transform/components/aggregation_list/popover_form.tsx
@@ -22,8 +22,10 @@ import { dictionaryToArray } from '../../../../../../common/types/common';
 import {
   AggName,
   isAggName,
+  isPivotAggsConfigPercentiles,
   isPivotAggsConfigWithUiSupport,
   getEsAggFromAggConfig,
+  PERCENTILES_AGG_DEFAULT_PERCENTS,
   PivotAggsConfig,
   PivotAggsConfigWithUiSupportDict,
   PIVOT_SUPPORTED_AGGS,
@@ -40,6 +42,33 @@ interface Props {
   onChange(d: PivotAggsConfig): void;
 }
 
+function getDefaultPercents(defaultData: PivotAggsConfig): number[] | undefined {
+  if (isPivotAggsConfigPercentiles(defaultData)) {
+    return defaultData.percents;
+  }
+}
+
+function parsePercentsInput(inputValue: string | undefined) {
+  if (inputValue !== undefined) {
+    const strVals: string[] = inputValue.split(',');
+    const percents: number[] = [];
+    for (const str of strVals) {
+      if (str.trim().length > 0 && isNaN(str as any) === false) {
+        const val = Number(str);
+        if (val >= 0 && val <= 100) {
+          percents.push(val);
+        } else {
+          return [];
+        }
+      }
+    }
+
+    return percents;
+  }
+
+  return [];
+}
+
 export const PopoverForm: React.FC<Props> = ({ defaultData, otherAggNames, onChange, options }) => {
   const isUnsupportedAgg = !isPivotAggsConfigWithUiSupport(defaultData);
 
@@ -48,10 +77,45 @@ export const PopoverForm: React.FC<Props> = ({ defaultData, otherAggNames, onCha
   const [field, setField] = useState(
     isPivotAggsConfigWithUiSupport(defaultData) ? defaultData.field : ''
   );
+  const [percents, setPercents] = useState(getDefaultPercents(defaultData));
 
   const availableFields: SelectOption[] = [];
   const availableAggs: SelectOption[] = [];
 
+  function updateAgg(aggVal: PIVOT_SUPPORTED_AGGS) {
+    setAgg(aggVal);
+    if (aggVal === PIVOT_SUPPORTED_AGGS.PERCENTILES && percents === undefined) {
+      setPercents(PERCENTILES_AGG_DEFAULT_PERCENTS);
+    }
+  }
+
+  function updatePercents(inputValue: string) {
+    setPercents(parsePercentsInput(inputValue));
+  }
+
+  function getUpdatedItem(): PivotAggsConfig {
+    let updatedItem: PivotAggsConfig;
+
+    if (agg !== PIVOT_SUPPORTED_AGGS.PERCENTILES) {
+      updatedItem = {
+        agg,
+        aggName,
+        field,
+        dropDownName: defaultData.dropDownName,
+      };
+    } else {
+      updatedItem = {
+        agg,
+        aggName,
+        field,
+        dropDownName: defaultData.dropDownName,
+        percents,
+      };
+    }
+
+    return updatedItem;
+  }
+
   if (!isUnsupportedAgg) {
     const optionsArr = dictionaryToArray(options);
     optionsArr
@@ -83,7 +147,18 @@ export const PopoverForm: React.FC<Props> = ({ defaultData, otherAggNames, onCha
     });
   }
 
-  const formValid = validAggName;
+  let percentsText;
+  if (percents !== undefined) {
+    percentsText = percents.toString();
+  }
+
+  const validPercents =
+    agg === PIVOT_SUPPORTED_AGGS.PERCENTILES && parsePercentsInput(percentsText).length > 0;
+
+  let formValid = validAggName;
+  if (formValid && agg === PIVOT_SUPPORTED_AGGS.PERCENTILES) {
+    formValid = validPercents;
+  }
 
   return (
     <EuiForm style={{ width: '300px' }}>
@@ -117,7 +192,7 @@ export const PopoverForm: React.FC<Props> = ({ defaultData, otherAggNames, onCha
           <EuiSelect
             options={availableAggs}
             value={agg}
-            onChange={e => setAgg(e.target.value as PIVOT_SUPPORTED_AGGS)}
+            onChange={e => updateAgg(e.target.value as PIVOT_SUPPORTED_AGGS)}
           />
         </EuiFormRow>
       )}
@@ -134,6 +209,26 @@ export const PopoverForm: React.FC<Props> = ({ defaultData, otherAggNames, onCha
           />
         </EuiFormRow>
       )}
+      {agg === PIVOT_SUPPORTED_AGGS.PERCENTILES && (
+        <EuiFormRow
+          label={i18n.translate('xpack.transform.agg.popoverForm.percentsLabel', {
+            defaultMessage: 'Percents',
+          })}
+          error={
+            !validPercents && [
+              i18n.translate('xpack.transform.groupBy.popoverForm.intervalPercents', {
+                defaultMessage: 'Enter a comma-separated list of percentiles',
+              }),
+            ]
+          }
+          isInvalid={!validPercents}
+        >
+          <EuiFieldText
+            defaultValue={percentsText}
+            onChange={e => updatePercents(e.target.value)}
+          />
+        </EuiFormRow>
+      )}
       {isUnsupportedAgg && (
         <EuiCodeEditor
           mode="json"
@@ -147,10 +242,7 @@ export const PopoverForm: React.FC<Props> = ({ defaultData, otherAggNames, onCha
         />
       )}
       <EuiFormRow hasEmptyLabelSpace>
-        <EuiButton
-          isDisabled={!formValid}
-          onClick={() => onChange({ ...defaultData, aggName, agg, field })}
-        >
+        <EuiButton isDisabled={!formValid} onClick={() => onChange(getUpdatedItem())}>
           {i18n.translate('xpack.transform.agg.popoverForm.submitButtonLabel', {
             defaultMessage: 'Apply',
           })}
diff --git a/x-pack/plugins/transform/public/app/sections/create_transform/components/step_define/common.test.ts b/x-pack/plugins/transform/public/app/sections/create_transform/components/step_define/common.test.ts
index 5db6a233c9134..58ab4a1b8ac33 100644
--- a/x-pack/plugins/transform/public/app/sections/create_transform/components/step_define/common.test.ts
+++ b/x-pack/plugins/transform/public/app/sections/create_transform/components/step_define/common.test.ts
@@ -37,6 +37,7 @@ describe('Transform: Define Pivot Common', () => {
             { label: 'cardinality( the-f[i]e>ld )' },
             { label: 'max( the-f[i]e>ld )' },
             { label: 'min( the-f[i]e>ld )' },
+            { label: 'percentiles( the-f[i]e>ld )' },
             { label: 'sum( the-f[i]e>ld )' },
             { label: 'value_count( the-f[i]e>ld )' },
           ],
@@ -67,6 +68,13 @@ describe('Transform: Define Pivot Common', () => {
           aggName: 'the-field.min',
           dropDownName: 'min( the-f[i]e>ld )',
         },
+        'percentiles( the-f[i]e>ld )': {
+          agg: 'percentiles',
+          field: ' the-f[i]e>ld ',
+          aggName: 'the-field.percentiles',
+          dropDownName: 'percentiles( the-f[i]e>ld )',
+          percents: [1, 5, 25, 50, 75, 95, 99],
+        },
         'sum( the-f[i]e>ld )': {
           agg: 'sum',
           field: ' the-f[i]e>ld ',
diff --git a/x-pack/plugins/transform/public/app/sections/create_transform/components/step_define/common.ts b/x-pack/plugins/transform/public/app/sections/create_transform/components/step_define/common.ts
index a9413afb6243e..65cea40276da9 100644
--- a/x-pack/plugins/transform/public/app/sections/create_transform/components/step_define/common.ts
+++ b/x-pack/plugins/transform/public/app/sections/create_transform/components/step_define/common.ts
@@ -12,10 +12,13 @@ import {
   DropDownOption,
   EsFieldName,
   GroupByConfigWithUiSupport,
+  PERCENTILES_AGG_DEFAULT_PERCENTS,
+  PivotAggsConfigWithUiSupport,
   PivotAggsConfigWithUiSupportDict,
   pivotAggsFieldSupport,
   PivotGroupByConfigWithUiSupportDict,
   pivotGroupByFieldSupport,
+  PIVOT_SUPPORTED_AGGS,
   PIVOT_SUPPORTED_GROUP_BY_AGGS,
 } from '../../../../common';
 
@@ -57,6 +60,31 @@ function getDefaultGroupByConfig(
   }
 }
 
+function getDefaultAggregationConfig(
+  aggName: string,
+  dropDownName: string,
+  fieldName: EsFieldName,
+  agg: PIVOT_SUPPORTED_AGGS
+): PivotAggsConfigWithUiSupport {
+  switch (agg) {
+    case PIVOT_SUPPORTED_AGGS.PERCENTILES:
+      return {
+        agg,
+        aggName,
+        dropDownName,
+        field: fieldName,
+        percents: PERCENTILES_AGG_DEFAULT_PERCENTS,
+      };
+    default:
+      return {
+        agg,
+        aggName,
+        dropDownName,
+        field: fieldName,
+      };
+  }
+}
+
 const illegalEsAggNameChars = /[[\]>]/g;
 
 export function getPivotDropdownOptions(indexPattern: IndexPattern) {
@@ -105,7 +133,12 @@ export function getPivotDropdownOptions(indexPattern: IndexPattern) {
         // Option name in the dropdown for the aggregation is in the form of `sum(fieldname)`.
         const dropDownName = `${agg}(${field.name})`;
         aggOption.options.push({ label: dropDownName });
-        aggOptionsData[dropDownName] = { agg, field: field.name, aggName, dropDownName };
+        aggOptionsData[dropDownName] = getDefaultAggregationConfig(
+          aggName,
+          dropDownName,
+          field.name,
+          agg
+        );
       });
     }
     aggOptions.push(aggOption);
diff --git a/x-pack/test/functional/apps/transform/creation_index_pattern.ts b/x-pack/test/functional/apps/transform/creation_index_pattern.ts
index 4d1300ffaad06..ae3617db9e517 100644
--- a/x-pack/test/functional/apps/transform/creation_index_pattern.ts
+++ b/x-pack/test/functional/apps/transform/creation_index_pattern.ts
@@ -94,6 +94,60 @@ export default function({ getService }: FtrProviderContext) {
           },
         },
       },
+      {
+        suiteTitle: 'batch transform with terms group and percentiles agg',
+        source: 'ecommerce',
+        groupByEntries: [
+          {
+            identifier: 'terms(geoip.country_iso_code)',
+            label: 'geoip.country_iso_code',
+          } as GroupByEntry,
+        ],
+        aggregationEntries: [
+          {
+            identifier: 'percentiles(products.base_price)',
+            label: 'products.base_price.percentiles',
+          },
+        ],
+        transformId: `ec_2_${Date.now()}`,
+        transformDescription:
+          'ecommerce batch transform with group by terms(geoip.country_iso_code) and aggregation percentiles(products.base_price)',
+        get destinationIndex(): string {
+          return `user-${this.transformId}`;
+        },
+        expected: {
+          pivotAdvancedEditorValue: {
+            group_by: {
+              'geoip.country_iso_code': {
+                terms: {
+                  field: 'geoip.country_iso_code',
+                },
+              },
+            },
+            aggregations: {
+              'products.base_price.percentiles': {
+                percentiles: {
+                  field: 'products.base_price',
+                  percents: [1, 5, 25, 50, 75, 95, 99],
+                },
+              },
+            },
+          },
+          pivotPreview: {
+            column: 0,
+            values: ['AE', 'CO', 'EG', 'FR', 'GB'],
+          },
+          row: {
+            status: 'stopped',
+            mode: 'batch',
+            progress: '100',
+          },
+          sourcePreview: {
+            columns: 45,
+            rows: 5,
+          },
+        },
+      },
     ];
 
     for (const testData of testDataList) {

From 85c0be357ae6b5ab6d0711bda5fe3c050f45fdaf Mon Sep 17 00:00:00 2001
From: Dario Gieselaar <dario.gieselaar@elastic.co>
Date: Tue, 24 Mar 2020 11:15:10 +0100
Subject: [PATCH 067/179] [APM] Threshold alerts (#59566)

* Add alerting/actions permissions for APM

* Export TIME_UNITS, getTimeUnitLabel from triggers actions UI plugin

* Add APM alert types and UI

* Review feedback

* Use Expression components for triggers

* Update alert name for transaction duration

* Change defaults for error rate trigger
---
 x-pack/legacy/plugins/apm/index.ts            |  22 ++-
 .../__test__/APMIndicesPermission.test.tsx    |   2 +-
 .../List/__test__/List.test.tsx               |  28 +---
 .../List/__test__/props.json                  |   7 -
 .../public/components/app/Home/Home.test.tsx  |   2 +-
 .../app/Main/UpdateBreadcrumbs.test.tsx       |   8 +-
 .../AlertingFlyout/index.tsx                  |  30 ++++
 .../AlertIntegrations/index.tsx               | 146 +++++++++++++++++
 .../components/app/ServiceDetails/index.tsx   |  20 +++
 .../app/ServiceMap/Cytoscape.stories.tsx      |   1 +
 .../app/ServiceMap/EmptyBanner.test.tsx       |   2 +-
 .../components/app/ServiceMap/index.test.tsx  |   2 +-
 .../app/ServiceNodeMetrics/index.test.tsx     |   2 +-
 .../__test__/ServiceOverview.test.tsx         |   4 +-
 .../app/Settings/ApmIndices/index.test.tsx    |   2 +-
 .../CustomizeUI/CustomLink/index.test.tsx     |   2 +-
 .../app/TraceLink/__test__/TraceLink.test.tsx |   2 +-
 .../__jest__/TransactionOverview.test.tsx     |   2 +-
 .../ErrorRateAlertTrigger/index.stories.tsx   |  26 +++
 .../shared/ErrorRateAlertTrigger/index.tsx    |  84 ++++++++++
 .../__test__/ErrorMetadata.test.tsx           |   4 +-
 .../__test__/SpanMetadata.test.tsx            |   4 +-
 .../__test__/TransactionMetadata.test.tsx     |   4 +-
 .../__test__/MetadataTable.test.tsx           |   6 +-
 .../PopoverExpression/index.tsx               |  39 +++++
 .../shared/ServiceAlertTrigger/index.tsx      |  61 +++++++
 .../__test__/TransactionActionMenu.test.tsx   |   2 +-
 .../index.stories.tsx                         |  50 ++++++
 .../TransactionDurationAlertTrigger/index.tsx | 149 ++++++++++++++++++
 .../BrowserLineChart.test.tsx                 |   2 +-
 .../ApmPluginContext/MockApmPluginContext.tsx |  63 ++++++++
 .../index.tsx}                                |   2 +-
 .../MockUrlParamsContextProvider.tsx          |  40 +++++
 .../hooks/useFetcher.integration.test.tsx     |   3 +-
 .../apm/public/hooks/useFetcher.test.tsx      |   3 +-
 .../apm/public/new-platform/plugin.tsx        |  76 +++++++--
 .../plugins/apm/public/utils/testHelpers.tsx  |  63 +-------
 x-pack/plugins/apm/common/alert_types.ts      |  67 ++++++++
 x-pack/plugins/apm/kibana.json                |   2 +-
 .../server/lib/alerts/register_apm_alerts.ts  |  29 ++++
 .../alerts/register_error_rate_alert_type.ts  | 108 +++++++++++++
 ...egister_transaction_duration_alert_type.ts | 140 ++++++++++++++++
 x-pack/plugins/apm/server/plugin.ts           |  17 +-
 .../public/application/lib/capabilities.ts    |  47 ++----
 .../triggers_actions_ui/public/index.ts       |   4 +
 45 files changed, 1198 insertions(+), 181 deletions(-)
 create mode 100644 x-pack/legacy/plugins/apm/public/components/app/ServiceDetails/AlertIntegrations/AlertingFlyout/index.tsx
 create mode 100644 x-pack/legacy/plugins/apm/public/components/app/ServiceDetails/AlertIntegrations/index.tsx
 create mode 100644 x-pack/legacy/plugins/apm/public/components/shared/ErrorRateAlertTrigger/index.stories.tsx
 create mode 100644 x-pack/legacy/plugins/apm/public/components/shared/ErrorRateAlertTrigger/index.tsx
 create mode 100644 x-pack/legacy/plugins/apm/public/components/shared/ServiceAlertTrigger/PopoverExpression/index.tsx
 create mode 100644 x-pack/legacy/plugins/apm/public/components/shared/ServiceAlertTrigger/index.tsx
 create mode 100644 x-pack/legacy/plugins/apm/public/components/shared/TransactionDurationAlertTrigger/index.stories.tsx
 create mode 100644 x-pack/legacy/plugins/apm/public/components/shared/TransactionDurationAlertTrigger/index.tsx
 create mode 100644 x-pack/legacy/plugins/apm/public/context/ApmPluginContext/MockApmPluginContext.tsx
 rename x-pack/legacy/plugins/apm/public/context/{ApmPluginContext.tsx => ApmPluginContext/index.tsx} (89%)
 create mode 100644 x-pack/legacy/plugins/apm/public/context/UrlParamsContext/MockUrlParamsContextProvider.tsx
 create mode 100644 x-pack/plugins/apm/common/alert_types.ts
 create mode 100644 x-pack/plugins/apm/server/lib/alerts/register_apm_alerts.ts
 create mode 100644 x-pack/plugins/apm/server/lib/alerts/register_error_rate_alert_type.ts
 create mode 100644 x-pack/plugins/apm/server/lib/alerts/register_transaction_duration_alert_type.ts

diff --git a/x-pack/legacy/plugins/apm/index.ts b/x-pack/legacy/plugins/apm/index.ts
index 6f238b48d9465..6cfd18d0c1cba 100644
--- a/x-pack/legacy/plugins/apm/index.ts
+++ b/x-pack/legacy/plugins/apm/index.ts
@@ -91,24 +91,34 @@ export const apm: LegacyPluginInitializer = kibana => {
         navLinkId: 'apm',
         app: ['apm', 'kibana'],
         catalogue: ['apm'],
+        // see x-pack/plugins/features/common/feature_kibana_privileges.ts
         privileges: {
           all: {
-            api: ['apm', 'apm_write'],
+            api: ['apm', 'apm_write', 'actions-read', 'alerting-read'],
             catalogue: ['apm'],
             savedObject: {
-              all: [],
+              all: ['action', 'action_task_params'],
               read: []
             },
-            ui: ['show', 'save']
+            ui: [
+              'show',
+              'save',
+              'alerting:show',
+              'actions:show',
+              'alerting:save',
+              'actions:save',
+              'alerting:delete',
+              'actions:delete'
+            ]
           },
           read: {
-            api: ['apm'],
+            api: ['apm', 'actions-read', 'alerting-read'],
             catalogue: ['apm'],
             savedObject: {
-              all: [],
+              all: ['action', 'action_task_params'],
               read: []
             },
-            ui: ['show']
+            ui: ['show', 'alerting:show', 'actions:show']
           }
         }
       });
diff --git a/x-pack/legacy/plugins/apm/public/components/app/APMIndicesPermission/__test__/APMIndicesPermission.test.tsx b/x-pack/legacy/plugins/apm/public/components/app/APMIndicesPermission/__test__/APMIndicesPermission.test.tsx
index c2c396d5b8951..68acaee4abe5d 100644
--- a/x-pack/legacy/plugins/apm/public/components/app/APMIndicesPermission/__test__/APMIndicesPermission.test.tsx
+++ b/x-pack/legacy/plugins/apm/public/components/app/APMIndicesPermission/__test__/APMIndicesPermission.test.tsx
@@ -11,9 +11,9 @@ import { APMIndicesPermission } from '../';
 import * as hooks from '../../../../hooks/useFetcher';
 import {
   expectTextsInDocument,
-  MockApmPluginContextWrapper,
   expectTextsNotInDocument
 } from '../../../../utils/testHelpers';
+import { MockApmPluginContextWrapper } from '../../../../context/ApmPluginContext/MockApmPluginContext';
 
 describe('APMIndicesPermission', () => {
   it('returns empty component when api status is loading', () => {
diff --git a/x-pack/legacy/plugins/apm/public/components/app/ErrorGroupOverview/List/__test__/List.test.tsx b/x-pack/legacy/plugins/apm/public/components/app/ErrorGroupOverview/List/__test__/List.test.tsx
index 68d19a41f33a4..a09482d663f65 100644
--- a/x-pack/legacy/plugins/apm/public/components/app/ErrorGroupOverview/List/__test__/List.test.tsx
+++ b/x-pack/legacy/plugins/apm/public/components/app/ErrorGroupOverview/List/__test__/List.test.tsx
@@ -9,25 +9,7 @@ import React from 'react';
 import { mockMoment, toJson } from '../../../../../utils/testHelpers';
 import { ErrorGroupList } from '../index';
 import props from './props.json';
-import { IUrlParams } from '../../../../../context/UrlParamsContext/types';
-import {
-  useUiFilters,
-  UrlParamsContext
-} from '../../../../../context/UrlParamsContext';
-
-const mockRefreshTimeRange = jest.fn();
-const MockUrlParamsProvider: React.FC<{
-  params?: IUrlParams;
-}> = ({ params = props.urlParams, children }) => (
-  <UrlParamsContext.Provider
-    value={{
-      urlParams: params,
-      refreshTimeRange: mockRefreshTimeRange,
-      uiFilters: useUiFilters(params)
-    }}
-    children={children}
-  />
-);
+import { MockUrlParamsContextProvider } from '../../../../../context/UrlParamsContext/MockUrlParamsContextProvider';
 
 describe('ErrorGroupOverview -> List', () => {
   beforeAll(() => {
@@ -37,9 +19,9 @@ describe('ErrorGroupOverview -> List', () => {
   it('should render empty state', () => {
     const storeState = {};
     const wrapper = mount(
-      <MockUrlParamsProvider>
+      <MockUrlParamsContextProvider>
         <ErrorGroupList items={[]} />
-      </MockUrlParamsProvider>,
+      </MockUrlParamsContextProvider>,
       storeState
     );
 
@@ -48,9 +30,9 @@ describe('ErrorGroupOverview -> List', () => {
 
   it('should render with data', () => {
     const wrapper = mount(
-      <MockUrlParamsProvider>
+      <MockUrlParamsContextProvider>
         <ErrorGroupList items={props.items} />
-      </MockUrlParamsProvider>
+      </MockUrlParamsContextProvider>
     );
 
     expect(toJson(wrapper)).toMatchSnapshot();
diff --git a/x-pack/legacy/plugins/apm/public/components/app/ErrorGroupOverview/List/__test__/props.json b/x-pack/legacy/plugins/apm/public/components/app/ErrorGroupOverview/List/__test__/props.json
index 92198220628d1..431a6c71b103b 100644
--- a/x-pack/legacy/plugins/apm/public/components/app/ErrorGroupOverview/List/__test__/props.json
+++ b/x-pack/legacy/plugins/apm/public/components/app/ErrorGroupOverview/List/__test__/props.json
@@ -1,11 +1,4 @@
 {
-  "urlParams": {
-    "page": 0,
-    "serviceName": "opbeans-python",
-    "transactionType": "request",
-    "start": "2018-01-10T09:51:41.050Z",
-    "end": "2018-01-10T10:06:41.050Z"
-  },
   "items": [
     {
       "message": "About to blow up!",
diff --git a/x-pack/legacy/plugins/apm/public/components/app/Home/Home.test.tsx b/x-pack/legacy/plugins/apm/public/components/app/Home/Home.test.tsx
index 711290942cea1..ab4ca1dfbb49d 100644
--- a/x-pack/legacy/plugins/apm/public/components/app/Home/Home.test.tsx
+++ b/x-pack/legacy/plugins/apm/public/components/app/Home/Home.test.tsx
@@ -7,7 +7,7 @@
 import { shallow } from 'enzyme';
 import React from 'react';
 import { Home } from '../Home';
-import { MockApmPluginContextWrapper } from '../../../utils/testHelpers';
+import { MockApmPluginContextWrapper } from '../../../context/ApmPluginContext/MockApmPluginContext';
 
 describe('Home component', () => {
   it('should render services', () => {
diff --git a/x-pack/legacy/plugins/apm/public/components/app/Main/UpdateBreadcrumbs.test.tsx b/x-pack/legacy/plugins/apm/public/components/app/Main/UpdateBreadcrumbs.test.tsx
index 5bf8cb8271fa4..e610f3b84899b 100644
--- a/x-pack/legacy/plugins/apm/public/components/app/Main/UpdateBreadcrumbs.test.tsx
+++ b/x-pack/legacy/plugins/apm/public/components/app/Main/UpdateBreadcrumbs.test.tsx
@@ -8,12 +8,12 @@ import { mount } from 'enzyme';
 import React from 'react';
 import { MemoryRouter } from 'react-router-dom';
 import { ApmPluginContextValue } from '../../../context/ApmPluginContext';
-import {
-  mockApmPluginContextValue,
-  MockApmPluginContextWrapper
-} from '../../../utils/testHelpers';
 import { routes } from './route_config';
 import { UpdateBreadcrumbs } from './UpdateBreadcrumbs';
+import {
+  MockApmPluginContextWrapper,
+  mockApmPluginContextValue
+} from '../../../context/ApmPluginContext/MockApmPluginContext';
 
 const setBreadcrumbs = jest.fn();
 
diff --git a/x-pack/legacy/plugins/apm/public/components/app/ServiceDetails/AlertIntegrations/AlertingFlyout/index.tsx b/x-pack/legacy/plugins/apm/public/components/app/ServiceDetails/AlertIntegrations/AlertingFlyout/index.tsx
new file mode 100644
index 0000000000000..7e8d057a7be6c
--- /dev/null
+++ b/x-pack/legacy/plugins/apm/public/components/app/ServiceDetails/AlertIntegrations/AlertingFlyout/index.tsx
@@ -0,0 +1,30 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+import React from 'react';
+import { AlertType } from '../../../../../../../../../plugins/apm/common/alert_types';
+import { AlertAdd } from '../../../../../../../../../plugins/triggers_actions_ui/public';
+
+type AlertAddProps = React.ComponentProps<typeof AlertAdd>;
+
+interface Props {
+  addFlyoutVisible: AlertAddProps['addFlyoutVisible'];
+  setAddFlyoutVisibility: AlertAddProps['setAddFlyoutVisibility'];
+  alertType: AlertType | null;
+}
+
+export function AlertingFlyout(props: Props) {
+  const { addFlyoutVisible, setAddFlyoutVisibility, alertType } = props;
+
+  return alertType ? (
+    <AlertAdd
+      addFlyoutVisible={addFlyoutVisible}
+      setAddFlyoutVisibility={setAddFlyoutVisibility}
+      consumer="apm"
+      alertTypeId={alertType}
+      canChangeTrigger={false}
+    />
+  ) : null;
+}
diff --git a/x-pack/legacy/plugins/apm/public/components/app/ServiceDetails/AlertIntegrations/index.tsx b/x-pack/legacy/plugins/apm/public/components/app/ServiceDetails/AlertIntegrations/index.tsx
new file mode 100644
index 0000000000000..92b325ab00d35
--- /dev/null
+++ b/x-pack/legacy/plugins/apm/public/components/app/ServiceDetails/AlertIntegrations/index.tsx
@@ -0,0 +1,146 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * 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,
+  EuiContextMenu,
+  EuiPopover,
+  EuiContextMenuPanelDescriptor
+} from '@elastic/eui';
+import { i18n } from '@kbn/i18n';
+import React, { useState } from 'react';
+import { AlertType } from '../../../../../../../../plugins/apm/common/alert_types';
+import { AlertingFlyout } from './AlertingFlyout';
+import { useApmPluginContext } from '../../../../hooks/useApmPluginContext';
+
+const alertLabel = i18n.translate(
+  'xpack.apm.serviceDetails.alertsMenu.alerts',
+  {
+    defaultMessage: 'Alerts'
+  }
+);
+
+const createThresholdAlertLabel = i18n.translate(
+  'xpack.apm.serviceDetails.alertsMenu.createThresholdAlert',
+  {
+    defaultMessage: 'Create threshold alert'
+  }
+);
+
+const CREATE_THRESHOLD_ALERT_PANEL_ID = 'create_threshold';
+
+interface Props {
+  canReadAlerts: boolean;
+  canSaveAlerts: boolean;
+}
+
+export function AlertIntegrations(props: Props) {
+  const { canSaveAlerts, canReadAlerts } = props;
+
+  const plugin = useApmPluginContext();
+
+  const [popoverOpen, setPopoverOpen] = useState(false);
+
+  const [alertType, setAlertType] = useState<AlertType | null>(null);
+
+  const button = (
+    <EuiButtonEmpty
+      iconType="arrowDown"
+      iconSide="right"
+      onClick={() => setPopoverOpen(true)}
+    >
+      {i18n.translate('xpack.apm.serviceDetails.alertsMenu.alerts', {
+        defaultMessage: 'Alerts'
+      })}
+    </EuiButtonEmpty>
+  );
+
+  const panels: EuiContextMenuPanelDescriptor[] = [
+    {
+      id: 0,
+      title: alertLabel,
+      items: [
+        ...(canSaveAlerts
+          ? [
+              {
+                name: createThresholdAlertLabel,
+                panel: CREATE_THRESHOLD_ALERT_PANEL_ID,
+                icon: 'bell'
+              }
+            ]
+          : []),
+        ...(canReadAlerts
+          ? [
+              {
+                name: i18n.translate(
+                  'xpack.apm.serviceDetails.alertsMenu.viewActiveAlerts',
+                  {
+                    defaultMessage: 'View active alerts'
+                  }
+                ),
+                href: plugin.core.http.basePath.prepend(
+                  '/app/kibana#/management/kibana/triggersActions/alerts'
+                ),
+                icon: 'tableOfContents'
+              }
+            ]
+          : [])
+      ]
+    },
+    {
+      id: CREATE_THRESHOLD_ALERT_PANEL_ID,
+      title: createThresholdAlertLabel,
+      items: [
+        {
+          name: i18n.translate(
+            'xpack.apm.serviceDetails.alertsMenu.transactionDuration',
+            {
+              defaultMessage: 'Transaction duration'
+            }
+          ),
+          onClick: () => {
+            setAlertType(AlertType.TransactionDuration);
+          }
+        },
+        {
+          name: i18n.translate(
+            'xpack.apm.serviceDetails.alertsMenu.errorRate',
+            {
+              defaultMessage: 'Error rate'
+            }
+          ),
+          onClick: () => {
+            setAlertType(AlertType.ErrorRate);
+          }
+        }
+      ]
+    }
+  ];
+
+  return (
+    <>
+      <EuiPopover
+        id="integrations-menu"
+        button={button}
+        isOpen={popoverOpen}
+        closePopover={() => setPopoverOpen(false)}
+        panelPaddingSize="none"
+        anchorPosition="downRight"
+      >
+        <EuiContextMenu initialPanelId={0} panels={panels} />
+      </EuiPopover>
+      <AlertingFlyout
+        alertType={alertType}
+        addFlyoutVisible={!!alertType}
+        setAddFlyoutVisibility={visible => {
+          if (!visible) {
+            setAlertType(null);
+          }
+        }}
+      />
+    </>
+  );
+}
diff --git a/x-pack/legacy/plugins/apm/public/components/app/ServiceDetails/index.tsx b/x-pack/legacy/plugins/apm/public/components/app/ServiceDetails/index.tsx
index ac7dfd49d4f3d..77ae67b71e1b6 100644
--- a/x-pack/legacy/plugins/apm/public/components/app/ServiceDetails/index.tsx
+++ b/x-pack/legacy/plugins/apm/public/components/app/ServiceDetails/index.tsx
@@ -10,15 +10,27 @@ import { ApmHeader } from '../../shared/ApmHeader';
 import { ServiceDetailTabs } from './ServiceDetailTabs';
 import { ServiceIntegrations } from './ServiceIntegrations';
 import { useUrlParams } from '../../../hooks/useUrlParams';
+import { AlertIntegrations } from './AlertIntegrations';
+import { useApmPluginContext } from '../../../hooks/useApmPluginContext';
 
 interface Props {
   tab: React.ComponentProps<typeof ServiceDetailTabs>['tab'];
 }
 
 export function ServiceDetails({ tab }: Props) {
+  const plugin = useApmPluginContext();
   const { urlParams } = useUrlParams();
   const { serviceName } = urlParams;
 
+  const canReadAlerts = !!plugin.core.application.capabilities.apm[
+    'alerting:show'
+  ];
+  const canSaveAlerts = !!plugin.core.application.capabilities.apm[
+    'alerting:save'
+  ];
+
+  const isAlertingAvailable = canReadAlerts || canSaveAlerts;
+
   return (
     <div>
       <ApmHeader>
@@ -31,6 +43,14 @@ export function ServiceDetails({ tab }: Props) {
           <EuiFlexItem grow={false}>
             <ServiceIntegrations urlParams={urlParams} />
           </EuiFlexItem>
+          {isAlertingAvailable && (
+            <EuiFlexItem grow={false}>
+              <AlertIntegrations
+                canReadAlerts={canReadAlerts}
+                canSaveAlerts={canSaveAlerts}
+              />
+            </EuiFlexItem>
+          )}
         </EuiFlexGroup>
       </ApmHeader>
 
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 7a066b520cc3b..46754c8c7cb6b 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
@@ -194,6 +194,7 @@ storiesOf('app/ServiceMap/Cytoscape', module)
       const height = 640;
       const width = 1340;
       const serviceName = undefined; // global service map
+
       return (
         <Cytoscape
           elements={elementsFromResponses}
diff --git a/x-pack/legacy/plugins/apm/public/components/app/ServiceMap/EmptyBanner.test.tsx b/x-pack/legacy/plugins/apm/public/components/app/ServiceMap/EmptyBanner.test.tsx
index d61dea80666a0..f05ff0246b9e4 100644
--- a/x-pack/legacy/plugins/apm/public/components/app/ServiceMap/EmptyBanner.test.tsx
+++ b/x-pack/legacy/plugins/apm/public/components/app/ServiceMap/EmptyBanner.test.tsx
@@ -7,9 +7,9 @@
 import { act, render, wait } from '@testing-library/react';
 import cytoscape from 'cytoscape';
 import React, { FunctionComponent } from 'react';
-import { MockApmPluginContextWrapper } from '../../../utils/testHelpers';
 import { CytoscapeContext } from './Cytoscape';
 import { EmptyBanner } from './EmptyBanner';
+import { MockApmPluginContextWrapper } from '../../../context/ApmPluginContext/MockApmPluginContext';
 
 const cy = cytoscape({});
 
diff --git a/x-pack/legacy/plugins/apm/public/components/app/ServiceMap/index.test.tsx b/x-pack/legacy/plugins/apm/public/components/app/ServiceMap/index.test.tsx
index 926f53954e7c6..d93caa601f0b6 100644
--- a/x-pack/legacy/plugins/apm/public/components/app/ServiceMap/index.test.tsx
+++ b/x-pack/legacy/plugins/apm/public/components/app/ServiceMap/index.test.tsx
@@ -8,8 +8,8 @@ import { render } from '@testing-library/react';
 import React, { FunctionComponent } from 'react';
 import { License } from '../../../../../../../plugins/licensing/common/license';
 import { LicenseContext } from '../../../context/LicenseContext';
-import { MockApmPluginContextWrapper } from '../../../utils/testHelpers';
 import { ServiceMap } from './';
+import { MockApmPluginContextWrapper } from '../../../context/ApmPluginContext/MockApmPluginContext';
 
 const expiredLicense = new License({
   signature: 'test signature',
diff --git a/x-pack/legacy/plugins/apm/public/components/app/ServiceNodeMetrics/index.test.tsx b/x-pack/legacy/plugins/apm/public/components/app/ServiceNodeMetrics/index.test.tsx
index 0ec9e90a31659..eced7457318d8 100644
--- a/x-pack/legacy/plugins/apm/public/components/app/ServiceNodeMetrics/index.test.tsx
+++ b/x-pack/legacy/plugins/apm/public/components/app/ServiceNodeMetrics/index.test.tsx
@@ -7,7 +7,7 @@
 import React from 'react';
 import { shallow } from 'enzyme';
 import { ServiceNodeMetrics } from '.';
-import { MockApmPluginContextWrapper } from '../../../utils/testHelpers';
+import { MockApmPluginContextWrapper } from '../../../context/ApmPluginContext/MockApmPluginContext';
 
 describe('ServiceNodeMetrics', () => {
   describe('render', () => {
diff --git a/x-pack/legacy/plugins/apm/public/components/app/ServiceOverview/__test__/ServiceOverview.test.tsx b/x-pack/legacy/plugins/apm/public/components/app/ServiceOverview/__test__/ServiceOverview.test.tsx
index 241f272b54a1d..b286d33ca74e9 100644
--- a/x-pack/legacy/plugins/apm/public/components/app/ServiceOverview/__test__/ServiceOverview.test.tsx
+++ b/x-pack/legacy/plugins/apm/public/components/app/ServiceOverview/__test__/ServiceOverview.test.tsx
@@ -11,11 +11,11 @@ import * as urlParamsHooks from '../../../../hooks/useUrlParams';
 import * as useLocalUIFilters from '../../../../hooks/useLocalUIFilters';
 import { FETCH_STATUS } from '../../../../hooks/useFetcher';
 import { SessionStorageMock } from '../../../../services/__test__/SessionStorageMock';
+import { ApmPluginContextValue } from '../../../../context/ApmPluginContext';
 import {
   MockApmPluginContextWrapper,
   mockApmPluginContextValue
-} from '../../../../utils/testHelpers';
-import { ApmPluginContextValue } from '../../../../context/ApmPluginContext';
+} from '../../../../context/ApmPluginContext/MockApmPluginContext';
 
 jest.mock('ui/new_platform');
 
diff --git a/x-pack/legacy/plugins/apm/public/components/app/Settings/ApmIndices/index.test.tsx b/x-pack/legacy/plugins/apm/public/components/app/Settings/ApmIndices/index.test.tsx
index fd71bf9709ce9..272c4b3add415 100644
--- a/x-pack/legacy/plugins/apm/public/components/app/Settings/ApmIndices/index.test.tsx
+++ b/x-pack/legacy/plugins/apm/public/components/app/Settings/ApmIndices/index.test.tsx
@@ -7,8 +7,8 @@
 import { render, wait } from '@testing-library/react';
 import React from 'react';
 import { ApmIndices } from '.';
-import { MockApmPluginContextWrapper } from '../../../../utils/testHelpers';
 import * as hooks from '../../../../hooks/useFetcher';
+import { MockApmPluginContextWrapper } from '../../../../context/ApmPluginContext/MockApmPluginContext';
 
 describe('ApmIndices', () => {
   it('should not get stuck in infinite loop', async () => {
diff --git a/x-pack/legacy/plugins/apm/public/components/app/Settings/CustomizeUI/CustomLink/index.test.tsx b/x-pack/legacy/plugins/apm/public/components/app/Settings/CustomizeUI/CustomLink/index.test.tsx
index 7c39356189891..b5bee5a5a1ebb 100644
--- a/x-pack/legacy/plugins/apm/public/components/app/Settings/CustomizeUI/CustomLink/index.test.tsx
+++ b/x-pack/legacy/plugins/apm/public/components/app/Settings/CustomizeUI/CustomLink/index.test.tsx
@@ -13,11 +13,11 @@ import * as hooks from '../../../../../hooks/useFetcher';
 import { LicenseContext } from '../../../../../context/LicenseContext';
 import { CustomLinkOverview } from '.';
 import {
-  MockApmPluginContextWrapper,
   expectTextsInDocument,
   expectTextsNotInDocument
 } from '../../../../../utils/testHelpers';
 import * as saveCustomLink from './CustomLinkFlyout/saveCustomLink';
+import { MockApmPluginContextWrapper } from '../../../../../context/ApmPluginContext/MockApmPluginContext';
 
 const data = [
   {
diff --git a/x-pack/legacy/plugins/apm/public/components/app/TraceLink/__test__/TraceLink.test.tsx b/x-pack/legacy/plugins/apm/public/components/app/TraceLink/__test__/TraceLink.test.tsx
index fe58fc39c6cfa..b8d6d9818eb2c 100644
--- a/x-pack/legacy/plugins/apm/public/components/app/TraceLink/__test__/TraceLink.test.tsx
+++ b/x-pack/legacy/plugins/apm/public/components/app/TraceLink/__test__/TraceLink.test.tsx
@@ -9,7 +9,7 @@ import React from 'react';
 import { TraceLink } from '../';
 import * as hooks from '../../../../hooks/useFetcher';
 import * as urlParamsHooks from '../../../../hooks/useUrlParams';
-import { MockApmPluginContextWrapper } from '../../../../utils/testHelpers';
+import { MockApmPluginContextWrapper } from '../../../../context/ApmPluginContext/MockApmPluginContext';
 
 const renderOptions = { wrapper: MockApmPluginContextWrapper };
 
diff --git a/x-pack/legacy/plugins/apm/public/components/app/TransactionOverview/__jest__/TransactionOverview.test.tsx b/x-pack/legacy/plugins/apm/public/components/app/TransactionOverview/__jest__/TransactionOverview.test.tsx
index 882682f1f6760..22cbeee5c6b7c 100644
--- a/x-pack/legacy/plugins/apm/public/components/app/TransactionOverview/__jest__/TransactionOverview.test.tsx
+++ b/x-pack/legacy/plugins/apm/public/components/app/TransactionOverview/__jest__/TransactionOverview.test.tsx
@@ -22,7 +22,7 @@ import * as useFetcherHook from '../../../../hooks/useFetcher';
 import { fromQuery } from '../../../shared/Links/url_helpers';
 import { Router } from 'react-router-dom';
 import { UrlParamsProvider } from '../../../../context/UrlParamsContext';
-import { MockApmPluginContextWrapper } from '../../../../utils/testHelpers';
+import { MockApmPluginContextWrapper } from '../../../../context/ApmPluginContext/MockApmPluginContext';
 
 jest.spyOn(history, 'push');
 jest.spyOn(history, 'replace');
diff --git a/x-pack/legacy/plugins/apm/public/components/shared/ErrorRateAlertTrigger/index.stories.tsx b/x-pack/legacy/plugins/apm/public/components/shared/ErrorRateAlertTrigger/index.stories.tsx
new file mode 100644
index 0000000000000..4ef8de7c2b208
--- /dev/null
+++ b/x-pack/legacy/plugins/apm/public/components/shared/ErrorRateAlertTrigger/index.stories.tsx
@@ -0,0 +1,26 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { storiesOf } from '@storybook/react';
+import React from 'react';
+import { ErrorRateAlertTrigger } from '.';
+
+storiesOf('app/ErrorRateAlertTrigger', module).add('example', props => {
+  const params = {
+    threshold: 2,
+    window: '5m'
+  };
+
+  return (
+    <div style={{ width: 400 }}>
+      <ErrorRateAlertTrigger
+        alertParams={params as any}
+        setAlertParams={() => undefined}
+        setAlertProperty={() => undefined}
+      />
+    </div>
+  );
+});
diff --git a/x-pack/legacy/plugins/apm/public/components/shared/ErrorRateAlertTrigger/index.tsx b/x-pack/legacy/plugins/apm/public/components/shared/ErrorRateAlertTrigger/index.tsx
new file mode 100644
index 0000000000000..6d0a2b96092a1
--- /dev/null
+++ b/x-pack/legacy/plugins/apm/public/components/shared/ErrorRateAlertTrigger/index.tsx
@@ -0,0 +1,84 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+import React from 'react';
+import { EuiFieldNumber } from '@elastic/eui';
+import { i18n } from '@kbn/i18n';
+import { ForLastExpression } from '../../../../../../../plugins/triggers_actions_ui/public';
+import { ALERT_TYPES_CONFIG } from '../../../../../../../plugins/apm/common/alert_types';
+import { ServiceAlertTrigger } from '../ServiceAlertTrigger';
+import { PopoverExpression } from '../ServiceAlertTrigger/PopoverExpression';
+
+export interface ErrorRateAlertTriggerParams {
+  windowSize: number;
+  windowUnit: string;
+  threshold: number;
+}
+
+interface Props {
+  alertParams: ErrorRateAlertTriggerParams;
+  setAlertParams: (key: string, value: any) => void;
+  setAlertProperty: (key: string, value: any) => void;
+}
+
+export function ErrorRateAlertTrigger(props: Props) {
+  const { setAlertParams, setAlertProperty, alertParams } = props;
+
+  const defaults = {
+    threshold: 25,
+    windowSize: 1,
+    windowUnit: 'm'
+  };
+
+  const params = {
+    ...defaults,
+    ...alertParams
+  };
+
+  const fields = [
+    <PopoverExpression
+      title={i18n.translate('xpack.apm.errorRateAlertTrigger.isAbove', {
+        defaultMessage: 'is above'
+      })}
+      value={params.threshold.toString()}
+    >
+      <EuiFieldNumber
+        value={alertParams.threshold ?? ''}
+        step={0}
+        onChange={e =>
+          setAlertParams('threshold', parseInt(e.target.value, 10))
+        }
+        compressed
+        append={i18n.translate('xpack.apm.errorRateAlertTrigger.errors', {
+          defaultMessage: 'errors'
+        })}
+      />
+    </PopoverExpression>,
+    <ForLastExpression
+      onChangeWindowSize={windowSize =>
+        setAlertParams('windowSize', windowSize)
+      }
+      onChangeWindowUnit={windowUnit =>
+        setAlertParams('windowUnit', windowUnit)
+      }
+      timeWindowSize={params.windowSize}
+      timeWindowUnit={params.windowUnit}
+      errors={{
+        timeWindowSize: [],
+        timeWindowUnit: []
+      }}
+    />
+  ];
+
+  return (
+    <ServiceAlertTrigger
+      alertTypeName={ALERT_TYPES_CONFIG['apm.error_rate'].name}
+      defaults={defaults}
+      fields={fields}
+      setAlertParams={setAlertParams}
+      setAlertProperty={setAlertProperty}
+    />
+  );
+}
diff --git a/x-pack/legacy/plugins/apm/public/components/shared/MetadataTable/ErrorMetadata/__test__/ErrorMetadata.test.tsx b/x-pack/legacy/plugins/apm/public/components/shared/MetadataTable/ErrorMetadata/__test__/ErrorMetadata.test.tsx
index 0c60d523b8f3f..258788252379a 100644
--- a/x-pack/legacy/plugins/apm/public/components/shared/MetadataTable/ErrorMetadata/__test__/ErrorMetadata.test.tsx
+++ b/x-pack/legacy/plugins/apm/public/components/shared/MetadataTable/ErrorMetadata/__test__/ErrorMetadata.test.tsx
@@ -10,9 +10,9 @@ import { render } from '@testing-library/react';
 import { APMError } from '../../../../../../../../../plugins/apm/typings/es_schemas/ui/apm_error';
 import {
   expectTextsInDocument,
-  expectTextsNotInDocument,
-  MockApmPluginContextWrapper
+  expectTextsNotInDocument
 } from '../../../../../utils/testHelpers';
+import { MockApmPluginContextWrapper } from '../../../../../context/ApmPluginContext/MockApmPluginContext';
 
 const renderOptions = {
   wrapper: MockApmPluginContextWrapper
diff --git a/x-pack/legacy/plugins/apm/public/components/shared/MetadataTable/SpanMetadata/__test__/SpanMetadata.test.tsx b/x-pack/legacy/plugins/apm/public/components/shared/MetadataTable/SpanMetadata/__test__/SpanMetadata.test.tsx
index ee66636d88ba9..0059b7b8fb4b3 100644
--- a/x-pack/legacy/plugins/apm/public/components/shared/MetadataTable/SpanMetadata/__test__/SpanMetadata.test.tsx
+++ b/x-pack/legacy/plugins/apm/public/components/shared/MetadataTable/SpanMetadata/__test__/SpanMetadata.test.tsx
@@ -10,9 +10,9 @@ import { SpanMetadata } from '..';
 import { Span } from '../../../../../../../../../plugins/apm/typings/es_schemas/ui/span';
 import {
   expectTextsInDocument,
-  expectTextsNotInDocument,
-  MockApmPluginContextWrapper
+  expectTextsNotInDocument
 } from '../../../../../utils/testHelpers';
+import { MockApmPluginContextWrapper } from '../../../../../context/ApmPluginContext/MockApmPluginContext';
 
 const renderOptions = {
   wrapper: MockApmPluginContextWrapper
diff --git a/x-pack/legacy/plugins/apm/public/components/shared/MetadataTable/TransactionMetadata/__test__/TransactionMetadata.test.tsx b/x-pack/legacy/plugins/apm/public/components/shared/MetadataTable/TransactionMetadata/__test__/TransactionMetadata.test.tsx
index f426074fbef80..3d78f36db9786 100644
--- a/x-pack/legacy/plugins/apm/public/components/shared/MetadataTable/TransactionMetadata/__test__/TransactionMetadata.test.tsx
+++ b/x-pack/legacy/plugins/apm/public/components/shared/MetadataTable/TransactionMetadata/__test__/TransactionMetadata.test.tsx
@@ -10,9 +10,9 @@ import { render } from '@testing-library/react';
 import { Transaction } from '../../../../../../../../../plugins/apm/typings/es_schemas/ui/transaction';
 import {
   expectTextsInDocument,
-  expectTextsNotInDocument,
-  MockApmPluginContextWrapper
+  expectTextsNotInDocument
 } from '../../../../../utils/testHelpers';
+import { MockApmPluginContextWrapper } from '../../../../../context/ApmPluginContext/MockApmPluginContext';
 
 const renderOptions = {
   wrapper: MockApmPluginContextWrapper
diff --git a/x-pack/legacy/plugins/apm/public/components/shared/MetadataTable/__test__/MetadataTable.test.tsx b/x-pack/legacy/plugins/apm/public/components/shared/MetadataTable/__test__/MetadataTable.test.tsx
index 979b9118a7534..96202525c8661 100644
--- a/x-pack/legacy/plugins/apm/public/components/shared/MetadataTable/__test__/MetadataTable.test.tsx
+++ b/x-pack/legacy/plugins/apm/public/components/shared/MetadataTable/__test__/MetadataTable.test.tsx
@@ -7,11 +7,9 @@
 import React from 'react';
 import { render } from '@testing-library/react';
 import { MetadataTable } from '..';
-import {
-  expectTextsInDocument,
-  MockApmPluginContextWrapper
-} from '../../../../utils/testHelpers';
+import { expectTextsInDocument } from '../../../../utils/testHelpers';
 import { SectionsWithRows } from '../helper';
+import { MockApmPluginContextWrapper } from '../../../../context/ApmPluginContext/MockApmPluginContext';
 
 const renderOptions = {
   wrapper: MockApmPluginContextWrapper
diff --git a/x-pack/legacy/plugins/apm/public/components/shared/ServiceAlertTrigger/PopoverExpression/index.tsx b/x-pack/legacy/plugins/apm/public/components/shared/ServiceAlertTrigger/PopoverExpression/index.tsx
new file mode 100644
index 0000000000000..1abdb94c8313e
--- /dev/null
+++ b/x-pack/legacy/plugins/apm/public/components/shared/ServiceAlertTrigger/PopoverExpression/index.tsx
@@ -0,0 +1,39 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React, { useState } from 'react';
+import { EuiExpression, EuiPopover } from '@elastic/eui';
+
+interface Props {
+  title: string;
+  value: string;
+  children?: React.ReactNode;
+}
+
+export const PopoverExpression = (props: Props) => {
+  const { title, value, children } = props;
+
+  const [popoverOpen, setPopoverOpen] = useState(false);
+
+  return (
+    <EuiPopover
+      isOpen={popoverOpen}
+      withTitle
+      anchorPosition="downLeft"
+      closePopover={() => setPopoverOpen(false)}
+      button={
+        <EuiExpression
+          description={title}
+          value={value}
+          isActive={popoverOpen}
+          onClick={() => setPopoverOpen(true)}
+        />
+      }
+    >
+      {children}
+    </EuiPopover>
+  );
+};
diff --git a/x-pack/legacy/plugins/apm/public/components/shared/ServiceAlertTrigger/index.tsx b/x-pack/legacy/plugins/apm/public/components/shared/ServiceAlertTrigger/index.tsx
new file mode 100644
index 0000000000000..98391b277caf6
--- /dev/null
+++ b/x-pack/legacy/plugins/apm/public/components/shared/ServiceAlertTrigger/index.tsx
@@ -0,0 +1,61 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React, { useEffect } from 'react';
+import { EuiSpacer, EuiFlexGrid, EuiFlexItem } from '@elastic/eui';
+import { useUrlParams } from '../../../hooks/useUrlParams';
+
+interface Props {
+  alertTypeName: string;
+  setAlertParams: (key: string, value: any) => void;
+  setAlertProperty: (key: string, value: any) => void;
+  defaults: Record<string, any>;
+  fields: React.ReactNode[];
+}
+
+export function ServiceAlertTrigger(props: Props) {
+  const { urlParams } = useUrlParams();
+
+  const {
+    fields,
+    setAlertParams,
+    setAlertProperty,
+    alertTypeName,
+    defaults
+  } = props;
+
+  const params: Record<string, any> = {
+    ...defaults,
+    serviceName: urlParams.serviceName!
+  };
+
+  useEffect(() => {
+    // we only want to run this on mount to set default values
+    setAlertProperty('name', `${alertTypeName} | ${params.serviceName}`);
+    setAlertProperty('tags', [
+      'apm',
+      `service.name:${params.serviceName}`.toLowerCase()
+    ]);
+    Object.keys(params).forEach(key => {
+      setAlertParams(key, params[key]);
+    });
+
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, []);
+  return (
+    <>
+      <EuiSpacer size="l" />
+      <EuiFlexGrid gutterSize="l" direction="row" columns={2}>
+        {fields.map((field, index) => (
+          <EuiFlexItem grow={false} key={index}>
+            {field}
+          </EuiFlexItem>
+        ))}
+      </EuiFlexGrid>
+      <EuiSpacer size="m" />
+    </>
+  );
+}
diff --git a/x-pack/legacy/plugins/apm/public/components/shared/TransactionActionMenu/__test__/TransactionActionMenu.test.tsx b/x-pack/legacy/plugins/apm/public/components/shared/TransactionActionMenu/__test__/TransactionActionMenu.test.tsx
index 9094662e34914..560884aec554a 100644
--- a/x-pack/legacy/plugins/apm/public/components/shared/TransactionActionMenu/__test__/TransactionActionMenu.test.tsx
+++ b/x-pack/legacy/plugins/apm/public/components/shared/TransactionActionMenu/__test__/TransactionActionMenu.test.tsx
@@ -10,13 +10,13 @@ import { TransactionActionMenu } from '../TransactionActionMenu';
 import { Transaction } from '../../../../../../../../plugins/apm/typings/es_schemas/ui/transaction';
 import * as Transactions from './mockData';
 import {
-  MockApmPluginContextWrapper,
   expectTextsNotInDocument,
   expectTextsInDocument
 } from '../../../../utils/testHelpers';
 import * as hooks from '../../../../hooks/useFetcher';
 import { LicenseContext } from '../../../../context/LicenseContext';
 import { License } from '../../../../../../../../plugins/licensing/common/license';
+import { MockApmPluginContextWrapper } from '../../../../context/ApmPluginContext/MockApmPluginContext';
 
 const renderTransaction = async (transaction: Record<string, any>) => {
   const rendered = render(
diff --git a/x-pack/legacy/plugins/apm/public/components/shared/TransactionDurationAlertTrigger/index.stories.tsx b/x-pack/legacy/plugins/apm/public/components/shared/TransactionDurationAlertTrigger/index.stories.tsx
new file mode 100644
index 0000000000000..a8f834103e6c1
--- /dev/null
+++ b/x-pack/legacy/plugins/apm/public/components/shared/TransactionDurationAlertTrigger/index.stories.tsx
@@ -0,0 +1,50 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+import { cloneDeep, merge } from 'lodash';
+import { storiesOf } from '@storybook/react';
+import React from 'react';
+import { TransactionDurationAlertTrigger } from '.';
+import {
+  MockApmPluginContextWrapper,
+  mockApmPluginContextValue
+} from '../../../context/ApmPluginContext/MockApmPluginContext';
+import { MockUrlParamsContextProvider } from '../../../context/UrlParamsContext/MockUrlParamsContextProvider';
+import { ApmPluginContextValue } from '../../../context/ApmPluginContext';
+
+storiesOf('app/TransactionDurationAlertTrigger', module).add(
+  'example',
+  context => {
+    const params = {
+      threshold: 1500,
+      aggregationType: 'avg' as const,
+      window: '5m'
+    };
+
+    const contextMock = (merge(cloneDeep(mockApmPluginContextValue), {
+      core: {
+        http: {
+          get: () => {
+            return Promise.resolve({ transactionTypes: ['request'] });
+          }
+        }
+      }
+    }) as unknown) as ApmPluginContextValue;
+
+    return (
+      <div style={{ width: 400 }}>
+        <MockApmPluginContextWrapper value={contextMock}>
+          <MockUrlParamsContextProvider>
+            <TransactionDurationAlertTrigger
+              alertParams={params as any}
+              setAlertParams={() => undefined}
+              setAlertProperty={() => undefined}
+            />
+          </MockUrlParamsContextProvider>
+        </MockApmPluginContextWrapper>
+      </div>
+    );
+  }
+);
diff --git a/x-pack/legacy/plugins/apm/public/components/shared/TransactionDurationAlertTrigger/index.tsx b/x-pack/legacy/plugins/apm/public/components/shared/TransactionDurationAlertTrigger/index.tsx
new file mode 100644
index 0000000000000..cdc7c30089b4f
--- /dev/null
+++ b/x-pack/legacy/plugins/apm/public/components/shared/TransactionDurationAlertTrigger/index.tsx
@@ -0,0 +1,149 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * 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 { map } from 'lodash';
+import { EuiFieldNumber, EuiSelect } from '@elastic/eui';
+import { i18n } from '@kbn/i18n';
+import { ForLastExpression } from '../../../../../../../plugins/triggers_actions_ui/public';
+import {
+  TRANSACTION_ALERT_AGGREGATION_TYPES,
+  ALERT_TYPES_CONFIG
+} from '../../../../../../../plugins/apm/common/alert_types';
+import { ServiceAlertTrigger } from '../ServiceAlertTrigger';
+import { useUrlParams } from '../../../hooks/useUrlParams';
+import { useServiceTransactionTypes } from '../../../hooks/useServiceTransactionTypes';
+import { PopoverExpression } from '../ServiceAlertTrigger/PopoverExpression';
+
+interface Params {
+  windowSize: number;
+  windowUnit: string;
+  threshold: number;
+  aggregationType: 'avg' | '95th' | '99th';
+  serviceName: string;
+  transactionType: string;
+}
+
+interface Props {
+  alertParams: Params;
+  setAlertParams: (key: string, value: any) => void;
+  setAlertProperty: (key: string, value: any) => void;
+}
+
+export function TransactionDurationAlertTrigger(props: Props) {
+  const { setAlertParams, alertParams, setAlertProperty } = props;
+
+  const { urlParams } = useUrlParams();
+
+  const transactionTypes = useServiceTransactionTypes(urlParams);
+
+  if (!transactionTypes.length) {
+    return null;
+  }
+
+  const defaults = {
+    threshold: 1500,
+    aggregationType: 'avg',
+    windowSize: 5,
+    windowUnit: 'm',
+    transactionType: transactionTypes[0]
+  };
+
+  const params = {
+    ...defaults,
+    ...alertParams
+  };
+
+  const fields = [
+    <PopoverExpression
+      value={params.transactionType}
+      title={i18n.translate('xpack.apm.transactionDurationAlertTrigger.type', {
+        defaultMessage: 'Type'
+      })}
+    >
+      <EuiSelect
+        value={params.transactionType}
+        options={transactionTypes.map(key => {
+          return {
+            text: key,
+            value: key
+          };
+        })}
+        onChange={e =>
+          setAlertParams(
+            'transactionType',
+            e.target.value as Params['transactionType']
+          )
+        }
+        compressed
+      />
+    </PopoverExpression>,
+    <PopoverExpression
+      value={params.aggregationType}
+      title={i18n.translate('xpack.apm.transactionDurationAlertTrigger.when', {
+        defaultMessage: 'When'
+      })}
+    >
+      <EuiSelect
+        value={params.aggregationType}
+        options={map(TRANSACTION_ALERT_AGGREGATION_TYPES, (label, key) => {
+          return {
+            text: label,
+            value: key
+          };
+        })}
+        onChange={e =>
+          setAlertParams(
+            'aggregationType',
+            e.target.value as Params['aggregationType']
+          )
+        }
+        compressed
+      />
+    </PopoverExpression>,
+    <PopoverExpression
+      value={params.threshold ? `${params.threshold}ms` : ''}
+      title={i18n.translate(
+        'xpack.apm.transactionDurationAlertTrigger.isAbove',
+        {
+          defaultMessage: 'is above'
+        }
+      )}
+    >
+      <EuiFieldNumber
+        value={params.threshold ?? ''}
+        onChange={e => setAlertParams('threshold', e.target.value)}
+        append={i18n.translate('xpack.apm.transactionDurationAlertTrigger.ms', {
+          defaultMessage: 'ms'
+        })}
+        compressed
+      />
+    </PopoverExpression>,
+    <ForLastExpression
+      onChangeWindowSize={timeWindowSize =>
+        setAlertParams('windowSize', timeWindowSize)
+      }
+      onChangeWindowUnit={timeWindowUnit =>
+        setAlertParams('windowUnit', timeWindowUnit)
+      }
+      timeWindowSize={params.windowSize}
+      timeWindowUnit={params.windowUnit}
+      errors={{
+        timeWindowSize: [],
+        timeWindowUnit: []
+      }}
+    />
+  ];
+
+  return (
+    <ServiceAlertTrigger
+      alertTypeName={ALERT_TYPES_CONFIG['apm.transaction_duration'].name}
+      fields={fields}
+      defaults={defaults}
+      setAlertParams={setAlertParams}
+      setAlertProperty={setAlertProperty}
+    />
+  );
+}
diff --git a/x-pack/legacy/plugins/apm/public/components/shared/charts/TransactionCharts/BrowserLineChart.test.tsx b/x-pack/legacy/plugins/apm/public/components/shared/charts/TransactionCharts/BrowserLineChart.test.tsx
index 6d3e29ec09985..9f112475a4a78 100644
--- a/x-pack/legacy/plugins/apm/public/components/shared/charts/TransactionCharts/BrowserLineChart.test.tsx
+++ b/x-pack/legacy/plugins/apm/public/components/shared/charts/TransactionCharts/BrowserLineChart.test.tsx
@@ -7,7 +7,7 @@
 import React from 'react';
 import { shallow } from 'enzyme';
 import { BrowserLineChart } from './BrowserLineChart';
-import { MockApmPluginContextWrapper } from '../../../../utils/testHelpers';
+import { MockApmPluginContextWrapper } from '../../../../context/ApmPluginContext/MockApmPluginContext';
 
 describe('BrowserLineChart', () => {
   describe('render', () => {
diff --git a/x-pack/legacy/plugins/apm/public/context/ApmPluginContext/MockApmPluginContext.tsx b/x-pack/legacy/plugins/apm/public/context/ApmPluginContext/MockApmPluginContext.tsx
new file mode 100644
index 0000000000000..8775dc98c3e1a
--- /dev/null
+++ b/x-pack/legacy/plugins/apm/public/context/ApmPluginContext/MockApmPluginContext.tsx
@@ -0,0 +1,63 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+import React from 'react';
+import { ApmPluginContext, ApmPluginContextValue } from '.';
+import { createCallApmApi } from '../../services/rest/createCallApmApi';
+import { ConfigSchema } from '../../new-platform/plugin';
+
+const mockCore = {
+  chrome: {
+    setBreadcrumbs: () => {}
+  },
+  http: {
+    basePath: {
+      prepend: (path: string) => `/basepath${path}`
+    }
+  },
+  notifications: {
+    toasts: {
+      addWarning: () => {},
+      addDanger: () => {}
+    }
+  }
+};
+
+const mockConfig: ConfigSchema = {
+  indexPatternTitle: 'apm-*',
+  serviceMapEnabled: true,
+  ui: {
+    enabled: false
+  }
+};
+
+export const mockApmPluginContextValue = {
+  config: mockConfig,
+  core: mockCore,
+  packageInfo: { version: '0' },
+  plugins: {}
+};
+
+export function MockApmPluginContextWrapper({
+  children,
+  value = {} as ApmPluginContextValue
+}: {
+  children?: React.ReactNode;
+  value?: ApmPluginContextValue;
+}) {
+  if (value.core?.http) {
+    createCallApmApi(value.core?.http);
+  }
+  return (
+    <ApmPluginContext.Provider
+      value={{
+        ...mockApmPluginContextValue,
+        ...value
+      }}
+    >
+      {children}
+    </ApmPluginContext.Provider>
+  );
+}
diff --git a/x-pack/legacy/plugins/apm/public/context/ApmPluginContext.tsx b/x-pack/legacy/plugins/apm/public/context/ApmPluginContext/index.tsx
similarity index 89%
rename from x-pack/legacy/plugins/apm/public/context/ApmPluginContext.tsx
rename to x-pack/legacy/plugins/apm/public/context/ApmPluginContext/index.tsx
index 7a9aaa6dfb920..d8934ba4b0151 100644
--- a/x-pack/legacy/plugins/apm/public/context/ApmPluginContext.tsx
+++ b/x-pack/legacy/plugins/apm/public/context/ApmPluginContext/index.tsx
@@ -6,7 +6,7 @@
 
 import { createContext } from 'react';
 import { AppMountContext, PackageInfo } from 'kibana/public';
-import { ApmPluginSetupDeps, ConfigSchema } from '../new-platform/plugin';
+import { ApmPluginSetupDeps, ConfigSchema } from '../../new-platform/plugin';
 
 export type AppMountContextBasePath = AppMountContext['core']['http']['basePath'];
 
diff --git a/x-pack/legacy/plugins/apm/public/context/UrlParamsContext/MockUrlParamsContextProvider.tsx b/x-pack/legacy/plugins/apm/public/context/UrlParamsContext/MockUrlParamsContextProvider.tsx
new file mode 100644
index 0000000000000..46f51da49692a
--- /dev/null
+++ b/x-pack/legacy/plugins/apm/public/context/UrlParamsContext/MockUrlParamsContextProvider.tsx
@@ -0,0 +1,40 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+import React from 'react';
+import { IUrlParams } from './types';
+import { UrlParamsContext, useUiFilters } from '.';
+
+const defaultUrlParams = {
+  page: 0,
+  serviceName: 'opbeans-python',
+  transactionType: 'request',
+  start: '2018-01-10T09:51:41.050Z',
+  end: '2018-01-10T10:06:41.050Z'
+};
+
+interface Props {
+  params?: IUrlParams;
+  children: React.ReactNode;
+  refreshTimeRange?: (time: any) => void;
+}
+
+export const MockUrlParamsContextProvider = ({
+  params,
+  children,
+  refreshTimeRange = () => undefined
+}: Props) => {
+  const urlParams = { ...defaultUrlParams, ...params };
+  return (
+    <UrlParamsContext.Provider
+      value={{
+        urlParams,
+        refreshTimeRange,
+        uiFilters: useUiFilters(urlParams)
+      }}
+      children={children}
+    />
+  );
+};
diff --git a/x-pack/legacy/plugins/apm/public/hooks/useFetcher.integration.test.tsx b/x-pack/legacy/plugins/apm/public/hooks/useFetcher.integration.test.tsx
index 8d8716e6e5cd7..8918d992b4f53 100644
--- a/x-pack/legacy/plugins/apm/public/hooks/useFetcher.integration.test.tsx
+++ b/x-pack/legacy/plugins/apm/public/hooks/useFetcher.integration.test.tsx
@@ -6,8 +6,9 @@
 
 import { render, wait } from '@testing-library/react';
 import React from 'react';
-import { delay, MockApmPluginContextWrapper } from '../utils/testHelpers';
+import { delay } from '../utils/testHelpers';
 import { useFetcher } from './useFetcher';
+import { MockApmPluginContextWrapper } from '../context/ApmPluginContext/MockApmPluginContext';
 
 const wrapper = MockApmPluginContextWrapper;
 
diff --git a/x-pack/legacy/plugins/apm/public/hooks/useFetcher.test.tsx b/x-pack/legacy/plugins/apm/public/hooks/useFetcher.test.tsx
index e3ef1d44c8b03..deb805c542b1e 100644
--- a/x-pack/legacy/plugins/apm/public/hooks/useFetcher.test.tsx
+++ b/x-pack/legacy/plugins/apm/public/hooks/useFetcher.test.tsx
@@ -5,8 +5,9 @@
  */
 
 import { renderHook } from '@testing-library/react-hooks';
-import { delay, MockApmPluginContextWrapper } from '../utils/testHelpers';
+import { delay } from '../utils/testHelpers';
 import { useFetcher } from './useFetcher';
+import { MockApmPluginContextWrapper } from '../context/ApmPluginContext/MockApmPluginContext';
 
 // Wrap the hook with a provider so it can useApmPluginContext
 const wrapper = MockApmPluginContextWrapper;
diff --git a/x-pack/legacy/plugins/apm/public/new-platform/plugin.tsx b/x-pack/legacy/plugins/apm/public/new-platform/plugin.tsx
index 0103dd72a3fea..f95767492d85b 100644
--- a/x-pack/legacy/plugins/apm/public/new-platform/plugin.tsx
+++ b/x-pack/legacy/plugins/apm/public/new-platform/plugin.tsx
@@ -10,6 +10,8 @@ import { Route, Router, Switch } from 'react-router-dom';
 import { ApmRoute } from '@elastic/apm-rum-react';
 import styled from 'styled-components';
 import { metadata } from 'ui/metadata';
+import { i18n } from '@kbn/i18n';
+import { AlertType } from '../../../../../plugins/apm/common/alert_types';
 import {
   CoreSetup,
   CoreStart,
@@ -39,6 +41,12 @@ import { toggleAppLinkInNav } from './toggleAppLinkInNav';
 import { setReadonlyBadge } from './updateBadge';
 import { KibanaContextProvider } from '../../../../../../src/plugins/kibana_react/public';
 import { APMIndicesPermission } from '../components/app/APMIndicesPermission';
+import {
+  TriggersAndActionsUIPublicPluginSetup,
+  AlertsContextProvider
+} from '../../../../../plugins/triggers_actions_ui/public';
+import { ErrorRateAlertTrigger } from '../components/shared/ErrorRateAlertTrigger';
+import { TransactionDurationAlertTrigger } from '../components/shared/TransactionDurationAlertTrigger';
 import { createCallApmApi } from '../services/rest/createCallApmApi';
 
 export const REACT_APP_ROOT_ID = 'react-apm-root';
@@ -72,6 +80,7 @@ export interface ApmPluginSetupDeps {
   data: DataPublicPluginSetup;
   home: HomePublicPluginSetup;
   licensing: LicensingPluginSetup;
+  triggers_actions_ui: TriggersAndActionsUIPublicPluginSetup;
 }
 
 export interface ConfigSchema {
@@ -135,25 +144,58 @@ export class ApmPlugin
       plugins
     };
 
+    plugins.triggers_actions_ui.alertTypeRegistry.register({
+      id: AlertType.ErrorRate,
+      name: i18n.translate('xpack.apm.alertTypes.errorRate', {
+        defaultMessage: 'Error rate'
+      }),
+      iconClass: 'bell',
+      alertParamsExpression: ErrorRateAlertTrigger,
+      validate: () => ({
+        errors: []
+      })
+    });
+
+    plugins.triggers_actions_ui.alertTypeRegistry.register({
+      id: AlertType.TransactionDuration,
+      name: i18n.translate('xpack.apm.alertTypes.transactionDuration', {
+        defaultMessage: 'Transaction duration'
+      }),
+      iconClass: 'bell',
+      alertParamsExpression: TransactionDurationAlertTrigger,
+      validate: () => ({
+        errors: []
+      })
+    });
+
     ReactDOM.render(
       <ApmPluginContext.Provider value={apmPluginContextValue}>
-        <KibanaContextProvider services={{ ...core, ...plugins }}>
-          <i18nCore.Context>
-            <Router history={history}>
-              <LocationProvider>
-                <MatchedRouteProvider routes={routes}>
-                  <UrlParamsProvider>
-                    <LoadingIndicatorProvider>
-                      <LicenseProvider>
-                        <App />
-                      </LicenseProvider>
-                    </LoadingIndicatorProvider>
-                  </UrlParamsProvider>
-                </MatchedRouteProvider>
-              </LocationProvider>
-            </Router>
-          </i18nCore.Context>
-        </KibanaContextProvider>
+        <AlertsContextProvider
+          value={{
+            http: core.http,
+            toastNotifications: core.notifications.toasts,
+            actionTypeRegistry: plugins.triggers_actions_ui.actionTypeRegistry,
+            alertTypeRegistry: plugins.triggers_actions_ui.alertTypeRegistry
+          }}
+        >
+          <KibanaContextProvider services={{ ...core, ...plugins }}>
+            <i18nCore.Context>
+              <Router history={history}>
+                <LocationProvider>
+                  <MatchedRouteProvider routes={routes}>
+                    <UrlParamsProvider>
+                      <LoadingIndicatorProvider>
+                        <LicenseProvider>
+                          <App />
+                        </LicenseProvider>
+                      </LoadingIndicatorProvider>
+                    </UrlParamsProvider>
+                  </MatchedRouteProvider>
+                </LocationProvider>
+              </Router>
+            </i18nCore.Context>
+          </KibanaContextProvider>
+        </AlertsContextProvider>
       </ApmPluginContext.Provider>,
       document.getElementById(REACT_APP_ROOT_ID)
     );
diff --git a/x-pack/legacy/plugins/apm/public/utils/testHelpers.tsx b/x-pack/legacy/plugins/apm/public/utils/testHelpers.tsx
index 6bcfbc4541b64..36c0e18777bfd 100644
--- a/x-pack/legacy/plugins/apm/public/utils/testHelpers.tsx
+++ b/x-pack/legacy/plugins/apm/public/utils/testHelpers.tsx
@@ -11,7 +11,7 @@ import enzymeToJson from 'enzyme-to-json';
 import { Location } from 'history';
 import moment from 'moment';
 import { Moment } from 'moment-timezone';
-import React, { ReactNode } from 'react';
+import React from 'react';
 import { render, waitForElement } from '@testing-library/react';
 import '@testing-library/jest-dom/extend-expect';
 import { MemoryRouter } from 'react-router-dom';
@@ -24,12 +24,7 @@ import {
   ESSearchResponse,
   ESSearchRequest
 } from '../../../../../plugins/apm/typings/elasticsearch';
-import {
-  ApmPluginContext,
-  ApmPluginContextValue
-} from '../context/ApmPluginContext';
-import { ConfigSchema } from '../new-platform/plugin';
-import { createCallApmApi } from '../services/rest/createCallApmApi';
+import { MockApmPluginContextWrapper } from '../context/ApmPluginContext/MockApmPluginContext';
 
 export function toJson(wrapper: ReactWrapper) {
   return enzymeToJson(wrapper, {
@@ -186,57 +181,3 @@ export async function inspectSearchParams(
 }
 
 export type SearchParamsMock = PromiseReturnType<typeof inspectSearchParams>;
-
-const mockCore = {
-  chrome: {
-    setBreadcrumbs: () => {}
-  },
-  http: {
-    basePath: {
-      prepend: (path: string) => `/basepath${path}`
-    }
-  },
-  notifications: {
-    toasts: {
-      addWarning: () => {},
-      addDanger: () => {}
-    }
-  }
-};
-
-const mockConfig: ConfigSchema = {
-  indexPatternTitle: 'apm-*',
-  serviceMapEnabled: true,
-  ui: {
-    enabled: false
-  }
-};
-
-export const mockApmPluginContextValue = {
-  config: mockConfig,
-  core: mockCore,
-  packageInfo: { version: '0' },
-  plugins: {}
-};
-
-export function MockApmPluginContextWrapper({
-  children,
-  value = {} as ApmPluginContextValue
-}: {
-  children?: ReactNode;
-  value?: ApmPluginContextValue;
-}) {
-  if (value.core?.http) {
-    createCallApmApi(value.core?.http);
-  }
-  return (
-    <ApmPluginContext.Provider
-      value={{
-        ...mockApmPluginContextValue,
-        ...value
-      }}
-    >
-      {children}
-    </ApmPluginContext.Provider>
-  );
-}
diff --git a/x-pack/plugins/apm/common/alert_types.ts b/x-pack/plugins/apm/common/alert_types.ts
new file mode 100644
index 0000000000000..51e1f88512965
--- /dev/null
+++ b/x-pack/plugins/apm/common/alert_types.ts
@@ -0,0 +1,67 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { i18n } from '@kbn/i18n';
+
+export enum AlertType {
+  ErrorRate = 'apm.error_rate',
+  TransactionDuration = 'apm.transaction_duration'
+}
+
+export const ALERT_TYPES_CONFIG = {
+  [AlertType.ErrorRate]: {
+    name: i18n.translate('xpack.apm.errorRateAlert.name', {
+      defaultMessage: 'Error rate threshold'
+    }),
+    actionGroups: [
+      {
+        id: 'threshold_met',
+        name: i18n.translate('xpack.apm.errorRateAlert.thresholdMet', {
+          defaultMessage: 'Threshold met'
+        })
+      }
+    ],
+    defaultActionGroupId: 'threshold_met'
+  },
+  [AlertType.TransactionDuration]: {
+    name: i18n.translate('xpack.apm.transactionDurationAlert.name', {
+      defaultMessage: 'Transaction duration threshold'
+    }),
+    actionGroups: [
+      {
+        id: 'threshold_met',
+        name: i18n.translate(
+          'xpack.apm.transactionDurationAlert.thresholdMet',
+          {
+            defaultMessage: 'Threshold met'
+          }
+        )
+      }
+    ],
+    defaultActionGroupId: 'threshold_met'
+  }
+};
+
+export const TRANSACTION_ALERT_AGGREGATION_TYPES = {
+  avg: i18n.translate(
+    'xpack.apm.transactionDurationAlert.aggregationType.avg',
+    {
+      defaultMessage: 'Average'
+    }
+  ),
+  '95th': i18n.translate(
+    'xpack.apm.transactionDurationAlert.aggregationType.95th',
+    {
+      defaultMessage: '95th percentile'
+    }
+  ),
+  '99th': i18n.translate(
+    'xpack.apm.transactionDurationAlert.aggregationType.99th',
+    {
+      defaultMessage: '99th percentile'
+    }
+  )
+};
diff --git a/x-pack/plugins/apm/kibana.json b/x-pack/plugins/apm/kibana.json
index 96579377c95e8..931fd92e1ecc3 100644
--- a/x-pack/plugins/apm/kibana.json
+++ b/x-pack/plugins/apm/kibana.json
@@ -6,5 +6,5 @@
   "configPath": ["xpack", "apm"],
   "ui": false,
   "requiredPlugins": ["apm_oss", "data", "home", "licensing"],
-  "optionalPlugins": ["cloud", "usageCollection"]
+  "optionalPlugins": ["cloud", "usageCollection", "taskManager","actions", "alerting"]
 }
diff --git a/x-pack/plugins/apm/server/lib/alerts/register_apm_alerts.ts b/x-pack/plugins/apm/server/lib/alerts/register_apm_alerts.ts
new file mode 100644
index 0000000000000..cb3dd761040da
--- /dev/null
+++ b/x-pack/plugins/apm/server/lib/alerts/register_apm_alerts.ts
@@ -0,0 +1,29 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * 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 { AlertingPlugin } from '../../../../alerting/server';
+import { ActionsPlugin } from '../../../../actions/server';
+import { registerTransactionDurationAlertType } from './register_transaction_duration_alert_type';
+import { registerErrorRateAlertType } from './register_error_rate_alert_type';
+import { APMConfig } from '../..';
+
+interface Params {
+  alerting: AlertingPlugin['setup'];
+  actions: ActionsPlugin['setup'];
+  config$: Observable<APMConfig>;
+}
+
+export function registerApmAlerts(params: Params) {
+  registerTransactionDurationAlertType({
+    alerting: params.alerting,
+    config$: params.config$
+  });
+  registerErrorRateAlertType({
+    alerting: params.alerting,
+    config$: params.config$
+  });
+}
diff --git a/x-pack/plugins/apm/server/lib/alerts/register_error_rate_alert_type.ts b/x-pack/plugins/apm/server/lib/alerts/register_error_rate_alert_type.ts
new file mode 100644
index 0000000000000..187a75d0b61f2
--- /dev/null
+++ b/x-pack/plugins/apm/server/lib/alerts/register_error_rate_alert_type.ts
@@ -0,0 +1,108 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { schema, TypeOf } from '@kbn/config-schema';
+import { Observable } from 'rxjs';
+import { take } from 'rxjs/operators';
+import { AlertType, ALERT_TYPES_CONFIG } from '../../../common/alert_types';
+import {
+  ESSearchResponse,
+  ESSearchRequest
+} from '../../../typings/elasticsearch';
+import {
+  PROCESSOR_EVENT,
+  SERVICE_NAME
+} from '../../../common/elasticsearch_fieldnames';
+import { AlertingPlugin } from '../../../../alerting/server';
+import { getApmIndices } from '../settings/apm_indices/get_apm_indices';
+import { APMConfig } from '../..';
+
+interface RegisterAlertParams {
+  alerting: AlertingPlugin['setup'];
+  config$: Observable<APMConfig>;
+}
+
+const paramsSchema = schema.object({
+  serviceName: schema.string(),
+  windowSize: schema.number(),
+  windowUnit: schema.string(),
+  threshold: schema.number()
+});
+
+const alertTypeConfig = ALERT_TYPES_CONFIG[AlertType.ErrorRate];
+
+export function registerErrorRateAlertType({
+  alerting,
+  config$
+}: RegisterAlertParams) {
+  alerting.registerType({
+    id: AlertType.ErrorRate,
+    name: alertTypeConfig.name,
+    actionGroups: alertTypeConfig.actionGroups,
+    defaultActionGroupId: alertTypeConfig.defaultActionGroupId,
+    validate: {
+      params: paramsSchema
+    },
+
+    executor: async ({ services, params }) => {
+      const config = await config$.pipe(take(1)).toPromise();
+
+      const alertParams = params as TypeOf<typeof paramsSchema>;
+
+      const indices = await getApmIndices({
+        config,
+        savedObjectsClient: services.savedObjectsClient
+      });
+
+      const searchParams = {
+        index: indices['apm_oss.errorIndices'],
+        size: 0,
+        body: {
+          query: {
+            bool: {
+              filter: [
+                {
+                  range: {
+                    '@timestamp': {
+                      gte: `now-${alertParams.windowSize}${alertParams.windowUnit}`
+                    }
+                  }
+                },
+                {
+                  term: {
+                    [PROCESSOR_EVENT]: 'error'
+                  }
+                },
+                {
+                  term: {
+                    [SERVICE_NAME]: alertParams.serviceName
+                  }
+                }
+              ]
+            }
+          },
+          track_total_hits: true
+        }
+      };
+
+      const response: ESSearchResponse<
+        unknown,
+        ESSearchRequest
+      > = await services.callCluster('search', searchParams);
+
+      const value = response.hits.total.value;
+
+      if (value && value > alertParams.threshold) {
+        const alertInstance = services.alertInstanceFactory(
+          AlertType.ErrorRate
+        );
+        alertInstance.scheduleActions(alertTypeConfig.defaultActionGroupId);
+      }
+
+      return {};
+    }
+  });
+}
diff --git a/x-pack/plugins/apm/server/lib/alerts/register_transaction_duration_alert_type.ts b/x-pack/plugins/apm/server/lib/alerts/register_transaction_duration_alert_type.ts
new file mode 100644
index 0000000000000..7575a8268bc26
--- /dev/null
+++ b/x-pack/plugins/apm/server/lib/alerts/register_transaction_duration_alert_type.ts
@@ -0,0 +1,140 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { schema, TypeOf } from '@kbn/config-schema';
+import { Observable } from 'rxjs';
+import { take } from 'rxjs/operators';
+import { AlertType, ALERT_TYPES_CONFIG } from '../../../common/alert_types';
+import { ESSearchResponse } from '../../../typings/elasticsearch';
+import {
+  PROCESSOR_EVENT,
+  SERVICE_NAME,
+  TRANSACTION_TYPE,
+  TRANSACTION_DURATION
+} from '../../../common/elasticsearch_fieldnames';
+import { AlertingPlugin } from '../../../../alerting/server';
+import { getApmIndices } from '../settings/apm_indices/get_apm_indices';
+import { APMConfig } from '../..';
+
+interface RegisterAlertParams {
+  alerting: AlertingPlugin['setup'];
+  config$: Observable<APMConfig>;
+}
+
+const paramsSchema = schema.object({
+  serviceName: schema.string(),
+  transactionType: schema.string(),
+  windowSize: schema.number(),
+  windowUnit: schema.string(),
+  threshold: schema.number(),
+  aggregationType: schema.oneOf([
+    schema.literal('avg'),
+    schema.literal('95th'),
+    schema.literal('99th')
+  ])
+});
+
+const alertTypeConfig = ALERT_TYPES_CONFIG[AlertType.TransactionDuration];
+
+export function registerTransactionDurationAlertType({
+  alerting,
+  config$
+}: RegisterAlertParams) {
+  alerting.registerType({
+    id: AlertType.TransactionDuration,
+    name: alertTypeConfig.name,
+    actionGroups: alertTypeConfig.actionGroups,
+    defaultActionGroupId: alertTypeConfig.defaultActionGroupId,
+    validate: {
+      params: paramsSchema
+    },
+
+    executor: async ({ services, params }) => {
+      const config = await config$.pipe(take(1)).toPromise();
+
+      const alertParams = params as TypeOf<typeof paramsSchema>;
+
+      const indices = await getApmIndices({
+        config,
+        savedObjectsClient: services.savedObjectsClient
+      });
+
+      const searchParams = {
+        index: indices['apm_oss.transactionIndices'],
+        size: 0,
+        body: {
+          query: {
+            bool: {
+              filter: [
+                {
+                  range: {
+                    '@timestamp': {
+                      gte: `now-${alertParams.windowSize}${alertParams.windowUnit}`
+                    }
+                  }
+                },
+                {
+                  term: {
+                    [PROCESSOR_EVENT]: 'transaction'
+                  }
+                },
+                {
+                  term: {
+                    [SERVICE_NAME]: alertParams.serviceName
+                  }
+                },
+                {
+                  term: {
+                    [TRANSACTION_TYPE]: alertParams.transactionType
+                  }
+                }
+              ]
+            }
+          },
+          aggs: {
+            agg:
+              alertParams.aggregationType === 'avg'
+                ? {
+                    avg: {
+                      field: TRANSACTION_DURATION
+                    }
+                  }
+                : {
+                    percentiles: {
+                      field: TRANSACTION_DURATION,
+                      percents: [
+                        alertParams.aggregationType === '95th' ? 95 : 99
+                      ]
+                    }
+                  }
+          }
+        }
+      };
+
+      const response: ESSearchResponse<
+        unknown,
+        typeof searchParams
+      > = await services.callCluster('search', searchParams);
+
+      if (!response.aggregations) {
+        return;
+      }
+
+      const { agg } = response.aggregations;
+
+      const value = 'values' in agg ? agg.values[0] : agg.value;
+
+      if (value && value > alertParams.threshold * 1000) {
+        const alertInstance = services.alertInstanceFactory(
+          AlertType.TransactionDuration
+        );
+        alertInstance.scheduleActions(alertTypeConfig.defaultActionGroupId);
+      }
+
+      return {};
+    }
+  });
+}
diff --git a/x-pack/plugins/apm/server/plugin.ts b/x-pack/plugins/apm/server/plugin.ts
index db14730f802a9..e140340786e8a 100644
--- a/x-pack/plugins/apm/server/plugin.ts
+++ b/x-pack/plugins/apm/server/plugin.ts
@@ -8,7 +8,10 @@ import { Observable, combineLatest, AsyncSubject } from 'rxjs';
 import { map, take } from 'rxjs/operators';
 import { Server } from 'hapi';
 import { once } from 'lodash';
-import { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
+import { UsageCollectionSetup } from '../../../../src/plugins/usage_collection/server';
+import { TaskManagerSetupContract } from '../../task_manager/server';
+import { AlertingPlugin } from '../../alerting/server';
+import { ActionsPlugin } from '../../actions/server';
 import { APMOSSPluginSetup } from '../../../../src/plugins/apm_oss/server';
 import { makeApmUsageCollector } from './lib/apm_telemetry';
 import { createApmAgentConfigurationIndex } from './lib/settings/agent_configuration/create_agent_config_index';
@@ -21,6 +24,7 @@ import { tutorialProvider } from './tutorial';
 import { CloudSetup } from '../../cloud/server';
 import { getInternalSavedObjectsClient } from './lib/helpers/get_internal_saved_objects_client';
 import { LicensingPluginSetup } from '../../licensing/public';
+import { registerApmAlerts } from './lib/alerts/register_apm_alerts';
 
 export interface LegacySetup {
   server: Server;
@@ -47,6 +51,9 @@ export class APMPlugin implements Plugin<APMPluginContract> {
       licensing: LicensingPluginSetup;
       cloud?: CloudSetup;
       usageCollection?: UsageCollectionSetup;
+      taskManager?: TaskManagerSetupContract;
+      alerting?: AlertingPlugin['setup'];
+      actions?: ActionsPlugin['setup'];
     }
   ) {
     const logger = this.initContext.logger.get('apm');
@@ -55,6 +62,14 @@ export class APMPlugin implements Plugin<APMPluginContract> {
       map(([apmOssConfig, apmConfig]) => mergeConfigs(apmOssConfig, apmConfig))
     );
 
+    if (plugins.actions && plugins.alerting) {
+      registerApmAlerts({
+        alerting: plugins.alerting,
+        actions: plugins.actions,
+        config$: mergedConfig$
+      });
+    }
+
     this.legacySetup$.subscribe(__LEGACY => {
       createApmApi().init(core, { config$: mergedConfig$, logger, __LEGACY });
     });
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/lib/capabilities.ts b/x-pack/plugins/triggers_actions_ui/public/application/lib/capabilities.ts
index e5693e31c2d66..f8102189c425c 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/lib/capabilities.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/lib/capabilities.ts
@@ -10,44 +10,21 @@
  * will possibly go away with https://github.com/elastic/kibana/issues/52300.
  */
 
-export function hasShowAlertsCapability(capabilities: any): boolean {
-  if (capabilities.siem && capabilities.siem['alerting:show']) {
-    return true;
-  }
-  return false;
-}
+type Capabilities = Record<string, any>;
 
-export function hasShowActionsCapability(capabilities: any): boolean {
-  if (capabilities.siem && capabilities.siem['actions:show']) {
-    return true;
-  }
-  return false;
-}
+const apps = ['apm', 'siem'];
 
-export function hasSaveAlertsCapability(capabilities: any): boolean {
-  if (capabilities.siem && capabilities.siem['alerting:save']) {
-    return true;
-  }
-  return false;
+function hasCapability(capabilities: Capabilities, capability: string) {
+  return apps.some(app => capabilities[app]?.[capability]);
 }
 
-export function hasSaveActionsCapability(capabilities: any): boolean {
-  if (capabilities.siem && capabilities.siem['actions:save']) {
-    return true;
-  }
-  return false;
+function createCapabilityCheck(capability: string) {
+  return (capabilities: Capabilities) => hasCapability(capabilities, capability);
 }
 
-export function hasDeleteAlertsCapability(capabilities: any): boolean {
-  if (capabilities.siem && capabilities.siem['alerting:delete']) {
-    return true;
-  }
-  return false;
-}
-
-export function hasDeleteActionsCapability(capabilities: any): boolean {
-  if (capabilities.siem && capabilities.siem['actions:delete']) {
-    return true;
-  }
-  return false;
-}
+export const hasShowAlertsCapability = createCapabilityCheck('alerting:show');
+export const hasShowActionsCapability = createCapabilityCheck('actions:show');
+export const hasSaveAlertsCapability = createCapabilityCheck('alerting:save');
+export const hasSaveActionsCapability = createCapabilityCheck('actions:save');
+export const hasDeleteAlertsCapability = createCapabilityCheck('alerting:delete');
+export const hasDeleteActionsCapability = createCapabilityCheck('actions:delete');
diff --git a/x-pack/plugins/triggers_actions_ui/public/index.ts b/x-pack/plugins/triggers_actions_ui/public/index.ts
index 342401c4778d8..96645e856e418 100644
--- a/x-pack/plugins/triggers_actions_ui/public/index.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/index.ts
@@ -23,3 +23,7 @@ export function plugin(ctx: PluginInitializerContext) {
 
 export { Plugin };
 export * from './plugin';
+
+export { TIME_UNITS } from './application/constants';
+export { getTimeUnitLabel } from './common/lib/get_time_unit_label';
+export { ForLastExpression } from './common/expression_items/for_the_last';

From 70625429199afc6f1b30a30d9630818905085161 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alejandro=20Fern=C3=A1ndez=20Haro?=
 <alejandro.haro@elastic.co>
Date: Tue, 24 Mar 2020 10:20:51 +0000
Subject: [PATCH 068/179] [skip-ci] Fix CODEOWNERS paths for the Pulse team
 (#60944)

---
 .github/CODEOWNERS | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index d48b29c89ece6..6519bf9c493f9 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -150,8 +150,11 @@
 # Pulse
 /packages/kbn-analytics/ @elastic/pulse
 /src/legacy/core_plugins/ui_metric/ @elastic/pulse
+/src/plugins/telemetry/ @elastic/pulse
+/src/plugins/telemetry_collection_manager/ @elastic/pulse
+/src/plugins/telemetry_management_section/ @elastic/pulse
 /src/plugins/usage_collection/ @elastic/pulse
-/x-pack/legacy/plugins/telemetry/ @elastic/pulse
+/x-pack/plugins/telemetry_collection_xpack/ @elastic/pulse
 
 # Kibana Alerting Services
 /x-pack/legacy/plugins/alerting/ @elastic/kibana-alerting-services

From 4dbcb3c0e99553af4306670ac4a980aad6db209b Mon Sep 17 00:00:00 2001
From: Gidi Meir Morris <github@gidi.io>
Date: Tue, 24 Mar 2020 10:52:00 +0000
Subject: [PATCH 069/179] [Alerting] removes unimplemented buttons from Alert
 Details page (#60934)

Removed the "Edit" and "View in Activity Log" buttons as they have not yet been implemented.
---
 .../components/alert_details.test.tsx         | 60 +------------------
 .../components/alert_details.tsx              | 17 ------
 2 files changed, 1 insertion(+), 76 deletions(-)

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 f025b0396f04d..d781e8b761845 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
@@ -8,16 +8,8 @@ import uuid from 'uuid';
 import { shallow } from 'enzyme';
 import { AlertDetails } from './alert_details';
 import { Alert, ActionType } from '../../../../types';
-import {
-  EuiTitle,
-  EuiBadge,
-  EuiFlexItem,
-  EuiButtonEmpty,
-  EuiSwitch,
-  EuiBetaBadge,
-} from '@elastic/eui';
+import { EuiTitle, EuiBadge, EuiFlexItem, EuiSwitch, EuiBetaBadge } from '@elastic/eui';
 import { times, random } from 'lodash';
-import { FormattedMessage } from '@kbn/i18n/react';
 import { i18n } from '@kbn/i18n';
 import { ViewInApp } from './view_in_app';
 
@@ -218,31 +210,6 @@ describe('alert_details', () => {
   });
 
   describe('links', () => {
-    it('links to the Edit flyout', () => {
-      const alert = mockAlert();
-
-      const alertType = {
-        id: '.noop',
-        name: 'No Op',
-        actionGroups: [{ id: 'default', name: 'Default' }],
-        actionVariables: { context: [], state: [] },
-        defaultActionGroupId: 'default',
-      };
-
-      expect(
-        shallow(
-          <AlertDetails alert={alert} alertType={alertType} actionTypes={[]} {...mockAlertApis} />
-        ).containsMatchingElement(
-          <EuiButtonEmpty disabled={true} iconType="pencil">
-            <FormattedMessage
-              id="xpack.triggersActionsUI.sections.alertDetails.editAlertButtonLabel"
-              defaultMessage="Edit"
-            />
-          </EuiButtonEmpty>
-        )
-      ).toBeTruthy();
-    });
-
     it('links to the app that created the alert', () => {
       const alert = mockAlert();
 
@@ -260,31 +227,6 @@ describe('alert_details', () => {
         ).containsMatchingElement(<ViewInApp alert={alert} />)
       ).toBeTruthy();
     });
-
-    it('links to the activity log', () => {
-      const alert = mockAlert();
-
-      const alertType = {
-        id: '.noop',
-        name: 'No Op',
-        actionGroups: [{ id: 'default', name: 'Default' }],
-        actionVariables: { context: [], state: [] },
-        defaultActionGroupId: 'default',
-      };
-
-      expect(
-        shallow(
-          <AlertDetails alert={alert} alertType={alertType} actionTypes={[]} {...mockAlertApis} />
-        ).containsMatchingElement(
-          <EuiButtonEmpty disabled={true} iconType="menuLeft">
-            <FormattedMessage
-              id="xpack.triggersActionsUI.sections.alertDetails.activityLogButtonLabel"
-              defaultMessage="Activity Log"
-            />
-          </EuiButtonEmpty>
-        )
-      ).toBeTruthy();
-    });
   });
 });
 
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_details/components/alert_details.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_details/components/alert_details.tsx
index 49e818ebc7ee4..1f55e61e9ee0d 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_details/components/alert_details.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_details/components/alert_details.tsx
@@ -17,7 +17,6 @@ import {
   EuiBadge,
   EuiPage,
   EuiPageContentBody,
-  EuiButtonEmpty,
   EuiSwitch,
   EuiCallOut,
   EuiSpacer,
@@ -87,25 +86,9 @@ export const AlertDetails: React.FunctionComponent<AlertDetailsProps> = ({
             </EuiPageContentHeaderSection>
             <EuiPageContentHeaderSection>
               <EuiFlexGroup responsive={false} gutterSize="xs">
-                <EuiFlexItem grow={false}>
-                  <EuiButtonEmpty disabled={true} iconType="pencil">
-                    <FormattedMessage
-                      id="xpack.triggersActionsUI.sections.alertDetails.editAlertButtonLabel"
-                      defaultMessage="Edit"
-                    />
-                  </EuiButtonEmpty>
-                </EuiFlexItem>
                 <EuiFlexItem grow={false}>
                   <ViewInApp alert={alert} />
                 </EuiFlexItem>
-                <EuiFlexItem grow={false}>
-                  <EuiButtonEmpty disabled={true} iconType="menuLeft">
-                    <FormattedMessage
-                      id="xpack.triggersActionsUI.sections.alertDetails.activityLogButtonLabel"
-                      defaultMessage="Activity Log"
-                    />
-                  </EuiButtonEmpty>
-                </EuiFlexItem>
               </EuiFlexGroup>
             </EuiPageContentHeaderSection>
           </EuiPageContentHeader>

From d31e5f524f13f1d8fd91cf1e5a716ecb5c6fb742 Mon Sep 17 00:00:00 2001
From: Shahzad <shahzad.muhammad@elastic.co>
Date: Tue, 24 Mar 2020 12:34:43 +0100
Subject: [PATCH 070/179] [Uptime] Ml detection of duration anomalies (#59785)

* add flyout

* add state

* update state

* ad job

* update

* updat

* add ml analyze button

* update api

* use differential colors for duration chart

* remove duration chart gql

* update type

* type fix

* fix tyoe

* update translation

* update test

* update conflicts

* update anomaly record

* chart

* added annotations

* update error handling

* update

* update types

* fixed types

* fix types

* update types

* update

* update

* remove unnecessary change

* remove unnecessary change

* fix type

* update

* save

* update pr

* update tets

* update job deletion

* update

* update tets

* upadte tests

* fix types

* update title text

* update types

* fixed tests

* update tests and types

* updated types

* fix PR feedback

* unit test

* update more types

* update test and manage  job

* resolve conflicts

* types

* remove unnecessary change

* revert ml code

* revert ml code

* fixed formatting issues pointed by pr feedback
---
 src/plugins/kibana_react/public/index.ts      |   1 +
 .../uptime/common/constants/rest_api.ts       |   6 +
 .../plugins/uptime/common/constants/ui.ts     |   4 +
 .../connected/charts/monitor_duration.tsx     |  63 ++++-
 .../connected/empty_state/empty_state.tsx     |   4 +-
 .../monitor/status_bar_container.tsx          |  25 +-
 .../duration_charts.test.tsx.snap             |   2 +
 .../charts/__tests__/duration_charts.test.tsx |   4 +-
 .../functional/charts/annotation_tooltip.tsx  |  54 ++++
 .../functional/charts/duration_chart.tsx      |  71 +++++-
 .../charts/duration_line_bar_list.tsx         |  91 +++++++
 .../__snapshots__/empty_state.test.tsx.snap   |  30 +--
 .../__tests__/empty_state.test.tsx            |  17 +-
 .../functional/empty_state/empty_state.tsx    |   3 +-
 .../empty_state/empty_state_error.tsx         |   3 +-
 .../functional/monitor_list/translations.ts   |   7 +
 .../{ => ping_list}/location_name.tsx         |   0
 .../functional/ping_list/ping_list.tsx        |   2 +-
 .../confirm_delete.test.tsx.snap              |  56 ++++
 .../__snapshots__/license_info.test.tsx.snap  |  73 ++++++
 .../__snapshots__/ml_flyout.test.tsx.snap     | 240 ++++++++++++++++++
 .../ml_integerations.test.tsx.snap            |  86 +++++++
 .../__snapshots__/ml_job_link.test.tsx.snap   |  82 ++++++
 .../__snapshots__/ml_manage_job.test.tsx.snap |  90 +++++++
 .../ml/__tests__/confirm_delete.test.tsx      |  25 ++
 .../ml/__tests__/license_info.test.tsx        |  21 ++
 .../ml/__tests__/ml_flyout.test.tsx           | 113 +++++++++
 .../ml/__tests__/ml_integerations.test.tsx    |  30 +++
 .../ml/__tests__/ml_job_link.test.tsx         |  25 ++
 .../ml/__tests__/ml_manage_job.test.tsx       |  32 +++
 .../monitor_details/ml/confirm_delete.tsx     |  59 +++++
 .../monitor_details/ml/license_info.tsx       |  33 +++
 .../monitor_details/ml/manage_ml_job.tsx      |  80 ++++++
 .../monitor_details/ml/ml_flyout.tsx          |  86 +++++++
 .../ml/ml_flyout_container.tsx                | 154 +++++++++++
 .../monitor_details/ml/ml_integeration.tsx    | 111 ++++++++
 .../monitor_details/ml/ml_job_link.tsx        |  52 ++++
 .../monitor_details/ml/translations.tsx       | 150 +++++++++++
 .../contexts/uptime_settings_context.tsx      |  20 +-
 .../uptime/public/state/actions/index.ts      |   1 +
 .../public/state/actions/index_status.ts      |   2 +-
 .../uptime/public/state/actions/ml_anomaly.ts |  46 ++++
 .../public/state/actions/monitor_duration.ts  |   5 +-
 .../uptime/public/state/actions/types.ts      |  30 ++-
 .../uptime/public/state/actions/utils.ts      |  14 +-
 .../uptime/public/state/api/ml_anomaly.ts     |  88 +++++++
 ...th_effect.test.ts => fetch_effect.test.ts} |  36 ++-
 .../public/state/effects/fetch_effect.ts      |   8 +-
 .../uptime/public/state/effects/index.ts      |   2 +
 .../uptime/public/state/effects/ml_anomaly.ts |  53 ++++
 .../uptime/public/state/reducers/index.ts     |   2 +
 .../public/state/reducers/index_status.ts     |  14 +-
 .../public/state/reducers/ml_anomaly.ts       |  71 ++++++
 .../public/state/reducers/monitor_duration.ts |   6 +-
 .../uptime/public/state/reducers/types.ts     |   7 +-
 .../uptime/public/state/reducers/utils.ts     |  33 ++-
 .../state/selectors/__tests__/index.test.ts   |  22 +-
 .../uptime/public/state/selectors/index.ts    |  41 ++-
 x-pack/package.json                           |   2 +-
 x-pack/plugins/ml/common/types/anomalies.ts   |  17 ++
 .../ml/common/types/data_recognizer.ts        |  17 ++
 .../models/data_recognizer/data_recognizer.ts |  13 +-
 .../modules/uptime_heartbeat/logo.json        |   3 +
 .../modules/uptime_heartbeat/manifest.json    |  26 ++
 .../ml/datafeed_high_latency_by_geo.json      |  13 +
 .../ml/high_latency_by_geo.json               |  29 +++
 .../build_anomaly_table_items.d.ts            |  19 +-
 .../models/results_service/results_service.ts |   4 +-
 yarn.lock                                     |  73 +++++-
 69 files changed, 2522 insertions(+), 180 deletions(-)
 create mode 100644 x-pack/legacy/plugins/uptime/public/components/functional/charts/annotation_tooltip.tsx
 create mode 100644 x-pack/legacy/plugins/uptime/public/components/functional/charts/duration_line_bar_list.tsx
 rename x-pack/legacy/plugins/uptime/public/components/functional/{ => ping_list}/location_name.tsx (100%)
 create mode 100644 x-pack/legacy/plugins/uptime/public/components/monitor_details/ml/__tests__/__snapshots__/confirm_delete.test.tsx.snap
 create mode 100644 x-pack/legacy/plugins/uptime/public/components/monitor_details/ml/__tests__/__snapshots__/license_info.test.tsx.snap
 create mode 100644 x-pack/legacy/plugins/uptime/public/components/monitor_details/ml/__tests__/__snapshots__/ml_flyout.test.tsx.snap
 create mode 100644 x-pack/legacy/plugins/uptime/public/components/monitor_details/ml/__tests__/__snapshots__/ml_integerations.test.tsx.snap
 create mode 100644 x-pack/legacy/plugins/uptime/public/components/monitor_details/ml/__tests__/__snapshots__/ml_job_link.test.tsx.snap
 create mode 100644 x-pack/legacy/plugins/uptime/public/components/monitor_details/ml/__tests__/__snapshots__/ml_manage_job.test.tsx.snap
 create mode 100644 x-pack/legacy/plugins/uptime/public/components/monitor_details/ml/__tests__/confirm_delete.test.tsx
 create mode 100644 x-pack/legacy/plugins/uptime/public/components/monitor_details/ml/__tests__/license_info.test.tsx
 create mode 100644 x-pack/legacy/plugins/uptime/public/components/monitor_details/ml/__tests__/ml_flyout.test.tsx
 create mode 100644 x-pack/legacy/plugins/uptime/public/components/monitor_details/ml/__tests__/ml_integerations.test.tsx
 create mode 100644 x-pack/legacy/plugins/uptime/public/components/monitor_details/ml/__tests__/ml_job_link.test.tsx
 create mode 100644 x-pack/legacy/plugins/uptime/public/components/monitor_details/ml/__tests__/ml_manage_job.test.tsx
 create mode 100644 x-pack/legacy/plugins/uptime/public/components/monitor_details/ml/confirm_delete.tsx
 create mode 100644 x-pack/legacy/plugins/uptime/public/components/monitor_details/ml/license_info.tsx
 create mode 100644 x-pack/legacy/plugins/uptime/public/components/monitor_details/ml/manage_ml_job.tsx
 create mode 100644 x-pack/legacy/plugins/uptime/public/components/monitor_details/ml/ml_flyout.tsx
 create mode 100644 x-pack/legacy/plugins/uptime/public/components/monitor_details/ml/ml_flyout_container.tsx
 create mode 100644 x-pack/legacy/plugins/uptime/public/components/monitor_details/ml/ml_integeration.tsx
 create mode 100644 x-pack/legacy/plugins/uptime/public/components/monitor_details/ml/ml_job_link.tsx
 create mode 100644 x-pack/legacy/plugins/uptime/public/components/monitor_details/ml/translations.tsx
 create mode 100644 x-pack/legacy/plugins/uptime/public/state/actions/ml_anomaly.ts
 create mode 100644 x-pack/legacy/plugins/uptime/public/state/api/ml_anomaly.ts
 rename x-pack/legacy/plugins/uptime/public/state/effects/__tests__/{fecth_effect.test.ts => fetch_effect.test.ts} (67%)
 create mode 100644 x-pack/legacy/plugins/uptime/public/state/effects/ml_anomaly.ts
 create mode 100644 x-pack/legacy/plugins/uptime/public/state/reducers/ml_anomaly.ts
 create mode 100644 x-pack/plugins/ml/common/types/data_recognizer.ts
 create mode 100644 x-pack/plugins/ml/server/models/data_recognizer/modules/uptime_heartbeat/logo.json
 create mode 100644 x-pack/plugins/ml/server/models/data_recognizer/modules/uptime_heartbeat/manifest.json
 create mode 100644 x-pack/plugins/ml/server/models/data_recognizer/modules/uptime_heartbeat/ml/datafeed_high_latency_by_geo.json
 create mode 100644 x-pack/plugins/ml/server/models/data_recognizer/modules/uptime_heartbeat/ml/high_latency_by_geo.json

diff --git a/src/plugins/kibana_react/public/index.ts b/src/plugins/kibana_react/public/index.ts
index e88ca7178cde3..e1689e38dbfe0 100644
--- a/src/plugins/kibana_react/public/index.ts
+++ b/src/plugins/kibana_react/public/index.ts
@@ -26,6 +26,7 @@ export * from './field_icon';
 export * from './table_list_view';
 export * from './split_panel';
 export { ValidatedDualRange } from './validated_range';
+export * from './notifications';
 export { Markdown, MarkdownSimple } from './markdown';
 export { reactToUiComponent, uiToReactComponent } from './adapters';
 export { useUrlTracker } from './use_url_tracker';
diff --git a/x-pack/legacy/plugins/uptime/common/constants/rest_api.ts b/x-pack/legacy/plugins/uptime/common/constants/rest_api.ts
index 61197d6dc373d..a1a3e86e6a97e 100644
--- a/x-pack/legacy/plugins/uptime/common/constants/rest_api.ts
+++ b/x-pack/legacy/plugins/uptime/common/constants/rest_api.ts
@@ -16,4 +16,10 @@ export enum API_URLS {
   PING_HISTOGRAM = `/api/uptime/ping/histogram`,
   SNAPSHOT_COUNT = `/api/uptime/snapshot/count`,
   FILTERS = `/api/uptime/filters`,
+
+  ML_MODULE_JOBS = `/api/ml/modules/jobs_exist/`,
+  ML_SETUP_MODULE = '/api/ml/modules/setup/',
+  ML_DELETE_JOB = `/api/ml/jobs/delete_jobs`,
+  ML_CAPABILITIES = '/api/ml/ml_capabilities',
+  ML_ANOMALIES_RESULT = `/api/ml/results/anomalies_table_data`,
 }
diff --git a/x-pack/legacy/plugins/uptime/common/constants/ui.ts b/x-pack/legacy/plugins/uptime/common/constants/ui.ts
index 8d223dbbba556..29e8dabf53f92 100644
--- a/x-pack/legacy/plugins/uptime/common/constants/ui.ts
+++ b/x-pack/legacy/plugins/uptime/common/constants/ui.ts
@@ -15,6 +15,10 @@ export enum STATUS {
   DOWN = 'down',
 }
 
+export const ML_JOB_ID = 'high_latency_by_geo';
+
+export const ML_MODULE_ID = 'uptime_heartbeat';
+
 export const UNNAMED_LOCATION = 'Unnamed-location';
 
 export const SHORT_TS_LOCALE = 'en-short-locale';
diff --git a/x-pack/legacy/plugins/uptime/public/components/connected/charts/monitor_duration.tsx b/x-pack/legacy/plugins/uptime/public/components/connected/charts/monitor_duration.tsx
index 8d2b8d2cd8e0d..7d1cb08cb8b1c 100644
--- a/x-pack/legacy/plugins/uptime/public/components/connected/charts/monitor_duration.tsx
+++ b/x-pack/legacy/plugins/uptime/public/components/connected/charts/monitor_duration.tsx
@@ -7,10 +7,21 @@
 import React, { useContext, useEffect } from 'react';
 import { useDispatch, useSelector } from 'react-redux';
 import { useUrlParams } from '../../../hooks';
-import { getMonitorDurationAction } from '../../../state/actions';
+import {
+  getAnomalyRecordsAction,
+  getMLCapabilitiesAction,
+  getMonitorDurationAction,
+} from '../../../state/actions';
 import { DurationChartComponent } from '../../functional/charts';
-import { selectDurationLines } from '../../../state/selectors';
+import {
+  anomaliesSelector,
+  hasMLFeatureAvailable,
+  hasMLJobSelector,
+  selectDurationLines,
+} from '../../../state/selectors';
 import { UptimeRefreshContext } from '../../../contexts';
+import { getMLJobId } from '../../../state/api/ml_anomaly';
+import { JobStat } from '../../../../../../../plugins/ml/common/types/data_recognizer';
 
 interface Props {
   monitorId: string;
@@ -18,24 +29,58 @@ interface Props {
 
 export const DurationChart: React.FC<Props> = ({ monitorId }: Props) => {
   const [getUrlParams] = useUrlParams();
-  const { dateRangeStart, dateRangeEnd } = getUrlParams();
+  const {
+    dateRangeStart,
+    dateRangeEnd,
+    absoluteDateRangeStart,
+    absoluteDateRangeEnd,
+  } = getUrlParams();
 
-  const { monitor_duration, loading } = useSelector(selectDurationLines);
+  const { durationLines, loading } = useSelector(selectDurationLines);
+
+  const isMLAvailable = useSelector(hasMLFeatureAvailable);
+
+  const { data: mlJobs, loading: jobsLoading } = useSelector(hasMLJobSelector);
+
+  const hasMLJob =
+    !!mlJobs?.jobsExist &&
+    !!mlJobs.jobs.find((job: JobStat) => job.id === getMLJobId(monitorId as string));
+
+  const anomalies = useSelector(anomaliesSelector);
 
   const dispatch = useDispatch();
 
   const { lastRefresh } = useContext(UptimeRefreshContext);
 
   useEffect(() => {
-    dispatch(
-      getMonitorDurationAction({ monitorId, dateStart: dateRangeStart, dateEnd: dateRangeEnd })
-    );
+    if (isMLAvailable) {
+      const anomalyParams = {
+        listOfMonitorIds: [monitorId],
+        dateStart: absoluteDateRangeStart,
+        dateEnd: absoluteDateRangeEnd,
+      };
+
+      dispatch(getAnomalyRecordsAction.get(anomalyParams));
+    }
+
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [dateRangeStart, dateRangeEnd, dispatch, lastRefresh, monitorId, isMLAvailable]);
+
+  useEffect(() => {
+    const params = { monitorId, dateStart: dateRangeStart, dateEnd: dateRangeEnd };
+    dispatch(getMonitorDurationAction(params));
   }, [dateRangeStart, dateRangeEnd, dispatch, lastRefresh, monitorId]);
 
+  useEffect(() => {
+    dispatch(getMLCapabilitiesAction.get());
+  }, [dispatch]);
+
   return (
     <DurationChartComponent
-      locationDurationLines={monitor_duration?.locationDurationLines ?? []}
-      loading={loading}
+      anomalies={anomalies}
+      hasMLJob={hasMLJob}
+      loading={loading || jobsLoading}
+      locationDurationLines={durationLines?.locationDurationLines ?? []}
     />
   );
 };
diff --git a/x-pack/legacy/plugins/uptime/public/components/connected/empty_state/empty_state.tsx b/x-pack/legacy/plugins/uptime/public/components/connected/empty_state/empty_state.tsx
index cac7042ca5b5c..b383a696095a3 100644
--- a/x-pack/legacy/plugins/uptime/public/components/connected/empty_state/empty_state.tsx
+++ b/x-pack/legacy/plugins/uptime/public/components/connected/empty_state/empty_state.tsx
@@ -11,7 +11,7 @@ import { indexStatusSelector } from '../../../state/selectors';
 import { EmptyStateComponent } from '../../functional/empty_state/empty_state';
 
 export const EmptyState: React.FC = ({ children }) => {
-  const { data, loading, errors } = useSelector(indexStatusSelector);
+  const { data, loading, error } = useSelector(indexStatusSelector);
 
   const dispatch = useDispatch();
 
@@ -23,7 +23,7 @@ export const EmptyState: React.FC = ({ children }) => {
     <EmptyStateComponent
       statesIndexStatus={data}
       loading={loading}
-      errors={errors}
+      errors={error ? [error] : undefined}
       children={children as React.ReactElement}
     />
   );
diff --git a/x-pack/legacy/plugins/uptime/public/components/connected/monitor/status_bar_container.tsx b/x-pack/legacy/plugins/uptime/public/components/connected/monitor/status_bar_container.tsx
index 456fa2b30bca8..9e7834ae6f242 100644
--- a/x-pack/legacy/plugins/uptime/public/components/connected/monitor/status_bar_container.tsx
+++ b/x-pack/legacy/plugins/uptime/public/components/connected/monitor/status_bar_container.tsx
@@ -22,7 +22,8 @@ interface StateProps {
 }
 
 interface DispatchProps {
-  loadMonitorStatus: (dateStart: string, dateEnd: string, monitorId: string) => void;
+  loadMonitorStatus: typeof getMonitorStatusAction;
+  loadSelectedMonitor: typeof getSelectedMonitorAction;
 }
 
 interface OwnProps {
@@ -33,6 +34,7 @@ type Props = OwnProps & StateProps & DispatchProps;
 
 const Container: React.FC<Props> = ({
   loadMonitorStatus,
+  loadSelectedMonitor,
   monitorId,
   monitorStatus,
   monitorLocations,
@@ -43,8 +45,9 @@ const Container: React.FC<Props> = ({
   const { dateRangeStart: dateStart, dateRangeEnd: dateEnd } = getUrlParams();
 
   useEffect(() => {
-    loadMonitorStatus(dateStart, dateEnd, monitorId);
-  }, [monitorId, dateStart, dateEnd, loadMonitorStatus, lastRefresh]);
+    loadMonitorStatus({ dateStart, dateEnd, monitorId });
+    loadSelectedMonitor({ monitorId });
+  }, [monitorId, dateStart, dateEnd, loadMonitorStatus, lastRefresh, loadSelectedMonitor]);
 
   return (
     <MonitorStatusBarComponent
@@ -61,20 +64,8 @@ const mapStateToProps = (state: AppState, ownProps: OwnProps) => ({
 });
 
 const mapDispatchToProps = (dispatch: Dispatch<any>): DispatchProps => ({
-  loadMonitorStatus: (dateStart: string, dateEnd: string, monitorId: string) => {
-    dispatch(
-      getMonitorStatusAction({
-        monitorId,
-        dateStart,
-        dateEnd,
-      })
-    );
-    dispatch(
-      getSelectedMonitorAction({
-        monitorId,
-      })
-    );
-  },
+  loadSelectedMonitor: params => dispatch(getSelectedMonitorAction(params)),
+  loadMonitorStatus: params => dispatch(getMonitorStatusAction(params)),
 });
 
 // @ts-ignore TODO: Investigate typescript issues here
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/charts/__tests__/__snapshots__/duration_charts.test.tsx.snap b/x-pack/legacy/plugins/uptime/public/components/functional/charts/__tests__/__snapshots__/duration_charts.test.tsx.snap
index 1e2d2b9144416..6c38f3e338cfd 100644
--- a/x-pack/legacy/plugins/uptime/public/components/functional/charts/__tests__/__snapshots__/duration_charts.test.tsx.snap
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/charts/__tests__/__snapshots__/duration_charts.test.tsx.snap
@@ -52,6 +52,8 @@ exports[`MonitorCharts component renders the component without errors 1`] = `
   }
 >
   <DurationChartComponent
+    anomalies={null}
+    hasMLJob={false}
     loading={false}
     locationDurationLines={
       Array [
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/charts/__tests__/duration_charts.test.tsx b/x-pack/legacy/plugins/uptime/public/components/functional/charts/__tests__/duration_charts.test.tsx
index 34a358171ead2..aac84c69d8d7b 100644
--- a/x-pack/legacy/plugins/uptime/public/components/functional/charts/__tests__/duration_charts.test.tsx
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/charts/__tests__/duration_charts.test.tsx
@@ -64,8 +64,10 @@ describe('MonitorCharts component', () => {
   it('renders the component without errors', () => {
     const component = shallowWithRouter(
       <DurationChartComponent
-        locationDurationLines={chartResponse.monitorChartsData.locationDurationLines}
         loading={false}
+        hasMLJob={false}
+        anomalies={null}
+        locationDurationLines={chartResponse.monitorChartsData.locationDurationLines}
       />
     );
     expect(component).toMatchSnapshot();
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/charts/annotation_tooltip.tsx b/x-pack/legacy/plugins/uptime/public/components/functional/charts/annotation_tooltip.tsx
new file mode 100644
index 0000000000000..ad2a6d02c5364
--- /dev/null
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/charts/annotation_tooltip.tsx
@@ -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 React from 'react';
+import moment from 'moment';
+import styled from 'styled-components';
+import { FormattedMessage } from '@kbn/i18n/react';
+
+const Header = styled.div`
+  font-weight: bold;
+  padding-left: 4px;
+`;
+
+const RecordSeverity = styled.div`
+  font-weight: bold;
+  border-left: 4px solid ${props => props.color};
+  padding-left: 2px;
+`;
+
+const TimeDiv = styled.div`
+  font-weight: 500;
+  border-bottom: 1px solid gray;
+  padding-bottom: 2px;
+`;
+
+export const AnnotationTooltip = ({ details }: { details: string }) => {
+  const data = JSON.parse(details);
+
+  function capitalizeFirstLetter(str: string) {
+    return str.charAt(0).toUpperCase() + str.slice(1);
+  }
+
+  return (
+    <>
+      <TimeDiv>{moment(data.time).format('lll')}</TimeDiv>
+      <Header>
+        <FormattedMessage
+          id="xpack.uptime.charts.mlAnnotation.header"
+          defaultMessage="Score: {score}"
+          values={{ score: data.score.toFixed(2) }}
+        />
+      </Header>
+      <RecordSeverity color={data.color}>
+        <FormattedMessage
+          id="xpack.uptime.charts.mlAnnotation.severity"
+          defaultMessage="Severity: {severity}"
+          values={{ severity: capitalizeFirstLetter(data.severity) }}
+        />
+      </RecordSeverity>
+    </>
+  );
+};
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 6bd4e7431f97a..d149e7a6deb5a 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
@@ -4,12 +4,13 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { Axis, Chart, Position, timeFormatter, Settings } from '@elastic/charts';
-import { EuiPanel, EuiTitle } from '@elastic/eui';
-import React from 'react';
+import React, { useState } from 'react';
 import { i18n } from '@kbn/i18n';
 import moment from 'moment';
 import { FormattedMessage } from '@kbn/i18n/react';
+import { EuiFlexGroup, EuiFlexItem, EuiPanel, EuiTitle } from '@elastic/eui';
+import { Axis, Chart, Position, timeFormatter, Settings } from '@elastic/charts';
+import { SeriesIdentifier } from '@elastic/charts/dist/chart_types/xy_chart/utils/series';
 import { getChartDateLabel } from '../../../lib/helper';
 import { LocationDurationLine } from '../../../../common/types';
 import { DurationLineSeriesList } from './duration_line_series_list';
@@ -17,6 +18,9 @@ import { ChartWrapper } from './chart_wrapper';
 import { useUrlParams } from '../../../hooks';
 import { getTickFormat } from './get_tick_format';
 import { ChartEmptyState } from './chart_empty_state';
+import { DurationAnomaliesBar } from './duration_line_bar_list';
+import { MLIntegrationComponent } from '../../monitor_details/ml/ml_integeration';
+import { AnomalyRecords } from '../../../state/actions';
 
 interface DurationChartProps {
   /**
@@ -29,6 +33,10 @@ interface DurationChartProps {
    * To represent the loading spinner on chart
    */
   loading: boolean;
+
+  hasMLJob: boolean;
+
+  anomalies: AnomalyRecords | null;
 }
 
 /**
@@ -37,29 +45,64 @@ interface DurationChartProps {
  * milliseconds.
  * @param props The props required for this component to render properly
  */
-export const DurationChartComponent = ({ locationDurationLines, loading }: DurationChartProps) => {
+export const DurationChartComponent = ({
+  locationDurationLines,
+  anomalies,
+  loading,
+  hasMLJob,
+}: DurationChartProps) => {
   const hasLines = locationDurationLines.length > 0;
   const [getUrlParams, updateUrlParams] = useUrlParams();
   const { absoluteDateRangeStart: min, absoluteDateRangeEnd: max } = getUrlParams();
 
+  const [hiddenLegends, setHiddenLegends] = useState<string[]>([]);
+
   const onBrushEnd = (minX: number, maxX: number) => {
     updateUrlParams({
       dateRangeStart: moment(minX).toISOString(),
       dateRangeEnd: moment(maxX).toISOString(),
     });
   };
+
+  const legendToggleVisibility = (legendItem: SeriesIdentifier | null) => {
+    if (legendItem) {
+      setHiddenLegends(prevState => {
+        if (prevState.includes(legendItem.specId)) {
+          return [...prevState.filter(item => item !== legendItem.specId)];
+        } else {
+          return [...prevState, legendItem.specId];
+        }
+      });
+    }
+  };
+
   return (
     <>
       <EuiPanel paddingSize="m">
-        <EuiTitle size="xs">
-          <h4>
-            <FormattedMessage
-              id="xpack.uptime.monitorCharts.monitorDuration.titleLabel"
-              defaultMessage="Monitor duration"
-              description="The 'ms' is an abbreviation for milliseconds."
-            />
-          </h4>
-        </EuiTitle>
+        <EuiFlexGroup>
+          <EuiFlexItem>
+            <EuiTitle size="xs">
+              <h4>
+                {hasMLJob ? (
+                  <FormattedMessage
+                    id="xpack.uptime.monitorCharts.monitorDuration.titleLabelWithAnomaly"
+                    defaultMessage="Monitor duration (Anomalies: {noOfAnomalies})"
+                    values={{ noOfAnomalies: anomalies?.anomalies?.length ?? 0 }}
+                  />
+                ) : (
+                  <FormattedMessage
+                    id="xpack.uptime.monitorCharts.monitorDuration.titleLabel"
+                    defaultMessage="Monitor duration"
+                  />
+                )}
+              </h4>
+            </EuiTitle>
+          </EuiFlexItem>
+          <EuiFlexItem grow={false}>
+            <MLIntegrationComponent />
+          </EuiFlexItem>
+        </EuiFlexGroup>
+
         <ChartWrapper height="400px" loading={loading}>
           {hasLines ? (
             <Chart>
@@ -69,6 +112,7 @@ export const DurationChartComponent = ({ locationDurationLines, loading }: Durat
                 showLegendExtra
                 legendPosition={Position.Bottom}
                 onBrushEnd={onBrushEnd}
+                onLegendItemClick={legendToggleVisibility}
               />
               <Axis
                 id="bottom"
@@ -89,6 +133,7 @@ export const DurationChartComponent = ({ locationDurationLines, loading }: Durat
                 })}
               />
               <DurationLineSeriesList lines={locationDurationLines} />
+              <DurationAnomaliesBar anomalies={anomalies} hiddenLegends={hiddenLegends} />
             </Chart>
           ) : (
             <ChartEmptyState
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/charts/duration_line_bar_list.tsx b/x-pack/legacy/plugins/uptime/public/components/functional/charts/duration_line_bar_list.tsx
new file mode 100644
index 0000000000000..a31a143b71fd2
--- /dev/null
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/charts/duration_line_bar_list.tsx
@@ -0,0 +1,91 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React from 'react';
+import moment from 'moment';
+import { AnnotationTooltipFormatter, RectAnnotation } from '@elastic/charts';
+import { RectAnnotationDatum } from '@elastic/charts/dist/chart_types/xy_chart/utils/specs';
+import { AnnotationTooltip } from './annotation_tooltip';
+import { ANOMALY_SEVERITY } from '../../../../../../../plugins/ml/common/constants/anomalies';
+import {
+  getSeverityColor,
+  getSeverityType,
+} from '../../../../../../../plugins/ml/common/util/anomaly_utils';
+
+interface Props {
+  anomalies: any;
+  hiddenLegends: string[];
+}
+
+export const DurationAnomaliesBar = ({ anomalies, hiddenLegends }: Props) => {
+  const anomalyAnnotations: Map<string, { rect: RectAnnotationDatum[]; color: string }> = new Map();
+
+  Object.keys(ANOMALY_SEVERITY).forEach(severityLevel => {
+    anomalyAnnotations.set(severityLevel.toLowerCase(), { rect: [], color: '' });
+  });
+
+  if (anomalies?.anomalies) {
+    const records = anomalies.anomalies;
+    records.forEach((record: any) => {
+      let recordObsvLoc = record.source['observer.geo.name']?.[0] ?? 'N/A';
+      if (recordObsvLoc === '') {
+        recordObsvLoc = 'N/A';
+      }
+      if (hiddenLegends.length && hiddenLegends.includes(`loc-avg-${recordObsvLoc}`)) {
+        return;
+      }
+      const severityLevel = getSeverityType(record.severity);
+
+      const tooltipData = {
+        time: record.source.timestamp,
+        score: record.severity,
+        severity: severityLevel,
+        color: getSeverityColor(record.severity),
+      };
+
+      const anomalyRect = {
+        coordinates: {
+          x0: moment(record.source.timestamp).valueOf(),
+          x1: moment(record.source.timestamp)
+            .add(record.source.bucket_span, 's')
+            .valueOf(),
+        },
+        details: JSON.stringify(tooltipData),
+      };
+      anomalyAnnotations.get(severityLevel)!.rect.push(anomalyRect);
+      anomalyAnnotations.get(severityLevel)!.color = getSeverityColor(record.severity);
+    });
+  }
+
+  const getRectStyle = (color: string) => {
+    return {
+      fill: color,
+      opacity: 1,
+      strokeWidth: 2,
+      stroke: color,
+    };
+  };
+
+  const tooltipFormatter: AnnotationTooltipFormatter = (details?: string) => {
+    return <AnnotationTooltip details={details || ''} />;
+  };
+
+  return (
+    <>
+      {Array.from(anomalyAnnotations).map(([keyIndex, rectAnnotation]) => {
+        return rectAnnotation.rect.length > 0 ? (
+          <RectAnnotation
+            dataValues={rectAnnotation.rect}
+            key={keyIndex}
+            id={keyIndex}
+            style={getRectStyle(rectAnnotation.color)}
+            renderTooltip={tooltipFormatter}
+          />
+        ) : null;
+      })}
+    </>
+  );
+};
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/empty_state/__tests__/__snapshots__/empty_state.test.tsx.snap b/x-pack/legacy/plugins/uptime/public/components/functional/empty_state/__tests__/__snapshots__/empty_state.test.tsx.snap
index 5548189175c55..2d45bbd18a60c 100644
--- a/x-pack/legacy/plugins/uptime/public/components/functional/empty_state/__tests__/__snapshots__/empty_state.test.tsx.snap
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/empty_state/__tests__/__snapshots__/empty_state.test.tsx.snap
@@ -749,17 +749,7 @@ exports[`EmptyState component renders error message when an error occurs 1`] = `
 <EmptyStateComponent
   errors={
     Array [
-      Object {
-        "extensions": undefined,
-        "locations": undefined,
-        "message": "An error occurred",
-        "name": "foo",
-        "nodes": undefined,
-        "originalError": undefined,
-        "path": undefined,
-        "positions": undefined,
-        "source": undefined,
-      },
+      [error: There was an error fetching your data.],
     ]
   }
   intl={
@@ -870,17 +860,7 @@ exports[`EmptyState component renders error message when an error occurs 1`] = `
   <EmptyStateError
     errors={
       Array [
-        Object {
-          "extensions": undefined,
-          "locations": undefined,
-          "message": "An error occurred",
-          "name": "foo",
-          "nodes": undefined,
-          "originalError": undefined,
-          "path": undefined,
-          "positions": undefined,
-          "source": undefined,
-        },
+        [error: There was an error fetching your data.],
       ]
     }
   >
@@ -904,7 +884,7 @@ exports[`EmptyState component renders error message when an error occurs 1`] = `
                   body={
                     <React.Fragment>
                       <p>
-                        An error occurred
+                        There was an error fetching your data.
                       </p>
                     </React.Fragment>
                   }
@@ -971,9 +951,9 @@ exports[`EmptyState component renders error message when an error occurs 1`] = `
                             className="euiText euiText--medium"
                           >
                             <p
-                              key="An error occurred"
+                              key="There was an error fetching your data."
                             >
-                              An error occurred
+                              There was an error fetching your data.
                             </p>
                           </div>
                         </EuiText>
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/empty_state/__tests__/empty_state.test.tsx b/x-pack/legacy/plugins/uptime/public/components/functional/empty_state/__tests__/empty_state.test.tsx
index 20113df3010f8..a74ad543c3318 100644
--- a/x-pack/legacy/plugins/uptime/public/components/functional/empty_state/__tests__/empty_state.test.tsx
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/empty_state/__tests__/empty_state.test.tsx
@@ -7,8 +7,9 @@
 import React from 'react';
 import { mountWithIntl, shallowWithIntl } from 'test_utils/enzyme_helpers';
 import { EmptyStateComponent } from '../empty_state';
-import { GraphQLError } from 'graphql';
 import { StatesIndexStatus } from '../../../../../common/runtime_types';
+import { IHttpFetchError } from '../../../../../../../../../target/types/core/public/http';
+import { HttpFetchError } from '../../../../../../../../../src/core/public/http/http_fetch_error';
 
 describe('EmptyState component', () => {
   let statesIndexStatus: StatesIndexStatus;
@@ -41,18 +42,8 @@ describe('EmptyState component', () => {
   });
 
   it(`renders error message when an error occurs`, () => {
-    const errors: GraphQLError[] = [
-      {
-        message: 'An error occurred',
-        locations: undefined,
-        path: undefined,
-        nodes: undefined,
-        source: undefined,
-        positions: undefined,
-        originalError: undefined,
-        extensions: undefined,
-        name: 'foo',
-      },
+    const errors: IHttpFetchError[] = [
+      new HttpFetchError('There was an error fetching your data.', 'error', {} as any),
     ];
     const component = mountWithIntl(
       <EmptyStateComponent statesIndexStatus={null} errors={errors} loading={false}>
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/empty_state/empty_state.tsx b/x-pack/legacy/plugins/uptime/public/components/functional/empty_state/empty_state.tsx
index 80afc2894ea44..ae6a1b892bc99 100644
--- a/x-pack/legacy/plugins/uptime/public/components/functional/empty_state/empty_state.tsx
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/empty_state/empty_state.tsx
@@ -10,12 +10,13 @@ import { EmptyStateError } from './empty_state_error';
 import { EmptyStateLoading } from './empty_state_loading';
 import { DataMissing } from './data_missing';
 import { StatesIndexStatus } from '../../../../common/runtime_types';
+import { IHttpFetchError } from '../../../../../../../../target/types/core/public/http';
 
 interface EmptyStateProps {
   children: JSX.Element[] | JSX.Element;
   statesIndexStatus: StatesIndexStatus | null;
   loading: boolean;
-  errors?: Error[];
+  errors?: IHttpFetchError[];
 }
 
 export const EmptyStateComponent = ({
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/empty_state/empty_state_error.tsx b/x-pack/legacy/plugins/uptime/public/components/functional/empty_state/empty_state_error.tsx
index c8e2bece1cb7f..1135b969018a1 100644
--- a/x-pack/legacy/plugins/uptime/public/components/functional/empty_state/empty_state_error.tsx
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/empty_state/empty_state_error.tsx
@@ -7,9 +7,10 @@
 import { EuiEmptyPrompt, EuiPanel, EuiTitle, EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import React, { Fragment } from 'react';
+import { IHttpFetchError } from '../../../../../../../../target/types/core/public/http';
 
 interface EmptyStateErrorProps {
-  errors: Error[];
+  errors: IHttpFetchError[];
 }
 
 export const EmptyStateError = ({ errors }: EmptyStateErrorProps) => {
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/translations.ts b/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/translations.ts
index 5252d90215e95..7b9b2d07f2a76 100644
--- a/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/translations.ts
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/translations.ts
@@ -64,3 +64,10 @@ export const UP = i18n.translate('xpack.uptime.monitorList.statusColumn.upLabel'
 export const DOWN = i18n.translate('xpack.uptime.monitorList.statusColumn.downLabel', {
   defaultMessage: 'Down',
 });
+
+export const RESPONSE_ANOMALY_SCORE = i18n.translate(
+  'xpack.uptime.monitorList.anomalyColumn.label',
+  {
+    defaultMessage: 'Response Anomaly Score',
+  }
+);
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/location_name.tsx b/x-pack/legacy/plugins/uptime/public/components/functional/ping_list/location_name.tsx
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/functional/location_name.tsx
rename to x-pack/legacy/plugins/uptime/public/components/functional/ping_list/location_name.tsx
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/ping_list/ping_list.tsx b/x-pack/legacy/plugins/uptime/public/components/functional/ping_list/ping_list.tsx
index e8825dacc0078..d245bc1456e6a 100644
--- a/x-pack/legacy/plugins/uptime/public/components/functional/ping_list/ping_list.tsx
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/ping_list/ping_list.tsx
@@ -29,7 +29,7 @@ import { Ping, PingResults } from '../../../../common/graphql/types';
 import { convertMicrosecondsToMilliseconds as microsToMillis } from '../../../lib/helper';
 import { UptimeGraphQLQueryProps, withUptimeGraphQL } from '../../higher_order';
 import { pingsQuery } from '../../../queries';
-import { LocationName } from './../location_name';
+import { LocationName } from './location_name';
 import { Pagination } from './../monitor_list';
 import { PingListExpandedRowComponent } from './expanded_row';
 
diff --git a/x-pack/legacy/plugins/uptime/public/components/monitor_details/ml/__tests__/__snapshots__/confirm_delete.test.tsx.snap b/x-pack/legacy/plugins/uptime/public/components/monitor_details/ml/__tests__/__snapshots__/confirm_delete.test.tsx.snap
new file mode 100644
index 0000000000000..24ef7eda0d129
--- /dev/null
+++ b/x-pack/legacy/plugins/uptime/public/components/monitor_details/ml/__tests__/__snapshots__/confirm_delete.test.tsx.snap
@@ -0,0 +1,56 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`ML Confirm Job Delete shallow renders without errors 1`] = `
+<EuiOverlayMask>
+  <EuiConfirmModal
+    buttonColor="danger"
+    cancelButtonText="Cancel"
+    confirmButtonText="Delete"
+    defaultFocusedButton="confirm"
+    onCancel={[MockFunction]}
+    onConfirm={[MockFunction]}
+    title="Delete anomaly detection job?"
+  >
+    <p>
+      <FormattedMessage
+        defaultMessage="Are you sure you want to delete this job?"
+        id="xpack.uptime.monitorDetails.ml.confirmDeleteMessage"
+        values={Object {}}
+      />
+    </p>
+    <p>
+      <FormattedMessage
+        defaultMessage="Deleting a job can be time consuming. It will be deleted in the background and data may not disappear instantly."
+        id="xpack.uptime.monitorDetails.ml.deleteJobWarning"
+        values={Object {}}
+      />
+    </p>
+  </EuiConfirmModal>
+</EuiOverlayMask>
+`;
+
+exports[`ML Confirm Job Delete shallow renders without errors while loading 1`] = `
+<EuiOverlayMask>
+  <EuiConfirmModal
+    buttonColor="danger"
+    cancelButtonText="Cancel"
+    confirmButtonText="Delete"
+    defaultFocusedButton="confirm"
+    onCancel={[MockFunction]}
+    onConfirm={[MockFunction]}
+    title="Delete anomaly detection job?"
+  >
+    <p>
+      <FormattedMessage
+        defaultMessage="Deleting jobs..."
+        id="xpack.uptime.monitorDetails.ml.deleteMessage"
+        values={Object {}}
+      />
+      )
+    </p>
+    <EuiLoadingSpinner
+      size="xl"
+    />
+  </EuiConfirmModal>
+</EuiOverlayMask>
+`;
diff --git a/x-pack/legacy/plugins/uptime/public/components/monitor_details/ml/__tests__/__snapshots__/license_info.test.tsx.snap b/x-pack/legacy/plugins/uptime/public/components/monitor_details/ml/__tests__/__snapshots__/license_info.test.tsx.snap
new file mode 100644
index 0000000000000..2457488c4facc
--- /dev/null
+++ b/x-pack/legacy/plugins/uptime/public/components/monitor_details/ml/__tests__/__snapshots__/license_info.test.tsx.snap
@@ -0,0 +1,73 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`ShowLicenseInfo renders without errors 1`] = `
+Array [
+  <div
+    class="euiCallOut euiCallOut--primary license-info-trial"
+  >
+    <div
+      class="euiCallOutHeader"
+    >
+      <div
+        aria-hidden="true"
+        class="euiCallOutHeader__icon"
+        data-euiicon-type="help"
+      />
+      <span
+        class="euiCallOutHeader__title"
+      >
+        Start free 14-day trial
+      </span>
+    </div>
+    <div
+      class="euiText euiText--small"
+    >
+      <p>
+        In order to access duration anomaly detection, you have to be subscribed to an Elastic Platinum license.
+      </p>
+      <a
+        class="euiButton euiButton--primary"
+        href="/app/kibana#/management/elasticsearch/license_management/home"
+        rel="noopener noreferrer"
+        target="_blank"
+      >
+        <span
+          class="euiButton__content"
+        >
+          <span
+            class="euiButton__text"
+          >
+            Start free 14-day trial
+          </span>
+        </span>
+      </a>
+    </div>
+  </div>,
+  <div
+    class="euiSpacer euiSpacer--l"
+  />,
+]
+`;
+
+exports[`ShowLicenseInfo shallow renders without errors 1`] = `
+<Fragment>
+  <EuiCallOut
+    className="license-info-trial"
+    color="primary"
+    iconType="help"
+    title="Start free 14-day trial"
+  >
+    <p>
+      In order to access duration anomaly detection, you have to be subscribed to an Elastic Platinum license.
+    </p>
+    <EuiButton
+      color="primary"
+      href="/app/kibana#/management/elasticsearch/license_management/home"
+      target="_blank"
+    >
+      Start free 14-day trial
+    </EuiButton>
+  </EuiCallOut>
+  <EuiSpacer />
+</Fragment>
+`;
diff --git a/x-pack/legacy/plugins/uptime/public/components/monitor_details/ml/__tests__/__snapshots__/ml_flyout.test.tsx.snap b/x-pack/legacy/plugins/uptime/public/components/monitor_details/ml/__tests__/__snapshots__/ml_flyout.test.tsx.snap
new file mode 100644
index 0000000000000..354521e7c55b9
--- /dev/null
+++ b/x-pack/legacy/plugins/uptime/public/components/monitor_details/ml/__tests__/__snapshots__/ml_flyout.test.tsx.snap
@@ -0,0 +1,240 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`ML Flyout component renders without errors 1`] = `
+<EuiFlyout
+  closeButtonAriaLabel="Closes this dialog"
+  hideCloseButton={false}
+  maxWidth={false}
+  onClose={[Function]}
+  ownFocus={false}
+  size="s"
+>
+  <EuiFlyoutHeader>
+    <EuiTitle>
+      <h2>
+        Enable anomaly detection
+      </h2>
+    </EuiTitle>
+    <EuiSpacer
+      size="s"
+    />
+  </EuiFlyoutHeader>
+  <EuiFlyoutBody>
+    <ShowLicenseInfo />
+    <EuiText>
+      <p>
+        Here you can create a machine learning job to calculate anomaly scores on
+    response durations for Uptime Monitor. Once enabled, the monitor duration chart on the details page
+    will show the expected bounds and annotate the graph with anomalies. You can also potentially
+     identify periods of increased latency across geographical regions.
+      </p>
+      <p>
+        <FormattedMessage
+          defaultMessage="Once a job is created, you can manage it and see more details in the {mlJobsPageLink}."
+          id="xpack.uptime.ml.enableAnomalyDetectionPanel.manageMLJobDescription"
+          values={
+            Object {
+              "mlJobsPageLink": <ForwardRef
+                href="/app/ml"
+              >
+                Machine Learning jobs management page
+              </ForwardRef>,
+            }
+          }
+        />
+      </p>
+      <p>
+        <em>
+          Note: It might take a few minutes for the job to begin calculating results.
+        </em>
+      </p>
+    </EuiText>
+    <EuiSpacer />
+  </EuiFlyoutBody>
+  <EuiFlyoutFooter>
+    <EuiFlexGroup
+      alignItems="flexEnd"
+      justifyContent="spaceBetween"
+    >
+      <EuiFlexItem
+        grow={false}
+      >
+        <EuiButton
+          disabled={true}
+          fill={true}
+          isLoading={false}
+          onClick={[Function]}
+        >
+          Create new job
+        </EuiButton>
+      </EuiFlexItem>
+    </EuiFlexGroup>
+  </EuiFlyoutFooter>
+</EuiFlyout>
+`;
+
+exports[`ML Flyout component shows license info if no ml available 1`] = `
+<div>
+  <div
+    data-focus-guard="true"
+    style="width:1px;height:0px;padding:0;overflow:hidden;position:fixed;top:1px;left:1px"
+    tabindex="0"
+  />
+  <div
+    data-focus-guard="true"
+    style="width:1px;height:0px;padding:0;overflow:hidden;position:fixed;top:1px;left:1px"
+    tabindex="1"
+  />
+  <div
+    data-focus-lock-disabled="false"
+  >
+    <div
+      class="euiFlyout euiFlyout--small"
+      role="dialog"
+      tabindex="0"
+    >
+      <button
+        aria-label="Closes this dialog"
+        class="euiButtonIcon euiButtonIcon--text euiFlyout__closeButton"
+        data-test-subj="euiFlyoutCloseButton"
+        type="button"
+      >
+        <div
+          aria-hidden="true"
+          class="euiButtonIcon__icon"
+          data-euiicon-type="cross"
+        />
+      </button>
+      <div
+        class="euiFlyoutHeader"
+      >
+        <h2
+          class="euiTitle euiTitle--medium"
+        >
+          Enable anomaly detection
+        </h2>
+        <div
+          class="euiSpacer euiSpacer--s"
+        />
+      </div>
+      <div
+        class="euiFlyoutBody"
+      >
+        <div
+          class="euiFlyoutBody__overflow"
+        >
+          <div
+            class="euiFlyoutBody__overflowContent"
+          >
+            <div
+              class="euiCallOut euiCallOut--primary license-info-trial"
+            >
+              <div
+                class="euiCallOutHeader"
+              >
+                <div
+                  aria-hidden="true"
+                  class="euiCallOutHeader__icon"
+                  data-euiicon-type="help"
+                />
+                <span
+                  class="euiCallOutHeader__title"
+                >
+                  Start free 14-day trial
+                </span>
+              </div>
+              <div
+                class="euiText euiText--small"
+              >
+                <p>
+                  In order to access duration anomaly detection, you have to be subscribed to an Elastic Platinum license.
+                </p>
+                <a
+                  class="euiButton euiButton--primary"
+                  href="/app/kibana#/management/elasticsearch/license_management/home"
+                  rel="noopener noreferrer"
+                  target="_blank"
+                >
+                  <span
+                    class="euiButton__content"
+                  >
+                    <span
+                      class="euiButton__text"
+                    >
+                      Start free 14-day trial
+                    </span>
+                  </span>
+                </a>
+              </div>
+            </div>
+            <div
+              class="euiSpacer euiSpacer--l"
+            />
+            <div
+              class="euiText euiText--medium"
+            >
+              <p>
+                Here you can create a machine learning job to calculate anomaly scores on
+    response durations for Uptime Monitor. Once enabled, the monitor duration chart on the details page
+    will show the expected bounds and annotate the graph with anomalies. You can also potentially
+     identify periods of increased latency across geographical regions.
+              </p>
+              <p>
+                Once a job is created, you can manage it and see more details in the 
+                <a
+                  class="euiLink euiLink--primary"
+                  href="/app/ml"
+                  rel="noreferrer"
+                >
+                  Machine Learning jobs management page
+                </a>
+                .
+              </p>
+              <p>
+                <em>
+                  Note: It might take a few minutes for the job to begin calculating results.
+                </em>
+              </p>
+            </div>
+            <div
+              class="euiSpacer euiSpacer--l"
+            />
+          </div>
+        </div>
+      </div>
+      <div
+        class="euiFlyoutFooter"
+      >
+        <div
+          class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsFlexEnd euiFlexGroup--justifyContentSpaceBetween euiFlexGroup--directionRow euiFlexGroup--responsive"
+        >
+          <div
+            class="euiFlexItem euiFlexItem--flexGrowZero"
+          >
+            <button
+              class="euiButton euiButton--primary euiButton--fill"
+              disabled=""
+              type="button"
+            >
+              <span
+                class="euiButton__content"
+              >
+                <span
+                  class="euiButton__text"
+                >
+                  Create new job
+                </span>
+              </span>
+            </button>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+  <div
+    data-focus-guard="true"
+    style="width:1px;height:0px;padding:0;overflow:hidden;position:fixed;top:1px;left:1px"
+    tabindex="0"
+  />
+</div>
+`;
diff --git a/x-pack/legacy/plugins/uptime/public/components/monitor_details/ml/__tests__/__snapshots__/ml_integerations.test.tsx.snap b/x-pack/legacy/plugins/uptime/public/components/monitor_details/ml/__tests__/__snapshots__/ml_integerations.test.tsx.snap
new file mode 100644
index 0000000000000..ac4630f4e69a8
--- /dev/null
+++ b/x-pack/legacy/plugins/uptime/public/components/monitor_details/ml/__tests__/__snapshots__/ml_integerations.test.tsx.snap
@@ -0,0 +1,86 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`ML Integrations renders without errors 1`] = `
+<div
+  class="euiPopover euiPopover--anchorDownCenter"
+>
+  <div
+    class="euiPopover__anchor"
+  >
+    <button
+      class="euiButtonEmpty euiButtonEmpty--primary"
+      type="button"
+    >
+      <span
+        class="euiButtonEmpty__content"
+      >
+        <div
+          aria-hidden="true"
+          class="euiButtonEmpty__icon"
+          data-euiicon-type="machineLearningApp"
+        />
+        <span
+          class="euiButtonEmpty__text"
+        >
+          Enable anomaly detection
+        </span>
+      </span>
+    </button>
+  </div>
+</div>
+`;
+
+exports[`ML Integrations shallow renders without errors 1`] = `
+<ContextProvider
+  value={
+    Object {
+      "history": Object {
+        "action": "POP",
+        "block": [Function],
+        "canGo": [Function],
+        "createHref": [Function],
+        "entries": Array [
+          Object {
+            "hash": "",
+            "key": "TestKeyForTesting",
+            "pathname": "/",
+            "search": "",
+            "state": undefined,
+          },
+        ],
+        "go": [Function],
+        "goBack": [Function],
+        "goForward": [Function],
+        "index": 0,
+        "length": 1,
+        "listen": [Function],
+        "location": Object {
+          "hash": "",
+          "key": "TestKeyForTesting",
+          "pathname": "/",
+          "search": "",
+          "state": undefined,
+        },
+        "push": [Function],
+        "replace": [Function],
+      },
+      "location": Object {
+        "hash": "",
+        "key": "TestKeyForTesting",
+        "pathname": "/",
+        "search": "",
+        "state": undefined,
+      },
+      "match": Object {
+        "isExact": true,
+        "params": Object {},
+        "path": "/",
+        "url": "/",
+      },
+      "staticContext": undefined,
+    }
+  }
+>
+  <MLIntegrationComponent />
+</ContextProvider>
+`;
diff --git a/x-pack/legacy/plugins/uptime/public/components/monitor_details/ml/__tests__/__snapshots__/ml_job_link.test.tsx.snap b/x-pack/legacy/plugins/uptime/public/components/monitor_details/ml/__tests__/__snapshots__/ml_job_link.test.tsx.snap
new file mode 100644
index 0000000000000..85988af04a939
--- /dev/null
+++ b/x-pack/legacy/plugins/uptime/public/components/monitor_details/ml/__tests__/__snapshots__/ml_job_link.test.tsx.snap
@@ -0,0 +1,82 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`ML JobLink renders without errors 1`] = `
+<a
+  class="euiButtonEmpty euiButtonEmpty--primary euiButtonEmpty--small"
+  href="/app/ml#/explorer?_g=(ml:(jobIds:!(testMonitor_high_latency_by_geo)),refreshInterval:(pause:!t,value:0),time:(from:'',to:''))&_a=(mlExplorerFilter:(filterActive:!t,filteredFields:!(monitor.id,testMonitor)),mlExplorerSwimlane:(viewByFieldName:observer.geo.name))"
+  rel="noopener noreferrer"
+  target="_blank"
+>
+  <span
+    class="euiButtonEmpty__content"
+  >
+    <span
+      class="euiButtonEmpty__text"
+    />
+  </span>
+</a>
+`;
+
+exports[`ML JobLink shallow renders without errors 1`] = `
+<ContextProvider
+  value={
+    Object {
+      "history": Object {
+        "action": "POP",
+        "block": [Function],
+        "canGo": [Function],
+        "createHref": [Function],
+        "entries": Array [
+          Object {
+            "hash": "",
+            "key": "TestKeyForTesting",
+            "pathname": "/",
+            "search": "",
+            "state": undefined,
+          },
+        ],
+        "go": [Function],
+        "goBack": [Function],
+        "goForward": [Function],
+        "index": 0,
+        "length": 1,
+        "listen": [Function],
+        "location": Object {
+          "hash": "",
+          "key": "TestKeyForTesting",
+          "pathname": "/",
+          "search": "",
+          "state": undefined,
+        },
+        "push": [Function],
+        "replace": [Function],
+      },
+      "location": Object {
+        "hash": "",
+        "key": "TestKeyForTesting",
+        "pathname": "/",
+        "search": "",
+        "state": undefined,
+      },
+      "match": Object {
+        "isExact": true,
+        "params": Object {},
+        "path": "/",
+        "url": "/",
+      },
+      "staticContext": undefined,
+    }
+  }
+>
+  <MLJobLink
+    basePath=""
+    dateRange={
+      Object {
+        "from": "",
+        "to": "",
+      }
+    }
+    monitorId="testMonitor"
+  />
+</ContextProvider>
+`;
diff --git a/x-pack/legacy/plugins/uptime/public/components/monitor_details/ml/__tests__/__snapshots__/ml_manage_job.test.tsx.snap b/x-pack/legacy/plugins/uptime/public/components/monitor_details/ml/__tests__/__snapshots__/ml_manage_job.test.tsx.snap
new file mode 100644
index 0000000000000..6eb2930c4875a
--- /dev/null
+++ b/x-pack/legacy/plugins/uptime/public/components/monitor_details/ml/__tests__/__snapshots__/ml_manage_job.test.tsx.snap
@@ -0,0 +1,90 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Manage ML Job renders without errors 1`] = `
+<div
+  class="euiPopover euiPopover--anchorDownCenter"
+>
+  <div
+    class="euiPopover__anchor"
+  >
+    <button
+      class="euiButtonEmpty euiButtonEmpty--primary euiButtonEmpty--iconRight"
+      type="button"
+    >
+      <span
+        class="euiButtonEmpty__content"
+      >
+        <div
+          aria-hidden="true"
+          class="euiButtonEmpty__icon"
+          data-euiicon-type="arrowDown"
+        />
+        <span
+          class="euiButtonEmpty__text"
+        >
+          Anomaly detection
+        </span>
+      </span>
+    </button>
+  </div>
+</div>
+`;
+
+exports[`Manage ML Job shallow renders without errors 1`] = `
+<ContextProvider
+  value={
+    Object {
+      "history": Object {
+        "action": "POP",
+        "block": [Function],
+        "canGo": [Function],
+        "createHref": [Function],
+        "entries": Array [
+          Object {
+            "hash": "",
+            "key": "TestKeyForTesting",
+            "pathname": "/",
+            "search": "",
+            "state": undefined,
+          },
+        ],
+        "go": [Function],
+        "goBack": [Function],
+        "goForward": [Function],
+        "index": 0,
+        "length": 1,
+        "listen": [Function],
+        "location": Object {
+          "hash": "",
+          "key": "TestKeyForTesting",
+          "pathname": "/",
+          "search": "",
+          "state": undefined,
+        },
+        "push": [Function],
+        "replace": [Function],
+      },
+      "location": Object {
+        "hash": "",
+        "key": "TestKeyForTesting",
+        "pathname": "/",
+        "search": "",
+        "state": undefined,
+      },
+      "match": Object {
+        "isExact": true,
+        "params": Object {},
+        "path": "/",
+        "url": "/",
+      },
+      "staticContext": undefined,
+    }
+  }
+>
+  <ManageMLJobComponent
+    hasMLJob={true}
+    onEnableJob={[MockFunction]}
+    onJobDelete={[MockFunction]}
+  />
+</ContextProvider>
+`;
diff --git a/x-pack/legacy/plugins/uptime/public/components/monitor_details/ml/__tests__/confirm_delete.test.tsx b/x-pack/legacy/plugins/uptime/public/components/monitor_details/ml/__tests__/confirm_delete.test.tsx
new file mode 100644
index 0000000000000..465369547d286
--- /dev/null
+++ b/x-pack/legacy/plugins/uptime/public/components/monitor_details/ml/__tests__/confirm_delete.test.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 { shallowWithIntl } from 'test_utils/enzyme_helpers';
+import { ConfirmJobDeletion } from '../confirm_delete';
+
+describe('ML Confirm Job Delete', () => {
+  it('shallow renders without errors', () => {
+    const wrapper = shallowWithIntl(
+      <ConfirmJobDeletion loading={false} onConfirm={jest.fn()} onCancel={jest.fn()} />
+    );
+    expect(wrapper).toMatchSnapshot();
+  });
+
+  it('shallow renders without errors while loading', () => {
+    const wrapper = shallowWithIntl(
+      <ConfirmJobDeletion loading={true} onConfirm={jest.fn()} onCancel={jest.fn()} />
+    );
+    expect(wrapper).toMatchSnapshot();
+  });
+});
diff --git a/x-pack/legacy/plugins/uptime/public/components/monitor_details/ml/__tests__/license_info.test.tsx b/x-pack/legacy/plugins/uptime/public/components/monitor_details/ml/__tests__/license_info.test.tsx
new file mode 100644
index 0000000000000..f3ac27c0569a3
--- /dev/null
+++ b/x-pack/legacy/plugins/uptime/public/components/monitor_details/ml/__tests__/license_info.test.tsx
@@ -0,0 +1,21 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React from 'react';
+import { renderWithIntl, shallowWithIntl } from 'test_utils/enzyme_helpers';
+import { ShowLicenseInfo } from '../license_info';
+
+describe('ShowLicenseInfo', () => {
+  it('shallow renders without errors', () => {
+    const wrapper = shallowWithIntl(<ShowLicenseInfo />);
+    expect(wrapper).toMatchSnapshot();
+  });
+
+  it('renders without errors', () => {
+    const wrapper = renderWithIntl(<ShowLicenseInfo />);
+    expect(wrapper).toMatchSnapshot();
+  });
+});
diff --git a/x-pack/legacy/plugins/uptime/public/components/monitor_details/ml/__tests__/ml_flyout.test.tsx b/x-pack/legacy/plugins/uptime/public/components/monitor_details/ml/__tests__/ml_flyout.test.tsx
new file mode 100644
index 0000000000000..c0b02181dcce1
--- /dev/null
+++ b/x-pack/legacy/plugins/uptime/public/components/monitor_details/ml/__tests__/ml_flyout.test.tsx
@@ -0,0 +1,113 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React from 'react';
+import { renderWithIntl, shallowWithIntl } from 'test_utils/enzyme_helpers';
+import { MLFlyoutView } from '../ml_flyout';
+import { UptimeSettingsContext } from '../../../../contexts';
+import { CLIENT_DEFAULTS } from '../../../../../common/constants';
+import { License } from '../../../../../../../../plugins/licensing/common/license';
+
+const expiredLicense = new License({
+  signature: 'test signature',
+  license: {
+    expiryDateInMillis: 0,
+    mode: 'platinum',
+    status: 'expired',
+    type: 'platinum',
+    uid: '1',
+  },
+  features: {
+    ml: {
+      isAvailable: false,
+      isEnabled: false,
+    },
+  },
+});
+
+const validLicense = new License({
+  signature: 'test signature',
+  license: {
+    expiryDateInMillis: 30000,
+    mode: 'platinum',
+    status: 'active',
+    type: 'platinum',
+    uid: '2',
+  },
+  features: {
+    ml: {
+      isAvailable: true,
+      isEnabled: true,
+    },
+  },
+});
+
+describe('ML Flyout component', () => {
+  const createJob = () => {};
+  const onClose = () => {};
+  const { DATE_RANGE_START, DATE_RANGE_END } = CLIENT_DEFAULTS;
+
+  it('renders without errors', () => {
+    const wrapper = shallowWithIntl(
+      <MLFlyoutView
+        isCreatingJob={false}
+        onClickCreate={createJob}
+        onClose={onClose}
+        canCreateMLJob={true}
+      />
+    );
+    expect(wrapper).toMatchSnapshot();
+  });
+  it('shows license info if no ml available', () => {
+    const value = {
+      license: expiredLicense,
+      basePath: '',
+      dateRangeStart: DATE_RANGE_START,
+      dateRangeEnd: DATE_RANGE_END,
+      isApmAvailable: true,
+      isInfraAvailable: true,
+      isLogsAvailable: true,
+    };
+    const wrapper = renderWithIntl(
+      <UptimeSettingsContext.Provider value={value}>
+        <MLFlyoutView
+          isCreatingJob={false}
+          onClickCreate={createJob}
+          onClose={onClose}
+          canCreateMLJob={true}
+        />
+      </UptimeSettingsContext.Provider>
+    );
+    const licenseComponent = wrapper.find('.license-info-trial');
+    expect(licenseComponent.length).toBe(1);
+    expect(wrapper).toMatchSnapshot();
+  });
+
+  it('able to create job if valid license is available', () => {
+    const value = {
+      license: validLicense,
+      basePath: '',
+      dateRangeStart: DATE_RANGE_START,
+      dateRangeEnd: DATE_RANGE_END,
+      isApmAvailable: true,
+      isInfraAvailable: true,
+      isLogsAvailable: true,
+    };
+    const wrapper = renderWithIntl(
+      <UptimeSettingsContext.Provider value={value}>
+        <MLFlyoutView
+          isCreatingJob={false}
+          onClickCreate={createJob}
+          onClose={onClose}
+          canCreateMLJob={true}
+        />
+      </UptimeSettingsContext.Provider>
+    );
+
+    const licenseComponent = wrapper.find('.license-info-trial');
+    expect(licenseComponent.length).toBe(0);
+  });
+});
diff --git a/x-pack/legacy/plugins/uptime/public/components/monitor_details/ml/__tests__/ml_integerations.test.tsx b/x-pack/legacy/plugins/uptime/public/components/monitor_details/ml/__tests__/ml_integerations.test.tsx
new file mode 100644
index 0000000000000..10b3a90414eb5
--- /dev/null
+++ b/x-pack/legacy/plugins/uptime/public/components/monitor_details/ml/__tests__/ml_integerations.test.tsx
@@ -0,0 +1,30 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React from 'react';
+import { MLIntegrationComponent } from '../ml_integeration';
+import { renderWithRouter, shallowWithRouter } from '../../../../lib';
+import * as redux from 'react-redux';
+
+describe('ML Integrations', () => {
+  beforeEach(() => {
+    const spy = jest.spyOn(redux, 'useDispatch');
+    spy.mockReturnValue(jest.fn());
+
+    const spy1 = jest.spyOn(redux, 'useSelector');
+    spy1.mockReturnValue(true);
+  });
+
+  it('shallow renders without errors', () => {
+    const wrapper = shallowWithRouter(<MLIntegrationComponent />);
+    expect(wrapper).toMatchSnapshot();
+  });
+
+  it('renders without errors', () => {
+    const wrapper = renderWithRouter(<MLIntegrationComponent />);
+    expect(wrapper).toMatchSnapshot();
+  });
+});
diff --git a/x-pack/legacy/plugins/uptime/public/components/monitor_details/ml/__tests__/ml_job_link.test.tsx b/x-pack/legacy/plugins/uptime/public/components/monitor_details/ml/__tests__/ml_job_link.test.tsx
new file mode 100644
index 0000000000000..fbd66e7077a77
--- /dev/null
+++ b/x-pack/legacy/plugins/uptime/public/components/monitor_details/ml/__tests__/ml_job_link.test.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 { renderWithRouter, shallowWithRouter } from '../../../../lib';
+import { MLJobLink } from '../ml_job_link';
+
+describe('ML JobLink', () => {
+  it('shallow renders without errors', () => {
+    const wrapper = shallowWithRouter(
+      <MLJobLink dateRange={{ to: '', from: '' }} basePath="" monitorId="testMonitor" />
+    );
+    expect(wrapper).toMatchSnapshot();
+  });
+
+  it('renders without errors', () => {
+    const wrapper = renderWithRouter(
+      <MLJobLink dateRange={{ to: '', from: '' }} basePath="" monitorId="testMonitor" />
+    );
+    expect(wrapper).toMatchSnapshot();
+  });
+});
diff --git a/x-pack/legacy/plugins/uptime/public/components/monitor_details/ml/__tests__/ml_manage_job.test.tsx b/x-pack/legacy/plugins/uptime/public/components/monitor_details/ml/__tests__/ml_manage_job.test.tsx
new file mode 100644
index 0000000000000..30038b030be56
--- /dev/null
+++ b/x-pack/legacy/plugins/uptime/public/components/monitor_details/ml/__tests__/ml_manage_job.test.tsx
@@ -0,0 +1,32 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React from 'react';
+import { ManageMLJobComponent } from '../manage_ml_job';
+import * as redux from 'react-redux';
+import { renderWithRouter, shallowWithRouter } from '../../../../lib';
+
+describe('Manage ML Job', () => {
+  it('shallow renders without errors', () => {
+    const spy = jest.spyOn(redux, 'useSelector');
+    spy.mockReturnValue(true);
+
+    const wrapper = shallowWithRouter(
+      <ManageMLJobComponent hasMLJob={true} onEnableJob={jest.fn()} onJobDelete={jest.fn()} />
+    );
+    expect(wrapper).toMatchSnapshot();
+  });
+
+  it('renders without errors', () => {
+    const spy = jest.spyOn(redux, 'useSelector');
+    spy.mockReturnValue(true);
+
+    const wrapper = renderWithRouter(
+      <ManageMLJobComponent hasMLJob={true} onEnableJob={jest.fn()} onJobDelete={jest.fn()} />
+    );
+    expect(wrapper).toMatchSnapshot();
+  });
+});
diff --git a/x-pack/legacy/plugins/uptime/public/components/monitor_details/ml/confirm_delete.tsx b/x-pack/legacy/plugins/uptime/public/components/monitor_details/ml/confirm_delete.tsx
new file mode 100644
index 0000000000000..6754676765fb6
--- /dev/null
+++ b/x-pack/legacy/plugins/uptime/public/components/monitor_details/ml/confirm_delete.tsx
@@ -0,0 +1,59 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+import React from 'react';
+import { EuiOverlayMask, EuiConfirmModal, EuiLoadingSpinner } from '@elastic/eui';
+import { FormattedMessage } from '@kbn/i18n/react';
+import * as labels from './translations';
+
+interface Props {
+  loading: boolean;
+  onConfirm: () => void;
+  onCancel: () => void;
+}
+
+export const ConfirmJobDeletion: React.FC<Props> = ({ loading, onConfirm, onCancel }) => {
+  return (
+    <EuiOverlayMask>
+      <EuiConfirmModal
+        title={labels.JOB_DELETION_CONFIRMATION}
+        onCancel={onCancel}
+        onConfirm={onConfirm}
+        cancelButtonText="Cancel"
+        confirmButtonText="Delete"
+        buttonColor="danger"
+        defaultFocusedButton="confirm"
+      >
+        {!loading ? (
+          <p>
+            <FormattedMessage
+              id="xpack.uptime.monitorDetails.ml.confirmDeleteMessage"
+              defaultMessage="Are you sure you want to delete this job?"
+            />
+          </p>
+        ) : (
+          <p>
+            <FormattedMessage
+              id="xpack.uptime.monitorDetails.ml.deleteMessage"
+              defaultMessage="Deleting jobs..."
+            />
+            )
+          </p>
+        )}
+        {!loading ? (
+          <p>
+            <FormattedMessage
+              id="xpack.uptime.monitorDetails.ml.deleteJobWarning"
+              defaultMessage="Deleting a job can be time consuming.
+              It will be deleted in the background and data may not disappear instantly."
+            />
+          </p>
+        ) : (
+          <EuiLoadingSpinner size="xl" />
+        )}
+      </EuiConfirmModal>
+    </EuiOverlayMask>
+  );
+};
diff --git a/x-pack/legacy/plugins/uptime/public/components/monitor_details/ml/license_info.tsx b/x-pack/legacy/plugins/uptime/public/components/monitor_details/ml/license_info.tsx
new file mode 100644
index 0000000000000..92badb4043ed6
--- /dev/null
+++ b/x-pack/legacy/plugins/uptime/public/components/monitor_details/ml/license_info.tsx
@@ -0,0 +1,33 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+import React, { useContext } from 'react';
+import { EuiCallOut, EuiButton, EuiSpacer } from '@elastic/eui';
+import { UptimeSettingsContext } from '../../../contexts';
+import * as labels from './translations';
+
+export const ShowLicenseInfo = () => {
+  const { basePath } = useContext(UptimeSettingsContext);
+  return (
+    <>
+      <EuiCallOut
+        className="license-info-trial"
+        title={labels.START_TRAIL}
+        color="primary"
+        iconType="help"
+      >
+        <p>{labels.START_TRAIL_DESC}</p>
+        <EuiButton
+          color="primary"
+          href={basePath + `/app/kibana#/management/elasticsearch/license_management/home`}
+          target="_blank"
+        >
+          {labels.START_TRAIL}
+        </EuiButton>
+      </EuiCallOut>
+      <EuiSpacer />
+    </>
+  );
+};
diff --git a/x-pack/legacy/plugins/uptime/public/components/monitor_details/ml/manage_ml_job.tsx b/x-pack/legacy/plugins/uptime/public/components/monitor_details/ml/manage_ml_job.tsx
new file mode 100644
index 0000000000000..29f003437f7cb
--- /dev/null
+++ b/x-pack/legacy/plugins/uptime/public/components/monitor_details/ml/manage_ml_job.tsx
@@ -0,0 +1,80 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React, { useContext, useState } from 'react';
+
+import { EuiButtonEmpty, EuiContextMenu, EuiIcon, EuiPopover } from '@elastic/eui';
+import { useParams } from 'react-router-dom';
+import { useSelector } from 'react-redux';
+import { canDeleteMLJobSelector } from '../../../state/selectors';
+import { UptimeSettingsContext } from '../../../contexts';
+import * as labels from './translations';
+import { getMLJobLinkHref } from './ml_job_link';
+import { useUrlParams } from '../../../hooks';
+
+interface Props {
+  hasMLJob: boolean;
+  onEnableJob: () => void;
+  onJobDelete: () => void;
+}
+
+export const ManageMLJobComponent = ({ hasMLJob, onEnableJob, onJobDelete }: Props) => {
+  const [isPopOverOpen, setIsPopOverOpen] = useState(false);
+
+  const { basePath } = useContext(UptimeSettingsContext);
+
+  const canDeleteMLJob = useSelector(canDeleteMLJobSelector);
+
+  const [getUrlParams] = useUrlParams();
+  const { dateRangeStart, dateRangeEnd } = getUrlParams();
+
+  let { monitorId } = useParams();
+  monitorId = atob(monitorId || '');
+
+  const button = (
+    <EuiButtonEmpty
+      iconType={hasMLJob ? 'arrowDown' : 'machineLearningApp'}
+      iconSide={hasMLJob ? 'right' : 'left'}
+      onClick={hasMLJob ? () => setIsPopOverOpen(true) : onEnableJob}
+      disabled={hasMLJob && !canDeleteMLJob}
+    >
+      {hasMLJob ? labels.ANOMALY_DETECTION : labels.ENABLE_ANOMALY_DETECTION}
+    </EuiButtonEmpty>
+  );
+
+  const panels = [
+    {
+      id: 0,
+      title: labels.MANAGE_ANOMALY_DETECTION,
+      items: [
+        {
+          name: labels.EXPLORE_IN_ML_APP,
+          icon: <EuiIcon type="dataVisualizer" size="m" />,
+          href: getMLJobLinkHref({
+            basePath,
+            monitorId,
+            dateRange: { from: dateRangeStart, to: dateRangeEnd },
+          }),
+          target: '_blank',
+        },
+        {
+          name: labels.DISABLE_ANOMALY_DETECTION,
+          icon: <EuiIcon type="trash" size="m" />,
+          onClick: () => {
+            setIsPopOverOpen(false);
+            onJobDelete();
+          },
+        },
+      ],
+    },
+  ];
+
+  return (
+    <EuiPopover button={button} isOpen={isPopOverOpen} closePopover={() => setIsPopOverOpen(false)}>
+      <EuiContextMenu initialPanelId={0} panels={panels} />
+    </EuiPopover>
+  );
+};
diff --git a/x-pack/legacy/plugins/uptime/public/components/monitor_details/ml/ml_flyout.tsx b/x-pack/legacy/plugins/uptime/public/components/monitor_details/ml/ml_flyout.tsx
new file mode 100644
index 0000000000000..917367f3e8dad
--- /dev/null
+++ b/x-pack/legacy/plugins/uptime/public/components/monitor_details/ml/ml_flyout.tsx
@@ -0,0 +1,86 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React, { useContext } from 'react';
+import {
+  EuiButton,
+  EuiFlexGroup,
+  EuiFlexItem,
+  EuiFlyout,
+  EuiFlyoutBody,
+  EuiFlyoutFooter,
+  EuiFlyoutHeader,
+  EuiLink,
+  EuiSpacer,
+  EuiText,
+  EuiTitle,
+} from '@elastic/eui';
+import { FormattedMessage } from '@kbn/i18n/react';
+import * as labels from './translations';
+import { UptimeSettingsContext } from '../../../contexts';
+import { ShowLicenseInfo } from './license_info';
+
+interface Props {
+  isCreatingJob: boolean;
+  onClickCreate: () => void;
+  onClose: () => void;
+  canCreateMLJob: boolean;
+}
+
+export function MLFlyoutView({ isCreatingJob, onClickCreate, onClose, canCreateMLJob }: Props) {
+  const { basePath, license } = useContext(UptimeSettingsContext);
+
+  const isLoadingMLJob = false;
+
+  const hasPlatinumLicense = license?.getFeature('ml')?.isAvailable;
+
+  return (
+    <EuiFlyout onClose={onClose} size="s">
+      <EuiFlyoutHeader>
+        <EuiTitle>
+          <h2>{labels.ENABLE_ANOMALY_DETECTION}</h2>
+        </EuiTitle>
+        <EuiSpacer size="s" />
+      </EuiFlyoutHeader>
+      <EuiFlyoutBody>
+        {!hasPlatinumLicense && <ShowLicenseInfo />}
+        <EuiText>
+          <p>{labels.CREAT_ML_JOB_DESC}</p>
+          <p>
+            <FormattedMessage
+              id="xpack.uptime.ml.enableAnomalyDetectionPanel.manageMLJobDescription"
+              defaultMessage="Once a job is created, you can manage it and see more details in the {mlJobsPageLink}."
+              values={{
+                mlJobsPageLink: (
+                  <EuiLink href={basePath + '/app/ml'}>{labels.ML_MANAGEMENT_PAGE}</EuiLink>
+                ),
+              }}
+            />
+          </p>
+          <p>
+            <em>{labels.TAKE_SOME_TIME_TEXT}</em>
+          </p>
+        </EuiText>
+
+        <EuiSpacer />
+      </EuiFlyoutBody>
+      <EuiFlyoutFooter>
+        <EuiFlexGroup justifyContent="spaceBetween" alignItems="flexEnd">
+          <EuiFlexItem grow={false}>
+            <EuiButton
+              onClick={() => onClickCreate()}
+              fill
+              isLoading={isCreatingJob}
+              disabled={isCreatingJob || isLoadingMLJob || !hasPlatinumLicense || !canCreateMLJob}
+            >
+              {labels.CREATE_NEW_JOB}
+            </EuiButton>
+          </EuiFlexItem>
+        </EuiFlexGroup>
+      </EuiFlyoutFooter>
+    </EuiFlyout>
+  );
+}
diff --git a/x-pack/legacy/plugins/uptime/public/components/monitor_details/ml/ml_flyout_container.tsx b/x-pack/legacy/plugins/uptime/public/components/monitor_details/ml/ml_flyout_container.tsx
new file mode 100644
index 0000000000000..fad12de94fd81
--- /dev/null
+++ b/x-pack/legacy/plugins/uptime/public/components/monitor_details/ml/ml_flyout_container.tsx
@@ -0,0 +1,154 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React, { useContext, useEffect, useState } from 'react';
+import { useDispatch, useSelector } from 'react-redux';
+import { useParams } from 'react-router-dom';
+import {
+  canCreateMLJobSelector,
+  hasMLJobSelector,
+  hasNewMLJobSelector,
+  isMLJobCreatingSelector,
+} from '../../../state/selectors';
+import { createMLJobAction, getExistingMLJobAction } from '../../../state/actions';
+import { MLJobLink } from './ml_job_link';
+import * as labels from './translations';
+import {
+  useKibana,
+  KibanaReactNotifications,
+} from '../../../../../../../../src/plugins/kibana_react/public';
+import { MLFlyoutView } from './ml_flyout';
+import { ML_JOB_ID } from '../../../../common/constants';
+import { UptimeRefreshContext, UptimeSettingsContext } from '../../../contexts';
+import { useUrlParams } from '../../../hooks';
+
+interface Props {
+  onClose: () => void;
+}
+
+const showMLJobNotification = (
+  notifications: KibanaReactNotifications,
+  monitorId: string,
+  basePath: string,
+  range: { to: string; from: string },
+  success: boolean,
+  message = ''
+) => {
+  if (success) {
+    notifications.toasts.success({
+      title: <p>{labels.JOB_CREATED_SUCCESS_TITLE}</p>,
+      body: (
+        <p>
+          {labels.JOB_CREATED_SUCCESS_MESSAGE}
+          <MLJobLink monitorId={monitorId} basePath={basePath} dateRange={range}>
+            {labels.VIEW_JOB}
+          </MLJobLink>
+        </p>
+      ),
+      toastLifeTimeMs: 5000,
+    });
+  } else {
+    notifications.toasts.warning({
+      title: <p>{labels.JOB_CREATION_FAILED}</p>,
+      body: message ?? <p>{labels.JOB_CREATION_FAILED_MESSAGE}</p>,
+      toastLifeTimeMs: 5000,
+    });
+  }
+};
+
+export const MachineLearningFlyout: React.FC<Props> = ({ onClose }) => {
+  const { notifications } = useKibana();
+
+  const dispatch = useDispatch();
+  const { data: hasMLJob, error } = useSelector(hasNewMLJobSelector);
+  const isMLJobCreating = useSelector(isMLJobCreatingSelector);
+  const { basePath } = useContext(UptimeSettingsContext);
+
+  const { refreshApp } = useContext(UptimeRefreshContext);
+
+  let { monitorId } = useParams();
+  monitorId = atob(monitorId || '');
+
+  const createMLJob = () => dispatch(createMLJobAction.get({ monitorId: monitorId as string }));
+
+  const canCreateMLJob = useSelector(canCreateMLJobSelector);
+
+  const { data: uptimeJobs } = useSelector(hasMLJobSelector);
+
+  const hasExistingMLJob = !!uptimeJobs?.jobsExist;
+
+  const [isCreatingJob, setIsCreatingJob] = useState(false);
+
+  const [getUrlParams] = useUrlParams();
+  const { dateRangeStart, dateRangeEnd } = getUrlParams();
+
+  useEffect(() => {
+    if (isCreatingJob && !isMLJobCreating) {
+      if (hasMLJob) {
+        showMLJobNotification(
+          notifications,
+          monitorId as string,
+          basePath,
+          { to: dateRangeEnd, from: dateRangeStart },
+          true
+        );
+        const loadMLJob = (jobId: string) =>
+          dispatch(getExistingMLJobAction.get({ monitorId: monitorId as string }));
+
+        loadMLJob(ML_JOB_ID);
+
+        refreshApp();
+      } else {
+        showMLJobNotification(
+          notifications,
+          monitorId as string,
+          basePath,
+          { to: dateRangeEnd, from: dateRangeStart },
+          false,
+          error?.body?.message
+        );
+      }
+      setIsCreatingJob(false);
+      onClose();
+    }
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [
+    hasMLJob,
+    notifications,
+    onClose,
+    isCreatingJob,
+    error,
+    isMLJobCreating,
+    monitorId,
+    dispatch,
+    basePath,
+  ]);
+
+  useEffect(() => {
+    if (hasExistingMLJob) {
+      setIsCreatingJob(true);
+      dispatch(createMLJobAction.get({ monitorId: monitorId as string }));
+    }
+  }, [dispatch, hasExistingMLJob, monitorId]);
+
+  if (hasExistingMLJob) {
+    return null;
+  }
+
+  const createAnomalyJob = () => {
+    setIsCreatingJob(true);
+    createMLJob();
+  };
+
+  return (
+    <MLFlyoutView
+      canCreateMLJob={!!canCreateMLJob}
+      isCreatingJob={isMLJobCreating}
+      onClickCreate={createAnomalyJob}
+      onClose={onClose}
+    />
+  );
+};
diff --git a/x-pack/legacy/plugins/uptime/public/components/monitor_details/ml/ml_integeration.tsx b/x-pack/legacy/plugins/uptime/public/components/monitor_details/ml/ml_integeration.tsx
new file mode 100644
index 0000000000000..a27796167091e
--- /dev/null
+++ b/x-pack/legacy/plugins/uptime/public/components/monitor_details/ml/ml_integeration.tsx
@@ -0,0 +1,111 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React, { useContext, useEffect, useState } from 'react';
+
+import { useParams } from 'react-router-dom';
+import { useDispatch, useSelector } from 'react-redux';
+import { MachineLearningFlyout } from './ml_flyout_container';
+import {
+  hasMLFeatureAvailable,
+  hasMLJobSelector,
+  isMLJobDeletedSelector,
+  isMLJobDeletingSelector,
+} from '../../../state/selectors';
+import { deleteMLJobAction, getExistingMLJobAction, resetMLState } from '../../../state/actions';
+import { ConfirmJobDeletion } from './confirm_delete';
+import { UptimeRefreshContext } from '../../../contexts';
+import { getMLJobId } from '../../../state/api/ml_anomaly';
+import * as labels from './translations';
+import { useKibana } from '../../../../../../../../src/plugins/kibana_react/public';
+import { ManageMLJobComponent } from './manage_ml_job';
+import { JobStat } from '../../../../../../../plugins/ml/common/types/data_recognizer';
+
+export const MLIntegrationComponent = () => {
+  const [isMlFlyoutOpen, setIsMlFlyoutOpen] = useState(false);
+  const [isConfirmDeleteJobOpen, setIsConfirmDeleteJobOpen] = useState(false);
+
+  const { lastRefresh, refreshApp } = useContext(UptimeRefreshContext);
+
+  const { notifications } = useKibana();
+
+  let { monitorId } = useParams();
+  monitorId = atob(monitorId || '');
+
+  const dispatch = useDispatch();
+
+  const isMLAvailable = useSelector(hasMLFeatureAvailable);
+
+  const deleteMLJob = () => dispatch(deleteMLJobAction.get({ monitorId: monitorId as string }));
+  const isMLJobDeleting = useSelector(isMLJobDeletingSelector);
+  const { data: jobDeletionSuccess } = useSelector(isMLJobDeletedSelector);
+
+  const { data: uptimeJobs } = useSelector(hasMLJobSelector);
+
+  const hasMLJob =
+    !!uptimeJobs?.jobsExist &&
+    !!uptimeJobs.jobs.find((job: JobStat) => job.id === getMLJobId(monitorId as string));
+
+  useEffect(() => {
+    if (isMLAvailable) {
+      dispatch(getExistingMLJobAction.get({ monitorId: monitorId as string }));
+    }
+  }, [dispatch, isMLAvailable, monitorId, lastRefresh]);
+
+  useEffect(() => {
+    if (isConfirmDeleteJobOpen && jobDeletionSuccess?.[getMLJobId(monitorId as string)]?.deleted) {
+      setIsConfirmDeleteJobOpen(false);
+      notifications.toasts.success({
+        title: <p>{labels.JOB_DELETION}</p>,
+        body: <p>{labels.JOB_DELETION_SUCCESS}</p>,
+        toastLifeTimeMs: 3000,
+      });
+      dispatch(resetMLState());
+
+      refreshApp();
+    }
+  }, [
+    isMLJobDeleting,
+    isConfirmDeleteJobOpen,
+    jobDeletionSuccess,
+    monitorId,
+    refreshApp,
+    notifications.toasts,
+    dispatch,
+  ]);
+
+  const onEnableJobClick = () => {
+    setIsMlFlyoutOpen(true);
+  };
+
+  const closeFlyout = () => {
+    setIsMlFlyoutOpen(false);
+  };
+
+  const confirmDeleteMLJob = () => {
+    setIsConfirmDeleteJobOpen(true);
+  };
+
+  return (
+    <>
+      <ManageMLJobComponent
+        hasMLJob={hasMLJob as boolean}
+        onEnableJob={onEnableJobClick}
+        onJobDelete={confirmDeleteMLJob}
+      />
+      {isMlFlyoutOpen && <MachineLearningFlyout onClose={closeFlyout} />}
+      {isConfirmDeleteJobOpen && (
+        <ConfirmJobDeletion
+          onConfirm={deleteMLJob}
+          loading={isMLJobDeleting}
+          onCancel={() => {
+            setIsConfirmDeleteJobOpen(false);
+          }}
+        />
+      )}
+    </>
+  );
+};
diff --git a/x-pack/legacy/plugins/uptime/public/components/monitor_details/ml/ml_job_link.tsx b/x-pack/legacy/plugins/uptime/public/components/monitor_details/ml/ml_job_link.tsx
new file mode 100644
index 0000000000000..4b6f7e3ba061d
--- /dev/null
+++ b/x-pack/legacy/plugins/uptime/public/components/monitor_details/ml/ml_job_link.tsx
@@ -0,0 +1,52 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * 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 url from 'url';
+import { EuiButtonEmpty } from '@elastic/eui';
+import rison, { RisonValue } from 'rison-node';
+import { getMLJobId } from '../../../state/api/ml_anomaly';
+
+interface Props {
+  monitorId: string;
+  basePath: string;
+  dateRange: {
+    to: string;
+    from: string;
+  };
+}
+
+export const getMLJobLinkHref = ({ basePath, monitorId, dateRange }: Props) => {
+  const query = {
+    ml: { jobIds: [getMLJobId(monitorId)] },
+    refreshInterval: { pause: true, value: 0 },
+    time: dateRange,
+  };
+
+  const queryParams = {
+    mlExplorerFilter: {
+      filterActive: true,
+      filteredFields: ['monitor.id', monitorId],
+    },
+    mlExplorerSwimlane: {
+      viewByFieldName: 'observer.geo.name',
+    },
+  };
+
+  const path = '/explorer';
+
+  return url.format({
+    pathname: basePath + '/app/ml',
+    hash:
+      `${path}?_g=${rison.encode(query as RisonValue)}` +
+      (monitorId ? `&_a=${rison.encode(queryParams as RisonValue)}` : ''),
+  });
+};
+
+export const MLJobLink: React.FC<Props> = ({ basePath, monitorId, dateRange, children }) => {
+  const href = getMLJobLinkHref({ basePath, monitorId, dateRange });
+  return <EuiButtonEmpty children={children} size="s" href={href} target="_blank" />;
+};
diff --git a/x-pack/legacy/plugins/uptime/public/components/monitor_details/ml/translations.tsx b/x-pack/legacy/plugins/uptime/public/components/monitor_details/ml/translations.tsx
new file mode 100644
index 0000000000000..570dd9d1bfa26
--- /dev/null
+++ b/x-pack/legacy/plugins/uptime/public/components/monitor_details/ml/translations.tsx
@@ -0,0 +1,150 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { i18n } from '@kbn/i18n';
+
+export const JOB_CREATED_SUCCESS_TITLE = i18n.translate(
+  'xpack.uptime.ml.enableAnomalyDetectionPanel.jobCreatedNotificationTitle',
+  {
+    defaultMessage: 'Job successfully created',
+  }
+);
+
+export const JOB_CREATED_SUCCESS_MESSAGE = i18n.translate(
+  'xpack.uptime.ml.enableAnomalyDetectionPanel.jobCreatedNotificationText',
+  {
+    defaultMessage:
+      'The analysis is now running for response duration chart. It might take a while before results are added to the response times graph.',
+  }
+);
+
+export const JOB_CREATION_FAILED = i18n.translate(
+  'xpack.uptime.ml.enableAnomalyDetectionPanel.jobCreationFailedNotificationTitle',
+  {
+    defaultMessage: 'Job creation failed',
+  }
+);
+
+export const JOB_CREATION_FAILED_MESSAGE = i18n.translate(
+  'xpack.uptime.ml.enableAnomalyDetectionPanel.jobCreationFailedNotificationText',
+  {
+    defaultMessage:
+      'Your current license may not allow for creating machine learning jobs, or this job may already exist.',
+  }
+);
+
+export const JOB_DELETION = i18n.translate(
+  'xpack.uptime.ml.enableAnomalyDetectionPanel.jobDeletionNotificationTitle',
+  {
+    defaultMessage: 'Job deleted',
+  }
+);
+
+export const JOB_DELETION_SUCCESS = i18n.translate(
+  'xpack.uptime.ml.enableAnomalyDetectionPanel.jobDeletionSuccessNotificationText',
+  {
+    defaultMessage: 'Job is successfully deleted',
+  }
+);
+
+export const JOB_DELETION_CONFIRMATION = i18n.translate(
+  'xpack.uptime.ml.enableAnomalyDetectionPanel.jobDeletionConfirmLabel',
+  {
+    defaultMessage: 'Delete anomaly detection job?',
+  }
+);
+
+export const VIEW_JOB = i18n.translate(
+  'xpack.uptime.ml.enableAnomalyDetectionPanel.jobCreatedNotificationText.viewJobLinkText',
+  {
+    defaultMessage: 'View job',
+  }
+);
+
+export const EXPLORE_IN_ML_APP = i18n.translate('xpack.uptime.ml.durationChart.exploreInMlApp', {
+  defaultMessage: 'Explore in ML App',
+});
+
+export const ENABLE_ANOMALY_DETECTION = i18n.translate(
+  'xpack.uptime.ml.enableAnomalyDetectionPanel.enableAnomalyDetectionTitle',
+  {
+    defaultMessage: 'Enable anomaly detection',
+  }
+);
+
+export const ANOMALY_DETECTION = i18n.translate(
+  'xpack.uptime.ml.enableAnomalyDetectionPanel.anomalyDetectionTitle',
+  {
+    defaultMessage: 'Anomaly detection',
+  }
+);
+
+export const DISABLE_ANOMALY_DETECTION = i18n.translate(
+  'xpack.uptime.ml.enableAnomalyDetectionPanel.disableAnomalyDetectionTitle',
+  {
+    defaultMessage: 'Disable anomaly detection',
+  }
+);
+
+export const MANAGE_ANOMALY_DETECTION = i18n.translate(
+  'xpack.uptime.ml.enableAnomalyDetectionPanel.manageAnomalyDetectionTitle',
+  {
+    defaultMessage: 'Manage anomaly detection',
+  }
+);
+
+export const VIEW_EXISTING_JOB = i18n.translate(
+  'xpack.uptime.ml.enableAnomalyDetectionPanel.callout.jobExistsDescription.viewJobLinkText',
+  {
+    defaultMessage: 'View existing job',
+  }
+);
+
+export const ML_MANAGEMENT_PAGE = i18n.translate(
+  'xpack.uptime.ml.enableAnomalyDetectionPanel.manageMLJobDescription.mlJobsPageLinkText',
+  {
+    defaultMessage: 'Machine Learning jobs management page',
+  }
+);
+
+export const TAKE_SOME_TIME_TEXT = i18n.translate(
+  'xpack.uptime.ml.enableAnomalyDetectionPanel.manageMLJobDescription.noteText',
+  {
+    defaultMessage: 'Note: It might take a few minutes for the job to begin calculating results.',
+  }
+);
+
+export const CREATE_NEW_JOB = i18n.translate(
+  'xpack.uptime.ml.enableAnomalyDetectionPanel.createNewJobButtonLabel',
+  {
+    defaultMessage: 'Create new job',
+  }
+);
+
+export const CREAT_ML_JOB_DESC = i18n.translate(
+  'xpack.uptime.ml.enableAnomalyDetectionPanel.createMLJobDescription',
+  {
+    defaultMessage: `Here you can create a machine learning job to calculate anomaly scores on
+    response durations for Uptime Monitor. Once enabled, the monitor duration chart on the details page
+    will show the expected bounds and annotate the graph with anomalies. You can also potentially
+     identify periods of increased latency across geographical regions.`,
+  }
+);
+
+export const START_TRAIL = i18n.translate(
+  'xpack.uptime.ml.enableAnomalyDetectionPanel.startTrial',
+  {
+    defaultMessage: 'Start free 14-day trial',
+  }
+);
+
+export const START_TRAIL_DESC = i18n.translate(
+  'xpack.uptime.ml.enableAnomalyDetectionPanel.startTrialDesc',
+  {
+    defaultMessage:
+      'In order to access duration anomaly detection, you have to be subscribed to an Elastic Platinum license.',
+  }
+);
diff --git a/x-pack/legacy/plugins/uptime/public/contexts/uptime_settings_context.tsx b/x-pack/legacy/plugins/uptime/public/contexts/uptime_settings_context.tsx
index 9f50849703562..44a87d310c9c7 100644
--- a/x-pack/legacy/plugins/uptime/public/contexts/uptime_settings_context.tsx
+++ b/x-pack/legacy/plugins/uptime/public/contexts/uptime_settings_context.tsx
@@ -9,9 +9,11 @@ import { UptimeAppProps } from '../uptime_app';
 import { CLIENT_DEFAULTS, CONTEXT_DEFAULTS } from '../../common/constants';
 import { CommonlyUsedRange } from '../components/functional/uptime_date_picker';
 import { useUrlParams } from '../hooks';
+import { ILicense } from '../../../../../plugins/licensing/common/types';
 
 export interface UptimeSettingsContextValues {
   basePath: string;
+  license?: ILicense | null;
   dateRangeStart: string;
   dateRangeEnd: string;
   isApmAvailable: boolean;
@@ -39,14 +41,29 @@ const defaultContext: UptimeSettingsContextValues = {
 export const UptimeSettingsContext = createContext(defaultContext);
 
 export const UptimeSettingsContextProvider: React.FC<UptimeAppProps> = ({ children, ...props }) => {
-  const { basePath, isApmAvailable, isInfraAvailable, isLogsAvailable, commonlyUsedRanges } = props;
+  const {
+    basePath,
+    isApmAvailable,
+    isInfraAvailable,
+    isLogsAvailable,
+    commonlyUsedRanges,
+    plugins,
+  } = props;
 
   const [getUrlParams] = useUrlParams();
 
   const { dateRangeStart, dateRangeEnd } = getUrlParams();
 
+  let license: ILicense | null = null;
+
+  // @ts-ignore
+  plugins.licensing.license$.subscribe((licenseItem: ILicense) => {
+    license = licenseItem;
+  });
+
   const value = useMemo(() => {
     return {
+      license,
       basePath,
       isApmAvailable,
       isInfraAvailable,
@@ -56,6 +73,7 @@ export const UptimeSettingsContextProvider: React.FC<UptimeAppProps> = ({ childr
       dateRangeEnd: dateRangeEnd ?? DATE_RANGE_END,
     };
   }, [
+    license,
     basePath,
     isApmAvailable,
     isInfraAvailable,
diff --git a/x-pack/legacy/plugins/uptime/public/state/actions/index.ts b/x-pack/legacy/plugins/uptime/public/state/actions/index.ts
index b2ab73879a4a7..4563e6bfc4f0e 100644
--- a/x-pack/legacy/plugins/uptime/public/state/actions/index.ts
+++ b/x-pack/legacy/plugins/uptime/public/state/actions/index.ts
@@ -10,5 +10,6 @@ export * from './ui';
 export * from './monitor_status';
 export * from './index_patternts';
 export * from './ping';
+export * from './ml_anomaly';
 export * from './monitor_duration';
 export * from './index_status';
diff --git a/x-pack/legacy/plugins/uptime/public/state/actions/index_status.ts b/x-pack/legacy/plugins/uptime/public/state/actions/index_status.ts
index 336758a71ce60..5c964052bb3de 100644
--- a/x-pack/legacy/plugins/uptime/public/state/actions/index_status.ts
+++ b/x-pack/legacy/plugins/uptime/public/state/actions/index_status.ts
@@ -7,4 +7,4 @@
 import { createAsyncAction } from './utils';
 import { StatesIndexStatus } from '../../../common/runtime_types';
 
-export const indexStatusAction = createAsyncAction<StatesIndexStatus & Error>('GET INDEX STATUS');
+export const indexStatusAction = createAsyncAction<any, StatesIndexStatus>('GET INDEX STATUS');
diff --git a/x-pack/legacy/plugins/uptime/public/state/actions/ml_anomaly.ts b/x-pack/legacy/plugins/uptime/public/state/actions/ml_anomaly.ts
new file mode 100644
index 0000000000000..9a8e4036f2cff
--- /dev/null
+++ b/x-pack/legacy/plugins/uptime/public/state/actions/ml_anomaly.ts
@@ -0,0 +1,46 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { createAction } from 'redux-actions';
+import { createAsyncAction } from './utils';
+import { PrivilegesResponse } from '../../../../../../plugins/ml/common/types/privileges';
+import { AnomaliesTableRecord } from '../../../../../../plugins/ml/common/types/anomalies';
+import { CreateMLJobSuccess, DeleteJobResults, MonitorIdParam } from './types';
+import { JobExistResult } from '../../../../../../plugins/ml/common/types/data_recognizer';
+
+export const resetMLState = createAction('RESET_ML_STATE');
+
+export const getExistingMLJobAction = createAsyncAction<MonitorIdParam, JobExistResult>(
+  'GET_EXISTING_ML_JOB'
+);
+
+export const createMLJobAction = createAsyncAction<MonitorIdParam, CreateMLJobSuccess | null>(
+  'CREATE_ML_JOB'
+);
+
+export const getMLCapabilitiesAction = createAsyncAction<any, PrivilegesResponse>(
+  'GET_ML_CAPABILITIES'
+);
+
+export const deleteMLJobAction = createAsyncAction<MonitorIdParam, DeleteJobResults>(
+  'DELETE_ML_JOB'
+);
+
+export interface AnomalyRecordsParams {
+  dateStart: number;
+  dateEnd: number;
+  listOfMonitorIds: string[];
+  anomalyThreshold?: number;
+}
+
+export interface AnomalyRecords {
+  anomalies: AnomaliesTableRecord[];
+  interval: string;
+}
+
+export const getAnomalyRecordsAction = createAsyncAction<AnomalyRecordsParams, AnomalyRecords>(
+  'GET_ANOMALY_RECORDS'
+);
diff --git a/x-pack/legacy/plugins/uptime/public/state/actions/monitor_duration.ts b/x-pack/legacy/plugins/uptime/public/state/actions/monitor_duration.ts
index cd02ace7db24f..9a2db5be60b12 100644
--- a/x-pack/legacy/plugins/uptime/public/state/actions/monitor_duration.ts
+++ b/x-pack/legacy/plugins/uptime/public/state/actions/monitor_duration.ts
@@ -7,6 +7,7 @@
 import { createAction } from 'redux-actions';
 import { QueryParams } from './types';
 import { MonitorDurationResult } from '../../../common/types';
+import { IHttpFetchError } from '../../../../../../../target/types/core/public/http';
 
 type MonitorQueryParams = QueryParams & { monitorId: string };
 
@@ -14,4 +15,6 @@ export const getMonitorDurationAction = createAction<MonitorQueryParams>('GET_MO
 export const getMonitorDurationActionSuccess = createAction<MonitorDurationResult>(
   'GET_MONITOR_DURATION_SUCCESS'
 );
-export const getMonitorDurationActionFail = createAction<Error>('GET_MONITOR_DURATION_FAIL');
+export const getMonitorDurationActionFail = createAction<IHttpFetchError>(
+  'GET_MONITOR_DURATION_FAIL'
+);
diff --git a/x-pack/legacy/plugins/uptime/public/state/actions/types.ts b/x-pack/legacy/plugins/uptime/public/state/actions/types.ts
index e9bf11256b0b8..236b263414a26 100644
--- a/x-pack/legacy/plugins/uptime/public/state/actions/types.ts
+++ b/x-pack/legacy/plugins/uptime/public/state/actions/types.ts
@@ -5,11 +5,21 @@
  */
 
 import { Action } from 'redux-actions';
+import { IHttpFetchError } from '../../../../../../../target/types/core/public/http';
 
-export interface AsyncAction {
-  get: (payload?: any) => Action<any>;
-  success: (payload?: any) => Action<any>;
-  fail: (payload?: any) => Action<any>;
+export interface AsyncAction<Payload, SuccessPayload> {
+  get: (payload: Payload) => Action<Payload>;
+  success: (payload: SuccessPayload) => Action<SuccessPayload>;
+  fail: (payload: IHttpFetchError) => Action<IHttpFetchError>;
+}
+export interface AsyncAction1<Payload, SuccessPayload> {
+  get: (payload?: Payload) => Action<Payload>;
+  success: (payload: SuccessPayload) => Action<SuccessPayload>;
+  fail: (payload: IHttpFetchError) => Action<IHttpFetchError>;
+}
+
+export interface MonitorIdParam {
+  monitorId: string;
 }
 
 export interface QueryParams {
@@ -27,3 +37,15 @@ export interface MonitorDetailsActionPayload {
   dateEnd: string;
   location?: string;
 }
+
+export interface CreateMLJobSuccess {
+  count: number;
+  jobId: string;
+}
+
+export interface DeleteJobResults {
+  [id: string]: {
+    [status: string]: boolean;
+    error?: any;
+  };
+}
diff --git a/x-pack/legacy/plugins/uptime/public/state/actions/utils.ts b/x-pack/legacy/plugins/uptime/public/state/actions/utils.ts
index 337c4bfb2fa47..a5adb96731f33 100644
--- a/x-pack/legacy/plugins/uptime/public/state/actions/utils.ts
+++ b/x-pack/legacy/plugins/uptime/public/state/actions/utils.ts
@@ -5,12 +5,18 @@
  */
 
 import { createAction } from 'redux-actions';
-import { AsyncAction } from './types';
+import { AsyncAction, AsyncAction1 } from './types';
+import { IHttpFetchError } from '../../../../../../../target/types/core/public/http';
 
-export function createAsyncAction<Payload>(actionStr: string): AsyncAction {
+export function createAsyncAction<Payload, SuccessPayload>(
+  actionStr: string
+): AsyncAction1<Payload, SuccessPayload>;
+export function createAsyncAction<Payload, SuccessPayload>(
+  actionStr: string
+): AsyncAction<Payload, SuccessPayload> {
   return {
     get: createAction<Payload>(actionStr),
-    success: createAction<Payload>(`${actionStr}_SUCCESS`),
-    fail: createAction<Payload>(`${actionStr}_FAIL`),
+    success: createAction<SuccessPayload>(`${actionStr}_SUCCESS`),
+    fail: createAction<IHttpFetchError>(`${actionStr}_FAIL`),
   };
 }
diff --git a/x-pack/legacy/plugins/uptime/public/state/api/ml_anomaly.ts b/x-pack/legacy/plugins/uptime/public/state/api/ml_anomaly.ts
new file mode 100644
index 0000000000000..80b97783769b5
--- /dev/null
+++ b/x-pack/legacy/plugins/uptime/public/state/api/ml_anomaly.ts
@@ -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 moment from 'moment';
+import { apiService } from './utils';
+import { AnomalyRecords, AnomalyRecordsParams } from '../actions';
+import { API_URLS, INDEX_NAMES, ML_JOB_ID, ML_MODULE_ID } from '../../../common/constants';
+import { PrivilegesResponse } from '../../../../../../plugins/ml/common/types/privileges';
+import { CreateMLJobSuccess, DeleteJobResults, MonitorIdParam } from '../actions/types';
+import { DataRecognizerConfigResponse } from '../../../../../../plugins/ml/common/types/modules';
+import { JobExistResult } from '../../../../../../plugins/ml/common/types/data_recognizer';
+
+export const getMLJobId = (monitorId: string) => `${monitorId}_${ML_JOB_ID}`;
+
+export const getMLCapabilities = async (): Promise<PrivilegesResponse> => {
+  return await apiService.get(API_URLS.ML_CAPABILITIES);
+};
+
+export const getExistingJobs = async (): Promise<JobExistResult> => {
+  return await apiService.get(API_URLS.ML_MODULE_JOBS + ML_MODULE_ID);
+};
+
+export const createMLJob = async ({
+  monitorId,
+}: MonitorIdParam): Promise<CreateMLJobSuccess | null> => {
+  const url = API_URLS.ML_SETUP_MODULE + ML_MODULE_ID;
+
+  const data = {
+    prefix: `${monitorId}_`,
+    useDedicatedIndex: false,
+    startDatafeed: true,
+    start: moment()
+      .subtract(24, 'h')
+      .valueOf(),
+    indexPatternName: INDEX_NAMES.HEARTBEAT,
+    query: {
+      bool: {
+        filter: [
+          {
+            term: {
+              'monitor.id': monitorId,
+            },
+          },
+        ],
+      },
+    },
+  };
+
+  const response: DataRecognizerConfigResponse = await apiService.post(url, data);
+  if (response?.jobs?.[0]?.id === getMLJobId(monitorId) && response?.jobs?.[0]?.success) {
+    return {
+      count: 1,
+      jobId: response?.jobs?.[0]?.id,
+    };
+  } else {
+    return null;
+  }
+};
+
+export const deleteMLJob = async ({ monitorId }: MonitorIdParam): Promise<DeleteJobResults> => {
+  const data = { jobIds: [getMLJobId(monitorId)] };
+
+  return await apiService.post(API_URLS.ML_DELETE_JOB, data);
+};
+
+export const fetchAnomalyRecords = async ({
+  dateStart,
+  dateEnd,
+  listOfMonitorIds,
+  anomalyThreshold,
+}: AnomalyRecordsParams): Promise<AnomalyRecords> => {
+  const data = {
+    jobIds: listOfMonitorIds.map((monitorId: string) => getMLJobId(monitorId)),
+    criteriaFields: [],
+    influencers: [],
+    aggregationInterval: 'auto',
+    threshold: anomalyThreshold ?? 25,
+    earliestMs: dateStart,
+    latestMs: dateEnd,
+    dateFormatTz: Intl.DateTimeFormat().resolvedOptions().timeZone,
+    maxRecords: 500,
+    maxExamples: 10,
+  };
+  return apiService.post(API_URLS.ML_ANOMALIES_RESULT, data);
+};
diff --git a/x-pack/legacy/plugins/uptime/public/state/effects/__tests__/fecth_effect.test.ts b/x-pack/legacy/plugins/uptime/public/state/effects/__tests__/fetch_effect.test.ts
similarity index 67%
rename from x-pack/legacy/plugins/uptime/public/state/effects/__tests__/fecth_effect.test.ts
rename to x-pack/legacy/plugins/uptime/public/state/effects/__tests__/fetch_effect.test.ts
index 6520e1492bddc..0354cfeac7b07 100644
--- a/x-pack/legacy/plugins/uptime/public/state/effects/__tests__/fecth_effect.test.ts
+++ b/x-pack/legacy/plugins/uptime/public/state/effects/__tests__/fetch_effect.test.ts
@@ -7,6 +7,9 @@
 import { call, put } from 'redux-saga/effects';
 import { fetchEffectFactory } from '../fetch_effect';
 import { indexStatusAction } from '../../actions';
+import { HttpFetchError } from '../../../../../../../../src/core/public/http/http_fetch_error';
+import { StatesIndexStatus } from '../../../../common/runtime_types';
+import { fetchIndexStatus } from '../../api';
 
 describe('fetch saga effect factory', () => {
   const asyncAction = indexStatusAction;
@@ -15,7 +18,7 @@ describe('fetch saga effect factory', () => {
 
   it('works with success workflow', () => {
     const indexStatusResult = { indexExists: true, docCount: 2712532 };
-    const fetchStatus = async () => {
+    const fetchStatus = async (): Promise<StatesIndexStatus> => {
       return { indexExists: true, docCount: 2712532 };
     };
     fetchEffect = fetchEffectFactory(
@@ -25,6 +28,7 @@ describe('fetch saga effect factory', () => {
     )(calledAction);
     let next = fetchEffect.next();
 
+    // @ts-ignore TODO, dig deeper for TS issues here
     expect(next.value).toEqual(call(fetchStatus, calledAction.payload));
 
     const successResult = put(asyncAction.success(indexStatusResult));
@@ -35,18 +39,21 @@ describe('fetch saga effect factory', () => {
   });
 
   it('works with error workflow', () => {
-    const indexStatusResultError = new Error('no heartbeat index found');
-    const fetchStatus = async () => {
-      return indexStatusResultError;
-    };
+    const indexStatusResultError = new HttpFetchError(
+      'No heartbeat index found.',
+      'error',
+      {} as any
+    );
+
     fetchEffect = fetchEffectFactory(
-      fetchStatus,
+      fetchIndexStatus,
       asyncAction.success,
       asyncAction.fail
     )(calledAction);
     let next = fetchEffect.next();
 
-    expect(next.value).toEqual(call(fetchStatus, calledAction.payload));
+    // @ts-ignore TODO, dig deeper for TS issues here
+    expect(next.value).toEqual(call(fetchIndexStatus, calledAction.payload));
 
     const errorResult = put(asyncAction.fail(indexStatusResultError));
 
@@ -56,18 +63,21 @@ describe('fetch saga effect factory', () => {
   });
 
   it('works with throw error workflow', () => {
-    const unExpectedError = new Error('no url found, so throw error');
-    const fetchStatus = async () => {
-      return await fetch('/some/url');
-    };
+    const unExpectedError = new HttpFetchError(
+      'No url found for the call, so throw error.',
+      'error',
+      {} as any
+    );
+
     fetchEffect = fetchEffectFactory(
-      fetchStatus,
+      fetchIndexStatus,
       asyncAction.success,
       asyncAction.fail
     )(calledAction);
     let next = fetchEffect.next();
 
-    expect(next.value).toEqual(call(fetchStatus, calledAction.payload));
+    // @ts-ignore TODO, dig deeper for TS issues here
+    expect(next.value).toEqual(call(fetchIndexStatus, calledAction.payload));
 
     const unexpectedErrorResult = put(asyncAction.fail(unExpectedError));
 
diff --git a/x-pack/legacy/plugins/uptime/public/state/effects/fetch_effect.ts b/x-pack/legacy/plugins/uptime/public/state/effects/fetch_effect.ts
index 943275d21e51e..49e497952ea44 100644
--- a/x-pack/legacy/plugins/uptime/public/state/effects/fetch_effect.ts
+++ b/x-pack/legacy/plugins/uptime/public/state/effects/fetch_effect.ts
@@ -6,6 +6,7 @@
 
 import { call, put } from 'redux-saga/effects';
 import { Action } from 'redux-actions';
+import { IHttpFetchError } from '../../../../../../../target/types/core/public/http';
 
 /**
  * Factory function for a fetch effect. It expects three action creators,
@@ -21,24 +22,23 @@ import { Action } from 'redux-actions';
 export function fetchEffectFactory<T, R, S, F>(
   fetch: (request: T) => Promise<R>,
   success: (response: R) => Action<S>,
-  fail: (error: Error) => Action<F>
+  fail: (error: IHttpFetchError) => Action<F>
 ) {
   return function*(action: Action<T>) {
     try {
       const response = yield call(fetch, action.payload);
-
       if (response instanceof Error) {
         // eslint-disable-next-line no-console
         console.error(response);
 
-        yield put(fail(response));
+        yield put(fail(response as IHttpFetchError));
       } else {
         yield put(success(response));
       }
     } catch (error) {
       // eslint-disable-next-line no-console
       console.error(error);
-      yield put(fail(error));
+      yield put(fail(error as IHttpFetchError));
     }
   };
 }
diff --git a/x-pack/legacy/plugins/uptime/public/state/effects/index.ts b/x-pack/legacy/plugins/uptime/public/state/effects/index.ts
index d11b79d60d154..8d457be1d1c78 100644
--- a/x-pack/legacy/plugins/uptime/public/state/effects/index.ts
+++ b/x-pack/legacy/plugins/uptime/public/state/effects/index.ts
@@ -13,6 +13,7 @@ import { fetchDynamicSettingsEffect, setDynamicSettingsEffect } from './dynamic_
 import { fetchIndexPatternEffect } from './index_pattern';
 import { fetchPingHistogramEffect } from './ping';
 import { fetchMonitorDurationEffect } from './monitor_duration';
+import { fetchMLJobEffect } from './ml_anomaly';
 import { fetchIndexStatusEffect } from './index_status';
 
 export function* rootEffect() {
@@ -24,6 +25,7 @@ export function* rootEffect() {
   yield fork(setDynamicSettingsEffect);
   yield fork(fetchIndexPatternEffect);
   yield fork(fetchPingHistogramEffect);
+  yield fork(fetchMLJobEffect);
   yield fork(fetchMonitorDurationEffect);
   yield fork(fetchIndexStatusEffect);
 }
diff --git a/x-pack/legacy/plugins/uptime/public/state/effects/ml_anomaly.ts b/x-pack/legacy/plugins/uptime/public/state/effects/ml_anomaly.ts
new file mode 100644
index 0000000000000..a6a376b546ab8
--- /dev/null
+++ b/x-pack/legacy/plugins/uptime/public/state/effects/ml_anomaly.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 { takeLatest } from 'redux-saga/effects';
+import {
+  getMLCapabilitiesAction,
+  getExistingMLJobAction,
+  createMLJobAction,
+  getAnomalyRecordsAction,
+  deleteMLJobAction,
+} from '../actions';
+import { fetchEffectFactory } from './fetch_effect';
+import {
+  getExistingJobs,
+  createMLJob,
+  fetchAnomalyRecords,
+  deleteMLJob,
+  getMLCapabilities,
+} from '../api/ml_anomaly';
+
+export function* fetchMLJobEffect() {
+  yield takeLatest(
+    getExistingMLJobAction.get,
+    fetchEffectFactory(getExistingJobs, getExistingMLJobAction.success, getExistingMLJobAction.fail)
+  );
+  yield takeLatest(
+    createMLJobAction.get,
+    fetchEffectFactory(createMLJob, createMLJobAction.success, createMLJobAction.fail)
+  );
+  yield takeLatest(
+    getAnomalyRecordsAction.get,
+    fetchEffectFactory(
+      fetchAnomalyRecords,
+      getAnomalyRecordsAction.success,
+      getAnomalyRecordsAction.fail
+    )
+  );
+  yield takeLatest(
+    deleteMLJobAction.get,
+    fetchEffectFactory(deleteMLJob, deleteMLJobAction.success, deleteMLJobAction.fail)
+  );
+  yield takeLatest(
+    getMLCapabilitiesAction.get,
+    fetchEffectFactory(
+      getMLCapabilities,
+      getMLCapabilitiesAction.success,
+      getMLCapabilitiesAction.fail
+    )
+  );
+}
diff --git a/x-pack/legacy/plugins/uptime/public/state/reducers/index.ts b/x-pack/legacy/plugins/uptime/public/state/reducers/index.ts
index 6617627aadaf3..7bf8af5dd4d03 100644
--- a/x-pack/legacy/plugins/uptime/public/state/reducers/index.ts
+++ b/x-pack/legacy/plugins/uptime/public/state/reducers/index.ts
@@ -15,6 +15,7 @@ import { indexPatternReducer } from './index_pattern';
 import { pingReducer } from './ping';
 import { monitorDurationReducer } from './monitor_duration';
 import { indexStatusReducer } from './index_status';
+import { mlJobsReducer } from './ml_anomaly';
 
 export const rootReducer = combineReducers({
   monitor: monitorReducer,
@@ -25,6 +26,7 @@ export const rootReducer = combineReducers({
   dynamicSettings: dynamicSettingsReducer,
   indexPattern: indexPatternReducer,
   ping: pingReducer,
+  ml: mlJobsReducer,
   monitorDuration: monitorDurationReducer,
   indexStatus: indexStatusReducer,
 });
diff --git a/x-pack/legacy/plugins/uptime/public/state/reducers/index_status.ts b/x-pack/legacy/plugins/uptime/public/state/reducers/index_status.ts
index 50a02210fb5d3..1a93eb43775f3 100644
--- a/x-pack/legacy/plugins/uptime/public/state/reducers/index_status.ts
+++ b/x-pack/legacy/plugins/uptime/public/state/reducers/index_status.ts
@@ -6,25 +6,23 @@
 
 import { handleActions } from 'redux-actions';
 import { indexStatusAction } from '../actions';
-import { handleAsyncAction } from './utils';
-import { IReducerState } from './types';
+import { getAsyncInitialState, handleAsyncAction } from './utils';
+import { AsyncInitialState } from './types';
 import { StatesIndexStatus } from '../../../common/runtime_types';
 
-export interface IndexStatusState extends IReducerState {
-  data: StatesIndexStatus | null;
+export interface IndexStatusState {
+  indexStatus: AsyncInitialState<StatesIndexStatus | null>;
 }
 
 const initialState: IndexStatusState = {
-  data: null,
-  loading: false,
-  errors: [],
+  indexStatus: getAsyncInitialState(),
 };
 
 type PayLoad = StatesIndexStatus & Error;
 
 export const indexStatusReducer = handleActions<IndexStatusState, PayLoad>(
   {
-    ...handleAsyncAction('data', indexStatusAction),
+    ...handleAsyncAction('indexStatus', indexStatusAction),
   },
   initialState
 );
diff --git a/x-pack/legacy/plugins/uptime/public/state/reducers/ml_anomaly.ts b/x-pack/legacy/plugins/uptime/public/state/reducers/ml_anomaly.ts
new file mode 100644
index 0000000000000..9d59d39634327
--- /dev/null
+++ b/x-pack/legacy/plugins/uptime/public/state/reducers/ml_anomaly.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 { handleActions } from 'redux-actions';
+import {
+  getExistingMLJobAction,
+  createMLJobAction,
+  getAnomalyRecordsAction,
+  deleteMLJobAction,
+  resetMLState,
+  AnomalyRecords,
+  getMLCapabilitiesAction,
+} from '../actions';
+import { getAsyncInitialState, handleAsyncAction } from './utils';
+import { IHttpFetchError } from '../../../../../../../target/types/core/public/http';
+import { AsyncInitialState } from './types';
+import { PrivilegesResponse } from '../../../../../../plugins/ml/common/types/privileges';
+import { CreateMLJobSuccess, DeleteJobResults } from '../actions/types';
+import { JobExistResult } from '../../../../../../plugins/ml/common/types/data_recognizer';
+
+export interface MLJobState {
+  mlJob: AsyncInitialState<JobExistResult>;
+  createJob: AsyncInitialState<CreateMLJobSuccess>;
+  deleteJob: AsyncInitialState<DeleteJobResults>;
+  anomalies: AsyncInitialState<AnomalyRecords>;
+  mlCapabilities: AsyncInitialState<PrivilegesResponse>;
+}
+
+const initialState: MLJobState = {
+  mlJob: getAsyncInitialState(),
+  createJob: getAsyncInitialState(),
+  deleteJob: getAsyncInitialState(),
+  anomalies: getAsyncInitialState(),
+  mlCapabilities: getAsyncInitialState(),
+};
+
+type Payload = IHttpFetchError;
+
+export const mlJobsReducer = handleActions<MLJobState>(
+  {
+    ...handleAsyncAction<MLJobState, Payload>('mlJob', getExistingMLJobAction),
+    ...handleAsyncAction<MLJobState, Payload>('mlCapabilities', getMLCapabilitiesAction),
+    ...handleAsyncAction<MLJobState, Payload>('createJob', createMLJobAction),
+    ...handleAsyncAction<MLJobState, Payload>('deleteJob', deleteMLJobAction),
+    ...handleAsyncAction<MLJobState, Payload>('anomalies', getAnomalyRecordsAction),
+    ...{
+      [String(resetMLState)]: state => ({
+        ...state,
+        mlJob: {
+          loading: false,
+          data: null,
+          error: null,
+        },
+        createJob: {
+          data: null,
+          error: null,
+          loading: false,
+        },
+        deleteJob: {
+          data: null,
+          error: null,
+          loading: false,
+        },
+      }),
+    },
+  },
+  initialState
+);
diff --git a/x-pack/legacy/plugins/uptime/public/state/reducers/monitor_duration.ts b/x-pack/legacy/plugins/uptime/public/state/reducers/monitor_duration.ts
index a222764bd5d24..0e1771c393e50 100644
--- a/x-pack/legacy/plugins/uptime/public/state/reducers/monitor_duration.ts
+++ b/x-pack/legacy/plugins/uptime/public/state/reducers/monitor_duration.ts
@@ -13,13 +13,13 @@ import {
 import { MonitorDurationResult } from '../../../common/types';
 
 export interface MonitorDuration {
-  monitor_duration: MonitorDurationResult | null;
+  durationLines: MonitorDurationResult | null;
   errors: any[];
   loading: boolean;
 }
 
 const initialState: MonitorDuration = {
-  monitor_duration: null,
+  durationLines: null,
   loading: false,
   errors: [],
 };
@@ -39,7 +39,7 @@ export const monitorDurationReducer = handleActions<MonitorDuration, PayLoad>(
     ) => ({
       ...state,
       loading: false,
-      monitor_duration: { ...action.payload },
+      durationLines: { ...action.payload },
     }),
 
     [String(getMonitorDurationActionFail)]: (state: MonitorDuration, action: Action<Error>) => ({
diff --git a/x-pack/legacy/plugins/uptime/public/state/reducers/types.ts b/x-pack/legacy/plugins/uptime/public/state/reducers/types.ts
index 40fe4bddbf172..88995a2f5dd70 100644
--- a/x-pack/legacy/plugins/uptime/public/state/reducers/types.ts
+++ b/x-pack/legacy/plugins/uptime/public/state/reducers/types.ts
@@ -4,7 +4,10 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-export interface IReducerState {
-  errors: Error[];
+import { IHttpFetchError } from '../../../../../../../target/types/core/public/http';
+
+export interface AsyncInitialState<ReduceStateType> {
+  data: ReduceStateType | null;
   loading: boolean;
+  error?: IHttpFetchError | null;
 }
diff --git a/x-pack/legacy/plugins/uptime/public/state/reducers/utils.ts b/x-pack/legacy/plugins/uptime/public/state/reducers/utils.ts
index 773ec10686943..d7a7f237c1154 100644
--- a/x-pack/legacy/plugins/uptime/public/state/reducers/utils.ts
+++ b/x-pack/legacy/plugins/uptime/public/state/reducers/utils.ts
@@ -6,28 +6,45 @@
 
 import { Action } from 'redux-actions';
 import { AsyncAction } from '../actions/types';
-import { IReducerState } from './types';
 
-export function handleAsyncAction<ReducerState extends IReducerState, Payload>(
+export function handleAsyncAction<ReducerState, Payload>(
   storeKey: string,
-  asyncAction: AsyncAction
+  asyncAction: AsyncAction<any, any>
 ) {
   return {
     [String(asyncAction.get)]: (state: ReducerState) => ({
       ...state,
-      loading: true,
+      [storeKey]: {
+        ...(state as any)[storeKey],
+        loading: true,
+      },
     }),
 
     [String(asyncAction.success)]: (state: ReducerState, action: Action<any>) => ({
       ...state,
-      loading: false,
-      [storeKey]: action.payload === null ? action.payload : { ...action.payload },
+      [storeKey]: {
+        ...(state as any)[storeKey],
+        data: action.payload === null ? action.payload : { ...action.payload },
+        loading: false,
+      },
     }),
 
     [String(asyncAction.fail)]: (state: ReducerState, action: Action<any>) => ({
       ...state,
-      errors: [...state.errors, action.payload],
-      loading: false,
+      [storeKey]: {
+        ...(state as any)[storeKey],
+        data: null,
+        error: action.payload,
+        loading: false,
+      },
     }),
   };
 }
+
+export function getAsyncInitialState(initialData = null) {
+  return {
+    data: initialData,
+    loading: false,
+    error: null,
+  };
+}
diff --git a/x-pack/legacy/plugins/uptime/public/state/selectors/__tests__/index.test.ts b/x-pack/legacy/plugins/uptime/public/state/selectors/__tests__/index.test.ts
index 1aea90c70cd0e..573d5b1906082 100644
--- a/x-pack/legacy/plugins/uptime/public/state/selectors/__tests__/index.test.ts
+++ b/x-pack/legacy/plugins/uptime/public/state/selectors/__tests__/index.test.ts
@@ -60,14 +60,28 @@ describe('state selectors', () => {
       errors: [],
     },
     monitorDuration: {
-      monitor_duration: null,
+      durationLines: null,
       loading: false,
       errors: [],
     },
+    ml: {
+      mlJob: {
+        data: null,
+        loading: false,
+      },
+      createJob: { data: null, loading: false },
+      deleteJob: { data: null, loading: false },
+      mlCapabilities: { data: null, loading: false },
+      anomalies: {
+        data: null,
+        loading: false,
+      },
+    },
     indexStatus: {
-      loading: false,
-      data: null,
-      errors: [],
+      indexStatus: {
+        data: null,
+        loading: false,
+      },
     },
   };
 
diff --git a/x-pack/legacy/plugins/uptime/public/state/selectors/index.ts b/x-pack/legacy/plugins/uptime/public/state/selectors/index.ts
index 6844b31d4973c..21e01bd7d8279 100644
--- a/x-pack/legacy/plugins/uptime/public/state/selectors/index.ts
+++ b/x-pack/legacy/plugins/uptime/public/state/selectors/index.ts
@@ -4,6 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+import { createSelector } from 'reselect';
 import { AppState } from '../../state';
 
 // UI Selectors
@@ -21,13 +22,9 @@ export const monitorLocationsSelector = (state: AppState, monitorId: string) =>
   return state.monitor.monitorLocationsList?.get(monitorId);
 };
 
-export const selectSelectedMonitor = (state: AppState) => {
-  return state.monitorStatus.monitor;
-};
+export const selectSelectedMonitor = (state: AppState) => state.monitorStatus.monitor;
 
-export const selectMonitorStatus = (state: AppState) => {
-  return state.monitorStatus.status;
-};
+export const selectMonitorStatus = (state: AppState) => state.monitorStatus.status;
 
 export const selectDynamicSettings = (state: AppState) => {
   return state.dynamicSettings;
@@ -46,6 +43,36 @@ export const selectPingHistogram = ({ ping, ui }: AppState) => {
   };
 };
 
+const mlCapabilitiesSelector = (state: AppState) => state.ml.mlCapabilities.data;
+
+export const hasMLFeatureAvailable = createSelector(
+  mlCapabilitiesSelector,
+  mlCapabilities =>
+    mlCapabilities?.isPlatinumOrTrialLicense && mlCapabilities?.mlFeatureEnabledInSpace
+);
+
+export const canCreateMLJobSelector = createSelector(
+  mlCapabilitiesSelector,
+  mlCapabilities => mlCapabilities?.capabilities.canCreateJob
+);
+
+export const canDeleteMLJobSelector = createSelector(
+  mlCapabilitiesSelector,
+  mlCapabilities => mlCapabilities?.capabilities.canDeleteJob
+);
+
+export const hasMLJobSelector = ({ ml }: AppState) => ml.mlJob;
+
+export const hasNewMLJobSelector = ({ ml }: AppState) => ml.createJob;
+
+export const isMLJobCreatingSelector = ({ ml }: AppState) => ml.createJob.loading;
+
+export const isMLJobDeletingSelector = ({ ml }: AppState) => ml.deleteJob.loading;
+
+export const isMLJobDeletedSelector = ({ ml }: AppState) => ml.deleteJob;
+
+export const anomaliesSelector = ({ ml }: AppState) => ml.anomalies.data;
+
 export const selectDurationLines = ({ monitorDuration }: AppState) => {
   return monitorDuration;
 };
@@ -60,5 +87,5 @@ export const selectMonitorStatusAlert = ({ indexPattern, overviewFilters, ui }:
 });
 
 export const indexStatusSelector = ({ indexStatus }: AppState) => {
-  return indexStatus;
+  return indexStatus.indexStatus;
 };
diff --git a/x-pack/package.json b/x-pack/package.json
index 41674cac01725..fdd2ef3719959 100644
--- a/x-pack/package.json
+++ b/x-pack/package.json
@@ -326,7 +326,7 @@
     "redux": "^4.0.5",
     "redux-actions": "^2.6.5",
     "redux-observable": "^1.2.0",
-    "redux-saga": "^0.16.0",
+    "redux-saga": "^1.1.3",
     "redux-thunk": "^2.3.0",
     "redux-thunks": "^1.0.0",
     "request": "^2.88.0",
diff --git a/x-pack/plugins/ml/common/types/anomalies.ts b/x-pack/plugins/ml/common/types/anomalies.ts
index 7a648a82dbae0..639d9b3b25fae 100644
--- a/x-pack/plugins/ml/common/types/anomalies.ts
+++ b/x-pack/plugins/ml/common/types/anomalies.ts
@@ -36,3 +36,20 @@ export interface AnomalyRecordDoc {
   // TODO provide the causes resource interface.
   causes?: any[];
 }
+
+export interface AnomaliesTableRecord {
+  time: number;
+  source: AnomalyRecordDoc;
+  rowId: string;
+  jobId: string;
+  detectorIndex: number;
+  severity: number;
+  entityName?: string;
+  entityValue?: any;
+  influencers?: Array<{ [key: string]: any }>;
+  actual?: number[];
+  actualSort?: any;
+  typical?: number[];
+  typicalSort?: any;
+  metricDescriptionSort?: number;
+}
diff --git a/x-pack/plugins/ml/common/types/data_recognizer.ts b/x-pack/plugins/ml/common/types/data_recognizer.ts
new file mode 100644
index 0000000000000..2f77cc8c33896
--- /dev/null
+++ b/x-pack/plugins/ml/common/types/data_recognizer.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.
+ */
+
+export interface JobStat {
+  id: string;
+  earliestTimestampMs: number;
+  latestTimestampMs: number;
+  latestResultsTimestampMs: number;
+}
+
+export interface JobExistResult {
+  jobsExist: boolean;
+  jobs: JobStat[];
+}
diff --git a/x-pack/plugins/ml/server/models/data_recognizer/data_recognizer.ts b/x-pack/plugins/ml/server/models/data_recognizer/data_recognizer.ts
index 824f9cc57982c..84f81a30f36b8 100644
--- a/x-pack/plugins/ml/server/models/data_recognizer/data_recognizer.ts
+++ b/x-pack/plugins/ml/server/models/data_recognizer/data_recognizer.ts
@@ -35,6 +35,7 @@ import { calculateModelMemoryLimitProvider } from '../calculate_model_memory_lim
 import { fieldsServiceProvider } from '../fields_service';
 import { jobServiceProvider } from '../job_service';
 import { resultsServiceProvider } from '../results_service';
+import { JobExistResult, JobStat } from '../../../common/types/data_recognizer';
 
 const ML_DIR = 'ml';
 const KIBANA_DIR = 'kibana';
@@ -80,18 +81,6 @@ export interface RecognizeResult {
   logo: { icon: string } | null;
 }
 
-interface JobStat {
-  id: string;
-  earliestTimestampMs: number;
-  latestTimestampMs: number;
-  latestResultsTimestampMs: number;
-}
-
-interface JobExistResult {
-  jobsExist: boolean;
-  jobs: JobStat[];
-}
-
 interface ObjectExistResult {
   id: string;
   type: string;
diff --git a/x-pack/plugins/ml/server/models/data_recognizer/modules/uptime_heartbeat/logo.json b/x-pack/plugins/ml/server/models/data_recognizer/modules/uptime_heartbeat/logo.json
new file mode 100644
index 0000000000000..cc9c9ff57560e
--- /dev/null
+++ b/x-pack/plugins/ml/server/models/data_recognizer/modules/uptime_heartbeat/logo.json
@@ -0,0 +1,3 @@
+{
+  "icon": "uptimeApp"
+}
diff --git a/x-pack/plugins/ml/server/models/data_recognizer/modules/uptime_heartbeat/manifest.json b/x-pack/plugins/ml/server/models/data_recognizer/modules/uptime_heartbeat/manifest.json
new file mode 100644
index 0000000000000..52005a2629900
--- /dev/null
+++ b/x-pack/plugins/ml/server/models/data_recognizer/modules/uptime_heartbeat/manifest.json
@@ -0,0 +1,26 @@
+{
+  "id": "uptime_heartbeat",
+  "title": "Uptime: Heartbeat",
+  "description": "Detect latency issues in heartbeat monitors.",
+  "type": "Heartbeat data",
+  "logoFile": "logo.json",
+  "defaultIndexPattern": "heartbeat-*",
+  "query": {
+    "bool": {
+      "filter": [{ "term": { "agent.type": "heartbeat" } }]
+    }
+  },
+  "jobs": [
+    {
+      "id": "high_latency_by_geo",
+      "file": "high_latency_by_geo.json"
+    }
+  ],
+  "datafeeds": [
+    {
+      "id": "datafeed-high_latency_by_geo",
+      "file": "datafeed_high_latency_by_geo.json",
+      "job_id": "high_latency_by_geo"
+    }
+  ]
+}
diff --git a/x-pack/plugins/ml/server/models/data_recognizer/modules/uptime_heartbeat/ml/datafeed_high_latency_by_geo.json b/x-pack/plugins/ml/server/models/data_recognizer/modules/uptime_heartbeat/ml/datafeed_high_latency_by_geo.json
new file mode 100644
index 0000000000000..0b0cc24982da9
--- /dev/null
+++ b/x-pack/plugins/ml/server/models/data_recognizer/modules/uptime_heartbeat/ml/datafeed_high_latency_by_geo.json
@@ -0,0 +1,13 @@
+{
+  "job_id": "JOB_ID",
+  "indices": ["INDEX_PATTERN_NAME"],
+  "max_empty_searches": 10,
+  "query": {
+    "bool": {
+      "must": [
+        { "bool": { "filter": { "term": { "agent.type": "heartbeat" } } } },
+        { "bool": { "filter": { "term": { "event.dataset": "uptime" } } } }
+      ]
+    }
+  }
+}
diff --git a/x-pack/plugins/ml/server/models/data_recognizer/modules/uptime_heartbeat/ml/high_latency_by_geo.json b/x-pack/plugins/ml/server/models/data_recognizer/modules/uptime_heartbeat/ml/high_latency_by_geo.json
new file mode 100644
index 0000000000000..c4f06daf97d08
--- /dev/null
+++ b/x-pack/plugins/ml/server/models/data_recognizer/modules/uptime_heartbeat/ml/high_latency_by_geo.json
@@ -0,0 +1,29 @@
+{
+  "job_type": "anomaly_detector",
+  "groups": ["uptime"],
+  "description": "Uptime Heartbeat: Identify periods of increased latency across geographical regions.",
+  "analysis_config": {
+    "bucket_span": "15m",
+    "detectors": [
+      {
+        "detector_description": "increased latency",
+        "function": "high_mean",
+        "field_name": "monitor.duration.us",
+        "partition_field_name": "observer.geo.name",
+        "use_null": true
+      }
+    ],
+    "influencers": ["monitor.id", "monitor.name", "observer.geo.name"]
+  },
+  "allow_lazy_open": true,
+  "analysis_limits": {
+    "model_memory_limit": "32mb"
+  },
+  "data_description": {
+    "time_field": "@timestamp"
+  },
+  "custom_settings": {
+    "created_by": "ml-module-uptime-heartbeat",
+    "custom_urls": []
+  }
+}
diff --git a/x-pack/plugins/ml/server/models/results_service/build_anomaly_table_items.d.ts b/x-pack/plugins/ml/server/models/results_service/build_anomaly_table_items.d.ts
index 2bd19985c8518..061f295ba5970 100644
--- a/x-pack/plugins/ml/server/models/results_service/build_anomaly_table_items.d.ts
+++ b/x-pack/plugins/ml/server/models/results_service/build_anomaly_table_items.d.ts
@@ -4,24 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { AnomalyRecordDoc } from '../../../common/types/anomalies';
-
-export interface AnomaliesTableRecord {
-  time: number;
-  source: AnomalyRecordDoc;
-  rowId: string;
-  jobId: string;
-  detectorIndex: number;
-  severity: number;
-  entityName?: string;
-  entityValue?: any;
-  influencers?: Array<{ [key: string]: any }>;
-  actual?: number[];
-  actualSort?: any;
-  typical?: number[];
-  typicalSort?: any;
-  metricDescriptionSort?: number;
-}
+import { AnomaliesTableRecord } from '../../../common/types/anomalies';
 
 export function buildAnomalyTableItems(
   anomalyRecords: any,
diff --git a/x-pack/plugins/ml/server/models/results_service/results_service.ts b/x-pack/plugins/ml/server/models/results_service/results_service.ts
index 6a12862048dee..1df53d9cee79c 100644
--- a/x-pack/plugins/ml/server/models/results_service/results_service.ts
+++ b/x-pack/plugins/ml/server/models/results_service/results_service.ts
@@ -8,11 +8,11 @@ import _ from 'lodash';
 import moment from 'moment';
 import { SearchResponse } from 'elasticsearch';
 import { APICaller } from 'kibana/server';
-import { buildAnomalyTableItems, AnomaliesTableRecord } from './build_anomaly_table_items';
+import { buildAnomalyTableItems } from './build_anomaly_table_items';
 import { ML_RESULTS_INDEX_PATTERN } from '../../../common/constants/index_patterns';
 import { ANOMALIES_TABLE_DEFAULT_QUERY_SIZE } from '../../../common/constants/search';
 import { getPartitionFieldsValuesFactory } from './get_partition_fields_values';
-import { AnomalyRecordDoc } from '../../../common/types/anomalies';
+import { AnomaliesTableRecord, AnomalyRecordDoc } from '../../../common/types/anomalies';
 
 // Service for carrying out Elasticsearch queries to obtain data for the
 // ML Results dashboards.
diff --git a/yarn.lock b/yarn.lock
index 22b087d5a8338..bd9a764cfdb22 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3078,6 +3078,50 @@
     react-lifecycles-compat "^3.0.4"
     warning "^3.0.0"
 
+"@redux-saga/core@^1.1.3":
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/@redux-saga/core/-/core-1.1.3.tgz#3085097b57a4ea8db5528d58673f20ce0950f6a4"
+  integrity sha512-8tInBftak8TPzE6X13ABmEtRJGjtK17w7VUs7qV17S8hCO5S3+aUTWZ/DBsBJPdE8Z5jOPwYALyvofgq1Ws+kg==
+  dependencies:
+    "@babel/runtime" "^7.6.3"
+    "@redux-saga/deferred" "^1.1.2"
+    "@redux-saga/delay-p" "^1.1.2"
+    "@redux-saga/is" "^1.1.2"
+    "@redux-saga/symbols" "^1.1.2"
+    "@redux-saga/types" "^1.1.0"
+    redux "^4.0.4"
+    typescript-tuple "^2.2.1"
+
+"@redux-saga/deferred@^1.1.2":
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/@redux-saga/deferred/-/deferred-1.1.2.tgz#59937a0eba71fff289f1310233bc518117a71888"
+  integrity sha512-908rDLHFN2UUzt2jb4uOzj6afpjgJe3MjICaUNO3bvkV/kN/cNeI9PMr8BsFXB/MR8WTAZQq/PlTq8Kww3TBSQ==
+
+"@redux-saga/delay-p@^1.1.2":
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/@redux-saga/delay-p/-/delay-p-1.1.2.tgz#8f515f4b009b05b02a37a7c3d0ca9ddc157bb355"
+  integrity sha512-ojc+1IoC6OP65Ts5+ZHbEYdrohmIw1j9P7HS9MOJezqMYtCDgpkoqB5enAAZrNtnbSL6gVCWPHaoaTY5KeO0/g==
+  dependencies:
+    "@redux-saga/symbols" "^1.1.2"
+
+"@redux-saga/is@^1.1.2":
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/@redux-saga/is/-/is-1.1.2.tgz#ae6c8421f58fcba80faf7cadb7d65b303b97e58e"
+  integrity sha512-OLbunKVsCVNTKEf2cH4TYyNbbPgvmZ52iaxBD4I1fTif4+MTXMa4/Z07L83zW/hTCXwpSZvXogqMqLfex2Tg6w==
+  dependencies:
+    "@redux-saga/symbols" "^1.1.2"
+    "@redux-saga/types" "^1.1.0"
+
+"@redux-saga/symbols@^1.1.2":
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/@redux-saga/symbols/-/symbols-1.1.2.tgz#216a672a487fc256872b8034835afc22a2d0595d"
+  integrity sha512-EfdGnF423glv3uMwLsGAtE6bg+R9MdqlHEzExnfagXPrIiuxwr3bdiAwz3gi+PsrQ3yBlaBpfGLtDG8rf3LgQQ==
+
+"@redux-saga/types@^1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@redux-saga/types/-/types-1.1.0.tgz#0e81ce56b4883b4b2a3001ebe1ab298b84237204"
+  integrity sha512-afmTuJrylUU/0OtqzaRkbyYFFNgCF73Bvel/sw90pvGrWIZ+vyoIJqA6eMSoA6+nb443kTmulmBtC9NerXboNg==
+
 "@samverschueren/stream-to-observable@^0.3.0":
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/@samverschueren/stream-to-observable/-/stream-to-observable-0.3.0.tgz#ecdf48d532c58ea477acfcab80348424f8d0662f"
@@ -25312,10 +25356,12 @@ redux-observable@^1.2.0:
   resolved "https://registry.yarnpkg.com/redux-observable/-/redux-observable-1.2.0.tgz#ff51b6c6be2598e9b5e89fc36639186bb0e669c7"
   integrity sha512-yeR90RP2WzZzCxxnQPlh2uFzyfFLsfXu8ROh53jGDPXVqj71uNDMmvi/YKQkd9ofiVoO4OYb1snbowO49tCEMg==
 
-redux-saga@^0.16.0:
-  version "0.16.2"
-  resolved "https://registry.yarnpkg.com/redux-saga/-/redux-saga-0.16.2.tgz#993662e86bc945d8509ac2b8daba3a8c615cc971"
-  integrity sha512-iIjKnRThI5sKPEASpUvySemjzwqwI13e3qP7oLub+FycCRDysLSAOwt958niZW6LhxfmS6Qm1BzbU70w/Koc4w==
+redux-saga@^1.1.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/redux-saga/-/redux-saga-1.1.3.tgz#9f3e6aebd3c994bbc0f6901a625f9a42b51d1112"
+  integrity sha512-RkSn/z0mwaSa5/xH/hQLo8gNf4tlvT18qXDNvedihLcfzh+jMchDgaariQoehCpgRltEm4zHKJyINEz6aqswTw==
+  dependencies:
+    "@redux-saga/core" "^1.1.3"
 
 redux-thunk@2.2.0:
   version "2.2.0"
@@ -29889,6 +29935,13 @@ typedarray@^0.0.6, typedarray@~0.0.5:
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
   integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
 
+typescript-compare@^0.0.2:
+  version "0.0.2"
+  resolved "https://registry.yarnpkg.com/typescript-compare/-/typescript-compare-0.0.2.tgz#7ee40a400a406c2ea0a7e551efd3309021d5f425"
+  integrity sha512-8ja4j7pMHkfLJQO2/8tut7ub+J3Lw2S3061eJLFQcvs3tsmJKp8KG5NtpLn7KcY2w08edF74BSVN7qJS0U6oHA==
+  dependencies:
+    typescript-logic "^0.0.0"
+
 typescript-fsa-reducers@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/typescript-fsa-reducers/-/typescript-fsa-reducers-1.2.1.tgz#2af1a85f7b88fb0dfb9fa59d5da51a5d7ac6543f"
@@ -29899,6 +29952,18 @@ typescript-fsa@^3.0.0:
   resolved "https://registry.yarnpkg.com/typescript-fsa/-/typescript-fsa-3.0.0.tgz#3ad1cb915a67338e013fc21f67c9b3e0e110c912"
   integrity sha512-xiXAib35i0QHl/+wMobzPibjAH5TJLDj+qGq5jwVLG9qR4FUswZURBw2qihBm0m06tHoyb3FzpnJs1GRhRwVag==
 
+typescript-logic@^0.0.0:
+  version "0.0.0"
+  resolved "https://registry.yarnpkg.com/typescript-logic/-/typescript-logic-0.0.0.tgz#66ebd82a2548f2b444a43667bec120b496890196"
+  integrity sha512-zXFars5LUkI3zP492ls0VskH3TtdeHCqu0i7/duGt60i5IGPIpAHE/DWo5FqJ6EjQ15YKXrt+AETjv60Dat34Q==
+
+typescript-tuple@^2.2.1:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/typescript-tuple/-/typescript-tuple-2.2.1.tgz#7d9813fb4b355f69ac55032e0363e8bb0f04dad2"
+  integrity sha512-Zcr0lbt8z5ZdEzERHAMAniTiIKerFCMgd7yjq1fPnDJ43et/k9twIFQMUYff9k5oXcsQ0WpvFcgzK2ZKASoW6Q==
+  dependencies:
+    typescript-compare "^0.0.2"
+
 typescript@3.7.2, typescript@^3.0.1, typescript@^3.0.3, typescript@^3.2.2, typescript@^3.3.3333, typescript@^3.4.5, typescript@~3.7.2:
   version "3.7.2"
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.7.2.tgz#27e489b95fa5909445e9fef5ee48d81697ad18fb"

From 3cb70538979485d865cd932fd13cb8fa25b0b4e1 Mon Sep 17 00:00:00 2001
From: Sandra Gonzales <neptunian@users.noreply.github.com>
Date: Tue, 24 Mar 2020 07:36:23 -0400
Subject: [PATCH 071/179] [EPM] merge duplicate fields when creating index
 patterns (#60957)

* fix bug where an already installed packaged was installed twice through endpoint

* fix bug where dataset like network and network_summary were not differentiated

* handle duplicate fields by merging fields of the same type
---
 .../__snapshots__/install.test.ts.snap        | 366 ------------------
 .../epm/kibana/index_pattern/install.test.ts  |  29 +-
 .../epm/kibana/index_pattern/install.ts       |  30 +-
 .../kibana/index_pattern/tests/test_data.ts   |  98 +++++
 .../server/services/epm/packages/assets.ts    |   3 +-
 5 files changed, 148 insertions(+), 378 deletions(-)
 create mode 100644 x-pack/plugins/ingest_manager/server/services/epm/kibana/index_pattern/tests/test_data.ts

diff --git a/x-pack/plugins/ingest_manager/server/services/epm/kibana/index_pattern/__snapshots__/install.test.ts.snap b/x-pack/plugins/ingest_manager/server/services/epm/kibana/index_pattern/__snapshots__/install.test.ts.snap
index 79f778f9bba8f..d063ebe92f938 100644
--- a/x-pack/plugins/ingest_manager/server/services/epm/kibana/index_pattern/__snapshots__/install.test.ts.snap
+++ b/x-pack/plugins/ingest_manager/server/services/epm/kibana/index_pattern/__snapshots__/install.test.ts.snap
@@ -565,372 +565,6 @@ exports[`creating index patterns from yaml fields createIndexPatternFields funct
 }
 `;
 
-exports[`creating index patterns from yaml fields dedupFields function remove duplicated fields when parsing multiple files: dedupeFields 1`] = `
-[
-  {
-    "name": "coredns",
-    "type": "group",
-    "description": "coredns fields after normalization\\n",
-    "fields": [
-      {
-        "name": "id",
-        "type": "keyword",
-        "description": "id of the DNS transaction\\n"
-      },
-      {
-        "name": "allParams",
-        "type": "integer",
-        "format": "bytes",
-        "pattern": "patternValQueryWeight",
-        "input_format": "inputFormatVal,",
-        "output_format": "outputFormalVal,",
-        "output_precision": "3,",
-        "label_template": "labelTemplateVal,",
-        "url_template": "urlTemplateVal,",
-        "openLinkInCurrentTab": "true,",
-        "description": "weight of the DNS query\\n"
-      },
-      {
-        "name": "query.length",
-        "type": "integer",
-        "pattern": "patternValQueryLength",
-        "description": "length of the DNS query\\n"
-      },
-      {
-        "name": "query.size",
-        "type": "integer",
-        "format": "bytes",
-        "pattern": "patternValQuerySize",
-        "description": "size of the DNS query\\n"
-      },
-      {
-        "name": "query.class",
-        "type": "keyword",
-        "description": "DNS query class\\n"
-      },
-      {
-        "name": "query.name",
-        "type": "keyword",
-        "description": "DNS query name\\n"
-      },
-      {
-        "name": "query.type",
-        "type": "keyword",
-        "description": "DNS query type\\n"
-      },
-      {
-        "name": "response.code",
-        "type": "keyword",
-        "description": "DNS response code\\n"
-      },
-      {
-        "name": "response.flags",
-        "type": "keyword",
-        "description": "DNS response flags\\n"
-      },
-      {
-        "name": "response.size",
-        "type": "integer",
-        "format": "bytes",
-        "description": "size of the DNS response\\n"
-      },
-      {
-        "name": "dnssec_ok",
-        "type": "boolean",
-        "description": "dnssec flag\\n"
-      }
-    ]
-  },
-  {
-    "name": "@timestamp",
-    "level": "core",
-    "required": true,
-    "type": "date",
-    "description": "Date/time when the event originated. This is the date/time extracted from the event, typically representing when the event was generated by the source. If the event source has no original timestamp, this value is typically populated by the first time the event was received by the pipeline. Required field for all events.",
-    "example": "2016-05-23T08:05:34.853Z"
-  },
-  {
-    "name": "labels",
-    "level": "core",
-    "type": "object",
-    "object_type": "keyword",
-    "description": "Custom key/value pairs. Can be used to add meta information to events. Should not contain nested objects. All values are stored as keyword. Example: \`docker\` and \`k8s\` labels.",
-    "example": {
-      "application": "foo-bar",
-      "env": "production"
-    }
-  },
-  {
-    "name": "message",
-    "level": "core",
-    "type": "text",
-    "description": "For log events the message field contains the log message, optimized for viewing in a log viewer. For structured logs without an original message field, other fields can be concatenated to form a human-readable summary of the event. If multiple messages exist, they can be combined into one message.",
-    "example": "Hello World"
-  },
-  {
-    "name": "tags",
-    "level": "core",
-    "type": "keyword",
-    "ignore_above": 1024,
-    "description": "List of keywords used to tag each event.",
-    "example": "[\\"production\\", \\"env2\\"]"
-  },
-  {
-    "name": "agent",
-    "title": "Agent",
-    "group": 2,
-    "description": "The agent fields contain the data about the software entity, if any, that collects, detects, or observes events on a host, or takes measurements on a host. Examples include Beats. Agents may also run on observers. ECS agent.* fields shall be populated with details of the agent running on the host or observer where the event happened or the measurement was taken.",
-    "footnote": "Examples: In the case of Beats for logs, the agent.name is filebeat. For APM, it is the agent running in the app/service. The agent information does not change if data is sent through queuing systems like Kafka, Redis, or processing systems such as Logstash or APM Server.",
-    "type": "group",
-    "fields": [
-      {
-        "name": "ephemeral_id",
-        "level": "extended",
-        "type": "keyword",
-        "ignore_above": 1024,
-        "description": "Ephemeral identifier of this agent (if one exists). This id normally changes across restarts, but \`agent.id\` does not.",
-        "example": "8a4f500f"
-      },
-      {
-        "name": "id",
-        "level": "core",
-        "type": "keyword",
-        "ignore_above": 1024,
-        "description": "Unique identifier of this agent (if one exists). Example: For Beats this would be beat.id.",
-        "example": "8a4f500d"
-      },
-      {
-        "name": "name",
-        "level": "core",
-        "type": "keyword",
-        "ignore_above": 1024,
-        "description": "Custom name of the agent. This is a name that can be given to an agent. This can be helpful if for example two Filebeat instances are running on the same host but a human readable separation is needed on which Filebeat instance data is coming from. If no name is given, the name is often left empty.",
-        "example": "foo"
-      },
-      {
-        "name": "type",
-        "level": "core",
-        "type": "keyword",
-        "ignore_above": 1024,
-        "description": "Type of the agent. The agent type stays always the same and should be given by the agent used. In case of Filebeat the agent would always be Filebeat also if two Filebeat instances are run on the same machine.",
-        "example": "filebeat"
-      },
-      {
-        "name": "version",
-        "level": "core",
-        "type": "keyword",
-        "ignore_above": 1024,
-        "description": "Version of the agent.",
-        "example": "6.0.0-rc2"
-      }
-    ]
-  },
-  {
-    "name": "as",
-    "title": "Autonomous System",
-    "group": 2,
-    "description": "An autonomous system (AS) is a collection of connected Internet Protocol (IP) routing prefixes under the control of one or more network operators on behalf of a single administrative entity or domain that presents a common, clearly defined routing policy to the internet.",
-    "type": "group",
-    "fields": [
-      {
-        "name": "number",
-        "level": "extended",
-        "type": "long",
-        "description": "Unique number allocated to the autonomous system. The autonomous system number (ASN) uniquely identifies each network on the Internet.",
-        "example": 15169
-      },
-      {
-        "name": "organization.name",
-        "level": "extended",
-        "type": "keyword",
-        "ignore_above": 1024,
-        "description": "Organization name.",
-        "example": "Google LLC"
-      }
-    ]
-  },
-  {
-    "name": "nginx.access",
-    "type": "group",
-    "description": "Contains fields for the Nginx access logs.\\n",
-    "fields": [
-      {
-        "name": "group_disabled",
-        "type": "group",
-        "enabled": false,
-        "fields": [
-          {
-            "name": "message",
-            "type": "text"
-          }
-        ]
-      },
-      {
-        "name": "remote_ip_list",
-        "type": "array",
-        "description": "An array of remote IP addresses. It is a list because it is common to include, besides the client IP address, IP addresses from headers like \`X-Forwarded-For\`. Real source IP is restored to \`source.ip\`.\\n"
-      },
-      {
-        "name": "body_sent.bytes",
-        "type": "alias",
-        "path": "http.response.body.bytes",
-        "migration": true
-      },
-      {
-        "name": "user_name",
-        "type": "alias",
-        "path": "user.name",
-        "migration": true
-      },
-      {
-        "name": "method",
-        "type": "alias",
-        "path": "http.request.method",
-        "migration": true
-      },
-      {
-        "name": "url",
-        "type": "alias",
-        "path": "url.original",
-        "migration": true
-      },
-      {
-        "name": "http_version",
-        "type": "alias",
-        "path": "http.version",
-        "migration": true
-      },
-      {
-        "name": "response_code",
-        "type": "alias",
-        "path": "http.response.status_code",
-        "migration": true
-      },
-      {
-        "name": "referrer",
-        "type": "alias",
-        "path": "http.request.referrer",
-        "migration": true
-      },
-      {
-        "name": "agent",
-        "type": "alias",
-        "path": "user_agent.original",
-        "migration": true
-      },
-      {
-        "name": "user_agent",
-        "type": "group",
-        "fields": [
-          {
-            "name": "device",
-            "type": "alias",
-            "path": "user_agent.device.name",
-            "migration": true
-          },
-          {
-            "name": "name",
-            "type": "alias",
-            "path": "user_agent.name",
-            "migration": true
-          },
-          {
-            "name": "os",
-            "type": "alias",
-            "path": "user_agent.os.full_name",
-            "migration": true
-          },
-          {
-            "name": "os_name",
-            "type": "alias",
-            "path": "user_agent.os.name",
-            "migration": true
-          },
-          {
-            "name": "original",
-            "type": "alias",
-            "path": "user_agent.original",
-            "migration": true
-          }
-        ]
-      },
-      {
-        "name": "geoip",
-        "type": "group",
-        "fields": [
-          {
-            "name": "continent_name",
-            "type": "alias",
-            "path": "source.geo.continent_name",
-            "migration": true
-          },
-          {
-            "name": "country_iso_code",
-            "type": "alias",
-            "path": "source.geo.country_iso_code",
-            "migration": true
-          },
-          {
-            "name": "location",
-            "type": "alias",
-            "path": "source.geo.location",
-            "migration": true
-          },
-          {
-            "name": "region_name",
-            "type": "alias",
-            "path": "source.geo.region_name",
-            "migration": true
-          },
-          {
-            "name": "city_name",
-            "type": "alias",
-            "path": "source.geo.city_name",
-            "migration": true
-          },
-          {
-            "name": "region_iso_code",
-            "type": "alias",
-            "path": "source.geo.region_iso_code",
-            "migration": true
-          }
-        ]
-      }
-    ]
-  },
-  {
-    "name": "source",
-    "type": "group",
-    "fields": [
-      {
-        "name": "geo",
-        "type": "group",
-        "fields": [
-          {
-            "name": "continent_name",
-            "type": "text"
-          }
-        ]
-      }
-    ]
-  },
-  {
-    "name": "country",
-    "type": "",
-    "multi_fields": [
-      {
-        "name": "keyword",
-        "type": "keyword"
-      },
-      {
-        "name": "text",
-        "type": "text"
-      }
-    ]
-  }
-]
-`;
-
 exports[`creating index patterns from yaml fields flattenFields function flattens recursively and handles copying alias fields: flattenFields 1`] = `
 [
   {
diff --git a/x-pack/plugins/ingest_manager/server/services/epm/kibana/index_pattern/install.test.ts b/x-pack/plugins/ingest_manager/server/services/epm/kibana/index_pattern/install.test.ts
index 5e883772957d2..bc1694348b4c2 100644
--- a/x-pack/plugins/ingest_manager/server/services/epm/kibana/index_pattern/install.test.ts
+++ b/x-pack/plugins/ingest_manager/server/services/epm/kibana/index_pattern/install.test.ts
@@ -19,6 +19,7 @@ import {
   createIndexPattern,
 } from './install';
 import { Fields, Field } from '../../fields/field';
+import { dupeFields } from './tests/test_data';
 
 // Add our own serialiser to just do JSON.stringify
 expect.addSnapshotSerializer({
@@ -60,9 +61,31 @@ describe('creating index patterns from yaml fields', () => {
     expect(flattened).toMatchSnapshot('flattenFields');
   });
 
-  test('dedupFields function remove duplicated fields when parsing multiple files', () => {
-    const deduped = dedupeFields(fields);
-    expect(deduped).toMatchSnapshot('dedupeFields');
+  describe('dedupFields', () => {
+    const deduped = dedupeFields(dupeFields);
+    const checkIfDup = (field: Field) => {
+      return deduped.filter(item => item.name === field.name);
+    };
+    test('there there is one field object with name of "1"', () => {
+      expect(checkIfDup({ name: '1' }).length).toBe(1);
+    });
+    test('there there is one field object with name of "1.1"', () => {
+      expect(checkIfDup({ name: '1.1' }).length).toBe(1);
+    });
+    test('there there is one field object with name of "2"', () => {
+      expect(checkIfDup({ name: '2' }).length).toBe(1);
+    });
+    test('there there is one field object with name of "4"', () => {
+      expect(checkIfDup({ name: '4' }).length).toBe(1);
+    });
+    // existing field takes precendence
+    test('the new merged field has correct attributes', () => {
+      const mergedField = deduped.find(field => field.name === '1');
+      expect(mergedField?.searchable).toBe(true);
+      expect(mergedField?.aggregatable).toBe(true);
+      expect(mergedField?.analyzed).toBe(true);
+      expect(mergedField?.count).toBe(0);
+    });
   });
 
   describe('getFieldByPath searches recursively for field in fields given dot separated path', () => {
diff --git a/x-pack/plugins/ingest_manager/server/services/epm/kibana/index_pattern/install.ts b/x-pack/plugins/ingest_manager/server/services/epm/kibana/index_pattern/install.ts
index 7aecc408e05fe..0657fb7759b49 100644
--- a/x-pack/plugins/ingest_manager/server/services/epm/kibana/index_pattern/install.ts
+++ b/x-pack/plugins/ingest_manager/server/services/epm/kibana/index_pattern/install.ts
@@ -78,8 +78,12 @@ export async function installIndexPatterns(
     savedObjectsClient,
     InstallationStatus.installed
   );
-  // add this package
-  if (pkgkey) installedPackages.push(pkgkey);
+  // add this package to the array if it doesn't already exist
+  // this should not happen because a user can't "reinstall" a package
+  // if it does because the install endpoint is called directly, the install continues
+  if (pkgkey && !installedPackages.includes(pkgkey)) {
+    installedPackages.push(pkgkey);
+  }
 
   // get each package's registry info
   const installedPackagesFetchInfoPromise = installedPackages.map(pkg => Registry.fetchInfo(pkg));
@@ -151,17 +155,29 @@ export const createIndexPattern = (indexPatternType: string, fields: Fields) =>
 export const createIndexPatternFields = (
   fields: Fields
 ): { indexPatternFields: IndexPatternField[]; fieldFormatMap: FieldFormatMap } => {
-  const dedupedFields = dedupeFields(fields);
-  const flattenedFields = flattenFields(dedupedFields);
+  const flattenedFields = flattenFields(fields);
   const fieldFormatMap = createFieldFormatMap(flattenedFields);
   const transformedFields = flattenedFields.map(transformField);
-  return { indexPatternFields: transformedFields, fieldFormatMap };
+  const dedupedFields = dedupeFields(transformedFields);
+  return { indexPatternFields: dedupedFields, fieldFormatMap };
 };
 
-export const dedupeFields = (fields: Fields) => {
-  const uniqueObj = fields.reduce<{ [name: string]: Field }>((acc, field) => {
+// merges fields that are duplicates with the existing taking precedence
+export const dedupeFields = (fields: IndexPatternField[]) => {
+  const uniqueObj = fields.reduce<{ [name: string]: IndexPatternField }>((acc, field) => {
+    // if field doesn't exist yet
     if (!acc[field.name]) {
       acc[field.name] = field;
+      // if field exists already
+    } else {
+      const existingField = acc[field.name];
+      // if the existing field and this field have the same type, merge
+      if (existingField.type === field.type) {
+        const mergedField = { ...field, ...existingField };
+        acc[field.name] = mergedField;
+      } else {
+        // log when there is a dup with different types
+      }
     }
     return acc;
   }, {});
diff --git a/x-pack/plugins/ingest_manager/server/services/epm/kibana/index_pattern/tests/test_data.ts b/x-pack/plugins/ingest_manager/server/services/epm/kibana/index_pattern/tests/test_data.ts
new file mode 100644
index 0000000000000..13bef1b6ddb2c
--- /dev/null
+++ b/x-pack/plugins/ingest_manager/server/services/epm/kibana/index_pattern/tests/test_data.ts
@@ -0,0 +1,98 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { IndexPatternField } from '../install';
+
+export const dupeFields: IndexPatternField[] = [
+  {
+    name: '1',
+    type: 'integer',
+    searchable: true,
+    aggregatable: true,
+    count: 0,
+    indexed: true,
+    doc_values: true,
+    scripted: false,
+    analyzed: true,
+  },
+  {
+    name: '2',
+    type: 'integer',
+    searchable: true,
+    aggregatable: true,
+    count: 0,
+    indexed: true,
+    doc_values: true,
+    scripted: false,
+    analyzed: true,
+  },
+  {
+    name: '3',
+    type: 'integer',
+    searchable: true,
+    aggregatable: true,
+    count: 0,
+    indexed: true,
+    doc_values: true,
+    scripted: false,
+    analyzed: true,
+  },
+  {
+    name: '1',
+    type: 'integer',
+    searchable: false,
+    aggregatable: false,
+    count: 2,
+    indexed: true,
+    doc_values: true,
+    scripted: false,
+    analyzed: true,
+  },
+  {
+    name: '1.1',
+    type: 'integer',
+    searchable: false,
+    aggregatable: false,
+    count: 0,
+    indexed: true,
+    doc_values: true,
+    scripted: false,
+    analyzed: true,
+  },
+  {
+    name: '4',
+    type: 'integer',
+    searchable: false,
+    aggregatable: false,
+    count: 0,
+    indexed: true,
+    doc_values: true,
+    scripted: false,
+    analyzed: true,
+  },
+  {
+    name: '2',
+    type: 'integer',
+    searchable: false,
+    aggregatable: false,
+    count: 0,
+    indexed: true,
+    doc_values: true,
+    scripted: false,
+    analyzed: true,
+  },
+  {
+    name: '1',
+    type: 'integer',
+    searchable: false,
+    aggregatable: false,
+    count: 1,
+    indexed: true,
+    doc_values: true,
+    scripted: false,
+    analyzed: false,
+  },
+];
diff --git a/x-pack/plugins/ingest_manager/server/services/epm/packages/assets.ts b/x-pack/plugins/ingest_manager/server/services/epm/packages/assets.ts
index ecc882d9c2e70..e36c2de1b4e80 100644
--- a/x-pack/plugins/ingest_manager/server/services/epm/packages/assets.ts
+++ b/x-pack/plugins/ingest_manager/server/services/epm/packages/assets.ts
@@ -35,8 +35,7 @@ export function getAssets(
 
     // if dataset, filter for them
     if (datasetName) {
-      // TODO: Filter for dataset path
-      const comparePath = `${EPR_PATH_PREFIX}/${packageInfo.name}-${packageInfo.version}/dataset/${datasetName}`;
+      const comparePath = `${EPR_PATH_PREFIX}/${packageInfo.name}-${packageInfo.version}/dataset/${datasetName}/`;
       if (!path.includes(comparePath)) {
         continue;
       }

From 78e0bdf3144e11d40092fbd3a70e546115771d86 Mon Sep 17 00:00:00 2001
From: Maryia Lapata <mary.lopato@gmail.com>
Date: Tue, 24 Mar 2020 15:15:28 +0300
Subject: [PATCH 072/179] [NP] Graph: get rid of saved objects class wrapper
 (#59917)

* Implement find saved workspace

* Implement get saved workspace

* Create helper function as applyESResp

* Fix eslint

* Implement savedWorkspaceLoader.get()

* Implement deleteWS

* Implement saveWS

* Remove applyESRespUtil

* Refactoring

* Refactoring

* Remove savedWorkspaceLoader

* Update unit test

* Fix merge conflicts

* Add unit tests for saveWithConfirmation

* Fix TS

* Move saveWithConfirmation to a separate file

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 src/plugins/saved_objects/public/index.ts     |   8 +-
 .../saved_object/helpers/save_saved_object.ts |   2 +-
 .../helpers/save_with_confirmation.test.ts    |  93 ++++++++
 .../helpers/save_with_confirmation.ts         |  87 ++++++++
 .../public/saved_object/index.ts              |   3 +
 x-pack/plugins/graph/public/app.js            |  26 ++-
 x-pack/plugins/graph/public/application.ts    |  11 +-
 .../public/helpers/saved_workspace_utils.ts   | 207 ++++++++++++++++++
 .../services/persistence/saved_workspace.ts   |  68 ------
 .../persistence/saved_workspace_loader.ts     |  69 ------
 .../saved_workspace_references.test.ts        |   9 +-
 .../persistence/saved_workspace_references.ts |   6 +-
 .../graph/public/services/save_modal.tsx      |  14 +-
 .../graph/public/state_management/mocks.ts    |  14 +-
 .../state_management/persistence.test.ts      |   5 +-
 .../public/state_management/persistence.ts    |  11 +-
 .../graph/public/state_management/store.ts    |   4 +-
 .../plugins/graph/public/types/persistence.ts |  17 +-
 .../translations/translations/ja-JP.json      |   2 -
 .../translations/translations/zh-CN.json      |   2 -
 20 files changed, 478 insertions(+), 180 deletions(-)
 create mode 100644 src/plugins/saved_objects/public/saved_object/helpers/save_with_confirmation.test.ts
 create mode 100644 src/plugins/saved_objects/public/saved_object/helpers/save_with_confirmation.ts
 create mode 100644 x-pack/plugins/graph/public/helpers/saved_workspace_utils.ts
 delete mode 100644 x-pack/plugins/graph/public/services/persistence/saved_workspace.ts
 delete mode 100644 x-pack/plugins/graph/public/services/persistence/saved_workspace_loader.ts

diff --git a/src/plugins/saved_objects/public/index.ts b/src/plugins/saved_objects/public/index.ts
index ea92c921efad0..9e0a7c40c043f 100644
--- a/src/plugins/saved_objects/public/index.ts
+++ b/src/plugins/saved_objects/public/index.ts
@@ -21,7 +21,13 @@ import { SavedObjectsPublicPlugin } from './plugin';
 
 export { OnSaveProps, SavedObjectSaveModal, SaveResult, showSaveModal } from './save_modal';
 export { getSavedObjectFinder, SavedObjectFinderUi, SavedObjectMetaData } from './finder';
-export { SavedObjectLoader, createSavedObjectClass } from './saved_object';
+export {
+  SavedObjectLoader,
+  createSavedObjectClass,
+  checkForDuplicateTitle,
+  saveWithConfirmation,
+  isErrorNonFatal,
+} from './saved_object';
 export { SavedObjectSaveOpts, SavedObjectKibanaServices, SavedObject } from './types';
 
 export const plugin = () => new SavedObjectsPublicPlugin();
diff --git a/src/plugins/saved_objects/public/saved_object/helpers/save_saved_object.ts b/src/plugins/saved_objects/public/saved_object/helpers/save_saved_object.ts
index e43619c2692a5..1fe3e551b09bc 100644
--- a/src/plugins/saved_objects/public/saved_object/helpers/save_saved_object.ts
+++ b/src/plugins/saved_objects/public/saved_object/helpers/save_saved_object.ts
@@ -30,7 +30,7 @@ import { checkForDuplicateTitle } from './check_for_duplicate_title';
  * @param error {Error} the error
  * @return {boolean}
  */
-function isErrorNonFatal(error: { message: string }) {
+export function isErrorNonFatal(error: { message: string }) {
   if (!error) return false;
   return error.message === OVERWRITE_REJECTED || error.message === SAVE_DUPLICATE_REJECTED;
 }
diff --git a/src/plugins/saved_objects/public/saved_object/helpers/save_with_confirmation.test.ts b/src/plugins/saved_objects/public/saved_object/helpers/save_with_confirmation.test.ts
new file mode 100644
index 0000000000000..b05747a10ecb7
--- /dev/null
+++ b/src/plugins/saved_objects/public/saved_object/helpers/save_with_confirmation.test.ts
@@ -0,0 +1,93 @@
+/*
+ * 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 { SavedObjectAttributes, SavedObjectsCreateOptions, OverlayStart } from 'kibana/public';
+import { SavedObjectsClientContract } from '../../../../../core/public';
+import { saveWithConfirmation } from './save_with_confirmation';
+import * as deps from './confirm_modal_promise';
+import { OVERWRITE_REJECTED } from '../../constants';
+
+describe('saveWithConfirmation', () => {
+  const savedObjectsClient: SavedObjectsClientContract = {} as SavedObjectsClientContract;
+  const overlays: OverlayStart = {} as OverlayStart;
+  const source: SavedObjectAttributes = {} as SavedObjectAttributes;
+  const options: SavedObjectsCreateOptions = {} as SavedObjectsCreateOptions;
+  const savedObject = {
+    getEsType: () => 'test type',
+    title: 'test title',
+    displayName: 'test display name',
+  };
+
+  beforeEach(() => {
+    savedObjectsClient.create = jest.fn();
+    jest.spyOn(deps, 'confirmModalPromise').mockReturnValue(Promise.resolve({} as any));
+  });
+
+  test('should call create of savedObjectsClient', async () => {
+    await saveWithConfirmation(source, savedObject, options, { savedObjectsClient, overlays });
+    expect(savedObjectsClient.create).toHaveBeenCalledWith(
+      savedObject.getEsType(),
+      source,
+      options
+    );
+  });
+
+  test('should call confirmModalPromise when such record exists', async () => {
+    savedObjectsClient.create = jest
+      .fn()
+      .mockImplementation((type, src, opt) =>
+        opt && opt.overwrite ? Promise.resolve({} as any) : Promise.reject({ res: { status: 409 } })
+      );
+
+    await saveWithConfirmation(source, savedObject, options, { savedObjectsClient, overlays });
+    expect(deps.confirmModalPromise).toHaveBeenCalledWith(
+      expect.any(String),
+      expect.any(String),
+      expect.any(String),
+      overlays
+    );
+  });
+
+  test('should call create of savedObjectsClient when overwriting confirmed', async () => {
+    savedObjectsClient.create = jest
+      .fn()
+      .mockImplementation((type, src, opt) =>
+        opt && opt.overwrite ? Promise.resolve({} as any) : Promise.reject({ res: { status: 409 } })
+      );
+
+    await saveWithConfirmation(source, savedObject, options, { savedObjectsClient, overlays });
+    expect(savedObjectsClient.create).toHaveBeenLastCalledWith(savedObject.getEsType(), source, {
+      overwrite: true,
+      ...options,
+    });
+  });
+
+  test('should reject when overwriting denied', async () => {
+    savedObjectsClient.create = jest.fn().mockReturnValue(Promise.reject({ res: { status: 409 } }));
+    jest.spyOn(deps, 'confirmModalPromise').mockReturnValue(Promise.reject());
+
+    expect.assertions(1);
+    await expect(
+      saveWithConfirmation(source, savedObject, options, {
+        savedObjectsClient,
+        overlays,
+      })
+    ).rejects.toThrow(OVERWRITE_REJECTED);
+  });
+});
diff --git a/src/plugins/saved_objects/public/saved_object/helpers/save_with_confirmation.ts b/src/plugins/saved_objects/public/saved_object/helpers/save_with_confirmation.ts
new file mode 100644
index 0000000000000..b413ea19a932d
--- /dev/null
+++ b/src/plugins/saved_objects/public/saved_object/helpers/save_with_confirmation.ts
@@ -0,0 +1,87 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { get } from 'lodash';
+import { i18n } from '@kbn/i18n';
+import {
+  SavedObjectAttributes,
+  SavedObjectsCreateOptions,
+  OverlayStart,
+  SavedObjectsClientContract,
+} from 'kibana/public';
+import { OVERWRITE_REJECTED } from '../../constants';
+import { confirmModalPromise } from './confirm_modal_promise';
+
+/**
+ * Attempts to create the current object using the serialized source. If an object already
+ * exists, a warning message requests an overwrite confirmation.
+ * @param source - serialized version of this object what will be indexed into elasticsearch.
+ * @param savedObject - a simple object that contains properties title and displayName, and getEsType method
+ * @param options - options to pass to the saved object create method
+ * @param services - provides Kibana services savedObjectsClient and overlays
+ * @returns {Promise} - A promise that is resolved with the objects id if the object is
+ * successfully indexed. If the overwrite confirmation was rejected, an error is thrown with
+ * a confirmRejected = true parameter so that case can be handled differently than
+ * a create or index error.
+ * @resolved {SavedObject}
+ */
+export async function saveWithConfirmation(
+  source: SavedObjectAttributes,
+  savedObject: {
+    getEsType(): string;
+    title: string;
+    displayName: string;
+  },
+  options: SavedObjectsCreateOptions,
+  services: { savedObjectsClient: SavedObjectsClientContract; overlays: OverlayStart }
+) {
+  const { savedObjectsClient, overlays } = services;
+  try {
+    return await savedObjectsClient.create(savedObject.getEsType(), source, options);
+  } catch (err) {
+    // record exists, confirm overwriting
+    if (get(err, 'res.status') === 409) {
+      const confirmMessage = i18n.translate(
+        'savedObjects.confirmModal.overwriteConfirmationMessage',
+        {
+          defaultMessage: 'Are you sure you want to overwrite {title}?',
+          values: { title: savedObject.title },
+        }
+      );
+
+      const title = i18n.translate('savedObjects.confirmModal.overwriteTitle', {
+        defaultMessage: 'Overwrite {name}?',
+        values: { name: savedObject.displayName },
+      });
+      const confirmButtonText = i18n.translate('savedObjects.confirmModal.overwriteButtonLabel', {
+        defaultMessage: 'Overwrite',
+      });
+
+      return confirmModalPromise(confirmMessage, title, confirmButtonText, overlays)
+        .then(() =>
+          savedObjectsClient.create(savedObject.getEsType(), source, {
+            overwrite: true,
+            ...options,
+          })
+        )
+        .catch(() => Promise.reject(new Error(OVERWRITE_REJECTED)));
+    }
+    return await Promise.reject(err);
+  }
+}
diff --git a/src/plugins/saved_objects/public/saved_object/index.ts b/src/plugins/saved_objects/public/saved_object/index.ts
index d3be5ea6df617..178ffaf88f4be 100644
--- a/src/plugins/saved_objects/public/saved_object/index.ts
+++ b/src/plugins/saved_objects/public/saved_object/index.ts
@@ -19,3 +19,6 @@
 
 export { createSavedObjectClass } from './saved_object';
 export { SavedObjectLoader } from './saved_object_loader';
+export { checkForDuplicateTitle } from './helpers/check_for_duplicate_title';
+export { saveWithConfirmation } from './helpers/save_with_confirmation';
+export { isErrorNonFatal } from './helpers/save_saved_object';
diff --git a/x-pack/plugins/graph/public/app.js b/x-pack/plugins/graph/public/app.js
index 72dddc2b9f813..53175d18e629f 100644
--- a/x-pack/plugins/graph/public/app.js
+++ b/x-pack/plugins/graph/public/app.js
@@ -31,6 +31,11 @@ import { asAngularSyncedObservable } from './helpers/as_observable';
 import { colorChoices } from './helpers/style_choices';
 import { createGraphStore, datasourceSelector, hasFieldsSelector } from './state_management';
 import { formatHttpError } from './helpers/format_http_error';
+import {
+  findSavedWorkspace,
+  getSavedWorkspace,
+  deleteSavedWorkspace,
+} from './helpers/saved_workspace_utils';
 
 export function initGraphApp(angularModule, deps) {
   const {
@@ -42,7 +47,6 @@ export function initGraphApp(angularModule, deps) {
     getBasePath,
     data,
     config,
-    savedWorkspaceLoader,
     capabilities,
     coreStart,
     storage,
@@ -112,15 +116,21 @@ export function initGraphApp(angularModule, deps) {
             $location.url(getNewPath());
           };
           $scope.find = search => {
-            return savedWorkspaceLoader.find(search, $scope.listingLimit);
+            return findSavedWorkspace(
+              { savedObjectsClient, basePath: coreStart.http.basePath },
+              search,
+              $scope.listingLimit
+            );
           };
           $scope.editItem = workspace => {
             $location.url(getEditPath(workspace));
           };
           $scope.getViewUrl = workspace => getEditUrl(addBasePath, workspace);
-          $scope.delete = workspaces => {
-            return savedWorkspaceLoader.delete(workspaces.map(({ id }) => id));
-          };
+          $scope.delete = workspaces =>
+            deleteSavedWorkspace(
+              savedObjectsClient,
+              workspaces.map(({ id }) => id)
+            );
           $scope.capabilities = capabilities;
           $scope.initialFilter = $location.search().filter || '';
           $scope.coreStart = coreStart;
@@ -133,7 +143,7 @@ export function initGraphApp(angularModule, deps) {
         resolve: {
           savedWorkspace: function($rootScope, $route, $location) {
             return $route.current.params.id
-              ? savedWorkspaceLoader.get($route.current.params.id).catch(function(e) {
+              ? getSavedWorkspace(savedObjectsClient, $route.current.params.id).catch(function(e) {
                   toastNotifications.addError(e, {
                     title: i18n.translate('xpack.graph.missingWorkspaceErrorMessage', {
                       defaultMessage: "Couldn't load graph with ID",
@@ -146,7 +156,7 @@ export function initGraphApp(angularModule, deps) {
                   // return promise that never returns to prevent the controller from loading
                   return new Promise();
                 })
-              : savedWorkspaceLoader.get();
+              : getSavedWorkspace(savedObjectsClient);
           },
           indexPatterns: function() {
             return savedObjectsClient
@@ -283,6 +293,8 @@ export function initGraphApp(angularModule, deps) {
       },
       notifications: coreStart.notifications,
       http: coreStart.http,
+      overlays: coreStart.overlays,
+      savedObjectsClient,
       showSaveModal,
       setWorkspaceInitialized: () => {
         $scope.workspaceInitialized = true;
diff --git a/x-pack/plugins/graph/public/application.ts b/x-pack/plugins/graph/public/application.ts
index 4f7bdd69db356..f804265f1f5ab 100644
--- a/x-pack/plugins/graph/public/application.ts
+++ b/x-pack/plugins/graph/public/application.ts
@@ -29,7 +29,6 @@ import { Plugin as DataPlugin, IndexPatternsContract } from '../../../../src/plu
 import { LicensingPluginSetup } from '../../licensing/public';
 import { checkLicense } from '../common/check_license';
 import { NavigationPublicPluginStart as NavigationStart } from '../../../../src/plugins/navigation/public';
-import { createSavedWorkspacesLoader } from './services/persistence/saved_workspace_loader';
 import { Storage } from '../../../../src/plugins/kibana_utils/public';
 import {
   addAppRedirectMessageToUrl,
@@ -87,15 +86,7 @@ export const renderApp = ({ appBasePath, element, ...deps }: GraphDependencies)
     }
   });
 
-  const savedWorkspaceLoader = createSavedWorkspacesLoader({
-    chrome: deps.coreStart.chrome,
-    indexPatterns: deps.data.indexPatterns,
-    overlays: deps.coreStart.overlays,
-    savedObjectsClient: deps.coreStart.savedObjects.client,
-    basePath: deps.coreStart.http.basePath,
-  });
-
-  initGraphApp(graphAngularModule, { ...deps, savedWorkspaceLoader });
+  initGraphApp(graphAngularModule, deps);
   const $injector = mountGraphApp(appBasePath, element);
   return () => {
     licenseSubscription.unsubscribe();
diff --git a/x-pack/plugins/graph/public/helpers/saved_workspace_utils.ts b/x-pack/plugins/graph/public/helpers/saved_workspace_utils.ts
new file mode 100644
index 0000000000000..2933e94b86e86
--- /dev/null
+++ b/x-pack/plugins/graph/public/helpers/saved_workspace_utils.ts
@@ -0,0 +1,207 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { cloneDeep, assign, defaults, forOwn } from 'lodash';
+import { i18n } from '@kbn/i18n';
+import {
+  IBasePath,
+  OverlayStart,
+  SavedObjectsClientContract,
+  SavedObjectAttributes,
+} from 'kibana/public';
+
+import {
+  SavedObjectSaveOpts,
+  checkForDuplicateTitle,
+  saveWithConfirmation,
+  isErrorNonFatal,
+  SavedObjectKibanaServices,
+} from '../../../../../src/plugins/saved_objects/public';
+import {
+  injectReferences,
+  extractReferences,
+} from '../services/persistence/saved_workspace_references';
+import { SavedObjectNotFound } from '../../../../../src/plugins/kibana_utils/public';
+import { GraphWorkspaceSavedObject } from '../types';
+
+const savedWorkspaceType = 'graph-workspace';
+const mapping: Record<string, string> = {
+  title: 'text',
+  description: 'text',
+  numLinks: 'integer',
+  numVertices: 'integer',
+  version: 'integer',
+  wsState: 'json',
+};
+const defaultsProps = {
+  title: i18n.translate('xpack.graph.savedWorkspace.workspaceNameTitle', {
+    defaultMessage: 'New Graph Workspace',
+  }),
+  numLinks: 0,
+  numVertices: 0,
+  wsState: '{}',
+  version: 1,
+};
+
+const urlFor = (basePath: IBasePath, id: string) =>
+  basePath.prepend(`/app/graph#/workspace/${encodeURIComponent(id)}`);
+
+function mapHits(hit: { id: string; attributes: Record<string, unknown> }, url: string) {
+  const source = hit.attributes;
+  source.id = hit.id;
+  source.url = url;
+  source.icon = 'fa-share-alt'; // looks like a graph
+  return source;
+}
+
+interface SavedWorkspaceServices {
+  basePath: IBasePath;
+  savedObjectsClient: SavedObjectsClientContract;
+}
+
+export function findSavedWorkspace(
+  { savedObjectsClient, basePath }: SavedWorkspaceServices,
+  searchString: string,
+  size: number = 100
+) {
+  return savedObjectsClient
+    .find<Record<string, unknown>>({
+      type: savedWorkspaceType,
+      search: searchString ? `${searchString}*` : undefined,
+      perPage: size,
+      searchFields: ['title^3', 'description'],
+    })
+    .then(resp => {
+      return {
+        total: resp.total,
+        hits: resp.savedObjects.map(hit => mapHits(hit, urlFor(basePath, hit.id))),
+      };
+    });
+}
+
+export async function getSavedWorkspace(
+  savedObjectsClient: SavedObjectsClientContract,
+  id?: string
+) {
+  const savedObject = {
+    id,
+    displayName: 'graph workspace',
+    getEsType: () => savedWorkspaceType,
+  } as { [key: string]: any };
+
+  if (!id) {
+    assign(savedObject, defaultsProps);
+    return Promise.resolve(savedObject);
+  }
+
+  const resp = await savedObjectsClient.get<Record<string, unknown>>(savedWorkspaceType, id);
+  savedObject._source = cloneDeep(resp.attributes);
+
+  if (!resp._version) {
+    throw new SavedObjectNotFound(savedWorkspaceType, id || '');
+  }
+
+  // assign the defaults to the response
+  defaults(savedObject._source, defaultsProps);
+
+  // transform the source using JSON.parse
+  if (savedObject._source.wsState) {
+    savedObject._source.wsState = JSON.parse(savedObject._source.wsState as string);
+  }
+
+  // Give obj all of the values in _source.fields
+  assign(savedObject, savedObject._source);
+  savedObject.lastSavedTitle = savedObject.title;
+
+  if (resp.references && resp.references.length > 0) {
+    injectReferences(savedObject, resp.references);
+  }
+
+  return savedObject as GraphWorkspaceSavedObject;
+}
+
+export function deleteSavedWorkspace(
+  savedObjectsClient: SavedObjectsClientContract,
+  ids: string[]
+) {
+  return Promise.all(ids.map((id: string) => savedObjectsClient.delete(savedWorkspaceType, id)));
+}
+
+export async function saveSavedWorkspace(
+  savedObject: GraphWorkspaceSavedObject,
+  {
+    confirmOverwrite = false,
+    isTitleDuplicateConfirmed = false,
+    onTitleDuplicate,
+  }: SavedObjectSaveOpts = {},
+  services: {
+    savedObjectsClient: SavedObjectsClientContract;
+    overlays: OverlayStart;
+  }
+) {
+  // Save the original id in case the save fails.
+  const originalId = savedObject.id;
+  // Read https://github.com/elastic/kibana/issues/9056 and
+  // https://github.com/elastic/kibana/issues/9012 for some background into why this copyOnSave variable
+  // exists.
+  // The goal is to move towards a better rename flow, but since our users have been conditioned
+  // to expect a 'save as' flow during a rename, we are keeping the logic the same until a better
+  // UI/UX can be worked out.
+  if (savedObject.copyOnSave) {
+    delete savedObject.id;
+  }
+
+  let attributes: SavedObjectAttributes = {};
+
+  forOwn(mapping, (fieldType, fieldName) => {
+    const savedObjectFieldVal = savedObject[fieldName as keyof GraphWorkspaceSavedObject] as string;
+    if (savedObjectFieldVal != null) {
+      attributes[fieldName as keyof GraphWorkspaceSavedObject] =
+        fieldName === 'wsState' ? JSON.stringify(savedObjectFieldVal) : savedObjectFieldVal;
+    }
+  });
+  const extractedRefs = extractReferences({ attributes, references: [] });
+  const references = extractedRefs.references;
+  attributes = extractedRefs.attributes;
+
+  if (!references) {
+    throw new Error('References not returned from extractReferences');
+  }
+
+  try {
+    await checkForDuplicateTitle(
+      savedObject as any,
+      isTitleDuplicateConfirmed,
+      onTitleDuplicate,
+      services as SavedObjectKibanaServices
+    );
+    savedObject.isSaving = true;
+
+    const createOpt = {
+      id: savedObject.id,
+      migrationVersion: savedObject.migrationVersion,
+      references,
+    };
+    const resp = confirmOverwrite
+      ? await saveWithConfirmation(attributes, savedObject, createOpt, services)
+      : await services.savedObjectsClient.create(savedObject.getEsType(), attributes, {
+          ...createOpt,
+          overwrite: true,
+        });
+
+    savedObject.id = resp.id;
+    savedObject.isSaving = false;
+    savedObject.lastSavedTitle = savedObject.title;
+    return savedObject.id;
+  } catch (err) {
+    savedObject.isSaving = false;
+    savedObject.id = originalId;
+    if (isErrorNonFatal(err)) {
+      return '';
+    }
+    return Promise.reject(err);
+  }
+}
diff --git a/x-pack/plugins/graph/public/services/persistence/saved_workspace.ts b/x-pack/plugins/graph/public/services/persistence/saved_workspace.ts
deleted file mode 100644
index e2bd885dc7209..0000000000000
--- a/x-pack/plugins/graph/public/services/persistence/saved_workspace.ts
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-import { i18n } from '@kbn/i18n';
-import { extractReferences, injectReferences } from './saved_workspace_references';
-import {
-  SavedObject,
-  createSavedObjectClass,
-  SavedObjectKibanaServices,
-} from '../../../../../../src/plugins/saved_objects/public';
-
-export interface SavedWorkspace extends SavedObject {
-  wsState?: string;
-}
-
-export function createSavedWorkspaceClass(services: SavedObjectKibanaServices) {
-  // SavedWorkspace constructor. Usually you'd interact with an instance of this.
-  // ID is option, without it one will be generated on save.
-  const SavedObjectClass = createSavedObjectClass(services);
-  class SavedWorkspaceClass extends SavedObjectClass {
-    public static type: string = 'graph-workspace';
-    // if type:workspace has no mapping, we push this mapping into ES
-    public static mapping: Record<string, string> = {
-      title: 'text',
-      description: 'text',
-      numLinks: 'integer',
-      numVertices: 'integer',
-      version: 'integer',
-      wsState: 'json',
-    };
-    // Order these fields to the top, the rest are alphabetical
-    public static fieldOrder = ['title', 'description'];
-    public static searchSource = false;
-
-    public wsState?: string;
-
-    constructor(id: string) {
-      // Gives our SavedWorkspace the properties of a SavedObject
-      super({
-        type: SavedWorkspaceClass.type,
-        mapping: SavedWorkspaceClass.mapping,
-        searchSource: SavedWorkspaceClass.searchSource,
-        extractReferences,
-        injectReferences,
-        // if this is null/undefined then the SavedObject will be assigned the defaults
-        id,
-        // default values that will get assigned if the doc is new
-        defaults: {
-          title: i18n.translate('xpack.graph.savedWorkspace.workspaceNameTitle', {
-            defaultMessage: 'New Graph Workspace',
-          }),
-          numLinks: 0,
-          numVertices: 0,
-          wsState: '{}',
-          version: 1,
-        },
-      });
-    }
-    // Overwrite the default getDisplayName function which uses type and which is not very
-    // user friendly for this object.
-    getDisplayName = () => {
-      return 'graph workspace';
-    };
-  }
-  return SavedWorkspaceClass;
-}
diff --git a/x-pack/plugins/graph/public/services/persistence/saved_workspace_loader.ts b/x-pack/plugins/graph/public/services/persistence/saved_workspace_loader.ts
deleted file mode 100644
index fb64fbadfbf7c..0000000000000
--- a/x-pack/plugins/graph/public/services/persistence/saved_workspace_loader.ts
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { IBasePath } from 'kibana/public';
-import { i18n } from '@kbn/i18n';
-
-import { SavedObjectKibanaServices } from '../../../../../../src/plugins/saved_objects/public';
-import { createSavedWorkspaceClass } from './saved_workspace';
-
-export function createSavedWorkspacesLoader(
-  services: SavedObjectKibanaServices & { basePath: IBasePath }
-) {
-  const { savedObjectsClient, basePath } = services;
-  const SavedWorkspace = createSavedWorkspaceClass(services);
-  const urlFor = (id: string) =>
-    basePath.prepend(`/app/graph#/workspace/${encodeURIComponent(id)}`);
-  const mapHits = (hit: { id: string; attributes: Record<string, unknown> }) => {
-    const source = hit.attributes;
-    source.id = hit.id;
-    source.url = urlFor(hit.id);
-    source.icon = 'fa-share-alt'; // looks like a graph
-    return source;
-  };
-
-  return {
-    type: SavedWorkspace.type,
-    Class: SavedWorkspace,
-    loaderProperties: {
-      name: 'Graph workspace',
-      noun: i18n.translate('xpack.graph.savedWorkspaces.graphWorkspaceLabel', {
-        defaultMessage: 'Graph workspace',
-      }),
-      nouns: i18n.translate('xpack.graph.savedWorkspaces.graphWorkspacesLabel', {
-        defaultMessage: 'Graph workspaces',
-      }),
-    },
-    // Returns a single dashboard by ID, should be the name of the workspace
-    get: (id: string) => {
-      // Returns a promise that contains a workspace which is a subclass of docSource
-      // @ts-ignore
-      return new SavedWorkspace(id).init();
-    },
-    urlFor,
-    delete: (ids: string | string[]) => {
-      const idArr = Array.isArray(ids) ? ids : [ids];
-      return Promise.all(
-        idArr.map((id: string) => savedObjectsClient.delete(SavedWorkspace.type, id))
-      );
-    },
-    find: (searchString: string, size: number = 100) => {
-      return savedObjectsClient
-        .find<Record<string, unknown>>({
-          type: SavedWorkspace.type,
-          search: searchString ? `${searchString}*` : undefined,
-          perPage: size,
-          searchFields: ['title^3', 'description'],
-        })
-        .then(resp => {
-          return {
-            total: resp.total,
-            hits: resp.savedObjects.map(hit => mapHits(hit)),
-          };
-        });
-    },
-  };
-}
diff --git a/x-pack/plugins/graph/public/services/persistence/saved_workspace_references.test.ts b/x-pack/plugins/graph/public/services/persistence/saved_workspace_references.test.ts
index 716520cb83aa1..c973a54a650a6 100644
--- a/x-pack/plugins/graph/public/services/persistence/saved_workspace_references.test.ts
+++ b/x-pack/plugins/graph/public/services/persistence/saved_workspace_references.test.ts
@@ -5,7 +5,6 @@
  */
 
 import { extractReferences, injectReferences } from './saved_workspace_references';
-import { SavedWorkspace } from './saved_workspace';
 
 describe('extractReferences', () => {
   test('extracts references from wsState', () => {
@@ -67,7 +66,7 @@ describe('injectReferences', () => {
         indexPatternRefName: 'indexPattern_0',
         bar: true,
       }),
-    } as SavedWorkspace;
+    };
     const references = [
       {
         name: 'indexPattern_0',
@@ -89,7 +88,7 @@ Object {
     const context = {
       id: '1',
       title: 'test',
-    } as SavedWorkspace;
+    } as any;
     injectReferences(context, []);
     expect(context).toMatchInlineSnapshot(`
 Object {
@@ -103,7 +102,7 @@ Object {
     const context = {
       id: '1',
       wsState: JSON.stringify({ bar: true }),
-    } as SavedWorkspace;
+    };
     injectReferences(context, []);
     expect(context).toMatchInlineSnapshot(`
 Object {
@@ -119,7 +118,7 @@ Object {
       wsState: JSON.stringify({
         indexPatternRefName: 'indexPattern_0',
       }),
-    } as SavedWorkspace;
+    };
     expect(() => injectReferences(context, [])).toThrowErrorMatchingInlineSnapshot(
       `"Could not find reference \\"indexPattern_0\\""`
     );
diff --git a/x-pack/plugins/graph/public/services/persistence/saved_workspace_references.ts b/x-pack/plugins/graph/public/services/persistence/saved_workspace_references.ts
index 3a596b8068655..0948d7a88fce8 100644
--- a/x-pack/plugins/graph/public/services/persistence/saved_workspace_references.ts
+++ b/x-pack/plugins/graph/public/services/persistence/saved_workspace_references.ts
@@ -5,7 +5,6 @@
  */
 
 import { SavedObjectAttributes, SavedObjectReference } from 'kibana/public';
-import { SavedWorkspace } from './saved_workspace';
 
 export function extractReferences({
   attributes,
@@ -38,7 +37,10 @@ export function extractReferences({
   };
 }
 
-export function injectReferences(savedObject: SavedWorkspace, references: SavedObjectReference[]) {
+export function injectReferences(
+  savedObject: { wsState?: string },
+  references: SavedObjectReference[]
+) {
   // Skip if wsState is missing, at the time of development of this, there is no guarantee each
   // saved object has wsState.
   if (typeof savedObject.wsState !== 'string') {
diff --git a/x-pack/plugins/graph/public/services/save_modal.tsx b/x-pack/plugins/graph/public/services/save_modal.tsx
index 127ff6a2b4c37..94b5de3be13ac 100644
--- a/x-pack/plugins/graph/public/services/save_modal.tsx
+++ b/x-pack/plugins/graph/public/services/save_modal.tsx
@@ -5,18 +5,24 @@
  */
 
 import React from 'react';
-import { I18nStart } from 'src/core/public';
+import { I18nStart, OverlayStart, SavedObjectsClientContract } from 'src/core/public';
 import { SaveResult } from 'src/plugins/saved_objects/public';
 import { GraphWorkspaceSavedObject, GraphSavePolicy } from '../types';
 import { SaveModal, OnSaveGraphProps } from '../components/save_modal';
 
+export interface SaveWorkspaceServices {
+  overlays: OverlayStart;
+  savedObjectsClient: SavedObjectsClientContract;
+}
+
 export type SaveWorkspaceHandler = (
   saveOptions: {
     confirmOverwrite: boolean;
     isTitleDuplicateConfirmed: boolean;
     onTitleDuplicate: () => void;
   },
-  dataConsent: boolean
+  dataConsent: boolean,
+  services: SaveWorkspaceServices
 ) => Promise<SaveResult>;
 
 export function openSaveModal({
@@ -26,6 +32,7 @@ export function openSaveModal({
   saveWorkspace,
   showSaveModal,
   I18nContext,
+  services,
 }: {
   savePolicy: GraphSavePolicy;
   hasData: boolean;
@@ -33,6 +40,7 @@ export function openSaveModal({
   saveWorkspace: SaveWorkspaceHandler;
   showSaveModal: (el: React.ReactNode, I18nContext: I18nStart['Context']) => void;
   I18nContext: I18nStart['Context'];
+  services: SaveWorkspaceServices;
 }) {
   const currentTitle = workspace.title;
   const currentDescription = workspace.description;
@@ -52,7 +60,7 @@ export function openSaveModal({
       isTitleDuplicateConfirmed,
       onTitleDuplicate,
     };
-    return saveWorkspace(saveOptions, dataConsent).then(response => {
+    return saveWorkspace(saveOptions, dataConsent, services).then(response => {
       // If the save wasn't successful, put the original values back.
       if (!('id' in response) || !Boolean(response.id)) {
         workspace.title = currentTitle;
diff --git a/x-pack/plugins/graph/public/state_management/mocks.ts b/x-pack/plugins/graph/public/state_management/mocks.ts
index d06f8a7b3ef0b..02a5830ffd6be 100644
--- a/x-pack/plugins/graph/public/state_management/mocks.ts
+++ b/x-pack/plugins/graph/public/state_management/mocks.ts
@@ -4,7 +4,12 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { NotificationsStart, HttpStart } from 'kibana/public';
+import {
+  NotificationsStart,
+  HttpStart,
+  OverlayStart,
+  SavedObjectsClientContract,
+} from 'kibana/public';
 import createSagaMiddleware from 'redux-saga';
 import { createStore, applyMiddleware, AnyAction } from 'redux';
 import { ChromeStart } from 'kibana/public';
@@ -79,6 +84,13 @@ export function createMockGraphStore({
     setLiveResponseFields: jest.fn(),
     setUrlTemplates: jest.fn(),
     setWorkspaceInitialized: jest.fn(),
+    overlays: ({
+      openModal: jest.fn(),
+    } as unknown) as OverlayStart,
+    savedObjectsClient: ({
+      find: jest.fn(),
+      get: jest.fn(),
+    } as unknown) as SavedObjectsClientContract,
     ...mockedDepsOverwrites,
   };
   const sagaMiddleware = createSagaMiddleware();
diff --git a/x-pack/plugins/graph/public/state_management/persistence.test.ts b/x-pack/plugins/graph/public/state_management/persistence.test.ts
index 2dac92fceb6b4..285bf2d6a0ea9 100644
--- a/x-pack/plugins/graph/public/state_management/persistence.test.ts
+++ b/x-pack/plugins/graph/public/state_management/persistence.test.ts
@@ -40,6 +40,10 @@ jest.mock('../services/save_modal', () => ({
   openSaveModal: jest.fn(),
 }));
 
+jest.mock('../helpers/saved_workspace_utils', () => ({
+  saveSavedWorkspace: jest.fn().mockResolvedValueOnce('123'),
+}));
+
 describe('persistence sagas', () => {
   let env: MockedGraphEnvironment;
 
@@ -90,7 +94,6 @@ describe('persistence sagas', () => {
           savePolicy: 'configAndDataWithConsent',
         },
       });
-      (env.mockedDeps.getSavedWorkspace().save as jest.Mock).mockResolvedValueOnce('123');
       env.mockedDeps.getSavedWorkspace().id = '123';
     });
 
diff --git a/x-pack/plugins/graph/public/state_management/persistence.ts b/x-pack/plugins/graph/public/state_management/persistence.ts
index 0f72186af031f..8dd1386f70e6e 100644
--- a/x-pack/plugins/graph/public/state_management/persistence.ts
+++ b/x-pack/plugins/graph/public/state_management/persistence.ts
@@ -22,6 +22,8 @@ import {
 import { updateMetaData, metaDataSelector } from './meta_data';
 import { openSaveModal, SaveWorkspaceHandler } from '../services/save_modal';
 import { getEditPath } from '../services/url';
+import { saveSavedWorkspace } from '../helpers/saved_workspace_utils';
+
 const actionCreator = actionCreatorFactory('x-pack/graph');
 
 export const loadSavedWorkspace = actionCreator<GraphWorkspaceSavedObject>('LOAD_WORKSPACE');
@@ -140,7 +142,8 @@ function showModal(
 ) {
   const saveWorkspaceHandler: SaveWorkspaceHandler = async (
     saveOptions,
-    userHasConfirmedSaveWorkspaceData
+    userHasConfirmedSaveWorkspaceData,
+    services
   ) => {
     const canSaveData =
       deps.savePolicy === 'configAndData' ||
@@ -157,7 +160,7 @@ function showModal(
       canSaveData
     );
     try {
-      const id = await savedWorkspace.save(saveOptions);
+      const id = await saveSavedWorkspace(savedWorkspace, saveOptions, services);
       if (id) {
         const title = i18n.translate('xpack.graph.saveWorkspace.successNotificationTitle', {
           defaultMessage: 'Saved "{workspaceTitle}"',
@@ -200,5 +203,9 @@ function showModal(
     showSaveModal: deps.showSaveModal,
     saveWorkspace: saveWorkspaceHandler,
     I18nContext: deps.I18nContext,
+    services: {
+      savedObjectsClient: deps.savedObjectsClient,
+      overlays: deps.overlays,
+    },
   });
 }
diff --git a/x-pack/plugins/graph/public/state_management/store.ts b/x-pack/plugins/graph/public/state_management/store.ts
index 4aeef0338923b..e639662225cb3 100644
--- a/x-pack/plugins/graph/public/state_management/store.ts
+++ b/x-pack/plugins/graph/public/state_management/store.ts
@@ -6,7 +6,7 @@
 
 import createSagaMiddleware, { SagaMiddleware } from 'redux-saga';
 import { combineReducers, createStore, Store, AnyAction, Dispatch, applyMiddleware } from 'redux';
-import { ChromeStart, I18nStart } from 'kibana/public';
+import { ChromeStart, I18nStart, OverlayStart, SavedObjectsClientContract } from 'kibana/public';
 import { CoreStart } from 'src/core/public';
 import {
   fieldsReducer,
@@ -54,6 +54,8 @@ export interface GraphStoreDependencies {
   getSavedWorkspace: () => GraphWorkspaceSavedObject;
   notifications: CoreStart['notifications'];
   http: CoreStart['http'];
+  overlays: OverlayStart;
+  savedObjectsClient: SavedObjectsClientContract;
   showSaveModal: (el: React.ReactNode, I18nContext: I18nStart['Context']) => void;
   savePolicy: GraphSavePolicy;
   changeUrl: (newUrl: string) => void;
diff --git a/x-pack/plugins/graph/public/types/persistence.ts b/x-pack/plugins/graph/public/types/persistence.ts
index b0209153c82e3..6847199d5878c 100644
--- a/x-pack/plugins/graph/public/types/persistence.ts
+++ b/x-pack/plugins/graph/public/types/persistence.ts
@@ -4,7 +4,6 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { SavedObject } from '../../../../../src/plugins/saved_objects/public';
 import { AdvancedSettings, UrlTemplate, WorkspaceField } from './app_state';
 import { WorkspaceNode, WorkspaceEdge } from './workspace_state';
 
@@ -12,15 +11,23 @@ type Omit<T, K> = Pick<T, Exclude<keyof T, K>>;
 
 /**
  * Workspace fetched from server.
- * This type is returned by `SavedWorkspacesProvider#get`.
  */
-export interface GraphWorkspaceSavedObject extends SavedObject {
-  title: string;
+export interface GraphWorkspaceSavedObject {
+  copyOnSave?: boolean;
   description: string;
+  displayName: string;
+  getEsType(): string;
+  id?: string;
+  isSaving?: boolean;
+  lastSavedTitle?: string;
+  migrationVersion?: Record<string, any>;
   numLinks: number;
   numVertices: number;
-  version: number;
+  title: string;
+  type: string;
+  version?: number;
   wsState: string;
+  _source: Record<string, unknown>;
 }
 
 export interface SerializedWorkspaceState {
diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json
index b746b659704ff..f02b52e5922d1 100644
--- a/x-pack/plugins/translations/translations/ja-JP.json
+++ b/x-pack/plugins/translations/translations/ja-JP.json
@@ -5679,8 +5679,6 @@
     "xpack.graph.outlinkEncoders.textPlainTitle": "プレインテキスト",
     "xpack.graph.pluginDescription": "Elasticsearch データの関連性のある関係を浮上させ分析します。",
     "xpack.graph.savedWorkspace.workspaceNameTitle": "新規グラフワークスペース",
-    "xpack.graph.savedWorkspaces.graphWorkspaceLabel": "グラフワークスペース",
-    "xpack.graph.savedWorkspaces.graphWorkspacesLabel": "グラフワークスペース",
     "xpack.graph.saveWorkspace.savingErrorMessage": "ワークスペースの保存に失敗しました: {message}",
     "xpack.graph.saveWorkspace.successNotification.noDataSavedText": "構成が保存されましたが、データは保存されませんでした",
     "xpack.graph.saveWorkspace.successNotificationTitle": "「{workspaceTitle}」が保存されました",
diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json
index 77c077e653b84..be6a3df6b6c18 100644
--- a/x-pack/plugins/translations/translations/zh-CN.json
+++ b/x-pack/plugins/translations/translations/zh-CN.json
@@ -5679,8 +5679,6 @@
     "xpack.graph.outlinkEncoders.textPlainTitle": "纯文本",
     "xpack.graph.pluginDescription": "显示并分析 Elasticsearch 数据中的相关关系。",
     "xpack.graph.savedWorkspace.workspaceNameTitle": "新建 Graph 工作空间",
-    "xpack.graph.savedWorkspaces.graphWorkspaceLabel": "Graph 工作空间",
-    "xpack.graph.savedWorkspaces.graphWorkspacesLabel": "Graph 工作空间",
     "xpack.graph.saveWorkspace.savingErrorMessage": "无法保存工作空间：{message}",
     "xpack.graph.saveWorkspace.successNotification.noDataSavedText": "配置会被保存，但不保存数据",
     "xpack.graph.saveWorkspace.successNotificationTitle": "已保存“{workspaceTitle}”",

From 6bd8755df4ba567fc2b1e9d992e743ebfa7d7113 Mon Sep 17 00:00:00 2001
From: Dario Gieselaar <dario.gieselaar@elastic.co>
Date: Tue, 24 Mar 2020 13:38:15 +0100
Subject: [PATCH 073/179] [APM] Re-revert "Collect telemetry about data/API
 performance" (#61030)

* Revert "Revert "[APM] Collect telemetry about data/API performance (#51612)""

This reverts commit 6de7f2a62b2b078b703bbe6f18475909e1224f57.

* Update transaction mock data to reflect the type
---
 src/dev/run_check_lockfile_symlinks.js        |   2 +
 x-pack/legacy/plugins/apm/index.ts            |  19 +-
 x-pack/legacy/plugins/apm/mappings.json       | 773 +++++++++++++++++-
 .../__test__/mockData.ts                      |   5 +-
 x-pack/legacy/plugins/apm/scripts/.gitignore  |   1 +
 .../legacy/plugins/apm/scripts/package.json   |  10 +
 .../apm/scripts/setup-kibana-security.js      |   1 +
 .../apm/scripts/upload-telemetry-data.js      |  21 +
 .../download-telemetry-template.ts            |  26 +
 .../generate-sample-documents.ts              | 124 +++
 .../scripts/upload-telemetry-data/index.ts    | 208 +++++
 .../elasticsearch_fieldnames.test.ts.snap     |  48 +-
 x-pack/plugins/apm/common/agent_name.ts       |  44 +-
 .../apm/common/apm_saved_object_constants.ts  |  10 +-
 .../common/elasticsearch_fieldnames.test.ts   |  15 +-
 .../apm/common/elasticsearch_fieldnames.ts    |  11 +-
 x-pack/plugins/apm/kibana.json                |   5 +-
 x-pack/plugins/apm/server/index.ts            |   6 +-
 .../lib/apm_telemetry/__test__/index.test.ts  |  83 --
 .../collect_data_telemetry/index.ts           |  77 ++
 .../collect_data_telemetry/tasks.ts           | 725 ++++++++++++++++
 .../apm/server/lib/apm_telemetry/index.ts     | 155 +++-
 .../apm/server/lib/apm_telemetry/types.ts     | 118 +++
 .../server/lib/helpers/setup_request.test.ts  |  13 +
 x-pack/plugins/apm/server/plugin.ts           |  33 +-
 .../server/routes/create_api/index.test.ts    |   1 +
 x-pack/plugins/apm/server/routes/services.ts  |  16 -
 .../apm/typings/elasticsearch/aggregations.ts |  26 +-
 .../apm/typings/es_schemas/raw/error_raw.ts   |   2 +
 .../typings/es_schemas/raw/fields/observer.ts |  10 +
 .../apm/typings/es_schemas/raw/span_raw.ts    |   2 +
 .../typings/es_schemas/raw/transaction_raw.ts |   2 +
 32 files changed, 2387 insertions(+), 205 deletions(-)
 create mode 100644 x-pack/legacy/plugins/apm/scripts/.gitignore
 create mode 100644 x-pack/legacy/plugins/apm/scripts/package.json
 create mode 100644 x-pack/legacy/plugins/apm/scripts/upload-telemetry-data.js
 create mode 100644 x-pack/legacy/plugins/apm/scripts/upload-telemetry-data/download-telemetry-template.ts
 create mode 100644 x-pack/legacy/plugins/apm/scripts/upload-telemetry-data/generate-sample-documents.ts
 create mode 100644 x-pack/legacy/plugins/apm/scripts/upload-telemetry-data/index.ts
 delete mode 100644 x-pack/plugins/apm/server/lib/apm_telemetry/__test__/index.test.ts
 create mode 100644 x-pack/plugins/apm/server/lib/apm_telemetry/collect_data_telemetry/index.ts
 create mode 100644 x-pack/plugins/apm/server/lib/apm_telemetry/collect_data_telemetry/tasks.ts
 create mode 100644 x-pack/plugins/apm/server/lib/apm_telemetry/types.ts
 create mode 100644 x-pack/plugins/apm/typings/es_schemas/raw/fields/observer.ts

diff --git a/src/dev/run_check_lockfile_symlinks.js b/src/dev/run_check_lockfile_symlinks.js
index 54a8cdf638a78..6c6fc54638ee8 100644
--- a/src/dev/run_check_lockfile_symlinks.js
+++ b/src/dev/run_check_lockfile_symlinks.js
@@ -36,6 +36,8 @@ const IGNORE_FILE_GLOBS = [
   '**/*fixtures*/**/*',
   // cypress isn't used in production, ignore it
   'x-pack/legacy/plugins/apm/e2e/*',
+  // apm scripts aren't used in production, ignore them
+  'x-pack/legacy/plugins/apm/scripts/*',
 ];
 
 run(async ({ log }) => {
diff --git a/x-pack/legacy/plugins/apm/index.ts b/x-pack/legacy/plugins/apm/index.ts
index 6cfd18d0c1cba..502e910caae51 100644
--- a/x-pack/legacy/plugins/apm/index.ts
+++ b/x-pack/legacy/plugins/apm/index.ts
@@ -14,7 +14,13 @@ import mappings from './mappings.json';
 
 export const apm: LegacyPluginInitializer = kibana => {
   return new kibana.Plugin({
-    require: ['kibana', 'elasticsearch', 'xpack_main', 'apm_oss'],
+    require: [
+      'kibana',
+      'elasticsearch',
+      'xpack_main',
+      'apm_oss',
+      'task_manager'
+    ],
     id: 'apm',
     configPrefix: 'xpack.apm',
     publicDir: resolve(__dirname, 'public'),
@@ -76,7 +82,10 @@ export const apm: LegacyPluginInitializer = kibana => {
         serviceMapTraceIdBucketSize: Joi.number().default(65),
         serviceMapFingerprintGlobalBucketSize: Joi.number().default(1000),
         serviceMapTraceIdGlobalBucketSize: Joi.number().default(6),
-        serviceMapMaxTracesPerRequest: Joi.number().default(50)
+        serviceMapMaxTracesPerRequest: Joi.number().default(50),
+
+        // telemetry
+        telemetryCollectionEnabled: Joi.boolean().default(true)
       }).default();
     },
 
@@ -122,10 +131,12 @@ export const apm: LegacyPluginInitializer = kibana => {
           }
         }
       });
-
       const apmPlugin = server.newPlatform.setup.plugins
         .apm as APMPluginContract;
-      apmPlugin.registerLegacyAPI({ server });
+
+      apmPlugin.registerLegacyAPI({
+        server
+      });
     }
   });
 };
diff --git a/x-pack/legacy/plugins/apm/mappings.json b/x-pack/legacy/plugins/apm/mappings.json
index 61bc90da28756..ba4c7a89ceaa8 100644
--- a/x-pack/legacy/plugins/apm/mappings.json
+++ b/x-pack/legacy/plugins/apm/mappings.json
@@ -1,20 +1,659 @@
 {
-  "apm-services-telemetry": {
+  "apm-telemetry": {
     "properties": {
+      "agents": {
+        "properties": {
+          "dotnet": {
+            "properties": {
+              "agent": {
+                "properties": {
+                  "version": {
+                    "type": "keyword",
+                    "ignore_above": 256
+                  }
+                }
+              },
+              "service": {
+                "properties": {
+                  "framework": {
+                    "properties": {
+                      "composite": {
+                        "type": "keyword",
+                        "ignore_above": 256
+                      },
+                      "name": {
+                        "type": "keyword",
+                        "ignore_above": 256
+                      },
+                      "version": {
+                        "type": "keyword",
+                        "ignore_above": 256
+                      }
+                    }
+                  },
+                  "language": {
+                    "properties": {
+                      "name": {
+                        "type": "keyword",
+                        "ignore_above": 256
+                      }
+                    }
+                  },
+                  "runtime": {
+                    "properties": {
+                      "composite": {
+                        "type": "keyword",
+                        "ignore_above": 256
+                      },
+                      "name": {
+                        "type": "keyword",
+                        "ignore_above": 256
+                      },
+                      "version": {
+                        "type": "keyword",
+                        "ignore_above": 256
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          },
+          "go": {
+            "properties": {
+              "agent": {
+                "properties": {
+                  "version": {
+                    "type": "keyword",
+                    "ignore_above": 256
+                  }
+                }
+              },
+              "service": {
+                "properties": {
+                  "framework": {
+                    "properties": {
+                      "composite": {
+                        "type": "keyword",
+                        "ignore_above": 256
+                      },
+                      "name": {
+                        "type": "keyword",
+                        "ignore_above": 256
+                      },
+                      "version": {
+                        "type": "keyword",
+                        "ignore_above": 256
+                      }
+                    }
+                  },
+                  "language": {
+                    "properties": {
+                      "composite": {
+                        "type": "keyword",
+                        "ignore_above": 256
+                      },
+                      "name": {
+                        "type": "keyword",
+                        "ignore_above": 256
+                      },
+                      "version": {
+                        "type": "keyword",
+                        "ignore_above": 256
+                      }
+                    }
+                  },
+                  "runtime": {
+                    "properties": {
+                      "composite": {
+                        "type": "keyword",
+                        "ignore_above": 256
+                      },
+                      "name": {
+                        "type": "keyword",
+                        "ignore_above": 256
+                      },
+                      "version": {
+                        "type": "keyword",
+                        "ignore_above": 256
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          },
+          "java": {
+            "properties": {
+              "agent": {
+                "properties": {
+                  "version": {
+                    "type": "keyword",
+                    "ignore_above": 256
+                  }
+                }
+              },
+              "service": {
+                "properties": {
+                  "framework": {
+                    "type": "object"
+                  },
+                  "language": {
+                    "properties": {
+                      "composite": {
+                        "type": "keyword",
+                        "ignore_above": 256
+                      },
+                      "name": {
+                        "type": "keyword",
+                        "ignore_above": 256
+                      },
+                      "version": {
+                        "type": "keyword",
+                        "ignore_above": 256
+                      }
+                    }
+                  },
+                  "runtime": {
+                    "properties": {
+                      "composite": {
+                        "type": "keyword",
+                        "ignore_above": 256
+                      },
+                      "name": {
+                        "type": "keyword",
+                        "ignore_above": 256
+                      },
+                      "version": {
+                        "type": "keyword",
+                        "ignore_above": 256
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          },
+          "js-base": {
+            "properties": {
+              "agent": {
+                "properties": {
+                  "version": {
+                    "type": "keyword",
+                    "ignore_above": 256
+                  }
+                }
+              },
+              "service": {
+                "properties": {
+                  "framework": {
+                    "type": "object"
+                  },
+                  "language": {
+                    "properties": {
+                      "name": {
+                        "type": "keyword",
+                        "ignore_above": 256
+                      }
+                    }
+                  },
+                  "runtime": {
+                    "type": "object"
+                  }
+                }
+              }
+            }
+          },
+          "nodejs": {
+            "properties": {
+              "agent": {
+                "properties": {
+                  "version": {
+                    "type": "keyword",
+                    "ignore_above": 256
+                  }
+                }
+              },
+              "service": {
+                "properties": {
+                  "framework": {
+                    "properties": {
+                      "composite": {
+                        "type": "keyword",
+                        "ignore_above": 256
+                      },
+                      "name": {
+                        "type": "keyword",
+                        "ignore_above": 256
+                      },
+                      "version": {
+                        "type": "keyword",
+                        "ignore_above": 256
+                      }
+                    }
+                  },
+                  "language": {
+                    "properties": {
+                      "name": {
+                        "type": "keyword",
+                        "ignore_above": 256
+                      }
+                    }
+                  },
+                  "runtime": {
+                    "properties": {
+                      "composite": {
+                        "type": "keyword",
+                        "ignore_above": 256
+                      },
+                      "name": {
+                        "type": "keyword",
+                        "ignore_above": 256
+                      },
+                      "version": {
+                        "type": "keyword",
+                        "ignore_above": 256
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          },
+          "python": {
+            "properties": {
+              "agent": {
+                "properties": {
+                  "version": {
+                    "type": "keyword",
+                    "ignore_above": 256
+                  }
+                }
+              },
+              "service": {
+                "properties": {
+                  "framework": {
+                    "properties": {
+                      "composite": {
+                        "type": "keyword",
+                        "ignore_above": 256
+                      },
+                      "name": {
+                        "type": "keyword",
+                        "ignore_above": 256
+                      },
+                      "version": {
+                        "type": "keyword",
+                        "ignore_above": 256
+                      }
+                    }
+                  },
+                  "language": {
+                    "properties": {
+                      "composite": {
+                        "type": "keyword",
+                        "ignore_above": 256
+                      },
+                      "name": {
+                        "type": "keyword",
+                        "ignore_above": 256
+                      },
+                      "version": {
+                        "type": "keyword",
+                        "ignore_above": 256
+                      }
+                    }
+                  },
+                  "runtime": {
+                    "properties": {
+                      "composite": {
+                        "type": "keyword",
+                        "ignore_above": 256
+                      },
+                      "name": {
+                        "type": "keyword",
+                        "ignore_above": 256
+                      },
+                      "version": {
+                        "type": "keyword",
+                        "ignore_above": 256
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          },
+          "ruby": {
+            "properties": {
+              "agent": {
+                "properties": {
+                  "version": {
+                    "type": "keyword",
+                    "ignore_above": 256
+                  }
+                }
+              },
+              "service": {
+                "properties": {
+                  "framework": {
+                    "properties": {
+                      "composite": {
+                        "type": "keyword",
+                        "ignore_above": 256
+                      },
+                      "name": {
+                        "type": "keyword",
+                        "ignore_above": 256
+                      },
+                      "version": {
+                        "type": "keyword",
+                        "ignore_above": 256
+                      }
+                    }
+                  },
+                  "language": {
+                    "properties": {
+                      "composite": {
+                        "type": "keyword",
+                        "ignore_above": 256
+                      },
+                      "name": {
+                        "type": "keyword",
+                        "ignore_above": 256
+                      },
+                      "version": {
+                        "type": "keyword",
+                        "ignore_above": 256
+                      }
+                    }
+                  },
+                  "runtime": {
+                    "properties": {
+                      "composite": {
+                        "type": "keyword",
+                        "ignore_above": 256
+                      },
+                      "name": {
+                        "type": "keyword",
+                        "ignore_above": 256
+                      },
+                      "version": {
+                        "type": "keyword",
+                        "ignore_above": 256
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          },
+          "rum-js": {
+            "properties": {
+              "agent": {
+                "type": "object"
+              },
+              "service": {
+                "properties": {
+                  "framework": {
+                    "type": "object"
+                  },
+                  "language": {
+                    "type": "object"
+                  },
+                  "runtime": {
+                    "type": "object"
+                  }
+                }
+              }
+            }
+          }
+        }
+      },
+      "counts": {
+        "properties": {
+          "agent_configuration": {
+            "properties": {
+              "all": {
+                "type": "long"
+              }
+            }
+          },
+          "error": {
+            "properties": {
+              "1d": {
+                "type": "long"
+              },
+              "all": {
+                "type": "long"
+              }
+            }
+          },
+          "max_error_groups_per_service": {
+            "properties": {
+              "1d": {
+                "type": "long"
+              }
+            }
+          },
+          "max_transaction_groups_per_service": {
+            "properties": {
+              "1d": {
+                "type": "long"
+              }
+            }
+          },
+          "metric": {
+            "properties": {
+              "1d": {
+                "type": "long"
+              },
+              "all": {
+                "type": "long"
+              }
+            }
+          },
+          "onboarding": {
+            "properties": {
+              "1d": {
+                "type": "long"
+              },
+              "all": {
+                "type": "long"
+              }
+            }
+          },
+          "services": {
+            "properties": {
+              "1d": {
+                "type": "long"
+              }
+            }
+          },
+          "sourcemap": {
+            "properties": {
+              "1d": {
+                "type": "long"
+              },
+              "all": {
+                "type": "long"
+              }
+            }
+          },
+          "span": {
+            "properties": {
+              "1d": {
+                "type": "long"
+              },
+              "all": {
+                "type": "long"
+              }
+            }
+          },
+          "traces": {
+            "properties": {
+              "1d": {
+                "type": "long"
+              }
+            }
+          },
+          "transaction": {
+            "properties": {
+              "1d": {
+                "type": "long"
+              },
+              "all": {
+                "type": "long"
+              }
+            }
+          }
+        }
+      },
+      "cardinality": {
+        "properties": {
+          "user_agent": {
+            "properties": {
+              "original": {
+                "properties": {
+                  "all_agents": {
+                    "properties": {
+                      "1d": {
+                        "type": "long"
+                      }
+                    }
+                  },
+                  "rum": {
+                    "properties": {
+                      "1d": {
+                        "type": "long"
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          },
+          "transaction": {
+            "properties": {
+              "name": {
+                "properties": {
+                  "all_agents": {
+                    "properties": {
+                      "1d": {
+                        "type": "long"
+                      }
+                    }
+                  },
+                  "rum": {
+                    "properties": {
+                      "1d": {
+                        "type": "long"
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      },
       "has_any_services": {
         "type": "boolean"
       },
+      "indices": {
+        "properties": {
+          "all": {
+            "properties": {
+              "total": {
+                "properties": {
+                  "docs": {
+                    "properties": {
+                      "count": {
+                        "type": "long"
+                      }
+                    }
+                  },
+                  "store": {
+                    "properties": {
+                      "size_in_bytes": {
+                        "type": "long"
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          },
+          "shards": {
+            "properties": {
+              "total": {
+                "type": "long"
+              }
+            }
+          }
+        }
+      },
+      "integrations": {
+        "properties": {
+          "ml": {
+            "properties": {
+              "all_jobs_count": {
+                "type": "long"
+              }
+            }
+          }
+        }
+      },
+      "retainment": {
+        "properties": {
+          "error": {
+            "properties": {
+              "ms": {
+                "type": "long"
+              }
+            }
+          },
+          "metric": {
+            "properties": {
+              "ms": {
+                "type": "long"
+              }
+            }
+          },
+          "onboarding": {
+            "properties": {
+              "ms": {
+                "type": "long"
+              }
+            }
+          },
+          "span": {
+            "properties": {
+              "ms": {
+                "type": "long"
+              }
+            }
+          },
+          "transaction": {
+            "properties": {
+              "ms": {
+                "type": "long"
+              }
+            }
+          }
+        }
+      },
       "services_per_agent": {
         "properties": {
-          "python": {
+          "dotnet": {
             "type": "long",
             "null_value": 0
           },
-          "java": {
+          "go": {
             "type": "long",
             "null_value": 0
           },
-          "nodejs": {
+          "java": {
             "type": "long",
             "null_value": 0
           },
@@ -22,11 +661,11 @@
             "type": "long",
             "null_value": 0
           },
-          "rum-js": {
+          "nodejs": {
             "type": "long",
             "null_value": 0
           },
-          "dotnet": {
+          "python": {
             "type": "long",
             "null_value": 0
           },
@@ -34,11 +673,131 @@
             "type": "long",
             "null_value": 0
           },
-          "go": {
+          "rum-js": {
             "type": "long",
             "null_value": 0
           }
         }
+      },
+      "tasks": {
+        "properties": {
+          "agent_configuration": {
+            "properties": {
+              "took": {
+                "properties": {
+                  "ms": {
+                    "type": "long"
+                  }
+                }
+              }
+            }
+          },
+          "agents": {
+            "properties": {
+              "took": {
+                "properties": {
+                  "ms": {
+                    "type": "long"
+                  }
+                }
+              }
+            }
+          },
+          "cardinality": {
+            "properties": {
+              "took": {
+                "properties": {
+                  "ms": {
+                    "type": "long"
+                  }
+                }
+              }
+            }
+          },
+          "groupings": {
+            "properties": {
+              "took": {
+                "properties": {
+                  "ms": {
+                    "type": "long"
+                  }
+                }
+              }
+            }
+          },
+          "indices_stats": {
+            "properties": {
+              "took": {
+                "properties": {
+                  "ms": {
+                    "type": "long"
+                  }
+                }
+              }
+            }
+          },
+          "integrations": {
+            "properties": {
+              "took": {
+                "properties": {
+                  "ms": {
+                    "type": "long"
+                  }
+                }
+              }
+            }
+          },
+          "processor_events": {
+            "properties": {
+              "took": {
+                "properties": {
+                  "ms": {
+                    "type": "long"
+                  }
+                }
+              }
+            }
+          },
+          "services": {
+            "properties": {
+              "took": {
+                "properties": {
+                  "ms": {
+                    "type": "long"
+                  }
+                }
+              }
+            }
+          },
+          "versions": {
+            "properties": {
+              "took": {
+                "properties": {
+                  "ms": {
+                    "type": "long"
+                  }
+                }
+              }
+            }
+          }
+        }
+      },
+      "version": {
+        "properties": {
+          "apm_server": {
+            "properties": {
+              "major": {
+                "type": "long"
+              },
+              "minor": {
+                "type": "long"
+              },
+              "patch": {
+                "type": "long"
+              }
+            }
+          }
+        }
       }
     }
   },
diff --git a/x-pack/legacy/plugins/apm/public/components/shared/TransactionActionMenu/__test__/mockData.ts b/x-pack/legacy/plugins/apm/public/components/shared/TransactionActionMenu/__test__/mockData.ts
index be8f379ce62ee..70be1a4744767 100644
--- a/x-pack/legacy/plugins/apm/public/components/shared/TransactionActionMenu/__test__/mockData.ts
+++ b/x-pack/legacy/plugins/apm/public/components/shared/TransactionActionMenu/__test__/mockData.ts
@@ -8,7 +8,10 @@ import { Location } from 'history';
 
 const bareTransaction = {
   '@metadata': 'whatever',
-  observer: 'whatever',
+  observer: {
+    version: '8.0.0',
+    version_major: 8
+  },
   agent: {
     name: 'java',
     version: '7.0.0'
diff --git a/x-pack/legacy/plugins/apm/scripts/.gitignore b/x-pack/legacy/plugins/apm/scripts/.gitignore
new file mode 100644
index 0000000000000..8ee01d321b721
--- /dev/null
+++ b/x-pack/legacy/plugins/apm/scripts/.gitignore
@@ -0,0 +1 @@
+yarn.lock
diff --git a/x-pack/legacy/plugins/apm/scripts/package.json b/x-pack/legacy/plugins/apm/scripts/package.json
new file mode 100644
index 0000000000000..9121449c53619
--- /dev/null
+++ b/x-pack/legacy/plugins/apm/scripts/package.json
@@ -0,0 +1,10 @@
+{
+  "name": "apm-scripts",
+  "version": "1.0.0",
+  "main": "index.js",
+  "license": "MIT",
+  "dependencies": {
+    "@octokit/rest": "^16.35.0",
+    "console-stamp": "^0.2.9"
+  }
+}
diff --git a/x-pack/legacy/plugins/apm/scripts/setup-kibana-security.js b/x-pack/legacy/plugins/apm/scripts/setup-kibana-security.js
index 825c1a526fcc5..61ba2fdc7f7e3 100644
--- a/x-pack/legacy/plugins/apm/scripts/setup-kibana-security.js
+++ b/x-pack/legacy/plugins/apm/scripts/setup-kibana-security.js
@@ -16,6 +16,7 @@
  ******************************/
 
 // compile typescript on the fly
+// eslint-disable-next-line import/no-extraneous-dependencies
 require('@babel/register')({
   extensions: ['.ts'],
   plugins: ['@babel/plugin-proposal-optional-chaining'],
diff --git a/x-pack/legacy/plugins/apm/scripts/upload-telemetry-data.js b/x-pack/legacy/plugins/apm/scripts/upload-telemetry-data.js
new file mode 100644
index 0000000000000..a99651c62dd7a
--- /dev/null
+++ b/x-pack/legacy/plugins/apm/scripts/upload-telemetry-data.js
@@ -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.
+ */
+
+// compile typescript on the fly
+// eslint-disable-next-line import/no-extraneous-dependencies
+require('@babel/register')({
+  extensions: ['.ts'],
+  plugins: [
+    '@babel/plugin-proposal-optional-chaining',
+    '@babel/plugin-proposal-nullish-coalescing-operator'
+  ],
+  presets: [
+    '@babel/typescript',
+    ['@babel/preset-env', { targets: { node: 'current' } }]
+  ]
+});
+
+require('./upload-telemetry-data/index.ts');
diff --git a/x-pack/legacy/plugins/apm/scripts/upload-telemetry-data/download-telemetry-template.ts b/x-pack/legacy/plugins/apm/scripts/upload-telemetry-data/download-telemetry-template.ts
new file mode 100644
index 0000000000000..dfed9223ef708
--- /dev/null
+++ b/x-pack/legacy/plugins/apm/scripts/upload-telemetry-data/download-telemetry-template.ts
@@ -0,0 +1,26 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+// @ts-ignore
+import { Octokit } from '@octokit/rest';
+
+export async function downloadTelemetryTemplate(octokit: Octokit) {
+  const file = await octokit.repos.getContents({
+    owner: 'elastic',
+    repo: 'telemetry',
+    path: 'config/templates/xpack-phone-home.json',
+    // @ts-ignore
+    mediaType: {
+      format: 'application/vnd.github.VERSION.raw'
+    }
+  });
+
+  if (Array.isArray(file.data)) {
+    throw new Error('Expected single response, got array');
+  }
+
+  return JSON.parse(Buffer.from(file.data.content!, 'base64').toString());
+}
diff --git a/x-pack/legacy/plugins/apm/scripts/upload-telemetry-data/generate-sample-documents.ts b/x-pack/legacy/plugins/apm/scripts/upload-telemetry-data/generate-sample-documents.ts
new file mode 100644
index 0000000000000..8d76063a7fdf6
--- /dev/null
+++ b/x-pack/legacy/plugins/apm/scripts/upload-telemetry-data/generate-sample-documents.ts
@@ -0,0 +1,124 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+import { DeepPartial } from 'utility-types';
+import {
+  merge,
+  omit,
+  defaultsDeep,
+  range,
+  mapValues,
+  isPlainObject,
+  flatten
+} from 'lodash';
+import uuid from 'uuid';
+import {
+  CollectTelemetryParams,
+  collectDataTelemetry
+  // eslint-disable-next-line @kbn/eslint/no-restricted-paths
+} from '../../../../../plugins/apm/server/lib/apm_telemetry/collect_data_telemetry';
+
+interface GenerateOptions {
+  days: number;
+  instances: number;
+  variation: {
+    min: number;
+    max: number;
+  };
+}
+
+const randomize = (
+  value: unknown,
+  instanceVariation: number,
+  dailyGrowth: number
+) => {
+  if (typeof value === 'boolean') {
+    return Math.random() > 0.5;
+  }
+  if (typeof value === 'number') {
+    return Math.round(instanceVariation * dailyGrowth * value);
+  }
+  return value;
+};
+
+const mapValuesDeep = (
+  obj: Record<string, any>,
+  iterator: (value: unknown, key: string, obj: Record<string, any>) => unknown
+): Record<string, any> =>
+  mapValues(obj, (val, key) =>
+    isPlainObject(val) ? mapValuesDeep(val, iterator) : iterator(val, key!, obj)
+  );
+
+export async function generateSampleDocuments(
+  options: DeepPartial<GenerateOptions> & {
+    collectTelemetryParams: CollectTelemetryParams;
+  }
+) {
+  const { collectTelemetryParams, ...preferredOptions } = options;
+
+  const opts: GenerateOptions = defaultsDeep(
+    {
+      days: 100,
+      instances: 50,
+      variation: {
+        min: 0.1,
+        max: 4
+      }
+    },
+    preferredOptions
+  );
+
+  const sample = await collectDataTelemetry(collectTelemetryParams);
+
+  console.log('Collected telemetry'); // eslint-disable-line no-console
+  console.log('\n' + JSON.stringify(sample, null, 2)); // eslint-disable-line no-console
+
+  const dateOfScriptExecution = new Date();
+
+  return flatten(
+    range(0, opts.instances).map(instanceNo => {
+      const instanceId = uuid.v4();
+      const defaults = {
+        cluster_uuid: instanceId,
+        stack_stats: {
+          kibana: {
+            versions: {
+              version: '8.0.0'
+            }
+          }
+        }
+      };
+
+      const instanceVariation =
+        Math.random() * (opts.variation.max - opts.variation.min) +
+        opts.variation.min;
+
+      return range(0, opts.days).map(dayNo => {
+        const dailyGrowth = Math.pow(1.005, opts.days - 1 - dayNo);
+
+        const timestamp = Date.UTC(
+          dateOfScriptExecution.getFullYear(),
+          dateOfScriptExecution.getMonth(),
+          -dayNo
+        );
+
+        const generated = mapValuesDeep(omit(sample, 'versions'), value =>
+          randomize(value, instanceVariation, dailyGrowth)
+        );
+
+        return merge({}, defaults, {
+          timestamp,
+          stack_stats: {
+            kibana: {
+              plugins: {
+                apm: merge({}, sample, generated)
+              }
+            }
+          }
+        });
+      });
+    })
+  );
+}
diff --git a/x-pack/legacy/plugins/apm/scripts/upload-telemetry-data/index.ts b/x-pack/legacy/plugins/apm/scripts/upload-telemetry-data/index.ts
new file mode 100644
index 0000000000000..bdc57eac412fc
--- /dev/null
+++ b/x-pack/legacy/plugins/apm/scripts/upload-telemetry-data/index.ts
@@ -0,0 +1,208 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+// This script downloads the telemetry mapping, runs the APM telemetry tasks,
+// generates a bunch of randomized data based on the downloaded sample,
+// and uploads it to a cluster of your choosing in the same format as it is
+// stored in the telemetry cluster. Its purpose is twofold:
+// - Easier testing of the telemetry tasks
+// - Validate whether we can run the queries we want to on the telemetry data
+
+import fs from 'fs';
+import path from 'path';
+// @ts-ignore
+import { Octokit } from '@octokit/rest';
+import { merge, chunk, flatten, pick, identity } from 'lodash';
+import axios from 'axios';
+import yaml from 'js-yaml';
+import { Client } from 'elasticsearch';
+import { argv } from 'yargs';
+import { promisify } from 'util';
+import { Logger } from 'kibana/server';
+// @ts-ignore
+import consoleStamp from 'console-stamp';
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import { CollectTelemetryParams } from '../../../../../plugins/apm/server/lib/apm_telemetry/collect_data_telemetry';
+import { downloadTelemetryTemplate } from './download-telemetry-template';
+import mapping from '../../mappings.json';
+import { generateSampleDocuments } from './generate-sample-documents';
+
+consoleStamp(console, '[HH:MM:ss.l]');
+
+const githubToken = process.env.GITHUB_TOKEN;
+
+if (!githubToken) {
+  throw new Error('GITHUB_TOKEN was not provided.');
+}
+
+const kibanaConfigDir = path.join(__filename, '../../../../../../../config');
+const kibanaDevConfig = path.join(kibanaConfigDir, 'kibana.dev.yml');
+const kibanaConfig = path.join(kibanaConfigDir, 'kibana.yml');
+
+const xpackTelemetryIndexName = 'xpack-phone-home';
+
+const loadedKibanaConfig = (yaml.safeLoad(
+  fs.readFileSync(
+    fs.existsSync(kibanaDevConfig) ? kibanaDevConfig : kibanaConfig,
+    'utf8'
+  )
+) || {}) as {};
+
+const cliEsCredentials = pick(
+  {
+    'elasticsearch.username': process.env.ELASTICSEARCH_USERNAME,
+    'elasticsearch.password': process.env.ELASTICSEARCH_PASSWORD,
+    'elasticsearch.hosts': process.env.ELASTICSEARCH_HOST
+  },
+  identity
+) as {
+  'elasticsearch.username': string;
+  'elasticsearch.password': string;
+  'elasticsearch.hosts': string;
+};
+
+const config = {
+  'apm_oss.transactionIndices': 'apm-*',
+  'apm_oss.metricsIndices': 'apm-*',
+  'apm_oss.errorIndices': 'apm-*',
+  'apm_oss.spanIndices': 'apm-*',
+  'apm_oss.onboardingIndices': 'apm-*',
+  'apm_oss.sourcemapIndices': 'apm-*',
+  'elasticsearch.hosts': 'http://localhost:9200',
+  ...loadedKibanaConfig,
+  ...cliEsCredentials
+};
+
+async function uploadData() {
+  const octokit = new Octokit({
+    auth: githubToken
+  });
+
+  const telemetryTemplate = await downloadTelemetryTemplate(octokit);
+
+  const kibanaMapping = mapping['apm-telemetry'];
+
+  const httpAuth =
+    config['elasticsearch.username'] && config['elasticsearch.password']
+      ? {
+          username: config['elasticsearch.username'],
+          password: config['elasticsearch.password']
+        }
+      : null;
+
+  const client = new Client({
+    host: config['elasticsearch.hosts'],
+    ...(httpAuth
+      ? {
+          httpAuth: `${httpAuth.username}:${httpAuth.password}`
+        }
+      : {})
+  });
+
+  if (argv.clear) {
+    try {
+      await promisify(client.indices.delete.bind(client))({
+        index: xpackTelemetryIndexName
+      });
+    } catch (err) {
+      // 404 = index not found, totally okay
+      if (err.status !== 404) {
+        throw err;
+      }
+    }
+  }
+
+  const axiosInstance = axios.create({
+    baseURL: config['elasticsearch.hosts'],
+    ...(httpAuth ? { auth: httpAuth } : {})
+  });
+
+  const newTemplate = merge(telemetryTemplate, {
+    settings: {
+      index: { mapping: { total_fields: { limit: 10000 } } }
+    }
+  });
+
+  // override apm mapping instead of merging
+  newTemplate.mappings.properties.stack_stats.properties.kibana.properties.plugins.properties.apm = kibanaMapping;
+
+  await axiosInstance.put(`/_template/xpack-phone-home`, newTemplate);
+
+  const sampleDocuments = await generateSampleDocuments({
+    collectTelemetryParams: {
+      logger: (console as unknown) as Logger,
+      indices: {
+        ...config,
+        apmCustomLinkIndex: '.apm-custom-links',
+        apmAgentConfigurationIndex: '.apm-agent-configuration'
+      },
+      search: body => {
+        return promisify(client.search.bind(client))({
+          ...body,
+          requestTimeout: 120000
+        }) as any;
+      },
+      indicesStats: body => {
+        return promisify(client.indices.stats.bind(client))({
+          ...body,
+          requestTimeout: 120000
+        }) as any;
+      },
+      transportRequest: (params => {
+        return axiosInstance[params.method](params.path);
+      }) as CollectTelemetryParams['transportRequest']
+    }
+  });
+
+  const chunks = chunk(sampleDocuments, 250);
+
+  await chunks.reduce<Promise<any>>((prev, documents) => {
+    return prev.then(async () => {
+      const body = flatten(
+        documents.map(doc => [{ index: { _index: 'xpack-phone-home' } }, doc])
+      );
+
+      return promisify(client.bulk.bind(client))({
+        body,
+        refresh: true
+      }).then((response: any) => {
+        if (response.errors) {
+          const firstError = response.items.filter(
+            (item: any) => item.index.status >= 400
+          )[0].index.error;
+          throw new Error(`Failed to upload documents: ${firstError.reason} `);
+        }
+      });
+    });
+  }, Promise.resolve());
+}
+
+uploadData()
+  .catch(e => {
+    if ('response' in e) {
+      if (typeof e.response === 'string') {
+        // eslint-disable-next-line no-console
+        console.log(e.response);
+      } else {
+        // eslint-disable-next-line no-console
+        console.log(
+          JSON.stringify(
+            e.response,
+            ['status', 'statusText', 'headers', 'data'],
+            2
+          )
+        );
+      }
+    } else {
+      // eslint-disable-next-line no-console
+      console.log(e);
+    }
+    process.exit(1);
+  })
+  .then(() => {
+    // eslint-disable-next-line no-console
+    console.log('Finished uploading generated telemetry data');
+  });
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 897d4e979fce3..5de82a9ee8788 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
@@ -2,6 +2,8 @@
 
 exports[`Error AGENT_NAME 1`] = `"java"`;
 
+exports[`Error AGENT_VERSION 1`] = `"agent version"`;
+
 exports[`Error CLIENT_GEO_COUNTRY_ISO_CODE 1`] = `undefined`;
 
 exports[`Error CONTAINER_ID 1`] = `undefined`;
@@ -56,7 +58,7 @@ exports[`Error METRIC_SYSTEM_TOTAL_MEMORY 1`] = `undefined`;
 
 exports[`Error OBSERVER_LISTENING 1`] = `undefined`;
 
-exports[`Error OBSERVER_VERSION_MAJOR 1`] = `undefined`;
+exports[`Error OBSERVER_VERSION_MAJOR 1`] = `8`;
 
 exports[`Error PARENT_ID 1`] = `"parentId"`;
 
@@ -68,10 +70,20 @@ exports[`Error SERVICE_ENVIRONMENT 1`] = `undefined`;
 
 exports[`Error SERVICE_FRAMEWORK_NAME 1`] = `undefined`;
 
+exports[`Error SERVICE_FRAMEWORK_VERSION 1`] = `undefined`;
+
+exports[`Error SERVICE_LANGUAGE_NAME 1`] = `"nodejs"`;
+
+exports[`Error SERVICE_LANGUAGE_VERSION 1`] = `"v1337"`;
+
 exports[`Error SERVICE_NAME 1`] = `"service name"`;
 
 exports[`Error SERVICE_NODE_NAME 1`] = `undefined`;
 
+exports[`Error SERVICE_RUNTIME_NAME 1`] = `undefined`;
+
+exports[`Error SERVICE_RUNTIME_VERSION 1`] = `undefined`;
+
 exports[`Error SERVICE_VERSION 1`] = `undefined`;
 
 exports[`Error SPAN_ACTION 1`] = `undefined`;
@@ -112,10 +124,14 @@ exports[`Error URL_FULL 1`] = `undefined`;
 
 exports[`Error USER_AGENT_NAME 1`] = `undefined`;
 
+exports[`Error USER_AGENT_ORIGINAL 1`] = `undefined`;
+
 exports[`Error USER_ID 1`] = `undefined`;
 
 exports[`Span AGENT_NAME 1`] = `"java"`;
 
+exports[`Span AGENT_VERSION 1`] = `"agent version"`;
+
 exports[`Span CLIENT_GEO_COUNTRY_ISO_CODE 1`] = `undefined`;
 
 exports[`Span CONTAINER_ID 1`] = `undefined`;
@@ -170,7 +186,7 @@ exports[`Span METRIC_SYSTEM_TOTAL_MEMORY 1`] = `undefined`;
 
 exports[`Span OBSERVER_LISTENING 1`] = `undefined`;
 
-exports[`Span OBSERVER_VERSION_MAJOR 1`] = `undefined`;
+exports[`Span OBSERVER_VERSION_MAJOR 1`] = `8`;
 
 exports[`Span PARENT_ID 1`] = `"parentId"`;
 
@@ -182,10 +198,20 @@ exports[`Span SERVICE_ENVIRONMENT 1`] = `undefined`;
 
 exports[`Span SERVICE_FRAMEWORK_NAME 1`] = `undefined`;
 
+exports[`Span SERVICE_FRAMEWORK_VERSION 1`] = `undefined`;
+
+exports[`Span SERVICE_LANGUAGE_NAME 1`] = `undefined`;
+
+exports[`Span SERVICE_LANGUAGE_VERSION 1`] = `undefined`;
+
 exports[`Span SERVICE_NAME 1`] = `"service name"`;
 
 exports[`Span SERVICE_NODE_NAME 1`] = `undefined`;
 
+exports[`Span SERVICE_RUNTIME_NAME 1`] = `undefined`;
+
+exports[`Span SERVICE_RUNTIME_VERSION 1`] = `undefined`;
+
 exports[`Span SERVICE_VERSION 1`] = `undefined`;
 
 exports[`Span SPAN_ACTION 1`] = `"my action"`;
@@ -226,10 +252,14 @@ exports[`Span URL_FULL 1`] = `undefined`;
 
 exports[`Span USER_AGENT_NAME 1`] = `undefined`;
 
+exports[`Span USER_AGENT_ORIGINAL 1`] = `undefined`;
+
 exports[`Span USER_ID 1`] = `undefined`;
 
 exports[`Transaction AGENT_NAME 1`] = `"java"`;
 
+exports[`Transaction AGENT_VERSION 1`] = `"agent version"`;
+
 exports[`Transaction CLIENT_GEO_COUNTRY_ISO_CODE 1`] = `undefined`;
 
 exports[`Transaction CONTAINER_ID 1`] = `"container1234567890abcdef"`;
@@ -284,7 +314,7 @@ exports[`Transaction METRIC_SYSTEM_TOTAL_MEMORY 1`] = `undefined`;
 
 exports[`Transaction OBSERVER_LISTENING 1`] = `undefined`;
 
-exports[`Transaction OBSERVER_VERSION_MAJOR 1`] = `undefined`;
+exports[`Transaction OBSERVER_VERSION_MAJOR 1`] = `8`;
 
 exports[`Transaction PARENT_ID 1`] = `"parentId"`;
 
@@ -296,10 +326,20 @@ exports[`Transaction SERVICE_ENVIRONMENT 1`] = `undefined`;
 
 exports[`Transaction SERVICE_FRAMEWORK_NAME 1`] = `undefined`;
 
+exports[`Transaction SERVICE_FRAMEWORK_VERSION 1`] = `undefined`;
+
+exports[`Transaction SERVICE_LANGUAGE_NAME 1`] = `"nodejs"`;
+
+exports[`Transaction SERVICE_LANGUAGE_VERSION 1`] = `"v1337"`;
+
 exports[`Transaction SERVICE_NAME 1`] = `"service name"`;
 
 exports[`Transaction SERVICE_NODE_NAME 1`] = `undefined`;
 
+exports[`Transaction SERVICE_RUNTIME_NAME 1`] = `undefined`;
+
+exports[`Transaction SERVICE_RUNTIME_VERSION 1`] = `undefined`;
+
 exports[`Transaction SERVICE_VERSION 1`] = `undefined`;
 
 exports[`Transaction SPAN_ACTION 1`] = `undefined`;
@@ -340,4 +380,6 @@ exports[`Transaction URL_FULL 1`] = `"http://www.elastic.co"`;
 
 exports[`Transaction USER_AGENT_NAME 1`] = `"Other"`;
 
+exports[`Transaction USER_AGENT_ORIGINAL 1`] = `"test original"`;
+
 exports[`Transaction USER_ID 1`] = `"1337"`;
diff --git a/x-pack/plugins/apm/common/agent_name.ts b/x-pack/plugins/apm/common/agent_name.ts
index bb68eb88b8e18..085828b729ea5 100644
--- a/x-pack/plugins/apm/common/agent_name.ts
+++ b/x-pack/plugins/apm/common/agent_name.ts
@@ -4,36 +4,40 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+import { AgentName } from '../typings/es_schemas/ui/fields/agent';
+
 /*
  * Agent names can be any string. This list only defines the official agents
  * that we might want to target specifically eg. linking to their documentation
  * & telemetry reporting. Support additional agent types by appending
  * definitions in mappings.json (for telemetry), the AgentName type, and the
- * agentNames object.
+ * AGENT_NAMES array.
  */
-import { AgentName } from '../typings/es_schemas/ui/fields/agent';
 
-const agentNames: { [agentName in AgentName]: agentName } = {
-  python: 'python',
-  java: 'java',
-  nodejs: 'nodejs',
-  'js-base': 'js-base',
-  'rum-js': 'rum-js',
-  dotnet: 'dotnet',
-  ruby: 'ruby',
-  go: 'go'
-};
+export const AGENT_NAMES: AgentName[] = [
+  'java',
+  'js-base',
+  'rum-js',
+  'dotnet',
+  'go',
+  'java',
+  'nodejs',
+  'python',
+  'ruby'
+];
 
-export function isAgentName(agentName: string): boolean {
-  return Object.values(agentNames).includes(agentName as AgentName);
+export function isAgentName(agentName: string): agentName is AgentName {
+  return AGENT_NAMES.includes(agentName as AgentName);
 }
 
-export function isRumAgentName(agentName: string | undefined) {
-  return (
-    agentName === agentNames['js-base'] || agentName === agentNames['rum-js']
-  );
+export function isRumAgentName(
+  agentName: string | undefined
+): agentName is 'js-base' | 'rum-js' {
+  return agentName === 'js-base' || agentName === 'rum-js';
 }
 
-export function isJavaAgentName(agentName: string | undefined) {
-  return agentName === agentNames.java;
+export function isJavaAgentName(
+  agentName: string | undefined
+): agentName is 'java' {
+  return agentName === 'java';
 }
diff --git a/x-pack/plugins/apm/common/apm_saved_object_constants.ts b/x-pack/plugins/apm/common/apm_saved_object_constants.ts
index ac43b700117c6..0529d90fe940a 100644
--- a/x-pack/plugins/apm/common/apm_saved_object_constants.ts
+++ b/x-pack/plugins/apm/common/apm_saved_object_constants.ts
@@ -4,11 +4,13 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-// APM Services telemetry
-export const APM_SERVICES_TELEMETRY_SAVED_OBJECT_TYPE =
-  'apm-services-telemetry';
-export const APM_SERVICES_TELEMETRY_SAVED_OBJECT_ID = 'apm-services-telemetry';
+// the types have to match the names of the saved object mappings
+// in /x-pack/legacy/plugins/apm/mappings.json
 
 // APM indices
 export const APM_INDICES_SAVED_OBJECT_TYPE = 'apm-indices';
 export const APM_INDICES_SAVED_OBJECT_ID = 'apm-indices';
+
+// APM telemetry
+export const APM_TELEMETRY_SAVED_OBJECT_TYPE = 'apm-telemetry';
+export const APM_TELEMETRY_SAVED_OBJECT_ID = 'apm-telemetry';
diff --git a/x-pack/plugins/apm/common/elasticsearch_fieldnames.test.ts b/x-pack/plugins/apm/common/elasticsearch_fieldnames.test.ts
index 1add2427d16a0..63fa749cd9f2c 100644
--- a/x-pack/plugins/apm/common/elasticsearch_fieldnames.test.ts
+++ b/x-pack/plugins/apm/common/elasticsearch_fieldnames.test.ts
@@ -15,7 +15,10 @@ describe('Transaction', () => {
   const transaction: AllowUnknownProperties<Transaction> = {
     '@timestamp': new Date().toString(),
     '@metadata': 'whatever',
-    observer: 'whatever',
+    observer: {
+      version: 'whatever',
+      version_major: 8
+    },
     agent: {
       name: 'java',
       version: 'agent version'
@@ -63,7 +66,10 @@ describe('Span', () => {
   const span: AllowUnknownProperties<Span> = {
     '@timestamp': new Date().toString(),
     '@metadata': 'whatever',
-    observer: 'whatever',
+    observer: {
+      version: 'whatever',
+      version_major: 8
+    },
     agent: {
       name: 'java',
       version: 'agent version'
@@ -107,7 +113,10 @@ describe('Span', () => {
 describe('Error', () => {
   const errorDoc: AllowUnknownProperties<APMError> = {
     '@metadata': 'whatever',
-    observer: 'whatever',
+    observer: {
+      version: 'whatever',
+      version_major: 8
+    },
     agent: {
       name: 'java',
       version: 'agent version'
diff --git a/x-pack/plugins/apm/common/elasticsearch_fieldnames.ts b/x-pack/plugins/apm/common/elasticsearch_fieldnames.ts
index 822201baddd88..bc1b346f50da7 100644
--- a/x-pack/plugins/apm/common/elasticsearch_fieldnames.ts
+++ b/x-pack/plugins/apm/common/elasticsearch_fieldnames.ts
@@ -4,15 +4,24 @@
  * 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_FRAMEWORK_NAME = 'service.framework.name';
+export const SERVICE_FRAMEWORK_VERSION = 'service.framework.version';
+export const SERVICE_LANGUAGE_NAME = 'service.language.name';
+export const SERVICE_LANGUAGE_VERSION = 'service.language.version';
+export const SERVICE_RUNTIME_NAME = 'service.runtime.name';
+export const SERVICE_RUNTIME_VERSION = 'service.runtime.version';
 export const SERVICE_NODE_NAME = 'service.node.name';
 export const SERVICE_VERSION = 'service.version';
+
+export const AGENT_NAME = 'agent.name';
+export const AGENT_VERSION = 'agent.version';
+
 export const URL_FULL = 'url.full';
 export const HTTP_REQUEST_METHOD = 'http.request.method';
 export const USER_ID = 'user.id';
+export const USER_AGENT_ORIGINAL = 'user_agent.original';
 export const USER_AGENT_NAME = 'user_agent.name';
 
 export const DESTINATION_ADDRESS = 'destination.address';
diff --git a/x-pack/plugins/apm/kibana.json b/x-pack/plugins/apm/kibana.json
index 931fd92e1ecc3..7ffdb676c740f 100644
--- a/x-pack/plugins/apm/kibana.json
+++ b/x-pack/plugins/apm/kibana.json
@@ -3,7 +3,10 @@
   "server": true,
   "version": "8.0.0",
   "kibanaVersion": "kibana",
-  "configPath": ["xpack", "apm"],
+  "configPath": [
+    "xpack",
+    "apm"
+  ],
   "ui": false,
   "requiredPlugins": ["apm_oss", "data", "home", "licensing"],
   "optionalPlugins": ["cloud", "usageCollection", "taskManager","actions", "alerting"]
diff --git a/x-pack/plugins/apm/server/index.ts b/x-pack/plugins/apm/server/index.ts
index 8afdb9e99c1a3..77655568a7e9c 100644
--- a/x-pack/plugins/apm/server/index.ts
+++ b/x-pack/plugins/apm/server/index.ts
@@ -29,7 +29,8 @@ export const config = {
       enabled: schema.boolean({ defaultValue: true }),
       transactionGroupBucketSize: schema.number({ defaultValue: 100 }),
       maxTraceItems: schema.number({ defaultValue: 1000 })
-    })
+    }),
+    telemetryCollectionEnabled: schema.boolean({ defaultValue: true })
   })
 };
 
@@ -62,7 +63,8 @@ export function mergeConfigs(
     'xpack.apm.ui.maxTraceItems': apmConfig.ui.maxTraceItems,
     'xpack.apm.ui.transactionGroupBucketSize':
       apmConfig.ui.transactionGroupBucketSize,
-    'xpack.apm.autocreateApmIndexPattern': apmConfig.autocreateApmIndexPattern
+    'xpack.apm.autocreateApmIndexPattern': apmConfig.autocreateApmIndexPattern,
+    'xpack.apm.telemetryCollectionEnabled': apmConfig.telemetryCollectionEnabled
   };
 }
 
diff --git a/x-pack/plugins/apm/server/lib/apm_telemetry/__test__/index.test.ts b/x-pack/plugins/apm/server/lib/apm_telemetry/__test__/index.test.ts
deleted file mode 100644
index c45c74a791aee..0000000000000
--- a/x-pack/plugins/apm/server/lib/apm_telemetry/__test__/index.test.ts
+++ /dev/null
@@ -1,83 +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 { SavedObjectAttributes } from '../../../../../../../src/core/server';
-import { createApmTelementry, storeApmServicesTelemetry } from '../index';
-import {
-  APM_SERVICES_TELEMETRY_SAVED_OBJECT_TYPE,
-  APM_SERVICES_TELEMETRY_SAVED_OBJECT_ID
-} from '../../../../common/apm_saved_object_constants';
-
-describe('apm_telemetry', () => {
-  describe('createApmTelementry', () => {
-    it('should create a ApmTelemetry object with boolean flag and frequency map of the given list of AgentNames', () => {
-      const apmTelemetry = createApmTelementry([
-        'go',
-        'nodejs',
-        'go',
-        'js-base'
-      ]);
-      expect(apmTelemetry.has_any_services).toBe(true);
-      expect(apmTelemetry.services_per_agent).toMatchObject({
-        go: 2,
-        nodejs: 1,
-        'js-base': 1
-      });
-    });
-    it('should ignore undefined or unknown AgentName values', () => {
-      const apmTelemetry = createApmTelementry([
-        'go',
-        'nodejs',
-        'go',
-        'js-base',
-        'example-platform' as any,
-        undefined as any
-      ]);
-      expect(apmTelemetry.services_per_agent).toMatchObject({
-        go: 2,
-        nodejs: 1,
-        'js-base': 1
-      });
-    });
-  });
-
-  describe('storeApmServicesTelemetry', () => {
-    let apmTelemetry: SavedObjectAttributes;
-    let savedObjectsClient: any;
-
-    beforeEach(() => {
-      apmTelemetry = {
-        has_any_services: true,
-        services_per_agent: {
-          go: 2,
-          nodejs: 1,
-          'js-base': 1
-        }
-      };
-      savedObjectsClient = { create: jest.fn() };
-    });
-
-    it('should call savedObjectsClient create with the given ApmTelemetry object', () => {
-      storeApmServicesTelemetry(savedObjectsClient, apmTelemetry);
-      expect(savedObjectsClient.create.mock.calls[0][1]).toBe(apmTelemetry);
-    });
-
-    it('should call savedObjectsClient create with the apm-telemetry document type and ID', () => {
-      storeApmServicesTelemetry(savedObjectsClient, apmTelemetry);
-      expect(savedObjectsClient.create.mock.calls[0][0]).toBe(
-        APM_SERVICES_TELEMETRY_SAVED_OBJECT_TYPE
-      );
-      expect(savedObjectsClient.create.mock.calls[0][2].id).toBe(
-        APM_SERVICES_TELEMETRY_SAVED_OBJECT_ID
-      );
-    });
-
-    it('should call savedObjectsClient create with overwrite: true', () => {
-      storeApmServicesTelemetry(savedObjectsClient, apmTelemetry);
-      expect(savedObjectsClient.create.mock.calls[0][2].overwrite).toBe(true);
-    });
-  });
-});
diff --git a/x-pack/plugins/apm/server/lib/apm_telemetry/collect_data_telemetry/index.ts b/x-pack/plugins/apm/server/lib/apm_telemetry/collect_data_telemetry/index.ts
new file mode 100644
index 0000000000000..729ccb73d73f3
--- /dev/null
+++ b/x-pack/plugins/apm/server/lib/apm_telemetry/collect_data_telemetry/index.ts
@@ -0,0 +1,77 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+import { merge } from 'lodash';
+import { Logger, CallAPIOptions } from 'kibana/server';
+import { IndicesStatsParams, Client } from 'elasticsearch';
+import {
+  ESSearchRequest,
+  ESSearchResponse
+} from '../../../../typings/elasticsearch';
+import { ApmIndicesConfig } from '../../settings/apm_indices/get_apm_indices';
+import { tasks } from './tasks';
+import { APMDataTelemetry } from '../types';
+
+type TelemetryTaskExecutor = (params: {
+  indices: ApmIndicesConfig;
+  search<TSearchRequest extends ESSearchRequest>(
+    params: TSearchRequest
+  ): Promise<ESSearchResponse<unknown, TSearchRequest>>;
+  indicesStats(
+    params: IndicesStatsParams,
+    options?: CallAPIOptions
+  ): ReturnType<Client['indices']['stats']>;
+  transportRequest: (params: {
+    path: string;
+    method: 'get';
+  }) => Promise<unknown>;
+}) => Promise<APMDataTelemetry>;
+
+export interface TelemetryTask {
+  name: string;
+  executor: TelemetryTaskExecutor;
+}
+
+export type CollectTelemetryParams = Parameters<TelemetryTaskExecutor>[0] & {
+  logger: Logger;
+};
+
+export function collectDataTelemetry({
+  search,
+  indices,
+  logger,
+  indicesStats,
+  transportRequest
+}: CollectTelemetryParams) {
+  return tasks.reduce((prev, task) => {
+    return prev.then(async data => {
+      logger.debug(`Executing APM telemetry task ${task.name}`);
+      try {
+        const time = process.hrtime();
+        const next = await task.executor({
+          search,
+          indices,
+          indicesStats,
+          transportRequest
+        });
+        const took = process.hrtime(time);
+
+        return merge({}, data, next, {
+          tasks: {
+            [task.name]: {
+              took: {
+                ms: Math.round(took[0] * 1000 + took[1] / 1e6)
+              }
+            }
+          }
+        });
+      } catch (err) {
+        logger.warn(`Failed executing APM telemetry task ${task.name}`);
+        logger.warn(err);
+        return data;
+      }
+    });
+  }, Promise.resolve({} as APMDataTelemetry));
+}
diff --git a/x-pack/plugins/apm/server/lib/apm_telemetry/collect_data_telemetry/tasks.ts b/x-pack/plugins/apm/server/lib/apm_telemetry/collect_data_telemetry/tasks.ts
new file mode 100644
index 0000000000000..415076b6ae116
--- /dev/null
+++ b/x-pack/plugins/apm/server/lib/apm_telemetry/collect_data_telemetry/tasks.ts
@@ -0,0 +1,725 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+import { flatten, merge, sortBy, sum } from 'lodash';
+import { AgentName } from '../../../../typings/es_schemas/ui/fields/agent';
+import { AGENT_NAMES } from '../../../../common/agent_name';
+import { Transaction } from '../../../../typings/es_schemas/ui/transaction';
+import {
+  PROCESSOR_EVENT,
+  SERVICE_NAME,
+  AGENT_NAME,
+  AGENT_VERSION,
+  ERROR_GROUP_ID,
+  TRANSACTION_NAME,
+  PARENT_ID,
+  SERVICE_FRAMEWORK_NAME,
+  SERVICE_FRAMEWORK_VERSION,
+  SERVICE_LANGUAGE_NAME,
+  SERVICE_LANGUAGE_VERSION,
+  SERVICE_RUNTIME_NAME,
+  SERVICE_RUNTIME_VERSION,
+  USER_AGENT_ORIGINAL
+} from '../../../../common/elasticsearch_fieldnames';
+import { Span } from '../../../../typings/es_schemas/ui/span';
+import { APMError } from '../../../../typings/es_schemas/ui/apm_error';
+import { TelemetryTask } from '.';
+import { APMTelemetry } from '../types';
+
+const TIME_RANGES = ['1d', 'all'] as const;
+type TimeRange = typeof TIME_RANGES[number];
+
+export const tasks: TelemetryTask[] = [
+  {
+    name: 'processor_events',
+    executor: async ({ indices, search }) => {
+      const indicesByProcessorEvent = {
+        error: indices['apm_oss.errorIndices'],
+        metric: indices['apm_oss.metricsIndices'],
+        span: indices['apm_oss.spanIndices'],
+        transaction: indices['apm_oss.transactionIndices'],
+        onboarding: indices['apm_oss.onboardingIndices'],
+        sourcemap: indices['apm_oss.sourcemapIndices']
+      };
+
+      type ProcessorEvent = keyof typeof indicesByProcessorEvent;
+
+      const jobs: Array<{
+        processorEvent: ProcessorEvent;
+        timeRange: TimeRange;
+      }> = flatten(
+        (Object.keys(
+          indicesByProcessorEvent
+        ) as ProcessorEvent[]).map(processorEvent =>
+          TIME_RANGES.map(timeRange => ({ processorEvent, timeRange }))
+        )
+      );
+
+      const allData = await jobs.reduce((prevJob, current) => {
+        return prevJob.then(async data => {
+          const { processorEvent, timeRange } = current;
+
+          const response = await search({
+            index: indicesByProcessorEvent[processorEvent],
+            body: {
+              size: 1,
+              query: {
+                bool: {
+                  filter: [
+                    { term: { [PROCESSOR_EVENT]: processorEvent } },
+                    ...(timeRange !== 'all'
+                      ? [
+                          {
+                            range: {
+                              '@timestamp': {
+                                gte: `now-${timeRange}`
+                              }
+                            }
+                          }
+                        ]
+                      : [])
+                  ]
+                }
+              },
+              sort: {
+                '@timestamp': 'asc'
+              },
+              _source: ['@timestamp'],
+              track_total_hits: true
+            }
+          });
+
+          const event = response.hits.hits[0]?._source as {
+            '@timestamp': number;
+          };
+
+          return merge({}, data, {
+            counts: {
+              [processorEvent]: {
+                [timeRange]: response.hits.total.value
+              }
+            },
+            ...(timeRange === 'all' && event
+              ? {
+                  retainment: {
+                    [processorEvent]: {
+                      ms:
+                        new Date().getTime() -
+                        new Date(event['@timestamp']).getTime()
+                    }
+                  }
+                }
+              : {})
+          });
+        });
+      }, Promise.resolve({} as Record<string, { counts: Record<ProcessorEvent, Record<TimeRange, number>> }>));
+
+      return allData;
+    }
+  },
+  {
+    name: 'agent_configuration',
+    executor: async ({ indices, search }) => {
+      const agentConfigurationCount = (
+        await search({
+          index: indices.apmAgentConfigurationIndex,
+          body: {
+            size: 0,
+            track_total_hits: true
+          }
+        })
+      ).hits.total.value;
+
+      return {
+        counts: {
+          agent_configuration: {
+            all: agentConfigurationCount
+          }
+        }
+      };
+    }
+  },
+  {
+    name: 'services',
+    executor: async ({ indices, search }) => {
+      const servicesPerAgent = await AGENT_NAMES.reduce(
+        (prevJob, agentName) => {
+          return prevJob.then(async data => {
+            const response = await search({
+              index: [
+                indices['apm_oss.errorIndices'],
+                indices['apm_oss.spanIndices'],
+                indices['apm_oss.metricsIndices'],
+                indices['apm_oss.transactionIndices']
+              ],
+              body: {
+                size: 0,
+                query: {
+                  bool: {
+                    filter: [
+                      {
+                        term: {
+                          [AGENT_NAME]: agentName
+                        }
+                      },
+                      {
+                        range: {
+                          '@timestamp': {
+                            gte: 'now-1d'
+                          }
+                        }
+                      }
+                    ]
+                  }
+                },
+                aggs: {
+                  services: {
+                    cardinality: {
+                      field: SERVICE_NAME
+                    }
+                  }
+                }
+              }
+            });
+
+            return {
+              ...data,
+              [agentName]: response.aggregations?.services.value || 0
+            };
+          });
+        },
+        Promise.resolve({} as Record<AgentName, number>)
+      );
+
+      return {
+        has_any_services: sum(Object.values(servicesPerAgent)) > 0,
+        services_per_agent: servicesPerAgent
+      };
+    }
+  },
+  {
+    name: 'versions',
+    executor: async ({ search, indices }) => {
+      const response = await search({
+        index: [
+          indices['apm_oss.transactionIndices'],
+          indices['apm_oss.spanIndices'],
+          indices['apm_oss.errorIndices']
+        ],
+        terminateAfter: 1,
+        body: {
+          query: {
+            exists: {
+              field: 'observer.version'
+            }
+          },
+          size: 1,
+          sort: {
+            '@timestamp': 'desc'
+          }
+        }
+      });
+
+      const hit = response.hits.hits[0]?._source as Pick<
+        Transaction | Span | APMError,
+        'observer'
+      >;
+
+      if (!hit || !hit.observer?.version) {
+        return {};
+      }
+
+      const [major, minor, patch] = hit.observer.version
+        .split('.')
+        .map(part => Number(part));
+
+      return {
+        versions: {
+          apm_server: {
+            major,
+            minor,
+            patch
+          }
+        }
+      };
+    }
+  },
+  {
+    name: 'groupings',
+    executor: async ({ search, indices }) => {
+      const range1d = { range: { '@timestamp': { gte: 'now-1d' } } };
+      const errorGroupsCount = (
+        await search({
+          index: indices['apm_oss.errorIndices'],
+          body: {
+            size: 0,
+            query: {
+              bool: {
+                filter: [{ term: { [PROCESSOR_EVENT]: 'error' } }, range1d]
+              }
+            },
+            aggs: {
+              top_service: {
+                terms: {
+                  field: SERVICE_NAME,
+                  order: {
+                    error_groups: 'desc'
+                  },
+                  size: 1
+                },
+                aggs: {
+                  error_groups: {
+                    cardinality: {
+                      field: ERROR_GROUP_ID
+                    }
+                  }
+                }
+              }
+            }
+          }
+        })
+      ).aggregations?.top_service.buckets[0]?.error_groups.value;
+
+      const transactionGroupsCount = (
+        await search({
+          index: indices['apm_oss.transactionIndices'],
+          body: {
+            size: 0,
+            query: {
+              bool: {
+                filter: [
+                  { term: { [PROCESSOR_EVENT]: 'transaction' } },
+                  range1d
+                ]
+              }
+            },
+            aggs: {
+              top_service: {
+                terms: {
+                  field: SERVICE_NAME,
+                  order: {
+                    transaction_groups: 'desc'
+                  },
+                  size: 1
+                },
+                aggs: {
+                  transaction_groups: {
+                    cardinality: {
+                      field: TRANSACTION_NAME
+                    }
+                  }
+                }
+              }
+            }
+          }
+        })
+      ).aggregations?.top_service.buckets[0]?.transaction_groups.value;
+
+      const tracesPerDayCount = (
+        await search({
+          index: indices['apm_oss.transactionIndices'],
+          body: {
+            query: {
+              bool: {
+                filter: [
+                  { term: { [PROCESSOR_EVENT]: 'transaction' } },
+                  range1d
+                ],
+                must_not: {
+                  exists: { field: PARENT_ID }
+                }
+              }
+            },
+            track_total_hits: true,
+            size: 0
+          }
+        })
+      ).hits.total.value;
+
+      const servicesCount = (
+        await search({
+          index: [
+            indices['apm_oss.transactionIndices'],
+            indices['apm_oss.errorIndices'],
+            indices['apm_oss.metricsIndices']
+          ],
+          body: {
+            size: 0,
+            query: {
+              bool: {
+                filter: [range1d]
+              }
+            },
+            aggs: {
+              service_name: {
+                cardinality: {
+                  field: SERVICE_NAME
+                }
+              }
+            }
+          }
+        })
+      ).aggregations?.service_name.value;
+
+      return {
+        counts: {
+          max_error_groups_per_service: {
+            '1d': errorGroupsCount || 0
+          },
+          max_transaction_groups_per_service: {
+            '1d': transactionGroupsCount || 0
+          },
+          traces: {
+            '1d': tracesPerDayCount || 0
+          },
+          services: {
+            '1d': servicesCount || 0
+          }
+        }
+      };
+    }
+  },
+  {
+    name: 'integrations',
+    executor: async ({ transportRequest }) => {
+      const apmJobs = ['*-high_mean_response_time'];
+
+      const response = (await transportRequest({
+        method: 'get',
+        path: `/_ml/anomaly_detectors/${apmJobs.join(',')}`
+      })) as { data?: { count: number } };
+
+      return {
+        integrations: {
+          ml: {
+            all_jobs_count: response.data?.count ?? 0
+          }
+        }
+      };
+    }
+  },
+  {
+    name: 'agents',
+    executor: async ({ search, indices }) => {
+      const size = 3;
+
+      const agentData = await AGENT_NAMES.reduce(async (prevJob, agentName) => {
+        const data = await prevJob;
+
+        const response = await search({
+          index: [
+            indices['apm_oss.errorIndices'],
+            indices['apm_oss.metricsIndices'],
+            indices['apm_oss.transactionIndices']
+          ],
+          body: {
+            size: 0,
+            query: {
+              bool: {
+                filter: [
+                  { term: { [AGENT_NAME]: agentName } },
+                  { range: { '@timestamp': { gte: 'now-1d' } } }
+                ]
+              }
+            },
+            sort: {
+              '@timestamp': 'desc'
+            },
+            aggs: {
+              [AGENT_VERSION]: {
+                terms: {
+                  field: AGENT_VERSION,
+                  size
+                }
+              },
+              [SERVICE_FRAMEWORK_NAME]: {
+                terms: {
+                  field: SERVICE_FRAMEWORK_NAME,
+                  size
+                },
+                aggs: {
+                  [SERVICE_FRAMEWORK_VERSION]: {
+                    terms: {
+                      field: SERVICE_FRAMEWORK_VERSION,
+                      size
+                    }
+                  }
+                }
+              },
+              [SERVICE_FRAMEWORK_VERSION]: {
+                terms: {
+                  field: SERVICE_FRAMEWORK_VERSION,
+                  size
+                }
+              },
+              [SERVICE_LANGUAGE_NAME]: {
+                terms: {
+                  field: SERVICE_LANGUAGE_NAME,
+                  size
+                },
+                aggs: {
+                  [SERVICE_LANGUAGE_VERSION]: {
+                    terms: {
+                      field: SERVICE_LANGUAGE_VERSION,
+                      size
+                    }
+                  }
+                }
+              },
+              [SERVICE_LANGUAGE_VERSION]: {
+                terms: {
+                  field: SERVICE_LANGUAGE_VERSION,
+                  size
+                }
+              },
+              [SERVICE_RUNTIME_NAME]: {
+                terms: {
+                  field: SERVICE_RUNTIME_NAME,
+                  size
+                },
+                aggs: {
+                  [SERVICE_RUNTIME_VERSION]: {
+                    terms: {
+                      field: SERVICE_RUNTIME_VERSION,
+                      size
+                    }
+                  }
+                }
+              },
+              [SERVICE_RUNTIME_VERSION]: {
+                terms: {
+                  field: SERVICE_RUNTIME_VERSION,
+                  size
+                }
+              }
+            }
+          }
+        });
+
+        const { aggregations } = response;
+
+        if (!aggregations) {
+          return data;
+        }
+
+        const toComposite = (
+          outerKey: string | number,
+          innerKey: string | number
+        ) => `${outerKey}/${innerKey}`;
+
+        return {
+          ...data,
+          [agentName]: {
+            agent: {
+              version: aggregations[AGENT_VERSION].buckets.map(
+                bucket => bucket.key as string
+              )
+            },
+            service: {
+              framework: {
+                name: aggregations[SERVICE_FRAMEWORK_NAME].buckets
+                  .map(bucket => bucket.key as string)
+                  .slice(0, size),
+                version: aggregations[SERVICE_FRAMEWORK_VERSION].buckets
+                  .map(bucket => bucket.key as string)
+                  .slice(0, size),
+                composite: sortBy(
+                  flatten(
+                    aggregations[SERVICE_FRAMEWORK_NAME].buckets.map(bucket =>
+                      bucket[SERVICE_FRAMEWORK_VERSION].buckets.map(
+                        versionBucket => ({
+                          doc_count: versionBucket.doc_count,
+                          name: toComposite(bucket.key, versionBucket.key)
+                        })
+                      )
+                    )
+                  ),
+                  'doc_count'
+                )
+                  .reverse()
+                  .slice(0, size)
+                  .map(composite => composite.name)
+              },
+              language: {
+                name: aggregations[SERVICE_LANGUAGE_NAME].buckets
+                  .map(bucket => bucket.key as string)
+                  .slice(0, size),
+                version: aggregations[SERVICE_LANGUAGE_VERSION].buckets
+                  .map(bucket => bucket.key as string)
+                  .slice(0, size),
+                composite: sortBy(
+                  flatten(
+                    aggregations[SERVICE_LANGUAGE_NAME].buckets.map(bucket =>
+                      bucket[SERVICE_LANGUAGE_VERSION].buckets.map(
+                        versionBucket => ({
+                          doc_count: versionBucket.doc_count,
+                          name: toComposite(bucket.key, versionBucket.key)
+                        })
+                      )
+                    )
+                  ),
+                  'doc_count'
+                )
+                  .reverse()
+                  .slice(0, size)
+                  .map(composite => composite.name)
+              },
+              runtime: {
+                name: aggregations[SERVICE_RUNTIME_NAME].buckets
+                  .map(bucket => bucket.key as string)
+                  .slice(0, size),
+                version: aggregations[SERVICE_RUNTIME_VERSION].buckets
+                  .map(bucket => bucket.key as string)
+                  .slice(0, size),
+                composite: sortBy(
+                  flatten(
+                    aggregations[SERVICE_RUNTIME_NAME].buckets.map(bucket =>
+                      bucket[SERVICE_RUNTIME_VERSION].buckets.map(
+                        versionBucket => ({
+                          doc_count: versionBucket.doc_count,
+                          name: toComposite(bucket.key, versionBucket.key)
+                        })
+                      )
+                    )
+                  ),
+                  'doc_count'
+                )
+                  .reverse()
+                  .slice(0, size)
+                  .map(composite => composite.name)
+              }
+            }
+          }
+        };
+      }, Promise.resolve({} as APMTelemetry['agents']));
+
+      return {
+        agents: agentData
+      };
+    }
+  },
+  {
+    name: 'indices_stats',
+    executor: async ({ indicesStats, indices }) => {
+      const response = await indicesStats({
+        index: [
+          indices.apmAgentConfigurationIndex,
+          indices['apm_oss.errorIndices'],
+          indices['apm_oss.metricsIndices'],
+          indices['apm_oss.onboardingIndices'],
+          indices['apm_oss.sourcemapIndices'],
+          indices['apm_oss.spanIndices'],
+          indices['apm_oss.transactionIndices']
+        ]
+      });
+
+      return {
+        indices: {
+          shards: {
+            total: response._shards.total
+          },
+          all: {
+            total: {
+              docs: {
+                count: response._all.total.docs.count
+              },
+              store: {
+                size_in_bytes: response._all.total.store.size_in_bytes
+              }
+            }
+          }
+        }
+      };
+    }
+  },
+  {
+    name: 'cardinality',
+    executor: async ({ search }) => {
+      const allAgentsCardinalityResponse = await search({
+        body: {
+          size: 0,
+          query: {
+            bool: {
+              filter: [{ range: { '@timestamp': { gte: 'now-1d' } } }]
+            }
+          },
+          aggs: {
+            [TRANSACTION_NAME]: {
+              cardinality: {
+                field: TRANSACTION_NAME
+              }
+            },
+            [USER_AGENT_ORIGINAL]: {
+              cardinality: {
+                field: USER_AGENT_ORIGINAL
+              }
+            }
+          }
+        }
+      });
+
+      const rumAgentCardinalityResponse = await search({
+        body: {
+          size: 0,
+          query: {
+            bool: {
+              filter: [
+                { range: { '@timestamp': { gte: 'now-1d' } } },
+                { terms: { [AGENT_NAME]: ['rum-js', 'js-base'] } }
+              ]
+            }
+          },
+          aggs: {
+            [TRANSACTION_NAME]: {
+              cardinality: {
+                field: TRANSACTION_NAME
+              }
+            },
+            [USER_AGENT_ORIGINAL]: {
+              cardinality: {
+                field: USER_AGENT_ORIGINAL
+              }
+            }
+          }
+        }
+      });
+
+      return {
+        cardinality: {
+          transaction: {
+            name: {
+              all_agents: {
+                '1d':
+                  allAgentsCardinalityResponse.aggregations?.[TRANSACTION_NAME]
+                    .value
+              },
+              rum: {
+                '1d':
+                  rumAgentCardinalityResponse.aggregations?.[TRANSACTION_NAME]
+                    .value
+              }
+            }
+          },
+          user_agent: {
+            original: {
+              all_agents: {
+                '1d':
+                  allAgentsCardinalityResponse.aggregations?.[
+                    USER_AGENT_ORIGINAL
+                  ].value
+              },
+              rum: {
+                '1d':
+                  rumAgentCardinalityResponse.aggregations?.[
+                    USER_AGENT_ORIGINAL
+                  ].value
+              }
+            }
+          }
+        }
+      };
+    }
+  }
+];
diff --git a/x-pack/plugins/apm/server/lib/apm_telemetry/index.ts b/x-pack/plugins/apm/server/lib/apm_telemetry/index.ts
index a2b0494730826..c80057a2894dc 100644
--- a/x-pack/plugins/apm/server/lib/apm_telemetry/index.ts
+++ b/x-pack/plugins/apm/server/lib/apm_telemetry/index.ts
@@ -3,60 +3,127 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-
-import { countBy } from 'lodash';
-import { SavedObjectAttributes } from '../../../../../../src/core/server';
-import { isAgentName } from '../../../common/agent_name';
+import { CoreSetup, Logger } from 'src/core/server';
+import { Observable } from 'rxjs';
+import { take } from 'rxjs/operators';
+import { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
+import {
+  TaskManagerStartContract,
+  TaskManagerSetupContract
+} from '../../../../task_manager/server';
+import { getApmIndices } from '../settings/apm_indices/get_apm_indices';
 import {
-  APM_SERVICES_TELEMETRY_SAVED_OBJECT_TYPE,
-  APM_SERVICES_TELEMETRY_SAVED_OBJECT_ID
+  APM_TELEMETRY_SAVED_OBJECT_ID,
+  APM_TELEMETRY_SAVED_OBJECT_TYPE
 } from '../../../common/apm_saved_object_constants';
-import { UsageCollectionSetup } from '../../../../../../src/plugins/usage_collection/server';
-import { InternalSavedObjectsClient } from '../helpers/get_internal_saved_objects_client';
-
-export function createApmTelementry(
-  agentNames: string[] = []
-): SavedObjectAttributes {
-  const validAgentNames = agentNames.filter(isAgentName);
-  return {
-    has_any_services: validAgentNames.length > 0,
-    services_per_agent: countBy(validAgentNames)
+import {
+  collectDataTelemetry,
+  CollectTelemetryParams
+} from './collect_data_telemetry';
+import { APMConfig } from '../..';
+import { getInternalSavedObjectsClient } from '../helpers/get_internal_saved_objects_client';
+
+const APM_TELEMETRY_TASK_NAME = 'apm-telemetry-task';
+
+export async function createApmTelemetry({
+  core,
+  config$,
+  usageCollector,
+  taskManager,
+  logger
+}: {
+  core: CoreSetup;
+  config$: Observable<APMConfig>;
+  usageCollector: UsageCollectionSetup;
+  taskManager: TaskManagerSetupContract;
+  logger: Logger;
+}) {
+  const savedObjectsClient = await getInternalSavedObjectsClient(core);
+
+  const collectAndStore = async () => {
+    const config = await config$.pipe(take(1)).toPromise();
+    const esClient = core.elasticsearch.dataClient;
+
+    const indices = await getApmIndices({
+      config,
+      savedObjectsClient
+    });
+
+    const search = esClient.callAsInternalUser.bind(
+      esClient,
+      'search'
+    ) as CollectTelemetryParams['search'];
+
+    const indicesStats = esClient.callAsInternalUser.bind(
+      esClient,
+      'indices.stats'
+    ) as CollectTelemetryParams['indicesStats'];
+
+    const transportRequest = esClient.callAsInternalUser.bind(
+      esClient,
+      'transport.request'
+    ) as CollectTelemetryParams['transportRequest'];
+
+    const dataTelemetry = await collectDataTelemetry({
+      search,
+      indices,
+      logger,
+      indicesStats,
+      transportRequest
+    });
+
+    await savedObjectsClient.create(
+      APM_TELEMETRY_SAVED_OBJECT_TYPE,
+      dataTelemetry,
+      { id: APM_TELEMETRY_SAVED_OBJECT_TYPE, overwrite: true }
+    );
   };
-}
 
-export async function storeApmServicesTelemetry(
-  savedObjectsClient: InternalSavedObjectsClient,
-  apmTelemetry: SavedObjectAttributes
-) {
-  return savedObjectsClient.create(
-    APM_SERVICES_TELEMETRY_SAVED_OBJECT_TYPE,
-    apmTelemetry,
-    {
-      id: APM_SERVICES_TELEMETRY_SAVED_OBJECT_ID,
-      overwrite: true
+  taskManager.registerTaskDefinitions({
+    [APM_TELEMETRY_TASK_NAME]: {
+      title: 'Collect APM telemetry',
+      type: APM_TELEMETRY_TASK_NAME,
+      createTaskRunner: () => {
+        return {
+          run: async () => {
+            await collectAndStore();
+          }
+        };
+      }
     }
-  );
-}
+  });
 
-export function makeApmUsageCollector(
-  usageCollector: UsageCollectionSetup,
-  savedObjectsRepository: InternalSavedObjectsClient
-) {
-  const apmUsageCollector = usageCollector.makeUsageCollector({
+  const collector = usageCollector.makeUsageCollector({
     type: 'apm',
     fetch: async () => {
-      try {
-        const apmTelemetrySavedObject = await savedObjectsRepository.get(
-          APM_SERVICES_TELEMETRY_SAVED_OBJECT_TYPE,
-          APM_SERVICES_TELEMETRY_SAVED_OBJECT_ID
-        );
-        return apmTelemetrySavedObject.attributes;
-      } catch (err) {
-        return createApmTelementry();
-      }
+      const data = (
+        await savedObjectsClient.get(
+          APM_TELEMETRY_SAVED_OBJECT_TYPE,
+          APM_TELEMETRY_SAVED_OBJECT_ID
+        )
+      ).attributes;
+
+      return data;
     },
     isReady: () => true
   });
 
-  usageCollector.registerCollector(apmUsageCollector);
+  usageCollector.registerCollector(collector);
+
+  core.getStartServices().then(([coreStart, pluginsStart]) => {
+    const { taskManager: taskManagerStart } = pluginsStart as {
+      taskManager: TaskManagerStartContract;
+    };
+
+    taskManagerStart.ensureScheduled({
+      id: APM_TELEMETRY_TASK_NAME,
+      taskType: APM_TELEMETRY_TASK_NAME,
+      schedule: {
+        interval: '720m'
+      },
+      scope: ['apm'],
+      params: {},
+      state: {}
+    });
+  });
 }
diff --git a/x-pack/plugins/apm/server/lib/apm_telemetry/types.ts b/x-pack/plugins/apm/server/lib/apm_telemetry/types.ts
new file mode 100644
index 0000000000000..f68dc517a2227
--- /dev/null
+++ b/x-pack/plugins/apm/server/lib/apm_telemetry/types.ts
@@ -0,0 +1,118 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { DeepPartial } from 'utility-types';
+import { AgentName } from '../../../typings/es_schemas/ui/fields/agent';
+
+export interface TimeframeMap {
+  '1d': number;
+  all: number;
+}
+
+export type TimeframeMap1d = Pick<TimeframeMap, '1d'>;
+export type TimeframeMapAll = Pick<TimeframeMap, 'all'>;
+
+export type APMDataTelemetry = DeepPartial<{
+  has_any_services: boolean;
+  services_per_agent: Record<AgentName, number>;
+  versions: {
+    apm_server: {
+      minor: number;
+      major: number;
+      patch: number;
+    };
+  };
+  counts: {
+    transaction: TimeframeMap;
+    span: TimeframeMap;
+    error: TimeframeMap;
+    metric: TimeframeMap;
+    sourcemap: TimeframeMap;
+    onboarding: TimeframeMap;
+    agent_configuration: TimeframeMapAll;
+    max_transaction_groups_per_service: TimeframeMap;
+    max_error_groups_per_service: TimeframeMap;
+    traces: TimeframeMap;
+    services: TimeframeMap;
+  };
+  cardinality: {
+    user_agent: {
+      original: {
+        all_agents: TimeframeMap1d;
+        rum: TimeframeMap1d;
+      };
+    };
+    transaction: {
+      name: {
+        all_agents: TimeframeMap1d;
+        rum: TimeframeMap1d;
+      };
+    };
+  };
+  retainment: Record<
+    'span' | 'transaction' | 'error' | 'metric' | 'sourcemap' | 'onboarding',
+    { ms: number }
+  >;
+  integrations: {
+    ml: {
+      all_jobs_count: number;
+    };
+  };
+  agents: Record<
+    AgentName,
+    {
+      agent: {
+        version: string[];
+      };
+      service: {
+        framework: {
+          name: string[];
+          version: string[];
+          composite: string[];
+        };
+        language: {
+          name: string[];
+          version: string[];
+          composite: string[];
+        };
+        runtime: {
+          name: string[];
+          version: string[];
+          composite: string[];
+        };
+      };
+    }
+  >;
+  indices: {
+    shards: {
+      total: number;
+    };
+    all: {
+      total: {
+        docs: {
+          count: number;
+        };
+        store: {
+          size_in_bytes: number;
+        };
+      };
+    };
+  };
+  tasks: Record<
+    | 'processor_events'
+    | 'agent_configuration'
+    | 'services'
+    | 'versions'
+    | 'groupings'
+    | 'integrations'
+    | 'agents'
+    | 'indices_stats'
+    | 'cardinality',
+    { took: { ms: number } }
+  >;
+}>;
+
+export type APMTelemetry = APMDataTelemetry;
diff --git a/x-pack/plugins/apm/server/lib/helpers/setup_request.test.ts b/x-pack/plugins/apm/server/lib/helpers/setup_request.test.ts
index 40a2a0e7216a0..8e8cf698a84cf 100644
--- a/x-pack/plugins/apm/server/lib/helpers/setup_request.test.ts
+++ b/x-pack/plugins/apm/server/lib/helpers/setup_request.test.ts
@@ -39,6 +39,19 @@ function getMockRequest() {
         _debug: false
       }
     },
+    __LEGACY: {
+      server: {
+        plugins: {
+          elasticsearch: {
+            getCluster: jest.fn().mockReturnValue({ callWithInternalUser: {} })
+          }
+        },
+        savedObjects: {
+          SavedObjectsClient: jest.fn(),
+          getSavedObjectsRepository: jest.fn()
+        }
+      }
+    },
     core: {
       elasticsearch: {
         dataClient: {
diff --git a/x-pack/plugins/apm/server/plugin.ts b/x-pack/plugins/apm/server/plugin.ts
index e140340786e8a..e18b6d33ca419 100644
--- a/x-pack/plugins/apm/server/plugin.ts
+++ b/x-pack/plugins/apm/server/plugin.ts
@@ -13,7 +13,6 @@ import { TaskManagerSetupContract } from '../../task_manager/server';
 import { AlertingPlugin } from '../../alerting/server';
 import { ActionsPlugin } from '../../actions/server';
 import { APMOSSPluginSetup } from '../../../../src/plugins/apm_oss/server';
-import { makeApmUsageCollector } from './lib/apm_telemetry';
 import { createApmAgentConfigurationIndex } from './lib/settings/agent_configuration/create_agent_config_index';
 import { createApmCustomLinkIndex } from './lib/settings/custom_link/create_custom_link_index';
 import { createApmApi } from './routes/create_apm_api';
@@ -25,6 +24,7 @@ import { CloudSetup } from '../../cloud/server';
 import { getInternalSavedObjectsClient } from './lib/helpers/get_internal_saved_objects_client';
 import { LicensingPluginSetup } from '../../licensing/public';
 import { registerApmAlerts } from './lib/alerts/register_apm_alerts';
+import { createApmTelemetry } from './lib/apm_telemetry';
 
 export interface LegacySetup {
   server: Server;
@@ -56,7 +56,7 @@ export class APMPlugin implements Plugin<APMPluginContract> {
       actions?: ActionsPlugin['setup'];
     }
   ) {
-    const logger = this.initContext.logger.get('apm');
+    const logger = this.initContext.logger.get();
     const config$ = this.initContext.config.create<APMXPackConfig>();
     const mergedConfig$ = combineLatest(plugins.apm_oss.config$, config$).pipe(
       map(([apmOssConfig, apmConfig]) => mergeConfigs(apmOssConfig, apmConfig))
@@ -76,6 +76,20 @@ export class APMPlugin implements Plugin<APMPluginContract> {
 
     const currentConfig = await mergedConfig$.pipe(take(1)).toPromise();
 
+    if (
+      plugins.taskManager &&
+      plugins.usageCollection &&
+      currentConfig['xpack.apm.telemetryCollectionEnabled']
+    ) {
+      createApmTelemetry({
+        core,
+        config$: mergedConfig$,
+        usageCollector: plugins.usageCollection,
+        taskManager: plugins.taskManager,
+        logger
+      });
+    }
+
     // create agent configuration index without blocking setup lifecycle
     createApmAgentConfigurationIndex({
       esClient: core.elasticsearch.dataClient,
@@ -104,18 +118,6 @@ export class APMPlugin implements Plugin<APMPluginContract> {
       })
     );
 
-    const usageCollection = plugins.usageCollection;
-    if (usageCollection) {
-      getInternalSavedObjectsClient(core)
-        .then(savedObjectsClient => {
-          makeApmUsageCollector(usageCollection, savedObjectsClient);
-        })
-        .catch(error => {
-          logger.error('Unable to initialize use collection');
-          logger.error(error.message);
-        });
-    }
-
     return {
       config$: mergedConfig$,
       registerLegacyAPI: once((__LEGACY: LegacySetup) => {
@@ -130,6 +132,7 @@ export class APMPlugin implements Plugin<APMPluginContract> {
     };
   }
 
-  public start() {}
+  public async start() {}
+
   public stop() {}
 }
diff --git a/x-pack/plugins/apm/server/routes/create_api/index.test.ts b/x-pack/plugins/apm/server/routes/create_api/index.test.ts
index e639bb5101e2f..312dae1d1f9d2 100644
--- a/x-pack/plugins/apm/server/routes/create_api/index.test.ts
+++ b/x-pack/plugins/apm/server/routes/create_api/index.test.ts
@@ -36,6 +36,7 @@ const getCoreMock = () => {
     put,
     createRouter,
     context: {
+      measure: () => undefined,
       config$: new BehaviorSubject({} as APMConfig),
       logger: ({
         error: jest.fn()
diff --git a/x-pack/plugins/apm/server/routes/services.ts b/x-pack/plugins/apm/server/routes/services.ts
index 2d4fae9d2707a..1c6561ee24c93 100644
--- a/x-pack/plugins/apm/server/routes/services.ts
+++ b/x-pack/plugins/apm/server/routes/services.ts
@@ -5,11 +5,6 @@
  */
 
 import * as t from 'io-ts';
-import { AgentName } from '../../typings/es_schemas/ui/fields/agent';
-import {
-  createApmTelementry,
-  storeApmServicesTelemetry
-} from '../lib/apm_telemetry';
 import { setupRequest } from '../lib/helpers/setup_request';
 import { getServiceAgentName } from '../lib/services/get_service_agent_name';
 import { getServices } from '../lib/services/get_services';
@@ -18,7 +13,6 @@ import { getServiceNodeMetadata } from '../lib/services/get_service_node_metadat
 import { createRoute } from './create_route';
 import { uiFiltersRt, rangeRt } from './default_api_types';
 import { getServiceAnnotations } from '../lib/services/annotations';
-import { getInternalSavedObjectsClient } from '../lib/helpers/get_internal_saved_objects_client';
 
 export const servicesRoute = createRoute(core => ({
   path: '/api/apm/services',
@@ -29,16 +23,6 @@ export const servicesRoute = createRoute(core => ({
     const setup = await setupRequest(context, request);
     const services = await getServices(setup);
 
-    // Store telemetry data derived from services
-    const agentNames = services.items.map(
-      ({ agentName }) => agentName as AgentName
-    );
-    const apmTelemetry = createApmTelementry(agentNames);
-    const savedObjectsClient = await getInternalSavedObjectsClient(core);
-    storeApmServicesTelemetry(savedObjectsClient, apmTelemetry).catch(error => {
-      context.logger.error(error.message);
-    });
-
     return services;
   }
 }));
diff --git a/x-pack/plugins/apm/typings/elasticsearch/aggregations.ts b/x-pack/plugins/apm/typings/elasticsearch/aggregations.ts
index 6d3620f11a87b..8a8d256cf4273 100644
--- a/x-pack/plugins/apm/typings/elasticsearch/aggregations.ts
+++ b/x-pack/plugins/apm/typings/elasticsearch/aggregations.ts
@@ -126,6 +126,16 @@ export interface AggregationOptionsByType {
     combine_script: Script;
     reduce_script: Script;
   };
+  date_range: {
+    field: string;
+    format?: string;
+    ranges: Array<
+      | { from: string | number }
+      | { to: string | number }
+      | { from: string | number; to: string | number }
+    >;
+    keyed?: boolean;
+  };
 }
 
 type AggregationType = keyof AggregationOptionsByType;
@@ -136,6 +146,15 @@ type AggregationOptionsMap = Unionize<
   }
 > & { aggs?: AggregationInputMap };
 
+interface DateRangeBucket {
+  key: string;
+  to?: number;
+  from?: number;
+  to_as_string?: string;
+  from_as_string?: string;
+  doc_count: number;
+}
+
 export interface AggregationInputMap {
   [key: string]: AggregationOptionsMap;
 }
@@ -276,6 +295,11 @@ interface AggregationResponsePart<
   scripted_metric: {
     value: unknown;
   };
+  date_range: {
+    buckets: TAggregationOptionsMap extends { date_range: { keyed: true } }
+      ? Record<string, DateRangeBucket>
+      : { buckets: DateRangeBucket[] };
+  };
 }
 
 // Type for debugging purposes. If you see an error in AggregationResponseMap
@@ -285,7 +309,7 @@ interface AggregationResponsePart<
 
 // type MissingAggregationResponseTypes = Exclude<
 //   AggregationType,
-//   keyof AggregationResponsePart<{}>
+//   keyof AggregationResponsePart<{}, unknown>
 // >;
 
 export type AggregationResponseMap<
diff --git a/x-pack/plugins/apm/typings/es_schemas/raw/error_raw.ts b/x-pack/plugins/apm/typings/es_schemas/raw/error_raw.ts
index daf65e44980b6..8e49d02beb908 100644
--- a/x-pack/plugins/apm/typings/es_schemas/raw/error_raw.ts
+++ b/x-pack/plugins/apm/typings/es_schemas/raw/error_raw.ts
@@ -15,6 +15,7 @@ import { Service } from './fields/service';
 import { IStackframe } from './fields/stackframe';
 import { Url } from './fields/url';
 import { User } from './fields/user';
+import { Observer } from './fields/observer';
 
 interface Processor {
   name: 'error';
@@ -61,4 +62,5 @@ export interface ErrorRaw extends APMBaseDoc {
   service: Service;
   url?: Url;
   user?: User;
+  observer?: Observer;
 }
diff --git a/x-pack/plugins/apm/typings/es_schemas/raw/fields/observer.ts b/x-pack/plugins/apm/typings/es_schemas/raw/fields/observer.ts
new file mode 100644
index 0000000000000..42843130ec47f
--- /dev/null
+++ b/x-pack/plugins/apm/typings/es_schemas/raw/fields/observer.ts
@@ -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.
+ */
+
+export interface Observer {
+  version: string;
+  version_major: number;
+}
diff --git a/x-pack/plugins/apm/typings/es_schemas/raw/span_raw.ts b/x-pack/plugins/apm/typings/es_schemas/raw/span_raw.ts
index dbd9e7ede4256..4d5d2c5c4a12e 100644
--- a/x-pack/plugins/apm/typings/es_schemas/raw/span_raw.ts
+++ b/x-pack/plugins/apm/typings/es_schemas/raw/span_raw.ts
@@ -6,6 +6,7 @@
 
 import { APMBaseDoc } from './apm_base_doc';
 import { IStackframe } from './fields/stackframe';
+import { Observer } from './fields/observer';
 
 interface Processor {
   name: 'transaction';
@@ -50,4 +51,5 @@ export interface SpanRaw extends APMBaseDoc {
   transaction?: {
     id: string;
   };
+  observer?: Observer;
 }
diff --git a/x-pack/plugins/apm/typings/es_schemas/raw/transaction_raw.ts b/x-pack/plugins/apm/typings/es_schemas/raw/transaction_raw.ts
index 3673f1f13c403..b8ebb4cf8da51 100644
--- a/x-pack/plugins/apm/typings/es_schemas/raw/transaction_raw.ts
+++ b/x-pack/plugins/apm/typings/es_schemas/raw/transaction_raw.ts
@@ -15,6 +15,7 @@ import { Service } from './fields/service';
 import { Url } from './fields/url';
 import { User } from './fields/user';
 import { UserAgent } from './fields/user_agent';
+import { Observer } from './fields/observer';
 
 interface Processor {
   name: 'transaction';
@@ -61,4 +62,5 @@ export interface TransactionRaw extends APMBaseDoc {
   url?: Url;
   user?: User;
   user_agent?: UserAgent;
+  observer?: Observer;
 }

From 2106b69219c0f36daa330a4ebaecb8a4c3ca482b Mon Sep 17 00:00:00 2001
From: patrykkopycinski <patryk.kopycinski@elastic.co>
Date: Tue, 24 Mar 2020 14:26:24 +0100
Subject: [PATCH 074/179] [SIEM][Detection Engine] Add rule's notification
 alert type (#60832)

---
 .../legacy/plugins/siem/common/constants.ts   |   8 +
 .../transform_actions.test.ts                 |   0
 .../detection_engine}/transform_actions.ts    |   4 +-
 .../siem/common/detection_engine/types.ts     |  11 ++
 .../notifications/add_tags.test.ts            |  26 +++
 .../notifications/add_tags.ts                 |  10 ++
 .../notifications/build_signals_query.test.ts |  53 ++++++
 .../notifications/build_signals_query.ts      |  42 +++++
 .../create_notifications.test.ts              |  73 +++++++++
 .../notifications/create_notifications.ts     |  36 ++++
 .../delete_notifications.test.ts              | 141 ++++++++++++++++
 .../notifications/delete_notifications.ts     |  37 +++++
 .../notifications/find_notifications.test.ts  |  20 +++
 .../notifications/find_notifications.ts       |  37 +++++
 .../notifications/get_signals_count.ts        |  66 ++++++++
 .../notifications/read_notifications.test.ts  | 154 ++++++++++++++++++
 .../notifications/read_notifications.ts       |  48 ++++++
 .../rules_notification_alert_type.test.ts     | 142 ++++++++++++++++
 .../rules_notification_alert_type.ts          |  64 ++++++++
 .../schedule_notification_actions.ts          |  34 ++++
 .../notifications/types.test.ts               |  26 +++
 .../detection_engine/notifications/types.ts   | 107 ++++++++++++
 .../update_notifications.test.ts              | 137 ++++++++++++++++
 .../notifications/update_notifications.ts     |  64 ++++++++
 .../notifications/utils.test.ts               |  21 +++
 .../detection_engine/notifications/utils.ts   |  18 ++
 .../routes/__mocks__/request_responses.ts     |  68 +++++++-
 .../routes/rules/create_rules_route.test.ts   |  15 ++
 .../routes/rules/create_rules_route.ts        |  13 ++
 .../routes/rules/delete_rules_bulk_route.ts   |   2 +
 .../routes/rules/delete_rules_route.ts        |   2 +
 .../routes/rules/update_rules_route.ts        |  11 ++
 .../detection_engine/routes/rules/utils.ts    |   2 +-
 .../add_prepackaged_rules_schema.test.ts      |   3 +-
 .../schemas/create_rules_schema.test.ts       |   3 +-
 .../schemas/import_rules_schema.test.ts       |   3 +-
 .../routes/schemas/patch_rules_schema.test.ts |   3 +-
 .../schemas/update_rules_schema.test.ts       |   3 +-
 .../detection_engine/rules/create_rules.ts    |   4 +-
 .../rules/delete_rules.test.ts                | 150 +++++++++++++++++
 .../rules/patch_rules.test.ts                 |  55 ++++++-
 .../lib/detection_engine/rules/patch_rules.ts |   2 +-
 .../detection_engine/rules/read_rules.test.ts |   2 +-
 .../rules/update_rules.test.ts                |  55 ++++++-
 .../detection_engine/rules/update_rules.ts    |   2 +-
 .../signals/build_bulk_body.ts                |   3 +-
 .../detection_engine/signals/build_rule.ts    |   3 +-
 .../signals/bulk_create_ml_signals.ts         |   3 +-
 .../signals/get_filter.test.ts                |  14 ++
 .../signals/search_after_bulk_create.ts       |   3 +-
 .../signals/signal_rule_alert_type.ts         |  47 +++++-
 .../signals/single_bulk_create.ts             |   3 +-
 .../lib/detection_engine/signals/types.ts     |   7 +-
 .../siem/server/lib/detection_engine/types.ts |   9 +-
 x-pack/legacy/plugins/siem/server/plugin.ts   |  16 +-
 55 files changed, 1850 insertions(+), 35 deletions(-)
 rename x-pack/legacy/plugins/siem/{server/lib/detection_engine/rules => common/detection_engine}/transform_actions.test.ts (100%)
 rename x-pack/legacy/plugins/siem/{server/lib/detection_engine/rules => common/detection_engine}/transform_actions.ts (83%)
 create mode 100644 x-pack/legacy/plugins/siem/common/detection_engine/types.ts
 create mode 100644 x-pack/legacy/plugins/siem/server/lib/detection_engine/notifications/add_tags.test.ts
 create mode 100644 x-pack/legacy/plugins/siem/server/lib/detection_engine/notifications/add_tags.ts
 create mode 100644 x-pack/legacy/plugins/siem/server/lib/detection_engine/notifications/build_signals_query.test.ts
 create mode 100644 x-pack/legacy/plugins/siem/server/lib/detection_engine/notifications/build_signals_query.ts
 create mode 100644 x-pack/legacy/plugins/siem/server/lib/detection_engine/notifications/create_notifications.test.ts
 create mode 100644 x-pack/legacy/plugins/siem/server/lib/detection_engine/notifications/create_notifications.ts
 create mode 100644 x-pack/legacy/plugins/siem/server/lib/detection_engine/notifications/delete_notifications.test.ts
 create mode 100644 x-pack/legacy/plugins/siem/server/lib/detection_engine/notifications/delete_notifications.ts
 create mode 100644 x-pack/legacy/plugins/siem/server/lib/detection_engine/notifications/find_notifications.test.ts
 create mode 100644 x-pack/legacy/plugins/siem/server/lib/detection_engine/notifications/find_notifications.ts
 create mode 100644 x-pack/legacy/plugins/siem/server/lib/detection_engine/notifications/get_signals_count.ts
 create mode 100644 x-pack/legacy/plugins/siem/server/lib/detection_engine/notifications/read_notifications.test.ts
 create mode 100644 x-pack/legacy/plugins/siem/server/lib/detection_engine/notifications/read_notifications.ts
 create mode 100644 x-pack/legacy/plugins/siem/server/lib/detection_engine/notifications/rules_notification_alert_type.test.ts
 create mode 100644 x-pack/legacy/plugins/siem/server/lib/detection_engine/notifications/rules_notification_alert_type.ts
 create mode 100644 x-pack/legacy/plugins/siem/server/lib/detection_engine/notifications/schedule_notification_actions.ts
 create mode 100644 x-pack/legacy/plugins/siem/server/lib/detection_engine/notifications/types.test.ts
 create mode 100644 x-pack/legacy/plugins/siem/server/lib/detection_engine/notifications/types.ts
 create mode 100644 x-pack/legacy/plugins/siem/server/lib/detection_engine/notifications/update_notifications.test.ts
 create mode 100644 x-pack/legacy/plugins/siem/server/lib/detection_engine/notifications/update_notifications.ts
 create mode 100644 x-pack/legacy/plugins/siem/server/lib/detection_engine/notifications/utils.test.ts
 create mode 100644 x-pack/legacy/plugins/siem/server/lib/detection_engine/notifications/utils.ts
 create mode 100644 x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/delete_rules.test.ts

diff --git a/x-pack/legacy/plugins/siem/common/constants.ts b/x-pack/legacy/plugins/siem/common/constants.ts
index c3fc4aea77863..ec720164e9bd7 100644
--- a/x-pack/legacy/plugins/siem/common/constants.ts
+++ b/x-pack/legacy/plugins/siem/common/constants.ts
@@ -52,12 +52,18 @@ export const IP_REPUTATION_LINKS_SETTING_DEFAULT = `[
  */
 export const SIGNALS_ID = `${APP_ID}.signals`;
 
+/**
+ * Id for the notifications alerting type
+ */
+export const NOTIFICATIONS_ID = `${APP_ID}.notifications`;
+
 /**
  * Special internal structure for tags for signals. This is used
  * to filter out tags that have internal structures within them.
  */
 export const INTERNAL_IDENTIFIER = '__internal';
 export const INTERNAL_RULE_ID_KEY = `${INTERNAL_IDENTIFIER}_rule_id`;
+export const INTERNAL_RULE_ALERT_ID_KEY = `${INTERNAL_IDENTIFIER}_rule_alert_id`;
 export const INTERNAL_IMMUTABLE_KEY = `${INTERNAL_IDENTIFIER}_immutable`;
 
 /**
@@ -87,3 +93,5 @@ export const DETECTION_ENGINE_QUERY_SIGNALS_URL = `${DETECTION_ENGINE_SIGNALS_UR
  * Common naming convention for an unauthenticated user
  */
 export const UNAUTHENTICATED_USER = 'Unauthenticated';
+
+export const NOTIFICATION_THROTTLE_RULE = 'rule';
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/transform_actions.test.ts b/x-pack/legacy/plugins/siem/common/detection_engine/transform_actions.test.ts
similarity index 100%
rename from x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/transform_actions.test.ts
rename to x-pack/legacy/plugins/siem/common/detection_engine/transform_actions.test.ts
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/transform_actions.ts b/x-pack/legacy/plugins/siem/common/detection_engine/transform_actions.ts
similarity index 83%
rename from x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/transform_actions.ts
rename to x-pack/legacy/plugins/siem/common/detection_engine/transform_actions.ts
index c1c17d2c70836..aeb4d53933022 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/transform_actions.ts
+++ b/x-pack/legacy/plugins/siem/common/detection_engine/transform_actions.ts
@@ -4,8 +4,8 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { AlertAction } from '../../../../../../../plugins/alerting/common';
-import { RuleAlertAction } from '../types';
+import { AlertAction } from '../../../../../plugins/alerting/common';
+import { RuleAlertAction } from './types';
 
 export const transformRuleToAlertAction = ({
   group,
diff --git a/x-pack/legacy/plugins/siem/common/detection_engine/types.ts b/x-pack/legacy/plugins/siem/common/detection_engine/types.ts
new file mode 100644
index 0000000000000..0de370b11cdaf
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/common/detection_engine/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 { AlertAction } from '../../../../../plugins/alerting/common';
+
+export type RuleAlertAction = Omit<AlertAction, 'actionTypeId'> & {
+  action_type_id: string;
+};
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/notifications/add_tags.test.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/notifications/add_tags.test.ts
new file mode 100644
index 0000000000000..e14d20e3bc56e
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/notifications/add_tags.test.ts
@@ -0,0 +1,26 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { addTags } from './add_tags';
+import { INTERNAL_RULE_ALERT_ID_KEY } from '../../../../common/constants';
+
+describe('add_tags', () => {
+  test('it should add a rule id as an internal structure', () => {
+    const tags = addTags([], 'rule-1');
+    expect(tags).toEqual([`${INTERNAL_RULE_ALERT_ID_KEY}:rule-1`]);
+  });
+
+  test('it should not allow duplicate tags to be created', () => {
+    const tags = addTags(['tag-1', 'tag-1'], 'rule-1');
+    expect(tags).toEqual(['tag-1', `${INTERNAL_RULE_ALERT_ID_KEY}:rule-1`]);
+  });
+
+  test('it should not allow duplicate internal tags to be created when called two times in a row', () => {
+    const tags1 = addTags(['tag-1'], 'rule-1');
+    const tags2 = addTags(tags1, 'rule-1');
+    expect(tags2).toEqual(['tag-1', `${INTERNAL_RULE_ALERT_ID_KEY}:rule-1`]);
+  });
+});
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/notifications/add_tags.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/notifications/add_tags.ts
new file mode 100644
index 0000000000000..6955e57d099be
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/notifications/add_tags.ts
@@ -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 { INTERNAL_RULE_ALERT_ID_KEY } from '../../../../common/constants';
+
+export const addTags = (tags: string[] = [], ruleAlertId: string): string[] =>
+  Array.from(new Set([...tags, `${INTERNAL_RULE_ALERT_ID_KEY}:${ruleAlertId}`]));
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/notifications/build_signals_query.test.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/notifications/build_signals_query.test.ts
new file mode 100644
index 0000000000000..f83a8d40d6ae1
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/notifications/build_signals_query.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 { buildSignalsSearchQuery } from './build_signals_query';
+
+describe('buildSignalsSearchQuery', () => {
+  it('returns proper query object', () => {
+    const index = 'index';
+    const ruleId = 'ruleId-12';
+    const from = '123123123';
+    const to = '1123123123';
+
+    expect(
+      buildSignalsSearchQuery({
+        index,
+        from,
+        to,
+        ruleId,
+      })
+    ).toEqual({
+      index,
+      body: {
+        query: {
+          bool: {
+            filter: [
+              {
+                bool: {
+                  should: {
+                    match: {
+                      'signal.rule.rule_id': ruleId,
+                    },
+                  },
+                  minimum_should_match: 1,
+                },
+              },
+              {
+                range: {
+                  '@timestamp': {
+                    gte: from,
+                    lte: to,
+                  },
+                },
+              },
+            ],
+          },
+        },
+      },
+    });
+  });
+});
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/notifications/build_signals_query.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/notifications/build_signals_query.ts
new file mode 100644
index 0000000000000..001650e5b2005
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/notifications/build_signals_query.ts
@@ -0,0 +1,42 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+interface BuildSignalsSearchQuery {
+  ruleId: string;
+  index: string;
+  from: string;
+  to: string;
+}
+
+export const buildSignalsSearchQuery = ({ ruleId, index, from, to }: BuildSignalsSearchQuery) => ({
+  index,
+  body: {
+    query: {
+      bool: {
+        filter: [
+          {
+            bool: {
+              should: {
+                match: {
+                  'signal.rule.rule_id': ruleId,
+                },
+              },
+              minimum_should_match: 1,
+            },
+          },
+          {
+            range: {
+              '@timestamp': {
+                gte: from,
+                lte: to,
+              },
+            },
+          },
+        ],
+      },
+    },
+  },
+});
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/notifications/create_notifications.test.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/notifications/create_notifications.test.ts
new file mode 100644
index 0000000000000..dea42b0c852f9
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/notifications/create_notifications.test.ts
@@ -0,0 +1,73 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { alertsClientMock } from '../../../../../../../plugins/alerting/server/mocks';
+import { createNotifications } from './create_notifications';
+
+describe('createNotifications', () => {
+  let alertsClient: ReturnType<typeof alertsClientMock.create>;
+
+  beforeEach(() => {
+    alertsClient = alertsClientMock.create();
+  });
+
+  it('calls the alertsClient with proper params', async () => {
+    const ruleAlertId = 'rule-04128c15-0d1b-4716-a4c5-46997ac7f3bd';
+
+    await createNotifications({
+      alertsClient,
+      actions: [],
+      ruleAlertId,
+      enabled: true,
+      interval: '',
+      name: '',
+      tags: [],
+    });
+
+    expect(alertsClient.create).toHaveBeenCalledWith(
+      expect.objectContaining({
+        data: expect.objectContaining({
+          params: expect.objectContaining({
+            ruleAlertId,
+          }),
+        }),
+      })
+    );
+  });
+
+  it('calls the alertsClient with transformed actions', async () => {
+    const action = {
+      group: 'default',
+      id: '99403909-ca9b-49ba-9d7a-7e5320e68d05',
+      params: { message: 'Rule generated {{state.signalsCount}} signals' },
+      action_type_id: '.slack',
+    };
+    await createNotifications({
+      alertsClient,
+      actions: [action],
+      ruleAlertId: 'new-rule-id',
+      enabled: true,
+      interval: '',
+      name: '',
+      tags: [],
+    });
+
+    expect(alertsClient.create).toHaveBeenCalledWith(
+      expect.objectContaining({
+        data: expect.objectContaining({
+          actions: expect.arrayContaining([
+            {
+              group: action.group,
+              id: action.id,
+              params: action.params,
+              actionTypeId: '.slack',
+            },
+          ]),
+        }),
+      })
+    );
+  });
+});
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/notifications/create_notifications.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/notifications/create_notifications.ts
new file mode 100644
index 0000000000000..3a1697f1c8afc
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/notifications/create_notifications.ts
@@ -0,0 +1,36 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { Alert } from '../../../../../../../plugins/alerting/common';
+import { APP_ID, NOTIFICATIONS_ID } from '../../../../common/constants';
+import { CreateNotificationParams } from './types';
+import { addTags } from './add_tags';
+import { transformRuleToAlertAction } from '../../../../common/detection_engine/transform_actions';
+
+export const createNotifications = async ({
+  alertsClient,
+  actions,
+  enabled,
+  ruleAlertId,
+  interval,
+  name,
+  tags,
+}: CreateNotificationParams): Promise<Alert> =>
+  alertsClient.create({
+    data: {
+      name,
+      tags: addTags(tags, ruleAlertId),
+      alertTypeId: NOTIFICATIONS_ID,
+      consumer: APP_ID,
+      params: {
+        ruleAlertId,
+      },
+      schedule: { interval },
+      enabled,
+      actions: actions?.map(transformRuleToAlertAction),
+      throttle: null,
+    },
+  });
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/notifications/delete_notifications.test.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/notifications/delete_notifications.test.ts
new file mode 100644
index 0000000000000..7e5c0eaf6286e
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/notifications/delete_notifications.test.ts
@@ -0,0 +1,141 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { alertsClientMock } from '../../../../../../../plugins/alerting/server/mocks';
+import { deleteNotifications } from './delete_notifications';
+import { readNotifications } from './read_notifications';
+jest.mock('./read_notifications');
+
+describe('deleteNotifications', () => {
+  let alertsClient: ReturnType<typeof alertsClientMock.create>;
+  const notificationId = 'notification-52128c15-0d1b-4716-a4c5-46997ac7f3bd';
+  const ruleAlertId = 'rule-04128c15-0d1b-4716-a4c5-46997ac7f3bd';
+
+  beforeEach(() => {
+    alertsClient = alertsClientMock.create();
+  });
+
+  it('should return null if notification was not found', async () => {
+    (readNotifications as jest.Mock).mockResolvedValue(null);
+
+    const result = await deleteNotifications({
+      alertsClient,
+      id: notificationId,
+      ruleAlertId,
+    });
+
+    expect(result).toBe(null);
+  });
+
+  it('should call alertsClient.delete if notification was found', async () => {
+    (readNotifications as jest.Mock).mockResolvedValue({
+      id: notificationId,
+    });
+
+    const result = await deleteNotifications({
+      alertsClient,
+      id: notificationId,
+      ruleAlertId,
+    });
+
+    expect(alertsClient.delete).toHaveBeenCalledWith(
+      expect.objectContaining({
+        id: notificationId,
+      })
+    );
+    expect(result).toEqual({ id: notificationId });
+  });
+
+  it('should call alertsClient.delete if notification.id was null', async () => {
+    (readNotifications as jest.Mock).mockResolvedValue({
+      id: null,
+    });
+
+    const result = await deleteNotifications({
+      alertsClient,
+      id: notificationId,
+      ruleAlertId,
+    });
+
+    expect(alertsClient.delete).toHaveBeenCalledWith(
+      expect.objectContaining({
+        id: notificationId,
+      })
+    );
+    expect(result).toEqual({ id: null });
+  });
+
+  it('should return null if alertsClient.delete rejects with 404 if notification.id was null', async () => {
+    (readNotifications as jest.Mock).mockResolvedValue({
+      id: null,
+    });
+
+    alertsClient.delete.mockRejectedValue({
+      output: {
+        statusCode: 404,
+      },
+    });
+
+    const result = await deleteNotifications({
+      alertsClient,
+      id: notificationId,
+      ruleAlertId,
+    });
+
+    expect(alertsClient.delete).toHaveBeenCalledWith(
+      expect.objectContaining({
+        id: notificationId,
+      })
+    );
+    expect(result).toEqual(null);
+  });
+
+  it('should return error object if alertsClient.delete rejects with status different than 404 and if notification.id was null', async () => {
+    (readNotifications as jest.Mock).mockResolvedValue({
+      id: null,
+    });
+
+    const errorObject = {
+      output: {
+        statusCode: 500,
+      },
+    };
+
+    alertsClient.delete.mockRejectedValue(errorObject);
+
+    let errorResult;
+    try {
+      await deleteNotifications({
+        alertsClient,
+        id: notificationId,
+        ruleAlertId,
+      });
+    } catch (error) {
+      errorResult = error;
+    }
+
+    expect(alertsClient.delete).toHaveBeenCalledWith(
+      expect.objectContaining({
+        id: notificationId,
+      })
+    );
+    expect(errorResult).toEqual(errorObject);
+  });
+
+  it('should return null if notification.id and id were null', async () => {
+    (readNotifications as jest.Mock).mockResolvedValue({
+      id: null,
+    });
+
+    const result = await deleteNotifications({
+      alertsClient,
+      id: undefined,
+      ruleAlertId,
+    });
+
+    expect(result).toEqual(null);
+  });
+});
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/notifications/delete_notifications.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/notifications/delete_notifications.ts
new file mode 100644
index 0000000000000..7e244f96f1649
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/notifications/delete_notifications.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 { readNotifications } from './read_notifications';
+import { DeleteNotificationParams } from './types';
+
+export const deleteNotifications = async ({
+  alertsClient,
+  id,
+  ruleAlertId,
+}: DeleteNotificationParams) => {
+  const notification = await readNotifications({ alertsClient, id, ruleAlertId });
+  if (notification == null) {
+    return null;
+  }
+
+  if (notification.id != null) {
+    await alertsClient.delete({ id: notification.id });
+    return notification;
+  } else if (id != null) {
+    try {
+      await alertsClient.delete({ id });
+      return notification;
+    } catch (err) {
+      if (err.output.statusCode === 404) {
+        return null;
+      } else {
+        throw err;
+      }
+    }
+  } else {
+    return null;
+  }
+};
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/notifications/find_notifications.test.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/notifications/find_notifications.test.ts
new file mode 100644
index 0000000000000..0e9e4a8370ec8
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/notifications/find_notifications.test.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 { getFilter } from './find_notifications';
+import { NOTIFICATIONS_ID } from '../../../../common/constants';
+
+describe('find_notifications', () => {
+  test('it returns a full filter with an AND if sent down', () => {
+    expect(getFilter('alert.attributes.enabled: true')).toEqual(
+      `alert.attributes.alertTypeId: ${NOTIFICATIONS_ID} AND alert.attributes.enabled: true`
+    );
+  });
+
+  test('it returns existing filter with no AND when not set', () => {
+    expect(getFilter(null)).toEqual(`alert.attributes.alertTypeId: ${NOTIFICATIONS_ID}`);
+  });
+});
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/notifications/find_notifications.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/notifications/find_notifications.ts
new file mode 100644
index 0000000000000..fcdeda608fe4e
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/notifications/find_notifications.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 { FindResult } from '../../../../../../../plugins/alerting/server';
+import { NOTIFICATIONS_ID } from '../../../../common/constants';
+import { FindNotificationParams } from './types';
+
+export const getFilter = (filter: string | null | undefined) => {
+  if (filter == null) {
+    return `alert.attributes.alertTypeId: ${NOTIFICATIONS_ID}`;
+  } else {
+    return `alert.attributes.alertTypeId: ${NOTIFICATIONS_ID} AND ${filter}`;
+  }
+};
+
+export const findNotifications = async ({
+  alertsClient,
+  perPage,
+  page,
+  fields,
+  filter,
+  sortField,
+  sortOrder,
+}: FindNotificationParams): Promise<FindResult> =>
+  alertsClient.find({
+    options: {
+      fields,
+      page,
+      perPage,
+      filter: getFilter(filter),
+      sortOrder,
+      sortField,
+    },
+  });
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/notifications/get_signals_count.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/notifications/get_signals_count.ts
new file mode 100644
index 0000000000000..6ae7922660bd7
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/notifications/get_signals_count.ts
@@ -0,0 +1,66 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import moment from 'moment';
+import { getNotificationResultsLink } from './utils';
+import { NotificationExecutorOptions } from './types';
+import { parseScheduleDates } from '../signals/utils';
+import { buildSignalsSearchQuery } from './build_signals_query';
+
+interface SignalsCountResults {
+  signalsCount: string;
+  resultsLink: string;
+}
+
+interface GetSignalsCount {
+  from: Date | string;
+  to: Date | string;
+  ruleAlertId: string;
+  ruleId: string;
+  index: string;
+  kibanaUrl: string | undefined;
+  callCluster: NotificationExecutorOptions['services']['callCluster'];
+}
+
+export const getSignalsCount = async ({
+  from,
+  to,
+  ruleAlertId,
+  ruleId,
+  index,
+  callCluster,
+  kibanaUrl = '',
+}: GetSignalsCount): Promise<SignalsCountResults> => {
+  const fromMoment = moment.isDate(from) ? moment(from) : parseScheduleDates(from);
+  const toMoment = moment.isDate(to) ? moment(to) : parseScheduleDates(to);
+
+  if (!fromMoment || !toMoment) {
+    throw new Error(`There was an issue with parsing ${from} or ${to} into Moment object`);
+  }
+
+  const fromInMs = fromMoment.format('x');
+  const toInMs = toMoment.format('x');
+
+  const query = buildSignalsSearchQuery({
+    index,
+    ruleId,
+    to: toInMs,
+    from: fromInMs,
+  });
+
+  const result = await callCluster('count', query);
+  const resultsLink = getNotificationResultsLink({
+    baseUrl: kibanaUrl,
+    id: ruleAlertId,
+    from: fromInMs,
+    to: toInMs,
+  });
+
+  return {
+    signalsCount: result.count,
+    resultsLink,
+  };
+};
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/notifications/read_notifications.test.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/notifications/read_notifications.test.ts
new file mode 100644
index 0000000000000..834ad2460959c
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/notifications/read_notifications.test.ts
@@ -0,0 +1,154 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { readNotifications } from './read_notifications';
+import { alertsClientMock } from '../../../../../../../plugins/alerting/server/mocks';
+import {
+  getNotificationResult,
+  getFindNotificationsResultWithSingleHit,
+} from '../routes/__mocks__/request_responses';
+
+class TestError extends Error {
+  constructor() {
+    super();
+
+    this.name = 'CustomError';
+    this.output = { statusCode: 404 };
+  }
+  public output: { statusCode: number };
+}
+
+describe('read_notifications', () => {
+  let alertsClient: ReturnType<typeof alertsClientMock.create>;
+
+  beforeEach(() => {
+    alertsClient = alertsClientMock.create();
+  });
+
+  describe('readNotifications', () => {
+    test('should return the output from alertsClient if id is set but ruleAlertId is undefined', async () => {
+      alertsClient.get.mockResolvedValue(getNotificationResult());
+
+      const rule = await readNotifications({
+        alertsClient,
+        id: '04128c15-0d1b-4716-a4c5-46997ac7f3bd',
+        ruleAlertId: undefined,
+      });
+      expect(rule).toEqual(getNotificationResult());
+    });
+    test('should return null if saved object found by alerts client given id is not alert type', async () => {
+      const result = getNotificationResult();
+      delete result.alertTypeId;
+      alertsClient.get.mockResolvedValue(result);
+
+      const rule = await readNotifications({
+        alertsClient,
+        id: '04128c15-0d1b-4716-a4c5-46997ac7f3bd',
+        ruleAlertId: undefined,
+      });
+      expect(rule).toEqual(null);
+    });
+
+    test('should return error if alerts client throws 404 error on get', async () => {
+      alertsClient.get.mockImplementation(() => {
+        throw new TestError();
+      });
+
+      const rule = await readNotifications({
+        alertsClient,
+        id: '04128c15-0d1b-4716-a4c5-46997ac7f3bd',
+        ruleAlertId: undefined,
+      });
+      expect(rule).toEqual(null);
+    });
+
+    test('should return error if alerts client throws error on get', async () => {
+      alertsClient.get.mockImplementation(() => {
+        throw new Error('Test error');
+      });
+      try {
+        await readNotifications({
+          alertsClient,
+          id: '04128c15-0d1b-4716-a4c5-46997ac7f3bd',
+          ruleAlertId: undefined,
+        });
+      } catch (exc) {
+        expect(exc.message).toEqual('Test error');
+      }
+    });
+
+    test('should return the output from alertsClient if id is set but ruleAlertId is null', async () => {
+      alertsClient.get.mockResolvedValue(getNotificationResult());
+
+      const rule = await readNotifications({
+        alertsClient,
+        id: '04128c15-0d1b-4716-a4c5-46997ac7f3bd',
+        ruleAlertId: null,
+      });
+      expect(rule).toEqual(getNotificationResult());
+    });
+
+    test('should return the output from alertsClient if id is undefined but ruleAlertId is set', async () => {
+      alertsClient.get.mockResolvedValue(getNotificationResult());
+      alertsClient.find.mockResolvedValue(getFindNotificationsResultWithSingleHit());
+
+      const rule = await readNotifications({
+        alertsClient,
+        id: undefined,
+        ruleAlertId: 'rule-1',
+      });
+      expect(rule).toEqual(getNotificationResult());
+    });
+
+    test('should return null if the output from alertsClient with ruleAlertId set is empty', async () => {
+      alertsClient.get.mockResolvedValue(getNotificationResult());
+      alertsClient.find.mockResolvedValue({ data: [], page: 0, perPage: 1, total: 0 });
+
+      const rule = await readNotifications({
+        alertsClient,
+        id: undefined,
+        ruleAlertId: 'rule-1',
+      });
+      expect(rule).toEqual(null);
+    });
+
+    test('should return the output from alertsClient if id is null but ruleAlertId is set', async () => {
+      alertsClient.get.mockResolvedValue(getNotificationResult());
+      alertsClient.find.mockResolvedValue(getFindNotificationsResultWithSingleHit());
+
+      const rule = await readNotifications({
+        alertsClient,
+        id: null,
+        ruleAlertId: 'rule-1',
+      });
+      expect(rule).toEqual(getNotificationResult());
+    });
+
+    test('should return null if id and ruleAlertId are null', async () => {
+      alertsClient.get.mockResolvedValue(getNotificationResult());
+      alertsClient.find.mockResolvedValue(getFindNotificationsResultWithSingleHit());
+
+      const rule = await readNotifications({
+        alertsClient,
+        id: null,
+        ruleAlertId: null,
+      });
+      expect(rule).toEqual(null);
+    });
+
+    test('should return null if id and ruleAlertId are undefined', async () => {
+      alertsClient.get.mockResolvedValue(getNotificationResult());
+      alertsClient.find.mockResolvedValue(getFindNotificationsResultWithSingleHit());
+
+      const rule = await readNotifications({
+        alertsClient,
+        id: undefined,
+        ruleAlertId: undefined,
+      });
+      expect(rule).toEqual(null);
+    });
+  });
+});
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/notifications/read_notifications.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/notifications/read_notifications.ts
new file mode 100644
index 0000000000000..87bdd6f3f40e1
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/notifications/read_notifications.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 { SanitizedAlert } from '../../../../../../../plugins/alerting/common';
+import { ReadNotificationParams, isAlertType } from './types';
+import { findNotifications } from './find_notifications';
+import { INTERNAL_RULE_ALERT_ID_KEY } from '../../../../common/constants';
+
+export const readNotifications = async ({
+  alertsClient,
+  id,
+  ruleAlertId,
+}: ReadNotificationParams): Promise<SanitizedAlert | null> => {
+  if (id != null) {
+    try {
+      const notification = await alertsClient.get({ id });
+      if (isAlertType(notification)) {
+        return notification;
+      } else {
+        return null;
+      }
+    } catch (err) {
+      if (err?.output?.statusCode === 404) {
+        return null;
+      } else {
+        // throw non-404 as they would be 500 or other internal errors
+        throw err;
+      }
+    }
+  } else if (ruleAlertId != null) {
+    const notificationFromFind = await findNotifications({
+      alertsClient,
+      filter: `alert.attributes.tags: "${INTERNAL_RULE_ALERT_ID_KEY}:${ruleAlertId}"`,
+      page: 1,
+    });
+    if (notificationFromFind.data.length === 0 || !isAlertType(notificationFromFind.data[0])) {
+      return null;
+    } else {
+      return notificationFromFind.data[0];
+    }
+  } else {
+    // should never get here, and yet here we are.
+    return null;
+  }
+};
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/notifications/rules_notification_alert_type.test.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/notifications/rules_notification_alert_type.test.ts
new file mode 100644
index 0000000000000..ff0126b129636
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/notifications/rules_notification_alert_type.test.ts
@@ -0,0 +1,142 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { savedObjectsClientMock } from 'src/core/server/mocks';
+import { loggerMock } from 'src/core/server/logging/logger.mock';
+import { getResult } from '../routes/__mocks__/request_responses';
+import { rulesNotificationAlertType } from './rules_notification_alert_type';
+import { buildSignalsSearchQuery } from './build_signals_query';
+import { AlertInstance } from '../../../../../../../plugins/alerting/server';
+import { NotificationExecutorOptions } from './types';
+jest.mock('./build_signals_query');
+
+describe('rules_notification_alert_type', () => {
+  let payload: NotificationExecutorOptions;
+  let alert: ReturnType<typeof rulesNotificationAlertType>;
+  let alertInstanceMock: Record<string, jest.Mock>;
+  let alertInstanceFactoryMock: () => AlertInstance;
+  let savedObjectsClient: ReturnType<typeof savedObjectsClientMock.create>;
+  let logger: ReturnType<typeof loggerMock.create>;
+  let callClusterMock: jest.Mock;
+
+  beforeEach(() => {
+    alertInstanceMock = {
+      scheduleActions: jest.fn(),
+      replaceState: jest.fn(),
+    };
+    alertInstanceMock.replaceState.mockReturnValue(alertInstanceMock);
+    alertInstanceFactoryMock = jest.fn().mockReturnValue(alertInstanceMock);
+    callClusterMock = jest.fn();
+    savedObjectsClient = savedObjectsClientMock.create();
+    logger = loggerMock.create();
+
+    payload = {
+      alertId: '1111',
+      services: {
+        savedObjectsClient,
+        alertInstanceFactory: alertInstanceFactoryMock,
+        callCluster: callClusterMock,
+      },
+      params: { ruleAlertId: '2222' },
+      state: {},
+      spaceId: '',
+      name: 'name',
+      tags: [],
+      startedAt: new Date('2019-12-14T16:40:33.400Z'),
+      previousStartedAt: new Date('2019-12-13T16:40:33.400Z'),
+      createdBy: 'elastic',
+      updatedBy: 'elastic',
+    };
+
+    alert = rulesNotificationAlertType({
+      logger,
+    });
+  });
+
+  describe('executor', () => {
+    it('throws an error if rule alert was not found', async () => {
+      savedObjectsClient.get.mockResolvedValue({
+        id: 'id',
+        attributes: {},
+        type: 'type',
+        references: [],
+      });
+      await alert.executor(payload);
+      expect(logger.error).toHaveBeenCalledWith(
+        `Saved object for alert ${payload.params.ruleAlertId} was not found`
+      );
+    });
+
+    it('should call buildSignalsSearchQuery with proper params', async () => {
+      const ruleAlert = getResult();
+      savedObjectsClient.get.mockResolvedValue({
+        id: 'id',
+        type: 'type',
+        references: [],
+        attributes: ruleAlert,
+      });
+      callClusterMock.mockResolvedValue({
+        count: 0,
+      });
+
+      await alert.executor(payload);
+
+      expect(buildSignalsSearchQuery).toHaveBeenCalledWith(
+        expect.objectContaining({
+          from: '1576255233400',
+          index: '.siem-signals',
+          ruleId: 'rule-1',
+          to: '1576341633400',
+        })
+      );
+    });
+
+    it('should not call alertInstanceFactory if signalsCount was 0', async () => {
+      const ruleAlert = getResult();
+      savedObjectsClient.get.mockResolvedValue({
+        id: 'id',
+        type: 'type',
+        references: [],
+        attributes: ruleAlert,
+      });
+      callClusterMock.mockResolvedValue({
+        count: 0,
+      });
+
+      await alert.executor(payload);
+
+      expect(alertInstanceFactoryMock).not.toHaveBeenCalled();
+    });
+
+    it('should call scheduleActions if signalsCount was greater than 0', async () => {
+      const ruleAlert = getResult();
+      savedObjectsClient.get.mockResolvedValue({
+        id: 'id',
+        type: 'type',
+        references: [],
+        attributes: ruleAlert,
+      });
+      callClusterMock.mockResolvedValue({
+        count: 10,
+      });
+
+      await alert.executor(payload);
+
+      expect(alertInstanceFactoryMock).toHaveBeenCalled();
+      expect(alertInstanceMock.replaceState).toHaveBeenCalledWith(
+        expect.objectContaining({ signalsCount: 10 })
+      );
+      expect(alertInstanceMock.scheduleActions).toHaveBeenCalledWith(
+        'default',
+        expect.objectContaining({
+          rule: expect.objectContaining({
+            name: ruleAlert.name,
+          }),
+        })
+      );
+    });
+  });
+});
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/notifications/rules_notification_alert_type.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/notifications/rules_notification_alert_type.ts
new file mode 100644
index 0000000000000..c5dc4c3a27e16
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/notifications/rules_notification_alert_type.ts
@@ -0,0 +1,64 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { Logger } from 'src/core/server';
+import { schema } from '@kbn/config-schema';
+import { NOTIFICATIONS_ID } from '../../../../common/constants';
+
+import { NotificationAlertTypeDefinition } from './types';
+import { getSignalsCount } from './get_signals_count';
+import { RuleAlertAttributes } from '../signals/types';
+import { siemRuleActionGroups } from '../signals/siem_rule_action_groups';
+import { scheduleNotificationActions } from './schedule_notification_actions';
+
+export const rulesNotificationAlertType = ({
+  logger,
+}: {
+  logger: Logger;
+}): NotificationAlertTypeDefinition => ({
+  id: NOTIFICATIONS_ID,
+  name: 'SIEM Notifications',
+  actionGroups: siemRuleActionGroups,
+  defaultActionGroupId: 'default',
+  validate: {
+    params: schema.object({
+      ruleAlertId: schema.string(),
+    }),
+  },
+  async executor({ startedAt, previousStartedAt, alertId, services, params }) {
+    const ruleAlertSavedObject = await services.savedObjectsClient.get<RuleAlertAttributes>(
+      'alert',
+      params.ruleAlertId
+    );
+
+    if (!ruleAlertSavedObject.attributes.params) {
+      logger.error(`Saved object for alert ${params.ruleAlertId} was not found`);
+      return;
+    }
+
+    const { params: ruleAlertParams, name: ruleName } = ruleAlertSavedObject.attributes;
+    const ruleParams = { ...ruleAlertParams, name: ruleName };
+
+    const { signalsCount, resultsLink } = await getSignalsCount({
+      from: previousStartedAt ?? `now-${ruleParams.interval}`,
+      to: startedAt,
+      index: ruleParams.outputIndex,
+      ruleId: ruleParams.ruleId!,
+      kibanaUrl: ruleAlertParams.meta?.kibanaUrl as string,
+      ruleAlertId: ruleAlertSavedObject.id,
+      callCluster: services.callCluster,
+    });
+
+    logger.info(
+      `Found ${signalsCount} signals using signal rule name: "${ruleParams.name}", id: "${params.ruleAlertId}", rule_id: "${ruleParams.ruleId}" in "${ruleParams.outputIndex}" index`
+    );
+
+    if (signalsCount) {
+      const alertInstance = services.alertInstanceFactory(alertId);
+      scheduleNotificationActions({ alertInstance, signalsCount, resultsLink, ruleParams });
+    }
+  },
+});
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/notifications/schedule_notification_actions.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/notifications/schedule_notification_actions.ts
new file mode 100644
index 0000000000000..9c38c88a12411
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/notifications/schedule_notification_actions.ts
@@ -0,0 +1,34 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { AlertInstance } from '../../../../../../../plugins/alerting/server';
+import { RuleTypeParams } from '../types';
+
+type NotificationRuleTypeParams = RuleTypeParams & {
+  name: string;
+};
+
+interface ScheduleNotificationActions {
+  alertInstance: AlertInstance;
+  signalsCount: string;
+  resultsLink: string;
+  ruleParams: NotificationRuleTypeParams;
+}
+
+export const scheduleNotificationActions = ({
+  alertInstance,
+  signalsCount,
+  resultsLink,
+  ruleParams,
+}: ScheduleNotificationActions): AlertInstance =>
+  alertInstance
+    .replaceState({
+      signalsCount,
+    })
+    .scheduleActions('default', {
+      resultsLink,
+      rule: ruleParams,
+    });
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/notifications/types.test.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/notifications/types.test.ts
new file mode 100644
index 0000000000000..4fce037b483d5
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/notifications/types.test.ts
@@ -0,0 +1,26 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { loggerMock } from 'src/core/server/logging/logger.mock';
+import { getNotificationResult, getResult } from '../routes/__mocks__/request_responses';
+import { isAlertTypes, isNotificationAlertExecutor } from './types';
+import { rulesNotificationAlertType } from './rules_notification_alert_type';
+
+describe('types', () => {
+  it('isAlertTypes should return true if is RuleNotificationAlertType type', () => {
+    expect(isAlertTypes([getNotificationResult()])).toEqual(true);
+  });
+
+  it('isAlertTypes should return false if is not RuleNotificationAlertType', () => {
+    expect(isAlertTypes([getResult()])).toEqual(false);
+  });
+
+  it('isNotificationAlertExecutor should return true it passed object is NotificationAlertTypeDefinition type', () => {
+    expect(
+      isNotificationAlertExecutor(rulesNotificationAlertType({ logger: loggerMock.create() }))
+    ).toEqual(true);
+  });
+});
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/notifications/types.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/notifications/types.ts
new file mode 100644
index 0000000000000..edcd821353bc8
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/notifications/types.ts
@@ -0,0 +1,107 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import {
+  AlertsClient,
+  PartialAlert,
+  AlertType,
+  State,
+  AlertExecutorOptions,
+} from '../../../../../../../plugins/alerting/server';
+import { Alert } from '../../../../../../../plugins/alerting/common';
+import { NOTIFICATIONS_ID } from '../../../../common/constants';
+import { RuleAlertAction } from '../../../../common/detection_engine/types';
+
+export interface RuleNotificationAlertType extends Alert {
+  params: {
+    ruleAlertId: string;
+  };
+}
+
+export interface FindNotificationParams {
+  alertsClient: AlertsClient;
+  perPage?: number;
+  page?: number;
+  sortField?: string;
+  filter?: string;
+  fields?: string[];
+  sortOrder?: 'asc' | 'desc';
+}
+
+export interface FindNotificationsRequestParams {
+  per_page: number;
+  page: number;
+  search?: string;
+  sort_field?: string;
+  filter?: string;
+  fields?: string[];
+  sort_order?: 'asc' | 'desc';
+}
+
+export interface Clients {
+  alertsClient: AlertsClient;
+}
+
+export type UpdateNotificationParams = Omit<NotificationAlertParams, 'interval' | 'actions'> & {
+  actions: RuleAlertAction[];
+  id?: string;
+  tags?: string[];
+  interval: string | null;
+  ruleAlertId: string;
+} & Clients;
+
+export type DeleteNotificationParams = Clients & {
+  id?: string;
+  ruleAlertId?: string;
+};
+
+export interface NotificationAlertParams {
+  actions: RuleAlertAction[];
+  enabled: boolean;
+  ruleAlertId: string;
+  interval: string;
+  name: string;
+  tags?: string[];
+  throttle?: null;
+}
+
+export type CreateNotificationParams = NotificationAlertParams & Clients;
+
+export interface ReadNotificationParams {
+  alertsClient: AlertsClient;
+  id?: string | null;
+  ruleAlertId?: string | null;
+}
+
+export const isAlertTypes = (
+  partialAlert: PartialAlert[]
+): partialAlert is RuleNotificationAlertType[] => {
+  return partialAlert.every(rule => isAlertType(rule));
+};
+
+export const isAlertType = (
+  partialAlert: PartialAlert
+): partialAlert is RuleNotificationAlertType => {
+  return partialAlert.alertTypeId === NOTIFICATIONS_ID;
+};
+
+export type NotificationExecutorOptions = Omit<AlertExecutorOptions, 'params'> & {
+  params: {
+    ruleAlertId: string;
+  };
+};
+
+// This returns true because by default a NotificationAlertTypeDefinition is an AlertType
+// since we are only increasing the strictness of params.
+export const isNotificationAlertExecutor = (
+  obj: NotificationAlertTypeDefinition
+): obj is AlertType => {
+  return true;
+};
+
+export type NotificationAlertTypeDefinition = Omit<AlertType, 'executor'> & {
+  executor: ({ services, params, state }: NotificationExecutorOptions) => Promise<State | void>;
+};
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/notifications/update_notifications.test.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/notifications/update_notifications.test.ts
new file mode 100644
index 0000000000000..e1b452c911443
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/notifications/update_notifications.test.ts
@@ -0,0 +1,137 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { alertsClientMock } from '../../../../../../../plugins/alerting/server/mocks';
+import { updateNotifications } from './update_notifications';
+import { readNotifications } from './read_notifications';
+import { createNotifications } from './create_notifications';
+import { getNotificationResult } from '../routes/__mocks__/request_responses';
+jest.mock('./read_notifications');
+jest.mock('./create_notifications');
+
+describe('updateNotifications', () => {
+  const notification = getNotificationResult();
+  let alertsClient: ReturnType<typeof alertsClientMock.create>;
+
+  beforeEach(() => {
+    alertsClient = alertsClientMock.create();
+  });
+
+  it('should update the existing notification if interval provided', async () => {
+    (readNotifications as jest.Mock).mockResolvedValue(notification);
+
+    await updateNotifications({
+      alertsClient,
+      actions: [],
+      ruleAlertId: 'new-rule-id',
+      enabled: true,
+      interval: '10m',
+      name: '',
+      tags: [],
+    });
+
+    expect(alertsClient.update).toHaveBeenCalledWith(
+      expect.objectContaining({
+        id: notification.id,
+        data: expect.objectContaining({
+          params: expect.objectContaining({
+            ruleAlertId: 'new-rule-id',
+          }),
+        }),
+      })
+    );
+  });
+
+  it('should create a new notification if did not exist', async () => {
+    (readNotifications as jest.Mock).mockResolvedValue(null);
+
+    const params = {
+      alertsClient,
+      actions: [],
+      ruleAlertId: 'new-rule-id',
+      enabled: true,
+      interval: '10m',
+      name: '',
+      tags: [],
+    };
+
+    await updateNotifications(params);
+
+    expect(createNotifications).toHaveBeenCalledWith(expect.objectContaining(params));
+  });
+
+  it('should delete notification if notification was found and interval is null', async () => {
+    (readNotifications as jest.Mock).mockResolvedValue(notification);
+
+    await updateNotifications({
+      alertsClient,
+      actions: [],
+      ruleAlertId: 'new-rule-id',
+      enabled: true,
+      interval: null,
+      name: '',
+      tags: [],
+    });
+
+    expect(alertsClient.delete).toHaveBeenCalledWith(
+      expect.objectContaining({
+        id: notification.id,
+      })
+    );
+  });
+
+  it('should call the alertsClient with transformed actions', async () => {
+    (readNotifications as jest.Mock).mockResolvedValue(notification);
+    const action = {
+      group: 'default',
+      id: '99403909-ca9b-49ba-9d7a-7e5320e68d05',
+      params: { message: 'Rule generated {{state.signalsCount}} signals' },
+      action_type_id: '.slack',
+    };
+    await updateNotifications({
+      alertsClient,
+      actions: [action],
+      ruleAlertId: 'new-rule-id',
+      enabled: true,
+      interval: '10m',
+      name: '',
+      tags: [],
+    });
+
+    expect(alertsClient.update).toHaveBeenCalledWith(
+      expect.objectContaining({
+        data: expect.objectContaining({
+          actions: expect.arrayContaining([
+            {
+              group: action.group,
+              id: action.id,
+              params: action.params,
+              actionTypeId: '.slack',
+            },
+          ]),
+        }),
+      })
+    );
+  });
+
+  it('returns null if notification was not found and interval was null', async () => {
+    (readNotifications as jest.Mock).mockResolvedValue(null);
+    const ruleAlertId = 'rule-04128c15-0d1b-4716-a4c5-46997ac7f3bd';
+
+    const result = await updateNotifications({
+      alertsClient,
+      actions: [],
+      enabled: true,
+      id: notification.id,
+      ruleAlertId,
+      name: notification.name,
+      tags: notification.tags,
+      interval: null,
+    });
+
+    expect(result).toEqual(null);
+  });
+});
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/notifications/update_notifications.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/notifications/update_notifications.ts
new file mode 100644
index 0000000000000..3197d21c0e95a
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/notifications/update_notifications.ts
@@ -0,0 +1,64 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { PartialAlert } from '../../../../../../../plugins/alerting/server';
+import { readNotifications } from './read_notifications';
+import { UpdateNotificationParams } from './types';
+import { addTags } from './add_tags';
+import { createNotifications } from './create_notifications';
+import { transformRuleToAlertAction } from '../../../../common/detection_engine/transform_actions';
+
+export const updateNotifications = async ({
+  alertsClient,
+  actions,
+  enabled,
+  id,
+  ruleAlertId,
+  name,
+  tags,
+  interval,
+}: UpdateNotificationParams): Promise<PartialAlert | null> => {
+  const notification = await readNotifications({ alertsClient, id, ruleAlertId });
+
+  if (interval && notification) {
+    const result = await alertsClient.update({
+      id: notification.id,
+      data: {
+        tags: addTags(tags, ruleAlertId),
+        name,
+        schedule: {
+          interval,
+        },
+        actions: actions?.map(transformRuleToAlertAction),
+        params: {
+          ruleAlertId,
+        },
+        throttle: null,
+      },
+    });
+    return result;
+  }
+
+  if (interval && !notification) {
+    const result = await createNotifications({
+      alertsClient,
+      enabled,
+      tags,
+      name,
+      interval,
+      actions,
+      ruleAlertId,
+    });
+    return result;
+  }
+
+  if (!interval && notification) {
+    await alertsClient.delete({ id: notification.id });
+    return null;
+  }
+
+  return null;
+};
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/notifications/utils.test.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/notifications/utils.test.ts
new file mode 100644
index 0000000000000..4c3f311d10acc
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/notifications/utils.test.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 { getNotificationResultsLink } from './utils';
+
+describe('utils', () => {
+  it('getNotificationResultsLink', () => {
+    const resultLink = getNotificationResultsLink({
+      baseUrl: 'http://localhost:5601',
+      id: 'notification-id',
+      from: '00000',
+      to: '1111',
+    });
+    expect(resultLink).toEqual(
+      `http://localhost:5601/app/siem#/detections/rules/id/notification-id?timerange=(global:(linkTo:!(timeline),timerange:(from:00000,kind:absolute,to:1111)),timeline:(linkTo:!(global),timerange:(from:00000,kind:absolute,to:1111)))`
+    );
+  });
+});
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/notifications/utils.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/notifications/utils.ts
new file mode 100644
index 0000000000000..ed502d31d2fb5
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/notifications/utils.ts
@@ -0,0 +1,18 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+export const getNotificationResultsLink = ({
+  baseUrl,
+  id,
+  from,
+  to,
+}: {
+  baseUrl: string;
+  id: string;
+  from: string;
+  to: string;
+}) =>
+  `${baseUrl}/app/siem#/detections/rules/id/${id}?timerange=(global:(linkTo:!(timeline),timerange:(from:${from},kind:absolute,to:${to})),timeline:(linkTo:!(global),timerange:(from:${from},kind:absolute,to:${to})))`;
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/__mocks__/request_responses.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/__mocks__/request_responses.ts
index 0e0ab58a7a199..6435410f31797 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/__mocks__/request_responses.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/__mocks__/request_responses.ts
@@ -28,6 +28,7 @@ import {
 } from '../../rules/types';
 import { RuleAlertParamsRest, PrepackagedRules } from '../../types';
 import { requestMock } from './request';
+import { RuleNotificationAlertType } from '../../notifications/types';
 
 export const mockPrepackagedRule = (): PrepackagedRules => ({
   rule_id: 'rule-1',
@@ -204,11 +205,11 @@ export const getPrepackagedRulesStatusRequest = () =>
     path: `${DETECTION_ENGINE_PREPACKAGED_URL}/_status`,
   });
 
-export interface FindHit {
+export interface FindHit<T = RuleAlertType> {
   page: number;
   perPage: number;
   total: number;
-  data: RuleAlertType[];
+  data: T[];
 }
 
 export const getEmptyFindResult = (): FindHit => ({
@@ -309,6 +310,27 @@ export const createMlRuleRequest = () => {
   });
 };
 
+export const createRuleWithActionsRequest = () => {
+  const payload = typicalPayload();
+
+  return requestMock.create({
+    method: 'post',
+    path: DETECTION_ENGINE_RULES_URL,
+    body: {
+      ...payload,
+      throttle: '5m',
+      actions: [
+        {
+          group: 'default',
+          id: '99403909-ca9b-49ba-9d7a-7e5320e68d05',
+          params: { message: 'Rule generated {{state.signalsCount}} signals' },
+          action_type_id: '.slack',
+        },
+      ],
+    },
+  });
+};
+
 export const getSetSignalStatusByIdsRequest = () =>
   requestMock.create({
     method: 'post',
@@ -616,3 +638,45 @@ export const getEmptyIndex = (): { _shards: Partial<ShardsResponse> } => ({
 export const getNonEmptyIndex = (): { _shards: Partial<ShardsResponse> } => ({
   _shards: { total: 1 },
 });
+
+export const getNotificationResult = (): RuleNotificationAlertType => ({
+  id: '200dbf2f-b269-4bf9-aa85-11ba32ba73ba',
+  name: 'Notification for Rule Test',
+  tags: ['__internal_rule_alert_id:85b64e8a-2e40-4096-86af-5ac172c10825'],
+  alertTypeId: 'siem.notifications',
+  consumer: 'siem',
+  params: {
+    ruleAlertId: '85b64e8a-2e40-4096-86af-5ac172c10825',
+  },
+  schedule: {
+    interval: '5m',
+  },
+  enabled: true,
+  actions: [
+    {
+      actionTypeId: '.slack',
+      params: {
+        message: 'Rule generated {{state.signalsCount}} signals\n\n{{rule.name}}\n{{resultsLink}}',
+      },
+      group: 'default',
+      id: '99403909-ca9b-49ba-9d7a-7e5320e68d05',
+    },
+  ],
+  throttle: null,
+  apiKey: null,
+  apiKeyOwner: 'elastic',
+  createdBy: 'elastic',
+  updatedBy: 'elastic',
+  createdAt: new Date('2020-03-21T11:15:13.530Z'),
+  muteAll: false,
+  mutedInstanceIds: [],
+  scheduledTaskId: '62b3a130-6b70-11ea-9ce9-6b9818c4cbd7',
+  updatedAt: new Date('2020-03-21T12:37:08.730Z'),
+});
+
+export const getFindNotificationsResultWithSingleHit = (): FindHit<RuleNotificationAlertType> => ({
+  page: 1,
+  perPage: 1,
+  total: 1,
+  data: [getNotificationResult()],
+});
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/create_rules_route.test.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/create_rules_route.test.ts
index 1a4e19c2047b5..14592dd499d43 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/create_rules_route.test.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/create_rules_route.test.ts
@@ -15,10 +15,13 @@ import {
   getEmptyIndex,
   getFindResultWithSingleHit,
   createMlRuleRequest,
+  createRuleWithActionsRequest,
 } from '../__mocks__/request_responses';
 import { requestContextMock, serverMock, requestMock } from '../__mocks__';
 import { createRulesRoute } from './create_rules_route';
 import { setFeatureFlagsForTestsOnly, unSetFeatureFlagsForTestsOnly } from '../../feature_flags';
+import { createNotifications } from '../../notifications/create_notifications';
+jest.mock('../../notifications/create_notifications');
 
 describe('create_rules', () => {
   let server: ReturnType<typeof serverMock.create>;
@@ -65,6 +68,18 @@ describe('create_rules', () => {
     });
   });
 
+  describe('creating a Notification if throttle and actions were provided ', () => {
+    it('is successful', async () => {
+      const response = await server.inject(createRuleWithActionsRequest(), context);
+      expect(response.status).toEqual(200);
+      expect(createNotifications).toHaveBeenCalledWith(
+        expect.objectContaining({
+          ruleAlertId: '04128c15-0d1b-4716-a4c5-46997ac7f3bd',
+        })
+      );
+    });
+  });
+
   describe('unhappy paths', () => {
     test('it returns a 400 if the index does not exist', async () => {
       clients.clusterClient.callAsCurrentUser.mockResolvedValue(getEmptyIndex());
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/create_rules_route.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/create_rules_route.ts
index cee9054cf922e..1fbbb5274d738 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/create_rules_route.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/create_rules_route.ts
@@ -17,6 +17,7 @@ import { transformValidate } from './validate';
 import { getIndexExists } from '../../index/get_index_exists';
 import { createRulesSchema } from '../schemas/create_rules_schema';
 import { buildRouteValidation, transformError, buildSiemResponse } from '../utils';
+import { createNotifications } from '../../notifications/create_notifications';
 
 export const createRulesRoute = (router: IRouter): void => {
   router.post(
@@ -131,6 +132,18 @@ export const createRulesRoute = (router: IRouter): void => {
           version: 1,
           lists,
         });
+
+        if (throttle && actions.length) {
+          await createNotifications({
+            alertsClient,
+            enabled,
+            name,
+            interval,
+            actions,
+            ruleAlertId: createdRule.id,
+          });
+        }
+
         const ruleStatuses = await savedObjectsClient.find<
           IRuleSavedAttributesSavedObjectAttributes
         >({
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/delete_rules_bulk_route.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/delete_rules_bulk_route.ts
index c56f34588cbc6..85cfeefdceead 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/delete_rules_bulk_route.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/delete_rules_bulk_route.ts
@@ -16,6 +16,7 @@ import {
   DeleteRulesRequestParams,
 } from '../../rules/types';
 import { deleteRules } from '../../rules/delete_rules';
+import { deleteNotifications } from '../../notifications/delete_notifications';
 import { ruleStatusSavedObjectType } from '../../rules/saved_object_mappings';
 
 type Config = RouteConfig<unknown, unknown, DeleteRulesRequestParams, 'delete' | 'post'>;
@@ -57,6 +58,7 @@ export const deleteRulesBulkRoute = (router: IRouter) => {
             ruleId,
           });
           if (rule != null) {
+            await deleteNotifications({ alertsClient, ruleAlertId: rule.id });
             const ruleStatuses = await savedObjectsClient.find<
               IRuleSavedAttributesSavedObjectAttributes
             >({
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/delete_rules_route.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/delete_rules_route.ts
index 753b281dbc09e..6fd50abd9364a 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/delete_rules_route.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/delete_rules_route.ts
@@ -16,6 +16,7 @@ import {
   IRuleSavedAttributesSavedObjectAttributes,
 } from '../../rules/types';
 import { ruleStatusSavedObjectType } from '../../rules/saved_object_mappings';
+import { deleteNotifications } from '../../notifications/delete_notifications';
 
 export const deleteRulesRoute = (router: IRouter) => {
   router.delete(
@@ -52,6 +53,7 @@ export const deleteRulesRoute = (router: IRouter) => {
           ruleId,
         });
         if (rule != null) {
+          await deleteNotifications({ alertsClient, ruleAlertId: rule.id });
           const ruleStatuses = await savedObjectsClient.find<
             IRuleSavedAttributesSavedObjectAttributes
           >({
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/update_rules_route.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/update_rules_route.ts
index 7e56c32ade92a..f8cca6494e000 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/update_rules_route.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/update_rules_route.ts
@@ -16,6 +16,7 @@ import { getIdError } from './utils';
 import { transformValidate } from './validate';
 import { ruleStatusSavedObjectType } from '../../rules/saved_object_mappings';
 import { updateRules } from '../../rules/update_rules';
+import { updateNotifications } from '../../notifications/update_notifications';
 
 export const updateRulesRoute = (router: IRouter) => {
   router.put(
@@ -117,7 +118,17 @@ export const updateRulesRoute = (router: IRouter) => {
           version,
           lists,
         });
+
         if (rule != null) {
+          await updateNotifications({
+            alertsClient,
+            actions,
+            enabled,
+            ruleAlertId: rule.id,
+            interval: throttle,
+            name,
+          });
+
           const ruleStatuses = await savedObjectsClient.find<
             IRuleSavedAttributesSavedObjectAttributes
           >({
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/utils.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/utils.ts
index e0ecbdedaac7c..a0458dc3a133d 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/utils.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/utils.ts
@@ -29,7 +29,7 @@ import {
   OutputError,
 } from '../utils';
 import { hasListsFeature } from '../../feature_flags';
-import { transformAlertToRuleAction } from '../../rules/transform_actions';
+import { transformAlertToRuleAction } from '../../../../../common/detection_engine/transform_actions';
 
 type PromiseFromStreams = ImportRuleAlertRest | Error;
 
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/schemas/add_prepackaged_rules_schema.test.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/schemas/add_prepackaged_rules_schema.test.ts
index 2b18e1b9bf52c..b10627d151fa2 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/schemas/add_prepackaged_rules_schema.test.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/schemas/add_prepackaged_rules_schema.test.ts
@@ -5,7 +5,8 @@
  */
 
 import { AlertAction } from '../../../../../../../../plugins/alerting/common';
-import { ThreatParams, PrepackagedRules, RuleAlertAction } from '../../types';
+import { RuleAlertAction } from '../../../../../common/detection_engine/types';
+import { ThreatParams, PrepackagedRules } from '../../types';
 import { addPrepackagedRulesSchema } from './add_prepackaged_rules_schema';
 import { setFeatureFlagsForTestsOnly, unSetFeatureFlagsForTestsOnly } from '../../feature_flags';
 
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/schemas/create_rules_schema.test.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/schemas/create_rules_schema.test.ts
index d9c3055512815..08bd01ee9a1a0 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/schemas/create_rules_schema.test.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/schemas/create_rules_schema.test.ts
@@ -7,7 +7,8 @@
 import { AlertAction } from '../../../../../../../../plugins/alerting/common';
 import { createRulesSchema } from './create_rules_schema';
 import { PatchRuleAlertParamsRest } from '../../rules/types';
-import { ThreatParams, RuleAlertParamsRest, RuleAlertAction } from '../../types';
+import { RuleAlertAction } from '../../../../../common/detection_engine/types';
+import { ThreatParams, RuleAlertParamsRest } from '../../types';
 import { setFeatureFlagsForTestsOnly, unSetFeatureFlagsForTestsOnly } from '../../feature_flags';
 
 describe('create rules schema', () => {
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/schemas/import_rules_schema.test.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/schemas/import_rules_schema.test.ts
index ffb49896ef7c7..c8e5bb981f921 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/schemas/import_rules_schema.test.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/schemas/import_rules_schema.test.ts
@@ -10,7 +10,8 @@ import {
   importRulesQuerySchema,
   importRulesPayloadSchema,
 } from './import_rules_schema';
-import { ThreatParams, ImportRuleAlertRest, RuleAlertAction } from '../../types';
+import { RuleAlertAction } from '../../../../../common/detection_engine/types';
+import { ThreatParams, ImportRuleAlertRest } from '../../types';
 import { ImportRulesRequestParams } from '../../rules/types';
 import { setFeatureFlagsForTestsOnly, unSetFeatureFlagsForTestsOnly } from '../../feature_flags';
 
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/schemas/patch_rules_schema.test.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/schemas/patch_rules_schema.test.ts
index 42945e0970cba..45b5028f392b9 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/schemas/patch_rules_schema.test.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/schemas/patch_rules_schema.test.ts
@@ -7,7 +7,8 @@
 import { AlertAction } from '../../../../../../../../plugins/alerting/common';
 import { patchRulesSchema } from './patch_rules_schema';
 import { PatchRuleAlertParamsRest } from '../../rules/types';
-import { ThreatParams, RuleAlertAction } from '../../types';
+import { RuleAlertAction } from '../../../../../common/detection_engine/types';
+import { ThreatParams } from '../../types';
 import { setFeatureFlagsForTestsOnly, unSetFeatureFlagsForTestsOnly } from '../../feature_flags';
 
 describe('patch rules schema', () => {
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/schemas/update_rules_schema.test.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/schemas/update_rules_schema.test.ts
index db3709cd6b126..6f6beea7fa5fb 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/schemas/update_rules_schema.test.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/schemas/update_rules_schema.test.ts
@@ -7,7 +7,8 @@
 import { AlertAction } from '../../../../../../../../plugins/alerting/common';
 import { updateRulesSchema } from './update_rules_schema';
 import { PatchRuleAlertParamsRest } from '../../rules/types';
-import { ThreatParams, RuleAlertParamsRest, RuleAlertAction } from '../../types';
+import { RuleAlertAction } from '../../../../../common/detection_engine/types';
+import { ThreatParams, RuleAlertParamsRest } from '../../types';
 import { setFeatureFlagsForTestsOnly, unSetFeatureFlagsForTestsOnly } from '../../feature_flags';
 
 describe('create rules schema', () => {
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/create_rules.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/create_rules.ts
index db70b90d5a17c..a45b28ba3e105 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/create_rules.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/create_rules.ts
@@ -6,12 +6,12 @@
 
 import { Alert } from '../../../../../../../plugins/alerting/common';
 import { APP_ID, SIGNALS_ID } from '../../../../common/constants';
+import { transformRuleToAlertAction } from '../../../../common/detection_engine/transform_actions';
 import { CreateRuleParams } from './types';
 import { addTags } from './add_tags';
 import { hasListsFeature } from '../feature_flags';
-import { transformRuleToAlertAction } from './transform_actions';
 
-export const createRules = ({
+export const createRules = async ({
   alertsClient,
   actionsClient, // TODO: Use this actionsClient once we have actions such as email, etc...
   actions,
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/delete_rules.test.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/delete_rules.test.ts
new file mode 100644
index 0000000000000..38fc1dc5d1930
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/delete_rules.test.ts
@@ -0,0 +1,150 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { actionsClientMock } from '../../../../../../../plugins/actions/server/mocks';
+import { alertsClientMock } from '../../../../../../../plugins/alerting/server/mocks';
+import { deleteRules } from './delete_rules';
+import { readRules } from './read_rules';
+jest.mock('./read_rules');
+
+describe('deleteRules', () => {
+  let actionsClient: ReturnType<typeof actionsClientMock.create>;
+  let alertsClient: ReturnType<typeof alertsClientMock.create>;
+  const notificationId = 'notification-52128c15-0d1b-4716-a4c5-46997ac7f3bd';
+  const ruleId = 'rule-04128c15-0d1b-4716-a4c5-46997ac7f3bd';
+
+  beforeEach(() => {
+    actionsClient = actionsClientMock.create();
+    alertsClient = alertsClientMock.create();
+  });
+
+  it('should return null if notification was not found', async () => {
+    (readRules as jest.Mock).mockResolvedValue(null);
+
+    const result = await deleteRules({
+      alertsClient,
+      actionsClient,
+      id: notificationId,
+      ruleId,
+    });
+
+    expect(result).toBe(null);
+  });
+
+  it('should call alertsClient.delete if notification was found', async () => {
+    (readRules as jest.Mock).mockResolvedValue({
+      id: notificationId,
+    });
+
+    const result = await deleteRules({
+      alertsClient,
+      actionsClient,
+      id: notificationId,
+      ruleId,
+    });
+
+    expect(alertsClient.delete).toHaveBeenCalledWith(
+      expect.objectContaining({
+        id: notificationId,
+      })
+    );
+    expect(result).toEqual({ id: notificationId });
+  });
+
+  it('should call alertsClient.delete if ruleId was null', async () => {
+    (readRules as jest.Mock).mockResolvedValue({
+      id: null,
+    });
+
+    const result = await deleteRules({
+      alertsClient,
+      actionsClient,
+      id: notificationId,
+      ruleId: null,
+    });
+
+    expect(alertsClient.delete).toHaveBeenCalledWith(
+      expect.objectContaining({
+        id: notificationId,
+      })
+    );
+    expect(result).toEqual({ id: null });
+  });
+
+  it('should return null if alertsClient.delete rejects with 404 if ruleId was null', async () => {
+    (readRules as jest.Mock).mockResolvedValue({
+      id: null,
+    });
+
+    alertsClient.delete.mockRejectedValue({
+      output: {
+        statusCode: 404,
+      },
+    });
+
+    const result = await deleteRules({
+      alertsClient,
+      actionsClient,
+      id: notificationId,
+      ruleId: null,
+    });
+
+    expect(alertsClient.delete).toHaveBeenCalledWith(
+      expect.objectContaining({
+        id: notificationId,
+      })
+    );
+    expect(result).toEqual(null);
+  });
+
+  it('should return error object if alertsClient.delete rejects with status different than 404 and if ruleId was null', async () => {
+    (readRules as jest.Mock).mockResolvedValue({
+      id: null,
+    });
+
+    const errorObject = {
+      output: {
+        statusCode: 500,
+      },
+    };
+
+    alertsClient.delete.mockRejectedValue(errorObject);
+
+    let errorResult;
+    try {
+      await deleteRules({
+        alertsClient,
+        actionsClient,
+        id: notificationId,
+        ruleId: null,
+      });
+    } catch (error) {
+      errorResult = error;
+    }
+
+    expect(alertsClient.delete).toHaveBeenCalledWith(
+      expect.objectContaining({
+        id: notificationId,
+      })
+    );
+    expect(errorResult).toEqual(errorObject);
+  });
+
+  it('should return null if ruleId and id was null', async () => {
+    (readRules as jest.Mock).mockResolvedValue({
+      id: null,
+    });
+
+    const result = await deleteRules({
+      alertsClient,
+      actionsClient,
+      id: undefined,
+      ruleId: null,
+    });
+
+    expect(result).toEqual(null);
+  });
+});
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/patch_rules.test.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/patch_rules.test.ts
index b424d2912ebc8..cd18bee6f606f 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/patch_rules.test.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/patch_rules.test.ts
@@ -7,7 +7,7 @@
 import { savedObjectsClientMock } from '../../../../../../../../src/core/server/mocks';
 import { alertsClientMock } from '../../../../../../../plugins/alerting/server/mocks';
 import { actionsClientMock } from '../../../../../../../plugins/actions/server/mocks';
-import { getMlResult } from '../routes/__mocks__/request_responses';
+import { getResult, getMlResult } from '../routes/__mocks__/request_responses';
 import { patchRules } from './patch_rules';
 
 describe('patchRules', () => {
@@ -21,6 +21,59 @@ describe('patchRules', () => {
     savedObjectsClient = savedObjectsClientMock.create();
   });
 
+  it('should call alertsClient.disable is the rule was enabled and enabled is false', async () => {
+    const rule = getResult();
+    alertsClient.get.mockResolvedValue(getResult());
+
+    await patchRules({
+      alertsClient,
+      actionsClient,
+      actions: [],
+      savedObjectsClient,
+      id: '04128c15-0d1b-4716-a4c5-46997ac7f3bd',
+      ...rule.params,
+      enabled: false,
+      throttle: null,
+      interval: '',
+      name: '',
+      tags: [],
+    });
+
+    expect(alertsClient.disable).toHaveBeenCalledWith(
+      expect.objectContaining({
+        id: '04128c15-0d1b-4716-a4c5-46997ac7f3bd',
+      })
+    );
+  });
+
+  it('should call alertsClient.enable is the rule was disabled and enabled is true', async () => {
+    const rule = getResult();
+    alertsClient.get.mockResolvedValue({
+      ...getResult(),
+      enabled: false,
+    });
+
+    await patchRules({
+      alertsClient,
+      actionsClient,
+      actions: [],
+      savedObjectsClient,
+      id: '04128c15-0d1b-4716-a4c5-46997ac7f3bd',
+      ...rule.params,
+      enabled: true,
+      throttle: null,
+      interval: '',
+      name: '',
+      tags: [],
+    });
+
+    expect(alertsClient.enable).toHaveBeenCalledWith(
+      expect.objectContaining({
+        id: '04128c15-0d1b-4716-a4c5-46997ac7f3bd',
+      })
+    );
+  });
+
   it('calls the alertsClient with ML params', async () => {
     alertsClient.get.mockResolvedValue(getMlResult());
     const params = {
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/patch_rules.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/patch_rules.ts
index 5b6fd08a9ea89..5394af526c917 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/patch_rules.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/patch_rules.ts
@@ -6,12 +6,12 @@
 
 import { defaults } from 'lodash/fp';
 import { PartialAlert } from '../../../../../../../plugins/alerting/server';
+import { transformRuleToAlertAction } from '../../../../common/detection_engine/transform_actions';
 import { readRules } from './read_rules';
 import { PatchRuleParams, IRuleSavedAttributesSavedObjectAttributes } from './types';
 import { addTags } from './add_tags';
 import { ruleStatusSavedObjectType } from './saved_object_mappings';
 import { calculateVersion, calculateName, calculateInterval } from './utils';
-import { transformRuleToAlertAction } from './transform_actions';
 
 export const patchRules = async ({
   alertsClient,
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/read_rules.test.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/read_rules.test.ts
index 862ea9d2dcbe5..38a883329318b 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/read_rules.test.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/read_rules.test.ts
@@ -8,7 +8,7 @@ import { readRules } from './read_rules';
 import { alertsClientMock } from '../../../../../../../plugins/alerting/server/mocks';
 import { getResult, getFindResultWithSingleHit } from '../routes/__mocks__/request_responses';
 
-class TestError extends Error {
+export class TestError extends Error {
   constructor() {
     // Pass remaining arguments (including vendor specific ones) to parent constructor
     super();
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 967a32df20c3b..af00816abfc3d 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
@@ -7,7 +7,7 @@
 import { savedObjectsClientMock } from '../../../../../../../../src/core/server/mocks';
 import { alertsClientMock } from '../../../../../../../plugins/alerting/server/mocks';
 import { actionsClientMock } from '../../../../../../../plugins/actions/server/mocks';
-import { getMlResult } from '../routes/__mocks__/request_responses';
+import { getResult, getMlResult } from '../routes/__mocks__/request_responses';
 import { updateRules } from './update_rules';
 
 describe('updateRules', () => {
@@ -21,6 +21,59 @@ describe('updateRules', () => {
     savedObjectsClient = savedObjectsClientMock.create();
   });
 
+  it('should call alertsClient.disable is the rule was enabled and enabled is false', async () => {
+    const rule = getResult();
+    alertsClient.get.mockResolvedValue(getResult());
+
+    await updateRules({
+      alertsClient,
+      actionsClient,
+      actions: [],
+      savedObjectsClient,
+      id: '04128c15-0d1b-4716-a4c5-46997ac7f3bd',
+      ...rule.params,
+      enabled: false,
+      throttle: null,
+      interval: '',
+      name: '',
+      tags: [],
+    });
+
+    expect(alertsClient.disable).toHaveBeenCalledWith(
+      expect.objectContaining({
+        id: '04128c15-0d1b-4716-a4c5-46997ac7f3bd',
+      })
+    );
+  });
+
+  it('should call alertsClient.enable is the rule was disabled and enabled is true', async () => {
+    const rule = getResult();
+    alertsClient.get.mockResolvedValue({
+      ...getResult(),
+      enabled: false,
+    });
+
+    await updateRules({
+      alertsClient,
+      actionsClient,
+      actions: [],
+      savedObjectsClient,
+      id: '04128c15-0d1b-4716-a4c5-46997ac7f3bd',
+      ...rule.params,
+      enabled: true,
+      throttle: null,
+      interval: '',
+      name: '',
+      tags: [],
+    });
+
+    expect(alertsClient.enable).toHaveBeenCalledWith(
+      expect.objectContaining({
+        id: '04128c15-0d1b-4716-a4c5-46997ac7f3bd',
+      })
+    );
+  });
+
   it('calls the alertsClient with ML params', async () => {
     alertsClient.get.mockResolvedValue(getMlResult());
 
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/update_rules.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/update_rules.ts
index a80f986482010..72cbc959c0105 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/update_rules.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/update_rules.ts
@@ -5,13 +5,13 @@
  */
 
 import { PartialAlert } from '../../../../../../../plugins/alerting/server';
+import { transformRuleToAlertAction } from '../../../../common/detection_engine/transform_actions';
 import { readRules } from './read_rules';
 import { IRuleSavedAttributesSavedObjectAttributes, UpdateRuleParams } from './types';
 import { addTags } from './add_tags';
 import { ruleStatusSavedObjectType } from './saved_object_mappings';
 import { calculateVersion } from './utils';
 import { hasListsFeature } from '../feature_flags';
-import { transformRuleToAlertAction } from './transform_actions';
 
 export const updateRules = async ({
   alertsClient,
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/signals/build_bulk_body.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/signals/build_bulk_body.ts
index adbd5f81d372a..f485769dffabc 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/signals/build_bulk_body.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/signals/build_bulk_body.ts
@@ -8,7 +8,8 @@ import { SignalSourceHit, SignalHit } from './types';
 import { buildRule } from './build_rule';
 import { buildSignal } from './build_signal';
 import { buildEventTypeSignal } from './build_event_type_signal';
-import { RuleTypeParams, RuleAlertAction } from '../types';
+import { RuleAlertAction } from '../../../../common/detection_engine/types';
+import { RuleTypeParams } from '../types';
 
 interface BuildBulkBodyParams {
   doc: SignalSourceHit;
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/signals/build_rule.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/signals/build_rule.ts
index e94ca18b186e4..1de80ca0b7eaf 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/signals/build_rule.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/signals/build_rule.ts
@@ -5,7 +5,8 @@
  */
 
 import { pickBy } from 'lodash/fp';
-import { RuleTypeParams, OutputRuleAlertRest, RuleAlertAction } from '../types';
+import { RuleAlertAction } from '../../../../common/detection_engine/types';
+import { RuleTypeParams, OutputRuleAlertRest } from '../types';
 
 interface BuildRuleParams {
   ruleParams: RuleTypeParams;
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/signals/bulk_create_ml_signals.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/signals/bulk_create_ml_signals.ts
index 95adb90172404..66e9f42061658 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/signals/bulk_create_ml_signals.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/signals/bulk_create_ml_signals.ts
@@ -9,7 +9,8 @@ import { SearchResponse } from 'elasticsearch';
 
 import { Logger } from '../../../../../../../../src/core/server';
 import { AlertServices } from '../../../../../../../plugins/alerting/server';
-import { RuleTypeParams, RuleAlertAction } from '../types';
+import { RuleAlertAction } from '../../../../common/detection_engine/types';
+import { RuleTypeParams } from '../types';
 import { singleBulkCreate } from './single_bulk_create';
 import { AnomalyResults, Anomaly } from '../../machine_learning';
 
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/signals/get_filter.test.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/signals/get_filter.test.ts
index b49f43ce9e7ac..86d1278031695 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/signals/get_filter.test.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/signals/get_filter.test.ts
@@ -510,6 +510,20 @@ describe('get_filter', () => {
       ).rejects.toThrow('savedId parameter should be defined');
     });
 
+    test('throws on machine learning query', async () => {
+      await expect(
+        getFilter({
+          type: 'machine_learning',
+          filters: undefined,
+          language: undefined,
+          query: undefined,
+          savedId: 'some-id',
+          services: servicesMock,
+          index: undefined,
+        })
+      ).rejects.toThrow('Unsupported Rule of type "machine_learning" supplied to getFilter');
+    });
+
     test('it works with references and does not add indexes', () => {
       const esQuery = getQueryFilter(
         '(event.module:suricata and event.kind:alert) and suricata.eve.alert.signature_id: (2610182 or 2610183 or 2610184 or 2610185 or 2610186 or 2610187)',
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/signals/search_after_bulk_create.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/signals/search_after_bulk_create.ts
index a12778d5b8f16..4f1a187a82937 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/signals/search_after_bulk_create.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/signals/search_after_bulk_create.ts
@@ -5,7 +5,8 @@
  */
 
 import { AlertServices } from '../../../../../../../plugins/alerting/server';
-import { RuleTypeParams, RuleAlertAction } from '../types';
+import { RuleAlertAction } from '../../../../common/detection_engine/types';
+import { RuleTypeParams } from '../types';
 import { Logger } from '../../../../../../../../src/core/server';
 import { singleSearchAfter } from './single_search_after';
 import { singleBulkCreate } from './single_bulk_create';
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/signals/signal_rule_alert_type.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/signals/signal_rule_alert_type.ts
index 89dcd3274ebed..03d48a6b27867 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/signals/signal_rule_alert_type.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/signals/signal_rule_alert_type.ts
@@ -5,13 +5,17 @@
  */
 
 import { Logger } from 'src/core/server';
-import { SIGNALS_ID, DEFAULT_SEARCH_AFTER_PAGE_SIZE } from '../../../../common/constants';
+import {
+  SIGNALS_ID,
+  DEFAULT_SEARCH_AFTER_PAGE_SIZE,
+  NOTIFICATION_THROTTLE_RULE,
+} from '../../../../common/constants';
 
 import { buildEventsSearchQuery } from './build_events_query';
 import { getInputIndex } from './get_input_output_index';
 import { searchAfterAndBulkCreate } from './search_after_bulk_create';
 import { getFilter } from './get_filter';
-import { SignalRuleAlertTypeDefinition, AlertAttributes } from './types';
+import { SignalRuleAlertTypeDefinition, RuleAlertAttributes } from './types';
 import { getGapBetweenRuns } from './utils';
 import { writeSignalRuleExceptionToSavedObject } from './write_signal_rule_exception_to_saved_object';
 import { signalParamsSchema } from './signal_params_schema';
@@ -22,6 +26,8 @@ import { getCurrentStatusSavedObject } from './get_current_status_saved_object';
 import { writeCurrentStatusSucceeded } from './write_current_status_succeeded';
 import { findMlSignals } from './find_ml_signals';
 import { bulkCreateMlSignals } from './bulk_create_ml_signals';
+import { getSignalsCount } from '../notifications/get_signals_count';
+import { scheduleNotificationActions } from '../notifications/schedule_notification_actions';
 
 export const signalRulesAlertType = ({
   logger,
@@ -46,6 +52,7 @@ export const signalRulesAlertType = ({
         index,
         filters,
         language,
+        meta,
         machineLearningJobId,
         outputIndex,
         savedId,
@@ -53,7 +60,10 @@ export const signalRulesAlertType = ({
         to,
         type,
       } = params;
-      const savedObject = await services.savedObjectsClient.get<AlertAttributes>('alert', alertId);
+      const savedObject = await services.savedObjectsClient.get<RuleAlertAttributes>(
+        'alert',
+        alertId
+      );
 
       const ruleStatusSavedObjects = await getRuleStatusSavedObjects({
         alertId,
@@ -76,6 +86,7 @@ export const signalRulesAlertType = ({
         enabled,
         schedule: { interval },
         throttle,
+        params: ruleParams,
       } = savedObject.attributes;
 
       const updatedAt = savedObject.updated_at ?? '';
@@ -199,6 +210,36 @@ export const signalRulesAlertType = ({
         }
 
         if (creationSucceeded) {
+          if (meta?.throttle === NOTIFICATION_THROTTLE_RULE && actions.length) {
+            const notificationRuleParams = {
+              ...ruleParams,
+              name,
+            };
+            const { signalsCount, resultsLink } = await getSignalsCount({
+              from: `now-${interval}`,
+              to: 'now',
+              index: ruleParams.outputIndex,
+              ruleId: ruleParams.ruleId!,
+              kibanaUrl: meta?.kibanaUrl as string,
+              ruleAlertId: savedObject.id,
+              callCluster: services.callCluster,
+            });
+
+            logger.info(
+              `Found ${signalsCount} signals using signal rule name: "${notificationRuleParams.name}", id: "${notificationRuleParams.ruleId}", rule_id: "${notificationRuleParams.ruleId}" in "${notificationRuleParams.outputIndex}" index`
+            );
+
+            if (signalsCount) {
+              const alertInstance = services.alertInstanceFactory(alertId);
+              scheduleNotificationActions({
+                alertInstance,
+                signalsCount,
+                resultsLink,
+                ruleParams: notificationRuleParams,
+              });
+            }
+          }
+
           logger.debug(
             `Finished signal rule name: "${name}", id: "${alertId}", rule_id: "${ruleId}", output_index: "${outputIndex}"`
           );
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/signals/single_bulk_create.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/signals/single_bulk_create.ts
index 333a938e09d45..e2e4471f609ac 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/signals/single_bulk_create.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/signals/single_bulk_create.ts
@@ -8,7 +8,8 @@ import { countBy, isEmpty } from 'lodash';
 import { performance } from 'perf_hooks';
 import { AlertServices } from '../../../../../../../plugins/alerting/server';
 import { SignalSearchResponse, BulkResponse } from './types';
-import { RuleTypeParams, RuleAlertAction } from '../types';
+import { RuleAlertAction } from '../../../../common/detection_engine/types';
+import { RuleTypeParams } from '../types';
 import { generateId } from './utils';
 import { buildBulkBody } from './build_bulk_body';
 import { Logger } from '../../../../../../../../src/core/server';
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/signals/types.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/signals/types.ts
index 06acff825f68e..93c48ed38c7c4 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/signals/types.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/signals/types.ts
@@ -4,7 +4,8 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { RuleAlertParams, OutputRuleAlertRest, RuleAlertAction } from '../types';
+import { RuleAlertAction } from '../../../../common/detection_engine/types';
+import { RuleAlertParams, OutputRuleAlertRest } from '../types';
 import { SearchResponse } from '../../types';
 import {
   AlertType,
@@ -159,3 +160,7 @@ export interface AlertAttributes {
   };
   throttle: string | null;
 }
+
+export interface RuleAlertAttributes extends AlertAttributes {
+  params: RuleAlertParams;
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/types.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/types.ts
index 2cbdc7db3ba64..aae8763a7ea39 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/types.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/types.ts
@@ -4,11 +4,11 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { AlertAction } from '../../../../../../plugins/alerting/common';
 import { CallAPIOptions } from '../../../../../../../src/core/server';
 import { Filter } from '../../../../../../../src/plugins/data/server';
 import { IRuleStatusAttributes } from './rules/types';
 import { ListsDefaultArraySchema } from './routes/schemas/types/lists_default_array';
+import { RuleAlertAction } from '../../../common/detection_engine/types';
 
 export type PartialFilter = Partial<Filter>;
 
@@ -24,10 +24,6 @@ export interface ThreatParams {
   technique: IMitreAttack[];
 }
 
-export type RuleAlertAction = Omit<AlertAction, 'actionTypeId'> & {
-  action_type_id: string;
-};
-
 // Notice below we are using lists: ListsDefaultArraySchema[]; which is coming directly from the response output section.
 // TODO: Eventually this whole RuleAlertParams will be replaced with io-ts. For now we can slowly strangle it out and reduce duplicate types
 // We don't have the input types defined through io-ts just yet but as we being introducing types from there we will more and more remove
@@ -56,7 +52,7 @@ export interface RuleAlertParams {
   query: string | undefined | null;
   references: string[];
   savedId?: string | undefined | null;
-  meta: Record<string, {}> | undefined | null;
+  meta: Record<string, {} | string> | undefined | null;
   severity: string;
   tags: string[];
   to: string;
@@ -123,6 +119,7 @@ export type OutputRuleAlertRest = RuleAlertParamsRest & {
   created_by: string | undefined | null;
   updated_by: string | undefined | null;
   immutable: boolean;
+  throttle: string | undefined | null;
 };
 
 export type ImportRuleAlertRest = Omit<OutputRuleAlertRest, 'rule_id' | 'id'> & {
diff --git a/x-pack/legacy/plugins/siem/server/plugin.ts b/x-pack/legacy/plugins/siem/server/plugin.ts
index c505edc79bc76..7008872a6f3cd 100644
--- a/x-pack/legacy/plugins/siem/server/plugin.ts
+++ b/x-pack/legacy/plugins/siem/server/plugin.ts
@@ -27,6 +27,8 @@ import { compose } from './lib/compose/kibana';
 import { initRoutes } from './routes';
 import { isAlertExecutor } from './lib/detection_engine/signals/types';
 import { signalRulesAlertType } from './lib/detection_engine/signals/signal_rule_alert_type';
+import { rulesNotificationAlertType } from './lib/detection_engine/notifications/rules_notification_alert_type';
+import { isNotificationAlertExecutor } from './lib/detection_engine/notifications/types';
 import {
   noteSavedObjectType,
   pinnedEventSavedObjectType,
@@ -151,12 +153,20 @@ export class Plugin {
     });
 
     if (plugins.alerting != null) {
-      const type = signalRulesAlertType({
+      const signalRuleType = signalRulesAlertType({
         logger: this.logger,
         version: this.context.env.packageInfo.version,
       });
-      if (isAlertExecutor(type)) {
-        plugins.alerting.registerType(type);
+      const ruleNotificationType = rulesNotificationAlertType({
+        logger: this.logger,
+      });
+
+      if (isAlertExecutor(signalRuleType)) {
+        plugins.alerting.registerType(signalRuleType);
+      }
+
+      if (isNotificationAlertExecutor(ruleNotificationType)) {
+        plugins.alerting.registerType(ruleNotificationType);
       }
     }
 

From babefb5737ddd6cdd6b475dcf61d9d9788c8018a Mon Sep 17 00:00:00 2001
From: Pierre Gayvallet <pierre.gayvallet@elastic.co>
Date: Tue, 24 Mar 2020 14:33:31 +0100
Subject: [PATCH 075/179] introduce StartServicesAccessor type for
 `CoreSetup.getStartServices` (#60748)

* create StartServicesAccessor type

* update generated doc

* update usages to use new type

* add missing public annotation
---
 .../kibana-plugin-core-public.app.mount.md    |  2 +-
 ...ana-plugin-core-public.applicationsetup.md |  2 +-
 ...c.applicationsetup.registermountcontext.md |  2 +-
 ...ana-plugin-core-public.applicationstart.md |  2 +-
 ...c.applicationstart.registermountcontext.md |  2 +-
 ...bana-plugin-core-public.appmountcontext.md |  2 +-
 ...a-plugin-core-public.appmountdeprecated.md |  2 +-
 ...-core-public.coresetup.getstartservices.md | 10 +++------
 .../kibana-plugin-core-public.coresetup.md    |  7 +------
 .../core/public/kibana-plugin-core-public.md  |  3 ++-
 ...lugin-core-public.startservicesaccessor.md | 13 ++++++++++++
 ...-core-server.coresetup.getstartservices.md | 10 +++------
 .../kibana-plugin-core-server.coresetup.md    |  7 +------
 .../core/server/kibana-plugin-core-server.md  |  1 +
 ...lugin-core-server.startservicesaccessor.md | 13 ++++++++++++
 .../kibana-plugin-plugins-data-server.md      |  2 ++
 src/core/public/index.ts                      | 20 +++++++++++-------
 src/core/public/public.api.md                 |  6 +++++-
 src/core/server/index.ts                      | 21 ++++++++++++-------
 src/core/server/server.api.md                 |  6 +++++-
 .../public/management_app/index.tsx           |  4 ++--
 .../data/server/kql_telemetry/route.ts        |  4 ++--
 .../management/public/management_app.tsx      |  4 ++--
 .../management/public/management_section.ts   |  6 +++---
 .../management/public/management_service.ts   |  6 +++---
 .../server/saved_objects/index.ts             | 11 +++++++---
 .../account_management_app.ts                 |  6 +++---
 .../authentication/authentication_service.ts  |  4 ++--
 .../logged_out/logged_out_app.ts              | 11 +++++++---
 .../public/authentication/login/login_app.ts  | 11 +++++++---
 .../overwritten_session_app.ts                |  6 +++---
 .../api_keys/api_keys_management_app.tsx      |  4 ++--
 .../public/management/management_service.ts   |  4 ++--
 .../role_mappings_management_app.tsx          |  4 ++--
 .../management/roles/roles_management_app.tsx |  4 ++--
 .../management/users/users_management_app.tsx |  4 ++--
 .../public/management/management_service.tsx  |  4 ++--
 .../management/spaces_management_app.tsx      |  4 ++--
 .../space_selector/space_selector_app.tsx     |  6 +++---
 39 files changed, 144 insertions(+), 96 deletions(-)
 create mode 100644 docs/development/core/public/kibana-plugin-core-public.startservicesaccessor.md
 create mode 100644 docs/development/core/server/kibana-plugin-core-server.startservicesaccessor.md

diff --git a/docs/development/core/public/kibana-plugin-core-public.app.mount.md b/docs/development/core/public/kibana-plugin-core-public.app.mount.md
index c42f73ced95af..8a9dfd9e2e972 100644
--- a/docs/development/core/public/kibana-plugin-core-public.app.mount.md
+++ b/docs/development/core/public/kibana-plugin-core-public.app.mount.md
@@ -14,5 +14,5 @@ mount: AppMount<HistoryLocationState> | AppMountDeprecated<HistoryLocationState>
 
 ## Remarks
 
-When function has two arguments, it will be called with a [context](./kibana-plugin-core-public.appmountcontext.md) as the first argument. This behavior is \*\*deprecated\*\*, and consumers should instead use [CoreSetup.getStartServices()](./kibana-plugin-core-public.coresetup.getstartservices.md)<!-- -->.
+When function has two arguments, it will be called with a [context](./kibana-plugin-core-public.appmountcontext.md) as the first argument. This behavior is \*\*deprecated\*\*, and consumers should instead use [CoreSetup.getStartServices](./kibana-plugin-core-public.coresetup.getstartservices.md)<!-- -->.
 
diff --git a/docs/development/core/public/kibana-plugin-core-public.applicationsetup.md b/docs/development/core/public/kibana-plugin-core-public.applicationsetup.md
index e5554be515077..fc99e2208220f 100644
--- a/docs/development/core/public/kibana-plugin-core-public.applicationsetup.md
+++ b/docs/development/core/public/kibana-plugin-core-public.applicationsetup.md
@@ -17,5 +17,5 @@ export interface ApplicationSetup
 |  --- | --- |
 |  [register(app)](./kibana-plugin-core-public.applicationsetup.register.md) | Register an mountable application to the system. |
 |  [registerAppUpdater(appUpdater$)](./kibana-plugin-core-public.applicationsetup.registerappupdater.md) | Register an application updater that can be used to change the [AppUpdatableFields](./kibana-plugin-core-public.appupdatablefields.md) fields of all applications at runtime.<!-- -->This is meant to be used by plugins that needs to updates the whole list of applications. To only updates a specific application, use the <code>updater$</code> property of the registered application instead. |
-|  [registerMountContext(contextName, provider)](./kibana-plugin-core-public.applicationsetup.registermountcontext.md) | Register a context provider for application mounting. Will only be available to applications that depend on the plugin that registered this context. Deprecated, use [CoreSetup.getStartServices()](./kibana-plugin-core-public.coresetup.getstartservices.md)<!-- -->. |
+|  [registerMountContext(contextName, provider)](./kibana-plugin-core-public.applicationsetup.registermountcontext.md) | Register a context provider for application mounting. Will only be available to applications that depend on the plugin that registered this context. Deprecated, use [CoreSetup.getStartServices](./kibana-plugin-core-public.coresetup.getstartservices.md)<!-- -->. |
 
diff --git a/docs/development/core/public/kibana-plugin-core-public.applicationsetup.registermountcontext.md b/docs/development/core/public/kibana-plugin-core-public.applicationsetup.registermountcontext.md
index 92a7ae1c0deee..1735d5df943ae 100644
--- a/docs/development/core/public/kibana-plugin-core-public.applicationsetup.registermountcontext.md
+++ b/docs/development/core/public/kibana-plugin-core-public.applicationsetup.registermountcontext.md
@@ -8,7 +8,7 @@
 > 
 > 
 
-Register a context provider for application mounting. Will only be available to applications that depend on the plugin that registered this context. Deprecated, use [CoreSetup.getStartServices()](./kibana-plugin-core-public.coresetup.getstartservices.md)<!-- -->.
+Register a context provider for application mounting. Will only be available to applications that depend on the plugin that registered this context. Deprecated, use [CoreSetup.getStartServices](./kibana-plugin-core-public.coresetup.getstartservices.md)<!-- -->.
 
 <b>Signature:</b>
 
diff --git a/docs/development/core/public/kibana-plugin-core-public.applicationstart.md b/docs/development/core/public/kibana-plugin-core-public.applicationstart.md
index 834411de5d57c..a93bc61bac527 100644
--- a/docs/development/core/public/kibana-plugin-core-public.applicationstart.md
+++ b/docs/development/core/public/kibana-plugin-core-public.applicationstart.md
@@ -24,5 +24,5 @@ export interface ApplicationStart
 |  --- | --- |
 |  [getUrlForApp(appId, options)](./kibana-plugin-core-public.applicationstart.geturlforapp.md) | Returns an URL to a given app, including the global base path. By default, the URL is relative (/basePath/app/my-app). Use the <code>absolute</code> option to generate an absolute url (http://host:port/basePath/app/my-app)<!-- -->Note that when generating absolute urls, the protocol, host and port are determined from the browser location. |
 |  [navigateToApp(appId, options)](./kibana-plugin-core-public.applicationstart.navigatetoapp.md) | Navigate to a given app |
-|  [registerMountContext(contextName, provider)](./kibana-plugin-core-public.applicationstart.registermountcontext.md) | Register a context provider for application mounting. Will only be available to applications that depend on the plugin that registered this context. Deprecated, use [CoreSetup.getStartServices()](./kibana-plugin-core-public.coresetup.getstartservices.md)<!-- -->. |
+|  [registerMountContext(contextName, provider)](./kibana-plugin-core-public.applicationstart.registermountcontext.md) | Register a context provider for application mounting. Will only be available to applications that depend on the plugin that registered this context. Deprecated, use [CoreSetup.getStartServices](./kibana-plugin-core-public.coresetup.getstartservices.md)<!-- -->. |
 
diff --git a/docs/development/core/public/kibana-plugin-core-public.applicationstart.registermountcontext.md b/docs/development/core/public/kibana-plugin-core-public.applicationstart.registermountcontext.md
index 6e0fbb46e9a1e..11f661c4af2b3 100644
--- a/docs/development/core/public/kibana-plugin-core-public.applicationstart.registermountcontext.md
+++ b/docs/development/core/public/kibana-plugin-core-public.applicationstart.registermountcontext.md
@@ -8,7 +8,7 @@
 > 
 > 
 
-Register a context provider for application mounting. Will only be available to applications that depend on the plugin that registered this context. Deprecated, use [CoreSetup.getStartServices()](./kibana-plugin-core-public.coresetup.getstartservices.md)<!-- -->.
+Register a context provider for application mounting. Will only be available to applications that depend on the plugin that registered this context. Deprecated, use [CoreSetup.getStartServices](./kibana-plugin-core-public.coresetup.getstartservices.md)<!-- -->.
 
 <b>Signature:</b>
 
diff --git a/docs/development/core/public/kibana-plugin-core-public.appmountcontext.md b/docs/development/core/public/kibana-plugin-core-public.appmountcontext.md
index d0b243859aab0..52a36b0b56f02 100644
--- a/docs/development/core/public/kibana-plugin-core-public.appmountcontext.md
+++ b/docs/development/core/public/kibana-plugin-core-public.appmountcontext.md
@@ -8,7 +8,7 @@
 > 
 > 
 
-The context object received when applications are mounted to the DOM. Deprecated, use [CoreSetup.getStartServices()](./kibana-plugin-core-public.coresetup.getstartservices.md)<!-- -->.
+The context object received when applications are mounted to the DOM. Deprecated, use [CoreSetup.getStartServices](./kibana-plugin-core-public.coresetup.getstartservices.md)<!-- -->.
 
 <b>Signature:</b>
 
diff --git a/docs/development/core/public/kibana-plugin-core-public.appmountdeprecated.md b/docs/development/core/public/kibana-plugin-core-public.appmountdeprecated.md
index 130689882495a..66b8a69d84a38 100644
--- a/docs/development/core/public/kibana-plugin-core-public.appmountdeprecated.md
+++ b/docs/development/core/public/kibana-plugin-core-public.appmountdeprecated.md
@@ -18,5 +18,5 @@ export declare type AppMountDeprecated<HistoryLocationState = unknown> = (contex
 
 ## Remarks
 
-When function has two arguments, it will be called with a [context](./kibana-plugin-core-public.appmountcontext.md) as the first argument. This behavior is \*\*deprecated\*\*, and consumers should instead use [CoreSetup.getStartServices()](./kibana-plugin-core-public.coresetup.getstartservices.md)<!-- -->.
+When function has two arguments, it will be called with a [context](./kibana-plugin-core-public.appmountcontext.md) as the first argument. This behavior is \*\*deprecated\*\*, and consumers should instead use [CoreSetup.getStartServices](./kibana-plugin-core-public.coresetup.getstartservices.md)<!-- -->.
 
diff --git a/docs/development/core/public/kibana-plugin-core-public.coresetup.getstartservices.md b/docs/development/core/public/kibana-plugin-core-public.coresetup.getstartservices.md
index 91b906cf83d01..e4fec4eae31b1 100644
--- a/docs/development/core/public/kibana-plugin-core-public.coresetup.getstartservices.md
+++ b/docs/development/core/public/kibana-plugin-core-public.coresetup.getstartservices.md
@@ -2,16 +2,12 @@
 
 [Home](./index.md) &gt; [kibana-plugin-core-public](./kibana-plugin-core-public.md) &gt; [CoreSetup](./kibana-plugin-core-public.coresetup.md) &gt; [getStartServices](./kibana-plugin-core-public.coresetup.getstartservices.md)
 
-## CoreSetup.getStartServices() method
+## CoreSetup.getStartServices property
 
-Allows plugins to get access to APIs available in start inside async handlers, such as [App.mount](./kibana-plugin-core-public.app.mount.md)<!-- -->. Promise will not resolve until Core and plugin dependencies have completed `start`<!-- -->.
+[StartServicesAccessor](./kibana-plugin-core-public.startservicesaccessor.md)
 
 <b>Signature:</b>
 
 ```typescript
-getStartServices(): Promise<[CoreStart, TPluginsStart]>;
+getStartServices: StartServicesAccessor<TPluginsStart>;
 ```
-<b>Returns:</b>
-
-`Promise<[CoreStart, TPluginsStart]>`
-
diff --git a/docs/development/core/public/kibana-plugin-core-public.coresetup.md b/docs/development/core/public/kibana-plugin-core-public.coresetup.md
index f211b740e84a3..c039bc19348cc 100644
--- a/docs/development/core/public/kibana-plugin-core-public.coresetup.md
+++ b/docs/development/core/public/kibana-plugin-core-public.coresetup.md
@@ -19,14 +19,9 @@ export interface CoreSetup<TPluginsStart extends object = object>
 |  [application](./kibana-plugin-core-public.coresetup.application.md) | <code>ApplicationSetup</code> | [ApplicationSetup](./kibana-plugin-core-public.applicationsetup.md) |
 |  [context](./kibana-plugin-core-public.coresetup.context.md) | <code>ContextSetup</code> | [ContextSetup](./kibana-plugin-core-public.contextsetup.md) |
 |  [fatalErrors](./kibana-plugin-core-public.coresetup.fatalerrors.md) | <code>FatalErrorsSetup</code> | [FatalErrorsSetup](./kibana-plugin-core-public.fatalerrorssetup.md) |
+|  [getStartServices](./kibana-plugin-core-public.coresetup.getstartservices.md) | <code>StartServicesAccessor&lt;TPluginsStart&gt;</code> | [StartServicesAccessor](./kibana-plugin-core-public.startservicesaccessor.md) |
 |  [http](./kibana-plugin-core-public.coresetup.http.md) | <code>HttpSetup</code> | [HttpSetup](./kibana-plugin-core-public.httpsetup.md) |
 |  [injectedMetadata](./kibana-plugin-core-public.coresetup.injectedmetadata.md) | <code>{</code><br/><code>        getInjectedVar: (name: string, defaultValue?: any) =&gt; unknown;</code><br/><code>    }</code> | exposed temporarily until https://github.com/elastic/kibana/issues/41990 done use \*only\* to retrieve config values. There is no way to set injected values in the new platform. Use the legacy platform API instead. |
 |  [notifications](./kibana-plugin-core-public.coresetup.notifications.md) | <code>NotificationsSetup</code> | [NotificationsSetup](./kibana-plugin-core-public.notificationssetup.md) |
 |  [uiSettings](./kibana-plugin-core-public.coresetup.uisettings.md) | <code>IUiSettingsClient</code> | [IUiSettingsClient](./kibana-plugin-core-public.iuisettingsclient.md) |
 
-## Methods
-
-|  Method | Description |
-|  --- | --- |
-|  [getStartServices()](./kibana-plugin-core-public.coresetup.getstartservices.md) | Allows plugins to get access to APIs available in start inside async handlers, such as [App.mount](./kibana-plugin-core-public.app.mount.md)<!-- -->. Promise will not resolve until Core and plugin dependencies have completed <code>start</code>. |
-
diff --git a/docs/development/core/public/kibana-plugin-core-public.md b/docs/development/core/public/kibana-plugin-core-public.md
index b8aa56eb2941b..adc87de2b9e7e 100644
--- a/docs/development/core/public/kibana-plugin-core-public.md
+++ b/docs/development/core/public/kibana-plugin-core-public.md
@@ -38,7 +38,7 @@ The plugin integrates with the core system via lifecycle events: `setup`<!-- -->
 |  [AppLeaveDefaultAction](./kibana-plugin-core-public.appleavedefaultaction.md) | Action to return from a [AppLeaveHandler](./kibana-plugin-core-public.appleavehandler.md) to execute the default behaviour when leaving the application.<!-- -->See  |
 |  [ApplicationSetup](./kibana-plugin-core-public.applicationsetup.md) |  |
 |  [ApplicationStart](./kibana-plugin-core-public.applicationstart.md) |  |
-|  [AppMountContext](./kibana-plugin-core-public.appmountcontext.md) | The context object received when applications are mounted to the DOM. Deprecated, use [CoreSetup.getStartServices()](./kibana-plugin-core-public.coresetup.getstartservices.md)<!-- -->. |
+|  [AppMountContext](./kibana-plugin-core-public.appmountcontext.md) | The context object received when applications are mounted to the DOM. Deprecated, use [CoreSetup.getStartServices](./kibana-plugin-core-public.coresetup.getstartservices.md)<!-- -->. |
 |  [AppMountParameters](./kibana-plugin-core-public.appmountparameters.md) |  |
 |  [Capabilities](./kibana-plugin-core-public.capabilities.md) | The read-only set of capabilities available for the current UI session. Capabilities are simple key-value pairs of (string, boolean), where the string denotes the capability ID, and the boolean is a flag indicating if the capability is enabled or disabled. |
 |  [ChromeBadge](./kibana-plugin-core-public.chromebadge.md) |  |
@@ -153,6 +153,7 @@ The plugin integrates with the core system via lifecycle events: `setup`<!-- -->
 |  [SavedObjectAttribute](./kibana-plugin-core-public.savedobjectattribute.md) | Type definition for a Saved Object attribute value |
 |  [SavedObjectAttributeSingle](./kibana-plugin-core-public.savedobjectattributesingle.md) | Don't use this type, it's simply a helper type for [SavedObjectAttribute](./kibana-plugin-core-public.savedobjectattribute.md) |
 |  [SavedObjectsClientContract](./kibana-plugin-core-public.savedobjectsclientcontract.md) | SavedObjectsClientContract as implemented by the [SavedObjectsClient](./kibana-plugin-core-public.savedobjectsclient.md) |
+|  [StartServicesAccessor](./kibana-plugin-core-public.startservicesaccessor.md) | Allows plugins to get access to APIs available in start inside async handlers, such as [App.mount](./kibana-plugin-core-public.app.mount.md)<!-- -->. Promise will not resolve until Core and plugin dependencies have completed <code>start</code>. |
 |  [StringValidation](./kibana-plugin-core-public.stringvalidation.md) | Allows regex objects or a regex string |
 |  [Toast](./kibana-plugin-core-public.toast.md) |  |
 |  [ToastInput](./kibana-plugin-core-public.toastinput.md) | Inputs for [IToasts](./kibana-plugin-core-public.itoasts.md) APIs. |
diff --git a/docs/development/core/public/kibana-plugin-core-public.startservicesaccessor.md b/docs/development/core/public/kibana-plugin-core-public.startservicesaccessor.md
new file mode 100644
index 0000000000000..02e896a6b47e5
--- /dev/null
+++ b/docs/development/core/public/kibana-plugin-core-public.startservicesaccessor.md
@@ -0,0 +1,13 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-core-public](./kibana-plugin-core-public.md) &gt; [StartServicesAccessor](./kibana-plugin-core-public.startservicesaccessor.md)
+
+## StartServicesAccessor type
+
+Allows plugins to get access to APIs available in start inside async handlers, such as [App.mount](./kibana-plugin-core-public.app.mount.md)<!-- -->. Promise will not resolve until Core and plugin dependencies have completed `start`<!-- -->.
+
+<b>Signature:</b>
+
+```typescript
+export declare type StartServicesAccessor<TPluginsStart extends object = object> = () => Promise<[CoreStart, TPluginsStart]>;
+```
diff --git a/docs/development/core/server/kibana-plugin-core-server.coresetup.getstartservices.md b/docs/development/core/server/kibana-plugin-core-server.coresetup.getstartservices.md
index 10a656363c0d0..ea8e610ee56de 100644
--- a/docs/development/core/server/kibana-plugin-core-server.coresetup.getstartservices.md
+++ b/docs/development/core/server/kibana-plugin-core-server.coresetup.getstartservices.md
@@ -2,16 +2,12 @@
 
 [Home](./index.md) &gt; [kibana-plugin-core-server](./kibana-plugin-core-server.md) &gt; [CoreSetup](./kibana-plugin-core-server.coresetup.md) &gt; [getStartServices](./kibana-plugin-core-server.coresetup.getstartservices.md)
 
-## CoreSetup.getStartServices() method
+## CoreSetup.getStartServices property
 
-Allows plugins to get access to APIs available in start inside async handlers. Promise will not resolve until Core and plugin dependencies have completed `start`<!-- -->. This should only be used inside handlers registered during `setup` that will only be executed after `start` lifecycle.
+[StartServicesAccessor](./kibana-plugin-core-server.startservicesaccessor.md)
 
 <b>Signature:</b>
 
 ```typescript
-getStartServices(): Promise<[CoreStart, TPluginsStart]>;
+getStartServices: StartServicesAccessor<TPluginsStart>;
 ```
-<b>Returns:</b>
-
-`Promise<[CoreStart, TPluginsStart]>`
-
diff --git a/docs/development/core/server/kibana-plugin-core-server.coresetup.md b/docs/development/core/server/kibana-plugin-core-server.coresetup.md
index 5b5803629cc86..b0eba8ac78063 100644
--- a/docs/development/core/server/kibana-plugin-core-server.coresetup.md
+++ b/docs/development/core/server/kibana-plugin-core-server.coresetup.md
@@ -19,15 +19,10 @@ export interface CoreSetup<TPluginsStart extends object = object>
 |  [capabilities](./kibana-plugin-core-server.coresetup.capabilities.md) | <code>CapabilitiesSetup</code> | [CapabilitiesSetup](./kibana-plugin-core-server.capabilitiessetup.md) |
 |  [context](./kibana-plugin-core-server.coresetup.context.md) | <code>ContextSetup</code> | [ContextSetup](./kibana-plugin-core-server.contextsetup.md) |
 |  [elasticsearch](./kibana-plugin-core-server.coresetup.elasticsearch.md) | <code>ElasticsearchServiceSetup</code> | [ElasticsearchServiceSetup](./kibana-plugin-core-server.elasticsearchservicesetup.md) |
+|  [getStartServices](./kibana-plugin-core-server.coresetup.getstartservices.md) | <code>StartServicesAccessor&lt;TPluginsStart&gt;</code> | [StartServicesAccessor](./kibana-plugin-core-server.startservicesaccessor.md) |
 |  [http](./kibana-plugin-core-server.coresetup.http.md) | <code>HttpServiceSetup</code> | [HttpServiceSetup](./kibana-plugin-core-server.httpservicesetup.md) |
 |  [metrics](./kibana-plugin-core-server.coresetup.metrics.md) | <code>MetricsServiceSetup</code> | [MetricsServiceSetup](./kibana-plugin-core-server.metricsservicesetup.md) |
 |  [savedObjects](./kibana-plugin-core-server.coresetup.savedobjects.md) | <code>SavedObjectsServiceSetup</code> | [SavedObjectsServiceSetup](./kibana-plugin-core-server.savedobjectsservicesetup.md) |
 |  [uiSettings](./kibana-plugin-core-server.coresetup.uisettings.md) | <code>UiSettingsServiceSetup</code> | [UiSettingsServiceSetup](./kibana-plugin-core-server.uisettingsservicesetup.md) |
 |  [uuid](./kibana-plugin-core-server.coresetup.uuid.md) | <code>UuidServiceSetup</code> | [UuidServiceSetup](./kibana-plugin-core-server.uuidservicesetup.md) |
 
-## Methods
-
-|  Method | Description |
-|  --- | --- |
-|  [getStartServices()](./kibana-plugin-core-server.coresetup.getstartservices.md) | Allows plugins to get access to APIs available in start inside async handlers. Promise will not resolve until Core and plugin dependencies have completed <code>start</code>. This should only be used inside handlers registered during <code>setup</code> that will only be executed after <code>start</code> lifecycle. |
-
diff --git a/docs/development/core/server/kibana-plugin-core-server.md b/docs/development/core/server/kibana-plugin-core-server.md
index 54cf496b2d6af..a1158dc853918 100644
--- a/docs/development/core/server/kibana-plugin-core-server.md
+++ b/docs/development/core/server/kibana-plugin-core-server.md
@@ -259,6 +259,7 @@ The plugin integrates with the core system via lifecycle events: `setup`<!-- -->
 |  [SavedObjectsFieldMapping](./kibana-plugin-core-server.savedobjectsfieldmapping.md) | Describe a [saved object type mapping](./kibana-plugin-core-server.savedobjectstypemappingdefinition.md) field.<!-- -->Please refer to [elasticsearch documentation](https://www.elastic.co/guide/en/elasticsearch/reference/current/mapping-types.html) For the mapping documentation |
 |  [ScopeableRequest](./kibana-plugin-core-server.scopeablerequest.md) | A user credentials container. It accommodates the necessary auth credentials to impersonate the current user.<!-- -->See [KibanaRequest](./kibana-plugin-core-server.kibanarequest.md)<!-- -->. |
 |  [SharedGlobalConfig](./kibana-plugin-core-server.sharedglobalconfig.md) |  |
+|  [StartServicesAccessor](./kibana-plugin-core-server.startservicesaccessor.md) | Allows plugins to get access to APIs available in start inside async handlers. Promise will not resolve until Core and plugin dependencies have completed <code>start</code>. This should only be used inside handlers registered during <code>setup</code> that will only be executed after <code>start</code> lifecycle. |
 |  [StringValidation](./kibana-plugin-core-server.stringvalidation.md) | Allows regex objects or a regex string |
 |  [UiSettingsType](./kibana-plugin-core-server.uisettingstype.md) | UI element type to represent the settings. |
 
diff --git a/docs/development/core/server/kibana-plugin-core-server.startservicesaccessor.md b/docs/development/core/server/kibana-plugin-core-server.startservicesaccessor.md
new file mode 100644
index 0000000000000..4de781fc99cc1
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-core-server.startservicesaccessor.md
@@ -0,0 +1,13 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-core-server](./kibana-plugin-core-server.md) &gt; [StartServicesAccessor](./kibana-plugin-core-server.startservicesaccessor.md)
+
+## StartServicesAccessor type
+
+Allows plugins to get access to APIs available in start inside async handlers. Promise will not resolve until Core and plugin dependencies have completed `start`<!-- -->. This should only be used inside handlers registered during `setup` that will only be executed after `start` lifecycle.
+
+<b>Signature:</b>
+
+```typescript
+export declare type StartServicesAccessor<TPluginsStart extends object = object> = () => Promise<[CoreStart, TPluginsStart]>;
+```
diff --git a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.md b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.md
index d179b9d9dcd82..e756eb9b72905 100644
--- a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.md
+++ b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.md
@@ -60,6 +60,7 @@
 |  [esQuery](./kibana-plugin-plugins-data-server.esquery.md) |  |
 |  [fieldFormats](./kibana-plugin-plugins-data-server.fieldformats.md) |  |
 |  [indexPatterns](./kibana-plugin-plugins-data-server.indexpatterns.md) |  |
+|  [search](./kibana-plugin-plugins-data-server.search.md) |  |
 
 ## Type Aliases
 
@@ -69,5 +70,6 @@
 |  [IFieldFormatsRegistry](./kibana-plugin-plugins-data-server.ifieldformatsregistry.md) |  |
 |  [ISearch](./kibana-plugin-plugins-data-server.isearch.md) |  |
 |  [ISearchCancel](./kibana-plugin-plugins-data-server.isearchcancel.md) |  |
+|  [ParsedInterval](./kibana-plugin-plugins-data-server.parsedinterval.md) |  |
 |  [TSearchStrategyProvider](./kibana-plugin-plugins-data-server.tsearchstrategyprovider.md) | Search strategy provider creates an instance of a search strategy with the request handler context bound to it. This way every search strategy can use whatever information they require from the request context. |
 
diff --git a/src/core/public/index.ts b/src/core/public/index.ts
index b91afa3ae7dc0..f72e115fd24ff 100644
--- a/src/core/public/index.ts
+++ b/src/core/public/index.ts
@@ -208,15 +208,21 @@ export interface CoreSetup<TPluginsStart extends object = object> {
   injectedMetadata: {
     getInjectedVar: (name: string, defaultValue?: any) => unknown;
   };
-
-  /**
-   * Allows plugins to get access to APIs available in start inside async
-   * handlers, such as {@link App.mount}. Promise will not resolve until Core
-   * and plugin dependencies have completed `start`.
-   */
-  getStartServices(): Promise<[CoreStart, TPluginsStart]>;
+  /** {@link StartServicesAccessor} */
+  getStartServices: StartServicesAccessor<TPluginsStart>;
 }
 
+/**
+ * Allows plugins to get access to APIs available in start inside async
+ * handlers, such as {@link App.mount}. Promise will not resolve until Core
+ * and plugin dependencies have completed `start`.
+ *
+ * @public
+ */
+export type StartServicesAccessor<TPluginsStart extends object = object> = () => Promise<
+  [CoreStart, TPluginsStart]
+>;
+
 /**
  * Core services exposed to the `Plugin` start lifecycle
  *
diff --git a/src/core/public/public.api.md b/src/core/public/public.api.md
index 37212a07ee631..eec12f2348176 100644
--- a/src/core/public/public.api.md
+++ b/src/core/public/public.api.md
@@ -378,7 +378,8 @@ export interface CoreSetup<TPluginsStart extends object = object> {
     context: ContextSetup;
     // (undocumented)
     fatalErrors: FatalErrorsSetup;
-    getStartServices(): Promise<[CoreStart, TPluginsStart]>;
+    // (undocumented)
+    getStartServices: StartServicesAccessor<TPluginsStart>;
     // (undocumented)
     http: HttpSetup;
     // @deprecated
@@ -1235,6 +1236,9 @@ export class SimpleSavedObject<T = unknown> {
     _version?: SavedObject<T>['version'];
 }
 
+// @public
+export type StartServicesAccessor<TPluginsStart extends object = object> = () => Promise<[CoreStart, TPluginsStart]>;
+
 // @public
 export type StringValidation = StringValidationRegex | StringValidationRegexString;
 
diff --git a/src/core/server/index.ts b/src/core/server/index.ts
index 89fee92a7ef02..1b436bfd72622 100644
--- a/src/core/server/index.ts
+++ b/src/core/server/index.ts
@@ -352,15 +352,22 @@ export interface CoreSetup<TPluginsStart extends object = object> {
   uuid: UuidServiceSetup;
   /** {@link MetricsServiceSetup} */
   metrics: MetricsServiceSetup;
-  /**
-   * Allows plugins to get access to APIs available in start inside async handlers.
-   * Promise will not resolve until Core and plugin dependencies have completed `start`.
-   * This should only be used inside handlers registered during `setup` that will only be executed
-   * after `start` lifecycle.
-   */
-  getStartServices(): Promise<[CoreStart, TPluginsStart]>;
+  /** {@link StartServicesAccessor} */
+  getStartServices: StartServicesAccessor<TPluginsStart>;
 }
 
+/**
+ * Allows plugins to get access to APIs available in start inside async handlers.
+ * Promise will not resolve until Core and plugin dependencies have completed `start`.
+ * This should only be used inside handlers registered during `setup` that will only be executed
+ * after `start` lifecycle.
+ *
+ * @public
+ */
+export type StartServicesAccessor<TPluginsStart extends object = object> = () => Promise<
+  [CoreStart, TPluginsStart]
+>;
+
 /**
  * Context passed to the plugins `start` method.
  *
diff --git a/src/core/server/server.api.md b/src/core/server/server.api.md
index 229ffc4d21575..6d4181e5e1ab3 100644
--- a/src/core/server/server.api.md
+++ b/src/core/server/server.api.md
@@ -629,7 +629,8 @@ export interface CoreSetup<TPluginsStart extends object = object> {
     context: ContextSetup;
     // (undocumented)
     elasticsearch: ElasticsearchServiceSetup;
-    getStartServices(): Promise<[CoreStart, TPluginsStart]>;
+    // (undocumented)
+    getStartServices: StartServicesAccessor<TPluginsStart>;
     // (undocumented)
     http: HttpServiceSetup;
     // (undocumented)
@@ -2269,6 +2270,9 @@ export type SharedGlobalConfig = RecursiveReadonly_2<{
     path: Pick<PathConfigType, typeof SharedGlobalConfigKeys.path[number]>;
 }>;
 
+// @public
+export type StartServicesAccessor<TPluginsStart extends object = object> = () => Promise<[CoreStart, TPluginsStart]>;
+
 // @public
 export type StringValidation = StringValidationRegex | StringValidationRegexString;
 
diff --git a/src/plugins/advanced_settings/public/management_app/index.tsx b/src/plugins/advanced_settings/public/management_app/index.tsx
index 27d3114051c16..53b8f9983aa27 100644
--- a/src/plugins/advanced_settings/public/management_app/index.tsx
+++ b/src/plugins/advanced_settings/public/management_app/index.tsx
@@ -24,7 +24,7 @@ import { i18n } from '@kbn/i18n';
 import { I18nProvider } from '@kbn/i18n/react';
 import { AdvancedSettings } from './advanced_settings';
 import { ManagementSetup } from '../../../management/public';
-import { CoreSetup } from '../../../../core/public';
+import { StartServicesAccessor } from '../../../../core/public';
 import { ComponentRegistry } from '../types';
 
 const title = i18n.translate('advancedSettings.advancedSettingsLabel', {
@@ -48,7 +48,7 @@ export async function registerAdvSettingsMgmntApp({
   componentRegistry,
 }: {
   management: ManagementSetup;
-  getStartServices: CoreSetup['getStartServices'];
+  getStartServices: StartServicesAccessor;
   componentRegistry: ComponentRegistry['start'];
 }) {
   const kibanaSection = management.sections.getSection('kibana');
diff --git a/src/plugins/data/server/kql_telemetry/route.ts b/src/plugins/data/server/kql_telemetry/route.ts
index d5725c859c9a9..dd7ff333e6257 100644
--- a/src/plugins/data/server/kql_telemetry/route.ts
+++ b/src/plugins/data/server/kql_telemetry/route.ts
@@ -17,12 +17,12 @@
  * under the License.
  */
 
-import { CoreSetup, IRouter, Logger } from 'kibana/server';
+import { StartServicesAccessor, IRouter, Logger } from 'kibana/server';
 import { schema } from '@kbn/config-schema';
 
 export function registerKqlTelemetryRoute(
   router: IRouter,
-  getStartServices: CoreSetup['getStartServices'],
+  getStartServices: StartServicesAccessor,
   logger: Logger
 ) {
   router.post(
diff --git a/src/plugins/management/public/management_app.tsx b/src/plugins/management/public/management_app.tsx
index 705d98eaaf2ff..38db1039042e5 100644
--- a/src/plugins/management/public/management_app.tsx
+++ b/src/plugins/management/public/management_app.tsx
@@ -26,7 +26,7 @@ import { KibanaLegacySetup } from '../../kibana_legacy/public';
 import { LegacyManagementSection } from './legacy';
 import { ManagementChrome } from './components';
 import { ManagementSection } from './management_section';
-import { ChromeBreadcrumb, CoreSetup } from '../../../core/public/';
+import { ChromeBreadcrumb, StartServicesAccessor } from '../../../core/public/';
 
 export class ManagementApp {
   readonly id: string;
@@ -41,7 +41,7 @@ export class ManagementApp {
     getSections: () => ManagementSection[],
     registerLegacyApp: KibanaLegacySetup['registerLegacyApp'],
     getLegacyManagementSections: () => LegacyManagementSection,
-    getStartServices: CoreSetup['getStartServices']
+    getStartServices: StartServicesAccessor
   ) {
     this.id = id;
     this.title = title;
diff --git a/src/plugins/management/public/management_section.ts b/src/plugins/management/public/management_section.ts
index 2f323c4b6a9cf..483605341ae4c 100644
--- a/src/plugins/management/public/management_section.ts
+++ b/src/plugins/management/public/management_section.ts
@@ -19,7 +19,7 @@
 
 import { CreateSection, RegisterManagementAppArgs } from './types';
 import { KibanaLegacySetup } from '../../kibana_legacy/public';
-import { CoreSetup } from '../../../core/public';
+import { StartServicesAccessor } from '../../../core/public';
 // @ts-ignore
 import { LegacyManagementSection } from './legacy';
 import { ManagementApp } from './management_app';
@@ -34,14 +34,14 @@ export class ManagementSection {
   private readonly getSections: () => ManagementSection[];
   private readonly registerLegacyApp: KibanaLegacySetup['registerLegacyApp'];
   private readonly getLegacyManagementSection: () => LegacyManagementSection;
-  private readonly getStartServices: CoreSetup['getStartServices'];
+  private readonly getStartServices: StartServicesAccessor;
 
   constructor(
     { id, title, order = 100, euiIconType, icon }: CreateSection,
     getSections: () => ManagementSection[],
     registerLegacyApp: KibanaLegacySetup['registerLegacyApp'],
     getLegacyManagementSection: () => ManagementSection,
-    getStartServices: CoreSetup['getStartServices']
+    getStartServices: StartServicesAccessor
   ) {
     this.id = id;
     this.title = title;
diff --git a/src/plugins/management/public/management_service.ts b/src/plugins/management/public/management_service.ts
index 4a900345b3843..ed31a22992da8 100644
--- a/src/plugins/management/public/management_service.ts
+++ b/src/plugins/management/public/management_service.ts
@@ -22,7 +22,7 @@ import { KibanaLegacySetup } from '../../kibana_legacy/public';
 // @ts-ignore
 import { LegacyManagementSection } from './legacy';
 import { CreateSection } from './types';
-import { CoreSetup, CoreStart } from '../../../core/public';
+import { StartServicesAccessor, CoreStart } from '../../../core/public';
 
 export class ManagementService {
   private sections: ManagementSection[] = [];
@@ -30,7 +30,7 @@ export class ManagementService {
   private register(
     registerLegacyApp: KibanaLegacySetup['registerLegacyApp'],
     getLegacyManagement: () => LegacyManagementSection,
-    getStartServices: CoreSetup['getStartServices']
+    getStartServices: StartServicesAccessor
   ) {
     return (section: CreateSection) => {
       if (this.getSection(section.id)) {
@@ -71,7 +71,7 @@ export class ManagementService {
   public setup(
     kibanaLegacy: KibanaLegacySetup,
     getLegacyManagement: () => LegacyManagementSection,
-    getStartServices: CoreSetup['getStartServices']
+    getStartServices: StartServicesAccessor
   ) {
     const register = this.register.bind(this)(
       kibanaLegacy.registerLegacyApp,
diff --git a/x-pack/plugins/encrypted_saved_objects/server/saved_objects/index.ts b/x-pack/plugins/encrypted_saved_objects/server/saved_objects/index.ts
index 0dbdc2f3ac7e3..c76477cd8da43 100644
--- a/x-pack/plugins/encrypted_saved_objects/server/saved_objects/index.ts
+++ b/x-pack/plugins/encrypted_saved_objects/server/saved_objects/index.ts
@@ -4,14 +4,19 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { CoreSetup, SavedObject, SavedObjectsBaseOptions } from 'src/core/server';
+import {
+  StartServicesAccessor,
+  SavedObject,
+  SavedObjectsBaseOptions,
+  SavedObjectsServiceSetup,
+} from 'src/core/server';
 import { EncryptedSavedObjectsService } from '../crypto';
 import { EncryptedSavedObjectsClientWrapper } from './encrypted_saved_objects_client_wrapper';
 
 interface SetupSavedObjectsParams {
   service: PublicMethodsOf<EncryptedSavedObjectsService>;
-  savedObjects: CoreSetup['savedObjects'];
-  getStartServices: CoreSetup['getStartServices'];
+  savedObjects: SavedObjectsServiceSetup;
+  getStartServices: StartServicesAccessor;
 }
 
 export interface SavedObjectsSetup {
diff --git a/x-pack/plugins/security/public/account_management/account_management_app.ts b/x-pack/plugins/security/public/account_management/account_management_app.ts
index 8a14a772a1eef..cd3ef34858b19 100644
--- a/x-pack/plugins/security/public/account_management/account_management_app.ts
+++ b/x-pack/plugins/security/public/account_management/account_management_app.ts
@@ -5,14 +5,14 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { CoreSetup, AppMountParameters } from 'src/core/public';
+import { StartServicesAccessor, ApplicationSetup, AppMountParameters } from 'src/core/public';
 import { AuthenticationServiceSetup } from '../authentication';
 import { UserAPIClient } from '../management';
 
 interface CreateDeps {
-  application: CoreSetup['application'];
+  application: ApplicationSetup;
   authc: AuthenticationServiceSetup;
-  getStartServices: CoreSetup['getStartServices'];
+  getStartServices: StartServicesAccessor;
 }
 
 export const accountManagementApp = Object.freeze({
diff --git a/x-pack/plugins/security/public/authentication/authentication_service.ts b/x-pack/plugins/security/public/authentication/authentication_service.ts
index 7b88b0f8573ba..979f7095cf933 100644
--- a/x-pack/plugins/security/public/authentication/authentication_service.ts
+++ b/x-pack/plugins/security/public/authentication/authentication_service.ts
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { ApplicationSetup, CoreSetup, HttpSetup } from 'src/core/public';
+import { ApplicationSetup, StartServicesAccessor, HttpSetup } from 'src/core/public';
 import { AuthenticatedUser } from '../../common/model';
 import { ConfigType } from '../config';
 import { PluginStartDependencies } from '../plugin';
@@ -17,7 +17,7 @@ interface SetupParams {
   application: ApplicationSetup;
   config: ConfigType;
   http: HttpSetup;
-  getStartServices: CoreSetup<PluginStartDependencies>['getStartServices'];
+  getStartServices: StartServicesAccessor<PluginStartDependencies>;
 }
 
 export interface AuthenticationServiceSetup {
diff --git a/x-pack/plugins/security/public/authentication/logged_out/logged_out_app.ts b/x-pack/plugins/security/public/authentication/logged_out/logged_out_app.ts
index b7f2615318791..2849111e7efeb 100644
--- a/x-pack/plugins/security/public/authentication/logged_out/logged_out_app.ts
+++ b/x-pack/plugins/security/public/authentication/logged_out/logged_out_app.ts
@@ -5,12 +5,17 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { CoreSetup, AppMountParameters, HttpSetup } from 'src/core/public';
+import {
+  StartServicesAccessor,
+  ApplicationSetup,
+  AppMountParameters,
+  HttpSetup,
+} from 'src/core/public';
 
 interface CreateDeps {
-  application: CoreSetup['application'];
+  application: ApplicationSetup;
   http: HttpSetup;
-  getStartServices: CoreSetup['getStartServices'];
+  getStartServices: StartServicesAccessor;
 }
 
 export const loggedOutApp = Object.freeze({
diff --git a/x-pack/plugins/security/public/authentication/login/login_app.ts b/x-pack/plugins/security/public/authentication/login/login_app.ts
index 1642aba51c1ae..1ecb5dcfd7990 100644
--- a/x-pack/plugins/security/public/authentication/login/login_app.ts
+++ b/x-pack/plugins/security/public/authentication/login/login_app.ts
@@ -5,13 +5,18 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { CoreSetup, AppMountParameters, HttpSetup } from 'src/core/public';
+import {
+  StartServicesAccessor,
+  AppMountParameters,
+  ApplicationSetup,
+  HttpSetup,
+} from 'src/core/public';
 import { ConfigType } from '../../config';
 
 interface CreateDeps {
-  application: CoreSetup['application'];
+  application: ApplicationSetup;
   http: HttpSetup;
-  getStartServices: CoreSetup['getStartServices'];
+  getStartServices: StartServicesAccessor;
   config: Pick<ConfigType, 'loginAssistanceMessage'>;
 }
 
diff --git a/x-pack/plugins/security/public/authentication/overwritten_session/overwritten_session_app.ts b/x-pack/plugins/security/public/authentication/overwritten_session/overwritten_session_app.ts
index 1bbe388a635e2..8e0ee73dfb613 100644
--- a/x-pack/plugins/security/public/authentication/overwritten_session/overwritten_session_app.ts
+++ b/x-pack/plugins/security/public/authentication/overwritten_session/overwritten_session_app.ts
@@ -5,13 +5,13 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { CoreSetup, AppMountParameters } from 'src/core/public';
+import { StartServicesAccessor, ApplicationSetup, AppMountParameters } from 'src/core/public';
 import { AuthenticationServiceSetup } from '../authentication_service';
 
 interface CreateDeps {
-  application: CoreSetup['application'];
+  application: ApplicationSetup;
   authc: AuthenticationServiceSetup;
-  getStartServices: CoreSetup['getStartServices'];
+  getStartServices: StartServicesAccessor;
 }
 
 export const overwrittenSessionApp = Object.freeze({
diff --git a/x-pack/plugins/security/public/management/api_keys/api_keys_management_app.tsx b/x-pack/plugins/security/public/management/api_keys/api_keys_management_app.tsx
index 35de732b84ce9..272fc9cfc2fe6 100644
--- a/x-pack/plugins/security/public/management/api_keys/api_keys_management_app.tsx
+++ b/x-pack/plugins/security/public/management/api_keys/api_keys_management_app.tsx
@@ -7,7 +7,7 @@
 import React from 'react';
 import { render, unmountComponentAtNode } from 'react-dom';
 import { i18n } from '@kbn/i18n';
-import { CoreSetup } from 'src/core/public';
+import { StartServicesAccessor } from 'src/core/public';
 import { RegisterManagementAppArgs } from '../../../../../../src/plugins/management/public';
 import { PluginStartDependencies } from '../../plugin';
 import { APIKeysGridPage } from './api_keys_grid';
@@ -15,7 +15,7 @@ import { APIKeysAPIClient } from './api_keys_api_client';
 import { DocumentationLinksService } from './documentation_links';
 
 interface CreateParams {
-  getStartServices: CoreSetup<PluginStartDependencies>['getStartServices'];
+  getStartServices: StartServicesAccessor<PluginStartDependencies>;
 }
 
 export const apiKeysManagementApp = Object.freeze({
diff --git a/x-pack/plugins/security/public/management/management_service.ts b/x-pack/plugins/security/public/management/management_service.ts
index 5ad3681590fbf..7c4c470730ffe 100644
--- a/x-pack/plugins/security/public/management/management_service.ts
+++ b/x-pack/plugins/security/public/management/management_service.ts
@@ -6,7 +6,7 @@
 
 import { Subscription } from 'rxjs';
 import { i18n } from '@kbn/i18n';
-import { CoreSetup, FatalErrorsSetup } from 'src/core/public';
+import { StartServicesAccessor, FatalErrorsSetup } from 'src/core/public';
 import {
   ManagementApp,
   ManagementSetup,
@@ -25,7 +25,7 @@ interface SetupParams {
   license: SecurityLicense;
   authc: AuthenticationServiceSetup;
   fatalErrors: FatalErrorsSetup;
-  getStartServices: CoreSetup<PluginStartDependencies>['getStartServices'];
+  getStartServices: StartServicesAccessor<PluginStartDependencies>;
 }
 
 interface StartParams {
diff --git a/x-pack/plugins/security/public/management/role_mappings/role_mappings_management_app.tsx b/x-pack/plugins/security/public/management/role_mappings/role_mappings_management_app.tsx
index 8e1ac8d7f6957..ea090520fdd46 100644
--- a/x-pack/plugins/security/public/management/role_mappings/role_mappings_management_app.tsx
+++ b/x-pack/plugins/security/public/management/role_mappings/role_mappings_management_app.tsx
@@ -8,7 +8,7 @@ import React from 'react';
 import { render, unmountComponentAtNode } from 'react-dom';
 import { HashRouter as Router, Route, Switch, useParams } from 'react-router-dom';
 import { i18n } from '@kbn/i18n';
-import { CoreSetup } from 'src/core/public';
+import { StartServicesAccessor } from 'src/core/public';
 import { RegisterManagementAppArgs } from '../../../../../../src/plugins/management/public';
 import { PluginStartDependencies } from '../../plugin';
 import { RolesAPIClient } from '../roles';
@@ -18,7 +18,7 @@ import { RoleMappingsGridPage } from './role_mappings_grid';
 import { EditRoleMappingPage } from './edit_role_mapping';
 
 interface CreateParams {
-  getStartServices: CoreSetup<PluginStartDependencies>['getStartServices'];
+  getStartServices: StartServicesAccessor<PluginStartDependencies>;
 }
 
 export const roleMappingsManagementApp = Object.freeze({
diff --git a/x-pack/plugins/security/public/management/roles/roles_management_app.tsx b/x-pack/plugins/security/public/management/roles/roles_management_app.tsx
index 4e8c95b61c2f1..4265cac22ece0 100644
--- a/x-pack/plugins/security/public/management/roles/roles_management_app.tsx
+++ b/x-pack/plugins/security/public/management/roles/roles_management_app.tsx
@@ -8,7 +8,7 @@ import React from 'react';
 import { render, unmountComponentAtNode } from 'react-dom';
 import { HashRouter as Router, Route, Switch, useParams } from 'react-router-dom';
 import { i18n } from '@kbn/i18n';
-import { CoreSetup, FatalErrorsSetup } from 'src/core/public';
+import { StartServicesAccessor, FatalErrorsSetup } from 'src/core/public';
 import { RegisterManagementAppArgs } from '../../../../../../src/plugins/management/public';
 import { SecurityLicense } from '../../../common/licensing';
 import { PluginStartDependencies } from '../../plugin';
@@ -23,7 +23,7 @@ import { PrivilegesAPIClient } from './privileges_api_client';
 interface CreateParams {
   fatalErrors: FatalErrorsSetup;
   license: SecurityLicense;
-  getStartServices: CoreSetup<PluginStartDependencies>['getStartServices'];
+  getStartServices: StartServicesAccessor<PluginStartDependencies>;
 }
 
 export const rolesManagementApp = Object.freeze({
diff --git a/x-pack/plugins/security/public/management/users/users_management_app.tsx b/x-pack/plugins/security/public/management/users/users_management_app.tsx
index 7874b810676b5..82a2b8d2a98ad 100644
--- a/x-pack/plugins/security/public/management/users/users_management_app.tsx
+++ b/x-pack/plugins/security/public/management/users/users_management_app.tsx
@@ -8,7 +8,7 @@ import React from 'react';
 import { render, unmountComponentAtNode } from 'react-dom';
 import { HashRouter as Router, Route, Switch, useParams } from 'react-router-dom';
 import { i18n } from '@kbn/i18n';
-import { CoreSetup } from 'src/core/public';
+import { StartServicesAccessor } from 'src/core/public';
 import { RegisterManagementAppArgs } from '../../../../../../src/plugins/management/public';
 import { AuthenticationServiceSetup } from '../../authentication';
 import { PluginStartDependencies } from '../../plugin';
@@ -19,7 +19,7 @@ import { EditUserPage } from './edit_user';
 
 interface CreateParams {
   authc: AuthenticationServiceSetup;
-  getStartServices: CoreSetup<PluginStartDependencies>['getStartServices'];
+  getStartServices: StartServicesAccessor<PluginStartDependencies>;
 }
 
 export const usersManagementApp = Object.freeze({
diff --git a/x-pack/plugins/spaces/public/management/management_service.tsx b/x-pack/plugins/spaces/public/management/management_service.tsx
index c81a3497762a5..cec4bee1373ca 100644
--- a/x-pack/plugins/spaces/public/management/management_service.tsx
+++ b/x-pack/plugins/spaces/public/management/management_service.tsx
@@ -5,7 +5,7 @@
  */
 
 import { ManagementSetup, ManagementApp } from 'src/plugins/management/public';
-import { CoreSetup, Capabilities } from 'src/core/public';
+import { StartServicesAccessor, Capabilities } from 'src/core/public';
 import { SecurityLicense } from '../../../security/public';
 import { SpacesManager } from '../spaces_manager';
 import { PluginsStart } from '../plugin';
@@ -13,7 +13,7 @@ import { spacesManagementApp } from './spaces_management_app';
 
 interface SetupDeps {
   management: ManagementSetup;
-  getStartServices: CoreSetup<PluginsStart>['getStartServices'];
+  getStartServices: StartServicesAccessor<PluginsStart>;
   spacesManager: SpacesManager;
   securityLicense?: SecurityLicense;
 }
diff --git a/x-pack/plugins/spaces/public/management/spaces_management_app.tsx b/x-pack/plugins/spaces/public/management/spaces_management_app.tsx
index 663237cfc2e8a..2a93e684bb716 100644
--- a/x-pack/plugins/spaces/public/management/spaces_management_app.tsx
+++ b/x-pack/plugins/spaces/public/management/spaces_management_app.tsx
@@ -8,7 +8,7 @@ import React from 'react';
 import { render, unmountComponentAtNode } from 'react-dom';
 import { HashRouter as Router, Route, Switch, useParams } from 'react-router-dom';
 import { i18n } from '@kbn/i18n';
-import { CoreSetup } from 'src/core/public';
+import { StartServicesAccessor } from 'src/core/public';
 import { SecurityLicense } from '../../../security/public';
 import { RegisterManagementAppArgs } from '../../../../../src/plugins/management/public';
 import { PluginsStart } from '../plugin';
@@ -18,7 +18,7 @@ import { ManageSpacePage } from './edit_space';
 import { Space } from '..';
 
 interface CreateParams {
-  getStartServices: CoreSetup<PluginsStart>['getStartServices'];
+  getStartServices: StartServicesAccessor<PluginsStart>;
   spacesManager: SpacesManager;
   securityLicense?: SecurityLicense;
 }
diff --git a/x-pack/plugins/spaces/public/space_selector/space_selector_app.tsx b/x-pack/plugins/spaces/public/space_selector/space_selector_app.tsx
index 6fab1767e4b6d..048f0e30cd469 100644
--- a/x-pack/plugins/spaces/public/space_selector/space_selector_app.tsx
+++ b/x-pack/plugins/spaces/public/space_selector/space_selector_app.tsx
@@ -4,14 +4,14 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { CoreSetup, AppMountParameters } from 'src/core/public';
+import { StartServicesAccessor, ApplicationSetup, AppMountParameters } from 'src/core/public';
 import { i18n } from '@kbn/i18n';
 import { SpacesManager } from '../spaces_manager';
 
 interface CreateDeps {
-  application: CoreSetup['application'];
+  application: ApplicationSetup;
   spacesManager: SpacesManager;
-  getStartServices: CoreSetup['getStartServices'];
+  getStartServices: StartServicesAccessor;
 }
 
 export const spaceSelectorApp = Object.freeze({

From 04360ef6f00707e3b640e146fc8673bd02a76c6a Mon Sep 17 00:00:00 2001
From: James Gowdy <jgowdy@elastic.co>
Date: Tue, 24 Mar 2020 14:25:59 +0000
Subject: [PATCH 076/179] [ML] Renaming ML setup and start contracts (#60980)

---
 x-pack/plugins/ml/public/index.ts  |  6 +++---
 x-pack/plugins/ml/public/plugin.ts |  6 +++---
 x-pack/plugins/ml/server/index.ts  |  2 +-
 x-pack/plugins/ml/server/plugin.ts | 10 +++++-----
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/x-pack/plugins/ml/public/index.ts b/x-pack/plugins/ml/public/index.ts
index f20f3836ab433..f9f2be390e05f 100755
--- a/x-pack/plugins/ml/public/index.ts
+++ b/x-pack/plugins/ml/public/index.ts
@@ -6,8 +6,8 @@
 
 import { PluginInitializer } from 'kibana/public';
 import './index.scss';
-import { MlPlugin, Setup, Start } from './plugin';
+import { MlPlugin, MlPluginSetup, MlPluginStart } from './plugin';
 
-export const plugin: PluginInitializer<Setup, Start> = () => new MlPlugin();
+export const plugin: PluginInitializer<MlPluginSetup, MlPluginStart> = () => new MlPlugin();
 
-export { Setup, Start };
+export { MlPluginSetup, MlPluginStart };
diff --git a/x-pack/plugins/ml/public/plugin.ts b/x-pack/plugins/ml/public/plugin.ts
index 79aebece85af2..30b7133f4147e 100644
--- a/x-pack/plugins/ml/public/plugin.ts
+++ b/x-pack/plugins/ml/public/plugin.ts
@@ -28,7 +28,7 @@ export interface MlSetupDependencies {
   usageCollection: UsageCollectionSetup;
 }
 
-export class MlPlugin implements Plugin<Setup, Start> {
+export class MlPlugin implements Plugin<MlPluginSetup, MlPluginStart> {
   setup(core: CoreSetup<MlStartDependencies>, pluginsSetup: MlSetupDependencies) {
     core.application.register({
       id: PLUGIN_ID,
@@ -77,5 +77,5 @@ export class MlPlugin implements Plugin<Setup, Start> {
   public stop() {}
 }
 
-export type Setup = ReturnType<MlPlugin['setup']>;
-export type Start = ReturnType<MlPlugin['start']>;
+export type MlPluginSetup = ReturnType<MlPlugin['setup']>;
+export type MlPluginStart = ReturnType<MlPlugin['start']>;
diff --git a/x-pack/plugins/ml/server/index.ts b/x-pack/plugins/ml/server/index.ts
index 6cfa1b23408c0..175c20bf49c94 100644
--- a/x-pack/plugins/ml/server/index.ts
+++ b/x-pack/plugins/ml/server/index.ts
@@ -6,6 +6,6 @@
 
 import { PluginInitializerContext } from 'kibana/server';
 import { MlServerPlugin } from './plugin';
-export { MlStartContract, MlSetupContract } from './plugin';
+export { MlPluginSetup, MlPluginStart } from './plugin';
 
 export const plugin = (ctx: PluginInitializerContext) => new MlServerPlugin(ctx);
diff --git a/x-pack/plugins/ml/server/plugin.ts b/x-pack/plugins/ml/server/plugin.ts
index 8948d232b9e5e..dc42a1f7fcbbb 100644
--- a/x-pack/plugins/ml/server/plugin.ts
+++ b/x-pack/plugins/ml/server/plugin.ts
@@ -49,10 +49,10 @@ declare module 'kibana/server' {
   }
 }
 
-export type MlSetupContract = SharedServices;
-export type MlStartContract = void;
+export type MlPluginSetup = SharedServices;
+export type MlPluginStart = void;
 
-export class MlServerPlugin implements Plugin<MlSetupContract, MlStartContract, PluginsSetup> {
+export class MlServerPlugin implements Plugin<MlPluginSetup, MlPluginStart, PluginsSetup> {
   private log: Logger;
   private version: string;
   private mlLicense: MlServerLicense;
@@ -63,7 +63,7 @@ export class MlServerPlugin implements Plugin<MlSetupContract, MlStartContract,
     this.mlLicense = new MlServerLicense();
   }
 
-  public setup(coreSetup: CoreSetup, plugins: PluginsSetup): MlSetupContract {
+  public setup(coreSetup: CoreSetup, plugins: PluginsSetup): MlPluginSetup {
     plugins.features.registerFeature({
       id: PLUGIN_ID,
       name: i18n.translate('xpack.ml.featureRegistry.mlFeatureName', {
@@ -135,7 +135,7 @@ export class MlServerPlugin implements Plugin<MlSetupContract, MlStartContract,
     return createSharedServices(this.mlLicense, plugins.spaces, plugins.cloud);
   }
 
-  public start(): MlStartContract {}
+  public start(): MlPluginStart {}
 
   public stop() {
     this.mlLicense.unsubscribe();

From 6506134946e31a2c063c372ea6be21fe5a71b6c3 Mon Sep 17 00:00:00 2001
From: Jean-Louis Leysens <jloleysens@gmail.com>
Date: Tue, 24 Mar 2020 15:26:40 +0100
Subject: [PATCH 077/179] [SearchProfiler] Minor fixes (#60919)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Fix auto-expanding of shards in profile tree

* Fix bad error message for ES errors that don't have line numbers

* Add error message for bad profile data

* Fix type and test issues and rename __test__ folder to __jest__

* ! 👉🏻.
---
 .../fixtures/breakdown.ts                     |  0
 .../fixtures/normalize_indices.ts             |  0
 .../fixtures/normalize_times.ts               |  0
 .../fixtures/processed_search_response.ts     |  0
 .../fixtures/search_response.ts               |  0
 .../{__tests__ => __jest__}/init_data.test.ts |  0
 .../profile_tree.test.tsx                     |  3 +++
 .../unsafe_utils.test.ts                      |  0
 .../{__tests__ => __jest__}/utils.test.ts     |  0
 .../components/profile_tree/profile_tree.tsx  |  6 +++---
 .../shard_details/shard_details.tsx           | 16 +++++++++++++++-
 .../application/containers/main/main.tsx      | 19 +++++++++++++++++--
 .../application/hooks/use_request_profile.ts  |  4 +++-
 .../public/application/types.ts               |  9 ++++++++-
 14 files changed, 49 insertions(+), 8 deletions(-)
 rename x-pack/plugins/searchprofiler/public/application/components/profile_tree/{__tests__ => __jest__}/fixtures/breakdown.ts (100%)
 rename x-pack/plugins/searchprofiler/public/application/components/profile_tree/{__tests__ => __jest__}/fixtures/normalize_indices.ts (100%)
 rename x-pack/plugins/searchprofiler/public/application/components/profile_tree/{__tests__ => __jest__}/fixtures/normalize_times.ts (100%)
 rename x-pack/plugins/searchprofiler/public/application/components/profile_tree/{__tests__ => __jest__}/fixtures/processed_search_response.ts (100%)
 rename x-pack/plugins/searchprofiler/public/application/components/profile_tree/{__tests__ => __jest__}/fixtures/search_response.ts (100%)
 rename x-pack/plugins/searchprofiler/public/application/components/profile_tree/{__tests__ => __jest__}/init_data.test.ts (100%)
 rename x-pack/plugins/searchprofiler/public/application/components/profile_tree/{__tests__ => __jest__}/profile_tree.test.tsx (89%)
 rename x-pack/plugins/searchprofiler/public/application/components/profile_tree/{__tests__ => __jest__}/unsafe_utils.test.ts (100%)
 rename x-pack/plugins/searchprofiler/public/application/components/profile_tree/{__tests__ => __jest__}/utils.test.ts (100%)

diff --git a/x-pack/plugins/searchprofiler/public/application/components/profile_tree/__tests__/fixtures/breakdown.ts b/x-pack/plugins/searchprofiler/public/application/components/profile_tree/__jest__/fixtures/breakdown.ts
similarity index 100%
rename from x-pack/plugins/searchprofiler/public/application/components/profile_tree/__tests__/fixtures/breakdown.ts
rename to x-pack/plugins/searchprofiler/public/application/components/profile_tree/__jest__/fixtures/breakdown.ts
diff --git a/x-pack/plugins/searchprofiler/public/application/components/profile_tree/__tests__/fixtures/normalize_indices.ts b/x-pack/plugins/searchprofiler/public/application/components/profile_tree/__jest__/fixtures/normalize_indices.ts
similarity index 100%
rename from x-pack/plugins/searchprofiler/public/application/components/profile_tree/__tests__/fixtures/normalize_indices.ts
rename to x-pack/plugins/searchprofiler/public/application/components/profile_tree/__jest__/fixtures/normalize_indices.ts
diff --git a/x-pack/plugins/searchprofiler/public/application/components/profile_tree/__tests__/fixtures/normalize_times.ts b/x-pack/plugins/searchprofiler/public/application/components/profile_tree/__jest__/fixtures/normalize_times.ts
similarity index 100%
rename from x-pack/plugins/searchprofiler/public/application/components/profile_tree/__tests__/fixtures/normalize_times.ts
rename to x-pack/plugins/searchprofiler/public/application/components/profile_tree/__jest__/fixtures/normalize_times.ts
diff --git a/x-pack/plugins/searchprofiler/public/application/components/profile_tree/__tests__/fixtures/processed_search_response.ts b/x-pack/plugins/searchprofiler/public/application/components/profile_tree/__jest__/fixtures/processed_search_response.ts
similarity index 100%
rename from x-pack/plugins/searchprofiler/public/application/components/profile_tree/__tests__/fixtures/processed_search_response.ts
rename to x-pack/plugins/searchprofiler/public/application/components/profile_tree/__jest__/fixtures/processed_search_response.ts
diff --git a/x-pack/plugins/searchprofiler/public/application/components/profile_tree/__tests__/fixtures/search_response.ts b/x-pack/plugins/searchprofiler/public/application/components/profile_tree/__jest__/fixtures/search_response.ts
similarity index 100%
rename from x-pack/plugins/searchprofiler/public/application/components/profile_tree/__tests__/fixtures/search_response.ts
rename to x-pack/plugins/searchprofiler/public/application/components/profile_tree/__jest__/fixtures/search_response.ts
diff --git a/x-pack/plugins/searchprofiler/public/application/components/profile_tree/__tests__/init_data.test.ts b/x-pack/plugins/searchprofiler/public/application/components/profile_tree/__jest__/init_data.test.ts
similarity index 100%
rename from x-pack/plugins/searchprofiler/public/application/components/profile_tree/__tests__/init_data.test.ts
rename to x-pack/plugins/searchprofiler/public/application/components/profile_tree/__jest__/init_data.test.ts
diff --git a/x-pack/plugins/searchprofiler/public/application/components/profile_tree/__tests__/profile_tree.test.tsx b/x-pack/plugins/searchprofiler/public/application/components/profile_tree/__jest__/profile_tree.test.tsx
similarity index 89%
rename from x-pack/plugins/searchprofiler/public/application/components/profile_tree/__tests__/profile_tree.test.tsx
rename to x-pack/plugins/searchprofiler/public/application/components/profile_tree/__jest__/profile_tree.test.tsx
index 1286f30d69c26..64f77e8b4e52c 100644
--- a/x-pack/plugins/searchprofiler/public/application/components/profile_tree/__tests__/profile_tree.test.tsx
+++ b/x-pack/plugins/searchprofiler/public/application/components/profile_tree/__jest__/profile_tree.test.tsx
@@ -14,6 +14,7 @@ describe('ProfileTree', () => {
       onHighlight: () => {},
       target: 'searches',
       data: searchResponse,
+      onDataInitError: jest.fn(),
     };
     const init = registerTestBed(ProfileTree);
     await init(props);
@@ -24,10 +25,12 @@ describe('ProfileTree', () => {
     const props: Props = {
       onHighlight: () => {},
       target: 'searches',
+      onDataInitError: jest.fn(),
       data: [{}] as any,
     };
 
     const init = registerTestBed(ProfileTree);
     await init(props);
+    expect(props.onDataInitError).toHaveBeenCalled();
   });
 });
diff --git a/x-pack/plugins/searchprofiler/public/application/components/profile_tree/__tests__/unsafe_utils.test.ts b/x-pack/plugins/searchprofiler/public/application/components/profile_tree/__jest__/unsafe_utils.test.ts
similarity index 100%
rename from x-pack/plugins/searchprofiler/public/application/components/profile_tree/__tests__/unsafe_utils.test.ts
rename to x-pack/plugins/searchprofiler/public/application/components/profile_tree/__jest__/unsafe_utils.test.ts
diff --git a/x-pack/plugins/searchprofiler/public/application/components/profile_tree/__tests__/utils.test.ts b/x-pack/plugins/searchprofiler/public/application/components/profile_tree/__jest__/utils.test.ts
similarity index 100%
rename from x-pack/plugins/searchprofiler/public/application/components/profile_tree/__tests__/utils.test.ts
rename to x-pack/plugins/searchprofiler/public/application/components/profile_tree/__jest__/utils.test.ts
diff --git a/x-pack/plugins/searchprofiler/public/application/components/profile_tree/profile_tree.tsx b/x-pack/plugins/searchprofiler/public/application/components/profile_tree/profile_tree.tsx
index 1dec8f0161c52..ade547a7d440f 100644
--- a/x-pack/plugins/searchprofiler/public/application/components/profile_tree/profile_tree.tsx
+++ b/x-pack/plugins/searchprofiler/public/application/components/profile_tree/profile_tree.tsx
@@ -17,9 +17,10 @@ export interface Props {
   target: Targets;
   data: ShardSerialized[] | null;
   onHighlight: (args: OnHighlightChangeArgs) => void;
+  onDataInitError: (error: Error) => void;
 }
 
-export const ProfileTree = memo(({ data, target, onHighlight }: Props) => {
+export const ProfileTree = memo(({ data, target, onHighlight, onDataInitError }: Props) => {
   if (!data || data.length === 0) {
     return null;
   }
@@ -28,8 +29,7 @@ export const ProfileTree = memo(({ data, target, onHighlight }: Props) => {
   try {
     sortedIndices = initDataFor(target)(data);
   } catch (e) {
-    // eslint-disable-next-line no-console
-    console.error(e);
+    onDataInitError(e);
     return null;
   }
 
diff --git a/x-pack/plugins/searchprofiler/public/application/components/profile_tree/shard_details/shard_details.tsx b/x-pack/plugins/searchprofiler/public/application/components/profile_tree/shard_details/shard_details.tsx
index 5ca8ad4ecd979..ac2a2997515d5 100644
--- a/x-pack/plugins/searchprofiler/public/application/components/profile_tree/shard_details/shard_details.tsx
+++ b/x-pack/plugins/searchprofiler/public/application/components/profile_tree/shard_details/shard_details.tsx
@@ -18,10 +18,24 @@ interface Props {
   operations: Operation[];
 }
 
+const hasVisibleOperation = (ops: Operation[]): boolean => {
+  for (const op of ops) {
+    if (op.visible) {
+      return true;
+    }
+    if (op.children?.length && hasVisibleOperation(op.children)) {
+      return true;
+    }
+  }
+  return false;
+};
+
 export const ShardDetails = ({ index, shard, operations }: Props) => {
   const { relative, time } = shard;
 
-  const [shardVisibility, setShardVisibility] = useState<boolean>(false);
+  const [shardVisibility, setShardVisibility] = useState<boolean>(() =>
+    hasVisibleOperation(operations.map(op => op.treeRoot ?? op))
+  );
 
   return (
     <>
diff --git a/x-pack/plugins/searchprofiler/public/application/containers/main/main.tsx b/x-pack/plugins/searchprofiler/public/application/containers/main/main.tsx
index aa6c20aa6a7f3..11dbc6b320531 100644
--- a/x-pack/plugins/searchprofiler/public/application/containers/main/main.tsx
+++ b/x-pack/plugins/searchprofiler/public/application/containers/main/main.tsx
@@ -4,6 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+import { i18n } from '@kbn/i18n';
 import React, { useCallback } from 'react';
 
 import {
@@ -33,7 +34,7 @@ import { useProfilerActionContext, useProfilerReadContext } from '../../contexts
 import { hasAggregations, hasSearch } from '../../utils';
 
 export const Main = () => {
-  const { getLicenseStatus } = useAppContext();
+  const { getLicenseStatus, notifications } = useAppContext();
 
   const {
     activeTab,
@@ -42,8 +43,17 @@ export const Main = () => {
     pristine,
     profiling,
   } = useProfilerReadContext();
+
   const dispatch = useProfilerActionContext();
 
+  const handleProfileTreeError = (e: Error) => {
+    notifications.addError(e, {
+      title: i18n.translate('xpack.searchProfiler.profileTreeErrorRenderTitle', {
+        defaultMessage: 'Profile data cannot be parsed.',
+      }),
+    });
+  };
+
   const setActiveTab = useCallback(
     (target: Targets) => dispatch({ type: 'setActiveTab', value: target }),
     [dispatch]
@@ -70,7 +80,12 @@ export const Main = () => {
     if (activeTab) {
       return (
         <div className="prfDevTool__main__profiletree">
-          <ProfileTree onHighlight={onHighlight} target={activeTab} data={currentResponse} />
+          <ProfileTree
+            onDataInitError={handleProfileTreeError}
+            onHighlight={onHighlight}
+            target={activeTab}
+            data={currentResponse}
+          />
         </div>
       );
     }
diff --git a/x-pack/plugins/searchprofiler/public/application/hooks/use_request_profile.ts b/x-pack/plugins/searchprofiler/public/application/hooks/use_request_profile.ts
index 3d8bee1d62b27..435db4a98c552 100644
--- a/x-pack/plugins/searchprofiler/public/application/hooks/use_request_profile.ts
+++ b/x-pack/plugins/searchprofiler/public/application/hooks/use_request_profile.ts
@@ -22,7 +22,9 @@ interface ReturnValue {
 const extractProfilerErrorMessage = (e: any): string | undefined => {
   if (e.body?.attributes?.error?.reason) {
     const { reason, line, col } = e.body.attributes.error;
-    return `${reason} at line: ${line - 1} col: ${col}`;
+    if (typeof line === 'number' && typeof col === 'number') {
+      return `${reason} at line: ${line - 1} col: ${col}`;
+    }
   }
 
   if (e.body?.message) {
diff --git a/x-pack/plugins/searchprofiler/public/application/types.ts b/x-pack/plugins/searchprofiler/public/application/types.ts
index 9866f8d5b1ccb..896af0851eb52 100644
--- a/x-pack/plugins/searchprofiler/public/application/types.ts
+++ b/x-pack/plugins/searchprofiler/public/application/types.ts
@@ -49,7 +49,14 @@ export interface Operation {
   parent: Operation | null;
   children: Operation[];
 
-  // Only exists on top level
+  /**
+   * Only exists on top level.
+   *
+   * @remark
+   * For now, when we init profile data for rendering we take a top-level
+   * operation and designate it the root of the operations tree - this is not
+   * information we get from ES.
+   */
   treeRoot?: Operation;
 
   depth?: number;

From 6d2aa8974d6f15d3b24881f9c8aa168b51e6c356 Mon Sep 17 00:00:00 2001
From: Wylie Conlon <william.conlon@elastic.co>
Date: Tue, 24 Mar 2020 10:43:48 -0400
Subject: [PATCH 078/179] [Lens] Fix bug in metric config panel (#60982)

* [Lens] Fix bug in metric config panel

* Fix test
---
 .../metric_visualization.test.ts              | 40 +++++++++++++++++++
 .../metric_visualization.tsx                  |  2 +-
 2 files changed, 41 insertions(+), 1 deletion(-)

diff --git a/x-pack/legacy/plugins/lens/public/metric_visualization/metric_visualization.test.ts b/x-pack/legacy/plugins/lens/public/metric_visualization/metric_visualization.test.ts
index 276f24433c670..62f47a21c85b0 100644
--- a/x-pack/legacy/plugins/lens/public/metric_visualization/metric_visualization.test.ts
+++ b/x-pack/legacy/plugins/lens/public/metric_visualization/metric_visualization.test.ts
@@ -72,6 +72,46 @@ describe('metric_visualization', () => {
     });
   });
 
+  describe('#getConfiguration', () => {
+    it('can add a metric when there is no accessor', () => {
+      expect(
+        metricVisualization.getConfiguration({
+          state: {
+            accessor: undefined,
+            layerId: 'l1',
+          },
+          layerId: 'l1',
+          frame: mockFrame(),
+        })
+      ).toEqual({
+        groups: [
+          expect.objectContaining({
+            supportsMoreColumns: true,
+          }),
+        ],
+      });
+    });
+
+    it('is not allowed to add a metric once one accessor is set', () => {
+      expect(
+        metricVisualization.getConfiguration({
+          state: {
+            accessor: 'a',
+            layerId: 'l1',
+          },
+          layerId: 'l1',
+          frame: mockFrame(),
+        })
+      ).toEqual({
+        groups: [
+          expect.objectContaining({
+            supportsMoreColumns: false,
+          }),
+        ],
+      });
+    });
+  });
+
   describe('#setDimension', () => {
     it('sets the accessor', () => {
       expect(
diff --git a/x-pack/legacy/plugins/lens/public/metric_visualization/metric_visualization.tsx b/x-pack/legacy/plugins/lens/public/metric_visualization/metric_visualization.tsx
index 44256df5aed6d..73b8019a31eaa 100644
--- a/x-pack/legacy/plugins/lens/public/metric_visualization/metric_visualization.tsx
+++ b/x-pack/legacy/plugins/lens/public/metric_visualization/metric_visualization.tsx
@@ -94,7 +94,7 @@ export const metricVisualization: Visualization<State, PersistableState> = {
           groupLabel: i18n.translate('xpack.lens.metric.label', { defaultMessage: 'Metric' }),
           layerId: props.state.layerId,
           accessors: props.state.accessor ? [props.state.accessor] : [],
-          supportsMoreColumns: false,
+          supportsMoreColumns: !props.state.accessor,
           filterOperations: (op: OperationMetadata) => !op.isBucketed && op.dataType === 'number',
         },
       ],

From 8657caaffdef9b5b782710f3794e235478a21b52 Mon Sep 17 00:00:00 2001
From: Gidi Meir Morris <github@gidi.io>
Date: Tue, 24 Mar 2020 14:51:15 +0000
Subject: [PATCH 079/179] allow users to unset the throttle of an alert
 (#60964)

---
 .../sections/alert_form/alert_form.tsx        |  22 +++-
 .../apps/triggers_actions_ui/alerts.ts        | 102 ++++++++++++++++++
 2 files changed, 121 insertions(+), 3 deletions(-)

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 c6346ba002a7f..2c601eeb75645 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,8 @@ import {
   EuiButtonIcon,
   EuiHorizontalRule,
 } from '@elastic/eui';
+import { some, filter, map, fold } from 'fp-ts/lib/Option';
+import { pipe } from 'fp-ts/lib/pipeable';
 import {
   getDurationNumberInItsUnit,
   getDurationUnitValue,
@@ -408,9 +410,23 @@ export const AlertForm = ({
                   name="throttle"
                   data-test-subj="throttleInput"
                   onChange={e => {
-                    const throttle = e.target.value !== '' ? parseInt(e.target.value, 10) : null;
-                    setAlertThrottle(throttle);
-                    setAlertProperty('throttle', `${e.target.value}${alertThrottleUnit}`);
+                    pipe(
+                      some(e.target.value.trim()),
+                      filter(value => value !== ''),
+                      map(value => parseInt(value, 10)),
+                      filter(value => !isNaN(value)),
+                      fold(
+                        () => {
+                          // unset throttle
+                          setAlertThrottle(null);
+                          setAlertProperty('throttle', null);
+                        },
+                        throttle => {
+                          setAlertThrottle(throttle);
+                          setAlertProperty('throttle', `${throttle}${alertThrottleUnit}`);
+                        }
+                      )
+                    );
                   }}
                 />
               </EuiFlexItem>
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 7e5825d88ec13..beedd6390388d 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
@@ -185,6 +185,108 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
       ]);
     });
 
+    it('should set an alert throttle', async () => {
+      const alertName = `edit throttle ${generateUniqueKey()}`;
+      const createdAlert = await createAlert({
+        alertTypeId: '.index-threshold',
+        name: alertName,
+        params: {
+          aggType: 'count',
+          termSize: 5,
+          thresholdComparator: '>',
+          timeWindowSize: 5,
+          timeWindowUnit: 'm',
+          groupBy: 'all',
+          threshold: [1000, 5000],
+          index: ['.kibana_1'],
+          timeField: 'alert',
+        },
+      });
+      await pageObjects.common.navigateToApp('triggersActions');
+      await pageObjects.triggersActionsUI.searchAlerts(createdAlert.name);
+
+      const searchResults = await pageObjects.triggersActionsUI.getAlertsList();
+      expect(searchResults).to.eql([
+        {
+          name: createdAlert.name,
+          tagsText: 'foo, bar',
+          alertType: 'Index Threshold',
+          interval: '1m',
+        },
+      ]);
+
+      const editLink = await testSubjects.findAll('alertsTableCell-editLink');
+      await editLink[0].click();
+
+      const throttleInputToSetInitialValue = await testSubjects.find('throttleInput');
+      await throttleInputToSetInitialValue.click();
+      await throttleInputToSetInitialValue.clearValue();
+      await throttleInputToSetInitialValue.type('1');
+
+      await find.clickByCssSelector('[data-test-subj="saveEditedAlertButton"]:not(disabled)');
+
+      expect(await pageObjects.common.closeToast()).to.eql(`Updated '${createdAlert.name}'`);
+
+      await pageObjects.common.navigateToApp('triggersActions');
+      await pageObjects.triggersActionsUI.searchAlerts(createdAlert.name);
+      await (await testSubjects.findAll('alertsTableCell-editLink'))[0].click();
+      const throttleInput = await testSubjects.find('throttleInput');
+      expect(await throttleInput.getAttribute('value')).to.eql('1');
+    });
+
+    it('should unset an alert throttle', async () => {
+      const alertName = `edit throttle ${generateUniqueKey()}`;
+      const createdAlert = await createAlert({
+        alertTypeId: '.index-threshold',
+        name: alertName,
+        throttle: '10m',
+        params: {
+          aggType: 'count',
+          termSize: 5,
+          thresholdComparator: '>',
+          timeWindowSize: 5,
+          timeWindowUnit: 'm',
+          groupBy: 'all',
+          threshold: [1000, 5000],
+          index: ['.kibana_1'],
+          timeField: 'alert',
+        },
+      });
+      await pageObjects.common.navigateToApp('triggersActions');
+      await pageObjects.triggersActionsUI.searchAlerts(createdAlert.name);
+
+      const searchResults = await pageObjects.triggersActionsUI.getAlertsList();
+      expect(searchResults).to.eql([
+        {
+          name: createdAlert.name,
+          tagsText: 'foo, bar',
+          alertType: 'Index Threshold',
+          interval: '1m',
+        },
+      ]);
+
+      const editLink = await testSubjects.findAll('alertsTableCell-editLink');
+      await editLink[0].click();
+
+      const throttleInputToUnsetValue = await testSubjects.find('throttleInput');
+
+      expect(await throttleInputToUnsetValue.getAttribute('value')).to.eql('10');
+      await throttleInputToUnsetValue.click();
+      await throttleInputToUnsetValue.clearValueWithKeyboard();
+
+      expect(await throttleInputToUnsetValue.getAttribute('value')).to.eql('');
+
+      await find.clickByCssSelector('[data-test-subj="saveEditedAlertButton"]:not(disabled)');
+
+      expect(await pageObjects.common.closeToast()).to.eql(`Updated '${createdAlert.name}'`);
+
+      await pageObjects.common.navigateToApp('triggersActions');
+      await pageObjects.triggersActionsUI.searchAlerts(createdAlert.name);
+      await (await testSubjects.findAll('alertsTableCell-editLink'))[0].click();
+      const throttleInput = await testSubjects.find('throttleInput');
+      expect(await throttleInput.getAttribute('value')).to.eql('');
+    });
+
     it('should reset alert when canceling an edit', async () => {
       const createdAlert = await createAlert({
         alertTypeId: '.index-threshold',

From 4b9126b2c3502d7730f8304bc8fcbcc9c25de1a3 Mon Sep 17 00:00:00 2001
From: Brandon Kobel <brandon.kobel@elastic.co>
Date: Tue, 24 Mar 2020 07:57:50 -0700
Subject: [PATCH 080/179] Updating our direct usage of https-proxy-agent to
 5.0.0 (#58296)

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 package.json |  2 +-
 yarn.lock    | 40 ++++++++++++++++++++--------------------
 2 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/package.json b/package.json
index 08668730f9a9d..9bb9b505f54a2 100644
--- a/package.json
+++ b/package.json
@@ -190,7 +190,7 @@
     "hjson": "3.2.1",
     "hoek": "^5.0.4",
     "http-proxy-agent": "^2.1.0",
-    "https-proxy-agent": "^2.2.2",
+    "https-proxy-agent": "^5.0.0",
     "immer": "^1.5.0",
     "inert": "^5.1.0",
     "inline-style": "^2.0.0",
diff --git a/yarn.lock b/yarn.lock
index bd9a764cfdb22..8b73ceeaef904 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6037,6 +6037,13 @@ agent-base@4:
   dependencies:
     es6-promisify "^5.0.0"
 
+agent-base@6:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.0.tgz#5d0101f19bbfaed39980b22ae866de153b93f09a"
+  integrity sha512-j1Q7cSCqN+AwrmDd+pzgqc0/NpC655x2bUf5ZjRIO77DcNBFmh+OgRNzF6OKdCC9RSCb19fGd99+bhXFdkRNqw==
+  dependencies:
+    debug "4"
+
 agent-base@^4.1.0:
   version "4.2.1"
   resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-4.2.1.tgz#d89e5999f797875674c07d87f260fc41e83e8ca9"
@@ -6044,13 +6051,6 @@ agent-base@^4.1.0:
   dependencies:
     es6-promisify "^5.0.0"
 
-agent-base@^4.3.0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-4.3.0.tgz#8165f01c436009bccad0b1d122f05ed770efc6ee"
-  integrity sha512-salcGninV0nPrwpGNn4VTXBb1SOuXQBiqbrNXoeizJsHrsL6ERFM2Ne3JUSBWRE6aeNJI2ROP/WEEIDUiDe3cg==
-  dependencies:
-    es6-promisify "^5.0.0"
-
 agentkeepalive@^3.4.1:
   version "3.4.1"
   resolved "https://registry.yarnpkg.com/agentkeepalive/-/agentkeepalive-3.4.1.tgz#aa95aebc3a749bca5ed53e3880a09f5235b48f0c"
@@ -11171,6 +11171,13 @@ debug@3.2.6, debug@3.X, debug@^3.1.0, debug@^3.2.5, debug@^3.2.6:
   dependencies:
     ms "^2.1.1"
 
+debug@4, debug@4.1.1, debug@^4.0.0, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.1.tgz#3b72260255109c6b589cee050f1d516139664791"
+  integrity sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==
+  dependencies:
+    ms "^2.1.1"
+
 debug@4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.0.tgz#373687bffa678b38b1cd91f861b63850035ddc87"
@@ -11178,13 +11185,6 @@ debug@4.1.0:
   dependencies:
     ms "^2.1.1"
 
-debug@4.1.1, debug@^4.0.0, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.1.tgz#3b72260255109c6b589cee050f1d516139664791"
-  integrity sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==
-  dependencies:
-    ms "^2.1.1"
-
 debuglog@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/debuglog/-/debuglog-1.0.1.tgz#aa24ffb9ac3df9a2351837cfb2d279360cd78492"
@@ -16519,13 +16519,13 @@ https-proxy-agent@2.2.1, https-proxy-agent@^2.2.1:
     agent-base "^4.1.0"
     debug "^3.1.0"
 
-https-proxy-agent@^2.2.2:
-  version "2.2.2"
-  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-2.2.2.tgz#271ea8e90f836ac9f119daccd39c19ff7dfb0793"
-  integrity sha512-c8Ndjc9Bkpfx/vCJueCPy0jlP4ccCCSNDp8xwCZzPjKJUm+B+u9WX2x98Qx4n1PiMNTWo3D7KK5ifNV/yJyRzg==
+https-proxy-agent@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz#e2a90542abb68a762e0a0850f6c9edadfd8506b2"
+  integrity sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==
   dependencies:
-    agent-base "^4.3.0"
-    debug "^3.1.0"
+    agent-base "6"
+    debug "4"
 
 human-signals@^1.1.1:
   version "1.1.1"

From f371acff33d628e2364cb31eb1d0b7ddab8d02f0 Mon Sep 17 00:00:00 2001
From: Mikhail Shustov <restrry@gmail.com>
Date: Tue, 24 Mar 2020 16:12:35 +0100
Subject: [PATCH 081/179] do not warn when switching capabilities for resources
 with optional auth (#61043)

* do not switch capabilities for optional routes

* downgrade message to debug
---
 .../spaces/server/capabilities/capabilities_switcher.test.ts  | 4 ++--
 .../spaces/server/capabilities/capabilities_switcher.ts       | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/x-pack/plugins/spaces/server/capabilities/capabilities_switcher.test.ts b/x-pack/plugins/spaces/server/capabilities/capabilities_switcher.test.ts
index 3f7b93c754aef..fcd756c2aca10 100644
--- a/x-pack/plugins/spaces/server/capabilities/capabilities_switcher.test.ts
+++ b/x-pack/plugins/spaces/server/capabilities/capabilities_switcher.test.ts
@@ -154,7 +154,7 @@ describe('capabilitiesSwitcher', () => {
     expect(result).toEqual(buildCapabilities());
   });
 
-  it('logs a warning, and does not toggle capabilities if an error is encountered', async () => {
+  it('logs a debug message, and does not toggle capabilities if an error is encountered', async () => {
     const space: Space = {
       id: 'space',
       name: '',
@@ -171,7 +171,7 @@ describe('capabilitiesSwitcher', () => {
     const result = await switcher(request, capabilities);
 
     expect(result).toEqual(buildCapabilities());
-    expect(logger.warn).toHaveBeenCalledWith(
+    expect(logger.debug).toHaveBeenCalledWith(
       `Error toggling capabilities for request to /path: Error: Something terrible happened`
     );
   });
diff --git a/x-pack/plugins/spaces/server/capabilities/capabilities_switcher.ts b/x-pack/plugins/spaces/server/capabilities/capabilities_switcher.ts
index 317cc7fe0e3c3..ddbea91f7268c 100644
--- a/x-pack/plugins/spaces/server/capabilities/capabilities_switcher.ts
+++ b/x-pack/plugins/spaces/server/capabilities/capabilities_switcher.ts
@@ -30,9 +30,10 @@ export function setupCapabilitiesSwitcher(
 
       const registeredFeatures = features.getFeatures();
 
+      // try to retrieve capabilities for authenticated or "maybe authenticated" users
       return toggleCapabilities(registeredFeatures, capabilities, activeSpace);
     } catch (e) {
-      logger.warn(`Error toggling capabilities for request to ${request.url.pathname}: ${e}`);
+      logger.debug(`Error toggling capabilities for request to ${request.url.pathname}: ${e}`);
       return capabilities;
     }
   };

From b82cc6ed4a1c6c08ebba856b9bba71fafbf23789 Mon Sep 17 00:00:00 2001
From: Larry Gregory <larry.gregory@elastic.co>
Date: Tue, 24 Mar 2020 11:12:49 -0400
Subject: [PATCH 082/179] Support for sub-feature privileges (#60563)

* initial server-side support for sub-feature privileges (#57507)

* initial server-side support for sub-feature privileges

* start addressing PR feedback

* renaming interfaces

* move privilege id collision check to security plugin

* additional testing

* change featurePrivilegeIterator import location

* fix link assertions following rebase from master

* Initial UI support for sub-feature privileges (#59198)

* Initial UI support for sub-feature privileges

* Address PR feedback

* display deleted spaces correctly in the privilege summary

* additional testing

* update snapshot

* Enables sub-feature privileges for gold+ licenses (#59750)

* enables sub-feature privileges for gold+ licenses

* Address PR feedback

* address platform review feedback
---
 .../np_ready/dashboard_app_controller.tsx     |    3 +-
 x-pack/legacy/plugins/apm/index.ts            |    3 +
 x-pack/legacy/plugins/graph/index.ts          |    5 +
 x-pack/legacy/plugins/maps/server/plugin.js   |    5 +
 x-pack/legacy/plugins/siem/server/plugin.ts   |    5 +
 .../plugins/xpack_main/server/xpack_main.d.ts |    4 +-
 x-pack/plugins/canvas/server/plugin.ts        |    5 +
 x-pack/plugins/endpoint/server/plugin.ts      |    2 +
 x-pack/plugins/features/common/feature.ts     |   88 +-
 .../common/feature_kibana_privileges.ts       |    2 -
 x-pack/plugins/features/common/index.ts       |    9 +-
 x-pack/plugins/features/common/sub_feature.ts |   87 +
 x-pack/plugins/features/kibana.json           |    2 +-
 .../public/features_api_client.test.ts        |   44 +
 .../features/public/features_api_client.ts    |   17 +
 x-pack/plugins/features/public/index.ts       |   16 +-
 x-pack/plugins/features/public/mocks.ts       |   17 +
 x-pack/plugins/features/public/plugin.test.ts |   53 +
 x-pack/plugins/features/public/plugin.ts      |   27 +
 .../__snapshots__/oss_features.test.ts.snap   |  458 +++++
 .../features/server/feature_registry.test.ts  |  517 +++++-
 .../features/server/feature_registry.ts       |   25 +-
 .../plugins/features/server/feature_schema.ts |  211 ++-
 x-pack/plugins/features/server/index.ts       |    2 +-
 .../features/server/oss_features.test.ts      |   15 +
 .../plugins/features/server/oss_features.ts   |  159 +-
 x-pack/plugins/features/server/plugin.ts      |    4 +-
 .../features/server/routes/index.test.ts      |  196 ++-
 .../plugins/features/server/routes/index.ts   |   20 +-
 .../ui_capabilities_for_features.test.ts      |  173 +-
 .../server/ui_capabilities_for_features.ts    |    9 +-
 x-pack/plugins/infra/server/features.ts       |   10 +
 .../plugins/ingest_manager/server/plugin.ts   |    2 +
 x-pack/plugins/ml/server/plugin.ts            |    5 +-
 x-pack/plugins/monitoring/server/plugin.ts    |    4 +-
 .../common/licensing/license_features.ts      |    5 +
 .../common/licensing/license_service.test.ts  |   14 +-
 .../common/licensing/license_service.ts       |    7 +-
 x-pack/plugins/security/common/model/index.ts |    3 +-
 .../kibana_privileges/feature_privileges.ts   |   36 -
 .../kibana_privileges/global_privileges.ts    |   17 -
 .../kibana_privileges/kibana_privileges.ts    |   26 -
 .../kibana_privileges/spaces_privileges.ts    |   17 -
 .../roles/__fixtures__/kibana_features.ts     |  208 +++
 .../roles/__fixtures__/kibana_privileges.ts   |   41 +
 .../roles/edit_role/edit_role_page.test.tsx   |  122 +-
 .../roles/edit_role/edit_role_page.tsx        |   30 +-
 .../roles/edit_role/privilege_utils.test.ts   |   38 +-
 .../roles/edit_role/privilege_utils.ts        |    9 -
 .../kibana_privileges_region.test.tsx.snap    |   26 +-
 .../feature_table/__fixtures__/index.ts       |   76 +
 .../__snapshots__/feature_table.test.tsx.snap |   39 -
 .../feature_table/change_all_privileges.tsx   |   30 +-
 .../feature_table/feature_table.test.tsx      |  868 ++++++++--
 .../kibana/feature_table/feature_table.tsx    |  402 +++--
 .../feature_table_expanded_row.test.tsx       |  199 +++
 .../feature_table_expanded_row.tsx            |   95 ++
 .../feature_table/sub_feature_form.test.tsx   |  237 +++
 .../kibana/feature_table/sub_feature_form.tsx |  134 ++
 .../feature_table_cell.test.tsx               |   60 +
 .../feature_table_cell/feature_table_cell.tsx |   41 +
 .../index.ts                                  |    2 +-
 .../__fixtures__/build_role.ts                |   38 -
 .../__fixtures__/common_allowed_privileges.ts |   60 -
 .../default_privilege_definition.ts           |   43 -
 ...bana_allowed_privileges_calculator.test.ts |  313 ----
 .../kibana_allowed_privileges_calculator.ts   |  155 --
 .../kibana_base_privilege_calculator.test.ts  |  321 ----
 .../kibana_base_privilege_calculator.ts       |   98 --
 ...ibana_feature_privilege_calculator.test.ts |  959 -----------
 .../kibana_feature_privilege_calculator.ts    |  209 ---
 .../kibana_privilege_calculator.test.ts       |  940 -----------
 .../kibana_privilege_calculator.ts            |  113 --
 .../kibana_privilege_calculator_types.ts      |   63 -
 .../kibana_privileges_calculator_factory.ts   |   81 -
 .../kibana/kibana_privileges_region.test.tsx  |   21 +-
 .../kibana/kibana_privileges_region.tsx       |   17 +-
 .../index.ts                                  |    3 +-
 .../privilege_form_calculator.test.ts         |  833 ++++++++++
 .../privilege_form_calculator.ts              |  303 ++++
 .../privilege_summary/__fixtures__/index.ts   |  129 ++
 .../kibana/privilege_summary}/index.ts        |    2 +-
 .../privilege_summary.test.tsx                |   82 +
 .../privilege_summary/privilege_summary.tsx   |   73 +
 .../privilege_summary_calculator.test.ts      |  338 ++++
 .../privilege_summary_calculator.ts           |  109 ++
 .../privilege_summary_expanded_row.tsx        |  131 ++
 .../privilege_summary_table.test.tsx          |  922 +++++++++++
 .../privilege_summary_table.tsx               |  174 ++
 .../space_column_header.test.tsx              |  123 ++
 .../privilege_summary/space_column_header.tsx |   78 +
 .../simple_privilege_section.test.tsx.snap    |  266 +--
 .../simple_privilege_section.test.tsx         |   82 +-
 .../simple_privilege_section.tsx              |  323 ++--
 .../__fixtures__/raw_kibana_privileges.ts     |   38 -
 .../privilege_display.test.tsx.snap           |  118 --
 .../privilege_space_form.test.tsx.snap        |  497 ------
 .../privilege_display.test.tsx                |   42 +-
 .../privilege_display.tsx                     |  133 +-
 .../privilege_matrix.test.tsx                 |  128 --
 .../privilege_matrix.tsx                      |  342 ----
 .../privilege_space_form.test.tsx             |  454 +++--
 .../privilege_space_form.tsx                  |  249 ++-
 .../privilege_space_table.test.tsx            |  283 +++-
 .../privilege_space_table.tsx                 |  182 +-
 .../space_aware_privilege_section.test.tsx    |   43 +-
 .../space_aware_privilege_section.tsx         |   92 +-
 .../space_selector.tsx                        |    9 +-
 .../spaces_popover_list.test.tsx              |  112 ++
 .../spaces_popover_list.tsx                   |   19 +-
 .../public/management/roles/model/index.ts    |   14 +
 .../roles/model/kibana_privilege.ts           |   31 +
 .../roles/model/kibana_privileges.test.ts     |  144 ++
 .../roles/model/kibana_privileges.ts          |   86 +
 .../roles/model/primary_feature_privilege.ts  |   29 +
 .../roles/model/privilege_collection.test.ts  |   66 +
 .../roles/model/privilege_collection.ts       |   33 +
 .../management/roles/model/secured_feature.ts |   77 +
 .../roles/model/secured_sub_feature.ts        |   41 +
 .../roles/model/sub_feature_privilege.ts      |   21 +
 .../model/sub_feature_privilege_group.ts      |   25 +
 .../roles/roles_management_app.test.tsx       |    7 +-
 .../management/roles/roles_management_app.tsx |    3 +-
 .../plugins/security/public/plugin.test.tsx   |    4 +
 x-pack/plugins/security/public/plugin.tsx     |    2 +
 .../server/authorization/actions/actions.ts   |    7 -
 .../server/authorization/actions/api.test.ts  |    7 -
 .../server/authorization/actions/api.ts       |    4 -
 .../server/authorization/actions/app.test.ts  |    7 -
 .../server/authorization/actions/app.ts       |    4 -
 .../actions/saved_object.test.ts              |    7 -
 .../authorization/actions/saved_object.ts     |    4 -
 .../server/authorization/actions/ui.test.ts   |   28 -
 .../server/authorization/actions/ui.ts        |   16 -
 .../disable_ui_capabilities.test.ts           |   55 +-
 .../server/authorization/index.test.ts        |    2 +-
 .../security/server/authorization/index.ts    |    5 +-
 .../feature_privilege_builder/app.ts          |    2 +-
 .../feature_privilege_builder/catalogue.ts    |    2 +-
 .../feature_privilege_builder/management.ts   |    2 +-
 .../feature_privilege_iterator.test.ts        |  891 ++++++++++
 .../feature_privilege_iterator.ts             |   83 +
 .../feature_privilege_iterator}/index.ts      |    5 +-
 .../sub_feature_privilege_iterator.ts         |   18 +
 .../server/authorization/privileges/index.ts  |    1 +
 .../privileges/privileges.test.ts             | 1473 ++++++++++++-----
 .../authorization/privileges/privileges.ts    |  104 +-
 .../validate_feature_privileges.test.ts       |  218 ++-
 .../validate_feature_privileges.ts            |   34 +-
 x-pack/plugins/security/server/plugin.test.ts |    1 -
 .../server/routes/views/login.test.ts         |    1 +
 .../enabled_features.test.tsx.snap            |    4 +-
 .../enabled_features.test.tsx                 |    8 +-
 .../enabled_features/enabled_features.tsx     |    4 +-
 .../enabled_features/feature_table.tsx        |    9 +-
 .../edit_space/manage_space_page.test.tsx     |   66 +-
 .../edit_space/manage_space_page.tsx          |   30 +-
 .../public/management/lib/feature_utils.ts    |    4 +-
 .../management/management_service.test.ts     |   22 +-
 .../spaces_grid/spaces_grid_page.tsx          |   19 +-
 .../spaces_grid/spaces_grid_pages.test.tsx    |   85 +-
 .../management/spaces_management_app.test.tsx |   13 +-
 .../management/spaces_management_app.tsx      |   11 +-
 x-pack/plugins/spaces/public/plugin.test.ts   |    3 +-
 x-pack/plugins/spaces/public/plugin.tsx       |    4 +-
 .../capabilities_switcher.test.ts             |    5 +-
 .../translations/translations/ja-JP.json      |   15 -
 .../translations/translations/zh-CN.json      |   15 -
 x-pack/plugins/uptime/server/kibana.index.ts  |    5 +
 .../common/fixtures/plugins/actions/index.ts  |    2 +
 .../common/fixtures/plugins/alerts/index.ts   |    2 +
 .../api_integration/apis/security/index.js    |    3 +
 .../apis/security/privileges.ts               |   82 +-
 .../apis/security/privileges_basic.ts         |   75 +
 .../apis/security/security_basic.ts           |   24 +
 .../api_integration/config_security_basic.js  |    2 +-
 .../feature_controls/dashboard_security.ts    |  109 ++
 .../feature_controls/discover_security.ts     |   91 +
 .../feature_controls/visualize_security.ts    |  107 ++
 .../fixtures/plugins/foo_plugin/index.js      |    4 +
 180 files changed, 12447 insertions(+), 7069 deletions(-)
 create mode 100644 x-pack/plugins/features/common/sub_feature.ts
 create mode 100644 x-pack/plugins/features/public/features_api_client.test.ts
 create mode 100644 x-pack/plugins/features/public/features_api_client.ts
 create mode 100644 x-pack/plugins/features/public/mocks.ts
 create mode 100644 x-pack/plugins/features/public/plugin.test.ts
 create mode 100644 x-pack/plugins/features/public/plugin.ts
 create mode 100644 x-pack/plugins/features/server/__snapshots__/oss_features.test.ts.snap
 delete mode 100644 x-pack/plugins/security/common/model/kibana_privileges/feature_privileges.ts
 delete mode 100644 x-pack/plugins/security/common/model/kibana_privileges/global_privileges.ts
 delete mode 100644 x-pack/plugins/security/common/model/kibana_privileges/kibana_privileges.ts
 delete mode 100644 x-pack/plugins/security/common/model/kibana_privileges/spaces_privileges.ts
 create mode 100644 x-pack/plugins/security/public/management/roles/__fixtures__/kibana_features.ts
 create mode 100644 x-pack/plugins/security/public/management/roles/__fixtures__/kibana_privileges.ts
 create mode 100644 x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/feature_table/__fixtures__/index.ts
 delete mode 100644 x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/feature_table/__snapshots__/feature_table.test.tsx.snap
 create mode 100644 x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/feature_table/feature_table_expanded_row.test.tsx
 create mode 100644 x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/feature_table/feature_table_expanded_row.tsx
 create mode 100644 x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/feature_table/sub_feature_form.test.tsx
 create mode 100644 x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/feature_table/sub_feature_form.tsx
 create mode 100644 x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/feature_table_cell/feature_table_cell.test.tsx
 create mode 100644 x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/feature_table_cell/feature_table_cell.tsx
 rename x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/{space_aware_privilege_section/__fixtures__ => feature_table_cell}/index.ts (79%)
 delete mode 100644 x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/kibana_privilege_calculator/__fixtures__/build_role.ts
 delete mode 100644 x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/kibana_privilege_calculator/__fixtures__/common_allowed_privileges.ts
 delete mode 100644 x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/kibana_privilege_calculator/__fixtures__/default_privilege_definition.ts
 delete mode 100644 x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/kibana_privilege_calculator/kibana_allowed_privileges_calculator.test.ts
 delete mode 100644 x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/kibana_privilege_calculator/kibana_allowed_privileges_calculator.ts
 delete mode 100644 x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/kibana_privilege_calculator/kibana_base_privilege_calculator.test.ts
 delete mode 100644 x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/kibana_privilege_calculator/kibana_base_privilege_calculator.ts
 delete mode 100644 x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/kibana_privilege_calculator/kibana_feature_privilege_calculator.test.ts
 delete mode 100644 x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/kibana_privilege_calculator/kibana_feature_privilege_calculator.ts
 delete mode 100644 x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/kibana_privilege_calculator/kibana_privilege_calculator.test.ts
 delete mode 100644 x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/kibana_privilege_calculator/kibana_privilege_calculator.ts
 delete mode 100644 x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/kibana_privilege_calculator/kibana_privilege_calculator_types.ts
 delete mode 100644 x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/kibana_privilege_calculator/kibana_privileges_calculator_factory.ts
 rename x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/{kibana_privilege_calculator => privilege_form_calculator}/index.ts (62%)
 create mode 100644 x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/privilege_form_calculator/privilege_form_calculator.test.ts
 create mode 100644 x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/privilege_form_calculator/privilege_form_calculator.ts
 create mode 100644 x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/privilege_summary/__fixtures__/index.ts
 rename x-pack/plugins/security/{common/model/kibana_privileges => public/management/roles/edit_role/privileges/kibana/privilege_summary}/index.ts (81%)
 create mode 100644 x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/privilege_summary/privilege_summary.test.tsx
 create mode 100644 x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/privilege_summary/privilege_summary.tsx
 create mode 100644 x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/privilege_summary/privilege_summary_calculator.test.ts
 create mode 100644 x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/privilege_summary/privilege_summary_calculator.ts
 create mode 100644 x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/privilege_summary/privilege_summary_expanded_row.tsx
 create mode 100644 x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/privilege_summary/privilege_summary_table.test.tsx
 create mode 100644 x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/privilege_summary/privilege_summary_table.tsx
 create mode 100644 x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/privilege_summary/space_column_header.test.tsx
 create mode 100644 x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/privilege_summary/space_column_header.tsx
 delete mode 100644 x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/space_aware_privilege_section/__fixtures__/raw_kibana_privileges.ts
 delete mode 100644 x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/space_aware_privilege_section/__snapshots__/privilege_display.test.tsx.snap
 delete mode 100644 x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/space_aware_privilege_section/__snapshots__/privilege_space_form.test.tsx.snap
 delete mode 100644 x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/space_aware_privilege_section/privilege_matrix.test.tsx
 delete mode 100644 x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/space_aware_privilege_section/privilege_matrix.tsx
 create mode 100644 x-pack/plugins/security/public/management/roles/edit_role/spaces_popover_list/spaces_popover_list.test.tsx
 create mode 100644 x-pack/plugins/security/public/management/roles/model/index.ts
 create mode 100644 x-pack/plugins/security/public/management/roles/model/kibana_privilege.ts
 create mode 100644 x-pack/plugins/security/public/management/roles/model/kibana_privileges.test.ts
 create mode 100644 x-pack/plugins/security/public/management/roles/model/kibana_privileges.ts
 create mode 100644 x-pack/plugins/security/public/management/roles/model/primary_feature_privilege.ts
 create mode 100644 x-pack/plugins/security/public/management/roles/model/privilege_collection.test.ts
 create mode 100644 x-pack/plugins/security/public/management/roles/model/privilege_collection.ts
 create mode 100644 x-pack/plugins/security/public/management/roles/model/secured_feature.ts
 create mode 100644 x-pack/plugins/security/public/management/roles/model/secured_sub_feature.ts
 create mode 100644 x-pack/plugins/security/public/management/roles/model/sub_feature_privilege.ts
 create mode 100644 x-pack/plugins/security/public/management/roles/model/sub_feature_privilege_group.ts
 create mode 100644 x-pack/plugins/security/server/authorization/privileges/feature_privilege_iterator/feature_privilege_iterator.test.ts
 create mode 100644 x-pack/plugins/security/server/authorization/privileges/feature_privilege_iterator/feature_privilege_iterator.ts
 rename x-pack/plugins/security/{public/management/roles/edit_role/privileges/kibana/kibana_privilege_calculator/__fixtures__ => server/authorization/privileges/feature_privilege_iterator}/index.ts (57%)
 create mode 100644 x-pack/plugins/security/server/authorization/privileges/feature_privilege_iterator/sub_feature_privilege_iterator.ts
 create mode 100644 x-pack/test/api_integration/apis/security/privileges_basic.ts
 create mode 100644 x-pack/test/api_integration/apis/security/security_basic.ts

diff --git a/src/legacy/core_plugins/kibana/public/dashboard/np_ready/dashboard_app_controller.tsx b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/dashboard_app_controller.tsx
index f1e1f20de1ce6..0c6686c993371 100644
--- a/src/legacy/core_plugins/kibana/public/dashboard/np_ready/dashboard_app_controller.tsx
+++ b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/dashboard_app_controller.tsx
@@ -890,7 +890,8 @@ export class DashboardAppController {
       share.toggleShareContextMenu({
         anchorElement,
         allowEmbed: true,
-        allowShortUrl: !dashboardConfig.getHideWriteControls(),
+        allowShortUrl:
+          !dashboardConfig.getHideWriteControls() || dashboardCapabilities.createShortUrl,
         shareableUrl: unhashUrl(window.location.href),
         objectId: dash.id,
         objectType: 'dashboard',
diff --git a/x-pack/legacy/plugins/apm/index.ts b/x-pack/legacy/plugins/apm/index.ts
index 502e910caae51..d1f7ce325d23e 100644
--- a/x-pack/legacy/plugins/apm/index.ts
+++ b/x-pack/legacy/plugins/apm/index.ts
@@ -96,6 +96,7 @@ export const apm: LegacyPluginInitializer = kibana => {
         name: i18n.translate('xpack.apm.featureRegistry.apmFeatureName', {
           defaultMessage: 'APM'
         }),
+        order: 900,
         icon: 'apmApp',
         navLinkId: 'apm',
         app: ['apm', 'kibana'],
@@ -103,6 +104,7 @@ export const apm: LegacyPluginInitializer = kibana => {
         // see x-pack/plugins/features/common/feature_kibana_privileges.ts
         privileges: {
           all: {
+            app: ['apm', 'kibana'],
             api: ['apm', 'apm_write', 'actions-read', 'alerting-read'],
             catalogue: ['apm'],
             savedObject: {
@@ -121,6 +123,7 @@ export const apm: LegacyPluginInitializer = kibana => {
             ]
           },
           read: {
+            app: ['apm', 'kibana'],
             api: ['apm', 'actions-read', 'alerting-read'],
             catalogue: ['apm'],
             savedObject: {
diff --git a/x-pack/legacy/plugins/graph/index.ts b/x-pack/legacy/plugins/graph/index.ts
index 5122796335e45..53d32a836cfa1 100644
--- a/x-pack/legacy/plugins/graph/index.ts
+++ b/x-pack/legacy/plugins/graph/index.ts
@@ -37,6 +37,7 @@ export const graph: LegacyPluginInitializer = kibana => {
         name: i18n.translate('xpack.graph.featureRegistry.graphFeatureName', {
           defaultMessage: 'Graph',
         }),
+        order: 1200,
         icon: 'graphApp',
         navLinkId: 'graph',
         app: ['graph', 'kibana'],
@@ -44,6 +45,8 @@ export const graph: LegacyPluginInitializer = kibana => {
         validLicenses: ['platinum', 'enterprise', 'trial'],
         privileges: {
           all: {
+            app: ['graph', 'kibana'],
+            catalogue: ['graph'],
             savedObject: {
               all: ['graph-workspace'],
               read: ['index-pattern'],
@@ -51,6 +54,8 @@ export const graph: LegacyPluginInitializer = kibana => {
             ui: ['save', 'delete'],
           },
           read: {
+            app: ['graph', 'kibana'],
+            catalogue: ['graph'],
             savedObject: {
               all: [],
               read: ['index-pattern', 'graph-workspace'],
diff --git a/x-pack/legacy/plugins/maps/server/plugin.js b/x-pack/legacy/plugins/maps/server/plugin.js
index 02e38ff54b300..5b52a3eba2f23 100644
--- a/x-pack/legacy/plugins/maps/server/plugin.js
+++ b/x-pack/legacy/plugins/maps/server/plugin.js
@@ -23,12 +23,15 @@ export class MapPlugin {
       name: i18n.translate('xpack.maps.featureRegistry.mapsFeatureName', {
         defaultMessage: 'Maps',
       }),
+      order: 600,
       icon: APP_ICON,
       navLinkId: APP_ID,
       app: [APP_ID, 'kibana'],
       catalogue: [APP_ID],
       privileges: {
         all: {
+          app: [APP_ID, 'kibana'],
+          catalogue: [APP_ID],
           savedObject: {
             all: [MAP_SAVED_OBJECT_TYPE, 'query'],
             read: ['index-pattern'],
@@ -36,6 +39,8 @@ export class MapPlugin {
           ui: ['save', 'show', 'saveQuery'],
         },
         read: {
+          app: [APP_ID, 'kibana'],
+          catalogue: [APP_ID],
           savedObject: {
             all: [],
             read: [MAP_SAVED_OBJECT_TYPE, 'index-pattern', 'query'],
diff --git a/x-pack/legacy/plugins/siem/server/plugin.ts b/x-pack/legacy/plugins/siem/server/plugin.ts
index 7008872a6f3cd..d785de32eab7e 100644
--- a/x-pack/legacy/plugins/siem/server/plugin.ts
+++ b/x-pack/legacy/plugins/siem/server/plugin.ts
@@ -97,12 +97,15 @@ export class Plugin {
       name: i18n.translate('xpack.siem.featureRegistry.linkSiemTitle', {
         defaultMessage: 'SIEM',
       }),
+      order: 1100,
       icon: 'securityAnalyticsApp',
       navLinkId: 'siem',
       app: ['siem', 'kibana'],
       catalogue: ['siem'],
       privileges: {
         all: {
+          app: ['siem', 'kibana'],
+          catalogue: ['siem'],
           api: ['siem', 'actions-read', 'actions-all', 'alerting-read', 'alerting-all'],
           savedObject: {
             all: [
@@ -128,6 +131,8 @@ export class Plugin {
           ],
         },
         read: {
+          app: ['siem', 'kibana'],
+          catalogue: ['siem'],
           api: ['siem', 'actions-read', 'actions-all', 'alerting-read', 'alerting-all'],
           savedObject: {
             all: ['alert', 'action', 'action_task_params'],
diff --git a/x-pack/legacy/plugins/xpack_main/server/xpack_main.d.ts b/x-pack/legacy/plugins/xpack_main/server/xpack_main.d.ts
index a9abc733775d2..7b5dc19760627 100644
--- a/x-pack/legacy/plugins/xpack_main/server/xpack_main.d.ts
+++ b/x-pack/legacy/plugins/xpack_main/server/xpack_main.d.ts
@@ -5,12 +5,12 @@
  */
 
 import KbnServer from 'src/legacy/server/kbn_server';
-import { Feature, FeatureWithAllOrReadPrivileges } from '../../../../plugins/features/server';
+import { Feature, FeatureConfig } from '../../../../plugins/features/server';
 import { XPackInfo, XPackInfoOptions } from './lib/xpack_info';
 export { XPackFeature } from './lib/xpack_info';
 
 export interface XPackMainPlugin {
   info: XPackInfo;
   getFeatures(): Feature[];
-  registerFeature(feature: FeatureWithAllOrReadPrivileges): void;
+  registerFeature(feature: FeatureConfig): void;
 }
diff --git a/x-pack/plugins/canvas/server/plugin.ts b/x-pack/plugins/canvas/server/plugin.ts
index bfda7ef5885bc..0325de9cf29e2 100644
--- a/x-pack/plugins/canvas/server/plugin.ts
+++ b/x-pack/plugins/canvas/server/plugin.ts
@@ -32,12 +32,15 @@ export class CanvasPlugin implements Plugin {
     plugins.features.registerFeature({
       id: 'canvas',
       name: 'Canvas',
+      order: 400,
       icon: 'canvasApp',
       navLinkId: 'canvas',
       app: ['canvas', 'kibana'],
       catalogue: ['canvas'],
       privileges: {
         all: {
+          app: ['canvas', 'kibana'],
+          catalogue: ['canvas'],
           savedObject: {
             all: ['canvas-workpad', 'canvas-element'],
             read: ['index-pattern'],
@@ -45,6 +48,8 @@ export class CanvasPlugin implements Plugin {
           ui: ['save', 'show'],
         },
         read: {
+          app: ['canvas', 'kibana'],
+          catalogue: ['canvas'],
           savedObject: {
             all: [],
             read: ['index-pattern', 'canvas-workpad', 'canvas-element'],
diff --git a/x-pack/plugins/endpoint/server/plugin.ts b/x-pack/plugins/endpoint/server/plugin.ts
index aef85f39e0382..4b4afd8088744 100644
--- a/x-pack/plugins/endpoint/server/plugin.ts
+++ b/x-pack/plugins/endpoint/server/plugin.ts
@@ -43,6 +43,7 @@ export class EndpointPlugin
       app: ['endpoint', 'kibana'],
       privileges: {
         all: {
+          app: ['endpoint', 'kibana'],
           api: ['resolver'],
           savedObject: {
             all: [],
@@ -51,6 +52,7 @@ export class EndpointPlugin
           ui: ['save'],
         },
         read: {
+          app: ['endpoint', 'kibana'],
           api: [],
           savedObject: {
             all: [],
diff --git a/x-pack/plugins/features/common/feature.ts b/x-pack/plugins/features/common/feature.ts
index 748076b95ad77..82fcc33f5c8ce 100644
--- a/x-pack/plugins/features/common/feature.ts
+++ b/x-pack/plugins/features/common/feature.ts
@@ -4,16 +4,16 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { FeatureKibanaPrivileges, FeatureKibanaPrivilegesSet } from './feature_kibana_privileges';
+import { RecursiveReadonly } from '@kbn/utility-types';
+import { FeatureKibanaPrivileges } from './feature_kibana_privileges';
+import { SubFeatureConfig, SubFeature } from './sub_feature';
 
 /**
  * Interface for registering a feature.
  * Feature registration allows plugins to hide their applications with spaces,
  * and secure access when configured for security.
  */
-export interface Feature<
-  TPrivileges extends Partial<FeatureKibanaPrivilegesSet> = FeatureKibanaPrivilegesSet
-> {
+export interface FeatureConfig {
   /**
    * Unique identifier for this feature.
    * This identifier is also used when generating UI Capabilities.
@@ -28,6 +28,11 @@ export interface Feature<
    */
   name: string;
 
+  /**
+   * An ordinal used to sort features relative to one another for display.
+   */
+  order?: number;
+
   /**
    * Whether or not this feature should be excluded from the base privileges.
    * This is primarily helpful when migrating applications with a "legacy" privileges model
@@ -98,7 +103,15 @@ export interface Feature<
    * ```
    * @see FeatureKibanaPrivileges
    */
-  privileges: TPrivileges;
+  privileges: {
+    all: FeatureKibanaPrivileges;
+    read: FeatureKibanaPrivileges;
+  } | null;
+
+  /**
+   * Optional sub-feature privilege definitions. This can only be specified if `privileges` are are also defined.
+   */
+  subFeatures?: SubFeatureConfig[];
 
   /**
    * Optional message to display on the Role Management screen when configuring permissions for this feature.
@@ -114,7 +127,64 @@ export interface Feature<
   };
 }
 
-export type FeatureWithAllOrReadPrivileges = Feature<{
-  all?: FeatureKibanaPrivileges;
-  read?: FeatureKibanaPrivileges;
-}>;
+export class Feature {
+  public readonly subFeatures: SubFeature[];
+
+  constructor(protected readonly config: RecursiveReadonly<FeatureConfig>) {
+    this.subFeatures = (config.subFeatures ?? []).map(
+      subFeatureConfig => new SubFeature(subFeatureConfig)
+    );
+  }
+
+  public get id() {
+    return this.config.id;
+  }
+
+  public get name() {
+    return this.config.name;
+  }
+
+  public get order() {
+    return this.config.order;
+  }
+
+  public get navLinkId() {
+    return this.config.navLinkId;
+  }
+
+  public get app() {
+    return this.config.app;
+  }
+
+  public get catalogue() {
+    return this.config.catalogue;
+  }
+
+  public get management() {
+    return this.config.management;
+  }
+
+  public get icon() {
+    return this.config.icon;
+  }
+
+  public get validLicenses() {
+    return this.config.validLicenses;
+  }
+
+  public get privileges() {
+    return this.config.privileges;
+  }
+
+  public get excludeFromBasePrivileges() {
+    return this.config.excludeFromBasePrivileges ?? false;
+  }
+
+  public get reserved() {
+    return this.config.reserved;
+  }
+
+  public toRaw() {
+    return { ...this.config } as FeatureConfig;
+  }
+}
diff --git a/x-pack/plugins/features/common/feature_kibana_privileges.ts b/x-pack/plugins/features/common/feature_kibana_privileges.ts
index 1d14f3728282c..768c8c6ae1088 100644
--- a/x-pack/plugins/features/common/feature_kibana_privileges.ts
+++ b/x-pack/plugins/features/common/feature_kibana_privileges.ts
@@ -123,5 +123,3 @@ export interface FeatureKibanaPrivileges {
    */
   ui: string[];
 }
-
-export type FeatureKibanaPrivilegesSet = Record<string, FeatureKibanaPrivileges>;
diff --git a/x-pack/plugins/features/common/index.ts b/x-pack/plugins/features/common/index.ts
index 6111d7d25a61b..e359efbda20d2 100644
--- a/x-pack/plugins/features/common/index.ts
+++ b/x-pack/plugins/features/common/index.ts
@@ -5,4 +5,11 @@
  */
 
 export { FeatureKibanaPrivileges } from './feature_kibana_privileges';
-export * from './feature';
+export { Feature, FeatureConfig } from './feature';
+export {
+  SubFeature,
+  SubFeatureConfig,
+  SubFeaturePrivilegeConfig,
+  SubFeaturePrivilegeGroupConfig,
+  SubFeaturePrivilegeGroupType,
+} from './sub_feature';
diff --git a/x-pack/plugins/features/common/sub_feature.ts b/x-pack/plugins/features/common/sub_feature.ts
new file mode 100644
index 0000000000000..121bb8514c8a2
--- /dev/null
+++ b/x-pack/plugins/features/common/sub_feature.ts
@@ -0,0 +1,87 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { RecursiveReadonly } from '@kbn/utility-types';
+import { FeatureKibanaPrivileges } from './feature_kibana_privileges';
+
+/**
+ * Configuration for a sub-feature.
+ */
+export interface SubFeatureConfig {
+  /** Display name for this sub-feature */
+  name: string;
+
+  /** Collection of privilege groups */
+  privilegeGroups: SubFeaturePrivilegeGroupConfig[];
+}
+
+/**
+ * The type of privilege group.
+ * - `mutually_exclusive`::
+ *     Users will be able to select at most one privilege within this group.
+ *     Privileges must be specified in descending order of permissiveness (e.g. `All`, `Read`, not `Read`, `All)
+ * - `independent`::
+ *     Users will be able to select any combination of privileges within this group.
+ */
+export type SubFeaturePrivilegeGroupType = 'mutually_exclusive' | 'independent';
+
+/**
+ * Configuration for a sub-feature privilege group.
+ */
+export interface SubFeaturePrivilegeGroupConfig {
+  /**
+   * The type of privilege group.
+   * - `mutually_exclusive`::
+   *     Users will be able to select at most one privilege within this group.
+   *     Privileges must be specified in descending order of permissiveness (e.g. `All`, `Read`, not `Read`, `All)
+   * - `independent`::
+   *     Users will be able to select any combination of privileges within this group.
+   */
+  groupType: SubFeaturePrivilegeGroupType;
+
+  /**
+   * The privileges which belong to this group.
+   */
+  privileges: SubFeaturePrivilegeConfig[];
+}
+
+/**
+ * Configuration for a sub-feature privilege.
+ */
+export interface SubFeaturePrivilegeConfig
+  extends Omit<FeatureKibanaPrivileges, 'excludeFromBasePrivileges'> {
+  /**
+   * Identifier for this privilege. Must be unique across all other privileges within a feature.
+   */
+  id: string;
+
+  /**
+   * The display name for this privilege.
+   */
+  name: string;
+
+  /**
+   * Denotes which Primary Feature Privilege this sub-feature privilege should be included in.
+   * `read` is also included in `all` automatically.
+   */
+  includeIn: 'all' | 'read' | 'none';
+}
+
+export class SubFeature {
+  constructor(protected readonly config: RecursiveReadonly<SubFeatureConfig>) {}
+
+  public get name() {
+    return this.config.name;
+  }
+
+  public get privilegeGroups() {
+    return this.config.privilegeGroups;
+  }
+
+  public toRaw() {
+    return { ...this.config };
+  }
+}
diff --git a/x-pack/plugins/features/kibana.json b/x-pack/plugins/features/kibana.json
index 553e920f0e720..e38d7be892904 100644
--- a/x-pack/plugins/features/kibana.json
+++ b/x-pack/plugins/features/kibana.json
@@ -4,5 +4,5 @@
   "kibanaVersion": "kibana",
   "optionalPlugins": ["timelion"],
   "server": true,
-  "ui": false
+  "ui": true
 }
diff --git a/x-pack/plugins/features/public/features_api_client.test.ts b/x-pack/plugins/features/public/features_api_client.test.ts
new file mode 100644
index 0000000000000..e3a25ad57425c
--- /dev/null
+++ b/x-pack/plugins/features/public/features_api_client.test.ts
@@ -0,0 +1,44 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { coreMock } from 'src/core/public/mocks';
+import { FeaturesAPIClient } from './features_api_client';
+
+describe('Features API Client', () => {
+  describe('#getFeatures', () => {
+    it('returns an array of Features', async () => {
+      const rawFeatures = [
+        {
+          id: 'feature-a',
+        },
+        {
+          id: 'feature-b',
+        },
+        {
+          id: 'feature-c',
+        },
+        {
+          id: 'feature-d',
+        },
+        {
+          id: 'feature-e',
+        },
+      ];
+      const coreSetup = coreMock.createSetup();
+      coreSetup.http.get.mockResolvedValue(rawFeatures);
+
+      const client = new FeaturesAPIClient(coreSetup.http);
+      const result = await client.getFeatures();
+      expect(result.map(f => f.id)).toEqual([
+        'feature-a',
+        'feature-b',
+        'feature-c',
+        'feature-d',
+        'feature-e',
+      ]);
+    });
+  });
+});
diff --git a/x-pack/plugins/features/public/features_api_client.ts b/x-pack/plugins/features/public/features_api_client.ts
new file mode 100644
index 0000000000000..b93c9bf917d79
--- /dev/null
+++ b/x-pack/plugins/features/public/features_api_client.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 { HttpSetup } from 'src/core/public';
+import { FeatureConfig, Feature } from '.';
+
+export class FeaturesAPIClient {
+  constructor(private readonly http: HttpSetup) {}
+
+  public async getFeatures() {
+    const features = await this.http.get<FeatureConfig[]>('/api/features');
+    return features.map(config => new Feature(config));
+  }
+}
diff --git a/x-pack/plugins/features/public/index.ts b/x-pack/plugins/features/public/index.ts
index 6a2c99aad4bd8..f19c7f947d97f 100644
--- a/x-pack/plugins/features/public/index.ts
+++ b/x-pack/plugins/features/public/index.ts
@@ -4,4 +4,18 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-export { Feature, FeatureWithAllOrReadPrivileges, FeatureKibanaPrivileges } from '../common';
+import { PluginInitializer } from 'src/core/public';
+import { FeaturesPlugin, FeaturesPluginSetup, FeaturesPluginStart } from './plugin';
+
+export {
+  Feature,
+  FeatureConfig,
+  FeatureKibanaPrivileges,
+  SubFeatureConfig,
+  SubFeaturePrivilegeConfig,
+} from '../common';
+
+export { FeaturesPluginSetup, FeaturesPluginStart } from './plugin';
+
+export const plugin: PluginInitializer<FeaturesPluginSetup, FeaturesPluginStart> = () =>
+  new FeaturesPlugin();
diff --git a/x-pack/plugins/features/public/mocks.ts b/x-pack/plugins/features/public/mocks.ts
new file mode 100644
index 0000000000000..014883f3ce9cf
--- /dev/null
+++ b/x-pack/plugins/features/public/mocks.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 { FeaturesPluginStart } from './plugin';
+
+const createStart = (): jest.Mocked<FeaturesPluginStart> => {
+  return {
+    getFeatures: jest.fn(),
+  };
+};
+
+export const featuresPluginMock = {
+  createStart,
+};
diff --git a/x-pack/plugins/features/public/plugin.test.ts b/x-pack/plugins/features/public/plugin.test.ts
new file mode 100644
index 0000000000000..aab712d647508
--- /dev/null
+++ b/x-pack/plugins/features/public/plugin.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 { FeaturesPlugin } from './plugin';
+
+import { coreMock, httpServiceMock } from 'src/core/public/mocks';
+
+jest.mock('./features_api_client', () => {
+  const instance = {
+    getFeatures: jest.fn(),
+  };
+  return {
+    FeaturesAPIClient: jest.fn().mockImplementation(() => instance),
+  };
+});
+
+import { FeaturesAPIClient } from './features_api_client';
+
+describe('Features Plugin', () => {
+  describe('#setup', () => {
+    it('returns expected public contract', () => {
+      const plugin = new FeaturesPlugin();
+      expect(plugin.setup(coreMock.createSetup())).toMatchInlineSnapshot(`undefined`);
+    });
+  });
+
+  describe('#start', () => {
+    it('returns expected public contract', () => {
+      const plugin = new FeaturesPlugin();
+      plugin.setup(coreMock.createSetup());
+
+      expect(plugin.start()).toMatchInlineSnapshot(`
+        Object {
+          "getFeatures": [Function],
+        }
+      `);
+    });
+
+    it('#getFeatures calls the underlying FeaturesAPIClient', () => {
+      const plugin = new FeaturesPlugin();
+      const apiClient = new FeaturesAPIClient(httpServiceMock.createSetupContract());
+
+      plugin.setup(coreMock.createSetup());
+
+      const start = plugin.start();
+      start.getFeatures();
+      expect(apiClient.getFeatures).toHaveBeenCalledTimes(1);
+    });
+  });
+});
diff --git a/x-pack/plugins/features/public/plugin.ts b/x-pack/plugins/features/public/plugin.ts
new file mode 100644
index 0000000000000..c168384dae78f
--- /dev/null
+++ b/x-pack/plugins/features/public/plugin.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 { Plugin, CoreSetup } from 'src/core/public';
+import { FeaturesAPIClient } from './features_api_client';
+
+export class FeaturesPlugin implements Plugin<FeaturesPluginSetup, FeaturesPluginStart> {
+  private apiClient?: FeaturesAPIClient;
+
+  public setup(core: CoreSetup) {
+    this.apiClient = new FeaturesAPIClient(core.http);
+  }
+
+  public start() {
+    return {
+      getFeatures: () => this.apiClient!.getFeatures(),
+    };
+  }
+
+  public stop() {}
+}
+
+export type FeaturesPluginSetup = ReturnType<FeaturesPlugin['setup']>;
+export type FeaturesPluginStart = ReturnType<FeaturesPlugin['start']>;
diff --git a/x-pack/plugins/features/server/__snapshots__/oss_features.test.ts.snap b/x-pack/plugins/features/server/__snapshots__/oss_features.test.ts.snap
new file mode 100644
index 0000000000000..ee94d0d40b853
--- /dev/null
+++ b/x-pack/plugins/features/server/__snapshots__/oss_features.test.ts.snap
@@ -0,0 +1,458 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`buildOSSFeatures returns the advancedSettings feature augmented with appropriate sub feature privileges 1`] = `
+Array [
+  Object {
+    "privilege": Object {
+      "app": Array [
+        "kibana",
+      ],
+      "catalogue": Array [
+        "advanced_settings",
+      ],
+      "management": Object {
+        "kibana": Array [
+          "settings",
+        ],
+      },
+      "savedObject": Object {
+        "all": Array [
+          "config",
+        ],
+        "read": Array [],
+      },
+      "ui": Array [
+        "save",
+      ],
+    },
+    "privilegeId": "all",
+  },
+  Object {
+    "privilege": Object {
+      "app": Array [
+        "kibana",
+      ],
+      "catalogue": Array [
+        "advanced_settings",
+      ],
+      "management": Object {
+        "kibana": Array [
+          "settings",
+        ],
+      },
+      "savedObject": Object {
+        "all": Array [],
+        "read": Array [],
+      },
+      "ui": Array [],
+    },
+    "privilegeId": "read",
+  },
+]
+`;
+
+exports[`buildOSSFeatures returns the dashboard feature augmented with appropriate sub feature privileges 1`] = `
+Array [
+  Object {
+    "privilege": Object {
+      "api": Array [],
+      "app": Array [
+        "kibana",
+      ],
+      "catalogue": Array [
+        "dashboard",
+      ],
+      "management": Object {},
+      "savedObject": Object {
+        "all": Array [
+          "dashboard",
+          "url",
+          "query",
+        ],
+        "read": Array [
+          "index-pattern",
+          "search",
+          "visualization",
+          "timelion-sheet",
+          "canvas-workpad",
+          "lens",
+          "map",
+        ],
+      },
+      "ui": Array [
+        "createNew",
+        "show",
+        "showWriteControls",
+        "saveQuery",
+        "createShortUrl",
+      ],
+    },
+    "privilegeId": "all",
+  },
+  Object {
+    "privilege": Object {
+      "app": Array [
+        "kibana",
+      ],
+      "catalogue": Array [
+        "dashboard",
+      ],
+      "savedObject": Object {
+        "all": Array [],
+        "read": Array [
+          "index-pattern",
+          "search",
+          "visualization",
+          "timelion-sheet",
+          "canvas-workpad",
+          "map",
+          "dashboard",
+          "query",
+        ],
+      },
+      "ui": Array [
+        "show",
+      ],
+    },
+    "privilegeId": "read",
+  },
+]
+`;
+
+exports[`buildOSSFeatures returns the dev_tools feature augmented with appropriate sub feature privileges 1`] = `
+Array [
+  Object {
+    "privilege": Object {
+      "api": Array [
+        "console",
+      ],
+      "app": Array [
+        "kibana",
+      ],
+      "catalogue": Array [
+        "console",
+        "searchprofiler",
+        "grokdebugger",
+      ],
+      "savedObject": Object {
+        "all": Array [],
+        "read": Array [],
+      },
+      "ui": Array [
+        "show",
+        "save",
+      ],
+    },
+    "privilegeId": "all",
+  },
+  Object {
+    "privilege": Object {
+      "api": Array [
+        "console",
+      ],
+      "app": Array [
+        "kibana",
+      ],
+      "catalogue": Array [
+        "console",
+        "searchprofiler",
+        "grokdebugger",
+      ],
+      "savedObject": Object {
+        "all": Array [],
+        "read": Array [],
+      },
+      "ui": Array [
+        "show",
+      ],
+    },
+    "privilegeId": "read",
+  },
+]
+`;
+
+exports[`buildOSSFeatures returns the discover feature augmented with appropriate sub feature privileges 1`] = `
+Array [
+  Object {
+    "privilege": Object {
+      "api": Array [],
+      "app": Array [
+        "kibana",
+      ],
+      "catalogue": Array [
+        "discover",
+      ],
+      "management": Object {},
+      "savedObject": Object {
+        "all": Array [
+          "search",
+          "query",
+          "url",
+        ],
+        "read": Array [
+          "index-pattern",
+        ],
+      },
+      "ui": Array [
+        "show",
+        "save",
+        "saveQuery",
+        "createShortUrl",
+      ],
+    },
+    "privilegeId": "all",
+  },
+  Object {
+    "privilege": Object {
+      "app": Array [
+        "kibana",
+      ],
+      "catalogue": Array [
+        "discover",
+      ],
+      "savedObject": Object {
+        "all": Array [],
+        "read": Array [
+          "index-pattern",
+          "search",
+          "query",
+        ],
+      },
+      "ui": Array [
+        "show",
+      ],
+    },
+    "privilegeId": "read",
+  },
+]
+`;
+
+exports[`buildOSSFeatures returns the indexPatterns feature augmented with appropriate sub feature privileges 1`] = `
+Array [
+  Object {
+    "privilege": Object {
+      "app": Array [
+        "kibana",
+      ],
+      "catalogue": Array [
+        "index_patterns",
+      ],
+      "management": Object {
+        "kibana": Array [
+          "index_patterns",
+        ],
+      },
+      "savedObject": Object {
+        "all": Array [
+          "index-pattern",
+        ],
+        "read": Array [],
+      },
+      "ui": Array [
+        "save",
+      ],
+    },
+    "privilegeId": "all",
+  },
+  Object {
+    "privilege": Object {
+      "app": Array [
+        "kibana",
+      ],
+      "catalogue": Array [
+        "index_patterns",
+      ],
+      "management": Object {
+        "kibana": Array [
+          "index_patterns",
+        ],
+      },
+      "savedObject": Object {
+        "all": Array [],
+        "read": Array [
+          "index-pattern",
+        ],
+      },
+      "ui": Array [],
+    },
+    "privilegeId": "read",
+  },
+]
+`;
+
+exports[`buildOSSFeatures returns the savedObjectsManagement feature augmented with appropriate sub feature privileges 1`] = `
+Array [
+  Object {
+    "privilege": Object {
+      "api": Array [
+        "copySavedObjectsToSpaces",
+      ],
+      "app": Array [
+        "kibana",
+      ],
+      "catalogue": Array [
+        "saved_objects",
+      ],
+      "management": Object {
+        "kibana": Array [
+          "objects",
+        ],
+      },
+      "savedObject": Object {
+        "all": Array [
+          "foo",
+          "bar",
+        ],
+        "read": Array [],
+      },
+      "ui": Array [
+        "read",
+        "edit",
+        "delete",
+        "copyIntoSpace",
+      ],
+    },
+    "privilegeId": "all",
+  },
+  Object {
+    "privilege": Object {
+      "api": Array [
+        "copySavedObjectsToSpaces",
+      ],
+      "app": Array [
+        "kibana",
+      ],
+      "catalogue": Array [
+        "saved_objects",
+      ],
+      "management": Object {
+        "kibana": Array [
+          "objects",
+        ],
+      },
+      "savedObject": Object {
+        "all": Array [],
+        "read": Array [
+          "foo",
+          "bar",
+        ],
+      },
+      "ui": Array [
+        "read",
+      ],
+    },
+    "privilegeId": "read",
+  },
+]
+`;
+
+exports[`buildOSSFeatures returns the timelion feature augmented with appropriate sub feature privileges 1`] = `
+Array [
+  Object {
+    "privilege": Object {
+      "app": Array [
+        "timelion",
+        "kibana",
+      ],
+      "catalogue": Array [
+        "timelion",
+      ],
+      "savedObject": Object {
+        "all": Array [
+          "timelion-sheet",
+        ],
+        "read": Array [
+          "index-pattern",
+        ],
+      },
+      "ui": Array [
+        "save",
+      ],
+    },
+    "privilegeId": "all",
+  },
+  Object {
+    "privilege": Object {
+      "app": Array [
+        "timelion",
+        "kibana",
+      ],
+      "catalogue": Array [
+        "timelion",
+      ],
+      "savedObject": Object {
+        "all": Array [],
+        "read": Array [
+          "index-pattern",
+          "timelion-sheet",
+        ],
+      },
+      "ui": Array [],
+    },
+    "privilegeId": "read",
+  },
+]
+`;
+
+exports[`buildOSSFeatures returns the visualize feature augmented with appropriate sub feature privileges 1`] = `
+Array [
+  Object {
+    "privilege": Object {
+      "api": Array [],
+      "app": Array [
+        "kibana",
+        "lens",
+      ],
+      "catalogue": Array [
+        "visualize",
+      ],
+      "management": Object {},
+      "savedObject": Object {
+        "all": Array [
+          "visualization",
+          "query",
+          "lens",
+          "url",
+        ],
+        "read": Array [
+          "index-pattern",
+          "search",
+        ],
+      },
+      "ui": Array [
+        "show",
+        "delete",
+        "save",
+        "saveQuery",
+        "createShortUrl",
+      ],
+    },
+    "privilegeId": "all",
+  },
+  Object {
+    "privilege": Object {
+      "app": Array [
+        "kibana",
+        "lens",
+      ],
+      "catalogue": Array [
+        "visualize",
+      ],
+      "savedObject": Object {
+        "all": Array [],
+        "read": Array [
+          "index-pattern",
+          "search",
+          "visualization",
+          "query",
+          "lens",
+        ],
+      },
+      "ui": Array [
+        "show",
+      ],
+    },
+    "privilegeId": "read",
+  },
+]
+`;
diff --git a/x-pack/plugins/features/server/feature_registry.test.ts b/x-pack/plugins/features/server/feature_registry.test.ts
index 7b25035892668..5b4f7728c9f31 100644
--- a/x-pack/plugins/features/server/feature_registry.test.ts
+++ b/x-pack/plugins/features/server/feature_registry.test.ts
@@ -5,15 +5,15 @@
  */
 
 import { FeatureRegistry } from './feature_registry';
-import { Feature } from '../common/feature';
+import { FeatureConfig } from '../common/feature';
 
 describe('FeatureRegistry', () => {
   it('allows a minimal feature to be registered', () => {
-    const feature: Feature = {
+    const feature: FeatureConfig = {
       id: 'test-feature',
       name: 'Test Feature',
       app: [],
-      privileges: {},
+      privileges: null,
     };
 
     const featureRegistry = new FeatureRegistry();
@@ -22,18 +22,18 @@ describe('FeatureRegistry', () => {
     expect(result).toHaveLength(1);
 
     // Should be the equal, but not the same instance (i.e., a defensive copy)
-    expect(result[0]).not.toBe(feature);
-    expect(result[0]).toEqual(feature);
+    expect(result[0].toRaw()).not.toBe(feature);
+    expect(result[0].toRaw()).toEqual(feature);
   });
 
   it('allows a complex feature to be registered', () => {
-    const feature: Feature = {
+    const feature: FeatureConfig = {
       id: 'test-feature',
       name: 'Test Feature',
       excludeFromBasePrivileges: true,
       icon: 'addDataApp',
       navLinkId: 'someNavLink',
-      app: ['app1', 'app2'],
+      app: ['app1'],
       validLicenses: ['standard', 'basic', 'gold', 'platinum'],
       catalogue: ['foo'],
       management: {
@@ -53,7 +53,61 @@ describe('FeatureRegistry', () => {
           api: ['someApiEndpointTag', 'anotherEndpointTag'],
           ui: ['allowsFoo', 'showBar', 'showBaz'],
         },
+        read: {
+          savedObject: {
+            all: [],
+            read: ['config', 'url'],
+          },
+          ui: [],
+        },
       },
+      subFeatures: [
+        {
+          name: 'sub-feature-1',
+          privilegeGroups: [
+            {
+              groupType: 'independent',
+              privileges: [
+                {
+                  id: 'foo',
+                  name: 'foo',
+                  includeIn: 'read',
+                  savedObject: {
+                    all: [],
+                    read: [],
+                  },
+                  ui: [],
+                },
+              ],
+            },
+            {
+              groupType: 'mutually_exclusive',
+              privileges: [
+                {
+                  id: 'bar',
+                  name: 'bar',
+                  includeIn: 'all',
+                  savedObject: {
+                    all: [],
+                    read: [],
+                  },
+                  ui: [],
+                },
+                {
+                  id: 'baz',
+                  name: 'baz',
+                  includeIn: 'none',
+                  savedObject: {
+                    all: [],
+                    read: [],
+                  },
+                  ui: [],
+                },
+              ],
+            },
+          ],
+        },
+      ],
       privilegesTooltip: 'some fancy tooltip',
       reserved: {
         privilege: {
@@ -79,12 +133,61 @@ describe('FeatureRegistry', () => {
     expect(result).toHaveLength(1);
 
     // Should be the equal, but not the same instance (i.e., a defensive copy)
-    expect(result[0]).not.toBe(feature);
-    expect(result[0]).toEqual(feature);
+    expect(result[0].toRaw()).not.toBe(feature);
+    expect(result[0].toRaw()).toEqual(feature);
+  });
+
+  it(`requires a value for privileges`, () => {
+    const feature: FeatureConfig = {
+      id: 'test-feature',
+      name: 'Test Feature',
+      app: [],
+    } as any;
+
+    const featureRegistry = new FeatureRegistry();
+    expect(() => featureRegistry.register(feature)).toThrowErrorMatchingInlineSnapshot(
+      `"child \\"privileges\\" fails because [\\"privileges\\" is required]"`
+    );
+  });
+
+  it(`does not allow sub-features to be registered when no primary privileges are not registered`, () => {
+    const feature: FeatureConfig = {
+      id: 'test-feature',
+      name: 'Test Feature',
+      app: [],
+      privileges: null,
+      subFeatures: [
+        {
+          name: 'my sub feature',
+          privilegeGroups: [
+            {
+              groupType: 'independent',
+              privileges: [
+                {
+                  id: 'my-sub-priv',
+                  name: 'my sub priv',
+                  includeIn: 'none',
+                  savedObject: {
+                    all: [],
+                    read: [],
+                  },
+                  ui: [],
+                },
+              ],
+            },
+          ],
+        },
+      ],
+    };
+
+    const featureRegistry = new FeatureRegistry();
+    expect(() => featureRegistry.register(feature)).toThrowErrorMatchingInlineSnapshot(
+      `"child \\"subFeatures\\" fails because [\\"subFeatures\\" must contain less than or equal to 0 items]"`
+    );
   });
 
   it(`automatically grants 'all' access to telemetry saved objects for the 'all' privilege`, () => {
-    const feature: Feature = {
+    const feature: FeatureConfig = {
       id: 'test-feature',
       name: 'Test Feature',
       app: [],
@@ -96,6 +199,13 @@ describe('FeatureRegistry', () => {
             read: [],
           },
         },
+        read: {
+          ui: [],
+          savedObject: {
+            all: [],
+            read: [],
+          },
+        },
       },
     };
 
@@ -103,12 +213,15 @@ describe('FeatureRegistry', () => {
     featureRegistry.register(feature);
     const result = featureRegistry.getAll();
 
-    const allPrivilege = result[0].privileges.all;
-    expect(allPrivilege.savedObject.all).toEqual(['telemetry']);
+    expect(result[0].privileges).toHaveProperty('all');
+    expect(result[0].privileges).toHaveProperty('read');
+
+    const allPrivilege = result[0].privileges?.all;
+    expect(allPrivilege?.savedObject.all).toEqual(['telemetry']);
   });
 
   it(`automatically grants 'read' access to config and url saved objects for both privileges`, () => {
-    const feature: Feature = {
+    const feature: FeatureConfig = {
       id: 'test-feature',
       name: 'Test Feature',
       app: [],
@@ -134,18 +247,21 @@ describe('FeatureRegistry', () => {
     featureRegistry.register(feature);
     const result = featureRegistry.getAll();
 
-    const allPrivilege = result[0].privileges.all;
-    const readPrivilege = result[0].privileges.read;
-    expect(allPrivilege.savedObject.read).toEqual(['config', 'url']);
-    expect(readPrivilege.savedObject.read).toEqual(['config', 'url']);
+    expect(result[0].privileges).toHaveProperty('all');
+    expect(result[0].privileges).toHaveProperty('read');
+
+    const allPrivilege = result[0].privileges?.all;
+    const readPrivilege = result[0].privileges?.read;
+    expect(allPrivilege?.savedObject.read).toEqual(['config', 'url']);
+    expect(readPrivilege?.savedObject.read).toEqual(['config', 'url']);
   });
 
   it(`automatically grants 'all' access to telemetry and 'read' to [config, url] saved objects for the reserved privilege`, () => {
-    const feature: Feature = {
+    const feature: FeatureConfig = {
       id: 'test-feature',
       name: 'Test Feature',
       app: [],
-      privileges: {},
+      privileges: null,
       reserved: {
         description: 'foo',
         privilege: {
@@ -168,7 +284,7 @@ describe('FeatureRegistry', () => {
   });
 
   it(`does not duplicate the automatic grants if specified on the incoming feature`, () => {
-    const feature: Feature = {
+    const feature: FeatureConfig = {
       id: 'test-feature',
       name: 'Test Feature',
       app: [],
@@ -194,26 +310,29 @@ describe('FeatureRegistry', () => {
     featureRegistry.register(feature);
     const result = featureRegistry.getAll();
 
-    const allPrivilege = result[0].privileges.all;
-    const readPrivilege = result[0].privileges.read;
-    expect(allPrivilege.savedObject.all).toEqual(['telemetry']);
-    expect(allPrivilege.savedObject.read).toEqual(['config', 'url']);
-    expect(readPrivilege.savedObject.read).toEqual(['config', 'url']);
+    expect(result[0].privileges).toHaveProperty('all');
+    expect(result[0].privileges).toHaveProperty('read');
+
+    const allPrivilege = result[0].privileges!.all;
+    const readPrivilege = result[0].privileges!.read;
+    expect(allPrivilege?.savedObject.all).toEqual(['telemetry']);
+    expect(allPrivilege?.savedObject.read).toEqual(['config', 'url']);
+    expect(readPrivilege?.savedObject.read).toEqual(['config', 'url']);
   });
 
   it(`does not allow duplicate features to be registered`, () => {
-    const feature: Feature = {
+    const feature: FeatureConfig = {
       id: 'test-feature',
       name: 'Test Feature',
       app: [],
-      privileges: {},
+      privileges: null,
     };
 
-    const duplicateFeature: Feature = {
+    const duplicateFeature: FeatureConfig = {
       id: 'test-feature',
       name: 'Duplicate Test Feature',
       app: [],
-      privileges: {},
+      privileges: null,
     };
 
     const featureRegistry = new FeatureRegistry();
@@ -233,7 +352,7 @@ describe('FeatureRegistry', () => {
           name: 'some feature',
           navLinkId: prohibitedChars,
           app: [],
-          privileges: {},
+          privileges: null,
         })
       ).toThrowErrorMatchingSnapshot();
     });
@@ -248,7 +367,7 @@ describe('FeatureRegistry', () => {
             kibana: [prohibitedChars],
           },
           app: [],
-          privileges: {},
+          privileges: null,
         })
       ).toThrowErrorMatchingSnapshot();
     });
@@ -261,7 +380,7 @@ describe('FeatureRegistry', () => {
           name: 'some feature',
           catalogue: [prohibitedChars],
           app: [],
-          privileges: {},
+          privileges: null,
         })
       ).toThrowErrorMatchingSnapshot();
     });
@@ -275,19 +394,20 @@ describe('FeatureRegistry', () => {
           id: prohibitedId,
           name: 'some feature',
           app: [],
-          privileges: {},
+          privileges: null,
         })
       ).toThrowErrorMatchingSnapshot();
     });
   });
 
   it('prevents features from being registered with invalid privilege names', () => {
-    const feature: Feature = {
+    const feature: FeatureConfig = {
       id: 'test-feature',
       name: 'Test Feature',
       app: ['app1', 'app2'],
       privileges: {
         foo: {
+          name: 'Foo',
           app: ['app1', 'app2'],
           savedObject: {
             all: ['config', 'space', 'etc'],
@@ -296,7 +416,7 @@ describe('FeatureRegistry', () => {
           api: ['someApiEndpointTag', 'anotherEndpointTag'],
           ui: ['allowsFoo', 'showBar', 'showBaz'],
         },
-      },
+      } as any,
     };
 
     const featureRegistry = new FeatureRegistry();
@@ -306,7 +426,7 @@ describe('FeatureRegistry', () => {
   });
 
   it(`prevents privileges from specifying app entries that don't exist at the root level`, () => {
-    const feature: Feature = {
+    const feature: FeatureConfig = {
       id: 'test-feature',
       name: 'Test Feature',
       app: ['bar'],
@@ -319,6 +439,14 @@ describe('FeatureRegistry', () => {
           ui: [],
           app: ['foo', 'bar', 'baz'],
         },
+        read: {
+          savedObject: {
+            all: [],
+            read: [],
+          },
+          ui: [],
+          app: ['foo', 'bar', 'baz'],
+        },
       },
     };
 
@@ -329,12 +457,67 @@ describe('FeatureRegistry', () => {
     );
   });
 
+  it(`prevents features from specifying app entries that don't exist at the privilege level`, () => {
+    const feature: FeatureConfig = {
+      id: 'test-feature',
+      name: 'Test Feature',
+      app: ['foo', 'bar', 'baz'],
+      privileges: {
+        all: {
+          savedObject: {
+            all: [],
+            read: [],
+          },
+          ui: [],
+          app: ['bar'],
+        },
+        read: {
+          savedObject: {
+            all: [],
+            read: [],
+          },
+          ui: [],
+          app: [],
+        },
+      },
+      subFeatures: [
+        {
+          name: 'my sub feature',
+          privilegeGroups: [
+            {
+              groupType: 'independent',
+              privileges: [
+                {
+                  id: 'cool-sub-feature-privilege',
+                  name: 'cool privilege',
+                  includeIn: 'none',
+                  savedObject: {
+                    all: [],
+                    read: [],
+                  },
+                  ui: [],
+                  app: ['foo'],
+                },
+              ],
+            },
+          ],
+        },
+      ],
+    };
+
+    const featureRegistry = new FeatureRegistry();
+
+    expect(() => featureRegistry.register(feature)).toThrowErrorMatchingInlineSnapshot(
+      `"Feature test-feature specifies app entries which are not granted to any privileges: baz"`
+    );
+  });
+
   it(`prevents reserved privileges from specifying app entries that don't exist at the root level`, () => {
-    const feature: Feature = {
+    const feature: FeatureConfig = {
       id: 'test-feature',
       name: 'Test Feature',
       app: ['bar'],
-      privileges: {},
+      privileges: null,
       reserved: {
         description: 'something',
         privilege: {
@@ -355,8 +538,34 @@ describe('FeatureRegistry', () => {
     );
   });
 
+  it(`prevents features from specifying app entries that don't exist at the reserved privilege level`, () => {
+    const feature: FeatureConfig = {
+      id: 'test-feature',
+      name: 'Test Feature',
+      app: ['foo', 'bar', 'baz'],
+      privileges: null,
+      reserved: {
+        description: 'something',
+        privilege: {
+          savedObject: {
+            all: [],
+            read: [],
+          },
+          ui: [],
+          app: ['foo', 'bar'],
+        },
+      },
+    };
+
+    const featureRegistry = new FeatureRegistry();
+
+    expect(() => featureRegistry.register(feature)).toThrowErrorMatchingInlineSnapshot(
+      `"Feature test-feature specifies app entries which are not granted to any privileges: baz"`
+    );
+  });
+
   it(`prevents privileges from specifying catalogue entries that don't exist at the root level`, () => {
-    const feature: Feature = {
+    const feature: FeatureConfig = {
       id: 'test-feature',
       name: 'Test Feature',
       app: [],
@@ -371,6 +580,15 @@ describe('FeatureRegistry', () => {
           ui: [],
           app: [],
         },
+        read: {
+          catalogue: ['foo', 'bar', 'baz'],
+          savedObject: {
+            all: [],
+            read: [],
+          },
+          ui: [],
+          app: [],
+        },
       },
     };
 
@@ -381,13 +599,71 @@ describe('FeatureRegistry', () => {
     );
   });
 
+  it(`prevents features from specifying catalogue entries that don't exist at the privilege level`, () => {
+    const feature: FeatureConfig = {
+      id: 'test-feature',
+      name: 'Test Feature',
+      app: [],
+      catalogue: ['foo', 'bar', 'baz'],
+      privileges: {
+        all: {
+          catalogue: ['foo'],
+          savedObject: {
+            all: [],
+            read: [],
+          },
+          ui: [],
+          app: [],
+        },
+        read: {
+          catalogue: ['foo'],
+          savedObject: {
+            all: [],
+            read: [],
+          },
+          ui: [],
+          app: [],
+        },
+      },
+      subFeatures: [
+        {
+          name: 'my sub feature',
+          privilegeGroups: [
+            {
+              groupType: 'independent',
+              privileges: [
+                {
+                  id: 'cool-sub-feature-privilege',
+                  name: 'cool privilege',
+                  includeIn: 'none',
+                  savedObject: {
+                    all: [],
+                    read: [],
+                  },
+                  ui: [],
+                  catalogue: ['bar'],
+                },
+              ],
+            },
+          ],
+        },
+      ],
+    };
+
+    const featureRegistry = new FeatureRegistry();
+
+    expect(() => featureRegistry.register(feature)).toThrowErrorMatchingInlineSnapshot(
+      `"Feature test-feature specifies catalogue entries which are not granted to any privileges: baz"`
+    );
+  });
+
   it(`prevents reserved privileges from specifying catalogue entries that don't exist at the root level`, () => {
-    const feature: Feature = {
+    const feature: FeatureConfig = {
       id: 'test-feature',
       name: 'Test Feature',
       app: [],
       catalogue: ['bar'],
-      privileges: {},
+      privileges: null,
       reserved: {
         description: 'something',
         privilege: {
@@ -409,8 +685,36 @@ describe('FeatureRegistry', () => {
     );
   });
 
+  it(`prevents features from specifying catalogue entries that don't exist at the reserved privilege level`, () => {
+    const feature: FeatureConfig = {
+      id: 'test-feature',
+      name: 'Test Feature',
+      app: [],
+      catalogue: ['foo', 'bar', 'baz'],
+      privileges: null,
+      reserved: {
+        description: 'something',
+        privilege: {
+          catalogue: ['foo', 'bar'],
+          savedObject: {
+            all: [],
+            read: [],
+          },
+          ui: [],
+          app: [],
+        },
+      },
+    };
+
+    const featureRegistry = new FeatureRegistry();
+
+    expect(() => featureRegistry.register(feature)).toThrowErrorMatchingInlineSnapshot(
+      `"Feature test-feature specifies catalogue entries which are not granted to any privileges: baz"`
+    );
+  });
+
   it(`prevents privileges from specifying management sections that don't exist at the root level`, () => {
-    const feature: Feature = {
+    const feature: FeatureConfig = {
       id: 'test-feature',
       name: 'Test Feature',
       app: [],
@@ -431,6 +735,18 @@ describe('FeatureRegistry', () => {
           ui: [],
           app: [],
         },
+        read: {
+          catalogue: ['bar'],
+          management: {
+            elasticsearch: ['hey'],
+          },
+          savedObject: {
+            all: [],
+            read: [],
+          },
+          ui: [],
+          app: [],
+        },
       },
     };
 
@@ -441,8 +757,79 @@ describe('FeatureRegistry', () => {
     );
   });
 
+  it(`prevents features from specifying management sections that don't exist at the privilege level`, () => {
+    const feature: FeatureConfig = {
+      id: 'test-feature',
+      name: 'Test Feature',
+      app: [],
+      catalogue: ['bar'],
+      management: {
+        kibana: ['hey'],
+        elasticsearch: ['hey', 'there'],
+      },
+      privileges: {
+        all: {
+          catalogue: ['bar'],
+          management: {
+            elasticsearch: ['hey'],
+          },
+          savedObject: {
+            all: [],
+            read: [],
+          },
+          ui: [],
+          app: [],
+        },
+        read: {
+          catalogue: ['bar'],
+          management: {
+            elasticsearch: ['hey'],
+          },
+          savedObject: {
+            all: [],
+            read: [],
+          },
+          ui: [],
+          app: [],
+        },
+      },
+      subFeatures: [
+        {
+          name: 'my sub feature',
+          privilegeGroups: [
+            {
+              groupType: 'independent',
+              privileges: [
+                {
+                  id: 'cool-sub-feature-privilege',
+                  name: 'cool privilege',
+                  includeIn: 'none',
+                  savedObject: {
+                    all: [],
+                    read: [],
+                  },
+                  ui: [],
+                  management: {
+                    kibana: ['hey'],
+                    elasticsearch: ['hey'],
+                  },
+                },
+              ],
+            },
+          ],
+        },
+      ],
+    };
+
+    const featureRegistry = new FeatureRegistry();
+
+    expect(() => featureRegistry.register(feature)).toThrowErrorMatchingInlineSnapshot(
+      `"Feature test-feature specifies management entries which are not granted to any privileges: elasticsearch.there"`
+    );
+  });
+
   it(`prevents reserved privileges from specifying management entries that don't exist at the root level`, () => {
-    const feature: Feature = {
+    const feature: FeatureConfig = {
       id: 'test-feature',
       name: 'Test Feature',
       app: [],
@@ -450,7 +837,7 @@ describe('FeatureRegistry', () => {
       management: {
         kibana: ['hey'],
       },
-      privileges: {},
+      privileges: null,
       reserved: {
         description: 'something',
         privilege: {
@@ -475,18 +862,52 @@ describe('FeatureRegistry', () => {
     );
   });
 
+  it(`prevents features from specifying management entries that don't exist at the reserved privilege level`, () => {
+    const feature: FeatureConfig = {
+      id: 'test-feature',
+      name: 'Test Feature',
+      app: [],
+      catalogue: ['bar'],
+      management: {
+        kibana: ['hey', 'hey-there'],
+      },
+      privileges: null,
+      reserved: {
+        description: 'something',
+        privilege: {
+          catalogue: ['bar'],
+          management: {
+            kibana: ['hey-there'],
+          },
+          savedObject: {
+            all: [],
+            read: [],
+          },
+          ui: [],
+          app: [],
+        },
+      },
+    };
+
+    const featureRegistry = new FeatureRegistry();
+
+    expect(() => featureRegistry.register(feature)).toThrowErrorMatchingInlineSnapshot(
+      `"Feature test-feature specifies management entries which are not granted to any privileges: kibana.hey"`
+    );
+  });
+
   it('cannot register feature after getAll has been called', () => {
-    const feature1: Feature = {
+    const feature1: FeatureConfig = {
       id: 'test-feature',
       name: 'Test Feature',
       app: [],
-      privileges: {},
+      privileges: null,
     };
-    const feature2: Feature = {
+    const feature2: FeatureConfig = {
       id: 'test-feature-2',
       name: 'Test Feature 2',
       app: [],
-      privileges: {},
+      privileges: null,
     };
 
     const featureRegistry = new FeatureRegistry();
diff --git a/x-pack/plugins/features/server/feature_registry.ts b/x-pack/plugins/features/server/feature_registry.ts
index 60a229fc58612..73a353cd27471 100644
--- a/x-pack/plugins/features/server/feature_registry.ts
+++ b/x-pack/plugins/features/server/feature_registry.ts
@@ -5,14 +5,14 @@
  */
 
 import { cloneDeep, uniq } from 'lodash';
-import { Feature, FeatureWithAllOrReadPrivileges, FeatureKibanaPrivileges } from '../common';
+import { FeatureConfig, Feature, FeatureKibanaPrivileges } from '../common';
 import { validateFeature } from './feature_schema';
 
 export class FeatureRegistry {
   private locked = false;
-  private features: Record<string, Feature> = {};
+  private features: Record<string, FeatureConfig> = {};
 
-  public register(feature: FeatureWithAllOrReadPrivileges) {
+  public register(feature: FeatureConfig) {
     if (this.locked) {
       throw new Error(
         `Features are locked, can't register new features. Attempt to register ${feature.id} failed.`
@@ -25,20 +25,21 @@ export class FeatureRegistry {
       throw new Error(`Feature with id ${feature.id} is already registered.`);
     }
 
-    const featureCopy: Feature = cloneDeep(feature as Feature);
+    const featureCopy = cloneDeep(feature);
 
-    this.features[feature.id] = applyAutomaticPrivilegeGrants(featureCopy as Feature);
+    this.features[feature.id] = applyAutomaticPrivilegeGrants(featureCopy);
   }
 
   public getAll(): Feature[] {
     this.locked = true;
-    return cloneDeep(Object.values(this.features));
+    return Object.values(this.features).map(featureConfig => new Feature(featureConfig));
   }
 }
 
-function applyAutomaticPrivilegeGrants(feature: Feature): Feature {
-  const { all: allPrivilege, read: readPrivilege } = feature.privileges;
-  const reservedPrivilege = feature.reserved ? feature.reserved.privilege : null;
+function applyAutomaticPrivilegeGrants(feature: FeatureConfig): FeatureConfig {
+  const allPrivilege = feature.privileges?.all;
+  const readPrivilege = feature.privileges?.read;
+  const reservedPrivilege = feature.reserved?.privilege;
 
   applyAutomaticAllPrivilegeGrants(allPrivilege, reservedPrivilege);
   applyAutomaticReadPrivilegeGrants(readPrivilege);
@@ -46,7 +47,9 @@ function applyAutomaticPrivilegeGrants(feature: Feature): Feature {
   return feature;
 }
 
-function applyAutomaticAllPrivilegeGrants(...allPrivileges: Array<FeatureKibanaPrivileges | null>) {
+function applyAutomaticAllPrivilegeGrants(
+  ...allPrivileges: Array<FeatureKibanaPrivileges | undefined>
+) {
   allPrivileges.forEach(allPrivilege => {
     if (allPrivilege) {
       allPrivilege.savedObject.all = uniq([...allPrivilege.savedObject.all, 'telemetry']);
@@ -56,7 +59,7 @@ function applyAutomaticAllPrivilegeGrants(...allPrivileges: Array<FeatureKibanaP
 }
 
 function applyAutomaticReadPrivilegeGrants(
-  ...readPrivileges: Array<FeatureKibanaPrivileges | null>
+  ...readPrivileges: Array<FeatureKibanaPrivileges | undefined>
 ) {
   readPrivileges.forEach(readPrivilege => {
     if (readPrivilege) {
diff --git a/x-pack/plugins/features/server/feature_schema.ts b/x-pack/plugins/features/server/feature_schema.ts
index cc12ea1b78dce..fdeceb30b4e3d 100644
--- a/x-pack/plugins/features/server/feature_schema.ts
+++ b/x-pack/plugins/features/server/feature_schema.ts
@@ -8,13 +8,15 @@ import Joi from 'joi';
 
 import { difference } from 'lodash';
 import { Capabilities as UICapabilities } from '../../../../src/core/server';
-import { FeatureWithAllOrReadPrivileges } from '../common/feature';
+import { FeatureConfig } from '../common/feature';
+import { FeatureKibanaPrivileges } from '.';
 
 // Each feature gets its own property on the UICapabilities object,
 // but that object has a few built-in properties which should not be overwritten.
 const prohibitedFeatureIds: Array<keyof UICapabilities> = ['catalogue', 'management', 'navLinks'];
 
 const featurePrivilegePartRegex = /^[a-zA-Z0-9_-]+$/;
+const subFeaturePrivilegePartRegex = /^[a-zA-Z0-9_-]+$/;
 const managementSectionIdRegex = /^[a-zA-Z0-9_-]+$/;
 export const uiCapabilitiesRegex = /^[a-zA-Z0-9:_-]+$/;
 
@@ -43,12 +45,52 @@ const privilegeSchema = Joi.object({
     .required(),
 });
 
+const subFeaturePrivilegeSchema = Joi.object({
+  id: Joi.string()
+    .regex(subFeaturePrivilegePartRegex)
+    .required(),
+  name: Joi.string().required(),
+  includeIn: Joi.string()
+    .allow('all', 'read', 'none')
+    .required(),
+  management: managementSchema,
+  catalogue: catalogueSchema,
+  api: Joi.array().items(Joi.string()),
+  app: Joi.array().items(Joi.string()),
+  savedObject: Joi.object({
+    all: Joi.array()
+      .items(Joi.string())
+      .required(),
+    read: Joi.array()
+      .items(Joi.string())
+      .required(),
+  }).required(),
+  ui: Joi.array()
+    .items(Joi.string().regex(uiCapabilitiesRegex))
+    .required(),
+});
+
+const subFeatureSchema = Joi.object({
+  name: Joi.string().required(),
+  privilegeGroups: Joi.array().items(
+    Joi.object({
+      groupType: Joi.string()
+        .valid('mutually_exclusive', 'independent')
+        .required(),
+      privileges: Joi.array()
+        .items(subFeaturePrivilegeSchema)
+        .min(1),
+    })
+  ),
+});
+
 const schema = Joi.object({
   id: Joi.string()
     .regex(featurePrivilegePartRegex)
     .invalid(...prohibitedFeatureIds)
     .required(),
   name: Joi.string().required(),
+  order: Joi.number(),
   excludeFromBasePrivileges: Joi.boolean(),
   validLicenses: Joi.array().items(
     Joi.string().valid('basic', 'standard', 'gold', 'platinum', 'enterprise', 'trial')
@@ -64,7 +106,16 @@ const schema = Joi.object({
   privileges: Joi.object({
     all: privilegeSchema,
     read: privilegeSchema,
-  }).required(),
+  })
+    .allow(null)
+    .required(),
+  subFeatures: Joi.when('privileges', {
+    is: null,
+    then: Joi.array()
+      .items(subFeatureSchema)
+      .max(0),
+    otherwise: Joi.array().items(subFeatureSchema),
+  }),
   privilegesTooltip: Joi.string(),
   reserved: Joi.object({
     privilege: privilegeSchema.required(),
@@ -72,7 +123,7 @@ const schema = Joi.object({
   }),
 });
 
-export function validateFeature(feature: FeatureWithAllOrReadPrivileges) {
+export function validateFeature(feature: FeatureConfig) {
   const validateResult = Joi.validate(feature, schema);
   if (validateResult.error) {
     throw validateResult.error;
@@ -80,17 +131,21 @@ export function validateFeature(feature: FeatureWithAllOrReadPrivileges) {
   // the following validation can't be enforced by the Joi schema, since it'd require us looking "up" the object graph for the list of valid value, which they explicitly forbid.
   const { app = [], management = {}, catalogue = [] } = feature;
 
-  const privilegeEntries = [...Object.entries(feature.privileges)];
-  if (feature.reserved) {
-    privilegeEntries.push(['reserved', feature.reserved.privilege]);
-  }
+  const unseenApps = new Set(app);
 
-  privilegeEntries.forEach(([privilegeId, privilegeDefinition]) => {
-    if (!privilegeDefinition) {
-      throw new Error('Privilege definition may not be null or undefined');
-    }
+  const managementSets = Object.entries(management).map(entry => [
+    entry[0],
+    new Set(entry[1]),
+  ]) as Array<[string, Set<string>]>;
+
+  const unseenManagement = new Map<string, Set<string>>(managementSets);
+
+  const unseenCatalogue = new Set(catalogue);
+
+  function validateAppEntry(privilegeId: string, entry: string[] = []) {
+    entry.forEach(privilegeApp => unseenApps.delete(privilegeApp));
 
-    const unknownAppEntries = difference(privilegeDefinition.app || [], app);
+    const unknownAppEntries = difference(entry, app);
     if (unknownAppEntries.length > 0) {
       throw new Error(
         `Feature privilege ${
@@ -98,8 +153,12 @@ export function validateFeature(feature: FeatureWithAllOrReadPrivileges) {
         }.${privilegeId} has unknown app entries: ${unknownAppEntries.join(', ')}`
       );
     }
+  }
+
+  function validateCatalogueEntry(privilegeId: string, entry: string[] = []) {
+    entry.forEach(privilegeCatalogue => unseenCatalogue.delete(privilegeCatalogue));
 
-    const unknownCatalogueEntries = difference(privilegeDefinition.catalogue || [], catalogue);
+    const unknownCatalogueEntries = difference(entry || [], catalogue);
     if (unknownCatalogueEntries.length > 0) {
       throw new Error(
         `Feature privilege ${
@@ -107,27 +166,113 @@ export function validateFeature(feature: FeatureWithAllOrReadPrivileges) {
         }.${privilegeId} has unknown catalogue entries: ${unknownCatalogueEntries.join(', ')}`
       );
     }
+  }
 
-    Object.entries(privilegeDefinition.management || {}).forEach(
-      ([managementSectionId, managementEntry]) => {
-        if (!management[managementSectionId]) {
-          throw new Error(
-            `Feature privilege ${feature.id}.${privilegeId} has unknown management section: ${managementSectionId}`
-          );
-        }
-
-        const unknownSectionEntries = difference(managementEntry, management[managementSectionId]);
-
-        if (unknownSectionEntries.length > 0) {
-          throw new Error(
-            `Feature privilege ${
-              feature.id
-            }.${privilegeId} has unknown management entries for section ${managementSectionId}: ${unknownSectionEntries.join(
-              ', '
-            )}`
-          );
-        }
+  function validateManagementEntry(
+    privilegeId: string,
+    managementEntry: Record<string, string[]> = {}
+  ) {
+    Object.entries(managementEntry).forEach(([managementSectionId, managementSectionEntry]) => {
+      if (unseenManagement.has(managementSectionId)) {
+        managementSectionEntry.forEach(entry => {
+          unseenManagement.get(managementSectionId)!.delete(entry);
+          if (unseenManagement.get(managementSectionId)?.size === 0) {
+            unseenManagement.delete(managementSectionId);
+          }
+        });
       }
-    );
+      if (!management[managementSectionId]) {
+        throw new Error(
+          `Feature privilege ${feature.id}.${privilegeId} has unknown management section: ${managementSectionId}`
+        );
+      }
+
+      const unknownSectionEntries = difference(
+        managementSectionEntry,
+        management[managementSectionId]
+      );
+
+      if (unknownSectionEntries.length > 0) {
+        throw new Error(
+          `Feature privilege ${
+            feature.id
+          }.${privilegeId} has unknown management entries for section ${managementSectionId}: ${unknownSectionEntries.join(
+            ', '
+          )}`
+        );
+      }
+    });
+  }
+
+  const privilegeEntries: Array<[string, FeatureKibanaPrivileges]> = [];
+  if (feature.privileges) {
+    privilegeEntries.push(...Object.entries(feature.privileges));
+  }
+  if (feature.reserved) {
+    privilegeEntries.push(['reserved', feature.reserved.privilege]);
+  }
+
+  if (privilegeEntries.length === 0) {
+    return;
+  }
+
+  privilegeEntries.forEach(([privilegeId, privilegeDefinition]) => {
+    if (!privilegeDefinition) {
+      throw new Error('Privilege definition may not be null or undefined');
+    }
+
+    validateAppEntry(privilegeId, privilegeDefinition.app);
+
+    validateCatalogueEntry(privilegeId, privilegeDefinition.catalogue);
+
+    validateManagementEntry(privilegeId, privilegeDefinition.management);
+  });
+
+  const subFeatureEntries = feature.subFeatures ?? [];
+  subFeatureEntries.forEach(subFeature => {
+    subFeature.privilegeGroups.forEach(subFeaturePrivilegeGroup => {
+      subFeaturePrivilegeGroup.privileges.forEach(subFeaturePrivilege => {
+        validateAppEntry(subFeaturePrivilege.id, subFeaturePrivilege.app);
+        validateCatalogueEntry(subFeaturePrivilege.id, subFeaturePrivilege.catalogue);
+        validateManagementEntry(subFeaturePrivilege.id, subFeaturePrivilege.management);
+      });
+    });
   });
+
+  if (unseenApps.size > 0) {
+    throw new Error(
+      `Feature ${
+        feature.id
+      } specifies app entries which are not granted to any privileges: ${Array.from(
+        unseenApps.values()
+      ).join(',')}`
+    );
+  }
+
+  if (unseenCatalogue.size > 0) {
+    throw new Error(
+      `Feature ${
+        feature.id
+      } specifies catalogue entries which are not granted to any privileges: ${Array.from(
+        unseenCatalogue.values()
+      ).join(',')}`
+    );
+  }
+
+  if (unseenManagement.size > 0) {
+    const ungrantedManagement = Array.from(unseenManagement.entries()).reduce((acc, entry) => {
+      const values = Array.from(entry[1].values()).map(
+        managementPage => `${entry[0]}.${managementPage}`
+      );
+      return [...acc, ...values];
+    }, [] as string[]);
+
+    throw new Error(
+      `Feature ${
+        feature.id
+      } specifies management entries which are not granted to any privileges: ${ungrantedManagement.join(
+        ','
+      )}`
+    );
+  }
 }
diff --git a/x-pack/plugins/features/server/index.ts b/x-pack/plugins/features/server/index.ts
index 48ef97a494f7e..48a350ae8f8fd 100644
--- a/x-pack/plugins/features/server/index.ts
+++ b/x-pack/plugins/features/server/index.ts
@@ -13,7 +13,7 @@ import { Plugin } from './plugin';
 // run-time contracts.
 export { uiCapabilitiesRegex } from './feature_schema';
 
-export { Feature, FeatureWithAllOrReadPrivileges, FeatureKibanaPrivileges } from '../common';
+export { Feature, FeatureConfig, FeatureKibanaPrivileges } from '../common';
 export { PluginSetupContract, PluginStartContract } from './plugin';
 
 export const plugin = (initializerContext: PluginInitializerContext) =>
diff --git a/x-pack/plugins/features/server/oss_features.test.ts b/x-pack/plugins/features/server/oss_features.test.ts
index 987af08fe7cda..72beff02173d2 100644
--- a/x-pack/plugins/features/server/oss_features.test.ts
+++ b/x-pack/plugins/features/server/oss_features.test.ts
@@ -5,6 +5,8 @@
  */
 
 import { buildOSSFeatures } from './oss_features';
+import { featurePrivilegeIterator } from '../../security/server/authorization';
+import { Feature } from '.';
 
 describe('buildOSSFeatures', () => {
   it('returns features including timelion', () => {
@@ -39,4 +41,17 @@ Array [
 ]
 `);
   });
+
+  const features = buildOSSFeatures({ savedObjectTypes: ['foo', 'bar'], includeTimelion: true });
+  features.forEach(featureConfig => {
+    it(`returns the ${featureConfig.id} feature augmented with appropriate sub feature privileges`, () => {
+      const privileges = [];
+      for (const featurePrivilege of featurePrivilegeIterator(new Feature(featureConfig), {
+        augmentWithSubFeaturePrivileges: true,
+      })) {
+        privileges.push(featurePrivilege);
+      }
+      expect(privileges).toMatchSnapshot();
+    });
+  });
 });
diff --git a/x-pack/plugins/features/server/oss_features.ts b/x-pack/plugins/features/server/oss_features.ts
index b48963ebb8139..3e8ce37fd1578 100644
--- a/x-pack/plugins/features/server/oss_features.ts
+++ b/x-pack/plugins/features/server/oss_features.ts
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 import { i18n } from '@kbn/i18n';
-import { Feature } from '../common/feature';
+import { FeatureConfig } from '../common/feature';
 
 export interface BuildOSSFeaturesParams {
   savedObjectTypes: string[];
@@ -18,19 +18,24 @@ export const buildOSSFeatures = ({ savedObjectTypes, includeTimelion }: BuildOSS
       name: i18n.translate('xpack.features.discoverFeatureName', {
         defaultMessage: 'Discover',
       }),
+      order: 100,
       icon: 'discoverApp',
       navLinkId: 'kibana:discover',
       app: ['kibana'],
       catalogue: ['discover'],
       privileges: {
         all: {
+          app: ['kibana'],
+          catalogue: ['discover'],
           savedObject: {
-            all: ['search', 'url', 'query'],
+            all: ['search', 'query'],
             read: ['index-pattern'],
           },
-          ui: ['show', 'createShortUrl', 'save', 'saveQuery'],
+          ui: ['show', 'save', 'saveQuery'],
         },
         read: {
+          app: ['kibana'],
+          catalogue: ['discover'],
           savedObject: {
             all: [],
             read: ['index-pattern', 'search', 'query'],
@@ -38,25 +43,59 @@ export const buildOSSFeatures = ({ savedObjectTypes, includeTimelion }: BuildOSS
           ui: ['show'],
         },
       },
+      subFeatures: [
+        {
+          name: i18n.translate('xpack.features.ossFeatures.discoverShortUrlSubFeatureName', {
+            defaultMessage: 'Short URLs',
+          }),
+          privilegeGroups: [
+            {
+              groupType: 'independent',
+              privileges: [
+                {
+                  id: 'url_create',
+                  name: i18n.translate(
+                    'xpack.features.ossFeatures.discoverCreateShortUrlPrivilegeName',
+                    {
+                      defaultMessage: 'Create Short URLs',
+                    }
+                  ),
+                  includeIn: 'all',
+                  savedObject: {
+                    all: ['url'],
+                    read: [],
+                  },
+                  ui: ['createShortUrl'],
+                },
+              ],
+            },
+          ],
+        },
+      ],
     },
     {
       id: 'visualize',
       name: i18n.translate('xpack.features.visualizeFeatureName', {
         defaultMessage: 'Visualize',
       }),
+      order: 200,
       icon: 'visualizeApp',
       navLinkId: 'kibana:visualize',
       app: ['kibana', 'lens'],
       catalogue: ['visualize'],
       privileges: {
         all: {
+          app: ['kibana', 'lens'],
+          catalogue: ['visualize'],
           savedObject: {
-            all: ['visualization', 'url', 'query', 'lens'],
+            all: ['visualization', 'query', 'lens'],
             read: ['index-pattern', 'search'],
           },
-          ui: ['show', 'createShortUrl', 'delete', 'save', 'saveQuery'],
+          ui: ['show', 'delete', 'save', 'saveQuery'],
         },
         read: {
+          app: ['kibana', 'lens'],
+          catalogue: ['visualize'],
           savedObject: {
             all: [],
             read: ['index-pattern', 'search', 'visualization', 'query', 'lens'],
@@ -64,18 +103,50 @@ export const buildOSSFeatures = ({ savedObjectTypes, includeTimelion }: BuildOSS
           ui: ['show'],
         },
       },
+      subFeatures: [
+        {
+          name: i18n.translate('xpack.features.ossFeatures.visualizeShortUrlSubFeatureName', {
+            defaultMessage: 'Short URLs',
+          }),
+          privilegeGroups: [
+            {
+              groupType: 'independent',
+              privileges: [
+                {
+                  id: 'url_create',
+                  name: i18n.translate(
+                    'xpack.features.ossFeatures.visualizeCreateShortUrlPrivilegeName',
+                    {
+                      defaultMessage: 'Create Short URLs',
+                    }
+                  ),
+                  includeIn: 'all',
+                  savedObject: {
+                    all: ['url'],
+                    read: [],
+                  },
+                  ui: ['createShortUrl'],
+                },
+              ],
+            },
+          ],
+        },
+      ],
     },
     {
       id: 'dashboard',
       name: i18n.translate('xpack.features.dashboardFeatureName', {
         defaultMessage: 'Dashboard',
       }),
+      order: 300,
       icon: 'dashboardApp',
       navLinkId: 'kibana:dashboard',
       app: ['kibana'],
       catalogue: ['dashboard'],
       privileges: {
         all: {
+          app: ['kibana'],
+          catalogue: ['dashboard'],
           savedObject: {
             all: ['dashboard', 'url', 'query'],
             read: [
@@ -91,6 +162,8 @@ export const buildOSSFeatures = ({ savedObjectTypes, includeTimelion }: BuildOSS
           ui: ['createNew', 'show', 'showWriteControls', 'saveQuery'],
         },
         read: {
+          app: ['kibana'],
+          catalogue: ['dashboard'],
           savedObject: {
             all: [],
             read: [
@@ -107,18 +180,50 @@ export const buildOSSFeatures = ({ savedObjectTypes, includeTimelion }: BuildOSS
           ui: ['show'],
         },
       },
+      subFeatures: [
+        {
+          name: i18n.translate('xpack.features.ossFeatures.dashboardShortUrlSubFeatureName', {
+            defaultMessage: 'Short URLs',
+          }),
+          privilegeGroups: [
+            {
+              groupType: 'independent',
+              privileges: [
+                {
+                  id: 'url_create',
+                  name: i18n.translate(
+                    'xpack.features.ossFeatures.dashboardCreateShortUrlPrivilegeName',
+                    {
+                      defaultMessage: 'Create Short URLs',
+                    }
+                  ),
+                  includeIn: 'all',
+                  savedObject: {
+                    all: ['url'],
+                    read: [],
+                  },
+                  ui: ['createShortUrl'],
+                },
+              ],
+            },
+          ],
+        },
+      ],
     },
     {
       id: 'dev_tools',
       name: i18n.translate('xpack.features.devToolsFeatureName', {
         defaultMessage: 'Dev Tools',
       }),
+      order: 1300,
       icon: 'devToolsApp',
       navLinkId: 'kibana:dev_tools',
       app: ['kibana'],
       catalogue: ['console', 'searchprofiler', 'grokdebugger'],
       privileges: {
         all: {
+          app: ['kibana'],
+          catalogue: ['console', 'searchprofiler', 'grokdebugger'],
           api: ['console'],
           savedObject: {
             all: [],
@@ -127,6 +232,8 @@ export const buildOSSFeatures = ({ savedObjectTypes, includeTimelion }: BuildOSS
           ui: ['show', 'save'],
         },
         read: {
+          app: ['kibana'],
+          catalogue: ['console', 'searchprofiler', 'grokdebugger'],
           api: ['console'],
           savedObject: {
             all: [],
@@ -145,6 +252,7 @@ export const buildOSSFeatures = ({ savedObjectTypes, includeTimelion }: BuildOSS
       name: i18n.translate('xpack.features.advancedSettingsFeatureName', {
         defaultMessage: 'Advanced Settings',
       }),
+      order: 1500,
       icon: 'advancedSettingsApp',
       app: ['kibana'],
       catalogue: ['advanced_settings'],
@@ -153,6 +261,11 @@ export const buildOSSFeatures = ({ savedObjectTypes, includeTimelion }: BuildOSS
       },
       privileges: {
         all: {
+          app: ['kibana'],
+          catalogue: ['advanced_settings'],
+          management: {
+            kibana: ['settings'],
+          },
           savedObject: {
             all: ['config'],
             read: [],
@@ -160,6 +273,11 @@ export const buildOSSFeatures = ({ savedObjectTypes, includeTimelion }: BuildOSS
           ui: ['save'],
         },
         read: {
+          app: ['kibana'],
+          catalogue: ['advanced_settings'],
+          management: {
+            kibana: ['settings'],
+          },
           savedObject: {
             all: [],
             read: [],
@@ -173,6 +291,7 @@ export const buildOSSFeatures = ({ savedObjectTypes, includeTimelion }: BuildOSS
       name: i18n.translate('xpack.features.indexPatternFeatureName', {
         defaultMessage: 'Index Pattern Management',
       }),
+      order: 1600,
       icon: 'indexPatternApp',
       app: ['kibana'],
       catalogue: ['index_patterns'],
@@ -181,6 +300,11 @@ export const buildOSSFeatures = ({ savedObjectTypes, includeTimelion }: BuildOSS
       },
       privileges: {
         all: {
+          app: ['kibana'],
+          catalogue: ['index_patterns'],
+          management: {
+            kibana: ['index_patterns'],
+          },
           savedObject: {
             all: ['index-pattern'],
             read: [],
@@ -188,6 +312,11 @@ export const buildOSSFeatures = ({ savedObjectTypes, includeTimelion }: BuildOSS
           ui: ['save'],
         },
         read: {
+          app: ['kibana'],
+          catalogue: ['index_patterns'],
+          management: {
+            kibana: ['index_patterns'],
+          },
           savedObject: {
             all: [],
             read: ['index-pattern'],
@@ -201,6 +330,7 @@ export const buildOSSFeatures = ({ savedObjectTypes, includeTimelion }: BuildOSS
       name: i18n.translate('xpack.features.savedObjectsManagementFeatureName', {
         defaultMessage: 'Saved Objects Management',
       }),
+      order: 1700,
       icon: 'savedObjectsApp',
       app: ['kibana'],
       catalogue: ['saved_objects'],
@@ -209,6 +339,11 @@ export const buildOSSFeatures = ({ savedObjectTypes, includeTimelion }: BuildOSS
       },
       privileges: {
         all: {
+          app: ['kibana'],
+          catalogue: ['saved_objects'],
+          management: {
+            kibana: ['objects'],
+          },
           api: ['copySavedObjectsToSpaces'],
           savedObject: {
             all: [...savedObjectTypes],
@@ -217,6 +352,11 @@ export const buildOSSFeatures = ({ savedObjectTypes, includeTimelion }: BuildOSS
           ui: ['read', 'edit', 'delete', 'copyIntoSpace'],
         },
         read: {
+          app: ['kibana'],
+          catalogue: ['saved_objects'],
+          management: {
+            kibana: ['objects'],
+          },
           api: ['copySavedObjectsToSpaces'],
           savedObject: {
             all: [],
@@ -227,18 +367,21 @@ export const buildOSSFeatures = ({ savedObjectTypes, includeTimelion }: BuildOSS
       },
     },
     ...(includeTimelion ? [timelionFeature] : []),
-  ];
+  ] as FeatureConfig[];
 };
 
-const timelionFeature: Feature = {
+const timelionFeature: FeatureConfig = {
   id: 'timelion',
   name: 'Timelion',
+  order: 350,
   icon: 'timelionApp',
   navLinkId: 'timelion',
   app: ['timelion', 'kibana'],
   catalogue: ['timelion'],
   privileges: {
     all: {
+      app: ['timelion', 'kibana'],
+      catalogue: ['timelion'],
       savedObject: {
         all: ['timelion-sheet'],
         read: ['index-pattern'],
@@ -246,6 +389,8 @@ const timelionFeature: Feature = {
       ui: ['save'],
     },
     read: {
+      app: ['timelion', 'kibana'],
+      catalogue: ['timelion'],
       savedObject: {
         all: [],
         read: ['index-pattern', 'timelion-sheet'],
diff --git a/x-pack/plugins/features/server/plugin.ts b/x-pack/plugins/features/server/plugin.ts
index e77fa218c0681..cebf67243fb28 100644
--- a/x-pack/plugins/features/server/plugin.ts
+++ b/x-pack/plugins/features/server/plugin.ts
@@ -15,7 +15,7 @@ import { deepFreeze } from '../../../../src/core/utils';
 import { XPackInfo } from '../../../legacy/plugins/xpack_main/server/lib/xpack_info';
 import { PluginSetupContract as TimelionSetupContract } from '../../../../src/plugins/timelion/server';
 import { FeatureRegistry } from './feature_registry';
-import { Feature, FeatureWithAllOrReadPrivileges } from '../common/feature';
+import { Feature, FeatureConfig } from '../common/feature';
 import { uiCapabilitiesForFeatures } from './ui_capabilities_for_features';
 import { buildOSSFeatures } from './oss_features';
 import { defineRoutes } from './routes';
@@ -24,7 +24,7 @@ import { defineRoutes } from './routes';
  * Describes public Features plugin contract returned at the `setup` stage.
  */
 export interface PluginSetupContract {
-  registerFeature(feature: FeatureWithAllOrReadPrivileges): void;
+  registerFeature(feature: FeatureConfig): void;
   getFeatures(): Feature[];
   getFeaturesUICapabilities(): UICapabilities;
   registerLegacyAPI: (legacyAPI: LegacyAPI) => void;
diff --git a/x-pack/plugins/features/server/routes/index.test.ts b/x-pack/plugins/features/server/routes/index.test.ts
index b0f8417b7175d..c43e2a5195fe7 100644
--- a/x-pack/plugins/features/server/routes/index.test.ts
+++ b/x-pack/plugins/features/server/routes/index.test.ts
@@ -10,6 +10,7 @@ import { defineRoutes } from './index';
 import { httpServerMock, httpServiceMock } from '../../../../../src/core/server/mocks';
 import { XPackInfoLicense } from '../../../../legacy/plugins/xpack_main/server/lib/xpack_info_license';
 import { RequestHandler } from '../../../../../src/core/server';
+import { FeatureConfig } from '../../common';
 
 let currentLicenseLevel: string = 'gold';
 
@@ -21,7 +22,23 @@ describe('GET /api/features', () => {
       id: 'feature_1',
       name: 'Feature 1',
       app: [],
-      privileges: {},
+      privileges: null,
+    });
+
+    featureRegistry.register({
+      id: 'feature_2',
+      name: 'Feature 2',
+      order: 2,
+      app: [],
+      privileges: null,
+    });
+
+    featureRegistry.register({
+      id: 'feature_3',
+      name: 'Feature 2',
+      order: 1,
+      app: [],
+      privileges: null,
     });
 
     featureRegistry.register({
@@ -29,7 +46,7 @@ describe('GET /api/features', () => {
       name: 'Licensed Feature',
       app: ['bar-app'],
       validLicenses: ['gold'],
-      privileges: {},
+      privileges: null,
     });
 
     const routerMock = httpServiceMock.createRouter();
@@ -51,37 +68,33 @@ describe('GET /api/features', () => {
     routeHandler = routerMock.get.mock.calls[0][1];
   });
 
-  it('returns a list of available features', async () => {
+  it('returns a list of available features, sorted by their configured order', async () => {
     const mockResponse = httpServerMock.createResponseFactory();
     routeHandler(undefined as any, { query: {} } as any, mockResponse);
 
-    expect(mockResponse.ok.mock.calls).toMatchInlineSnapshot(`
-            Array [
-              Array [
-                Object {
-                  "body": Array [
-                    Object {
-                      "app": Array [],
-                      "id": "feature_1",
-                      "name": "Feature 1",
-                      "privileges": Object {},
-                    },
-                    Object {
-                      "app": Array [
-                        "bar-app",
-                      ],
-                      "id": "licensed_feature",
-                      "name": "Licensed Feature",
-                      "privileges": Object {},
-                      "validLicenses": Array [
-                        "gold",
-                      ],
-                    },
-                  ],
-                },
-              ],
-            ]
-        `);
+    expect(mockResponse.ok).toHaveBeenCalledTimes(1);
+    const [call] = mockResponse.ok.mock.calls;
+    const body = call[0]!.body as FeatureConfig[];
+
+    const features = body.map(feature => ({ id: feature.id, order: feature.order }));
+    expect(features).toEqual([
+      {
+        id: 'feature_3',
+        order: 1,
+      },
+      {
+        id: 'feature_2',
+        order: 2,
+      },
+      {
+        id: 'feature_1',
+        order: undefined,
+      },
+      {
+        id: 'licensed_feature',
+        order: undefined,
+      },
+    ]);
   });
 
   it(`by default does not return features that arent allowed by current license`, async () => {
@@ -90,22 +103,26 @@ describe('GET /api/features', () => {
     const mockResponse = httpServerMock.createResponseFactory();
     routeHandler(undefined as any, { query: {} } as any, mockResponse);
 
-    expect(mockResponse.ok.mock.calls).toMatchInlineSnapshot(`
-      Array [
-        Array [
-          Object {
-            "body": Array [
-              Object {
-                "app": Array [],
-                "id": "feature_1",
-                "name": "Feature 1",
-                "privileges": Object {},
-              },
-            ],
-          },
-        ],
-      ]
-    `);
+    expect(mockResponse.ok).toHaveBeenCalledTimes(1);
+    const [call] = mockResponse.ok.mock.calls;
+    const body = call[0]!.body as FeatureConfig[];
+
+    const features = body.map(feature => ({ id: feature.id, order: feature.order }));
+
+    expect(features).toEqual([
+      {
+        id: 'feature_3',
+        order: 1,
+      },
+      {
+        id: 'feature_2',
+        order: 2,
+      },
+      {
+        id: 'feature_1',
+        order: undefined,
+      },
+    ]);
   });
 
   it(`ignoreValidLicenses=false does not return features that arent allowed by current license`, async () => {
@@ -114,22 +131,26 @@ describe('GET /api/features', () => {
     const mockResponse = httpServerMock.createResponseFactory();
     routeHandler(undefined as any, { query: { ignoreValidLicenses: false } } as any, mockResponse);
 
-    expect(mockResponse.ok.mock.calls).toMatchInlineSnapshot(`
-      Array [
-        Array [
-          Object {
-            "body": Array [
-              Object {
-                "app": Array [],
-                "id": "feature_1",
-                "name": "Feature 1",
-                "privileges": Object {},
-              },
-            ],
-          },
-        ],
-      ]
-    `);
+    expect(mockResponse.ok).toHaveBeenCalledTimes(1);
+    const [call] = mockResponse.ok.mock.calls;
+    const body = call[0]!.body as FeatureConfig[];
+
+    const features = body.map(feature => ({ id: feature.id, order: feature.order }));
+
+    expect(features).toEqual([
+      {
+        id: 'feature_3',
+        order: 1,
+      },
+      {
+        id: 'feature_2',
+        order: 2,
+      },
+      {
+        id: 'feature_1',
+        order: undefined,
+      },
+    ]);
   });
 
   it(`ignoreValidLicenses=true returns features that arent allowed by current license`, async () => {
@@ -138,32 +159,29 @@ describe('GET /api/features', () => {
     const mockResponse = httpServerMock.createResponseFactory();
     routeHandler(undefined as any, { query: { ignoreValidLicenses: true } } as any, mockResponse);
 
-    expect(mockResponse.ok.mock.calls).toMatchInlineSnapshot(`
-      Array [
-        Array [
-          Object {
-            "body": Array [
-              Object {
-                "app": Array [],
-                "id": "feature_1",
-                "name": "Feature 1",
-                "privileges": Object {},
-              },
-              Object {
-                "app": Array [
-                  "bar-app",
-                ],
-                "id": "licensed_feature",
-                "name": "Licensed Feature",
-                "privileges": Object {},
-                "validLicenses": Array [
-                  "gold",
-                ],
-              },
-            ],
-          },
-        ],
-      ]
-    `);
+    expect(mockResponse.ok).toHaveBeenCalledTimes(1);
+    const [call] = mockResponse.ok.mock.calls;
+    const body = call[0]!.body as FeatureConfig[];
+
+    const features = body.map(feature => ({ id: feature.id, order: feature.order }));
+
+    expect(features).toEqual([
+      {
+        id: 'feature_3',
+        order: 1,
+      },
+      {
+        id: 'feature_2',
+        order: 2,
+      },
+      {
+        id: 'feature_1',
+        order: undefined,
+      },
+      {
+        id: 'licensed_feature',
+        order: undefined,
+      },
+    ]);
   });
 });
diff --git a/x-pack/plugins/features/server/routes/index.ts b/x-pack/plugins/features/server/routes/index.ts
index cf4d61ccac88b..428500c3daa88 100644
--- a/x-pack/plugins/features/server/routes/index.ts
+++ b/x-pack/plugins/features/server/routes/index.ts
@@ -31,13 +31,19 @@ export function defineRoutes({ router, featureRegistry, getLegacyAPI }: RouteDef
       const allFeatures = featureRegistry.getAll();
 
       return response.ok({
-        body: allFeatures.filter(
-          feature =>
-            request.query.ignoreValidLicenses ||
-            !feature.validLicenses ||
-            !feature.validLicenses.length ||
-            getLegacyAPI().xpackInfo.license.isOneOf(feature.validLicenses)
-        ),
+        body: allFeatures
+          .filter(
+            feature =>
+              request.query.ignoreValidLicenses ||
+              !feature.validLicenses ||
+              !feature.validLicenses.length ||
+              getLegacyAPI().xpackInfo.license.isOneOf(feature.validLicenses)
+          )
+          .sort(
+            (f1, f2) =>
+              (f1.order ?? Number.MAX_SAFE_INTEGER) - (f2.order ?? Number.MAX_SAFE_INTEGER)
+          )
+          .map(feature => feature.toRaw()),
       });
     }
   );
diff --git a/x-pack/plugins/features/server/ui_capabilities_for_features.test.ts b/x-pack/plugins/features/server/ui_capabilities_for_features.test.ts
index bb2cd82891a15..73c399878b17b 100644
--- a/x-pack/plugins/features/server/ui_capabilities_for_features.test.ts
+++ b/x-pack/plugins/features/server/ui_capabilities_for_features.test.ts
@@ -5,17 +5,31 @@
  */
 
 import { uiCapabilitiesForFeatures } from './ui_capabilities_for_features';
+import { Feature } from '.';
+import { SubFeaturePrivilegeGroupConfig } from '../common';
 
-function createFeaturePrivilege(key: string, capabilities: string[] = []) {
+function createFeaturePrivilege(capabilities: string[] = []) {
   return {
-    [key]: {
-      savedObject: {
-        all: [],
-        read: [],
-      },
-      app: [],
-      ui: [...capabilities],
+    savedObject: {
+      all: [],
+      read: [],
+    },
+    app: [],
+    ui: [...capabilities],
+  };
+}
+
+function createSubFeaturePrivilege(privilegeId: string, capabilities: string[] = []) {
+  return {
+    id: privilegeId,
+    name: `sub-feature privilege ${privilegeId}`,
+    includeIn: 'none',
+    savedObject: {
+      all: [],
+      read: [],
     },
+    app: [],
+    ui: [...capabilities],
   };
 }
 
@@ -27,14 +41,15 @@ describe('populateUICapabilities', () => {
   it('handles features with no registered capabilities', () => {
     expect(
       uiCapabilitiesForFeatures([
-        {
+        new Feature({
           id: 'newFeature',
           name: 'my new feature',
           app: ['bar-app'],
           privileges: {
-            ...createFeaturePrivilege('all'),
+            all: createFeaturePrivilege(),
+            read: createFeaturePrivilege(),
           },
-        },
+        }),
       ])
     ).toEqual({
       catalogue: {},
@@ -45,15 +60,16 @@ describe('populateUICapabilities', () => {
   it('augments the original uiCapabilities with registered feature capabilities', () => {
     expect(
       uiCapabilitiesForFeatures([
-        {
+        new Feature({
           id: 'newFeature',
           name: 'my new feature',
           navLinkId: 'newFeatureNavLink',
           app: ['bar-app'],
           privileges: {
-            ...createFeaturePrivilege('all', ['capability1', 'capability2']),
+            all: createFeaturePrivilege(['capability1', 'capability2']),
+            read: createFeaturePrivilege(),
           },
-        },
+        }),
       ])
     ).toEqual({
       catalogue: {},
@@ -67,18 +83,17 @@ describe('populateUICapabilities', () => {
   it('combines catalogue entries from multiple features', () => {
     expect(
       uiCapabilitiesForFeatures([
-        {
+        new Feature({
           id: 'newFeature',
           name: 'my new feature',
           navLinkId: 'newFeatureNavLink',
           app: ['bar-app'],
           catalogue: ['anotherFooEntry', 'anotherBarEntry'],
           privileges: {
-            ...createFeaturePrivilege('foo', ['capability1', 'capability2']),
-            ...createFeaturePrivilege('bar', ['capability3', 'capability4']),
-            ...createFeaturePrivilege('baz'),
+            all: createFeaturePrivilege(['capability1', 'capability2']),
+            read: createFeaturePrivilege(['capability3', 'capability4']),
           },
-        },
+        }),
       ])
     ).toEqual({
       catalogue: {
@@ -97,17 +112,75 @@ describe('populateUICapabilities', () => {
   it(`merges capabilities from all feature privileges`, () => {
     expect(
       uiCapabilitiesForFeatures([
-        {
+        new Feature({
+          id: 'newFeature',
+          name: 'my new feature',
+          navLinkId: 'newFeatureNavLink',
+          app: ['bar-app'],
+          privileges: {
+            all: createFeaturePrivilege(['capability1', 'capability2']),
+            read: createFeaturePrivilege(['capability3', 'capability4', 'capability5']),
+          },
+        }),
+      ])
+    ).toEqual({
+      catalogue: {},
+      newFeature: {
+        capability1: true,
+        capability2: true,
+        capability3: true,
+        capability4: true,
+        capability5: true,
+      },
+    });
+  });
+
+  it(`supports merging features with sub privileges`, () => {
+    expect(
+      uiCapabilitiesForFeatures([
+        new Feature({
           id: 'newFeature',
           name: 'my new feature',
           navLinkId: 'newFeatureNavLink',
           app: ['bar-app'],
           privileges: {
-            ...createFeaturePrivilege('foo', ['capability1', 'capability2']),
-            ...createFeaturePrivilege('bar', ['capability3', 'capability4']),
-            ...createFeaturePrivilege('baz', ['capability1', 'capability5']),
+            all: createFeaturePrivilege(['capability1', 'capability2']),
+            read: createFeaturePrivilege(['capability3', 'capability4']),
           },
-        },
+          subFeatures: [
+            {
+              name: 'sub-feature-1',
+              privilegeGroups: [
+                {
+                  groupType: 'independent',
+                  privileges: [
+                    createSubFeaturePrivilege('privilege-1', ['capability5']),
+                    createSubFeaturePrivilege('privilege-2', ['capability6']),
+                  ],
+                } as SubFeaturePrivilegeGroupConfig,
+                {
+                  groupType: 'mutually_exclusive',
+                  privileges: [
+                    createSubFeaturePrivilege('privilege-3', ['capability7']),
+                    createSubFeaturePrivilege('privilege-4', ['capability8']),
+                  ],
+                } as SubFeaturePrivilegeGroupConfig,
+              ],
+            },
+            {
+              name: 'sub-feature-2',
+              privilegeGroups: [
+                {
+                  name: 'Group Name',
+                  groupType: 'independent',
+                  privileges: [
+                    createSubFeaturePrivilege('privilege-5', ['capability9', 'capability10']),
+                  ],
+                } as SubFeaturePrivilegeGroupConfig,
+              ],
+            },
+          ],
+        }),
       ])
     ).toEqual({
       catalogue: {},
@@ -117,6 +190,11 @@ describe('populateUICapabilities', () => {
         capability3: true,
         capability4: true,
         capability5: true,
+        capability6: true,
+        capability7: true,
+        capability8: true,
+        capability9: true,
+        capability10: true,
       },
     });
   });
@@ -124,41 +202,49 @@ describe('populateUICapabilities', () => {
   it('supports merging multiple features with multiple privileges each', () => {
     expect(
       uiCapabilitiesForFeatures([
-        {
+        new Feature({
           id: 'newFeature',
           name: 'my new feature',
           navLinkId: 'newFeatureNavLink',
           app: ['bar-app'],
           privileges: {
-            ...createFeaturePrivilege('foo', ['capability1', 'capability2']),
-            ...createFeaturePrivilege('bar', ['capability3', 'capability4']),
-            ...createFeaturePrivilege('baz', ['capability1', 'capability5']),
+            all: createFeaturePrivilege(['capability1', 'capability2']),
+            read: createFeaturePrivilege(['capability3', 'capability4']),
           },
-        },
-        {
+        }),
+        new Feature({
           id: 'anotherNewFeature',
           name: 'another new feature',
           app: ['bar-app'],
           privileges: {
-            ...createFeaturePrivilege('foo', ['capability1', 'capability2']),
-            ...createFeaturePrivilege('bar', ['capability3', 'capability4']),
+            all: createFeaturePrivilege(['capability1', 'capability2']),
+            read: createFeaturePrivilege(['capability3', 'capability4']),
           },
-        },
-        {
+        }),
+        new Feature({
           id: 'yetAnotherNewFeature',
           name: 'yet another new feature',
           navLinkId: 'yetAnotherNavLink',
           app: ['bar-app'],
           privileges: {
-            ...createFeaturePrivilege('all', ['capability1', 'capability2']),
-            ...createFeaturePrivilege('read', []),
-            ...createFeaturePrivilege('somethingInBetween', [
-              'something1',
-              'something2',
-              'something3',
-            ]),
+            all: createFeaturePrivilege(['capability1', 'capability2']),
+            read: createFeaturePrivilege(['something1', 'something2', 'something3']),
           },
-        },
+          subFeatures: [
+            {
+              name: 'sub-feature-1',
+              privilegeGroups: [
+                {
+                  groupType: 'independent',
+                  privileges: [
+                    createSubFeaturePrivilege('privilege-1', ['capability3']),
+                    createSubFeaturePrivilege('privilege-2', ['capability4']),
+                  ],
+                } as SubFeaturePrivilegeGroupConfig,
+              ],
+            },
+          ],
+        }),
       ])
     ).toEqual({
       anotherNewFeature: {
@@ -173,11 +259,12 @@ describe('populateUICapabilities', () => {
         capability2: true,
         capability3: true,
         capability4: true,
-        capability5: true,
       },
       yetAnotherNewFeature: {
         capability1: true,
         capability2: true,
+        capability3: true,
+        capability4: true,
         something1: true,
         something2: true,
         something3: true,
diff --git a/x-pack/plugins/features/server/ui_capabilities_for_features.ts b/x-pack/plugins/features/server/ui_capabilities_for_features.ts
index a13afa854de52..d3d3230822749 100644
--- a/x-pack/plugins/features/server/ui_capabilities_for_features.ts
+++ b/x-pack/plugins/features/server/ui_capabilities_for_features.ts
@@ -39,7 +39,14 @@ function getCapabilitiesFromFeature(feature: Feature): FeatureCapabilities {
     };
   }
 
-  Object.values(feature.privileges).forEach(privilege => {
+  const featurePrivileges = Object.values(feature.privileges ?? {});
+  if (feature.subFeatures) {
+    featurePrivileges.push(
+      ...feature.subFeatures.map(sf => sf.privilegeGroups.map(pg => pg.privileges)).flat(2)
+    );
+  }
+
+  featurePrivileges.forEach(privilege => {
     UIFeatureCapabilities[feature.id] = {
       ...UIFeatureCapabilities[feature.id],
       ...privilege.ui.reduce(
diff --git a/x-pack/plugins/infra/server/features.ts b/x-pack/plugins/infra/server/features.ts
index edf94beab43a7..5301e1e9cbd0b 100644
--- a/x-pack/plugins/infra/server/features.ts
+++ b/x-pack/plugins/infra/server/features.ts
@@ -11,12 +11,15 @@ export const METRICS_FEATURE = {
   name: i18n.translate('xpack.infra.featureRegistry.linkInfrastructureTitle', {
     defaultMessage: 'Metrics',
   }),
+  order: 700,
   icon: 'metricsApp',
   navLinkId: 'metrics',
   app: ['infra', 'kibana'],
   catalogue: ['infraops'],
   privileges: {
     all: {
+      app: ['infra', 'kibana'],
+      catalogue: ['infraops'],
       api: ['infra'],
       savedObject: {
         all: ['infrastructure-ui-source'],
@@ -25,6 +28,8 @@ export const METRICS_FEATURE = {
       ui: ['show', 'configureSource', 'save'],
     },
     read: {
+      app: ['infra', 'kibana'],
+      catalogue: ['infraops'],
       api: ['infra'],
       savedObject: {
         all: [],
@@ -40,12 +45,15 @@ export const LOGS_FEATURE = {
   name: i18n.translate('xpack.infra.featureRegistry.linkLogsTitle', {
     defaultMessage: 'Logs',
   }),
+  order: 800,
   icon: 'logsApp',
   navLinkId: 'logs',
   app: ['infra', 'kibana'],
   catalogue: ['infralogging'],
   privileges: {
     all: {
+      app: ['infra', 'kibana'],
+      catalogue: ['infralogging'],
       api: ['infra'],
       savedObject: {
         all: ['infrastructure-ui-source'],
@@ -54,6 +62,8 @@ export const LOGS_FEATURE = {
       ui: ['show', 'configureSource', 'save'],
     },
     read: {
+      app: ['infra', 'kibana'],
+      catalogue: ['infralogging'],
       api: ['infra'],
       savedObject: {
         all: [],
diff --git a/x-pack/plugins/ingest_manager/server/plugin.ts b/x-pack/plugins/ingest_manager/server/plugin.ts
index 67737c6fe502e..45c847fe1f68a 100644
--- a/x-pack/plugins/ingest_manager/server/plugin.ts
+++ b/x-pack/plugins/ingest_manager/server/plugin.ts
@@ -88,6 +88,7 @@ export class IngestManagerPlugin implements Plugin {
         privileges: {
           all: {
             api: [`${PLUGIN_ID}-read`, `${PLUGIN_ID}-all`],
+            app: [PLUGIN_ID, 'kibana'],
             savedObject: {
               all: allSavedObjectTypes,
               read: [],
@@ -96,6 +97,7 @@ export class IngestManagerPlugin implements Plugin {
           },
           read: {
             api: [`${PLUGIN_ID}-read`],
+            app: [PLUGIN_ID, 'kibana'],
             savedObject: {
               all: [],
               read: allSavedObjectTypes,
diff --git a/x-pack/plugins/ml/server/plugin.ts b/x-pack/plugins/ml/server/plugin.ts
index dc42a1f7fcbbb..674c3886c12f8 100644
--- a/x-pack/plugins/ml/server/plugin.ts
+++ b/x-pack/plugins/ml/server/plugin.ts
@@ -70,12 +70,15 @@ export class MlServerPlugin implements Plugin<MlPluginSetup, MlPluginStart, Plug
         defaultMessage: 'Machine Learning',
       }),
       icon: PLUGIN_ICON,
+      order: 500,
       navLinkId: PLUGIN_ID,
       app: [PLUGIN_ID, 'kibana'],
       catalogue: [PLUGIN_ID],
-      privileges: {},
+      privileges: null,
       reserved: {
         privilege: {
+          app: [PLUGIN_ID, 'kibana'],
+          catalogue: [PLUGIN_ID],
           savedObject: {
             all: [],
             read: [],
diff --git a/x-pack/plugins/monitoring/server/plugin.ts b/x-pack/plugins/monitoring/server/plugin.ts
index ca5ef7f9db26b..b8216f037eabb 100644
--- a/x-pack/plugins/monitoring/server/plugin.ts
+++ b/x-pack/plugins/monitoring/server/plugin.ts
@@ -267,9 +267,11 @@ export class Plugin {
       navLinkId: 'monitoring',
       app: ['monitoring', 'kibana'],
       catalogue: ['monitoring'],
-      privileges: {},
+      privileges: null,
       reserved: {
         privilege: {
+          app: ['monitoring', 'kibana'],
+          catalogue: ['monitoring'],
           savedObject: {
             all: [],
             read: [],
diff --git a/x-pack/plugins/security/common/licensing/license_features.ts b/x-pack/plugins/security/common/licensing/license_features.ts
index bef328f54de03..5184ab0e962bd 100644
--- a/x-pack/plugins/security/common/licensing/license_features.ts
+++ b/x-pack/plugins/security/common/licensing/license_features.ts
@@ -48,6 +48,11 @@ export interface SecurityLicenseFeatures {
    */
   readonly allowRbac: boolean;
 
+  /**
+   * Indicates whether we allow sub-feature privileges.
+   */
+  readonly allowSubFeaturePrivileges: boolean;
+
   /**
    * Describes the layout of the login form if it's displayed.
    */
diff --git a/x-pack/plugins/security/common/licensing/license_service.test.ts b/x-pack/plugins/security/common/licensing/license_service.test.ts
index 40e8901970af8..dfc94042ef930 100644
--- a/x-pack/plugins/security/common/licensing/license_service.test.ts
+++ b/x-pack/plugins/security/common/licensing/license_service.test.ts
@@ -22,6 +22,7 @@ describe('license features', function() {
       allowRoleFieldLevelSecurity: false,
       layout: 'error-es-unavailable',
       allowRbac: false,
+      allowSubFeaturePrivileges: false,
     });
   });
 
@@ -40,6 +41,7 @@ describe('license features', function() {
       allowRoleFieldLevelSecurity: false,
       layout: 'error-xpack-unavailable',
       allowRbac: false,
+      allowSubFeaturePrivileges: false,
     });
   });
 
@@ -62,6 +64,7 @@ describe('license features', function() {
             "allowRbac": false,
             "allowRoleDocumentLevelSecurity": false,
             "allowRoleFieldLevelSecurity": false,
+            "allowSubFeaturePrivileges": false,
             "layout": "error-xpack-unavailable",
             "showLinks": false,
             "showLogin": true,
@@ -79,6 +82,7 @@ describe('license features', function() {
             "allowRbac": false,
             "allowRoleDocumentLevelSecurity": false,
             "allowRoleFieldLevelSecurity": false,
+            "allowSubFeaturePrivileges": false,
             "showLinks": false,
             "showLogin": false,
             "showRoleMappingsManagement": false,
@@ -90,7 +94,7 @@ describe('license features', function() {
     }
   });
 
-  it('should show login page and other security elements, allow RBAC but forbid role mappings and document level security if license is basic.', () => {
+  it('should show login page and other security elements, allow RBAC but forbid role mappings, DLS, and sub-feature privileges if license is basic.', () => {
     const mockRawLicense = licensingMock.createLicense({
       features: { security: { isEnabled: true, isAvailable: true } },
     });
@@ -108,6 +112,7 @@ describe('license features', function() {
       allowRoleDocumentLevelSecurity: false,
       allowRoleFieldLevelSecurity: false,
       allowRbac: true,
+      allowSubFeaturePrivileges: false,
     });
     expect(getFeatureSpy).toHaveBeenCalledTimes(1);
     expect(getFeatureSpy).toHaveBeenCalledWith('security');
@@ -129,10 +134,11 @@ describe('license features', function() {
       allowRoleDocumentLevelSecurity: false,
       allowRoleFieldLevelSecurity: false,
       allowRbac: false,
+      allowSubFeaturePrivileges: false,
     });
   });
 
-  it('should allow role mappings, but not DLS/FLS if license = gold', () => {
+  it('should allow role mappings and sub-feature privileges, but not DLS/FLS if license = gold', () => {
     const mockRawLicense = licensingMock.createLicense({
       license: { mode: 'gold', type: 'gold' },
       features: { security: { isEnabled: true, isAvailable: true } },
@@ -149,10 +155,11 @@ describe('license features', function() {
       allowRoleDocumentLevelSecurity: false,
       allowRoleFieldLevelSecurity: false,
       allowRbac: true,
+      allowSubFeaturePrivileges: true,
     });
   });
 
-  it('should allow to login, allow RBAC, allow role mappings, and document level security if license >= platinum', () => {
+  it('should allow to login, allow RBAC, role mappings, sub-feature privileges, and DLS if license >= platinum', () => {
     const mockRawLicense = licensingMock.createLicense({
       license: { mode: 'platinum', type: 'platinum' },
       features: { security: { isEnabled: true, isAvailable: true } },
@@ -169,6 +176,7 @@ describe('license features', function() {
       allowRoleDocumentLevelSecurity: true,
       allowRoleFieldLevelSecurity: true,
       allowRbac: true,
+      allowSubFeaturePrivileges: true,
     });
   });
 });
diff --git a/x-pack/plugins/security/common/licensing/license_service.ts b/x-pack/plugins/security/common/licensing/license_service.ts
index 2c2039c5e2e92..34bc44b88e40d 100644
--- a/x-pack/plugins/security/common/licensing/license_service.ts
+++ b/x-pack/plugins/security/common/licensing/license_service.ts
@@ -74,6 +74,7 @@ export class SecurityLicenseService {
         allowRoleDocumentLevelSecurity: false,
         allowRoleFieldLevelSecurity: false,
         allowRbac: false,
+        allowSubFeaturePrivileges: false,
         layout:
           rawLicense !== undefined && !rawLicense?.isAvailable
             ? 'error-xpack-unavailable'
@@ -90,16 +91,18 @@ export class SecurityLicenseService {
         allowRoleDocumentLevelSecurity: false,
         allowRoleFieldLevelSecurity: false,
         allowRbac: false,
+        allowSubFeaturePrivileges: false,
       };
     }
 
-    const showRoleMappingsManagement = rawLicense.hasAtLeast('gold');
+    const isLicenseGoldOrBetter = rawLicense.hasAtLeast('gold');
     const isLicensePlatinumOrBetter = rawLicense.hasAtLeast('platinum');
     return {
       showLogin: true,
       allowLogin: true,
       showLinks: true,
-      showRoleMappingsManagement,
+      showRoleMappingsManagement: isLicenseGoldOrBetter,
+      allowSubFeaturePrivileges: isLicenseGoldOrBetter,
       // Only platinum and trial licenses are compliant with field- and document-level security.
       allowRoleDocumentLevelSecurity: isLicensePlatinumOrBetter,
       allowRoleFieldLevelSecurity: isLicensePlatinumOrBetter,
diff --git a/x-pack/plugins/security/common/model/index.ts b/x-pack/plugins/security/common/model/index.ts
index 88da416cf715b..59d4908c67ffb 100644
--- a/x-pack/plugins/security/common/model/index.ts
+++ b/x-pack/plugins/security/common/model/index.ts
@@ -8,8 +8,8 @@ export { ApiKey, ApiKeyToInvalidate } from './api_key';
 export { User, EditUser, getUserDisplayName } from './user';
 export { AuthenticatedUser, canUserChangePassword } from './authenticated_user';
 export { BuiltinESPrivileges } from './builtin_es_privileges';
-export { FeaturesPrivileges } from './features_privileges';
 export { RawKibanaPrivileges, RawKibanaFeaturePrivileges } from './raw_kibana_privileges';
+export { FeaturesPrivileges } from './features_privileges';
 export {
   Role,
   RoleIndexPrivilege,
@@ -22,7 +22,6 @@ export {
   prepareRoleClone,
   getExtendedRoleDeprecationNotice,
 } from './role';
-export { KibanaPrivileges } from './kibana_privileges';
 export {
   InlineRoleTemplate,
   StoredRoleTemplate,
diff --git a/x-pack/plugins/security/common/model/kibana_privileges/feature_privileges.ts b/x-pack/plugins/security/common/model/kibana_privileges/feature_privileges.ts
deleted file mode 100644
index fd4cdf33028eb..0000000000000
--- a/x-pack/plugins/security/common/model/kibana_privileges/feature_privileges.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-import { FeaturesPrivileges } from '../features_privileges';
-import { RawKibanaFeaturePrivileges } from '../raw_kibana_privileges';
-
-export class KibanaFeaturePrivileges {
-  constructor(private readonly featurePrivilegesMap: RawKibanaFeaturePrivileges) {}
-
-  public getAllPrivileges(): FeaturesPrivileges {
-    return Object.entries(this.featurePrivilegesMap).reduce((acc, [featureId, privileges]) => {
-      return {
-        ...acc,
-        [featureId]: Object.keys(privileges),
-      };
-    }, {});
-  }
-
-  public getPrivileges(featureId: string): string[] {
-    const featurePrivileges = this.featurePrivilegesMap[featureId];
-    if (featurePrivileges == null) {
-      return [];
-    }
-
-    return Object.keys(featurePrivileges);
-  }
-
-  public getActions(featureId: string, privilege: string): string[] {
-    if (!this.featurePrivilegesMap[featureId]) {
-      return [];
-    }
-    return this.featurePrivilegesMap[featureId][privilege] || [];
-  }
-}
diff --git a/x-pack/plugins/security/common/model/kibana_privileges/global_privileges.ts b/x-pack/plugins/security/common/model/kibana_privileges/global_privileges.ts
deleted file mode 100644
index ffe55b813217f..0000000000000
--- a/x-pack/plugins/security/common/model/kibana_privileges/global_privileges.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-export class KibanaGlobalPrivileges {
-  constructor(private readonly globalPrivilegesMap: Record<string, string[]>) {}
-
-  public getAllPrivileges(): string[] {
-    return Object.keys(this.globalPrivilegesMap);
-  }
-
-  public getActions(privilege: string): string[] {
-    return this.globalPrivilegesMap[privilege] || [];
-  }
-}
diff --git a/x-pack/plugins/security/common/model/kibana_privileges/kibana_privileges.ts b/x-pack/plugins/security/common/model/kibana_privileges/kibana_privileges.ts
deleted file mode 100644
index 61e5f083a7798..0000000000000
--- a/x-pack/plugins/security/common/model/kibana_privileges/kibana_privileges.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { RawKibanaPrivileges } from '../raw_kibana_privileges';
-import { KibanaFeaturePrivileges } from './feature_privileges';
-import { KibanaGlobalPrivileges } from './global_privileges';
-import { KibanaSpacesPrivileges } from './spaces_privileges';
-
-export class KibanaPrivileges {
-  constructor(private readonly rawKibanaPrivileges: RawKibanaPrivileges) {}
-
-  public getGlobalPrivileges() {
-    return new KibanaGlobalPrivileges(this.rawKibanaPrivileges.global);
-  }
-
-  public getSpacesPrivileges() {
-    return new KibanaSpacesPrivileges(this.rawKibanaPrivileges.space);
-  }
-
-  public getFeaturePrivileges() {
-    return new KibanaFeaturePrivileges(this.rawKibanaPrivileges.features);
-  }
-}
diff --git a/x-pack/plugins/security/common/model/kibana_privileges/spaces_privileges.ts b/x-pack/plugins/security/common/model/kibana_privileges/spaces_privileges.ts
deleted file mode 100644
index 5c8b4196a2b55..0000000000000
--- a/x-pack/plugins/security/common/model/kibana_privileges/spaces_privileges.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-export class KibanaSpacesPrivileges {
-  constructor(private readonly spacesPrivilegesMap: Record<string, string[]>) {}
-
-  public getAllPrivileges(): string[] {
-    return Object.keys(this.spacesPrivilegesMap);
-  }
-
-  public getActions(privilege: string): string[] {
-    return this.spacesPrivilegesMap[privilege] || [];
-  }
-}
diff --git a/x-pack/plugins/security/public/management/roles/__fixtures__/kibana_features.ts b/x-pack/plugins/security/public/management/roles/__fixtures__/kibana_features.ts
new file mode 100644
index 0000000000000..68d352363d363
--- /dev/null
+++ b/x-pack/plugins/security/public/management/roles/__fixtures__/kibana_features.ts
@@ -0,0 +1,208 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { Feature, FeatureConfig } from '../../../../../features/public';
+
+export const createFeature = (
+  config: Pick<FeatureConfig, 'id' | 'name' | 'subFeatures' | 'reserved' | 'privilegesTooltip'> & {
+    excludeFromBaseAll?: boolean;
+    excludeFromBaseRead?: boolean;
+  }
+) => {
+  const { excludeFromBaseAll, excludeFromBaseRead, ...rest } = config;
+  return new Feature({
+    icon: 'discoverApp',
+    navLinkId: 'kibana:discover',
+    app: [],
+    catalogue: [],
+    privileges: {
+      all: {
+        excludeFromBasePrivileges: excludeFromBaseAll,
+        savedObject: {
+          all: ['all-type'],
+          read: ['read-type'],
+        },
+        ui: ['read-ui', 'all-ui', `read-${config.id}`, `all-${config.id}`],
+      },
+      read: {
+        excludeFromBasePrivileges: excludeFromBaseRead,
+        savedObject: {
+          all: [],
+          read: ['read-type'],
+        },
+        ui: ['read-ui', `read-${config.id}`],
+      },
+    },
+    ...rest,
+  });
+};
+
+export const kibanaFeatures = [
+  createFeature({
+    id: 'no_sub_features',
+    name: 'Feature 1: No Sub Features',
+  }),
+  createFeature({
+    id: 'with_sub_features',
+    name: 'Mutually Exclusive Sub Features',
+    subFeatures: [
+      {
+        name: 'Cool Sub Feature',
+        privilegeGroups: [
+          {
+            groupType: 'mutually_exclusive',
+            privileges: [
+              {
+                id: 'cool_all',
+                name: 'All',
+                includeIn: 'all',
+                savedObject: {
+                  all: ['all-cool-type'],
+                  read: ['read-cool-type'],
+                },
+                ui: ['cool_read-ui', 'cool_all-ui'],
+              },
+              {
+                id: 'cool_read',
+                name: 'Read',
+                includeIn: 'read',
+                savedObject: {
+                  all: [],
+                  read: ['read-cool-type'],
+                },
+                ui: ['cool_read-ui'],
+              },
+            ],
+          },
+          {
+            groupType: 'independent',
+            privileges: [
+              {
+                id: 'cool_toggle_1',
+                name: 'Cool toggle 1',
+                includeIn: 'all',
+                savedObject: {
+                  all: [],
+                  read: [],
+                },
+                ui: ['cool_toggle_1-ui'],
+              },
+              {
+                id: 'cool_toggle_2',
+                name: 'Cool toggle 2',
+                includeIn: 'read',
+                savedObject: {
+                  all: [],
+                  read: [],
+                },
+                ui: ['cool_toggle_2-ui'],
+              },
+              {
+                id: 'cool_excluded_toggle',
+                name: 'Cool excluded toggle',
+                includeIn: 'none',
+                savedObject: {
+                  all: [],
+                  read: [],
+                },
+                ui: ['cool_excluded_toggle-ui'],
+              },
+            ],
+          },
+        ],
+      },
+    ],
+  }),
+  createFeature({
+    id: 'with_excluded_sub_features',
+    name: 'Excluded Sub Features',
+    subFeatures: [
+      {
+        name: 'Excluded Sub Feature',
+        privilegeGroups: [
+          {
+            groupType: 'independent',
+            privileges: [
+              {
+                id: 'cool_toggle_1',
+                name: 'Cool toggle 1',
+                includeIn: 'none',
+                savedObject: {
+                  all: [],
+                  read: [],
+                },
+                ui: ['cool_toggle_1-ui'],
+              },
+            ],
+          },
+        ],
+      },
+    ],
+  }),
+  createFeature({
+    id: 'excluded_from_base',
+    name: 'Excluded from base',
+    excludeFromBaseAll: true,
+    excludeFromBaseRead: true,
+    subFeatures: [
+      {
+        name: 'Cool Sub Feature',
+        privilegeGroups: [
+          {
+            groupType: 'mutually_exclusive',
+            privileges: [
+              {
+                id: 'cool_all',
+                name: 'All',
+                includeIn: 'all',
+                savedObject: {
+                  all: [],
+                  read: [],
+                },
+                ui: ['cool_read-ui', 'cool_all-ui'],
+              },
+              {
+                id: 'cool_read',
+                name: 'Read',
+                includeIn: 'read',
+                savedObject: {
+                  all: [],
+                  read: [],
+                },
+                ui: ['cool_read-ui'],
+              },
+            ],
+          },
+          {
+            groupType: 'independent',
+            privileges: [
+              {
+                id: 'cool_toggle_1',
+                name: 'Cool toggle 2',
+                includeIn: 'all',
+                savedObject: {
+                  all: [],
+                  read: [],
+                },
+                ui: ['cool_toggle_1-ui'],
+              },
+              {
+                id: 'cool_toggle_2',
+                name: 'Cool toggle 2',
+                includeIn: 'read',
+                savedObject: {
+                  all: [],
+                  read: [],
+                },
+                ui: ['cool_toggle_2-ui'],
+              },
+            ],
+          },
+        ],
+      },
+    ],
+  }),
+];
diff --git a/x-pack/plugins/security/public/management/roles/__fixtures__/kibana_privileges.ts b/x-pack/plugins/security/public/management/roles/__fixtures__/kibana_privileges.ts
new file mode 100644
index 0000000000000..98110a83103aa
--- /dev/null
+++ b/x-pack/plugins/security/public/management/roles/__fixtures__/kibana_privileges.ts
@@ -0,0 +1,41 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import { Actions } from '../../../../server/authorization';
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import { privilegesFactory } from '../../../../server/authorization/privileges';
+import { Feature } from '../../../../../features/public';
+import { KibanaPrivileges } from '../model';
+import { SecurityLicenseFeatures } from '../../..';
+
+export const createRawKibanaPrivileges = (
+  features: Feature[],
+  { allowSubFeaturePrivileges = true } = {}
+) => {
+  const featuresService = {
+    getFeatures: () => features,
+  };
+
+  const licensingService = {
+    getFeatures: () => ({ allowSubFeaturePrivileges } as SecurityLicenseFeatures),
+  };
+
+  return privilegesFactory(
+    new Actions('unit_test_version'),
+    featuresService,
+    licensingService
+  ).get();
+};
+
+export const createKibanaPrivileges = (
+  features: Feature[],
+  { allowSubFeaturePrivileges = true } = {}
+) => {
+  return new KibanaPrivileges(
+    createRawKibanaPrivileges(features, { allowSubFeaturePrivileges }),
+    features
+  );
+};
diff --git a/x-pack/plugins/security/public/management/roles/edit_role/edit_role_page.test.tsx b/x-pack/plugins/security/public/management/roles/edit_role/edit_role_page.test.tsx
index 23a3f327a2c5c..f1ee681331005 100644
--- a/x-pack/plugins/security/public/management/roles/edit_role/edit_role_page.test.tsx
+++ b/x-pack/plugins/security/public/management/roles/edit_role/edit_role_page.test.tsx
@@ -10,16 +10,10 @@ import { act } from '@testing-library/react';
 import { mountWithIntl, nextTick } from 'test_utils/enzyme_helpers';
 import { Capabilities } from 'src/core/public';
 import { Feature } from '../../../../../features/public';
-// These modules should be moved into a common directory
-// eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { Actions } from '../../../../server/authorization/actions';
-// eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { privilegesFactory } from '../../../../server/authorization/privileges';
 import { Role } from '../../../../common/model';
 import { DocumentationLinksService } from '../documentation_links';
 import { EditRolePage } from './edit_role_page';
 import { SimplePrivilegeSection } from './privileges/kibana/simple_privilege_section';
-import { SpaceAwarePrivilegeSection } from './privileges/kibana/space_aware_privilege_section';
 
 import { TransformErrorSection } from './privileges/kibana/transform_error_section';
 import { coreMock } from '../../../../../../../src/core/public/mocks';
@@ -28,10 +22,12 @@ import { licenseMock } from '../../../../common/licensing/index.mock';
 import { userAPIClientMock } from '../../users/index.mock';
 import { rolesAPIClientMock, indicesAPIClientMock, privilegesAPIClientMock } from '../index.mock';
 import { Space } from '../../../../../spaces/public';
+import { SpaceAwarePrivilegeSection } from './privileges/kibana/space_aware_privilege_section';
+import { createRawKibanaPrivileges } from '../__fixtures__/kibana_privileges';
 
 const buildFeatures = () => {
   return [
-    {
+    new Feature({
       id: 'feature1',
       name: 'Feature 1',
       icon: 'addDataApp',
@@ -45,9 +41,17 @@ const buildFeatures = () => {
             read: [],
           },
         },
+        read: {
+          app: ['feature1App'],
+          ui: ['feature1-ui'],
+          savedObject: {
+            all: [],
+            read: [],
+          },
+        },
       },
-    },
-    {
+    }),
+    new Feature({
       id: 'feature2',
       name: 'Feature 2',
       icon: 'addDataApp',
@@ -61,17 +65,19 @@ const buildFeatures = () => {
             read: ['config'],
           },
         },
+        read: {
+          app: ['feature2App'],
+          ui: ['feature2-ui'],
+          savedObject: {
+            all: [],
+            read: ['config'],
+          },
+        },
       },
-    },
+    }),
   ] as Feature[];
 };
 
-const buildRawKibanaPrivileges = () => {
-  return privilegesFactory(new Actions('unit_test_version'), {
-    getFeatures: () => buildFeatures(),
-  }).get();
-};
-
 const buildBuiltinESPrivileges = () => {
   return {
     cluster: ['all', 'manage', 'monitor'],
@@ -144,7 +150,7 @@ function getProps({
   userAPIClient.getUsers.mockResolvedValue([]);
 
   const privilegesAPIClient = privilegesAPIClientMock.create();
-  privilegesAPIClient.getAll.mockResolvedValue(buildRawKibanaPrivileges());
+  privilegesAPIClient.getAll.mockResolvedValue(createRawKibanaPrivileges(buildFeatures()));
   privilegesAPIClient.getBuiltIn.mockResolvedValue(buildBuiltinESPrivileges());
 
   const license = licenseMock.create();
@@ -156,10 +162,6 @@ function getProps({
   const { fatalErrors } = coreMock.createSetup();
   const { http, docLinks, notifications } = coreMock.createStart();
   http.get.mockImplementation(async (path: any) => {
-    if (path === '/api/features') {
-      return buildFeatures();
-    }
-
     if (path === '/api/spaces/space') {
       return buildSpaces();
     }
@@ -175,6 +177,7 @@ function getProps({
     privilegesAPIClient,
     rolesAPIClient,
     userAPIClient,
+    getFeatures: () => Promise.resolve(buildFeatures()),
     notifications,
     docLinks: new DocumentationLinksService(docLinks),
     fatalErrors,
@@ -200,10 +203,7 @@ describe('<EditRolePage />', () => {
         />
       );
 
-      await act(async () => {
-        await nextTick();
-        wrapper.update();
-      });
+      await waitForRender(wrapper);
 
       expect(wrapper.find('[data-test-subj="reservedRoleBadgeTooltip"]')).toHaveLength(1);
       expect(wrapper.find(SpaceAwarePrivilegeSection)).toHaveLength(1);
@@ -226,10 +226,7 @@ describe('<EditRolePage />', () => {
         />
       );
 
-      await act(async () => {
-        await nextTick();
-        wrapper.update();
-      });
+      await waitForRender(wrapper);
 
       expect(wrapper.find('[data-test-subj="reservedRoleBadgeTooltip"]')).toHaveLength(0);
       expect(wrapper.find(SpaceAwarePrivilegeSection)).toHaveLength(1);
@@ -240,10 +237,7 @@ describe('<EditRolePage />', () => {
     it('can render when creating a new role', async () => {
       const wrapper = mountWithIntl(<EditRolePage {...getProps({ action: 'edit' })} />);
 
-      await act(async () => {
-        await nextTick();
-        wrapper.update();
-      });
+      await waitForRender(wrapper);
 
       expect(wrapper.find(SpaceAwarePrivilegeSection)).toHaveLength(1);
       expect(wrapper.find('[data-test-subj="userCannotManageSpacesCallout"]')).toHaveLength(0);
@@ -275,10 +269,7 @@ describe('<EditRolePage />', () => {
         />
       );
 
-      await act(async () => {
-        await nextTick();
-        wrapper.update();
-      });
+      await waitForRender(wrapper);
 
       expect(wrapper.find(SpaceAwarePrivilegeSection)).toHaveLength(1);
       expect(wrapper.find('[data-test-subj="userCannotManageSpacesCallout"]')).toHaveLength(0);
@@ -301,10 +292,7 @@ describe('<EditRolePage />', () => {
         />
       );
 
-      await act(async () => {
-        await nextTick();
-        wrapper.update();
-      });
+      await waitForRender(wrapper);
 
       expect(wrapper.find('[data-test-subj="reservedRoleBadgeTooltip"]')).toHaveLength(0);
 
@@ -333,10 +321,7 @@ describe('<EditRolePage />', () => {
         />
       );
 
-      await act(async () => {
-        await nextTick();
-        wrapper.update();
-      });
+      await waitForRender(wrapper);
 
       expect(wrapper.find(TransformErrorSection)).toHaveLength(1);
       expectReadOnlyFormButtons(wrapper);
@@ -360,10 +345,7 @@ describe('<EditRolePage />', () => {
         />
       );
 
-      await act(async () => {
-        await nextTick();
-        wrapper.update();
-      });
+      await waitForRender(wrapper);
 
       expect(wrapper.find('[data-test-subj="reservedRoleBadgeTooltip"]')).toHaveLength(1);
       expect(wrapper.find(SimplePrivilegeSection)).toHaveLength(1);
@@ -387,10 +369,7 @@ describe('<EditRolePage />', () => {
         />
       );
 
-      await act(async () => {
-        await nextTick();
-        wrapper.update();
-      });
+      await waitForRender(wrapper);
 
       expect(wrapper.find('[data-test-subj="reservedRoleBadgeTooltip"]')).toHaveLength(0);
       expect(wrapper.find(SimplePrivilegeSection)).toHaveLength(1);
@@ -403,10 +382,7 @@ describe('<EditRolePage />', () => {
         <EditRolePage {...getProps({ action: 'edit', spacesEnabled: false })} />
       );
 
-      await act(async () => {
-        await nextTick();
-        wrapper.update();
-      });
+      await waitForRender(wrapper);
 
       expect(wrapper.find(SimplePrivilegeSection)).toHaveLength(1);
       expectSaveFormButtons(wrapper);
@@ -438,10 +414,7 @@ describe('<EditRolePage />', () => {
         />
       );
 
-      await act(async () => {
-        await nextTick();
-        wrapper.update();
-      });
+      await waitForRender(wrapper);
 
       expect(wrapper.find(SimplePrivilegeSection)).toHaveLength(1);
       expectSaveFormButtons(wrapper);
@@ -464,10 +437,7 @@ describe('<EditRolePage />', () => {
         />
       );
 
-      await act(async () => {
-        await nextTick();
-        wrapper.update();
-      });
+      await waitForRender(wrapper);
 
       expect(wrapper.find('[data-test-subj="reservedRoleBadgeTooltip"]')).toHaveLength(0);
 
@@ -497,10 +467,7 @@ describe('<EditRolePage />', () => {
         />
       );
 
-      await act(async () => {
-        await nextTick();
-        wrapper.update();
-      });
+      await waitForRender(wrapper);
 
       expect(wrapper.find(TransformErrorSection)).toHaveLength(1);
       expectReadOnlyFormButtons(wrapper);
@@ -522,10 +489,7 @@ describe('<EditRolePage />', () => {
 
     const wrapper = mountWithIntl(<EditRolePage {...{ ...getProps({ action: 'edit' }), http }} />);
 
-    await act(async () => {
-      await nextTick();
-      wrapper.update();
-    });
+    await waitForRender(wrapper);
 
     expect(wrapper.find(SpaceAwarePrivilegeSection)).toHaveLength(1);
     expect(wrapper.find('[data-test-subj="userCannotManageSpacesCallout"]')).toHaveLength(0);
@@ -540,13 +504,17 @@ describe('<EditRolePage />', () => {
       <EditRolePage {...{ ...getProps({ action: 'edit' }), indexPatterns }} />
     );
 
-    await act(async () => {
-      await nextTick();
-      wrapper.update();
-    });
+    await waitForRender(wrapper);
 
     expect(wrapper.find(SpaceAwarePrivilegeSection)).toHaveLength(1);
     expect(wrapper.find('[data-test-subj="userCannotManageSpacesCallout"]')).toHaveLength(0);
     expectSaveFormButtons(wrapper);
   });
 });
+
+async function waitForRender(wrapper: ReactWrapper<any>) {
+  await act(async () => {
+    await nextTick();
+    wrapper.update();
+  });
+}
diff --git a/x-pack/plugins/security/public/management/roles/edit_role/edit_role_page.tsx b/x-pack/plugins/security/public/management/roles/edit_role/edit_role_page.tsx
index cd7766ef38748..f0d5abf89dd2e 100644
--- a/x-pack/plugins/security/public/management/roles/edit_role/edit_role_page.tsx
+++ b/x-pack/plugins/security/public/management/roles/edit_role/edit_role_page.tsx
@@ -37,11 +37,11 @@ import {
   IHttpFetchError,
   NotificationsStart,
 } from 'src/core/public';
+import { FeaturesPluginStart } from '../../../../../features/public';
+import { Feature } from '../../../../../features/common';
 import { IndexPatternsContract } from '../../../../../../../src/plugins/data/public';
 import { Space } from '../../../../../spaces/public';
-import { Feature } from '../../../../../features/public';
 import {
-  KibanaPrivileges,
   RawKibanaPrivileges,
   Role,
   BuiltinESPrivileges,
@@ -64,6 +64,7 @@ import { DocumentationLinksService } from '../documentation_links';
 import { IndicesAPIClient } from '../indices_api_client';
 import { RolesAPIClient } from '../roles_api_client';
 import { PrivilegesAPIClient } from '../privileges_api_client';
+import { KibanaPrivileges } from '../model';
 
 interface Props {
   action: 'edit' | 'clone';
@@ -73,6 +74,7 @@ interface Props {
   indicesAPIClient: PublicMethodsOf<IndicesAPIClient>;
   rolesAPIClient: PublicMethodsOf<RolesAPIClient>;
   privilegesAPIClient: PublicMethodsOf<PrivilegesAPIClient>;
+  getFeatures: FeaturesPluginStart['getFeatures'];
   docLinks: DocumentationLinksService;
   http: HttpStart;
   license: SecurityLicense;
@@ -231,11 +233,13 @@ function useSpaces(http: HttpStart, fatalErrors: FatalErrorsSetup, spacesEnabled
   return spaces;
 }
 
-function useFeatures(http: HttpStart, fatalErrors: FatalErrorsSetup) {
+function useFeatures(
+  getFeatures: FeaturesPluginStart['getFeatures'],
+  fatalErrors: FatalErrorsSetup
+) {
   const [features, setFeatures] = useState<Feature[] | null>(null);
   useEffect(() => {
-    http
-      .get('/api/features')
+    getFeatures()
       .catch((err: IHttpFetchError) => {
         // Currently, the `/api/features` endpoint effectively requires the "Global All" kibana privilege (e.g., what
         // the `kibana_user` grants), because it returns information about all registered features (#35841). It's
@@ -246,14 +250,15 @@ function useFeatures(http: HttpStart, fatalErrors: FatalErrorsSetup) {
         // 404 here, and respond in a way that still allows the UI to render itself.
         const unauthorizedForFeatures = err.response?.status === 404;
         if (unauthorizedForFeatures) {
-          return [];
+          return [] as Feature[];
         }
 
         fatalErrors.add(err);
-        throw err;
       })
-      .then(setFeatures);
-  }, [http, fatalErrors]);
+      .then(retrievedFeatures => {
+        setFeatures(retrievedFeatures);
+      });
+  }, [fatalErrors, getFeatures]);
 
   return features;
 }
@@ -268,6 +273,7 @@ export const EditRolePage: FunctionComponent<Props> = ({
   rolesAPIClient,
   indicesAPIClient,
   privilegesAPIClient,
+  getFeatures,
   http,
   roleName,
   action,
@@ -287,7 +293,7 @@ export const EditRolePage: FunctionComponent<Props> = ({
   const indexPatternsTitles = useIndexPatternsTitles(indexPatterns, fatalErrors, notifications);
   const privileges = usePrivileges(privilegesAPIClient, fatalErrors);
   const spaces = useSpaces(http, fatalErrors, spacesEnabled);
-  const features = useFeatures(http, fatalErrors);
+  const features = useFeatures(getFeatures, fatalErrors);
   const [role, setRole] = useRole(
     rolesAPIClient,
     fatalErrors,
@@ -425,11 +431,11 @@ export const EditRolePage: FunctionComponent<Props> = ({
       <div>
         <EuiSpacer />
         <KibanaPrivilegesRegion
-          kibanaPrivileges={new KibanaPrivileges(kibanaPrivileges)}
+          kibanaPrivileges={new KibanaPrivileges(kibanaPrivileges, features)}
           spaces={spaces}
           spacesEnabled={spacesEnabled}
-          features={features}
           uiCapabilities={uiCapabilities}
+          canCustomizeSubFeaturePrivileges={license.getFeatures().allowSubFeaturePrivileges}
           editable={!isRoleReadOnly}
           role={role}
           onChange={onRoleChange}
diff --git a/x-pack/plugins/security/public/management/roles/edit_role/privilege_utils.test.ts b/x-pack/plugins/security/public/management/roles/edit_role/privilege_utils.test.ts
index 88ac71cbd7634..9ecdc7062d405 100644
--- a/x-pack/plugins/security/public/management/roles/edit_role/privilege_utils.test.ts
+++ b/x-pack/plugins/security/public/management/roles/edit_role/privilege_utils.test.ts
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { hasAssignedFeaturePrivileges, isGlobalPrivilegeDefinition } from './privilege_utils';
+import { isGlobalPrivilegeDefinition } from './privilege_utils';
 
 describe('isGlobalPrivilegeDefinition', () => {
   it('returns true if no spaces are defined', () => {
@@ -47,39 +47,3 @@ describe('isGlobalPrivilegeDefinition', () => {
     ).toEqual(false);
   });
 });
-
-describe('hasAssignedFeaturePrivileges', () => {
-  it('returns false if no feature privileges are defined', () => {
-    expect(
-      hasAssignedFeaturePrivileges({
-        spaces: [],
-        base: [],
-        feature: {},
-      })
-    ).toEqual(false);
-  });
-
-  it('returns false if feature privileges are defined but not assigned', () => {
-    expect(
-      hasAssignedFeaturePrivileges({
-        spaces: [],
-        base: [],
-        feature: {
-          foo: [],
-        },
-      })
-    ).toEqual(false);
-  });
-
-  it('returns true if feature privileges are defined and assigned', () => {
-    expect(
-      hasAssignedFeaturePrivileges({
-        spaces: [],
-        base: [],
-        feature: {
-          foo: ['all'],
-        },
-      })
-    ).toEqual(true);
-  });
-});
diff --git a/x-pack/plugins/security/public/management/roles/edit_role/privilege_utils.ts b/x-pack/plugins/security/public/management/roles/edit_role/privilege_utils.ts
index 3fd8536951967..1fad9057665da 100644
--- a/x-pack/plugins/security/public/management/roles/edit_role/privilege_utils.ts
+++ b/x-pack/plugins/security/public/management/roles/edit_role/privilege_utils.ts
@@ -16,12 +16,3 @@ export function isGlobalPrivilegeDefinition(privilegeSpec: RoleKibanaPrivilege):
   }
   return privilegeSpec.spaces.includes('*');
 }
-
-/**
- * Determines if the passed privilege spec defines feature privileges.
- * @param privilegeSpec
- */
-export function hasAssignedFeaturePrivileges(privilegeSpec: RoleKibanaPrivilege): boolean {
-  const featureKeys = Object.keys(privilegeSpec.feature);
-  return featureKeys.length > 0 && featureKeys.some(key => privilegeSpec.feature[key].length > 0);
-}
diff --git a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/__snapshots__/kibana_privileges_region.test.tsx.snap b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/__snapshots__/kibana_privileges_region.test.tsx.snap
index 617335dc9fb34..a911455f95b5d 100644
--- a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/__snapshots__/kibana_privileges_region.test.tsx.snap
+++ b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/__snapshots__/kibana_privileges_region.test.tsx.snap
@@ -5,33 +5,17 @@ exports[`<KibanaPrivileges> renders without crashing 1`] = `
   iconType="logoKibana"
   title="Kibana"
 >
-  <InjectIntl(SpaceAwarePrivilegeSectionUI)
+  <SpaceAwarePrivilegeSection
+    canCustomizeSubFeaturePrivileges={true}
     editable={true}
-    features={Array []}
     kibanaPrivileges={
       KibanaPrivileges {
-        "rawKibanaPrivileges": Object {
-          "features": Object {},
-          "global": Object {},
-          "reserved": Object {},
-          "space": Object {},
-        },
+        "feature": Map {},
+        "global": Map {},
+        "spaces": Map {},
       }
     }
     onChange={[MockFunction]}
-    privilegeCalculatorFactory={
-      KibanaPrivilegeCalculatorFactory {
-        "kibanaPrivileges": KibanaPrivileges {
-          "rawKibanaPrivileges": Object {
-            "features": Object {},
-            "global": Object {},
-            "reserved": Object {},
-            "space": Object {},
-          },
-        },
-        "rankedFeaturePrivileges": Object {},
-      }
-    }
     role={
       Object {
         "elasticsearch": Object {
diff --git a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/feature_table/__fixtures__/index.ts b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/feature_table/__fixtures__/index.ts
new file mode 100644
index 0000000000000..440ed78f944ba
--- /dev/null
+++ b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/feature_table/__fixtures__/index.ts
@@ -0,0 +1,76 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { ReactWrapper } from 'enzyme';
+
+import {
+  EuiTableRow,
+  EuiCheckbox,
+  EuiCheckboxProps,
+  EuiButtonGroup,
+  EuiButtonGroupProps,
+} from '@elastic/eui';
+
+import { findTestSubject } from 'test_utils/find_test_subject';
+import { SubFeatureForm } from '../sub_feature_form';
+
+export function getDisplayedFeaturePrivileges(wrapper: ReactWrapper<any>) {
+  const allExpanderButtons = findTestSubject(wrapper, 'expandFeaturePrivilegeRow');
+  allExpanderButtons.forEach(button => button.simulate('click'));
+
+  // each expanded row renders its own `EuiTableRow`, so there are 2 rows
+  // for each feature: one for the primary feature privilege, and one for the sub privilege form
+  const rows = wrapper.find(EuiTableRow);
+
+  return rows.reduce((acc, row) => {
+    const subFeaturePrivileges = [];
+    const subFeatureForm = row.find(SubFeatureForm);
+    if (subFeatureForm.length > 0) {
+      const { featureId } = subFeatureForm.props();
+      const independentPrivileges = (subFeatureForm.find(EuiCheckbox) as ReactWrapper<
+        EuiCheckboxProps
+      >).reduce((acc2, checkbox) => {
+        const { id: privilegeId, checked } = checkbox.props();
+        return checked ? [...acc2, privilegeId] : acc2;
+      }, [] as string[]);
+
+      const mutuallyExclusivePrivileges = (subFeatureForm.find(EuiButtonGroup) as ReactWrapper<
+        EuiButtonGroupProps
+      >).reduce((acc2, subPrivButtonGroup) => {
+        const { idSelected: selectedSubPrivilege } = subPrivButtonGroup.props();
+        return selectedSubPrivilege && selectedSubPrivilege !== 'none'
+          ? [...acc2, selectedSubPrivilege]
+          : acc2;
+      }, [] as string[]);
+
+      subFeaturePrivileges.push(...independentPrivileges, ...mutuallyExclusivePrivileges);
+
+      return {
+        ...acc,
+        [featureId]: {
+          ...acc[featureId],
+          subFeaturePrivileges,
+        },
+      };
+    } else {
+      const buttonGroup = row.find(EuiButtonGroup);
+      const { name, idSelected } = buttonGroup.props();
+      expect(name).toBeDefined();
+      expect(idSelected).toBeDefined();
+
+      const featureId = name!.substr(`featurePrivilege_`.length);
+      const primaryFeaturePrivilege = idSelected!.substr(`${featureId}_`.length);
+
+      return {
+        ...acc,
+        [featureId]: {
+          ...acc[featureId],
+          primaryFeaturePrivilege,
+        },
+      };
+    }
+  }, {} as Record<string, { primaryFeaturePrivilege: string; subFeaturePrivileges: string[] }>);
+}
diff --git a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/feature_table/__snapshots__/feature_table.test.tsx.snap b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/feature_table/__snapshots__/feature_table.test.tsx.snap
deleted file mode 100644
index 799ff205e2540..0000000000000
--- a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/feature_table/__snapshots__/feature_table.test.tsx.snap
+++ /dev/null
@@ -1,39 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`FeatureTable can render without spaces 1`] = `
-<EuiInMemoryTable
-  columns={
-    Array [
-      Object {
-        "field": "feature",
-        "name": "Feature",
-        "render": [Function],
-      },
-      Object {
-        "field": "privilege",
-        "name": <span>
-          <FormattedMessage
-            defaultMessage="Privilege"
-            id="xpack.security.management.editRole.featureTable.enabledRoleFeaturesEnabledColumnTitle"
-            values={Object {}}
-          />
-          <ChangeAllPrivilegesControl
-            onChange={[Function]}
-            privileges={
-              Array [
-                "all",
-                "read",
-                "none",
-              ]
-            }
-          />
-        </span>,
-        "render": [Function],
-      },
-    ]
-  }
-  items={Array []}
-  responsive={false}
-  tableLayout="fixed"
-/>
-`;
diff --git a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/feature_table/change_all_privileges.tsx b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/feature_table/change_all_privileges.tsx
index c480f33b57899..2083778e53998 100644
--- a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/feature_table/change_all_privileges.tsx
+++ b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/feature_table/change_all_privileges.tsx
@@ -7,9 +7,11 @@ import { EuiContextMenuItem, EuiContextMenuPanel, EuiLink, EuiPopover } from '@e
 import { FormattedMessage } from '@kbn/i18n/react';
 import _ from 'lodash';
 import React, { Component } from 'react';
+import { KibanaPrivilege } from '../../../../model';
+import { NO_PRIVILEGE_VALUE } from '../constants';
 interface Props {
   onChange: (privilege: string) => void;
-  privileges: string[];
+  privileges: KibanaPrivilege[];
   disabled?: boolean;
 }
 
@@ -24,7 +26,11 @@ export class ChangeAllPrivilegesControl extends Component<Props, State> {
 
   public render() {
     const button = (
-      <EuiLink onClick={this.onButtonClick} className={'secPrivilegeFeatureChangeAllLink'}>
+      <EuiLink
+        onClick={this.onButtonClick}
+        className={'secPrivilegeFeatureChangeAllLink'}
+        data-test-subj="changeAllPrivilegesButton"
+      >
         <FormattedMessage
           id="xpack.security.management.editRole.changeAllPrivilegesLink"
           defaultMessage="(change all)"
@@ -35,17 +41,31 @@ export class ChangeAllPrivilegesControl extends Component<Props, State> {
     const items = this.props.privileges.map(privilege => {
       return (
         <EuiContextMenuItem
-          key={privilege}
+          key={privilege.id}
+          data-test-subj={`changeAllPrivileges-${privilege.id}`}
           onClick={() => {
-            this.onSelectPrivilege(privilege);
+            this.onSelectPrivilege(privilege.id);
           }}
           disabled={this.props.disabled}
         >
-          {_.capitalize(privilege)}
+          {_.capitalize(privilege.id)}
         </EuiContextMenuItem>
       );
     });
 
+    items.push(
+      <EuiContextMenuItem
+        key={NO_PRIVILEGE_VALUE}
+        data-test-subj={`changeAllPrivileges-${NO_PRIVILEGE_VALUE}`}
+        onClick={() => {
+          this.onSelectPrivilege(NO_PRIVILEGE_VALUE);
+        }}
+        disabled={this.props.disabled}
+      >
+        {_.capitalize(NO_PRIVILEGE_VALUE)}
+      </EuiContextMenuItem>
+    );
+
     return (
       <EuiPopover
         id={'changeAllFeaturePrivilegesPopover'}
diff --git a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/feature_table/feature_table.test.tsx b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/feature_table/feature_table.test.tsx
index dea42e16f99d4..d974b336fac78 100644
--- a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/feature_table/feature_table.test.tsx
+++ b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/feature_table/feature_table.test.tsx
@@ -3,145 +3,765 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-import { EuiInMemoryTable } from '@elastic/eui';
 import React from 'react';
-import { mountWithIntl, shallowWithIntl } from 'test_utils/enzyme_helpers';
-import { FeaturesPrivileges, KibanaPrivileges, Role } from '../../../../../../../common/model';
-import { KibanaPrivilegeCalculatorFactory } from '../kibana_privilege_calculator';
 import { FeatureTable } from './feature_table';
+import { Role } from '../../../../../../../common/model';
+import { mountWithIntl } from 'test_utils/enzyme_helpers';
+import { Feature, SubFeatureConfig } from '../../../../../../../../features/public';
+import { kibanaFeatures, createFeature } from '../../../../__fixtures__/kibana_features';
+import { createKibanaPrivileges } from '../../../../__fixtures__/kibana_privileges';
+import { PrivilegeFormCalculator } from '../privilege_form_calculator';
+import { getDisplayedFeaturePrivileges } from './__fixtures__';
+import { findTestSubject } from 'test_utils/find_test_subject';
+import { FeatureTableExpandedRow } from './feature_table_expanded_row';
 
-const defaultPrivilegeDefinition = new KibanaPrivileges({
-  global: {
-    all: ['api:/*', 'ui:/*'],
-    read: ['ui:/feature1/foo', 'ui:/feature2/foo'],
-  },
-  space: {
-    all: ['api:/*', 'ui:/*'],
-    read: ['ui:/feature1/foo', 'ui:/feature2/foo'],
-  },
-  features: {
-    feature1: {
-      all: ['ui:/feature1/foo', 'ui:/feature1/bar'],
-      read: ['ui:/feature1/foo'],
-    },
-    feature2: {
-      all: ['ui:/feature2/foo', 'api:/feature2/bar'],
-      read: ['ui:/feature2/foo'],
-    },
-    feature3: {
-      all: ['ui:/feature3/foo'],
-    },
-    feature4: {
-      all: ['somethingObsecure:/foo'],
-    },
-  },
-  reserved: {},
-});
-
-interface BuildRoleOpts {
-  globalPrivilege?: {
-    base: string[];
-    feature: FeaturesPrivileges;
+const createRole = (kibana: Role['kibana'] = []): Role => {
+  return {
+    name: 'my_role',
+    elasticsearch: { cluster: [], run_as: [], indices: [] },
+    kibana,
   };
-  spacesPrivileges?: Array<{
-    spaces: string[];
-    base: string[];
-    feature: FeaturesPrivileges;
-  }>;
+};
+
+interface TestConfig {
+  features: Feature[];
+  role: Role;
+  privilegeIndex: number;
+  calculateDisplayedPrivileges: boolean;
+  canCustomizeSubFeaturePrivileges: boolean;
 }
-const buildRole = (options: BuildRoleOpts = {}) => {
-  const role: Role = {
-    name: 'unit test role',
-    elasticsearch: {
-      indices: [],
-      cluster: [],
-      run_as: [],
-    },
-    kibana: [],
+const setup = (config: TestConfig) => {
+  const kibanaPrivileges = createKibanaPrivileges(config.features, {
+    allowSubFeaturePrivileges: config.canCustomizeSubFeaturePrivileges,
+  });
+  const calculator = new PrivilegeFormCalculator(kibanaPrivileges, config.role);
+  const onChange = jest.fn();
+  const onChangeAll = jest.fn();
+  const wrapper = mountWithIntl(
+    <FeatureTable
+      role={config.role}
+      privilegeCalculator={calculator}
+      kibanaPrivileges={kibanaPrivileges}
+      onChange={onChange}
+      onChangeAll={onChangeAll}
+      canCustomizeSubFeaturePrivileges={config.canCustomizeSubFeaturePrivileges}
+      privilegeIndex={config.privilegeIndex}
+    />
+  );
+
+  const displayedPrivileges = config.calculateDisplayedPrivileges
+    ? getDisplayedFeaturePrivileges(wrapper)
+    : undefined;
+
+  return {
+    wrapper,
+    onChange,
+    onChangeAll,
+    displayedPrivileges,
   };
+};
+
+describe('FeatureTable', () => {
+  [true, false].forEach(canCustomizeSubFeaturePrivileges => {
+    describe(`with sub feature privileges ${
+      canCustomizeSubFeaturePrivileges ? 'allowed' : 'disallowed'
+    }`, () => {
+      it('renders with no granted privileges for an empty role', () => {
+        const role = createRole([
+          {
+            spaces: [],
+            base: [],
+            feature: {},
+          },
+        ]);
+
+        const { displayedPrivileges } = setup({
+          role,
+          features: kibanaFeatures,
+          privilegeIndex: 0,
+          calculateDisplayedPrivileges: true,
+          canCustomizeSubFeaturePrivileges,
+        });
+
+        expect(displayedPrivileges).toEqual({
+          excluded_from_base: {
+            primaryFeaturePrivilege: 'none',
+            ...(canCustomizeSubFeaturePrivileges ? { subFeaturePrivileges: [] } : {}),
+          },
+          no_sub_features: {
+            primaryFeaturePrivilege: 'none',
+          },
+          with_excluded_sub_features: {
+            primaryFeaturePrivilege: 'none',
+            ...(canCustomizeSubFeaturePrivileges ? { subFeaturePrivileges: [] } : {}),
+          },
+          with_sub_features: {
+            primaryFeaturePrivilege: 'none',
+            ...(canCustomizeSubFeaturePrivileges ? { subFeaturePrivileges: [] } : {}),
+          },
+        });
+      });
+
+      it('renders with all included privileges granted at the space when space base privilege is "all"', () => {
+        const role = createRole([
+          {
+            spaces: ['*'],
+            base: ['read'],
+            feature: {},
+          },
+          {
+            spaces: ['foo'],
+            base: ['all'],
+            feature: {},
+          },
+        ]);
+        const { displayedPrivileges } = setup({
+          role,
+          features: kibanaFeatures,
+          privilegeIndex: 1,
+          calculateDisplayedPrivileges: true,
+          canCustomizeSubFeaturePrivileges,
+        });
+        expect(displayedPrivileges).toEqual({
+          excluded_from_base: {
+            primaryFeaturePrivilege: 'none',
+            ...(canCustomizeSubFeaturePrivileges ? { subFeaturePrivileges: [] } : {}),
+          },
+          no_sub_features: {
+            primaryFeaturePrivilege: 'all',
+          },
+          with_excluded_sub_features: {
+            primaryFeaturePrivilege: 'all',
+            ...(canCustomizeSubFeaturePrivileges ? { subFeaturePrivileges: [] } : {}),
+          },
+          with_sub_features: {
+            primaryFeaturePrivilege: 'all',
+            ...(canCustomizeSubFeaturePrivileges
+              ? {
+                  subFeaturePrivileges: [
+                    'with_sub_features_cool_toggle_1',
+                    'with_sub_features_cool_toggle_2',
+                    'cool_all',
+                  ],
+                }
+              : {}),
+          },
+        });
+      });
+
+      it('renders the most permissive primary feature privilege when multiple are assigned', () => {
+        const role = createRole([
+          {
+            spaces: ['*'],
+            base: ['read'],
+            feature: {},
+          },
+          {
+            spaces: ['foo'],
+            base: [],
+            feature: {
+              with_sub_features: ['read', 'minimal_all', 'all', 'minimal_read'],
+            },
+          },
+        ]);
+        const { displayedPrivileges } = setup({
+          role,
+          features: kibanaFeatures,
+          privilegeIndex: 1,
+          calculateDisplayedPrivileges: true,
+          canCustomizeSubFeaturePrivileges,
+        });
 
-  if (options.globalPrivilege) {
-    role.kibana.push({
-      spaces: ['*'],
-      ...options.globalPrivilege,
+        expect(displayedPrivileges).toEqual({
+          excluded_from_base: {
+            primaryFeaturePrivilege: 'none',
+            ...(canCustomizeSubFeaturePrivileges ? { subFeaturePrivileges: [] } : {}),
+          },
+          no_sub_features: {
+            primaryFeaturePrivilege: 'none',
+          },
+          with_excluded_sub_features: {
+            primaryFeaturePrivilege: 'none',
+            ...(canCustomizeSubFeaturePrivileges ? { subFeaturePrivileges: [] } : {}),
+          },
+          with_sub_features: {
+            primaryFeaturePrivilege: 'all',
+            ...(canCustomizeSubFeaturePrivileges
+              ? {
+                  subFeaturePrivileges: [
+                    'with_sub_features_cool_toggle_1',
+                    'with_sub_features_cool_toggle_2',
+                    'cool_all',
+                  ],
+                }
+              : {}),
+          },
+        });
+      });
+
+      it('allows all feature privileges to be toggled via "change all"', () => {
+        const role = createRole([
+          {
+            spaces: ['foo'],
+            base: [],
+            feature: {},
+          },
+        ]);
+        const { wrapper, onChangeAll } = setup({
+          role,
+          features: kibanaFeatures,
+          privilegeIndex: 0,
+          calculateDisplayedPrivileges: false,
+          canCustomizeSubFeaturePrivileges,
+        });
+
+        findTestSubject(wrapper, 'changeAllPrivilegesButton').simulate('click');
+        findTestSubject(wrapper, 'changeAllPrivileges-read').simulate('click');
+
+        expect(onChangeAll).toHaveBeenCalledWith(['read']);
+      });
+
+      it('allows all feature privileges to be unassigned via "change all"', () => {
+        const role = createRole([
+          {
+            spaces: ['foo'],
+            base: [],
+            feature: {
+              with_sub_features: ['all'],
+              no_sub_features: ['read'],
+              with_excluded_sub_features: ['all', 'something else'],
+            },
+          },
+        ]);
+        const { wrapper, onChangeAll } = setup({
+          role,
+          features: kibanaFeatures,
+          privilegeIndex: 0,
+          calculateDisplayedPrivileges: false,
+          canCustomizeSubFeaturePrivileges,
+        });
+
+        findTestSubject(wrapper, 'changeAllPrivilegesButton').simulate('click');
+        findTestSubject(wrapper, 'changeAllPrivileges-none').simulate('click');
+
+        expect(onChangeAll).toHaveBeenCalledWith([]);
+      });
+    });
+  });
+
+  it('renders the most permissive sub-feature privilege when multiple are assigned in a mutually-exclusive group', () => {
+    const role = createRole([
+      {
+        spaces: ['*'],
+        base: ['read'],
+        feature: {},
+      },
+      {
+        spaces: ['foo'],
+        base: [],
+        feature: {
+          with_sub_features: ['minimal_read', 'cool_all', 'cool_read'],
+        },
+      },
+    ]);
+    const { displayedPrivileges } = setup({
+      role,
+      features: kibanaFeatures,
+      privilegeIndex: 1,
+      calculateDisplayedPrivileges: true,
+      canCustomizeSubFeaturePrivileges: true,
     });
-  }
 
-  if (options.spacesPrivileges) {
-    role.kibana.push(...options.spacesPrivileges);
-  }
+    expect(displayedPrivileges).toEqual({
+      excluded_from_base: {
+        primaryFeaturePrivilege: 'none',
+        subFeaturePrivileges: [],
+      },
+      no_sub_features: {
+        primaryFeaturePrivilege: 'none',
+      },
+      with_excluded_sub_features: {
+        primaryFeaturePrivilege: 'none',
+        subFeaturePrivileges: [],
+      },
+      with_sub_features: {
+        primaryFeaturePrivilege: 'read',
+        subFeaturePrivileges: ['cool_all'],
+      },
+    });
+  });
 
-  return role;
-};
+  it('renders a row expander only for features with sub-features', () => {
+    const role = createRole([
+      {
+        spaces: ['*'],
+        base: ['read'],
+        feature: {},
+      },
+      {
+        spaces: ['foo'],
+        base: [],
+        feature: {},
+      },
+    ]);
+    const { wrapper } = setup({
+      role,
+      features: kibanaFeatures,
+      privilegeIndex: 1,
+      calculateDisplayedPrivileges: false,
+      canCustomizeSubFeaturePrivileges: true,
+    });
 
-const buildFeatures = () => {
-  return [];
-};
+    kibanaFeatures.forEach(feature => {
+      const rowExpander = findTestSubject(wrapper, `expandFeaturePrivilegeRow-${feature.id}`);
+      if (!feature.subFeatures || feature.subFeatures.length === 0) {
+        expect(rowExpander).toHaveLength(0);
+      } else {
+        expect(rowExpander).toHaveLength(1);
+      }
+    });
+  });
 
-describe('FeatureTable', () => {
-  it('can render without spaces', () => {
-    const role = buildRole({
-      spacesPrivileges: [
+  it('renders the <FeatureTableExpandedRow> when the row is expanded', () => {
+    const role = createRole([
+      {
+        spaces: ['*'],
+        base: ['read'],
+        feature: {},
+      },
+      {
+        spaces: ['foo'],
+        base: [],
+        feature: {},
+      },
+    ]);
+    const { wrapper } = setup({
+      role,
+      features: kibanaFeatures,
+      privilegeIndex: 1,
+      calculateDisplayedPrivileges: false,
+      canCustomizeSubFeaturePrivileges: true,
+    });
+
+    expect(wrapper.find(FeatureTableExpandedRow)).toHaveLength(0);
+
+    findTestSubject(wrapper, 'expandFeaturePrivilegeRow')
+      .first()
+      .simulate('click');
+
+    expect(wrapper.find(FeatureTableExpandedRow)).toHaveLength(1);
+  });
+
+  it('renders with sub-feature privileges granted when primary feature privilege is "all"', () => {
+    const role = createRole([
+      {
+        spaces: ['*'],
+        base: ['read'],
+        feature: {
+          unit_test: ['all'],
+        },
+      },
+    ]);
+    const feature = createFeature({
+      id: 'unit_test',
+      name: 'Unit Test Feature',
+      subFeatures: [
         {
-          spaces: ['marketing', 'default'],
-          base: ['read'],
-          feature: {
-            feature1: ['all'],
-          },
+          name: 'Some Sub Feature',
+          privilegeGroups: [
+            {
+              groupType: 'independent',
+              privileges: [
+                {
+                  id: 'sub-toggle-1',
+                  name: 'Sub Toggle 1',
+                  includeIn: 'all',
+                  savedObject: { all: [], read: [] },
+                  ui: ['sub-toggle-1'],
+                },
+                {
+                  id: 'sub-toggle-2',
+                  name: 'Sub Toggle 2',
+                  includeIn: 'read',
+                  savedObject: { all: [], read: [] },
+                  ui: ['sub-toggle-2'],
+                },
+              ],
+            },
+            {
+              groupType: 'mutually_exclusive',
+              privileges: [
+                {
+                  id: 'sub-option-1',
+                  name: 'Sub Option 1',
+                  includeIn: 'all',
+                  savedObject: { all: [], read: [] },
+                  ui: ['sub-option-1'],
+                },
+                {
+                  id: 'sub-toggle-2',
+                  name: 'Sub Toggle 2',
+                  includeIn: 'read',
+                  savedObject: { all: [], read: [] },
+                  ui: ['sub-option-2'],
+                },
+              ],
+            },
+          ],
+        },
+      ] as SubFeatureConfig[],
+    });
+
+    const { displayedPrivileges } = setup({
+      role,
+      features: [feature],
+      privilegeIndex: 0,
+      calculateDisplayedPrivileges: true,
+      canCustomizeSubFeaturePrivileges: true,
+    });
+    expect(displayedPrivileges).toEqual({
+      unit_test: {
+        primaryFeaturePrivilege: 'all',
+        subFeaturePrivileges: ['unit_test_sub-toggle-1', 'unit_test_sub-toggle-2', 'sub-option-1'],
+      },
+    });
+  });
+
+  it('renders with some sub-feature privileges granted when primary feature privilege is "read"', () => {
+    const role = createRole([
+      {
+        spaces: ['*'],
+        base: ['read'],
+        feature: {
+          unit_test: ['read'],
+        },
+      },
+    ]);
+    const feature = createFeature({
+      id: 'unit_test',
+      name: 'Unit Test Feature',
+      subFeatures: [
+        {
+          name: 'Some Sub Feature',
+          privilegeGroups: [
+            {
+              groupType: 'independent',
+              privileges: [
+                {
+                  id: 'sub-toggle-1',
+                  name: 'Sub Toggle 1',
+                  includeIn: 'all',
+                  savedObject: { all: [], read: [] },
+                  ui: ['sub-toggle-1'],
+                },
+                {
+                  id: 'sub-toggle-2',
+                  name: 'Sub Toggle 2',
+                  includeIn: 'read',
+                  savedObject: { all: [], read: [] },
+                  ui: ['sub-toggle-2'],
+                },
+              ],
+            },
+            {
+              groupType: 'mutually_exclusive',
+              privileges: [
+                {
+                  id: 'sub-option-1',
+                  name: 'Sub Option 1',
+                  includeIn: 'all',
+                  savedObject: { all: [], read: [] },
+                  ui: ['sub-option-1'],
+                },
+                {
+                  id: 'sub-toggle-2',
+                  name: 'Sub Toggle 2',
+                  includeIn: 'read',
+                  savedObject: { all: [], read: [] },
+                  ui: ['sub-option-2'],
+                },
+              ],
+            },
+          ],
+        },
+      ] as SubFeatureConfig[],
+    });
+
+    const { displayedPrivileges } = setup({
+      role,
+      features: [feature],
+      privilegeIndex: 0,
+      calculateDisplayedPrivileges: true,
+      canCustomizeSubFeaturePrivileges: true,
+    });
+    expect(displayedPrivileges).toEqual({
+      unit_test: {
+        primaryFeaturePrivilege: 'read',
+        subFeaturePrivileges: ['unit_test_sub-toggle-2', 'sub-toggle-2'],
+      },
+    });
+  });
+
+  it('renders with excluded sub-feature privileges not granted when primary feature privilege is "all"', () => {
+    const role = createRole([
+      {
+        spaces: ['*'],
+        base: ['read'],
+        feature: {
+          unit_test: ['all'],
+        },
+      },
+    ]);
+    const feature = createFeature({
+      id: 'unit_test',
+      name: 'Unit Test Feature',
+      subFeatures: [
+        {
+          name: 'Some Sub Feature',
+          privilegeGroups: [
+            {
+              groupType: 'independent',
+              privileges: [
+                {
+                  id: 'sub-toggle-1',
+                  name: 'Sub Toggle 1',
+                  includeIn: 'none',
+                  savedObject: { all: [], read: [] },
+                  ui: ['sub-toggle-1'],
+                },
+                {
+                  id: 'sub-toggle-2',
+                  name: 'Sub Toggle 2',
+                  includeIn: 'none',
+                  savedObject: { all: [], read: [] },
+                  ui: ['sub-toggle-2'],
+                },
+              ],
+            },
+            {
+              groupType: 'mutually_exclusive',
+              privileges: [
+                {
+                  id: 'sub-option-1',
+                  name: 'Sub Option 1',
+                  includeIn: 'all',
+                  savedObject: { all: [], read: [] },
+                  ui: ['sub-option-1'],
+                },
+                {
+                  id: 'sub-toggle-2',
+                  name: 'Sub Toggle 2',
+                  includeIn: 'read',
+                  savedObject: { all: [], read: [] },
+                  ui: ['sub-option-2'],
+                },
+              ],
+            },
+          ],
+        },
+      ] as SubFeatureConfig[],
+    });
+
+    const { displayedPrivileges } = setup({
+      role,
+      features: [feature],
+      privilegeIndex: 0,
+      calculateDisplayedPrivileges: true,
+      canCustomizeSubFeaturePrivileges: true,
+    });
+    expect(displayedPrivileges).toEqual({
+      unit_test: {
+        primaryFeaturePrivilege: 'all',
+        subFeaturePrivileges: ['unit_test_sub-toggle-2', 'sub-option-1'],
+      },
+    });
+  });
+
+  it('renders with excluded sub-feature privileges granted when explicitly assigned', () => {
+    const role = createRole([
+      {
+        spaces: ['*'],
+        base: ['read'],
+        feature: {
+          unit_test: ['all', 'sub-toggle-1'],
+        },
+      },
+    ]);
+    const feature = createFeature({
+      id: 'unit_test',
+      name: 'Unit Test Feature',
+      subFeatures: [
+        {
+          name: 'Some Sub Feature',
+          privilegeGroups: [
+            {
+              groupType: 'independent',
+              privileges: [
+                {
+                  id: 'sub-toggle-1',
+                  name: 'Sub Toggle 1',
+                  includeIn: 'none',
+                  savedObject: { all: [], read: [] },
+                  ui: ['sub-toggle-1'],
+                },
+                {
+                  id: 'sub-toggle-2',
+                  name: 'Sub Toggle 2',
+                  includeIn: 'none',
+                  savedObject: { all: [], read: [] },
+                  ui: ['sub-toggle-2'],
+                },
+              ],
+            },
+            {
+              groupType: 'mutually_exclusive',
+              privileges: [
+                {
+                  id: 'sub-option-1',
+                  name: 'Sub Option 1',
+                  includeIn: 'all',
+                  savedObject: { all: [], read: [] },
+                  ui: ['sub-option-1'],
+                },
+                {
+                  id: 'sub-toggle-2',
+                  name: 'Sub Toggle 2',
+                  includeIn: 'read',
+                  savedObject: { all: [], read: [] },
+                  ui: ['sub-option-2'],
+                },
+              ],
+            },
+          ],
+        },
+      ] as SubFeatureConfig[],
+    });
+
+    const { displayedPrivileges } = setup({
+      role,
+      features: [feature],
+      privilegeIndex: 0,
+      calculateDisplayedPrivileges: true,
+      canCustomizeSubFeaturePrivileges: true,
+    });
+    expect(displayedPrivileges).toEqual({
+      unit_test: {
+        primaryFeaturePrivilege: 'all',
+        subFeaturePrivileges: ['unit_test_sub-toggle-1', 'unit_test_sub-toggle-2', 'sub-option-1'],
+      },
+    });
+  });
+
+  it('renders with all included sub-feature privileges granted at the space when primary feature privileges are granted', () => {
+    const role = createRole([
+      {
+        spaces: ['*'],
+        base: ['read'],
+        feature: {},
+      },
+      {
+        spaces: ['foo'],
+        base: [],
+        feature: {
+          with_sub_features: ['all'],
         },
-      ],
-    });
-
-    const calculator = new KibanaPrivilegeCalculatorFactory(defaultPrivilegeDefinition).getInstance(
-      role
-    );
-
-    const wrapper = shallowWithIntl(
-      <FeatureTable
-        role={role}
-        kibanaPrivileges={defaultPrivilegeDefinition}
-        calculatedPrivileges={calculator.calculateEffectivePrivileges()[0]}
-        allowedPrivileges={calculator.calculateAllowedPrivileges()[0]}
-        rankedFeaturePrivileges={{
-          feature1: ['all', 'read'],
-          feature2: ['all', 'read'],
-          feature3: ['all'],
-          feature4: ['all'],
-        }}
-        features={buildFeatures()}
-        onChange={jest.fn()}
-        onChangeAll={jest.fn()}
-        spacesIndex={0}
-      />
-    );
-
-    expect(wrapper).toMatchSnapshot();
+      },
+    ]);
+    const { displayedPrivileges } = setup({
+      role,
+      features: kibanaFeatures,
+      privilegeIndex: 1,
+      calculateDisplayedPrivileges: true,
+      canCustomizeSubFeaturePrivileges: true,
+    });
+    expect(displayedPrivileges).toEqual({
+      excluded_from_base: {
+        primaryFeaturePrivilege: 'none',
+        subFeaturePrivileges: [],
+      },
+      no_sub_features: {
+        primaryFeaturePrivilege: 'none',
+      },
+      with_excluded_sub_features: {
+        primaryFeaturePrivilege: 'none',
+        subFeaturePrivileges: [],
+      },
+      with_sub_features: {
+        primaryFeaturePrivilege: 'all',
+        subFeaturePrivileges: [
+          'with_sub_features_cool_toggle_1',
+          'with_sub_features_cool_toggle_2',
+          'cool_all',
+        ],
+      },
+    });
   });
 
-  it('can render for a specific spaces entry', () => {
-    const role = buildRole();
-    const calculator = new KibanaPrivilegeCalculatorFactory(defaultPrivilegeDefinition).getInstance(
-      role
-    );
-    const wrapper = mountWithIntl(
-      <FeatureTable
-        role={role}
-        kibanaPrivileges={defaultPrivilegeDefinition}
-        calculatedPrivileges={calculator.calculateEffectivePrivileges()[0]}
-        allowedPrivileges={calculator.calculateAllowedPrivileges()[0]}
-        rankedFeaturePrivileges={{
-          feature1: ['all', 'read'],
-          feature2: ['all', 'read'],
-          feature3: ['all'],
-          feature4: ['all'],
-        }}
-        features={buildFeatures()}
-        onChange={jest.fn()}
-        onChangeAll={jest.fn()}
-        spacesIndex={-1}
-      />
-    );
-
-    expect(wrapper.find(EuiInMemoryTable)).toHaveLength(1);
+  it('renders with no privileges granted when minimal feature privileges are assigned, and sub-feature privileges are disallowed', () => {
+    const role = createRole([
+      {
+        spaces: ['foo'],
+        base: [],
+        feature: {
+          with_sub_features: ['minimal_all'],
+        },
+      },
+    ]);
+    const { displayedPrivileges } = setup({
+      role,
+      features: kibanaFeatures,
+      privilegeIndex: 0,
+      calculateDisplayedPrivileges: true,
+      canCustomizeSubFeaturePrivileges: false,
+    });
+
+    expect(displayedPrivileges).toEqual({
+      excluded_from_base: {
+        primaryFeaturePrivilege: 'none',
+      },
+      no_sub_features: {
+        primaryFeaturePrivilege: 'none',
+      },
+      with_excluded_sub_features: {
+        primaryFeaturePrivilege: 'none',
+      },
+      with_sub_features: {
+        primaryFeaturePrivilege: 'none',
+      },
+    });
+  });
+
+  it('renders with no privileges granted when sub feature privileges are assigned, and sub-feature privileges are disallowed', () => {
+    const role = createRole([
+      {
+        spaces: ['foo'],
+        base: [],
+        feature: {
+          with_sub_features: ['minimal_read', 'cool_all'],
+        },
+      },
+    ]);
+    const { displayedPrivileges } = setup({
+      role,
+      features: kibanaFeatures,
+      privilegeIndex: 0,
+      calculateDisplayedPrivileges: true,
+      canCustomizeSubFeaturePrivileges: false,
+    });
+
+    expect(displayedPrivileges).toEqual({
+      excluded_from_base: {
+        primaryFeaturePrivilege: 'none',
+      },
+      no_sub_features: {
+        primaryFeaturePrivilege: 'none',
+      },
+      with_excluded_sub_features: {
+        primaryFeaturePrivilege: 'none',
+      },
+      with_sub_features: {
+        primaryFeaturePrivilege: 'none',
+      },
+    });
   });
 });
diff --git a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/feature_table/feature_table.tsx b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/feature_table/feature_table.tsx
index 8283efe23260a..4610da95e9649 100644
--- a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/feature_table/feature_table.tsx
+++ b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/feature_table/feature_table.tsx
@@ -4,103 +4,112 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import _ from 'lodash';
-import React, { Component } from 'react';
 import {
   EuiButtonGroup,
-  EuiIcon,
   EuiIconTip,
   EuiInMemoryTable,
   EuiText,
-  IconType,
+  EuiButtonIcon,
+  EuiFlexGroup,
+  EuiFlexItem,
 } from '@elastic/eui';
-import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n/react';
-import { Feature } from '../../../../../../../../features/public';
-import { FeaturesPrivileges, KibanaPrivileges, Role } from '../../../../../../../common/model';
-import {
-  AllowedPrivilege,
-  CalculatedPrivilege,
-  PrivilegeExplanation,
-} from '../kibana_privilege_calculator';
-import { isGlobalPrivilegeDefinition } from '../../../privilege_utils';
-import { NO_PRIVILEGE_VALUE } from '../constants';
-import { PrivilegeDisplay } from '../space_aware_privilege_section/privilege_display';
+import { i18n } from '@kbn/i18n';
+import _ from 'lodash';
+import React, { Component } from 'react';
+import { Role } from '../../../../../../../common/model';
 import { ChangeAllPrivilegesControl } from './change_all_privileges';
+import { FeatureTableExpandedRow } from './feature_table_expanded_row';
+import { NO_PRIVILEGE_VALUE } from '../constants';
+import { PrivilegeFormCalculator } from '../privilege_form_calculator';
+import { FeatureTableCell } from '../feature_table_cell';
+import { KibanaPrivileges, SecuredFeature, KibanaPrivilege } from '../../../../model';
 
 interface Props {
   role: Role;
-  features: Feature[];
-  calculatedPrivileges: CalculatedPrivilege;
-  allowedPrivileges: AllowedPrivilege;
-  rankedFeaturePrivileges: FeaturesPrivileges;
+  privilegeCalculator: PrivilegeFormCalculator;
   kibanaPrivileges: KibanaPrivileges;
-  spacesIndex: number;
+  privilegeIndex: number;
   onChange: (featureId: string, privileges: string[]) => void;
   onChangeAll: (privileges: string[]) => void;
+  canCustomizeSubFeaturePrivileges: boolean;
   disabled?: boolean;
 }
 
-interface TableFeature extends Feature {
-  hasAnyPrivilegeAssigned: boolean;
+interface State {
+  expandedFeatures: string[];
 }
 
 interface TableRow {
-  feature: TableFeature;
+  featureId: string;
+  feature: SecuredFeature;
+  inherited: KibanaPrivilege[];
+  effective: KibanaPrivilege[];
   role: Role;
 }
 
-export class FeatureTable extends Component<Props, {}> {
+export class FeatureTable extends Component<Props, State> {
   public static defaultProps = {
-    spacesIndex: -1,
+    privilegeIndex: -1,
     showLocks: true,
   };
 
+  constructor(props: Props) {
+    super(props);
+    this.state = {
+      expandedFeatures: [],
+    };
+  }
+
   public render() {
-    const { role, features, calculatedPrivileges, rankedFeaturePrivileges } = this.props;
+    const { role, kibanaPrivileges } = this.props;
+
+    const featurePrivileges = kibanaPrivileges.getSecuredFeatures();
 
-    const items: TableRow[] = features
+    const items: TableRow[] = featurePrivileges
       .sort((feature1, feature2) => {
-        if (
-          Object.keys(feature1.privileges).length === 0 &&
-          Object.keys(feature2.privileges).length > 0
-        ) {
+        if (feature1.reserved && !feature2.reserved) {
           return 1;
         }
 
-        if (
-          Object.keys(feature2.privileges).length === 0 &&
-          Object.keys(feature1.privileges).length > 0
-        ) {
+        if (feature2.reserved && !feature1.reserved) {
           return -1;
         }
 
         return 0;
       })
       .map(feature => {
-        const calculatedFeaturePrivileges = calculatedPrivileges.feature[feature.id];
-        const hasAnyPrivilegeAssigned = Boolean(
-          calculatedFeaturePrivileges &&
-            calculatedFeaturePrivileges.actualPrivilege !== NO_PRIVILEGE_VALUE
-        );
         return {
-          feature: {
-            ...feature,
-            hasAnyPrivilegeAssigned,
-          },
+          featureId: feature.id,
+          feature,
+          inherited: [],
+          effective: [],
           role,
         };
       });
 
-    // TODO: This simply grabs the available privileges from the first feature we encounter.
-    // As of now, features can have 'all' and 'read' as available privileges. Once that assumption breaks,
-    // this will need updating. This is a simplifying measure to enable the new UI.
-    const availablePrivileges = Object.values(rankedFeaturePrivileges)[0];
-
     return (
       <EuiInMemoryTable
         responsive={false}
-        columns={this.getColumns(availablePrivileges)}
+        columns={this.getColumns()}
+        itemId={'featureId'}
+        itemIdToExpandedRowMap={this.state.expandedFeatures.reduce((acc, featureId) => {
+          return {
+            ...acc,
+            [featureId]: (
+              <FeatureTableExpandedRow
+                feature={featurePrivileges.find(f => f.id === featureId)!}
+                privilegeIndex={this.props.privilegeIndex}
+                onChange={this.props.onChange}
+                privilegeCalculator={this.props.privilegeCalculator}
+                selectedFeaturePrivileges={
+                  this.props.role.kibana[this.props.privilegeIndex].feature[featureId] ?? []
+                }
+                disabled={this.props.disabled}
+              />
+            ),
+          };
+        }, {})}
         items={items}
       />
     );
@@ -115,171 +124,157 @@ export class FeatureTable extends Component<Props, {}> {
     }
   };
 
-  private getColumns = (availablePrivileges: string[]) => [
-    {
-      field: 'feature',
-      name: i18n.translate(
-        'xpack.security.management.editRole.featureTable.enabledRoleFeaturesFeatureColumnTitle',
-        { defaultMessage: 'Feature' }
-      ),
-      render: (feature: TableFeature) => {
-        let tooltipElement = null;
-        if (feature.privilegesTooltip) {
-          const tooltipContent = (
-            <EuiText>
-              <p>{feature.privilegesTooltip}</p>
-            </EuiText>
-          );
-          tooltipElement = (
-            <EuiIconTip
-              iconProps={{
-                className: 'eui-alignTop',
-              }}
-              type={'iInCircle'}
-              color={'subdued'}
-              content={tooltipContent}
+  private getColumns = () => {
+    const basePrivileges = this.props.kibanaPrivileges.getBasePrivileges(
+      this.props.role.kibana[this.props.privilegeIndex]
+    );
+
+    const columns = [];
+
+    if (this.props.canCustomizeSubFeaturePrivileges) {
+      columns.push({
+        width: '30px',
+        isExpander: true,
+        field: 'featureId',
+        name: '',
+        render: (featureId: string, record: TableRow) => {
+          const { feature } = record;
+          const hasSubFeaturePrivileges = feature.getSubFeaturePrivileges().length > 0;
+          if (!hasSubFeaturePrivileges) {
+            return null;
+          }
+          return (
+            <EuiButtonIcon
+              onClick={() => this.toggleExpandedFeature(featureId)}
+              data-test-subj={`expandFeaturePrivilegeRow expandFeaturePrivilegeRow-${featureId}`}
+              aria-label={this.state.expandedFeatures.includes(featureId) ? 'Collapse' : 'Expand'}
+              iconType={this.state.expandedFeatures.includes(featureId) ? 'arrowUp' : 'arrowDown'}
             />
           );
-        }
+        },
+      });
+    }
 
-        return (
-          <span>
-            <EuiIcon size="m" type={feature.icon as IconType} className="secPrivilegeFeatureIcon" />
-            {feature.name} {tooltipElement}
-          </span>
-        );
+    columns.push(
+      {
+        field: 'feature',
+        width: '200px',
+        name: i18n.translate(
+          'xpack.security.management.editRole.featureTable.enabledRoleFeaturesFeatureColumnTitle',
+          {
+            defaultMessage: 'Feature',
+          }
+        ),
+        render: (feature: SecuredFeature) => {
+          return <FeatureTableCell feature={feature} />;
+        },
       },
-    },
-    {
-      field: 'privilege',
-      name: (
-        <span>
-          <FormattedMessage
-            id="xpack.security.management.editRole.featureTable.enabledRoleFeaturesEnabledColumnTitle"
-            defaultMessage="Privilege"
-          />
-          {!this.props.disabled && (
-            <ChangeAllPrivilegesControl
-              privileges={[...availablePrivileges, NO_PRIVILEGE_VALUE]}
-              onChange={this.onChangeAllFeaturePrivileges}
-            />
-          )}
-        </span>
-      ),
-      render: (roleEntry: Role, record: TableRow) => {
-        const { id: featureId, name: featureName, reserved, privileges } = record.feature;
-
-        if (reserved && Object.keys(privileges).length === 0) {
-          return <EuiText size={'s'}>{reserved.description}</EuiText>;
-        }
-
-        const featurePrivileges = this.props.kibanaPrivileges
-          .getFeaturePrivileges()
-          .getPrivileges(featureId);
-
-        if (featurePrivileges.length === 0) {
-          return null;
-        }
-
-        const enabledFeaturePrivileges = this.getEnabledFeaturePrivileges(
-          featurePrivileges,
-          featureId
-        );
-
-        const privilegeExplanation = this.getPrivilegeExplanation(featureId);
-
-        const allowsNone = this.allowsNoneForPrivilegeAssignment(featureId);
-
-        const actualPrivilegeValue = privilegeExplanation.actualPrivilege;
-
-        const canChangePrivilege =
-          !this.props.disabled && (allowsNone || enabledFeaturePrivileges.length > 1);
-
-        if (!canChangePrivilege) {
-          const assignedBasePrivilege =
-            this.props.role.kibana[this.props.spacesIndex].base.length > 0;
-
-          const excludedFromBasePrivilegsTooltip = (
+      {
+        field: 'privilege',
+        width: '200px',
+        name: (
+          <span>
             <FormattedMessage
-              id="xpack.security.management.editRole.featureTable.excludedFromBasePrivilegsTooltip"
-              defaultMessage='Use "Custom" privileges to grant access. {featureName} isn&apos;t part of the base privileges.'
-              values={{ featureName }}
+              id="xpack.security.management.editRole.featureTable.enabledRoleFeaturesEnabledColumnTitle"
+              defaultMessage="Privilege"
             />
+            {!this.props.disabled && (
+              <ChangeAllPrivilegesControl
+                privileges={basePrivileges}
+                onChange={this.onChangeAllFeaturePrivileges}
+              />
+            )}
+          </span>
+        ),
+        mobileOptions: {
+          // Table isn't responsive, so skip rendering this for mobile. <ChangeAllPrivilegesControl /> isn't free...
+          header: false,
+        },
+        render: (roleEntry: Role, record: TableRow) => {
+          const { feature } = record;
+
+          if (feature.reserved) {
+            return <EuiText size={'s'}>{feature.reserved.description}</EuiText>;
+          }
+
+          const primaryFeaturePrivileges = feature.getPrimaryFeaturePrivileges();
+
+          if (primaryFeaturePrivileges.length === 0) {
+            return null;
+          }
+
+          const selectedPrivilegeId = this.props.privilegeCalculator.getDisplayedPrimaryFeaturePrivilegeId(
+            feature.id,
+            this.props.privilegeIndex
           );
 
+          const options = primaryFeaturePrivileges.map(privilege => {
+            return {
+              id: `${feature.id}_${privilege.id}`,
+              label: privilege.name,
+              isDisabled: this.props.disabled,
+            };
+          });
+
+          options.push({
+            id: `${feature.id}_${NO_PRIVILEGE_VALUE}`,
+            label: 'None',
+            isDisabled: this.props.disabled,
+          });
+
+          let warningIcon = <EuiIconTip type="empty" content={null} />;
+          if (
+            this.props.privilegeCalculator.hasCustomizedSubFeaturePrivileges(
+              feature.id,
+              this.props.privilegeIndex
+            )
+          ) {
+            warningIcon = (
+              <EuiIconTip
+                type="iInCircle"
+                content={
+                  <FormattedMessage
+                    id="xpack.security.management.editRole.featureTable.privilegeCustomizationTooltip"
+                    defaultMessage="Feature has customized sub-feature privileges. Expand this row for more information."
+                  />
+                }
+              />
+            );
+          }
+
           return (
-            <PrivilegeDisplay
-              privilege={actualPrivilegeValue}
-              explanation={privilegeExplanation}
-              tooltipContent={
-                assignedBasePrivilege && actualPrivilegeValue === NO_PRIVILEGE_VALUE
-                  ? excludedFromBasePrivilegsTooltip
-                  : undefined
-              }
-            />
+            <EuiFlexGroup alignItems="center" gutterSize="xs">
+              <EuiFlexItem grow={false}>{warningIcon}</EuiFlexItem>
+              <EuiFlexItem>
+                <EuiButtonGroup
+                  name={`featurePrivilege_${feature.id}`}
+                  data-test-subj={`primaryFeaturePrivilegeControl`}
+                  buttonSize="compressed"
+                  color={'primary'}
+                  isFullWidth={true}
+                  options={options}
+                  idSelected={`${feature.id}_${selectedPrivilegeId ?? NO_PRIVILEGE_VALUE}`}
+                  onChange={this.onChange(feature.id)}
+                />
+              </EuiFlexItem>
+            </EuiFlexGroup>
           );
-        }
-
-        const options = availablePrivileges.map(priv => {
-          return {
-            id: `${featureId}_${priv}`,
-            label: _.capitalize(priv),
-            isDisabled: !enabledFeaturePrivileges.includes(priv),
-          };
-        });
-
-        options.push({
-          id: `${featureId}_${NO_PRIVILEGE_VALUE}`,
-          label: 'None',
-          isDisabled: !allowsNone,
-        });
-
-        return (
-          <EuiButtonGroup
-            name={`featurePrivilege_${featureId}`}
-            options={options}
-            idSelected={`${featureId}_${actualPrivilegeValue || NO_PRIVILEGE_VALUE}`}
-            onChange={this.onChange(featureId)}
-          />
-        );
-      },
-    },
-  ];
-
-  private getEnabledFeaturePrivileges = (featurePrivileges: string[], featureId: string) => {
-    const { allowedPrivileges } = this.props;
-
-    if (this.isConfiguringGlobalPrivileges()) {
-      // Global feature privileges are not limited by effective privileges.
-      return featurePrivileges;
-    }
-
-    const allowedFeaturePrivileges = allowedPrivileges.feature[featureId];
-    if (allowedFeaturePrivileges == null) {
-      throw new Error('Unable to get enabled feature privileges for a feature without privileges');
-    }
-
-    return allowedFeaturePrivileges.privileges;
-  };
-
-  private getPrivilegeExplanation = (featureId: string): PrivilegeExplanation => {
-    const { calculatedPrivileges } = this.props;
-    const calculatedFeaturePrivileges = calculatedPrivileges.feature[featureId];
-    if (calculatedFeaturePrivileges == null) {
-      throw new Error('Unable to get privilege explanation for a feature without privileges');
-    }
-
-    return calculatedFeaturePrivileges;
+        },
+      }
+    );
+    return columns;
   };
 
-  private allowsNoneForPrivilegeAssignment = (featureId: string): boolean => {
-    const { allowedPrivileges } = this.props;
-    const allowedFeaturePrivileges = allowedPrivileges.feature[featureId];
-    if (allowedFeaturePrivileges == null) {
-      throw new Error('Unable to determine if none is allowed for a feature without privileges');
+  private toggleExpandedFeature = (featureId: string) => {
+    if (this.state.expandedFeatures.includes(featureId)) {
+      this.setState({
+        expandedFeatures: this.state.expandedFeatures.filter(ef => ef !== featureId),
+      });
+    } else {
+      this.setState({
+        expandedFeatures: [...this.state.expandedFeatures, featureId],
+      });
     }
-
-    return allowedFeaturePrivileges.canUnassign;
   };
 
   private onChangeAllFeaturePrivileges = (privilege: string) => {
@@ -289,7 +284,4 @@ export class FeatureTable extends Component<Props, {}> {
       this.props.onChangeAll([privilege]);
     }
   };
-
-  private isConfiguringGlobalPrivileges = () =>
-    isGlobalPrivilegeDefinition(this.props.role.kibana[this.props.spacesIndex]);
 }
diff --git a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/feature_table/feature_table_expanded_row.test.tsx b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/feature_table/feature_table_expanded_row.test.tsx
new file mode 100644
index 0000000000000..8897d89a39926
--- /dev/null
+++ b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/feature_table/feature_table_expanded_row.test.tsx
@@ -0,0 +1,199 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * 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 { Role } from '../../../../../../../common/model';
+import { createKibanaPrivileges } from '../../../../__fixtures__/kibana_privileges';
+import { kibanaFeatures } from '../../../../__fixtures__/kibana_features';
+import { PrivilegeFormCalculator } from '../privilege_form_calculator';
+import { mountWithIntl } from 'test_utils/enzyme_helpers';
+import { FeatureTableExpandedRow } from './feature_table_expanded_row';
+import { findTestSubject } from 'test_utils/find_test_subject';
+import { act } from '@testing-library/react';
+
+const createRole = (kibana: Role['kibana'] = []): Role => {
+  return {
+    name: 'my_role',
+    elasticsearch: { cluster: [], run_as: [], indices: [] },
+    kibana,
+  };
+};
+
+describe('FeatureTableExpandedRow', () => {
+  it('indicates sub-feature privileges are being customized if a minimal feature privilege is set', () => {
+    const role = createRole([
+      {
+        base: [],
+        feature: {
+          with_sub_features: ['minimal_read'],
+        },
+        spaces: ['foo'],
+      },
+    ]);
+    const kibanaPrivileges = createKibanaPrivileges(kibanaFeatures);
+
+    const calculator = new PrivilegeFormCalculator(kibanaPrivileges, role);
+
+    const feature = kibanaPrivileges.getSecuredFeature('with_sub_features');
+
+    const wrapper = mountWithIntl(
+      <FeatureTableExpandedRow
+        feature={feature}
+        privilegeIndex={0}
+        privilegeCalculator={calculator}
+        selectedFeaturePrivileges={['minimal_read']}
+        onChange={jest.fn()}
+      />
+    );
+
+    expect(
+      wrapper.find('EuiSwitch[data-test-subj="customizeSubFeaturePrivileges"]').props()
+    ).toMatchObject({
+      disabled: false,
+      checked: true,
+    });
+  });
+
+  it('indicates sub-feature privileges are not being customized if a primary feature privilege is set', () => {
+    const role = createRole([
+      {
+        base: [],
+        feature: {
+          with_sub_features: ['read'],
+        },
+        spaces: ['foo'],
+      },
+    ]);
+    const kibanaPrivileges = createKibanaPrivileges(kibanaFeatures);
+
+    const calculator = new PrivilegeFormCalculator(kibanaPrivileges, role);
+
+    const feature = kibanaPrivileges.getSecuredFeature('with_sub_features');
+
+    const wrapper = mountWithIntl(
+      <FeatureTableExpandedRow
+        feature={feature}
+        privilegeIndex={0}
+        privilegeCalculator={calculator}
+        selectedFeaturePrivileges={['read']}
+        onChange={jest.fn()}
+      />
+    );
+
+    expect(
+      wrapper.find('EuiSwitch[data-test-subj="customizeSubFeaturePrivileges"]').props()
+    ).toMatchObject({
+      disabled: false,
+      checked: false,
+    });
+  });
+
+  it('does not allow customizing if a primary privilege is not set', () => {
+    const role = createRole([
+      {
+        base: [],
+        feature: {},
+        spaces: ['foo'],
+      },
+    ]);
+    const kibanaPrivileges = createKibanaPrivileges(kibanaFeatures);
+
+    const calculator = new PrivilegeFormCalculator(kibanaPrivileges, role);
+
+    const feature = kibanaPrivileges.getSecuredFeature('with_sub_features');
+
+    const wrapper = mountWithIntl(
+      <FeatureTableExpandedRow
+        feature={feature}
+        privilegeIndex={0}
+        privilegeCalculator={calculator}
+        selectedFeaturePrivileges={['read']}
+        onChange={jest.fn()}
+      />
+    );
+
+    expect(
+      wrapper.find('EuiSwitch[data-test-subj="customizeSubFeaturePrivileges"]').props()
+    ).toMatchObject({
+      disabled: true,
+      checked: false,
+    });
+  });
+
+  it('switches to the minimal privilege when customizing privileges, including corresponding sub-feature privileges', () => {
+    const role = createRole([
+      {
+        base: [],
+        feature: {
+          with_sub_features: ['read'],
+        },
+        spaces: ['foo'],
+      },
+    ]);
+    const kibanaPrivileges = createKibanaPrivileges(kibanaFeatures);
+
+    const calculator = new PrivilegeFormCalculator(kibanaPrivileges, role);
+
+    const feature = kibanaPrivileges.getSecuredFeature('with_sub_features');
+
+    const onChange = jest.fn();
+
+    const wrapper = mountWithIntl(
+      <FeatureTableExpandedRow
+        feature={feature}
+        privilegeIndex={0}
+        privilegeCalculator={calculator}
+        selectedFeaturePrivileges={['read']}
+        onChange={onChange}
+      />
+    );
+
+    act(() => {
+      findTestSubject(wrapper, 'customizeSubFeaturePrivileges').simulate('click');
+    });
+
+    expect(onChange).toHaveBeenCalledWith('with_sub_features', [
+      'minimal_read',
+      'cool_read',
+      'cool_toggle_2',
+    ]);
+  });
+
+  it('switches to the primary privilege when not customizing privileges, removing any other privileges', () => {
+    const role = createRole([
+      {
+        base: [],
+        feature: {
+          with_sub_features: ['minimal_read', 'cool_read', 'cool_toggle_2'],
+        },
+        spaces: ['foo'],
+      },
+    ]);
+    const kibanaPrivileges = createKibanaPrivileges(kibanaFeatures);
+
+    const calculator = new PrivilegeFormCalculator(kibanaPrivileges, role);
+
+    const feature = kibanaPrivileges.getSecuredFeature('with_sub_features');
+
+    const onChange = jest.fn();
+
+    const wrapper = mountWithIntl(
+      <FeatureTableExpandedRow
+        feature={feature}
+        privilegeIndex={0}
+        privilegeCalculator={calculator}
+        selectedFeaturePrivileges={['minimal_read', 'cool_read', 'cool_toggle_2']}
+        onChange={onChange}
+      />
+    );
+
+    act(() => {
+      findTestSubject(wrapper, 'customizeSubFeaturePrivileges').simulate('click');
+    });
+
+    expect(onChange).toHaveBeenCalledWith('with_sub_features', ['read']);
+  });
+});
diff --git a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/feature_table/feature_table_expanded_row.tsx b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/feature_table/feature_table_expanded_row.tsx
new file mode 100644
index 0000000000000..fb302c2269485
--- /dev/null
+++ b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/feature_table/feature_table_expanded_row.tsx
@@ -0,0 +1,95 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * 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, { useState, useEffect } from 'react';
+import { FormattedMessage } from '@kbn/i18n/react';
+import { EuiFlexItem, EuiFlexGroup, EuiSwitch, EuiSwitchEvent } from '@elastic/eui';
+import { SubFeatureForm } from './sub_feature_form';
+import { PrivilegeFormCalculator } from '../privilege_form_calculator';
+import { SecuredFeature } from '../../../../model';
+
+interface Props {
+  feature: SecuredFeature;
+  privilegeCalculator: PrivilegeFormCalculator;
+  privilegeIndex: number;
+  selectedFeaturePrivileges: string[];
+  disabled?: boolean;
+  onChange: (featureId: string, featurePrivileges: string[]) => void;
+}
+
+export const FeatureTableExpandedRow = ({
+  feature,
+  onChange,
+  privilegeIndex,
+  privilegeCalculator,
+  selectedFeaturePrivileges,
+  disabled,
+}: Props) => {
+  const [isCustomizing, setIsCustomizing] = useState(() => {
+    return feature
+      .getMinimalFeaturePrivileges()
+      .some(p => selectedFeaturePrivileges.includes(p.id));
+  });
+
+  useEffect(() => {
+    const hasMinimalFeaturePrivilegeSelected = feature
+      .getMinimalFeaturePrivileges()
+      .some(p => selectedFeaturePrivileges.includes(p.id));
+
+    if (!hasMinimalFeaturePrivilegeSelected && isCustomizing) {
+      setIsCustomizing(false);
+    }
+  }, [feature, isCustomizing, selectedFeaturePrivileges]);
+
+  const onCustomizeSubFeatureChange = (e: EuiSwitchEvent) => {
+    onChange(
+      feature.id,
+      privilegeCalculator.updateSelectedFeaturePrivilegesForCustomization(
+        feature.id,
+        privilegeIndex,
+        e.target.checked
+      )
+    );
+    setIsCustomizing(e.target.checked);
+  };
+
+  return (
+    <EuiFlexGroup direction="column">
+      <EuiFlexItem>
+        <EuiSwitch
+          label={
+            <FormattedMessage
+              id="xpack.security.management.editRole.featureTable.customizeSubFeaturePrivilegesSwitchLabel"
+              defaultMessage="Customize sub-feature privileges"
+            />
+          }
+          checked={isCustomizing}
+          onChange={onCustomizeSubFeatureChange}
+          data-test-subj="customizeSubFeaturePrivileges"
+          disabled={
+            disabled ||
+            !privilegeCalculator.canCustomizeSubFeaturePrivileges(feature.id, privilegeIndex)
+          }
+        />
+      </EuiFlexItem>
+      {feature.getSubFeatures().map(subFeature => {
+        return (
+          <EuiFlexItem key={subFeature.name}>
+            <SubFeatureForm
+              privilegeCalculator={privilegeCalculator}
+              privilegeIndex={privilegeIndex}
+              featureId={feature.id}
+              subFeature={subFeature}
+              onChange={updatedPrivileges => onChange(feature.id, updatedPrivileges)}
+              selectedFeaturePrivileges={selectedFeaturePrivileges}
+              disabled={disabled || !isCustomizing}
+            />
+          </EuiFlexItem>
+        );
+      })}
+    </EuiFlexGroup>
+  );
+};
diff --git a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/feature_table/sub_feature_form.test.tsx b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/feature_table/sub_feature_form.test.tsx
new file mode 100644
index 0000000000000..ba7eff601f4c1
--- /dev/null
+++ b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/feature_table/sub_feature_form.test.tsx
@@ -0,0 +1,237 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * 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 { kibanaFeatures } from '../../../../__fixtures__/kibana_features';
+import { createKibanaPrivileges } from '../../../../__fixtures__/kibana_privileges';
+import { SecuredSubFeature } from '../../../../model';
+import { PrivilegeFormCalculator } from '../privilege_form_calculator';
+import { Role } from '../../../../../../../common/model';
+import { mountWithIntl } from 'test_utils/enzyme_helpers';
+import { SubFeatureForm } from './sub_feature_form';
+import { EuiCheckbox, EuiButtonGroup } from '@elastic/eui';
+import { act } from '@testing-library/react';
+
+// Note: these tests are not concerned with the proper display of privileges,
+// as that is verified by the feature_table and privilege_space_form tests.
+
+const createRole = (kibana: Role['kibana'] = []): Role => {
+  return {
+    name: 'my_role',
+    elasticsearch: { cluster: [], run_as: [], indices: [] },
+    kibana,
+  };
+};
+
+const featureId = 'with_sub_features';
+const subFeature = kibanaFeatures.find(kf => kf.id === featureId)!.subFeatures[0];
+const securedSubFeature = new SecuredSubFeature(subFeature.toRaw());
+
+describe('SubFeatureForm', () => {
+  it('renders disabled elements when requested', () => {
+    const role = createRole([
+      {
+        base: [],
+        feature: {},
+        spaces: [],
+      },
+    ]);
+    const kibanaPrivileges = createKibanaPrivileges(kibanaFeatures);
+    const calculator = new PrivilegeFormCalculator(kibanaPrivileges, role);
+
+    const wrapper = mountWithIntl(
+      <SubFeatureForm
+        featureId={featureId}
+        subFeature={securedSubFeature}
+        selectedFeaturePrivileges={[]}
+        privilegeCalculator={calculator}
+        privilegeIndex={0}
+        onChange={jest.fn()}
+        disabled={true}
+      />
+    );
+
+    const checkboxes = wrapper.find(EuiCheckbox);
+    const buttonGroups = wrapper.find(EuiButtonGroup);
+
+    expect(checkboxes.everyWhere(checkbox => checkbox.props().disabled === true)).toBe(true);
+    expect(buttonGroups.everyWhere(checkbox => checkbox.props().isDisabled === true)).toBe(true);
+  });
+
+  it('fires onChange when an independent privilege is selected', () => {
+    const role = createRole([
+      {
+        base: [],
+        feature: {},
+        spaces: [],
+      },
+    ]);
+    const kibanaPrivileges = createKibanaPrivileges(kibanaFeatures);
+    const calculator = new PrivilegeFormCalculator(kibanaPrivileges, role);
+
+    const onChange = jest.fn();
+
+    const wrapper = mountWithIntl(
+      <SubFeatureForm
+        featureId={featureId}
+        subFeature={securedSubFeature}
+        selectedFeaturePrivileges={[]}
+        privilegeCalculator={calculator}
+        privilegeIndex={0}
+        onChange={onChange}
+        disabled={false}
+      />
+    );
+
+    const checkbox = wrapper.find('EuiCheckbox[id="with_sub_features_cool_toggle_1"] input');
+
+    act(() => {
+      checkbox.simulate('change', { target: { checked: true } });
+    });
+
+    expect(onChange).toHaveBeenCalledWith(['cool_toggle_1']);
+  });
+
+  it('fires onChange when an independent privilege is deselected', () => {
+    const role = createRole([
+      {
+        base: [],
+        feature: {
+          with_sub_features: ['cool_toggle_1', 'cool_toggle_2'],
+        },
+        spaces: [],
+      },
+    ]);
+    const kibanaPrivileges = createKibanaPrivileges(kibanaFeatures);
+    const calculator = new PrivilegeFormCalculator(kibanaPrivileges, role);
+
+    const onChange = jest.fn();
+
+    const wrapper = mountWithIntl(
+      <SubFeatureForm
+        featureId={featureId}
+        subFeature={securedSubFeature}
+        selectedFeaturePrivileges={['cool_toggle_1', 'cool_toggle_2']}
+        privilegeCalculator={calculator}
+        privilegeIndex={0}
+        onChange={onChange}
+        disabled={false}
+      />
+    );
+
+    const checkbox = wrapper.find('EuiCheckbox[id="with_sub_features_cool_toggle_1"] input');
+
+    act(() => {
+      checkbox.simulate('change', { target: { checked: false } });
+    });
+
+    expect(onChange).toHaveBeenCalledWith(['cool_toggle_2']);
+  });
+
+  it('fires onChange when a mutually exclusive privilege is selected', () => {
+    const role = createRole([
+      {
+        base: [],
+        feature: {},
+        spaces: [],
+      },
+    ]);
+    const kibanaPrivileges = createKibanaPrivileges(kibanaFeatures);
+    const calculator = new PrivilegeFormCalculator(kibanaPrivileges, role);
+
+    const onChange = jest.fn();
+
+    const wrapper = mountWithIntl(
+      <SubFeatureForm
+        featureId={featureId}
+        subFeature={securedSubFeature}
+        selectedFeaturePrivileges={[]}
+        privilegeCalculator={calculator}
+        privilegeIndex={0}
+        onChange={onChange}
+        disabled={false}
+      />
+    );
+
+    const button = wrapper.find(EuiButtonGroup);
+
+    act(() => {
+      button.props().onChange('cool_all');
+    });
+
+    expect(onChange).toHaveBeenCalledWith(['cool_all']);
+  });
+
+  it('fires onChange when switching between mutually exclusive options', () => {
+    const role = createRole([
+      {
+        base: [],
+        feature: {},
+        spaces: [],
+      },
+    ]);
+    const kibanaPrivileges = createKibanaPrivileges(kibanaFeatures);
+    const calculator = new PrivilegeFormCalculator(kibanaPrivileges, role);
+
+    const onChange = jest.fn();
+
+    const wrapper = mountWithIntl(
+      <SubFeatureForm
+        featureId={featureId}
+        subFeature={securedSubFeature}
+        selectedFeaturePrivileges={['cool_all', 'cool_toggle_1']}
+        privilegeCalculator={calculator}
+        privilegeIndex={0}
+        onChange={onChange}
+        disabled={false}
+      />
+    );
+
+    const button = wrapper.find(EuiButtonGroup);
+
+    act(() => {
+      button.props().onChange('cool_read');
+    });
+
+    expect(onChange).toHaveBeenCalledWith(['cool_toggle_1', 'cool_read']);
+  });
+
+  it('fires onChange when a mutually exclusive privilege is deselected', () => {
+    const role = createRole([
+      {
+        base: [],
+        feature: {
+          with_sub_features: ['cool_all'],
+        },
+        spaces: [],
+      },
+    ]);
+    const kibanaPrivileges = createKibanaPrivileges(kibanaFeatures);
+    const calculator = new PrivilegeFormCalculator(kibanaPrivileges, role);
+
+    const onChange = jest.fn();
+
+    const wrapper = mountWithIntl(
+      <SubFeatureForm
+        featureId={featureId}
+        subFeature={securedSubFeature}
+        selectedFeaturePrivileges={['cool_all']}
+        privilegeCalculator={calculator}
+        privilegeIndex={0}
+        onChange={onChange}
+        disabled={false}
+      />
+    );
+
+    const button = wrapper.find(EuiButtonGroup);
+
+    act(() => {
+      button.props().onChange('none');
+    });
+
+    expect(onChange).toHaveBeenCalledWith([]);
+  });
+});
diff --git a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/feature_table/sub_feature_form.tsx b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/feature_table/sub_feature_form.tsx
new file mode 100644
index 0000000000000..d4b6721ddad05
--- /dev/null
+++ b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/feature_table/sub_feature_form.tsx
@@ -0,0 +1,134 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * 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 { EuiFlexGroup, EuiFlexItem, EuiText, EuiCheckbox, EuiButtonGroup } from '@elastic/eui';
+
+import { NO_PRIVILEGE_VALUE } from '../constants';
+import { PrivilegeFormCalculator } from '../privilege_form_calculator';
+import {
+  SecuredSubFeature,
+  SubFeaturePrivilegeGroup,
+  SubFeaturePrivilege,
+} from '../../../../model';
+
+interface Props {
+  featureId: string;
+  subFeature: SecuredSubFeature;
+  selectedFeaturePrivileges: string[];
+  privilegeCalculator: PrivilegeFormCalculator;
+  privilegeIndex: number;
+  onChange: (selectedPrivileges: string[]) => void;
+  disabled?: boolean;
+}
+
+export const SubFeatureForm = (props: Props) => {
+  return (
+    <EuiFlexGroup>
+      <EuiFlexItem>
+        <EuiText size="s">{props.subFeature.name}</EuiText>
+      </EuiFlexItem>
+      <EuiFlexItem>{props.subFeature.getPrivilegeGroups().map(renderPrivilegeGroup)}</EuiFlexItem>
+    </EuiFlexGroup>
+  );
+
+  function renderPrivilegeGroup(privilegeGroup: SubFeaturePrivilegeGroup, index: number) {
+    switch (privilegeGroup.groupType) {
+      case 'independent':
+        return renderIndependentPrivilegeGroup(privilegeGroup, index);
+      case 'mutually_exclusive':
+        return renderMutuallyExclusivePrivilegeGroup(privilegeGroup, index);
+      default:
+        throw new Error(`Unsupported privilege group type: ${privilegeGroup.groupType}`);
+    }
+  }
+
+  function renderIndependentPrivilegeGroup(
+    privilegeGroup: SubFeaturePrivilegeGroup,
+    index: number
+  ) {
+    return (
+      <div key={index}>
+        {privilegeGroup.privileges.map((privilege: SubFeaturePrivilege) => {
+          const isGranted = props.privilegeCalculator.isIndependentSubFeaturePrivilegeGranted(
+            props.featureId,
+            privilege.id,
+            props.privilegeIndex
+          );
+          return (
+            <EuiCheckbox
+              key={privilege.id}
+              id={`${props.featureId}_${privilege.id}`}
+              label={privilege.name}
+              data-test-subj="independentSubFeaturePrivilegeControl"
+              onChange={e => {
+                const { checked } = e.target;
+                if (checked) {
+                  props.onChange([...props.selectedFeaturePrivileges, privilege.id]);
+                } else {
+                  props.onChange(props.selectedFeaturePrivileges.filter(sp => sp !== privilege.id));
+                }
+              }}
+              checked={isGranted}
+              disabled={props.disabled}
+              compressed={true}
+            />
+          );
+        })}
+      </div>
+    );
+  }
+
+  function renderMutuallyExclusivePrivilegeGroup(
+    privilegeGroup: SubFeaturePrivilegeGroup,
+    index: number
+  ) {
+    const firstSelectedPrivilege = props.privilegeCalculator.getSelectedMutuallyExclusiveSubFeaturePrivilege(
+      props.featureId,
+      privilegeGroup,
+      props.privilegeIndex
+    );
+
+    const options = [
+      ...privilegeGroup.privileges.map((privilege, privilegeIndex) => {
+        return {
+          id: privilege.id,
+          label: privilege.name,
+          isDisabled: props.disabled,
+        };
+      }),
+    ];
+
+    options.push({
+      id: NO_PRIVILEGE_VALUE,
+      label: 'None',
+      isDisabled: props.disabled,
+    });
+
+    return (
+      <EuiButtonGroup
+        key={index}
+        buttonSize="compressed"
+        data-test-subj="mutexSubFeaturePrivilegeControl"
+        options={options}
+        idSelected={firstSelectedPrivilege?.id ?? NO_PRIVILEGE_VALUE}
+        isDisabled={props.disabled}
+        onChange={selectedPrivilegeId => {
+          // Deselect all privileges which belong to this mutually-exclusive group
+          const privilegesWithoutGroupEntries = props.selectedFeaturePrivileges.filter(
+            sp => !privilegeGroup.privileges.some(privilege => privilege.id === sp)
+          );
+          // fire on-change with the newly selected privilege
+          if (selectedPrivilegeId === NO_PRIVILEGE_VALUE) {
+            props.onChange(privilegesWithoutGroupEntries);
+          } else {
+            props.onChange([...privilegesWithoutGroupEntries, selectedPrivilegeId]);
+          }
+        }}
+      />
+    );
+  }
+};
diff --git a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/feature_table_cell/feature_table_cell.test.tsx b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/feature_table_cell/feature_table_cell.test.tsx
new file mode 100644
index 0000000000000..316818e4deed3
--- /dev/null
+++ b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/feature_table_cell/feature_table_cell.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 { createFeature } from '../../../../__fixtures__/kibana_features';
+import { mountWithIntl } from 'test_utils/enzyme_helpers';
+import { FeatureTableCell } from '.';
+import { SecuredFeature } from '../../../../model';
+import { EuiIcon, EuiIconTip } from '@elastic/eui';
+
+describe('FeatureTableCell', () => {
+  it('renders an icon and feature name', () => {
+    const feature = createFeature({
+      id: 'test-feature',
+      name: 'Test Feature',
+    });
+
+    const wrapper = mountWithIntl(
+      <FeatureTableCell feature={new SecuredFeature(feature.toRaw())} />
+    );
+
+    expect(wrapper.text()).toMatchInlineSnapshot(`"Test Feature "`);
+    expect(wrapper.find(EuiIcon).props()).toMatchObject({
+      type: feature.icon,
+    });
+    expect(wrapper.find(EuiIconTip)).toHaveLength(0);
+  });
+
+  it('renders an icon and feature name with tooltip when configured', () => {
+    const feature = createFeature({
+      id: 'test-feature',
+      name: 'Test Feature',
+      privilegesTooltip: 'This is my awesome tooltip content',
+    });
+
+    const wrapper = mountWithIntl(
+      <FeatureTableCell feature={new SecuredFeature(feature.toRaw())} />
+    );
+
+    expect(wrapper.text()).toMatchInlineSnapshot(`"Test Feature "`);
+    expect(
+      wrapper
+        .find(EuiIcon)
+        .first()
+        .props()
+    ).toMatchObject({
+      type: feature.icon,
+    });
+    expect(wrapper.find(EuiIconTip).props().content).toMatchInlineSnapshot(`
+      <EuiText>
+        <p>
+          This is my awesome tooltip content
+        </p>
+      </EuiText>
+    `);
+  });
+});
diff --git a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/feature_table_cell/feature_table_cell.tsx b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/feature_table_cell/feature_table_cell.tsx
new file mode 100644
index 0000000000000..9e4a3a8a99b56
--- /dev/null
+++ b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/feature_table_cell/feature_table_cell.tsx
@@ -0,0 +1,41 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React from 'react';
+import { EuiText, EuiIconTip, EuiIcon, IconType } from '@elastic/eui';
+import { SecuredFeature } from '../../../../model';
+
+interface Props {
+  feature: SecuredFeature;
+}
+
+export const FeatureTableCell = ({ feature }: Props) => {
+  let tooltipElement = null;
+  if (feature.getPrivilegesTooltip()) {
+    const tooltipContent = (
+      <EuiText>
+        <p>{feature.getPrivilegesTooltip()}</p>
+      </EuiText>
+    );
+    tooltipElement = (
+      <EuiIconTip
+        iconProps={{
+          className: 'eui-alignTop',
+        }}
+        type={'iInCircle'}
+        color={'subdued'}
+        content={tooltipContent}
+      />
+    );
+  }
+
+  return (
+    <span>
+      <EuiIcon size="m" type={feature.icon as IconType} className="secPrivilegeFeatureIcon" />
+      {feature.name} {tooltipElement}
+    </span>
+  );
+};
diff --git a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/space_aware_privilege_section/__fixtures__/index.ts b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/feature_table_cell/index.ts
similarity index 79%
rename from x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/space_aware_privilege_section/__fixtures__/index.ts
rename to x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/feature_table_cell/index.ts
index 09e449f61356f..8f084fcc37c50 100644
--- a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/space_aware_privilege_section/__fixtures__/index.ts
+++ b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/feature_table_cell/index.ts
@@ -4,4 +4,4 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-export { rawKibanaPrivileges } from './raw_kibana_privileges';
+export { FeatureTableCell } from './feature_table_cell';
diff --git a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/kibana_privilege_calculator/__fixtures__/build_role.ts b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/kibana_privilege_calculator/__fixtures__/build_role.ts
deleted file mode 100644
index 70e48dcdc37f8..0000000000000
--- a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/kibana_privilege_calculator/__fixtures__/build_role.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-import { FeaturesPrivileges, Role } from '../../../../../../../../common/model';
-
-export interface BuildRoleOpts {
-  spacesPrivileges?: Array<{
-    spaces: string[];
-    base: string[];
-    feature: FeaturesPrivileges;
-  }>;
-}
-
-export const buildRole = (options: BuildRoleOpts = {}) => {
-  const role: Role = {
-    name: 'unit test role',
-    elasticsearch: {
-      indices: [],
-      cluster: [],
-      run_as: [],
-    },
-    kibana: [],
-  };
-
-  if (options.spacesPrivileges) {
-    role.kibana.push(...options.spacesPrivileges);
-  } else {
-    role.kibana.push({
-      spaces: [],
-      base: [],
-      feature: {},
-    });
-  }
-
-  return role;
-};
diff --git a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/kibana_privilege_calculator/__fixtures__/common_allowed_privileges.ts b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/kibana_privilege_calculator/__fixtures__/common_allowed_privileges.ts
deleted file mode 100644
index ddab7eff6835e..0000000000000
--- a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/kibana_privilege_calculator/__fixtures__/common_allowed_privileges.ts
+++ /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.
- */
-
-export const unrestrictedBasePrivileges = {
-  base: {
-    privileges: ['all', 'read'],
-    canUnassign: true,
-  },
-};
-export const unrestrictedFeaturePrivileges = {
-  feature: {
-    feature1: {
-      privileges: ['all', 'read'],
-      canUnassign: true,
-    },
-    feature2: {
-      privileges: ['all', 'read'],
-      canUnassign: true,
-    },
-    feature3: {
-      privileges: ['all'],
-      canUnassign: true,
-    },
-    feature4: {
-      privileges: ['all', 'read'],
-      canUnassign: true,
-    },
-  },
-};
-
-export const fullyRestrictedBasePrivileges = {
-  base: {
-    privileges: ['all'],
-    canUnassign: false,
-  },
-};
-
-export const fullyRestrictedFeaturePrivileges = {
-  feature: {
-    feature1: {
-      privileges: ['all'],
-      canUnassign: false,
-    },
-    feature2: {
-      privileges: ['all'],
-      canUnassign: false,
-    },
-    feature3: {
-      privileges: ['all'],
-      canUnassign: false,
-    },
-    feature4: {
-      privileges: ['all', 'read'],
-      canUnassign: false,
-    },
-  },
-};
diff --git a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/kibana_privilege_calculator/__fixtures__/default_privilege_definition.ts b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/kibana_privilege_calculator/__fixtures__/default_privilege_definition.ts
deleted file mode 100644
index 0c794b68f95da..0000000000000
--- a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/kibana_privilege_calculator/__fixtures__/default_privilege_definition.ts
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-import { KibanaPrivileges } from '../../../../../../../../common/model';
-
-export const defaultPrivilegeDefinition = new KibanaPrivileges({
-  global: {
-    all: ['api:/*', 'ui:/*'],
-    read: ['ui:/feature1/foo', 'ui:/feature2/foo', 'ui:/feature3/foo/*', 'ui:/feature4/foo'],
-  },
-  space: {
-    all: [
-      'api:/feature1/*',
-      'ui:/feature1/*',
-      'api:/feature2/*',
-      'ui:/feature2/*',
-      'ui:/feature3/foo',
-      'ui:/feature3/foo/*',
-      'ui:/feature4/foo',
-    ],
-    read: ['ui:/feature1/foo', 'ui:/feature2/foo', 'ui:/feature3/foo/bar', 'ui:/feature4/foo'],
-  },
-  features: {
-    feature1: {
-      all: ['ui:/feature1/foo', 'ui:/feature1/bar'],
-      read: ['ui:/feature1/foo'],
-    },
-    feature2: {
-      all: ['ui:/feature2/foo', 'api:/feature2/bar'],
-      read: ['ui:/feature2/foo'],
-    },
-    feature3: {
-      all: ['ui:/feature3/foo', 'ui:/feature3/foo/*'],
-    },
-    feature4: {
-      all: ['somethingObscure:/feature4/foo', 'ui:/feature4/foo'],
-      read: ['ui:/feature4/foo'],
-    },
-  },
-  reserved: {},
-});
diff --git a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/kibana_privilege_calculator/kibana_allowed_privileges_calculator.test.ts b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/kibana_privilege_calculator/kibana_allowed_privileges_calculator.test.ts
deleted file mode 100644
index 2a1c42838a83d..0000000000000
--- a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/kibana_privilege_calculator/kibana_allowed_privileges_calculator.test.ts
+++ /dev/null
@@ -1,313 +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 { KibanaPrivileges, Role } from '../../../../../../../common/model';
-import {
-  buildRole,
-  defaultPrivilegeDefinition,
-  fullyRestrictedBasePrivileges,
-  fullyRestrictedFeaturePrivileges,
-  unrestrictedBasePrivileges,
-  unrestrictedFeaturePrivileges,
-} from './__fixtures__';
-import { KibanaAllowedPrivilegesCalculator } from './kibana_allowed_privileges_calculator';
-import { KibanaPrivilegeCalculatorFactory } from './kibana_privileges_calculator_factory';
-
-const buildAllowedPrivilegesCalculator = (
-  role: Role,
-  kibanaPrivilege: KibanaPrivileges = defaultPrivilegeDefinition
-) => {
-  return new KibanaAllowedPrivilegesCalculator(kibanaPrivilege, role);
-};
-
-const buildEffectivePrivilegesCalculator = (
-  role: Role,
-  kibanaPrivileges: KibanaPrivileges = defaultPrivilegeDefinition
-) => {
-  const factory = new KibanaPrivilegeCalculatorFactory(kibanaPrivileges);
-  return factory.getInstance(role);
-};
-
-describe('AllowedPrivileges', () => {
-  it('allows all privileges when none are currently assigned', () => {
-    const role = buildRole({
-      spacesPrivileges: [
-        {
-          spaces: ['*'],
-          base: [],
-          feature: {},
-        },
-        {
-          spaces: ['foo'],
-          base: [],
-          feature: {},
-        },
-      ],
-    });
-    const effectivePrivileges = buildEffectivePrivilegesCalculator(role);
-    const allowedPrivilegesCalculator = buildAllowedPrivilegesCalculator(role);
-
-    const result = allowedPrivilegesCalculator.calculateAllowedPrivileges(
-      effectivePrivileges.calculateEffectivePrivileges(true)
-    );
-
-    expect(result).toEqual([
-      {
-        ...unrestrictedBasePrivileges,
-        ...unrestrictedFeaturePrivileges,
-      },
-      {
-        ...unrestrictedBasePrivileges,
-        ...unrestrictedFeaturePrivileges,
-      },
-    ]);
-  });
-
-  it('allows all global base privileges, but just "all" for everything else when global is set to "all"', () => {
-    const role = buildRole({
-      spacesPrivileges: [
-        {
-          spaces: ['*'],
-          base: ['all'],
-          feature: {},
-        },
-        {
-          spaces: ['foo'],
-          base: [],
-          feature: {},
-        },
-      ],
-    });
-    const effectivePrivileges = buildEffectivePrivilegesCalculator(role);
-    const allowedPrivilegesCalculator = buildAllowedPrivilegesCalculator(role);
-
-    const result = allowedPrivilegesCalculator.calculateAllowedPrivileges(
-      effectivePrivileges.calculateEffectivePrivileges(true)
-    );
-
-    expect(result).toEqual([
-      {
-        ...unrestrictedBasePrivileges,
-        ...fullyRestrictedFeaturePrivileges,
-      },
-      {
-        ...fullyRestrictedBasePrivileges,
-        ...fullyRestrictedFeaturePrivileges,
-      },
-    ]);
-  });
-
-  it(`allows feature privileges to be set to "all" or "read" when global base is "read"`, () => {
-    const role = buildRole({
-      spacesPrivileges: [
-        {
-          spaces: ['*'],
-          base: ['read'],
-          feature: {},
-        },
-        {
-          spaces: ['foo'],
-          base: [],
-          feature: {},
-        },
-      ],
-    });
-    const effectivePrivileges = buildEffectivePrivilegesCalculator(role);
-    const allowedPrivilegesCalculator = buildAllowedPrivilegesCalculator(role);
-
-    const result = allowedPrivilegesCalculator.calculateAllowedPrivileges(
-      effectivePrivileges.calculateEffectivePrivileges(true)
-    );
-
-    const expectedFeaturePrivileges = {
-      feature: {
-        feature1: {
-          privileges: ['all', 'read'],
-          canUnassign: false,
-        },
-        feature2: {
-          privileges: ['all', 'read'],
-          canUnassign: false,
-        },
-        feature3: {
-          privileges: ['all'],
-          canUnassign: true, // feature 3 has no "read" privilege governed by global "all"
-        },
-        feature4: {
-          privileges: ['all', 'read'],
-          canUnassign: false,
-        },
-      },
-    };
-
-    expect(result).toEqual([
-      {
-        ...unrestrictedBasePrivileges,
-        ...expectedFeaturePrivileges,
-      },
-      {
-        base: {
-          privileges: ['all', 'read'],
-          canUnassign: false,
-        },
-        ...expectedFeaturePrivileges,
-      },
-    ]);
-  });
-
-  it(`allows feature privileges to be set to "all" or "read" when space base is "read"`, () => {
-    const role = buildRole({
-      spacesPrivileges: [
-        {
-          spaces: ['*'],
-          base: [],
-          feature: {},
-        },
-        {
-          spaces: ['foo'],
-          base: ['read'],
-          feature: {},
-        },
-      ],
-    });
-    const effectivePrivileges = buildEffectivePrivilegesCalculator(role);
-    const allowedPrivilegesCalculator = buildAllowedPrivilegesCalculator(role);
-
-    const result = allowedPrivilegesCalculator.calculateAllowedPrivileges(
-      effectivePrivileges.calculateEffectivePrivileges(true)
-    );
-
-    expect(result).toEqual([
-      {
-        ...unrestrictedBasePrivileges,
-        ...unrestrictedFeaturePrivileges,
-      },
-      {
-        base: {
-          privileges: ['all', 'read'],
-          canUnassign: true,
-        },
-        feature: {
-          feature1: {
-            privileges: ['all', 'read'],
-            canUnassign: false,
-          },
-          feature2: {
-            privileges: ['all', 'read'],
-            canUnassign: false,
-          },
-          feature3: {
-            privileges: ['all'],
-            canUnassign: true, // feature 3 has no "read" privilege governed by space "all"
-          },
-          feature4: {
-            privileges: ['all', 'read'],
-            canUnassign: false,
-          },
-        },
-      },
-    ]);
-  });
-
-  it(`allows space base privilege to be set to "all" or "read" when space base is already "all"`, () => {
-    const role = buildRole({
-      spacesPrivileges: [
-        {
-          spaces: ['foo'],
-          base: ['all'],
-          feature: {},
-        },
-      ],
-    });
-    const effectivePrivileges = buildEffectivePrivilegesCalculator(role);
-    const allowedPrivilegesCalculator = buildAllowedPrivilegesCalculator(role);
-
-    const result = allowedPrivilegesCalculator.calculateAllowedPrivileges(
-      effectivePrivileges.calculateEffectivePrivileges(true)
-    );
-
-    expect(result).toEqual([
-      {
-        ...unrestrictedBasePrivileges,
-        feature: {
-          feature1: {
-            privileges: ['all'],
-            canUnassign: false,
-          },
-          feature2: {
-            privileges: ['all'],
-            canUnassign: false,
-          },
-          feature3: {
-            privileges: ['all'],
-            canUnassign: false,
-          },
-          feature4: {
-            privileges: ['all', 'read'],
-            canUnassign: false,
-          },
-        },
-      },
-    ]);
-  });
-
-  it(`restricts space feature privileges when global feature privileges are set`, () => {
-    const role = buildRole({
-      spacesPrivileges: [
-        {
-          spaces: ['*'],
-          base: [],
-          feature: {
-            feature1: ['all'],
-            feature2: ['read'],
-            feature4: ['all'],
-          },
-        },
-        {
-          spaces: ['foo'],
-          base: [],
-          feature: {},
-        },
-      ],
-    });
-    const effectivePrivileges = buildEffectivePrivilegesCalculator(role);
-    const allowedPrivilegesCalculator = buildAllowedPrivilegesCalculator(role);
-
-    const result = allowedPrivilegesCalculator.calculateAllowedPrivileges(
-      effectivePrivileges.calculateEffectivePrivileges(true)
-    );
-
-    expect(result).toEqual([
-      {
-        ...unrestrictedBasePrivileges,
-        ...unrestrictedFeaturePrivileges,
-      },
-      {
-        base: {
-          privileges: ['all', 'read'],
-          canUnassign: true,
-        },
-        feature: {
-          feature1: {
-            privileges: ['all'],
-            canUnassign: false,
-          },
-          feature2: {
-            privileges: ['all', 'read'],
-            canUnassign: false,
-          },
-          feature3: {
-            privileges: ['all'],
-            canUnassign: true, // feature 3 has no "read" privilege governed by space "all"
-          },
-          feature4: {
-            privileges: ['all'],
-            canUnassign: false,
-          },
-        },
-      },
-    ]);
-  });
-});
diff --git a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/kibana_privilege_calculator/kibana_allowed_privileges_calculator.ts b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/kibana_privilege_calculator/kibana_allowed_privileges_calculator.ts
deleted file mode 100644
index cea25649c43ff..0000000000000
--- a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/kibana_privilege_calculator/kibana_allowed_privileges_calculator.ts
+++ /dev/null
@@ -1,155 +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 { KibanaPrivileges, Role, RoleKibanaPrivilege } from '../../../../../../../common/model';
-import {
-  areActionsFullyCovered,
-  compareActions,
-} from '../../../../../../../common/privilege_calculator_utils';
-import { NO_PRIVILEGE_VALUE } from '../constants';
-import { isGlobalPrivilegeDefinition } from '../../../privilege_utils';
-import {
-  AllowedPrivilege,
-  CalculatedPrivilege,
-  PRIVILEGE_SOURCE,
-} from './kibana_privilege_calculator_types';
-
-export class KibanaAllowedPrivilegesCalculator {
-  // reference to the global privilege definition
-  private globalPrivilege: RoleKibanaPrivilege;
-
-  // list of privilege actions that comprise the global base privilege
-  private readonly assignedGlobalBaseActions: string[];
-
-  constructor(private readonly kibanaPrivileges: KibanaPrivileges, private readonly role: Role) {
-    this.globalPrivilege = this.locateGlobalPrivilege(role);
-    this.assignedGlobalBaseActions = this.globalPrivilege.base[0]
-      ? kibanaPrivileges.getGlobalPrivileges().getActions(this.globalPrivilege.base[0])
-      : [];
-  }
-
-  public calculateAllowedPrivileges(
-    effectivePrivileges: CalculatedPrivilege[]
-  ): AllowedPrivilege[] {
-    const { kibana = [] } = this.role;
-    return kibana.map((privilegeSpec, index) =>
-      this.calculateAllowedPrivilege(privilegeSpec, effectivePrivileges[index])
-    );
-  }
-
-  private calculateAllowedPrivilege(
-    privilegeSpec: RoleKibanaPrivilege,
-    effectivePrivileges: CalculatedPrivilege
-  ): AllowedPrivilege {
-    const result: AllowedPrivilege = {
-      base: {
-        privileges: [],
-        canUnassign: true,
-      },
-      feature: {},
-    };
-
-    if (isGlobalPrivilegeDefinition(privilegeSpec)) {
-      // nothing can impede global privileges
-      result.base.canUnassign = true;
-      result.base.privileges = this.kibanaPrivileges.getGlobalPrivileges().getAllPrivileges();
-    } else {
-      // space base privileges are restricted based on the assigned global privileges
-      const spacePrivileges = this.kibanaPrivileges.getSpacesPrivileges().getAllPrivileges();
-      result.base.canUnassign = this.assignedGlobalBaseActions.length === 0;
-      result.base.privileges = spacePrivileges.filter(privilege => {
-        // always allowed to assign the calculated effective privilege
-        if (privilege === effectivePrivileges.base.actualPrivilege) {
-          return true;
-        }
-
-        const privilegeActions = this.getBaseActions(PRIVILEGE_SOURCE.SPACE_BASE, privilege);
-        return !areActionsFullyCovered(this.assignedGlobalBaseActions, privilegeActions);
-      });
-    }
-
-    const allFeaturePrivileges = this.kibanaPrivileges.getFeaturePrivileges().getAllPrivileges();
-    result.feature = Object.entries(allFeaturePrivileges).reduce(
-      (acc, [featureId, featurePrivileges]) => {
-        return {
-          ...acc,
-          [featureId]: this.getAllowedFeaturePrivileges(
-            effectivePrivileges,
-            featureId,
-            featurePrivileges
-          ),
-        };
-      },
-      {}
-    );
-
-    return result;
-  }
-
-  private getAllowedFeaturePrivileges(
-    effectivePrivileges: CalculatedPrivilege,
-    featureId: string,
-    candidateFeaturePrivileges: string[]
-  ): { privileges: string[]; canUnassign: boolean } {
-    const effectiveFeaturePrivilegeExplanation = effectivePrivileges.feature[featureId];
-    if (effectiveFeaturePrivilegeExplanation == null) {
-      throw new Error('To calculate allowed feature privileges, we need the effective privileges');
-    }
-
-    const effectiveFeatureActions = this.getFeatureActions(
-      featureId,
-      effectiveFeaturePrivilegeExplanation.actualPrivilege
-    );
-
-    const privileges = [];
-    if (effectiveFeaturePrivilegeExplanation.actualPrivilege !== NO_PRIVILEGE_VALUE) {
-      // Always allowed to assign the calculated effective privilege
-      privileges.push(effectiveFeaturePrivilegeExplanation.actualPrivilege);
-    }
-
-    privileges.push(
-      ...candidateFeaturePrivileges.filter(privilegeId => {
-        const candidateActions = this.getFeatureActions(featureId, privilegeId);
-        return compareActions(effectiveFeatureActions, candidateActions) > 0;
-      })
-    );
-
-    const result = {
-      privileges: privileges.sort(),
-      canUnassign: effectiveFeaturePrivilegeExplanation.actualPrivilege === NO_PRIVILEGE_VALUE,
-    };
-
-    return result;
-  }
-
-  private getBaseActions(source: PRIVILEGE_SOURCE, privilegeId: string) {
-    switch (source) {
-      case PRIVILEGE_SOURCE.GLOBAL_BASE:
-        return this.assignedGlobalBaseActions;
-      case PRIVILEGE_SOURCE.SPACE_BASE:
-        return this.kibanaPrivileges.getSpacesPrivileges().getActions(privilegeId);
-      default:
-        throw new Error(
-          `Cannot get base actions for unsupported privilege source ${PRIVILEGE_SOURCE[source]}`
-        );
-    }
-  }
-
-  private getFeatureActions(featureId: string, privilegeId: string): string[] {
-    return this.kibanaPrivileges.getFeaturePrivileges().getActions(featureId, privilegeId);
-  }
-
-  private locateGlobalPrivilege(role: Role) {
-    const spacePrivileges = role.kibana;
-    return (
-      spacePrivileges.find(privileges => isGlobalPrivilegeDefinition(privileges)) || {
-        spaces: [] as string[],
-        base: [] as string[],
-        feature: {},
-      }
-    );
-  }
-}
diff --git a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/kibana_privilege_calculator/kibana_base_privilege_calculator.test.ts b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/kibana_privilege_calculator/kibana_base_privilege_calculator.test.ts
deleted file mode 100644
index 8d30061b92c6f..0000000000000
--- a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/kibana_privilege_calculator/kibana_base_privilege_calculator.test.ts
+++ /dev/null
@@ -1,321 +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 { KibanaPrivileges, Role, RoleKibanaPrivilege } from '../../../../../../../common/model';
-import { NO_PRIVILEGE_VALUE } from '../constants';
-import { isGlobalPrivilegeDefinition } from '../../../privilege_utils';
-import { buildRole, defaultPrivilegeDefinition } from './__fixtures__';
-import { KibanaBasePrivilegeCalculator } from './kibana_base_privilege_calculator';
-import { PRIVILEGE_SOURCE, PrivilegeExplanation } from './kibana_privilege_calculator_types';
-
-const buildEffectiveBasePrivilegeCalculator = (
-  role: Role,
-  kibanaPrivileges: KibanaPrivileges = defaultPrivilegeDefinition
-) => {
-  const globalPrivilegeSpec =
-    role.kibana.find(k => isGlobalPrivilegeDefinition(k)) ||
-    ({
-      spaces: ['*'],
-      base: [],
-      feature: {},
-    } as RoleKibanaPrivilege);
-
-  const globalActions = globalPrivilegeSpec.base[0]
-    ? kibanaPrivileges.getGlobalPrivileges().getActions(globalPrivilegeSpec.base[0])
-    : [];
-
-  return new KibanaBasePrivilegeCalculator(kibanaPrivileges, globalPrivilegeSpec, globalActions);
-};
-
-describe('getMostPermissiveBasePrivilege', () => {
-  describe('without ignoring assigned', () => {
-    it('returns "none" when no privileges are granted', () => {
-      const role = buildRole();
-      const effectiveBasePrivilegesCalculator = buildEffectiveBasePrivilegeCalculator(role);
-      const result: PrivilegeExplanation = effectiveBasePrivilegesCalculator.getMostPermissiveBasePrivilege(
-        role.kibana[0],
-        false
-      );
-
-      expect(result).toEqual({
-        actualPrivilege: NO_PRIVILEGE_VALUE,
-        actualPrivilegeSource: PRIVILEGE_SOURCE.GLOBAL_BASE,
-        isDirectlyAssigned: true,
-      } as PrivilegeExplanation);
-    });
-
-    defaultPrivilegeDefinition
-      .getGlobalPrivileges()
-      .getAllPrivileges()
-      .forEach(globalBasePrivilege => {
-        it(`returns "${globalBasePrivilege}" when assigned directly at the global privilege`, () => {
-          const role = buildRole({
-            spacesPrivileges: [
-              {
-                spaces: ['*'],
-                base: [globalBasePrivilege],
-                feature: {},
-              },
-            ],
-          });
-          const effectiveBasePrivilegesCalculator = buildEffectiveBasePrivilegeCalculator(role);
-          const result: PrivilegeExplanation = effectiveBasePrivilegesCalculator.getMostPermissiveBasePrivilege(
-            role.kibana[0],
-            false
-          );
-
-          expect(result).toEqual({
-            actualPrivilege: globalBasePrivilege,
-            actualPrivilegeSource: PRIVILEGE_SOURCE.GLOBAL_BASE,
-            isDirectlyAssigned: true,
-          } as PrivilegeExplanation);
-        });
-      });
-
-    defaultPrivilegeDefinition
-      .getSpacesPrivileges()
-      .getAllPrivileges()
-      .forEach(spaceBasePrivilege => {
-        it(`returns "${spaceBasePrivilege}" when assigned directly at the space base privilege`, () => {
-          const role = buildRole({
-            spacesPrivileges: [
-              {
-                spaces: ['foo'],
-                base: [spaceBasePrivilege],
-                feature: {},
-              },
-            ],
-          });
-          const effectiveBasePrivilegesCalculator = buildEffectiveBasePrivilegeCalculator(role);
-          const result: PrivilegeExplanation = effectiveBasePrivilegesCalculator.getMostPermissiveBasePrivilege(
-            role.kibana[0],
-            false
-          );
-
-          expect(result).toEqual({
-            actualPrivilege: spaceBasePrivilege,
-            actualPrivilegeSource: PRIVILEGE_SOURCE.SPACE_BASE,
-            isDirectlyAssigned: true,
-          } as PrivilegeExplanation);
-        });
-      });
-
-    it('returns the global privilege when no space base is defined', () => {
-      const role = buildRole({
-        spacesPrivileges: [
-          {
-            spaces: ['*'],
-            base: ['all'],
-            feature: {},
-          },
-          {
-            spaces: ['foo'],
-            base: [],
-            feature: {},
-          },
-        ],
-      });
-      const effectiveBasePrivilegesCalculator = buildEffectiveBasePrivilegeCalculator(role);
-      const result: PrivilegeExplanation = effectiveBasePrivilegesCalculator.getMostPermissiveBasePrivilege(
-        role.kibana[1],
-        false
-      );
-
-      expect(result).toEqual({
-        actualPrivilege: 'all',
-        actualPrivilegeSource: PRIVILEGE_SOURCE.GLOBAL_BASE,
-        isDirectlyAssigned: false,
-      } as PrivilegeExplanation);
-    });
-
-    it('returns the global privilege when it supercedes the space privilege', () => {
-      const role = buildRole({
-        spacesPrivileges: [
-          {
-            spaces: ['*'],
-            base: ['all'],
-            feature: {},
-          },
-          {
-            spaces: ['foo'],
-            base: ['read'],
-            feature: {},
-          },
-        ],
-      });
-      const effectiveBasePrivilegesCalculator = buildEffectiveBasePrivilegeCalculator(role);
-      const result: PrivilegeExplanation = effectiveBasePrivilegesCalculator.getMostPermissiveBasePrivilege(
-        role.kibana[1],
-        false
-      );
-
-      expect(result).toEqual({
-        actualPrivilege: 'all',
-        actualPrivilegeSource: PRIVILEGE_SOURCE.GLOBAL_BASE,
-        isDirectlyAssigned: false,
-        supersededPrivilege: 'read',
-        supersededPrivilegeSource: PRIVILEGE_SOURCE.SPACE_BASE,
-      } as PrivilegeExplanation);
-    });
-  });
-
-  describe('ignoring assigned', () => {
-    it('returns "none" when no privileges are granted', () => {
-      const role = buildRole();
-      const effectiveBasePrivilegesCalculator = buildEffectiveBasePrivilegeCalculator(role);
-      const result: PrivilegeExplanation = effectiveBasePrivilegesCalculator.getMostPermissiveBasePrivilege(
-        role.kibana[0],
-        true
-      );
-
-      expect(result).toEqual({
-        actualPrivilege: NO_PRIVILEGE_VALUE,
-        actualPrivilegeSource: PRIVILEGE_SOURCE.GLOBAL_BASE,
-        isDirectlyAssigned: true,
-      } as PrivilegeExplanation);
-    });
-
-    defaultPrivilegeDefinition
-      .getGlobalPrivileges()
-      .getAllPrivileges()
-      .forEach(globalBasePrivilege => {
-        it(`returns "none" when "${globalBasePrivilege}" assigned directly at the global privilege`, () => {
-          const role = buildRole({
-            spacesPrivileges: [
-              {
-                spaces: ['*'],
-                base: [globalBasePrivilege],
-                feature: {},
-              },
-            ],
-          });
-          const effectiveBasePrivilegesCalculator = buildEffectiveBasePrivilegeCalculator(role);
-          const result: PrivilegeExplanation = effectiveBasePrivilegesCalculator.getMostPermissiveBasePrivilege(
-            role.kibana[0],
-            true
-          );
-
-          expect(result).toEqual({
-            actualPrivilege: NO_PRIVILEGE_VALUE,
-            actualPrivilegeSource: PRIVILEGE_SOURCE.GLOBAL_BASE,
-            isDirectlyAssigned: true,
-          } as PrivilegeExplanation);
-        });
-      });
-
-    defaultPrivilegeDefinition
-      .getSpacesPrivileges()
-      .getAllPrivileges()
-      .forEach(spaceBasePrivilege => {
-        it(`returns "none" when "${spaceBasePrivilege}" when assigned directly at the space base privilege`, () => {
-          const role = buildRole({
-            spacesPrivileges: [
-              {
-                spaces: ['foo'],
-                base: [spaceBasePrivilege],
-                feature: {},
-              },
-            ],
-          });
-          const effectiveBasePrivilegesCalculator = buildEffectiveBasePrivilegeCalculator(role);
-          const result: PrivilegeExplanation = effectiveBasePrivilegesCalculator.getMostPermissiveBasePrivilege(
-            role.kibana[0],
-            true
-          );
-
-          expect(result).toEqual({
-            actualPrivilege: NO_PRIVILEGE_VALUE,
-            actualPrivilegeSource: PRIVILEGE_SOURCE.SPACE_BASE,
-            isDirectlyAssigned: true,
-          } as PrivilegeExplanation);
-        });
-      });
-
-    it('returns the global privilege when no space base is defined', () => {
-      const role = buildRole({
-        spacesPrivileges: [
-          {
-            spaces: ['*'],
-            base: ['all'],
-            feature: {},
-          },
-          {
-            spaces: ['foo'],
-            base: [],
-            feature: {},
-          },
-        ],
-      });
-      const effectiveBasePrivilegesCalculator = buildEffectiveBasePrivilegeCalculator(role);
-      const result: PrivilegeExplanation = effectiveBasePrivilegesCalculator.getMostPermissiveBasePrivilege(
-        role.kibana[1],
-        true
-      );
-
-      expect(result).toEqual({
-        actualPrivilege: 'all',
-        actualPrivilegeSource: PRIVILEGE_SOURCE.GLOBAL_BASE,
-        isDirectlyAssigned: false,
-      } as PrivilegeExplanation);
-    });
-
-    it('returns the global privilege when it supercedes the space privilege, without indicating override', () => {
-      const role = buildRole({
-        spacesPrivileges: [
-          {
-            spaces: ['*'],
-            base: ['all'],
-            feature: {},
-          },
-          {
-            spaces: ['foo'],
-            base: ['read'],
-            feature: {},
-          },
-        ],
-      });
-      const effectiveBasePrivilegesCalculator = buildEffectiveBasePrivilegeCalculator(role);
-      const result: PrivilegeExplanation = effectiveBasePrivilegesCalculator.getMostPermissiveBasePrivilege(
-        role.kibana[1],
-        true
-      );
-
-      expect(result).toEqual({
-        actualPrivilege: 'all',
-        actualPrivilegeSource: PRIVILEGE_SOURCE.GLOBAL_BASE,
-        isDirectlyAssigned: false,
-      } as PrivilegeExplanation);
-    });
-
-    it('returns the global privilege even though it would ordinarly be overriden by space base privilege', () => {
-      const role = buildRole({
-        spacesPrivileges: [
-          {
-            spaces: ['*'],
-            base: ['read'],
-            feature: {},
-          },
-          {
-            spaces: ['foo'],
-            base: ['all'],
-            feature: {},
-          },
-        ],
-      });
-      const effectiveBasePrivilegesCalculator = buildEffectiveBasePrivilegeCalculator(role);
-      const result: PrivilegeExplanation = effectiveBasePrivilegesCalculator.getMostPermissiveBasePrivilege(
-        role.kibana[1],
-        true
-      );
-
-      expect(result).toEqual({
-        actualPrivilege: 'read',
-        actualPrivilegeSource: PRIVILEGE_SOURCE.GLOBAL_BASE,
-        isDirectlyAssigned: false,
-      } as PrivilegeExplanation);
-    });
-  });
-});
diff --git a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/kibana_privilege_calculator/kibana_base_privilege_calculator.ts b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/kibana_privilege_calculator/kibana_base_privilege_calculator.ts
deleted file mode 100644
index 9fefea637e168..0000000000000
--- a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/kibana_privilege_calculator/kibana_base_privilege_calculator.ts
+++ /dev/null
@@ -1,98 +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 { KibanaPrivileges, RoleKibanaPrivilege } from '../../../../../../../common/model';
-import { compareActions } from '../../../../../../../common/privilege_calculator_utils';
-import { NO_PRIVILEGE_VALUE } from '../constants';
-import { isGlobalPrivilegeDefinition } from '../../../privilege_utils';
-import { PRIVILEGE_SOURCE, PrivilegeExplanation } from './kibana_privilege_calculator_types';
-
-export class KibanaBasePrivilegeCalculator {
-  constructor(
-    private readonly kibanaPrivileges: KibanaPrivileges,
-    private readonly globalPrivilege: RoleKibanaPrivilege,
-    private readonly assignedGlobalBaseActions: string[]
-  ) {}
-
-  public getMostPermissiveBasePrivilege(
-    privilegeSpec: RoleKibanaPrivilege,
-    ignoreAssigned: boolean
-  ): PrivilegeExplanation {
-    const assignedPrivilege = privilegeSpec.base[0] || NO_PRIVILEGE_VALUE;
-
-    // If this is the global privilege definition, then there is nothing to supercede it.
-    if (isGlobalPrivilegeDefinition(privilegeSpec)) {
-      if (assignedPrivilege === NO_PRIVILEGE_VALUE || ignoreAssigned) {
-        return {
-          actualPrivilege: NO_PRIVILEGE_VALUE,
-          actualPrivilegeSource: PRIVILEGE_SOURCE.GLOBAL_BASE,
-          isDirectlyAssigned: true,
-        };
-      }
-      return {
-        actualPrivilege: assignedPrivilege,
-        actualPrivilegeSource: PRIVILEGE_SOURCE.GLOBAL_BASE,
-        isDirectlyAssigned: true,
-      };
-    }
-
-    // Otherwise, check to see if the global privilege supercedes this one.
-    const baseActions = [
-      ...this.kibanaPrivileges.getSpacesPrivileges().getActions(assignedPrivilege),
-    ];
-
-    const globalSupercedes =
-      this.hasAssignedGlobalBasePrivilege() &&
-      (compareActions(this.assignedGlobalBaseActions, baseActions) < 0 || ignoreAssigned);
-
-    if (globalSupercedes) {
-      const wasDirectlyAssigned = !ignoreAssigned && baseActions.length > 0;
-
-      return {
-        actualPrivilege: this.globalPrivilege.base[0],
-        actualPrivilegeSource: PRIVILEGE_SOURCE.GLOBAL_BASE,
-        isDirectlyAssigned: false,
-        ...this.buildSupercededFields(
-          wasDirectlyAssigned,
-          assignedPrivilege,
-          PRIVILEGE_SOURCE.SPACE_BASE
-        ),
-      };
-    }
-
-    if (!ignoreAssigned) {
-      return {
-        actualPrivilege: assignedPrivilege,
-        actualPrivilegeSource: PRIVILEGE_SOURCE.SPACE_BASE,
-        isDirectlyAssigned: true,
-      };
-    }
-
-    return {
-      actualPrivilege: NO_PRIVILEGE_VALUE,
-      actualPrivilegeSource: PRIVILEGE_SOURCE.SPACE_BASE,
-      isDirectlyAssigned: true,
-    };
-  }
-
-  private hasAssignedGlobalBasePrivilege() {
-    return this.assignedGlobalBaseActions.length > 0;
-  }
-
-  private buildSupercededFields(
-    isSuperceding: boolean,
-    supersededPrivilege?: string,
-    supersededPrivilegeSource?: PRIVILEGE_SOURCE
-  ) {
-    if (!isSuperceding) {
-      return {};
-    }
-    return {
-      supersededPrivilege,
-      supersededPrivilegeSource,
-    };
-  }
-}
diff --git a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/kibana_privilege_calculator/kibana_feature_privilege_calculator.test.ts b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/kibana_privilege_calculator/kibana_feature_privilege_calculator.test.ts
deleted file mode 100644
index 887fffa1b0cbc..0000000000000
--- a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/kibana_privilege_calculator/kibana_feature_privilege_calculator.test.ts
+++ /dev/null
@@ -1,959 +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 { KibanaPrivileges, Role, RoleKibanaPrivilege } from '../../../../../../../common/model';
-import { NO_PRIVILEGE_VALUE } from '../constants';
-import { isGlobalPrivilegeDefinition } from '../../../privilege_utils';
-import { buildRole, BuildRoleOpts, defaultPrivilegeDefinition } from './__fixtures__';
-import { KibanaBasePrivilegeCalculator } from './kibana_base_privilege_calculator';
-import { KibanaFeaturePrivilegeCalculator } from './kibana_feature_privilege_calculator';
-import { PRIVILEGE_SOURCE } from './kibana_privilege_calculator_types';
-
-const buildEffectiveBasePrivilegeCalculator = (
-  role: Role,
-  kibanaPrivileges: KibanaPrivileges = defaultPrivilegeDefinition
-) => {
-  const globalPrivilegeSpec =
-    role.kibana.find(k => isGlobalPrivilegeDefinition(k)) ||
-    ({
-      spaces: ['*'],
-      base: [],
-      feature: {},
-    } as RoleKibanaPrivilege);
-
-  const globalActions = globalPrivilegeSpec.base[0]
-    ? kibanaPrivileges.getGlobalPrivileges().getActions(globalPrivilegeSpec.base[0])
-    : [];
-
-  return new KibanaBasePrivilegeCalculator(kibanaPrivileges, globalPrivilegeSpec, globalActions);
-};
-
-const buildEffectiveFeaturePrivilegeCalculator = (
-  role: Role,
-  kibanaPrivileges: KibanaPrivileges = defaultPrivilegeDefinition
-) => {
-  const globalPrivilegeSpec =
-    role.kibana.find(k => isGlobalPrivilegeDefinition(k)) ||
-    ({
-      spaces: ['*'],
-      base: [],
-      feature: {},
-    } as RoleKibanaPrivilege);
-
-  const globalActions = globalPrivilegeSpec.base[0]
-    ? kibanaPrivileges.getGlobalPrivileges().getActions(globalPrivilegeSpec.base[0])
-    : [];
-
-  const rankedFeaturePrivileges = kibanaPrivileges.getFeaturePrivileges().getAllPrivileges();
-
-  return new KibanaFeaturePrivilegeCalculator(
-    kibanaPrivileges,
-    globalPrivilegeSpec,
-    globalActions,
-    rankedFeaturePrivileges
-  );
-};
-
-interface TestOpts {
-  only?: boolean;
-  role?: BuildRoleOpts;
-  privilegeIndex?: number;
-  ignoreAssigned?: boolean;
-  result: Record<string, any>;
-  feature?: string;
-}
-
-function runTest(
-  description: string,
-  {
-    role: roleOpts = {},
-    result = {},
-    privilegeIndex = 0,
-    ignoreAssigned = false,
-    only = false,
-    feature = 'feature1',
-  }: TestOpts
-) {
-  const fn = only ? it.only : it;
-  fn(description, () => {
-    const role = buildRole(roleOpts);
-    const basePrivilegeCalculator = buildEffectiveBasePrivilegeCalculator(role);
-    const featurePrivilegeCalculator = buildEffectiveFeaturePrivilegeCalculator(role);
-
-    const baseExplanation = basePrivilegeCalculator.getMostPermissiveBasePrivilege(
-      role.kibana[privilegeIndex],
-      // If calculations wish to ignoreAssigned, then we still need to know what the real effective base privilege is
-      // without ignoring assigned, in order to calculate the correct feature privileges.
-      false
-    );
-
-    const actualResult = featurePrivilegeCalculator.getMostPermissiveFeaturePrivilege(
-      role.kibana[privilegeIndex],
-      baseExplanation,
-      feature,
-      ignoreAssigned
-    );
-
-    expect(actualResult).toEqual(result);
-  });
-}
-
-describe('getMostPermissiveFeaturePrivilege', () => {
-  describe('for global feature privileges, without ignoring assigned', () => {
-    runTest('returns "none" when no privileges are granted', {
-      result: {
-        actualPrivilege: NO_PRIVILEGE_VALUE,
-        actualPrivilegeSource: PRIVILEGE_SOURCE.GLOBAL_FEATURE,
-        isDirectlyAssigned: true,
-      },
-    });
-
-    runTest('returns "read" when assigned directly to the feature', {
-      role: {
-        spacesPrivileges: [
-          {
-            spaces: ['*'],
-            base: [],
-            feature: {
-              feature1: ['read'],
-            },
-          },
-        ],
-      },
-      result: {
-        actualPrivilege: 'read',
-        actualPrivilegeSource: PRIVILEGE_SOURCE.GLOBAL_FEATURE,
-        isDirectlyAssigned: true,
-      },
-    });
-
-    runTest('returns "read" when assigned as the global base privilege', {
-      role: {
-        spacesPrivileges: [
-          {
-            spaces: ['*'],
-            base: ['read'],
-            feature: {},
-          },
-        ],
-      },
-      result: {
-        actualPrivilege: 'read',
-        actualPrivilegeSource: PRIVILEGE_SOURCE.GLOBAL_BASE,
-        isDirectlyAssigned: false,
-      },
-    });
-
-    runTest(
-      'returns "all" when assigned as the global base privilege, which overrides assigned feature privilege',
-      {
-        role: {
-          spacesPrivileges: [
-            {
-              spaces: ['*'],
-              base: ['all'],
-              feature: {
-                feature1: ['read'],
-              },
-            },
-          ],
-        },
-        result: {
-          actualPrivilege: 'all',
-          actualPrivilegeSource: PRIVILEGE_SOURCE.GLOBAL_BASE,
-          isDirectlyAssigned: false,
-          supersededPrivilege: 'read',
-          supersededPrivilegeSource: PRIVILEGE_SOURCE.GLOBAL_FEATURE,
-        },
-      }
-    );
-
-    runTest(
-      'returns "all" when assigned as the feature privilege, which does not override assigned global base privilege',
-      {
-        role: {
-          spacesPrivileges: [
-            {
-              spaces: ['*'],
-              base: ['read'],
-              feature: {
-                feature1: ['all'],
-              },
-            },
-          ],
-        },
-        result: {
-          actualPrivilege: 'all',
-          actualPrivilegeSource: PRIVILEGE_SOURCE.GLOBAL_FEATURE,
-          isDirectlyAssigned: true,
-        },
-      }
-    );
-  });
-
-  describe('for global feature privileges, ignoring assigned', () => {
-    runTest('returns "none" when no privileges are granted', {
-      ignoreAssigned: true,
-      result: {
-        actualPrivilege: NO_PRIVILEGE_VALUE,
-        actualPrivilegeSource: PRIVILEGE_SOURCE.GLOBAL_FEATURE,
-        isDirectlyAssigned: true,
-      },
-    });
-
-    runTest('returns "none" when "read" is assigned directly to the feature', {
-      role: {
-        spacesPrivileges: [
-          {
-            spaces: ['*'],
-            base: [],
-            feature: {
-              feature1: ['read'],
-            },
-          },
-        ],
-      },
-      ignoreAssigned: true,
-      result: {
-        actualPrivilege: NO_PRIVILEGE_VALUE,
-        actualPrivilegeSource: PRIVILEGE_SOURCE.GLOBAL_FEATURE,
-        isDirectlyAssigned: true,
-      },
-    });
-
-    runTest('returns "read" when assigned as the global base privilege', {
-      role: {
-        spacesPrivileges: [
-          {
-            spaces: ['*'],
-            base: ['read'],
-            feature: {},
-          },
-        ],
-      },
-      ignoreAssigned: true,
-      result: {
-        actualPrivilege: 'read',
-        actualPrivilegeSource: PRIVILEGE_SOURCE.GLOBAL_BASE,
-        isDirectlyAssigned: false,
-      },
-    });
-
-    runTest(
-      'returns "all" when assigned as the global base privilege, which overrides assigned feature privilege',
-      {
-        role: {
-          spacesPrivileges: [
-            {
-              spaces: ['*'],
-              base: ['all'],
-              feature: {
-                feature1: ['read'],
-              },
-            },
-          ],
-        },
-        ignoreAssigned: true,
-        result: {
-          actualPrivilege: 'all',
-          actualPrivilegeSource: PRIVILEGE_SOURCE.GLOBAL_BASE,
-          isDirectlyAssigned: false,
-        },
-      }
-    );
-
-    runTest(
-      'returns "read" when "all" assigned as the feature privilege, which does not override assigned global base privilege',
-      {
-        role: {
-          spacesPrivileges: [
-            {
-              spaces: ['*'],
-              base: ['read'],
-              feature: {
-                feature1: ['all'],
-              },
-            },
-          ],
-        },
-        ignoreAssigned: true,
-        result: {
-          actualPrivilege: 'read',
-          actualPrivilegeSource: PRIVILEGE_SOURCE.GLOBAL_BASE,
-          isDirectlyAssigned: false,
-        },
-      }
-    );
-  });
-
-  describe('for space feature privileges, without ignoring assigned', () => {
-    runTest('returns "none" when no privileges are granted', {
-      role: {
-        spacesPrivileges: [
-          {
-            spaces: ['marketing'],
-            base: [],
-            feature: {},
-          },
-        ],
-      },
-      result: {
-        actualPrivilege: NO_PRIVILEGE_VALUE,
-        actualPrivilegeSource: PRIVILEGE_SOURCE.SPACE_FEATURE,
-        isDirectlyAssigned: true,
-      },
-    });
-
-    runTest('returns "read" when assigned directly to the feature', {
-      role: {
-        spacesPrivileges: [
-          {
-            spaces: ['marketing'],
-            base: [],
-            feature: {
-              feature1: ['read'],
-            },
-          },
-        ],
-      },
-      result: {
-        actualPrivilege: 'read',
-        actualPrivilegeSource: PRIVILEGE_SOURCE.SPACE_FEATURE,
-        isDirectlyAssigned: true,
-        directlyAssignedFeaturePrivilegeMorePermissiveThanBase: true,
-      },
-    });
-
-    runTest('returns "read" when assigned as the global base privilege', {
-      role: {
-        spacesPrivileges: [
-          {
-            spaces: ['*'],
-            base: ['read'],
-            feature: {},
-          },
-          {
-            spaces: ['marketing'],
-            base: [],
-            feature: {},
-          },
-        ],
-      },
-      privilegeIndex: 1,
-      result: {
-        actualPrivilege: 'read',
-        actualPrivilegeSource: PRIVILEGE_SOURCE.GLOBAL_BASE,
-        isDirectlyAssigned: false,
-      },
-    });
-
-    runTest(
-      'returns "all" when assigned as the global base privilege, which overrides assigned global feature privilege',
-      {
-        role: {
-          spacesPrivileges: [
-            {
-              spaces: ['*'],
-              base: ['all'],
-              feature: {
-                feature1: ['read'],
-              },
-            },
-            {
-              spaces: ['marketing'],
-              base: [],
-              feature: {},
-            },
-          ],
-        },
-        privilegeIndex: 1,
-        result: {
-          actualPrivilege: 'all',
-          actualPrivilegeSource: PRIVILEGE_SOURCE.GLOBAL_BASE,
-          isDirectlyAssigned: false,
-        },
-      }
-    );
-
-    runTest(
-      'returns "all" when assigned as the global base privilege, which overrides assigned space feature privilege',
-      {
-        role: {
-          spacesPrivileges: [
-            {
-              spaces: ['*'],
-              base: ['all'],
-              feature: {},
-            },
-            {
-              spaces: ['marketing'],
-              base: [],
-              feature: {
-                feature1: ['read'],
-              },
-            },
-          ],
-        },
-        privilegeIndex: 1,
-        result: {
-          actualPrivilege: 'all',
-          actualPrivilegeSource: PRIVILEGE_SOURCE.GLOBAL_BASE,
-          isDirectlyAssigned: false,
-          supersededPrivilege: 'read',
-          supersededPrivilegeSource: PRIVILEGE_SOURCE.SPACE_FEATURE,
-        },
-      }
-    );
-
-    runTest(
-      'returns "all" when assigned as the global feature privilege, which does not override assigned global base privilege',
-      {
-        role: {
-          spacesPrivileges: [
-            {
-              spaces: ['*'],
-              base: ['read'],
-              feature: {
-                feature1: ['all'],
-              },
-            },
-            {
-              spaces: ['marketing'],
-              base: [],
-              feature: {},
-            },
-          ],
-        },
-        privilegeIndex: 1,
-        result: {
-          actualPrivilege: 'all',
-          actualPrivilegeSource: PRIVILEGE_SOURCE.GLOBAL_FEATURE,
-          isDirectlyAssigned: false,
-        },
-      }
-    );
-
-    runTest(
-      'returns "all" when assigned as the space feature privilege, which does not override assigned global base privilege',
-      {
-        role: {
-          spacesPrivileges: [
-            {
-              spaces: ['*'],
-              base: ['read'],
-              feature: {},
-            },
-            {
-              spaces: ['marketing'],
-              base: [],
-              feature: {
-                feature1: ['all'],
-              },
-            },
-          ],
-        },
-        privilegeIndex: 1,
-        result: {
-          actualPrivilege: 'all',
-          actualPrivilegeSource: PRIVILEGE_SOURCE.SPACE_FEATURE,
-          isDirectlyAssigned: true,
-          directlyAssignedFeaturePrivilegeMorePermissiveThanBase: true,
-        },
-      }
-    );
-
-    runTest(
-      'returns "all" when assigned as the space base privilege, which does not override assigned global base privilege',
-      {
-        role: {
-          spacesPrivileges: [
-            {
-              spaces: ['*'],
-              base: ['read'],
-              feature: {},
-            },
-            {
-              spaces: ['marketing'],
-              base: ['all'],
-              feature: {},
-            },
-          ],
-        },
-        privilegeIndex: 1,
-        result: {
-          actualPrivilege: 'all',
-          actualPrivilegeSource: PRIVILEGE_SOURCE.SPACE_BASE,
-          isDirectlyAssigned: false,
-        },
-      }
-    );
-
-    runTest(
-      'returns "all" when assigned as the global base privilege, which overrides assigned space feature privilege',
-      {
-        role: {
-          spacesPrivileges: [
-            {
-              spaces: ['*'],
-              base: ['all'],
-              feature: {},
-            },
-            {
-              spaces: ['marketing'],
-              base: [],
-              feature: {
-                feature1: ['read'],
-              },
-            },
-          ],
-        },
-        privilegeIndex: 1,
-        result: {
-          actualPrivilege: 'all',
-          actualPrivilegeSource: PRIVILEGE_SOURCE.GLOBAL_BASE,
-          isDirectlyAssigned: false,
-          supersededPrivilege: 'read',
-          supersededPrivilegeSource: PRIVILEGE_SOURCE.SPACE_FEATURE,
-        },
-      }
-    );
-
-    runTest('returns "all" when assigned everywhere, without indicating override', {
-      role: {
-        spacesPrivileges: [
-          {
-            spaces: ['*'],
-            base: ['all'],
-            feature: {
-              feature1: ['all'],
-            },
-          },
-          {
-            spaces: ['marketing'],
-            base: ['all'],
-            feature: {
-              feature1: ['all'],
-            },
-          },
-        ],
-      },
-      privilegeIndex: 1,
-      result: {
-        actualPrivilege: 'all',
-        actualPrivilegeSource: PRIVILEGE_SOURCE.SPACE_FEATURE,
-        isDirectlyAssigned: true,
-        directlyAssignedFeaturePrivilegeMorePermissiveThanBase: false,
-      },
-    });
-
-    runTest('returns "all" when assigned at global feature, overriding space feature', {
-      role: {
-        spacesPrivileges: [
-          {
-            spaces: ['*'],
-            base: [],
-            feature: {
-              feature1: ['all'],
-            },
-          },
-          {
-            spaces: ['marketing'],
-            base: [],
-            feature: {
-              feature1: ['read'],
-            },
-          },
-        ],
-      },
-      privilegeIndex: 1,
-      result: {
-        actualPrivilege: 'all',
-        actualPrivilegeSource: PRIVILEGE_SOURCE.GLOBAL_FEATURE,
-        isDirectlyAssigned: false,
-        supersededPrivilege: 'read',
-        supersededPrivilegeSource: PRIVILEGE_SOURCE.SPACE_FEATURE,
-      },
-    });
-
-    describe('feature with "all" excluded from base privileges', () => {
-      runTest('returns "read" when "all" assigned as the global base privilege', {
-        role: {
-          spacesPrivileges: [
-            {
-              spaces: ['*'],
-              base: ['all'],
-              feature: {},
-            },
-            {
-              spaces: ['marketing'],
-              base: [],
-              feature: {},
-            },
-          ],
-        },
-        feature: 'feature4',
-        privilegeIndex: 1,
-        result: {
-          actualPrivilege: 'read',
-          actualPrivilegeSource: PRIVILEGE_SOURCE.GLOBAL_BASE,
-          isDirectlyAssigned: false,
-        },
-      });
-
-      runTest(
-        'returns "read" when "all" assigned as the global base privilege, which does not override assigned space feature privilege',
-        {
-          role: {
-            spacesPrivileges: [
-              {
-                spaces: ['*'],
-                base: ['all'],
-                feature: {},
-              },
-              {
-                spaces: ['marketing'],
-                base: [],
-                feature: {
-                  feature4: ['read'],
-                },
-              },
-            ],
-          },
-          feature: 'feature4',
-          privilegeIndex: 1,
-          result: {
-            actualPrivilege: 'read',
-            actualPrivilegeSource: PRIVILEGE_SOURCE.SPACE_FEATURE,
-            isDirectlyAssigned: true,
-            directlyAssignedFeaturePrivilegeMorePermissiveThanBase: false,
-          },
-        }
-      );
-
-      runTest(
-        'returns "all" when assigned as the feature privilege, which is more permissive than the base privilege',
-        {
-          role: {
-            spacesPrivileges: [
-              {
-                spaces: ['*'],
-                base: ['all'],
-                feature: {},
-              },
-              {
-                spaces: ['marketing'],
-                base: [],
-                feature: {
-                  feature4: ['all'],
-                },
-              },
-            ],
-          },
-          feature: 'feature4',
-          privilegeIndex: 1,
-          result: {
-            actualPrivilege: 'all',
-            actualPrivilegeSource: PRIVILEGE_SOURCE.SPACE_FEATURE,
-            isDirectlyAssigned: true,
-            directlyAssignedFeaturePrivilegeMorePermissiveThanBase: true,
-          },
-        }
-      );
-    });
-  });
-
-  describe('for space feature privileges, ignoring assigned', () => {
-    runTest('returns "none" when no privileges are granted', {
-      role: {
-        spacesPrivileges: [
-          {
-            spaces: ['marketing'],
-            base: [],
-            feature: {},
-          },
-        ],
-      },
-      ignoreAssigned: true,
-      result: {
-        actualPrivilege: NO_PRIVILEGE_VALUE,
-        actualPrivilegeSource: PRIVILEGE_SOURCE.SPACE_FEATURE,
-        isDirectlyAssigned: true,
-      },
-    });
-
-    runTest('returns "none" when "read" assigned directly to the feature', {
-      role: {
-        spacesPrivileges: [
-          {
-            spaces: ['marketing'],
-            base: [],
-            feature: {
-              feature1: ['read'],
-            },
-          },
-        ],
-      },
-      ignoreAssigned: true,
-      result: {
-        actualPrivilege: NO_PRIVILEGE_VALUE,
-        actualPrivilegeSource: PRIVILEGE_SOURCE.SPACE_FEATURE,
-        isDirectlyAssigned: true,
-      },
-    });
-
-    runTest('returns "read" when assigned as the global base privilege', {
-      role: {
-        spacesPrivileges: [
-          {
-            spaces: ['*'],
-            base: ['read'],
-            feature: {},
-          },
-          {
-            spaces: ['marketing'],
-            base: [],
-            feature: {},
-          },
-        ],
-      },
-      privilegeIndex: 1,
-      ignoreAssigned: true,
-      result: {
-        actualPrivilege: 'read',
-        actualPrivilegeSource: PRIVILEGE_SOURCE.GLOBAL_BASE,
-        isDirectlyAssigned: false,
-      },
-    });
-
-    runTest(
-      'returns "all" when assigned as the global base privilege, which overrides assigned global feature privilege',
-      {
-        role: {
-          spacesPrivileges: [
-            {
-              spaces: ['*'],
-              base: ['all'],
-              feature: {
-                feature1: ['read'],
-              },
-            },
-            {
-              spaces: ['marketing'],
-              base: [],
-              feature: {},
-            },
-          ],
-        },
-        privilegeIndex: 1,
-        ignoreAssigned: true,
-        result: {
-          actualPrivilege: 'all',
-          actualPrivilegeSource: PRIVILEGE_SOURCE.GLOBAL_BASE,
-          isDirectlyAssigned: false,
-        },
-      }
-    );
-
-    runTest(
-      'returns "all" when assigned as the global base privilege, which normally overrides assigned space feature privilege',
-      {
-        role: {
-          spacesPrivileges: [
-            {
-              spaces: ['*'],
-              base: ['all'],
-              feature: {},
-            },
-            {
-              spaces: ['marketing'],
-              base: [],
-              feature: {
-                feature1: ['read'],
-              },
-            },
-          ],
-        },
-        privilegeIndex: 1,
-        ignoreAssigned: true,
-        result: {
-          actualPrivilege: 'all',
-          actualPrivilegeSource: PRIVILEGE_SOURCE.GLOBAL_BASE,
-          isDirectlyAssigned: false,
-        },
-      }
-    );
-
-    runTest(
-      'returns "all" when assigned as the global feature privilege, which does not override assigned global base privilege',
-      {
-        role: {
-          spacesPrivileges: [
-            {
-              spaces: ['*'],
-              base: ['read'],
-              feature: {
-                feature1: ['all'],
-              },
-            },
-            {
-              spaces: ['marketing'],
-              base: [],
-              feature: {},
-            },
-          ],
-        },
-        privilegeIndex: 1,
-        ignoreAssigned: true,
-        result: {
-          actualPrivilege: 'all',
-          actualPrivilegeSource: PRIVILEGE_SOURCE.GLOBAL_FEATURE,
-          isDirectlyAssigned: false,
-        },
-      }
-    );
-
-    runTest(
-      'returns "read" when "all" assigned as the space feature privilege, which normally overrides assigned global base privilege',
-      {
-        role: {
-          spacesPrivileges: [
-            {
-              spaces: ['*'],
-              base: ['read'],
-              feature: {},
-            },
-            {
-              spaces: ['marketing'],
-              base: [],
-              feature: {
-                feature1: ['all'],
-              },
-            },
-          ],
-        },
-        privilegeIndex: 1,
-        ignoreAssigned: true,
-        result: {
-          actualPrivilege: 'read',
-          actualPrivilegeSource: PRIVILEGE_SOURCE.GLOBAL_BASE,
-          isDirectlyAssigned: false,
-        },
-      }
-    );
-
-    runTest(
-      'returns "all" when assigned as the space base privilege, which does not override assigned global base privilege',
-      {
-        role: {
-          spacesPrivileges: [
-            {
-              spaces: ['*'],
-              base: ['read'],
-              feature: {},
-            },
-            {
-              spaces: ['marketing'],
-              base: ['all'],
-              feature: {},
-            },
-          ],
-        },
-        privilegeIndex: 1,
-        ignoreAssigned: true,
-        result: {
-          actualPrivilege: 'all',
-          actualPrivilegeSource: PRIVILEGE_SOURCE.SPACE_BASE,
-          isDirectlyAssigned: false,
-        },
-      }
-    );
-
-    runTest(
-      'returns "all" when assigned as the global base privilege, which normally overrides assigned space feature privilege',
-      {
-        role: {
-          spacesPrivileges: [
-            {
-              spaces: ['*'],
-              base: ['all'],
-              feature: {},
-            },
-            {
-              spaces: ['marketing'],
-              base: [],
-              feature: {
-                feature1: ['read'],
-              },
-            },
-          ],
-        },
-        privilegeIndex: 1,
-        ignoreAssigned: true,
-        result: {
-          actualPrivilege: 'all',
-          actualPrivilegeSource: PRIVILEGE_SOURCE.GLOBAL_BASE,
-          isDirectlyAssigned: false,
-        },
-      }
-    );
-
-    runTest('returns "all" when assigned everywhere, without indicating override', {
-      role: {
-        spacesPrivileges: [
-          {
-            spaces: ['*'],
-            base: ['all'],
-            feature: {
-              feature1: ['all'],
-            },
-          },
-          {
-            spaces: ['marketing'],
-            base: ['all'],
-            feature: {
-              feature1: ['all'],
-            },
-          },
-        ],
-      },
-      privilegeIndex: 1,
-      ignoreAssigned: true,
-      result: {
-        actualPrivilege: 'all',
-        actualPrivilegeSource: PRIVILEGE_SOURCE.SPACE_BASE,
-        isDirectlyAssigned: false,
-      },
-    });
-
-    runTest('returns "all" when assigned at global feature, normally overriding space feature', {
-      role: {
-        spacesPrivileges: [
-          {
-            spaces: ['*'],
-            base: [],
-            feature: {
-              feature1: ['all'],
-            },
-          },
-          {
-            spaces: ['marketing'],
-            base: [],
-            feature: {
-              feature1: ['read'],
-            },
-          },
-        ],
-      },
-      privilegeIndex: 1,
-      ignoreAssigned: true,
-      result: {
-        actualPrivilege: 'all',
-        actualPrivilegeSource: PRIVILEGE_SOURCE.GLOBAL_FEATURE,
-        isDirectlyAssigned: false,
-      },
-    });
-  });
-});
diff --git a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/kibana_privilege_calculator/kibana_feature_privilege_calculator.ts b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/kibana_privilege_calculator/kibana_feature_privilege_calculator.ts
deleted file mode 100644
index 1ca87871aa892..0000000000000
--- a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/kibana_privilege_calculator/kibana_feature_privilege_calculator.ts
+++ /dev/null
@@ -1,209 +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 {
-  FeaturesPrivileges,
-  KibanaPrivileges,
-  RoleKibanaPrivilege,
-} from '../../../../../../../common/model';
-import { areActionsFullyCovered } from '../../../../../../../common/privilege_calculator_utils';
-import { NO_PRIVILEGE_VALUE } from '../constants';
-import { isGlobalPrivilegeDefinition } from '../../../privilege_utils';
-import {
-  PRIVILEGE_SOURCE,
-  PrivilegeExplanation,
-  PrivilegeScenario,
-} from './kibana_privilege_calculator_types';
-
-export class KibanaFeaturePrivilegeCalculator {
-  constructor(
-    private readonly kibanaPrivileges: KibanaPrivileges,
-    private readonly globalPrivilege: RoleKibanaPrivilege,
-    private readonly assignedGlobalBaseActions: string[],
-    private readonly rankedFeaturePrivileges: FeaturesPrivileges
-  ) {}
-
-  public getMostPermissiveFeaturePrivilege(
-    privilegeSpec: RoleKibanaPrivilege,
-    basePrivilegeExplanation: PrivilegeExplanation,
-    featureId: string,
-    ignoreAssigned: boolean
-  ): PrivilegeExplanation {
-    const scenarios = this.buildFeaturePrivilegeScenarios(
-      privilegeSpec,
-      basePrivilegeExplanation,
-      featureId,
-      ignoreAssigned
-    );
-
-    const featurePrivileges = this.rankedFeaturePrivileges[featureId] || [];
-
-    // inspect feature privileges in ranked order (most permissive -> least permissive)
-    for (const featurePrivilege of featurePrivileges) {
-      const actions = this.kibanaPrivileges
-        .getFeaturePrivileges()
-        .getActions(featureId, featurePrivilege);
-
-      // check if any of the scenarios satisfy the privilege - first one wins.
-      for (const scenario of scenarios) {
-        if (areActionsFullyCovered(scenario.actions, actions)) {
-          return {
-            actualPrivilege: featurePrivilege,
-            actualPrivilegeSource: scenario.actualPrivilegeSource,
-            isDirectlyAssigned: scenario.isDirectlyAssigned,
-            directlyAssignedFeaturePrivilegeMorePermissiveThanBase:
-              scenario.directlyAssignedFeaturePrivilegeMorePermissiveThanBase,
-            ...this.buildSupercededFields(
-              !scenario.isDirectlyAssigned,
-              scenario.supersededPrivilege,
-              scenario.supersededPrivilegeSource
-            ),
-          };
-        }
-      }
-    }
-
-    const isGlobal = isGlobalPrivilegeDefinition(privilegeSpec);
-    return {
-      actualPrivilege: NO_PRIVILEGE_VALUE,
-      actualPrivilegeSource: isGlobal
-        ? PRIVILEGE_SOURCE.GLOBAL_FEATURE
-        : PRIVILEGE_SOURCE.SPACE_FEATURE,
-      isDirectlyAssigned: true,
-    };
-  }
-
-  private buildFeaturePrivilegeScenarios(
-    privilegeSpec: RoleKibanaPrivilege,
-    basePrivilegeExplanation: PrivilegeExplanation,
-    featureId: string,
-    ignoreAssigned: boolean
-  ): PrivilegeScenario[] {
-    const scenarios: PrivilegeScenario[] = [];
-
-    const isGlobalPrivilege = isGlobalPrivilegeDefinition(privilegeSpec);
-
-    const assignedGlobalFeaturePrivilege = this.getAssignedFeaturePrivilege(
-      this.globalPrivilege,
-      featureId
-    );
-
-    const assignedFeaturePrivilege = this.getAssignedFeaturePrivilege(privilegeSpec, featureId);
-    const hasAssignedFeaturePrivilege =
-      !ignoreAssigned && assignedFeaturePrivilege !== NO_PRIVILEGE_VALUE;
-
-    scenarios.push({
-      actualPrivilegeSource: PRIVILEGE_SOURCE.GLOBAL_BASE,
-      isDirectlyAssigned: false,
-      actions: [...this.assignedGlobalBaseActions],
-      ...this.buildSupercededFields(
-        hasAssignedFeaturePrivilege,
-        assignedFeaturePrivilege,
-        isGlobalPrivilege ? PRIVILEGE_SOURCE.GLOBAL_FEATURE : PRIVILEGE_SOURCE.SPACE_FEATURE
-      ),
-    });
-
-    if (!isGlobalPrivilege || !ignoreAssigned) {
-      scenarios.push({
-        actualPrivilegeSource: PRIVILEGE_SOURCE.GLOBAL_FEATURE,
-        actions: this.getFeatureActions(featureId, assignedGlobalFeaturePrivilege),
-        isDirectlyAssigned: isGlobalPrivilege && hasAssignedFeaturePrivilege,
-        ...this.buildSupercededFields(
-          hasAssignedFeaturePrivilege && !isGlobalPrivilege,
-          assignedFeaturePrivilege,
-          PRIVILEGE_SOURCE.SPACE_FEATURE
-        ),
-      });
-    }
-
-    if (isGlobalPrivilege) {
-      return this.rankScenarios(scenarios);
-    }
-
-    // Otherwise, this is a space feature privilege
-
-    const includeSpaceBaseScenario =
-      basePrivilegeExplanation.actualPrivilegeSource === PRIVILEGE_SOURCE.SPACE_BASE ||
-      basePrivilegeExplanation.supersededPrivilegeSource === PRIVILEGE_SOURCE.SPACE_BASE;
-
-    const spaceBasePrivilege =
-      basePrivilegeExplanation.supersededPrivilege || basePrivilegeExplanation.actualPrivilege;
-
-    if (includeSpaceBaseScenario) {
-      scenarios.push({
-        actualPrivilegeSource: PRIVILEGE_SOURCE.SPACE_BASE,
-        isDirectlyAssigned: false,
-        actions: this.getBaseActions(PRIVILEGE_SOURCE.SPACE_BASE, spaceBasePrivilege),
-        ...this.buildSupercededFields(
-          hasAssignedFeaturePrivilege,
-          assignedFeaturePrivilege,
-          PRIVILEGE_SOURCE.SPACE_FEATURE
-        ),
-      });
-    }
-
-    if (!ignoreAssigned) {
-      const actions = this.getFeatureActions(
-        featureId,
-        this.getAssignedFeaturePrivilege(privilegeSpec, featureId)
-      );
-      const directlyAssignedFeaturePrivilegeMorePermissiveThanBase = !areActionsFullyCovered(
-        this.assignedGlobalBaseActions,
-        actions
-      );
-      scenarios.push({
-        actualPrivilegeSource: PRIVILEGE_SOURCE.SPACE_FEATURE,
-        isDirectlyAssigned: true,
-        directlyAssignedFeaturePrivilegeMorePermissiveThanBase,
-        actions,
-      });
-    }
-
-    return this.rankScenarios(scenarios);
-  }
-
-  private rankScenarios(scenarios: PrivilegeScenario[]): PrivilegeScenario[] {
-    return scenarios.sort(
-      (scenario1, scenario2) => scenario1.actualPrivilegeSource - scenario2.actualPrivilegeSource
-    );
-  }
-
-  private getBaseActions(source: PRIVILEGE_SOURCE, privilegeId: string) {
-    switch (source) {
-      case PRIVILEGE_SOURCE.GLOBAL_BASE:
-        return this.assignedGlobalBaseActions;
-      case PRIVILEGE_SOURCE.SPACE_BASE:
-        return this.kibanaPrivileges.getSpacesPrivileges().getActions(privilegeId);
-      default:
-        throw new Error(
-          `Cannot get base actions for unsupported privilege source ${PRIVILEGE_SOURCE[source]}`
-        );
-    }
-  }
-
-  private getFeatureActions(featureId: string, privilegeId: string) {
-    return this.kibanaPrivileges.getFeaturePrivileges().getActions(featureId, privilegeId);
-  }
-
-  private getAssignedFeaturePrivilege(privilegeSpec: RoleKibanaPrivilege, featureId: string) {
-    const featureEntry = privilegeSpec.feature[featureId] || [];
-    return featureEntry[0] || NO_PRIVILEGE_VALUE;
-  }
-
-  private buildSupercededFields(
-    isSuperceding: boolean,
-    supersededPrivilege?: string,
-    supersededPrivilegeSource?: PRIVILEGE_SOURCE
-  ) {
-    if (!isSuperceding) {
-      return {};
-    }
-    return {
-      supersededPrivilege,
-      supersededPrivilegeSource,
-    };
-  }
-}
diff --git a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/kibana_privilege_calculator/kibana_privilege_calculator.test.ts b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/kibana_privilege_calculator/kibana_privilege_calculator.test.ts
deleted file mode 100644
index 4c44c077f0336..0000000000000
--- a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/kibana_privilege_calculator/kibana_privilege_calculator.test.ts
+++ /dev/null
@@ -1,940 +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 { KibanaPrivileges, Role } from '../../../../../../../common/model';
-import { NO_PRIVILEGE_VALUE } from '../constants';
-import {
-  buildRole,
-  defaultPrivilegeDefinition,
-  fullyRestrictedBasePrivileges,
-  fullyRestrictedFeaturePrivileges,
-  unrestrictedBasePrivileges,
-  unrestrictedFeaturePrivileges,
-} from './__fixtures__';
-import {
-  AllowedPrivilege,
-  PRIVILEGE_SOURCE,
-  PrivilegeExplanation,
-} from './kibana_privilege_calculator_types';
-import { KibanaPrivilegeCalculatorFactory } from './kibana_privileges_calculator_factory';
-
-const buildEffectivePrivileges = (
-  role: Role,
-  kibanaPrivileges: KibanaPrivileges = defaultPrivilegeDefinition
-) => {
-  const factory = new KibanaPrivilegeCalculatorFactory(kibanaPrivileges);
-  return factory.getInstance(role);
-};
-
-interface BuildExpectedFeaturePrivilegesOption {
-  features: string[];
-  privilegeExplanation: PrivilegeExplanation;
-}
-
-const buildExpectedFeaturePrivileges = (options: BuildExpectedFeaturePrivilegesOption[]) => {
-  return {
-    feature: options.reduce((acc1, option) => {
-      return {
-        ...acc1,
-        ...option.features.reduce((acc2, featureId) => {
-          return {
-            ...acc2,
-            [featureId]: option.privilegeExplanation,
-          };
-        }, {}),
-      };
-    }, {}),
-  };
-};
-
-describe('calculateEffectivePrivileges', () => {
-  it(`returns an empty array for an empty role`, () => {
-    const role = buildRole();
-    role.kibana = [];
-
-    const effectivePrivileges = buildEffectivePrivileges(role);
-    const calculatedPrivileges = effectivePrivileges.calculateEffectivePrivileges();
-    expect(calculatedPrivileges).toHaveLength(0);
-  });
-
-  it(`calculates "none" for all privileges when nothing is assigned`, () => {
-    const role = buildRole({
-      spacesPrivileges: [
-        {
-          spaces: ['foo', 'bar'],
-          base: [],
-          feature: {},
-        },
-      ],
-    });
-    const effectivePrivileges = buildEffectivePrivileges(role);
-    const calculatedPrivileges = effectivePrivileges.calculateEffectivePrivileges();
-    expect(calculatedPrivileges).toEqual([
-      {
-        base: {
-          actualPrivilege: NO_PRIVILEGE_VALUE,
-          actualPrivilegeSource: PRIVILEGE_SOURCE.SPACE_BASE,
-          isDirectlyAssigned: true,
-        },
-        ...buildExpectedFeaturePrivileges([
-          {
-            features: ['feature1', 'feature2', 'feature3', 'feature4'],
-            privilegeExplanation: {
-              actualPrivilege: NO_PRIVILEGE_VALUE,
-              actualPrivilegeSource: PRIVILEGE_SOURCE.SPACE_FEATURE,
-              isDirectlyAssigned: true,
-            },
-          },
-        ]),
-      },
-    ]);
-  });
-
-  describe(`with global base privilege of "all"`, () => {
-    it(`calculates global feature privilege of all for features 1-3 and read for feature 4`, () => {
-      const role = buildRole({
-        spacesPrivileges: [
-          {
-            spaces: ['*'],
-            base: ['all'],
-            feature: {},
-          },
-        ],
-      });
-      const effectivePrivileges = buildEffectivePrivileges(role);
-      const calculatedPrivileges = effectivePrivileges.calculateEffectivePrivileges();
-
-      expect(calculatedPrivileges).toEqual([
-        {
-          base: {
-            actualPrivilege: 'all',
-            actualPrivilegeSource: PRIVILEGE_SOURCE.GLOBAL_BASE,
-            isDirectlyAssigned: true,
-          },
-          ...buildExpectedFeaturePrivileges([
-            {
-              features: ['feature1', 'feature2', 'feature3'],
-              privilegeExplanation: {
-                actualPrivilege: 'all',
-                actualPrivilegeSource: PRIVILEGE_SOURCE.GLOBAL_BASE,
-                isDirectlyAssigned: false,
-              },
-            },
-            {
-              features: ['feature4'],
-              privilegeExplanation: {
-                actualPrivilege: 'read',
-                actualPrivilegeSource: PRIVILEGE_SOURCE.GLOBAL_BASE,
-                isDirectlyAssigned: false,
-              },
-            },
-          ]),
-        },
-      ]);
-    });
-
-    it(`calculates space base and feature privilege of all for features 1-3 and read for feature 4`, () => {
-      const role = buildRole({
-        spacesPrivileges: [
-          {
-            spaces: ['*'],
-            base: ['all'],
-            feature: {},
-          },
-          {
-            spaces: ['foo'],
-            base: [],
-            feature: {},
-          },
-        ],
-      });
-      const effectivePrivileges = buildEffectivePrivileges(role);
-      const calculatedPrivileges = effectivePrivileges.calculateEffectivePrivileges();
-
-      const calculatedSpacePrivileges = calculatedPrivileges[1];
-
-      expect(calculatedSpacePrivileges).toEqual({
-        base: {
-          actualPrivilege: 'all',
-          actualPrivilegeSource: PRIVILEGE_SOURCE.GLOBAL_BASE,
-          isDirectlyAssigned: false,
-        },
-        ...buildExpectedFeaturePrivileges([
-          {
-            features: ['feature1', 'feature2', 'feature3'],
-            privilegeExplanation: {
-              actualPrivilege: 'all',
-              actualPrivilegeSource: PRIVILEGE_SOURCE.GLOBAL_BASE,
-              isDirectlyAssigned: false,
-            },
-          },
-          {
-            features: ['feature4'],
-            privilegeExplanation: {
-              actualPrivilege: 'read',
-              actualPrivilegeSource: PRIVILEGE_SOURCE.GLOBAL_BASE,
-              isDirectlyAssigned: false,
-            },
-          },
-        ]),
-      });
-    });
-
-    describe(`and with feature privileges assigned`, () => {
-      it('returns the base privileges when they are more permissive', () => {
-        const role = buildRole({
-          spacesPrivileges: [
-            {
-              spaces: ['*'],
-              base: ['all'],
-              feature: {
-                feature1: ['read'],
-                feature2: ['read'],
-                feature3: ['read'],
-                feature4: ['read'],
-              },
-            },
-            {
-              spaces: ['foo'],
-              base: [],
-              feature: {
-                feature1: ['read'],
-                feature2: ['read'],
-                feature3: ['read'],
-                feature4: ['read'],
-              },
-            },
-          ],
-        });
-        const effectivePrivileges = buildEffectivePrivileges(role);
-        const calculatedPrivileges = effectivePrivileges.calculateEffectivePrivileges();
-
-        expect(calculatedPrivileges).toEqual([
-          {
-            base: {
-              actualPrivilege: 'all',
-              actualPrivilegeSource: PRIVILEGE_SOURCE.GLOBAL_BASE,
-              isDirectlyAssigned: true,
-            },
-            ...buildExpectedFeaturePrivileges([
-              {
-                features: ['feature1', 'feature2', 'feature3'],
-                privilegeExplanation: {
-                  actualPrivilege: 'all',
-                  actualPrivilegeSource: PRIVILEGE_SOURCE.GLOBAL_BASE,
-                  isDirectlyAssigned: false,
-                  supersededPrivilege: 'read',
-                  supersededPrivilegeSource: PRIVILEGE_SOURCE.GLOBAL_FEATURE,
-                },
-              },
-              {
-                features: ['feature4'],
-                privilegeExplanation: {
-                  actualPrivilege: 'read',
-                  actualPrivilegeSource: PRIVILEGE_SOURCE.GLOBAL_FEATURE,
-                  isDirectlyAssigned: true,
-                },
-              },
-            ]),
-          },
-          {
-            base: {
-              actualPrivilege: 'all',
-              actualPrivilegeSource: PRIVILEGE_SOURCE.GLOBAL_BASE,
-              isDirectlyAssigned: false,
-            },
-            ...buildExpectedFeaturePrivileges([
-              {
-                features: ['feature1', 'feature2', 'feature3'],
-                privilegeExplanation: {
-                  actualPrivilege: 'all',
-                  actualPrivilegeSource: PRIVILEGE_SOURCE.GLOBAL_BASE,
-                  isDirectlyAssigned: false,
-                  supersededPrivilege: 'read',
-                  supersededPrivilegeSource: PRIVILEGE_SOURCE.SPACE_FEATURE,
-                },
-              },
-              {
-                features: ['feature4'],
-                privilegeExplanation: {
-                  actualPrivilege: 'read',
-                  actualPrivilegeSource: PRIVILEGE_SOURCE.SPACE_FEATURE,
-                  isDirectlyAssigned: true,
-                  directlyAssignedFeaturePrivilegeMorePermissiveThanBase: false,
-                },
-              },
-            ]),
-          },
-        ]);
-      });
-    });
-  });
-
-  describe(`with global base privilege of "read"`, () => {
-    it(`it calculates space base and feature privileges when none are provided`, () => {
-      const role = buildRole({
-        spacesPrivileges: [
-          {
-            spaces: ['*'],
-            base: ['read'],
-            feature: {},
-          },
-          {
-            spaces: ['foo'],
-            base: [],
-            feature: {},
-          },
-        ],
-      });
-      const effectivePrivileges = buildEffectivePrivileges(role);
-      const calculatedPrivileges = effectivePrivileges.calculateEffectivePrivileges();
-
-      expect(calculatedPrivileges).toEqual([
-        {
-          base: {
-            actualPrivilege: 'read',
-            actualPrivilegeSource: PRIVILEGE_SOURCE.GLOBAL_BASE,
-            isDirectlyAssigned: true,
-          },
-          ...buildExpectedFeaturePrivileges([
-            {
-              features: ['feature1', 'feature2'],
-              privilegeExplanation: {
-                actualPrivilege: 'read',
-                actualPrivilegeSource: PRIVILEGE_SOURCE.GLOBAL_BASE,
-                isDirectlyAssigned: false,
-              },
-            },
-            {
-              features: ['feature3'],
-              privilegeExplanation: {
-                actualPrivilege: NO_PRIVILEGE_VALUE,
-                actualPrivilegeSource: PRIVILEGE_SOURCE.GLOBAL_FEATURE,
-                isDirectlyAssigned: true,
-              },
-            },
-            {
-              features: ['feature4'],
-              privilegeExplanation: {
-                actualPrivilege: 'read',
-                actualPrivilegeSource: PRIVILEGE_SOURCE.GLOBAL_BASE,
-                isDirectlyAssigned: false,
-              },
-            },
-          ]),
-        },
-        {
-          base: {
-            actualPrivilege: 'read',
-            actualPrivilegeSource: PRIVILEGE_SOURCE.GLOBAL_BASE,
-            isDirectlyAssigned: false,
-          },
-          ...buildExpectedFeaturePrivileges([
-            {
-              features: ['feature1', 'feature2'],
-              privilegeExplanation: {
-                actualPrivilege: 'read',
-                actualPrivilegeSource: PRIVILEGE_SOURCE.GLOBAL_BASE,
-                isDirectlyAssigned: false,
-              },
-            },
-            {
-              features: ['feature3'],
-              privilegeExplanation: {
-                actualPrivilege: NO_PRIVILEGE_VALUE,
-                actualPrivilegeSource: PRIVILEGE_SOURCE.SPACE_FEATURE,
-                isDirectlyAssigned: true,
-              },
-            },
-            {
-              features: ['feature4'],
-              privilegeExplanation: {
-                actualPrivilege: 'read',
-                actualPrivilegeSource: PRIVILEGE_SOURCE.GLOBAL_BASE,
-                isDirectlyAssigned: false,
-              },
-            },
-          ]),
-        },
-      ]);
-    });
-
-    describe('and with feature privileges assigned', () => {
-      it('returns the feature privileges when they are more permissive', () => {
-        const role = buildRole({
-          spacesPrivileges: [
-            {
-              spaces: ['*'],
-              base: ['read'],
-              feature: {
-                feature1: ['all'],
-                feature2: ['all'],
-                feature3: ['all'],
-                feature4: ['all'],
-              },
-            },
-            {
-              spaces: ['foo'],
-              base: [],
-              feature: {
-                feature1: ['all'],
-                feature2: ['all'],
-                feature3: ['all'],
-                feature4: ['all'],
-              },
-            },
-          ],
-        });
-        const effectivePrivileges = buildEffectivePrivileges(role);
-        const calculatedPrivileges = effectivePrivileges.calculateEffectivePrivileges();
-
-        expect(calculatedPrivileges).toEqual([
-          {
-            base: {
-              actualPrivilege: 'read',
-              actualPrivilegeSource: PRIVILEGE_SOURCE.GLOBAL_BASE,
-              isDirectlyAssigned: true,
-            },
-            ...buildExpectedFeaturePrivileges([
-              {
-                features: ['feature1', 'feature2', 'feature3', 'feature4'],
-                privilegeExplanation: {
-                  actualPrivilege: 'all',
-                  actualPrivilegeSource: PRIVILEGE_SOURCE.GLOBAL_FEATURE,
-                  isDirectlyAssigned: true,
-                },
-              },
-            ]),
-          },
-          {
-            base: {
-              actualPrivilege: 'read',
-              actualPrivilegeSource: PRIVILEGE_SOURCE.GLOBAL_BASE,
-              isDirectlyAssigned: false,
-            },
-            ...buildExpectedFeaturePrivileges([
-              {
-                features: ['feature1', 'feature2', 'feature3', 'feature4'],
-                privilegeExplanation: {
-                  actualPrivilege: 'all',
-                  actualPrivilegeSource: PRIVILEGE_SOURCE.SPACE_FEATURE,
-                  isDirectlyAssigned: true,
-                  directlyAssignedFeaturePrivilegeMorePermissiveThanBase: true,
-                },
-              },
-            ]),
-          },
-        ]);
-      });
-    });
-  });
-
-  describe('with both global and space base privileges assigned', () => {
-    it(`does not override space base of "all" when global base is "read"`, () => {
-      const role = buildRole({
-        spacesPrivileges: [
-          {
-            spaces: ['*'],
-            base: ['read'],
-            feature: {},
-          },
-          {
-            spaces: ['foo'],
-            base: ['all'],
-            feature: {},
-          },
-        ],
-      });
-      const effectivePrivileges = buildEffectivePrivileges(role);
-      const calculatedPrivileges = effectivePrivileges.calculateEffectivePrivileges();
-
-      expect(calculatedPrivileges).toEqual([
-        {
-          base: {
-            actualPrivilege: 'read',
-            actualPrivilegeSource: PRIVILEGE_SOURCE.GLOBAL_BASE,
-            isDirectlyAssigned: true,
-          },
-          ...buildExpectedFeaturePrivileges([
-            {
-              features: ['feature1', 'feature2'],
-              privilegeExplanation: {
-                actualPrivilege: 'read',
-                actualPrivilegeSource: PRIVILEGE_SOURCE.GLOBAL_BASE,
-                isDirectlyAssigned: false,
-              },
-            },
-            {
-              features: ['feature3'],
-              privilegeExplanation: {
-                actualPrivilege: NO_PRIVILEGE_VALUE,
-                actualPrivilegeSource: PRIVILEGE_SOURCE.GLOBAL_FEATURE,
-                isDirectlyAssigned: true,
-              },
-            },
-            {
-              features: ['feature4'],
-              privilegeExplanation: {
-                actualPrivilege: 'read',
-                actualPrivilegeSource: PRIVILEGE_SOURCE.GLOBAL_BASE,
-                isDirectlyAssigned: false,
-              },
-            },
-          ]),
-        },
-        {
-          base: {
-            actualPrivilege: 'all',
-            actualPrivilegeSource: PRIVILEGE_SOURCE.SPACE_BASE,
-            isDirectlyAssigned: true,
-          },
-          ...buildExpectedFeaturePrivileges([
-            {
-              features: ['feature1', 'feature2', 'feature3'],
-              privilegeExplanation: {
-                actualPrivilege: 'all',
-                actualPrivilegeSource: PRIVILEGE_SOURCE.SPACE_BASE,
-                isDirectlyAssigned: false,
-              },
-            },
-            {
-              features: ['feature4'],
-              privilegeExplanation: {
-                actualPrivilege: 'read',
-                actualPrivilegeSource: PRIVILEGE_SOURCE.SPACE_BASE,
-                isDirectlyAssigned: false,
-              },
-            },
-          ]),
-        },
-      ]);
-    });
-
-    it(`calculates "all" for space base and space features when superceded by global "all"`, () => {
-      const role = buildRole({
-        spacesPrivileges: [
-          {
-            spaces: ['*'],
-            base: ['all'],
-            feature: {},
-          },
-          {
-            spaces: ['foo'],
-            base: ['read'],
-            feature: {},
-          },
-        ],
-      });
-      const effectivePrivileges = buildEffectivePrivileges(role);
-      const calculatedPrivileges = effectivePrivileges.calculateEffectivePrivileges();
-
-      expect(calculatedPrivileges).toEqual([
-        {
-          base: {
-            actualPrivilege: 'all',
-            actualPrivilegeSource: PRIVILEGE_SOURCE.GLOBAL_BASE,
-            isDirectlyAssigned: true,
-          },
-          ...buildExpectedFeaturePrivileges([
-            {
-              features: ['feature1', 'feature2', 'feature3'],
-              privilegeExplanation: {
-                actualPrivilege: 'all',
-                actualPrivilegeSource: PRIVILEGE_SOURCE.GLOBAL_BASE,
-                isDirectlyAssigned: false,
-              },
-            },
-            {
-              features: ['feature4'],
-              privilegeExplanation: {
-                actualPrivilege: 'read',
-                actualPrivilegeSource: PRIVILEGE_SOURCE.GLOBAL_BASE,
-                isDirectlyAssigned: false,
-              },
-            },
-          ]),
-        },
-        {
-          base: {
-            actualPrivilege: 'all',
-            actualPrivilegeSource: PRIVILEGE_SOURCE.GLOBAL_BASE,
-            isDirectlyAssigned: false,
-            supersededPrivilege: 'read',
-            supersededPrivilegeSource: PRIVILEGE_SOURCE.SPACE_BASE,
-          },
-          ...buildExpectedFeaturePrivileges([
-            {
-              features: ['feature1', 'feature2', 'feature3'],
-              privilegeExplanation: {
-                actualPrivilege: 'all',
-                actualPrivilegeSource: PRIVILEGE_SOURCE.GLOBAL_BASE,
-                isDirectlyAssigned: false,
-              },
-            },
-            {
-              features: ['feature4'],
-              privilegeExplanation: {
-                actualPrivilege: 'read',
-                actualPrivilegeSource: PRIVILEGE_SOURCE.SPACE_BASE,
-                isDirectlyAssigned: false,
-              },
-            },
-          ]),
-        },
-      ]);
-    });
-
-    it(`does not override feature privileges when they are more permissive`, () => {
-      const role = buildRole({
-        spacesPrivileges: [
-          {
-            spaces: ['*'],
-            base: ['read'],
-            feature: {},
-          },
-          {
-            spaces: ['foo'],
-            base: ['read'],
-            feature: {
-              feature1: ['all'],
-              feature2: ['all'],
-              feature3: ['all'],
-              feature4: ['all'],
-            },
-          },
-        ],
-      });
-      const effectivePrivileges = buildEffectivePrivileges(role);
-      const calculatedPrivileges = effectivePrivileges.calculateEffectivePrivileges();
-
-      expect(calculatedPrivileges).toEqual([
-        {
-          base: {
-            actualPrivilege: 'read',
-            actualPrivilegeSource: PRIVILEGE_SOURCE.GLOBAL_BASE,
-            isDirectlyAssigned: true,
-          },
-          ...buildExpectedFeaturePrivileges([
-            {
-              features: ['feature1', 'feature2'],
-              privilegeExplanation: {
-                actualPrivilege: 'read',
-                actualPrivilegeSource: PRIVILEGE_SOURCE.GLOBAL_BASE,
-                isDirectlyAssigned: false,
-              },
-            },
-            {
-              features: ['feature3'],
-              privilegeExplanation: {
-                actualPrivilege: NO_PRIVILEGE_VALUE,
-                actualPrivilegeSource: PRIVILEGE_SOURCE.GLOBAL_FEATURE,
-                isDirectlyAssigned: true,
-              },
-            },
-            {
-              features: ['feature4'],
-              privilegeExplanation: {
-                actualPrivilege: 'read',
-                actualPrivilegeSource: PRIVILEGE_SOURCE.GLOBAL_BASE,
-                isDirectlyAssigned: false,
-              },
-            },
-          ]),
-        },
-        {
-          base: {
-            actualPrivilege: 'read',
-            actualPrivilegeSource: PRIVILEGE_SOURCE.GLOBAL_BASE,
-            isDirectlyAssigned: false,
-            supersededPrivilege: 'read',
-            supersededPrivilegeSource: PRIVILEGE_SOURCE.SPACE_BASE,
-          },
-          ...buildExpectedFeaturePrivileges([
-            {
-              features: ['feature1', 'feature2', 'feature3', 'feature4'],
-              privilegeExplanation: {
-                actualPrivilege: 'all',
-                actualPrivilegeSource: PRIVILEGE_SOURCE.SPACE_FEATURE,
-                isDirectlyAssigned: true,
-                directlyAssignedFeaturePrivilegeMorePermissiveThanBase: true,
-              },
-            },
-          ]),
-        },
-      ]);
-    });
-  });
-});
-
-describe('calculateAllowedPrivileges', () => {
-  it('allows all privileges when none are currently assigned', () => {
-    const role = buildRole({
-      spacesPrivileges: [
-        {
-          spaces: ['*'],
-          base: [],
-          feature: {},
-        },
-        {
-          spaces: ['foo'],
-          base: [],
-          feature: {},
-        },
-      ],
-    });
-
-    const privilegeCalculator = buildEffectivePrivileges(role);
-
-    const result: AllowedPrivilege[] = privilegeCalculator.calculateAllowedPrivileges();
-
-    expect(result).toEqual([
-      {
-        ...unrestrictedBasePrivileges,
-        ...unrestrictedFeaturePrivileges,
-      },
-      {
-        ...unrestrictedBasePrivileges,
-        ...unrestrictedFeaturePrivileges,
-      },
-    ]);
-  });
-
-  it('allows all global base privileges, but just "all" for everything else when global is set to "all"', () => {
-    const role = buildRole({
-      spacesPrivileges: [
-        {
-          spaces: ['*'],
-          base: ['all'],
-          feature: {},
-        },
-        {
-          spaces: ['foo'],
-          base: [],
-          feature: {},
-        },
-      ],
-    });
-
-    const privilegeCalculator = buildEffectivePrivileges(role);
-
-    const result: AllowedPrivilege[] = privilegeCalculator.calculateAllowedPrivileges();
-
-    expect(result).toEqual([
-      {
-        ...unrestrictedBasePrivileges,
-        ...fullyRestrictedFeaturePrivileges,
-      },
-      {
-        ...fullyRestrictedBasePrivileges,
-        ...fullyRestrictedFeaturePrivileges,
-      },
-    ]);
-  });
-
-  it(`allows feature privileges to be set to "all" or "read" when global base is "read"`, () => {
-    const role = buildRole({
-      spacesPrivileges: [
-        {
-          spaces: ['*'],
-          base: ['read'],
-          feature: {},
-        },
-        {
-          spaces: ['foo'],
-          base: [],
-          feature: {},
-        },
-      ],
-    });
-
-    const privilegeCalculator = buildEffectivePrivileges(role);
-
-    const result: AllowedPrivilege[] = privilegeCalculator.calculateAllowedPrivileges();
-
-    const expectedFeaturePrivileges = {
-      feature: {
-        feature1: {
-          privileges: ['all', 'read'],
-          canUnassign: false,
-        },
-        feature2: {
-          privileges: ['all', 'read'],
-          canUnassign: false,
-        },
-        feature3: {
-          privileges: ['all'],
-          canUnassign: true, // feature 3 has no "read" privilege governed by global "all"
-        },
-        feature4: {
-          privileges: ['all', 'read'],
-          canUnassign: false,
-        },
-      },
-    };
-
-    expect(result).toEqual([
-      {
-        ...unrestrictedBasePrivileges,
-        ...expectedFeaturePrivileges,
-      },
-      {
-        base: {
-          privileges: ['all', 'read'],
-          canUnassign: false,
-        },
-        ...expectedFeaturePrivileges,
-      },
-    ]);
-  });
-
-  it(`allows feature privileges to be set to "all" or "read" when space base is "read"`, () => {
-    const role = buildRole({
-      spacesPrivileges: [
-        {
-          spaces: ['*'],
-          base: [],
-          feature: {},
-        },
-        {
-          spaces: ['foo'],
-          base: ['read'],
-          feature: {},
-        },
-      ],
-    });
-
-    const privilegeCalculator = buildEffectivePrivileges(role);
-
-    const result: AllowedPrivilege[] = privilegeCalculator.calculateAllowedPrivileges();
-
-    expect(result).toEqual([
-      {
-        ...unrestrictedBasePrivileges,
-        ...unrestrictedFeaturePrivileges,
-      },
-      {
-        base: {
-          privileges: ['all', 'read'],
-          canUnassign: true,
-        },
-        feature: {
-          feature1: {
-            privileges: ['all', 'read'],
-            canUnassign: false,
-          },
-          feature2: {
-            privileges: ['all', 'read'],
-            canUnassign: false,
-          },
-          feature3: {
-            privileges: ['all'],
-            canUnassign: true, // feature 3 has no "read" privilege governed by space "all"
-          },
-          feature4: {
-            privileges: ['all', 'read'],
-            canUnassign: false,
-          },
-        },
-      },
-    ]);
-  });
-
-  it(`allows space base privilege to be set to "all" or "read" when space base is already "all"`, () => {
-    const role = buildRole({
-      spacesPrivileges: [
-        {
-          spaces: ['foo'],
-          base: ['all'],
-          feature: {},
-        },
-      ],
-    });
-
-    const privilegeCalculator = buildEffectivePrivileges(role);
-
-    const result: AllowedPrivilege[] = privilegeCalculator.calculateAllowedPrivileges();
-
-    expect(result).toEqual([
-      {
-        ...unrestrictedBasePrivileges,
-        feature: {
-          feature1: {
-            privileges: ['all'],
-            canUnassign: false,
-          },
-          feature2: {
-            privileges: ['all'],
-            canUnassign: false,
-          },
-          feature3: {
-            privileges: ['all'],
-            canUnassign: false,
-          },
-          feature4: {
-            privileges: ['all', 'read'],
-            canUnassign: false,
-          },
-        },
-      },
-    ]);
-  });
-
-  it(`restricts space feature privileges when global feature privileges are set`, () => {
-    const role = buildRole({
-      spacesPrivileges: [
-        {
-          spaces: ['*'],
-          base: [],
-          feature: {
-            feature1: ['all'],
-            feature2: ['read'],
-            feature4: ['all'],
-          },
-        },
-        {
-          spaces: ['foo'],
-          base: [],
-          feature: {},
-        },
-      ],
-    });
-
-    const privilegeCalculator = buildEffectivePrivileges(role);
-
-    const result: AllowedPrivilege[] = privilegeCalculator.calculateAllowedPrivileges();
-
-    expect(result).toEqual([
-      {
-        ...unrestrictedBasePrivileges,
-        ...unrestrictedFeaturePrivileges,
-      },
-      {
-        base: {
-          privileges: ['all', 'read'],
-          canUnassign: true,
-        },
-        feature: {
-          feature1: {
-            privileges: ['all'],
-            canUnassign: false,
-          },
-          feature2: {
-            privileges: ['all', 'read'],
-            canUnassign: false,
-          },
-          feature3: {
-            privileges: ['all'],
-            canUnassign: true, // feature 3 has no "read" privilege governed by space "all"
-          },
-          feature4: {
-            privileges: ['all'],
-            canUnassign: false,
-          },
-        },
-      },
-    ]);
-  });
-});
diff --git a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/kibana_privilege_calculator/kibana_privilege_calculator.ts b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/kibana_privilege_calculator/kibana_privilege_calculator.ts
deleted file mode 100644
index c3bf12b6aef5f..0000000000000
--- a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/kibana_privilege_calculator/kibana_privilege_calculator.ts
+++ /dev/null
@@ -1,113 +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 {
-  FeaturesPrivileges,
-  KibanaPrivileges,
-  Role,
-  RoleKibanaPrivilege,
-} from '../../../../../../../common/model';
-import { isGlobalPrivilegeDefinition } from '../../../privilege_utils';
-import { KibanaAllowedPrivilegesCalculator } from './kibana_allowed_privileges_calculator';
-import { KibanaBasePrivilegeCalculator } from './kibana_base_privilege_calculator';
-import { KibanaFeaturePrivilegeCalculator } from './kibana_feature_privilege_calculator';
-import { AllowedPrivilege, CalculatedPrivilege } from './kibana_privilege_calculator_types';
-
-export class KibanaPrivilegeCalculator {
-  private allowedPrivilegesCalculator: KibanaAllowedPrivilegesCalculator;
-
-  private effectiveBasePrivilegesCalculator: KibanaBasePrivilegeCalculator;
-
-  private effectiveFeaturePrivilegesCalculator: KibanaFeaturePrivilegeCalculator;
-
-  constructor(
-    private readonly kibanaPrivileges: KibanaPrivileges,
-    private readonly role: Role,
-    public readonly rankedFeaturePrivileges: FeaturesPrivileges
-  ) {
-    const globalPrivilege = this.locateGlobalPrivilege(role);
-
-    const assignedGlobalBaseActions: string[] = globalPrivilege.base[0]
-      ? kibanaPrivileges.getGlobalPrivileges().getActions(globalPrivilege.base[0])
-      : [];
-
-    this.allowedPrivilegesCalculator = new KibanaAllowedPrivilegesCalculator(
-      kibanaPrivileges,
-      role
-    );
-
-    this.effectiveBasePrivilegesCalculator = new KibanaBasePrivilegeCalculator(
-      kibanaPrivileges,
-      globalPrivilege,
-      assignedGlobalBaseActions
-    );
-
-    this.effectiveFeaturePrivilegesCalculator = new KibanaFeaturePrivilegeCalculator(
-      kibanaPrivileges,
-      globalPrivilege,
-      assignedGlobalBaseActions,
-      rankedFeaturePrivileges
-    );
-  }
-
-  public calculateEffectivePrivileges(ignoreAssigned: boolean = false): CalculatedPrivilege[] {
-    const { kibana = [] } = this.role;
-    return kibana.map(privilegeSpec =>
-      this.calculateEffectivePrivilege(privilegeSpec, ignoreAssigned)
-    );
-  }
-
-  public calculateAllowedPrivileges(): AllowedPrivilege[] {
-    const effectivePrivs = this.calculateEffectivePrivileges(true);
-    return this.allowedPrivilegesCalculator.calculateAllowedPrivileges(effectivePrivs);
-  }
-
-  private calculateEffectivePrivilege(
-    privilegeSpec: RoleKibanaPrivilege,
-    ignoreAssigned: boolean
-  ): CalculatedPrivilege {
-    const result: CalculatedPrivilege = {
-      base: this.effectiveBasePrivilegesCalculator.getMostPermissiveBasePrivilege(
-        privilegeSpec,
-        ignoreAssigned
-      ),
-      feature: {},
-      reserved: privilegeSpec._reserved,
-    };
-
-    // If calculations wish to ignoreAssigned, then we still need to know what the real effective base privilege is
-    // without ignoring assigned, in order to calculate the correct feature privileges.
-    const effectiveBase = ignoreAssigned
-      ? this.effectiveBasePrivilegesCalculator.getMostPermissiveBasePrivilege(privilegeSpec, false)
-      : result.base;
-
-    const allFeaturePrivileges = this.kibanaPrivileges.getFeaturePrivileges().getAllPrivileges();
-    result.feature = Object.keys(allFeaturePrivileges).reduce((acc, featureId) => {
-      return {
-        ...acc,
-        [featureId]: this.effectiveFeaturePrivilegesCalculator.getMostPermissiveFeaturePrivilege(
-          privilegeSpec,
-          effectiveBase,
-          featureId,
-          ignoreAssigned
-        ),
-      };
-    }, {});
-
-    return result;
-  }
-
-  private locateGlobalPrivilege(role: Role) {
-    const spacePrivileges = role.kibana;
-    return (
-      spacePrivileges.find(privileges => isGlobalPrivilegeDefinition(privileges)) || {
-        spaces: [] as string[],
-        base: [] as string[],
-        feature: {},
-      }
-    );
-  }
-}
diff --git a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/kibana_privilege_calculator/kibana_privilege_calculator_types.ts b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/kibana_privilege_calculator/kibana_privilege_calculator_types.ts
deleted file mode 100644
index aeaf12d02210a..0000000000000
--- a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/kibana_privilege_calculator/kibana_privilege_calculator_types.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.
- */
-
-/**
- * Describes the source of a privilege.
- */
-export enum PRIVILEGE_SOURCE {
-  /** Privilege is assigned directly to the entity */
-  SPACE_FEATURE = 10,
-
-  /** Privilege is derived from space base privilege */
-  SPACE_BASE = 20,
-
-  /** Privilege is derived from global feature privilege */
-  GLOBAL_FEATURE = 30,
-
-  /** Privilege is derived from global base privilege */
-  GLOBAL_BASE = 40,
-}
-
-export interface PrivilegeExplanation {
-  actualPrivilege: string;
-  actualPrivilegeSource: PRIVILEGE_SOURCE;
-  isDirectlyAssigned: boolean;
-  supersededPrivilege?: string;
-  supersededPrivilegeSource?: PRIVILEGE_SOURCE;
-  directlyAssignedFeaturePrivilegeMorePermissiveThanBase?: boolean;
-}
-
-export interface CalculatedPrivilege {
-  base: PrivilegeExplanation;
-  feature: {
-    [featureId: string]: PrivilegeExplanation | undefined;
-  };
-  reserved: undefined | string[];
-}
-
-export interface PrivilegeScenario {
-  actualPrivilegeSource: PRIVILEGE_SOURCE;
-  isDirectlyAssigned: boolean;
-  supersededPrivilege?: string;
-  supersededPrivilegeSource?: PRIVILEGE_SOURCE;
-  actions: string[];
-  directlyAssignedFeaturePrivilegeMorePermissiveThanBase?: boolean;
-}
-
-export interface AllowedPrivilege {
-  base: {
-    privileges: string[];
-    canUnassign: boolean;
-  };
-  feature: {
-    [featureId: string]:
-      | {
-          privileges: string[];
-          canUnassign: boolean;
-        }
-      | undefined;
-  };
-}
diff --git a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/kibana_privilege_calculator/kibana_privileges_calculator_factory.ts b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/kibana_privilege_calculator/kibana_privileges_calculator_factory.ts
deleted file mode 100644
index febdb64b93d61..0000000000000
--- a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/kibana_privilege_calculator/kibana_privileges_calculator_factory.ts
+++ /dev/null
@@ -1,81 +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 {
-  FeaturesPrivileges,
-  KibanaPrivileges,
-  Role,
-  copyRole,
-} from '../../../../../../../common/model';
-import { compareActions } from '../../../../../../../common/privilege_calculator_utils';
-import { KibanaPrivilegeCalculator } from './kibana_privilege_calculator';
-
-export class KibanaPrivilegeCalculatorFactory {
-  /** All feature privileges, sorted from most permissive => least permissive. */
-  public readonly rankedFeaturePrivileges: FeaturesPrivileges;
-
-  constructor(private readonly kibanaPrivileges: KibanaPrivileges) {
-    this.rankedFeaturePrivileges = {};
-    const featurePrivilegeSet = kibanaPrivileges.getFeaturePrivileges().getAllPrivileges();
-
-    Object.entries(featurePrivilegeSet).forEach(([featureId, privileges]) => {
-      this.rankedFeaturePrivileges[featureId] = privileges.sort((privilege1, privilege2) => {
-        const privilege1Actions = kibanaPrivileges
-          .getFeaturePrivileges()
-          .getActions(featureId, privilege1);
-        const privilege2Actions = kibanaPrivileges
-          .getFeaturePrivileges()
-          .getActions(featureId, privilege2);
-        return compareActions(privilege1Actions, privilege2Actions);
-      });
-    });
-  }
-
-  /**
-   * Creates an KibanaPrivilegeCalculator instance for the specified role.
-   * @param role
-   */
-  public getInstance(role: Role) {
-    const roleCopy = copyRole(role);
-
-    this.sortPrivileges(roleCopy);
-    return new KibanaPrivilegeCalculator(
-      this.kibanaPrivileges,
-      roleCopy,
-      this.rankedFeaturePrivileges
-    );
-  }
-
-  private sortPrivileges(role: Role) {
-    role.kibana.forEach(privilege => {
-      privilege.base.sort((privilege1, privilege2) => {
-        const privilege1Actions = this.kibanaPrivileges
-          .getSpacesPrivileges()
-          .getActions(privilege1);
-
-        const privilege2Actions = this.kibanaPrivileges
-          .getSpacesPrivileges()
-          .getActions(privilege2);
-
-        return compareActions(privilege1Actions, privilege2Actions);
-      });
-
-      Object.entries(privilege.feature).forEach(([featureId, featurePrivs]) => {
-        featurePrivs.sort((privilege1, privilege2) => {
-          const privilege1Actions = this.kibanaPrivileges
-            .getFeaturePrivileges()
-            .getActions(featureId, privilege1);
-
-          const privilege2Actions = this.kibanaPrivileges
-            .getFeaturePrivileges()
-            .getActions(featureId, privilege2);
-
-          return compareActions(privilege1Actions, privilege2Actions);
-        });
-      });
-    });
-  }
-}
diff --git a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/kibana_privileges_region.test.tsx b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/kibana_privileges_region.test.tsx
index 6487179b1d6e5..8fea0e02f3c8d 100644
--- a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/kibana_privileges_region.test.tsx
+++ b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/kibana_privileges_region.test.tsx
@@ -6,12 +6,13 @@
 
 import { shallow } from 'enzyme';
 import React from 'react';
-import { KibanaPrivileges, Role } from '../../../../../../common/model';
+import { Role } from '../../../../../../common/model';
 import { RoleValidator } from '../../validate_role';
 import { KibanaPrivilegesRegion } from './kibana_privileges_region';
 import { SimplePrivilegeSection } from './simple_privilege_section';
-import { SpaceAwarePrivilegeSection } from './space_aware_privilege_section';
 import { TransformErrorSection } from './transform_error_section';
+import { SpaceAwarePrivilegeSection } from './space_aware_privilege_section';
+import { KibanaPrivileges } from '../../../model';
 
 const buildProps = (customProps = {}) => {
   return {
@@ -39,12 +40,15 @@ const buildProps = (customProps = {}) => {
       },
     ],
     features: [],
-    kibanaPrivileges: new KibanaPrivileges({
-      global: {},
-      space: {},
-      features: {},
-      reserved: {},
-    }),
+    kibanaPrivileges: new KibanaPrivileges(
+      {
+        global: {},
+        space: {},
+        features: {},
+        reserved: {},
+      },
+      []
+    ),
     intl: null as any,
     uiCapabilities: {
       navLinks: {},
@@ -57,6 +61,7 @@ const buildProps = (customProps = {}) => {
     editable: true,
     onChange: jest.fn(),
     validator: new RoleValidator(),
+    canCustomizeSubFeaturePrivileges: true,
     ...customProps,
   };
 };
diff --git a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/kibana_privileges_region.tsx b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/kibana_privileges_region.tsx
index a4e287632c764..284bcb29f9b6e 100644
--- a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/kibana_privileges_region.tsx
+++ b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/kibana_privileges_region.tsx
@@ -7,21 +7,20 @@
 import React, { Component } from 'react';
 import { Capabilities } from 'src/core/public';
 import { Space } from '../../../../../../../spaces/public';
-import { Feature } from '../../../../../../../features/public';
-import { KibanaPrivileges, Role } from '../../../../../../common/model';
-import { KibanaPrivilegeCalculatorFactory } from './kibana_privilege_calculator';
+import { Role } from '../../../../../../common/model';
 import { RoleValidator } from '../../validate_role';
 import { CollapsiblePanel } from '../../collapsible_panel';
 import { SimplePrivilegeSection } from './simple_privilege_section';
 import { SpaceAwarePrivilegeSection } from './space_aware_privilege_section';
 import { TransformErrorSection } from './transform_error_section';
+import { KibanaPrivileges } from '../../../model';
 
 interface Props {
   role: Role;
   spacesEnabled: boolean;
+  canCustomizeSubFeaturePrivileges: boolean;
   spaces?: Space[];
   uiCapabilities: Capabilities;
-  features: Feature[];
   editable: boolean;
   kibanaPrivileges: KibanaPrivileges;
   onChange: (role: Role) => void;
@@ -42,31 +41,28 @@ export class KibanaPrivilegesRegion extends Component<Props, {}> {
       kibanaPrivileges,
       role,
       spacesEnabled,
+      canCustomizeSubFeaturePrivileges,
       spaces = [],
       uiCapabilities,
       onChange,
       editable,
       validator,
-      features,
     } = this.props;
 
     if (role._transform_error && role._transform_error.includes('kibana')) {
       return <TransformErrorSection />;
     }
 
-    const privilegeCalculatorFactory = new KibanaPrivilegeCalculatorFactory(kibanaPrivileges);
-
     if (spacesEnabled) {
       return (
         <SpaceAwarePrivilegeSection
           kibanaPrivileges={kibanaPrivileges}
           role={role}
-          privilegeCalculatorFactory={privilegeCalculatorFactory}
           spaces={spaces}
           uiCapabilities={uiCapabilities}
-          features={features}
           onChange={onChange}
           editable={editable}
+          canCustomizeSubFeaturePrivileges={canCustomizeSubFeaturePrivileges}
           validator={validator}
         />
       );
@@ -74,11 +70,10 @@ export class KibanaPrivilegesRegion extends Component<Props, {}> {
       return (
         <SimplePrivilegeSection
           kibanaPrivileges={kibanaPrivileges}
-          features={features}
           role={role}
-          privilegeCalculatorFactory={privilegeCalculatorFactory}
           onChange={onChange}
           editable={editable}
+          canCustomizeSubFeaturePrivileges={canCustomizeSubFeaturePrivileges}
         />
       );
     }
diff --git a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/kibana_privilege_calculator/index.ts b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/privilege_form_calculator/index.ts
similarity index 62%
rename from x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/kibana_privilege_calculator/index.ts
rename to x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/privilege_form_calculator/index.ts
index 056a4d3022fc5..121d615c1fc35 100644
--- a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/kibana_privilege_calculator/index.ts
+++ b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/privilege_form_calculator/index.ts
@@ -4,5 +4,4 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-export { KibanaPrivilegeCalculatorFactory } from './kibana_privileges_calculator_factory';
-export * from './kibana_privilege_calculator_types';
+export { PrivilegeFormCalculator } from './privilege_form_calculator';
diff --git a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/privilege_form_calculator/privilege_form_calculator.test.ts b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/privilege_form_calculator/privilege_form_calculator.test.ts
new file mode 100644
index 0000000000000..edf2af918fd04
--- /dev/null
+++ b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/privilege_form_calculator/privilege_form_calculator.test.ts
@@ -0,0 +1,833 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { createKibanaPrivileges } from '../../../../__fixtures__/kibana_privileges';
+import { kibanaFeatures } from '../../../../__fixtures__/kibana_features';
+import { Role } from '../../../../../../../common/model';
+import { PrivilegeFormCalculator } from './privilege_form_calculator';
+
+const createRole = (kibana: Role['kibana'] = []): Role => {
+  return {
+    name: 'unit test role',
+    elasticsearch: { cluster: [], indices: [], run_as: [] },
+    kibana,
+  };
+};
+
+describe('PrivilegeFormCalculator', () => {
+  describe('#getBasePrivilege', () => {
+    it(`returns undefined when no base privilege is assigned`, () => {
+      const kibanaPrivileges = createKibanaPrivileges(kibanaFeatures);
+      const role = createRole([
+        {
+          base: [],
+          feature: {
+            with_sub_features: ['all'],
+          },
+          spaces: ['foo'],
+        },
+      ]);
+
+      const calculator = new PrivilegeFormCalculator(kibanaPrivileges, role);
+      expect(calculator.getBasePrivilege(0)).toBeUndefined();
+    });
+
+    it(`ignores unknown base privileges`, () => {
+      const kibanaPrivileges = createKibanaPrivileges(kibanaFeatures);
+      const role = createRole([
+        {
+          base: ['unknown'],
+          feature: {},
+          spaces: ['foo'],
+        },
+      ]);
+
+      const calculator = new PrivilegeFormCalculator(kibanaPrivileges, role);
+      expect(calculator.getBasePrivilege(0)).toBeUndefined();
+    });
+
+    it(`returns the assigned base privilege`, () => {
+      const kibanaPrivileges = createKibanaPrivileges(kibanaFeatures);
+      const role = createRole([
+        {
+          base: ['read'],
+          feature: {},
+          spaces: ['foo'],
+        },
+      ]);
+
+      const calculator = new PrivilegeFormCalculator(kibanaPrivileges, role);
+      expect(calculator.getBasePrivilege(0)).toMatchObject({
+        id: 'read',
+      });
+    });
+
+    it(`returns the most permissive base privilege when multiple are assigned`, () => {
+      const kibanaPrivileges = createKibanaPrivileges(kibanaFeatures);
+      const role = createRole([
+        {
+          base: ['read', 'all'],
+          feature: {},
+          spaces: ['foo'],
+        },
+      ]);
+
+      const calculator = new PrivilegeFormCalculator(kibanaPrivileges, role);
+      expect(calculator.getBasePrivilege(0)).toMatchObject({
+        id: 'all',
+      });
+    });
+  });
+
+  describe('#getDisplayedPrimaryFeaturePrivilegeId', () => {
+    it('returns undefined when no privileges are assigned', () => {
+      const kibanaPrivileges = createKibanaPrivileges(kibanaFeatures);
+      const role = createRole([
+        {
+          base: [],
+          feature: {
+            with_sub_features: [],
+          },
+          spaces: ['foo'],
+        },
+      ]);
+
+      const calculator = new PrivilegeFormCalculator(kibanaPrivileges, role);
+      expect(
+        calculator.getDisplayedPrimaryFeaturePrivilegeId('with_sub_features', 0)
+      ).toBeUndefined();
+    });
+
+    it('returns the effective privilege id when a base privilege is assigned', () => {
+      const kibanaPrivileges = createKibanaPrivileges(kibanaFeatures);
+      const role = createRole([
+        {
+          base: ['all'],
+          feature: {
+            with_sub_features: [],
+          },
+          spaces: ['foo'],
+        },
+      ]);
+
+      const calculator = new PrivilegeFormCalculator(kibanaPrivileges, role);
+      expect(calculator.getDisplayedPrimaryFeaturePrivilegeId('with_sub_features', 0)).toEqual(
+        'all'
+      );
+    });
+
+    it('returns the most permissive assigned primary feature privilege id', () => {
+      const kibanaPrivileges = createKibanaPrivileges(kibanaFeatures);
+      const role = createRole([
+        {
+          base: [],
+          feature: {
+            with_sub_features: ['read', 'all', 'minimal_read'],
+          },
+          spaces: ['foo'],
+        },
+      ]);
+
+      const calculator = new PrivilegeFormCalculator(kibanaPrivileges, role);
+      expect(calculator.getDisplayedPrimaryFeaturePrivilegeId('with_sub_features', 0)).toEqual(
+        'all'
+      );
+    });
+
+    it('returns the primary version of the minimal privilege id when assigned', () => {
+      const kibanaPrivileges = createKibanaPrivileges(kibanaFeatures);
+      const role = createRole([
+        {
+          base: [],
+          feature: {
+            with_sub_features: ['minimal_read'],
+          },
+          spaces: ['foo'],
+        },
+      ]);
+
+      const calculator = new PrivilegeFormCalculator(kibanaPrivileges, role);
+      expect(calculator.getDisplayedPrimaryFeaturePrivilegeId('with_sub_features', 0)).toEqual(
+        'read'
+      );
+    });
+  });
+
+  describe('#hasCustomizedSubFeaturePrivileges', () => {
+    it('returns false when no privileges are assigned', () => {
+      const kibanaPrivileges = createKibanaPrivileges(kibanaFeatures);
+      const role = createRole([
+        {
+          base: [],
+          feature: {
+            with_sub_features: [],
+          },
+          spaces: ['foo'],
+        },
+      ]);
+
+      const calculator = new PrivilegeFormCalculator(kibanaPrivileges, role);
+      expect(calculator.hasCustomizedSubFeaturePrivileges('with_sub_features', 0)).toEqual(false);
+    });
+
+    it('returns false when there are no sub-feature privileges assigned', () => {
+      const kibanaPrivileges = createKibanaPrivileges(kibanaFeatures);
+      const role = createRole([
+        {
+          base: [],
+          feature: {
+            with_sub_features: ['all'],
+          },
+          spaces: ['foo'],
+        },
+      ]);
+
+      const calculator = new PrivilegeFormCalculator(kibanaPrivileges, role);
+      expect(calculator.hasCustomizedSubFeaturePrivileges('with_sub_features', 0)).toEqual(false);
+    });
+
+    it('returns false when the assigned sub-features are also granted by other assigned privileges', () => {
+      const kibanaPrivileges = createKibanaPrivileges(kibanaFeatures);
+      const role = createRole([
+        {
+          base: [],
+          feature: {
+            with_sub_features: ['all', 'cool_all'],
+          },
+          spaces: ['foo'],
+        },
+      ]);
+
+      const calculator = new PrivilegeFormCalculator(kibanaPrivileges, role);
+      expect(calculator.hasCustomizedSubFeaturePrivileges('with_sub_features', 0)).toEqual(false);
+    });
+
+    it('returns true when the assigned sub-features are not also granted by other assigned privileges', () => {
+      const kibanaPrivileges = createKibanaPrivileges(kibanaFeatures);
+      const role = createRole([
+        {
+          base: [],
+          feature: {
+            with_sub_features: ['read', 'cool_all'],
+          },
+          spaces: ['foo'],
+        },
+      ]);
+
+      const calculator = new PrivilegeFormCalculator(kibanaPrivileges, role);
+      expect(calculator.hasCustomizedSubFeaturePrivileges('with_sub_features', 0)).toEqual(true);
+    });
+
+    it('returns true when a minimal primary feature privilege is assigned, whose corresponding primary grants sub-feature privileges which are not assigned ', () => {
+      const kibanaPrivileges = createKibanaPrivileges(kibanaFeatures);
+      const role = createRole([
+        {
+          base: [],
+          feature: {
+            with_sub_features: ['minimal_read'],
+          },
+          spaces: ['foo'],
+        },
+      ]);
+
+      const calculator = new PrivilegeFormCalculator(kibanaPrivileges, role);
+      expect(calculator.hasCustomizedSubFeaturePrivileges('with_sub_features', 0)).toEqual(true);
+    });
+
+    it('returns false when a minimal primary feature privilege is assigned, whose corresponding primary grants sub-feature privileges which are all assigned ', () => {
+      const kibanaPrivileges = createKibanaPrivileges(kibanaFeatures);
+      const role = createRole([
+        {
+          base: [],
+          feature: {
+            with_sub_features: ['minimal_read', 'cool_read', 'cool_toggle_2'],
+          },
+          spaces: ['foo'],
+        },
+      ]);
+
+      const calculator = new PrivilegeFormCalculator(kibanaPrivileges, role);
+      expect(calculator.hasCustomizedSubFeaturePrivileges('with_sub_features', 0)).toEqual(false);
+    });
+
+    it('returns true when a minimal primary feature privilege is assigned, whose corresponding primary does not grant all assigned sub-feature privileges', () => {
+      const kibanaPrivileges = createKibanaPrivileges(kibanaFeatures);
+      const role = createRole([
+        {
+          base: [],
+          feature: {
+            with_sub_features: [
+              'minimal_read',
+              'cool_read',
+              'cool_toggle_2',
+              'cool_excluded_toggle',
+            ],
+          },
+          spaces: ['foo'],
+        },
+      ]);
+
+      const calculator = new PrivilegeFormCalculator(kibanaPrivileges, role);
+      expect(calculator.hasCustomizedSubFeaturePrivileges('with_sub_features', 0)).toEqual(true);
+    });
+
+    it('returns false when a base privilege is assigned', () => {
+      const kibanaPrivileges = createKibanaPrivileges(kibanaFeatures);
+      const role = createRole([
+        {
+          base: ['all'],
+          feature: {
+            with_sub_features: [],
+          },
+          spaces: ['foo'],
+        },
+      ]);
+
+      const calculator = new PrivilegeFormCalculator(kibanaPrivileges, role);
+      expect(calculator.hasCustomizedSubFeaturePrivileges('with_sub_features', 0)).toEqual(false);
+    });
+  });
+
+  describe('#getEffectivePrimaryFeaturePrivilege', () => {
+    it('returns undefined when no privileges are assigned', () => {
+      const kibanaPrivileges = createKibanaPrivileges(kibanaFeatures);
+      const role = createRole([
+        {
+          base: [],
+          feature: {
+            with_sub_features: [],
+          },
+          spaces: ['foo'],
+        },
+      ]);
+
+      const calculator = new PrivilegeFormCalculator(kibanaPrivileges, role);
+      expect(
+        calculator.getEffectivePrimaryFeaturePrivilege('with_sub_features', 0)
+      ).toBeUndefined();
+    });
+
+    it('returns the most permissive feature privilege granted by the assigned base privilege', () => {
+      const kibanaPrivileges = createKibanaPrivileges(kibanaFeatures);
+      const role = createRole([
+        {
+          base: ['read'],
+          feature: {
+            with_sub_features: [],
+          },
+          spaces: ['foo'],
+        },
+      ]);
+
+      const calculator = new PrivilegeFormCalculator(kibanaPrivileges, role);
+      expect(calculator.getEffectivePrimaryFeaturePrivilege('with_sub_features', 0)).toMatchObject({
+        id: 'read',
+      });
+    });
+
+    it('returns the most permissive feature privilege granted by the assigned feature privileges', () => {
+      const kibanaPrivileges = createKibanaPrivileges(kibanaFeatures);
+      const role = createRole([
+        {
+          base: ['read'],
+          feature: {
+            with_sub_features: ['read', 'all', 'minimal_all'],
+          },
+          spaces: ['foo'],
+        },
+      ]);
+
+      const calculator = new PrivilegeFormCalculator(kibanaPrivileges, role);
+      expect(calculator.getEffectivePrimaryFeaturePrivilege('with_sub_features', 0)).toMatchObject({
+        id: 'all',
+      });
+    });
+
+    it('prefers `read` primary over `mininal_all`', () => {
+      const kibanaPrivileges = createKibanaPrivileges(kibanaFeatures);
+      const role = createRole([
+        {
+          base: [],
+          feature: {
+            with_sub_features: ['minimal_all', 'read'],
+          },
+          spaces: ['foo'],
+        },
+      ]);
+
+      const calculator = new PrivilegeFormCalculator(kibanaPrivileges, role);
+      expect(calculator.getEffectivePrimaryFeaturePrivilege('with_sub_features', 0)).toMatchObject({
+        id: 'read',
+      });
+    });
+
+    it('returns the minimal primary feature privilege when assigned and not superseded', () => {
+      const kibanaPrivileges = createKibanaPrivileges(kibanaFeatures);
+      const role = createRole([
+        {
+          base: [],
+          feature: {
+            with_sub_features: ['minimal_all'],
+          },
+          spaces: ['foo'],
+        },
+      ]);
+
+      const calculator = new PrivilegeFormCalculator(kibanaPrivileges, role);
+      expect(calculator.getEffectivePrimaryFeaturePrivilege('with_sub_features', 0)).toMatchObject({
+        id: 'minimal_all',
+      });
+    });
+
+    it('ignores unknown privileges', () => {
+      const kibanaPrivileges = createKibanaPrivileges(kibanaFeatures);
+      const role = createRole([
+        {
+          base: [],
+          feature: {
+            with_sub_features: ['unknown'],
+          },
+          spaces: ['foo'],
+        },
+      ]);
+
+      const calculator = new PrivilegeFormCalculator(kibanaPrivileges, role);
+      expect(
+        calculator.getEffectivePrimaryFeaturePrivilege('with_sub_features', 0)
+      ).toBeUndefined();
+    });
+  });
+
+  describe('#isIndependentSubFeaturePrivilegeGranted', () => {
+    it('returns false when no privileges are assigned', () => {
+      const kibanaPrivileges = createKibanaPrivileges(kibanaFeatures);
+      const role = createRole([
+        {
+          base: [],
+          feature: {
+            with_sub_features: [],
+          },
+          spaces: ['foo'],
+        },
+      ]);
+
+      const calculator = new PrivilegeFormCalculator(kibanaPrivileges, role);
+      expect(
+        calculator.isIndependentSubFeaturePrivilegeGranted('with_sub_features', 'cool_toggle_1', 0)
+      ).toEqual(false);
+    });
+
+    it('returns false when an excluded sub-feature privilege is not directly assigned', () => {
+      const kibanaPrivileges = createKibanaPrivileges(kibanaFeatures);
+      const role = createRole([
+        {
+          base: ['all'],
+          feature: {
+            with_sub_features: ['all'],
+          },
+          spaces: ['foo'],
+        },
+      ]);
+
+      const calculator = new PrivilegeFormCalculator(kibanaPrivileges, role);
+      expect(
+        calculator.isIndependentSubFeaturePrivilegeGranted(
+          'with_sub_features',
+          'cool_excluded_toggle',
+          0
+        )
+      ).toEqual(false);
+    });
+
+    it('returns true when an excluded sub-feature privilege is directly assigned', () => {
+      const kibanaPrivileges = createKibanaPrivileges(kibanaFeatures);
+      const role = createRole([
+        {
+          base: ['all'],
+          feature: {
+            with_sub_features: ['all', 'cool_excluded_toggle'],
+          },
+          spaces: ['foo'],
+        },
+      ]);
+
+      const calculator = new PrivilegeFormCalculator(kibanaPrivileges, role);
+      expect(
+        calculator.isIndependentSubFeaturePrivilegeGranted(
+          'with_sub_features',
+          'cool_excluded_toggle',
+          0
+        )
+      ).toEqual(true);
+    });
+
+    it('returns true when a sub-feature privilege is directly assigned', () => {
+      const kibanaPrivileges = createKibanaPrivileges(kibanaFeatures);
+      const role = createRole([
+        {
+          base: ['all'],
+          feature: {
+            with_sub_features: ['all', 'cool_toggle_1'],
+          },
+          spaces: ['foo'],
+        },
+      ]);
+
+      const calculator = new PrivilegeFormCalculator(kibanaPrivileges, role);
+      expect(
+        calculator.isIndependentSubFeaturePrivilegeGranted('with_sub_features', 'cool_toggle_1', 0)
+      ).toEqual(true);
+    });
+
+    it('returns true when a sub-feature privilege is inherited', () => {
+      const kibanaPrivileges = createKibanaPrivileges(kibanaFeatures);
+      const role = createRole([
+        {
+          base: ['all'],
+          feature: {
+            with_sub_features: ['all'],
+          },
+          spaces: ['foo'],
+        },
+      ]);
+
+      const calculator = new PrivilegeFormCalculator(kibanaPrivileges, role);
+      expect(
+        calculator.isIndependentSubFeaturePrivilegeGranted('with_sub_features', 'cool_toggle_1', 0)
+      ).toEqual(true);
+    });
+  });
+
+  describe('#getSelectedMutuallyExclusiveSubFeaturePrivilege', () => {
+    it('returns undefined when no privileges are assigned', () => {
+      const kibanaPrivileges = createKibanaPrivileges(kibanaFeatures);
+      const role = createRole([
+        {
+          base: [],
+          feature: {
+            with_sub_features: [],
+          },
+          spaces: ['foo'],
+        },
+      ]);
+
+      const feature = kibanaPrivileges.getSecuredFeature('with_sub_features');
+      const coolSubFeature = feature.getSubFeatures().find(sf => sf.name === 'Cool Sub Feature')!;
+      const subFeatureGroup = coolSubFeature
+        .getPrivilegeGroups()
+        .find(pg => pg.groupType === 'mutually_exclusive')!;
+
+      const calculator = new PrivilegeFormCalculator(kibanaPrivileges, role);
+      expect(
+        calculator.getSelectedMutuallyExclusiveSubFeaturePrivilege(
+          'with_sub_features',
+          subFeatureGroup,
+          0
+        )
+      ).toBeUndefined();
+    });
+
+    it('returns the inherited privilege when not directly assigned', () => {
+      const kibanaPrivileges = createKibanaPrivileges(kibanaFeatures);
+      const role = createRole([
+        {
+          base: [],
+          feature: {
+            with_sub_features: ['all'],
+          },
+          spaces: ['foo'],
+        },
+      ]);
+
+      const feature = kibanaPrivileges.getSecuredFeature('with_sub_features');
+      const coolSubFeature = feature.getSubFeatures().find(sf => sf.name === 'Cool Sub Feature')!;
+      const subFeatureGroup = coolSubFeature
+        .getPrivilegeGroups()
+        .find(pg => pg.groupType === 'mutually_exclusive')!;
+
+      const calculator = new PrivilegeFormCalculator(kibanaPrivileges, role);
+      expect(
+        calculator.getSelectedMutuallyExclusiveSubFeaturePrivilege(
+          'with_sub_features',
+          subFeatureGroup,
+          0
+        )
+      ).toMatchObject({
+        id: 'cool_all',
+      });
+    });
+
+    it('returns the the most permissive effective privilege', () => {
+      const kibanaPrivileges = createKibanaPrivileges(kibanaFeatures);
+      const role = createRole([
+        {
+          base: [],
+          feature: {
+            with_sub_features: ['all', 'cool_read', 'cool_all'],
+          },
+          spaces: ['foo'],
+        },
+      ]);
+
+      const feature = kibanaPrivileges.getSecuredFeature('with_sub_features');
+      const coolSubFeature = feature.getSubFeatures().find(sf => sf.name === 'Cool Sub Feature')!;
+      const subFeatureGroup = coolSubFeature
+        .getPrivilegeGroups()
+        .find(pg => pg.groupType === 'mutually_exclusive')!;
+
+      const calculator = new PrivilegeFormCalculator(kibanaPrivileges, role);
+      expect(
+        calculator.getSelectedMutuallyExclusiveSubFeaturePrivilege(
+          'with_sub_features',
+          subFeatureGroup,
+          0
+        )
+      ).toMatchObject({
+        id: 'cool_all',
+      });
+    });
+  });
+
+  describe('#canCustomizeSubFeaturePrivileges', () => {
+    it('returns false if no privileges are assigned', () => {
+      const kibanaPrivileges = createKibanaPrivileges(kibanaFeatures);
+      const role = createRole([
+        {
+          base: [],
+          feature: {
+            with_sub_features: [],
+          },
+          spaces: ['foo'],
+        },
+      ]);
+      const calculator = new PrivilegeFormCalculator(kibanaPrivileges, role);
+      expect(calculator.canCustomizeSubFeaturePrivileges('with_sub_features', 0)).toEqual(false);
+    });
+
+    it('returns false if a base privilege is assigned', () => {
+      const kibanaPrivileges = createKibanaPrivileges(kibanaFeatures);
+      const role = createRole([
+        {
+          base: ['all'],
+          feature: {
+            with_sub_features: [],
+          },
+          spaces: ['foo'],
+        },
+      ]);
+      const calculator = new PrivilegeFormCalculator(kibanaPrivileges, role);
+      expect(calculator.canCustomizeSubFeaturePrivileges('with_sub_features', 0)).toEqual(false);
+    });
+
+    it('returns true if a minimal privilege is assigned', () => {
+      const kibanaPrivileges = createKibanaPrivileges(kibanaFeatures);
+      const role = createRole([
+        {
+          base: [],
+          feature: {
+            with_sub_features: ['minimal_read'],
+          },
+          spaces: ['foo'],
+        },
+      ]);
+      const calculator = new PrivilegeFormCalculator(kibanaPrivileges, role);
+      expect(calculator.canCustomizeSubFeaturePrivileges('with_sub_features', 0)).toEqual(true);
+    });
+
+    it('returns true if a primary feature privilege is assigned', () => {
+      const kibanaPrivileges = createKibanaPrivileges(kibanaFeatures);
+      const role = createRole([
+        {
+          base: [],
+          feature: {
+            with_sub_features: ['read'],
+          },
+          spaces: ['foo'],
+        },
+      ]);
+      const calculator = new PrivilegeFormCalculator(kibanaPrivileges, role);
+      expect(calculator.canCustomizeSubFeaturePrivileges('with_sub_features', 0)).toEqual(true);
+    });
+  });
+
+  describe('#updateSelectedFeaturePrivilegesForCustomization', () => {
+    it('returns the privileges unmodified if no primary feature privilege is assigned', () => {
+      const kibanaPrivileges = createKibanaPrivileges(kibanaFeatures);
+      const role = createRole([
+        {
+          base: [],
+          feature: {
+            with_sub_features: ['some-privilege'],
+          },
+          spaces: ['foo'],
+        },
+      ]);
+
+      const calculator = new PrivilegeFormCalculator(kibanaPrivileges, role);
+
+      expect(
+        calculator.updateSelectedFeaturePrivilegesForCustomization('with_sub_features', 0, true)
+      ).toEqual(['some-privilege']);
+
+      expect(
+        calculator.updateSelectedFeaturePrivilegesForCustomization('with_sub_features', 0, false)
+      ).toEqual(['some-privilege']);
+    });
+
+    it('switches to the minimal privilege when customizing, but explicitly grants the sub-feature privileges which were originally inherited', () => {
+      const kibanaPrivileges = createKibanaPrivileges(kibanaFeatures);
+      const role = createRole([
+        {
+          base: [],
+          feature: {
+            with_sub_features: ['read'],
+          },
+          spaces: ['foo'],
+        },
+      ]);
+
+      const calculator = new PrivilegeFormCalculator(kibanaPrivileges, role);
+
+      expect(
+        calculator.updateSelectedFeaturePrivilegesForCustomization('with_sub_features', 0, true)
+      ).toEqual(['minimal_read', 'cool_read', 'cool_toggle_2']);
+    });
+
+    it('switches to the non-minimal privilege when customizing, removing all other privileges', () => {
+      const kibanaPrivileges = createKibanaPrivileges(kibanaFeatures);
+      const role = createRole([
+        {
+          base: [],
+          feature: {
+            with_sub_features: ['minimal_read', 'cool_read', 'cool_toggle_2'],
+          },
+          spaces: ['foo'],
+        },
+      ]);
+
+      const calculator = new PrivilegeFormCalculator(kibanaPrivileges, role);
+
+      expect(
+        calculator.updateSelectedFeaturePrivilegesForCustomization('with_sub_features', 0, false)
+      ).toEqual(['read']);
+    });
+  });
+
+  describe('#hasSupersededInheritedPrivileges', () => {
+    // More exhaustive testing is done at the UI layer: `privilege_space_table.test.tsx`
+    it('returns false for the global privilege definition', () => {
+      const kibanaPrivileges = createKibanaPrivileges(kibanaFeatures);
+      const role = createRole([
+        {
+          base: [],
+          feature: {
+            with_sub_features: ['all'],
+          },
+          spaces: ['foo'],
+        },
+        {
+          base: ['all'],
+          feature: {
+            with_sub_features: ['read'],
+          },
+          spaces: ['*'],
+        },
+      ]);
+
+      const calculator = new PrivilegeFormCalculator(kibanaPrivileges, role);
+
+      expect(calculator.hasSupersededInheritedPrivileges(1)).toEqual(false);
+    });
+
+    it('returns false when the global privilege is not more permissive', () => {
+      const kibanaPrivileges = createKibanaPrivileges(kibanaFeatures);
+      const role = createRole([
+        {
+          base: [],
+          feature: {
+            with_sub_features: ['all'],
+          },
+          spaces: ['foo'],
+        },
+        {
+          base: [],
+          feature: {
+            with_sub_features: ['all'],
+          },
+          spaces: ['*'],
+        },
+      ]);
+
+      const calculator = new PrivilegeFormCalculator(kibanaPrivileges, role);
+
+      expect(calculator.hasSupersededInheritedPrivileges(0)).toEqual(false);
+    });
+
+    it('returns true when the global feature privilege is more permissive', () => {
+      const kibanaPrivileges = createKibanaPrivileges(kibanaFeatures);
+      const role = createRole([
+        {
+          base: [],
+          feature: {
+            with_sub_features: ['read'],
+          },
+          spaces: ['foo'],
+        },
+        {
+          base: [],
+          feature: {
+            with_sub_features: ['all'],
+          },
+          spaces: ['*'],
+        },
+      ]);
+
+      const calculator = new PrivilegeFormCalculator(kibanaPrivileges, role);
+
+      expect(calculator.hasSupersededInheritedPrivileges(0)).toEqual(true);
+    });
+
+    it('returns true when the global base privilege is more permissive', () => {
+      const kibanaPrivileges = createKibanaPrivileges(kibanaFeatures);
+      const role = createRole([
+        {
+          base: ['read'],
+          feature: {},
+          spaces: ['foo'],
+        },
+        {
+          base: ['all'],
+          feature: {},
+          spaces: ['*'],
+        },
+      ]);
+
+      const calculator = new PrivilegeFormCalculator(kibanaPrivileges, role);
+
+      expect(calculator.hasSupersededInheritedPrivileges(0)).toEqual(true);
+    });
+
+    it('returns false when only the global base privilege is assigned', () => {
+      const kibanaPrivileges = createKibanaPrivileges(kibanaFeatures);
+      const role = createRole([
+        {
+          base: [],
+          feature: {},
+          spaces: ['foo'],
+        },
+        {
+          base: ['all'],
+          feature: {},
+          spaces: ['*'],
+        },
+      ]);
+
+      const calculator = new PrivilegeFormCalculator(kibanaPrivileges, role);
+
+      expect(calculator.hasSupersededInheritedPrivileges(0)).toEqual(false);
+    });
+  });
+});
diff --git a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/privilege_form_calculator/privilege_form_calculator.ts b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/privilege_form_calculator/privilege_form_calculator.ts
new file mode 100644
index 0000000000000..8cff37f4bd4b0
--- /dev/null
+++ b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/privilege_form_calculator/privilege_form_calculator.ts
@@ -0,0 +1,303 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { Role } from '../../../../../../../common/model';
+import { isGlobalPrivilegeDefinition } from '../../../privilege_utils';
+import { KibanaPrivileges, SubFeaturePrivilegeGroup } from '../../../../model';
+
+/**
+ * Calculator responsible for determining the displayed and effective privilege values for the following interfaces:
+ * - <PrivilegeSpaceForm> and children
+ * - <PrivilegeSpaceTable> and children
+ */
+export class PrivilegeFormCalculator {
+  constructor(private readonly kibanaPrivileges: KibanaPrivileges, private readonly role: Role) {}
+
+  /**
+   * Returns the assigned base privilege.
+   * If more than one base privilege is assigned, the most permissive privilege will be returned.
+   * If no base privileges are assigned, then this will return `undefined`.
+   *
+   * @param privilegeIndex the index of the kibana privileges role component
+   */
+  public getBasePrivilege(privilegeIndex: number) {
+    const entry = this.role.kibana[privilegeIndex];
+
+    const basePrivileges = this.kibanaPrivileges.getBasePrivileges(entry);
+    return basePrivileges.find(bp => entry.base.includes(bp.id));
+  }
+
+  /**
+   * Returns the ID of the *displayed* Primary Feature Privilege for the indicated feature and privilege index.
+   * If the effective primary feature privilege is a "minimal" version, then this returns the corresponding non-minimal version.
+   *
+   * @example
+   * The following kibana privilege entry will return `read`:
+   * ```ts
+   * const entry = {
+   *    base: [],
+   *    feature: {
+   *       some_feature: ['minimal_read'],
+   *    }
+   * }
+   * ```
+   *
+   * @param featureId the feature id to get the Primary Feature KibanaPrivilege for.
+   * @param privilegeIndex the index of the kibana privileges role component
+   */
+  public getDisplayedPrimaryFeaturePrivilegeId(featureId: string, privilegeIndex: number) {
+    return this.getDisplayedPrimaryFeaturePrivilege(featureId, privilegeIndex)?.id;
+  }
+
+  /**
+   * Determines if the indicated feature has sub-feature privilege assignments which differ from the "displayed" primary feature privilege.
+   *
+   * @param featureId the feature id
+   * @param privilegeIndex the index of the kibana privileges role component
+   */
+  public hasCustomizedSubFeaturePrivileges(featureId: string, privilegeIndex: number) {
+    const feature = this.kibanaPrivileges.getSecuredFeature(featureId);
+
+    const displayedPrimary = this.getDisplayedPrimaryFeaturePrivilege(featureId, privilegeIndex);
+
+    const formPrivileges = this.kibanaPrivileges.createCollectionFromRoleKibanaPrivileges([
+      this.role.kibana[privilegeIndex],
+    ]);
+
+    return feature.getSubFeaturePrivileges().some(sfp => {
+      const isGranted = formPrivileges.grantsPrivilege(sfp);
+      const isGrantedByDisplayedPrimary = displayedPrimary?.grantsPrivilege(sfp) ?? isGranted;
+
+      return isGranted !== isGrantedByDisplayedPrimary;
+    });
+  }
+
+  /**
+   * Returns the most permissive effective Primary Feature KibanaPrivilege, including the minimal versions.
+   *
+   * @param featureId the feature id
+   * @param privilegeIndex the index of the kibana privileges role component
+   */
+  public getEffectivePrimaryFeaturePrivilege(featureId: string, privilegeIndex: number) {
+    const feature = this.kibanaPrivileges.getSecuredFeature(featureId);
+
+    const basePrivilege = this.getBasePrivilege(privilegeIndex);
+
+    const selectedFeaturePrivileges = this.getSelectedFeaturePrivileges(featureId, privilegeIndex);
+
+    return feature
+      .getPrimaryFeaturePrivileges({ includeMinimalFeaturePrivileges: true })
+      .find(fp => {
+        return selectedFeaturePrivileges.includes(fp.id) || basePrivilege?.grantsPrivilege(fp);
+      });
+  }
+
+  /**
+   * Determines if the indicated sub-feature privilege is granted.
+   *
+   * @param featureId the feature id
+   * @param privilegeId the sub feature privilege id
+   * @param privilegeIndex the index of the kibana privileges role component
+   */
+  public isIndependentSubFeaturePrivilegeGranted(
+    featureId: string,
+    privilegeId: string,
+    privilegeIndex: number
+  ) {
+    const kibanaPrivilege = this.role.kibana[privilegeIndex];
+
+    const feature = this.kibanaPrivileges.getSecuredFeature(featureId);
+    const subFeaturePrivilege = feature
+      .getSubFeaturePrivileges()
+      .find(ap => ap.id === privilegeId)!;
+
+    const assignedPrivileges = this.kibanaPrivileges.createCollectionFromRoleKibanaPrivileges([
+      kibanaPrivilege,
+    ]);
+
+    return assignedPrivileges.grantsPrivilege(subFeaturePrivilege);
+  }
+
+  /**
+   * Returns the most permissive effective privilege within the indicated mutually-exclusive sub feature privilege group.
+   *
+   * @param featureId the feature id
+   * @param subFeatureGroup the mutually-exclusive sub feature group
+   * @param privilegeIndex the index of the kibana privileges role component
+   */
+  public getSelectedMutuallyExclusiveSubFeaturePrivilege(
+    featureId: string,
+    subFeatureGroup: SubFeaturePrivilegeGroup,
+    privilegeIndex: number
+  ) {
+    const kibanaPrivilege = this.role.kibana[privilegeIndex];
+    const assignedPrivileges = this.kibanaPrivileges.createCollectionFromRoleKibanaPrivileges([
+      kibanaPrivilege,
+    ]);
+
+    return subFeatureGroup.privileges.find(p => {
+      return assignedPrivileges.grantsPrivilege(p);
+    });
+  }
+
+  /**
+   * Determines if the indicated feature is capable of having its sub-feature privileges customized.
+   *
+   * @param featureId the feature id
+   * @param privilegeIndex the index of the kibana privileges role component
+   */
+  public canCustomizeSubFeaturePrivileges(featureId: string, privilegeIndex: number) {
+    const selectedFeaturePrivileges = this.getSelectedFeaturePrivileges(featureId, privilegeIndex);
+    const feature = this.kibanaPrivileges.getSecuredFeature(featureId);
+
+    return feature
+      .getPrimaryFeaturePrivileges({ includeMinimalFeaturePrivileges: true })
+      .some(apfp => selectedFeaturePrivileges.includes(apfp.id));
+  }
+
+  /**
+   * Returns an updated set of feature privileges based on the toggling of the "Customize sub-feature privileges" control.
+   *
+   * @param featureId the feature id
+   * @param privilegeIndex  the index of the kibana privileges role component
+   * @param willBeCustomizing flag indicating if this feature is about to have its sub-feature privileges customized or not
+   */
+  public updateSelectedFeaturePrivilegesForCustomization(
+    featureId: string,
+    privilegeIndex: number,
+    willBeCustomizing: boolean
+  ) {
+    const primary = this.getDisplayedPrimaryFeaturePrivilege(featureId, privilegeIndex);
+    const selectedFeaturePrivileges = this.getSelectedFeaturePrivileges(featureId, privilegeIndex);
+
+    if (!primary) {
+      return selectedFeaturePrivileges;
+    }
+
+    const nextPrivileges = [];
+
+    if (willBeCustomizing) {
+      const feature = this.kibanaPrivileges.getSecuredFeature(featureId);
+
+      const startingPrivileges = feature
+        .getSubFeaturePrivileges()
+        .filter(ap => primary.grantsPrivilege(ap))
+        .map(p => p.id);
+
+      nextPrivileges.push(primary.getMinimalPrivilegeId(), ...startingPrivileges);
+    } else {
+      nextPrivileges.push(primary.id);
+    }
+
+    return nextPrivileges;
+  }
+
+  /**
+   * Determines if the indicated privilege entry is less permissive than the configured "global" entry for the role.
+   * @param privilegeIndex the index of the kibana privileges role component
+   */
+  public hasSupersededInheritedPrivileges(privilegeIndex: number) {
+    const global = this.locateGlobalPrivilege(this.role);
+
+    const entry = this.role.kibana[privilegeIndex];
+
+    if (isGlobalPrivilegeDefinition(entry) || !global) {
+      return false;
+    }
+
+    const globalPrivileges = this.kibanaPrivileges.createCollectionFromRoleKibanaPrivileges([
+      global,
+    ]);
+
+    const formPrivileges = this.kibanaPrivileges.createCollectionFromRoleKibanaPrivileges([entry]);
+
+    const hasAssignedBasePrivileges = this.kibanaPrivileges
+      .getBasePrivileges(entry)
+      .some(base => entry.base.includes(base.id));
+
+    const featuresWithDirectlyAssignedPrivileges = this.kibanaPrivileges
+      .getSecuredFeatures()
+      .filter(feature =>
+        feature
+          .getAllPrivileges()
+          .some(privilege => entry.feature[feature.id]?.includes(privilege.id))
+      );
+
+    const hasSupersededBasePrivileges =
+      hasAssignedBasePrivileges &&
+      this.kibanaPrivileges
+        .getBasePrivileges(entry)
+        .some(
+          privilege =>
+            globalPrivileges.grantsPrivilege(privilege) &&
+            !formPrivileges.grantsPrivilege(privilege)
+        );
+
+    const hasSupersededFeaturePrivileges = featuresWithDirectlyAssignedPrivileges.some(feature =>
+      feature
+        .getAllPrivileges()
+        .some(fp => globalPrivileges.grantsPrivilege(fp) && !formPrivileges.grantsPrivilege(fp))
+    );
+
+    return hasSupersededBasePrivileges || hasSupersededFeaturePrivileges;
+  }
+
+  /**
+   * Returns the *displayed* Primary Feature Privilege for the indicated feature and privilege index.
+   * If the effective primary feature privilege is a "minimal" version, then this returns the corresponding non-minimal version.
+   *
+   * @example
+   * The following kibana privilege entry will return `read`:
+   * ```ts
+   * const entry = {
+   *    base: [],
+   *    feature: {
+   *       some_feature: ['minimal_read'],
+   *    }
+   * }
+   * ```
+   *
+   * @param featureId the feature id to get the Primary Feature KibanaPrivilege for.
+   * @param privilegeIndex the index of the kibana privileges role component
+   */
+  private getDisplayedPrimaryFeaturePrivilege(featureId: string, privilegeIndex: number) {
+    const feature = this.kibanaPrivileges.getSecuredFeature(featureId);
+
+    const basePrivilege = this.getBasePrivilege(privilegeIndex);
+
+    const selectedFeaturePrivileges = this.getSelectedFeaturePrivileges(featureId, privilegeIndex);
+
+    return feature.getPrimaryFeaturePrivileges().find(fp => {
+      const correspondingMinimalPrivilegeId = fp.getMinimalPrivilegeId();
+
+      const correspendingMinimalPrivilege = feature
+        .getMinimalFeaturePrivileges()
+        .find(mp => mp.id === correspondingMinimalPrivilegeId)!;
+
+      // There are two cases where the minimal privileges aren't available:
+      // 1. The feature has no registered sub-features
+      // 2. Sub-feature privileges cannot be customized. When this is the case, the minimal privileges aren't registered with ES,
+      // so they end up represented in the UI as an empty privilege. Empty privileges cannot be granted other privileges, so if we
+      // encounter a minimal privilege that isn't granted by it's correspending primary, then we know we've encountered this scenario.
+      const hasMinimalPrivileges =
+        feature.subFeatures.length > 0 && fp.grantsPrivilege(correspendingMinimalPrivilege);
+      return (
+        selectedFeaturePrivileges.includes(fp.id) ||
+        (hasMinimalPrivileges &&
+          selectedFeaturePrivileges.includes(correspondingMinimalPrivilegeId)) ||
+        basePrivilege?.grantsPrivilege(fp)
+      );
+    });
+  }
+
+  private getSelectedFeaturePrivileges(featureId: string, privilegeIndex: number) {
+    return this.role.kibana[privilegeIndex].feature[featureId] ?? [];
+  }
+
+  private locateGlobalPrivilege(role: Role) {
+    return role.kibana.find(entry => isGlobalPrivilegeDefinition(entry));
+  }
+}
diff --git a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/privilege_summary/__fixtures__/index.ts b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/privilege_summary/__fixtures__/index.ts
new file mode 100644
index 0000000000000..63b38b6967575
--- /dev/null
+++ b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/privilege_summary/__fixtures__/index.ts
@@ -0,0 +1,129 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { ReactWrapper } from 'enzyme';
+
+import { EuiTableRow } from '@elastic/eui';
+
+import { findTestSubject } from 'test_utils/find_test_subject';
+import { Role, RoleKibanaPrivilege } from '../../../../../../../../common/model';
+import { PrivilegeSummaryExpandedRow } from '../privilege_summary_expanded_row';
+import { FeatureTableCell } from '../../feature_table_cell';
+
+interface DisplayedFeaturePrivileges {
+  [featureId: string]: {
+    [spaceGroup: string]: {
+      primaryFeaturePrivilege: string;
+      subFeaturesPrivileges: {
+        [subFeatureName: string]: string[];
+      };
+      hasCustomizedSubFeaturePrivileges: boolean;
+    };
+  };
+}
+
+const getSpaceKey = (entry: RoleKibanaPrivilege) => entry.spaces.join(', ');
+
+export function getDisplayedFeaturePrivileges(
+  wrapper: ReactWrapper<any>,
+  role: Role
+): DisplayedFeaturePrivileges {
+  const allExpanderButtons = findTestSubject(wrapper, 'expandPrivilegeSummaryRow');
+  allExpanderButtons.forEach(button => button.simulate('click'));
+
+  // each expanded row renders its own `EuiTableRow`, so there are 2 rows
+  // for each feature: one for the primary feature privilege, and one for the sub privilege form
+  const rows = wrapper.find(EuiTableRow);
+
+  return rows.reduce((acc, row) => {
+    const expandedRow = row.find(PrivilegeSummaryExpandedRow);
+    if (expandedRow.length > 0) {
+      return {
+        ...acc,
+        ...getDisplayedSubFeaturePrivileges(acc, expandedRow, role),
+      };
+    } else {
+      const feature = row.find(FeatureTableCell).props().feature;
+
+      const primaryFeaturePrivileges = findTestSubject(row, 'privilegeColumn');
+
+      expect(primaryFeaturePrivileges).toHaveLength(role.kibana.length);
+
+      acc[feature.id] = acc[feature.id] ?? {};
+
+      primaryFeaturePrivileges.forEach((primary, index) => {
+        const key = getSpaceKey(role.kibana[index]);
+
+        acc[feature.id][key] = {
+          ...acc[feature.id][key],
+          primaryFeaturePrivilege: primary.text().trim(),
+          hasCustomizedSubFeaturePrivileges:
+            findTestSubject(primary, 'additionalPrivilegesGranted').length > 0,
+        };
+      });
+
+      return acc;
+    }
+  }, {} as DisplayedFeaturePrivileges);
+}
+
+function getDisplayedSubFeaturePrivileges(
+  displayedFeatures: DisplayedFeaturePrivileges,
+  expandedRow: ReactWrapper<any>,
+  role: Role
+) {
+  const { feature } = expandedRow.props();
+
+  const subFeatureEntries = findTestSubject(expandedRow as ReactWrapper<any>, 'subFeatureEntry');
+
+  displayedFeatures[feature.id] = displayedFeatures[feature.id] ?? {};
+
+  subFeatureEntries.forEach(subFeatureEntry => {
+    const subFeatureName = findTestSubject(subFeatureEntry, 'subFeatureName').text();
+
+    const entryElements = findTestSubject(subFeatureEntry as ReactWrapper<any>, 'entry', '|=');
+
+    expect(entryElements).toHaveLength(role.kibana.length);
+
+    role.kibana.forEach((entry, index) => {
+      const key = getSpaceKey(entry);
+      const element = findTestSubject(expandedRow as ReactWrapper<any>, `entry-${index}`);
+
+      const independentPrivileges = element
+        .find('EuiFlexGroup[data-test-subj="independentPrivilege"]')
+        .reduce((acc2, flexGroup) => {
+          const privilegeName = findTestSubject(flexGroup, 'privilegeName').text();
+          const isGranted = flexGroup.exists('EuiIconTip[type="check"]');
+          if (isGranted) {
+            return [...acc2, privilegeName];
+          }
+          return acc2;
+        }, [] as string[]);
+
+      const mutuallyExclusivePrivileges = element
+        .find('EuiFlexGroup[data-test-subj="mutexPrivilege"]')
+        .reduce((acc2, flexGroup) => {
+          const privilegeName = findTestSubject(flexGroup, 'privilegeName').text();
+          const isGranted = flexGroup.exists('EuiIconTip[type="check"]');
+
+          if (isGranted) {
+            return [...acc2, privilegeName];
+          }
+          return acc2;
+        }, [] as string[]);
+
+      displayedFeatures[feature.id][key] = {
+        ...displayedFeatures[feature.id][key],
+        subFeaturesPrivileges: {
+          ...displayedFeatures[feature.id][key].subFeaturesPrivileges,
+          [subFeatureName]: [...independentPrivileges, ...mutuallyExclusivePrivileges],
+        },
+      };
+    });
+  });
+
+  return displayedFeatures;
+}
diff --git a/x-pack/plugins/security/common/model/kibana_privileges/index.ts b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/privilege_summary/index.ts
similarity index 81%
rename from x-pack/plugins/security/common/model/kibana_privileges/index.ts
rename to x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/privilege_summary/index.ts
index ab9baa1356c4b..5f7dc0d99654e 100644
--- a/x-pack/plugins/security/common/model/kibana_privileges/index.ts
+++ b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/privilege_summary/index.ts
@@ -4,4 +4,4 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-export { KibanaPrivileges } from './kibana_privileges';
+export { PrivilegeSummary } from './privilege_summary';
diff --git a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/privilege_summary/privilege_summary.test.tsx b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/privilege_summary/privilege_summary.test.tsx
new file mode 100644
index 0000000000000..85144d37ce754
--- /dev/null
+++ b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/privilege_summary/privilege_summary.test.tsx
@@ -0,0 +1,82 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React from 'react';
+import { mountWithIntl } from 'test_utils/enzyme_helpers';
+import { createKibanaPrivileges } from '../../../../__fixtures__/kibana_privileges';
+import { kibanaFeatures } from '../../../../__fixtures__/kibana_features';
+import { RoleKibanaPrivilege } from '../../../../../../../common/model';
+import { PrivilegeSummary } from '.';
+import { findTestSubject } from 'test_utils/find_test_subject';
+import { PrivilegeSummaryTable } from './privilege_summary_table';
+
+const createRole = (roleKibanaPrivileges: RoleKibanaPrivilege[]) => ({
+  name: 'some-role',
+  elasticsearch: {
+    cluster: [],
+    indices: [],
+    run_as: [],
+  },
+  kibana: roleKibanaPrivileges,
+});
+
+const spaces = [
+  {
+    id: 'default',
+    name: 'Default Space',
+    disabledFeatures: [],
+  },
+];
+
+describe('PrivilegeSummary', () => {
+  it('initially renders a button', () => {
+    const kibanaPrivileges = createKibanaPrivileges(kibanaFeatures);
+
+    const role = createRole([
+      {
+        base: ['all'],
+        feature: {},
+        spaces: ['default'],
+      },
+    ]);
+
+    const wrapper = mountWithIntl(
+      <PrivilegeSummary
+        spaces={spaces}
+        kibanaPrivileges={kibanaPrivileges}
+        role={role}
+        canCustomizeSubFeaturePrivileges={true}
+      />
+    );
+
+    expect(findTestSubject(wrapper, 'viewPrivilegeSummaryButton')).toHaveLength(1);
+    expect(wrapper.find(PrivilegeSummaryTable)).toHaveLength(0);
+  });
+
+  it('clicking the button renders the privilege summary table', () => {
+    const kibanaPrivileges = createKibanaPrivileges(kibanaFeatures);
+
+    const role = createRole([
+      {
+        base: ['all'],
+        feature: {},
+        spaces: ['default'],
+      },
+    ]);
+
+    const wrapper = mountWithIntl(
+      <PrivilegeSummary
+        spaces={spaces}
+        kibanaPrivileges={kibanaPrivileges}
+        role={role}
+        canCustomizeSubFeaturePrivileges={true}
+      />
+    );
+
+    findTestSubject(wrapper, 'viewPrivilegeSummaryButton').simulate('click');
+    expect(wrapper.find(PrivilegeSummaryTable)).toHaveLength(1);
+  });
+});
diff --git a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/privilege_summary/privilege_summary.tsx b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/privilege_summary/privilege_summary.tsx
new file mode 100644
index 0000000000000..e0889d91d759a
--- /dev/null
+++ b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/privilege_summary/privilege_summary.tsx
@@ -0,0 +1,73 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React, { useState, Fragment } from 'react';
+import { FormattedMessage } from '@kbn/i18n/react';
+import {
+  EuiModal,
+  EuiButtonEmpty,
+  EuiOverlayMask,
+  EuiModalHeader,
+  EuiModalHeaderTitle,
+  EuiModalBody,
+  EuiModalFooter,
+  EuiButton,
+} from '@elastic/eui';
+import { Space } from '../../../../../../../../spaces/common/model/space';
+import { Role } from '../../../../../../../common/model';
+import { PrivilegeSummaryTable } from './privilege_summary_table';
+import { KibanaPrivileges } from '../../../../model';
+
+interface Props {
+  role: Role;
+  spaces: Space[];
+  kibanaPrivileges: KibanaPrivileges;
+  canCustomizeSubFeaturePrivileges: boolean;
+}
+export const PrivilegeSummary = (props: Props) => {
+  const [isOpen, setIsOpen] = useState(false);
+
+  return (
+    <Fragment>
+      <EuiButtonEmpty onClick={() => setIsOpen(true)} data-test-subj="viewPrivilegeSummaryButton">
+        <FormattedMessage
+          id="xpack.security.management.editRole.privilegeSummary.viewSummaryButtonText"
+          defaultMessage="View privilege summary"
+        />
+      </EuiButtonEmpty>
+      {isOpen && (
+        <EuiOverlayMask>
+          <EuiModal onClose={() => setIsOpen(false)} maxWidth={false}>
+            <EuiModalHeader>
+              <EuiModalHeaderTitle>
+                <FormattedMessage
+                  id="xpack.security.management.editRole.privilegeSummary.modalHeaderTitle"
+                  defaultMessage="Privilege summary"
+                />
+              </EuiModalHeaderTitle>
+            </EuiModalHeader>
+            <EuiModalBody>
+              <PrivilegeSummaryTable
+                role={props.role}
+                spaces={props.spaces}
+                kibanaPrivileges={props.kibanaPrivileges}
+                canCustomizeSubFeaturePrivileges={props.canCustomizeSubFeaturePrivileges}
+              />
+            </EuiModalBody>
+            <EuiModalFooter>
+              <EuiButton onClick={() => setIsOpen(false)}>
+                <FormattedMessage
+                  id="xpack.security.management.editRole.privilegeSummary.closeSummaryButtonText"
+                  defaultMessage="Close"
+                />
+              </EuiButton>
+            </EuiModalFooter>
+          </EuiModal>
+        </EuiOverlayMask>
+      )}
+    </Fragment>
+  );
+};
diff --git a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/privilege_summary/privilege_summary_calculator.test.ts b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/privilege_summary/privilege_summary_calculator.test.ts
new file mode 100644
index 0000000000000..6163a6ec7ba23
--- /dev/null
+++ b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/privilege_summary/privilege_summary_calculator.test.ts
@@ -0,0 +1,338 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { Role } from '../../../../../../../common/model';
+import { createKibanaPrivileges } from '../../../../__fixtures__/kibana_privileges';
+import { kibanaFeatures } from '../../../../__fixtures__/kibana_features';
+import { PrivilegeSummaryCalculator } from './privilege_summary_calculator';
+
+const createRole = (kibana: Role['kibana'] = []): Role => {
+  return {
+    name: 'unit test role',
+    elasticsearch: { cluster: [], indices: [], run_as: [] },
+    kibana,
+  };
+};
+describe('PrivilegeSummaryCalculator', () => {
+  describe('#getEffectiveFeaturePrivileges', () => {
+    it('returns an empty privilege set when nothing is assigned', () => {
+      const kibanaPrivileges = createKibanaPrivileges(kibanaFeatures);
+      const role = createRole([
+        {
+          base: [],
+          feature: {
+            with_sub_features: [],
+          },
+          spaces: ['foo'],
+        },
+      ]);
+
+      const calculator = new PrivilegeSummaryCalculator(kibanaPrivileges, role);
+      expect(calculator.getEffectiveFeaturePrivileges(role.kibana[0])).toEqual({
+        excluded_from_base: {
+          hasCustomizedSubFeaturePrivileges: false,
+          primary: undefined,
+          subFeature: [],
+        },
+        no_sub_features: {
+          hasCustomizedSubFeaturePrivileges: false,
+          primary: undefined,
+          subFeature: [],
+        },
+        with_excluded_sub_features: {
+          hasCustomizedSubFeaturePrivileges: false,
+          primary: undefined,
+          subFeature: [],
+        },
+        with_sub_features: {
+          hasCustomizedSubFeaturePrivileges: false,
+          primary: undefined,
+          subFeature: [],
+        },
+      });
+    });
+
+    it('calculates effective privileges when inherited from the global privilege', () => {
+      const kibanaPrivileges = createKibanaPrivileges(kibanaFeatures);
+      const role = createRole([
+        {
+          base: [],
+          feature: {},
+          spaces: ['foo'],
+        },
+        {
+          base: ['all'],
+          feature: {},
+          spaces: ['*'],
+        },
+      ]);
+
+      const calculator = new PrivilegeSummaryCalculator(kibanaPrivileges, role);
+      expect(calculator.getEffectiveFeaturePrivileges(role.kibana[0])).toEqual({
+        excluded_from_base: {
+          hasCustomizedSubFeaturePrivileges: false,
+          primary: undefined,
+          subFeature: [],
+        },
+        no_sub_features: {
+          hasCustomizedSubFeaturePrivileges: false,
+          primary: expect.objectContaining({
+            id: 'all',
+          }),
+          subFeature: [],
+        },
+        with_excluded_sub_features: {
+          hasCustomizedSubFeaturePrivileges: false,
+          primary: expect.objectContaining({
+            id: 'all',
+          }),
+          subFeature: [],
+        },
+        with_sub_features: {
+          hasCustomizedSubFeaturePrivileges: false,
+          primary: expect.objectContaining({
+            id: 'all',
+          }),
+          subFeature: ['cool_all', 'cool_read', 'cool_toggle_1', 'cool_toggle_2'],
+        },
+      });
+    });
+
+    it('calculates effective privileges when there are non-superseded sub-feature privileges', () => {
+      const kibanaPrivileges = createKibanaPrivileges(kibanaFeatures);
+      const role = createRole([
+        {
+          base: [],
+          feature: {
+            with_sub_features: ['cool_excluded_toggle'],
+          },
+          spaces: ['foo'],
+        },
+        {
+          base: ['all'],
+          feature: {
+            with_sub_features: [],
+          },
+          spaces: ['*'],
+        },
+      ]);
+
+      const calculator = new PrivilegeSummaryCalculator(kibanaPrivileges, role);
+      expect(calculator.getEffectiveFeaturePrivileges(role.kibana[0])).toEqual({
+        excluded_from_base: {
+          hasCustomizedSubFeaturePrivileges: false,
+          primary: undefined,
+          subFeature: [],
+        },
+        no_sub_features: {
+          hasCustomizedSubFeaturePrivileges: false,
+          primary: expect.objectContaining({
+            id: 'all',
+          }),
+          subFeature: [],
+        },
+        with_excluded_sub_features: {
+          hasCustomizedSubFeaturePrivileges: false,
+          primary: expect.objectContaining({
+            id: 'all',
+          }),
+          subFeature: [],
+        },
+        with_sub_features: {
+          hasCustomizedSubFeaturePrivileges: true,
+          primary: expect.objectContaining({
+            id: 'all',
+          }),
+          subFeature: [
+            'cool_all',
+            'cool_read',
+            'cool_toggle_1',
+            'cool_toggle_2',
+            'cool_excluded_toggle',
+          ],
+        },
+      });
+    });
+
+    it('calculates privileges for all features for a space entry', () => {
+      const kibanaPrivileges = createKibanaPrivileges(kibanaFeatures);
+      const role = createRole([
+        {
+          base: ['read'],
+          feature: {
+            excluded_from_base: ['all'],
+            no_sub_features: ['read'],
+            with_excluded_sub_features: ['all'],
+            with_sub_features: ['minimal_read', 'cool_excluded_toggle'],
+          },
+          spaces: ['foo'],
+        },
+        {
+          base: ['all'],
+          feature: {},
+          spaces: ['*'],
+        },
+      ]);
+
+      const calculator = new PrivilegeSummaryCalculator(kibanaPrivileges, role);
+      expect(calculator.getEffectiveFeaturePrivileges(role.kibana[0])).toEqual({
+        excluded_from_base: {
+          hasCustomizedSubFeaturePrivileges: false,
+          primary: expect.objectContaining({
+            id: 'all',
+          }),
+          subFeature: ['cool_all', 'cool_read', 'cool_toggle_1', 'cool_toggle_2'],
+        },
+        no_sub_features: {
+          hasCustomizedSubFeaturePrivileges: false,
+          primary: expect.objectContaining({
+            id: 'all',
+          }),
+          subFeature: [],
+        },
+        with_excluded_sub_features: {
+          hasCustomizedSubFeaturePrivileges: false,
+          primary: expect.objectContaining({
+            id: 'all',
+          }),
+          subFeature: [],
+        },
+        with_sub_features: {
+          hasCustomizedSubFeaturePrivileges: true,
+          primary: expect.objectContaining({
+            id: 'all',
+          }),
+          subFeature: [
+            'cool_all',
+            'cool_read',
+            'cool_toggle_1',
+            'cool_toggle_2',
+            'cool_excluded_toggle',
+          ],
+        },
+      });
+    });
+
+    it('calculates privileges for all features for a global entry', () => {
+      const kibanaPrivileges = createKibanaPrivileges(kibanaFeatures);
+      const role = createRole([
+        {
+          base: ['all'],
+          feature: {},
+          spaces: ['*'],
+        },
+      ]);
+
+      const calculator = new PrivilegeSummaryCalculator(kibanaPrivileges, role);
+      expect(calculator.getEffectiveFeaturePrivileges(role.kibana[0])).toEqual({
+        excluded_from_base: {
+          hasCustomizedSubFeaturePrivileges: false,
+          primary: undefined,
+          subFeature: [],
+        },
+        no_sub_features: {
+          hasCustomizedSubFeaturePrivileges: false,
+          primary: expect.objectContaining({
+            id: 'all',
+          }),
+          subFeature: [],
+        },
+        with_excluded_sub_features: {
+          hasCustomizedSubFeaturePrivileges: false,
+          primary: expect.objectContaining({
+            id: 'all',
+          }),
+          subFeature: [],
+        },
+        with_sub_features: {
+          hasCustomizedSubFeaturePrivileges: false,
+          primary: expect.objectContaining({
+            id: 'all',
+          }),
+          subFeature: ['cool_all', 'cool_read', 'cool_toggle_1', 'cool_toggle_2'],
+        },
+      });
+    });
+
+    it('calculates privileges for a single feature at a space entry', () => {
+      const kibanaPrivileges = createKibanaPrivileges(kibanaFeatures);
+      const role = createRole([
+        {
+          base: [],
+          feature: {
+            with_excluded_sub_features: ['all'],
+          },
+          spaces: ['foo'],
+        },
+      ]);
+
+      const calculator = new PrivilegeSummaryCalculator(kibanaPrivileges, role);
+      expect(calculator.getEffectiveFeaturePrivileges(role.kibana[0])).toEqual({
+        excluded_from_base: {
+          hasCustomizedSubFeaturePrivileges: false,
+          primary: undefined,
+          subFeature: [],
+        },
+        no_sub_features: {
+          hasCustomizedSubFeaturePrivileges: false,
+          primary: undefined,
+          subFeature: [],
+        },
+        with_excluded_sub_features: {
+          hasCustomizedSubFeaturePrivileges: false,
+          primary: expect.objectContaining({
+            id: 'all',
+          }),
+          subFeature: [],
+        },
+        with_sub_features: {
+          hasCustomizedSubFeaturePrivileges: false,
+          primary: undefined,
+          subFeature: [],
+        },
+      });
+    });
+
+    it('calculates privileges for a single feature at the global entry', () => {
+      const kibanaPrivileges = createKibanaPrivileges(kibanaFeatures);
+      const role = createRole([
+        {
+          base: [],
+          feature: {
+            with_excluded_sub_features: ['all'],
+          },
+          spaces: ['*'],
+        },
+      ]);
+
+      const calculator = new PrivilegeSummaryCalculator(kibanaPrivileges, role);
+      expect(calculator.getEffectiveFeaturePrivileges(role.kibana[0])).toEqual({
+        excluded_from_base: {
+          hasCustomizedSubFeaturePrivileges: false,
+          primary: undefined,
+          subFeature: [],
+        },
+        no_sub_features: {
+          hasCustomizedSubFeaturePrivileges: false,
+          primary: undefined,
+          subFeature: [],
+        },
+        with_excluded_sub_features: {
+          hasCustomizedSubFeaturePrivileges: false,
+          primary: expect.objectContaining({
+            id: 'all',
+          }),
+          subFeature: [],
+        },
+        with_sub_features: {
+          hasCustomizedSubFeaturePrivileges: false,
+          primary: undefined,
+          subFeature: [],
+        },
+      });
+    });
+  });
+});
diff --git a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/privilege_summary/privilege_summary_calculator.ts b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/privilege_summary/privilege_summary_calculator.ts
new file mode 100644
index 0000000000000..27ed8c443045a
--- /dev/null
+++ b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/privilege_summary/privilege_summary_calculator.ts
@@ -0,0 +1,109 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { Role, RoleKibanaPrivilege } from '../../../../../../../common/model';
+import { isGlobalPrivilegeDefinition } from '../../../privilege_utils';
+import { KibanaPrivileges, PrimaryFeaturePrivilege, SecuredFeature } from '../../../../model';
+import { PrivilegeCollection } from '../../../../model/privilege_collection';
+
+export interface EffectiveFeaturePrivileges {
+  [featureId: string]: {
+    primary?: PrimaryFeaturePrivilege;
+    subFeature: string[];
+    hasCustomizedSubFeaturePrivileges: boolean;
+  };
+}
+export class PrivilegeSummaryCalculator {
+  constructor(private readonly kibanaPrivileges: KibanaPrivileges, private readonly role: Role) {}
+
+  public getEffectiveFeaturePrivileges(entry: RoleKibanaPrivilege): EffectiveFeaturePrivileges {
+    const assignedPrivileges = this.collectAssignedPrivileges(entry);
+
+    const features = this.kibanaPrivileges.getSecuredFeatures();
+
+    return features.reduce((acc, feature) => {
+      const displayedPrimaryFeaturePrivilege = this.getDisplayedPrimaryFeaturePrivilege(
+        assignedPrivileges,
+        feature
+      );
+
+      const effectiveSubPrivileges = feature
+        .getSubFeaturePrivileges()
+        .filter(ap => assignedPrivileges.grantsPrivilege(ap));
+
+      const hasCustomizedSubFeaturePrivileges = this.hasCustomizedSubFeaturePrivileges(
+        feature,
+        displayedPrimaryFeaturePrivilege,
+        entry
+      );
+
+      return {
+        ...acc,
+        [feature.id]: {
+          primary: displayedPrimaryFeaturePrivilege,
+          hasCustomizedSubFeaturePrivileges,
+          subFeature: effectiveSubPrivileges.map(p => p.id),
+        },
+      };
+    }, {} as EffectiveFeaturePrivileges);
+  }
+
+  private hasCustomizedSubFeaturePrivileges(
+    feature: SecuredFeature,
+    displayedPrimaryFeaturePrivilege: PrimaryFeaturePrivilege | undefined,
+    entry: RoleKibanaPrivilege
+  ) {
+    const formPrivileges = this.collectAssignedPrivileges(entry);
+
+    return feature.getSubFeaturePrivileges().some(sfp => {
+      const isGranted = formPrivileges.grantsPrivilege(sfp);
+      const isGrantedByDisplayedPrimary =
+        displayedPrimaryFeaturePrivilege?.grantsPrivilege(sfp) ?? isGranted;
+
+      // if displayed primary is derived from base, then excluded sub-feature-privs should not count.
+      return isGranted !== isGrantedByDisplayedPrimary;
+    });
+  }
+
+  private getDisplayedPrimaryFeaturePrivilege(
+    assignedPrivileges: PrivilegeCollection,
+    feature: SecuredFeature
+  ) {
+    const primaryFeaturePrivileges = feature.getPrimaryFeaturePrivileges();
+    const minimalPrimaryFeaturePrivileges = feature.getMinimalFeaturePrivileges();
+
+    const hasMinimalPrivileges = feature.subFeatures.length > 0;
+
+    const effectivePrivilege = primaryFeaturePrivileges.find(pfp => {
+      const isPrimaryGranted = assignedPrivileges.grantsPrivilege(pfp);
+      if (!isPrimaryGranted && hasMinimalPrivileges) {
+        const correspondingMinimal = minimalPrimaryFeaturePrivileges.find(
+          mpfp => mpfp.id === pfp.getMinimalPrivilegeId()
+        )!;
+
+        return assignedPrivileges.grantsPrivilege(correspondingMinimal);
+      }
+      return isPrimaryGranted;
+    });
+
+    return effectivePrivilege;
+  }
+
+  private collectAssignedPrivileges(entry: RoleKibanaPrivilege) {
+    if (isGlobalPrivilegeDefinition(entry)) {
+      return this.kibanaPrivileges.createCollectionFromRoleKibanaPrivileges([entry]);
+    }
+
+    const globalPrivilege = this.locateGlobalPrivilege(this.role);
+    return this.kibanaPrivileges.createCollectionFromRoleKibanaPrivileges(
+      globalPrivilege ? [globalPrivilege, entry] : [entry]
+    );
+  }
+
+  private locateGlobalPrivilege(role: Role) {
+    return role.kibana.find(entry => isGlobalPrivilegeDefinition(entry));
+  }
+}
diff --git a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/privilege_summary/privilege_summary_expanded_row.tsx b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/privilege_summary/privilege_summary_expanded_row.tsx
new file mode 100644
index 0000000000000..3283f7a58a27c
--- /dev/null
+++ b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/privilege_summary/privilege_summary_expanded_row.tsx
@@ -0,0 +1,131 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * 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 { EuiFlexGroup, EuiFlexItem, EuiText, EuiIconTip } from '@elastic/eui';
+import { SecuredFeature, SubFeaturePrivilegeGroup, SubFeaturePrivilege } from '../../../../model';
+import { EffectiveFeaturePrivileges } from './privilege_summary_calculator';
+
+interface Props {
+  feature: SecuredFeature;
+  effectiveFeaturePrivileges: Array<EffectiveFeaturePrivileges['featureId']>;
+}
+
+export const PrivilegeSummaryExpandedRow = (props: Props) => {
+  return (
+    <EuiFlexGroup direction="column">
+      {props.feature.getSubFeatures().map(subFeature => {
+        return (
+          <EuiFlexItem key={subFeature.name} data-test-subj="subFeatureEntry">
+            <EuiFlexGroup>
+              <EuiFlexItem>
+                <EuiText size="s" data-test-subj="subFeatureName">
+                  {subFeature.name}
+                </EuiText>
+              </EuiFlexItem>
+              {props.effectiveFeaturePrivileges.map((privs, index) => {
+                return (
+                  <EuiFlexItem key={index} data-test-subj={`entry-${index}`}>
+                    {subFeature.getPrivilegeGroups().map(renderPrivilegeGroup(privs.subFeature))}
+                  </EuiFlexItem>
+                );
+              })}
+            </EuiFlexGroup>
+          </EuiFlexItem>
+        );
+      })}
+    </EuiFlexGroup>
+  );
+
+  function renderPrivilegeGroup(effectiveSubFeaturePrivileges: string[]) {
+    return (privilegeGroup: SubFeaturePrivilegeGroup, index: number) => {
+      switch (privilegeGroup.groupType) {
+        case 'independent':
+          return renderIndependentPrivilegeGroup(
+            effectiveSubFeaturePrivileges,
+            privilegeGroup,
+            index
+          );
+        case 'mutually_exclusive':
+          return renderMutuallyExclusivePrivilegeGroup(
+            effectiveSubFeaturePrivileges,
+            privilegeGroup,
+            index
+          );
+        default:
+          throw new Error(`Unsupported privilege group type: ${privilegeGroup.groupType}`);
+      }
+    };
+  }
+
+  function renderIndependentPrivilegeGroup(
+    effectiveSubFeaturePrivileges: string[],
+    privilegeGroup: SubFeaturePrivilegeGroup,
+    index: number
+  ) {
+    return (
+      <div key={index}>
+        {privilegeGroup.privileges.map((privilege: SubFeaturePrivilege) => {
+          const isGranted = effectiveSubFeaturePrivileges.includes(privilege.id);
+          return (
+            <EuiFlexGroup gutterSize="s" data-test-subj="independentPrivilege" key={privilege.id}>
+              <EuiFlexItem grow={false}>
+                <EuiIconTip
+                  type={isGranted ? 'check' : 'cross'}
+                  color={isGranted ? 'primary' : 'danger'}
+                  content={
+                    isGranted
+                      ? i18n.translate(
+                          'xpack.security.management.editRole.privilegeSummary.privilegeGrantedIconTip',
+                          { defaultMessage: 'Privilege is granted' }
+                        )
+                      : i18n.translate(
+                          'xpack.security.management.editRole.privilegeSummary.privilegeNotGrantedIconTip',
+                          { defaultMessage: 'Privilege is not granted' }
+                        )
+                  }
+                />
+              </EuiFlexItem>
+              <EuiFlexItem>
+                <EuiText size="s" data-test-subj="privilegeName">
+                  {privilege.name}
+                </EuiText>
+              </EuiFlexItem>
+            </EuiFlexGroup>
+          );
+        })}
+      </div>
+    );
+  }
+
+  function renderMutuallyExclusivePrivilegeGroup(
+    effectiveSubFeaturePrivileges: string[],
+    privilegeGroup: SubFeaturePrivilegeGroup,
+    index: number
+  ) {
+    const firstSelectedPrivilege = privilegeGroup.privileges.find(p =>
+      effectiveSubFeaturePrivileges.includes(p.id)
+    )?.name;
+
+    return (
+      <EuiFlexGroup gutterSize="s" key={index} data-test-subj="mutexPrivilege">
+        <EuiFlexItem grow={false}>
+          <EuiIconTip
+            type={firstSelectedPrivilege ? 'check' : 'cross'}
+            color={firstSelectedPrivilege ? 'primary' : 'danger'}
+            content={firstSelectedPrivilege ? 'Privilege is granted' : 'Privilege is not granted'}
+          />
+        </EuiFlexItem>
+        <EuiFlexItem>
+          <EuiText size="s" data-test-subj="privilegeName">
+            {firstSelectedPrivilege ?? 'None'}
+          </EuiText>
+        </EuiFlexItem>
+      </EuiFlexGroup>
+    );
+  }
+};
diff --git a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/privilege_summary/privilege_summary_table.test.tsx b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/privilege_summary/privilege_summary_table.test.tsx
new file mode 100644
index 0000000000000..0498f099b536b
--- /dev/null
+++ b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/privilege_summary/privilege_summary_table.test.tsx
@@ -0,0 +1,922 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * 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 { createKibanaPrivileges } from '../../../../__fixtures__/kibana_privileges';
+import { kibanaFeatures } from '../../../../__fixtures__/kibana_features';
+import { mountWithIntl } from 'test_utils/enzyme_helpers';
+import { PrivilegeSummaryTable } from './privilege_summary_table';
+import { RoleKibanaPrivilege } from '../../../../../../../common/model';
+import { getDisplayedFeaturePrivileges } from './__fixtures__';
+
+const createRole = (roleKibanaPrivileges: RoleKibanaPrivilege[]) => ({
+  name: 'some-role',
+  elasticsearch: {
+    cluster: [],
+    indices: [],
+    run_as: [],
+  },
+  kibana: roleKibanaPrivileges,
+});
+
+const spaces = [
+  {
+    id: 'default',
+    name: 'Default Space',
+    disabledFeatures: [],
+  },
+  {
+    id: 'space-1',
+    name: 'First Space',
+    disabledFeatures: [],
+  },
+  {
+    id: 'space-2',
+    name: 'Second Space',
+    disabledFeatures: [],
+  },
+];
+
+const maybeExpectSubFeaturePrivileges = (expect: boolean, subFeaturesPrivileges: unknown) => {
+  return expect ? { subFeaturesPrivileges } : {};
+};
+
+const expectNoPrivileges = (displayedPrivileges: any, expectSubFeatures: boolean) => {
+  expect(displayedPrivileges).toEqual({
+    excluded_from_base: {
+      '*': {
+        hasCustomizedSubFeaturePrivileges: false,
+        primaryFeaturePrivilege: 'None',
+        ...maybeExpectSubFeaturePrivileges(expectSubFeatures, {
+          'Cool Sub Feature': [],
+        }),
+      },
+    },
+    no_sub_features: {
+      '*': {
+        hasCustomizedSubFeaturePrivileges: false,
+        primaryFeaturePrivilege: 'None',
+      },
+    },
+    with_excluded_sub_features: {
+      '*': {
+        hasCustomizedSubFeaturePrivileges: false,
+        primaryFeaturePrivilege: 'None',
+        ...maybeExpectSubFeaturePrivileges(expectSubFeatures, {
+          'Excluded Sub Feature': [],
+        }),
+      },
+    },
+    with_sub_features: {
+      '*': {
+        hasCustomizedSubFeaturePrivileges: false,
+        primaryFeaturePrivilege: 'None',
+        ...maybeExpectSubFeaturePrivileges(expectSubFeatures, {
+          'Cool Sub Feature': [],
+        }),
+      },
+    },
+  });
+};
+
+describe('PrivilegeSummaryTable', () => {
+  [true, false].forEach(allowSubFeaturePrivileges => {
+    describe(`when sub feature privileges are ${
+      allowSubFeaturePrivileges ? 'allowed' : 'disallowed'
+    }`, () => {
+      it('ignores unknown base privileges', () => {
+        const kibanaPrivileges = createKibanaPrivileges(kibanaFeatures, {
+          allowSubFeaturePrivileges,
+        });
+
+        const role = createRole([
+          {
+            base: ['idk_what_this_means'],
+            feature: {},
+            spaces: ['*'],
+          },
+        ]);
+
+        const wrapper = mountWithIntl(
+          <PrivilegeSummaryTable
+            spaces={spaces}
+            kibanaPrivileges={kibanaPrivileges}
+            role={role}
+            canCustomizeSubFeaturePrivileges={allowSubFeaturePrivileges}
+          />
+        );
+
+        const displayedPrivileges = getDisplayedFeaturePrivileges(wrapper, role);
+
+        expectNoPrivileges(displayedPrivileges, allowSubFeaturePrivileges);
+      });
+
+      it('ignores unknown feature privileges', () => {
+        const kibanaPrivileges = createKibanaPrivileges(kibanaFeatures, {
+          allowSubFeaturePrivileges,
+        });
+
+        const role = createRole([
+          {
+            base: [],
+            feature: {
+              with_sub_features: ['this_doesnt_exist_either'],
+            },
+            spaces: ['*'],
+          },
+        ]);
+
+        const wrapper = mountWithIntl(
+          <PrivilegeSummaryTable
+            spaces={spaces}
+            kibanaPrivileges={kibanaPrivileges}
+            role={role}
+            canCustomizeSubFeaturePrivileges={allowSubFeaturePrivileges}
+          />
+        );
+
+        const displayedPrivileges = getDisplayedFeaturePrivileges(wrapper, role);
+
+        expectNoPrivileges(displayedPrivileges, allowSubFeaturePrivileges);
+      });
+
+      it('ignores unknown features', () => {
+        const kibanaPrivileges = createKibanaPrivileges(kibanaFeatures, {
+          allowSubFeaturePrivileges,
+        });
+
+        const role = createRole([
+          {
+            base: [],
+            feature: {
+              unknown_feature: ['this_doesnt_exist_either'],
+            },
+            spaces: ['*'],
+          },
+        ]);
+
+        const wrapper = mountWithIntl(
+          <PrivilegeSummaryTable
+            spaces={spaces}
+            kibanaPrivileges={kibanaPrivileges}
+            role={role}
+            canCustomizeSubFeaturePrivileges={allowSubFeaturePrivileges}
+          />
+        );
+
+        const displayedPrivileges = getDisplayedFeaturePrivileges(wrapper, role);
+
+        expectNoPrivileges(displayedPrivileges, allowSubFeaturePrivileges);
+      });
+
+      it('renders effective privileges for the global base privilege', () => {
+        const kibanaPrivileges = createKibanaPrivileges(kibanaFeatures, {
+          allowSubFeaturePrivileges,
+        });
+
+        const role = createRole([
+          {
+            base: ['all'],
+            feature: {},
+            spaces: ['*'],
+          },
+        ]);
+
+        const wrapper = mountWithIntl(
+          <PrivilegeSummaryTable
+            spaces={spaces}
+            kibanaPrivileges={kibanaPrivileges}
+            role={role}
+            canCustomizeSubFeaturePrivileges={allowSubFeaturePrivileges}
+          />
+        );
+
+        const displayedPrivileges = getDisplayedFeaturePrivileges(wrapper, role);
+
+        expect(displayedPrivileges).toEqual({
+          excluded_from_base: {
+            '*': {
+              hasCustomizedSubFeaturePrivileges: false,
+              primaryFeaturePrivilege: 'None',
+              ...maybeExpectSubFeaturePrivileges(allowSubFeaturePrivileges, {
+                'Cool Sub Feature': [],
+              }),
+            },
+          },
+          no_sub_features: {
+            '*': {
+              hasCustomizedSubFeaturePrivileges: false,
+              primaryFeaturePrivilege: 'All',
+            },
+          },
+          with_excluded_sub_features: {
+            '*': {
+              hasCustomizedSubFeaturePrivileges: false,
+              primaryFeaturePrivilege: 'All',
+              ...maybeExpectSubFeaturePrivileges(allowSubFeaturePrivileges, {
+                'Excluded Sub Feature': [],
+              }),
+            },
+          },
+          with_sub_features: {
+            '*': {
+              hasCustomizedSubFeaturePrivileges: false,
+              primaryFeaturePrivilege: 'All',
+              ...maybeExpectSubFeaturePrivileges(allowSubFeaturePrivileges, {
+                'Cool Sub Feature': ['Cool toggle 1', 'Cool toggle 2', 'All'],
+              }),
+            },
+          },
+        });
+      });
+
+      it('renders effective privileges for a global feature privilege', () => {
+        const kibanaPrivileges = createKibanaPrivileges(kibanaFeatures, {
+          allowSubFeaturePrivileges,
+        });
+
+        const role = createRole([
+          {
+            base: ['all'],
+            feature: {
+              with_sub_features: ['minimal_read'],
+            },
+            spaces: ['*'],
+          },
+        ]);
+
+        const wrapper = mountWithIntl(
+          <PrivilegeSummaryTable
+            spaces={spaces}
+            kibanaPrivileges={kibanaPrivileges}
+            role={role}
+            canCustomizeSubFeaturePrivileges={allowSubFeaturePrivileges}
+          />
+        );
+
+        const displayedPrivileges = getDisplayedFeaturePrivileges(wrapper, role);
+
+        expect(displayedPrivileges).toEqual({
+          excluded_from_base: {
+            '*': {
+              hasCustomizedSubFeaturePrivileges: false,
+              primaryFeaturePrivilege: 'None',
+              ...maybeExpectSubFeaturePrivileges(allowSubFeaturePrivileges, {
+                'Cool Sub Feature': [],
+              }),
+            },
+          },
+          no_sub_features: {
+            '*': {
+              hasCustomizedSubFeaturePrivileges: false,
+              primaryFeaturePrivilege: 'All',
+            },
+          },
+          with_excluded_sub_features: {
+            '*': {
+              hasCustomizedSubFeaturePrivileges: false,
+              primaryFeaturePrivilege: 'All',
+              ...maybeExpectSubFeaturePrivileges(allowSubFeaturePrivileges, {
+                'Excluded Sub Feature': [],
+              }),
+            },
+          },
+          with_sub_features: {
+            '*': {
+              hasCustomizedSubFeaturePrivileges: false,
+              primaryFeaturePrivilege: 'All',
+              ...maybeExpectSubFeaturePrivileges(allowSubFeaturePrivileges, {
+                'Cool Sub Feature': ['Cool toggle 1', 'Cool toggle 2', 'All'],
+              }),
+            },
+          },
+        });
+      });
+
+      it('renders effective privileges for the space base privilege', () => {
+        const kibanaPrivileges = createKibanaPrivileges(kibanaFeatures, {
+          allowSubFeaturePrivileges,
+        });
+
+        const role = createRole([
+          {
+            base: ['all'],
+            feature: {},
+            spaces: ['default', 'space-1'],
+          },
+        ]);
+
+        const wrapper = mountWithIntl(
+          <PrivilegeSummaryTable
+            spaces={spaces}
+            kibanaPrivileges={kibanaPrivileges}
+            role={role}
+            canCustomizeSubFeaturePrivileges={allowSubFeaturePrivileges}
+          />
+        );
+
+        const displayedPrivileges = getDisplayedFeaturePrivileges(wrapper, role);
+
+        expect(displayedPrivileges).toEqual({
+          excluded_from_base: {
+            'default, space-1': {
+              hasCustomizedSubFeaturePrivileges: false,
+              primaryFeaturePrivilege: 'None',
+              ...maybeExpectSubFeaturePrivileges(allowSubFeaturePrivileges, {
+                'Cool Sub Feature': [],
+              }),
+            },
+          },
+          no_sub_features: {
+            'default, space-1': {
+              hasCustomizedSubFeaturePrivileges: false,
+              primaryFeaturePrivilege: 'All',
+            },
+          },
+          with_excluded_sub_features: {
+            'default, space-1': {
+              hasCustomizedSubFeaturePrivileges: false,
+              primaryFeaturePrivilege: 'All',
+              ...maybeExpectSubFeaturePrivileges(allowSubFeaturePrivileges, {
+                'Excluded Sub Feature': [],
+              }),
+            },
+          },
+          with_sub_features: {
+            'default, space-1': {
+              hasCustomizedSubFeaturePrivileges: false,
+              primaryFeaturePrivilege: 'All',
+              ...maybeExpectSubFeaturePrivileges(allowSubFeaturePrivileges, {
+                'Cool Sub Feature': ['Cool toggle 1', 'Cool toggle 2', 'All'],
+              }),
+            },
+          },
+        });
+      });
+
+      it('renders effective privileges for a space feature privilege', () => {
+        const kibanaPrivileges = createKibanaPrivileges(kibanaFeatures, {
+          allowSubFeaturePrivileges,
+        });
+
+        const role = createRole([
+          {
+            base: [],
+            feature: {
+              with_sub_features: ['minimal_read'],
+            },
+            spaces: ['default', 'space-1'],
+          },
+        ]);
+
+        const wrapper = mountWithIntl(
+          <PrivilegeSummaryTable
+            spaces={spaces}
+            kibanaPrivileges={kibanaPrivileges}
+            role={role}
+            canCustomizeSubFeaturePrivileges={allowSubFeaturePrivileges}
+          />
+        );
+
+        const displayedPrivileges = getDisplayedFeaturePrivileges(wrapper, role);
+
+        expect(displayedPrivileges).toEqual({
+          excluded_from_base: {
+            'default, space-1': {
+              hasCustomizedSubFeaturePrivileges: false,
+              primaryFeaturePrivilege: 'None',
+              ...maybeExpectSubFeaturePrivileges(allowSubFeaturePrivileges, {
+                'Cool Sub Feature': [],
+              }),
+            },
+          },
+          no_sub_features: {
+            'default, space-1': {
+              hasCustomizedSubFeaturePrivileges: false,
+              primaryFeaturePrivilege: 'None',
+            },
+          },
+          with_excluded_sub_features: {
+            'default, space-1': {
+              hasCustomizedSubFeaturePrivileges: false,
+              primaryFeaturePrivilege: 'None',
+              ...maybeExpectSubFeaturePrivileges(allowSubFeaturePrivileges, {
+                'Excluded Sub Feature': [],
+              }),
+            },
+          },
+          with_sub_features: {
+            'default, space-1': {
+              hasCustomizedSubFeaturePrivileges: allowSubFeaturePrivileges,
+              primaryFeaturePrivilege: allowSubFeaturePrivileges ? 'Read' : 'None',
+              ...maybeExpectSubFeaturePrivileges(allowSubFeaturePrivileges, {
+                'Cool Sub Feature': [],
+              }),
+            },
+          },
+        });
+      });
+
+      it('renders effective privileges for global base + space base privileges', () => {
+        const kibanaPrivileges = createKibanaPrivileges(kibanaFeatures, {
+          allowSubFeaturePrivileges,
+        });
+
+        const role = createRole([
+          {
+            base: ['read'],
+            feature: {},
+            spaces: ['*'],
+          },
+          {
+            base: ['all'],
+            feature: {},
+            spaces: ['default', 'space-1'],
+          },
+        ]);
+
+        const wrapper = mountWithIntl(
+          <PrivilegeSummaryTable
+            spaces={spaces}
+            kibanaPrivileges={kibanaPrivileges}
+            role={role}
+            canCustomizeSubFeaturePrivileges={allowSubFeaturePrivileges}
+          />
+        );
+
+        const displayedPrivileges = getDisplayedFeaturePrivileges(wrapper, role);
+
+        expect(displayedPrivileges).toEqual({
+          excluded_from_base: {
+            '*': {
+              hasCustomizedSubFeaturePrivileges: false,
+              primaryFeaturePrivilege: 'None',
+              ...maybeExpectSubFeaturePrivileges(allowSubFeaturePrivileges, {
+                'Cool Sub Feature': [],
+              }),
+            },
+            'default, space-1': {
+              hasCustomizedSubFeaturePrivileges: false,
+              primaryFeaturePrivilege: 'None',
+              ...maybeExpectSubFeaturePrivileges(allowSubFeaturePrivileges, {
+                'Cool Sub Feature': [],
+              }),
+            },
+          },
+          no_sub_features: {
+            '*': {
+              hasCustomizedSubFeaturePrivileges: false,
+              primaryFeaturePrivilege: 'Read',
+            },
+            'default, space-1': {
+              hasCustomizedSubFeaturePrivileges: false,
+              primaryFeaturePrivilege: 'All',
+            },
+          },
+          with_excluded_sub_features: {
+            '*': {
+              hasCustomizedSubFeaturePrivileges: false,
+              primaryFeaturePrivilege: 'Read',
+              ...maybeExpectSubFeaturePrivileges(allowSubFeaturePrivileges, {
+                'Excluded Sub Feature': [],
+              }),
+            },
+            'default, space-1': {
+              hasCustomizedSubFeaturePrivileges: false,
+              primaryFeaturePrivilege: 'All',
+              ...maybeExpectSubFeaturePrivileges(allowSubFeaturePrivileges, {
+                'Excluded Sub Feature': [],
+              }),
+            },
+          },
+          with_sub_features: {
+            '*': {
+              hasCustomizedSubFeaturePrivileges: false,
+              primaryFeaturePrivilege: 'Read',
+              ...maybeExpectSubFeaturePrivileges(allowSubFeaturePrivileges, {
+                'Cool Sub Feature': ['Cool toggle 2', 'Read'],
+              }),
+            },
+            'default, space-1': {
+              hasCustomizedSubFeaturePrivileges: false,
+              primaryFeaturePrivilege: 'All',
+              ...maybeExpectSubFeaturePrivileges(allowSubFeaturePrivileges, {
+                'Cool Sub Feature': ['Cool toggle 1', 'Cool toggle 2', 'All'],
+              }),
+            },
+          },
+        });
+      });
+
+      it('renders effective privileges for global base + space feature privileges', () => {
+        const kibanaPrivileges = createKibanaPrivileges(kibanaFeatures, {
+          allowSubFeaturePrivileges,
+        });
+
+        const role = createRole([
+          {
+            base: ['read'],
+            feature: {},
+            spaces: ['*'],
+          },
+          {
+            base: [],
+            feature: {
+              with_sub_features: ['minimal_read', 'cool_all'],
+            },
+            spaces: ['default', 'space-1'],
+          },
+        ]);
+
+        const wrapper = mountWithIntl(
+          <PrivilegeSummaryTable
+            spaces={spaces}
+            kibanaPrivileges={kibanaPrivileges}
+            role={role}
+            canCustomizeSubFeaturePrivileges={allowSubFeaturePrivileges}
+          />
+        );
+
+        const displayedPrivileges = getDisplayedFeaturePrivileges(wrapper, role);
+
+        expect(displayedPrivileges).toEqual({
+          excluded_from_base: {
+            '*': {
+              hasCustomizedSubFeaturePrivileges: false,
+              primaryFeaturePrivilege: 'None',
+              ...maybeExpectSubFeaturePrivileges(allowSubFeaturePrivileges, {
+                'Cool Sub Feature': [],
+              }),
+            },
+            'default, space-1': {
+              hasCustomizedSubFeaturePrivileges: false,
+              primaryFeaturePrivilege: 'None',
+              ...maybeExpectSubFeaturePrivileges(allowSubFeaturePrivileges, {
+                'Cool Sub Feature': [],
+              }),
+            },
+          },
+          no_sub_features: {
+            '*': {
+              hasCustomizedSubFeaturePrivileges: false,
+              primaryFeaturePrivilege: 'Read',
+            },
+            'default, space-1': {
+              hasCustomizedSubFeaturePrivileges: false,
+              primaryFeaturePrivilege: 'Read',
+            },
+          },
+          with_excluded_sub_features: {
+            '*': {
+              hasCustomizedSubFeaturePrivileges: false,
+              primaryFeaturePrivilege: 'Read',
+              ...maybeExpectSubFeaturePrivileges(allowSubFeaturePrivileges, {
+                'Excluded Sub Feature': [],
+              }),
+            },
+            'default, space-1': {
+              hasCustomizedSubFeaturePrivileges: false,
+              primaryFeaturePrivilege: 'Read',
+              ...maybeExpectSubFeaturePrivileges(allowSubFeaturePrivileges, {
+                'Excluded Sub Feature': [],
+              }),
+            },
+          },
+          with_sub_features: {
+            '*': {
+              hasCustomizedSubFeaturePrivileges: false,
+              primaryFeaturePrivilege: 'Read',
+              ...maybeExpectSubFeaturePrivileges(allowSubFeaturePrivileges, {
+                'Cool Sub Feature': ['Cool toggle 2', 'Read'],
+              }),
+            },
+            'default, space-1': {
+              hasCustomizedSubFeaturePrivileges: allowSubFeaturePrivileges,
+              primaryFeaturePrivilege: 'Read',
+              ...maybeExpectSubFeaturePrivileges(allowSubFeaturePrivileges, {
+                'Cool Sub Feature': ['Cool toggle 2', 'All'],
+              }),
+            },
+          },
+        });
+      });
+
+      it('renders effective privileges for global feature + space base privileges', () => {
+        const kibanaPrivileges = createKibanaPrivileges(kibanaFeatures, {
+          allowSubFeaturePrivileges,
+        });
+
+        const role = createRole([
+          {
+            base: [],
+            feature: {
+              with_sub_features: ['minimal_read', 'cool_all'],
+            },
+            spaces: ['*'],
+          },
+          {
+            base: ['read'],
+            feature: {},
+            spaces: ['default', 'space-1'],
+          },
+        ]);
+
+        const wrapper = mountWithIntl(
+          <PrivilegeSummaryTable
+            spaces={spaces}
+            kibanaPrivileges={kibanaPrivileges}
+            role={role}
+            canCustomizeSubFeaturePrivileges={allowSubFeaturePrivileges}
+          />
+        );
+
+        const displayedPrivileges = getDisplayedFeaturePrivileges(wrapper, role);
+
+        expect(displayedPrivileges).toEqual({
+          excluded_from_base: {
+            '*': {
+              hasCustomizedSubFeaturePrivileges: false,
+              primaryFeaturePrivilege: 'None',
+              ...maybeExpectSubFeaturePrivileges(allowSubFeaturePrivileges, {
+                'Cool Sub Feature': [],
+              }),
+            },
+            'default, space-1': {
+              hasCustomizedSubFeaturePrivileges: false,
+              primaryFeaturePrivilege: 'None',
+              ...maybeExpectSubFeaturePrivileges(allowSubFeaturePrivileges, {
+                'Cool Sub Feature': [],
+              }),
+            },
+          },
+          no_sub_features: {
+            '*': {
+              hasCustomizedSubFeaturePrivileges: false,
+              primaryFeaturePrivilege: 'None',
+            },
+            'default, space-1': {
+              hasCustomizedSubFeaturePrivileges: false,
+              primaryFeaturePrivilege: 'Read',
+            },
+          },
+          with_excluded_sub_features: {
+            '*': {
+              hasCustomizedSubFeaturePrivileges: false,
+              primaryFeaturePrivilege: 'None',
+              ...maybeExpectSubFeaturePrivileges(allowSubFeaturePrivileges, {
+                'Excluded Sub Feature': [],
+              }),
+            },
+            'default, space-1': {
+              hasCustomizedSubFeaturePrivileges: false,
+              primaryFeaturePrivilege: 'Read',
+              ...maybeExpectSubFeaturePrivileges(allowSubFeaturePrivileges, {
+                'Excluded Sub Feature': [],
+              }),
+            },
+          },
+          with_sub_features: {
+            '*': {
+              hasCustomizedSubFeaturePrivileges: allowSubFeaturePrivileges,
+              primaryFeaturePrivilege: allowSubFeaturePrivileges ? 'Read' : 'None',
+              ...maybeExpectSubFeaturePrivileges(allowSubFeaturePrivileges, {
+                'Cool Sub Feature': ['All'],
+              }),
+            },
+            'default, space-1': {
+              hasCustomizedSubFeaturePrivileges: allowSubFeaturePrivileges,
+              primaryFeaturePrivilege: 'Read',
+              ...maybeExpectSubFeaturePrivileges(allowSubFeaturePrivileges, {
+                'Cool Sub Feature': ['Cool toggle 2', 'All'],
+              }),
+            },
+          },
+        });
+      });
+
+      it('renders effective privileges for global feature + space feature privileges', () => {
+        const kibanaPrivileges = createKibanaPrivileges(kibanaFeatures, {
+          allowSubFeaturePrivileges,
+        });
+
+        const role = createRole([
+          {
+            base: [],
+            feature: {
+              with_sub_features: ['minimal_read', 'cool_all'],
+            },
+            spaces: ['*'],
+          },
+          {
+            base: [],
+            feature: {
+              with_sub_features: ['all'],
+            },
+            spaces: ['default', 'space-1'],
+          },
+        ]);
+
+        const wrapper = mountWithIntl(
+          <PrivilegeSummaryTable
+            spaces={spaces}
+            kibanaPrivileges={kibanaPrivileges}
+            role={role}
+            canCustomizeSubFeaturePrivileges={allowSubFeaturePrivileges}
+          />
+        );
+
+        const displayedPrivileges = getDisplayedFeaturePrivileges(wrapper, role);
+
+        expect(displayedPrivileges).toEqual({
+          excluded_from_base: {
+            '*': {
+              hasCustomizedSubFeaturePrivileges: false,
+              primaryFeaturePrivilege: 'None',
+              ...maybeExpectSubFeaturePrivileges(allowSubFeaturePrivileges, {
+                'Cool Sub Feature': [],
+              }),
+            },
+            'default, space-1': {
+              hasCustomizedSubFeaturePrivileges: false,
+              primaryFeaturePrivilege: 'None',
+              ...maybeExpectSubFeaturePrivileges(allowSubFeaturePrivileges, {
+                'Cool Sub Feature': [],
+              }),
+            },
+          },
+          no_sub_features: {
+            '*': {
+              hasCustomizedSubFeaturePrivileges: false,
+              primaryFeaturePrivilege: 'None',
+            },
+            'default, space-1': {
+              hasCustomizedSubFeaturePrivileges: false,
+              primaryFeaturePrivilege: 'None',
+            },
+          },
+          with_excluded_sub_features: {
+            '*': {
+              hasCustomizedSubFeaturePrivileges: false,
+              primaryFeaturePrivilege: 'None',
+              ...maybeExpectSubFeaturePrivileges(allowSubFeaturePrivileges, {
+                'Excluded Sub Feature': [],
+              }),
+            },
+            'default, space-1': {
+              hasCustomizedSubFeaturePrivileges: false,
+              primaryFeaturePrivilege: 'None',
+              ...maybeExpectSubFeaturePrivileges(allowSubFeaturePrivileges, {
+                'Excluded Sub Feature': [],
+              }),
+            },
+          },
+          with_sub_features: {
+            '*': {
+              hasCustomizedSubFeaturePrivileges: allowSubFeaturePrivileges,
+              primaryFeaturePrivilege: allowSubFeaturePrivileges ? 'Read' : 'None',
+              ...maybeExpectSubFeaturePrivileges(allowSubFeaturePrivileges, {
+                'Cool Sub Feature': ['All'],
+              }),
+            },
+            'default, space-1': {
+              hasCustomizedSubFeaturePrivileges: false,
+              primaryFeaturePrivilege: 'All',
+              ...maybeExpectSubFeaturePrivileges(allowSubFeaturePrivileges, {
+                'Cool Sub Feature': ['Cool toggle 1', 'Cool toggle 2', 'All'],
+              }),
+            },
+          },
+        });
+      });
+
+      it('renders effective privileges for a complex setup', () => {
+        const kibanaPrivileges = createKibanaPrivileges(kibanaFeatures, {
+          allowSubFeaturePrivileges,
+        });
+
+        const role = createRole([
+          {
+            base: ['read'],
+            feature: {},
+            spaces: ['*'],
+          },
+          {
+            base: ['read', 'all'],
+            feature: {},
+            spaces: ['default'],
+          },
+          {
+            base: [],
+            feature: {
+              with_sub_features: ['minimal_read'],
+              with_excluded_sub_features: ['all', 'cool_toggle_1'],
+              no_sub_features: ['all'],
+              excluded_from_base: ['minimal_all', 'cool_toggle_1'],
+            },
+            spaces: ['space-1', 'space-2'],
+          },
+        ]);
+
+        const wrapper = mountWithIntl(
+          <PrivilegeSummaryTable
+            spaces={spaces}
+            kibanaPrivileges={kibanaPrivileges}
+            role={role}
+            canCustomizeSubFeaturePrivileges={allowSubFeaturePrivileges}
+          />
+        );
+
+        const displayedPrivileges = getDisplayedFeaturePrivileges(wrapper, role);
+
+        expect(displayedPrivileges).toEqual({
+          excluded_from_base: {
+            '*': {
+              hasCustomizedSubFeaturePrivileges: false,
+              primaryFeaturePrivilege: 'None',
+              ...maybeExpectSubFeaturePrivileges(allowSubFeaturePrivileges, {
+                'Cool Sub Feature': [],
+              }),
+            },
+            default: {
+              hasCustomizedSubFeaturePrivileges: false,
+              primaryFeaturePrivilege: 'None',
+              ...maybeExpectSubFeaturePrivileges(allowSubFeaturePrivileges, {
+                'Cool Sub Feature': [],
+              }),
+            },
+            'space-1, space-2': {
+              hasCustomizedSubFeaturePrivileges: allowSubFeaturePrivileges,
+              primaryFeaturePrivilege: allowSubFeaturePrivileges ? 'All' : 'None',
+              ...maybeExpectSubFeaturePrivileges(allowSubFeaturePrivileges, {
+                'Cool Sub Feature': ['Cool toggle 2'],
+              }),
+            },
+          },
+          no_sub_features: {
+            '*': {
+              hasCustomizedSubFeaturePrivileges: false,
+              primaryFeaturePrivilege: 'Read',
+            },
+            default: {
+              hasCustomizedSubFeaturePrivileges: false,
+              primaryFeaturePrivilege: 'All',
+            },
+            'space-1, space-2': {
+              hasCustomizedSubFeaturePrivileges: false,
+              primaryFeaturePrivilege: 'All',
+            },
+          },
+          with_excluded_sub_features: {
+            '*': {
+              hasCustomizedSubFeaturePrivileges: false,
+              primaryFeaturePrivilege: 'Read',
+              ...maybeExpectSubFeaturePrivileges(allowSubFeaturePrivileges, {
+                'Excluded Sub Feature': [],
+              }),
+            },
+            default: {
+              hasCustomizedSubFeaturePrivileges: false,
+              primaryFeaturePrivilege: 'All',
+              ...maybeExpectSubFeaturePrivileges(allowSubFeaturePrivileges, {
+                'Excluded Sub Feature': [],
+              }),
+            },
+            'space-1, space-2': {
+              hasCustomizedSubFeaturePrivileges: allowSubFeaturePrivileges,
+              primaryFeaturePrivilege: 'All',
+              ...maybeExpectSubFeaturePrivileges(allowSubFeaturePrivileges, {
+                'Excluded Sub Feature': ['Cool toggle 1'],
+              }),
+            },
+          },
+          with_sub_features: {
+            '*': {
+              hasCustomizedSubFeaturePrivileges: false,
+              primaryFeaturePrivilege: 'Read',
+              ...maybeExpectSubFeaturePrivileges(allowSubFeaturePrivileges, {
+                'Cool Sub Feature': ['Cool toggle 2', 'Read'],
+              }),
+            },
+            default: {
+              hasCustomizedSubFeaturePrivileges: false,
+              primaryFeaturePrivilege: 'All',
+              ...maybeExpectSubFeaturePrivileges(allowSubFeaturePrivileges, {
+                'Cool Sub Feature': ['Cool toggle 1', 'Cool toggle 2', 'All'],
+              }),
+            },
+            'space-1, space-2': {
+              hasCustomizedSubFeaturePrivileges: false,
+              primaryFeaturePrivilege: 'Read',
+              ...maybeExpectSubFeaturePrivileges(allowSubFeaturePrivileges, {
+                'Cool Sub Feature': ['Cool toggle 2', 'Read'],
+              }),
+            },
+          },
+        });
+      });
+    });
+  });
+});
diff --git a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/privilege_summary/privilege_summary_table.tsx b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/privilege_summary/privilege_summary_table.tsx
new file mode 100644
index 0000000000000..e04ca36b6d193
--- /dev/null
+++ b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/privilege_summary/privilege_summary_table.tsx
@@ -0,0 +1,174 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * 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, { useState } from 'react';
+import { FormattedMessage } from '@kbn/i18n/react';
+import {
+  EuiInMemoryTable,
+  EuiBasicTableColumn,
+  EuiButtonIcon,
+  EuiIcon,
+  EuiIconTip,
+} from '@elastic/eui';
+import { Space } from '../../../../../../../../spaces/common/model/space';
+import { Role, RoleKibanaPrivilege } from '../../../../../../../common/model';
+import { isGlobalPrivilegeDefinition } from '../../../privilege_utils';
+import { FeatureTableCell } from '../feature_table_cell';
+import { SpaceColumnHeader } from './space_column_header';
+import { PrivilegeSummaryExpandedRow } from './privilege_summary_expanded_row';
+import { SecuredFeature, KibanaPrivileges } from '../../../../model';
+import {
+  PrivilegeSummaryCalculator,
+  EffectiveFeaturePrivileges,
+} from './privilege_summary_calculator';
+
+interface Props {
+  role: Role;
+  spaces: Space[];
+  kibanaPrivileges: KibanaPrivileges;
+  canCustomizeSubFeaturePrivileges: boolean;
+}
+
+function getColumnKey(entry: RoleKibanaPrivilege) {
+  return `privilege_entry_${entry.spaces.join('|')}`;
+}
+
+export const PrivilegeSummaryTable = (props: Props) => {
+  const [expandedFeatures, setExpandedFeatures] = useState<string[]>([]);
+
+  const calculator = new PrivilegeSummaryCalculator(props.kibanaPrivileges, props.role);
+
+  const toggleExpandedFeature = (featureId: string) => {
+    if (expandedFeatures.includes(featureId)) {
+      setExpandedFeatures(expandedFeatures.filter(ef => ef !== featureId));
+    } else {
+      setExpandedFeatures([...expandedFeatures, featureId]);
+    }
+  };
+
+  const featureColumn: EuiBasicTableColumn<any> = {
+    name: 'Feature',
+    field: 'feature',
+    render: (feature: any) => {
+      return <FeatureTableCell feature={feature} />;
+    },
+  };
+  const rowExpanderColumn: EuiBasicTableColumn<any> = {
+    align: 'right',
+    width: '40px',
+    isExpander: true,
+    field: 'featureId',
+    name: '',
+    render: (featureId: string, record: any) => {
+      const feature = record.feature as SecuredFeature;
+      const hasSubFeaturePrivileges = feature.getSubFeaturePrivileges().length > 0;
+      if (!hasSubFeaturePrivileges) {
+        return null;
+      }
+      return (
+        <EuiButtonIcon
+          onClick={() => toggleExpandedFeature(featureId)}
+          data-test-subj={`expandPrivilegeSummaryRow`}
+          aria-label={expandedFeatures.includes(featureId) ? 'Collapse' : 'Expand'}
+          iconType={expandedFeatures.includes(featureId) ? 'arrowUp' : 'arrowDown'}
+        />
+      );
+    },
+  };
+
+  const rawKibanaPrivileges = [...props.role.kibana].sort((entry1, entry2) => {
+    if (isGlobalPrivilegeDefinition(entry1)) {
+      return -1;
+    }
+    if (isGlobalPrivilegeDefinition(entry2)) {
+      return 1;
+    }
+    return 0;
+  });
+  const privilegeColumns = rawKibanaPrivileges.map(entry => {
+    const key = getColumnKey(entry);
+    return {
+      name: <SpaceColumnHeader entry={entry} spaces={props.spaces} />,
+      field: key,
+      render: (kibanaPrivilege: EffectiveFeaturePrivileges, record: { featureId: string }) => {
+        const { primary, hasCustomizedSubFeaturePrivileges } = kibanaPrivilege[record.featureId];
+        let iconTip = null;
+        if (hasCustomizedSubFeaturePrivileges) {
+          iconTip = (
+            <EuiIconTip
+              size="s"
+              type="iInCircle"
+              content={
+                <span>
+                  <FormattedMessage
+                    id="xpack.security.management.editRole.privilegeSummary.additionalPrivilegesGrantedIconTip"
+                    defaultMessage="Additional privileges granted. Expand this row for more information."
+                  />
+                </span>
+              }
+            />
+          );
+        } else {
+          iconTip = <EuiIcon size="s" type="empty" />;
+        }
+        return (
+          <span
+            data-test-subj={`privilegeColumn ${
+              hasCustomizedSubFeaturePrivileges ? 'additionalPrivilegesGranted' : ''
+            }`}
+          >
+            {primary?.name ?? 'None'} {iconTip}
+          </span>
+        );
+      },
+    };
+  });
+
+  const columns: Array<EuiBasicTableColumn<any>> = [];
+  if (props.canCustomizeSubFeaturePrivileges) {
+    columns.push(rowExpanderColumn);
+  }
+  columns.push(featureColumn, ...privilegeColumns);
+
+  const privileges = rawKibanaPrivileges.reduce((acc, entry) => {
+    return {
+      ...acc,
+      [getColumnKey(entry)]: calculator.getEffectiveFeaturePrivileges(entry),
+    };
+  }, {} as Record<string, EffectiveFeaturePrivileges>);
+
+  const items = props.kibanaPrivileges.getSecuredFeatures().map(feature => {
+    return {
+      feature,
+      featureId: feature.id,
+      ...privileges,
+    };
+  });
+
+  return (
+    <EuiInMemoryTable
+      columns={columns}
+      items={items}
+      itemId="featureId"
+      rowProps={record => {
+        return {
+          'data-test-subj': `summaryTableRow-${record.featureId}`,
+        };
+      }}
+      itemIdToExpandedRowMap={expandedFeatures.reduce((acc, featureId) => {
+        return {
+          ...acc,
+          [featureId]: (
+            <PrivilegeSummaryExpandedRow
+              feature={props.kibanaPrivileges.getSecuredFeature(featureId)}
+              effectiveFeaturePrivileges={Object.values(privileges).map(p => p[featureId])}
+            />
+          ),
+        };
+      }, {})}
+    />
+  );
+};
diff --git a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/privilege_summary/space_column_header.test.tsx b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/privilege_summary/space_column_header.test.tsx
new file mode 100644
index 0000000000000..b691056528498
--- /dev/null
+++ b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/privilege_summary/space_column_header.test.tsx
@@ -0,0 +1,123 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+import React from 'react';
+import { mountWithIntl } from 'test_utils/enzyme_helpers';
+import { SpaceColumnHeader } from './space_column_header';
+import { SpacesPopoverList } from '../../../spaces_popover_list';
+import { SpaceAvatar } from '../../../../../../../../spaces/public';
+
+const spaces = [
+  {
+    id: '*',
+    name: 'Global',
+    disabledFeatures: [],
+  },
+  {
+    id: 'space-1',
+    name: 'Space 1',
+    disabledFeatures: [],
+  },
+  {
+    id: 'space-2',
+    name: 'Space 2',
+    disabledFeatures: [],
+  },
+  {
+    id: 'space-3',
+    name: 'Space 3',
+    disabledFeatures: [],
+  },
+  {
+    id: 'space-4',
+    name: 'Space 4',
+    disabledFeatures: [],
+  },
+  {
+    id: 'space-5',
+    name: 'Space 5',
+    disabledFeatures: [],
+  },
+];
+
+describe('SpaceColumnHeader', () => {
+  it('renders the Global privilege definition with a special label and popover control', () => {
+    const wrapper = mountWithIntl(
+      <SpaceColumnHeader
+        spaces={spaces}
+        entry={{
+          base: [],
+          feature: {},
+          spaces: ['*'],
+        }}
+      />
+    );
+
+    expect(wrapper.find(SpacesPopoverList)).toHaveLength(1);
+    // Snapshot includes space avatar (The first "G"), followed by the "Global" label,
+    // followed by the (all spaces) text as part of the SpacesPopoverList
+    expect(wrapper.text()).toMatchInlineSnapshot(`"G Global(all spaces)"`);
+  });
+
+  it('renders a placeholder space when the requested space no longer exists', () => {
+    const wrapper = mountWithIntl(
+      <SpaceColumnHeader
+        spaces={spaces}
+        entry={{
+          base: [],
+          feature: {},
+          spaces: ['space-1', 'missing-space', 'space-3'],
+        }}
+      />
+    );
+
+    expect(wrapper.find(SpacesPopoverList)).toHaveLength(0);
+
+    const avatars = wrapper.find(SpaceAvatar);
+    expect(avatars).toHaveLength(3);
+
+    expect(wrapper.text()).toMatchInlineSnapshot(`"S1 m S3 "`);
+  });
+
+  it('renders a space privilege definition with an avatar for each space in the group', () => {
+    const wrapper = mountWithIntl(
+      <SpaceColumnHeader
+        spaces={spaces}
+        entry={{
+          base: [],
+          feature: {},
+          spaces: ['space-1', 'space-2', 'space-3', 'space-4'],
+        }}
+      />
+    );
+
+    expect(wrapper.find(SpacesPopoverList)).toHaveLength(0);
+
+    const avatars = wrapper.find(SpaceAvatar);
+    expect(avatars).toHaveLength(4);
+
+    expect(wrapper.text()).toMatchInlineSnapshot(`"S1 S2 S3 S4 "`);
+  });
+
+  it('renders a space privilege definition with an avatar for the first 4 spaces in the group, with the popover control showing the rest', () => {
+    const wrapper = mountWithIntl(
+      <SpaceColumnHeader
+        spaces={spaces}
+        entry={{
+          base: [],
+          feature: {},
+          spaces: ['space-1', 'space-2', 'space-3', 'space-4', 'space-5'],
+        }}
+      />
+    );
+
+    expect(wrapper.find(SpacesPopoverList)).toHaveLength(1);
+
+    const avatars = wrapper.find(SpaceAvatar);
+    expect(avatars).toHaveLength(4);
+
+    expect(wrapper.text()).toMatchInlineSnapshot(`"S1 S2 S3 S4 +1 more"`);
+  });
+});
diff --git a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/privilege_summary/space_column_header.tsx b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/privilege_summary/space_column_header.tsx
new file mode 100644
index 0000000000000..8ed9bb449b595
--- /dev/null
+++ b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/privilege_summary/space_column_header.tsx
@@ -0,0 +1,78 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+import React, { Fragment } from 'react';
+import { FormattedMessage } from '@kbn/i18n/react';
+import { i18n } from '@kbn/i18n';
+import { Space, SpaceAvatar } from '../../../../../../../../spaces/public';
+import { RoleKibanaPrivilege } from '../../../../../../../common/model';
+import { isGlobalPrivilegeDefinition } from '../../../privilege_utils';
+import { SpacesPopoverList } from '../../../spaces_popover_list';
+
+interface Props {
+  spaces: Space[];
+  entry: RoleKibanaPrivilege;
+}
+
+const SPACES_DISPLAY_COUNT = 4;
+
+export const SpaceColumnHeader = (props: Props) => {
+  const isGlobal = isGlobalPrivilegeDefinition(props.entry);
+  const entrySpaces = props.entry.spaces.map(spaceId => {
+    return (
+      props.spaces.find(s => s.id === spaceId) ?? {
+        id: spaceId,
+        name: spaceId,
+        disabledFeatures: [],
+      }
+    );
+  });
+  return (
+    <div>
+      {entrySpaces.slice(0, SPACES_DISPLAY_COUNT).map(space => {
+        return (
+          <span key={space.id}>
+            <SpaceAvatar size="s" space={space} />{' '}
+            {isGlobal && (
+              <span>
+                <FormattedMessage
+                  id="xpack.security.management.editRole.spacePrivilegeMatrix.globalSpaceName"
+                  defaultMessage="Global"
+                />
+                <br />
+                <SpacesPopoverList
+                  spaces={props.spaces.filter(s => s.id !== '*')}
+                  buttonText={i18n.translate(
+                    'xpack.security.management.editRole.spacePrivilegeMatrix.showAllSpacesLink',
+                    {
+                      defaultMessage: '(all spaces)',
+                    }
+                  )}
+                />
+              </span>
+            )}
+          </span>
+        );
+      })}
+      {entrySpaces.length > SPACES_DISPLAY_COUNT && (
+        <Fragment>
+          <br />
+          <SpacesPopoverList
+            spaces={entrySpaces}
+            buttonText={i18n.translate(
+              'xpack.security.management.editRole.spacePrivilegeMatrix.showNMoreSpacesLink',
+              {
+                defaultMessage: '+{count} more',
+                values: {
+                  count: entrySpaces.length - SPACES_DISPLAY_COUNT,
+                },
+              }
+            )}
+          />
+        </Fragment>
+      )}
+    </div>
+  );
+};
diff --git a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/simple_privilege_section/__snapshots__/simple_privilege_section.test.tsx.snap b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/simple_privilege_section/__snapshots__/simple_privilege_section.test.tsx.snap
index 4d8f590f286ae..7873e47d2e0ff 100644
--- a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/simple_privilege_section/__snapshots__/simple_privilege_section.test.tsx.snap
+++ b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/simple_privilege_section/__snapshots__/simple_privilege_section.test.tsx.snap
@@ -2,153 +2,159 @@
 
 exports[`<SimplePrivilegeForm> renders without crashing 1`] = `
 <Fragment>
-  <EuiDescribedFormGroup
-    description={
-      <p>
-        <FormattedMessage
-          defaultMessage="Specifies the Kibana privilege for this role."
-          id="xpack.security.management.editRole.simplePrivilegeForm.specifyPrivilegeForRoleDescription"
-          values={Object {}}
-        />
-      </p>
-    }
-    title={
-      <h3>
-        <FormattedMessage
-          defaultMessage="Kibana privileges"
-          id="xpack.security.management.editRole.simplePrivilegeForm.kibanaPrivilegesTitle"
-          values={Object {}}
-        />
-      </h3>
-    }
+  <EuiFlexGroup
+    direction="column"
   >
-    <EuiFormRow
-      describedByIds={Array []}
-      display="row"
-      fullWidth={false}
-      hasChildLabel={true}
-      hasEmptyLabelSpace={true}
-      labelType="label"
-    >
-      <EuiSuperSelect
-        compressed={false}
-        disabled={false}
+    <EuiFlexItem>
+      <EuiText
+        color="subdued"
+        size="s"
+      >
+        <p>
+          <FormattedMessage
+            defaultMessage="Specifies the Kibana privilege for this role."
+            id="xpack.security.management.editRole.simplePrivilegeForm.specifyPrivilegeForRoleDescription"
+            values={Object {}}
+          />
+        </p>
+      </EuiText>
+    </EuiFlexItem>
+    <EuiFlexItem>
+      <EuiFormRow
+        describedByIds={Array []}
+        display="row"
         fullWidth={false}
-        hasDividers={true}
-        isInvalid={false}
-        isLoading={false}
-        onChange={[Function]}
-        options={
-          Array [
-            Object {
-              "dropdownDisplay": <EuiText>
-                <strong>
+        hasChildLabel={true}
+        hasEmptyLabelSpace={false}
+        label={
+          <FormattedMessage
+            defaultMessage="Kibana privileges"
+            id="xpack.security.management.editRole.simplePrivilegeForm.kibanaPrivilegesTitle"
+            values={Object {}}
+          />
+        }
+        labelType="label"
+      >
+        <EuiSuperSelect
+          compressed={false}
+          disabled={false}
+          fullWidth={false}
+          hasDividers={true}
+          isInvalid={false}
+          isLoading={false}
+          onChange={[Function]}
+          options={
+            Array [
+              Object {
+                "dropdownDisplay": <EuiText>
+                  <strong>
+                    <FormattedMessage
+                      defaultMessage="None"
+                      id="xpack.security.management.editRole.simplePrivilegeForm.noPrivilegeDropdown"
+                      values={Object {}}
+                    />
+                  </strong>
+                  <p>
+                    <FormattedMessage
+                      defaultMessage="No access to Kibana"
+                      id="xpack.security.management.editRole.simplePrivilegeForm.noPrivilegeDropdownDescription"
+                      values={Object {}}
+                    />
+                  </p>
+                </EuiText>,
+                "inputDisplay": <EuiText>
                   <FormattedMessage
                     defaultMessage="None"
-                    id="xpack.security.management.editRole.simplePrivilegeForm.noPrivilegeDropdown"
+                    id="xpack.security.management.editRole.simplePrivilegeForm.noPrivilegeInput"
                     values={Object {}}
                   />
-                </strong>
-                <p>
-                  <FormattedMessage
-                    defaultMessage="No access to Kibana"
-                    id="xpack.security.management.editRole.simplePrivilegeForm.noPrivilegeDropdownDescription"
-                    values={Object {}}
-                  />
-                </p>
-              </EuiText>,
-              "inputDisplay": <EuiText>
-                <FormattedMessage
-                  defaultMessage="None"
-                  id="xpack.security.management.editRole.simplePrivilegeForm.noPrivilegeInput"
-                  values={Object {}}
-                />
-              </EuiText>,
-              "value": "none",
-            },
-            Object {
-              "dropdownDisplay": <EuiText>
-                <strong>
+                </EuiText>,
+                "value": "none",
+              },
+              Object {
+                "dropdownDisplay": <EuiText>
+                  <strong>
+                    <FormattedMessage
+                      defaultMessage="Custom"
+                      id="xpack.security.management.editRole.simplePrivilegeForm.customPrivilegeDropdown"
+                      values={Object {}}
+                    />
+                  </strong>
+                  <p>
+                    <FormattedMessage
+                      defaultMessage="Customize access to Kibana"
+                      id="xpack.security.management.editRole.simplePrivilegeForm.customPrivilegeDropdownDescription"
+                      values={Object {}}
+                    />
+                  </p>
+                </EuiText>,
+                "inputDisplay": <EuiText>
                   <FormattedMessage
                     defaultMessage="Custom"
-                    id="xpack.security.management.editRole.simplePrivilegeForm.customPrivilegeDropdown"
-                    values={Object {}}
-                  />
-                </strong>
-                <p>
-                  <FormattedMessage
-                    defaultMessage="Customize access to Kibana"
-                    id="xpack.security.management.editRole.simplePrivilegeForm.customPrivilegeDropdownDescription"
+                    id="xpack.security.management.editRole.simplePrivilegeForm.customPrivilegeInput"
                     values={Object {}}
                   />
-                </p>
-              </EuiText>,
-              "inputDisplay": <EuiText>
-                <FormattedMessage
-                  defaultMessage="Custom"
-                  id="xpack.security.management.editRole.simplePrivilegeForm.customPrivilegeInput"
-                  values={Object {}}
-                />
-              </EuiText>,
-              "value": "custom",
-            },
-            Object {
-              "dropdownDisplay": <EuiText>
-                <strong>
+                </EuiText>,
+                "value": "custom",
+              },
+              Object {
+                "dropdownDisplay": <EuiText>
+                  <strong>
+                    <FormattedMessage
+                      defaultMessage="Read"
+                      id="xpack.security.management.editRole.simplePrivilegeForm.readPrivilegeDropdown"
+                      values={Object {}}
+                    />
+                  </strong>
+                  <p>
+                    <FormattedMessage
+                      defaultMessage="Grants read-only access to all of Kibana"
+                      id="xpack.security.management.editRole.simplePrivilegeForm.readPrivilegeDropdownDescription"
+                      values={Object {}}
+                    />
+                  </p>
+                </EuiText>,
+                "inputDisplay": <EuiText>
                   <FormattedMessage
                     defaultMessage="Read"
-                    id="xpack.security.management.editRole.simplePrivilegeForm.readPrivilegeDropdown"
+                    id="xpack.security.management.editRole.simplePrivilegeForm.readPrivilegeInput"
                     values={Object {}}
                   />
-                </strong>
-                <p>
-                  <FormattedMessage
-                    defaultMessage="Grants read-only access to all of Kibana"
-                    id="xpack.security.management.editRole.simplePrivilegeForm.readPrivilegeDropdownDescription"
-                    values={Object {}}
-                  />
-                </p>
-              </EuiText>,
-              "inputDisplay": <EuiText>
-                <FormattedMessage
-                  defaultMessage="Read"
-                  id="xpack.security.management.editRole.simplePrivilegeForm.readPrivilegeInput"
-                  values={Object {}}
-                />
-              </EuiText>,
-              "value": "read",
-            },
-            Object {
-              "dropdownDisplay": <EuiText>
-                <strong>
+                </EuiText>,
+                "value": "read",
+              },
+              Object {
+                "dropdownDisplay": <EuiText>
+                  <strong>
+                    <FormattedMessage
+                      defaultMessage="All"
+                      id="xpack.security.management.editRole.simplePrivilegeForm.allPrivilegeDropdown"
+                      values={Object {}}
+                    />
+                  </strong>
+                  <p>
+                    <FormattedMessage
+                      defaultMessage="Grants full access to all of Kibana"
+                      id="xpack.security.management.editRole.simplePrivilegeForm.allPrivilegeDropdownDescription"
+                      values={Object {}}
+                    />
+                  </p>
+                </EuiText>,
+                "inputDisplay": <EuiText>
                   <FormattedMessage
                     defaultMessage="All"
-                    id="xpack.security.management.editRole.simplePrivilegeForm.allPrivilegeDropdown"
-                    values={Object {}}
-                  />
-                </strong>
-                <p>
-                  <FormattedMessage
-                    defaultMessage="Grants full access to all of Kibana"
-                    id="xpack.security.management.editRole.simplePrivilegeForm.allPrivilegeDropdownDescription"
+                    id="xpack.security.management.editRole.simplePrivilegeForm.allPrivilegeInput"
                     values={Object {}}
                   />
-                </p>
-              </EuiText>,
-              "inputDisplay": <EuiText>
-                <FormattedMessage
-                  defaultMessage="All"
-                  id="xpack.security.management.editRole.simplePrivilegeForm.allPrivilegeInput"
-                  values={Object {}}
-                />
-              </EuiText>,
-              "value": "all",
-            },
-          ]
-        }
-        valueOfSelected="none"
-      />
-    </EuiFormRow>
-  </EuiDescribedFormGroup>
+                </EuiText>,
+                "value": "all",
+              },
+            ]
+          }
+          valueOfSelected="none"
+        />
+      </EuiFormRow>
+    </EuiFlexItem>
+  </EuiFlexGroup>
 </Fragment>
 `;
diff --git a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/simple_privilege_section/simple_privilege_section.test.tsx b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/simple_privilege_section/simple_privilege_section.test.tsx
index db1e3cfd61621..7ecf32ee45b85 100644
--- a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/simple_privilege_section/simple_privilege_section.test.tsx
+++ b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/simple_privilege_section/simple_privilege_section.test.tsx
@@ -7,24 +7,53 @@
 import { EuiButtonGroup, EuiButtonGroupProps, EuiComboBox, EuiSuperSelect } from '@elastic/eui';
 import React from 'react';
 import { mountWithIntl, shallowWithIntl } from 'test_utils/enzyme_helpers';
-import { Feature } from '../../../../../../../../features/public';
-import { KibanaPrivileges, Role } from '../../../../../../../common/model';
-import { KibanaPrivilegeCalculatorFactory } from '../kibana_privilege_calculator';
+import { Role } from '../../../../../../../common/model';
 import { SimplePrivilegeSection } from './simple_privilege_section';
 import { UnsupportedSpacePrivilegesWarning } from './unsupported_space_privileges_warning';
+import { KibanaPrivileges, SecuredFeature } from '../../../../model';
 
 const buildProps = (customProps: any = {}) => {
-  const kibanaPrivileges = new KibanaPrivileges({
-    features: {
-      feature1: {
-        all: ['*'],
-        read: ['read'],
+  const features = [
+    new SecuredFeature({
+      id: 'feature1',
+      name: 'Feature 1',
+      app: ['app'],
+      icon: 'spacesApp',
+      privileges: {
+        all: {
+          app: ['app'],
+          savedObject: {
+            all: ['foo'],
+            read: [],
+          },
+          ui: ['app-ui'],
+        },
+        read: {
+          app: ['app'],
+          savedObject: {
+            all: [],
+            read: [],
+          },
+          ui: ['app-ui'],
+        },
       },
+    }),
+  ] as SecuredFeature[];
+
+  const kibanaPrivileges = new KibanaPrivileges(
+    {
+      features: {
+        feature1: {
+          all: ['*'],
+          read: ['read'],
+        },
+      },
+      global: {},
+      space: {},
+      reserved: {},
     },
-    global: {},
-    space: {},
-    reserved: {},
-  });
+    features
+  );
 
   const role = {
     name: '',
@@ -40,34 +69,9 @@ const buildProps = (customProps: any = {}) => {
   return {
     editable: true,
     kibanaPrivileges,
-    privilegeCalculatorFactory: new KibanaPrivilegeCalculatorFactory(kibanaPrivileges),
-    features: [
-      {
-        id: 'feature1',
-        name: 'Feature 1',
-        app: ['app'],
-        icon: 'spacesApp',
-        privileges: {
-          all: {
-            app: ['app'],
-            savedObject: {
-              all: ['foo'],
-              read: [],
-            },
-            ui: ['app-ui'],
-          },
-          read: {
-            app: ['app'],
-            savedObject: {
-              all: [],
-              read: [],
-            },
-            ui: ['app-ui'],
-          },
-        },
-      },
-    ] as Feature[],
+    features,
     onChange: jest.fn(),
+    canCustomizeSubFeaturePrivileges: true,
     ...customProps,
     role,
   };
diff --git a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/simple_privilege_section/simple_privilege_section.tsx b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/simple_privilege_section/simple_privilege_section.tsx
index 2221fc6bab279..d68d43e8089c7 100644
--- a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/simple_privilege_section/simple_privilege_section.tsx
+++ b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/simple_privilege_section/simple_privilege_section.tsx
@@ -6,34 +6,28 @@
 
 import {
   EuiComboBox,
-  EuiDescribedFormGroup,
   EuiFormRow,
   EuiSuperSelect,
   EuiText,
+  EuiFlexGroup,
+  EuiFlexItem,
 } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n/react';
 import React, { Component, Fragment } from 'react';
-
-import { Feature } from '../../../../../../../../features/public';
-import {
-  KibanaPrivileges,
-  Role,
-  RoleKibanaPrivilege,
-  copyRole,
-} from '../../../../../../../common/model';
-import { KibanaPrivilegeCalculatorFactory } from '../kibana_privilege_calculator';
+import { Role, RoleKibanaPrivilege, copyRole } from '../../../../../../../common/model';
 import { isGlobalPrivilegeDefinition } from '../../../privilege_utils';
 import { CUSTOM_PRIVILEGE_VALUE, NO_PRIVILEGE_VALUE } from '../constants';
 import { FeatureTable } from '../feature_table';
 import { UnsupportedSpacePrivilegesWarning } from './unsupported_space_privileges_warning';
+import { KibanaPrivileges } from '../../../../model';
+import { PrivilegeFormCalculator } from '../privilege_form_calculator';
 
 interface Props {
   role: Role;
   kibanaPrivileges: KibanaPrivileges;
-  privilegeCalculatorFactory: KibanaPrivilegeCalculatorFactory;
-  features: Feature[];
   onChange: (role: Role) => void;
   editable: boolean;
+  canCustomizeSubFeaturePrivileges: boolean;
 }
 
 interface State {
@@ -58,20 +52,14 @@ export class SimplePrivilegeSection extends Component<Props, State> {
   public render() {
     const kibanaPrivilege = this.getDisplayedBasePrivilege();
 
-    const privilegeCalculator = this.props.privilegeCalculatorFactory.getInstance(this.props.role);
-
-    const calculatedPrivileges = privilegeCalculator.calculateEffectivePrivileges()[
-      this.state.globalPrivsIndex
-    ];
-
-    const allowedPrivileges = privilegeCalculator.calculateAllowedPrivileges()[
-      this.state.globalPrivsIndex
-    ];
+    const reservedPrivileges = this.props.role.kibana[this.state.globalPrivsIndex]?._reserved ?? [];
 
-    const hasReservedPrivileges =
-      calculatedPrivileges &&
-      calculatedPrivileges.reserved != null &&
-      calculatedPrivileges.reserved.length > 0;
+    const title = (
+      <FormattedMessage
+        id="xpack.security.management.editRole.simplePrivilegeForm.kibanaPrivilegesTitle"
+        defaultMessage="Kibana privileges"
+      />
+    );
 
     const description = (
       <p>
@@ -84,162 +72,159 @@ export class SimplePrivilegeSection extends Component<Props, State> {
 
     return (
       <Fragment>
-        <EuiDescribedFormGroup
-          title={
-            <h3>
-              <FormattedMessage
-                id="xpack.security.management.editRole.simplePrivilegeForm.kibanaPrivilegesTitle"
-                defaultMessage="Kibana privileges"
-              />
-            </h3>
-          }
-          description={description}
-        >
-          <EuiFormRow hasEmptyLabelSpace>
-            {hasReservedPrivileges ? (
-              <EuiComboBox
-                fullWidth
-                selectedOptions={calculatedPrivileges.reserved!.map(privilege => ({
-                  label: privilege,
-                }))}
-                isDisabled
-              />
-            ) : (
-              <EuiSuperSelect
-                disabled={!this.props.editable}
-                onChange={this.onKibanaPrivilegeChange}
-                options={[
-                  {
-                    value: NO_PRIVILEGE_VALUE,
-                    inputDisplay: (
-                      <EuiText>
-                        <FormattedMessage
-                          id="xpack.security.management.editRole.simplePrivilegeForm.noPrivilegeInput"
-                          defaultMessage="None"
-                        />
-                      </EuiText>
-                    ),
-                    dropdownDisplay: (
-                      <EuiText>
-                        <strong>
+        <EuiFlexGroup direction="column">
+          <EuiFlexItem>
+            <EuiText size="s" color="subdued">
+              {description}
+            </EuiText>
+          </EuiFlexItem>
+          <EuiFlexItem>
+            <EuiFormRow label={title}>
+              {reservedPrivileges.length > 0 ? (
+                <EuiComboBox
+                  fullWidth
+                  selectedOptions={reservedPrivileges.map(rp => ({ label: rp }))}
+                  isDisabled
+                />
+              ) : (
+                <EuiSuperSelect
+                  disabled={!this.props.editable}
+                  onChange={this.onKibanaPrivilegeChange}
+                  options={[
+                    {
+                      value: NO_PRIVILEGE_VALUE,
+                      inputDisplay: (
+                        <EuiText>
                           <FormattedMessage
-                            id="xpack.security.management.editRole.simplePrivilegeForm.noPrivilegeDropdown"
+                            id="xpack.security.management.editRole.simplePrivilegeForm.noPrivilegeInput"
                             defaultMessage="None"
                           />
-                        </strong>
-                        <p>
-                          <FormattedMessage
-                            id="xpack.security.management.editRole.simplePrivilegeForm.noPrivilegeDropdownDescription"
-                            defaultMessage="No access to Kibana"
-                          />
-                        </p>
-                      </EuiText>
-                    ),
-                  },
-                  {
-                    value: CUSTOM_PRIVILEGE_VALUE,
-                    inputDisplay: (
-                      <EuiText>
-                        <FormattedMessage
-                          id="xpack.security.management.editRole.simplePrivilegeForm.customPrivilegeInput"
-                          defaultMessage="Custom"
-                        />
-                      </EuiText>
-                    ),
-                    dropdownDisplay: (
-                      <EuiText>
-                        <strong>
+                        </EuiText>
+                      ),
+                      dropdownDisplay: (
+                        <EuiText>
+                          <strong>
+                            <FormattedMessage
+                              id="xpack.security.management.editRole.simplePrivilegeForm.noPrivilegeDropdown"
+                              defaultMessage="None"
+                            />
+                          </strong>
+                          <p>
+                            <FormattedMessage
+                              id="xpack.security.management.editRole.simplePrivilegeForm.noPrivilegeDropdownDescription"
+                              defaultMessage="No access to Kibana"
+                            />
+                          </p>
+                        </EuiText>
+                      ),
+                    },
+                    {
+                      value: CUSTOM_PRIVILEGE_VALUE,
+                      inputDisplay: (
+                        <EuiText>
                           <FormattedMessage
-                            id="xpack.security.management.editRole.simplePrivilegeForm.customPrivilegeDropdown"
+                            id="xpack.security.management.editRole.simplePrivilegeForm.customPrivilegeInput"
                             defaultMessage="Custom"
                           />
-                        </strong>
-                        <p>
+                        </EuiText>
+                      ),
+                      dropdownDisplay: (
+                        <EuiText>
+                          <strong>
+                            <FormattedMessage
+                              id="xpack.security.management.editRole.simplePrivilegeForm.customPrivilegeDropdown"
+                              defaultMessage="Custom"
+                            />
+                          </strong>
+                          <p>
+                            <FormattedMessage
+                              id="xpack.security.management.editRole.simplePrivilegeForm.customPrivilegeDropdownDescription"
+                              defaultMessage="Customize access to Kibana"
+                            />
+                          </p>
+                        </EuiText>
+                      ),
+                    },
+                    {
+                      value: 'read',
+                      inputDisplay: (
+                        <EuiText>
                           <FormattedMessage
-                            id="xpack.security.management.editRole.simplePrivilegeForm.customPrivilegeDropdownDescription"
-                            defaultMessage="Customize access to Kibana"
-                          />
-                        </p>
-                      </EuiText>
-                    ),
-                  },
-                  {
-                    value: 'read',
-                    inputDisplay: (
-                      <EuiText>
-                        <FormattedMessage
-                          id="xpack.security.management.editRole.simplePrivilegeForm.readPrivilegeInput"
-                          defaultMessage="Read"
-                        />
-                      </EuiText>
-                    ),
-                    dropdownDisplay: (
-                      <EuiText>
-                        <strong>
-                          <FormattedMessage
-                            id="xpack.security.management.editRole.simplePrivilegeForm.readPrivilegeDropdown"
+                            id="xpack.security.management.editRole.simplePrivilegeForm.readPrivilegeInput"
                             defaultMessage="Read"
                           />
-                        </strong>
-                        <p>
-                          <FormattedMessage
-                            id="xpack.security.management.editRole.simplePrivilegeForm.readPrivilegeDropdownDescription"
-                            defaultMessage="Grants read-only access to all of Kibana"
-                          />
-                        </p>
-                      </EuiText>
-                    ),
-                  },
-                  {
-                    value: 'all',
-                    inputDisplay: (
-                      <EuiText>
-                        <FormattedMessage
-                          id="xpack.security.management.editRole.simplePrivilegeForm.allPrivilegeInput"
-                          defaultMessage="All"
-                        />
-                      </EuiText>
-                    ),
-                    dropdownDisplay: (
-                      <EuiText>
-                        <strong>
+                        </EuiText>
+                      ),
+                      dropdownDisplay: (
+                        <EuiText>
+                          <strong>
+                            <FormattedMessage
+                              id="xpack.security.management.editRole.simplePrivilegeForm.readPrivilegeDropdown"
+                              defaultMessage="Read"
+                            />
+                          </strong>
+                          <p>
+                            <FormattedMessage
+                              id="xpack.security.management.editRole.simplePrivilegeForm.readPrivilegeDropdownDescription"
+                              defaultMessage="Grants read-only access to all of Kibana"
+                            />
+                          </p>
+                        </EuiText>
+                      ),
+                    },
+                    {
+                      value: 'all',
+                      inputDisplay: (
+                        <EuiText>
                           <FormattedMessage
-                            id="xpack.security.management.editRole.simplePrivilegeForm.allPrivilegeDropdown"
+                            id="xpack.security.management.editRole.simplePrivilegeForm.allPrivilegeInput"
                             defaultMessage="All"
                           />
-                        </strong>
-                        <p>
-                          <FormattedMessage
-                            id="xpack.security.management.editRole.simplePrivilegeForm.allPrivilegeDropdownDescription"
-                            defaultMessage="Grants full access to all of Kibana"
-                          />
-                        </p>
-                      </EuiText>
-                    ),
-                  },
-                ]}
-                hasDividers
-                valueOfSelected={kibanaPrivilege}
-              />
-            )}
-          </EuiFormRow>
-          {this.state.isCustomizingGlobalPrivilege && (
-            <EuiFormRow>
-              <FeatureTable
-                role={this.props.role}
-                kibanaPrivileges={this.props.kibanaPrivileges}
-                calculatedPrivileges={calculatedPrivileges}
-                allowedPrivileges={allowedPrivileges}
-                rankedFeaturePrivileges={privilegeCalculator.rankedFeaturePrivileges}
-                features={this.props.features}
-                onChange={this.onFeaturePrivilegeChange}
-                onChangeAll={this.onChangeAllFeaturePrivileges}
-                spacesIndex={this.props.role.kibana.findIndex(k => isGlobalPrivilegeDefinition(k))}
-              />
+                        </EuiText>
+                      ),
+                      dropdownDisplay: (
+                        <EuiText>
+                          <strong>
+                            <FormattedMessage
+                              id="xpack.security.management.editRole.simplePrivilegeForm.allPrivilegeDropdown"
+                              defaultMessage="All"
+                            />
+                          </strong>
+                          <p>
+                            <FormattedMessage
+                              id="xpack.security.management.editRole.simplePrivilegeForm.allPrivilegeDropdownDescription"
+                              defaultMessage="Grants full access to all of Kibana"
+                            />
+                          </p>
+                        </EuiText>
+                      ),
+                    },
+                  ]}
+                  hasDividers
+                  valueOfSelected={kibanaPrivilege}
+                />
+              )}
             </EuiFormRow>
-          )}
-          {this.maybeRenderSpacePrivilegeWarning()}
-        </EuiDescribedFormGroup>
+            {this.state.isCustomizingGlobalPrivilege && (
+              <EuiFormRow fullWidth>
+                <FeatureTable
+                  role={this.props.role}
+                  kibanaPrivileges={this.props.kibanaPrivileges}
+                  privilegeCalculator={
+                    new PrivilegeFormCalculator(this.props.kibanaPrivileges, this.props.role)
+                  }
+                  onChange={this.onFeaturePrivilegeChange}
+                  onChangeAll={this.onChangeAllFeaturePrivileges}
+                  privilegeIndex={this.props.role.kibana.findIndex(k =>
+                    isGlobalPrivilegeDefinition(k)
+                  )}
+                  canCustomizeSubFeaturePrivileges={this.props.canCustomizeSubFeaturePrivileges}
+                />
+              </EuiFormRow>
+            )}
+            {this.maybeRenderSpacePrivilegeWarning()}
+          </EuiFlexItem>
+        </EuiFlexGroup>
       </Fragment>
     );
   }
@@ -295,7 +280,7 @@ export class SimplePrivilegeSection extends Component<Props, State> {
 
     const form = this.locateGlobalPrivilege(role) || this.createGlobalPrivilegeEntry(role);
     if (privileges.length > 0) {
-      this.props.features.forEach(feature => {
+      this.props.kibanaPrivileges.getSecuredFeatures().forEach(feature => {
         form.feature[feature.id] = [...privileges];
       });
     } else {
diff --git a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/space_aware_privilege_section/__fixtures__/raw_kibana_privileges.ts b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/space_aware_privilege_section/__fixtures__/raw_kibana_privileges.ts
deleted file mode 100644
index 428836c9f181b..0000000000000
--- a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/space_aware_privilege_section/__fixtures__/raw_kibana_privileges.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { RawKibanaPrivileges } from '../../../../../../../../common/model';
-
-export const rawKibanaPrivileges: RawKibanaPrivileges = {
-  global: {
-    all: [
-      'normal-feature-all',
-      'normal-feature-read',
-      'just-global-all',
-      'all-privilege-excluded-from-base-read',
-    ],
-    read: ['normal-feature-read', 'all-privilege-excluded-from-base-read'],
-  },
-  space: {
-    all: ['normal-feature-all', 'normal-feature-read', 'all-privilege-excluded-from-base-read'],
-    read: ['normal-feature-read', 'all-privilege-excluded-from-base-read'],
-  },
-  reserved: {},
-  features: {
-    normal: {
-      all: ['normal-feature-all', 'normal-feature-read'],
-      read: ['normal-feature-read'],
-    },
-    bothPrivilegesExcludedFromBase: {
-      all: ['both-privileges-excluded-from-base-all', 'both-privileges-excluded-from-base-read'],
-      read: ['both-privileges-excluded-from-base-read'],
-    },
-    allPrivilegeExcludedFromBase: {
-      all: ['all-privilege-excluded-from-base-all', 'all-privilege-excluded-from-base-read'],
-      read: ['all-privilege-excluded-from-base-read'],
-    },
-  },
-};
diff --git a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/space_aware_privilege_section/__snapshots__/privilege_display.test.tsx.snap b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/space_aware_privilege_section/__snapshots__/privilege_display.test.tsx.snap
deleted file mode 100644
index a3fbdebee7eba..0000000000000
--- a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/space_aware_privilege_section/__snapshots__/privilege_display.test.tsx.snap
+++ /dev/null
@@ -1,118 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`PrivilegeDisplay renders a superceded privilege 1`] = `
-<SupersededPrivilegeDisplay
-  explanation={
-    Object {
-      "actualPrivilege": "all",
-      "actualPrivilegeSource": 40,
-      "isDirectlyAssigned": false,
-      "supersededPrivilege": "read",
-      "supersededPrivilegeSource": 20,
-    }
-  }
-  intl={
-    Object {
-      "defaultFormats": Object {},
-      "defaultLocale": "en",
-      "formatDate": [Function],
-      "formatHTMLMessage": [Function],
-      "formatMessage": [Function],
-      "formatNumber": [Function],
-      "formatPlural": [Function],
-      "formatRelative": [Function],
-      "formatTime": [Function],
-      "formats": Object {
-        "date": Object {
-          "full": Object {
-            "day": "numeric",
-            "month": "long",
-            "weekday": "long",
-            "year": "numeric",
-          },
-          "long": Object {
-            "day": "numeric",
-            "month": "long",
-            "year": "numeric",
-          },
-          "medium": Object {
-            "day": "numeric",
-            "month": "short",
-            "year": "numeric",
-          },
-          "short": Object {
-            "day": "numeric",
-            "month": "numeric",
-            "year": "2-digit",
-          },
-        },
-        "number": Object {
-          "currency": Object {
-            "style": "currency",
-          },
-          "percent": Object {
-            "style": "percent",
-          },
-        },
-        "relative": Object {
-          "days": Object {
-            "units": "day",
-          },
-          "hours": Object {
-            "units": "hour",
-          },
-          "minutes": Object {
-            "units": "minute",
-          },
-          "months": Object {
-            "units": "month",
-          },
-          "seconds": Object {
-            "units": "second",
-          },
-          "years": Object {
-            "units": "year",
-          },
-        },
-        "time": Object {
-          "full": Object {
-            "hour": "numeric",
-            "minute": "numeric",
-            "second": "numeric",
-            "timeZoneName": "short",
-          },
-          "long": Object {
-            "hour": "numeric",
-            "minute": "numeric",
-            "second": "numeric",
-            "timeZoneName": "short",
-          },
-          "medium": Object {
-            "hour": "numeric",
-            "minute": "numeric",
-            "second": "numeric",
-          },
-          "short": Object {
-            "hour": "numeric",
-            "minute": "numeric",
-          },
-        },
-      },
-      "formatters": Object {
-        "getDateTimeFormat": [Function],
-        "getMessageFormat": [Function],
-        "getNumberFormat": [Function],
-        "getPluralFormat": [Function],
-        "getRelativeFormat": [Function],
-      },
-      "locale": "en",
-      "messages": Object {},
-      "now": [Function],
-      "onError": [Function],
-      "textComponent": Symbol(react.fragment),
-      "timeZone": null,
-    }
-  }
-  privilege="all"
-/>
-`;
diff --git a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/space_aware_privilege_section/__snapshots__/privilege_space_form.test.tsx.snap b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/space_aware_privilege_section/__snapshots__/privilege_space_form.test.tsx.snap
deleted file mode 100644
index 8d10e27df9694..0000000000000
--- a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/space_aware_privilege_section/__snapshots__/privilege_space_form.test.tsx.snap
+++ /dev/null
@@ -1,497 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`<PrivilegeSpaceForm> renders without crashing 1`] = `
-<EuiOverlayMask>
-  <EuiFlyout
-    closeButtonAriaLabel="Closes this dialog"
-    hideCloseButton={false}
-    maxWidth={true}
-    onClose={[Function]}
-    ownFocus={false}
-    size="m"
-  >
-    <EuiFlyoutHeader
-      hasBorder={true}
-    >
-      <EuiTitle
-        size="m"
-      >
-        <h2>
-          <FormattedMessage
-            defaultMessage="Space privileges"
-            id="xpack.security.management.editRole.spacePrivilegeForm.modalTitle"
-            values={Object {}}
-          />
-        </h2>
-      </EuiTitle>
-    </EuiFlyoutHeader>
-    <EuiFlyoutBody>
-      <EuiForm>
-        <EuiFormRow
-          describedByIds={Array []}
-          display="row"
-          fullWidth={true}
-          hasChildLabel={true}
-          hasEmptyLabelSpace={false}
-          label="Spaces"
-          labelType="label"
-        >
-          <SpaceSelector
-            intl={
-              Object {
-                "defaultFormats": Object {},
-                "defaultLocale": "en",
-                "formatDate": [Function],
-                "formatHTMLMessage": [Function],
-                "formatMessage": [Function],
-                "formatNumber": [Function],
-                "formatPlural": [Function],
-                "formatRelative": [Function],
-                "formatTime": [Function],
-                "formats": Object {
-                  "date": Object {
-                    "full": Object {
-                      "day": "numeric",
-                      "month": "long",
-                      "weekday": "long",
-                      "year": "numeric",
-                    },
-                    "long": Object {
-                      "day": "numeric",
-                      "month": "long",
-                      "year": "numeric",
-                    },
-                    "medium": Object {
-                      "day": "numeric",
-                      "month": "short",
-                      "year": "numeric",
-                    },
-                    "short": Object {
-                      "day": "numeric",
-                      "month": "numeric",
-                      "year": "2-digit",
-                    },
-                  },
-                  "number": Object {
-                    "currency": Object {
-                      "style": "currency",
-                    },
-                    "percent": Object {
-                      "style": "percent",
-                    },
-                  },
-                  "relative": Object {
-                    "days": Object {
-                      "units": "day",
-                    },
-                    "hours": Object {
-                      "units": "hour",
-                    },
-                    "minutes": Object {
-                      "units": "minute",
-                    },
-                    "months": Object {
-                      "units": "month",
-                    },
-                    "seconds": Object {
-                      "units": "second",
-                    },
-                    "years": Object {
-                      "units": "year",
-                    },
-                  },
-                  "time": Object {
-                    "full": Object {
-                      "hour": "numeric",
-                      "minute": "numeric",
-                      "second": "numeric",
-                      "timeZoneName": "short",
-                    },
-                    "long": Object {
-                      "hour": "numeric",
-                      "minute": "numeric",
-                      "second": "numeric",
-                      "timeZoneName": "short",
-                    },
-                    "medium": Object {
-                      "hour": "numeric",
-                      "minute": "numeric",
-                      "second": "numeric",
-                    },
-                    "short": Object {
-                      "hour": "numeric",
-                      "minute": "numeric",
-                    },
-                  },
-                },
-                "formatters": Object {
-                  "getDateTimeFormat": [Function],
-                  "getMessageFormat": [Function],
-                  "getNumberFormat": [Function],
-                  "getPluralFormat": [Function],
-                  "getRelativeFormat": [Function],
-                },
-                "locale": "en",
-                "messages": Object {},
-                "now": [Function],
-                "onError": [Function],
-                "textComponent": Symbol(react.fragment),
-                "timeZone": null,
-              }
-            }
-            onChange={[Function]}
-            selectedSpaceIds={Array []}
-            spaces={
-              Array [
-                Object {
-                  "_reserved": true,
-                  "description": "",
-                  "disabledFeatures": Array [],
-                  "id": "default",
-                  "name": "Default Space",
-                },
-                Object {
-                  "description": "",
-                  "disabledFeatures": Array [],
-                  "id": "marketing",
-                  "name": "Marketing",
-                },
-              ]
-            }
-          />
-        </EuiFormRow>
-        <EuiFormRow
-          describedByIds={Array []}
-          display="row"
-          fullWidth={true}
-          hasChildLabel={true}
-          hasEmptyLabelSpace={false}
-          label="Privilege"
-          labelType="label"
-        >
-          <EuiSuperSelect
-            compressed={false}
-            data-test-subj="basePrivilegeComboBox"
-            disabled={true}
-            fullWidth={true}
-            hasDividers={true}
-            isInvalid={false}
-            isLoading={false}
-            onChange={[Function]}
-            options={
-              Array [
-                Object {
-                  "disabled": false,
-                  "dropdownDisplay": <EuiText>
-                    <strong>
-                      <FormattedMessage
-                        defaultMessage="Custom"
-                        id="xpack.security.management.editRole.spacePrivilegeForm.customPrivilegeDropdownDisplay"
-                        values={Object {}}
-                      />
-                    </strong>
-                    <p>
-                      <FormattedMessage
-                        defaultMessage="Customize access by feature in selected spaces."
-                        id="xpack.security.management.editRole.spacePrivilegeForm.customPrivilegeDetails"
-                        values={Object {}}
-                      />
-                    </p>
-                  </EuiText>,
-                  "inputDisplay": <EuiText>
-                    <FormattedMessage
-                      defaultMessage="Custom"
-                      id="xpack.security.management.editRole.spacePrivilegeForm.customPrivilegeDisplay"
-                      values={Object {}}
-                    />
-                  </EuiText>,
-                  "value": "basePrivilege_custom",
-                },
-                Object {
-                  "disabled": false,
-                  "dropdownDisplay": <EuiText>
-                    <strong>
-                      <FormattedMessage
-                        defaultMessage="Read"
-                        id="xpack.security.management.editRole.spacePrivilegeForm.readPrivilegeDropdownDisplay"
-                        values={Object {}}
-                      />
-                    </strong>
-                    <p>
-                      <FormattedMessage
-                        defaultMessage="Grant read-only access to all features in selected spaces."
-                        id="xpack.security.management.editRole.spacePrivilegeForm.readPrivilegeDetails"
-                        values={Object {}}
-                      />
-                    </p>
-                  </EuiText>,
-                  "inputDisplay": <EuiText>
-                    <FormattedMessage
-                      defaultMessage="Read"
-                      id="xpack.security.management.editRole.spacePrivilegeForm.readPrivilegeDisplay"
-                      values={Object {}}
-                    />
-                  </EuiText>,
-                  "value": "basePrivilege_read",
-                },
-                Object {
-                  "dropdownDisplay": <EuiText>
-                    <strong>
-                      <FormattedMessage
-                        defaultMessage="All"
-                        id="xpack.security.management.editRole.spacePrivilegeForm.allPrivilegeDropdownDisplay"
-                        values={Object {}}
-                      />
-                    </strong>
-                    <p>
-                      <FormattedMessage
-                        defaultMessage="Grant full access to all features in selected spaces."
-                        id="xpack.security.management.editRole.spacePrivilegeForm.allPrivilegeDetails"
-                        values={Object {}}
-                      />
-                    </p>
-                  </EuiText>,
-                  "inputDisplay": <EuiText>
-                    <FormattedMessage
-                      defaultMessage="All"
-                      id="xpack.security.management.editRole.spacePrivilegeForm.allPrivilegeDisplay"
-                      values={Object {}}
-                    />
-                  </EuiText>,
-                  "value": "basePrivilege_all",
-                },
-              ]
-            }
-            valueOfSelected="basePrivilege_custom"
-          />
-        </EuiFormRow>
-        <EuiSpacer
-          size="s"
-        />
-        <EuiTitle
-          size="xxs"
-        >
-          <h3>
-            Customize by feature
-          </h3>
-        </EuiTitle>
-        <EuiSpacer
-          size="xs"
-        />
-        <EuiText
-          size="s"
-        >
-          <p>
-            Increase privilege levels on a per feature basis. Some features might be hidden by the space or affected by a global space privilege.
-          </p>
-        </EuiText>
-        <EuiSpacer
-          size="l"
-        />
-        <FeatureTable
-          allowedPrivileges={
-            Object {
-              "base": Object {
-                "canUnassign": true,
-                "privileges": Array [
-                  "all",
-                  "read",
-                ],
-              },
-              "feature": Object {
-                "allPrivilegeExcludedFromBase": Object {
-                  "canUnassign": true,
-                  "privileges": Array [
-                    "all",
-                    "read",
-                  ],
-                },
-                "bothPrivilegesExcludedFromBase": Object {
-                  "canUnassign": true,
-                  "privileges": Array [
-                    "all",
-                    "read",
-                  ],
-                },
-                "normal": Object {
-                  "canUnassign": true,
-                  "privileges": Array [
-                    "all",
-                    "read",
-                  ],
-                },
-              },
-            }
-          }
-          calculatedPrivileges={
-            Object {
-              "base": Object {
-                "actualPrivilege": "none",
-                "actualPrivilegeSource": 40,
-                "isDirectlyAssigned": true,
-              },
-              "feature": Object {
-                "allPrivilegeExcludedFromBase": Object {
-                  "actualPrivilege": "none",
-                  "actualPrivilegeSource": 30,
-                  "isDirectlyAssigned": true,
-                },
-                "bothPrivilegesExcludedFromBase": Object {
-                  "actualPrivilege": "none",
-                  "actualPrivilegeSource": 30,
-                  "isDirectlyAssigned": true,
-                },
-                "normal": Object {
-                  "actualPrivilege": "none",
-                  "actualPrivilegeSource": 30,
-                  "isDirectlyAssigned": true,
-                },
-              },
-              "reserved": undefined,
-            }
-          }
-          disabled={true}
-          features={Array []}
-          kibanaPrivileges={
-            KibanaPrivileges {
-              "rawKibanaPrivileges": Object {
-                "features": Object {
-                  "allPrivilegeExcludedFromBase": Object {
-                    "all": Array [
-                      "all-privilege-excluded-from-base-all",
-                      "all-privilege-excluded-from-base-read",
-                    ],
-                    "read": Array [
-                      "all-privilege-excluded-from-base-read",
-                    ],
-                  },
-                  "bothPrivilegesExcludedFromBase": Object {
-                    "all": Array [
-                      "both-privileges-excluded-from-base-all",
-                      "both-privileges-excluded-from-base-read",
-                    ],
-                    "read": Array [
-                      "both-privileges-excluded-from-base-read",
-                    ],
-                  },
-                  "normal": Object {
-                    "all": Array [
-                      "normal-feature-all",
-                      "normal-feature-read",
-                    ],
-                    "read": Array [
-                      "normal-feature-read",
-                    ],
-                  },
-                },
-                "global": Object {
-                  "all": Array [
-                    "normal-feature-all",
-                    "normal-feature-read",
-                    "just-global-all",
-                    "all-privilege-excluded-from-base-read",
-                  ],
-                  "read": Array [
-                    "normal-feature-read",
-                    "all-privilege-excluded-from-base-read",
-                  ],
-                },
-                "reserved": Object {},
-                "space": Object {
-                  "all": Array [
-                    "normal-feature-all",
-                    "normal-feature-read",
-                    "all-privilege-excluded-from-base-read",
-                  ],
-                  "read": Array [
-                    "normal-feature-read",
-                    "all-privilege-excluded-from-base-read",
-                  ],
-                },
-              },
-            }
-          }
-          onChange={[Function]}
-          onChangeAll={[Function]}
-          rankedFeaturePrivileges={
-            Object {
-              "allPrivilegeExcludedFromBase": Array [
-                "all",
-                "read",
-              ],
-              "bothPrivilegesExcludedFromBase": Array [
-                "all",
-                "read",
-              ],
-              "normal": Array [
-                "all",
-                "read",
-              ],
-            }
-          }
-          role={
-            Object {
-              "elasticsearch": Object {
-                "cluster": Array [
-                  "all",
-                ],
-                "indices": Array [],
-                "run_as": Array [],
-              },
-              "kibana": Array [
-                Object {
-                  "base": Array [],
-                  "feature": Object {},
-                  "spaces": Array [],
-                },
-              ],
-              "name": "test role",
-            }
-          }
-          showLocks={true}
-          spacesIndex={0}
-        />
-      </EuiForm>
-    </EuiFlyoutBody>
-    <EuiFlyoutFooter>
-      <EuiFlexGroup
-        justifyContent="spaceBetween"
-      >
-        <EuiFlexItem
-          grow={false}
-        >
-          <EuiButtonEmpty
-            data-test-subj="cancelSpacePrivilegeButton"
-            flush="left"
-            iconType="cross"
-            onClick={[Function]}
-          >
-            <FormattedMessage
-              defaultMessage="Cancel"
-              id="xpack.security.management.editRolespacePrivilegeForm.cancelButton"
-              values={Object {}}
-            />
-          </EuiButtonEmpty>
-        </EuiFlexItem>
-        <EuiFlexItem
-          grow={false}
-        >
-          <EuiButton
-            color="primary"
-            data-test-subj="createSpacePrivilegeButton"
-            disabled={true}
-            fill={true}
-            onClick={[Function]}
-          >
-            <FormattedMessage
-              defaultMessage="Update space privilege"
-              id="xpack.security.management.editRolespacePrivilegeForm.updatePrivilegeButton"
-              values={Object {}}
-            />
-          </EuiButton>
-        </EuiFlexItem>
-      </EuiFlexGroup>
-    </EuiFlyoutFooter>
-  </EuiFlyout>
-</EuiOverlayMask>
-`;
diff --git a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/space_aware_privilege_section/privilege_display.test.tsx b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/space_aware_privilege_section/privilege_display.test.tsx
index c6268e19abfd1..155ccf98b9762 100644
--- a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/space_aware_privilege_section/privilege_display.test.tsx
+++ b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/space_aware_privilege_section/privilege_display.test.tsx
@@ -4,10 +4,9 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { EuiIconTip, EuiText, EuiToolTip } from '@elastic/eui';
+import { EuiText } from '@elastic/eui';
 import React from 'react';
-import { mountWithIntl, shallowWithIntl } from 'test_utils/enzyme_helpers';
-import { PRIVILEGE_SOURCE } from '../kibana_privilege_calculator';
+import { mountWithIntl } from 'test_utils/enzyme_helpers';
 import { PrivilegeDisplay } from './privilege_display';
 
 describe('PrivilegeDisplay', () => {
@@ -23,41 +22,4 @@ describe('PrivilegeDisplay', () => {
       color: 'danger',
     });
   });
-
-  it('renders a privilege with tooltip, if provided', () => {
-    const wrapper = mountWithIntl(
-      <PrivilegeDisplay privilege={'all'} tooltipContent={<b>ahh</b>} />
-    );
-    expect(wrapper.text().trim()).toEqual('All');
-    expect(wrapper.find(EuiToolTip).props()).toMatchObject({
-      content: <b>ahh</b>,
-    });
-  });
-
-  it('renders a privilege with icon tooltip, if provided', () => {
-    const wrapper = mountWithIntl(
-      <PrivilegeDisplay privilege={'all'} iconTooltipContent={<b>ahh</b>} iconType={'asterisk'} />
-    );
-    expect(wrapper.text().trim()).toEqual('All');
-    expect(wrapper.find(EuiIconTip).props()).toMatchObject({
-      type: 'asterisk',
-      content: <b>ahh</b>,
-    });
-  });
-
-  it('renders a superceded privilege', () => {
-    const wrapper = shallowWithIntl(
-      <PrivilegeDisplay
-        privilege={'all'}
-        explanation={{
-          supersededPrivilege: 'read',
-          supersededPrivilegeSource: PRIVILEGE_SOURCE.SPACE_BASE,
-          actualPrivilege: 'all',
-          actualPrivilegeSource: PRIVILEGE_SOURCE.GLOBAL_BASE,
-          isDirectlyAssigned: false,
-        }}
-      />
-    );
-    expect(wrapper).toMatchSnapshot();
-  });
 });
diff --git a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/space_aware_privilege_section/privilege_display.tsx b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/space_aware_privilege_section/privilege_display.tsx
index 55ac99da4c8c1..93f1d9bba460d 100644
--- a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/space_aware_privilege_section/privilege_display.tsx
+++ b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/space_aware_privilege_section/privilege_display.tsx
@@ -3,95 +3,28 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-import { EuiIcon, EuiIconTip, EuiText, IconType, PropsOf, EuiToolTip } from '@elastic/eui';
-import { FormattedMessage } from '@kbn/i18n/react';
+import { EuiIcon, EuiText, PropsOf } from '@elastic/eui';
 import _ from 'lodash';
 import React, { ReactNode, FC } from 'react';
-import { PRIVILEGE_SOURCE, PrivilegeExplanation } from '../kibana_privilege_calculator';
 import { NO_PRIVILEGE_VALUE } from '../constants';
 
 interface Props extends PropsOf<typeof EuiText> {
   privilege: string | string[] | undefined;
-  explanation?: PrivilegeExplanation;
-  iconType?: IconType;
-  iconTooltipContent?: ReactNode;
-  tooltipContent?: ReactNode;
+  'data-test-subj'?: string;
 }
 
 export const PrivilegeDisplay: FC<Props> = (props: Props) => {
-  const { explanation } = props;
-
-  if (!explanation) {
-    return <SimplePrivilegeDisplay {...props} />;
-  }
-
-  if (explanation.supersededPrivilege) {
-    return <SupersededPrivilegeDisplay {...props} />;
-  }
-
-  if (!explanation.isDirectlyAssigned) {
-    return <EffectivePrivilegeDisplay {...props} />;
-  }
-
   return <SimplePrivilegeDisplay {...props} />;
 };
 
 const SimplePrivilegeDisplay: FC<Props> = (props: Props) => {
-  const { privilege, iconType, iconTooltipContent, explanation, tooltipContent, ...rest } = props;
-
-  const text = (
-    <EuiText {...rest}>
-      {getDisplayValue(privilege)} {getIconTip(iconType, iconTooltipContent)}
-    </EuiText>
-  );
+  const { privilege, ...rest } = props;
 
-  if (tooltipContent) {
-    return <EuiToolTip content={tooltipContent}>{text}</EuiToolTip>;
-  }
+  const text = <EuiText {...rest}>{getDisplayValue(privilege)}</EuiText>;
 
   return text;
 };
 
-export const SupersededPrivilegeDisplay: FC<Props> = (props: Props) => {
-  const { supersededPrivilege, actualPrivilegeSource } =
-    props.explanation || ({} as PrivilegeExplanation);
-
-  return (
-    <SimplePrivilegeDisplay
-      {...props}
-      iconType={'lock'}
-      iconTooltipContent={
-        <FormattedMessage
-          id="xpack.security.management.editRole.spaceAwarePrivilegeDisplay.privilegeSupercededMessage"
-          defaultMessage="Original privilege of {supersededPrivilege} has been overriden by {actualPrivilegeSource}"
-          values={{
-            supersededPrivilege: `'${supersededPrivilege}'`,
-            actualPrivilegeSource: getReadablePrivilegeSource(actualPrivilegeSource),
-          }}
-        />
-      }
-    />
-  );
-};
-
-export const EffectivePrivilegeDisplay: FC<Props> = (props: Props) => {
-  const { explanation, ...rest } = props;
-
-  const source = getReadablePrivilegeSource(explanation!.actualPrivilegeSource);
-
-  const iconTooltipContent = (
-    <FormattedMessage
-      id="xpack.security.management.editRole.spaceAwarePrivilegeDisplay.effectivePrivilegeMessage"
-      defaultMessage="Granted via {source}."
-      values={{ source }}
-    />
-  );
-
-  return (
-    <SimplePrivilegeDisplay {...rest} iconType={'lock'} iconTooltipContent={iconTooltipContent} />
-  );
-};
-
 PrivilegeDisplay.defaultProps = {
   privilege: [],
 };
@@ -113,24 +46,6 @@ function getDisplayValue(privilege: string | string[] | undefined) {
   return displayValue;
 }
 
-function getIconTip(iconType?: IconType, tooltipContent?: ReactNode) {
-  if (!iconType || !tooltipContent) {
-    return null;
-  }
-
-  return (
-    <EuiIconTip
-      iconProps={{
-        className: 'eui-alignTop',
-      }}
-      color="subdued"
-      type={iconType}
-      content={tooltipContent}
-      size={'s'}
-    />
-  );
-}
-
 function coerceToArray(privilege: string | string[] | undefined): string[] {
   if (privilege === undefined) {
     return [];
@@ -140,43 +55,3 @@ function coerceToArray(privilege: string | string[] | undefined): string[] {
   }
   return [privilege];
 }
-
-function getReadablePrivilegeSource(privilegeSource: PRIVILEGE_SOURCE) {
-  switch (privilegeSource) {
-    case PRIVILEGE_SOURCE.GLOBAL_BASE:
-      return (
-        <FormattedMessage
-          id="xpack.security.management.editRole.spaceAwarePrivilegeDisplay.globalBasePrivilegeSource"
-          defaultMessage="global base privilege"
-        />
-      );
-    case PRIVILEGE_SOURCE.GLOBAL_FEATURE:
-      return (
-        <FormattedMessage
-          id="xpack.security.management.editRole.spaceAwarePrivilegeDisplay.globalFeaturePrivilegeSource"
-          defaultMessage="global feature privilege"
-        />
-      );
-    case PRIVILEGE_SOURCE.SPACE_BASE:
-      return (
-        <FormattedMessage
-          id="xpack.security.management.editRole.spaceAwarePrivilegeDisplay.spaceBasePrivilegeSource"
-          defaultMessage="space base privilege"
-        />
-      );
-    case PRIVILEGE_SOURCE.SPACE_FEATURE:
-      return (
-        <FormattedMessage
-          id="xpack.security.management.editRole.spaceAwarePrivilegeDisplay.spaceFeaturePrivilegeSource"
-          defaultMessage="space feature privilege"
-        />
-      );
-    default:
-      return (
-        <FormattedMessage
-          id="xpack.security.management.editRole.spaceAwarePrivilegeDisplay.unknownPrivilegeSource"
-          defaultMessage="**UNKNOWN**"
-        />
-      );
-  }
-}
diff --git a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/space_aware_privilege_section/privilege_matrix.test.tsx b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/space_aware_privilege_section/privilege_matrix.test.tsx
deleted file mode 100644
index a01c026c1a5df..0000000000000
--- a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/space_aware_privilege_section/privilege_matrix.test.tsx
+++ /dev/null
@@ -1,128 +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, EuiInMemoryTable } from '@elastic/eui';
-import React from 'react';
-import { mountWithIntl } from 'test_utils/enzyme_helpers';
-import { Space } from '../../../../../../../../spaces/public';
-import { Feature } from '../../../../../../../../features/public';
-import { KibanaPrivileges, Role } from '../../../../../../../common/model';
-import { KibanaPrivilegeCalculatorFactory } from '../kibana_privilege_calculator';
-import { PrivilegeMatrix } from './privilege_matrix';
-
-describe('PrivilegeMatrix', () => {
-  it('can render a complex matrix', () => {
-    const spaces: Space[] = ['*', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k'].map(a => ({
-      id: a,
-      name: `${a} space`,
-      disabledFeatures: [],
-    }));
-
-    const features: Feature[] = [
-      {
-        id: 'feature1',
-        name: 'feature 1',
-        icon: 'apmApp',
-        app: [],
-        privileges: {},
-      },
-      {
-        id: 'feature2',
-        name: 'feature 2',
-        icon: 'apmApp',
-        app: [],
-        privileges: {},
-      },
-      {
-        id: 'feature3',
-        name: 'feature 3',
-        icon: 'apmApp',
-        app: [],
-        privileges: {},
-      },
-    ];
-
-    const role: Role = {
-      name: 'role',
-      elasticsearch: {
-        cluster: [],
-        indices: [],
-        run_as: [],
-      },
-      kibana: [
-        {
-          spaces: ['*'],
-          base: ['read'],
-          feature: {
-            feature1: ['all'],
-          },
-        },
-        {
-          spaces: ['a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j'],
-          base: [],
-          feature: {
-            feature2: ['read'],
-            feature3: ['all'],
-          },
-        },
-        {
-          spaces: ['k'],
-          base: ['all'],
-          feature: {
-            feature2: ['read'],
-            feature3: ['read'],
-          },
-        },
-      ],
-    };
-
-    const calculator = new KibanaPrivilegeCalculatorFactory(
-      new KibanaPrivileges({
-        global: {
-          all: [],
-          read: [],
-        },
-        features: {
-          feature1: {
-            all: [],
-            read: [],
-          },
-          feature2: {
-            all: [],
-            read: [],
-          },
-          feature3: {
-            all: [],
-            read: [],
-          },
-        },
-        space: {
-          all: [],
-          read: [],
-        },
-        reserved: {},
-      })
-    ).getInstance(role);
-
-    const wrapper = mountWithIntl(
-      <PrivilegeMatrix
-        role={role}
-        spaces={spaces}
-        features={features}
-        calculatedPrivileges={calculator.calculateEffectivePrivileges()}
-        intl={null as any}
-      />
-    );
-
-    wrapper.find(EuiButtonEmpty).simulate('click');
-    wrapper.update();
-
-    const { columns, items } = wrapper.find(EuiInMemoryTable).props() as any;
-
-    expect(columns).toHaveLength(4); // all spaces groups plus the "feature" column
-    expect(items).toHaveLength(features.length + 1); // all features plus the "base" row
-  });
-});
diff --git a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/space_aware_privilege_section/privilege_matrix.tsx b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/space_aware_privilege_section/privilege_matrix.tsx
deleted file mode 100644
index f0f425273e25d..0000000000000
--- a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/space_aware_privilege_section/privilege_matrix.tsx
+++ /dev/null
@@ -1,342 +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 {
-  EuiButton,
-  EuiButtonEmpty,
-  EuiIcon,
-  EuiIconTip,
-  EuiInMemoryTable,
-  EuiModal,
-  EuiModalBody,
-  EuiModalFooter,
-  EuiModalHeader,
-  EuiModalHeaderTitle,
-  EuiOverlayMask,
-  IconType,
-} from '@elastic/eui';
-import { FormattedMessage, InjectedIntl } from '@kbn/i18n/react';
-import React, { Component, Fragment } from 'react';
-import { Space, SpaceAvatar } from '../../../../../../../../spaces/public';
-import { Feature } from '../../../../../../../../features/public';
-import { FeaturesPrivileges, Role } from '../../../../../../../common/model';
-import { CalculatedPrivilege } from '../kibana_privilege_calculator';
-import { isGlobalPrivilegeDefinition } from '../../../privilege_utils';
-import { SpacesPopoverList } from '../../../spaces_popover_list';
-import { PrivilegeDisplay } from './privilege_display';
-
-const SPACES_DISPLAY_COUNT = 4;
-
-interface Props {
-  role: Role;
-  spaces: Space[];
-  features: Feature[];
-  calculatedPrivileges: CalculatedPrivilege[];
-  intl: InjectedIntl;
-}
-
-interface State {
-  showModal: boolean;
-}
-
-interface TableRow {
-  feature: Feature & { isBase: boolean };
-  tooltip?: string;
-  role: Role;
-}
-
-interface SpacesColumn {
-  isGlobal: boolean;
-  spacesIndex: number;
-  spaces: Space[];
-  privileges: {
-    base: string[];
-    feature: FeaturesPrivileges;
-  };
-}
-
-export class PrivilegeMatrix extends Component<Props, State> {
-  public state = {
-    showModal: false,
-  };
-  public render() {
-    let modal = null;
-    if (this.state.showModal) {
-      modal = (
-        <EuiOverlayMask>
-          <EuiModal className="secPrivilegeMatrix__modal" onClose={this.hideModal}>
-            <EuiModalHeader>
-              <EuiModalHeaderTitle>
-                <FormattedMessage
-                  id="xpack.security.management.editRole.spacePrivilegeMatrix.modalTitle"
-                  defaultMessage="Privilege summary"
-                />
-              </EuiModalHeaderTitle>
-            </EuiModalHeader>
-            <EuiModalBody>{this.renderTable()}</EuiModalBody>
-            <EuiModalFooter>
-              <EuiButton onClick={this.hideModal} fill>
-                <FormattedMessage
-                  id="xpack.security.management.editRole.spacePrivilegeMatrix.closeButton"
-                  defaultMessage="Close"
-                />
-              </EuiButton>
-            </EuiModalFooter>
-          </EuiModal>
-        </EuiOverlayMask>
-      );
-    }
-
-    return (
-      <Fragment>
-        <EuiButtonEmpty onClick={this.showModal}>
-          <FormattedMessage
-            id="xpack.security.management.editRole.spacePrivilegeMatrix.showSummaryText"
-            defaultMessage="View privilege summary"
-          />
-        </EuiButtonEmpty>
-        {modal}
-      </Fragment>
-    );
-  }
-
-  private renderTable = () => {
-    const { role, features, intl } = this.props;
-
-    const spacePrivileges = role.kibana;
-
-    const globalPrivilege = this.locateGlobalPrivilege();
-
-    const spacesColumns: SpacesColumn[] = [];
-
-    spacePrivileges.forEach((spacePrivs, spacesIndex) => {
-      spacesColumns.push({
-        isGlobal: isGlobalPrivilegeDefinition(spacePrivs),
-        spacesIndex,
-        spaces: spacePrivs.spaces
-          .map(spaceId => this.props.spaces.find(space => space.id === spaceId))
-          .filter(Boolean) as Space[],
-        privileges: {
-          base: spacePrivs.base,
-          feature: spacePrivs.feature,
-        },
-      });
-    });
-
-    const rows: TableRow[] = [
-      {
-        feature: {
-          id: '*base*',
-          isBase: true,
-          name: intl.formatMessage({
-            id: 'xpack.security.management.editRole.spacePrivilegeMatrix.basePrivilegeText',
-            defaultMessage: 'Base privilege',
-          }),
-          app: [],
-          privileges: {},
-        },
-        role,
-      },
-      ...features.map(feature => ({
-        feature: {
-          ...feature,
-          isBase: false,
-        },
-        role,
-      })),
-    ];
-
-    const columns = [
-      {
-        field: 'feature',
-        name: intl.formatMessage({
-          id: 'xpack.security.management.editRole.spacePrivilegeMatrix.featureColumnTitle',
-          defaultMessage: 'Feature',
-        }),
-        width: '230px',
-        render: (feature: Feature & { isBase: boolean }) => {
-          return feature.isBase ? (
-            <Fragment>
-              <strong>{feature.name}</strong>
-              <EuiIconTip
-                iconProps={{
-                  className: 'eui-alignTop',
-                }}
-                type="questionInCircle"
-                content={intl.formatMessage({
-                  id:
-                    'xpack.security.management.editRole.spacePrivilegeMatrix.basePrivilegeTooltip',
-                  defaultMessage: 'The base privilege is automatically granted to all features.',
-                })}
-                color="subdued"
-              />
-            </Fragment>
-          ) : (
-            <Fragment>
-              {feature.icon && (
-                <EuiIcon
-                  className="secPrivilegeFeatureIcon"
-                  size="m"
-                  type={feature.icon as IconType}
-                />
-              )}
-              {feature.name}
-            </Fragment>
-          );
-        },
-      },
-      ...spacesColumns.map(item => {
-        let columnWidth;
-        if (item.isGlobal) {
-          columnWidth = '100px';
-        } else if (item.spaces.length - SPACES_DISPLAY_COUNT) {
-          columnWidth = '90px';
-        } else {
-          columnWidth = '80px';
-        }
-
-        return {
-          // TODO: this is a hacky way to determine if we are looking at the global feature
-          // used for cellProps below...
-          field: item.isGlobal ? 'global' : 'feature',
-          width: columnWidth,
-          name: (
-            <div>
-              {item.spaces.slice(0, SPACES_DISPLAY_COUNT).map((space: Space) => (
-                <span key={space.id}>
-                  <SpaceAvatar size="s" space={space} />{' '}
-                  {item.isGlobal && (
-                    <span>
-                      <FormattedMessage
-                        id="xpack.security.management.editRole.spacePrivilegeMatrix.globalSpaceName"
-                        defaultMessage="Global"
-                      />
-                      <br />
-                      <SpacesPopoverList
-                        spaces={this.props.spaces.filter(s => s.id !== '*')}
-                        intl={this.props.intl}
-                        buttonText={this.props.intl.formatMessage({
-                          id:
-                            'xpack.security.management.editRole.spacePrivilegeMatrix.showAllSpacesLink',
-                          defaultMessage: '(all spaces)',
-                        })}
-                      />
-                    </span>
-                  )}
-                </span>
-              ))}
-              {item.spaces.length > SPACES_DISPLAY_COUNT && (
-                <Fragment>
-                  <br />
-                  <SpacesPopoverList
-                    spaces={item.spaces}
-                    intl={this.props.intl}
-                    buttonText={this.props.intl.formatMessage(
-                      {
-                        id:
-                          'xpack.security.management.editRole.spacePrivilegeMatrix.showNMoreSpacesLink',
-                        defaultMessage: '+{count} more',
-                      },
-                      { count: item.spaces.length - SPACES_DISPLAY_COUNT }
-                    )}
-                  />
-                </Fragment>
-              )}
-            </div>
-          ),
-          render: (feature: Feature & { isBase: boolean }, record: TableRow) => {
-            return this.renderPrivilegeDisplay(item, record, globalPrivilege.base);
-          },
-        };
-      }),
-    ];
-
-    return (
-      <EuiInMemoryTable
-        columns={columns}
-        items={rows}
-        rowProps={(item: TableRow) => {
-          return {
-            className: item.feature.isBase ? 'secPrivilegeMatrix__row--isBasePrivilege' : '',
-          };
-        }}
-        cellProps={(item: TableRow, column: Record<string, any>) => {
-          return {
-            className:
-              column.field === 'global' ? 'secPrivilegeMatrix__cell--isGlobalPrivilege' : '',
-          };
-        }}
-      />
-    );
-  };
-
-  private renderPrivilegeDisplay = (
-    column: SpacesColumn,
-    { feature }: TableRow,
-    globalBasePrivilege: string[]
-  ) => {
-    if (column.isGlobal) {
-      if (feature.isBase) {
-        return <PrivilegeDisplay privilege={globalBasePrivilege} />;
-      }
-
-      const featureCalculatedPrivilege = this.props.calculatedPrivileges[column.spacesIndex]
-        .feature[feature.id];
-
-      return (
-        <PrivilegeDisplay
-          privilege={featureCalculatedPrivilege && featureCalculatedPrivilege.actualPrivilege}
-        />
-      );
-    } else {
-      // not global
-
-      const calculatedPrivilege = this.props.calculatedPrivileges[column.spacesIndex];
-
-      if (feature.isBase) {
-        // Space base privilege
-        const actualBasePrivileges = calculatedPrivilege.base.actualPrivilege;
-
-        return (
-          <PrivilegeDisplay
-            explanation={calculatedPrivilege.base}
-            privilege={actualBasePrivileges}
-          />
-        );
-      }
-
-      const featurePrivilegeExplanation = calculatedPrivilege.feature[feature.id];
-
-      return (
-        <PrivilegeDisplay
-          explanation={featurePrivilegeExplanation}
-          privilege={featurePrivilegeExplanation && featurePrivilegeExplanation.actualPrivilege}
-        />
-      );
-    }
-  };
-
-  private locateGlobalPrivilege = () => {
-    return (
-      this.props.role.kibana.find(spacePriv => isGlobalPrivilegeDefinition(spacePriv)) || {
-        spaces: ['*'],
-        base: [],
-        feature: [],
-      }
-    );
-  };
-
-  private hideModal = () => {
-    this.setState({
-      showModal: false,
-    });
-  };
-
-  private showModal = () => {
-    this.setState({
-      showModal: true,
-    });
-  };
-}
diff --git a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/space_aware_privilege_section/privilege_space_form.test.tsx b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/space_aware_privilege_section/privilege_space_form.test.tsx
index 675f02a81f9e1..968730181fe10 100644
--- a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/space_aware_privilege_section/privilege_space_form.test.tsx
+++ b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/space_aware_privilege_section/privilege_space_form.test.tsx
@@ -4,123 +4,379 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import React from 'react';
-import { merge } from 'lodash';
-// @ts-ignore
-import { findTestSubject } from '@elastic/eui/lib/test';
-import { shallowWithIntl, mountWithIntl } from 'test_utils/enzyme_helpers';
-import { KibanaPrivileges } from '../../../../../../../common/model';
-import { KibanaPrivilegeCalculatorFactory } from '../kibana_privilege_calculator';
+import { Role } from '../../../../../../../common/model';
+import { createKibanaPrivileges } from '../../../../__fixtures__/kibana_privileges';
+import { kibanaFeatures } from '../../../../__fixtures__/kibana_features';
+import { mountWithIntl } from 'test_utils/enzyme_helpers';
 import { PrivilegeSpaceForm } from './privilege_space_form';
-import { rawKibanaPrivileges } from './__fixtures__';
+import React from 'react';
+import { Space } from '../../../../../../../../spaces/public';
+import { EuiSuperSelect } from '@elastic/eui';
+import { FeatureTable } from '../feature_table';
+import { getDisplayedFeaturePrivileges } from '../feature_table/__fixtures__';
+import { findTestSubject } from 'test_utils/find_test_subject';
+import { SpaceSelector } from './space_selector';
 
-type RecursivePartial<T> = {
-  [P in keyof T]?: RecursivePartial<T[P]>;
+const createRole = (kibana: Role['kibana'] = []): Role => {
+  return {
+    name: 'my_role',
+    elasticsearch: { cluster: [], run_as: [], indices: [] },
+    kibana,
+  };
 };
 
-const buildProps = (
-  overrides?: RecursivePartial<PrivilegeSpaceForm['props']>
-): PrivilegeSpaceForm['props'] => {
-  const kibanaPrivileges = new KibanaPrivileges(rawKibanaPrivileges);
-  const defaultProps: PrivilegeSpaceForm['props'] = {
-    spaces: [
+const displaySpaces: Space[] = [
+  {
+    id: 'foo',
+    name: 'Foo Space',
+    disabledFeatures: [],
+  },
+  {
+    id: 'default',
+    name: 'Default Space',
+    disabledFeatures: [],
+  },
+  {
+    id: '*',
+    name: 'Global',
+    disabledFeatures: [],
+  },
+];
+
+describe('PrivilegeSpaceForm', () => {
+  it('renders an empty form when the role contains no Kibana privileges', () => {
+    const role = createRole();
+    const kibanaPrivileges = createKibanaPrivileges(kibanaFeatures);
+
+    const wrapper = mountWithIntl(
+      <PrivilegeSpaceForm
+        role={role}
+        spaces={displaySpaces}
+        kibanaPrivileges={kibanaPrivileges}
+        canCustomizeSubFeaturePrivileges={true}
+        onChange={jest.fn()}
+        onCancel={jest.fn()}
+      />
+    );
+
+    expect(wrapper.find(EuiSuperSelect).props().valueOfSelected).toEqual(`basePrivilege_custom`);
+    expect(wrapper.find(FeatureTable).props().disabled).toEqual(true);
+    expect(getDisplayedFeaturePrivileges(wrapper)).toMatchInlineSnapshot(`
+      Object {
+        "excluded_from_base": Object {
+          "primaryFeaturePrivilege": "none",
+          "subFeaturePrivileges": Array [],
+        },
+        "no_sub_features": Object {
+          "primaryFeaturePrivilege": "none",
+        },
+        "with_excluded_sub_features": Object {
+          "primaryFeaturePrivilege": "none",
+          "subFeaturePrivileges": Array [],
+        },
+        "with_sub_features": Object {
+          "primaryFeaturePrivilege": "none",
+          "subFeaturePrivileges": Array [],
+        },
+      }
+    `);
+
+    expect(findTestSubject(wrapper, 'spaceFormGlobalPermissionsSupersedeWarning')).toHaveLength(0);
+  });
+
+  it('renders when a base privilege is selected', () => {
+    const role = createRole([
       {
-        id: 'default',
-        name: 'Default Space',
-        description: '',
-        disabledFeatures: [],
-        _reserved: true,
+        base: ['all'],
+        feature: {},
+        spaces: ['foo'],
       },
+    ]);
+    const kibanaPrivileges = createKibanaPrivileges(kibanaFeatures);
+
+    const wrapper = mountWithIntl(
+      <PrivilegeSpaceForm
+        role={role}
+        spaces={displaySpaces}
+        kibanaPrivileges={kibanaPrivileges}
+        canCustomizeSubFeaturePrivileges={true}
+        privilegeIndex={0}
+        onChange={jest.fn()}
+        onCancel={jest.fn()}
+      />
+    );
+
+    expect(wrapper.find(EuiSuperSelect).props().valueOfSelected).toEqual(`basePrivilege_all`);
+    expect(wrapper.find(FeatureTable).props().disabled).toEqual(true);
+    expect(getDisplayedFeaturePrivileges(wrapper)).toMatchInlineSnapshot(`
+      Object {
+        "excluded_from_base": Object {
+          "primaryFeaturePrivilege": "none",
+          "subFeaturePrivileges": Array [],
+        },
+        "no_sub_features": Object {
+          "primaryFeaturePrivilege": "all",
+        },
+        "with_excluded_sub_features": Object {
+          "primaryFeaturePrivilege": "all",
+          "subFeaturePrivileges": Array [],
+        },
+        "with_sub_features": Object {
+          "primaryFeaturePrivilege": "all",
+          "subFeaturePrivileges": Array [
+            "with_sub_features_cool_toggle_1",
+            "with_sub_features_cool_toggle_2",
+            "cool_all",
+          ],
+        },
+      }
+    `);
+
+    expect(findTestSubject(wrapper, 'spaceFormGlobalPermissionsSupersedeWarning')).toHaveLength(0);
+  });
+
+  it('renders when a feature privileges are selected', () => {
+    const role = createRole([
       {
-        id: 'marketing',
-        name: 'Marketing',
-        description: '',
-        disabledFeatures: [],
+        base: [],
+        feature: {
+          with_sub_features: ['read'],
+        },
+        spaces: ['foo'],
       },
-    ],
-    kibanaPrivileges,
-    privilegeCalculatorFactory: new KibanaPrivilegeCalculatorFactory(kibanaPrivileges),
-    features: [],
-    role: {
-      name: 'test role',
-      elasticsearch: {
-        cluster: ['all'],
-        indices: [] as any[],
-        run_as: [] as string[],
+    ]);
+    const kibanaPrivileges = createKibanaPrivileges(kibanaFeatures);
+
+    const wrapper = mountWithIntl(
+      <PrivilegeSpaceForm
+        role={role}
+        spaces={displaySpaces}
+        kibanaPrivileges={kibanaPrivileges}
+        canCustomizeSubFeaturePrivileges={true}
+        privilegeIndex={0}
+        onChange={jest.fn()}
+        onCancel={jest.fn()}
+      />
+    );
+
+    expect(wrapper.find(EuiSuperSelect).props().valueOfSelected).toEqual(`basePrivilege_custom`);
+    expect(wrapper.find(FeatureTable).props().disabled).toEqual(false);
+    expect(getDisplayedFeaturePrivileges(wrapper)).toMatchInlineSnapshot(`
+      Object {
+        "excluded_from_base": Object {
+          "primaryFeaturePrivilege": "none",
+          "subFeaturePrivileges": Array [],
+        },
+        "no_sub_features": Object {
+          "primaryFeaturePrivilege": "none",
+        },
+        "with_excluded_sub_features": Object {
+          "primaryFeaturePrivilege": "none",
+          "subFeaturePrivileges": Array [],
+        },
+        "with_sub_features": Object {
+          "primaryFeaturePrivilege": "read",
+          "subFeaturePrivileges": Array [
+            "with_sub_features_cool_toggle_2",
+            "cool_read",
+          ],
+        },
+      }
+    `);
+
+    expect(findTestSubject(wrapper, 'spaceFormGlobalPermissionsSupersedeWarning')).toHaveLength(0);
+  });
+
+  it('renders a warning when configuring a global privilege after space privileges are already defined', () => {
+    const role = createRole([
+      {
+        base: [],
+        feature: {
+          with_sub_features: ['read'],
+        },
+        spaces: ['foo'],
       },
-      kibana: [{ spaces: [], base: [], feature: {} }],
-    },
-    onChange: jest.fn(),
-    onCancel: jest.fn(),
-    intl: {} as any,
-    editingIndex: 0,
-  };
-  return merge(defaultProps, overrides || {});
-};
+      {
+        base: [],
+        feature: {
+          with_sub_features: ['all'],
+        },
+        spaces: ['*'],
+      },
+    ]);
+
+    const kibanaPrivileges = createKibanaPrivileges(kibanaFeatures);
+
+    const wrapper = mountWithIntl(
+      <PrivilegeSpaceForm
+        role={role}
+        spaces={displaySpaces}
+        kibanaPrivileges={kibanaPrivileges}
+        canCustomizeSubFeaturePrivileges={true}
+        onChange={jest.fn()}
+        onCancel={jest.fn()}
+      />
+    );
+
+    wrapper
+      .find(SpaceSelector)
+      .props()
+      .onChange(['*']);
+
+    wrapper.update();
 
-describe('<PrivilegeSpaceForm>', () => {
-  it('renders without crashing', () => {
-    expect(shallowWithIntl(<PrivilegeSpaceForm {...buildProps()} />)).toMatchSnapshot();
+    expect(findTestSubject(wrapper, 'globalPrivilegeWarning')).toHaveLength(1);
   });
 
-  it(`defaults to "Custom" for new global entries`, () => {
-    const props = buildProps({
-      role: {
-        kibana: [
-          {
-            spaces: ['*'],
-            base: [],
-            feature: {},
-          },
-        ],
+  it('renders a warning when space privileges are less permissive than configured global privileges', () => {
+    const role = createRole([
+      {
+        base: [],
+        feature: {
+          with_sub_features: ['read'],
+        },
+        spaces: ['foo'],
+      },
+      {
+        base: [],
+        feature: {
+          with_sub_features: ['all'],
+        },
+        spaces: ['*'],
       },
-      editingIndex: 0,
-    });
-    const component = mountWithIntl(<PrivilegeSpaceForm {...props} />);
-    const basePrivilegeComboBox = findTestSubject(component, `basePrivilegeComboBox`);
-    expect(basePrivilegeComboBox.text()).toBe('Custom');
+    ]);
+    const kibanaPrivileges = createKibanaPrivileges(kibanaFeatures);
+
+    const wrapper = mountWithIntl(
+      <PrivilegeSpaceForm
+        role={role}
+        spaces={displaySpaces}
+        kibanaPrivileges={kibanaPrivileges}
+        canCustomizeSubFeaturePrivileges={true}
+        privilegeIndex={0}
+        onChange={jest.fn()}
+        onCancel={jest.fn()}
+      />
+    );
+
+    expect(wrapper.find(EuiSuperSelect).props().valueOfSelected).toEqual(`basePrivilege_custom`);
+    expect(wrapper.find(FeatureTable).props().disabled).toEqual(false);
+    expect(getDisplayedFeaturePrivileges(wrapper)).toMatchInlineSnapshot(`
+      Object {
+        "excluded_from_base": Object {
+          "primaryFeaturePrivilege": "none",
+          "subFeaturePrivileges": Array [],
+        },
+        "no_sub_features": Object {
+          "primaryFeaturePrivilege": "none",
+        },
+        "with_excluded_sub_features": Object {
+          "primaryFeaturePrivilege": "none",
+          "subFeaturePrivileges": Array [],
+        },
+        "with_sub_features": Object {
+          "primaryFeaturePrivilege": "read",
+          "subFeaturePrivileges": Array [
+            "with_sub_features_cool_toggle_2",
+            "cool_read",
+          ],
+        },
+      }
+    `);
+
+    expect(findTestSubject(wrapper, 'spaceFormGlobalPermissionsSupersedeWarning')).toHaveLength(1);
+    expect(findTestSubject(wrapper, 'globalPrivilegeWarning')).toHaveLength(0);
   });
 
-  it(`defaults to "Custom" for new space entries`, () => {
-    const props = buildProps({
-      role: {
-        kibana: [
-          {
-            spaces: ['space:default'],
-            base: [],
-            feature: {},
-          },
-        ],
+  it('allows all feature privileges to be changed via "change all"', () => {
+    const role = createRole([
+      {
+        base: [],
+        feature: {
+          with_sub_features: ['all', 'with_sub_features_cool_toggle_2', 'cool_read'],
+        },
+        spaces: ['foo'],
+      },
+      {
+        base: [],
+        feature: {
+          with_sub_features: ['all'],
+        },
+        spaces: ['bar'],
       },
-      editingIndex: 0,
-    });
-    const component = mountWithIntl(<PrivilegeSpaceForm {...props} />);
-    const basePrivilegeComboBox = findTestSubject(component, `basePrivilegeComboBox`);
-    expect(basePrivilegeComboBox.text()).toBe('Custom');
+    ]);
+    const kibanaPrivileges = createKibanaPrivileges(kibanaFeatures);
+
+    const onChange = jest.fn();
+
+    const wrapper = mountWithIntl(
+      <PrivilegeSpaceForm
+        role={role}
+        spaces={displaySpaces}
+        kibanaPrivileges={kibanaPrivileges}
+        canCustomizeSubFeaturePrivileges={true}
+        privilegeIndex={0}
+        onChange={onChange}
+        onCancel={jest.fn()}
+      />
+    );
+
+    findTestSubject(wrapper, 'changeAllPrivilegesButton').simulate('click');
+    findTestSubject(wrapper, 'changeAllPrivileges-read').simulate('click');
+    findTestSubject(wrapper, 'createSpacePrivilegeButton').simulate('click');
+
+    expect(onChange).toHaveBeenCalledWith(
+      createRole([
+        {
+          base: [],
+          feature: {
+            excluded_from_base: ['read'],
+            with_excluded_sub_features: ['read'],
+            no_sub_features: ['read'],
+            with_sub_features: ['read'],
+          },
+          spaces: ['foo'],
+        },
+        // this set remains unchanged from the original
+        {
+          base: [],
+          feature: {
+            with_sub_features: ['all'],
+          },
+          spaces: ['bar'],
+        },
+      ])
+    );
   });
 
-  describe('when an existing global all privilege', () => {
-    it(`defaults to "Custom" for new entries`, () => {
-      const props = buildProps({
-        role: {
-          kibana: [
-            {
-              spaces: ['*'],
-              base: ['all'],
-              feature: {},
-            },
-            {
-              spaces: ['default'],
-              base: [],
-              feature: {},
-            },
-          ],
+  it('passes the `canCustomizeSubFeaturePrivileges` prop to the FeatureTable', () => {
+    const role = createRole([
+      {
+        base: [],
+        feature: {
+          with_sub_features: ['all'],
         },
-        editingIndex: 1,
-      });
-      const component = mountWithIntl(<PrivilegeSpaceForm {...props} />);
-      const basePrivilegeComboBox = findTestSubject(component, `basePrivilegeComboBox`);
-      expect(basePrivilegeComboBox.text()).toBe('Custom');
-    });
+        spaces: ['foo'],
+      },
+    ]);
+    const kibanaPrivileges = createKibanaPrivileges(kibanaFeatures);
+
+    const onChange = jest.fn();
+
+    const canCustomize = (Symbol('can customize') as unknown) as boolean;
+
+    const wrapper = mountWithIntl(
+      <PrivilegeSpaceForm
+        role={role}
+        spaces={displaySpaces}
+        kibanaPrivileges={kibanaPrivileges}
+        canCustomizeSubFeaturePrivileges={canCustomize}
+        privilegeIndex={0}
+        onChange={onChange}
+        onCancel={jest.fn()}
+      />
+    );
+
+    expect(wrapper.find(FeatureTable).props().canCustomizeSubFeaturePrivileges).toBe(canCustomize);
   });
 });
diff --git a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/space_aware_privilege_section/privilege_space_form.tsx b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/space_aware_privilege_section/privilege_space_form.tsx
index 6f841b5d14cb3..4e9e02bb531f1 100644
--- a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/space_aware_privilege_section/privilege_space_form.tsx
+++ b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/space_aware_privilege_section/privilege_space_form.tsx
@@ -21,46 +21,42 @@ import {
   EuiSuperSelect,
   EuiText,
   EuiTitle,
+  EuiErrorBoundary,
 } from '@elastic/eui';
-import { FormattedMessage, InjectedIntl } from '@kbn/i18n/react';
+import { i18n } from '@kbn/i18n';
+import { FormattedMessage } from '@kbn/i18n/react';
 import React, { Component, Fragment } from 'react';
 import { Space } from '../../../../../../../../spaces/public';
-import { Feature } from '../../../../../../../../features/public';
-import { KibanaPrivileges, Role, copyRole } from '../../../../../../../common/model';
-import {
-  AllowedPrivilege,
-  KibanaPrivilegeCalculatorFactory,
-  PrivilegeExplanation,
-} from '../kibana_privilege_calculator';
-import { hasAssignedFeaturePrivileges } from '../../../privilege_utils';
-import { CUSTOM_PRIVILEGE_VALUE } from '../constants';
-import { FeatureTable } from '../feature_table';
+import { Role, copyRole } from '../../../../../../../common/model';
 import { SpaceSelector } from './space_selector';
+import { FeatureTable } from '../feature_table';
+import { CUSTOM_PRIVILEGE_VALUE } from '../constants';
+import { PrivilegeFormCalculator } from '../privilege_form_calculator';
+import { KibanaPrivileges } from '../../../../model';
 
 interface Props {
   role: Role;
-  privilegeCalculatorFactory: KibanaPrivilegeCalculatorFactory;
   kibanaPrivileges: KibanaPrivileges;
-  features: Feature[];
   spaces: Space[];
-  editingIndex: number;
+  privilegeIndex: number;
+  canCustomizeSubFeaturePrivileges: boolean;
   onChange: (role: Role) => void;
   onCancel: () => void;
-  intl: InjectedIntl;
 }
 
 interface State {
-  editingIndex: number;
+  privilegeIndex: number;
   selectedSpaceIds: string[];
   selectedBasePrivilege: string[];
   role: Role;
   mode: 'create' | 'update';
   isCustomizingFeaturePrivileges: boolean;
+  privilegeCalculator: PrivilegeFormCalculator;
 }
 
 export class PrivilegeSpaceForm extends Component<Props, State> {
   public static defaultProps = {
-    editingIndex: -1,
+    privilegeIndex: -1,
   };
 
   constructor(props: Props) {
@@ -68,10 +64,10 @@ export class PrivilegeSpaceForm extends Component<Props, State> {
 
     const role = copyRole(props.role);
 
-    let editingIndex = props.editingIndex;
-    if (editingIndex < 0) {
+    let privilegeIndex = props.privilegeIndex;
+    if (privilegeIndex < 0) {
       // create new form
-      editingIndex =
+      privilegeIndex =
         role.kibana.push({
           spaces: [],
           base: [],
@@ -81,11 +77,12 @@ export class PrivilegeSpaceForm extends Component<Props, State> {
 
     this.state = {
       role,
-      editingIndex,
-      selectedSpaceIds: [...role.kibana[editingIndex].spaces],
-      selectedBasePrivilege: [...(role.kibana[editingIndex].base || [])],
-      mode: props.editingIndex < 0 ? 'create' : 'update',
+      privilegeIndex,
+      selectedSpaceIds: [...role.kibana[privilegeIndex].spaces],
+      selectedBasePrivilege: [...(role.kibana[privilegeIndex].base || [])],
+      mode: props.privilegeIndex < 0 ? 'create' : 'update',
       isCustomizingFeaturePrivileges: false,
+      privilegeCalculator: new PrivilegeFormCalculator(props.kibanaPrivileges, role),
     };
   }
 
@@ -103,8 +100,33 @@ export class PrivilegeSpaceForm extends Component<Props, State> {
               </h2>
             </EuiTitle>
           </EuiFlyoutHeader>
-          <EuiFlyoutBody>{this.getForm()}</EuiFlyoutBody>
+          <EuiFlyoutBody>
+            <EuiErrorBoundary>{this.getForm()}</EuiErrorBoundary>
+          </EuiFlyoutBody>
           <EuiFlyoutFooter>
+            {this.state.privilegeCalculator.hasSupersededInheritedPrivileges(
+              this.state.privilegeIndex
+            ) && (
+              <Fragment>
+                <EuiCallOut
+                  color="warning"
+                  iconType="alert"
+                  data-test-subj="spaceFormGlobalPermissionsSupersedeWarning"
+                  title={
+                    <FormattedMessage
+                      id="xpack.security.management.editRole.spacePrivilegeForm.supersededWarningTitle"
+                      defaultMessage="Superseded by global privileges"
+                    />
+                  }
+                >
+                  <FormattedMessage
+                    id="xpack.security.management.editRole.spacePrivilegeForm.supersededWarning"
+                    defaultMessage="Declared privileges are less permissive than configured global privileges. View the privilege summary to see effective privileges."
+                  />
+                </EuiCallOut>
+                <EuiSpacer size="s" />
+              </Fragment>
+            )}
             <EuiFlexGroup justifyContent="spaceBetween">
               <EuiFlexItem grow={false}>
                 <EuiButtonEmpty
@@ -114,7 +136,7 @@ export class PrivilegeSpaceForm extends Component<Props, State> {
                   data-test-subj={'cancelSpacePrivilegeButton'}
                 >
                   <FormattedMessage
-                    id="xpack.security.management.editRolespacePrivilegeForm.cancelButton"
+                    id="xpack.security.management.editRole.spacePrivilegeForm.cancelButton"
                     defaultMessage="Cancel"
                   />
                 </EuiButtonEmpty>
@@ -128,18 +150,7 @@ export class PrivilegeSpaceForm extends Component<Props, State> {
   }
 
   private getForm = () => {
-    const { intl, spaces, privilegeCalculatorFactory } = this.props;
-
-    const privilegeCalculator = privilegeCalculatorFactory.getInstance(this.state.role);
-
-    const calculatedPrivileges = privilegeCalculator.calculateEffectivePrivileges()[
-      this.state.editingIndex
-    ];
-    const allowedPrivileges = privilegeCalculator.calculateAllowedPrivileges()[
-      this.state.editingIndex
-    ];
-
-    const baseExplanation = calculatedPrivileges.base;
+    const { spaces } = this.props;
 
     const hasSelectedSpaces = this.state.selectedSpaceIds.length > 0;
 
@@ -147,16 +158,17 @@ export class PrivilegeSpaceForm extends Component<Props, State> {
       <EuiForm>
         <EuiFormRow
           fullWidth
-          label={intl.formatMessage({
-            id: 'xpack.security.management.editRole.spacePrivilegeForm.spaceSelectorFormLabel',
-            defaultMessage: 'Spaces',
-          })}
+          label={i18n.translate(
+            'xpack.security.management.editRole.spacePrivilegeForm.spaceSelectorFormLabel',
+            {
+              defaultMessage: 'Spaces',
+            }
+          )}
         >
           <SpaceSelector
             selectedSpaceIds={this.state.selectedSpaceIds}
             onChange={this.onSelectedSpacesChange}
             spaces={spaces}
-            intl={this.props.intl}
           />
         </EuiFormRow>
 
@@ -164,10 +176,12 @@ export class PrivilegeSpaceForm extends Component<Props, State> {
 
         <EuiFormRow
           fullWidth
-          label={intl.formatMessage({
-            id: 'xpack.security.management.editRole.spacePrivilegeForm.privilegeSelectorFormLabel',
-            defaultMessage: 'Privilege',
-          })}
+          label={i18n.translate(
+            'xpack.security.management.editRole.spacePrivilegeForm.privilegeSelectorFormLabel',
+            {
+              defaultMessage: 'Privilege',
+            }
+          )}
         >
           <EuiSuperSelect
             data-test-subj={'basePrivilegeComboBox'}
@@ -176,7 +190,6 @@ export class PrivilegeSpaceForm extends Component<Props, State> {
             options={[
               {
                 value: 'basePrivilege_custom',
-                disabled: !this.canCustomizeFeaturePrivileges(baseExplanation, allowedPrivileges),
                 inputDisplay: (
                   <EuiText>
                     <FormattedMessage
@@ -204,7 +217,6 @@ export class PrivilegeSpaceForm extends Component<Props, State> {
               },
               {
                 value: 'basePrivilege_read',
-                disabled: !allowedPrivileges.base.privileges.includes('read'),
                 inputDisplay: (
                   <EuiText>
                     <FormattedMessage
@@ -259,7 +271,7 @@ export class PrivilegeSpaceForm extends Component<Props, State> {
               },
             ]}
             hasDividers
-            valueOfSelected={this.getDisplayedBasePrivilege(allowedPrivileges, baseExplanation)}
+            valueOfSelected={this.getDisplayedBasePrivilege()}
             disabled={!hasSelectedSpaces}
           />
         </EuiFormRow>
@@ -280,14 +292,12 @@ export class PrivilegeSpaceForm extends Component<Props, State> {
 
         <FeatureTable
           role={this.state.role}
-          features={this.props.features}
-          calculatedPrivileges={calculatedPrivileges}
-          allowedPrivileges={allowedPrivileges}
-          rankedFeaturePrivileges={privilegeCalculator.rankedFeaturePrivileges}
+          privilegeCalculator={this.state.privilegeCalculator}
           onChange={this.onFeaturePrivilegesChange}
           onChangeAll={this.onChangeAllFeaturePrivileges}
           kibanaPrivileges={this.props.kibanaPrivileges}
-          spacesIndex={this.state.editingIndex}
+          privilegeIndex={this.state.privilegeIndex}
+          canCustomizeSubFeaturePrivileges={this.props.canCustomizeSubFeaturePrivileges}
           disabled={this.state.selectedBasePrivilege.length > 0 || !hasSelectedSpaces}
         />
 
@@ -297,6 +307,7 @@ export class PrivilegeSpaceForm extends Component<Props, State> {
             <EuiCallOut
               color="warning"
               iconType="alert"
+              data-test-subj="globalPrivilegeWarning"
               title={
                 <FormattedMessage
                   id="xpack.security.management.editRole.spacePrivilegeForm.globalPrivilegeWarning"
@@ -373,33 +384,39 @@ export class PrivilegeSpaceForm extends Component<Props, State> {
 
   private getFeatureListLabel = (disabled: boolean) => {
     if (disabled) {
-      return this.props.intl.formatMessage({
-        id: 'xpack.security.management.editRole.spacePrivilegeForm.summaryOfFeaturePrivileges',
-        defaultMessage: 'Summary of feature privileges',
-      });
+      return i18n.translate(
+        'xpack.security.management.editRole.spacePrivilegeForm.summaryOfFeaturePrivileges',
+        {
+          defaultMessage: 'Summary of feature privileges',
+        }
+      );
     } else {
-      return this.props.intl.formatMessage({
-        id: 'xpack.security.management.editRole.spacePrivilegeForm.customizeFeaturePrivileges',
-        defaultMessage: 'Customize by feature',
-      });
+      return i18n.translate(
+        'xpack.security.management.editRole.spacePrivilegeForm.customizeFeaturePrivileges',
+        {
+          defaultMessage: 'Customize by feature',
+        }
+      );
     }
   };
 
   private getFeatureListDescription = (disabled: boolean) => {
     if (disabled) {
-      return this.props.intl.formatMessage({
-        id:
-          'xpack.security.management.editRole.spacePrivilegeForm.featurePrivilegeSummaryDescription',
-        defaultMessage:
-          'Some features might be hidden by the space or affected by a global space privilege.',
-      });
+      return i18n.translate(
+        'xpack.security.management.editRole.spacePrivilegeForm.featurePrivilegeSummaryDescription',
+        {
+          defaultMessage:
+            'Some features might be hidden by the space or affected by a global space privilege.',
+        }
+      );
     } else {
-      return this.props.intl.formatMessage({
-        id:
-          'xpack.security.management.editRole.spacePrivilegeForm.customizeFeaturePrivilegeDescription',
-        defaultMessage:
-          'Increase privilege levels on a per feature basis. Some features might be hidden by the space or affected by a global space privilege.',
-      });
+      return i18n.translate(
+        'xpack.security.management.editRole.spacePrivilegeForm.customizeFeaturePrivilegeDescription',
+        {
+          defaultMessage:
+            'Increase privilege levels on a per feature basis. Some features might be hidden by the space or affected by a global space privilege.',
+        }
+      );
     }
   };
 
@@ -410,10 +427,12 @@ export class PrivilegeSpaceForm extends Component<Props, State> {
           <EuiCallOut
             color="primary"
             iconType="iInCircle"
-            title={this.props.intl.formatMessage({
-              id: 'xpack.security.management.editRole.spacePrivilegeForm.globalPrivilegeNotice',
-              defaultMessage: 'These privileges will apply to all current and future spaces.',
-            })}
+            title={i18n.translate(
+              'xpack.security.management.editRole.spacePrivilegeForm.globalPrivilegeNotice',
+              {
+                defaultMessage: 'These privileges will apply to all current and future spaces.',
+              }
+            )}
           />
         </EuiFormRow>
       );
@@ -429,7 +448,7 @@ export class PrivilegeSpaceForm extends Component<Props, State> {
   private onSaveClick = () => {
     const role = copyRole(this.state.role);
 
-    const form = role.kibana[this.state.editingIndex];
+    const form = role.kibana[this.state.privilegeIndex];
 
     // remove any spaces that no longer exist
     if (!this.isDefiningGlobalPrivilege()) {
@@ -444,18 +463,19 @@ export class PrivilegeSpaceForm extends Component<Props, State> {
   private onSelectedSpacesChange = (selectedSpaceIds: string[]) => {
     const role = copyRole(this.state.role);
 
-    const form = role.kibana[this.state.editingIndex];
+    const form = role.kibana[this.state.privilegeIndex];
     form.spaces = [...selectedSpaceIds];
 
     this.setState({
       selectedSpaceIds,
       role,
+      privilegeCalculator: new PrivilegeFormCalculator(this.props.kibanaPrivileges, role),
     });
   };
 
   private onSpaceBasePrivilegeChange = (basePrivilege: string) => {
     const role = copyRole(this.state.role);
-    const form = role.kibana[this.state.editingIndex];
+    const form = role.kibana[this.state.privilegeIndex];
 
     const privilegeName = basePrivilege.split('basePrivilege_')[1];
 
@@ -473,47 +493,25 @@ export class PrivilegeSpaceForm extends Component<Props, State> {
       selectedBasePrivilege: privilegeName === CUSTOM_PRIVILEGE_VALUE ? [] : [privilegeName],
       role,
       isCustomizingFeaturePrivileges,
+      privilegeCalculator: new PrivilegeFormCalculator(this.props.kibanaPrivileges, role),
     });
   };
 
-  private getDisplayedBasePrivilege = (
-    allowedPrivileges: AllowedPrivilege,
-    explanation: PrivilegeExplanation
-  ) => {
-    let displayedBasePrivilege = explanation.actualPrivilege;
-
-    if (this.canCustomizeFeaturePrivileges(explanation, allowedPrivileges)) {
-      const form = this.state.role.kibana[this.state.editingIndex];
-
-      if (
-        hasAssignedFeaturePrivileges(form) ||
-        form.base.length === 0 ||
-        this.state.isCustomizingFeaturePrivileges
-      ) {
-        displayedBasePrivilege = CUSTOM_PRIVILEGE_VALUE;
-      }
-    }
-
-    return displayedBasePrivilege ? `basePrivilege_${displayedBasePrivilege}` : undefined;
-  };
+  private getDisplayedBasePrivilege = () => {
+    const basePrivilege = this.state.privilegeCalculator.getBasePrivilege(
+      this.state.privilegeIndex
+    );
 
-  private canCustomizeFeaturePrivileges = (
-    basePrivilegeExplanation: PrivilegeExplanation,
-    allowedPrivileges: AllowedPrivilege
-  ) => {
-    if (basePrivilegeExplanation.isDirectlyAssigned) {
-      return true;
+    if (basePrivilege) {
+      return `basePrivilege_${basePrivilege.id}`;
     }
 
-    const featureEntries = Object.values(allowedPrivileges.feature);
-    return featureEntries.some(entry => {
-      return entry != null && (entry.canUnassign || entry.privileges.length > 1);
-    });
+    return `basePrivilege_${CUSTOM_PRIVILEGE_VALUE}`;
   };
 
   private onFeaturePrivilegesChange = (featureId: string, privileges: string[]) => {
     const role = copyRole(this.state.role);
-    const form = role.kibana[this.state.editingIndex];
+    const form = role.kibana[this.state.privilegeIndex];
 
     if (privileges.length === 0) {
       delete form.feature[featureId];
@@ -523,32 +521,29 @@ export class PrivilegeSpaceForm extends Component<Props, State> {
 
     this.setState({
       role,
+      privilegeCalculator: new PrivilegeFormCalculator(this.props.kibanaPrivileges, role),
     });
   };
 
   private onChangeAllFeaturePrivileges = (privileges: string[]) => {
     const role = copyRole(this.state.role);
-    const form = role.kibana[this.state.editingIndex];
-
-    const calculator = this.props.privilegeCalculatorFactory.getInstance(role);
-    const allowedPrivs = calculator.calculateAllowedPrivileges();
+    const entry = role.kibana[this.state.privilegeIndex];
 
     if (privileges.length === 0) {
-      form.feature = {};
+      entry.feature = {};
     } else {
-      this.props.features.forEach(feature => {
-        const allowedPrivilegesFeature = allowedPrivs[this.state.editingIndex].feature[feature.id];
-        const canAssign =
-          allowedPrivilegesFeature && allowedPrivilegesFeature.privileges.includes(privileges[0]);
-
-        if (canAssign) {
-          form.feature[feature.id] = [...privileges];
+      this.props.kibanaPrivileges.getSecuredFeatures().forEach(feature => {
+        const nextFeaturePrivilege = feature
+          .getPrimaryFeaturePrivileges()
+          .find(pfp => privileges.includes(pfp.id));
+        if (nextFeaturePrivilege) {
+          entry.feature[feature.id] = [nextFeaturePrivilege.id];
         }
       });
     }
-
     this.setState({
       role,
+      privilegeCalculator: new PrivilegeFormCalculator(this.props.kibanaPrivileges, role),
     });
   };
 
@@ -557,7 +552,7 @@ export class PrivilegeSpaceForm extends Component<Props, State> {
       return false;
     }
 
-    const form = this.state.role.kibana[this.state.editingIndex];
+    const form = this.state.role.kibana[this.state.privilegeIndex];
     if (form.base.length === 0 && Object.keys(form.feature).length === 0) {
       return false;
     }
diff --git a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/space_aware_privilege_section/privilege_space_table.test.tsx b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/space_aware_privilege_section/privilege_space_table.test.tsx
index f0a391c98c910..b1c7cb4b631e6 100644
--- a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/space_aware_privilege_section/privilege_space_table.test.tsx
+++ b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/space_aware_privilege_section/privilege_space_table.test.tsx
@@ -5,14 +5,16 @@
  */
 
 import React from 'react';
-import { EuiBadge, EuiInMemoryTable, EuiIconTip } from '@elastic/eui';
+import { EuiBadge, EuiInMemoryTable } from '@elastic/eui';
 import { mountWithIntl } from 'test_utils/enzyme_helpers';
 import { ReactWrapper } from 'enzyme';
 import { PrivilegeSpaceTable } from './privilege_space_table';
 import { PrivilegeDisplay } from './privilege_display';
-import { KibanaPrivileges, Role, RoleKibanaPrivilege } from '../../../../../../../common/model';
-import { KibanaPrivilegeCalculatorFactory } from '../kibana_privilege_calculator';
-import { rawKibanaPrivileges } from './__fixtures__';
+import { Role, RoleKibanaPrivilege } from '../../../../../../../common/model';
+import { createKibanaPrivileges } from '../../../../__fixtures__/kibana_privileges';
+import { PrivilegeFormCalculator } from '../privilege_form_calculator';
+import { Feature } from '../../../../../../../../features/public';
+import { findTestSubject } from 'test_utils/find_test_subject';
 
 interface TableRow {
   spaces: string[];
@@ -21,20 +23,125 @@ interface TableRow {
   };
 }
 
-const buildProps = (roleKibanaPrivileges: RoleKibanaPrivilege[]): PrivilegeSpaceTable['props'] => {
-  const kibanaPrivileges = new KibanaPrivileges(rawKibanaPrivileges);
-  return {
-    role: {
-      name: 'test role',
-      elasticsearch: {
-        cluster: ['all'],
-        indices: [] as any[],
-        run_as: [] as string[],
+const features = [
+  new Feature({
+    id: 'normal',
+    name: 'normal feature',
+    app: [],
+    privileges: {
+      all: {
+        savedObject: { all: [], read: [] },
+        ui: ['normal-feature-all', 'normal-feature-read'],
+      },
+      read: {
+        savedObject: { all: [], read: [] },
+        ui: ['normal-feature-read'],
       },
-      kibana: roleKibanaPrivileges,
     },
-    privilegeCalculatorFactory: new KibanaPrivilegeCalculatorFactory(kibanaPrivileges),
-    onChange: (role: Role) => {},
+  }),
+  new Feature({
+    id: 'normal_with_sub',
+    name: 'normal feature with sub features',
+    app: [],
+    privileges: {
+      all: {
+        savedObject: { all: [], read: [] },
+        ui: ['normal-feature-all', 'normal-feature-read'],
+      },
+      read: {
+        savedObject: { all: [], read: [] },
+        ui: ['normal-feature-read'],
+      },
+    },
+    subFeatures: [
+      {
+        name: 'sub feature',
+        privilegeGroups: [
+          {
+            groupType: 'mutually_exclusive',
+            privileges: [
+              {
+                id: 'normal_sub_all',
+                name: 'normal sub feature privilege',
+                includeIn: 'all',
+                savedObject: { all: [], read: [] },
+                ui: ['normal-sub-all', 'normal-sub-read'],
+              },
+              {
+                id: 'normal_sub_read',
+                name: 'normal sub feature read privilege',
+                includeIn: 'read',
+                savedObject: { all: [], read: [] },
+                ui: ['normal-sub-read'],
+              },
+            ],
+          },
+          {
+            groupType: 'independent',
+            privileges: [
+              {
+                id: 'excluded_sub_priv',
+                name: 'excluded sub feature privilege',
+                includeIn: 'none',
+                savedObject: { all: [], read: [] },
+                ui: ['excluded-sub-priv'],
+              },
+            ],
+          },
+        ],
+      },
+    ],
+  }),
+  new Feature({
+    id: 'bothPrivilegesExcludedFromBase',
+    name: 'bothPrivilegesExcludedFromBase',
+    app: [],
+    privileges: {
+      all: {
+        excludeFromBasePrivileges: true,
+        savedObject: { all: [], read: [] },
+        ui: ['both-privileges-excluded-from-base-all', 'both-privileges-excluded-from-base-read'],
+      },
+      read: {
+        excludeFromBasePrivileges: true,
+        savedObject: { all: [], read: [] },
+        ui: ['both-privileges-excluded-from-base-read'],
+      },
+    },
+  }),
+  new Feature({
+    id: 'allPrivilegeExcludedFromBase',
+    name: 'allPrivilegeExcludedFromBase',
+    app: [],
+    privileges: {
+      all: {
+        excludeFromBasePrivileges: true,
+        savedObject: { all: [], read: [] },
+        ui: ['all-privilege-excluded-from-base-all', 'all-privilege-excluded-from-base-read'],
+      },
+      read: {
+        savedObject: { all: [], read: [] },
+        ui: ['all-privilege-excluded-from-base-read'],
+      },
+    },
+  }),
+];
+
+const buildProps = (roleKibanaPrivileges: RoleKibanaPrivilege[]): PrivilegeSpaceTable['props'] => {
+  const kibanaPrivileges = createKibanaPrivileges(features);
+  const role = {
+    name: 'test role',
+    elasticsearch: {
+      cluster: ['all'],
+      indices: [] as any[],
+      run_as: [] as string[],
+    },
+    kibana: roleKibanaPrivileges,
+  };
+  return {
+    role,
+    privilegeCalculator: new PrivilegeFormCalculator(kibanaPrivileges, role),
+    onChange: (r: Role) => {},
     onEdit: (spacesIndex: number) => {},
     displaySpaces: [
       {
@@ -51,7 +158,6 @@ const buildProps = (roleKibanaPrivileges: RoleKibanaPrivilege[]): PrivilegeSpace
         disabledFeatures: [],
       },
     ],
-    intl: {} as any,
   };
 };
 
@@ -73,7 +179,9 @@ const getTableFromComponent = (
         spaces: spacesBadge.map(badge => badge.text().trim()),
         privileges: {
           summary: privilegesDisplay.text().trim(),
-          overridden: privilegesDisplay.find(EuiIconTip).exists('[type="lock"]'),
+          overridden:
+            findTestSubject(row as ReactWrapper<any>, 'spaceTablePrivilegeSupersededWarning')
+              .length > 0,
         },
       },
     ];
@@ -117,6 +225,28 @@ describe('only global', () => {
     ]);
   });
 
+  it('normal feature privilege minimal_all', () => {
+    const props = buildProps([
+      { spaces: ['*'], base: [], feature: { normal_with_sub: ['minimal_all'] } },
+    ]);
+    const component = mountWithIntl(<PrivilegeSpaceTable {...props} />);
+    const actualTable = getTableFromComponent(component);
+    expect(actualTable).toEqual([
+      { spaces: ['*'], privileges: { summary: 'Custom', overridden: false } },
+    ]);
+  });
+
+  it('normal feature privilege minimal_all and normal_sub_read', () => {
+    const props = buildProps([
+      { spaces: ['*'], base: [], feature: { normal_with_sub: ['minimal_all', 'normal_sub_read'] } },
+    ]);
+    const component = mountWithIntl(<PrivilegeSpaceTable {...props} />);
+    const actualTable = getTableFromComponent(component);
+    expect(actualTable).toEqual([
+      { spaces: ['*'], privileges: { summary: 'Custom', overridden: false } },
+    ]);
+  });
+
   it('bothPrivilegesExcludedFromBase feature privilege all', () => {
     const props = buildProps([
       { spaces: ['*'], base: [], feature: { bothPrivilegesExcludedFromBase: ['read'] } },
@@ -203,6 +333,32 @@ describe('only default and marketing space', () => {
     ]);
   });
 
+  it('normal feature privilege minimal_all', () => {
+    const props = buildProps([
+      { spaces: ['default', 'marketing'], base: [], feature: { normal_with_sub: ['minimal_all'] } },
+    ]);
+    const component = mountWithIntl(<PrivilegeSpaceTable {...props} />);
+    const actualTable = getTableFromComponent(component);
+    expect(actualTable).toEqual([
+      { spaces: ['Default', 'Marketing'], privileges: { summary: 'Custom', overridden: false } },
+    ]);
+  });
+
+  it('normal feature privilege minimal_all and normal_sub_read', () => {
+    const props = buildProps([
+      {
+        spaces: ['default', 'marketing'],
+        base: [],
+        feature: { normal_with_sub: ['minimal_all', 'normal_sub_read'] },
+      },
+    ]);
+    const component = mountWithIntl(<PrivilegeSpaceTable {...props} />);
+    const actualTable = getTableFromComponent(component);
+    expect(actualTable).toEqual([
+      { spaces: ['Default', 'Marketing'], privileges: { summary: 'Custom', overridden: false } },
+    ]);
+  });
+
   it('bothPrivilegesExcludedFromBase feature privilege all', () => {
     const props = buildProps([
       {
@@ -275,7 +431,7 @@ describe('global base all', () => {
       const actualTable = getTableFromComponent(component);
       expect(actualTable).toEqual([
         { spaces: ['*'], privileges: { summary: 'All', overridden: false } },
-        { spaces: ['Default', 'Marketing'], privileges: { summary: 'All', overridden: true } },
+        { spaces: ['Default', 'Marketing'], privileges: { summary: 'All', overridden: false } },
       ]);
     });
 
@@ -288,7 +444,7 @@ describe('global base all', () => {
       const actualTable = getTableFromComponent(component);
       expect(actualTable).toEqual([
         { spaces: ['*'], privileges: { summary: 'All', overridden: false } },
-        { spaces: ['Default', 'Marketing'], privileges: { summary: 'All', overridden: true } },
+        { spaces: ['Default', 'Marketing'], privileges: { summary: 'Read', overridden: true } },
       ]);
     });
 
@@ -301,7 +457,7 @@ describe('global base all', () => {
       const actualTable = getTableFromComponent(component);
       expect(actualTable).toEqual([
         { spaces: ['*'], privileges: { summary: 'All', overridden: false } },
-        { spaces: ['Default', 'Marketing'], privileges: { summary: 'All', overridden: true } },
+        { spaces: ['Default', 'Marketing'], privileges: { summary: 'Custom', overridden: false } },
       ]);
     });
 
@@ -314,7 +470,41 @@ describe('global base all', () => {
       const actualTable = getTableFromComponent(component);
       expect(actualTable).toEqual([
         { spaces: ['*'], privileges: { summary: 'All', overridden: false } },
-        { spaces: ['Default', 'Marketing'], privileges: { summary: 'All', overridden: true } },
+        { spaces: ['Default', 'Marketing'], privileges: { summary: 'Custom', overridden: true } },
+      ]);
+    });
+
+    it('normal feature privilege minimal_all', () => {
+      const props = buildProps([
+        { spaces: ['*'], base: ['all'], feature: {} },
+        {
+          spaces: ['default', 'marketing'],
+          base: [],
+          feature: { normal_with_sub: ['minimal_all'] },
+        },
+      ]);
+      const component = mountWithIntl(<PrivilegeSpaceTable {...props} />);
+      const actualTable = getTableFromComponent(component);
+      expect(actualTable).toEqual([
+        { spaces: ['*'], privileges: { summary: 'All', overridden: false } },
+        { spaces: ['Default', 'Marketing'], privileges: { summary: 'Custom', overridden: true } },
+      ]);
+    });
+
+    it('normal feature privilege minimal_all and normal_sub_read', () => {
+      const props = buildProps([
+        { spaces: ['*'], base: ['all'], feature: {} },
+        {
+          spaces: ['default', 'marketing'],
+          base: [],
+          feature: { normal_with_sub: ['minimal_all', 'normal_sub_read'] },
+        },
+      ]);
+      const component = mountWithIntl(<PrivilegeSpaceTable {...props} />);
+      const actualTable = getTableFromComponent(component);
+      expect(actualTable).toEqual([
+        { spaces: ['*'], privileges: { summary: 'All', overridden: false } },
+        { spaces: ['Default', 'Marketing'], privileges: { summary: 'Custom', overridden: true } },
       ]);
     });
 
@@ -382,7 +572,7 @@ describe('global base all', () => {
       const actualTable = getTableFromComponent(component);
       expect(actualTable).toEqual([
         { spaces: ['*'], privileges: { summary: 'All', overridden: false } },
-        { spaces: ['Default', 'Marketing'], privileges: { summary: 'All', overridden: true } },
+        { spaces: ['Default', 'Marketing'], privileges: { summary: 'Custom', overridden: false } },
       ]);
     });
   });
@@ -412,7 +602,7 @@ describe('global base read', () => {
       const actualTable = getTableFromComponent(component);
       expect(actualTable).toEqual([
         { spaces: ['*'], privileges: { summary: 'Read', overridden: false } },
-        { spaces: ['Default', 'Marketing'], privileges: { summary: 'Read', overridden: true } },
+        { spaces: ['Default', 'Marketing'], privileges: { summary: 'Read', overridden: false } },
       ]);
     });
 
@@ -438,7 +628,41 @@ describe('global base read', () => {
       const actualTable = getTableFromComponent(component);
       expect(actualTable).toEqual([
         { spaces: ['*'], privileges: { summary: 'Read', overridden: false } },
-        { spaces: ['Default', 'Marketing'], privileges: { summary: 'Read', overridden: true } },
+        { spaces: ['Default', 'Marketing'], privileges: { summary: 'Custom', overridden: false } },
+      ]);
+    });
+
+    it('normal feature privilege minimal_read', () => {
+      const props = buildProps([
+        { spaces: ['*'], base: ['read'], feature: {} },
+        {
+          spaces: ['default', 'marketing'],
+          base: [],
+          feature: { normal_with_sub: ['minimal_read'] },
+        },
+      ]);
+      const component = mountWithIntl(<PrivilegeSpaceTable {...props} />);
+      const actualTable = getTableFromComponent(component);
+      expect(actualTable).toEqual([
+        { spaces: ['*'], privileges: { summary: 'Read', overridden: false } },
+        { spaces: ['Default', 'Marketing'], privileges: { summary: 'Custom', overridden: true } },
+      ]);
+    });
+
+    it('normal feature privilege minimal_read and normal_sub_read', () => {
+      const props = buildProps([
+        { spaces: ['*'], base: ['read'], feature: {} },
+        {
+          spaces: ['default', 'marketing'],
+          base: [],
+          feature: { normal_with_sub: ['minimal_read', 'normal_sub_read'] },
+        },
+      ]);
+      const component = mountWithIntl(<PrivilegeSpaceTable {...props} />);
+      const actualTable = getTableFromComponent(component);
+      expect(actualTable).toEqual([
+        { spaces: ['*'], privileges: { summary: 'Read', overridden: false } },
+        { spaces: ['Default', 'Marketing'], privileges: { summary: 'Custom', overridden: false } },
       ]);
     });
 
@@ -506,7 +730,7 @@ describe('global base read', () => {
       const actualTable = getTableFromComponent(component);
       expect(actualTable).toEqual([
         { spaces: ['*'], privileges: { summary: 'Read', overridden: false } },
-        { spaces: ['Default', 'Marketing'], privileges: { summary: 'Read', overridden: true } },
+        { spaces: ['Default', 'Marketing'], privileges: { summary: 'Custom', overridden: false } },
       ]);
     });
   });
@@ -562,7 +786,7 @@ describe('global normal feature privilege all', () => {
       const actualTable = getTableFromComponent(component);
       expect(actualTable).toEqual([
         { spaces: ['*'], privileges: { summary: 'Custom', overridden: false } },
-        { spaces: ['Default', 'Marketing'], privileges: { summary: 'Custom', overridden: false } },
+        { spaces: ['Default', 'Marketing'], privileges: { summary: 'Custom', overridden: true } },
       ]);
     });
 
@@ -844,7 +1068,7 @@ describe('global bothPrivilegesExcludedFromBase feature privilege all', () => {
       const actualTable = getTableFromComponent(component);
       expect(actualTable).toEqual([
         { spaces: ['*'], privileges: { summary: 'Custom', overridden: false } },
-        { spaces: ['Default', 'Marketing'], privileges: { summary: 'Custom', overridden: false } },
+        { spaces: ['Default', 'Marketing'], privileges: { summary: 'Custom', overridden: true } },
       ]);
     });
 
@@ -1126,7 +1350,7 @@ describe('global allPrivilegeExcludedFromBase feature privilege all', () => {
       const actualTable = getTableFromComponent(component);
       expect(actualTable).toEqual([
         { spaces: ['*'], privileges: { summary: 'Custom', overridden: false } },
-        { spaces: ['Default', 'Marketing'], privileges: { summary: 'Custom', overridden: false } },
+        { spaces: ['Default', 'Marketing'], privileges: { summary: 'Custom', overridden: true } },
       ]);
     });
   });
@@ -1213,6 +1437,7 @@ describe('global allPrivilegeExcludedFromBase feature privilege read', () => {
         },
       ]);
       const component = mountWithIntl(<PrivilegeSpaceTable {...props} />);
+
       const actualTable = getTableFromComponent(component);
       expect(actualTable).toEqual([
         { spaces: ['*'], privileges: { summary: 'Custom', overridden: false } },
diff --git a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/space_aware_privilege_section/privilege_space_table.tsx b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/space_aware_privilege_section/privilege_space_table.tsx
index 1a43fb9e2683a..ccb5398a11b23 100644
--- a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/space_aware_privilege_section/privilege_space_table.tsx
+++ b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/space_aware_privilege_section/privilege_space_table.tsx
@@ -10,35 +10,32 @@ import {
   EuiButtonIcon,
   EuiInMemoryTable,
   EuiBasicTableColumn,
+  EuiIcon,
+  EuiIconTip,
+  EuiFlexGroup,
+  EuiFlexItem,
 } from '@elastic/eui';
-import { FormattedMessage, InjectedIntl } from '@kbn/i18n/react';
+import { i18n } from '@kbn/i18n';
+import { FormattedMessage } from '@kbn/i18n/react';
+import _ from 'lodash';
 import React, { Component } from 'react';
 import { Space, getSpaceColor } from '../../../../../../../../spaces/public';
-import {
-  FeaturesPrivileges,
-  Role,
-  RoleKibanaPrivilege,
-  copyRole,
-} from '../../../../../../../common/model';
-import { KibanaPrivilegeCalculatorFactory } from '../kibana_privilege_calculator';
-import {
-  isGlobalPrivilegeDefinition,
-  hasAssignedFeaturePrivileges,
-} from '../../../privilege_utils';
-import { CUSTOM_PRIVILEGE_VALUE, NO_PRIVILEGE_VALUE } from '../constants';
+import { FeaturesPrivileges, Role, copyRole } from '../../../../../../../common/model';
 import { SpacesPopoverList } from '../../../spaces_popover_list';
 import { PrivilegeDisplay } from './privilege_display';
+import { isGlobalPrivilegeDefinition } from '../../../privilege_utils';
+import { PrivilegeFormCalculator } from '../privilege_form_calculator';
+import { CUSTOM_PRIVILEGE_VALUE } from '../constants';
 
 const SPACES_DISPLAY_COUNT = 4;
 
 interface Props {
   role: Role;
-  privilegeCalculatorFactory: KibanaPrivilegeCalculatorFactory;
+  privilegeCalculator: PrivilegeFormCalculator;
   onChange: (role: Role) => void;
-  onEdit: (spacesIndex: number) => void;
+  onEdit: (privilegeIndex: number) => void;
   displaySpaces: Space[];
   disabled?: boolean;
-  intl: InjectedIntl;
 }
 
 interface State {
@@ -52,12 +49,13 @@ type TableSpace = Space &
 
 interface TableRow {
   spaces: TableSpace[];
-  spacesIndex: number;
+  privilegeIndex: number;
   isGlobal: boolean;
   privileges: {
     spaces: string[];
     base: string[];
     feature: FeaturesPrivileges;
+    reserved: string[];
   };
 }
 
@@ -71,15 +69,11 @@ export class PrivilegeSpaceTable extends Component<Props, State> {
   }
 
   private renderKibanaPrivileges = () => {
-    const { privilegeCalculatorFactory, displaySpaces, intl } = this.props;
+    const { privilegeCalculator, displaySpaces } = this.props;
 
     const spacePrivileges = this.getSortedPrivileges();
 
-    const privilegeCalculator = privilegeCalculatorFactory.getInstance(this.props.role);
-
-    const effectivePrivileges = privilegeCalculator.calculateEffectivePrivileges(false);
-
-    const rows: TableRow[] = spacePrivileges.map((spacePrivs, spacesIndex) => {
+    const rows: TableRow[] = spacePrivileges.map((spacePrivs, privilegeIndex) => {
       const spaces = spacePrivs.spaces.map(
         spaceId =>
           displaySpaces.find(space => space.id === spaceId) || {
@@ -92,12 +86,13 @@ export class PrivilegeSpaceTable extends Component<Props, State> {
 
       return {
         spaces,
-        spacesIndex,
+        privilegeIndex,
         isGlobal: isGlobalPrivilegeDefinition(spacePrivs),
         privileges: {
           spaces: spacePrivs.spaces,
           base: spacePrivs.base || [],
           feature: spacePrivs.feature || {},
+          reserved: spacePrivs._reserved || [],
         },
       };
     });
@@ -117,26 +112,27 @@ export class PrivilegeSpaceTable extends Component<Props, State> {
         name: 'Spaces',
         width: '60%',
         render: (spaces: TableSpace[], record: TableRow) => {
-          const isExpanded = this.state.expandedSpacesGroups.includes(record.spacesIndex);
+          const isExpanded = this.state.expandedSpacesGroups.includes(record.privilegeIndex);
           const displayedSpaces = isExpanded ? spaces : spaces.slice(0, SPACES_DISPLAY_COUNT);
 
           let button = null;
           if (record.isGlobal) {
             button = (
               <SpacesPopoverList
-                spaces={this.props.displaySpaces}
-                intl={this.props.intl}
-                buttonText={this.props.intl.formatMessage({
-                  id: 'xpack.security.management.editRole.spacePrivilegeTable.showAllSpacesLink',
-                  defaultMessage: 'show spaces',
-                })}
+                spaces={this.props.displaySpaces.filter(s => s.id !== '*')}
+                buttonText={i18n.translate(
+                  'xpack.security.management.editRole.spacePrivilegeTable.showAllSpacesLink',
+                  {
+                    defaultMessage: 'show spaces',
+                  }
+                )}
               />
             );
           } else if (spaces.length > displayedSpaces.length) {
             button = (
               <EuiButtonEmpty
                 size="xs"
-                onClick={() => this.toggleExpandSpacesGroup(record.spacesIndex)}
+                onClick={() => this.toggleExpandSpacesGroup(record.privilegeIndex)}
               >
                 <FormattedMessage
                   id="xpack.security.management.editRole.spacePrivilegeTable.showNMoreSpacesLink"
@@ -149,7 +145,7 @@ export class PrivilegeSpaceTable extends Component<Props, State> {
             button = (
               <EuiButtonEmpty
                 size="xs"
-                onClick={() => this.toggleExpandSpacesGroup(record.spacesIndex)}
+                onClick={() => this.toggleExpandSpacesGroup(record.privilegeIndex)}
               >
                 <FormattedMessage
                   id="xpack.security.management.editRole.spacePrivilegeTable.showLessSpacesLink"
@@ -161,15 +157,18 @@ export class PrivilegeSpaceTable extends Component<Props, State> {
 
           return (
             <div>
-              {displayedSpaces.map((space: TableSpace) => (
-                <EuiBadge
-                  key={space.id}
-                  {...getExtraBadgeProps(space)}
-                  color={getSpaceColor(space)}
-                >
-                  {space.name}
-                </EuiBadge>
-              ))}
+              <span data-test-subj="spacesColumn">
+                {displayedSpaces.map((space: TableSpace) => (
+                  <EuiBadge
+                    key={space.id}
+                    {...getExtraBadgeProps(space)}
+                    color={getSpaceColor(space)}
+                  >
+                    {space.name}
+                  </EuiBadge>
+                ))}
+              </span>
+
               {button}
             </div>
           );
@@ -178,45 +177,48 @@ export class PrivilegeSpaceTable extends Component<Props, State> {
       {
         field: 'privileges',
         name: 'Privileges',
-        render: (privileges: RoleKibanaPrivilege, record: TableRow) => {
-          const effectivePrivilege = effectivePrivileges[record.spacesIndex];
-          const basePrivilege = effectivePrivilege.base;
-
-          if (effectivePrivilege.reserved != null && effectivePrivilege.reserved.length > 0) {
-            return <PrivilegeDisplay privilege={effectivePrivilege.reserved} />;
-          } else if (record.isGlobal) {
+        render: (privileges: TableRow['privileges'], record: TableRow) => {
+          if (privileges.reserved.length > 0) {
             return (
               <PrivilegeDisplay
-                privilege={
-                  hasAssignedFeaturePrivileges(privileges)
-                    ? CUSTOM_PRIVILEGE_VALUE
-                    : basePrivilege.actualPrivilege
-                }
+                privilege={privileges.reserved}
+                data-test-subj={`privilegeColumn`}
               />
             );
-          } else {
-            const hasNonSupersededCustomizations = Object.keys(privileges.feature).some(
-              featureId => {
-                const featureEffectivePrivilege = effectivePrivilege.feature[featureId];
-                return (
-                  featureEffectivePrivilege &&
-                  featureEffectivePrivilege.directlyAssignedFeaturePrivilegeMorePermissiveThanBase
-                );
-              }
-            );
-
-            const showCustom =
-              hasNonSupersededCustomizations ||
-              (hasAssignedFeaturePrivileges(privileges) &&
-                effectivePrivilege.base.actualPrivilege === NO_PRIVILEGE_VALUE);
+          }
 
-            return (
-              <PrivilegeDisplay
-                explanation={hasNonSupersededCustomizations ? undefined : basePrivilege}
-                privilege={showCustom ? CUSTOM_PRIVILEGE_VALUE : basePrivilege.actualPrivilege}
-              />
+          let icon = <EuiIcon type="empty" size="s" />;
+          if (privilegeCalculator.hasSupersededInheritedPrivileges(record.privilegeIndex)) {
+            icon = (
+              <span data-test-subj="spaceTablePrivilegeSupersededWarning">
+                <EuiIconTip
+                  type="alert"
+                  size="s"
+                  content={
+                    <FormattedMessage
+                      id="xpack.security.management.editRole.spacePrivilegeTable.supersededPrivilegeWarning"
+                      defaultMessage="Privileges are superseded by configured global privilege. View the privilege summary to see effective privileges."
+                    />
+                  }
+                />
+              </span>
             );
           }
+
+          return (
+            <EuiFlexGroup gutterSize="xs" alignItems="center">
+              <EuiFlexItem grow={false}>{icon}</EuiFlexItem>
+              <EuiFlexItem>
+                <PrivilegeDisplay
+                  privilege={
+                    privilegeCalculator.getBasePrivilege(record.privilegeIndex)?.id ??
+                    CUSTOM_PRIVILEGE_VALUE
+                  }
+                  data-test-subj={`privilegeColumn`}
+                />
+              </EuiFlexItem>
+            </EuiFlexGroup>
+          );
         },
       },
     ];
@@ -229,19 +231,16 @@ export class PrivilegeSpaceTable extends Component<Props, State> {
             render: (record: TableRow) => {
               return (
                 <EuiButtonIcon
-                  aria-label={intl.formatMessage(
+                  aria-label={i18n.translate(
+                    'xpack.security.management.editRole.spacePrivilegeTable.editPrivilegesLabel',
                     {
-                      id:
-                        'xpack.security.management.editRole.spacePrivilegeTable.editPrivilegesLabel',
                       defaultMessage: `Edit privileges for the following spaces: {spaceNames}.`,
-                    },
-                    {
-                      spaceNames: record.spaces.map(s => s.name).join(', '),
+                      values: { spaceNames: record.spaces.map(s => s.name).join(', ') },
                     }
                   )}
                   color={'primary'}
                   iconType={'pencil'}
-                  onClick={() => this.props.onEdit(record.spacesIndex)}
+                  onClick={() => this.props.onEdit(record.privilegeIndex)}
                 />
               );
             },
@@ -250,14 +249,11 @@ export class PrivilegeSpaceTable extends Component<Props, State> {
             render: (record: TableRow) => {
               return (
                 <EuiButtonIcon
-                  aria-label={intl.formatMessage(
+                  aria-label={i18n.translate(
+                    'xpack.security.management.editRole.spacePrivilegeTable.deletePrivilegesLabel',
                     {
-                      id:
-                        'xpack.security.management.editRole.spacePrivilegeTable.deletePrivilegesLabel',
                       defaultMessage: `Delete privileges for the following spaces: {spaceNames}.`,
-                    },
-                    {
-                      spaceNames: record.spaces.map(s => s.name).join(', '),
+                      values: { spaceNames: record.spaces.map(s => s.name).join(', ') },
                     }
                   )}
                   color={'danger'}
@@ -294,26 +290,26 @@ export class PrivilegeSpaceTable extends Component<Props, State> {
     });
   };
 
-  private toggleExpandSpacesGroup = (spacesIndex: number) => {
-    if (this.state.expandedSpacesGroups.includes(spacesIndex)) {
+  private toggleExpandSpacesGroup = (privilegeIndex: number) => {
+    if (this.state.expandedSpacesGroups.includes(privilegeIndex)) {
       this.setState({
-        expandedSpacesGroups: this.state.expandedSpacesGroups.filter(i => i !== spacesIndex),
+        expandedSpacesGroups: this.state.expandedSpacesGroups.filter(i => i !== privilegeIndex),
       });
     } else {
       this.setState({
-        expandedSpacesGroups: [...this.state.expandedSpacesGroups, spacesIndex],
+        expandedSpacesGroups: [...this.state.expandedSpacesGroups, privilegeIndex],
       });
     }
   };
 
   private onDeleteSpacePrivilege = (item: TableRow) => {
     const roleCopy = copyRole(this.props.role);
-    roleCopy.kibana.splice(item.spacesIndex, 1);
+    roleCopy.kibana.splice(item.privilegeIndex, 1);
 
     this.props.onChange(roleCopy);
 
     this.setState({
-      expandedSpacesGroups: this.state.expandedSpacesGroups.filter(i => i !== item.spacesIndex),
+      expandedSpacesGroups: this.state.expandedSpacesGroups.filter(i => i !== item.privilegeIndex),
     });
   };
 }
diff --git a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/space_aware_privilege_section/space_aware_privilege_section.test.tsx b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/space_aware_privilege_section/space_aware_privilege_section.test.tsx
index e06d2a4f7dc33..a9bcb5433fcc7 100644
--- a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/space_aware_privilege_section/space_aware_privilege_section.test.tsx
+++ b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/space_aware_privilege_section/space_aware_privilege_section.test.tsx
@@ -6,13 +6,13 @@
 
 import React from 'react';
 import { mountWithIntl, shallowWithIntl } from 'test_utils/enzyme_helpers';
-import { KibanaPrivileges } from '../../../../../../../common/model';
-import { KibanaPrivilegeCalculatorFactory } from '../kibana_privilege_calculator';
 import { RoleValidator } from '../../../validate_role';
-import { PrivilegeMatrix } from './privilege_matrix';
 import { PrivilegeSpaceForm } from './privilege_space_form';
 import { PrivilegeSpaceTable } from './privilege_space_table';
 import { SpaceAwarePrivilegeSection } from './space_aware_privilege_section';
+import { PrivilegeSummary } from '../privilege_summary';
+import { createKibanaPrivileges } from '../../../../__fixtures__/kibana_privileges';
+import { kibanaFeatures } from '../../../../__fixtures__/kibana_features';
 
 const buildProps = (customProps: any = {}) => {
   return {
@@ -42,23 +42,12 @@ const buildProps = (customProps: any = {}) => {
         manage: true,
       },
     },
-    features: [],
+    features: kibanaFeatures,
     editable: true,
     onChange: jest.fn(),
     validator: new RoleValidator(),
-    privilegeCalculatorFactory: new KibanaPrivilegeCalculatorFactory(
-      new KibanaPrivileges({
-        features: {
-          feature1: {
-            all: ['*'],
-            read: ['read'],
-          },
-        },
-        global: {},
-        space: {},
-        reserved: {},
-      })
-    ),
+    kibanaPrivileges: createKibanaPrivileges(kibanaFeatures),
+    canCustomizeSubFeaturePrivileges: true,
     ...customProps,
   };
 };
@@ -80,7 +69,7 @@ describe('<SpaceAwarePrivilegeSection>', () => {
       },
     });
 
-    const wrapper = mountWithIntl(<SpaceAwarePrivilegeSection.WrappedComponent {...props} />);
+    const wrapper = mountWithIntl(<SpaceAwarePrivilegeSection {...props} />);
 
     const table = wrapper.find(PrivilegeSpaceTable);
     expect(table).toHaveLength(1);
@@ -89,13 +78,13 @@ describe('<SpaceAwarePrivilegeSection>', () => {
   it('hides the space table if there are no existing space privileges', () => {
     const props = buildProps();
 
-    const wrapper = mountWithIntl(<SpaceAwarePrivilegeSection.WrappedComponent {...props} />);
+    const wrapper = mountWithIntl(<SpaceAwarePrivilegeSection {...props} />);
 
     const table = wrapper.find(PrivilegeSpaceTable);
     expect(table).toHaveLength(0);
   });
 
-  it('Renders flyout after clicking "Add a privilege" button', () => {
+  it('Renders flyout after clicking "Add space privilege" button', () => {
     const props = buildProps({
       role: {
         elasticsearch: {
@@ -111,7 +100,7 @@ describe('<SpaceAwarePrivilegeSection>', () => {
       },
     });
 
-    const wrapper = mountWithIntl(<SpaceAwarePrivilegeSection.WrappedComponent {...props} />);
+    const wrapper = mountWithIntl(<SpaceAwarePrivilegeSection {...props} />);
     expect(wrapper.find(PrivilegeSpaceForm)).toHaveLength(0);
 
     wrapper.find('button[data-test-subj="addSpacePrivilegeButton"]').simulate('click');
@@ -119,7 +108,7 @@ describe('<SpaceAwarePrivilegeSection>', () => {
     expect(wrapper.find(PrivilegeSpaceForm)).toHaveLength(1);
   });
 
-  it('hides privilege matrix when the role is reserved', () => {
+  it('hides privilege summary when the role is reserved', () => {
     const props = buildProps({
       role: {
         name: '',
@@ -135,8 +124,8 @@ describe('<SpaceAwarePrivilegeSection>', () => {
       },
     });
 
-    const wrapper = mountWithIntl(<SpaceAwarePrivilegeSection.WrappedComponent {...props} />);
-    expect(wrapper.find(PrivilegeMatrix)).toHaveLength(0);
+    const wrapper = mountWithIntl(<SpaceAwarePrivilegeSection {...props} />);
+    expect(wrapper.find(PrivilegeSummary)).toHaveLength(0);
   });
 
   describe('with base privilege set to "read"', () => {
@@ -156,7 +145,7 @@ describe('<SpaceAwarePrivilegeSection>', () => {
         },
       });
 
-      const wrapper = mountWithIntl(<SpaceAwarePrivilegeSection.WrappedComponent {...props} />);
+      const wrapper = mountWithIntl(<SpaceAwarePrivilegeSection {...props} />);
 
       const table = wrapper.find(PrivilegeSpaceTable);
       expect(table).toHaveLength(1);
@@ -183,7 +172,7 @@ describe('<SpaceAwarePrivilegeSection>', () => {
         },
       });
 
-      const wrapper = mountWithIntl(<SpaceAwarePrivilegeSection.WrappedComponent {...props} />);
+      const wrapper = mountWithIntl(<SpaceAwarePrivilegeSection {...props} />);
 
       const table = wrapper.find(PrivilegeSpaceTable);
       expect(table).toHaveLength(1);
@@ -202,7 +191,7 @@ describe('<SpaceAwarePrivilegeSection>', () => {
         },
       });
 
-      const wrapper = shallowWithIntl(<SpaceAwarePrivilegeSection.WrappedComponent {...props} />);
+      const wrapper = shallowWithIntl(<SpaceAwarePrivilegeSection {...props} />);
       expect(wrapper).toMatchSnapshot();
     });
   });
diff --git a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/space_aware_privilege_section/space_aware_privilege_section.tsx b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/space_aware_privilege_section/space_aware_privilege_section.tsx
index a847ccb677485..86b09e5332792 100644
--- a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/space_aware_privilege_section/space_aware_privilege_section.tsx
+++ b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/space_aware_privilege_section/space_aware_privilege_section.tsx
@@ -10,47 +10,49 @@ import {
   EuiFlexGroup,
   EuiFlexItem,
   EuiSpacer,
+  EuiErrorBoundary,
 } from '@elastic/eui';
-import { FormattedMessage, InjectedIntl, injectI18n } from '@kbn/i18n/react';
+import { i18n } from '@kbn/i18n';
+import { FormattedMessage } from '@kbn/i18n/react';
 import _ from 'lodash';
 import React, { Component, Fragment } from 'react';
 import { Capabilities } from 'src/core/public';
 import { Space } from '../../../../../../../../spaces/public';
-import { Feature } from '../../../../../../../../features/public';
-import { KibanaPrivileges, Role, isRoleReserved } from '../../../../../../../common/model';
-import { KibanaPrivilegeCalculatorFactory } from '../kibana_privilege_calculator';
+import { Role, isRoleReserved } from '../../../../../../../common/model';
 import { RoleValidator } from '../../../validate_role';
-import { PrivilegeMatrix } from './privilege_matrix';
-import { PrivilegeSpaceForm } from './privilege_space_form';
 import { PrivilegeSpaceTable } from './privilege_space_table';
+import { PrivilegeSpaceForm } from './privilege_space_form';
+import { PrivilegeFormCalculator } from '../privilege_form_calculator';
+import { PrivilegeSummary } from '../privilege_summary';
+import { KibanaPrivileges } from '../../../../model';
 
 interface Props {
   kibanaPrivileges: KibanaPrivileges;
   role: Role;
-  privilegeCalculatorFactory: KibanaPrivilegeCalculatorFactory;
   spaces: Space[];
   onChange: (role: Role) => void;
   editable: boolean;
+  canCustomizeSubFeaturePrivileges: boolean;
   validator: RoleValidator;
-  intl: InjectedIntl;
   uiCapabilities: Capabilities;
-  features: Feature[];
 }
 
 interface State {
   role: Role | null;
-  editingIndex: number;
+  privilegeIndex: number;
   showSpacePrivilegeEditor: boolean;
   showPrivilegeMatrix: boolean;
 }
 
-class SpaceAwarePrivilegeSectionUI extends Component<Props, State> {
+export class SpaceAwarePrivilegeSection extends Component<Props, State> {
   private globalSpaceEntry: Space = {
     id: '*',
-    name: this.props.intl.formatMessage({
-      id: 'xpack.security.management.editRole.spaceAwarePrivilegeForm.globalSpacesName',
-      defaultMessage: '* Global (all spaces)',
-    }),
+    name: i18n.translate(
+      'xpack.security.management.editRole.spaceAwarePrivilegeForm.globalSpacesName',
+      {
+        defaultMessage: '* Global (all spaces)',
+      }
+    ),
     color: '#D3DAE6',
     initials: '*',
     disabledFeatures: [],
@@ -63,12 +65,12 @@ class SpaceAwarePrivilegeSectionUI extends Component<Props, State> {
       showSpacePrivilegeEditor: false,
       showPrivilegeMatrix: false,
       role: null,
-      editingIndex: -1,
+      privilegeIndex: -1,
     };
   }
 
   public render() {
-    const { uiCapabilities, privilegeCalculatorFactory } = this.props;
+    const { uiCapabilities } = this.props;
 
     if (!uiCapabilities.spaces.manage) {
       return (
@@ -113,22 +115,22 @@ class SpaceAwarePrivilegeSectionUI extends Component<Props, State> {
     }
 
     return (
-      <Fragment>
-        {this.renderKibanaPrivileges()}
-        {this.state.showSpacePrivilegeEditor && (
-          <PrivilegeSpaceForm
-            role={this.props.role}
-            privilegeCalculatorFactory={privilegeCalculatorFactory}
-            kibanaPrivileges={this.props.kibanaPrivileges}
-            features={this.props.features}
-            intl={this.props.intl}
-            onChange={this.onSpacesPrivilegeChange}
-            onCancel={this.onCancelEditPrivileges}
-            spaces={this.getAvailableSpaces(this.state.editingIndex)}
-            editingIndex={this.state.editingIndex}
-          />
-        )}
-      </Fragment>
+      <EuiErrorBoundary>
+        <Fragment>
+          {this.renderKibanaPrivileges()}
+          {this.state.showSpacePrivilegeEditor && (
+            <PrivilegeSpaceForm
+              role={this.props.role}
+              kibanaPrivileges={this.props.kibanaPrivileges}
+              onChange={this.onSpacesPrivilegeChange}
+              onCancel={this.onCancelEditPrivileges}
+              spaces={this.getAvailableSpaces(this.state.privilegeIndex)}
+              privilegeIndex={this.state.privilegeIndex}
+              canCustomizeSubFeaturePrivileges={this.props.canCustomizeSubFeaturePrivileges}
+            />
+          )}
+        </Fragment>
+      </EuiErrorBoundary>
     );
   }
 
@@ -143,10 +145,11 @@ class SpaceAwarePrivilegeSectionUI extends Component<Props, State> {
         <PrivilegeSpaceTable
           role={this.props.role}
           displaySpaces={this.getDisplaySpaces()}
-          privilegeCalculatorFactory={this.props.privilegeCalculatorFactory}
+          privilegeCalculator={
+            new PrivilegeFormCalculator(this.props.kibanaPrivileges, this.props.role)
+          }
           onChange={this.props.onChange}
           onEdit={this.onEditSpacesPrivileges}
-          intl={this.props.intl}
           disabled={!this.props.editable}
         />
       );
@@ -205,14 +208,11 @@ class SpaceAwarePrivilegeSectionUI extends Component<Props, State> {
     }
 
     const viewMatrixButton = (
-      <PrivilegeMatrix
+      <PrivilegeSummary
         role={this.props.role}
-        calculatedPrivileges={this.props.privilegeCalculatorFactory
-          .getInstance(this.props.role)
-          .calculateEffectivePrivileges()}
-        features={this.props.features}
         spaces={this.getDisplaySpaces()}
-        intl={this.props.intl}
+        kibanaPrivileges={this.props.kibanaPrivileges}
+        canCustomizeSubFeaturePrivileges={this.props.canCustomizeSubFeaturePrivileges}
       />
     );
 
@@ -250,18 +250,18 @@ class SpaceAwarePrivilegeSectionUI extends Component<Props, State> {
   private addSpacePrivilege = () => {
     this.setState({
       showSpacePrivilegeEditor: true,
-      editingIndex: -1,
+      privilegeIndex: -1,
     });
   };
 
   private onSpacesPrivilegeChange = (role: Role) => {
-    this.setState({ showSpacePrivilegeEditor: false, editingIndex: -1 });
+    this.setState({ showSpacePrivilegeEditor: false, privilegeIndex: -1 });
     this.props.onChange(role);
   };
 
-  private onEditSpacesPrivileges = (spacesIndex: number) => {
+  private onEditSpacesPrivileges = (privilegeIndex: number) => {
     this.setState({
-      editingIndex: spacesIndex,
+      privilegeIndex,
       showSpacePrivilegeEditor: true,
     });
   };
@@ -270,5 +270,3 @@ class SpaceAwarePrivilegeSectionUI extends Component<Props, State> {
     this.setState({ showSpacePrivilegeEditor: false });
   };
 }
-
-export const SpaceAwarePrivilegeSection = injectI18n(SpaceAwarePrivilegeSectionUI);
diff --git a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/space_aware_privilege_section/space_selector.tsx b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/space_aware_privilege_section/space_selector.tsx
index 1e42a926c51f7..70790f785ad58 100644
--- a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/space_aware_privilege_section/space_selector.tsx
+++ b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/space_aware_privilege_section/space_selector.tsx
@@ -5,9 +5,10 @@
  */
 
 import { EuiComboBox, EuiComboBoxOptionOption, EuiHealth, EuiHighlight } from '@elastic/eui';
-import { InjectedIntl } from '@kbn/i18n/react';
+import { i18n } from '@kbn/i18n';
 import React, { Component } from 'react';
-import { Space, getSpaceColor } from '../../../../../../../../spaces/public';
+import { getSpaceColor } from '../../../../../../../../spaces/public';
+import { Space } from '../../../../../../../../spaces/common/model/space';
 
 const spaceToOption = (space?: Space, currentSelection?: 'global' | 'spaces') => {
   if (!space) {
@@ -32,7 +33,6 @@ interface Props {
   selectedSpaceIds: string[];
   onChange: (spaceIds: string[]) => void;
   disabled?: boolean;
-  intl: InjectedIntl;
 }
 
 export class SpaceSelector extends Component<Props, {}> {
@@ -51,8 +51,7 @@ export class SpaceSelector extends Component<Props, {}> {
     return (
       <EuiComboBox
         data-test-subj={'spaceSelectorComboBox'}
-        aria-label={this.props.intl.formatMessage({
-          id: 'xpack.security.management.editRole.spaceSelectorLabel',
+        aria-label={i18n.translate('xpack.security.management.editRole.spaceSelectorLabel', {
           defaultMessage: 'Spaces',
         })}
         fullWidth
diff --git a/x-pack/plugins/security/public/management/roles/edit_role/spaces_popover_list/spaces_popover_list.test.tsx b/x-pack/plugins/security/public/management/roles/edit_role/spaces_popover_list/spaces_popover_list.test.tsx
new file mode 100644
index 0000000000000..20882864645d3
--- /dev/null
+++ b/x-pack/plugins/security/public/management/roles/edit_role/spaces_popover_list/spaces_popover_list.test.tsx
@@ -0,0 +1,112 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React from 'react';
+import { mountWithIntl } from 'test_utils/enzyme_helpers';
+import { SpacesPopoverList } from '.';
+import {
+  EuiButtonEmpty,
+  EuiContextMenuPanel,
+  EuiContextMenuItem,
+  EuiFieldSearch,
+  EuiPopover,
+} from '@elastic/eui';
+import { SpaceAvatar } from '../../../../../../spaces/public';
+
+const spaces = [
+  {
+    id: 'default',
+    name: 'Default Space',
+    description: 'this is your default space',
+    disabledFeatures: [],
+  },
+  {
+    id: 'space-1',
+    name: 'Space 1',
+    disabledFeatures: [],
+  },
+  {
+    id: 'space-2',
+    name: 'Space 2',
+    disabledFeatures: [],
+  },
+];
+
+describe('SpacesPopoverList', () => {
+  it('renders a button with the provided text', () => {
+    const wrapper = mountWithIntl(<SpacesPopoverList spaces={spaces} buttonText="hello world" />);
+    expect(wrapper.find(EuiButtonEmpty).text()).toEqual('hello world');
+    expect(wrapper.find(EuiContextMenuPanel)).toHaveLength(0);
+  });
+
+  it('clicking the button renders a context menu with the provided spaces', () => {
+    const wrapper = mountWithIntl(<SpacesPopoverList spaces={spaces} buttonText="hello world" />);
+    wrapper.find(EuiButtonEmpty).simulate('click');
+    wrapper.update();
+
+    const menu = wrapper.find(EuiContextMenuPanel);
+    expect(menu).toHaveLength(1);
+
+    const items = menu.find(EuiContextMenuItem);
+    expect(items).toHaveLength(spaces.length);
+
+    spaces.forEach((space, index) => {
+      const spaceAvatar = items.at(index).find(SpaceAvatar);
+      expect(spaceAvatar.props().space).toEqual(space);
+    });
+
+    expect(wrapper.find(EuiFieldSearch)).toHaveLength(0);
+  });
+
+  it('renders a search box when there are 8 or more spaces', () => {
+    const lotsOfSpaces = [1, 2, 3, 4, 5, 6, 7, 8].map(num => ({
+      id: `space-${num}`,
+      name: `Space ${num}`,
+      disabledFeatures: [],
+    }));
+
+    const wrapper = mountWithIntl(
+      <SpacesPopoverList spaces={lotsOfSpaces} buttonText="hello world" />
+    );
+    wrapper.find(EuiButtonEmpty).simulate('click');
+    wrapper.update();
+
+    const menu = wrapper.find(EuiContextMenuPanel).first();
+    const items = menu.find(EuiContextMenuItem);
+    expect(items).toHaveLength(lotsOfSpaces.length);
+
+    const searchField = wrapper.find(EuiFieldSearch);
+    expect(searchField).toHaveLength(1);
+
+    searchField.props().onSearch!('Space 6');
+    wrapper.update();
+    expect(wrapper.find(SpaceAvatar)).toHaveLength(1);
+
+    searchField.props().onSearch!('this does not match');
+    wrapper.update();
+    expect(wrapper.find(SpaceAvatar)).toHaveLength(0);
+
+    const updatedMenu = wrapper.find(EuiContextMenuPanel).first();
+    expect(updatedMenu.text()).toMatchInlineSnapshot(`"Spaces no spaces found "`);
+  });
+
+  it('can close its popover', () => {
+    const wrapper = mountWithIntl(<SpacesPopoverList spaces={spaces} buttonText="hello world" />);
+    wrapper.find(EuiButtonEmpty).simulate('click');
+    wrapper.update();
+
+    expect(wrapper.find(EuiPopover).props().isOpen).toEqual(true);
+
+    wrapper
+      .find(EuiPopover)
+      .props()
+      .closePopover();
+
+    wrapper.update();
+
+    expect(wrapper.find(EuiPopover).props().isOpen).toEqual(false);
+  });
+});
diff --git a/x-pack/plugins/security/public/management/roles/edit_role/spaces_popover_list/spaces_popover_list.tsx b/x-pack/plugins/security/public/management/roles/edit_role/spaces_popover_list/spaces_popover_list.tsx
index f8b2991a844f7..92e42ec811afc 100644
--- a/x-pack/plugins/security/public/management/roles/edit_role/spaces_popover_list/spaces_popover_list.tsx
+++ b/x-pack/plugins/security/public/management/roles/edit_role/spaces_popover_list/spaces_popover_list.tsx
@@ -12,14 +12,14 @@ import {
   EuiPopover,
   EuiText,
 } from '@elastic/eui';
-import { FormattedMessage, InjectedIntl } from '@kbn/i18n/react';
+import { FormattedMessage } from '@kbn/i18n/react';
+import { i18n } from '@kbn/i18n';
 import React, { Component } from 'react';
 import { Space, SpaceAvatar } from '../../../../../../spaces/public';
 import { SPACE_SEARCH_COUNT_THRESHOLD } from '../../../../../../spaces/common';
 
 interface Props {
   spaces: Space[];
-  intl: InjectedIntl;
   buttonText: string;
 }
 
@@ -59,15 +59,13 @@ export class SpacesPopoverList extends Component<Props, State> {
   }
 
   private getMenuPanel = () => {
-    const { intl } = this.props;
     const { searchTerm } = this.state;
 
     const items = this.getVisibleSpaces(searchTerm).map(this.renderSpaceMenuItem);
 
     const panelProps = {
       className: 'spcMenu',
-      title: intl.formatMessage({
-        id: 'xpack.security.management.editRole.spacesPopoverList.popoverTitle',
+      title: i18n.translate('xpack.security.management.editRole.spacesPopoverList.popoverTitle', {
         defaultMessage: 'Spaces',
       }),
       watchedItemProps: ['data-search-term'],
@@ -141,15 +139,16 @@ export class SpacesPopoverList extends Component<Props, State> {
   };
 
   private renderSearchField = () => {
-    const { intl } = this.props;
     return (
       <div key="manageSpacesSearchField" className="spcMenu__searchFieldWrapper">
         {
           <EuiFieldSearch
-            placeholder={intl.formatMessage({
-              id: 'xpack.security.management.editRole.spacesPopoverList.findSpacePlaceholder',
-              defaultMessage: 'Find a space',
-            })}
+            placeholder={i18n.translate(
+              'xpack.security.management.editRole.spacesPopoverList.findSpacePlaceholder',
+              {
+                defaultMessage: 'Find a space',
+              }
+            )}
             incremental={true}
             onSearch={this.onSearch}
             onKeyDown={this.onSearchKeyDown}
diff --git a/x-pack/plugins/security/public/management/roles/model/index.ts b/x-pack/plugins/security/public/management/roles/model/index.ts
new file mode 100644
index 0000000000000..8000300f57e10
--- /dev/null
+++ b/x-pack/plugins/security/public/management/roles/model/index.ts
@@ -0,0 +1,14 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+export { SecuredFeature } from './secured_feature';
+export { SecuredSubFeature } from './secured_sub_feature';
+export { SubFeaturePrivilegeGroup } from './sub_feature_privilege_group';
+export { SubFeaturePrivilege } from './sub_feature_privilege';
+export { PrimaryFeaturePrivilege } from './primary_feature_privilege';
+export { KibanaPrivileges } from './kibana_privileges';
+export { KibanaPrivilege } from './kibana_privilege';
+export { PrivilegeCollection } from './privilege_collection';
diff --git a/x-pack/plugins/security/public/management/roles/model/kibana_privilege.ts b/x-pack/plugins/security/public/management/roles/model/kibana_privilege.ts
new file mode 100644
index 0000000000000..7c21a4b5c0ee6
--- /dev/null
+++ b/x-pack/plugins/security/public/management/roles/model/kibana_privilege.ts
@@ -0,0 +1,31 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import _ from 'lodash';
+
+export class KibanaPrivilege {
+  constructor(public readonly id: string, public readonly actions: string[] = []) {}
+
+  public get name() {
+    return _.capitalize(this.id);
+  }
+
+  public grantsPrivilege(candidatePrivilege: KibanaPrivilege) {
+    return this.checkActions(this.actions, candidatePrivilege.actions).hasAllRequested;
+  }
+
+  private checkActions(knownActions: string[], candidateActions: string[]) {
+    const missing = candidateActions.filter(action => !knownActions.includes(action));
+
+    const hasAllRequested =
+      knownActions.length > 0 && candidateActions.length > 0 && missing.length === 0;
+
+    return {
+      missing,
+      hasAllRequested,
+    };
+  }
+}
diff --git a/x-pack/plugins/security/public/management/roles/model/kibana_privileges.test.ts b/x-pack/plugins/security/public/management/roles/model/kibana_privileges.test.ts
new file mode 100644
index 0000000000000..a1f1e36e8df86
--- /dev/null
+++ b/x-pack/plugins/security/public/management/roles/model/kibana_privileges.test.ts
@@ -0,0 +1,144 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { createRawKibanaPrivileges } from '../__fixtures__/kibana_privileges';
+import { kibanaFeatures } from '../__fixtures__/kibana_features';
+import { KibanaPrivileges } from './kibana_privileges';
+import { RoleKibanaPrivilege } from '../../../../common/model';
+import { KibanaPrivilege } from './kibana_privilege';
+
+describe('KibanaPrivileges', () => {
+  describe('#getBasePrivileges', () => {
+    it('returns the space base privileges for a non-global entry', () => {
+      const rawPrivileges = createRawKibanaPrivileges(kibanaFeatures);
+      const kibanaPrivileges = new KibanaPrivileges(rawPrivileges, kibanaFeatures);
+
+      const entry: RoleKibanaPrivilege = {
+        base: [],
+        feature: {},
+        spaces: ['foo'],
+      };
+
+      const basePrivileges = kibanaPrivileges.getBasePrivileges(entry);
+
+      const expectedPrivileges = rawPrivileges.space;
+
+      expect(basePrivileges).toHaveLength(2);
+      expect(basePrivileges[0]).toMatchObject({
+        id: 'all',
+        actions: expectedPrivileges.all,
+      });
+      expect(basePrivileges[1]).toMatchObject({
+        id: 'read',
+        actions: expectedPrivileges.read,
+      });
+    });
+
+    it('returns the global base privileges for a global entry', () => {
+      const rawPrivileges = createRawKibanaPrivileges(kibanaFeatures);
+      const kibanaPrivileges = new KibanaPrivileges(rawPrivileges, kibanaFeatures);
+
+      const entry: RoleKibanaPrivilege = {
+        base: [],
+        feature: {},
+        spaces: ['*'],
+      };
+
+      const basePrivileges = kibanaPrivileges.getBasePrivileges(entry);
+
+      const expectedPrivileges = rawPrivileges.global;
+
+      expect(basePrivileges).toHaveLength(2);
+      expect(basePrivileges[0]).toMatchObject({
+        id: 'all',
+        actions: expectedPrivileges.all,
+      });
+      expect(basePrivileges[1]).toMatchObject({
+        id: 'read',
+        actions: expectedPrivileges.read,
+      });
+    });
+  });
+
+  describe('#createCollectionFromRoleKibanaPrivileges', () => {
+    it('creates a collection from a role with no privileges assigned', () => {
+      const rawPrivileges = createRawKibanaPrivileges(kibanaFeatures);
+      const kibanaPrivileges = new KibanaPrivileges(rawPrivileges, kibanaFeatures);
+
+      const assignedPrivileges: RoleKibanaPrivilege[] = [];
+      kibanaPrivileges.createCollectionFromRoleKibanaPrivileges(assignedPrivileges);
+    });
+
+    it('creates a collection ignoring unknown privileges', () => {
+      const rawPrivileges = createRawKibanaPrivileges(kibanaFeatures);
+      const kibanaPrivileges = new KibanaPrivileges(rawPrivileges, kibanaFeatures);
+
+      const assignedPrivileges: RoleKibanaPrivilege[] = [
+        {
+          base: ['read', 'some-unknown-base-privilege'],
+          feature: {},
+          spaces: ['*'],
+        },
+        {
+          base: [],
+          feature: {
+            with_sub_features: ['read', 'cool_all', 'some-unknown-feature-privilege'],
+            some_unknown_feature: ['all'],
+          },
+          spaces: ['foo'],
+        },
+      ];
+      kibanaPrivileges.createCollectionFromRoleKibanaPrivileges(assignedPrivileges);
+    });
+
+    it('creates a collection using all assigned privileges, and only the assigned privileges', () => {
+      const rawPrivileges = createRawKibanaPrivileges(kibanaFeatures);
+      const kibanaPrivileges = new KibanaPrivileges(rawPrivileges, kibanaFeatures);
+
+      const assignedPrivileges: RoleKibanaPrivilege[] = [
+        {
+          base: ['read'],
+          feature: {},
+          spaces: ['*'],
+        },
+        {
+          base: [],
+          feature: {
+            with_sub_features: ['read', 'cool_all'],
+          },
+          spaces: ['foo'],
+        },
+      ];
+      const collection = kibanaPrivileges.createCollectionFromRoleKibanaPrivileges(
+        assignedPrivileges
+      );
+
+      expect(
+        collection.grantsPrivilege(
+          new KibanaPrivilege('test', [...rawPrivileges.features.with_excluded_sub_features.read])
+        )
+      ).toEqual(true);
+
+      expect(
+        collection.grantsPrivilege(
+          new KibanaPrivilege('test', [...rawPrivileges.features.with_excluded_sub_features.all])
+        )
+      ).toEqual(false);
+
+      expect(
+        collection.grantsPrivilege(
+          new KibanaPrivilege('test', [...rawPrivileges.features.with_sub_features.cool_all])
+        )
+      ).toEqual(true);
+
+      expect(
+        collection.grantsPrivilege(
+          new KibanaPrivilege('test', [...rawPrivileges.features.with_sub_features.cool_toggle_1])
+        )
+      ).toEqual(false);
+    });
+  });
+});
diff --git a/x-pack/plugins/security/public/management/roles/model/kibana_privileges.ts b/x-pack/plugins/security/public/management/roles/model/kibana_privileges.ts
new file mode 100644
index 0000000000000..d8d75e90847e3
--- /dev/null
+++ b/x-pack/plugins/security/public/management/roles/model/kibana_privileges.ts
@@ -0,0 +1,86 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { RawKibanaPrivileges, RoleKibanaPrivilege } from '../../../../common/model';
+import { KibanaPrivilege } from './kibana_privilege';
+import { PrivilegeCollection } from './privilege_collection';
+import { SecuredFeature } from './secured_feature';
+import { Feature } from '../../../../../features/common';
+import { isGlobalPrivilegeDefinition } from '../edit_role/privilege_utils';
+
+function toBasePrivilege(entry: [string, string[]]): [string, KibanaPrivilege] {
+  const [privilegeId, actions] = entry;
+  return [privilegeId, new KibanaPrivilege(privilegeId, actions)];
+}
+
+function recordsToBasePrivilegeMap(
+  record: Record<string, string[]>
+): ReadonlyMap<string, KibanaPrivilege> {
+  return new Map(Object.entries(record).map(entry => toBasePrivilege(entry)));
+}
+
+export class KibanaPrivileges {
+  private global: ReadonlyMap<string, KibanaPrivilege>;
+
+  private spaces: ReadonlyMap<string, KibanaPrivilege>;
+
+  private feature: ReadonlyMap<string, SecuredFeature>;
+
+  constructor(rawKibanaPrivileges: RawKibanaPrivileges, features: Feature[]) {
+    this.global = recordsToBasePrivilegeMap(rawKibanaPrivileges.global);
+    this.spaces = recordsToBasePrivilegeMap(rawKibanaPrivileges.space);
+    this.feature = new Map(
+      features.map(feature => {
+        const rawPrivs = rawKibanaPrivileges.features[feature.id];
+        return [feature.id, new SecuredFeature(feature.toRaw(), rawPrivs)];
+      })
+    );
+  }
+
+  public getBasePrivileges(entry: RoleKibanaPrivilege) {
+    if (isGlobalPrivilegeDefinition(entry)) {
+      return Array.from(this.global.values());
+    }
+    return Array.from(this.spaces.values());
+  }
+
+  public getSecuredFeature(featureId: string) {
+    return this.feature.get(featureId)!;
+  }
+
+  public getSecuredFeatures() {
+    return Array.from(this.feature.values());
+  }
+
+  public createCollectionFromRoleKibanaPrivileges(roleKibanaPrivileges: RoleKibanaPrivilege[]) {
+    const filterAssigned = (assignedPrivileges: string[]) => (privilege: KibanaPrivilege) =>
+      assignedPrivileges.includes(privilege.id);
+
+    const privileges: KibanaPrivilege[] = roleKibanaPrivileges
+      .map(entry => {
+        const assignedBasePrivileges = this.getBasePrivileges(entry).filter(
+          filterAssigned(entry.base)
+        );
+
+        const assignedFeaturePrivileges: KibanaPrivilege[][] = Object.entries(entry.feature).map(
+          ([featureId, assignedFeaturePrivs]) => {
+            return this.getFeaturePrivileges(featureId).filter(
+              filterAssigned(assignedFeaturePrivs)
+            );
+          }
+        );
+
+        return [assignedBasePrivileges, assignedFeaturePrivileges].flat<KibanaPrivilege>(2);
+      })
+      .flat<KibanaPrivilege>();
+
+    return new PrivilegeCollection(privileges);
+  }
+
+  private getFeaturePrivileges(featureId: string) {
+    return this.getSecuredFeature(featureId)?.getAllPrivileges() ?? [];
+  }
+}
diff --git a/x-pack/plugins/security/public/management/roles/model/primary_feature_privilege.ts b/x-pack/plugins/security/public/management/roles/model/primary_feature_privilege.ts
new file mode 100644
index 0000000000000..9ed460fe734ef
--- /dev/null
+++ b/x-pack/plugins/security/public/management/roles/model/primary_feature_privilege.ts
@@ -0,0 +1,29 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { KibanaPrivilege } from './kibana_privilege';
+import { FeatureKibanaPrivileges } from '../../../../../features/public';
+
+export class PrimaryFeaturePrivilege extends KibanaPrivilege {
+  constructor(
+    id: string,
+    protected readonly config: FeatureKibanaPrivileges,
+    public readonly actions: string[] = []
+  ) {
+    super(id, actions);
+  }
+
+  public isMinimalFeaturePrivilege() {
+    return this.id.startsWith('minimal_');
+  }
+
+  public getMinimalPrivilegeId() {
+    if (this.isMinimalFeaturePrivilege()) {
+      return this.id;
+    }
+    return `minimal_${this.id}`;
+  }
+}
diff --git a/x-pack/plugins/security/public/management/roles/model/privilege_collection.test.ts b/x-pack/plugins/security/public/management/roles/model/privilege_collection.test.ts
new file mode 100644
index 0000000000000..6b1c3785721b3
--- /dev/null
+++ b/x-pack/plugins/security/public/management/roles/model/privilege_collection.test.ts
@@ -0,0 +1,66 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { KibanaPrivilege } from './kibana_privilege';
+import { PrivilegeCollection } from './privilege_collection';
+
+describe('PrivilegeCollection', () => {
+  describe('#grantsPrivilege', () => {
+    it('returns true when the collection contains the same privilege being tested', () => {
+      const privilege = new KibanaPrivilege('some-privilege', ['action:foo', 'action:bar']);
+      const collection = new PrivilegeCollection([privilege]);
+
+      expect(collection.grantsPrivilege(privilege)).toEqual(true);
+    });
+
+    it('returns false when a non-empty collection tests an empty privilege', () => {
+      const privilege = new KibanaPrivilege('some-privilege', ['action:foo', 'action:bar']);
+      const collection = new PrivilegeCollection([privilege]);
+
+      expect(collection.grantsPrivilege(new KibanaPrivilege('test', []))).toEqual(false);
+    });
+
+    it('returns true for collections comprised of multiple privileges, with actions spanning them', () => {
+      const collection = new PrivilegeCollection([
+        new KibanaPrivilege('privilege1', ['action:foo', 'action:bar']),
+        new KibanaPrivilege('privilege1', ['action:baz']),
+      ]);
+
+      expect(
+        collection.grantsPrivilege(
+          new KibanaPrivilege('test', ['action:foo', 'action:bar', 'action:baz'])
+        )
+      ).toEqual(true);
+    });
+
+    it('returns false for collections which do not contain all necessary actions', () => {
+      const collection = new PrivilegeCollection([
+        new KibanaPrivilege('privilege1', ['action:foo', 'action:bar']),
+        new KibanaPrivilege('privilege1', ['action:baz']),
+      ]);
+
+      expect(
+        collection.grantsPrivilege(
+          new KibanaPrivilege('test', ['action:foo', 'action:bar', 'action:baz', 'actions:secret'])
+        )
+      ).toEqual(false);
+    });
+
+    it('returns false for collections which contain no privileges', () => {
+      const collection = new PrivilegeCollection([]);
+
+      expect(collection.grantsPrivilege(new KibanaPrivilege('test', ['action:foo']))).toEqual(
+        false
+      );
+    });
+
+    it('returns false for collections which contain no privileges, even if the requested privilege has no actions', () => {
+      const collection = new PrivilegeCollection([]);
+
+      expect(collection.grantsPrivilege(new KibanaPrivilege('test', []))).toEqual(false);
+    });
+  });
+});
diff --git a/x-pack/plugins/security/public/management/roles/model/privilege_collection.ts b/x-pack/plugins/security/public/management/roles/model/privilege_collection.ts
new file mode 100644
index 0000000000000..cbbd22857666e
--- /dev/null
+++ b/x-pack/plugins/security/public/management/roles/model/privilege_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 { KibanaPrivilege } from './kibana_privilege';
+
+export class PrivilegeCollection {
+  private actions: ReadonlySet<string>;
+
+  constructor(privileges: KibanaPrivilege[]) {
+    this.actions = new Set(
+      privileges.reduce((acc, priv) => [...acc, ...priv.actions], [] as string[])
+    );
+  }
+
+  public grantsPrivilege(privilege: KibanaPrivilege) {
+    return this.checkActions(this.actions, privilege.actions).hasAllRequested;
+  }
+
+  private checkActions(knownActions: ReadonlySet<string>, candidateActions: string[]) {
+    const missing = candidateActions.filter(action => !knownActions.has(action));
+
+    const hasAllRequested =
+      knownActions.size > 0 && candidateActions.length > 0 && missing.length === 0;
+
+    return {
+      missing,
+      hasAllRequested,
+    };
+  }
+}
diff --git a/x-pack/plugins/security/public/management/roles/model/secured_feature.ts b/x-pack/plugins/security/public/management/roles/model/secured_feature.ts
new file mode 100644
index 0000000000000..7fc466a70b984
--- /dev/null
+++ b/x-pack/plugins/security/public/management/roles/model/secured_feature.ts
@@ -0,0 +1,77 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { Feature, FeatureConfig } from '../../../../../features/common';
+import { PrimaryFeaturePrivilege } from './primary_feature_privilege';
+import { SecuredSubFeature } from './secured_sub_feature';
+import { SubFeaturePrivilege } from './sub_feature_privilege';
+
+export class SecuredFeature extends Feature {
+  private readonly primaryFeaturePrivileges: PrimaryFeaturePrivilege[];
+
+  private readonly minimalPrimaryFeaturePrivileges: PrimaryFeaturePrivilege[];
+
+  private readonly subFeaturePrivileges: SubFeaturePrivilege[];
+
+  private readonly securedSubFeatures: SecuredSubFeature[];
+
+  constructor(config: FeatureConfig, actionMapping: { [privilegeId: string]: string[] } = {}) {
+    super(config);
+    this.primaryFeaturePrivileges = Object.entries(this.config.privileges || {}).map(
+      ([id, privilege]) => new PrimaryFeaturePrivilege(id, privilege, actionMapping[id])
+    );
+
+    if (this.config.subFeatures?.length ?? 0 > 0) {
+      this.minimalPrimaryFeaturePrivileges = Object.entries(this.config.privileges || {}).map(
+        ([id, privilege]) =>
+          new PrimaryFeaturePrivilege(`minimal_${id}`, privilege, actionMapping[`minimal_${id}`])
+      );
+    } else {
+      this.minimalPrimaryFeaturePrivileges = [];
+    }
+
+    this.securedSubFeatures =
+      this.config.subFeatures?.map(sf => new SecuredSubFeature(sf, actionMapping)) ?? [];
+
+    this.subFeaturePrivileges = this.securedSubFeatures.reduce((acc, subFeature) => {
+      return [...acc, ...subFeature.privilegeIterator()];
+    }, [] as SubFeaturePrivilege[]);
+  }
+
+  public getPrivilegesTooltip() {
+    return this.config.privilegesTooltip;
+  }
+
+  public getAllPrivileges() {
+    return [
+      ...this.primaryFeaturePrivileges,
+      ...this.minimalPrimaryFeaturePrivileges,
+      ...this.subFeaturePrivileges,
+    ];
+  }
+
+  public getPrimaryFeaturePrivileges(
+    { includeMinimalFeaturePrivileges }: { includeMinimalFeaturePrivileges: boolean } = {
+      includeMinimalFeaturePrivileges: false,
+    }
+  ) {
+    return includeMinimalFeaturePrivileges
+      ? [this.primaryFeaturePrivileges, this.minimalPrimaryFeaturePrivileges].flat()
+      : [...this.primaryFeaturePrivileges];
+  }
+
+  public getMinimalFeaturePrivileges() {
+    return [...this.minimalPrimaryFeaturePrivileges];
+  }
+
+  public getSubFeaturePrivileges() {
+    return [...this.subFeaturePrivileges];
+  }
+
+  public getSubFeatures() {
+    return [...this.securedSubFeatures];
+  }
+}
diff --git a/x-pack/plugins/security/public/management/roles/model/secured_sub_feature.ts b/x-pack/plugins/security/public/management/roles/model/secured_sub_feature.ts
new file mode 100644
index 0000000000000..3d69e5e709bb0
--- /dev/null
+++ b/x-pack/plugins/security/public/management/roles/model/secured_sub_feature.ts
@@ -0,0 +1,41 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { SubFeature, SubFeatureConfig } from '../../../../../features/common';
+import { SubFeaturePrivilege } from './sub_feature_privilege';
+import { SubFeaturePrivilegeGroup } from './sub_feature_privilege_group';
+
+export class SecuredSubFeature extends SubFeature {
+  public readonly privileges: SubFeaturePrivilege[];
+
+  constructor(
+    config: SubFeatureConfig,
+    private readonly actionMapping: { [privilegeId: string]: string[] } = {}
+  ) {
+    super(config);
+
+    this.privileges = [];
+    for (const privilege of this.privilegeIterator()) {
+      this.privileges.push(privilege);
+    }
+  }
+
+  public getPrivilegeGroups() {
+    return this.privilegeGroups.map(pg => new SubFeaturePrivilegeGroup(pg, this.actionMapping));
+  }
+
+  public *privilegeIterator({
+    predicate = () => true,
+  }: {
+    predicate?: (privilege: SubFeaturePrivilege, feature: SecuredSubFeature) => boolean;
+  } = {}): IterableIterator<SubFeaturePrivilege> {
+    for (const group of this.privilegeGroups) {
+      yield* group.privileges
+        .map(gp => new SubFeaturePrivilege(gp, this.actionMapping[gp.id]))
+        .filter(privilege => predicate(privilege, this));
+    }
+  }
+}
diff --git a/x-pack/plugins/security/public/management/roles/model/sub_feature_privilege.ts b/x-pack/plugins/security/public/management/roles/model/sub_feature_privilege.ts
new file mode 100644
index 0000000000000..e149a59e12edf
--- /dev/null
+++ b/x-pack/plugins/security/public/management/roles/model/sub_feature_privilege.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 { SubFeaturePrivilegeConfig } from '../../../../../features/public';
+import { KibanaPrivilege } from './kibana_privilege';
+
+export class SubFeaturePrivilege extends KibanaPrivilege {
+  constructor(
+    protected readonly subPrivilegeConfig: SubFeaturePrivilegeConfig,
+    public readonly actions: string[] = []
+  ) {
+    super(subPrivilegeConfig.id, actions);
+  }
+
+  public get name() {
+    return this.subPrivilegeConfig.name;
+  }
+}
diff --git a/x-pack/plugins/security/public/management/roles/model/sub_feature_privilege_group.ts b/x-pack/plugins/security/public/management/roles/model/sub_feature_privilege_group.ts
new file mode 100644
index 0000000000000..b437649236e27
--- /dev/null
+++ b/x-pack/plugins/security/public/management/roles/model/sub_feature_privilege_group.ts
@@ -0,0 +1,25 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { SubFeaturePrivilegeGroupConfig } from '../../../../../features/common';
+import { SubFeaturePrivilege } from './sub_feature_privilege';
+
+export class SubFeaturePrivilegeGroup {
+  constructor(
+    private readonly config: SubFeaturePrivilegeGroupConfig,
+    private readonly actionMapping: { [privilegeId: string]: string[] } = {}
+  ) {}
+
+  public get groupType() {
+    return this.config.groupType;
+  }
+
+  public get privileges() {
+    return this.config.privileges.map(
+      p => new SubFeaturePrivilege(p, this.actionMapping[p.id] || [])
+    );
+  }
+}
diff --git a/x-pack/plugins/security/public/management/roles/roles_management_app.test.tsx b/x-pack/plugins/security/public/management/roles/roles_management_app.test.tsx
index 5936409eb6e8b..96051dbd7fa56 100644
--- a/x-pack/plugins/security/public/management/roles/roles_management_app.test.tsx
+++ b/x-pack/plugins/security/public/management/roles/roles_management_app.test.tsx
@@ -17,17 +17,22 @@ jest.mock('./edit_role', () => ({
 import { rolesManagementApp } from './roles_management_app';
 
 import { coreMock } from '../../../../../../src/core/public/mocks';
+import { featuresPluginMock } from '../../../../features/public/mocks';
 
 async function mountApp(basePath: string) {
   const { fatalErrors } = coreMock.createSetup();
   const container = document.createElement('div');
   const setBreadcrumbs = jest.fn();
 
+  const featuresStart = featuresPluginMock.createStart();
+
   const unmount = await rolesManagementApp
     .create({
       license: licenseMock.create(),
       fatalErrors,
-      getStartServices: jest.fn().mockResolvedValue([coreMock.createStart(), { data: {} }]),
+      getStartServices: jest
+        .fn()
+        .mockResolvedValue([coreMock.createStart(), { data: {}, features: featuresStart }]),
     })
     .mount({ basePath, element: container, setBreadcrumbs });
 
diff --git a/x-pack/plugins/security/public/management/roles/roles_management_app.tsx b/x-pack/plugins/security/public/management/roles/roles_management_app.tsx
index 4265cac22ece0..e1a10fdc2b8c3 100644
--- a/x-pack/plugins/security/public/management/roles/roles_management_app.tsx
+++ b/x-pack/plugins/security/public/management/roles/roles_management_app.tsx
@@ -36,7 +36,7 @@ export const rolesManagementApp = Object.freeze({
       async mount({ basePath, element, setBreadcrumbs }) {
         const [
           { application, docLinks, http, i18n: i18nStart, injectedMetadata, notifications },
-          { data },
+          { data, features },
         ] = await getStartServices();
 
         const rolesBreadcrumbs = [
@@ -77,6 +77,7 @@ export const rolesManagementApp = Object.freeze({
               userAPIClient={new UserAPIClient(http)}
               indicesAPIClient={new IndicesAPIClient(http)}
               privilegesAPIClient={new PrivilegesAPIClient(http)}
+              getFeatures={features.getFeatures}
               http={http}
               notifications={notifications}
               fatalErrors={fatalErrors}
diff --git a/x-pack/plugins/security/public/plugin.test.tsx b/x-pack/plugins/security/public/plugin.test.tsx
index 3d0ef3b2cabc7..122b26378d22b 100644
--- a/x-pack/plugins/security/public/plugin.test.tsx
+++ b/x-pack/plugins/security/public/plugin.test.tsx
@@ -15,6 +15,7 @@ import { coreMock } from '../../../../src/core/public/mocks';
 import { managementPluginMock } from '../../../../src/plugins/management/public/mocks';
 import { licensingMock } from '../../licensing/public/mocks';
 import { ManagementService } from './management';
+import { FeaturesPluginStart } from '../../features/public';
 
 describe('Security Plugin', () => {
   beforeAll(() => {
@@ -86,6 +87,7 @@ describe('Security Plugin', () => {
       expect(
         plugin.start(coreMock.createStart({ basePath: '/some-base-path' }), {
           data: {} as DataPublicPluginStart,
+          features: {} as FeaturesPluginStart,
         })
       ).toBeUndefined();
     });
@@ -110,6 +112,7 @@ describe('Security Plugin', () => {
 
       plugin.start(coreMock.createStart({ basePath: '/some-base-path' }), {
         data: {} as DataPublicPluginStart,
+        features: {} as FeaturesPluginStart,
         management: managementStartMock,
       });
 
@@ -139,6 +142,7 @@ describe('Security Plugin', () => {
 
       plugin.start(coreMock.createStart({ basePath: '/some-base-path' }), {
         data: {} as DataPublicPluginStart,
+        features: {} as FeaturesPluginStart,
       });
 
       expect(() => plugin.stop()).not.toThrow();
diff --git a/x-pack/plugins/security/public/plugin.tsx b/x-pack/plugins/security/public/plugin.tsx
index dcd90b1738f10..38ef552e75a9e 100644
--- a/x-pack/plugins/security/public/plugin.tsx
+++ b/x-pack/plugins/security/public/plugin.tsx
@@ -11,6 +11,7 @@ import {
   Plugin,
   PluginInitializerContext,
 } from '../../../../src/core/public';
+import { FeaturesPluginStart } from '../../features/public';
 import { DataPublicPluginStart } from '../../../../src/plugins/data/public';
 import {
   FeatureCatalogueCategory,
@@ -40,6 +41,7 @@ export interface PluginSetupDependencies {
 
 export interface PluginStartDependencies {
   data: DataPublicPluginStart;
+  features: FeaturesPluginStart;
   management?: ManagementStart;
 }
 
diff --git a/x-pack/plugins/security/server/authorization/actions/actions.ts b/x-pack/plugins/security/server/authorization/actions/actions.ts
index 4bf7a41550cc6..00293e88abe76 100644
--- a/x-pack/plugins/security/server/authorization/actions/actions.ts
+++ b/x-pack/plugins/security/server/authorization/actions/actions.ts
@@ -15,13 +15,6 @@ import { UIActions } from './ui';
  * by the various `checkPrivilegesWithRequest` derivatives
  */
 export class Actions {
-  /**
-   * The allHack action is used to differentiate the `all` privilege from the `read` privilege
-   * for those applications which register the same set of actions for both privileges. This is a
-   * temporary hack until we remove this assumption in the role management UI
-   */
-  public readonly allHack = 'allHack:';
-
   public readonly api = new ApiActions(this.versionNumber);
 
   public readonly app = new AppActions(this.versionNumber);
diff --git a/x-pack/plugins/security/server/authorization/actions/api.test.ts b/x-pack/plugins/security/server/authorization/actions/api.test.ts
index 60a42ba6a78a2..d6e7a5d242d49 100644
--- a/x-pack/plugins/security/server/authorization/actions/api.test.ts
+++ b/x-pack/plugins/security/server/authorization/actions/api.test.ts
@@ -8,13 +8,6 @@ import { ApiActions } from './api';
 
 const version = '1.0.0-zeta1';
 
-describe('#all', () => {
-  test('returns `api:${version}:*`', () => {
-    const apiActions = new ApiActions(version);
-    expect(apiActions.all).toBe('api:1.0.0-zeta1:*');
-  });
-});
-
 describe('#get', () => {
   [null, undefined, '', 1, true, {}].forEach((operation: any) => {
     test(`operation of ${JSON.stringify(operation)} throws error`, () => {
diff --git a/x-pack/plugins/security/server/authorization/actions/api.ts b/x-pack/plugins/security/server/authorization/actions/api.ts
index 35e614e7a03d4..60b135acc15ef 100644
--- a/x-pack/plugins/security/server/authorization/actions/api.ts
+++ b/x-pack/plugins/security/server/authorization/actions/api.ts
@@ -12,10 +12,6 @@ export class ApiActions {
     this.prefix = `api:${versionNumber}:`;
   }
 
-  public get all(): string {
-    return `${this.prefix}*`;
-  }
-
   public get(operation: string) {
     if (!operation || !isString(operation)) {
       throw new Error('operation is required and must be a string');
diff --git a/x-pack/plugins/security/server/authorization/actions/app.test.ts b/x-pack/plugins/security/server/authorization/actions/app.test.ts
index a696fd8693997..74c372a0699a2 100644
--- a/x-pack/plugins/security/server/authorization/actions/app.test.ts
+++ b/x-pack/plugins/security/server/authorization/actions/app.test.ts
@@ -8,13 +8,6 @@ import { AppActions } from './app';
 
 const version = '1.0.0-zeta1';
 
-describe('#all', () => {
-  test('returns `app:${version}:*`', () => {
-    const appActions = new AppActions(version);
-    expect(appActions.all).toBe('app:1.0.0-zeta1:*');
-  });
-});
-
 describe('#get', () => {
   [null, undefined, '', 1, true, {}].forEach((appid: any) => {
     test(`appId of ${JSON.stringify(appid)} throws error`, () => {
diff --git a/x-pack/plugins/security/server/authorization/actions/app.ts b/x-pack/plugins/security/server/authorization/actions/app.ts
index ed0854e8a805b..227c658619175 100644
--- a/x-pack/plugins/security/server/authorization/actions/app.ts
+++ b/x-pack/plugins/security/server/authorization/actions/app.ts
@@ -12,10 +12,6 @@ export class AppActions {
     this.prefix = `app:${versionNumber}:`;
   }
 
-  public get all(): string {
-    return `${this.prefix}*`;
-  }
-
   public get(appId: string) {
     if (!appId || !isString(appId)) {
       throw new Error('appId is required and must be a string');
diff --git a/x-pack/plugins/security/server/authorization/actions/saved_object.test.ts b/x-pack/plugins/security/server/authorization/actions/saved_object.test.ts
index 5e5da7233d93e..9e8bfb6ad795f 100644
--- a/x-pack/plugins/security/server/authorization/actions/saved_object.test.ts
+++ b/x-pack/plugins/security/server/authorization/actions/saved_object.test.ts
@@ -8,13 +8,6 @@ import { SavedObjectActions } from './saved_object';
 
 const version = '1.0.0-zeta1';
 
-describe('#all', () => {
-  test(`returns saved_object:*`, () => {
-    const savedObjectActions = new SavedObjectActions(version);
-    expect(savedObjectActions.all).toBe('saved_object:1.0.0-zeta1:*');
-  });
-});
-
 describe('#get', () => {
   [null, undefined, '', 1, true, {}].forEach((type: any) => {
     test(`type of ${JSON.stringify(type)} throws error`, () => {
diff --git a/x-pack/plugins/security/server/authorization/actions/saved_object.ts b/x-pack/plugins/security/server/authorization/actions/saved_object.ts
index 4a0bc7cda1b8f..e3a02d3807399 100644
--- a/x-pack/plugins/security/server/authorization/actions/saved_object.ts
+++ b/x-pack/plugins/security/server/authorization/actions/saved_object.ts
@@ -13,10 +13,6 @@ export class SavedObjectActions {
     this.prefix = `saved_object:${versionNumber}:`;
   }
 
-  public get all(): string {
-    return `${this.prefix}*`;
-  }
-
   public get(type: string, operation: string): string {
     if (!type || !isString(type)) {
       throw new Error('type is required and must be a string');
diff --git a/x-pack/plugins/security/server/authorization/actions/ui.test.ts b/x-pack/plugins/security/server/authorization/actions/ui.test.ts
index f91b7baf78baa..32827822117d0 100644
--- a/x-pack/plugins/security/server/authorization/actions/ui.test.ts
+++ b/x-pack/plugins/security/server/authorization/actions/ui.test.ts
@@ -8,34 +8,6 @@ import { UIActions } from './ui';
 
 const version = '1.0.0-zeta1';
 
-describe('#all', () => {
-  test('returns `ui:${version}:*`', () => {
-    const uiActions = new UIActions(version);
-    expect(uiActions.all).toBe('ui:1.0.0-zeta1:*');
-  });
-});
-
-describe('#allNavlinks', () => {
-  test('returns `ui:${version}:navLinks/*`', () => {
-    const uiActions = new UIActions(version);
-    expect(uiActions.allNavLinks).toBe('ui:1.0.0-zeta1:navLinks/*');
-  });
-});
-
-describe('#allCatalogueEntries', () => {
-  test('returns `ui:${version}:catalogue/*`', () => {
-    const uiActions = new UIActions(version);
-    expect(uiActions.allCatalogueEntries).toBe('ui:1.0.0-zeta1:catalogue/*');
-  });
-});
-
-describe('#allManagementLinks', () => {
-  test('returns `ui:${version}:management/*`', () => {
-    const uiActions = new UIActions(version);
-    expect(uiActions.allManagementLinks).toBe('ui:1.0.0-zeta1:management/*');
-  });
-});
-
 describe('#get', () => {
   [null, undefined, '', 1, true, {}].forEach((featureId: any) => {
     test(`featureId of ${JSON.stringify(featureId)} throws error`, () => {
diff --git a/x-pack/plugins/security/server/authorization/actions/ui.ts b/x-pack/plugins/security/server/authorization/actions/ui.ts
index 9e77c319a9b3a..3dae9a47b3827 100644
--- a/x-pack/plugins/security/server/authorization/actions/ui.ts
+++ b/x-pack/plugins/security/server/authorization/actions/ui.ts
@@ -14,22 +14,6 @@ export class UIActions {
     this.prefix = `ui:${versionNumber}:`;
   }
 
-  public get all(): string {
-    return `${this.prefix}*`;
-  }
-
-  public get allNavLinks(): string {
-    return `${this.prefix}navLinks/*`;
-  }
-
-  public get allCatalogueEntries(): string {
-    return `${this.prefix}catalogue/*`;
-  }
-
-  public get allManagementLinks(): string {
-    return `${this.prefix}management/*`;
-  }
-
   public get(featureId: keyof UICapabilities, ...uiCapabilityParts: string[]) {
     if (!featureId || !isString(featureId)) {
       throw new Error('featureId is required and must be a string');
diff --git a/x-pack/plugins/security/server/authorization/disable_ui_capabilities.test.ts b/x-pack/plugins/security/server/authorization/disable_ui_capabilities.test.ts
index 49c9db2d0e6e3..912ae60e12065 100644
--- a/x-pack/plugins/security/server/authorization/disable_ui_capabilities.test.ts
+++ b/x-pack/plugins/security/server/authorization/disable_ui_capabilities.test.ts
@@ -9,6 +9,7 @@ import { disableUICapabilitiesFactory } from './disable_ui_capabilities';
 
 import { httpServerMock, loggingServiceMock } from '../../../../../src/core/server/mocks';
 import { authorizationMock } from './index.mock';
+import { Feature } from '../../../features/server';
 
 type MockAuthzOptions = { rejectCheckPrivileges: any } | { resolveCheckPrivileges: any };
 
@@ -42,7 +43,15 @@ describe('usingPrivileges', () => {
 
       const { usingPrivileges } = disableUICapabilitiesFactory(
         mockRequest,
-        [{ id: 'fooFeature', name: 'Foo Feature', app: [], navLinkId: 'foo', privileges: {} }],
+        [
+          new Feature({
+            id: 'fooFeature',
+            name: 'Foo Feature',
+            app: [],
+            navLinkId: 'foo',
+            privileges: null,
+          }),
+        ],
         mockLoggers.get(),
         mockAuthz
       );
@@ -108,7 +117,15 @@ describe('usingPrivileges', () => {
 
       const { usingPrivileges } = disableUICapabilitiesFactory(
         mockRequest,
-        [{ id: 'fooFeature', name: 'Foo Feature', app: [], navLinkId: 'foo', privileges: {} }],
+        [
+          new Feature({
+            id: 'fooFeature',
+            name: 'Foo Feature',
+            app: [],
+            navLinkId: 'foo',
+            privileges: null,
+          }),
+        ],
         mockLoggers.get(),
         mockAuthz
       );
@@ -226,20 +243,20 @@ describe('usingPrivileges', () => {
     const { usingPrivileges } = disableUICapabilitiesFactory(
       mockRequest,
       [
-        {
+        new Feature({
           id: 'fooFeature',
           name: 'Foo Feature',
           navLinkId: 'foo',
           app: [],
-          privileges: {},
-        },
-        {
+          privileges: null,
+        }),
+        new Feature({
           id: 'barFeature',
           name: 'Bar Feature',
           navLinkId: 'bar',
           app: [],
-          privileges: {},
-        },
+          privileges: null,
+        }),
       ],
       loggingServiceMock.create().get(),
       mockAuthz
@@ -312,20 +329,20 @@ describe('usingPrivileges', () => {
     const { usingPrivileges } = disableUICapabilitiesFactory(
       mockRequest,
       [
-        {
+        new Feature({
           id: 'fooFeature',
           name: 'Foo Feature',
           navLinkId: 'foo',
           app: [],
-          privileges: {},
-        },
-        {
+          privileges: null,
+        }),
+        new Feature({
           id: 'barFeature',
           name: 'Bar Feature',
           navLinkId: 'bar',
           app: [],
-          privileges: {},
-        },
+          privileges: null,
+        }),
       ],
       loggingServiceMock.create().get(),
       mockAuthz
@@ -383,7 +400,15 @@ describe('all', () => {
 
     const { all } = disableUICapabilitiesFactory(
       mockRequest,
-      [{ id: 'fooFeature', name: 'Foo Feature', app: [], navLinkId: 'foo', privileges: {} }],
+      [
+        new Feature({
+          id: 'fooFeature',
+          name: 'Foo Feature',
+          app: [],
+          navLinkId: 'foo',
+          privileges: null,
+        }),
+      ],
       loggingServiceMock.create().get(),
       mockAuthz
     );
diff --git a/x-pack/plugins/security/server/authorization/index.test.ts b/x-pack/plugins/security/server/authorization/index.test.ts
index 9e99cae620633..3252053454764 100644
--- a/x-pack/plugins/security/server/authorization/index.test.ts
+++ b/x-pack/plugins/security/server/authorization/index.test.ts
@@ -93,7 +93,7 @@ test(`returns exposed services`, () => {
   );
 
   expect(authz.privileges).toBe(mockPrivilegesService);
-  expect(privilegesFactory).toHaveBeenCalledWith(authz.actions, mockFeaturesService);
+  expect(privilegesFactory).toHaveBeenCalledWith(authz.actions, mockFeaturesService, mockLicense);
 
   expect(authz.mode).toBe(mockAuthorizationMode);
   expect(authorizationModeFactory).toHaveBeenCalledWith(mockLicense);
diff --git a/x-pack/plugins/security/server/authorization/index.ts b/x-pack/plugins/security/server/authorization/index.ts
index 4cbc76ecb6be4..f065c9cfd90ba 100644
--- a/x-pack/plugins/security/server/authorization/index.ts
+++ b/x-pack/plugins/security/server/authorization/index.ts
@@ -35,6 +35,7 @@ import { SecurityLicense } from '../../common/licensing';
 
 export { Actions } from './actions';
 export { CheckSavedObjectsPrivileges } from './check_saved_objects_privileges';
+export { featurePrivilegeIterator } from './privileges';
 
 interface SetupAuthorizationParams {
   packageVersion: string;
@@ -80,7 +81,7 @@ export function setupAuthorization({
     clusterClient,
     applicationName
   );
-  const privileges = privilegesFactory(actions, featuresService);
+  const privileges = privilegesFactory(actions, featuresService, license);
   const logger = loggers.get('authorization');
 
   const authz = {
@@ -120,7 +121,7 @@ export function setupAuthorization({
     },
 
     registerPrivilegesWithCluster: async () => {
-      validateFeaturePrivileges(actions, featuresService.getFeatures());
+      validateFeaturePrivileges(featuresService.getFeatures());
 
       await registerPrivilegesWithCluster(logger, privileges, applicationName, clusterClient);
     },
diff --git a/x-pack/plugins/security/server/authorization/privileges/feature_privilege_builder/app.ts b/x-pack/plugins/security/server/authorization/privileges/feature_privilege_builder/app.ts
index c874886d908eb..514d6734b47ba 100644
--- a/x-pack/plugins/security/server/authorization/privileges/feature_privilege_builder/app.ts
+++ b/x-pack/plugins/security/server/authorization/privileges/feature_privilege_builder/app.ts
@@ -9,7 +9,7 @@ import { BaseFeaturePrivilegeBuilder } from './feature_privilege_builder';
 
 export class FeaturePrivilegeAppBuilder extends BaseFeaturePrivilegeBuilder {
   public getActions(privilegeDefinition: FeatureKibanaPrivileges, feature: Feature): string[] {
-    const appIds = privilegeDefinition.app || feature.app;
+    const appIds = privilegeDefinition.app;
 
     if (!appIds) {
       return [];
diff --git a/x-pack/plugins/security/server/authorization/privileges/feature_privilege_builder/catalogue.ts b/x-pack/plugins/security/server/authorization/privileges/feature_privilege_builder/catalogue.ts
index 3dbe71db93f4a..fc15aff32b975 100644
--- a/x-pack/plugins/security/server/authorization/privileges/feature_privilege_builder/catalogue.ts
+++ b/x-pack/plugins/security/server/authorization/privileges/feature_privilege_builder/catalogue.ts
@@ -9,7 +9,7 @@ import { BaseFeaturePrivilegeBuilder } from './feature_privilege_builder';
 
 export class FeaturePrivilegeCatalogueBuilder extends BaseFeaturePrivilegeBuilder {
   public getActions(privilegeDefinition: FeatureKibanaPrivileges, feature: Feature): string[] {
-    const catalogueEntries = privilegeDefinition.catalogue || feature.catalogue;
+    const catalogueEntries = privilegeDefinition.catalogue;
 
     if (!catalogueEntries) {
       return [];
diff --git a/x-pack/plugins/security/server/authorization/privileges/feature_privilege_builder/management.ts b/x-pack/plugins/security/server/authorization/privileges/feature_privilege_builder/management.ts
index 0180554a47ccc..7a2bb87d72b45 100644
--- a/x-pack/plugins/security/server/authorization/privileges/feature_privilege_builder/management.ts
+++ b/x-pack/plugins/security/server/authorization/privileges/feature_privilege_builder/management.ts
@@ -9,7 +9,7 @@ import { BaseFeaturePrivilegeBuilder } from './feature_privilege_builder';
 
 export class FeaturePrivilegeManagementBuilder extends BaseFeaturePrivilegeBuilder {
   public getActions(privilegeDefinition: FeatureKibanaPrivileges, feature: Feature): string[] {
-    const managementSections = privilegeDefinition.management || feature.management;
+    const managementSections = privilegeDefinition.management;
 
     if (!managementSections) {
       return [];
diff --git a/x-pack/plugins/security/server/authorization/privileges/feature_privilege_iterator/feature_privilege_iterator.test.ts b/x-pack/plugins/security/server/authorization/privileges/feature_privilege_iterator/feature_privilege_iterator.test.ts
new file mode 100644
index 0000000000000..7d92eacfe6b35
--- /dev/null
+++ b/x-pack/plugins/security/server/authorization/privileges/feature_privilege_iterator/feature_privilege_iterator.test.ts
@@ -0,0 +1,891 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { Feature } from '../../../../../features/server';
+import { featurePrivilegeIterator } from './feature_privilege_iterator';
+
+describe('featurePrivilegeIterator', () => {
+  it('handles features with no privileges', () => {
+    const feature = new Feature({
+      id: 'foo',
+      name: 'foo',
+      privileges: null,
+      app: [],
+    });
+
+    const actualPrivileges = Array.from(
+      featurePrivilegeIterator(feature, {
+        augmentWithSubFeaturePrivileges: true,
+      })
+    );
+
+    expect(actualPrivileges).toHaveLength(0);
+  });
+
+  it('handles features with no sub-features', () => {
+    const feature = new Feature({
+      id: 'foo',
+      name: 'foo',
+      privileges: {
+        all: {
+          api: ['all-api', 'read-api'],
+          app: ['foo'],
+          catalogue: ['foo-catalogue'],
+          management: {
+            section: ['foo-management'],
+          },
+          savedObject: {
+            all: ['all-type'],
+            read: ['read-type'],
+          },
+          ui: ['ui-action'],
+        },
+        read: {
+          api: ['read-api'],
+          app: ['foo'],
+          catalogue: ['foo-catalogue'],
+          management: {
+            section: ['foo-management'],
+          },
+          savedObject: {
+            all: [],
+            read: ['read-type'],
+          },
+          ui: ['ui-action'],
+        },
+      },
+      app: ['foo'],
+    });
+
+    const actualPrivileges = Array.from(
+      featurePrivilegeIterator(feature, {
+        augmentWithSubFeaturePrivileges: true,
+      })
+    );
+
+    expect(actualPrivileges).toEqual([
+      {
+        privilegeId: 'all',
+        privilege: {
+          api: ['all-api', 'read-api'],
+          app: ['foo'],
+          catalogue: ['foo-catalogue'],
+          management: {
+            section: ['foo-management'],
+          },
+          savedObject: {
+            all: ['all-type'],
+            read: ['read-type'],
+          },
+          ui: ['ui-action'],
+        },
+      },
+      {
+        privilegeId: 'read',
+        privilege: {
+          api: ['read-api'],
+          app: ['foo'],
+          catalogue: ['foo-catalogue'],
+          management: {
+            section: ['foo-management'],
+          },
+          savedObject: {
+            all: [],
+            read: ['read-type'],
+          },
+          ui: ['ui-action'],
+        },
+      },
+    ]);
+  });
+
+  it('filters privileges using the provided predicate', () => {
+    const feature = new Feature({
+      id: 'foo',
+      name: 'foo',
+      privileges: {
+        all: {
+          api: ['all-api', 'read-api'],
+          app: ['foo'],
+          catalogue: ['foo-catalogue'],
+          management: {
+            section: ['foo-management'],
+          },
+          savedObject: {
+            all: ['all-type'],
+            read: ['read-type'],
+          },
+          ui: ['ui-action'],
+        },
+        read: {
+          api: ['read-api'],
+          app: ['foo'],
+          catalogue: ['foo-catalogue'],
+          management: {
+            section: ['foo-management'],
+          },
+          savedObject: {
+            all: [],
+            read: ['read-type'],
+          },
+          ui: ['ui-action'],
+        },
+      },
+      app: ['foo'],
+    });
+
+    const actualPrivileges = Array.from(
+      featurePrivilegeIterator(feature, {
+        augmentWithSubFeaturePrivileges: true,
+        predicate: privilegeId => privilegeId === 'all',
+      })
+    );
+
+    expect(actualPrivileges).toEqual([
+      {
+        privilegeId: 'all',
+        privilege: {
+          api: ['all-api', 'read-api'],
+          app: ['foo'],
+          catalogue: ['foo-catalogue'],
+          management: {
+            section: ['foo-management'],
+          },
+          savedObject: {
+            all: ['all-type'],
+            read: ['read-type'],
+          },
+          ui: ['ui-action'],
+        },
+      },
+    ]);
+  });
+
+  it('ignores sub features when `augmentWithSubFeaturePrivileges` is false', () => {
+    const feature = new Feature({
+      id: 'foo',
+      name: 'foo',
+      app: [],
+      privileges: {
+        all: {
+          api: ['all-api', 'read-api'],
+          app: ['foo'],
+          catalogue: ['foo-catalogue'],
+          management: {
+            section: ['foo-management'],
+          },
+          savedObject: {
+            all: ['all-type'],
+            read: ['read-type'],
+          },
+          ui: ['ui-action'],
+        },
+        read: {
+          api: ['read-api'],
+          app: ['foo'],
+          catalogue: ['foo-catalogue'],
+          management: {
+            section: ['foo-management'],
+          },
+          savedObject: {
+            all: [],
+            read: ['read-type'],
+          },
+          ui: ['ui-action'],
+        },
+      },
+      subFeatures: [
+        {
+          name: 'sub feature 1',
+          privilegeGroups: [
+            {
+              groupType: 'independent',
+              privileges: [
+                {
+                  id: 'sub-feature-priv-1',
+                  name: 'first sub feature privilege',
+                  includeIn: 'read',
+                  api: ['sub-feature-api'],
+                  app: ['sub-app'],
+                  catalogue: ['sub-catalogue'],
+                  management: {
+                    kibana: ['sub-management'],
+                  },
+                  savedObject: {
+                    all: ['all-sub-type'],
+                    read: ['read-sub-type'],
+                  },
+                  ui: ['ui-sub-type'],
+                },
+              ],
+            },
+          ],
+        },
+      ],
+    });
+
+    const actualPrivileges = Array.from(
+      featurePrivilegeIterator(feature, {
+        augmentWithSubFeaturePrivileges: false,
+      })
+    );
+
+    expect(actualPrivileges).toEqual([
+      {
+        privilegeId: 'all',
+        privilege: {
+          api: ['all-api', 'read-api'],
+          app: ['foo'],
+          catalogue: ['foo-catalogue'],
+          management: {
+            section: ['foo-management'],
+          },
+          savedObject: {
+            all: ['all-type'],
+            read: ['read-type'],
+          },
+          ui: ['ui-action'],
+        },
+      },
+      {
+        privilegeId: 'read',
+        privilege: {
+          api: ['read-api'],
+          app: ['foo'],
+          catalogue: ['foo-catalogue'],
+          management: {
+            section: ['foo-management'],
+          },
+          savedObject: {
+            all: [],
+            read: ['read-type'],
+          },
+          ui: ['ui-action'],
+        },
+      },
+    ]);
+  });
+
+  it('ignores sub features when `includeIn` is none, even if `augmentWithSubFeaturePrivileges` is true', () => {
+    const feature = new Feature({
+      id: 'foo',
+      name: 'foo',
+      app: [],
+      privileges: {
+        all: {
+          api: ['all-api', 'read-api'],
+          app: ['foo'],
+          catalogue: ['foo-catalogue'],
+          management: {
+            section: ['foo-management'],
+          },
+          savedObject: {
+            all: ['all-type'],
+            read: ['read-type'],
+          },
+          ui: ['ui-action'],
+        },
+        read: {
+          api: ['read-api'],
+          app: ['foo'],
+          catalogue: ['foo-catalogue'],
+          management: {
+            section: ['foo-management'],
+          },
+          savedObject: {
+            all: [],
+            read: ['read-type'],
+          },
+          ui: ['ui-action'],
+        },
+      },
+      subFeatures: [
+        {
+          name: 'sub feature 1',
+          privilegeGroups: [
+            {
+              groupType: 'independent',
+              privileges: [
+                {
+                  id: 'sub-feature-priv-1',
+                  name: 'first sub feature privilege',
+                  includeIn: 'none',
+                  api: ['sub-feature-api'],
+                  app: ['sub-app'],
+                  catalogue: ['sub-catalogue'],
+                  management: {
+                    kibana: ['sub-management'],
+                  },
+                  savedObject: {
+                    all: ['all-sub-type'],
+                    read: ['read-sub-type'],
+                  },
+                  ui: ['ui-sub-type'],
+                },
+              ],
+            },
+          ],
+        },
+      ],
+    });
+
+    const actualPrivileges = Array.from(
+      featurePrivilegeIterator(feature, {
+        augmentWithSubFeaturePrivileges: true,
+      })
+    );
+
+    expect(actualPrivileges).toEqual([
+      {
+        privilegeId: 'all',
+        privilege: {
+          api: ['all-api', 'read-api'],
+          app: ['foo'],
+          catalogue: ['foo-catalogue'],
+          management: {
+            section: ['foo-management'],
+          },
+          savedObject: {
+            all: ['all-type'],
+            read: ['read-type'],
+          },
+          ui: ['ui-action'],
+        },
+      },
+      {
+        privilegeId: 'read',
+        privilege: {
+          api: ['read-api'],
+          app: ['foo'],
+          catalogue: ['foo-catalogue'],
+          management: {
+            section: ['foo-management'],
+          },
+          savedObject: {
+            all: [],
+            read: ['read-type'],
+          },
+          ui: ['ui-action'],
+        },
+      },
+    ]);
+  });
+
+  it('includes sub feature privileges into both all and read when`augmentWithSubFeaturePrivileges` is true and `includeIn: read`', () => {
+    const feature = new Feature({
+      id: 'foo',
+      name: 'foo',
+      app: [],
+      privileges: {
+        all: {
+          api: ['all-api', 'read-api'],
+          app: ['foo'],
+          catalogue: ['foo-catalogue'],
+          management: {
+            section: ['foo-management'],
+          },
+          savedObject: {
+            all: ['all-type'],
+            read: ['read-type'],
+          },
+          ui: ['ui-action'],
+        },
+        read: {
+          api: ['read-api'],
+          app: ['foo'],
+          catalogue: ['foo-catalogue'],
+          management: {
+            section: ['foo-management'],
+          },
+          savedObject: {
+            all: [],
+            read: ['read-type'],
+          },
+          ui: ['ui-action'],
+        },
+      },
+      subFeatures: [
+        {
+          name: 'sub feature 1',
+          privilegeGroups: [
+            {
+              groupType: 'independent',
+              privileges: [
+                {
+                  id: 'sub-feature-priv-1',
+                  name: 'first sub feature privilege',
+                  includeIn: 'read',
+                  api: ['sub-feature-api'],
+                  app: ['sub-app'],
+                  catalogue: ['sub-catalogue'],
+                  management: {
+                    section: ['other-sub-management'],
+                    kibana: ['sub-management'],
+                  },
+                  savedObject: {
+                    all: ['all-sub-type'],
+                    read: ['read-sub-type'],
+                  },
+                  ui: ['ui-sub-type'],
+                },
+              ],
+            },
+          ],
+        },
+      ],
+    });
+
+    const actualPrivileges = Array.from(
+      featurePrivilegeIterator(feature, {
+        augmentWithSubFeaturePrivileges: true,
+      })
+    );
+
+    expect(actualPrivileges).toEqual([
+      {
+        privilegeId: 'all',
+        privilege: {
+          api: ['all-api', 'read-api', 'sub-feature-api'],
+          app: ['foo', 'sub-app'],
+          catalogue: ['foo-catalogue', 'sub-catalogue'],
+          management: {
+            section: ['foo-management', 'other-sub-management'],
+            kibana: ['sub-management'],
+          },
+          savedObject: {
+            all: ['all-type', 'all-sub-type'],
+            read: ['read-type', 'read-sub-type'],
+          },
+          ui: ['ui-action', 'ui-sub-type'],
+        },
+      },
+      {
+        privilegeId: 'read',
+        privilege: {
+          api: ['read-api', 'sub-feature-api'],
+          app: ['foo', 'sub-app'],
+          catalogue: ['foo-catalogue', 'sub-catalogue'],
+          management: {
+            section: ['foo-management', 'other-sub-management'],
+            kibana: ['sub-management'],
+          },
+          savedObject: {
+            all: ['all-sub-type'],
+            read: ['read-type', 'read-sub-type'],
+          },
+          ui: ['ui-action', 'ui-sub-type'],
+        },
+      },
+    ]);
+  });
+
+  it('does not duplicate privileges when merging', () => {
+    const feature = new Feature({
+      id: 'foo',
+      name: 'foo',
+      app: [],
+      privileges: {
+        all: {
+          api: ['all-api', 'read-api'],
+          app: ['foo'],
+          catalogue: ['foo-catalogue'],
+          management: {
+            section: ['foo-management'],
+          },
+          savedObject: {
+            all: ['all-type'],
+            read: ['read-type'],
+          },
+          ui: ['ui-action'],
+        },
+        read: {
+          api: ['read-api'],
+          app: ['foo'],
+          catalogue: ['foo-catalogue'],
+          management: {
+            section: ['foo-management'],
+          },
+          savedObject: {
+            all: [],
+            read: ['read-type'],
+          },
+          ui: ['ui-action'],
+        },
+      },
+      subFeatures: [
+        {
+          name: 'sub feature 1',
+          privilegeGroups: [
+            {
+              groupType: 'independent',
+              privileges: [
+                {
+                  id: 'sub-feature-priv-1',
+                  name: 'first sub feature privilege',
+                  includeIn: 'read',
+                  api: ['read-api'],
+                  app: ['foo'],
+                  catalogue: ['foo-catalogue'],
+                  management: {
+                    section: ['foo-management'],
+                  },
+                  savedObject: {
+                    all: [],
+                    read: ['read-type'],
+                  },
+                  ui: ['ui-action'],
+                },
+              ],
+            },
+          ],
+        },
+      ],
+    });
+
+    const actualPrivileges = Array.from(
+      featurePrivilegeIterator(feature, {
+        augmentWithSubFeaturePrivileges: true,
+      })
+    );
+
+    expect(actualPrivileges).toEqual([
+      {
+        privilegeId: 'all',
+        privilege: {
+          api: ['all-api', 'read-api'],
+          app: ['foo'],
+          catalogue: ['foo-catalogue'],
+          management: {
+            section: ['foo-management'],
+          },
+          savedObject: {
+            all: ['all-type'],
+            read: ['read-type'],
+          },
+          ui: ['ui-action'],
+        },
+      },
+      {
+        privilegeId: 'read',
+        privilege: {
+          api: ['read-api'],
+          app: ['foo'],
+          catalogue: ['foo-catalogue'],
+          management: {
+            section: ['foo-management'],
+          },
+          savedObject: {
+            all: [],
+            read: ['read-type'],
+          },
+          ui: ['ui-action'],
+        },
+      },
+    ]);
+  });
+
+  it('includes sub feature privileges into both all and read when`augmentWithSubFeaturePrivileges` is true and `includeIn: all`', () => {
+    const feature = new Feature({
+      id: 'foo',
+      name: 'foo',
+      app: [],
+      privileges: {
+        all: {
+          api: ['all-api', 'read-api'],
+          app: ['foo'],
+          catalogue: ['foo-catalogue'],
+          management: {
+            section: ['foo-management'],
+          },
+          savedObject: {
+            all: ['all-type'],
+            read: ['read-type'],
+          },
+          ui: ['ui-action'],
+        },
+        read: {
+          api: ['read-api'],
+          app: ['foo'],
+          catalogue: ['foo-catalogue'],
+          management: {
+            section: ['foo-management'],
+          },
+          savedObject: {
+            all: [],
+            read: ['read-type'],
+          },
+          ui: ['ui-action'],
+        },
+      },
+      subFeatures: [
+        {
+          name: 'sub feature 1',
+          privilegeGroups: [
+            {
+              groupType: 'independent',
+              privileges: [
+                {
+                  id: 'sub-feature-priv-1',
+                  name: 'first sub feature privilege',
+                  includeIn: 'all',
+                  api: ['sub-feature-api'],
+                  app: ['sub-app'],
+                  catalogue: ['sub-catalogue'],
+                  management: {
+                    section: ['other-sub-management'],
+                    kibana: ['sub-management'],
+                  },
+                  savedObject: {
+                    all: ['all-sub-type'],
+                    read: ['read-sub-type'],
+                  },
+                  ui: ['ui-sub-type'],
+                },
+              ],
+            },
+          ],
+        },
+      ],
+    });
+
+    const actualPrivileges = Array.from(
+      featurePrivilegeIterator(feature, {
+        augmentWithSubFeaturePrivileges: true,
+      })
+    );
+
+    expect(actualPrivileges).toEqual([
+      {
+        privilegeId: 'all',
+        privilege: {
+          api: ['all-api', 'read-api', 'sub-feature-api'],
+          app: ['foo', 'sub-app'],
+          catalogue: ['foo-catalogue', 'sub-catalogue'],
+          management: {
+            section: ['foo-management', 'other-sub-management'],
+            kibana: ['sub-management'],
+          },
+          savedObject: {
+            all: ['all-type', 'all-sub-type'],
+            read: ['read-type', 'read-sub-type'],
+          },
+          ui: ['ui-action', 'ui-sub-type'],
+        },
+      },
+      {
+        privilegeId: 'read',
+        privilege: {
+          api: ['read-api'],
+          app: ['foo'],
+          catalogue: ['foo-catalogue'],
+          management: {
+            section: ['foo-management'],
+          },
+          savedObject: {
+            all: [],
+            read: ['read-type'],
+          },
+          ui: ['ui-action'],
+        },
+      },
+    ]);
+  });
+
+  it(`can augment primary feature privileges even if they don't specify their own`, () => {
+    const feature = new Feature({
+      id: 'foo',
+      name: 'foo',
+      app: [],
+      privileges: {
+        all: {
+          savedObject: {
+            all: [],
+            read: [],
+          },
+          ui: [],
+        },
+        read: {
+          savedObject: {
+            all: [],
+            read: [],
+          },
+          ui: [],
+        },
+      },
+      subFeatures: [
+        {
+          name: 'sub feature 1',
+          privilegeGroups: [
+            {
+              groupType: 'independent',
+              privileges: [
+                {
+                  id: 'sub-feature-priv-1',
+                  name: 'first sub feature privilege',
+                  includeIn: 'read',
+                  api: ['sub-feature-api'],
+                  app: ['sub-app'],
+                  catalogue: ['sub-catalogue'],
+                  management: {
+                    section: ['other-sub-management'],
+                    kibana: ['sub-management'],
+                  },
+                  savedObject: {
+                    all: ['all-sub-type'],
+                    read: ['read-sub-type'],
+                  },
+                  ui: ['ui-sub-type'],
+                },
+              ],
+            },
+          ],
+        },
+      ],
+    });
+
+    const actualPrivileges = Array.from(
+      featurePrivilegeIterator(feature, {
+        augmentWithSubFeaturePrivileges: true,
+      })
+    );
+
+    expect(actualPrivileges).toEqual([
+      {
+        privilegeId: 'all',
+        privilege: {
+          api: ['sub-feature-api'],
+          app: ['sub-app'],
+          catalogue: ['sub-catalogue'],
+          management: {
+            section: ['other-sub-management'],
+            kibana: ['sub-management'],
+          },
+          savedObject: {
+            all: ['all-sub-type'],
+            read: ['read-sub-type'],
+          },
+          ui: ['ui-sub-type'],
+        },
+      },
+      {
+        privilegeId: 'read',
+        privilege: {
+          api: ['sub-feature-api'],
+          app: ['sub-app'],
+          catalogue: ['sub-catalogue'],
+          management: {
+            section: ['other-sub-management'],
+            kibana: ['sub-management'],
+          },
+          savedObject: {
+            all: ['all-sub-type'],
+            read: ['read-sub-type'],
+          },
+          ui: ['ui-sub-type'],
+        },
+      },
+    ]);
+  });
+
+  it(`can augment primary feature privileges even if the sub-feature privileges don't specify their own`, () => {
+    const feature = new Feature({
+      id: 'foo',
+      name: 'foo',
+      app: [],
+      privileges: {
+        all: {
+          api: ['all-api', 'read-api'],
+          app: ['foo'],
+          catalogue: ['foo-catalogue'],
+          management: {
+            section: ['foo-management'],
+          },
+          savedObject: {
+            all: ['all-type'],
+            read: ['read-type'],
+          },
+          ui: ['ui-action'],
+        },
+        read: {
+          api: ['read-api'],
+          app: ['foo'],
+          catalogue: ['foo-catalogue'],
+          management: {
+            section: ['foo-management'],
+          },
+          savedObject: {
+            all: [],
+            read: ['read-type'],
+          },
+          ui: ['ui-action'],
+        },
+      },
+      subFeatures: [
+        {
+          name: 'sub feature 1',
+          privilegeGroups: [
+            {
+              groupType: 'independent',
+              privileges: [
+                {
+                  id: 'sub-feature-priv-1',
+                  name: 'first sub feature privilege',
+                  includeIn: 'read',
+                  savedObject: {
+                    all: [],
+                    read: [],
+                  },
+                  ui: [],
+                },
+              ],
+            },
+          ],
+        },
+      ],
+    });
+
+    const actualPrivileges = Array.from(
+      featurePrivilegeIterator(feature, {
+        augmentWithSubFeaturePrivileges: true,
+      })
+    );
+
+    expect(actualPrivileges).toEqual([
+      {
+        privilegeId: 'all',
+        privilege: {
+          api: ['all-api', 'read-api'],
+          app: ['foo'],
+          catalogue: ['foo-catalogue'],
+          management: {
+            section: ['foo-management'],
+          },
+          savedObject: {
+            all: ['all-type'],
+            read: ['read-type'],
+          },
+          ui: ['ui-action'],
+        },
+      },
+      {
+        privilegeId: 'read',
+        privilege: {
+          api: ['read-api'],
+          app: ['foo'],
+          catalogue: ['foo-catalogue'],
+          management: {
+            section: ['foo-management'],
+          },
+          savedObject: {
+            all: [],
+            read: ['read-type'],
+          },
+          ui: ['ui-action'],
+        },
+      },
+    ]);
+  });
+});
diff --git a/x-pack/plugins/security/server/authorization/privileges/feature_privilege_iterator/feature_privilege_iterator.ts b/x-pack/plugins/security/server/authorization/privileges/feature_privilege_iterator/feature_privilege_iterator.ts
new file mode 100644
index 0000000000000..e239a6e280aec
--- /dev/null
+++ b/x-pack/plugins/security/server/authorization/privileges/feature_privilege_iterator/feature_privilege_iterator.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 _ from 'lodash';
+import { Feature, FeatureKibanaPrivileges } from '../../../../../features/server';
+import { subFeaturePrivilegeIterator } from './sub_feature_privilege_iterator';
+
+interface IteratorOptions {
+  augmentWithSubFeaturePrivileges: boolean;
+  predicate?: (privilegeId: string, privilege: FeatureKibanaPrivileges) => boolean;
+}
+
+export function* featurePrivilegeIterator(
+  feature: Feature,
+  options: IteratorOptions
+): IterableIterator<{ privilegeId: string; privilege: FeatureKibanaPrivileges }> {
+  for (const entry of Object.entries(feature.privileges ?? {})) {
+    const [privilegeId, privilege] = entry;
+
+    if (options.predicate && !options.predicate(privilegeId, privilege)) {
+      continue;
+    }
+
+    if (options.augmentWithSubFeaturePrivileges) {
+      yield { privilegeId, privilege: mergeWithSubFeatures(privilegeId, privilege, feature) };
+    } else {
+      yield { privilegeId, privilege };
+    }
+  }
+}
+
+function mergeWithSubFeatures(
+  privilegeId: string,
+  privilege: FeatureKibanaPrivileges,
+  feature: Feature
+) {
+  const mergedConfig = _.cloneDeep(privilege);
+  for (const subFeaturePrivilege of subFeaturePrivilegeIterator(feature)) {
+    if (subFeaturePrivilege.includeIn !== 'read' && subFeaturePrivilege.includeIn !== privilegeId) {
+      continue;
+    }
+
+    mergedConfig.api = mergeArrays(mergedConfig.api, subFeaturePrivilege.api);
+
+    mergedConfig.app = mergeArrays(mergedConfig.app, subFeaturePrivilege.app);
+
+    mergedConfig.catalogue = mergeArrays(mergedConfig.catalogue, subFeaturePrivilege.catalogue);
+
+    const managementEntries = Object.entries(mergedConfig.management ?? {});
+    const subFeatureManagementEntries = Object.entries(subFeaturePrivilege.management ?? {});
+
+    mergedConfig.management = [managementEntries, subFeatureManagementEntries]
+      .flat()
+      .reduce((acc, [sectionId, managementApps]) => {
+        return {
+          ...acc,
+          [sectionId]: mergeArrays(acc[sectionId], managementApps),
+        };
+      }, {} as Record<string, string[]>);
+
+    mergedConfig.ui = mergeArrays(mergedConfig.ui, subFeaturePrivilege.ui);
+
+    mergedConfig.savedObject.all = mergeArrays(
+      mergedConfig.savedObject.all,
+      subFeaturePrivilege.savedObject.all
+    );
+
+    mergedConfig.savedObject.read = mergeArrays(
+      mergedConfig.savedObject.read,
+      subFeaturePrivilege.savedObject.read
+    );
+  }
+  return mergedConfig;
+}
+
+function mergeArrays(input1: string[] | undefined, input2: string[] | undefined) {
+  const first = input1 ?? [];
+  const second = input2 ?? [];
+  return Array.from(new Set([...first, ...second]));
+}
diff --git a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/kibana_privilege_calculator/__fixtures__/index.ts b/x-pack/plugins/security/server/authorization/privileges/feature_privilege_iterator/index.ts
similarity index 57%
rename from x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/kibana_privilege_calculator/__fixtures__/index.ts
rename to x-pack/plugins/security/server/authorization/privileges/feature_privilege_iterator/index.ts
index 253dcaed9f19e..24af524c350b0 100644
--- a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/kibana_privilege_calculator/__fixtures__/index.ts
+++ b/x-pack/plugins/security/server/authorization/privileges/feature_privilege_iterator/index.ts
@@ -4,6 +4,5 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-export { defaultPrivilegeDefinition } from './default_privilege_definition';
-export { buildRole, BuildRoleOpts } from './build_role';
-export * from './common_allowed_privileges';
+export { featurePrivilegeIterator } from './feature_privilege_iterator';
+export { subFeaturePrivilegeIterator } from './sub_feature_privilege_iterator';
diff --git a/x-pack/plugins/security/server/authorization/privileges/feature_privilege_iterator/sub_feature_privilege_iterator.ts b/x-pack/plugins/security/server/authorization/privileges/feature_privilege_iterator/sub_feature_privilege_iterator.ts
new file mode 100644
index 0000000000000..b288262be25c6
--- /dev/null
+++ b/x-pack/plugins/security/server/authorization/privileges/feature_privilege_iterator/sub_feature_privilege_iterator.ts
@@ -0,0 +1,18 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { SubFeaturePrivilegeConfig } from '../../../../../features/common';
+import { Feature } from '../../../../../features/server';
+
+export function* subFeaturePrivilegeIterator(
+  feature: Feature
+): IterableIterator<SubFeaturePrivilegeConfig> {
+  for (const subFeature of feature.subFeatures) {
+    for (const group of subFeature.privilegeGroups) {
+      yield* group.privileges;
+    }
+  }
+}
diff --git a/x-pack/plugins/security/server/authorization/privileges/index.ts b/x-pack/plugins/security/server/authorization/privileges/index.ts
index 22b9cd45d4c0f..e12a33ce509bd 100644
--- a/x-pack/plugins/security/server/authorization/privileges/index.ts
+++ b/x-pack/plugins/security/server/authorization/privileges/index.ts
@@ -5,3 +5,4 @@
  */
 
 export { privilegesFactory, PrivilegesService } from './privileges';
+export { featurePrivilegeIterator } from './feature_privilege_iterator';
diff --git a/x-pack/plugins/security/server/authorization/privileges/privileges.test.ts b/x-pack/plugins/security/server/authorization/privileges/privileges.test.ts
index 38d4d413c591e..3d25fc03f568b 100644
--- a/x-pack/plugins/security/server/authorization/privileges/privileges.test.ts
+++ b/x-pack/plugins/security/server/authorization/privileges/privileges.test.ts
@@ -11,9 +11,9 @@ import { privilegesFactory } from './privileges';
 const actions = new Actions('1.0.0-zeta1');
 
 describe('features', () => {
-  test('actions defined at the feature cascade to the privileges', () => {
+  test('actions defined at the feature do not cascade to the privileges', () => {
     const features: Feature[] = [
-      {
+      new Feature({
         id: 'foo-feature',
         name: 'Foo Feature',
         icon: 'arrowDown',
@@ -39,115 +39,25 @@ describe('features', () => {
             ui: [],
           },
         },
-      },
+      }),
     ];
 
     const mockFeaturesService = { getFeatures: jest.fn().mockReturnValue(features) };
-    const privileges = privilegesFactory(actions, mockFeaturesService);
-
-    const actual = privileges.get();
-    expect(actual).toHaveProperty('features.foo-feature', {
-      all: [
-        actions.login,
-        actions.version,
-        actions.app.get('app-1'),
-        actions.app.get('app-2'),
-        actions.ui.get('catalogue', 'catalogue-1'),
-        actions.ui.get('catalogue', 'catalogue-2'),
-        actions.ui.get('management', 'foo', 'management-1'),
-        actions.ui.get('management', 'foo', 'management-2'),
-        actions.ui.get('navLinks', 'kibana:foo'),
-        actions.allHack,
-      ],
-      read: [
-        actions.login,
-        actions.version,
-        actions.app.get('app-1'),
-        actions.app.get('app-2'),
-        actions.ui.get('catalogue', 'catalogue-1'),
-        actions.ui.get('catalogue', 'catalogue-2'),
-        actions.ui.get('management', 'foo', 'management-1'),
-        actions.ui.get('management', 'foo', 'management-2'),
-        actions.ui.get('navLinks', 'kibana:foo'),
-      ],
-    });
-  });
-
-  test('actions defined at the privilege take precedence', () => {
-    const features: Feature[] = [
-      {
-        id: 'foo',
-        name: 'Foo Feature',
-        icon: 'arrowDown',
-        app: ['ignore-me-1', 'ignore-me-2'],
-        catalogue: ['ignore-me-1', 'ignore-me-2'],
-        management: {
-          foo: ['ignore-me-1', 'ignore-me-2'],
-        },
-        privileges: {
-          all: {
-            app: ['all-app-1', 'all-app-2'],
-            catalogue: ['catalogue-all-1', 'catalogue-all-2'],
-            management: {
-              all: ['all-management-1', 'all-management-2'],
-            },
-            savedObject: {
-              all: [],
-              read: [],
-            },
-            ui: [],
-          },
-          read: {
-            app: ['read-app-1', 'read-app-2'],
-            catalogue: ['catalogue-read-1', 'catalogue-read-2'],
-            management: {
-              read: ['read-management-1', 'read-management-2'],
-            },
-            savedObject: {
-              all: [],
-              read: [],
-            },
-            ui: [],
-          },
-        },
-      },
-    ];
-
-    const mockXPackMainPlugin = {
-      getFeatures: jest.fn().mockReturnValue(features),
+    const mockLicenseService = {
+      getFeatures: jest.fn().mockReturnValue({ allowSubFeaturePrivileges: true }),
     };
-
-    const privileges = privilegesFactory(actions, mockXPackMainPlugin as any);
+    const privileges = privilegesFactory(actions, mockFeaturesService, mockLicenseService);
 
     const actual = privileges.get();
-    expect(actual).toHaveProperty('features.foo', {
-      all: [
-        actions.login,
-        actions.version,
-        actions.app.get('all-app-1'),
-        actions.app.get('all-app-2'),
-        actions.ui.get('catalogue', 'catalogue-all-1'),
-        actions.ui.get('catalogue', 'catalogue-all-2'),
-        actions.ui.get('management', 'all', 'all-management-1'),
-        actions.ui.get('management', 'all', 'all-management-2'),
-        actions.allHack,
-      ],
-      read: [
-        actions.login,
-        actions.version,
-        actions.app.get('read-app-1'),
-        actions.app.get('read-app-2'),
-        actions.ui.get('catalogue', 'catalogue-read-1'),
-        actions.ui.get('catalogue', 'catalogue-read-2'),
-        actions.ui.get('management', 'read', 'read-management-1'),
-        actions.ui.get('management', 'read', 'read-management-2'),
-      ],
+    expect(actual).toHaveProperty('features.foo-feature', {
+      all: [actions.login, actions.version, actions.ui.get('navLinks', 'kibana:foo')],
+      read: [actions.login, actions.version, actions.ui.get('navLinks', 'kibana:foo')],
     });
   });
 
   test(`actions only specified at the privilege are alright too`, () => {
     const features: Feature[] = [
-      {
+      new Feature({
         id: 'foo',
         name: 'Foo Feature',
         icon: 'arrowDown',
@@ -168,93 +78,100 @@ describe('features', () => {
             ui: ['read-ui-1', 'read-ui-2'],
           },
         },
-      },
+      }),
     ];
 
     const mockXPackMainPlugin = {
       getFeatures: jest.fn().mockReturnValue(features),
     };
+    const mockLicenseService = {
+      getFeatures: jest.fn().mockReturnValue({ allowSubFeaturePrivileges: true }),
+    };
+    const privileges = privilegesFactory(actions, mockXPackMainPlugin as any, mockLicenseService);
 
-    const privileges = privilegesFactory(actions, mockXPackMainPlugin as any);
+    const expectedAllPrivileges = [
+      actions.login,
+      actions.version,
+      actions.savedObject.get('all-savedObject-all-1', 'bulk_get'),
+      actions.savedObject.get('all-savedObject-all-1', 'get'),
+      actions.savedObject.get('all-savedObject-all-1', 'find'),
+      actions.savedObject.get('all-savedObject-all-1', 'create'),
+      actions.savedObject.get('all-savedObject-all-1', 'bulk_create'),
+      actions.savedObject.get('all-savedObject-all-1', 'update'),
+      actions.savedObject.get('all-savedObject-all-1', 'bulk_update'),
+      actions.savedObject.get('all-savedObject-all-1', 'delete'),
+      actions.savedObject.get('all-savedObject-all-2', 'bulk_get'),
+      actions.savedObject.get('all-savedObject-all-2', 'get'),
+      actions.savedObject.get('all-savedObject-all-2', 'find'),
+      actions.savedObject.get('all-savedObject-all-2', 'create'),
+      actions.savedObject.get('all-savedObject-all-2', 'bulk_create'),
+      actions.savedObject.get('all-savedObject-all-2', 'update'),
+      actions.savedObject.get('all-savedObject-all-2', 'bulk_update'),
+      actions.savedObject.get('all-savedObject-all-2', 'delete'),
+      actions.savedObject.get('all-savedObject-read-1', 'bulk_get'),
+      actions.savedObject.get('all-savedObject-read-1', 'get'),
+      actions.savedObject.get('all-savedObject-read-1', 'find'),
+      actions.savedObject.get('all-savedObject-read-2', 'bulk_get'),
+      actions.savedObject.get('all-savedObject-read-2', 'get'),
+      actions.savedObject.get('all-savedObject-read-2', 'find'),
+      actions.ui.get('foo', 'all-ui-1'),
+      actions.ui.get('foo', 'all-ui-2'),
+    ];
+
+    const expectedReadPrivileges = [
+      actions.login,
+      actions.version,
+      actions.savedObject.get('read-savedObject-all-1', 'bulk_get'),
+      actions.savedObject.get('read-savedObject-all-1', 'get'),
+      actions.savedObject.get('read-savedObject-all-1', 'find'),
+      actions.savedObject.get('read-savedObject-all-1', 'create'),
+      actions.savedObject.get('read-savedObject-all-1', 'bulk_create'),
+      actions.savedObject.get('read-savedObject-all-1', 'update'),
+      actions.savedObject.get('read-savedObject-all-1', 'bulk_update'),
+      actions.savedObject.get('read-savedObject-all-1', 'delete'),
+      actions.savedObject.get('read-savedObject-all-2', 'bulk_get'),
+      actions.savedObject.get('read-savedObject-all-2', 'get'),
+      actions.savedObject.get('read-savedObject-all-2', 'find'),
+      actions.savedObject.get('read-savedObject-all-2', 'create'),
+      actions.savedObject.get('read-savedObject-all-2', 'bulk_create'),
+      actions.savedObject.get('read-savedObject-all-2', 'update'),
+      actions.savedObject.get('read-savedObject-all-2', 'bulk_update'),
+      actions.savedObject.get('read-savedObject-all-2', 'delete'),
+      actions.savedObject.get('read-savedObject-read-1', 'bulk_get'),
+      actions.savedObject.get('read-savedObject-read-1', 'get'),
+      actions.savedObject.get('read-savedObject-read-1', 'find'),
+      actions.savedObject.get('read-savedObject-read-2', 'bulk_get'),
+      actions.savedObject.get('read-savedObject-read-2', 'get'),
+      actions.savedObject.get('read-savedObject-read-2', 'find'),
+      actions.ui.get('foo', 'read-ui-1'),
+      actions.ui.get('foo', 'read-ui-2'),
+    ];
 
     const actual = privileges.get();
     expect(actual).toHaveProperty('features.foo', {
-      all: [
-        actions.login,
-        actions.version,
-        actions.savedObject.get('all-savedObject-all-1', 'bulk_get'),
-        actions.savedObject.get('all-savedObject-all-1', 'get'),
-        actions.savedObject.get('all-savedObject-all-1', 'find'),
-        actions.savedObject.get('all-savedObject-all-1', 'create'),
-        actions.savedObject.get('all-savedObject-all-1', 'bulk_create'),
-        actions.savedObject.get('all-savedObject-all-1', 'update'),
-        actions.savedObject.get('all-savedObject-all-1', 'bulk_update'),
-        actions.savedObject.get('all-savedObject-all-1', 'delete'),
-        actions.savedObject.get('all-savedObject-all-2', 'bulk_get'),
-        actions.savedObject.get('all-savedObject-all-2', 'get'),
-        actions.savedObject.get('all-savedObject-all-2', 'find'),
-        actions.savedObject.get('all-savedObject-all-2', 'create'),
-        actions.savedObject.get('all-savedObject-all-2', 'bulk_create'),
-        actions.savedObject.get('all-savedObject-all-2', 'update'),
-        actions.savedObject.get('all-savedObject-all-2', 'bulk_update'),
-        actions.savedObject.get('all-savedObject-all-2', 'delete'),
-        actions.savedObject.get('all-savedObject-read-1', 'bulk_get'),
-        actions.savedObject.get('all-savedObject-read-1', 'get'),
-        actions.savedObject.get('all-savedObject-read-1', 'find'),
-        actions.savedObject.get('all-savedObject-read-2', 'bulk_get'),
-        actions.savedObject.get('all-savedObject-read-2', 'get'),
-        actions.savedObject.get('all-savedObject-read-2', 'find'),
-        actions.ui.get('foo', 'all-ui-1'),
-        actions.ui.get('foo', 'all-ui-2'),
-        actions.allHack,
-      ],
-      read: [
-        actions.login,
-        actions.version,
-        actions.savedObject.get('read-savedObject-all-1', 'bulk_get'),
-        actions.savedObject.get('read-savedObject-all-1', 'get'),
-        actions.savedObject.get('read-savedObject-all-1', 'find'),
-        actions.savedObject.get('read-savedObject-all-1', 'create'),
-        actions.savedObject.get('read-savedObject-all-1', 'bulk_create'),
-        actions.savedObject.get('read-savedObject-all-1', 'update'),
-        actions.savedObject.get('read-savedObject-all-1', 'bulk_update'),
-        actions.savedObject.get('read-savedObject-all-1', 'delete'),
-        actions.savedObject.get('read-savedObject-all-2', 'bulk_get'),
-        actions.savedObject.get('read-savedObject-all-2', 'get'),
-        actions.savedObject.get('read-savedObject-all-2', 'find'),
-        actions.savedObject.get('read-savedObject-all-2', 'create'),
-        actions.savedObject.get('read-savedObject-all-2', 'bulk_create'),
-        actions.savedObject.get('read-savedObject-all-2', 'update'),
-        actions.savedObject.get('read-savedObject-all-2', 'bulk_update'),
-        actions.savedObject.get('read-savedObject-all-2', 'delete'),
-        actions.savedObject.get('read-savedObject-read-1', 'bulk_get'),
-        actions.savedObject.get('read-savedObject-read-1', 'get'),
-        actions.savedObject.get('read-savedObject-read-1', 'find'),
-        actions.savedObject.get('read-savedObject-read-2', 'bulk_get'),
-        actions.savedObject.get('read-savedObject-read-2', 'get'),
-        actions.savedObject.get('read-savedObject-read-2', 'find'),
-        actions.ui.get('foo', 'read-ui-1'),
-        actions.ui.get('foo', 'read-ui-2'),
-      ],
+      all: [...expectedAllPrivileges],
+      read: [...expectedReadPrivileges],
     });
   });
 
   test(`features with no privileges aren't listed`, () => {
     const features: Feature[] = [
-      {
+      new Feature({
         id: 'foo',
         name: 'Foo Feature',
         icon: 'arrowDown',
         app: [],
-        privileges: {},
-      },
+        privileges: null,
+      }),
     ];
 
     const mockXPackMainPlugin = {
       getFeatures: jest.fn().mockReturnValue(features),
     };
-
-    const privileges = privilegesFactory(actions, mockXPackMainPlugin as any);
+    const mockLicenseService = {
+      getFeatures: jest.fn().mockReturnValue({ allowSubFeaturePrivileges: true }),
+    };
+    const privileges = privilegesFactory(actions, mockXPackMainPlugin as any, mockLicenseService);
 
     const actual = privileges.get();
     expect(actual).not.toHaveProperty('features.foo');
@@ -276,82 +193,9 @@ describe('features', () => {
   },
 ].forEach(({ group, expectManageSpaces, expectGetFeatures }) => {
   describe(`${group}`, () => {
-    test('actions defined only at the feature are included in `all` and `read`', () => {
-      const features: Feature[] = [
-        {
-          id: 'foo',
-          name: 'Foo Feature',
-          icon: 'arrowDown',
-          navLinkId: 'kibana:foo',
-          app: ['app-1', 'app-2'],
-          catalogue: ['catalogue-1', 'catalogue-2'],
-          management: {
-            foo: ['management-1', 'management-2'],
-          },
-          privileges: {
-            all: {
-              savedObject: {
-                all: [],
-                read: [],
-              },
-              ui: [],
-            },
-            read: {
-              savedObject: {
-                all: [],
-                read: [],
-              },
-              ui: [],
-            },
-          },
-        },
-      ];
-
-      const mockXPackMainPlugin = {
-        getFeatures: jest.fn().mockReturnValue(features),
-      };
-
-      const privileges = privilegesFactory(actions, mockXPackMainPlugin as any);
-
-      const actual = privileges.get();
-      expect(actual).toHaveProperty(group, {
-        all: [
-          actions.login,
-          actions.version,
-          ...(expectGetFeatures ? [actions.api.get('features')] : []),
-          ...(expectManageSpaces
-            ? [
-                actions.space.manage,
-                actions.ui.get('spaces', 'manage'),
-                actions.ui.get('management', 'kibana', 'spaces'),
-              ]
-            : []),
-          actions.app.get('app-1'),
-          actions.app.get('app-2'),
-          actions.ui.get('catalogue', 'catalogue-1'),
-          actions.ui.get('catalogue', 'catalogue-2'),
-          actions.ui.get('management', 'foo', 'management-1'),
-          actions.ui.get('management', 'foo', 'management-2'),
-          actions.ui.get('navLinks', 'kibana:foo'),
-          actions.allHack,
-        ],
-        read: [
-          actions.login,
-          actions.version,
-          actions.app.get('app-1'),
-          actions.app.get('app-2'),
-          actions.ui.get('catalogue', 'catalogue-1'),
-          actions.ui.get('catalogue', 'catalogue-2'),
-          actions.ui.get('management', 'foo', 'management-1'),
-          actions.ui.get('management', 'foo', 'management-2'),
-          actions.ui.get('navLinks', 'kibana:foo'),
-        ],
-      });
-    });
-
     test('actions defined in any feature privilege are included in `all`', () => {
       const features: Feature[] = [
-        {
+        new Feature({
           id: 'foo',
           name: 'Foo Feature',
           icon: 'arrowDown',
@@ -362,17 +206,6 @@ describe('features', () => {
             foo: ['ignore-me-1', 'ignore-me-2'],
           },
           privileges: {
-            bar: {
-              management: {
-                'bar-management': ['bar-management-1', 'bar-management-2'],
-              },
-              catalogue: ['bar-catalogue-1', 'bar-catalogue-2'],
-              savedObject: {
-                all: ['bar-savedObject-all-1', 'bar-savedObject-all-2'],
-                read: ['bar-savedObject-read-1', 'bar-savedObject-read-2'],
-              },
-              ui: ['bar-ui-1', 'bar-ui-2'],
-            },
             all: {
               management: {
                 'all-management': ['all-management-1', 'all-management-2'],
@@ -396,14 +229,16 @@ describe('features', () => {
               ui: ['read-ui-1', 'read-ui-2'],
             },
           },
-        },
+        }),
       ];
 
       const mockXPackMainPlugin = {
         getFeatures: jest.fn().mockReturnValue(features),
       };
-
-      const privileges = privilegesFactory(actions, mockXPackMainPlugin as any);
+      const mockLicenseService = {
+        getFeatures: jest.fn().mockReturnValue({ allowSubFeaturePrivileges: true }),
+      };
+      const privileges = privilegesFactory(actions, mockXPackMainPlugin as any, mockLicenseService);
 
       const actual = privileges.get();
       expect(actual).toHaveProperty(`${group}.all`, [
@@ -417,39 +252,11 @@ describe('features', () => {
               actions.ui.get('management', 'kibana', 'spaces'),
             ]
           : []),
-        actions.ui.get('catalogue', 'bar-catalogue-1'),
-        actions.ui.get('catalogue', 'bar-catalogue-2'),
-        actions.ui.get('management', 'bar-management', 'bar-management-1'),
-        actions.ui.get('management', 'bar-management', 'bar-management-2'),
-        actions.ui.get('navLinks', 'kibana:foo'),
-        actions.savedObject.get('bar-savedObject-all-1', 'bulk_get'),
-        actions.savedObject.get('bar-savedObject-all-1', 'get'),
-        actions.savedObject.get('bar-savedObject-all-1', 'find'),
-        actions.savedObject.get('bar-savedObject-all-1', 'create'),
-        actions.savedObject.get('bar-savedObject-all-1', 'bulk_create'),
-        actions.savedObject.get('bar-savedObject-all-1', 'update'),
-        actions.savedObject.get('bar-savedObject-all-1', 'bulk_update'),
-        actions.savedObject.get('bar-savedObject-all-1', 'delete'),
-        actions.savedObject.get('bar-savedObject-all-2', 'bulk_get'),
-        actions.savedObject.get('bar-savedObject-all-2', 'get'),
-        actions.savedObject.get('bar-savedObject-all-2', 'find'),
-        actions.savedObject.get('bar-savedObject-all-2', 'create'),
-        actions.savedObject.get('bar-savedObject-all-2', 'bulk_create'),
-        actions.savedObject.get('bar-savedObject-all-2', 'update'),
-        actions.savedObject.get('bar-savedObject-all-2', 'bulk_update'),
-        actions.savedObject.get('bar-savedObject-all-2', 'delete'),
-        actions.savedObject.get('bar-savedObject-read-1', 'bulk_get'),
-        actions.savedObject.get('bar-savedObject-read-1', 'get'),
-        actions.savedObject.get('bar-savedObject-read-1', 'find'),
-        actions.savedObject.get('bar-savedObject-read-2', 'bulk_get'),
-        actions.savedObject.get('bar-savedObject-read-2', 'get'),
-        actions.savedObject.get('bar-savedObject-read-2', 'find'),
-        actions.ui.get('foo', 'bar-ui-1'),
-        actions.ui.get('foo', 'bar-ui-2'),
         actions.ui.get('catalogue', 'all-catalogue-1'),
         actions.ui.get('catalogue', 'all-catalogue-2'),
         actions.ui.get('management', 'all-management', 'all-management-1'),
         actions.ui.get('management', 'all-management', 'all-management-2'),
+        actions.ui.get('navLinks', 'kibana:foo'),
         actions.savedObject.get('all-savedObject-all-1', 'bulk_get'),
         actions.savedObject.get('all-savedObject-all-1', 'get'),
         actions.savedObject.get('all-savedObject-all-1', 'find'),
@@ -502,13 +309,12 @@ describe('features', () => {
         actions.savedObject.get('read-savedObject-read-2', 'find'),
         actions.ui.get('foo', 'read-ui-1'),
         actions.ui.get('foo', 'read-ui-2'),
-        actions.allHack,
       ]);
     });
 
     test('actions defined in a feature privilege with name `read` are included in `read`', () => {
       const features: Feature[] = [
-        {
+        new Feature({
           id: 'foo',
           name: 'Foo Feature',
           icon: 'arrowDown',
@@ -519,17 +325,6 @@ describe('features', () => {
             foo: ['ignore-me-1', 'ignore-me-2'],
           },
           privileges: {
-            bar: {
-              management: {
-                'ignore-me': ['ignore-me-1', 'ignore-me-2'],
-              },
-              catalogue: ['ignore-me-1', 'ignore-me-2'],
-              savedObject: {
-                all: ['ignore-me-1', 'ignore-me-2'],
-                read: ['ignore-me-1', 'ignore-me-2'],
-              },
-              ui: ['ignore-me-1', 'ignore-me-2'],
-            },
             all: {
               management: {
                 'ignore-me': ['ignore-me-1', 'ignore-me-2'],
@@ -553,14 +348,16 @@ describe('features', () => {
               ui: ['read-ui-1', 'read-ui-2'],
             },
           },
-        },
+        }),
       ];
 
       const mockXPackMainPlugin = {
         getFeatures: jest.fn().mockReturnValue(features),
       };
-
-      const privileges = privilegesFactory(actions, mockXPackMainPlugin as any);
+      const mockLicenseService = {
+        getFeatures: jest.fn().mockReturnValue({ allowSubFeaturePrivileges: true }),
+      };
+      const privileges = privilegesFactory(actions, mockXPackMainPlugin as any, mockLicenseService);
 
       const actual = privileges.get();
       expect(actual).toHaveProperty(`${group}.read`, [
@@ -600,7 +397,7 @@ describe('features', () => {
 
     test('actions defined in a reserved privilege are not included in `all` or `read`', () => {
       const features: Feature[] = [
-        {
+        new Feature({
           id: 'foo',
           name: 'Foo Feature',
           icon: 'arrowDown',
@@ -610,7 +407,7 @@ describe('features', () => {
           management: {
             foo: ['ignore-me-1', 'ignore-me-2'],
           },
-          privileges: {},
+          privileges: null,
           reserved: {
             privilege: {
               savedObject: {
@@ -621,14 +418,16 @@ describe('features', () => {
             },
             description: '',
           },
-        },
+        }),
       ];
 
       const mockXPackMainPlugin = {
         getFeatures: jest.fn().mockReturnValue(features),
       };
-
-      const privileges = privilegesFactory(actions, mockXPackMainPlugin as any);
+      const mockLicenseService = {
+        getFeatures: jest.fn().mockReturnValue({ allowSubFeaturePrivileges: true }),
+      };
+      const privileges = privilegesFactory(actions, mockXPackMainPlugin as any, mockLicenseService);
 
       const actual = privileges.get();
       expect(actual).toHaveProperty(`${group}.all`, [
@@ -642,14 +441,13 @@ describe('features', () => {
               actions.ui.get('management', 'kibana', 'spaces'),
             ]
           : []),
-        actions.allHack,
       ]);
       expect(actual).toHaveProperty(`${group}.read`, [actions.login, actions.version]);
     });
 
     test('actions defined in a feature with excludeFromBasePrivileges are not included in `all` or `read', () => {
       const features: Feature[] = [
-        {
+        new Feature({
           id: 'foo',
           name: 'Foo Feature',
           excludeFromBasePrivileges: true,
@@ -661,17 +459,6 @@ describe('features', () => {
             foo: ['ignore-me-1', 'ignore-me-2'],
           },
           privileges: {
-            bar: {
-              management: {
-                'bar-management': ['bar-management-1'],
-              },
-              catalogue: ['bar-catalogue-1'],
-              savedObject: {
-                all: ['bar-savedObject-all-1'],
-                read: ['bar-savedObject-read-1'],
-              },
-              ui: ['bar-ui-1'],
-            },
             all: {
               management: {
                 'all-management': ['all-management-1'],
@@ -695,14 +482,16 @@ describe('features', () => {
               ui: ['read-ui-1'],
             },
           },
-        },
+        }),
       ];
 
       const mockXPackMainPlugin = {
         getFeatures: jest.fn().mockReturnValue(features),
       };
-
-      const privileges = privilegesFactory(actions, mockXPackMainPlugin as any);
+      const mockLicenseService = {
+        getFeatures: jest.fn().mockReturnValue({ allowSubFeaturePrivileges: true }),
+      };
+      const privileges = privilegesFactory(actions, mockXPackMainPlugin as any, mockLicenseService);
 
       const actual = privileges.get();
       expect(actual).toHaveProperty(`${group}.all`, [
@@ -716,14 +505,13 @@ describe('features', () => {
               actions.ui.get('management', 'kibana', 'spaces'),
             ]
           : []),
-        actions.allHack,
       ]);
       expect(actual).toHaveProperty(`${group}.read`, [actions.login, actions.version]);
     });
 
     test('actions defined in an individual feature privilege with excludeFromBasePrivileges are not included in `all` or `read`', () => {
       const features: Feature[] = [
-        {
+        new Feature({
           id: 'foo',
           name: 'Foo Feature',
           icon: 'arrowDown',
@@ -734,18 +522,6 @@ describe('features', () => {
             foo: ['ignore-me-1', 'ignore-me-2'],
           },
           privileges: {
-            bar: {
-              excludeFromBasePrivileges: true,
-              management: {
-                'bar-management': ['bar-management-1'],
-              },
-              catalogue: ['bar-catalogue-1'],
-              savedObject: {
-                all: ['bar-savedObject-all-1'],
-                read: ['bar-savedObject-read-1'],
-              },
-              ui: ['bar-ui-1'],
-            },
             all: {
               excludeFromBasePrivileges: true,
               management: {
@@ -771,14 +547,16 @@ describe('features', () => {
               ui: ['read-ui-1'],
             },
           },
-        },
+        }),
       ];
 
       const mockXPackMainPlugin = {
         getFeatures: jest.fn().mockReturnValue(features),
       };
-
-      const privileges = privilegesFactory(actions, mockXPackMainPlugin as any);
+      const mockLicenseService = {
+        getFeatures: jest.fn().mockReturnValue({ allowSubFeaturePrivileges: true }),
+      };
+      const privileges = privilegesFactory(actions, mockXPackMainPlugin as any, mockLicenseService);
 
       const actual = privileges.get();
       expect(actual).toHaveProperty(`${group}.all`, [
@@ -792,7 +570,6 @@ describe('features', () => {
               actions.ui.get('management', 'kibana', 'spaces'),
             ]
           : []),
-        actions.allHack,
       ]);
       expect(actual).toHaveProperty(`${group}.read`, [actions.login, actions.version]);
     });
@@ -800,9 +577,9 @@ describe('features', () => {
 });
 
 describe('reserved', () => {
-  test('actions defined at the feature cascade to the privileges', () => {
+  test('actions defined at the feature do not cascade to the privileges', () => {
     const features: Feature[] = [
-      {
+      new Feature({
         id: 'foo',
         name: 'Foo Feature',
         icon: 'arrowDown',
@@ -812,7 +589,7 @@ describe('reserved', () => {
         management: {
           foo: ['management-1', 'management-2'],
         },
-        privileges: {},
+        privileges: null,
         reserved: {
           privilege: {
             savedObject: {
@@ -823,84 +600,32 @@ describe('reserved', () => {
           },
           description: '',
         },
-      },
+      }),
     ];
 
     const mockXPackMainPlugin = {
       getFeatures: jest.fn().mockReturnValue(features),
     };
-
-    const privileges = privilegesFactory(actions, mockXPackMainPlugin as any);
-
-    const actual = privileges.get();
-    expect(actual).toHaveProperty('reserved.foo', [
-      actions.version,
-      actions.app.get('app-1'),
-      actions.app.get('app-2'),
-      actions.ui.get('catalogue', 'catalogue-1'),
-      actions.ui.get('catalogue', 'catalogue-2'),
-      actions.ui.get('management', 'foo', 'management-1'),
-      actions.ui.get('management', 'foo', 'management-2'),
-      actions.ui.get('navLinks', 'kibana:foo'),
-    ]);
-  });
-
-  test('actions defined at the reservedPrivilege take precedence', () => {
-    const features: Feature[] = [
-      {
-        id: 'foo',
-        name: 'Foo Feature',
-        icon: 'arrowDown',
-        app: ['ignore-me-1', 'ignore-me-2'],
-        catalogue: ['ignore-me-1', 'ignore-me-2'],
-        management: {
-          foo: ['ignore-me-1', 'ignore-me-2'],
-        },
-        privileges: {},
-        reserved: {
-          privilege: {
-            app: ['app-1', 'app-2'],
-            catalogue: ['catalogue-1', 'catalogue-2'],
-            management: {
-              bar: ['management-1', 'management-2'],
-            },
-            savedObject: {
-              all: [],
-              read: [],
-            },
-            ui: [],
-          },
-          description: '',
-        },
-      },
-    ];
-
-    const mockXPackMainPlugin = {
-      getFeatures: jest.fn().mockReturnValue(features),
+    const mockLicenseService = {
+      getFeatures: jest.fn().mockReturnValue({ allowSubFeaturePrivileges: true }),
     };
-
-    const privileges = privilegesFactory(actions, mockXPackMainPlugin as any);
+    const privileges = privilegesFactory(actions, mockXPackMainPlugin as any, mockLicenseService);
 
     const actual = privileges.get();
     expect(actual).toHaveProperty('reserved.foo', [
       actions.version,
-      actions.app.get('app-1'),
-      actions.app.get('app-2'),
-      actions.ui.get('catalogue', 'catalogue-1'),
-      actions.ui.get('catalogue', 'catalogue-2'),
-      actions.ui.get('management', 'bar', 'management-1'),
-      actions.ui.get('management', 'bar', 'management-2'),
+      actions.ui.get('navLinks', 'kibana:foo'),
     ]);
   });
 
   test(`actions only specified at the privilege are alright too`, () => {
     const features: Feature[] = [
-      {
+      new Feature({
         id: 'foo',
         name: 'Foo Feature',
         icon: 'arrowDown',
         app: [],
-        privileges: {},
+        privileges: null,
         reserved: {
           privilege: {
             savedObject: {
@@ -911,14 +636,16 @@ describe('reserved', () => {
           },
           description: '',
         },
-      },
+      }),
     ];
 
     const mockXPackMainPlugin = {
       getFeatures: jest.fn().mockReturnValue(features),
     };
-
-    const privileges = privilegesFactory(actions, mockXPackMainPlugin as any);
+    const mockLicenseService = {
+      getFeatures: jest.fn().mockReturnValue({ allowSubFeaturePrivileges: true }),
+    };
+    const privileges = privilegesFactory(actions, mockXPackMainPlugin as any, mockLicenseService);
 
     const actual = privileges.get();
     expect(actual).toHaveProperty('reserved.foo', [
@@ -952,7 +679,7 @@ describe('reserved', () => {
 
   test(`features with no reservedPrivileges aren't listed`, () => {
     const features: Feature[] = [
-      {
+      new Feature({
         id: 'foo',
         name: 'Foo Feature',
         icon: 'arrowDown',
@@ -965,17 +692,953 @@ describe('reserved', () => {
             },
             ui: ['foo'],
           },
+          read: {
+            savedObject: {
+              all: [],
+              read: [],
+            },
+            ui: ['foo'],
+          },
         },
-      },
+      }),
     ];
 
     const mockXPackMainPlugin = {
       getFeatures: jest.fn().mockReturnValue(features),
     };
-
-    const privileges = privilegesFactory(actions, mockXPackMainPlugin as any);
+    const mockLicenseService = {
+      getFeatures: jest.fn().mockReturnValue({ allowSubFeaturePrivileges: true }),
+    };
+    const privileges = privilegesFactory(actions, mockXPackMainPlugin as any, mockLicenseService);
 
     const actual = privileges.get();
     expect(actual).not.toHaveProperty('reserved.foo');
   });
 });
+
+describe('subFeatures', () => {
+  describe(`with includeIn: 'none'`, () => {
+    test(`should not augment the primary feature privileges, base privileges, or minimal feature privileges`, () => {
+      const features: Feature[] = [
+        new Feature({
+          id: 'foo',
+          name: 'Foo Feature',
+          icon: 'arrowDown',
+          app: [],
+          privileges: {
+            all: {
+              savedObject: {
+                all: [],
+                read: [],
+              },
+              ui: ['foo'],
+            },
+            read: {
+              savedObject: {
+                all: [],
+                read: [],
+              },
+              ui: ['foo'],
+            },
+          },
+          subFeatures: [
+            {
+              name: 'subFeature1',
+              privilegeGroups: [
+                {
+                  groupType: 'independent',
+                  privileges: [
+                    {
+                      id: 'subFeaturePriv1',
+                      name: 'sub feature priv 1',
+                      includeIn: 'none',
+                      savedObject: {
+                        all: ['all-sub-feature-type'],
+                        read: ['read-sub-feature-type'],
+                      },
+                      ui: ['sub-feature-ui'],
+                    },
+                  ],
+                },
+              ],
+            },
+          ],
+        }),
+      ];
+
+      const mockXPackMainPlugin = {
+        getFeatures: jest.fn().mockReturnValue(features),
+      };
+      const mockLicenseService = {
+        getFeatures: jest.fn().mockReturnValue({ allowSubFeaturePrivileges: true }),
+      };
+      const privileges = privilegesFactory(actions, mockXPackMainPlugin as any, mockLicenseService);
+
+      const actual = privileges.get();
+      expect(actual.features).toHaveProperty(`foo.subFeaturePriv1`, [
+        actions.login,
+        actions.version,
+        actions.savedObject.get('all-sub-feature-type', 'bulk_get'),
+        actions.savedObject.get('all-sub-feature-type', 'get'),
+        actions.savedObject.get('all-sub-feature-type', 'find'),
+        actions.savedObject.get('all-sub-feature-type', 'create'),
+        actions.savedObject.get('all-sub-feature-type', 'bulk_create'),
+        actions.savedObject.get('all-sub-feature-type', 'update'),
+        actions.savedObject.get('all-sub-feature-type', 'bulk_update'),
+        actions.savedObject.get('all-sub-feature-type', 'delete'),
+        actions.savedObject.get('read-sub-feature-type', 'bulk_get'),
+        actions.savedObject.get('read-sub-feature-type', 'get'),
+        actions.savedObject.get('read-sub-feature-type', 'find'),
+        actions.ui.get('foo', 'sub-feature-ui'),
+      ]);
+
+      expect(actual.features).toHaveProperty('foo.all', [
+        actions.login,
+        actions.version,
+        actions.ui.get('foo', 'foo'),
+      ]);
+      expect(actual.features).toHaveProperty('foo.minimal_all', [
+        actions.login,
+        actions.version,
+        actions.ui.get('foo', 'foo'),
+      ]);
+
+      expect(actual.features).toHaveProperty('foo.read', [
+        actions.login,
+        actions.version,
+        actions.ui.get('foo', 'foo'),
+      ]);
+      expect(actual.features).toHaveProperty('foo.minimal_read', [
+        actions.login,
+        actions.version,
+        actions.ui.get('foo', 'foo'),
+      ]);
+
+      expect(actual).toHaveProperty('global.all', [
+        actions.login,
+        actions.version,
+        actions.api.get('features'),
+        actions.space.manage,
+        actions.ui.get('spaces', 'manage'),
+        actions.ui.get('management', 'kibana', 'spaces'),
+        actions.ui.get('foo', 'foo'),
+      ]);
+      expect(actual).toHaveProperty('global.read', [
+        actions.login,
+        actions.version,
+        actions.ui.get('foo', 'foo'),
+      ]);
+
+      expect(actual).toHaveProperty('space.all', [
+        actions.login,
+        actions.version,
+        actions.ui.get('foo', 'foo'),
+      ]);
+      expect(actual).toHaveProperty('space.read', [
+        actions.login,
+        actions.version,
+        actions.ui.get('foo', 'foo'),
+      ]);
+    });
+  });
+
+  describe(`with includeIn: 'read'`, () => {
+    test(`should augment the primary feature privileges and base privileges, but never the minimal versions`, () => {
+      const features: Feature[] = [
+        new Feature({
+          id: 'foo',
+          name: 'Foo Feature',
+          icon: 'arrowDown',
+          app: [],
+          privileges: {
+            all: {
+              savedObject: {
+                all: [],
+                read: [],
+              },
+              ui: ['foo'],
+            },
+            read: {
+              savedObject: {
+                all: [],
+                read: [],
+              },
+              ui: ['foo'],
+            },
+          },
+          subFeatures: [
+            {
+              name: 'subFeature1',
+              privilegeGroups: [
+                {
+                  groupType: 'independent',
+                  privileges: [
+                    {
+                      id: 'subFeaturePriv1',
+                      name: 'sub feature priv 1',
+                      includeIn: 'read',
+                      savedObject: {
+                        all: ['all-sub-feature-type'],
+                        read: ['read-sub-feature-type'],
+                      },
+                      ui: ['sub-feature-ui'],
+                    },
+                  ],
+                },
+              ],
+            },
+          ],
+        }),
+      ];
+
+      const mockXPackMainPlugin = {
+        getFeatures: jest.fn().mockReturnValue(features),
+      };
+      const mockLicenseService = {
+        getFeatures: jest.fn().mockReturnValue({ allowSubFeaturePrivileges: true }),
+      };
+      const privileges = privilegesFactory(actions, mockXPackMainPlugin as any, mockLicenseService);
+
+      const actual = privileges.get();
+      expect(actual.features).toHaveProperty(`foo.subFeaturePriv1`, [
+        actions.login,
+        actions.version,
+        actions.savedObject.get('all-sub-feature-type', 'bulk_get'),
+        actions.savedObject.get('all-sub-feature-type', 'get'),
+        actions.savedObject.get('all-sub-feature-type', 'find'),
+        actions.savedObject.get('all-sub-feature-type', 'create'),
+        actions.savedObject.get('all-sub-feature-type', 'bulk_create'),
+        actions.savedObject.get('all-sub-feature-type', 'update'),
+        actions.savedObject.get('all-sub-feature-type', 'bulk_update'),
+        actions.savedObject.get('all-sub-feature-type', 'delete'),
+        actions.savedObject.get('read-sub-feature-type', 'bulk_get'),
+        actions.savedObject.get('read-sub-feature-type', 'get'),
+        actions.savedObject.get('read-sub-feature-type', 'find'),
+        actions.ui.get('foo', 'sub-feature-ui'),
+      ]);
+
+      expect(actual.features).toHaveProperty(`foo.all`, [
+        actions.login,
+        actions.version,
+        actions.savedObject.get('all-sub-feature-type', 'bulk_get'),
+        actions.savedObject.get('all-sub-feature-type', 'get'),
+        actions.savedObject.get('all-sub-feature-type', 'find'),
+        actions.savedObject.get('all-sub-feature-type', 'create'),
+        actions.savedObject.get('all-sub-feature-type', 'bulk_create'),
+        actions.savedObject.get('all-sub-feature-type', 'update'),
+        actions.savedObject.get('all-sub-feature-type', 'bulk_update'),
+        actions.savedObject.get('all-sub-feature-type', 'delete'),
+        actions.savedObject.get('read-sub-feature-type', 'bulk_get'),
+        actions.savedObject.get('read-sub-feature-type', 'get'),
+        actions.savedObject.get('read-sub-feature-type', 'find'),
+        actions.ui.get('foo', 'foo'),
+        actions.ui.get('foo', 'sub-feature-ui'),
+      ]);
+
+      expect(actual.features).toHaveProperty(`foo.minimal_all`, [
+        actions.login,
+        actions.version,
+        actions.ui.get('foo', 'foo'),
+      ]);
+
+      expect(actual.features).toHaveProperty(`foo.read`, [
+        actions.login,
+        actions.version,
+        actions.savedObject.get('all-sub-feature-type', 'bulk_get'),
+        actions.savedObject.get('all-sub-feature-type', 'get'),
+        actions.savedObject.get('all-sub-feature-type', 'find'),
+        actions.savedObject.get('all-sub-feature-type', 'create'),
+        actions.savedObject.get('all-sub-feature-type', 'bulk_create'),
+        actions.savedObject.get('all-sub-feature-type', 'update'),
+        actions.savedObject.get('all-sub-feature-type', 'bulk_update'),
+        actions.savedObject.get('all-sub-feature-type', 'delete'),
+        actions.savedObject.get('read-sub-feature-type', 'bulk_get'),
+        actions.savedObject.get('read-sub-feature-type', 'get'),
+        actions.savedObject.get('read-sub-feature-type', 'find'),
+        actions.ui.get('foo', 'foo'),
+        actions.ui.get('foo', 'sub-feature-ui'),
+      ]);
+
+      expect(actual.features).toHaveProperty(`foo.minimal_read`, [
+        actions.login,
+        actions.version,
+        actions.ui.get('foo', 'foo'),
+      ]);
+
+      expect(actual).toHaveProperty('global.all', [
+        actions.login,
+        actions.version,
+        actions.api.get('features'),
+        actions.space.manage,
+        actions.ui.get('spaces', 'manage'),
+        actions.ui.get('management', 'kibana', 'spaces'),
+        actions.savedObject.get('all-sub-feature-type', 'bulk_get'),
+        actions.savedObject.get('all-sub-feature-type', 'get'),
+        actions.savedObject.get('all-sub-feature-type', 'find'),
+        actions.savedObject.get('all-sub-feature-type', 'create'),
+        actions.savedObject.get('all-sub-feature-type', 'bulk_create'),
+        actions.savedObject.get('all-sub-feature-type', 'update'),
+        actions.savedObject.get('all-sub-feature-type', 'bulk_update'),
+        actions.savedObject.get('all-sub-feature-type', 'delete'),
+        actions.savedObject.get('read-sub-feature-type', 'bulk_get'),
+        actions.savedObject.get('read-sub-feature-type', 'get'),
+        actions.savedObject.get('read-sub-feature-type', 'find'),
+        actions.ui.get('foo', 'foo'),
+        actions.ui.get('foo', 'sub-feature-ui'),
+      ]);
+      expect(actual).toHaveProperty('global.read', [
+        actions.login,
+        actions.version,
+        actions.savedObject.get('all-sub-feature-type', 'bulk_get'),
+        actions.savedObject.get('all-sub-feature-type', 'get'),
+        actions.savedObject.get('all-sub-feature-type', 'find'),
+        actions.savedObject.get('all-sub-feature-type', 'create'),
+        actions.savedObject.get('all-sub-feature-type', 'bulk_create'),
+        actions.savedObject.get('all-sub-feature-type', 'update'),
+        actions.savedObject.get('all-sub-feature-type', 'bulk_update'),
+        actions.savedObject.get('all-sub-feature-type', 'delete'),
+        actions.savedObject.get('read-sub-feature-type', 'bulk_get'),
+        actions.savedObject.get('read-sub-feature-type', 'get'),
+        actions.savedObject.get('read-sub-feature-type', 'find'),
+        actions.ui.get('foo', 'foo'),
+        actions.ui.get('foo', 'sub-feature-ui'),
+      ]);
+
+      expect(actual).toHaveProperty('space.all', [
+        actions.login,
+        actions.version,
+        actions.savedObject.get('all-sub-feature-type', 'bulk_get'),
+        actions.savedObject.get('all-sub-feature-type', 'get'),
+        actions.savedObject.get('all-sub-feature-type', 'find'),
+        actions.savedObject.get('all-sub-feature-type', 'create'),
+        actions.savedObject.get('all-sub-feature-type', 'bulk_create'),
+        actions.savedObject.get('all-sub-feature-type', 'update'),
+        actions.savedObject.get('all-sub-feature-type', 'bulk_update'),
+        actions.savedObject.get('all-sub-feature-type', 'delete'),
+        actions.savedObject.get('read-sub-feature-type', 'bulk_get'),
+        actions.savedObject.get('read-sub-feature-type', 'get'),
+        actions.savedObject.get('read-sub-feature-type', 'find'),
+        actions.ui.get('foo', 'foo'),
+        actions.ui.get('foo', 'sub-feature-ui'),
+      ]);
+      expect(actual).toHaveProperty('space.read', [
+        actions.login,
+        actions.version,
+        actions.savedObject.get('all-sub-feature-type', 'bulk_get'),
+        actions.savedObject.get('all-sub-feature-type', 'get'),
+        actions.savedObject.get('all-sub-feature-type', 'find'),
+        actions.savedObject.get('all-sub-feature-type', 'create'),
+        actions.savedObject.get('all-sub-feature-type', 'bulk_create'),
+        actions.savedObject.get('all-sub-feature-type', 'update'),
+        actions.savedObject.get('all-sub-feature-type', 'bulk_update'),
+        actions.savedObject.get('all-sub-feature-type', 'delete'),
+        actions.savedObject.get('read-sub-feature-type', 'bulk_get'),
+        actions.savedObject.get('read-sub-feature-type', 'get'),
+        actions.savedObject.get('read-sub-feature-type', 'find'),
+        actions.ui.get('foo', 'foo'),
+        actions.ui.get('foo', 'sub-feature-ui'),
+      ]);
+    });
+
+    test(`should augment the primary feature privileges, but not base privileges if feature is excluded from them.`, () => {
+      const features: Feature[] = [
+        new Feature({
+          id: 'foo',
+          name: 'Foo Feature',
+          icon: 'arrowDown',
+          app: [],
+          excludeFromBasePrivileges: true,
+          privileges: {
+            all: {
+              savedObject: {
+                all: [],
+                read: [],
+              },
+              ui: ['foo'],
+            },
+            read: {
+              savedObject: {
+                all: [],
+                read: [],
+              },
+              ui: ['foo'],
+            },
+          },
+          subFeatures: [
+            {
+              name: 'subFeature1',
+              privilegeGroups: [
+                {
+                  groupType: 'independent',
+                  privileges: [
+                    {
+                      id: 'subFeaturePriv1',
+                      name: 'sub feature priv 1',
+                      includeIn: 'read',
+                      savedObject: {
+                        all: ['all-sub-feature-type'],
+                        read: ['read-sub-feature-type'],
+                      },
+                      ui: ['sub-feature-ui'],
+                    },
+                  ],
+                },
+              ],
+            },
+          ],
+        }),
+      ];
+
+      const mockXPackMainPlugin = {
+        getFeatures: jest.fn().mockReturnValue(features),
+      };
+      const mockLicenseService = {
+        getFeatures: jest.fn().mockReturnValue({ allowSubFeaturePrivileges: true }),
+      };
+      const privileges = privilegesFactory(actions, mockXPackMainPlugin as any, mockLicenseService);
+
+      const actual = privileges.get();
+      expect(actual.features).toHaveProperty(`foo.subFeaturePriv1`, [
+        actions.login,
+        actions.version,
+        actions.savedObject.get('all-sub-feature-type', 'bulk_get'),
+        actions.savedObject.get('all-sub-feature-type', 'get'),
+        actions.savedObject.get('all-sub-feature-type', 'find'),
+        actions.savedObject.get('all-sub-feature-type', 'create'),
+        actions.savedObject.get('all-sub-feature-type', 'bulk_create'),
+        actions.savedObject.get('all-sub-feature-type', 'update'),
+        actions.savedObject.get('all-sub-feature-type', 'bulk_update'),
+        actions.savedObject.get('all-sub-feature-type', 'delete'),
+        actions.savedObject.get('read-sub-feature-type', 'bulk_get'),
+        actions.savedObject.get('read-sub-feature-type', 'get'),
+        actions.savedObject.get('read-sub-feature-type', 'find'),
+        actions.ui.get('foo', 'sub-feature-ui'),
+      ]);
+
+      expect(actual.features).toHaveProperty(`foo.all`, [
+        actions.login,
+        actions.version,
+        actions.savedObject.get('all-sub-feature-type', 'bulk_get'),
+        actions.savedObject.get('all-sub-feature-type', 'get'),
+        actions.savedObject.get('all-sub-feature-type', 'find'),
+        actions.savedObject.get('all-sub-feature-type', 'create'),
+        actions.savedObject.get('all-sub-feature-type', 'bulk_create'),
+        actions.savedObject.get('all-sub-feature-type', 'update'),
+        actions.savedObject.get('all-sub-feature-type', 'bulk_update'),
+        actions.savedObject.get('all-sub-feature-type', 'delete'),
+        actions.savedObject.get('read-sub-feature-type', 'bulk_get'),
+        actions.savedObject.get('read-sub-feature-type', 'get'),
+        actions.savedObject.get('read-sub-feature-type', 'find'),
+        actions.ui.get('foo', 'foo'),
+        actions.ui.get('foo', 'sub-feature-ui'),
+      ]);
+
+      expect(actual.features).toHaveProperty(`foo.minimal_all`, [
+        actions.login,
+        actions.version,
+        actions.ui.get('foo', 'foo'),
+      ]);
+
+      expect(actual.features).toHaveProperty(`foo.read`, [
+        actions.login,
+        actions.version,
+        actions.savedObject.get('all-sub-feature-type', 'bulk_get'),
+        actions.savedObject.get('all-sub-feature-type', 'get'),
+        actions.savedObject.get('all-sub-feature-type', 'find'),
+        actions.savedObject.get('all-sub-feature-type', 'create'),
+        actions.savedObject.get('all-sub-feature-type', 'bulk_create'),
+        actions.savedObject.get('all-sub-feature-type', 'update'),
+        actions.savedObject.get('all-sub-feature-type', 'bulk_update'),
+        actions.savedObject.get('all-sub-feature-type', 'delete'),
+        actions.savedObject.get('read-sub-feature-type', 'bulk_get'),
+        actions.savedObject.get('read-sub-feature-type', 'get'),
+        actions.savedObject.get('read-sub-feature-type', 'find'),
+        actions.ui.get('foo', 'foo'),
+        actions.ui.get('foo', 'sub-feature-ui'),
+      ]);
+
+      expect(actual.features).toHaveProperty(`foo.minimal_read`, [
+        actions.login,
+        actions.version,
+        actions.ui.get('foo', 'foo'),
+      ]);
+
+      expect(actual).toHaveProperty('global.all', [
+        actions.login,
+        actions.version,
+        actions.api.get('features'),
+        actions.space.manage,
+        actions.ui.get('spaces', 'manage'),
+        actions.ui.get('management', 'kibana', 'spaces'),
+      ]);
+      expect(actual).toHaveProperty('global.read', [actions.login, actions.version]);
+
+      expect(actual).toHaveProperty('space.all', [actions.login, actions.version]);
+      expect(actual).toHaveProperty('space.read', [actions.login, actions.version]);
+    });
+  });
+
+  describe(`with includeIn: 'all'`, () => {
+    test(`should augment the primary 'all' feature privileges and base 'all' privileges, but never the minimal versions`, () => {
+      const features: Feature[] = [
+        new Feature({
+          id: 'foo',
+          name: 'Foo Feature',
+          icon: 'arrowDown',
+          app: [],
+          privileges: {
+            all: {
+              savedObject: {
+                all: [],
+                read: [],
+              },
+              ui: ['foo'],
+            },
+            read: {
+              savedObject: {
+                all: [],
+                read: [],
+              },
+              ui: ['foo'],
+            },
+          },
+          subFeatures: [
+            {
+              name: 'subFeature1',
+              privilegeGroups: [
+                {
+                  groupType: 'independent',
+                  privileges: [
+                    {
+                      id: 'subFeaturePriv1',
+                      name: 'sub feature priv 1',
+                      includeIn: 'all',
+                      savedObject: {
+                        all: ['all-sub-feature-type'],
+                        read: ['read-sub-feature-type'],
+                      },
+                      ui: ['sub-feature-ui'],
+                    },
+                  ],
+                },
+              ],
+            },
+          ],
+        }),
+      ];
+
+      const mockXPackMainPlugin = {
+        getFeatures: jest.fn().mockReturnValue(features),
+      };
+      const mockLicenseService = {
+        getFeatures: jest.fn().mockReturnValue({ allowSubFeaturePrivileges: true }),
+      };
+      const privileges = privilegesFactory(actions, mockXPackMainPlugin as any, mockLicenseService);
+
+      const actual = privileges.get();
+      expect(actual.features).toHaveProperty(`foo.subFeaturePriv1`, [
+        actions.login,
+        actions.version,
+        actions.savedObject.get('all-sub-feature-type', 'bulk_get'),
+        actions.savedObject.get('all-sub-feature-type', 'get'),
+        actions.savedObject.get('all-sub-feature-type', 'find'),
+        actions.savedObject.get('all-sub-feature-type', 'create'),
+        actions.savedObject.get('all-sub-feature-type', 'bulk_create'),
+        actions.savedObject.get('all-sub-feature-type', 'update'),
+        actions.savedObject.get('all-sub-feature-type', 'bulk_update'),
+        actions.savedObject.get('all-sub-feature-type', 'delete'),
+        actions.savedObject.get('read-sub-feature-type', 'bulk_get'),
+        actions.savedObject.get('read-sub-feature-type', 'get'),
+        actions.savedObject.get('read-sub-feature-type', 'find'),
+        actions.ui.get('foo', 'sub-feature-ui'),
+      ]);
+
+      expect(actual.features).toHaveProperty(`foo.all`, [
+        actions.login,
+        actions.version,
+        actions.savedObject.get('all-sub-feature-type', 'bulk_get'),
+        actions.savedObject.get('all-sub-feature-type', 'get'),
+        actions.savedObject.get('all-sub-feature-type', 'find'),
+        actions.savedObject.get('all-sub-feature-type', 'create'),
+        actions.savedObject.get('all-sub-feature-type', 'bulk_create'),
+        actions.savedObject.get('all-sub-feature-type', 'update'),
+        actions.savedObject.get('all-sub-feature-type', 'bulk_update'),
+        actions.savedObject.get('all-sub-feature-type', 'delete'),
+        actions.savedObject.get('read-sub-feature-type', 'bulk_get'),
+        actions.savedObject.get('read-sub-feature-type', 'get'),
+        actions.savedObject.get('read-sub-feature-type', 'find'),
+        actions.ui.get('foo', 'foo'),
+        actions.ui.get('foo', 'sub-feature-ui'),
+      ]);
+
+      expect(actual.features).toHaveProperty(`foo.minimal_all`, [
+        actions.login,
+        actions.version,
+        actions.ui.get('foo', 'foo'),
+      ]);
+
+      expect(actual.features).toHaveProperty(`foo.read`, [
+        actions.login,
+        actions.version,
+        actions.ui.get('foo', 'foo'),
+      ]);
+
+      expect(actual.features).toHaveProperty(`foo.minimal_read`, [
+        actions.login,
+        actions.version,
+        actions.ui.get('foo', 'foo'),
+      ]);
+
+      expect(actual).toHaveProperty('global.all', [
+        actions.login,
+        actions.version,
+        actions.api.get('features'),
+        actions.space.manage,
+        actions.ui.get('spaces', 'manage'),
+        actions.ui.get('management', 'kibana', 'spaces'),
+        actions.savedObject.get('all-sub-feature-type', 'bulk_get'),
+        actions.savedObject.get('all-sub-feature-type', 'get'),
+        actions.savedObject.get('all-sub-feature-type', 'find'),
+        actions.savedObject.get('all-sub-feature-type', 'create'),
+        actions.savedObject.get('all-sub-feature-type', 'bulk_create'),
+        actions.savedObject.get('all-sub-feature-type', 'update'),
+        actions.savedObject.get('all-sub-feature-type', 'bulk_update'),
+        actions.savedObject.get('all-sub-feature-type', 'delete'),
+        actions.savedObject.get('read-sub-feature-type', 'bulk_get'),
+        actions.savedObject.get('read-sub-feature-type', 'get'),
+        actions.savedObject.get('read-sub-feature-type', 'find'),
+        actions.ui.get('foo', 'foo'),
+        actions.ui.get('foo', 'sub-feature-ui'),
+      ]);
+      expect(actual).toHaveProperty('global.read', [
+        actions.login,
+        actions.version,
+        actions.ui.get('foo', 'foo'),
+      ]);
+
+      expect(actual).toHaveProperty('space.all', [
+        actions.login,
+        actions.version,
+        actions.savedObject.get('all-sub-feature-type', 'bulk_get'),
+        actions.savedObject.get('all-sub-feature-type', 'get'),
+        actions.savedObject.get('all-sub-feature-type', 'find'),
+        actions.savedObject.get('all-sub-feature-type', 'create'),
+        actions.savedObject.get('all-sub-feature-type', 'bulk_create'),
+        actions.savedObject.get('all-sub-feature-type', 'update'),
+        actions.savedObject.get('all-sub-feature-type', 'bulk_update'),
+        actions.savedObject.get('all-sub-feature-type', 'delete'),
+        actions.savedObject.get('read-sub-feature-type', 'bulk_get'),
+        actions.savedObject.get('read-sub-feature-type', 'get'),
+        actions.savedObject.get('read-sub-feature-type', 'find'),
+        actions.ui.get('foo', 'foo'),
+        actions.ui.get('foo', 'sub-feature-ui'),
+      ]);
+      expect(actual).toHaveProperty('space.read', [
+        actions.login,
+        actions.version,
+        actions.ui.get('foo', 'foo'),
+      ]);
+    });
+
+    test(`should augment the primary 'all' feature privileges, but not the base privileges if the feature is excluded from them`, () => {
+      const features: Feature[] = [
+        new Feature({
+          id: 'foo',
+          name: 'Foo Feature',
+          icon: 'arrowDown',
+          app: [],
+          excludeFromBasePrivileges: true,
+          privileges: {
+            all: {
+              savedObject: {
+                all: [],
+                read: [],
+              },
+              ui: ['foo'],
+            },
+            read: {
+              savedObject: {
+                all: [],
+                read: [],
+              },
+              ui: ['foo'],
+            },
+          },
+          subFeatures: [
+            {
+              name: 'subFeature1',
+              privilegeGroups: [
+                {
+                  groupType: 'independent',
+                  privileges: [
+                    {
+                      id: 'subFeaturePriv1',
+                      name: 'sub feature priv 1',
+                      includeIn: 'all',
+                      savedObject: {
+                        all: ['all-sub-feature-type'],
+                        read: ['read-sub-feature-type'],
+                      },
+                      ui: ['sub-feature-ui'],
+                    },
+                  ],
+                },
+              ],
+            },
+          ],
+        }),
+      ];
+
+      const mockXPackMainPlugin = {
+        getFeatures: jest.fn().mockReturnValue(features),
+      };
+      const mockLicenseService = {
+        getFeatures: jest.fn().mockReturnValue({ allowSubFeaturePrivileges: true }),
+      };
+      const privileges = privilegesFactory(actions, mockXPackMainPlugin as any, mockLicenseService);
+
+      const actual = privileges.get();
+      expect(actual.features).toHaveProperty(`foo.subFeaturePriv1`, [
+        actions.login,
+        actions.version,
+        actions.savedObject.get('all-sub-feature-type', 'bulk_get'),
+        actions.savedObject.get('all-sub-feature-type', 'get'),
+        actions.savedObject.get('all-sub-feature-type', 'find'),
+        actions.savedObject.get('all-sub-feature-type', 'create'),
+        actions.savedObject.get('all-sub-feature-type', 'bulk_create'),
+        actions.savedObject.get('all-sub-feature-type', 'update'),
+        actions.savedObject.get('all-sub-feature-type', 'bulk_update'),
+        actions.savedObject.get('all-sub-feature-type', 'delete'),
+        actions.savedObject.get('read-sub-feature-type', 'bulk_get'),
+        actions.savedObject.get('read-sub-feature-type', 'get'),
+        actions.savedObject.get('read-sub-feature-type', 'find'),
+        actions.ui.get('foo', 'sub-feature-ui'),
+      ]);
+
+      expect(actual.features).toHaveProperty(`foo.all`, [
+        actions.login,
+        actions.version,
+        actions.savedObject.get('all-sub-feature-type', 'bulk_get'),
+        actions.savedObject.get('all-sub-feature-type', 'get'),
+        actions.savedObject.get('all-sub-feature-type', 'find'),
+        actions.savedObject.get('all-sub-feature-type', 'create'),
+        actions.savedObject.get('all-sub-feature-type', 'bulk_create'),
+        actions.savedObject.get('all-sub-feature-type', 'update'),
+        actions.savedObject.get('all-sub-feature-type', 'bulk_update'),
+        actions.savedObject.get('all-sub-feature-type', 'delete'),
+        actions.savedObject.get('read-sub-feature-type', 'bulk_get'),
+        actions.savedObject.get('read-sub-feature-type', 'get'),
+        actions.savedObject.get('read-sub-feature-type', 'find'),
+        actions.ui.get('foo', 'foo'),
+        actions.ui.get('foo', 'sub-feature-ui'),
+      ]);
+
+      expect(actual.features).toHaveProperty(`foo.minimal_all`, [
+        actions.login,
+        actions.version,
+        actions.ui.get('foo', 'foo'),
+      ]);
+
+      expect(actual.features).toHaveProperty(`foo.read`, [
+        actions.login,
+        actions.version,
+        actions.ui.get('foo', 'foo'),
+      ]);
+
+      expect(actual.features).toHaveProperty(`foo.minimal_read`, [
+        actions.login,
+        actions.version,
+        actions.ui.get('foo', 'foo'),
+      ]);
+
+      expect(actual).toHaveProperty('global.all', [
+        actions.login,
+        actions.version,
+        actions.api.get('features'),
+        actions.space.manage,
+        actions.ui.get('spaces', 'manage'),
+        actions.ui.get('management', 'kibana', 'spaces'),
+      ]);
+      expect(actual).toHaveProperty('global.read', [actions.login, actions.version]);
+
+      expect(actual).toHaveProperty('space.all', [actions.login, actions.version]);
+      expect(actual).toHaveProperty('space.read', [actions.login, actions.version]);
+    });
+  });
+
+  describe(`when license does not allow sub features`, () => {
+    test(`should augment the primary feature privileges, and should not create minimal or sub-feature privileges`, () => {
+      const features: Feature[] = [
+        new Feature({
+          id: 'foo',
+          name: 'Foo Feature',
+          icon: 'arrowDown',
+          app: [],
+          privileges: {
+            all: {
+              savedObject: {
+                all: [],
+                read: [],
+              },
+              ui: ['foo'],
+            },
+            read: {
+              savedObject: {
+                all: [],
+                read: [],
+              },
+              ui: ['foo'],
+            },
+          },
+          subFeatures: [
+            {
+              name: 'subFeature1',
+              privilegeGroups: [
+                {
+                  groupType: 'independent',
+                  privileges: [
+                    {
+                      id: 'subFeaturePriv1',
+                      name: 'sub feature priv 1',
+                      includeIn: 'read',
+                      savedObject: {
+                        all: ['all-sub-feature-type'],
+                        read: ['read-sub-feature-type'],
+                      },
+                      ui: ['sub-feature-ui'],
+                    },
+                  ],
+                },
+              ],
+            },
+          ],
+        }),
+      ];
+
+      const mockXPackMainPlugin = {
+        getFeatures: jest.fn().mockReturnValue(features),
+      };
+      const mockLicenseService = {
+        getFeatures: jest.fn().mockReturnValue({ allowSubFeaturePrivileges: false }),
+      };
+      const privileges = privilegesFactory(actions, mockXPackMainPlugin as any, mockLicenseService);
+
+      const actual = privileges.get();
+      expect(actual.features).not.toHaveProperty(`foo.subFeaturePriv1`);
+
+      expect(actual.features).toHaveProperty(`foo.all`, [
+        actions.login,
+        actions.version,
+        actions.savedObject.get('all-sub-feature-type', 'bulk_get'),
+        actions.savedObject.get('all-sub-feature-type', 'get'),
+        actions.savedObject.get('all-sub-feature-type', 'find'),
+        actions.savedObject.get('all-sub-feature-type', 'create'),
+        actions.savedObject.get('all-sub-feature-type', 'bulk_create'),
+        actions.savedObject.get('all-sub-feature-type', 'update'),
+        actions.savedObject.get('all-sub-feature-type', 'bulk_update'),
+        actions.savedObject.get('all-sub-feature-type', 'delete'),
+        actions.savedObject.get('read-sub-feature-type', 'bulk_get'),
+        actions.savedObject.get('read-sub-feature-type', 'get'),
+        actions.savedObject.get('read-sub-feature-type', 'find'),
+        actions.ui.get('foo', 'foo'),
+        actions.ui.get('foo', 'sub-feature-ui'),
+      ]);
+
+      expect(actual.features).not.toHaveProperty(`foo.minimal_all`);
+
+      expect(actual.features).toHaveProperty(`foo.read`, [
+        actions.login,
+        actions.version,
+        actions.savedObject.get('all-sub-feature-type', 'bulk_get'),
+        actions.savedObject.get('all-sub-feature-type', 'get'),
+        actions.savedObject.get('all-sub-feature-type', 'find'),
+        actions.savedObject.get('all-sub-feature-type', 'create'),
+        actions.savedObject.get('all-sub-feature-type', 'bulk_create'),
+        actions.savedObject.get('all-sub-feature-type', 'update'),
+        actions.savedObject.get('all-sub-feature-type', 'bulk_update'),
+        actions.savedObject.get('all-sub-feature-type', 'delete'),
+        actions.savedObject.get('read-sub-feature-type', 'bulk_get'),
+        actions.savedObject.get('read-sub-feature-type', 'get'),
+        actions.savedObject.get('read-sub-feature-type', 'find'),
+        actions.ui.get('foo', 'foo'),
+        actions.ui.get('foo', 'sub-feature-ui'),
+      ]);
+
+      expect(actual.features).not.toHaveProperty(`foo.minimal_read`);
+
+      expect(actual).toHaveProperty('global.all', [
+        actions.login,
+        actions.version,
+        actions.api.get('features'),
+        actions.space.manage,
+        actions.ui.get('spaces', 'manage'),
+        actions.ui.get('management', 'kibana', 'spaces'),
+        actions.savedObject.get('all-sub-feature-type', 'bulk_get'),
+        actions.savedObject.get('all-sub-feature-type', 'get'),
+        actions.savedObject.get('all-sub-feature-type', 'find'),
+        actions.savedObject.get('all-sub-feature-type', 'create'),
+        actions.savedObject.get('all-sub-feature-type', 'bulk_create'),
+        actions.savedObject.get('all-sub-feature-type', 'update'),
+        actions.savedObject.get('all-sub-feature-type', 'bulk_update'),
+        actions.savedObject.get('all-sub-feature-type', 'delete'),
+        actions.savedObject.get('read-sub-feature-type', 'bulk_get'),
+        actions.savedObject.get('read-sub-feature-type', 'get'),
+        actions.savedObject.get('read-sub-feature-type', 'find'),
+        actions.ui.get('foo', 'foo'),
+        actions.ui.get('foo', 'sub-feature-ui'),
+      ]);
+      expect(actual).toHaveProperty('global.read', [
+        actions.login,
+        actions.version,
+        actions.savedObject.get('all-sub-feature-type', 'bulk_get'),
+        actions.savedObject.get('all-sub-feature-type', 'get'),
+        actions.savedObject.get('all-sub-feature-type', 'find'),
+        actions.savedObject.get('all-sub-feature-type', 'create'),
+        actions.savedObject.get('all-sub-feature-type', 'bulk_create'),
+        actions.savedObject.get('all-sub-feature-type', 'update'),
+        actions.savedObject.get('all-sub-feature-type', 'bulk_update'),
+        actions.savedObject.get('all-sub-feature-type', 'delete'),
+        actions.savedObject.get('read-sub-feature-type', 'bulk_get'),
+        actions.savedObject.get('read-sub-feature-type', 'get'),
+        actions.savedObject.get('read-sub-feature-type', 'find'),
+        actions.ui.get('foo', 'foo'),
+        actions.ui.get('foo', 'sub-feature-ui'),
+      ]);
+
+      expect(actual).toHaveProperty('space.all', [
+        actions.login,
+        actions.version,
+        actions.savedObject.get('all-sub-feature-type', 'bulk_get'),
+        actions.savedObject.get('all-sub-feature-type', 'get'),
+        actions.savedObject.get('all-sub-feature-type', 'find'),
+        actions.savedObject.get('all-sub-feature-type', 'create'),
+        actions.savedObject.get('all-sub-feature-type', 'bulk_create'),
+        actions.savedObject.get('all-sub-feature-type', 'update'),
+        actions.savedObject.get('all-sub-feature-type', 'bulk_update'),
+        actions.savedObject.get('all-sub-feature-type', 'delete'),
+        actions.savedObject.get('read-sub-feature-type', 'bulk_get'),
+        actions.savedObject.get('read-sub-feature-type', 'get'),
+        actions.savedObject.get('read-sub-feature-type', 'find'),
+        actions.ui.get('foo', 'foo'),
+        actions.ui.get('foo', 'sub-feature-ui'),
+      ]);
+      expect(actual).toHaveProperty('space.read', [
+        actions.login,
+        actions.version,
+        actions.savedObject.get('all-sub-feature-type', 'bulk_get'),
+        actions.savedObject.get('all-sub-feature-type', 'get'),
+        actions.savedObject.get('all-sub-feature-type', 'find'),
+        actions.savedObject.get('all-sub-feature-type', 'create'),
+        actions.savedObject.get('all-sub-feature-type', 'bulk_create'),
+        actions.savedObject.get('all-sub-feature-type', 'update'),
+        actions.savedObject.get('all-sub-feature-type', 'bulk_update'),
+        actions.savedObject.get('all-sub-feature-type', 'delete'),
+        actions.savedObject.get('read-sub-feature-type', 'bulk_get'),
+        actions.savedObject.get('read-sub-feature-type', 'get'),
+        actions.savedObject.get('read-sub-feature-type', 'find'),
+        actions.ui.get('foo', 'foo'),
+        actions.ui.get('foo', 'sub-feature-ui'),
+      ]);
+    });
+  });
+});
diff --git a/x-pack/plugins/security/server/authorization/privileges/privileges.ts b/x-pack/plugins/security/server/authorization/privileges/privileges.ts
index c73c4be8f36ac..b25aad30a3423 100644
--- a/x-pack/plugins/security/server/authorization/privileges/privileges.ts
+++ b/x-pack/plugins/security/server/authorization/privileges/privileges.ts
@@ -4,65 +4,94 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { flatten, mapValues, uniq } from 'lodash';
+import { uniq } from 'lodash';
+import { SecurityLicense } from '../../../common/licensing';
 import { Feature } from '../../../../features/server';
-import { RawKibanaFeaturePrivileges, RawKibanaPrivileges } from '../../../common/model';
+import { RawKibanaPrivileges } from '../../../common/model';
 import { Actions } from '../actions';
 import { featurePrivilegeBuilderFactory } from './feature_privilege_builder';
 import { FeaturesService } from '../../plugin';
+import {
+  featurePrivilegeIterator,
+  subFeaturePrivilegeIterator,
+} from './feature_privilege_iterator';
 
 export interface PrivilegesService {
   get(): RawKibanaPrivileges;
 }
 
-export function privilegesFactory(actions: Actions, featuresService: FeaturesService) {
+export function privilegesFactory(
+  actions: Actions,
+  featuresService: FeaturesService,
+  licenseService: Pick<SecurityLicense, 'getFeatures'>
+) {
   const featurePrivilegeBuilder = featurePrivilegeBuilderFactory(actions);
 
   return {
     get() {
       const features = featuresService.getFeatures();
+      const { allowSubFeaturePrivileges } = licenseService.getFeatures();
       const basePrivilegeFeatures = features.filter(feature => !feature.excludeFromBasePrivileges);
 
-      const allActions = uniq(
-        flatten(
-          basePrivilegeFeatures.map(feature =>
-            Object.values(feature.privileges).reduce<string[]>((acc, privilege) => {
-              if (privilege.excludeFromBasePrivileges) {
-                return acc;
-              }
+      let allActions: string[] = [];
+      let readActions: string[] = [];
 
-              return [...acc, ...featurePrivilegeBuilder.getActions(privilege, feature)];
-            }, [])
-          )
-        )
-      );
+      basePrivilegeFeatures.forEach(feature => {
+        for (const { privilegeId, privilege } of featurePrivilegeIterator(feature, {
+          augmentWithSubFeaturePrivileges: true,
+          predicate: (pId, featurePrivilege) => !featurePrivilege.excludeFromBasePrivileges,
+        })) {
+          const privilegeActions = featurePrivilegeBuilder.getActions(privilege, feature);
+          allActions = [...allActions, ...privilegeActions];
+          if (privilegeId === 'read') {
+            readActions = [...readActions, ...privilegeActions];
+          }
+        }
+      });
 
-      const readActions = uniq(
-        flatten(
-          basePrivilegeFeatures.map(feature =>
-            Object.entries(feature.privileges).reduce<string[]>((acc, [privilegeId, privilege]) => {
-              if (privilegeId !== 'read' || privilege.excludeFromBasePrivileges) {
-                return acc;
-              }
+      allActions = uniq(allActions);
+      readActions = uniq(readActions);
 
-              return [...acc, ...featurePrivilegeBuilder.getActions(privilege, feature)];
-            }, [])
-          )
-        )
-      );
+      const featurePrivileges: Record<string, Record<string, string[]>> = {};
+      for (const feature of features) {
+        featurePrivileges[feature.id] = {};
+        for (const featurePrivilege of featurePrivilegeIterator(feature, {
+          augmentWithSubFeaturePrivileges: true,
+        })) {
+          featurePrivileges[feature.id][featurePrivilege.privilegeId] = [
+            actions.login,
+            actions.version,
+            ...uniq(featurePrivilegeBuilder.getActions(featurePrivilege.privilege, feature)),
+          ];
+        }
 
-      return {
-        features: features.reduce((acc: RawKibanaFeaturePrivileges, feature: Feature) => {
-          if (Object.keys(feature.privileges).length > 0) {
-            acc[feature.id] = mapValues(feature.privileges, (privilege, privilegeId) => [
+        if (allowSubFeaturePrivileges && feature.subFeatures?.length > 0) {
+          for (const featurePrivilege of featurePrivilegeIterator(feature, {
+            augmentWithSubFeaturePrivileges: false,
+          })) {
+            featurePrivileges[feature.id][`minimal_${featurePrivilege.privilegeId}`] = [
               actions.login,
               actions.version,
-              ...featurePrivilegeBuilder.getActions(privilege, feature),
-              ...(privilegeId === 'all' ? [actions.allHack] : []),
-            ]);
+              ...uniq(featurePrivilegeBuilder.getActions(featurePrivilege.privilege, feature)),
+            ];
           }
-          return acc;
-        }, {}),
+
+          for (const subFeaturePrivilege of subFeaturePrivilegeIterator(feature)) {
+            featurePrivileges[feature.id][subFeaturePrivilege.id] = [
+              actions.login,
+              actions.version,
+              ...uniq(featurePrivilegeBuilder.getActions(subFeaturePrivilege, feature)),
+            ];
+          }
+        }
+
+        if (Object.keys(featurePrivileges[feature.id]).length === 0) {
+          delete featurePrivileges[feature.id];
+        }
+      }
+
+      return {
+        features: featurePrivileges,
         global: {
           all: [
             actions.login,
@@ -72,12 +101,11 @@ export function privilegesFactory(actions: Actions, featuresService: FeaturesSer
             actions.ui.get('spaces', 'manage'),
             actions.ui.get('management', 'kibana', 'spaces'),
             ...allActions,
-            actions.allHack,
           ],
           read: [actions.login, actions.version, ...readActions],
         },
         space: {
-          all: [actions.login, actions.version, ...allActions, actions.allHack],
+          all: [actions.login, actions.version, ...allActions],
           read: [actions.login, actions.version, ...readActions],
         },
         reserved: features.reduce((acc: Record<string, string[]>, feature: Feature) => {
diff --git a/x-pack/plugins/security/server/authorization/validate_feature_privileges.test.ts b/x-pack/plugins/security/server/authorization/validate_feature_privileges.test.ts
index 3dc3ae03b18cb..ac386d287cff1 100644
--- a/x-pack/plugins/security/server/authorization/validate_feature_privileges.test.ts
+++ b/x-pack/plugins/security/server/authorization/validate_feature_privileges.test.ts
@@ -5,13 +5,42 @@
  */
 
 import { Feature } from '../../../features/server';
-import { Actions } from './actions';
 import { validateFeaturePrivileges } from './validate_feature_privileges';
 
-const actions = new Actions('1.0.0-zeta1');
+it('allows features to be defined without privileges', () => {
+  const feature: Feature = new Feature({
+    id: 'foo',
+    name: 'foo',
+    app: [],
+    privileges: null,
+  });
 
-it(`doesn't allow read to grant privileges which aren't also included in all`, () => {
-  const feature: Feature = {
+  validateFeaturePrivileges([feature]);
+});
+
+it('allows features with reserved privileges to be defined', () => {
+  const feature: Feature = new Feature({
+    id: 'foo',
+    name: 'foo',
+    app: [],
+    privileges: null,
+    reserved: {
+      description: 'foo',
+      privilege: {
+        savedObject: {
+          all: ['foo'],
+          read: ['bar'],
+        },
+        ui: [],
+      },
+    },
+  });
+
+  validateFeaturePrivileges([feature]);
+});
+
+it('allows features with sub-features to be defined', () => {
+  const feature: Feature = new Feature({
     id: 'foo',
     name: 'foo',
     app: [],
@@ -31,15 +60,50 @@ it(`doesn't allow read to grant privileges which aren't also included in all`, (
         ui: [],
       },
     },
-  };
+    subFeatures: [
+      {
+        name: 'sub-feature-1',
+        privilegeGroups: [
+          {
+            groupType: 'independent',
+            privileges: [
+              {
+                id: 'sub-feature-1-priv-1',
+                name: 'some sub feature',
+                includeIn: 'all',
+                savedObject: {
+                  all: ['foo'],
+                  read: ['bar', 'baz'],
+                },
+                ui: [],
+              },
+            ],
+          },
+          {
+            groupType: 'independent',
+            privileges: [
+              {
+                id: 'sub-feature-1-priv-2',
+                name: 'some second sub feature',
+                includeIn: 'none',
+                savedObject: {
+                  all: ['foo', 'bar'],
+                  read: ['baz'],
+                },
+                ui: [],
+              },
+            ],
+          },
+        ],
+      },
+    ],
+  });
 
-  expect(() => validateFeaturePrivileges(actions, [feature])).toThrowErrorMatchingInlineSnapshot(
-    `"foo's \\"all\\" privilege should be a superset of the \\"read\\" privilege."`
-  );
+  validateFeaturePrivileges([feature]);
 });
 
-it(`allows all and read to grant the same privileges`, () => {
-  const feature: Feature = {
+it('does not allow features with sub-features which have id conflicts with the minimal privileges', () => {
+  const feature: Feature = new Feature({
     id: 'foo',
     name: 'foo',
     app: [],
@@ -54,18 +118,42 @@ it(`allows all and read to grant the same privileges`, () => {
       read: {
         savedObject: {
           all: ['foo'],
-          read: ['bar'],
+          read: ['bar', 'baz'],
         },
         ui: [],
       },
     },
-  };
+    subFeatures: [
+      {
+        name: 'sub-feature-1',
+        privilegeGroups: [
+          {
+            groupType: 'independent',
+            privileges: [
+              {
+                id: 'minimal_all',
+                name: 'some sub feature',
+                includeIn: 'all',
+                savedObject: {
+                  all: ['foo'],
+                  read: ['bar', 'baz'],
+                },
+                ui: [],
+              },
+            ],
+          },
+        ],
+      },
+    ],
+  });
 
-  validateFeaturePrivileges(actions, [feature]);
+  expect(() => validateFeaturePrivileges([feature])).toThrowErrorMatchingInlineSnapshot(
+    `"Feature 'foo' already has a privilege with ID 'minimal_all'. Sub feature 'sub-feature-1' cannot also specify this."`
+  );
 });
 
-it(`allows all to grant privileges in addition to read`, () => {
-  const feature: Feature = {
+it('does not allow features with sub-features which have id conflicts with the primary feature privileges', () => {
+  const feature: Feature = new Feature({
     id: 'foo',
     name: 'foo',
     app: [],
@@ -73,19 +161,113 @@ it(`allows all to grant privileges in addition to read`, () => {
       all: {
         savedObject: {
           all: ['foo'],
-          read: ['bar', 'baz'],
+          read: ['bar'],
         },
         ui: [],
       },
       read: {
+        savedObject: {
+          all: ['foo'],
+          read: ['bar', 'baz'],
+        },
+        ui: [],
+      },
+    },
+    subFeatures: [
+      {
+        name: 'sub-feature-1',
+        privilegeGroups: [
+          {
+            groupType: 'independent',
+            privileges: [
+              {
+                id: 'read',
+                name: 'some sub feature',
+                includeIn: 'all',
+                savedObject: {
+                  all: ['foo'],
+                  read: ['bar', 'baz'],
+                },
+                ui: [],
+              },
+            ],
+          },
+        ],
+      },
+    ],
+  });
+
+  expect(() => validateFeaturePrivileges([feature])).toThrowErrorMatchingInlineSnapshot(
+    `"Feature 'foo' already has a privilege with ID 'read'. Sub feature 'sub-feature-1' cannot also specify this."`
+  );
+});
+
+it('does not allow features with sub-features which have id conflicts each other', () => {
+  const feature: Feature = new Feature({
+    id: 'foo',
+    name: 'foo',
+    app: [],
+    privileges: {
+      all: {
         savedObject: {
           all: ['foo'],
           read: ['bar'],
         },
         ui: [],
       },
+      read: {
+        savedObject: {
+          all: ['foo'],
+          read: ['bar', 'baz'],
+        },
+        ui: [],
+      },
     },
-  };
+    subFeatures: [
+      {
+        name: 'sub-feature-1',
+        privilegeGroups: [
+          {
+            groupType: 'independent',
+            privileges: [
+              {
+                id: 'some-sub-feature',
+                name: 'some sub feature',
+                includeIn: 'all',
+                savedObject: {
+                  all: ['foo'],
+                  read: ['bar', 'baz'],
+                },
+                ui: [],
+              },
+            ],
+          },
+        ],
+      },
+      {
+        name: 'sub-feature-2',
+        privilegeGroups: [
+          {
+            groupType: 'independent',
+            privileges: [
+              {
+                id: 'some-sub-feature',
+                name: 'some sub feature',
+                includeIn: 'all',
+                savedObject: {
+                  all: ['foo'],
+                  read: ['bar', 'baz'],
+                },
+                ui: [],
+              },
+            ],
+          },
+        ],
+      },
+    ],
+  });
 
-  validateFeaturePrivileges(actions, [feature]);
+  expect(() => validateFeaturePrivileges([feature])).toThrowErrorMatchingInlineSnapshot(
+    `"Feature 'foo' already has a privilege with ID 'some-sub-feature'. Sub feature 'sub-feature-2' cannot also specify this."`
+  );
 });
diff --git a/x-pack/plugins/security/server/authorization/validate_feature_privileges.ts b/x-pack/plugins/security/server/authorization/validate_feature_privileges.ts
index 7998c816ae1c7..510feb1151a9b 100644
--- a/x-pack/plugins/security/server/authorization/validate_feature_privileges.ts
+++ b/x-pack/plugins/security/server/authorization/validate_feature_privileges.ts
@@ -5,21 +5,27 @@
  */
 
 import { Feature } from '../../../features/server';
-import { areActionsFullyCovered } from '../../common/privilege_calculator_utils';
-import { Actions } from './actions';
-import { featurePrivilegeBuilderFactory } from './privileges/feature_privilege_builder';
 
-export function validateFeaturePrivileges(actions: Actions, features: Feature[]) {
-  const featurePrivilegeBuilder = featurePrivilegeBuilderFactory(actions);
+export function validateFeaturePrivileges(features: Feature[]) {
   for (const feature of features) {
-    if (feature.privileges.all != null && feature.privileges.read != null) {
-      const allActions = featurePrivilegeBuilder.getActions(feature.privileges.all, feature);
-      const readActions = featurePrivilegeBuilder.getActions(feature.privileges.read, feature);
-      if (!areActionsFullyCovered(allActions, readActions)) {
-        throw new Error(
-          `${feature.id}'s "all" privilege should be a superset of the "read" privilege.`
-        );
-      }
-    }
+    const seenPrivilegeIds = new Set<string>();
+    Object.keys(feature.privileges ?? {}).forEach(privilegeId => {
+      seenPrivilegeIds.add(privilegeId);
+      seenPrivilegeIds.add(`minimal_${privilegeId}`);
+    });
+
+    const subFeatureEntries = feature.subFeatures ?? [];
+    subFeatureEntries.forEach(subFeature => {
+      subFeature.privilegeGroups.forEach(subFeaturePrivilegeGroup => {
+        subFeaturePrivilegeGroup.privileges.forEach(subFeaturePrivilege => {
+          if (seenPrivilegeIds.has(subFeaturePrivilege.id)) {
+            throw new Error(
+              `Feature '${feature.id}' already has a privilege with ID '${subFeaturePrivilege.id}'. Sub feature '${subFeature.name}' cannot also specify this.`
+            );
+          }
+          seenPrivilegeIds.add(subFeaturePrivilege.id);
+        });
+      });
+    });
   }
 }
diff --git a/x-pack/plugins/security/server/plugin.test.ts b/x-pack/plugins/security/server/plugin.test.ts
index a23c826b32fbd..4767f57de764c 100644
--- a/x-pack/plugins/security/server/plugin.test.ts
+++ b/x-pack/plugins/security/server/plugin.test.ts
@@ -82,7 +82,6 @@ describe('Security Plugin', () => {
                 },
                 "authz": Object {
                   "actions": Actions {
-                    "allHack": "allHack:",
                     "api": ApiActions {
                       "prefix": "api:version:",
                     },
diff --git a/x-pack/plugins/security/server/routes/views/login.test.ts b/x-pack/plugins/security/server/routes/views/login.test.ts
index 9217d5a437f9c..7751f9a952c09 100644
--- a/x-pack/plugins/security/server/routes/views/login.test.ts
+++ b/x-pack/plugins/security/server/routes/views/login.test.ts
@@ -163,6 +163,7 @@ describe('Login view routes', () => {
         layout: 'error-es-unavailable',
         showLinks: false,
         showRoleMappingsManagement: true,
+        allowSubFeaturePrivileges: true,
         showLogin: true,
       });
 
diff --git a/x-pack/plugins/spaces/public/management/edit_space/enabled_features/__snapshots__/enabled_features.test.tsx.snap b/x-pack/plugins/spaces/public/management/edit_space/enabled_features/__snapshots__/enabled_features.test.tsx.snap
index 7db3d5456fbd3..6d40ce15fc57f 100644
--- a/x-pack/plugins/spaces/public/management/edit_space/enabled_features/__snapshots__/enabled_features.test.tsx.snap
+++ b/x-pack/plugins/spaces/public/management/edit_space/enabled_features/__snapshots__/enabled_features.test.tsx.snap
@@ -91,14 +91,14 @@ exports[`EnabledFeatures renders as expected 1`] = `
               "icon": "spacesApp",
               "id": "feature-1",
               "name": "Feature 1",
-              "privileges": Object {},
+              "privileges": null,
             },
             Object {
               "app": Array [],
               "icon": "spacesApp",
               "id": "feature-2",
               "name": "Feature 2",
-              "privileges": Object {},
+              "privileges": null,
             },
           ]
         }
diff --git a/x-pack/plugins/spaces/public/management/edit_space/enabled_features/enabled_features.test.tsx b/x-pack/plugins/spaces/public/management/edit_space/enabled_features/enabled_features.test.tsx
index d9282ad0457dd..ca53a9eb17253 100644
--- a/x-pack/plugins/spaces/public/management/edit_space/enabled_features/enabled_features.test.tsx
+++ b/x-pack/plugins/spaces/public/management/edit_space/enabled_features/enabled_features.test.tsx
@@ -10,22 +10,22 @@ import { mountWithIntl, shallowWithIntl } from 'test_utils/enzyme_helpers';
 import { Space } from '../../../../common/model/space';
 import { SectionPanel } from '../section_panel';
 import { EnabledFeatures } from './enabled_features';
-import { Feature } from '../../../../../features/public';
+import { FeatureConfig } from '../../../../../features/public';
 
-const features: Feature[] = [
+const features: FeatureConfig[] = [
   {
     id: 'feature-1',
     name: 'Feature 1',
     icon: 'spacesApp',
     app: [],
-    privileges: {},
+    privileges: null,
   },
   {
     id: 'feature-2',
     name: 'Feature 2',
     icon: 'spacesApp',
     app: [],
-    privileges: {},
+    privileges: null,
   },
 ];
 
diff --git a/x-pack/plugins/spaces/public/management/edit_space/enabled_features/enabled_features.tsx b/x-pack/plugins/spaces/public/management/edit_space/enabled_features/enabled_features.tsx
index 52a0fe8d4d26c..6f0462a6ddcc2 100644
--- a/x-pack/plugins/spaces/public/management/edit_space/enabled_features/enabled_features.tsx
+++ b/x-pack/plugins/spaces/public/management/edit_space/enabled_features/enabled_features.tsx
@@ -8,7 +8,7 @@ import { EuiFlexGroup, EuiFlexItem, EuiLink, EuiSpacer, EuiText, EuiTitle } from
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n/react';
 import React, { Component, Fragment, ReactNode } from 'react';
-import { Feature } from '../../../../../../plugins/features/public';
+import { FeatureConfig } from '../../../../../../plugins/features/public';
 import { Space } from '../../../../common/model/space';
 import { getEnabledFeatures } from '../../lib/feature_utils';
 import { SectionPanel } from '../section_panel';
@@ -16,7 +16,7 @@ import { FeatureTable } from './feature_table';
 
 interface Props {
   space: Partial<Space>;
-  features: Feature[];
+  features: FeatureConfig[];
   securityEnabled: boolean;
   onChange: (space: Partial<Space>) => void;
 }
diff --git a/x-pack/plugins/spaces/public/management/edit_space/enabled_features/feature_table.tsx b/x-pack/plugins/spaces/public/management/edit_space/enabled_features/feature_table.tsx
index 380f151b54a18..880842ed0ae30 100644
--- a/x-pack/plugins/spaces/public/management/edit_space/enabled_features/feature_table.tsx
+++ b/x-pack/plugins/spaces/public/management/edit_space/enabled_features/feature_table.tsx
@@ -9,13 +9,13 @@ import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n/react';
 import _ from 'lodash';
 import React, { ChangeEvent, Component } from 'react';
-import { Feature } from '../../../../../../plugins/features/public';
+import { FeatureConfig } from '../../../../../../plugins/features/public';
 import { Space } from '../../../../common/model/space';
 import { ToggleAllFeatures } from './toggle_all_features';
 
 interface Props {
   space: Partial<Space>;
-  features: Feature[];
+  features: FeatureConfig[];
   onChange: (space: Partial<Space>) => void;
 }
 
@@ -69,7 +69,10 @@ export class FeatureTable extends Component<Props, {}> {
       name: i18n.translate('xpack.spaces.management.enabledSpaceFeaturesFeatureColumnTitle', {
         defaultMessage: 'Feature',
       }),
-      render: (feature: Feature, _item: { feature: Feature; space: Props['space'] }) => {
+      render: (
+        feature: FeatureConfig,
+        _item: { feature: FeatureConfig; space: Props['space'] }
+      ) => {
         return (
           <EuiText>
             <EuiIcon size="m" type={feature.icon as IconType} />
diff --git a/x-pack/plugins/spaces/public/management/edit_space/manage_space_page.test.tsx b/x-pack/plugins/spaces/public/management/edit_space/manage_space_page.test.tsx
index 2aba1522a7e3f..b79bbd0d6ab3f 100644
--- a/x-pack/plugins/spaces/public/management/edit_space/manage_space_page.test.tsx
+++ b/x-pack/plugins/spaces/public/management/edit_space/manage_space_page.test.tsx
@@ -13,7 +13,9 @@ import { ManageSpacePage } from './manage_space_page';
 import { SectionPanel } from './section_panel';
 import { spacesManagerMock } from '../../spaces_manager/mocks';
 import { SpacesManager } from '../../spaces_manager';
-import { httpServiceMock, notificationServiceMock } from 'src/core/public/mocks';
+import { notificationServiceMock } from 'src/core/public/mocks';
+import { featuresPluginMock } from '../../../../features/public/mocks';
+import { Feature } from '../../../../features/public';
 
 const space = {
   id: 'my-space',
@@ -21,19 +23,27 @@ const space = {
   disabledFeatures: [],
 };
 
+const featuresStart = featuresPluginMock.createStart();
+featuresStart.getFeatures.mockResolvedValue([
+  new Feature({
+    id: 'feature-1',
+    name: 'feature 1',
+    icon: 'spacesApp',
+    app: [],
+    privileges: null,
+  }),
+]);
+
 describe('ManageSpacePage', () => {
   it('allows a space to be created', async () => {
     const spacesManager = spacesManagerMock.create();
     spacesManager.createSpace = jest.fn(spacesManager.createSpace);
     spacesManager.getActiveSpace = jest.fn().mockResolvedValue(space);
 
-    const httpStart = httpServiceMock.createStartContract();
-    httpStart.get.mockResolvedValue([{ id: 'feature-1', name: 'feature 1', icon: 'spacesApp' }]);
-
     const wrapper = mountWithIntl(
       <ManageSpacePage
         spacesManager={(spacesManager as unknown) as SpacesManager}
-        http={httpStart}
+        getFeatures={featuresStart.getFeatures}
         notifications={notificationServiceMock.createStartContract()}
         securityEnabled={true}
         capabilities={{
@@ -83,9 +93,6 @@ describe('ManageSpacePage', () => {
     });
     spacesManager.getActiveSpace = jest.fn().mockResolvedValue(space);
 
-    const httpStart = httpServiceMock.createStartContract();
-    httpStart.get.mockResolvedValue([{ id: 'feature-1', name: 'feature 1', icon: 'spacesApp' }]);
-
     const onLoadSpace = jest.fn();
 
     const wrapper = mountWithIntl(
@@ -93,7 +100,7 @@ describe('ManageSpacePage', () => {
         spaceId={'existing-space'}
         spacesManager={(spacesManager as unknown) as SpacesManager}
         onLoadSpace={onLoadSpace}
-        http={httpStart}
+        getFeatures={featuresStart.getFeatures}
         notifications={notificationServiceMock.createStartContract()}
         securityEnabled={true}
         capabilities={{
@@ -130,6 +137,37 @@ describe('ManageSpacePage', () => {
     });
   });
 
+  it('notifies when there is an error retrieving features', async () => {
+    const spacesManager = spacesManagerMock.create();
+    spacesManager.createSpace = jest.fn(spacesManager.createSpace);
+    spacesManager.getActiveSpace = jest.fn().mockResolvedValue(space);
+
+    const error = new Error('something awful happened');
+
+    const notifications = notificationServiceMock.createStartContract();
+
+    const wrapper = mountWithIntl(
+      <ManageSpacePage
+        spacesManager={(spacesManager as unknown) as SpacesManager}
+        getFeatures={() => Promise.reject(error)}
+        notifications={notifications}
+        securityEnabled={true}
+        capabilities={{
+          navLinks: {},
+          management: {},
+          catalogue: {},
+          spaces: { manage: true },
+        }}
+      />
+    );
+
+    await waitForDataLoad(wrapper);
+
+    expect(notifications.toasts.addError).toHaveBeenCalledWith(error, {
+      title: 'Error loading available features',
+    });
+  });
+
   it('warns when updating features in the active space', async () => {
     const spacesManager = spacesManagerMock.create();
     spacesManager.getSpace = jest.fn().mockResolvedValue({
@@ -142,14 +180,11 @@ describe('ManageSpacePage', () => {
     });
     spacesManager.getActiveSpace = jest.fn().mockResolvedValue(space);
 
-    const httpStart = httpServiceMock.createStartContract();
-    httpStart.get.mockResolvedValue([{ id: 'feature-1', name: 'feature 1', icon: 'spacesApp' }]);
-
     const wrapper = mountWithIntl(
       <ManageSpacePage
         spaceId={'my-space'}
         spacesManager={(spacesManager as unknown) as SpacesManager}
-        http={httpStart}
+        getFeatures={featuresStart.getFeatures}
         notifications={notificationServiceMock.createStartContract()}
         securityEnabled={true}
         capabilities={{
@@ -204,14 +239,11 @@ describe('ManageSpacePage', () => {
     });
     spacesManager.getActiveSpace = jest.fn().mockResolvedValue(space);
 
-    const httpStart = httpServiceMock.createStartContract();
-    httpStart.get.mockResolvedValue([{ id: 'feature-1', name: 'feature 1', icon: 'spacesApp' }]);
-
     const wrapper = mountWithIntl(
       <ManageSpacePage
         spaceId={'my-space'}
         spacesManager={(spacesManager as unknown) as SpacesManager}
-        http={httpStart}
+        getFeatures={featuresStart.getFeatures}
         notifications={notificationServiceMock.createStartContract()}
         securityEnabled={true}
         capabilities={{
diff --git a/x-pack/plugins/spaces/public/management/edit_space/manage_space_page.tsx b/x-pack/plugins/spaces/public/management/edit_space/manage_space_page.tsx
index 6be3bfcebffe4..0cb471854f815 100644
--- a/x-pack/plugins/spaces/public/management/edit_space/manage_space_page.tsx
+++ b/x-pack/plugins/spaces/public/management/edit_space/manage_space_page.tsx
@@ -18,8 +18,8 @@ import { FormattedMessage } from '@kbn/i18n/react';
 import { i18n } from '@kbn/i18n';
 import _ from 'lodash';
 import React, { Component, Fragment } from 'react';
-import { Capabilities, HttpStart, NotificationsStart } from 'src/core/public';
-import { Feature } from '../../../../features/public';
+import { Capabilities, NotificationsStart } from 'src/core/public';
+import { Feature, FeaturesPluginStart } from '../../../../features/public';
 import { isReservedSpace } from '../../../common';
 import { Space } from '../../../common/model/space';
 import { SpacesManager } from '../../spaces_manager';
@@ -33,7 +33,7 @@ import { EnabledFeatures } from './enabled_features';
 import { ReservedSpaceBadge } from './reserved_space_badge';
 
 interface Props {
-  http: HttpStart;
+  getFeatures: FeaturesPluginStart['getFeatures'];
   notifications: NotificationsStart;
   spacesManager: SpacesManager;
   spaceId?: string;
@@ -75,15 +75,21 @@ export class ManageSpacePage extends Component<Props, State> {
       return;
     }
 
-    const { spaceId, http } = this.props;
+    const { spaceId, getFeatures, notifications } = this.props;
 
-    const getFeatures = http.get('/api/features');
-
-    if (spaceId) {
-      await this.loadSpace(spaceId, getFeatures);
-    } else {
-      const features = await getFeatures;
-      this.setState({ isLoading: false, features });
+    try {
+      if (spaceId) {
+        await this.loadSpace(spaceId, getFeatures());
+      } else {
+        const features = await getFeatures();
+        this.setState({ isLoading: false, features });
+      }
+    } catch (e) {
+      notifications.toasts.addError(e, {
+        title: i18n.translate('xpack.spaces.management.manageSpacePage.loadErrorTitle', {
+          defaultMessage: 'Error loading available features',
+        }),
+      });
     }
   }
 
@@ -318,7 +324,7 @@ export class ManageSpacePage extends Component<Props, State> {
 
         this.setState({
           space,
-          features: await features,
+          features,
           originalSpace: space,
           isLoading: false,
         });
diff --git a/x-pack/plugins/spaces/public/management/lib/feature_utils.ts b/x-pack/plugins/spaces/public/management/lib/feature_utils.ts
index a1b64eb954403..09dbe886ab191 100644
--- a/x-pack/plugins/spaces/public/management/lib/feature_utils.ts
+++ b/x-pack/plugins/spaces/public/management/lib/feature_utils.ts
@@ -4,10 +4,10 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { Feature } from '../../../../features/common';
+import { FeatureConfig } from '../../../../features/common';
 
 import { Space } from '../..';
 
-export function getEnabledFeatures(features: Feature[], space: Partial<Space>) {
+export function getEnabledFeatures(features: FeatureConfig[], space: Partial<Space>) {
   return features.filter(feature => !(space.disabledFeatures || []).includes(feature.id));
 }
diff --git a/x-pack/plugins/spaces/public/management/management_service.test.ts b/x-pack/plugins/spaces/public/management/management_service.test.ts
index d4c6bdaea2776..782c261be9664 100644
--- a/x-pack/plugins/spaces/public/management/management_service.test.ts
+++ b/x-pack/plugins/spaces/public/management/management_service.test.ts
@@ -10,6 +10,8 @@ import { spacesManagerMock } from '../spaces_manager/mocks';
 import { managementPluginMock } from '../../../../../src/plugins/management/public/mocks';
 import { ManagementSection } from 'src/plugins/management/public';
 import { Capabilities } from 'kibana/public';
+import { PluginsStart } from '../plugin';
+import { CoreSetup } from 'src/core/public';
 
 describe('ManagementService', () => {
   describe('#setup', () => {
@@ -19,7 +21,9 @@ describe('ManagementService', () => {
       } as unknown) as ManagementSection;
       const deps = {
         management: managementPluginMock.createSetupContract(),
-        getStartServices: coreMock.createSetup().getStartServices,
+        getStartServices: coreMock.createSetup().getStartServices as CoreSetup<
+          PluginsStart
+        >['getStartServices'],
         spacesManager: spacesManagerMock.create(),
       };
 
@@ -43,7 +47,9 @@ describe('ManagementService', () => {
     it('will not crash if the kibana section is missing', () => {
       const deps = {
         management: managementPluginMock.createSetupContract(),
-        getStartServices: coreMock.createSetup().getStartServices,
+        getStartServices: coreMock.createSetup().getStartServices as CoreSetup<
+          PluginsStart
+        >['getStartServices'],
         spacesManager: spacesManagerMock.create(),
       };
 
@@ -61,7 +67,9 @@ describe('ManagementService', () => {
 
       const deps = {
         management: managementPluginMock.createSetupContract(),
-        getStartServices: coreMock.createSetup().getStartServices,
+        getStartServices: coreMock.createSetup().getStartServices as CoreSetup<
+          PluginsStart
+        >['getStartServices'],
         spacesManager: spacesManagerMock.create(),
       };
 
@@ -88,7 +96,9 @@ describe('ManagementService', () => {
 
       const deps = {
         management: managementPluginMock.createSetupContract(),
-        getStartServices: coreMock.createSetup().getStartServices,
+        getStartServices: coreMock.createSetup().getStartServices as CoreSetup<
+          PluginsStart
+        >['getStartServices'],
         spacesManager: spacesManagerMock.create(),
       };
 
@@ -117,7 +127,9 @@ describe('ManagementService', () => {
 
       const deps = {
         management: managementPluginMock.createSetupContract(),
-        getStartServices: coreMock.createSetup().getStartServices,
+        getStartServices: coreMock.createSetup().getStartServices as CoreSetup<
+          PluginsStart
+        >['getStartServices'],
         spacesManager: spacesManagerMock.create(),
       };
 
diff --git a/x-pack/plugins/spaces/public/management/spaces_grid/spaces_grid_page.tsx b/x-pack/plugins/spaces/public/management/spaces_grid/spaces_grid_page.tsx
index 4cc4190e9591b..ff4be84207832 100644
--- a/x-pack/plugins/spaces/public/management/spaces_grid/spaces_grid_page.tsx
+++ b/x-pack/plugins/spaces/public/management/spaces_grid/spaces_grid_page.tsx
@@ -20,8 +20,8 @@ import {
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n/react';
-import { Capabilities, HttpStart, NotificationsStart } from 'src/core/public';
-import { Feature } from '../../../../features/public';
+import { Capabilities, NotificationsStart } from 'src/core/public';
+import { Feature, FeaturesPluginStart } from '../../../../features/public';
 import { isReservedSpace } from '../../../common';
 import { DEFAULT_SPACE_ID } from '../../../common/constants';
 import { Space } from '../../../common/model/space';
@@ -36,7 +36,7 @@ import { getEnabledFeatures } from '../lib/feature_utils';
 interface Props {
   spacesManager: SpacesManager;
   notifications: NotificationsStart;
-  http: HttpStart;
+  getFeatures: FeaturesPluginStart['getFeatures'];
   capabilities: Capabilities;
   securityEnabled: boolean;
 }
@@ -47,7 +47,6 @@ interface State {
   loading: boolean;
   showConfirmDeleteModal: boolean;
   selectedSpace: Space | null;
-  error: Error | null;
 }
 
 export class SpacesGridPage extends Component<Props, State> {
@@ -59,7 +58,6 @@ export class SpacesGridPage extends Component<Props, State> {
       loading: true,
       showConfirmDeleteModal: false,
       selectedSpace: null,
-      error: null,
     };
   }
 
@@ -211,7 +209,7 @@ export class SpacesGridPage extends Component<Props, State> {
   };
 
   public loadGrid = async () => {
-    const { spacesManager, http } = this.props;
+    const { spacesManager, getFeatures, notifications } = this.props;
 
     this.setState({
       loading: true,
@@ -220,10 +218,9 @@ export class SpacesGridPage extends Component<Props, State> {
     });
 
     const getSpaces = spacesManager.getSpaces();
-    const getFeatures = http.get('/api/features');
 
     try {
-      const [spaces, features] = await Promise.all([getSpaces, getFeatures]);
+      const [spaces, features] = await Promise.all([getSpaces, getFeatures()]);
       this.setState({
         loading: false,
         spaces,
@@ -232,7 +229,11 @@ export class SpacesGridPage extends Component<Props, State> {
     } catch (error) {
       this.setState({
         loading: false,
-        error,
+      });
+      notifications.toasts.addError(error, {
+        title: i18n.translate('xpack.spaces.management.spacesGridPage.errorTitle', {
+          defaultMessage: 'Error loading spaces',
+        }),
       });
     }
   };
diff --git a/x-pack/plugins/spaces/public/management/spaces_grid/spaces_grid_pages.test.tsx b/x-pack/plugins/spaces/public/management/spaces_grid/spaces_grid_pages.test.tsx
index 90c7aba65e3d6..9b7dc921b9a25 100644
--- a/x-pack/plugins/spaces/public/management/spaces_grid/spaces_grid_pages.test.tsx
+++ b/x-pack/plugins/spaces/public/management/spaces_grid/spaces_grid_pages.test.tsx
@@ -12,6 +12,8 @@ import { SpacesManager } from '../../spaces_manager';
 import { SpacesGridPage } from './spaces_grid_page';
 import { httpServiceMock } from 'src/core/public/mocks';
 import { notificationServiceMock } from 'src/core/public/mocks';
+import { featuresPluginMock } from '../../../../features/public/mocks';
+import { Feature } from '../../../../features/public';
 
 const spaces = [
   {
@@ -38,6 +40,17 @@ const spaces = [
 const spacesManager = spacesManagerMock.create();
 spacesManager.getSpaces = jest.fn().mockResolvedValue(spaces);
 
+const featuresStart = featuresPluginMock.createStart();
+featuresStart.getFeatures.mockResolvedValue([
+  new Feature({
+    id: 'feature-1',
+    name: 'feature 1',
+    icon: 'spacesApp',
+    app: [],
+    privileges: null,
+  }),
+]);
+
 describe('SpacesGridPage', () => {
   it('renders as expected', () => {
     const httpStart = httpServiceMock.createStartContract();
@@ -47,7 +60,7 @@ describe('SpacesGridPage', () => {
       shallowWithIntl(
         <SpacesGridPage
           spacesManager={(spacesManager as unknown) as SpacesManager}
-          http={httpStart}
+          getFeatures={featuresStart.getFeatures}
           notifications={notificationServiceMock.createStartContract()}
           securityEnabled={true}
           capabilities={{
@@ -68,7 +81,7 @@ describe('SpacesGridPage', () => {
     const wrapper = mountWithIntl(
       <SpacesGridPage
         spacesManager={(spacesManager as unknown) as SpacesManager}
-        http={httpStart}
+        getFeatures={featuresStart.getFeatures}
         notifications={notificationServiceMock.createStartContract()}
         securityEnabled={true}
         capabilities={{
@@ -87,4 +100,72 @@ describe('SpacesGridPage', () => {
     expect(wrapper.find(SpaceAvatar)).toHaveLength(spaces.length);
     expect(wrapper.find(SpaceAvatar)).toMatchSnapshot();
   });
+
+  it('notifies when spaces fail to load', async () => {
+    const httpStart = httpServiceMock.createStartContract();
+    httpStart.get.mockResolvedValue([]);
+
+    const error = new Error('something awful happened');
+    spacesManager.getSpaces.mockRejectedValue(error);
+
+    const notifications = notificationServiceMock.createStartContract();
+
+    const wrapper = mountWithIntl(
+      <SpacesGridPage
+        spacesManager={(spacesManager as unknown) as SpacesManager}
+        getFeatures={featuresStart.getFeatures}
+        notifications={notifications}
+        securityEnabled={true}
+        capabilities={{
+          navLinks: {},
+          management: {},
+          catalogue: {},
+          spaces: { manage: true },
+        }}
+      />
+    );
+
+    // allow spacesManager to load spaces
+    await nextTick();
+    wrapper.update();
+
+    expect(wrapper.find(SpaceAvatar)).toHaveLength(0);
+    expect(notifications.toasts.addError).toHaveBeenCalledWith(error, {
+      title: 'Error loading spaces',
+    });
+  });
+
+  it('notifies when features fail to load', async () => {
+    const httpStart = httpServiceMock.createStartContract();
+    httpStart.get.mockResolvedValue([]);
+
+    const error = new Error('something awful happened');
+
+    const notifications = notificationServiceMock.createStartContract();
+
+    const wrapper = mountWithIntl(
+      <SpacesGridPage
+        spacesManager={(spacesManager as unknown) as SpacesManager}
+        getFeatures={() => Promise.reject(error)}
+        notifications={notifications}
+        securityEnabled={true}
+        capabilities={{
+          navLinks: {},
+          management: {},
+          catalogue: {},
+          spaces: { manage: true },
+        }}
+      />
+    );
+
+    // allow spacesManager to load spaces
+    await nextTick();
+    wrapper.update();
+
+    expect(wrapper.find(SpaceAvatar)).toHaveLength(0);
+    // For end-users, the effect is that spaces won't load, even though this was a request to retrieve features.
+    expect(notifications.toasts.addError).toHaveBeenCalledWith(error, {
+      title: 'Error loading spaces',
+    });
+  });
 });
diff --git a/x-pack/plugins/spaces/public/management/spaces_management_app.test.tsx b/x-pack/plugins/spaces/public/management/spaces_management_app.test.tsx
index 2e274e08ee13b..7738a440cb5e1 100644
--- a/x-pack/plugins/spaces/public/management/spaces_management_app.test.tsx
+++ b/x-pack/plugins/spaces/public/management/spaces_management_app.test.tsx
@@ -23,6 +23,8 @@ import { coreMock } from '../../../../../src/core/public/mocks';
 import { securityMock } from '../../../security/public/mocks';
 import { spacesManagerMock } from '../spaces_manager/mocks';
 import { SecurityLicenseFeatures } from '../../../security/public';
+import { featuresPluginMock } from '../../../features/public/mocks';
+import { PluginsStart } from '../plugin';
 
 async function mountApp(basePath: string, spaceId?: string) {
   const container = document.createElement('div');
@@ -42,11 +44,14 @@ async function mountApp(basePath: string, spaceId?: string) {
     showLinks: true,
   } as SecurityLicenseFeatures);
 
+  const [coreStart, pluginsStart] = await coreMock.createSetup().getStartServices();
+  (pluginsStart as PluginsStart).features = featuresPluginMock.createStart();
+
   const unmount = await spacesManagementApp
     .create({
       spacesManager,
       securityLicense,
-      getStartServices: coreMock.createSetup().getStartServices as any,
+      getStartServices: async () => [coreStart, pluginsStart as PluginsStart],
     })
     .mount({ basePath, element: container, setBreadcrumbs });
 
@@ -81,7 +86,7 @@ describe('spacesManagementApp', () => {
     expect(setBreadcrumbs).toHaveBeenCalledWith([{ href: `#${basePath}`, text: 'Spaces' }]);
     expect(container).toMatchInlineSnapshot(`
       <div>
-        Spaces Page: {"capabilities":{"catalogue":{},"management":{},"navLinks":{}},"http":{"basePath":{"basePath":"","serverBasePath":""},"anonymousPaths":{}},"notifications":{"toasts":{}},"spacesManager":{"onActiveSpaceChange$":{"_isScalar":false}},"securityEnabled":true}
+        Spaces Page: {"capabilities":{"catalogue":{},"management":{},"navLinks":{}},"notifications":{"toasts":{}},"spacesManager":{"onActiveSpaceChange$":{"_isScalar":false}},"securityEnabled":true}
       </div>
     `);
 
@@ -103,7 +108,7 @@ describe('spacesManagementApp', () => {
     ]);
     expect(container).toMatchInlineSnapshot(`
       <div>
-        Spaces Edit Page: {"capabilities":{"catalogue":{},"management":{},"navLinks":{}},"http":{"basePath":{"basePath":"","serverBasePath":""},"anonymousPaths":{}},"notifications":{"toasts":{}},"spacesManager":{"onActiveSpaceChange$":{"_isScalar":false}},"securityEnabled":true}
+        Spaces Edit Page: {"capabilities":{"catalogue":{},"management":{},"navLinks":{}},"notifications":{"toasts":{}},"spacesManager":{"onActiveSpaceChange$":{"_isScalar":false}},"securityEnabled":true}
       </div>
     `);
 
@@ -126,7 +131,7 @@ describe('spacesManagementApp', () => {
     ]);
     expect(container).toMatchInlineSnapshot(`
       <div>
-        Spaces Edit Page: {"capabilities":{"catalogue":{},"management":{},"navLinks":{}},"http":{"basePath":{"basePath":"","serverBasePath":""},"anonymousPaths":{}},"notifications":{"toasts":{}},"spacesManager":{"onActiveSpaceChange$":{"_isScalar":false}},"spaceId":"some-space","securityEnabled":true}
+        Spaces Edit Page: {"capabilities":{"catalogue":{},"management":{},"navLinks":{}},"notifications":{"toasts":{}},"spacesManager":{"onActiveSpaceChange$":{"_isScalar":false}},"spaceId":"some-space","securityEnabled":true}
       </div>
     `);
 
diff --git a/x-pack/plugins/spaces/public/management/spaces_management_app.tsx b/x-pack/plugins/spaces/public/management/spaces_management_app.tsx
index 2a93e684bb716..92b369807b0da 100644
--- a/x-pack/plugins/spaces/public/management/spaces_management_app.tsx
+++ b/x-pack/plugins/spaces/public/management/spaces_management_app.tsx
@@ -33,7 +33,10 @@ export const spacesManagementApp = Object.freeze({
         defaultMessage: 'Spaces',
       }),
       async mount({ basePath, element, setBreadcrumbs }) {
-        const [{ http, notifications, i18n: i18nStart, application }] = await getStartServices();
+        const [
+          { notifications, i18n: i18nStart, application },
+          { features },
+        ] = await getStartServices();
         const spacesBreadcrumbs = [
           {
             text: i18n.translate('xpack.spaces.management.breadcrumb', {
@@ -48,7 +51,7 @@ export const spacesManagementApp = Object.freeze({
           return (
             <SpacesGridPage
               capabilities={application.capabilities}
-              http={http}
+              getFeatures={features.getFeatures}
               notifications={notifications}
               spacesManager={spacesManager}
               securityEnabled={securityLicense?.getFeatures().showLinks ?? false}
@@ -69,7 +72,7 @@ export const spacesManagementApp = Object.freeze({
           return (
             <ManageSpacePage
               capabilities={application.capabilities}
-              http={http}
+              getFeatures={features.getFeatures}
               notifications={notifications}
               spacesManager={spacesManager}
               securityEnabled={securityLicense?.getFeatures().showLinks ?? false}
@@ -93,7 +96,7 @@ export const spacesManagementApp = Object.freeze({
           return (
             <ManageSpacePage
               capabilities={application.capabilities}
-              http={http}
+              getFeatures={features.getFeatures}
               notifications={notifications}
               spacesManager={spacesManager}
               spaceId={spaceId}
diff --git a/x-pack/plugins/spaces/public/plugin.test.ts b/x-pack/plugins/spaces/public/plugin.test.ts
index 28f8433be6fd9..d879a318fe815 100644
--- a/x-pack/plugins/spaces/public/plugin.test.ts
+++ b/x-pack/plugins/spaces/public/plugin.test.ts
@@ -10,6 +10,7 @@ import { homePluginMock } from '../../../../src/plugins/home/public/mocks';
 import { ManagementSection } from '../../../../src/plugins/management/public';
 import { managementPluginMock } from '../../../../src/plugins/management/public/mocks';
 import { advancedSettingsMock } from '../../../../src/plugins/advanced_settings/public/mocks';
+import { featuresPluginMock } from '../../features/public/mocks';
 
 describe('Spaces plugin', () => {
   describe('#setup', () => {
@@ -101,7 +102,7 @@ describe('Spaces plugin', () => {
       const plugin = new SpacesPlugin();
       plugin.setup(coreSetup, {});
 
-      plugin.start(coreStart, {});
+      plugin.start(coreStart, { features: featuresPluginMock.createStart() });
 
       expect(coreStart.chrome.navControls.registerLeft).toHaveBeenCalled();
     });
diff --git a/x-pack/plugins/spaces/public/plugin.tsx b/x-pack/plugins/spaces/public/plugin.tsx
index 44215ec538002..876ab39df3a1f 100644
--- a/x-pack/plugins/spaces/public/plugin.tsx
+++ b/x-pack/plugins/spaces/public/plugin.tsx
@@ -9,6 +9,7 @@ import { HomePublicPluginSetup } from 'src/plugins/home/public';
 import { SavedObjectsManagementAction } from 'src/legacy/core_plugins/management/public';
 import { ManagementStart, ManagementSetup } from 'src/plugins/management/public';
 import { AdvancedSettingsSetup } from 'src/plugins/advanced_settings/public';
+import { FeaturesPluginStart } from '../../features/public';
 import { SecurityPluginStart, SecurityPluginSetup } from '../../security/public';
 import { SpacesManager } from './spaces_manager';
 import { initSpacesNavControl } from './nav_control';
@@ -26,6 +27,7 @@ export interface PluginsSetup {
 }
 
 export interface PluginsStart {
+  features: FeaturesPluginStart;
   management?: ManagementStart;
   security?: SecurityPluginStart;
 }
@@ -53,7 +55,7 @@ export class SpacesPlugin implements Plugin<SpacesPluginSetup, SpacesPluginStart
       this.managementService = new ManagementService();
       this.managementService.setup({
         management: plugins.management,
-        getStartServices: core.getStartServices,
+        getStartServices: core.getStartServices as CoreSetup<PluginsStart>['getStartServices'],
         spacesManager: this.spacesManager,
         securityLicense: plugins.security?.license,
       });
diff --git a/x-pack/plugins/spaces/server/capabilities/capabilities_switcher.test.ts b/x-pack/plugins/spaces/server/capabilities/capabilities_switcher.test.ts
index fcd756c2aca10..2c1ab26dd3d82 100644
--- a/x-pack/plugins/spaces/server/capabilities/capabilities_switcher.test.ts
+++ b/x-pack/plugins/spaces/server/capabilities/capabilities_switcher.test.ts
@@ -13,12 +13,11 @@ import { featuresPluginMock } from '../../../features/server/mocks';
 import { spacesServiceMock } from '../spaces_service/spaces_service.mock';
 import { PluginsStart } from '../plugin';
 
-const features: Feature[] = [
+const features = ([
   {
     id: 'feature_1',
     name: 'Feature 1',
     app: [],
-    privileges: {},
   },
   {
     id: 'feature_2',
@@ -60,7 +59,7 @@ const features: Feature[] = [
       },
     },
   },
-];
+] as unknown) as Feature[];
 
 const buildCapabilities = () =>
   Object.freeze({
diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json
index f02b52e5922d1..09392093b8f62 100644
--- a/x-pack/plugins/translations/translations/ja-JP.json
+++ b/x-pack/plugins/translations/translations/ja-JP.json
@@ -10429,7 +10429,6 @@
     "xpack.security.management.editRole.elasticSearchPrivileges.runAsPrivilegesTitle": "権限として実行",
     "xpack.security.management.editRole.featureTable.enabledRoleFeaturesEnabledColumnTitle": "権限",
     "xpack.security.management.editRole.featureTable.enabledRoleFeaturesFeatureColumnTitle": "機能",
-    "xpack.security.management.editRole.featureTable.excludedFromBasePrivilegsTooltip": "アクセスを許可するには、「カスタム」特権を使用します。{featureName} は基本権限の一部ではありません。",
     "xpack.security.management.editRole.indexPrivilegeForm.deleteSpacePrivilegeAriaLabel": "インデックスの権限を削除",
     "xpack.security.management.editRole.indexPrivilegeForm.grantedDocumentsQueryFormRowLabel": "提供されたドキュメントのクエリ",
     "xpack.security.management.editRole.indexPrivilegeForm.grantReadPrivilegesLabel": "特定のドキュメントの読み込み権限を提供",
@@ -10459,13 +10458,6 @@
     "xpack.security.management.editRole.simplePrivilegeForm.readPrivilegeInput": "読み込み",
     "xpack.security.management.editRole.simplePrivilegeForm.specifyPrivilegeForRoleDescription": "このロールの Kibana の権限を指定します。",
     "xpack.security.management.editRole.simplePrivilegeForm.unsupportedSpacePrivilegesWarning": "このロールはスペースへの権限が定義されていますが、Kibana でスペースが有効ではありません。このロールを保存するとこれらの権限が削除されます。",
-    "xpack.security.management.editRole.spaceAwarePrivilegeDisplay.effectivePrivilegeMessage": "{source} で許可されています。",
-    "xpack.security.management.editRole.spaceAwarePrivilegeDisplay.globalBasePrivilegeSource": "グローバルベース権限",
-    "xpack.security.management.editRole.spaceAwarePrivilegeDisplay.globalFeaturePrivilegeSource": "グローバル機能権限",
-    "xpack.security.management.editRole.spaceAwarePrivilegeDisplay.privilegeSupercededMessage": "{supersededPrivilege} のオリジナルの権限は {actualPrivilegeSource} により上書きされています",
-    "xpack.security.management.editRole.spaceAwarePrivilegeDisplay.spaceBasePrivilegeSource": "スペースベース権限",
-    "xpack.security.management.editRole.spaceAwarePrivilegeDisplay.spaceFeaturePrivilegeSource": "スペース機能権限",
-    "xpack.security.management.editRole.spaceAwarePrivilegeDisplay.unknownPrivilegeSource": "**不明**",
     "xpack.security.management.editRole.spaceAwarePrivilegeForm.ensureAccountHasAllPrivilegesGrantedDescription": "{kibanaAdmin} ロールによりアカウントにすべての権限が提供されていることを確認し、再試行してください。",
     "xpack.security.management.editRole.spaceAwarePrivilegeForm.globalSpacesName": "* グローバル (すべてのスペース)",
     "xpack.security.management.editRole.spaceAwarePrivilegeForm.howToViewAllAvailableSpacesDescription": "利用可能なすべてのスペースを表示する権限がありません。",
@@ -10489,15 +10481,9 @@
     "xpack.security.management.editRole.spacePrivilegeForm.readPrivilegeDropdownDisplay": "読み込み",
     "xpack.security.management.editRole.spacePrivilegeForm.spaceSelectorFormLabel": "スペース",
     "xpack.security.management.editRole.spacePrivilegeForm.summaryOfFeaturePrivileges": "機能権限のサマリー",
-    "xpack.security.management.editRole.spacePrivilegeMatrix.basePrivilegeText": "ベース権限",
-    "xpack.security.management.editRole.spacePrivilegeMatrix.basePrivilegeTooltip": "基本権限は自動的にすべての機能に与えられます。",
-    "xpack.security.management.editRole.spacePrivilegeMatrix.closeButton": "閉じる",
-    "xpack.security.management.editRole.spacePrivilegeMatrix.featureColumnTitle": "機能",
     "xpack.security.management.editRole.spacePrivilegeMatrix.globalSpaceName": "グローバル",
-    "xpack.security.management.editRole.spacePrivilegeMatrix.modalTitle": "権限のサマリー",
     "xpack.security.management.editRole.spacePrivilegeMatrix.showAllSpacesLink": "(すべてのスペース)",
     "xpack.security.management.editRole.spacePrivilegeMatrix.showNMoreSpacesLink": "他 {count} 件",
-    "xpack.security.management.editRole.spacePrivilegeMatrix.showSummaryText": "権限サマリーを表示",
     "xpack.security.management.editRole.spacePrivilegeSection.addSpacePrivilegeButton": "スペース権限を追加",
     "xpack.security.management.editRole.spacePrivilegeSection.noAccessToKibanaTitle": "このロールは Kibana へのアクセスを許可しません",
     "xpack.security.management.editRole.spacePrivilegeTable.deletePrivilegesLabel": "次のスペースの権限を削除: {spaceNames}",
@@ -10524,7 +10510,6 @@
     "xpack.security.management.editRoles.indexPrivilegeForm.grantedFieldsFormRowHelpText": "フィールドが提供されていない場合、このロールのユーザーはこのインデックスのデータを表示できません。",
     "xpack.security.management.editRoles.indexPrivilegeForm.grantedFieldsFormRowLabel": "許可されたフィールド",
     "xpack.security.management.editRoles.indexPrivilegeForm.grantFieldPrivilegesLabel": "特定のフィールドへのアクセスを許可",
-    "xpack.security.management.editRolespacePrivilegeForm.cancelButton": "キャンセル",
     "xpack.security.management.editRolespacePrivilegeForm.createGlobalPrivilegeButton": "グローバル権限を作成",
     "xpack.security.management.editRolespacePrivilegeForm.createPrivilegeButton": "スペース権限を作成",
     "xpack.security.management.editRolespacePrivilegeForm.updateGlobalPrivilegeButton": "グローバル特権を更新",
diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json
index be6a3df6b6c18..a3382a19f76b7 100644
--- a/x-pack/plugins/translations/translations/zh-CN.json
+++ b/x-pack/plugins/translations/translations/zh-CN.json
@@ -10429,7 +10429,6 @@
     "xpack.security.management.editRole.elasticSearchPrivileges.runAsPrivilegesTitle": "运行身份权限",
     "xpack.security.management.editRole.featureTable.enabledRoleFeaturesEnabledColumnTitle": "权限",
     "xpack.security.management.editRole.featureTable.enabledRoleFeaturesFeatureColumnTitle": "功能",
-    "xpack.security.management.editRole.featureTable.excludedFromBasePrivilegsTooltip": "使用“定制”权限来授予权限。{featureName} 不属于基础权限。",
     "xpack.security.management.editRole.indexPrivilegeForm.deleteSpacePrivilegeAriaLabel": "删除索引权限",
     "xpack.security.management.editRole.indexPrivilegeForm.grantedDocumentsQueryFormRowLabel": "已授权文档查询",
     "xpack.security.management.editRole.indexPrivilegeForm.grantReadPrivilegesLabel": "授予特定文档的读取权限",
@@ -10459,13 +10458,6 @@
     "xpack.security.management.editRole.simplePrivilegeForm.readPrivilegeInput": "读取",
     "xpack.security.management.editRole.simplePrivilegeForm.specifyPrivilegeForRoleDescription": "为此角色指定 Kibana 权限。",
     "xpack.security.management.editRole.simplePrivilegeForm.unsupportedSpacePrivilegesWarning": "此角色包含工作区的权限定义，但在 Kibana 中未启用工作区。保存此角色将会移除这些权限。",
-    "xpack.security.management.editRole.spaceAwarePrivilegeDisplay.effectivePrivilegeMessage": "已通过 {source} 授予。",
-    "xpack.security.management.editRole.spaceAwarePrivilegeDisplay.globalBasePrivilegeSource": "全局基本权限",
-    "xpack.security.management.editRole.spaceAwarePrivilegeDisplay.globalFeaturePrivilegeSource": "全局功能权限",
-    "xpack.security.management.editRole.spaceAwarePrivilegeDisplay.privilegeSupercededMessage": "{supersededPrivilege} 的原始权限已为 {actualPrivilegeSource} 所覆盖",
-    "xpack.security.management.editRole.spaceAwarePrivilegeDisplay.spaceBasePrivilegeSource": "工作区基本权限",
-    "xpack.security.management.editRole.spaceAwarePrivilegeDisplay.spaceFeaturePrivilegeSource": "全局功能权限",
-    "xpack.security.management.editRole.spaceAwarePrivilegeDisplay.unknownPrivilegeSource": "**未知**",
     "xpack.security.management.editRole.spaceAwarePrivilegeForm.ensureAccountHasAllPrivilegesGrantedDescription": "请确保您的帐户具有 {kibanaAdmin} 角色授予的所有权限，然后重试。",
     "xpack.security.management.editRole.spaceAwarePrivilegeForm.globalSpacesName": "* 全局（所有工作区）",
     "xpack.security.management.editRole.spaceAwarePrivilegeForm.howToViewAllAvailableSpacesDescription": "您无权查看所有可用工作区。",
@@ -10489,15 +10481,9 @@
     "xpack.security.management.editRole.spacePrivilegeForm.readPrivilegeDropdownDisplay": "读取",
     "xpack.security.management.editRole.spacePrivilegeForm.spaceSelectorFormLabel": "工作区",
     "xpack.security.management.editRole.spacePrivilegeForm.summaryOfFeaturePrivileges": "功能权限的摘要",
-    "xpack.security.management.editRole.spacePrivilegeMatrix.basePrivilegeText": "基本权限",
-    "xpack.security.management.editRole.spacePrivilegeMatrix.basePrivilegeTooltip": "所有功能的基本权限将自动授予。",
-    "xpack.security.management.editRole.spacePrivilegeMatrix.closeButton": "关闭",
-    "xpack.security.management.editRole.spacePrivilegeMatrix.featureColumnTitle": "功能",
     "xpack.security.management.editRole.spacePrivilegeMatrix.globalSpaceName": "全局",
-    "xpack.security.management.editRole.spacePrivilegeMatrix.modalTitle": "权限摘要",
     "xpack.security.management.editRole.spacePrivilegeMatrix.showAllSpacesLink": "（所有工作区）",
     "xpack.security.management.editRole.spacePrivilegeMatrix.showNMoreSpacesLink": "另外 {count} 个",
-    "xpack.security.management.editRole.spacePrivilegeMatrix.showSummaryText": "查看权限摘要",
     "xpack.security.management.editRole.spacePrivilegeSection.addSpacePrivilegeButton": "添加工作区权限",
     "xpack.security.management.editRole.spacePrivilegeSection.noAccessToKibanaTitle": "此角色未授予对 Kibana 的访问权限",
     "xpack.security.management.editRole.spacePrivilegeTable.deletePrivilegesLabel": "删除以下工作区的权限：{spaceNames}。",
@@ -10524,7 +10510,6 @@
     "xpack.security.management.editRoles.indexPrivilegeForm.grantedFieldsFormRowHelpText": "如果未授权任何字段，则分配到此角色的用户将无法查看此索引的任何数据。",
     "xpack.security.management.editRoles.indexPrivilegeForm.grantedFieldsFormRowLabel": "已授权字段",
     "xpack.security.management.editRoles.indexPrivilegeForm.grantFieldPrivilegesLabel": "授予对特定字段的访问权限",
-    "xpack.security.management.editRolespacePrivilegeForm.cancelButton": "取消",
     "xpack.security.management.editRolespacePrivilegeForm.createGlobalPrivilegeButton": "创建全局权限",
     "xpack.security.management.editRolespacePrivilegeForm.createPrivilegeButton": "创建工作区权限",
     "xpack.security.management.editRolespacePrivilegeForm.updateGlobalPrivilegeButton": "更新全局权限",
diff --git a/x-pack/plugins/uptime/server/kibana.index.ts b/x-pack/plugins/uptime/server/kibana.index.ts
index 19506bb316a05..da208e13acdad 100644
--- a/x-pack/plugins/uptime/server/kibana.index.ts
+++ b/x-pack/plugins/uptime/server/kibana.index.ts
@@ -32,12 +32,15 @@ export const initServerWithKibana = (server: UptimeCoreSetup, plugins: UptimeCor
   features.registerFeature({
     id: PLUGIN.ID,
     name: PLUGIN.NAME,
+    order: 1000,
     navLinkId: PLUGIN.ID,
     icon: 'uptimeApp',
     app: ['uptime', 'kibana'],
     catalogue: ['uptime'],
     privileges: {
       all: {
+        app: ['uptime', 'kibana'],
+        catalogue: ['uptime'],
         api: ['uptime-read', 'uptime-write'],
         savedObject: {
           all: [umDynamicSettings.name],
@@ -46,6 +49,8 @@ export const initServerWithKibana = (server: UptimeCoreSetup, plugins: UptimeCor
         ui: ['save', 'configureSettings', 'show'],
       },
       read: {
+        app: ['uptime', 'kibana'],
+        catalogue: ['uptime'],
         api: ['uptime-read'],
         savedObject: {
           all: [],
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 acd14e8a2bf7b..019b15cc1862a 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
@@ -57,6 +57,7 @@ export default function(kibana: any) {
         app: ['actions', 'kibana'],
         privileges: {
           all: {
+            app: ['actions', 'kibana'],
             savedObject: {
               all: ['action', 'action_task_params'],
               read: [],
@@ -65,6 +66,7 @@ export default function(kibana: any) {
             api: ['actions-read', 'actions-all'],
           },
           read: {
+            app: ['actions', 'kibana'],
             savedObject: {
               all: ['action_task_params'],
               read: ['action'],
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 9b4a2d14de9ea..fe0f630830a56 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
@@ -20,6 +20,7 @@ export default function(kibana: any) {
         app: ['alerting', 'kibana'],
         privileges: {
           all: {
+            app: ['alerting', 'kibana'],
             savedObject: {
               all: ['alert'],
               read: [],
@@ -28,6 +29,7 @@ export default function(kibana: any) {
             api: ['alerting-read', 'alerting-all'],
           },
           read: {
+            app: ['alerting', 'kibana'],
             savedObject: {
               all: [],
               read: ['alert'],
diff --git a/x-pack/test/api_integration/apis/security/index.js b/x-pack/test/api_integration/apis/security/index.js
index df35ec2195dc5..ad1876cb717f1 100644
--- a/x-pack/test/api_integration/apis/security/index.js
+++ b/x-pack/test/api_integration/apis/security/index.js
@@ -8,6 +8,9 @@ export default function({ loadTestFile }) {
   describe('security', function() {
     this.tags('ciGroup6');
 
+    // Updates here should be mirrored in `./security_basic.ts` if tests
+    // should also run under a basic license.
+
     loadTestFile(require.resolve('./basic_login'));
     loadTestFile(require.resolve('./builtin_es_privileges'));
     loadTestFile(require.resolve('./change_password'));
diff --git a/x-pack/test/api_integration/apis/security/privileges.ts b/x-pack/test/api_integration/apis/security/privileges.ts
index 0b29fc1cac7de..77293ddff3f9f 100644
--- a/x-pack/test/api_integration/apis/security/privileges.ts
+++ b/x-pack/test/api_integration/apis/security/privileges.ts
@@ -5,6 +5,8 @@
  */
 import util from 'util';
 import { isEqual } from 'lodash';
+import expect from '@kbn/expect/expect.js';
+import { RawKibanaPrivileges } from '../../../../plugins/security/common/model';
 import { FtrProviderContext } from '../../ftr_provider_context';
 
 export default function({ getService }: FtrProviderContext) {
@@ -18,9 +20,9 @@ export default function({ getService }: FtrProviderContext) {
         // Roles are associated with these privileges, and we shouldn't be removing them in a minor version.
         const expected = {
           features: {
-            discover: ['all', 'read'],
-            visualize: ['all', 'read'],
-            dashboard: ['all', 'read'],
+            discover: ['all', 'read', 'minimal_all', 'minimal_read', 'url_create'],
+            visualize: ['all', 'read', 'minimal_all', 'minimal_read', 'url_create'],
+            dashboard: ['all', 'read', 'minimal_all', 'minimal_read', 'url_create'],
             dev_tools: ['all', 'read'],
             advancedSettings: ['all', 'read'],
             indexPatterns: ['all', 'read'],
@@ -48,13 +50,18 @@ export default function({ getService }: FtrProviderContext) {
           .send()
           .expect(200)
           .expect((res: any) => {
-            // when comparing privileges, the order of the privileges doesn't matter.
+            // when comparing privileges, the order of the features doesn't matter (but the order of the privileges does)
             // supertest uses assert.deepStrictEqual.
             // expect.js doesn't help us here.
             // and lodash's isEqual doesn't know how to compare Sets.
             const success = isEqual(res.body, expected, (value, other, key) => {
               if (Array.isArray(value) && Array.isArray(other)) {
-                return isEqual(value.sort(), other.sort());
+                if (key === 'reserved') {
+                  // order does not matter for the reserved privilege set.
+                  return isEqual(value.sort(), other.sort());
+                }
+                // order matters for the rest, as the UI assumes they are returned in a descending order of permissiveness.
+                return isEqual(value, other);
               }
 
               // Lodash types aren't correct, `undefined` should be supported as a return value here and it
@@ -71,5 +78,70 @@ export default function({ getService }: FtrProviderContext) {
           .expect(200);
       });
     });
+
+    describe('GET /api/security/privileges?includeActions=true', () => {
+      // The UI assumes that no wildcards are present when calculating the effective set of privileges.
+      // If this changes, then the "privilege calculators" will need revisiting to account for these wildcards.
+      it('should return a privilege map with actions which do not include wildcards', async () => {
+        await supertest
+          .get('/api/security/privileges?includeActions=true')
+          .set('kbn-xsrf', 'xxx')
+          .send()
+          .expect(200)
+          .expect((res: any) => {
+            const { features, global, space, reserved } = res.body as RawKibanaPrivileges;
+            expect(features).to.be.an('object');
+            expect(global).to.be.an('object');
+            expect(space).to.be.an('object');
+            expect(reserved).to.be.an('object');
+
+            Object.entries(features).forEach(([featureId, featurePrivs]) => {
+              Object.values(featurePrivs).forEach(actions => {
+                expect(actions).to.be.an('array');
+                actions.forEach(action => {
+                  expect(action).to.be.a('string');
+                  expect(action.indexOf('*')).to.eql(
+                    -1,
+                    `Feature ${featureId} with action ${action} cannot contain a wildcard`
+                  );
+                });
+              });
+            });
+
+            Object.entries(global).forEach(([privilegeId, actions]) => {
+              expect(actions).to.be.an('array');
+              actions.forEach(action => {
+                expect(action).to.be.a('string');
+                expect(action.indexOf('*')).to.eql(
+                  -1,
+                  `Global privilege ${privilegeId} with action ${action} cannot contain a wildcard`
+                );
+              });
+            });
+
+            Object.entries(space).forEach(([privilegeId, actions]) => {
+              expect(actions).to.be.an('array');
+              actions.forEach(action => {
+                expect(action).to.be.a('string');
+                expect(action.indexOf('*')).to.eql(
+                  -1,
+                  `Space privilege ${privilegeId} with action ${action} cannot contain a wildcard`
+                );
+              });
+            });
+
+            Object.entries(reserved).forEach(([privilegeId, actions]) => {
+              expect(actions).to.be.an('array');
+              actions.forEach(action => {
+                expect(action).to.be.a('string');
+                expect(action.indexOf('*')).to.eql(
+                  -1,
+                  `Reserved privilege ${privilegeId} with action ${action} cannot contain a wildcard`
+                );
+              });
+            });
+          });
+      });
+    });
   });
 }
diff --git a/x-pack/test/api_integration/apis/security/privileges_basic.ts b/x-pack/test/api_integration/apis/security/privileges_basic.ts
new file mode 100644
index 0000000000000..0b29fc1cac7de
--- /dev/null
+++ b/x-pack/test/api_integration/apis/security/privileges_basic.ts
@@ -0,0 +1,75 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+import util from 'util';
+import { isEqual } from 'lodash';
+import { FtrProviderContext } from '../../ftr_provider_context';
+
+export default function({ getService }: FtrProviderContext) {
+  const supertest = getService('supertest');
+
+  describe('Privileges', () => {
+    describe('GET /api/security/privileges', () => {
+      it('should return a privilege map with all known privileges, without actions', async () => {
+        // If you're adding a privilege to the following, that's great!
+        // If you're removing a privilege, this breaks backwards compatibility
+        // Roles are associated with these privileges, and we shouldn't be removing them in a minor version.
+        const expected = {
+          features: {
+            discover: ['all', 'read'],
+            visualize: ['all', 'read'],
+            dashboard: ['all', 'read'],
+            dev_tools: ['all', 'read'],
+            advancedSettings: ['all', 'read'],
+            indexPatterns: ['all', 'read'],
+            savedObjectsManagement: ['all', 'read'],
+            timelion: ['all', 'read'],
+            graph: ['all', 'read'],
+            maps: ['all', 'read'],
+            canvas: ['all', 'read'],
+            infrastructure: ['all', 'read'],
+            logs: ['all', 'read'],
+            uptime: ['all', 'read'],
+            apm: ['all', 'read'],
+            siem: ['all', 'read'],
+            endpoint: ['all', 'read'],
+            ingestManager: ['all', 'read'],
+          },
+          global: ['all', 'read'],
+          space: ['all', 'read'],
+          reserved: ['ml', 'monitoring'],
+        };
+
+        await supertest
+          .get('/api/security/privileges')
+          .set('kbn-xsrf', 'xxx')
+          .send()
+          .expect(200)
+          .expect((res: any) => {
+            // when comparing privileges, the order of the privileges doesn't matter.
+            // supertest uses assert.deepStrictEqual.
+            // expect.js doesn't help us here.
+            // and lodash's isEqual doesn't know how to compare Sets.
+            const success = isEqual(res.body, expected, (value, other, key) => {
+              if (Array.isArray(value) && Array.isArray(other)) {
+                return isEqual(value.sort(), other.sort());
+              }
+
+              // Lodash types aren't correct, `undefined` should be supported as a return value here and it
+              // has special meaning.
+              return undefined as any;
+            });
+
+            if (!success) {
+              throw new Error(
+                `Expected ${util.inspect(res.body)} to equal ${util.inspect(expected)}`
+              );
+            }
+          })
+          .expect(200);
+      });
+    });
+  });
+}
diff --git a/x-pack/test/api_integration/apis/security/security_basic.ts b/x-pack/test/api_integration/apis/security/security_basic.ts
new file mode 100644
index 0000000000000..dcbdb17724249
--- /dev/null
+++ b/x-pack/test/api_integration/apis/security/security_basic.ts
@@ -0,0 +1,24 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { FtrProviderContext } from '../../ftr_provider_context';
+
+export default function({ loadTestFile }: FtrProviderContext) {
+  describe('security (basic license)', function() {
+    this.tags('ciGroup6');
+
+    // Updates here should be mirrored in `./index.js` if tests
+    // should also run under a trial/platinum license.
+
+    loadTestFile(require.resolve('./basic_login'));
+    loadTestFile(require.resolve('./builtin_es_privileges'));
+    loadTestFile(require.resolve('./change_password'));
+    loadTestFile(require.resolve('./index_fields'));
+    loadTestFile(require.resolve('./roles'));
+    loadTestFile(require.resolve('./privileges_basic'));
+    loadTestFile(require.resolve('./session'));
+  });
+}
diff --git a/x-pack/test/api_integration/config_security_basic.js b/x-pack/test/api_integration/config_security_basic.js
index c427bf7fa8f28..d21bfa4d7031a 100644
--- a/x-pack/test/api_integration/config_security_basic.js
+++ b/x-pack/test/api_integration/config_security_basic.js
@@ -14,7 +14,7 @@ export default async function({ readConfigFile }) {
       'xpack.license.self_generated.type=basic',
       'xpack.security.enabled=true',
     ];
-    config.testFiles = [require.resolve('./apis/security')];
+    config.testFiles = [require.resolve('./apis/security/security_basic')];
     return config;
   });
 }
diff --git a/x-pack/test/functional/apps/dashboard/feature_controls/dashboard_security.ts b/x-pack/test/functional/apps/dashboard/feature_controls/dashboard_security.ts
index b966d37becc3f..de68ec0c64c17 100644
--- a/x-pack/test/functional/apps/dashboard/feature_controls/dashboard_security.ts
+++ b/x-pack/test/functional/apps/dashboard/feature_controls/dashboard_security.ts
@@ -338,6 +338,115 @@ export default function({ getPageObjects, getService }: FtrProviderContext) {
       });
     });
 
+    describe('global dashboard read-only with url_create privileges', () => {
+      before(async () => {
+        await security.role.create('global_dashboard_read_url_create_role', {
+          elasticsearch: {
+            indices: [{ names: ['logstash-*'], privileges: ['read', 'view_index_metadata'] }],
+          },
+          kibana: [
+            {
+              feature: {
+                dashboard: ['read', 'url_create'],
+              },
+              spaces: ['*'],
+            },
+          ],
+        });
+
+        await security.user.create('global_dashboard_read_url_create_user', {
+          password: 'global_dashboard_read_url_create_user-password',
+          roles: ['global_dashboard_read_url_create_role'],
+          full_name: 'test user',
+        });
+
+        await PageObjects.security.login(
+          'global_dashboard_read_url_create_user',
+          'global_dashboard_read_url_create_user-password',
+          {
+            expectSpaceSelector: false,
+          }
+        );
+      });
+
+      after(async () => {
+        await security.role.delete('global_dashboard_read_url_create_role');
+        await security.user.delete('global_dashboard_read_url_create_user');
+      });
+
+      it('shows dashboard navlink', async () => {
+        const navLinks = (await appsMenu.readLinks()).map(link => link.text);
+        expect(navLinks).to.eql(['Dashboard', 'Management']);
+      });
+
+      it(`landing page doesn't show "Create new Dashboard" button`, async () => {
+        await PageObjects.common.navigateToActualUrl(
+          'kibana',
+          DashboardConstants.LANDING_PAGE_PATH,
+          {
+            ensureCurrentUrl: false,
+            shouldLoginIfPrompted: false,
+          }
+        );
+        await testSubjects.existOrFail('dashboardLandingPage', { timeout: 10000 });
+        await testSubjects.missingOrFail('newItemButton');
+      });
+
+      it(`shows read-only badge`, async () => {
+        await globalNav.badgeExistsOrFail('Read only');
+      });
+
+      it(`create new dashboard redirects to the home page`, async () => {
+        await PageObjects.common.navigateToActualUrl(
+          'kibana',
+          DashboardConstants.CREATE_NEW_DASHBOARD_URL,
+          {
+            ensureCurrentUrl: false,
+            shouldLoginIfPrompted: false,
+          }
+        );
+        await testSubjects.existOrFail('homeApp', { timeout: 20000 });
+      });
+
+      it(`can view existing Dashboard`, async () => {
+        await PageObjects.common.navigateToActualUrl('kibana', createDashboardEditUrl('i-exist'), {
+          ensureCurrentUrl: false,
+          shouldLoginIfPrompted: false,
+        });
+        await testSubjects.existOrFail('embeddablePanelHeading-APie', { timeout: 10000 });
+      });
+
+      it(`Permalinks shows create short-url button`, async () => {
+        await PageObjects.share.openShareMenuItem('Permalinks');
+        await PageObjects.share.createShortUrlExistOrFail();
+      });
+
+      it('allows loading a saved query via the saved query management component', async () => {
+        await savedQueryManagementComponent.loadSavedQuery('OKJpgs');
+        const queryString = await queryBar.getQueryString();
+        expect(queryString).to.eql('response:200');
+      });
+
+      it('does not allow saving via the saved query management component popover with no query loaded', async () => {
+        await savedQueryManagementComponent.saveNewQueryMissingOrFail();
+      });
+
+      it('does not allow saving changes to saved query from the saved query management component', async () => {
+        await savedQueryManagementComponent.loadSavedQuery('OKJpgs');
+        await queryBar.setQuery('response:404');
+        await savedQueryManagementComponent.updateCurrentlyLoadedQueryMissingOrFail();
+      });
+
+      it('does not allow deleting a saved query from the saved query management component', async () => {
+        await savedQueryManagementComponent.deleteSavedQueryMissingOrFail('OKJpgs');
+      });
+
+      it('allows clearing the currently loaded saved query', async () => {
+        await savedQueryManagementComponent.loadSavedQuery('OKJpgs');
+        await savedQueryManagementComponent.clearCurrentlyLoadedQuery();
+      });
+    });
+
     describe('no dashboard privileges', () => {
       before(async () => {
         await security.role.create('no_dashboard_privileges_role', {
diff --git a/x-pack/test/functional/apps/discover/feature_controls/discover_security.ts b/x-pack/test/functional/apps/discover/feature_controls/discover_security.ts
index 98ab4c1f15a54..dc8c488460100 100644
--- a/x-pack/test/functional/apps/discover/feature_controls/discover_security.ts
+++ b/x-pack/test/functional/apps/discover/feature_controls/discover_security.ts
@@ -221,6 +221,97 @@ export default function({ getPageObjects, getService }: FtrProviderContext) {
       });
     });
 
+    describe('global discover read-only privileges with url_create', () => {
+      before(async () => {
+        await security.role.create('global_discover_read_url_create_role', {
+          elasticsearch: {
+            indices: [{ names: ['logstash-*'], privileges: ['read', 'view_index_metadata'] }],
+          },
+          kibana: [
+            {
+              feature: {
+                discover: ['read', 'url_create'],
+              },
+              spaces: ['*'],
+            },
+          ],
+        });
+
+        await security.user.create('global_discover_read_url_create_user', {
+          password: 'global_discover_read_url_create_user-password',
+          roles: ['global_discover_read_url_create_role'],
+          full_name: 'test user',
+        });
+
+        await PageObjects.security.login(
+          'global_discover_read_url_create_user',
+          'global_discover_read_url_create_user-password',
+          {
+            expectSpaceSelector: false,
+          }
+        );
+      });
+
+      after(async () => {
+        await security.user.delete('global_discover_read_url_create_user');
+        await security.role.delete('global_discover_read_url_create_role');
+      });
+
+      it('shows discover navlink', async () => {
+        const navLinks = (await appsMenu.readLinks()).map(link => link.text);
+        expect(navLinks).to.eql(['Discover', 'Management']);
+      });
+
+      it(`doesn't show save button`, async () => {
+        await PageObjects.common.navigateToApp('discover');
+        await testSubjects.existOrFail('discoverNewButton', { timeout: 10000 });
+        await testSubjects.missingOrFail('discoverSaveButton');
+      });
+
+      it(`shows read-only badge`, async () => {
+        await globalNav.badgeExistsOrFail('Read only');
+      });
+
+      it(`doesn't show visualize button`, async () => {
+        await PageObjects.common.navigateToApp('discover');
+        await setDiscoverTimeRange();
+        await PageObjects.discover.clickFieldListItem('bytes');
+        await PageObjects.discover.expectMissingFieldListItemVisualize('bytes');
+      });
+
+      it('Permalinks shows create short-url button', async () => {
+        await PageObjects.share.openShareMenuItem('Permalinks');
+        await PageObjects.share.createShortUrlExistOrFail();
+        // close the menu
+        await PageObjects.share.clickShareTopNavButton();
+      });
+
+      it('allows loading a saved query via the saved query management component', async () => {
+        await savedQueryManagementComponent.loadSavedQuery('OKJpgs');
+        const queryString = await queryBar.getQueryString();
+        expect(queryString).to.eql('response:200');
+      });
+
+      it('does not allow saving via the saved query management component popover with no query loaded', async () => {
+        await savedQueryManagementComponent.saveNewQueryMissingOrFail();
+      });
+
+      it('does not allow saving changes to saved query from the saved query management component', async () => {
+        await savedQueryManagementComponent.loadSavedQuery('OKJpgs');
+        await queryBar.setQuery('response:404');
+        await savedQueryManagementComponent.updateCurrentlyLoadedQueryMissingOrFail();
+      });
+
+      it('does not allow deleting a saved query from the saved query management component', async () => {
+        await savedQueryManagementComponent.deleteSavedQueryMissingOrFail('OKJpgs');
+      });
+
+      it('allows clearing the currently loaded saved query', async () => {
+        await savedQueryManagementComponent.loadSavedQuery('OKJpgs');
+        await savedQueryManagementComponent.clearCurrentlyLoadedQuery();
+      });
+    });
+
     describe('discover and visualize privileges', () => {
       before(async () => {
         await security.role.create('global_discover_visualize_read_role', {
diff --git a/x-pack/test/functional/apps/visualize/feature_controls/visualize_security.ts b/x-pack/test/functional/apps/visualize/feature_controls/visualize_security.ts
index e5b6512d1c1b0..9f080a056e91f 100644
--- a/x-pack/test/functional/apps/visualize/feature_controls/visualize_security.ts
+++ b/x-pack/test/functional/apps/visualize/feature_controls/visualize_security.ts
@@ -276,6 +276,113 @@ export default function({ getPageObjects, getService }: FtrProviderContext) {
       });
     });
 
+    describe('global visualize read-only with url_create privileges', () => {
+      before(async () => {
+        await security.role.create('global_visualize_read_url_create_role', {
+          elasticsearch: {
+            indices: [{ names: ['logstash-*'], privileges: ['read', 'view_index_metadata'] }],
+          },
+          kibana: [
+            {
+              feature: {
+                visualize: ['read', 'url_create'],
+              },
+              spaces: ['*'],
+            },
+          ],
+        });
+
+        await security.user.create('global_visualize_read_url_create_user', {
+          password: 'global_visualize_read_url_create_user-password',
+          roles: ['global_visualize_read_url_create_role'],
+          full_name: 'test user',
+        });
+
+        await PageObjects.security.login(
+          'global_visualize_read_url_create_user',
+          'global_visualize_read_url_create_user-password',
+          {
+            expectSpaceSelector: false,
+          }
+        );
+      });
+
+      after(async () => {
+        await PageObjects.security.forceLogout();
+        await security.role.delete('global_visualize_read_url_create_role');
+        await security.user.delete('global_visualize_read_url_create_user');
+      });
+
+      it('shows visualize navlink', async () => {
+        const navLinks = (await appsMenu.readLinks()).map(link => link.text);
+        expect(navLinks).to.eql(['Visualize', 'Management']);
+      });
+
+      it(`landing page shows "Create new Visualization" button`, async () => {
+        await PageObjects.visualize.gotoVisualizationLandingPage();
+        await testSubjects.existOrFail('visualizeLandingPage', { timeout: 10000 });
+        await testSubjects.existOrFail('newItemButton');
+      });
+
+      it(`shows read-only badge`, async () => {
+        await globalNav.badgeExistsOrFail('Read only');
+      });
+
+      it(`can view existing Visualization`, async () => {
+        await PageObjects.common.navigateToActualUrl('visualize', '/visualize/edit/i-exist', {
+          ensureCurrentUrl: false,
+          shouldLoginIfPrompted: false,
+        });
+        await testSubjects.existOrFail('visualizationLoader', { timeout: 10000 });
+      });
+
+      it(`can't save existing Visualization`, async () => {
+        await PageObjects.common.navigateToActualUrl('visualize', '/visualize/edit/i-exist', {
+          ensureCurrentUrl: false,
+          shouldLoginIfPrompted: false,
+        });
+        await testSubjects.existOrFail('shareTopNavButton', { timeout: 10000 });
+        await testSubjects.missingOrFail('visualizeSaveButton', { timeout: 10000 });
+      });
+
+      it('Embed code shows create short-url button', async () => {
+        await PageObjects.share.openShareMenuItem('Embedcode');
+        await PageObjects.share.createShortUrlExistOrFail();
+      });
+
+      it('Permalinks shows create short-url button', async () => {
+        await PageObjects.share.openShareMenuItem('Permalinks');
+        await PageObjects.share.createShortUrlExistOrFail();
+        // close menu
+        await PageObjects.share.clickShareTopNavButton();
+      });
+
+      it('allows loading a saved query via the saved query management component', async () => {
+        await savedQueryManagementComponent.loadSavedQuery('OKJpgs');
+        const queryString = await queryBar.getQueryString();
+        expect(queryString).to.eql('response:200');
+      });
+
+      it('does not allow saving via the saved query management component popover with no query loaded', async () => {
+        await savedQueryManagementComponent.saveNewQueryMissingOrFail();
+      });
+
+      it('does not allow saving changes to saved query from the saved query management component', async () => {
+        await savedQueryManagementComponent.loadSavedQuery('OKJpgs');
+        await queryBar.setQuery('response:404');
+        await savedQueryManagementComponent.updateCurrentlyLoadedQueryMissingOrFail();
+      });
+
+      it('does not allow deleting a saved query from the saved query management component', async () => {
+        await savedQueryManagementComponent.deleteSavedQueryMissingOrFail('OKJpgs');
+      });
+
+      it('allows clearing the currently loaded saved query', async () => {
+        await savedQueryManagementComponent.loadSavedQuery('OKJpgs');
+        await savedQueryManagementComponent.clearCurrentlyLoadedQuery();
+      });
+    });
+
     describe('no visualize privileges', () => {
       before(async () => {
         await security.role.create('no_visualize_privileges_role', {
diff --git a/x-pack/test/ui_capabilities/common/fixtures/plugins/foo_plugin/index.js b/x-pack/test/ui_capabilities/common/fixtures/plugins/foo_plugin/index.js
index 6110996a553dc..89ae0125614b6 100644
--- a/x-pack/test/ui_capabilities/common/fixtures/plugins/foo_plugin/index.js
+++ b/x-pack/test/ui_capabilities/common/fixtures/plugins/foo_plugin/index.js
@@ -28,6 +28,8 @@ export default function(kibana) {
         catalogue: ['foo'],
         privileges: {
           all: {
+            app: ['kibana'],
+            catalogue: ['foo'],
             savedObject: {
               all: ['foo'],
               read: ['index-pattern'],
@@ -35,6 +37,8 @@ export default function(kibana) {
             ui: ['create', 'edit', 'delete', 'show'],
           },
           read: {
+            app: ['kibana'],
+            catalogue: ['foo'],
             savedObject: {
               all: [],
               read: ['foo', 'index-pattern'],

From e55ee76b26505fead41854ad10ad8e8f7da5f5da Mon Sep 17 00:00:00 2001
From: Nathan Reese <reese.nathan@gmail.com>
Date: Tue, 24 Mar 2020 09:38:00 -0600
Subject: [PATCH 083/179] [Maps] convert layer utils to TS (#60791)

* [Maps] convert layer utils to TS

* clean up

* renovate changes

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 renovate.json5                                |  8 ++++
 .../common/data_request_descriptor_types.d.ts | 30 ++++++++++---
 .../plugins/maps/common/map_descriptor.ts     | 13 ++++++
 .../public/layers/blended_vector_layer.ts     |  1 -
 .../maps/public/layers/sources/es_source.d.ts |  6 +--
 .../maps/public/layers/sources/source.d.ts    | 17 ++++++-
 .../public/layers/sources/vector_source.d.ts  |  3 +-
 .../maps/public/layers/tile_layer.test.ts     | 13 ++----
 ...ids.test.js => assign_feature_ids.test.ts} | 44 +++++++++++++------
 ...n_feature_ids.js => assign_feature_ids.ts} |  7 +--
 .../{can_skip_fetch.js => can_skip_fetch.ts}  | 40 ++++++++++++++---
 ...only_query.js => is_refresh_only_query.ts} |  7 ++-
 ...xpressions.js => mb_filter_expressions.ts} |  6 +--
 .../maps/public/layers/vector_layer.d.ts      |  4 +-
 x-pack/package.json                           |  1 +
 yarn.lock                                     |  2 +-
 16 files changed, 149 insertions(+), 53 deletions(-)
 create mode 100644 x-pack/legacy/plugins/maps/common/map_descriptor.ts
 rename x-pack/legacy/plugins/maps/public/layers/util/{assign_feature_ids.test.js => assign_feature_ids.test.ts} (74%)
 rename x-pack/legacy/plugins/maps/public/layers/util/{assign_feature_ids.js => assign_feature_ids.ts} (90%)
 rename x-pack/legacy/plugins/maps/public/layers/util/{can_skip_fetch.js => can_skip_fetch.ts} (84%)
 rename x-pack/legacy/plugins/maps/public/layers/util/{is_refresh_only_query.js => is_refresh_only_query.ts} (78%)
 rename x-pack/legacy/plugins/maps/public/layers/util/{mb_filter_expressions.js => mb_filter_expressions.ts} (87%)

diff --git a/renovate.json5 b/renovate.json5
index e4836537df703..57f175d1afc8e 100644
--- a/renovate.json5
+++ b/renovate.json5
@@ -297,6 +297,14 @@
           '@types/flot',
         ],
       },
+      {
+        groupSlug: 'geojson',
+        groupName: 'geojson related packages',
+        packageNames: [
+          'geojson',
+          '@types/geojson',
+        ],
+      },
       {
         groupSlug: 'getopts',
         groupName: 'getopts related packages',
diff --git a/x-pack/legacy/plugins/maps/common/data_request_descriptor_types.d.ts b/x-pack/legacy/plugins/maps/common/data_request_descriptor_types.d.ts
index 3281fb5892eac..a0102a4249a59 100644
--- a/x-pack/legacy/plugins/maps/common/data_request_descriptor_types.d.ts
+++ b/x-pack/legacy/plugins/maps/common/data_request_descriptor_types.d.ts
@@ -5,25 +5,41 @@
  */
 /* eslint-disable @typescript-eslint/consistent-type-definitions */
 
+import { Query } from './map_descriptor';
+
+type Extent = {
+  maxLat: number;
+  maxLon: number;
+  minLat: number;
+  minLon: number;
+};
+
 // Global map state passed to every layer.
 export type MapFilters = {
-  buffer: unknown;
-  extent: unknown;
+  buffer: Extent; // extent with additional buffer
+  extent: Extent; // map viewport
   filters: unknown[];
-  query: unknown;
+  query: Query;
   refreshTimerLastTriggeredAt: string;
   timeFilters: unknown;
   zoom: number;
 };
 
-export type VectorLayerRequestMeta = MapFilters & {
+export type VectorSourceRequestMeta = MapFilters & {
   applyGlobalQuery: boolean;
   fieldNames: string[];
   geogridPrecision: number;
-  sourceQuery: unknown;
+  sourceQuery: Query;
   sourceMeta: unknown;
 };
 
+export type VectorStyleRequestMeta = MapFilters & {
+  dynamicStyleFields: string[];
+  isTimeAware: boolean;
+  sourceQuery: Query;
+  timeFilters: unknown;
+};
+
 export type ESSearchSourceResponseMeta = {
   areResultsTrimmed?: boolean;
   sourceType?: string;
@@ -35,7 +51,9 @@ export type ESSearchSourceResponseMeta = {
 };
 
 // Partial because objects are justified downstream in constructors
-export type DataMeta = Partial<VectorLayerRequestMeta> & Partial<ESSearchSourceResponseMeta>;
+export type DataMeta = Partial<VectorSourceRequestMeta> &
+  Partial<VectorStyleRequestMeta> &
+  Partial<ESSearchSourceResponseMeta>;
 
 export type DataRequestDescriptor = {
   dataId: string;
diff --git a/x-pack/legacy/plugins/maps/common/map_descriptor.ts b/x-pack/legacy/plugins/maps/common/map_descriptor.ts
new file mode 100644
index 0000000000000..570398e37c5d4
--- /dev/null
+++ b/x-pack/legacy/plugins/maps/common/map_descriptor.ts
@@ -0,0 +1,13 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+/* eslint-disable @typescript-eslint/consistent-type-definitions */
+
+export type Query = {
+  language: string;
+  query: string;
+  queryLastTriggeredAt: string;
+};
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 22990538bd5d3..8c54720987e41 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
@@ -23,7 +23,6 @@ import {
   FIELD_ORIGIN,
 } from '../../common/constants';
 import { ESGeoGridSource } from './sources/es_geo_grid_source/es_geo_grid_source';
-// @ts-ignore
 import { canSkipSourceUpdate } from './util/can_skip_fetch';
 import { IVectorLayer, VectorLayerArguments } from './vector_layer';
 import { IESSource } from './sources/es_source';
diff --git a/x-pack/legacy/plugins/maps/public/layers/sources/es_source.d.ts b/x-pack/legacy/plugins/maps/public/layers/sources/es_source.d.ts
index 963a30c7413e8..b565cb9108aea 100644
--- a/x-pack/legacy/plugins/maps/public/layers/sources/es_source.d.ts
+++ b/x-pack/legacy/plugins/maps/public/layers/sources/es_source.d.ts
@@ -7,7 +7,7 @@
 import { AbstractVectorSource } from './vector_source';
 import { IVectorSource } from './vector_source';
 import { IndexPattern, SearchSource } from '../../../../../../../src/plugins/data/public';
-import { VectorLayerRequestMeta } from '../../../common/data_request_descriptor_types';
+import { VectorSourceRequestMeta } from '../../../common/data_request_descriptor_types';
 
 export interface IESSource extends IVectorSource {
   getId(): string;
@@ -16,7 +16,7 @@ export interface IESSource extends IVectorSource {
   getGeoFieldName(): string;
   getMaxResultWindow(): Promise<number>;
   makeSearchSource(
-    searchFilters: VectorLayerRequestMeta,
+    searchFilters: VectorSourceRequestMeta,
     limit: number,
     initialSearchContext?: object
   ): Promise<SearchSource>;
@@ -29,7 +29,7 @@ export class AbstractESSource extends AbstractVectorSource implements IESSource
   getGeoFieldName(): string;
   getMaxResultWindow(): Promise<number>;
   makeSearchSource(
-    searchFilters: VectorLayerRequestMeta,
+    searchFilters: VectorSourceRequestMeta,
     limit: number,
     initialSearchContext?: object
   ): Promise<SearchSource>;
diff --git a/x-pack/legacy/plugins/maps/public/layers/sources/source.d.ts b/x-pack/legacy/plugins/maps/public/layers/sources/source.d.ts
index 2ca18e47a4bf9..e1706ad7b7d77 100644
--- a/x-pack/legacy/plugins/maps/public/layers/sources/source.d.ts
+++ b/x-pack/legacy/plugins/maps/public/layers/sources/source.d.ts
@@ -9,15 +9,28 @@ import { ILayer } from '../layer';
 
 export interface ISource {
   createDefaultLayer(): ILayer;
-  getDisplayName(): Promise<string>;
   destroy(): void;
+  getDisplayName(): Promise<string>;
   getInspectorAdapters(): object;
+  isFieldAware(): boolean;
+  isFilterByMapBounds(): boolean;
+  isGeoGridPrecisionAware(): boolean;
+  isQueryAware(): boolean;
+  isRefreshTimerAware(): Promise<boolean>;
+  isTimeAware(): Promise<boolean>;
 }
 
 export class AbstractSource implements ISource {
   constructor(sourceDescriptor: AbstractSourceDescriptor, inspectorAdapters: object);
+
+  destroy(): void;
   createDefaultLayer(): ILayer;
   getDisplayName(): Promise<string>;
-  destroy(): void;
   getInspectorAdapters(): object;
+  isFieldAware(): boolean;
+  isFilterByMapBounds(): boolean;
+  isGeoGridPrecisionAware(): boolean;
+  isQueryAware(): boolean;
+  isRefreshTimerAware(): Promise<boolean>;
+  isTimeAware(): Promise<boolean>;
 }
diff --git a/x-pack/legacy/plugins/maps/public/layers/sources/vector_source.d.ts b/x-pack/legacy/plugins/maps/public/layers/sources/vector_source.d.ts
index 14fc23751ac1a..fd585e100924e 100644
--- a/x-pack/legacy/plugins/maps/public/layers/sources/vector_source.d.ts
+++ b/x-pack/legacy/plugins/maps/public/layers/sources/vector_source.d.ts
@@ -5,6 +5,7 @@
  */
 /* eslint-disable @typescript-eslint/consistent-type-definitions */
 
+import { FeatureCollection } from 'geojson';
 import { AbstractSource, ISource } from './source';
 import { IField } from '../fields/field';
 import { ESSearchSourceResponseMeta } from '../../../common/data_request_descriptor_types';
@@ -12,7 +13,7 @@ import { ESSearchSourceResponseMeta } from '../../../common/data_request_descrip
 export type GeoJsonFetchMeta = ESSearchSourceResponseMeta;
 
 export type GeoJsonWithMeta = {
-  data: unknown; // geojson feature collection
+  data: FeatureCollection;
   meta?: GeoJsonFetchMeta;
 };
 
diff --git a/x-pack/legacy/plugins/maps/public/layers/tile_layer.test.ts b/x-pack/legacy/plugins/maps/public/layers/tile_layer.test.ts
index 8ce38a128ebc4..1cb99dcbc1a70 100644
--- a/x-pack/legacy/plugins/maps/public/layers/tile_layer.test.ts
+++ b/x-pack/legacy/plugins/maps/public/layers/tile_layer.test.ts
@@ -7,7 +7,7 @@
 import { TileLayer } from './tile_layer';
 import { EMS_XYZ } from '../../common/constants';
 import { XYZTMSSourceDescriptor } from '../../common/descriptor_types';
-import { ITMSSource } from './sources/tms_source';
+import { ITMSSource, AbstractTMSSource } from './sources/tms_source';
 import { ILayer } from './layer';
 
 const sourceDescriptor: XYZTMSSourceDescriptor = {
@@ -16,9 +16,10 @@ const sourceDescriptor: XYZTMSSourceDescriptor = {
   id: 'foobar',
 };
 
-class MockTileSource implements ITMSSource {
+class MockTileSource extends AbstractTMSSource implements ITMSSource {
   private readonly _descriptor: XYZTMSSourceDescriptor;
   constructor(descriptor: XYZTMSSourceDescriptor) {
+    super(descriptor, {});
     this._descriptor = descriptor;
   }
   createDefaultLayer(): ILayer {
@@ -32,14 +33,6 @@ class MockTileSource implements ITMSSource {
   async getUrlTemplate(): Promise<string> {
     return 'template/{x}/{y}/{z}.png';
   }
-
-  destroy(): void {
-    // no-op
-  }
-
-  getInspectorAdapters(): object {
-    return {};
-  }
 }
 
 describe('TileLayer', () => {
diff --git a/x-pack/legacy/plugins/maps/public/layers/util/assign_feature_ids.test.js b/x-pack/legacy/plugins/maps/public/layers/util/assign_feature_ids.test.ts
similarity index 74%
rename from x-pack/legacy/plugins/maps/public/layers/util/assign_feature_ids.test.js
rename to x-pack/legacy/plugins/maps/public/layers/util/assign_feature_ids.test.ts
index cc8dff14ec4f0..fb07a523e1e07 100644
--- a/x-pack/legacy/plugins/maps/public/layers/util/assign_feature_ids.test.js
+++ b/x-pack/legacy/plugins/maps/public/layers/util/assign_feature_ids.test.ts
@@ -6,19 +6,25 @@
 
 import { assignFeatureIds } from './assign_feature_ids';
 import { FEATURE_ID_PROPERTY_NAME } from '../../../common/constants';
+import { FeatureCollection, Feature, Point } from 'geojson';
 
 const featureId = 'myFeature1';
 
+const geometry: Point = {
+  type: 'Point',
+  coordinates: [0, 0],
+};
+
+const defaultFeature: Feature = {
+  type: 'Feature',
+  geometry,
+  properties: {},
+};
+
 test('should provide unique id when feature.id is not provided', () => {
-  const featureCollection = {
-    features: [
-      {
-        properties: {},
-      },
-      {
-        properties: {},
-      },
-    ],
+  const featureCollection: FeatureCollection = {
+    type: 'FeatureCollection',
+    features: [{ ...defaultFeature }, { ...defaultFeature }],
   };
 
   const updatedFeatureCollection = assignFeatureIds(featureCollection);
@@ -26,16 +32,18 @@ test('should provide unique id when feature.id is not provided', () => {
   const feature2 = updatedFeatureCollection.features[1];
   expect(typeof feature1.id).toBe('number');
   expect(typeof feature2.id).toBe('number');
+  // @ts-ignore
   expect(feature1.id).toBe(feature1.properties[FEATURE_ID_PROPERTY_NAME]);
   expect(feature1.id).not.toBe(feature2.id);
 });
 
 test('should preserve feature id when provided', () => {
-  const featureCollection = {
+  const featureCollection: FeatureCollection = {
+    type: 'FeatureCollection',
     features: [
       {
+        ...defaultFeature,
         id: featureId,
-        properties: {},
       },
     ],
   };
@@ -43,16 +51,19 @@ test('should preserve feature id when provided', () => {
   const updatedFeatureCollection = assignFeatureIds(featureCollection);
   const feature1 = updatedFeatureCollection.features[0];
   expect(typeof feature1.id).toBe('number');
+  // @ts-ignore
   expect(feature1.id).not.toBe(feature1.properties[FEATURE_ID_PROPERTY_NAME]);
+  // @ts-ignore
   expect(feature1.properties[FEATURE_ID_PROPERTY_NAME]).toBe(featureId);
 });
 
 test('should preserve feature id for falsy value', () => {
-  const featureCollection = {
+  const featureCollection: FeatureCollection = {
+    type: 'FeatureCollection',
     features: [
       {
+        ...defaultFeature,
         id: 0,
-        properties: {},
       },
     ],
   };
@@ -60,15 +71,19 @@ test('should preserve feature id for falsy value', () => {
   const updatedFeatureCollection = assignFeatureIds(featureCollection);
   const feature1 = updatedFeatureCollection.features[0];
   expect(typeof feature1.id).toBe('number');
+  // @ts-ignore
   expect(feature1.id).not.toBe(feature1.properties[FEATURE_ID_PROPERTY_NAME]);
+  // @ts-ignore
   expect(feature1.properties[FEATURE_ID_PROPERTY_NAME]).toBe(0);
 });
 
 test('should not modify original feature properties', () => {
   const featureProperties = {};
-  const featureCollection = {
+  const featureCollection: FeatureCollection = {
+    type: 'FeatureCollection',
     features: [
       {
+        ...defaultFeature,
         id: featureId,
         properties: featureProperties,
       },
@@ -77,6 +92,7 @@ test('should not modify original feature properties', () => {
 
   const updatedFeatureCollection = assignFeatureIds(featureCollection);
   const feature1 = updatedFeatureCollection.features[0];
+  // @ts-ignore
   expect(feature1.properties[FEATURE_ID_PROPERTY_NAME]).toBe(featureId);
   expect(featureProperties).not.toHaveProperty(FEATURE_ID_PROPERTY_NAME);
 });
diff --git a/x-pack/legacy/plugins/maps/public/layers/util/assign_feature_ids.js b/x-pack/legacy/plugins/maps/public/layers/util/assign_feature_ids.ts
similarity index 90%
rename from x-pack/legacy/plugins/maps/public/layers/util/assign_feature_ids.js
rename to x-pack/legacy/plugins/maps/public/layers/util/assign_feature_ids.ts
index a943b0b22a189..e5c170a803174 100644
--- a/x-pack/legacy/plugins/maps/public/layers/util/assign_feature_ids.js
+++ b/x-pack/legacy/plugins/maps/public/layers/util/assign_feature_ids.ts
@@ -5,17 +5,18 @@
  */
 
 import _ from 'lodash';
+import { FeatureCollection, Feature } from 'geojson';
 import { FEATURE_ID_PROPERTY_NAME } from '../../../common/constants';
 
 let idCounter = 0;
 
-function generateNumericalId() {
+function generateNumericalId(): number {
   const newId = idCounter < Number.MAX_SAFE_INTEGER ? idCounter : 0;
   idCounter = newId + 1;
   return newId;
 }
 
-export function assignFeatureIds(featureCollection) {
+export function assignFeatureIds(featureCollection: FeatureCollection): FeatureCollection {
   // wrt https://github.com/elastic/kibana/issues/39317
   // In constrained resource environments, mapbox-gl may throw a stackoverflow error due to hitting the browser's recursion limit. This crashes Kibana.
   // This error is thrown in mapbox-gl's quicksort implementation, when it is sorting all the features by id.
@@ -32,7 +33,7 @@ export function assignFeatureIds(featureCollection) {
   }
 
   const randomizedIds = _.shuffle(ids);
-  const features = [];
+  const features: Feature[] = [];
   for (let i = 0; i < featureCollection.features.length; i++) {
     const numericId = randomizedIds[i];
     const feature = featureCollection.features[i];
diff --git a/x-pack/legacy/plugins/maps/public/layers/util/can_skip_fetch.js b/x-pack/legacy/plugins/maps/public/layers/util/can_skip_fetch.ts
similarity index 84%
rename from x-pack/legacy/plugins/maps/public/layers/util/can_skip_fetch.js
rename to x-pack/legacy/plugins/maps/public/layers/util/can_skip_fetch.ts
index 7abfee1b184f0..7b75bb0f21b79 100644
--- a/x-pack/legacy/plugins/maps/public/layers/util/can_skip_fetch.js
+++ b/x-pack/legacy/plugins/maps/public/layers/util/can_skip_fetch.ts
@@ -4,14 +4,22 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 import _ from 'lodash';
+// @ts-ignore
 import turf from 'turf';
 import turfBooleanContains from '@turf/boolean-contains';
 import { isRefreshOnlyQuery } from './is_refresh_only_query';
+import { ISource } from '../sources/source';
+import { DataMeta } from '../../../common/data_request_descriptor_types';
+import { DataRequest } from './data_request';
 
 const SOURCE_UPDATE_REQUIRED = true;
 const NO_SOURCE_UPDATE_REQUIRED = false;
 
-export function updateDueToExtent(source, prevMeta = {}, nextMeta = {}) {
+export function updateDueToExtent(
+  source: ISource,
+  prevMeta: DataMeta = {},
+  nextMeta: DataMeta = {}
+) {
   const extentAware = source.isFilterByMapBounds();
   if (!extentAware) {
     return NO_SOURCE_UPDATE_REQUIRED;
@@ -20,7 +28,7 @@ export function updateDueToExtent(source, prevMeta = {}, nextMeta = {}) {
   const { buffer: previousBuffer } = prevMeta;
   const { buffer: newBuffer } = nextMeta;
 
-  if (!previousBuffer) {
+  if (!previousBuffer || !previousBuffer || !newBuffer) {
     return SOURCE_UPDATE_REQUIRED;
   }
 
@@ -51,7 +59,15 @@ export function updateDueToExtent(source, prevMeta = {}, nextMeta = {}) {
     : SOURCE_UPDATE_REQUIRED;
 }
 
-export async function canSkipSourceUpdate({ source, prevDataRequest, nextMeta }) {
+export async function canSkipSourceUpdate({
+  source,
+  prevDataRequest,
+  nextMeta,
+}: {
+  source: ISource;
+  prevDataRequest: DataRequest | undefined;
+  nextMeta: DataMeta;
+}): Promise<boolean> {
   const timeAware = await source.isTimeAware();
   const refreshTimerAware = await source.isRefreshTimerAware();
   const extentAware = source.isFilterByMapBounds();
@@ -67,7 +83,7 @@ export async function canSkipSourceUpdate({ source, prevDataRequest, nextMeta })
     !isQueryAware &&
     !isGeoGridPrecisionAware
   ) {
-    return prevDataRequest && prevDataRequest.hasDataOrRequestInProgress();
+    return !!prevDataRequest && prevDataRequest.hasDataOrRequestInProgress();
   }
 
   if (!prevDataRequest) {
@@ -136,7 +152,13 @@ export async function canSkipSourceUpdate({ source, prevDataRequest, nextMeta })
   );
 }
 
-export function canSkipStyleMetaUpdate({ prevDataRequest, nextMeta }) {
+export function canSkipStyleMetaUpdate({
+  prevDataRequest,
+  nextMeta,
+}: {
+  prevDataRequest: DataRequest | undefined;
+  nextMeta: DataMeta;
+}): boolean {
   if (!prevDataRequest) {
     return false;
   }
@@ -159,7 +181,13 @@ export function canSkipStyleMetaUpdate({ prevDataRequest, nextMeta }) {
   );
 }
 
-export function canSkipFormattersUpdate({ prevDataRequest, nextMeta }) {
+export function canSkipFormattersUpdate({
+  prevDataRequest,
+  nextMeta,
+}: {
+  prevDataRequest: DataRequest | undefined;
+  nextMeta: DataMeta;
+}): boolean {
   if (!prevDataRequest) {
     return false;
   }
diff --git a/x-pack/legacy/plugins/maps/public/layers/util/is_refresh_only_query.js b/x-pack/legacy/plugins/maps/public/layers/util/is_refresh_only_query.ts
similarity index 78%
rename from x-pack/legacy/plugins/maps/public/layers/util/is_refresh_only_query.js
rename to x-pack/legacy/plugins/maps/public/layers/util/is_refresh_only_query.ts
index f3dc08a7a7a58..48b1340207fd4 100644
--- a/x-pack/legacy/plugins/maps/public/layers/util/is_refresh_only_query.js
+++ b/x-pack/legacy/plugins/maps/public/layers/util/is_refresh_only_query.ts
@@ -4,9 +4,14 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+import { Query } from '../../../common/map_descriptor';
+
 // Refresh only query is query where timestamps are different but query is the same.
 // Triggered by clicking "Refresh" button in QueryBar
-export function isRefreshOnlyQuery(prevQuery, newQuery) {
+export function isRefreshOnlyQuery(
+  prevQuery: Query | undefined,
+  newQuery: Query | undefined
+): boolean {
   if (!prevQuery || !newQuery) {
     return false;
   }
diff --git a/x-pack/legacy/plugins/maps/public/layers/util/mb_filter_expressions.js b/x-pack/legacy/plugins/maps/public/layers/util/mb_filter_expressions.ts
similarity index 87%
rename from x-pack/legacy/plugins/maps/public/layers/util/mb_filter_expressions.js
rename to x-pack/legacy/plugins/maps/public/layers/util/mb_filter_expressions.ts
index 36841dc727dd3..8da6fa2318de9 100644
--- a/x-pack/legacy/plugins/maps/public/layers/util/mb_filter_expressions.js
+++ b/x-pack/legacy/plugins/maps/public/layers/util/mb_filter_expressions.ts
@@ -34,14 +34,14 @@ const POINT_MB_FILTER = [
 
 const VISIBLE_POINT_MB_FILTER = [...VISIBILITY_FILTER_CLAUSE, POINT_MB_FILTER];
 
-export function getFillFilterExpression(hasJoins) {
+export function getFillFilterExpression(hasJoins: boolean): unknown[] {
   return hasJoins ? VISIBLE_CLOSED_SHAPE_MB_FILTER : CLOSED_SHAPE_MB_FILTER;
 }
 
-export function getLineFilterExpression(hasJoins) {
+export function getLineFilterExpression(hasJoins: boolean): unknown[] {
   return hasJoins ? VISIBLE_ALL_SHAPE_MB_FILTER : ALL_SHAPE_MB_FILTER;
 }
 
-export function getPointFilterExpression(hasJoins) {
+export function getPointFilterExpression(hasJoins: boolean): unknown[] {
   return hasJoins ? VISIBLE_POINT_MB_FILTER : POINT_MB_FILTER;
 }
diff --git a/x-pack/legacy/plugins/maps/public/layers/vector_layer.d.ts b/x-pack/legacy/plugins/maps/public/layers/vector_layer.d.ts
index 77e8ab768cd00..390374f761fc7 100644
--- a/x-pack/legacy/plugins/maps/public/layers/vector_layer.d.ts
+++ b/x-pack/legacy/plugins/maps/public/layers/vector_layer.d.ts
@@ -8,7 +8,7 @@
 import { AbstractLayer } from './layer';
 import { IVectorSource } from './sources/vector_source';
 import { VectorLayerDescriptor } from '../../common/descriptor_types';
-import { MapFilters, VectorLayerRequestMeta } from '../../common/data_request_descriptor_types';
+import { MapFilters, VectorSourceRequestMeta } from '../../common/data_request_descriptor_types';
 import { ILayer } from './layer';
 import { IJoin } from './joins/join';
 import { IVectorStyle } from './styles/vector/vector_style';
@@ -45,6 +45,6 @@ export class VectorLayer extends AbstractLayer implements IVectorLayer {
     dataFilters: MapFilters,
     source: IVectorSource,
     style: IVectorStyle
-  ): VectorLayerRequestMeta;
+  ): VectorSourceRequestMeta;
   _syncData(syncContext: SyncContext, source: IVectorSource, style: IVectorStyle): Promise<void>;
 }
diff --git a/x-pack/package.json b/x-pack/package.json
index fdd2ef3719959..1fd4c261474f7 100644
--- a/x-pack/package.json
+++ b/x-pack/package.json
@@ -59,6 +59,7 @@
     "@types/elasticsearch": "^5.0.33",
     "@types/fancy-log": "^1.3.1",
     "@types/file-saver": "^2.0.0",
+    "@types/geojson": "7946.0.7",
     "@types/getos": "^3.0.0",
     "@types/git-url-parse": "^9.0.0",
     "@types/glob": "^7.1.1",
diff --git a/yarn.lock b/yarn.lock
index 8b73ceeaef904..37cebe420a362 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4504,7 +4504,7 @@
   dependencies:
     "@types/jquery" "*"
 
-"@types/geojson@*":
+"@types/geojson@*", "@types/geojson@7946.0.7":
   version "7946.0.7"
   resolved "https://registry.yarnpkg.com/@types/geojson/-/geojson-7946.0.7.tgz#c8fa532b60a0042219cdf173ca21a975ef0666ad"
   integrity sha512-wE2v81i4C4Ol09RtsWFAqg3BUitWbHSpSlIo+bNdsCJijO9sjme+zm+73ZMCa/qMC8UEERxzGbvmr1cffo2SiQ==

From c7c6eba0799819d41df4b360581884b9c3c0ff8a Mon Sep 17 00:00:00 2001
From: Liza Katz <liza.katz@elastic.co>
Date: Tue, 24 Mar 2020 15:41:31 +0000
Subject: [PATCH 084/179] Add async search notification (#60706)

* notifications ui

* increase timeout to 10s

* trigger notification from search interceptor

* added an enhanced interceptor

* added an enhanced interceptor

* docs

* docs

* fix ts

* Fix jest tests for interceptor

* update docs

* docs

* Fix handling syntax error in discover

* docs and translations

* fix scripted fields err

Co-authored-by: Lukas Olson <olson.lukas@gmail.com>
---
 .../kibana-plugin-plugins-data-public.md      |   2 +
 ...ublic.requesttimeouterror._constructor_.md |  20 +++
 ...plugins-data-public.requesttimeouterror.md |  20 +++
 ...-public.searchinterceptor._constructor_.md |  22 +++
 ...ublic.searchinterceptor.abortcontroller.md |  13 ++
 ...ta-public.searchinterceptor.application.md |  11 ++
 ...blic.searchinterceptor.getpendingcount_.md |  13 ++
 ...data-public.searchinterceptor.hidetoast.md |  11 ++
 ...blic.searchinterceptor.longrunningtoast.md |  13 ++
 ...n-plugins-data-public.searchinterceptor.md |  33 ++++
 ...public.searchinterceptor.requesttimeout.md |  11 ++
 ...ns-data-public.searchinterceptor.search.md |  13 ++
 ...data-public.searchinterceptor.showtoast.md |  11 ++
 ....searchinterceptor.timeoutsubscriptions.md |  13 ++
 ...ns-data-public.searchinterceptor.toasts.md |  11 ++
 src/plugins/data/public/index.ts              |   2 +
 src/plugins/data/public/public.api.md         |  63 ++++++--
 src/plugins/data/public/search/index.ts       |   1 +
 .../public/search/long_query_notification.tsx |  61 ++++++++
 src/plugins/data/public/search/mocks.ts       |   4 +-
 .../public/search/search_interceptor.test.ts  |  57 ++-----
 .../data/public/search/search_interceptor.ts  | 141 +++++++++++-------
 .../data/public/search/search_service.ts      |  14 +-
 src/plugins/data/public/search/types.ts       |   6 +-
 x-pack/plugins/data_enhanced/public/plugin.ts |   7 +
 .../public/search/long_query_notification.tsx |  47 ++++++
 .../public/search/search_interceptor.test.ts  |  67 +++++++++
 .../public/search/search_interceptor.ts       |  56 +++++++
 28 files changed, 620 insertions(+), 123 deletions(-)
 create mode 100644 docs/development/plugins/data/public/kibana-plugin-plugins-data-public.requesttimeouterror._constructor_.md
 create mode 100644 docs/development/plugins/data/public/kibana-plugin-plugins-data-public.requesttimeouterror.md
 create mode 100644 docs/development/plugins/data/public/kibana-plugin-plugins-data-public.searchinterceptor._constructor_.md
 create mode 100644 docs/development/plugins/data/public/kibana-plugin-plugins-data-public.searchinterceptor.abortcontroller.md
 create mode 100644 docs/development/plugins/data/public/kibana-plugin-plugins-data-public.searchinterceptor.application.md
 create mode 100644 docs/development/plugins/data/public/kibana-plugin-plugins-data-public.searchinterceptor.getpendingcount_.md
 create mode 100644 docs/development/plugins/data/public/kibana-plugin-plugins-data-public.searchinterceptor.hidetoast.md
 create mode 100644 docs/development/plugins/data/public/kibana-plugin-plugins-data-public.searchinterceptor.longrunningtoast.md
 create mode 100644 docs/development/plugins/data/public/kibana-plugin-plugins-data-public.searchinterceptor.md
 create mode 100644 docs/development/plugins/data/public/kibana-plugin-plugins-data-public.searchinterceptor.requesttimeout.md
 create mode 100644 docs/development/plugins/data/public/kibana-plugin-plugins-data-public.searchinterceptor.search.md
 create mode 100644 docs/development/plugins/data/public/kibana-plugin-plugins-data-public.searchinterceptor.showtoast.md
 create mode 100644 docs/development/plugins/data/public/kibana-plugin-plugins-data-public.searchinterceptor.timeoutsubscriptions.md
 create mode 100644 docs/development/plugins/data/public/kibana-plugin-plugins-data-public.searchinterceptor.toasts.md
 create mode 100644 src/plugins/data/public/search/long_query_notification.tsx
 create mode 100644 x-pack/plugins/data_enhanced/public/search/long_query_notification.tsx
 create mode 100644 x-pack/plugins/data_enhanced/public/search/search_interceptor.test.ts
 create mode 100644 x-pack/plugins/data_enhanced/public/search/search_interceptor.ts

diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.md
index ea77d6f39389b..6964c070097c5 100644
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.md
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.md
@@ -18,7 +18,9 @@
 |  [IndexPatternSelect](./kibana-plugin-plugins-data-public.indexpatternselect.md) |  |
 |  [OptionedParamType](./kibana-plugin-plugins-data-public.optionedparamtype.md) |  |
 |  [Plugin](./kibana-plugin-plugins-data-public.plugin.md) |  |
+|  [RequestTimeoutError](./kibana-plugin-plugins-data-public.requesttimeouterror.md) | Class used to signify that a request timed out. Useful for applications to conditionally handle this type of error differently than other errors. |
 |  [SearchError](./kibana-plugin-plugins-data-public.searcherror.md) |  |
+|  [SearchInterceptor](./kibana-plugin-plugins-data-public.searchinterceptor.md) |  |
 |  [SearchSource](./kibana-plugin-plugins-data-public.searchsource.md) |  |
 |  [TimeHistory](./kibana-plugin-plugins-data-public.timehistory.md) |  |
 
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.requesttimeouterror._constructor_.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.requesttimeouterror._constructor_.md
new file mode 100644
index 0000000000000..25e472817b46d
--- /dev/null
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.requesttimeouterror._constructor_.md
@@ -0,0 +1,20 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) &gt; [RequestTimeoutError](./kibana-plugin-plugins-data-public.requesttimeouterror.md) &gt; [(constructor)](./kibana-plugin-plugins-data-public.requesttimeouterror._constructor_.md)
+
+## RequestTimeoutError.(constructor)
+
+Constructs a new instance of the `RequestTimeoutError` class
+
+<b>Signature:</b>
+
+```typescript
+constructor(message?: string);
+```
+
+## Parameters
+
+|  Parameter | Type | Description |
+|  --- | --- | --- |
+|  message | <code>string</code> |  |
+
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.requesttimeouterror.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.requesttimeouterror.md
new file mode 100644
index 0000000000000..84b2fc3fe0b17
--- /dev/null
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.requesttimeouterror.md
@@ -0,0 +1,20 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) &gt; [RequestTimeoutError](./kibana-plugin-plugins-data-public.requesttimeouterror.md)
+
+## RequestTimeoutError class
+
+Class used to signify that a request timed out. Useful for applications to conditionally handle this type of error differently than other errors.
+
+<b>Signature:</b>
+
+```typescript
+export declare class RequestTimeoutError extends Error 
+```
+
+## Constructors
+
+|  Constructor | Modifiers | Description |
+|  --- | --- | --- |
+|  [(constructor)(message)](./kibana-plugin-plugins-data-public.requesttimeouterror._constructor_.md) |  | Constructs a new instance of the <code>RequestTimeoutError</code> class |
+
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.searchinterceptor._constructor_.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.searchinterceptor._constructor_.md
new file mode 100644
index 0000000000000..6eabefb9eb912
--- /dev/null
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.searchinterceptor._constructor_.md
@@ -0,0 +1,22 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) &gt; [SearchInterceptor](./kibana-plugin-plugins-data-public.searchinterceptor.md) &gt; [(constructor)](./kibana-plugin-plugins-data-public.searchinterceptor._constructor_.md)
+
+## SearchInterceptor.(constructor)
+
+This class should be instantiated with a `requestTimeout` corresponding with how many ms after requests are initiated that they should automatically cancel.
+
+<b>Signature:</b>
+
+```typescript
+constructor(toasts: ToastsStart, application: ApplicationStart, requestTimeout?: number | undefined);
+```
+
+## Parameters
+
+|  Parameter | Type | Description |
+|  --- | --- | --- |
+|  toasts | <code>ToastsStart</code> |  |
+|  application | <code>ApplicationStart</code> |  |
+|  requestTimeout | <code>number &#124; undefined</code> |  |
+
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.searchinterceptor.abortcontroller.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.searchinterceptor.abortcontroller.md
new file mode 100644
index 0000000000000..0451a2254dc40
--- /dev/null
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.searchinterceptor.abortcontroller.md
@@ -0,0 +1,13 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) &gt; [SearchInterceptor](./kibana-plugin-plugins-data-public.searchinterceptor.md) &gt; [abortController](./kibana-plugin-plugins-data-public.searchinterceptor.abortcontroller.md)
+
+## SearchInterceptor.abortController property
+
+`abortController` used to signal all searches to abort.
+
+<b>Signature:</b>
+
+```typescript
+protected abortController: AbortController;
+```
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.searchinterceptor.application.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.searchinterceptor.application.md
new file mode 100644
index 0000000000000..e44910161aa60
--- /dev/null
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.searchinterceptor.application.md
@@ -0,0 +1,11 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) &gt; [SearchInterceptor](./kibana-plugin-plugins-data-public.searchinterceptor.md) &gt; [application](./kibana-plugin-plugins-data-public.searchinterceptor.application.md)
+
+## SearchInterceptor.application property
+
+<b>Signature:</b>
+
+```typescript
+protected readonly application: ApplicationStart;
+```
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.searchinterceptor.getpendingcount_.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.searchinterceptor.getpendingcount_.md
new file mode 100644
index 0000000000000..59b107c92424f
--- /dev/null
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.searchinterceptor.getpendingcount_.md
@@ -0,0 +1,13 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) &gt; [SearchInterceptor](./kibana-plugin-plugins-data-public.searchinterceptor.md) &gt; [getPendingCount$](./kibana-plugin-plugins-data-public.searchinterceptor.getpendingcount_.md)
+
+## SearchInterceptor.getPendingCount$ property
+
+Returns an `Observable` over the current number of pending searches. This could mean that one of the search requests is still in flight, or that it has only received partial responses.
+
+<b>Signature:</b>
+
+```typescript
+getPendingCount$: () => import("rxjs").Observable<number>;
+```
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.searchinterceptor.hidetoast.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.searchinterceptor.hidetoast.md
new file mode 100644
index 0000000000000..59938a755a99e
--- /dev/null
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.searchinterceptor.hidetoast.md
@@ -0,0 +1,11 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) &gt; [SearchInterceptor](./kibana-plugin-plugins-data-public.searchinterceptor.md) &gt; [hideToast](./kibana-plugin-plugins-data-public.searchinterceptor.hidetoast.md)
+
+## SearchInterceptor.hideToast property
+
+<b>Signature:</b>
+
+```typescript
+protected hideToast: () => void;
+```
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.searchinterceptor.longrunningtoast.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.searchinterceptor.longrunningtoast.md
new file mode 100644
index 0000000000000..5799039de91bc
--- /dev/null
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.searchinterceptor.longrunningtoast.md
@@ -0,0 +1,13 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) &gt; [SearchInterceptor](./kibana-plugin-plugins-data-public.searchinterceptor.md) &gt; [longRunningToast](./kibana-plugin-plugins-data-public.searchinterceptor.longrunningtoast.md)
+
+## SearchInterceptor.longRunningToast property
+
+The current long-running toast (if there is one).
+
+<b>Signature:</b>
+
+```typescript
+protected longRunningToast?: Toast;
+```
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.searchinterceptor.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.searchinterceptor.md
new file mode 100644
index 0000000000000..0c7b123be72af
--- /dev/null
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.searchinterceptor.md
@@ -0,0 +1,33 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) &gt; [SearchInterceptor](./kibana-plugin-plugins-data-public.searchinterceptor.md)
+
+## SearchInterceptor class
+
+<b>Signature:</b>
+
+```typescript
+export declare class SearchInterceptor 
+```
+
+## Constructors
+
+|  Constructor | Modifiers | Description |
+|  --- | --- | --- |
+|  [(constructor)(toasts, application, requestTimeout)](./kibana-plugin-plugins-data-public.searchinterceptor._constructor_.md) |  | This class should be instantiated with a <code>requestTimeout</code> corresponding with how many ms after requests are initiated that they should automatically cancel. |
+
+## Properties
+
+|  Property | Modifiers | Type | Description |
+|  --- | --- | --- | --- |
+|  [abortController](./kibana-plugin-plugins-data-public.searchinterceptor.abortcontroller.md) |  | <code>AbortController</code> | <code>abortController</code> used to signal all searches to abort. |
+|  [application](./kibana-plugin-plugins-data-public.searchinterceptor.application.md) |  | <code>ApplicationStart</code> |  |
+|  [getPendingCount$](./kibana-plugin-plugins-data-public.searchinterceptor.getpendingcount_.md) |  | <code>() =&gt; import(&quot;rxjs&quot;).Observable&lt;number&gt;</code> | Returns an <code>Observable</code> over the current number of pending searches. This could mean that one of the search requests is still in flight, or that it has only received partial responses. |
+|  [hideToast](./kibana-plugin-plugins-data-public.searchinterceptor.hidetoast.md) |  | <code>() =&gt; void</code> |  |
+|  [longRunningToast](./kibana-plugin-plugins-data-public.searchinterceptor.longrunningtoast.md) |  | <code>Toast</code> | The current long-running toast (if there is one). |
+|  [requestTimeout](./kibana-plugin-plugins-data-public.searchinterceptor.requesttimeout.md) |  | <code>number &#124; undefined</code> |  |
+|  [search](./kibana-plugin-plugins-data-public.searchinterceptor.search.md) |  | <code>(search: ISearchGeneric, request: IKibanaSearchRequest, options?: ISearchOptions &#124; undefined) =&gt; import(&quot;rxjs&quot;).Observable&lt;import(&quot;../../common/search&quot;).IEsSearchResponse&lt;unknown&gt;&gt;</code> | Searches using the given <code>search</code> method. Overrides the <code>AbortSignal</code> with one that will abort either when <code>cancelPending</code> is called, when the request times out, or when the original <code>AbortSignal</code> is aborted. Updates the <code>pendingCount</code> when the request is started/finalized. |
+|  [showToast](./kibana-plugin-plugins-data-public.searchinterceptor.showtoast.md) |  | <code>() =&gt; void</code> |  |
+|  [timeoutSubscriptions](./kibana-plugin-plugins-data-public.searchinterceptor.timeoutsubscriptions.md) |  | <code>Set&lt;Subscription&gt;</code> | The subscriptions from scheduling the automatic timeout for each request. |
+|  [toasts](./kibana-plugin-plugins-data-public.searchinterceptor.toasts.md) |  | <code>ToastsStart</code> |  |
+
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.searchinterceptor.requesttimeout.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.searchinterceptor.requesttimeout.md
new file mode 100644
index 0000000000000..3123433762991
--- /dev/null
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.searchinterceptor.requesttimeout.md
@@ -0,0 +1,11 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) &gt; [SearchInterceptor](./kibana-plugin-plugins-data-public.searchinterceptor.md) &gt; [requestTimeout](./kibana-plugin-plugins-data-public.searchinterceptor.requesttimeout.md)
+
+## SearchInterceptor.requestTimeout property
+
+<b>Signature:</b>
+
+```typescript
+protected readonly requestTimeout?: number | undefined;
+```
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.searchinterceptor.search.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.searchinterceptor.search.md
new file mode 100644
index 0000000000000..80c98ab84fb40
--- /dev/null
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.searchinterceptor.search.md
@@ -0,0 +1,13 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) &gt; [SearchInterceptor](./kibana-plugin-plugins-data-public.searchinterceptor.md) &gt; [search](./kibana-plugin-plugins-data-public.searchinterceptor.search.md)
+
+## SearchInterceptor.search property
+
+Searches using the given `search` method. Overrides the `AbortSignal` with one that will abort either when `cancelPending` is called, when the request times out, or when the original `AbortSignal` is aborted. Updates the `pendingCount` when the request is started/finalized.
+
+<b>Signature:</b>
+
+```typescript
+search: (search: ISearchGeneric, request: IKibanaSearchRequest, options?: ISearchOptions | undefined) => import("rxjs").Observable<import("../../common/search").IEsSearchResponse<unknown>>;
+```
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.searchinterceptor.showtoast.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.searchinterceptor.showtoast.md
new file mode 100644
index 0000000000000..e495c72b57215
--- /dev/null
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.searchinterceptor.showtoast.md
@@ -0,0 +1,11 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) &gt; [SearchInterceptor](./kibana-plugin-plugins-data-public.searchinterceptor.md) &gt; [showToast](./kibana-plugin-plugins-data-public.searchinterceptor.showtoast.md)
+
+## SearchInterceptor.showToast property
+
+<b>Signature:</b>
+
+```typescript
+protected showToast: () => void;
+```
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.searchinterceptor.timeoutsubscriptions.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.searchinterceptor.timeoutsubscriptions.md
new file mode 100644
index 0000000000000..072f67591f097
--- /dev/null
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.searchinterceptor.timeoutsubscriptions.md
@@ -0,0 +1,13 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) &gt; [SearchInterceptor](./kibana-plugin-plugins-data-public.searchinterceptor.md) &gt; [timeoutSubscriptions](./kibana-plugin-plugins-data-public.searchinterceptor.timeoutsubscriptions.md)
+
+## SearchInterceptor.timeoutSubscriptions property
+
+The subscriptions from scheduling the automatic timeout for each request.
+
+<b>Signature:</b>
+
+```typescript
+protected timeoutSubscriptions: Set<Subscription>;
+```
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.searchinterceptor.toasts.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.searchinterceptor.toasts.md
new file mode 100644
index 0000000000000..4953d17c89c39
--- /dev/null
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.searchinterceptor.toasts.md
@@ -0,0 +1,11 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) &gt; [SearchInterceptor](./kibana-plugin-plugins-data-public.searchinterceptor.md) &gt; [toasts](./kibana-plugin-plugins-data-public.searchinterceptor.toasts.md)
+
+## SearchInterceptor.toasts property
+
+<b>Signature:</b>
+
+```typescript
+protected readonly toasts: ToastsStart;
+```
diff --git a/src/plugins/data/public/index.ts b/src/plugins/data/public/index.ts
index 977b9568ceaa6..efafea44167d4 100644
--- a/src/plugins/data/public/index.ts
+++ b/src/plugins/data/public/index.ts
@@ -374,6 +374,8 @@ export {
   TabbedAggColumn,
   TabbedAggRow,
   TabbedTable,
+  SearchInterceptor,
+  RequestTimeoutError,
 } from './search';
 
 // Search namespace
diff --git a/src/plugins/data/public/public.api.md b/src/plugins/data/public/public.api.md
index f0807187fc254..fcdbccfb42592 100644
--- a/src/plugins/data/public/public.api.md
+++ b/src/plugins/data/public/public.api.md
@@ -7,6 +7,7 @@
 import { $Values } from '@kbn/utility-types';
 import _ from 'lodash';
 import { Action } from 'history';
+import { ApplicationStart } from 'kibana/public';
 import { Assign } from '@kbn/utility-types';
 import { Breadcrumb } from '@elastic/eui';
 import { Component } from 'react';
@@ -48,6 +49,9 @@ import { SavedObjectsClientContract } from 'src/core/public';
 import { SearchParams } from 'elasticsearch';
 import { SearchResponse as SearchResponse_2 } from 'elasticsearch';
 import { SimpleSavedObject } from 'src/core/public';
+import { Subscription } from 'rxjs';
+import { Toast } from 'kibana/public';
+import { ToastsStart } from 'kibana/public';
 import { UiActionsSetup } from 'src/plugins/ui_actions/public';
 import { UiActionsStart } from 'src/plugins/ui_actions/public';
 import { Unit } from '@elastic/datemath';
@@ -1465,6 +1469,13 @@ export interface RefreshInterval {
     value: number;
 }
 
+// Warning: (ae-missing-release-tag) "RequestTimeoutError" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public
+export class RequestTimeoutError extends Error {
+    constructor(message?: string);
+}
+
 // Warning: (ae-missing-release-tag) "SavedQuery" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
@@ -1582,6 +1593,28 @@ export class SearchError extends Error {
     type: string;
 }
 
+// Warning: (ae-missing-release-tag) "SearchInterceptor" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export class SearchInterceptor {
+    constructor(toasts: ToastsStart, application: ApplicationStart, requestTimeout?: number | undefined);
+    protected abortController: AbortController;
+    // (undocumented)
+    protected readonly application: ApplicationStart;
+    getPendingCount$: () => import("rxjs").Observable<number>;
+    // (undocumented)
+    protected hideToast: () => void;
+    protected longRunningToast?: Toast;
+    // (undocumented)
+    protected readonly requestTimeout?: number | undefined;
+    search: (search: ISearchGeneric, request: IKibanaSearchRequest, options?: ISearchOptions | undefined) => import("rxjs").Observable<import("../../common/search").IEsSearchResponse<unknown>>;
+    // (undocumented)
+    protected showToast: () => void;
+    protected timeoutSubscriptions: Set<Subscription>;
+    // (undocumented)
+    protected readonly toasts: ToastsStart;
+}
+
 // Warning: (ae-missing-release-tag) "SearchRequest" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
@@ -1848,21 +1881,21 @@ export type TSearchStrategyProvider<T extends TStrategyTypes> = (context: ISearc
 // src/plugins/data/public/index.ts:234:27 - (ae-forgotten-export) The symbol "flattenHitWrapper" needs to be exported by the entry point index.d.ts
 // src/plugins/data/public/index.ts:234:27 - (ae-forgotten-export) The symbol "getRoutes" needs to be exported by the entry point index.d.ts
 // src/plugins/data/public/index.ts:234:27 - (ae-forgotten-export) The symbol "formatHitProvider" needs to be exported by the entry point index.d.ts
-// src/plugins/data/public/index.ts:380:20 - (ae-forgotten-export) The symbol "getRequestInspectorStats" needs to be exported by the entry point index.d.ts
-// src/plugins/data/public/index.ts:380:20 - (ae-forgotten-export) The symbol "getResponseInspectorStats" needs to be exported by the entry point index.d.ts
-// src/plugins/data/public/index.ts:380:20 - (ae-forgotten-export) The symbol "tabifyAggResponse" needs to be exported by the entry point index.d.ts
-// src/plugins/data/public/index.ts:380:20 - (ae-forgotten-export) The symbol "tabifyGetColumns" needs to be exported by the entry point index.d.ts
-// src/plugins/data/public/index.ts:385:1 - (ae-forgotten-export) The symbol "CidrMask" needs to be exported by the entry point index.d.ts
-// src/plugins/data/public/index.ts:386:1 - (ae-forgotten-export) The symbol "convertDateRangeToString" needs to be exported by the entry point index.d.ts
-// src/plugins/data/public/index.ts:388:1 - (ae-forgotten-export) The symbol "dateHistogramInterval" needs to be exported by the entry point index.d.ts
-// src/plugins/data/public/index.ts:397:1 - (ae-forgotten-export) The symbol "InvalidEsCalendarIntervalError" needs to be exported by the entry point index.d.ts
-// src/plugins/data/public/index.ts:398:1 - (ae-forgotten-export) The symbol "InvalidEsIntervalFormatError" needs to be exported by the entry point index.d.ts
-// src/plugins/data/public/index.ts:399:1 - (ae-forgotten-export) The symbol "isDateHistogramBucketAggConfig" needs to be exported by the entry point index.d.ts
-// src/plugins/data/public/index.ts:402:1 - (ae-forgotten-export) The symbol "isValidEsInterval" needs to be exported by the entry point index.d.ts
-// src/plugins/data/public/index.ts:403:1 - (ae-forgotten-export) The symbol "isValidInterval" needs to be exported by the entry point index.d.ts
-// src/plugins/data/public/index.ts:406:1 - (ae-forgotten-export) The symbol "parseInterval" needs to be exported by the entry point index.d.ts
-// src/plugins/data/public/index.ts:407:1 - (ae-forgotten-export) The symbol "propFilter" needs to be exported by the entry point index.d.ts
-// src/plugins/data/public/index.ts:410:1 - (ae-forgotten-export) The symbol "toAbsoluteDates" needs to be exported by the entry point index.d.ts
+// src/plugins/data/public/index.ts:382:20 - (ae-forgotten-export) The symbol "getRequestInspectorStats" needs to be exported by the entry point index.d.ts
+// src/plugins/data/public/index.ts:382:20 - (ae-forgotten-export) The symbol "getResponseInspectorStats" needs to be exported by the entry point index.d.ts
+// src/plugins/data/public/index.ts:382:20 - (ae-forgotten-export) The symbol "tabifyAggResponse" needs to be exported by the entry point index.d.ts
+// src/plugins/data/public/index.ts:382:20 - (ae-forgotten-export) The symbol "tabifyGetColumns" needs to be exported by the entry point index.d.ts
+// src/plugins/data/public/index.ts:387:1 - (ae-forgotten-export) The symbol "CidrMask" needs to be exported by the entry point index.d.ts
+// src/plugins/data/public/index.ts:388:1 - (ae-forgotten-export) The symbol "convertDateRangeToString" needs to be exported by the entry point index.d.ts
+// src/plugins/data/public/index.ts:390:1 - (ae-forgotten-export) The symbol "dateHistogramInterval" needs to be exported by the entry point index.d.ts
+// src/plugins/data/public/index.ts:399:1 - (ae-forgotten-export) The symbol "InvalidEsCalendarIntervalError" needs to be exported by the entry point index.d.ts
+// src/plugins/data/public/index.ts:400:1 - (ae-forgotten-export) The symbol "InvalidEsIntervalFormatError" needs to be exported by the entry point index.d.ts
+// src/plugins/data/public/index.ts:401:1 - (ae-forgotten-export) The symbol "isDateHistogramBucketAggConfig" needs to be exported by the entry point index.d.ts
+// src/plugins/data/public/index.ts:404:1 - (ae-forgotten-export) The symbol "isValidEsInterval" needs to be exported by the entry point index.d.ts
+// src/plugins/data/public/index.ts:405:1 - (ae-forgotten-export) The symbol "isValidInterval" needs to be exported by the entry point index.d.ts
+// src/plugins/data/public/index.ts:408:1 - (ae-forgotten-export) The symbol "parseInterval" needs to be exported by the entry point index.d.ts
+// src/plugins/data/public/index.ts:409:1 - (ae-forgotten-export) The symbol "propFilter" needs to be exported by the entry point index.d.ts
+// src/plugins/data/public/index.ts:412:1 - (ae-forgotten-export) The symbol "toAbsoluteDates" needs to be exported by the entry point index.d.ts
 // src/plugins/data/public/query/state_sync/connect_to_query_state.ts:33:33 - (ae-forgotten-export) The symbol "FilterStateStore" needs to be exported by the entry point index.d.ts
 // src/plugins/data/public/query/state_sync/connect_to_query_state.ts:37:1 - (ae-forgotten-export) The symbol "QueryStateChange" needs to be exported by the entry point index.d.ts
 // src/plugins/data/public/types.ts:52:5 - (ae-forgotten-export) The symbol "createFiltersFromEvent" needs to be exported by the entry point index.d.ts
diff --git a/src/plugins/data/public/search/index.ts b/src/plugins/data/public/search/index.ts
index f3d2d99af5998..1687d749f46e2 100644
--- a/src/plugins/data/public/search/index.ts
+++ b/src/plugins/data/public/search/index.ts
@@ -57,5 +57,6 @@ export {
 } from './search_source';
 
 export { SearchInterceptor } from './search_interceptor';
+export { RequestTimeoutError } from './request_timeout_error';
 
 export { FetchOptions } from './fetch';
diff --git a/src/plugins/data/public/search/long_query_notification.tsx b/src/plugins/data/public/search/long_query_notification.tsx
new file mode 100644
index 0000000000000..590fee20db690
--- /dev/null
+++ b/src/plugins/data/public/search/long_query_notification.tsx
@@ -0,0 +1,61 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { EuiButton, EuiFlexGroup, EuiFlexItem, EuiSpacer } from '@elastic/eui';
+import { FormattedMessage } from '@kbn/i18n/react';
+import React from 'react';
+import { ApplicationStart } from 'kibana/public';
+import { toMountPoint } from '../../../kibana_react/public';
+
+interface Props {
+  application: ApplicationStart;
+}
+
+export function getLongQueryNotification(props: Props) {
+  return toMountPoint(<LongQueryNotification application={props.application} />);
+}
+
+export function LongQueryNotification(props: Props) {
+  return (
+    <div>
+      <FormattedMessage
+        id="data.query.queryBar.longQueryMessage"
+        defaultMessage="With an upgraded license, you can ensure requests have enough time to complete."
+      />
+      <EuiSpacer size="s" />
+      <EuiFlexGroup justifyContent="flexEnd" gutterSize="s">
+        <EuiFlexItem grow={false}>
+          <EuiButton
+            size="s"
+            onClick={async () => {
+              await props.application.navigateToApp(
+                'kibana#/management/elasticsearch/license_management'
+              );
+            }}
+          >
+            <FormattedMessage
+              id="data.query.queryBar.licenseOptions"
+              defaultMessage="Go to license options"
+            />
+          </EuiButton>
+        </EuiFlexItem>
+      </EuiFlexGroup>
+    </div>
+  );
+}
diff --git a/src/plugins/data/public/search/mocks.ts b/src/plugins/data/public/search/mocks.ts
index 12cf258759a99..b70e889066a45 100644
--- a/src/plugins/data/public/search/mocks.ts
+++ b/src/plugins/data/public/search/mocks.ts
@@ -31,10 +31,8 @@ export const searchSetupMock = {
 
 export const searchStartMock: jest.Mocked<ISearchStart> = {
   aggs: searchAggsStartMock(),
+  setInterceptor: jest.fn(),
   search: jest.fn(),
-  cancel: jest.fn(),
-  getPendingCount$: jest.fn(),
-  runBeyondTimeout: jest.fn(),
   __LEGACY: {
     AggConfig: jest.fn() as any,
     AggType: jest.fn(),
diff --git a/src/plugins/data/public/search/search_interceptor.test.ts b/src/plugins/data/public/search/search_interceptor.test.ts
index a89d17464b9e0..bd056271688c1 100644
--- a/src/plugins/data/public/search/search_interceptor.test.ts
+++ b/src/plugins/data/public/search/search_interceptor.test.ts
@@ -18,27 +18,38 @@
  */
 
 import { Observable, Subject } from 'rxjs';
+import { CoreStart } from '../../../../core/public';
+import { coreMock } from '../../../../core/public/mocks';
 import { IKibanaSearchRequest } from '../../common/search';
 import { RequestTimeoutError } from './request_timeout_error';
 import { SearchInterceptor } from './search_interceptor';
 
 jest.useFakeTimers();
 
-const flushPromises = () => new Promise(resolve => setImmediate(resolve));
 const mockSearch = jest.fn();
 let searchInterceptor: SearchInterceptor;
+let mockCoreStart: MockedKeys<CoreStart>;
 
 describe('SearchInterceptor', () => {
   beforeEach(() => {
+    mockCoreStart = coreMock.createStart();
     mockSearch.mockClear();
-    searchInterceptor = new SearchInterceptor(1000);
+    searchInterceptor = new SearchInterceptor(
+      mockCoreStart.notifications.toasts,
+      mockCoreStart.application,
+      1000
+    );
   });
 
   describe('search', () => {
     test('should invoke `search` with the request', () => {
-      mockSearch.mockReturnValue(new Observable());
+      const mockResponse = new Subject();
+      mockSearch.mockReturnValue(mockResponse.asObservable());
       const mockRequest: IKibanaSearchRequest = {};
-      searchInterceptor.search(mockSearch, mockRequest);
+      const response = searchInterceptor.search(mockSearch, mockRequest);
+      mockResponse.complete();
+
+      response.subscribe();
       expect(mockSearch.mock.calls[0][0]).toBe(mockRequest);
     });
 
@@ -92,44 +103,6 @@ describe('SearchInterceptor', () => {
     });
   });
 
-  describe('cancelPending', () => {
-    test('should abort all pending requests', async () => {
-      mockSearch.mockReturnValue(new Observable());
-
-      searchInterceptor.search(mockSearch, {});
-      searchInterceptor.search(mockSearch, {});
-      searchInterceptor.cancelPending();
-
-      await flushPromises();
-
-      const areAllRequestsAborted = mockSearch.mock.calls.every(([, { signal }]) => signal.aborted);
-      expect(areAllRequestsAborted).toBe(true);
-    });
-  });
-
-  describe('runBeyondTimeout', () => {
-    test('should prevent the request from timing out', () => {
-      const mockResponse = new Subject();
-      mockSearch.mockReturnValue(mockResponse.asObservable());
-      const response = searchInterceptor.search(mockSearch, {});
-
-      setTimeout(searchInterceptor.runBeyondTimeout, 500);
-      setTimeout(() => mockResponse.next('hi'), 250);
-      setTimeout(() => mockResponse.complete(), 2000);
-
-      const next = jest.fn();
-      const complete = jest.fn();
-      const error = jest.fn();
-      response.subscribe({ next, error, complete });
-
-      jest.advanceTimersByTime(2000);
-
-      expect(next).toHaveBeenCalledWith('hi');
-      expect(error).not.toHaveBeenCalled();
-      expect(complete).toHaveBeenCalled();
-    });
-  });
-
   describe('getPendingCount$', () => {
     test('should observe the number of pending requests', () => {
       let i = 0;
diff --git a/src/plugins/data/public/search/search_interceptor.ts b/src/plugins/data/public/search/search_interceptor.ts
index 3f83214f6050c..d83ddab807bc5 100644
--- a/src/plugins/data/public/search/search_interceptor.ts
+++ b/src/plugins/data/public/search/search_interceptor.ts
@@ -17,51 +17,59 @@
  * under the License.
  */
 
-import { BehaviorSubject, fromEvent, throwError } from 'rxjs';
-import { mergeMap, takeUntil, finalize } from 'rxjs/operators';
+import { BehaviorSubject, throwError, timer, Subscription, defer, fromEvent } from 'rxjs';
+import { takeUntil, finalize, filter, mergeMapTo } from 'rxjs/operators';
+import { ApplicationStart, Toast, ToastsStart } from 'kibana/public';
 import { getCombinedSignal } from '../../common/utils';
 import { IKibanaSearchRequest } from '../../common/search';
 import { ISearchGeneric, ISearchOptions } from './i_search';
 import { RequestTimeoutError } from './request_timeout_error';
+import { getLongQueryNotification } from './long_query_notification';
 
 export class SearchInterceptor {
   /**
    * `abortController` used to signal all searches to abort.
    */
-  private abortController = new AbortController();
+  protected abortController = new AbortController();
 
   /**
-   * Observable that emits when the number of pending requests changes.
+   * The number of pending search requests.
    */
-  private pendingCount$ = new BehaviorSubject(0);
+  private pendingCount = 0;
 
   /**
-   * The IDs from `setTimeout` when scheduling the automatic timeout for each request.
+   * Observable that emits when the number of pending requests changes.
    */
-  private timeoutIds: Set<number> = new Set();
+  private pendingCount$ = new BehaviorSubject(this.pendingCount);
 
   /**
-   * This class should be instantiated with a `requestTimeout` corresponding with how many ms after
-   * requests are initiated that they should automatically cancel.
-   * @param requestTimeout Usually config value `elasticsearch.requestTimeout`
+   * The subscriptions from scheduling the automatic timeout for each request.
    */
-  constructor(private readonly requestTimeout?: number) {}
+  protected timeoutSubscriptions: Set<Subscription> = new Set();
 
   /**
-   * Abort our `AbortController`, which in turn aborts any intercepted searches.
+   * The current long-running toast (if there is one).
    */
-  public cancelPending = () => {
-    this.abortController.abort();
-    this.abortController = new AbortController();
-  };
+  protected longRunningToast?: Toast;
 
   /**
-   * Un-schedule timing out all of the searches intercepted.
+   * This class should be instantiated with a `requestTimeout` corresponding with how many ms after
+   * requests are initiated that they should automatically cancel.
+   * @param toasts The `core.notifications.toasts` service
+   * @param application  The `core.application` service
+   * @param requestTimeout Usually config value `elasticsearch.requestTimeout`
    */
-  public runBeyondTimeout = () => {
-    this.timeoutIds.forEach(clearTimeout);
-    this.timeoutIds.clear();
-  };
+  constructor(
+    protected readonly toasts: ToastsStart,
+    protected readonly application: ApplicationStart,
+    protected readonly requestTimeout?: number
+  ) {
+    // When search requests go out, a notification is scheduled allowing users to continue the
+    // request past the timeout. When all search requests complete, we remove the notification.
+    this.getPendingCount$()
+      .pipe(filter(count => count === 0))
+      .subscribe(this.hideToast);
+  }
 
   /**
    * Returns an `Observable` over the current number of pending searches. This could mean that one
@@ -81,41 +89,66 @@ export class SearchInterceptor {
     request: IKibanaSearchRequest,
     options?: ISearchOptions
   ) => {
-    // Schedule this request to automatically timeout after some interval
-    const timeoutController = new AbortController();
-    const { signal: timeoutSignal } = timeoutController;
-    const timeoutId = window.setTimeout(() => {
-      timeoutController.abort();
-    }, this.requestTimeout);
-    this.addTimeoutId(timeoutId);
-
-    // Get a combined `AbortSignal` that will be aborted whenever the first of the following occurs:
-    // 1. The user manually aborts (via `cancelPending`)
-    // 2. The request times out
-    // 3. The passed-in signal aborts (e.g. when re-fetching, or whenever the app determines)
-    const signals = [this.abortController.signal, timeoutSignal, options?.signal].filter(
-      Boolean
-    ) as AbortSignal[];
-    const combinedSignal = getCombinedSignal(signals);
-
-    // If the request timed out, throw a `RequestTimeoutError`
-    const timeoutError$ = fromEvent(timeoutSignal, 'abort').pipe(
-      mergeMap(() => throwError(new RequestTimeoutError()))
-    );
+    // Defer the following logic until `subscribe` is actually called
+    return defer(() => {
+      this.pendingCount$.next(++this.pendingCount);
 
-    return search(request as any, { ...options, signal: combinedSignal }).pipe(
-      takeUntil(timeoutError$),
-      finalize(() => this.removeTimeoutId(timeoutId))
-    );
+      // Schedule this request to automatically timeout after some interval
+      const timeoutController = new AbortController();
+      const { signal: timeoutSignal } = timeoutController;
+      const timeout$ = timer(this.requestTimeout);
+      const subscription = timeout$.subscribe(() => timeoutController.abort());
+      this.timeoutSubscriptions.add(subscription);
+
+      // If the request timed out, throw a `RequestTimeoutError`
+      const timeoutError$ = fromEvent(timeoutSignal, 'abort').pipe(
+        mergeMapTo(throwError(new RequestTimeoutError()))
+      );
+
+      // Schedule the notification to allow users to cancel or wait beyond the timeout
+      const notificationSubscription = timer(10000).subscribe(this.showToast);
+
+      // Get a combined `AbortSignal` that will be aborted whenever the first of the following occurs:
+      // 1. The user manually aborts (via `cancelPending`)
+      // 2. The request times out
+      // 3. The passed-in signal aborts (e.g. when re-fetching, or whenever the app determines)
+      const signals = [
+        this.abortController.signal,
+        timeoutSignal,
+        ...(options?.signal ? [options.signal] : []),
+      ];
+      const combinedSignal = getCombinedSignal(signals);
+
+      return search(request as any, { ...options, signal: combinedSignal }).pipe(
+        takeUntil(timeoutError$),
+        finalize(() => {
+          this.pendingCount$.next(--this.pendingCount);
+          this.timeoutSubscriptions.delete(subscription);
+          notificationSubscription.unsubscribe();
+        })
+      );
+    });
   };
 
-  private addTimeoutId(id: number) {
-    this.timeoutIds.add(id);
-    this.pendingCount$.next(this.timeoutIds.size);
-  }
+  protected showToast = () => {
+    if (this.longRunningToast) return;
+    this.longRunningToast = this.toasts.addInfo(
+      {
+        title: 'Your query is taking awhile',
+        text: getLongQueryNotification({
+          application: this.application,
+        }),
+      },
+      {
+        toastLifeTimeMs: Infinity,
+      }
+    );
+  };
 
-  private removeTimeoutId(id: number) {
-    this.timeoutIds.delete(id);
-    this.pendingCount$.next(this.timeoutIds.size);
-  }
+  protected hideToast = () => {
+    if (this.longRunningToast) {
+      this.toasts.remove(this.longRunningToast);
+      delete this.longRunningToast;
+    }
+  };
 }
diff --git a/src/plugins/data/public/search/search_service.ts b/src/plugins/data/public/search/search_service.ts
index 62c7e0468bb88..311a8a2fc6f60 100644
--- a/src/plugins/data/public/search/search_service.ts
+++ b/src/plugins/data/public/search/search_service.ts
@@ -58,6 +58,7 @@ export class SearchService implements Plugin<ISearchSetup, ISearchStart> {
 
   private esClient?: LegacyApiCaller;
   private readonly aggTypesRegistry = new AggTypesRegistry();
+  private searchInterceptor!: SearchInterceptor;
 
   private registerSearchStrategyProvider = <T extends TStrategyTypes>(
     name: T,
@@ -98,7 +99,9 @@ export class SearchService implements Plugin<ISearchSetup, ISearchStart> {
      * TODO: Make this modular so that apps can opt in/out of search collection, or even provide
      * their own search collector instances
      */
-    const searchInterceptor = new SearchInterceptor(
+    this.searchInterceptor = new SearchInterceptor(
+      core.notifications.toasts,
+      core.application,
       core.injectedMetadata.getInjectedVar('esRequestTimeout') as number
     );
 
@@ -114,16 +117,17 @@ export class SearchService implements Plugin<ISearchSetup, ISearchStart> {
         },
         types: aggTypesStart,
       },
-      cancel: () => searchInterceptor.cancelPending(),
-      getPendingCount$: () => searchInterceptor.getPendingCount$(),
-      runBeyondTimeout: () => searchInterceptor.runBeyondTimeout(),
       search: (request, options, strategyName) => {
         const strategyProvider = this.getSearchStrategy(strategyName || DEFAULT_SEARCH_STRATEGY);
         const { search } = strategyProvider({
           core,
           getSearchStrategy: this.getSearchStrategy,
         });
-        return searchInterceptor.search(search as any, request, options);
+        return this.searchInterceptor.search(search as any, request, options);
+      },
+      setInterceptor: (searchInterceptor: SearchInterceptor) => {
+        // TODO: should an intercepror have a destroy method?
+        this.searchInterceptor = searchInterceptor;
       },
       __LEGACY: {
         esClient: this.esClient!,
diff --git a/src/plugins/data/public/search/types.ts b/src/plugins/data/public/search/types.ts
index 1b551f978b971..03cbfa9f8ed84 100644
--- a/src/plugins/data/public/search/types.ts
+++ b/src/plugins/data/public/search/types.ts
@@ -17,12 +17,12 @@
  * under the License.
  */
 
-import { Observable } from 'rxjs';
 import { CoreStart } from 'kibana/public';
 import { SearchAggsSetup, SearchAggsStart, SearchAggsStartLegacy } from './aggs';
 import { ISearch, ISearchGeneric } from './i_search';
 import { TStrategyTypes } from './strategy_types';
 import { LegacyApiCaller } from './es_client';
+import { SearchInterceptor } from './search_interceptor';
 
 export interface ISearchContext {
   core: CoreStart;
@@ -87,9 +87,7 @@ export interface ISearchSetup {
 
 export interface ISearchStart {
   aggs: SearchAggsStart;
-  cancel: () => void;
-  getPendingCount$: () => Observable<number>;
-  runBeyondTimeout: () => void;
+  setInterceptor: (searchInterceptor: SearchInterceptor) => void;
   search: ISearchGeneric;
   __LEGACY: ISearchStartLegacy & SearchAggsStartLegacy;
 }
diff --git a/x-pack/plugins/data_enhanced/public/plugin.ts b/x-pack/plugins/data_enhanced/public/plugin.ts
index 6316d87c50519..72e0817eea8df 100644
--- a/x-pack/plugins/data_enhanced/public/plugin.ts
+++ b/x-pack/plugins/data_enhanced/public/plugin.ts
@@ -17,6 +17,7 @@ import {
   asyncSearchStrategyProvider,
   enhancedEsSearchStrategyProvider,
 } from './search';
+import { EnhancedSearchInterceptor } from './search/search_interceptor';
 
 export interface DataEnhancedSetupDependencies {
   data: DataPublicPluginSetup;
@@ -45,5 +46,11 @@ export class DataEnhancedPlugin implements Plugin {
 
   public start(core: CoreStart, plugins: DataEnhancedStartDependencies) {
     setAutocompleteService(plugins.data.autocomplete);
+    const enhancedSearchInterceptor = new EnhancedSearchInterceptor(
+      core.notifications.toasts,
+      core.application,
+      core.injectedMetadata.getInjectedVar('esRequestTimeout') as number
+    );
+    plugins.data.search.setInterceptor(enhancedSearchInterceptor);
   }
 }
diff --git a/x-pack/plugins/data_enhanced/public/search/long_query_notification.tsx b/x-pack/plugins/data_enhanced/public/search/long_query_notification.tsx
new file mode 100644
index 0000000000000..325cf1145fa5f
--- /dev/null
+++ b/x-pack/plugins/data_enhanced/public/search/long_query_notification.tsx
@@ -0,0 +1,47 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { EuiButton, EuiButtonEmpty, EuiFlexGroup, EuiFlexItem, EuiSpacer } from '@elastic/eui';
+import { FormattedMessage } from '@kbn/i18n/react';
+import React from 'react';
+import { toMountPoint } from '../../../../../src/plugins/kibana_react/public';
+
+interface Props {
+  cancel: () => void;
+  runBeyondTimeout: () => void;
+}
+
+export function getLongQueryNotification(props: Props) {
+  return toMountPoint(
+    <LongQueryNotification cancel={props.cancel} runBeyondTimeout={props.runBeyondTimeout} />
+  );
+}
+
+export function LongQueryNotification(props: Props) {
+  return (
+    <div>
+      <EuiSpacer size="s" />
+      <EuiFlexGroup justifyContent="flexEnd" gutterSize="s">
+        <EuiFlexItem grow={false}>
+          <EuiButtonEmpty size="s" onClick={props.cancel}>
+            <FormattedMessage
+              id="xpack.data.query.queryBar.cancelLongQuery"
+              defaultMessage="Cancel"
+            />
+          </EuiButtonEmpty>
+        </EuiFlexItem>
+        <EuiFlexItem grow={false}>
+          <EuiButton size="s" fill onClick={props.runBeyondTimeout}>
+            <FormattedMessage
+              id="xpack.data.query.queryBar.runBeyond"
+              defaultMessage="Run beyond timeout"
+            />
+          </EuiButton>
+        </EuiFlexItem>
+      </EuiFlexGroup>
+    </div>
+  );
+}
diff --git a/x-pack/plugins/data_enhanced/public/search/search_interceptor.test.ts b/x-pack/plugins/data_enhanced/public/search/search_interceptor.test.ts
new file mode 100644
index 0000000000000..1e554d3ff2d86
--- /dev/null
+++ b/x-pack/plugins/data_enhanced/public/search/search_interceptor.test.ts
@@ -0,0 +1,67 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { Observable, Subject } from 'rxjs';
+import { coreMock } from '../../../../../src/core/public/mocks';
+import { EnhancedSearchInterceptor } from './search_interceptor';
+import { CoreStart } from 'kibana/public';
+
+jest.useFakeTimers();
+
+const flushPromises = () => new Promise(resolve => setImmediate(resolve));
+const mockSearch = jest.fn();
+let searchInterceptor: EnhancedSearchInterceptor;
+let mockCoreStart: MockedKeys<CoreStart>;
+
+describe('EnhancedSearchInterceptor', () => {
+  beforeEach(() => {
+    mockCoreStart = coreMock.createStart();
+    mockSearch.mockClear();
+    searchInterceptor = new EnhancedSearchInterceptor(
+      mockCoreStart.notifications.toasts,
+      mockCoreStart.application,
+      1000
+    );
+  });
+
+  describe('cancelPending', () => {
+    test('should abort all pending requests', async () => {
+      mockSearch.mockReturnValue(new Observable());
+
+      searchInterceptor.search(mockSearch, {});
+      searchInterceptor.search(mockSearch, {});
+      searchInterceptor.cancelPending();
+
+      await flushPromises();
+
+      const areAllRequestsAborted = mockSearch.mock.calls.every(([, { signal }]) => signal.aborted);
+      expect(areAllRequestsAborted).toBe(true);
+    });
+  });
+
+  describe('runBeyondTimeout', () => {
+    test('should prevent the request from timing out', () => {
+      const mockResponse = new Subject();
+      mockSearch.mockReturnValue(mockResponse.asObservable());
+      const response = searchInterceptor.search(mockSearch, {});
+
+      setTimeout(searchInterceptor.runBeyondTimeout, 500);
+      setTimeout(() => mockResponse.next('hi'), 250);
+      setTimeout(() => mockResponse.complete(), 2000);
+
+      const next = jest.fn();
+      const complete = jest.fn();
+      const error = jest.fn();
+      response.subscribe({ next, error, complete });
+
+      jest.advanceTimersByTime(2000);
+
+      expect(next).toHaveBeenCalledWith('hi');
+      expect(error).not.toHaveBeenCalled();
+      expect(complete).toHaveBeenCalled();
+    });
+  });
+});
diff --git a/x-pack/plugins/data_enhanced/public/search/search_interceptor.ts b/x-pack/plugins/data_enhanced/public/search/search_interceptor.ts
new file mode 100644
index 0000000000000..38452dee9a2da
--- /dev/null
+++ b/x-pack/plugins/data_enhanced/public/search/search_interceptor.ts
@@ -0,0 +1,56 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { ApplicationStart, ToastsStart } from 'kibana/public';
+import { getLongQueryNotification } from './long_query_notification';
+import { SearchInterceptor } from '../../../../../src/plugins/data/public';
+
+export class EnhancedSearchInterceptor extends SearchInterceptor {
+  /**
+   * This class should be instantiated with a `requestTimeout` corresponding with how many ms after
+   * requests are initiated that they should automatically cancel.
+   * @param toasts The `core.notifications.toasts` service
+   * @param application The `core.application` service
+   * @param requestTimeout Usually config value `elasticsearch.requestTimeout`
+   */
+  constructor(toasts: ToastsStart, application: ApplicationStart, requestTimeout?: number) {
+    super(toasts, application, requestTimeout);
+  }
+
+  /**
+   * Abort our `AbortController`, which in turn aborts any intercepted searches.
+   */
+  public cancelPending = () => {
+    this.hideToast();
+    this.abortController.abort();
+    this.abortController = new AbortController();
+  };
+
+  /**
+   * Un-schedule timing out all of the searches intercepted.
+   */
+  public runBeyondTimeout = () => {
+    this.hideToast();
+    this.timeoutSubscriptions.forEach(subscription => subscription.unsubscribe());
+    this.timeoutSubscriptions.clear();
+  };
+
+  protected showToast = () => {
+    if (this.longRunningToast) return;
+    this.longRunningToast = this.toasts.addInfo(
+      {
+        title: 'Your query is taking awhile',
+        text: getLongQueryNotification({
+          cancel: this.cancelPending,
+          runBeyondTimeout: this.runBeyondTimeout,
+        }),
+      },
+      {
+        toastLifeTimeMs: Infinity,
+      }
+    );
+  };
+}

From 9dab555787159cab326a8b22f173cd5dbd8eaaad Mon Sep 17 00:00:00 2001
From: Stacey Gammon <gammon@elastic.co>
Date: Tue, 24 Mar 2020 11:58:52 -0400
Subject: [PATCH 085/179] Move extract/inject dashboard references to NP, use
 NP start contract (#60290)

* move some types and functions to np

* make saved dashboard loader a singleton

* fix bad merge

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 .../kibana/public/dashboard/index.ts          |  1 -
 .../dashboard/migrations/is_dashboard_doc.ts  |  2 +-
 .../migrations/migrate_to_730_panels.test.ts  |  2 -
 .../migrations/migrate_to_730_panels.ts       |  6 +--
 .../migrations/migrations_730.test.ts         |  2 +-
 .../dashboard/migrations/migrations_730.ts    |  5 ++-
 .../dashboard/np_ready/dashboard_app.tsx      |  2 +-
 .../np_ready/dashboard_state_manager.ts       |  7 ++--
 .../lib/embeddable_saved_object_converters.ts |  2 +-
 .../np_ready/lib/get_app_state_defaults.ts    |  2 +-
 .../np_ready/lib/update_saved_dashboard.ts    |  2 +-
 .../test_utils/get_saved_dashboard_mock.ts    |  2 +-
 .../kibana/public/dashboard/np_ready/types.ts | 10 +----
 .../kibana/public/dashboard/plugin.ts         | 14 +++----
 .../management/saved_object_registry.ts       |  3 +-
 .../new_platform/new_platform.karma_mock.js   |  3 ++
 .../ui/public/new_platform/new_platform.ts    |  2 +
 src/plugins/dashboard/kibana.json             |  3 +-
 src/plugins/dashboard/public/bwc/index.ts     | 20 +++++++++
 .../dashboard/public/bwc}/types.ts            | 23 ++++++++++-
 .../dashboard/public/dashboard_constants.ts   | 32 +++++++++++++++
 .../dashboard/public/embeddable/index.ts      |  2 +-
 src/plugins/dashboard/public/index.ts         | 41 ++++++++++++++++---
 src/plugins/dashboard/public/plugin.tsx       | 37 +++++++++++++----
 .../public/saved_dashboards/index.ts          | 21 ++++++++++
 .../saved_dashboards}/saved_dashboard.ts      | 19 ++++-----
 .../saved_dashboard_references.test.ts        |  0
 .../saved_dashboard_references.ts             |  0
 .../saved_dashboards}/saved_dashboards.ts     | 19 ++++++---
 29 files changed, 216 insertions(+), 68 deletions(-)
 create mode 100644 src/plugins/dashboard/public/bwc/index.ts
 rename src/{legacy/core_plugins/kibana/public/dashboard/migrations => plugins/dashboard/public/bwc}/types.ts (91%)
 create mode 100644 src/plugins/dashboard/public/dashboard_constants.ts
 create mode 100644 src/plugins/dashboard/public/saved_dashboards/index.ts
 rename src/{legacy/core_plugins/kibana/public/dashboard/saved_dashboard => plugins/dashboard/public/saved_dashboards}/saved_dashboard.ts (86%)
 rename src/{legacy/core_plugins/kibana/public/dashboard/saved_dashboard => plugins/dashboard/public/saved_dashboards}/saved_dashboard_references.test.ts (100%)
 rename src/{legacy/core_plugins/kibana/public/dashboard/saved_dashboard => plugins/dashboard/public/saved_dashboards}/saved_dashboard_references.ts (100%)
 rename src/{legacy/core_plugins/kibana/public/dashboard/saved_dashboard => plugins/dashboard/public/saved_dashboards}/saved_dashboards.ts (67%)

diff --git a/src/legacy/core_plugins/kibana/public/dashboard/index.ts b/src/legacy/core_plugins/kibana/public/dashboard/index.ts
index 5b9fb8c0b6360..8900d017ef81a 100644
--- a/src/legacy/core_plugins/kibana/public/dashboard/index.ts
+++ b/src/legacy/core_plugins/kibana/public/dashboard/index.ts
@@ -21,7 +21,6 @@ import { PluginInitializerContext } from 'kibana/public';
 import { DashboardPlugin } from './plugin';
 
 export * from './np_ready/dashboard_constants';
-export { createSavedDashboardLoader } from './saved_dashboard/saved_dashboards';
 
 // Core will be looking for this when loading our plugin in the new platform
 export const plugin = (context: PluginInitializerContext) => {
diff --git a/src/legacy/core_plugins/kibana/public/dashboard/migrations/is_dashboard_doc.ts b/src/legacy/core_plugins/kibana/public/dashboard/migrations/is_dashboard_doc.ts
index f3bc2a4a4e155..d8f8882a218dd 100644
--- a/src/legacy/core_plugins/kibana/public/dashboard/migrations/is_dashboard_doc.ts
+++ b/src/legacy/core_plugins/kibana/public/dashboard/migrations/is_dashboard_doc.ts
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { DashboardDoc730ToLatest } from './types';
+import { DashboardDoc730ToLatest } from '../../../../../../plugins/dashboard/public';
 import { isDoc } from '../../../migrations/is_doc';
 
 export function isDashboardDoc(
diff --git a/src/legacy/core_plugins/kibana/public/dashboard/migrations/migrate_to_730_panels.test.ts b/src/legacy/core_plugins/kibana/public/dashboard/migrations/migrate_to_730_panels.test.ts
index 2189b53ac81ee..e37c8de08fec4 100644
--- a/src/legacy/core_plugins/kibana/public/dashboard/migrations/migrate_to_730_panels.test.ts
+++ b/src/legacy/core_plugins/kibana/public/dashboard/migrations/migrate_to_730_panels.test.ts
@@ -44,8 +44,6 @@ import {
   RawSavedDashboardPanel620,
   RawSavedDashboardPanel630,
   RawSavedDashboardPanel640To720,
-} from './types';
-import {
   DEFAULT_PANEL_WIDTH,
   DEFAULT_PANEL_HEIGHT,
 } from '../../../../../../plugins/dashboard/public';
diff --git a/src/legacy/core_plugins/kibana/public/dashboard/migrations/migrate_to_730_panels.ts b/src/legacy/core_plugins/kibana/public/dashboard/migrations/migrate_to_730_panels.ts
index 6b037fa63cf68..047ec15f9a5d6 100644
--- a/src/legacy/core_plugins/kibana/public/dashboard/migrations/migrate_to_730_panels.ts
+++ b/src/legacy/core_plugins/kibana/public/dashboard/migrations/migrate_to_730_panels.ts
@@ -18,17 +18,17 @@
  */
 import { i18n } from '@kbn/i18n';
 import semver from 'semver';
-import { GridData } from 'src/plugins/dashboard/public';
-
 import uuid from 'uuid';
 import {
+  GridData,
   RawSavedDashboardPanelTo60,
   RawSavedDashboardPanel630,
   RawSavedDashboardPanel640To720,
   RawSavedDashboardPanel730ToLatest,
   RawSavedDashboardPanel610,
   RawSavedDashboardPanel620,
-} from './types';
+} from '../../../../../../plugins/dashboard/public';
+
 import {
   SavedDashboardPanelTo60,
   SavedDashboardPanel620,
diff --git a/src/legacy/core_plugins/kibana/public/dashboard/migrations/migrations_730.test.ts b/src/legacy/core_plugins/kibana/public/dashboard/migrations/migrations_730.test.ts
index 86d399d219a26..34bb46ce5d407 100644
--- a/src/legacy/core_plugins/kibana/public/dashboard/migrations/migrations_730.test.ts
+++ b/src/legacy/core_plugins/kibana/public/dashboard/migrations/migrations_730.test.ts
@@ -24,7 +24,7 @@ import {
   DashboardDoc730ToLatest,
   RawSavedDashboardPanel730ToLatest,
   DashboardDocPre700,
-} from './types';
+} from '../../../../../../plugins/dashboard/public';
 
 const mockLogger = {
   warning: () => {},
diff --git a/src/legacy/core_plugins/kibana/public/dashboard/migrations/migrations_730.ts b/src/legacy/core_plugins/kibana/public/dashboard/migrations/migrations_730.ts
index 1ab5738cf4752..56856f7b21303 100644
--- a/src/legacy/core_plugins/kibana/public/dashboard/migrations/migrations_730.ts
+++ b/src/legacy/core_plugins/kibana/public/dashboard/migrations/migrations_730.ts
@@ -20,7 +20,10 @@
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
 import { SavedObjectsMigrationLogger } from 'src/core/server';
 import { inspect } from 'util';
-import { DashboardDoc730ToLatest, DashboardDoc700To720 } from './types';
+import {
+  DashboardDoc730ToLatest,
+  DashboardDoc700To720,
+} from '../../../../../../plugins/dashboard/public';
 import { isDashboardDoc } from './is_dashboard_doc';
 import { moveFiltersToQuery } from './move_filters_to_query';
 import { migratePanelsTo730 } from './migrate_to_730_panels';
diff --git a/src/legacy/core_plugins/kibana/public/dashboard/np_ready/dashboard_app.tsx b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/dashboard_app.tsx
index 4e9942767186e..e21033ffe10ec 100644
--- a/src/legacy/core_plugins/kibana/public/dashboard/np_ready/dashboard_app.tsx
+++ b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/dashboard_app.tsx
@@ -22,7 +22,7 @@ import { Subscription } from 'rxjs';
 import { History } from 'history';
 
 import { ViewMode } from '../../../../embeddable_api/public/np_ready/public';
-import { SavedObjectDashboard } from '../saved_dashboard/saved_dashboard';
+import { SavedObjectDashboard } from '../../../../../../plugins/dashboard/public';
 import { DashboardAppState, SavedDashboardPanel } from './types';
 import {
   IIndexPattern,
diff --git a/src/legacy/core_plugins/kibana/public/dashboard/np_ready/dashboard_state_manager.ts b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/dashboard_state_manager.ts
index f29721e3c3d5c..171f08b45cf8d 100644
--- a/src/legacy/core_plugins/kibana/public/dashboard/np_ready/dashboard_state_manager.ts
+++ b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/dashboard_state_manager.ts
@@ -23,7 +23,10 @@ import { Observable, Subscription } from 'rxjs';
 import { Moment } from 'moment';
 import { History } from 'history';
 
-import { DashboardContainer } from 'src/plugins/dashboard/public';
+import {
+  DashboardContainer,
+  SavedObjectDashboard,
+} from '../../../../../../plugins/dashboard/public';
 import { ViewMode } from '../../../../../../plugins/embeddable/public';
 import { migrateLegacyQuery } from '../legacy_imports';
 import {
@@ -35,8 +38,6 @@ import {
 import { getAppStateDefaults, migrateAppState } from './lib';
 import { convertPanelStateToSavedDashboardPanel } from './lib/embeddable_saved_object_converters';
 import { FilterUtils } from './lib/filter_utils';
-import { SavedObjectDashboard } from '../saved_dashboard/saved_dashboard';
-
 import {
   DashboardAppState,
   DashboardAppStateDefaults,
diff --git a/src/legacy/core_plugins/kibana/public/dashboard/np_ready/lib/embeddable_saved_object_converters.ts b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/lib/embeddable_saved_object_converters.ts
index 7d5a378885470..500ee7e28daa6 100644
--- a/src/legacy/core_plugins/kibana/public/dashboard/np_ready/lib/embeddable_saved_object_converters.ts
+++ b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/lib/embeddable_saved_object_converters.ts
@@ -17,7 +17,7 @@
  * under the License.
  */
 import { omit } from 'lodash';
-import { DashboardPanelState } from 'src/plugins/dashboard/public';
+import { DashboardPanelState } from '../../../../../../../plugins/dashboard/public';
 import { SavedDashboardPanel } from '../types';
 
 export function convertSavedDashboardPanelToPanelState(
diff --git a/src/legacy/core_plugins/kibana/public/dashboard/np_ready/lib/get_app_state_defaults.ts b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/lib/get_app_state_defaults.ts
index eceb51f17d164..b3acefeba0146 100644
--- a/src/legacy/core_plugins/kibana/public/dashboard/np_ready/lib/get_app_state_defaults.ts
+++ b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/lib/get_app_state_defaults.ts
@@ -18,7 +18,7 @@
  */
 
 import { ViewMode } from '../../../../../../../plugins/embeddable/public';
-import { SavedObjectDashboard } from '../../saved_dashboard/saved_dashboard';
+import { SavedObjectDashboard } from '../../../../../../../plugins/dashboard/public';
 import { DashboardAppStateDefaults } from '../types';
 
 export function getAppStateDefaults(
diff --git a/src/legacy/core_plugins/kibana/public/dashboard/np_ready/lib/update_saved_dashboard.ts b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/lib/update_saved_dashboard.ts
index ec8073c0f72f7..dee279550aa6a 100644
--- a/src/legacy/core_plugins/kibana/public/dashboard/np_ready/lib/update_saved_dashboard.ts
+++ b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/lib/update_saved_dashboard.ts
@@ -20,7 +20,7 @@
 import _ from 'lodash';
 import { RefreshInterval, TimefilterContract } from 'src/plugins/data/public';
 import { FilterUtils } from './filter_utils';
-import { SavedObjectDashboard } from '../../saved_dashboard/saved_dashboard';
+import { SavedObjectDashboard } from '../../../../../../../plugins/dashboard/public';
 import { DashboardAppState } from '../types';
 
 export function updateSavedDashboard(
diff --git a/src/legacy/core_plugins/kibana/public/dashboard/np_ready/test_utils/get_saved_dashboard_mock.ts b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/test_utils/get_saved_dashboard_mock.ts
index 60b2a33f720ec..53618f1cfe5fa 100644
--- a/src/legacy/core_plugins/kibana/public/dashboard/np_ready/test_utils/get_saved_dashboard_mock.ts
+++ b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/test_utils/get_saved_dashboard_mock.ts
@@ -18,7 +18,7 @@
  */
 
 import { searchSourceMock } from '../../../../../../../plugins/data/public/mocks';
-import { SavedObjectDashboard } from '../../saved_dashboard/saved_dashboard';
+import { SavedObjectDashboard } from '../../../../../../../plugins/dashboard/public/';
 
 export function getSavedDashboardMock(
   config?: Partial<SavedObjectDashboard>
diff --git a/src/legacy/core_plugins/kibana/public/dashboard/np_ready/types.ts b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/types.ts
index 0f3a7e322ebf3..9f8682f13d811 100644
--- a/src/legacy/core_plugins/kibana/public/dashboard/np_ready/types.ts
+++ b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/types.ts
@@ -25,19 +25,11 @@ import {
   RawSavedDashboardPanel630,
   RawSavedDashboardPanel640To720,
   RawSavedDashboardPanel730ToLatest,
-} from '../migrations/types';
+} from '../../../../../../plugins/dashboard/public';
 import { Query, Filter } from '../../../../../../plugins/data/public';
 
 export type NavAction = (anchorElement?: any) => void;
 
-export interface GridData {
-  w: number;
-  h: number;
-  x: number;
-  y: number;
-  i: string;
-}
-
 /**
  * This should always represent the latest dashboard panel shape, after all possible migrations.
  */
diff --git a/src/legacy/core_plugins/kibana/public/dashboard/plugin.ts b/src/legacy/core_plugins/kibana/public/dashboard/plugin.ts
index a9ee77921ed4a..7452807454fe7 100644
--- a/src/legacy/core_plugins/kibana/public/dashboard/plugin.ts
+++ b/src/legacy/core_plugins/kibana/public/dashboard/plugin.ts
@@ -49,8 +49,8 @@ import {
   KibanaLegacySetup,
   KibanaLegacyStart,
 } from '../../../../../plugins/kibana_legacy/public';
-import { createSavedDashboardLoader } from './saved_dashboard/saved_dashboards';
 import { createKbnUrlTracker } from '../../../../../plugins/kibana_utils/public';
+import { DashboardStart } from '../../../../../plugins/dashboard/public';
 
 export interface DashboardPluginStartDependencies {
   data: DataPublicPluginStart;
@@ -58,6 +58,7 @@ export interface DashboardPluginStartDependencies {
   navigation: NavigationStart;
   share: SharePluginStart;
   kibanaLegacy: KibanaLegacyStart;
+  dashboard: DashboardStart;
 }
 
 export interface DashboardPluginSetupDependencies {
@@ -74,6 +75,7 @@ export class DashboardPlugin implements Plugin {
     navigation: NavigationStart;
     share: SharePluginStart;
     dashboardConfig: KibanaLegacyStart['dashboardConfig'];
+    dashboard: DashboardStart;
   } | null = null;
 
   private appStateUpdater = new BehaviorSubject<AngularRenderedAppUpdater>(() => ({}));
@@ -129,13 +131,9 @@ export class DashboardPlugin implements Plugin {
           share,
           data: dataStart,
           dashboardConfig,
+          dashboard: { getSavedDashboardLoader },
         } = this.startDependencies;
-        const savedDashboards = createSavedDashboardLoader({
-          savedObjectsClient,
-          indexPatterns: dataStart.indexPatterns,
-          chrome: coreStart.chrome,
-          overlays: coreStart.overlays,
-        });
+        const savedDashboards = getSavedDashboardLoader();
 
         const deps: RenderDeps = {
           pluginInitializerContext: this.initializerContext,
@@ -199,6 +197,7 @@ export class DashboardPlugin implements Plugin {
       data,
       share,
       kibanaLegacy: { dashboardConfig },
+      dashboard,
     }: DashboardPluginStartDependencies
   ) {
     this.startDependencies = {
@@ -208,6 +207,7 @@ export class DashboardPlugin implements Plugin {
       navigation,
       share,
       dashboardConfig,
+      dashboard,
     };
   }
 
diff --git a/src/legacy/core_plugins/kibana/public/management/saved_object_registry.ts b/src/legacy/core_plugins/kibana/public/management/saved_object_registry.ts
index cb9ac0e01bb7f..f3a37e2b7348f 100644
--- a/src/legacy/core_plugins/kibana/public/management/saved_object_registry.ts
+++ b/src/legacy/core_plugins/kibana/public/management/saved_object_registry.ts
@@ -21,7 +21,6 @@ import _ from 'lodash';
 import { i18n } from '@kbn/i18n';
 import { npStart } from 'ui/new_platform';
 import { SavedObjectLoader } from '../../../../../plugins/saved_objects/public';
-import { createSavedDashboardLoader } from '../dashboard';
 import { start as visualizations } from '../../../visualizations/public/np_ready/public/legacy';
 import { createSavedSearchesLoader } from '../../../../../plugins/discover/public';
 
@@ -70,7 +69,7 @@ savedObjectManagementRegistry.register({
 
 savedObjectManagementRegistry.register({
   id: 'savedDashboards',
-  service: createSavedDashboardLoader(services),
+  service: npStart.plugins.dashboard.getSavedDashboardLoader(),
   title: i18n.translate('kbn.dashboard.savedDashboardsTitle', {
     defaultMessage: 'dashboards',
   }),
diff --git a/src/legacy/ui/public/new_platform/new_platform.karma_mock.js b/src/legacy/ui/public/new_platform/new_platform.karma_mock.js
index 809022620e69d..67877c5382633 100644
--- a/src/legacy/ui/public/new_platform/new_platform.karma_mock.js
+++ b/src/legacy/ui/public/new_platform/new_platform.karma_mock.js
@@ -330,6 +330,9 @@ export const npStart = {
         getHideWriteControls: sinon.fake(),
       },
     },
+    dashboard: {
+      getSavedDashboardLoader: sinon.fake(),
+    },
     data: {
       actions: {
         createFiltersFromEvent: Promise.resolve(['yes']),
diff --git a/src/legacy/ui/public/new_platform/new_platform.ts b/src/legacy/ui/public/new_platform/new_platform.ts
index ee14f192a2149..b315abec1a64b 100644
--- a/src/legacy/ui/public/new_platform/new_platform.ts
+++ b/src/legacy/ui/public/new_platform/new_platform.ts
@@ -22,6 +22,7 @@ import { IScope } from 'angular';
 import { UiActionsStart, UiActionsSetup } from 'src/plugins/ui_actions/public';
 import { EmbeddableStart, EmbeddableSetup } from 'src/plugins/embeddable/public';
 import { createBrowserHistory } from 'history';
+import { DashboardStart } from '../../../../plugins/dashboard/public';
 import {
   LegacyCoreSetup,
   LegacyCoreStart,
@@ -104,6 +105,7 @@ export interface PluginsStart {
   advancedSettings: AdvancedSettingsStart;
   discover: DiscoverStart;
   telemetry?: TelemetryPluginStart;
+  dashboard: DashboardStart;
 }
 
 export const npSetup = {
diff --git a/src/plugins/dashboard/kibana.json b/src/plugins/dashboard/kibana.json
index e5a657555819a..e35599a5f0b66 100644
--- a/src/plugins/dashboard/kibana.json
+++ b/src/plugins/dashboard/kibana.json
@@ -5,7 +5,8 @@
     "data",
     "embeddable",
     "inspector",
-    "uiActions"
+    "uiActions",
+    "savedObjects"
   ],
   "optionalPlugins": [
     "share"
diff --git a/src/plugins/dashboard/public/bwc/index.ts b/src/plugins/dashboard/public/bwc/index.ts
new file mode 100644
index 0000000000000..d8f7b5091eb8f
--- /dev/null
+++ b/src/plugins/dashboard/public/bwc/index.ts
@@ -0,0 +1,20 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+export * from './types';
diff --git a/src/legacy/core_plugins/kibana/public/dashboard/migrations/types.ts b/src/plugins/dashboard/public/bwc/types.ts
similarity index 91%
rename from src/legacy/core_plugins/kibana/public/dashboard/migrations/types.ts
rename to src/plugins/dashboard/public/bwc/types.ts
index c264358a8f81f..e9b9d392e9b7d 100644
--- a/src/legacy/core_plugins/kibana/public/dashboard/migrations/types.ts
+++ b/src/plugins/dashboard/public/bwc/types.ts
@@ -17,8 +17,27 @@
  * under the License.
  */
 
-import { GridData } from '../np_ready/types';
-import { Doc, DocPre700 } from '../../../migrations/types';
+import { SavedObjectReference } from 'kibana/public';
+import { GridData } from '../../../../plugins/dashboard/public';
+
+export interface SavedObjectAttributes {
+  kibanaSavedObjectMeta: {
+    searchSourceJSON: string;
+  };
+}
+
+export interface Doc<Attributes extends SavedObjectAttributes = SavedObjectAttributes> {
+  references: SavedObjectReference[];
+  attributes: Attributes;
+  id: string;
+  type: string;
+}
+
+export interface DocPre700<Attributes extends SavedObjectAttributes = SavedObjectAttributes> {
+  attributes: Attributes;
+  id: string;
+  type: string;
+}
 
 export interface SavedObjectAttributes {
   kibanaSavedObjectMeta: {
diff --git a/src/plugins/dashboard/public/dashboard_constants.ts b/src/plugins/dashboard/public/dashboard_constants.ts
new file mode 100644
index 0000000000000..0820ebd371004
--- /dev/null
+++ b/src/plugins/dashboard/public/dashboard_constants.ts
@@ -0,0 +1,32 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+export const DashboardConstants = {
+  ADD_VISUALIZATION_TO_DASHBOARD_MODE_PARAM: 'addToDashboard',
+  LANDING_PAGE_PATH: '/dashboards',
+  CREATE_NEW_DASHBOARD_URL: '/dashboard',
+  ADD_EMBEDDABLE_ID: 'addEmbeddableId',
+  ADD_EMBEDDABLE_TYPE: 'addEmbeddableType',
+  DASHBOARDS_ID: 'dashboards',
+  DASHBOARD_ID: 'dashboard',
+};
+
+export function createDashboardEditUrl(id: string) {
+  return `/dashboard/${id}`;
+}
diff --git a/src/plugins/dashboard/public/embeddable/index.ts b/src/plugins/dashboard/public/embeddable/index.ts
index 58bfd5eedefcb..fcc5fe5202bd2 100644
--- a/src/plugins/dashboard/public/embeddable/index.ts
+++ b/src/plugins/dashboard/public/embeddable/index.ts
@@ -21,7 +21,7 @@ export { DashboardContainerFactory } from './dashboard_container_factory';
 export { DashboardContainer, DashboardContainerInput } from './dashboard_container';
 export { createPanelState } from './panel';
 
-export { DashboardPanelState, GridData } from './types';
+export * from './types';
 
 export {
   DASHBOARD_GRID_COLUMN_COUNT,
diff --git a/src/plugins/dashboard/public/index.ts b/src/plugins/dashboard/public/index.ts
index c6846346b64ef..070e437ce52ef 100644
--- a/src/plugins/dashboard/public/index.ts
+++ b/src/plugins/dashboard/public/index.ts
@@ -22,14 +22,43 @@ import './index.scss';
 import { PluginInitializerContext } from '../../../core/public';
 import { DashboardEmbeddableContainerPublicPlugin } from './plugin';
 
-export * from './types';
-export * from './actions';
-export * from './embeddable';
+/**
+ * These types can probably be internal once all of dashboard app is migrated into this plugin. Right
+ * now, migrations are still in legacy land.
+ */
+export {
+  DashboardDoc730ToLatest,
+  DashboardDoc700To720,
+  RawSavedDashboardPanelTo60,
+  RawSavedDashboardPanel610,
+  RawSavedDashboardPanel620,
+  RawSavedDashboardPanel630,
+  RawSavedDashboardPanel640To720,
+  RawSavedDashboardPanel730ToLatest,
+  DashboardDocPre700,
+} from './bwc';
 
-export function plugin(initializerContext: PluginInitializerContext) {
-  return new DashboardEmbeddableContainerPublicPlugin(initializerContext);
-}
+export {} from './types';
+export {} from './actions';
+export {
+  DashboardContainer,
+  DashboardContainerInput,
+  DashboardContainerFactory,
+  DASHBOARD_CONTAINER_TYPE,
+  DashboardPanelState,
+  // Types below here can likely be made private when dashboard app moved into this NP plugin.
+  DEFAULT_PANEL_WIDTH,
+  DEFAULT_PANEL_HEIGHT,
+  GridData,
+} from './embeddable';
+
+export { SavedObjectDashboard } from './saved_dashboards';
+export { DashboardStart } from './plugin';
 
 export { DashboardEmbeddableContainerPublicPlugin as Plugin };
 
 export { DASHBOARD_APP_URL_GENERATOR } from './url_generator';
+
+export function plugin(initializerContext: PluginInitializerContext) {
+  return new DashboardEmbeddableContainerPublicPlugin(initializerContext);
+}
diff --git a/src/plugins/dashboard/public/plugin.tsx b/src/plugins/dashboard/public/plugin.tsx
index d663c736e5aed..3d67435e6d8f7 100644
--- a/src/plugins/dashboard/public/plugin.tsx
+++ b/src/plugins/dashboard/public/plugin.tsx
@@ -21,13 +21,18 @@
 
 import * as React from 'react';
 import { PluginInitializerContext, CoreSetup, CoreStart, Plugin } from 'src/core/public';
-import { SharePluginSetup } from 'src/plugins/share/public';
+import {
+  CONTEXT_MENU_TRIGGER,
+  EmbeddableSetup,
+  EmbeddableStart,
+} from '../../../plugins/embeddable/public';
+import { DataPublicPluginStart } from '../../../plugins/data/public';
+import { SharePluginSetup } from '../../../plugins/share/public';
 import { UiActionsSetup, UiActionsStart } from '../../../plugins/ui_actions/public';
-import { CONTEXT_MENU_TRIGGER, EmbeddableSetup, EmbeddableStart } from './embeddable_plugin';
-import { ExpandPanelAction, ReplacePanelAction } from '.';
+import { ExpandPanelAction, ReplacePanelAction } from './actions';
 import { DashboardContainerFactory } from './embeddable/dashboard_container_factory';
 import { Start as InspectorStartContract } from '../../../plugins/inspector/public';
-import { getSavedObjectFinder } from '../../../plugins/saved_objects/public';
+import { getSavedObjectFinder, SavedObjectLoader } from '../../../plugins/saved_objects/public';
 import {
   ExitFullScreenButton as ExitFullScreenButtonUi,
   ExitFullScreenButtonProps,
@@ -39,6 +44,7 @@ import {
   DASHBOARD_APP_URL_GENERATOR,
   createDirectAccessDashboardLinkGenerator,
 } from './url_generator';
+import { createSavedDashboardLoader } from './saved_dashboards';
 
 declare module '../../share/public' {
   export interface UrlGeneratorStateMapping {
@@ -56,10 +62,13 @@ interface StartDependencies {
   embeddable: EmbeddableStart;
   inspector: InspectorStartContract;
   uiActions: UiActionsStart;
+  data: DataPublicPluginStart;
 }
 
 export type Setup = void;
-export type Start = void;
+export interface DashboardStart {
+  getSavedDashboardLoader: () => SavedObjectLoader;
+}
 
 declare module '../../../plugins/ui_actions/public' {
   export interface ActionContextMapping {
@@ -69,7 +78,7 @@ declare module '../../../plugins/ui_actions/public' {
 }
 
 export class DashboardEmbeddableContainerPublicPlugin
-  implements Plugin<Setup, Start, SetupDependencies, StartDependencies> {
+  implements Plugin<Setup, DashboardStart, SetupDependencies, StartDependencies> {
   constructor(initializerContext: PluginInitializerContext) {}
 
   public setup(
@@ -121,9 +130,12 @@ export class DashboardEmbeddableContainerPublicPlugin
     embeddable.registerEmbeddableFactory(factory.type, factory);
   }
 
-  public start(core: CoreStart, plugins: StartDependencies): Start {
+  public start(core: CoreStart, plugins: StartDependencies): DashboardStart {
     const { notifications } = core;
-    const { uiActions } = plugins;
+    const {
+      uiActions,
+      data: { indexPatterns },
+    } = plugins;
 
     const SavedObjectFinder = getSavedObjectFinder(core.savedObjects, core.uiSettings);
 
@@ -135,6 +147,15 @@ export class DashboardEmbeddableContainerPublicPlugin
     );
     uiActions.registerAction(changeViewAction);
     uiActions.addTriggerAction(CONTEXT_MENU_TRIGGER, changeViewAction);
+    const savedDashboardLoader = createSavedDashboardLoader({
+      savedObjectsClient: core.savedObjects.client,
+      indexPatterns,
+      chrome: core.chrome,
+      overlays: core.overlays,
+    });
+    return {
+      getSavedDashboardLoader: () => savedDashboardLoader,
+    };
   }
 
   public stop() {}
diff --git a/src/plugins/dashboard/public/saved_dashboards/index.ts b/src/plugins/dashboard/public/saved_dashboards/index.ts
new file mode 100644
index 0000000000000..9b7745bd884f7
--- /dev/null
+++ b/src/plugins/dashboard/public/saved_dashboards/index.ts
@@ -0,0 +1,21 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+export * from './saved_dashboard_references';
+export * from './saved_dashboard';
+export * from './saved_dashboards';
diff --git a/src/legacy/core_plugins/kibana/public/dashboard/saved_dashboard/saved_dashboard.ts b/src/plugins/dashboard/public/saved_dashboards/saved_dashboard.ts
similarity index 86%
rename from src/legacy/core_plugins/kibana/public/dashboard/saved_dashboard/saved_dashboard.ts
rename to src/plugins/dashboard/public/saved_dashboards/saved_dashboard.ts
index c5ac05b5a77eb..c4ebf4f07a5db 100644
--- a/src/legacy/core_plugins/kibana/public/dashboard/saved_dashboard/saved_dashboard.ts
+++ b/src/plugins/dashboard/public/saved_dashboards/saved_dashboard.ts
@@ -20,16 +20,11 @@ import {
   createSavedObjectClass,
   SavedObject,
   SavedObjectKibanaServices,
-} from '../../../../../../plugins/saved_objects/public';
+} from '../../../../plugins/saved_objects/public';
 import { extractReferences, injectReferences } from './saved_dashboard_references';
 
-import {
-  Filter,
-  ISearchSource,
-  Query,
-  RefreshInterval,
-} from '../../../../../../plugins/data/public';
-import { createDashboardEditUrl } from '..';
+import { Filter, ISearchSource, Query, RefreshInterval } from '../../../../plugins/data/public';
+import { createDashboardEditUrl } from '../dashboard_constants';
 
 export interface SavedObjectDashboard extends SavedObject {
   id?: string;
@@ -49,7 +44,9 @@ export interface SavedObjectDashboard extends SavedObject {
 }
 
 // Used only by the savedDashboards service, usually no reason to change this
-export function createSavedDashboardClass(services: SavedObjectKibanaServices) {
+export function createSavedDashboardClass(
+  services: SavedObjectKibanaServices
+): new (id: string) => SavedObjectDashboard {
   const SavedObjectClass = createSavedObjectClass(services);
   class SavedDashboard extends SavedObjectClass {
     // save these objects with the 'dashboard' type
@@ -121,5 +118,7 @@ export function createSavedDashboardClass(services: SavedObjectKibanaServices) {
     }
   }
 
-  return SavedDashboard;
+  // Unfortunately this throws a typescript error without the casting.  I think it's due to the
+  // convoluted way SavedObjects are created.
+  return (SavedDashboard as unknown) as new (id: string) => SavedObjectDashboard;
 }
diff --git a/src/legacy/core_plugins/kibana/public/dashboard/saved_dashboard/saved_dashboard_references.test.ts b/src/plugins/dashboard/public/saved_dashboards/saved_dashboard_references.test.ts
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/dashboard/saved_dashboard/saved_dashboard_references.test.ts
rename to src/plugins/dashboard/public/saved_dashboards/saved_dashboard_references.test.ts
diff --git a/src/legacy/core_plugins/kibana/public/dashboard/saved_dashboard/saved_dashboard_references.ts b/src/plugins/dashboard/public/saved_dashboards/saved_dashboard_references.ts
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/dashboard/saved_dashboard/saved_dashboard_references.ts
rename to src/plugins/dashboard/public/saved_dashboards/saved_dashboard_references.ts
diff --git a/src/legacy/core_plugins/kibana/public/dashboard/saved_dashboard/saved_dashboards.ts b/src/plugins/dashboard/public/saved_dashboards/saved_dashboards.ts
similarity index 67%
rename from src/legacy/core_plugins/kibana/public/dashboard/saved_dashboard/saved_dashboards.ts
rename to src/plugins/dashboard/public/saved_dashboards/saved_dashboards.ts
index 2ff76da9c5ca6..2a1e64fa88a02 100644
--- a/src/legacy/core_plugins/kibana/public/dashboard/saved_dashboard/saved_dashboards.ts
+++ b/src/plugins/dashboard/public/saved_dashboards/saved_dashboards.ts
@@ -17,13 +17,22 @@
  * under the License.
  */
 
-import {
-  SavedObjectLoader,
-  SavedObjectKibanaServices,
-} from '../../../../../../plugins/saved_objects/public';
+import { SavedObjectsClientContract, ChromeStart, OverlayStart } from 'kibana/public';
+import { IndexPatternsContract } from '../../../../plugins/data/public';
+import { SavedObjectLoader } from '../../../../plugins/saved_objects/public';
 import { createSavedDashboardClass } from './saved_dashboard';
 
-export function createSavedDashboardLoader(services: SavedObjectKibanaServices) {
+interface Services {
+  savedObjectsClient: SavedObjectsClientContract;
+  indexPatterns: IndexPatternsContract;
+  chrome: ChromeStart;
+  overlays: OverlayStart;
+}
+
+/**
+ * @param services
+ */
+export function createSavedDashboardLoader(services: Services) {
   const SavedDashboard = createSavedDashboardClass(services);
   return new SavedObjectLoader(SavedDashboard, services.savedObjectsClient, services.chrome);
 }

From 427848c3be63671d337659cca05b1e38dce1cd16 Mon Sep 17 00:00:00 2001
From: Joel Griffith <joel.griffith@elastic.co>
Date: Tue, 24 Mar 2020 09:07:39 -0700
Subject: [PATCH 086/179] Revert "[Reporting/New Platform Migration] Use a new
 config service on server-side (#55882)" (#61075)

This reverts commit 5755b2ac522483bd71ad0e1b31459338ff69cf93.
---
 .../__snapshots__/index.test.js.snap          | 383 ++++++++++++++++++
 x-pack/legacy/plugins/reporting/config.ts     | 182 +++++++++
 .../execute_job/decrypt_job_headers.test.ts   |  22 +-
 .../common/execute_job/decrypt_job_headers.ts |   8 +-
 .../get_conditional_headers.test.ts           | 173 ++++++--
 .../execute_job/get_conditional_headers.ts    |  20 +-
 .../execute_job/get_custom_logo.test.ts       |  14 +-
 .../common/execute_job/get_custom_logo.ts     |  11 +-
 .../common/execute_job/get_full_urls.test.ts  |  80 ++--
 .../common/execute_job/get_full_urls.ts       |  22 +-
 .../common/layouts/create_layout.ts           |   7 +-
 .../common/layouts/print_layout.ts            |   9 +-
 .../lib/screenshots/get_number_of_items.ts    |   7 +-
 .../common/lib/screenshots/observable.test.ts |  19 +-
 .../common/lib/screenshots/observable.ts      |  18 +-
 .../common/lib/screenshots/open_url.ts        |  11 +-
 .../common/lib/screenshots/types.ts           |   2 +-
 .../common/lib/screenshots/wait_for_render.ts |   4 +-
 .../screenshots/wait_for_visualizations.ts    |   7 +-
 .../export_types/csv/server/create_job.ts     |   6 +-
 .../csv/server/execute_job.test.js            | 344 +++++++++++++---
 .../export_types/csv/server/execute_job.ts    |  30 +-
 .../csv/server/lib/hit_iterator.test.ts       |   3 +-
 .../csv/server/lib/hit_iterator.ts            |   5 +-
 .../reporting/export_types/csv/types.d.ts     |   5 +-
 .../server/create_job/create_job.ts           |  19 +-
 .../server/execute_job.ts                     |  23 +-
 .../server/lib/generate_csv.ts                |  16 +-
 .../server/lib/generate_csv_search.ts         |  20 +-
 .../csv_from_savedobject/types.d.ts           |   5 +-
 .../png/server/create_job/index.ts            |   6 +-
 .../png/server/execute_job/index.test.js      |  94 +++--
 .../png/server/execute_job/index.ts           |  23 +-
 .../png/server/lib/generate_png.ts            |   7 +-
 .../printable_pdf/server/create_job/index.ts  |   6 +-
 .../server/execute_job/index.test.js          |  80 ++--
 .../printable_pdf/server/execute_job/index.ts |  25 +-
 .../printable_pdf/server/lib/generate_pdf.ts  |   9 +-
 .../export_types/printable_pdf/types.d.ts     |   2 +-
 x-pack/legacy/plugins/reporting/index.test.js |  34 ++
 x-pack/legacy/plugins/reporting/index.ts      |  16 +-
 .../plugins/reporting/log_configuration.ts    |  23 +-
 .../browsers/chromium/driver_factory/args.ts  |   7 +-
 .../browsers/chromium/driver_factory/index.ts |  19 +-
 .../server/browsers/chromium/index.ts         |   5 +-
 .../browsers/create_browser_driver_factory.ts |  22 +-
 .../browsers/download/ensure_downloaded.ts    |  13 +-
 .../server/browsers/network_policy.ts         |   9 +-
 .../reporting/server/browsers/types.d.ts      |   2 +
 .../plugins/reporting/server/config/config.js |  21 +
 .../legacy/plugins/reporting/server/core.ts   |  72 +---
 .../legacy/plugins/reporting/server/index.ts  |   2 +-
 .../legacy/plugins/reporting/server/legacy.ts |  73 +---
 .../reporting/server/lib/create_queue.ts      |  20 +-
 .../server/lib/create_worker.test.ts          |  39 +-
 .../reporting/server/lib/create_worker.ts     |  24 +-
 .../plugins/reporting/server/lib/crypto.ts    |   7 +-
 .../reporting/server/lib/enqueue_job.ts       |  31 +-
 .../lib/esqueue/helpers/index_timestamp.js    |   1 -
 .../plugins/reporting/server/lib/get_user.ts  |   4 +-
 .../plugins/reporting/server/lib/index.ts     |   9 +-
 .../reporting/server/lib/jobs_query.ts        |  10 +-
 .../reporting/server/lib/once_per_server.ts   |  43 ++
 .../__tests__/validate_encryption_key.js      |  34 ++
 .../__tests__/validate_server_host.ts         |  30 ++
 .../reporting/server/lib/validate/index.ts    |  13 +-
 .../server/lib/validate/validate_browser.ts   |   4 +-
 .../lib/validate/validate_encryption_key.ts   |  31 ++
 .../validate_max_content_length.test.js       |  16 +-
 .../validate/validate_max_content_length.ts   |  14 +-
 .../lib/validate/validate_server_host.ts      |  27 ++
 .../legacy/plugins/reporting/server/plugin.ts |  24 +-
 .../server/routes/generate_from_jobparams.ts  |   5 +-
 .../routes/generate_from_savedobject.ts       |   5 +-
 .../generate_from_savedobject_immediate.ts    |  18 +-
 .../server/routes/generation.test.ts          |  11 +-
 .../reporting/server/routes/generation.ts     |  15 +-
 .../plugins/reporting/server/routes/index.ts  |   7 +-
 .../reporting/server/routes/jobs.test.js      |  46 +--
 .../plugins/reporting/server/routes/jobs.ts   |  15 +-
 .../lib/authorized_user_pre_routing.test.js   | 131 +++---
 .../routes/lib/authorized_user_pre_routing.ts |  16 +-
 .../server/routes/lib/get_document_payload.ts |  31 +-
 .../server/routes/lib/job_response_handler.ts |  15 +-
 .../lib/reporting_feature_pre_routing.ts      |   8 +-
 .../routes/lib/route_config_factories.ts      |  28 +-
 .../plugins/reporting/server/types.d.ts       |  11 +-
 .../server/usage/get_reporting_usage.ts       |  28 +-
 .../usage/reporting_usage_collector.test.js   | 152 ++++---
 .../server/usage/reporting_usage_collector.ts |  23 +-
 .../create_mock_browserdriverfactory.ts       |  45 +-
 .../create_mock_layoutinstance.ts             |   8 +-
 .../create_mock_reportingplugin.ts            |  22 +-
 .../test_helpers/create_mock_server.ts        |  34 +-
 x-pack/legacy/plugins/reporting/types.d.ts    |  62 ++-
 x-pack/plugins/reporting/config.ts            |  10 +
 x-pack/plugins/reporting/kibana.json          |   6 +-
 .../reporting/server/config/index.test.ts     | 122 ------
 .../plugins/reporting/server/config/index.ts  |  85 ----
 .../reporting/server/config/schema.test.ts    | 103 -----
 .../plugins/reporting/server/config/schema.ts | 174 --------
 x-pack/plugins/reporting/server/index.ts      |  14 -
 x-pack/plugins/reporting/server/plugin.ts     |  38 --
 103 files changed, 2192 insertions(+), 1522 deletions(-)
 create mode 100644 x-pack/legacy/plugins/reporting/__snapshots__/index.test.js.snap
 create mode 100644 x-pack/legacy/plugins/reporting/config.ts
 create mode 100644 x-pack/legacy/plugins/reporting/index.test.js
 create mode 100644 x-pack/legacy/plugins/reporting/server/config/config.js
 create mode 100644 x-pack/legacy/plugins/reporting/server/lib/once_per_server.ts
 create mode 100644 x-pack/legacy/plugins/reporting/server/lib/validate/__tests__/validate_encryption_key.js
 create mode 100644 x-pack/legacy/plugins/reporting/server/lib/validate/__tests__/validate_server_host.ts
 create mode 100644 x-pack/legacy/plugins/reporting/server/lib/validate/validate_encryption_key.ts
 create mode 100644 x-pack/legacy/plugins/reporting/server/lib/validate/validate_server_host.ts
 create mode 100644 x-pack/plugins/reporting/config.ts
 delete mode 100644 x-pack/plugins/reporting/server/config/index.test.ts
 delete mode 100644 x-pack/plugins/reporting/server/config/index.ts
 delete mode 100644 x-pack/plugins/reporting/server/config/schema.test.ts
 delete mode 100644 x-pack/plugins/reporting/server/config/schema.ts
 delete mode 100644 x-pack/plugins/reporting/server/index.ts
 delete mode 100644 x-pack/plugins/reporting/server/plugin.ts

diff --git a/x-pack/legacy/plugins/reporting/__snapshots__/index.test.js.snap b/x-pack/legacy/plugins/reporting/__snapshots__/index.test.js.snap
new file mode 100644
index 0000000000000..757677f1d4f82
--- /dev/null
+++ b/x-pack/legacy/plugins/reporting/__snapshots__/index.test.js.snap
@@ -0,0 +1,383 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`config schema with context {"dev":false,"dist":false} produces correct config 1`] = `
+Object {
+  "capture": Object {
+    "browser": Object {
+      "autoDownload": true,
+      "chromium": Object {
+        "disableSandbox": "<platform dependent>",
+        "maxScreenshotDimension": 1950,
+        "proxy": Object {
+          "enabled": false,
+        },
+      },
+      "type": "chromium",
+    },
+    "concurrency": 4,
+    "loadDelay": 3000,
+    "maxAttempts": 1,
+    "networkPolicy": Object {
+      "enabled": true,
+      "rules": Array [
+        Object {
+          "allow": true,
+          "protocol": "http:",
+        },
+        Object {
+          "allow": true,
+          "protocol": "https:",
+        },
+        Object {
+          "allow": true,
+          "protocol": "ws:",
+        },
+        Object {
+          "allow": true,
+          "protocol": "wss:",
+        },
+        Object {
+          "allow": true,
+          "protocol": "data:",
+        },
+        Object {
+          "allow": false,
+        },
+      ],
+    },
+    "settleTime": 1000,
+    "timeout": 20000,
+    "timeouts": Object {
+      "openUrl": 30000,
+      "renderComplete": 30000,
+      "waitForElements": 30000,
+    },
+    "viewport": Object {
+      "height": 1200,
+      "width": 1950,
+    },
+    "zoom": 2,
+  },
+  "csv": Object {
+    "checkForFormulas": true,
+    "enablePanelActionDownload": true,
+    "maxSizeBytes": 10485760,
+    "scroll": Object {
+      "duration": "30s",
+      "size": 500,
+    },
+  },
+  "enabled": true,
+  "encryptionKey": "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
+  "index": ".reporting",
+  "kibanaServer": Object {},
+  "poll": Object {
+    "jobCompletionNotifier": Object {
+      "interval": 10000,
+      "intervalErrorMultiplier": 5,
+    },
+    "jobsRefresh": Object {
+      "interval": 5000,
+      "intervalErrorMultiplier": 5,
+    },
+  },
+  "queue": Object {
+    "indexInterval": "week",
+    "pollEnabled": true,
+    "pollInterval": 3000,
+    "pollIntervalErrorMultiplier": 10,
+    "timeout": 120000,
+  },
+  "roles": Object {
+    "allow": Array [
+      "reporting_user",
+    ],
+  },
+}
+`;
+
+exports[`config schema with context {"dev":false,"dist":true} produces correct config 1`] = `
+Object {
+  "capture": Object {
+    "browser": Object {
+      "autoDownload": false,
+      "chromium": Object {
+        "disableSandbox": "<platform dependent>",
+        "maxScreenshotDimension": 1950,
+        "proxy": Object {
+          "enabled": false,
+        },
+      },
+      "type": "chromium",
+    },
+    "concurrency": 4,
+    "loadDelay": 3000,
+    "maxAttempts": 3,
+    "networkPolicy": Object {
+      "enabled": true,
+      "rules": Array [
+        Object {
+          "allow": true,
+          "protocol": "http:",
+        },
+        Object {
+          "allow": true,
+          "protocol": "https:",
+        },
+        Object {
+          "allow": true,
+          "protocol": "ws:",
+        },
+        Object {
+          "allow": true,
+          "protocol": "wss:",
+        },
+        Object {
+          "allow": true,
+          "protocol": "data:",
+        },
+        Object {
+          "allow": false,
+        },
+      ],
+    },
+    "settleTime": 1000,
+    "timeout": 20000,
+    "timeouts": Object {
+      "openUrl": 30000,
+      "renderComplete": 30000,
+      "waitForElements": 30000,
+    },
+    "viewport": Object {
+      "height": 1200,
+      "width": 1950,
+    },
+    "zoom": 2,
+  },
+  "csv": Object {
+    "checkForFormulas": true,
+    "enablePanelActionDownload": true,
+    "maxSizeBytes": 10485760,
+    "scroll": Object {
+      "duration": "30s",
+      "size": 500,
+    },
+  },
+  "enabled": true,
+  "index": ".reporting",
+  "kibanaServer": Object {},
+  "poll": Object {
+    "jobCompletionNotifier": Object {
+      "interval": 10000,
+      "intervalErrorMultiplier": 5,
+    },
+    "jobsRefresh": Object {
+      "interval": 5000,
+      "intervalErrorMultiplier": 5,
+    },
+  },
+  "queue": Object {
+    "indexInterval": "week",
+    "pollEnabled": true,
+    "pollInterval": 3000,
+    "pollIntervalErrorMultiplier": 10,
+    "timeout": 120000,
+  },
+  "roles": Object {
+    "allow": Array [
+      "reporting_user",
+    ],
+  },
+}
+`;
+
+exports[`config schema with context {"dev":true,"dist":false} produces correct config 1`] = `
+Object {
+  "capture": Object {
+    "browser": Object {
+      "autoDownload": true,
+      "chromium": Object {
+        "disableSandbox": "<platform dependent>",
+        "maxScreenshotDimension": 1950,
+        "proxy": Object {
+          "enabled": false,
+        },
+      },
+      "type": "chromium",
+    },
+    "concurrency": 4,
+    "loadDelay": 3000,
+    "maxAttempts": 1,
+    "networkPolicy": Object {
+      "enabled": true,
+      "rules": Array [
+        Object {
+          "allow": true,
+          "protocol": "http:",
+        },
+        Object {
+          "allow": true,
+          "protocol": "https:",
+        },
+        Object {
+          "allow": true,
+          "protocol": "ws:",
+        },
+        Object {
+          "allow": true,
+          "protocol": "wss:",
+        },
+        Object {
+          "allow": true,
+          "protocol": "data:",
+        },
+        Object {
+          "allow": false,
+        },
+      ],
+    },
+    "settleTime": 1000,
+    "timeout": 20000,
+    "timeouts": Object {
+      "openUrl": 30000,
+      "renderComplete": 30000,
+      "waitForElements": 30000,
+    },
+    "viewport": Object {
+      "height": 1200,
+      "width": 1950,
+    },
+    "zoom": 2,
+  },
+  "csv": Object {
+    "checkForFormulas": true,
+    "enablePanelActionDownload": true,
+    "maxSizeBytes": 10485760,
+    "scroll": Object {
+      "duration": "30s",
+      "size": 500,
+    },
+  },
+  "enabled": true,
+  "encryptionKey": "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
+  "index": ".reporting",
+  "kibanaServer": Object {},
+  "poll": Object {
+    "jobCompletionNotifier": Object {
+      "interval": 10000,
+      "intervalErrorMultiplier": 5,
+    },
+    "jobsRefresh": Object {
+      "interval": 5000,
+      "intervalErrorMultiplier": 5,
+    },
+  },
+  "queue": Object {
+    "indexInterval": "week",
+    "pollEnabled": true,
+    "pollInterval": 3000,
+    "pollIntervalErrorMultiplier": 10,
+    "timeout": 120000,
+  },
+  "roles": Object {
+    "allow": Array [
+      "reporting_user",
+    ],
+  },
+}
+`;
+
+exports[`config schema with context {"dev":true,"dist":true} produces correct config 1`] = `
+Object {
+  "capture": Object {
+    "browser": Object {
+      "autoDownload": false,
+      "chromium": Object {
+        "disableSandbox": "<platform dependent>",
+        "maxScreenshotDimension": 1950,
+        "proxy": Object {
+          "enabled": false,
+        },
+      },
+      "type": "chromium",
+    },
+    "concurrency": 4,
+    "loadDelay": 3000,
+    "maxAttempts": 3,
+    "networkPolicy": Object {
+      "enabled": true,
+      "rules": Array [
+        Object {
+          "allow": true,
+          "protocol": "http:",
+        },
+        Object {
+          "allow": true,
+          "protocol": "https:",
+        },
+        Object {
+          "allow": true,
+          "protocol": "ws:",
+        },
+        Object {
+          "allow": true,
+          "protocol": "wss:",
+        },
+        Object {
+          "allow": true,
+          "protocol": "data:",
+        },
+        Object {
+          "allow": false,
+        },
+      ],
+    },
+    "settleTime": 1000,
+    "timeout": 20000,
+    "timeouts": Object {
+      "openUrl": 30000,
+      "renderComplete": 30000,
+      "waitForElements": 30000,
+    },
+    "viewport": Object {
+      "height": 1200,
+      "width": 1950,
+    },
+    "zoom": 2,
+  },
+  "csv": Object {
+    "checkForFormulas": true,
+    "enablePanelActionDownload": true,
+    "maxSizeBytes": 10485760,
+    "scroll": Object {
+      "duration": "30s",
+      "size": 500,
+    },
+  },
+  "enabled": true,
+  "index": ".reporting",
+  "kibanaServer": Object {},
+  "poll": Object {
+    "jobCompletionNotifier": Object {
+      "interval": 10000,
+      "intervalErrorMultiplier": 5,
+    },
+    "jobsRefresh": Object {
+      "interval": 5000,
+      "intervalErrorMultiplier": 5,
+    },
+  },
+  "queue": Object {
+    "indexInterval": "week",
+    "pollEnabled": true,
+    "pollInterval": 3000,
+    "pollIntervalErrorMultiplier": 10,
+    "timeout": 120000,
+  },
+  "roles": Object {
+    "allow": Array [
+      "reporting_user",
+    ],
+  },
+}
+`;
diff --git a/x-pack/legacy/plugins/reporting/config.ts b/x-pack/legacy/plugins/reporting/config.ts
new file mode 100644
index 0000000000000..211fa70301bbf
--- /dev/null
+++ b/x-pack/legacy/plugins/reporting/config.ts
@@ -0,0 +1,182 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { BROWSER_TYPE } from './common/constants';
+// @ts-ignore untyped module
+import { config as appConfig } from './server/config/config';
+import { getDefaultChromiumSandboxDisabled } from './server/browsers';
+
+export async function config(Joi: any) {
+  return Joi.object({
+    enabled: Joi.boolean().default(true),
+    kibanaServer: Joi.object({
+      protocol: Joi.string().valid(['http', 'https']),
+      hostname: Joi.string().invalid('0'),
+      port: Joi.number().integer(),
+    }).default(),
+    queue: Joi.object({
+      indexInterval: Joi.string().default('week'),
+      pollEnabled: Joi.boolean().default(true),
+      pollInterval: Joi.number()
+        .integer()
+        .default(3000),
+      pollIntervalErrorMultiplier: Joi.number()
+        .integer()
+        .default(10),
+      timeout: Joi.number()
+        .integer()
+        .default(120000),
+    }).default(),
+    capture: Joi.object({
+      timeouts: Joi.object({
+        openUrl: Joi.number()
+          .integer()
+          .default(30000),
+        waitForElements: Joi.number()
+          .integer()
+          .default(30000),
+        renderComplete: Joi.number()
+          .integer()
+          .default(30000),
+      }).default(),
+      networkPolicy: Joi.object({
+        enabled: Joi.boolean().default(true),
+        rules: Joi.array()
+          .items(
+            Joi.object({
+              allow: Joi.boolean().required(),
+              protocol: Joi.string(),
+              host: Joi.string(),
+            })
+          )
+          .default([
+            { allow: true, protocol: 'http:' },
+            { allow: true, protocol: 'https:' },
+            { allow: true, protocol: 'ws:' },
+            { allow: true, protocol: 'wss:' },
+            { allow: true, protocol: 'data:' },
+            { allow: false }, // Default action is to deny!
+          ]),
+      }).default(),
+      zoom: Joi.number()
+        .integer()
+        .default(2),
+      viewport: Joi.object({
+        width: Joi.number()
+          .integer()
+          .default(1950),
+        height: Joi.number()
+          .integer()
+          .default(1200),
+      }).default(),
+      timeout: Joi.number()
+        .integer()
+        .default(20000), // deprecated
+      loadDelay: Joi.number()
+        .integer()
+        .default(3000),
+      settleTime: Joi.number()
+        .integer()
+        .default(1000), // deprecated
+      concurrency: Joi.number()
+        .integer()
+        .default(appConfig.concurrency), // deprecated
+      browser: Joi.object({
+        type: Joi.any()
+          .valid(BROWSER_TYPE)
+          .default(BROWSER_TYPE),
+        autoDownload: Joi.boolean().when('$dist', {
+          is: true,
+          then: Joi.default(false),
+          otherwise: Joi.default(true),
+        }),
+        chromium: Joi.object({
+          inspect: Joi.boolean()
+            .when('$dev', {
+              is: false,
+              then: Joi.valid(false),
+              else: Joi.default(false),
+            })
+            .default(),
+          disableSandbox: Joi.boolean().default(await getDefaultChromiumSandboxDisabled()),
+          proxy: Joi.object({
+            enabled: Joi.boolean().default(false),
+            server: Joi.string()
+              .uri({ scheme: ['http', 'https'] })
+              .when('enabled', {
+                is: Joi.valid(false),
+                then: Joi.valid(null),
+                else: Joi.required(),
+              }),
+            bypass: Joi.array()
+              .items(Joi.string().regex(/^[^\s]+$/))
+              .when('enabled', {
+                is: Joi.valid(false),
+                then: Joi.valid(null),
+                else: Joi.default([]),
+              }),
+          }).default(),
+          maxScreenshotDimension: Joi.number()
+            .integer()
+            .default(1950),
+        }).default(),
+      }).default(),
+      maxAttempts: Joi.number()
+        .integer()
+        .greater(0)
+        .when('$dist', {
+          is: true,
+          then: Joi.default(3),
+          otherwise: Joi.default(1),
+        })
+        .default(),
+    }).default(),
+    csv: Joi.object({
+      checkForFormulas: Joi.boolean().default(true),
+      enablePanelActionDownload: Joi.boolean().default(true),
+      maxSizeBytes: Joi.number()
+        .integer()
+        .default(1024 * 1024 * 10), // bytes in a kB * kB in a mB * 10
+      scroll: Joi.object({
+        duration: Joi.string()
+          .regex(/^[0-9]+(d|h|m|s|ms|micros|nanos)$/, { name: 'DurationString' })
+          .default('30s'),
+        size: Joi.number()
+          .integer()
+          .default(500),
+      }).default(),
+    }).default(),
+    encryptionKey: Joi.when(Joi.ref('$dist'), {
+      is: true,
+      then: Joi.string(),
+      otherwise: Joi.string().default('a'.repeat(32)),
+    }),
+    roles: Joi.object({
+      allow: Joi.array()
+        .items(Joi.string())
+        .default(['reporting_user']),
+    }).default(),
+    index: Joi.string().default('.reporting'),
+    poll: Joi.object({
+      jobCompletionNotifier: Joi.object({
+        interval: Joi.number()
+          .integer()
+          .default(10000),
+        intervalErrorMultiplier: Joi.number()
+          .integer()
+          .default(5),
+      }).default(),
+      jobsRefresh: Joi.object({
+        interval: Joi.number()
+          .integer()
+          .default(5000),
+        intervalErrorMultiplier: Joi.number()
+          .integer()
+          .default(5),
+      }).default(),
+    }).default(),
+  }).default();
+}
diff --git a/x-pack/legacy/plugins/reporting/export_types/common/execute_job/decrypt_job_headers.test.ts b/x-pack/legacy/plugins/reporting/export_types/common/execute_job/decrypt_job_headers.test.ts
index 9085fb3cbc876..468caf93ec5dd 100644
--- a/x-pack/legacy/plugins/reporting/export_types/common/execute_job/decrypt_job_headers.test.ts
+++ b/x-pack/legacy/plugins/reporting/export_types/common/execute_job/decrypt_job_headers.test.ts
@@ -5,27 +5,33 @@
  */
 
 import { cryptoFactory } from '../../../server/lib/crypto';
+import { createMockServer } from '../../../test_helpers';
 import { Logger } from '../../../types';
 import { decryptJobHeaders } from './decrypt_job_headers';
 
-const encryptHeaders = async (encryptionKey: string, headers: Record<string, string>) => {
-  const crypto = cryptoFactory(encryptionKey);
+let mockServer: any;
+beforeEach(() => {
+  mockServer = createMockServer('');
+});
+
+const encryptHeaders = async (headers: Record<string, string>) => {
+  const crypto = cryptoFactory(mockServer);
   return await crypto.encrypt(headers);
 };
 
 describe('headers', () => {
   test(`fails if it can't decrypt headers`, async () => {
-    const getDecryptedHeaders = () =>
+    await expect(
       decryptJobHeaders({
-        encryptionKey: 'abcsecretsauce',
         job: {
           headers: 'Q53+9A+zf+Xe+ceR/uB/aR/Sw/8e+M+qR+WiG+8z+EY+mo+HiU/zQL+Xn',
         },
         logger: ({
           error: jest.fn(),
         } as unknown) as Logger,
-      });
-    await expect(getDecryptedHeaders()).rejects.toMatchInlineSnapshot(
+        server: mockServer,
+      })
+    ).rejects.toMatchInlineSnapshot(
       `[Error: Failed to decrypt report job data. Please ensure that xpack.reporting.encryptionKey is set and re-generate this report. Error: Invalid IV length]`
     );
   });
@@ -36,15 +42,15 @@ describe('headers', () => {
       baz: 'quix',
     };
 
-    const encryptedHeaders = await encryptHeaders('abcsecretsauce', headers);
+    const encryptedHeaders = await encryptHeaders(headers);
     const decryptedHeaders = await decryptJobHeaders({
-      encryptionKey: 'abcsecretsauce',
       job: {
         title: 'cool-job-bro',
         type: 'csv',
         headers: encryptedHeaders,
       },
       logger: {} as Logger,
+      server: mockServer,
     });
     expect(decryptedHeaders).toEqual(headers);
   });
diff --git a/x-pack/legacy/plugins/reporting/export_types/common/execute_job/decrypt_job_headers.ts b/x-pack/legacy/plugins/reporting/export_types/common/execute_job/decrypt_job_headers.ts
index 6f415d7ee5ea9..436b2c2dab1ad 100644
--- a/x-pack/legacy/plugins/reporting/export_types/common/execute_job/decrypt_job_headers.ts
+++ b/x-pack/legacy/plugins/reporting/export_types/common/execute_job/decrypt_job_headers.ts
@@ -6,7 +6,7 @@
 
 import { i18n } from '@kbn/i18n';
 import { cryptoFactory } from '../../../server/lib/crypto';
-import { CryptoFactory, Logger } from '../../../types';
+import { CryptoFactory, ServerFacade, Logger } from '../../../types';
 
 interface HasEncryptedHeaders {
   headers?: string;
@@ -17,15 +17,15 @@ export const decryptJobHeaders = async <
   JobParamsType,
   JobDocPayloadType extends HasEncryptedHeaders
 >({
-  encryptionKey,
+  server,
   job,
   logger,
 }: {
-  encryptionKey?: string;
+  server: ServerFacade;
   job: JobDocPayloadType;
   logger: Logger;
 }): Promise<Record<string, string>> => {
-  const crypto: CryptoFactory = cryptoFactory(encryptionKey);
+  const crypto: CryptoFactory = cryptoFactory(server);
   try {
     const decryptedHeaders: Record<string, string> = await crypto.decrypt(job.headers);
     return decryptedHeaders;
diff --git a/x-pack/legacy/plugins/reporting/export_types/common/execute_job/get_conditional_headers.test.ts b/x-pack/legacy/plugins/reporting/export_types/common/execute_job/get_conditional_headers.test.ts
index 09527621fa49f..eedb742ad7597 100644
--- a/x-pack/legacy/plugins/reporting/export_types/common/execute_job/get_conditional_headers.test.ts
+++ b/x-pack/legacy/plugins/reporting/export_types/common/execute_job/get_conditional_headers.test.ts
@@ -4,33 +4,27 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import sinon from 'sinon';
-import { createMockReportingCore } from '../../../test_helpers';
-import { ReportingConfig, ReportingCore } from '../../../server/types';
+import { createMockReportingCore, createMockServer } from '../../../test_helpers';
+import { ReportingCore } from '../../../server';
 import { JobDocPayload } from '../../../types';
 import { JobDocPayloadPDF } from '../../printable_pdf/types';
 import { getConditionalHeaders, getCustomLogo } from './index';
 
-let mockConfig: ReportingConfig;
 let mockReportingPlugin: ReportingCore;
-
-const getMockConfig = (mockConfigGet: sinon.SinonStub) => ({
-  get: mockConfigGet,
-  kbnConfig: { get: mockConfigGet },
-});
-
+let mockServer: any;
 beforeEach(async () => {
   mockReportingPlugin = await createMockReportingCore();
-
-  const mockConfigGet = sinon
-    .stub()
-    .withArgs('kibanaServer', 'hostname')
-    .returns('custom-hostname');
-  mockConfig = getMockConfig(mockConfigGet);
+  mockServer = createMockServer('');
 });
 
 describe('conditions', () => {
   test(`uses hostname from reporting config if set`, async () => {
+    const settings: any = {
+      'xpack.reporting.kibanaServer.hostname': 'custom-hostname',
+    };
+
+    mockServer = createMockServer({ settings });
+
     const permittedHeaders = {
       foo: 'bar',
       baz: 'quix',
@@ -39,20 +33,121 @@ describe('conditions', () => {
     const conditionalHeaders = await getConditionalHeaders({
       job: {} as JobDocPayload<any>,
       filteredHeaders: permittedHeaders,
-      config: mockConfig,
+      server: mockServer,
     });
 
     expect(conditionalHeaders.conditions.hostname).toEqual(
-      mockConfig.get('kibanaServer', 'hostname')
+      mockServer.config().get('xpack.reporting.kibanaServer.hostname')
     );
-    expect(conditionalHeaders.conditions.port).toEqual(mockConfig.get('kibanaServer', 'port'));
-    expect(conditionalHeaders.conditions.protocol).toEqual(
-      mockConfig.get('kibanaServer', 'protocol')
+  });
+
+  test(`uses hostname from server.config if reporting config not set`, async () => {
+    const permittedHeaders = {
+      foo: 'bar',
+      baz: 'quix',
+    };
+
+    const conditionalHeaders = await getConditionalHeaders({
+      job: {} as JobDocPayload<any>,
+      filteredHeaders: permittedHeaders,
+      server: mockServer,
+    });
+
+    expect(conditionalHeaders.conditions.hostname).toEqual(mockServer.config().get('server.host'));
+  });
+
+  test(`uses port from reporting config if set`, async () => {
+    const settings = {
+      'xpack.reporting.kibanaServer.port': 443,
+    };
+
+    mockServer = createMockServer({ settings });
+
+    const permittedHeaders = {
+      foo: 'bar',
+      baz: 'quix',
+    };
+
+    const conditionalHeaders = await getConditionalHeaders({
+      job: {} as JobDocPayload<any>,
+      filteredHeaders: permittedHeaders,
+      server: mockServer,
+    });
+
+    expect(conditionalHeaders.conditions.port).toEqual(
+      mockServer.config().get('xpack.reporting.kibanaServer.port')
     );
+  });
+
+  test(`uses port from server if reporting config not set`, async () => {
+    const permittedHeaders = {
+      foo: 'bar',
+      baz: 'quix',
+    };
+
+    const conditionalHeaders = await getConditionalHeaders({
+      job: {} as JobDocPayload<any>,
+      filteredHeaders: permittedHeaders,
+      server: mockServer,
+    });
+
+    expect(conditionalHeaders.conditions.port).toEqual(mockServer.config().get('server.port'));
+  });
+
+  test(`uses basePath from server config`, async () => {
+    const permittedHeaders = {
+      foo: 'bar',
+      baz: 'quix',
+    };
+
+    const conditionalHeaders = await getConditionalHeaders({
+      job: {} as JobDocPayload<any>,
+      filteredHeaders: permittedHeaders,
+      server: mockServer,
+    });
+
     expect(conditionalHeaders.conditions.basePath).toEqual(
-      mockConfig.kbnConfig.get('server', 'basePath')
+      mockServer.config().get('server.basePath')
     );
   });
+
+  test(`uses protocol from reporting config if set`, async () => {
+    const settings = {
+      'xpack.reporting.kibanaServer.protocol': 'https',
+    };
+
+    mockServer = createMockServer({ settings });
+
+    const permittedHeaders = {
+      foo: 'bar',
+      baz: 'quix',
+    };
+
+    const conditionalHeaders = await getConditionalHeaders({
+      job: {} as JobDocPayload<any>,
+      filteredHeaders: permittedHeaders,
+      server: mockServer,
+    });
+
+    expect(conditionalHeaders.conditions.protocol).toEqual(
+      mockServer.config().get('xpack.reporting.kibanaServer.protocol')
+    );
+  });
+
+  test(`uses protocol from server.info`, async () => {
+    const permittedHeaders = {
+      foo: 'bar',
+      baz: 'quix',
+    };
+
+    const conditionalHeaders = await getConditionalHeaders({
+      job: {} as JobDocPayload<any>,
+      filteredHeaders: permittedHeaders,
+      server: mockServer,
+    });
+
+    expect(conditionalHeaders.conditions.protocol).toEqual(mockServer.info.protocol);
+  });
 });
 
 test('uses basePath from job when creating saved object service', async () => {
@@ -66,14 +161,14 @@ test('uses basePath from job when creating saved object service', async () => {
   const conditionalHeaders = await getConditionalHeaders({
     job: {} as JobDocPayload<any>,
     filteredHeaders: permittedHeaders,
-    config: mockConfig,
+    server: mockServer,
   });
   const jobBasePath = '/sbp/s/marketing';
   await getCustomLogo({
     reporting: mockReportingPlugin,
     job: { basePath: jobBasePath } as JobDocPayloadPDF,
     conditionalHeaders,
-    config: mockConfig,
+    server: mockServer,
   });
 
   const getBasePath = mockGetSavedObjectsClient.mock.calls[0][0].getBasePath;
@@ -84,11 +179,6 @@ test(`uses basePath from server if job doesn't have a basePath when creating sav
   const mockGetSavedObjectsClient = jest.fn();
   mockReportingPlugin.getSavedObjectsClient = mockGetSavedObjectsClient;
 
-  const mockConfigGet = sinon.stub();
-  mockConfigGet.withArgs('kibanaServer', 'hostname').returns('localhost');
-  mockConfigGet.withArgs('server', 'basePath').returns('/sbp');
-  mockConfig = getMockConfig(mockConfigGet);
-
   const permittedHeaders = {
     foo: 'bar',
     baz: 'quix',
@@ -96,14 +186,14 @@ test(`uses basePath from server if job doesn't have a basePath when creating sav
   const conditionalHeaders = await getConditionalHeaders({
     job: {} as JobDocPayload<any>,
     filteredHeaders: permittedHeaders,
-    config: mockConfig,
+    server: mockServer,
   });
 
   await getCustomLogo({
     reporting: mockReportingPlugin,
     job: {} as JobDocPayloadPDF,
     conditionalHeaders,
-    config: mockConfig,
+    server: mockServer,
   });
 
   const getBasePath = mockGetSavedObjectsClient.mock.calls[0][0].getBasePath;
@@ -135,26 +225,19 @@ test(`uses basePath from server if job doesn't have a basePath when creating sav
 
 describe('config formatting', () => {
   test(`lowercases server.host`, async () => {
-    const mockConfigGet = sinon
-      .stub()
-      .withArgs('server', 'host')
-      .returns('COOL-HOSTNAME');
-    mockConfig = getMockConfig(mockConfigGet);
-
+    mockServer = createMockServer({ settings: { 'server.host': 'COOL-HOSTNAME' } });
     const conditionalHeaders = await getConditionalHeaders({
       job: {} as JobDocPayload<any>,
       filteredHeaders: {},
-      config: mockConfig,
+      server: mockServer,
     });
     expect(conditionalHeaders.conditions.hostname).toEqual('cool-hostname');
   });
 
-  test(`lowercases kibanaServer.hostname`, async () => {
-    const mockConfigGet = sinon
-      .stub()
-      .withArgs('kibanaServer', 'hostname')
-      .returns('GREAT-HOSTNAME');
-    mockConfig = getMockConfig(mockConfigGet);
+  test(`lowercases xpack.reporting.kibanaServer.hostname`, async () => {
+    mockServer = createMockServer({
+      settings: { 'xpack.reporting.kibanaServer.hostname': 'GREAT-HOSTNAME' },
+    });
     const conditionalHeaders = await getConditionalHeaders({
       job: {
         title: 'cool-job-bro',
@@ -166,7 +249,7 @@ describe('config formatting', () => {
         },
       },
       filteredHeaders: {},
-      config: mockConfig,
+      server: mockServer,
     });
     expect(conditionalHeaders.conditions.hostname).toEqual('great-hostname');
   });
diff --git a/x-pack/legacy/plugins/reporting/export_types/common/execute_job/get_conditional_headers.ts b/x-pack/legacy/plugins/reporting/export_types/common/execute_job/get_conditional_headers.ts
index bd7999d697ca9..975060a8052f0 100644
--- a/x-pack/legacy/plugins/reporting/export_types/common/execute_job/get_conditional_headers.ts
+++ b/x-pack/legacy/plugins/reporting/export_types/common/execute_job/get_conditional_headers.ts
@@ -3,31 +3,29 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-
-import { ReportingConfig } from '../../../server/types';
-import { ConditionalHeaders } from '../../../types';
+import { ConditionalHeaders, ServerFacade } from '../../../types';
 
 export const getConditionalHeaders = <JobDocPayloadType>({
-  config,
+  server,
   job,
   filteredHeaders,
 }: {
-  config: ReportingConfig;
+  server: ServerFacade;
   job: JobDocPayloadType;
   filteredHeaders: Record<string, string>;
 }) => {
-  const { kbnConfig } = config;
+  const config = server.config();
   const [hostname, port, basePath, protocol] = [
-    config.get('kibanaServer', 'hostname'),
-    config.get('kibanaServer', 'port'),
-    kbnConfig.get('server', 'basePath'),
-    config.get('kibanaServer', 'protocol'),
+    config.get('xpack.reporting.kibanaServer.hostname') || config.get('server.host'),
+    config.get('xpack.reporting.kibanaServer.port') || config.get('server.port'),
+    config.get('server.basePath'),
+    config.get('xpack.reporting.kibanaServer.protocol') || server.info.protocol,
   ] as [string, number, string, string];
 
   const conditionalHeaders: ConditionalHeaders = {
     headers: filteredHeaders,
     conditions: {
-      hostname: hostname ? hostname.toLowerCase() : hostname,
+      hostname: hostname.toLowerCase(),
       port,
       basePath,
       protocol,
diff --git a/x-pack/legacy/plugins/reporting/export_types/common/execute_job/get_custom_logo.test.ts b/x-pack/legacy/plugins/reporting/export_types/common/execute_job/get_custom_logo.test.ts
index 7c4c889e3e14f..fa53f474dfba7 100644
--- a/x-pack/legacy/plugins/reporting/export_types/common/execute_job/get_custom_logo.test.ts
+++ b/x-pack/legacy/plugins/reporting/export_types/common/execute_job/get_custom_logo.test.ts
@@ -5,18 +5,16 @@
  */
 
 import { ReportingCore } from '../../../server';
-import { createMockReportingCore } from '../../../test_helpers';
+import { createMockReportingCore, createMockServer } from '../../../test_helpers';
+import { ServerFacade } from '../../../types';
 import { JobDocPayloadPDF } from '../../printable_pdf/types';
 import { getConditionalHeaders, getCustomLogo } from './index';
 
-const mockConfigGet = jest.fn().mockImplementation((key: string) => {
-  return 'localhost';
-});
-const mockConfig = { get: mockConfigGet, kbnConfig: { get: mockConfigGet } };
-
 let mockReportingPlugin: ReportingCore;
+let mockServer: ServerFacade;
 beforeEach(async () => {
   mockReportingPlugin = await createMockReportingCore();
+  mockServer = createMockServer('');
 });
 
 test(`gets logo from uiSettings`, async () => {
@@ -39,14 +37,14 @@ test(`gets logo from uiSettings`, async () => {
   const conditionalHeaders = await getConditionalHeaders({
     job: {} as JobDocPayloadPDF,
     filteredHeaders: permittedHeaders,
-    config: mockConfig,
+    server: mockServer,
   });
 
   const { logo } = await getCustomLogo({
     reporting: mockReportingPlugin,
-    config: mockConfig,
     job: {} as JobDocPayloadPDF,
     conditionalHeaders,
+    server: mockServer,
   });
 
   expect(mockGet).toBeCalledWith('xpackReporting:customPdfLogo');
diff --git a/x-pack/legacy/plugins/reporting/export_types/common/execute_job/get_custom_logo.ts b/x-pack/legacy/plugins/reporting/export_types/common/execute_job/get_custom_logo.ts
index a13f992e7867c..7af5edab41ab7 100644
--- a/x-pack/legacy/plugins/reporting/export_types/common/execute_job/get_custom_logo.ts
+++ b/x-pack/legacy/plugins/reporting/export_types/common/execute_job/get_custom_logo.ts
@@ -5,22 +5,23 @@
  */
 
 import { UI_SETTINGS_CUSTOM_PDF_LOGO } from '../../../common/constants';
-import { ReportingConfig, ReportingCore } from '../../../server/types';
-import { ConditionalHeaders } from '../../../types';
+import { ReportingCore } from '../../../server';
+import { ConditionalHeaders, ServerFacade } from '../../../types';
 import { JobDocPayloadPDF } from '../../printable_pdf/types'; // Logo is PDF only
 
 export const getCustomLogo = async ({
   reporting,
-  config,
+  server,
   job,
   conditionalHeaders,
 }: {
   reporting: ReportingCore;
-  config: ReportingConfig;
+  server: ServerFacade;
   job: JobDocPayloadPDF;
   conditionalHeaders: ConditionalHeaders;
 }) => {
-  const serverBasePath: string = config.kbnConfig.get('server', 'basePath');
+  const serverBasePath: string = server.config().get('server.basePath');
+
   const fakeRequest: any = {
     headers: conditionalHeaders.headers,
     // This is used by the spaces SavedObjectClientWrapper to determine the existing space.
diff --git a/x-pack/legacy/plugins/reporting/export_types/common/execute_job/get_full_urls.test.ts b/x-pack/legacy/plugins/reporting/export_types/common/execute_job/get_full_urls.test.ts
index 5f55617724ff6..27e772195f726 100644
--- a/x-pack/legacy/plugins/reporting/export_types/common/execute_job/get_full_urls.test.ts
+++ b/x-pack/legacy/plugins/reporting/export_types/common/execute_job/get_full_urls.test.ts
@@ -4,41 +4,29 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { ReportingConfig } from '../../../server';
+import { createMockServer } from '../../../test_helpers';
+import { ServerFacade } from '../../../types';
 import { JobDocPayloadPNG } from '../../png/types';
 import { JobDocPayloadPDF } from '../../printable_pdf/types';
 import { getFullUrls } from './get_full_urls';
 
 interface FullUrlsOpts {
   job: JobDocPayloadPNG & JobDocPayloadPDF;
-  config: ReportingConfig;
+  server: ServerFacade;
+  conditionalHeaders: any;
 }
 
-let mockConfig: ReportingConfig;
-const getMockConfig = (mockConfigGet: jest.Mock<any, any>) => {
-  return {
-    get: mockConfigGet,
-    kbnConfig: { get: mockConfigGet },
-  };
-};
-
+let mockServer: any;
 beforeEach(() => {
-  const reportingConfig: Record<string, any> = {
-    'kibanaServer.hostname': 'localhost',
-    'kibanaServer.port': 5601,
-    'kibanaServer.protocol': 'http',
-    'server.basePath': '/sbp',
-  };
-  const mockConfigGet = jest.fn().mockImplementation((...keys: string[]) => {
-    return reportingConfig[keys.join('.') as string];
-  });
-  mockConfig = getMockConfig(mockConfigGet);
+  mockServer = createMockServer('');
 });
 
-const getMockJob = (base: object) => base as JobDocPayloadPNG & JobDocPayloadPDF;
-
 test(`fails if no URL is passed`, async () => {
-  const fn = () => getFullUrls({ job: getMockJob({}), config: mockConfig } as FullUrlsOpts);
+  const fn = () =>
+    getFullUrls({
+      job: {},
+      server: mockServer,
+    } as FullUrlsOpts);
   expect(fn).toThrowErrorMatchingInlineSnapshot(
     `"No valid URL fields found in Job Params! Expected \`job.relativeUrl: string\` or \`job.relativeUrls: string[]\`"`
   );
@@ -49,8 +37,8 @@ test(`fails if URLs are file-protocols for PNGs`, async () => {
   const relativeUrl = 'file://etc/passwd/#/something';
   const fn = () =>
     getFullUrls({
-      job: getMockJob({ relativeUrl, forceNow }),
-      config: mockConfig,
+      job: { relativeUrl, forceNow },
+      server: mockServer,
     } as FullUrlsOpts);
   expect(fn).toThrowErrorMatchingInlineSnapshot(
     `"Found invalid URL(s), all URLs must be relative: file://etc/passwd/#/something"`
@@ -63,8 +51,8 @@ test(`fails if URLs are absolute for PNGs`, async () => {
     'http://169.254.169.254/latest/meta-data/iam/security-credentials/profileName/#/something';
   const fn = () =>
     getFullUrls({
-      job: getMockJob({ relativeUrl, forceNow }),
-      config: mockConfig,
+      job: { relativeUrl, forceNow },
+      server: mockServer,
     } as FullUrlsOpts);
   expect(fn).toThrowErrorMatchingInlineSnapshot(
     `"Found invalid URL(s), all URLs must be relative: http://169.254.169.254/latest/meta-data/iam/security-credentials/profileName/#/something"`
@@ -76,11 +64,11 @@ test(`fails if URLs are file-protocols for PDF`, async () => {
   const relativeUrl = 'file://etc/passwd/#/something';
   const fn = () =>
     getFullUrls({
-      job: getMockJob({
+      job: {
         relativeUrls: [relativeUrl],
         forceNow,
-      }),
-      config: mockConfig,
+      },
+      server: mockServer,
     } as FullUrlsOpts);
   expect(fn).toThrowErrorMatchingInlineSnapshot(
     `"Found invalid URL(s), all URLs must be relative: file://etc/passwd/#/something"`
@@ -93,11 +81,11 @@ test(`fails if URLs are absolute for PDF`, async () => {
     'http://169.254.169.254/latest/meta-data/iam/security-credentials/profileName/#/something';
   const fn = () =>
     getFullUrls({
-      job: getMockJob({
+      job: {
         relativeUrls: [relativeUrl],
         forceNow,
-      }),
-      config: mockConfig,
+      },
+      server: mockServer,
     } as FullUrlsOpts);
   expect(fn).toThrowErrorMatchingInlineSnapshot(
     `"Found invalid URL(s), all URLs must be relative: http://169.254.169.254/latest/meta-data/iam/security-credentials/profileName/#/something"`
@@ -114,8 +102,8 @@ test(`fails if any URLs are absolute or file's for PDF`, async () => {
 
   const fn = () =>
     getFullUrls({
-      job: getMockJob({ relativeUrls, forceNow }),
-      config: mockConfig,
+      job: { relativeUrls, forceNow },
+      server: mockServer,
     } as FullUrlsOpts);
   expect(fn).toThrowErrorMatchingInlineSnapshot(
     `"Found invalid URL(s), all URLs must be relative: http://169.254.169.254/latest/meta-data/iam/security-credentials/profileName/#/something file://etc/passwd/#/something"`
@@ -125,8 +113,8 @@ test(`fails if any URLs are absolute or file's for PDF`, async () => {
 test(`fails if URL does not route to a visualization`, async () => {
   const fn = () =>
     getFullUrls({
-      job: getMockJob({ relativeUrl: '/app/phoney' }),
-      config: mockConfig,
+      job: { relativeUrl: '/app/phoney' },
+      server: mockServer,
     } as FullUrlsOpts);
   expect(fn).toThrowErrorMatchingInlineSnapshot(
     `"No valid hash in the URL! A hash is expected for the application to route to the intended visualization."`
@@ -136,8 +124,8 @@ test(`fails if URL does not route to a visualization`, async () => {
 test(`adds forceNow to hash's query, if it exists`, async () => {
   const forceNow = '2000-01-01T00:00:00.000Z';
   const urls = await getFullUrls({
-    job: getMockJob({ relativeUrl: '/app/kibana#/something', forceNow }),
-    config: mockConfig,
+    job: { relativeUrl: '/app/kibana#/something', forceNow },
+    server: mockServer,
   } as FullUrlsOpts);
 
   expect(urls[0]).toEqual(
@@ -149,8 +137,8 @@ test(`appends forceNow to hash's query, if it exists`, async () => {
   const forceNow = '2000-01-01T00:00:00.000Z';
 
   const urls = await getFullUrls({
-    job: getMockJob({ relativeUrl: '/app/kibana#/something?_g=something', forceNow }),
-    config: mockConfig,
+    job: { relativeUrl: '/app/kibana#/something?_g=something', forceNow },
+    server: mockServer,
   } as FullUrlsOpts);
 
   expect(urls[0]).toEqual(
@@ -160,8 +148,8 @@ test(`appends forceNow to hash's query, if it exists`, async () => {
 
 test(`doesn't append forceNow query to url, if it doesn't exists`, async () => {
   const urls = await getFullUrls({
-    job: getMockJob({ relativeUrl: '/app/kibana#/something' }),
-    config: mockConfig,
+    job: { relativeUrl: '/app/kibana#/something' },
+    server: mockServer,
   } as FullUrlsOpts);
 
   expect(urls[0]).toEqual('http://localhost:5601/sbp/app/kibana#/something');
@@ -170,7 +158,7 @@ test(`doesn't append forceNow query to url, if it doesn't exists`, async () => {
 test(`adds forceNow to each of multiple urls`, async () => {
   const forceNow = '2000-01-01T00:00:00.000Z';
   const urls = await getFullUrls({
-    job: getMockJob({
+    job: {
       relativeUrls: [
         '/app/kibana#/something_aaa',
         '/app/kibana#/something_bbb',
@@ -178,8 +166,8 @@ test(`adds forceNow to each of multiple urls`, async () => {
         '/app/kibana#/something_ddd',
       ],
       forceNow,
-    }),
-    config: mockConfig,
+    },
+    server: mockServer,
   } as FullUrlsOpts);
 
   expect(urls).toEqual([
diff --git a/x-pack/legacy/plugins/reporting/export_types/common/execute_job/get_full_urls.ts b/x-pack/legacy/plugins/reporting/export_types/common/execute_job/get_full_urls.ts
index c4b6f31019fdf..ca64d8632dbfe 100644
--- a/x-pack/legacy/plugins/reporting/export_types/common/execute_job/get_full_urls.ts
+++ b/x-pack/legacy/plugins/reporting/export_types/common/execute_job/get_full_urls.ts
@@ -12,7 +12,7 @@ import {
 } from 'url';
 import { getAbsoluteUrlFactory } from '../../../common/get_absolute_url';
 import { validateUrls } from '../../../common/validate_urls';
-import { ReportingConfig } from '../../../server/types';
+import { ServerFacade } from '../../../types';
 import { JobDocPayloadPNG } from '../../png/types';
 import { JobDocPayloadPDF } from '../../printable_pdf/types';
 
@@ -24,23 +24,19 @@ function isPdfJob(job: JobDocPayloadPNG | JobDocPayloadPDF): job is JobDocPayloa
 }
 
 export function getFullUrls<JobDocPayloadType>({
-  config,
+  server,
   job,
 }: {
-  config: ReportingConfig;
+  server: ServerFacade;
   job: JobDocPayloadPDF | JobDocPayloadPNG;
 }) {
-  const [basePath, protocol, hostname, port] = [
-    config.kbnConfig.get('server', 'basePath'),
-    config.get('kibanaServer', 'protocol'),
-    config.get('kibanaServer', 'hostname'),
-    config.get('kibanaServer', 'port'),
-  ] as string[];
+  const config = server.config();
+
   const getAbsoluteUrl = getAbsoluteUrlFactory({
-    defaultBasePath: basePath,
-    protocol,
-    hostname,
-    port,
+    defaultBasePath: config.get('server.basePath'),
+    protocol: config.get('xpack.reporting.kibanaServer.protocol') || server.info.protocol,
+    hostname: config.get('xpack.reporting.kibanaServer.hostname') || config.get('server.host'),
+    port: config.get('xpack.reporting.kibanaServer.port') || config.get('server.port'),
   });
 
   // PDF and PNG job params put in the url differently
diff --git a/x-pack/legacy/plugins/reporting/export_types/common/layouts/create_layout.ts b/x-pack/legacy/plugins/reporting/export_types/common/layouts/create_layout.ts
index 07fceb603e451..0cb83352d4606 100644
--- a/x-pack/legacy/plugins/reporting/export_types/common/layouts/create_layout.ts
+++ b/x-pack/legacy/plugins/reporting/export_types/common/layouts/create_layout.ts
@@ -3,18 +3,17 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-
-import { CaptureConfig } from '../../../server/types';
+import { ServerFacade } from '../../../types';
 import { LayoutTypes } from '../constants';
 import { Layout, LayoutParams } from './layout';
 import { PreserveLayout } from './preserve_layout';
 import { PrintLayout } from './print_layout';
 
-export function createLayout(captureConfig: CaptureConfig, layoutParams?: LayoutParams): Layout {
+export function createLayout(server: ServerFacade, layoutParams?: LayoutParams): Layout {
   if (layoutParams && layoutParams.id === LayoutTypes.PRESERVE_LAYOUT) {
     return new PreserveLayout(layoutParams.dimensions);
   }
 
   // this is the default because some jobs won't have anything specified
-  return new PrintLayout(captureConfig);
+  return new PrintLayout(server);
 }
diff --git a/x-pack/legacy/plugins/reporting/export_types/common/layouts/print_layout.ts b/x-pack/legacy/plugins/reporting/export_types/common/layouts/print_layout.ts
index 98d8dc2983653..6007c2960057a 100644
--- a/x-pack/legacy/plugins/reporting/export_types/common/layouts/print_layout.ts
+++ b/x-pack/legacy/plugins/reporting/export_types/common/layouts/print_layout.ts
@@ -3,12 +3,11 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-
 import path from 'path';
 import { EvaluateFn, SerializableOrJSHandle } from 'puppeteer';
-import { HeadlessChromiumDriver } from '../../../server/browsers';
 import { LevelLogger } from '../../../server/lib';
-import { ReportingConfigType } from '../../../server/core';
+import { HeadlessChromiumDriver } from '../../../server/browsers';
+import { ServerFacade } from '../../../types';
 import { LayoutTypes } from '../constants';
 import { getDefaultLayoutSelectors, Layout, LayoutSelectorDictionary, Size } from './layout';
 import { CaptureConfig } from './types';
@@ -21,9 +20,9 @@ export class PrintLayout extends Layout {
   public readonly groupCount = 2;
   private captureConfig: CaptureConfig;
 
-  constructor(captureConfig: ReportingConfigType['capture']) {
+  constructor(server: ServerFacade) {
     super(LayoutTypes.PRINT);
-    this.captureConfig = captureConfig;
+    this.captureConfig = server.config().get('xpack.reporting.capture');
   }
 
   public getCssOverridesPath() {
diff --git a/x-pack/legacy/plugins/reporting/export_types/common/lib/screenshots/get_number_of_items.ts b/x-pack/legacy/plugins/reporting/export_types/common/lib/screenshots/get_number_of_items.ts
index 57d025890d3e2..16eb433e8a75e 100644
--- a/x-pack/legacy/plugins/reporting/export_types/common/lib/screenshots/get_number_of_items.ts
+++ b/x-pack/legacy/plugins/reporting/export_types/common/lib/screenshots/get_number_of_items.ts
@@ -7,16 +7,17 @@
 import { i18n } from '@kbn/i18n';
 import { HeadlessChromiumDriver as HeadlessBrowser } from '../../../../server/browsers';
 import { LevelLogger } from '../../../../server/lib';
-import { CaptureConfig } from '../../../../server/types';
+import { ServerFacade } from '../../../../types';
 import { LayoutInstance } from '../../layouts/layout';
 import { CONTEXT_GETNUMBEROFITEMS, CONTEXT_READMETADATA } from './constants';
 
 export const getNumberOfItems = async (
-  captureConfig: CaptureConfig,
+  server: ServerFacade,
   browser: HeadlessBrowser,
   layout: LayoutInstance,
   logger: LevelLogger
 ): Promise<number> => {
+  const config = server.config();
   const { renderComplete: renderCompleteSelector, itemsCountAttribute } = layout.selectors;
   let itemsCount: number;
 
@@ -32,7 +33,7 @@ export const getNumberOfItems = async (
     // we have to use this hint to wait for all of them
     await browser.waitForSelector(
       `${renderCompleteSelector},[${itemsCountAttribute}]`,
-      { timeout: captureConfig.timeouts.waitForElements },
+      { timeout: config.get('xpack.reporting.capture.timeouts.waitForElements') },
       { context: CONTEXT_READMETADATA },
       logger
     );
diff --git a/x-pack/legacy/plugins/reporting/export_types/common/lib/screenshots/observable.test.ts b/x-pack/legacy/plugins/reporting/export_types/common/lib/screenshots/observable.test.ts
index 75ac3dca4ffa0..13d07bcdd6baf 100644
--- a/x-pack/legacy/plugins/reporting/export_types/common/lib/screenshots/observable.test.ts
+++ b/x-pack/legacy/plugins/reporting/export_types/common/lib/screenshots/observable.test.ts
@@ -19,9 +19,12 @@ import * as Rx from 'rxjs';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
 import { loggingServiceMock } from '../../../../../../../../src/core/server/mocks';
 import { LevelLogger } from '../../../../server/lib';
-import { createMockBrowserDriverFactory, createMockLayoutInstance } from '../../../../test_helpers';
+import {
+  createMockBrowserDriverFactory,
+  createMockLayoutInstance,
+  createMockServer,
+} from '../../../../test_helpers';
 import { ConditionalHeaders, HeadlessChromiumDriver } from '../../../../types';
-import { CaptureConfig } from '../../../../server/types';
 import { screenshotsObservableFactory } from './observable';
 import { ElementsPositionAndAttribute } from './types';
 
@@ -31,8 +34,8 @@ import { ElementsPositionAndAttribute } from './types';
 const mockLogger = jest.fn(loggingServiceMock.create);
 const logger = new LevelLogger(mockLogger());
 
-const mockConfig = { timeouts: { openUrl: 13 } } as CaptureConfig;
-const mockLayout = createMockLayoutInstance(mockConfig);
+const __LEGACY = createMockServer({ settings: { 'xpack.reporting.capture': { loadDelay: 13 } } });
+const mockLayout = createMockLayoutInstance(__LEGACY);
 
 /*
  * Tests
@@ -45,7 +48,7 @@ describe('Screenshot Observable Pipeline', () => {
   });
 
   it('pipelines a single url into screenshot and timeRange', async () => {
-    const getScreenshots$ = screenshotsObservableFactory(mockConfig, mockBrowserDriverFactory);
+    const getScreenshots$ = screenshotsObservableFactory(__LEGACY, mockBrowserDriverFactory);
     const result = await getScreenshots$({
       logger,
       urls: ['/welcome/home/start/index.htm'],
@@ -83,7 +86,7 @@ describe('Screenshot Observable Pipeline', () => {
     });
 
     // test
-    const getScreenshots$ = screenshotsObservableFactory(mockConfig, mockBrowserDriverFactory);
+    const getScreenshots$ = screenshotsObservableFactory(__LEGACY, mockBrowserDriverFactory);
     const result = await getScreenshots$({
       logger,
       urls: ['/welcome/home/start/index2.htm', '/welcome/home/start/index.php3?page=./home.php'],
@@ -133,7 +136,7 @@ describe('Screenshot Observable Pipeline', () => {
       });
 
       // test
-      const getScreenshots$ = screenshotsObservableFactory(mockConfig, mockBrowserDriverFactory);
+      const getScreenshots$ = screenshotsObservableFactory(__LEGACY, mockBrowserDriverFactory);
       const getScreenshot = async () => {
         return await getScreenshots$({
           logger,
@@ -194,7 +197,7 @@ describe('Screenshot Observable Pipeline', () => {
       });
 
       // test
-      const getScreenshots$ = screenshotsObservableFactory(mockConfig, mockBrowserDriverFactory);
+      const getScreenshots$ = screenshotsObservableFactory(__LEGACY, mockBrowserDriverFactory);
       const getScreenshot = async () => {
         return await getScreenshots$({
           logger,
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 53a11c18abd79..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
@@ -6,22 +6,24 @@
 
 import * as Rx from 'rxjs';
 import { catchError, concatMap, first, mergeMap, take, takeUntil, toArray } from 'rxjs/operators';
-import { CaptureConfig } from '../../../../server/types';
-import { HeadlessChromiumDriverFactory } from '../../../../types';
+import { CaptureConfig, HeadlessChromiumDriverFactory, ServerFacade } from '../../../../types';
 import { getElementPositionAndAttributes } from './get_element_position_data';
 import { getNumberOfItems } from './get_number_of_items';
 import { getScreenshots } from './get_screenshots';
 import { getTimeRange } from './get_time_range';
-import { injectCustomCss } from './inject_css';
 import { openUrl } from './open_url';
 import { ScreenSetupData, ScreenshotObservableOpts, ScreenshotResults } from './types';
 import { waitForRenderComplete } from './wait_for_render';
 import { waitForVisualizations } from './wait_for_visualizations';
+import { injectCustomCss } from './inject_css';
 
 export function screenshotsObservableFactory(
-  captureConfig: CaptureConfig,
+  server: ServerFacade,
   browserDriverFactory: HeadlessChromiumDriverFactory
 ) {
+  const config = server.config();
+  const captureConfig: CaptureConfig = config.get('xpack.reporting.capture');
+
   return function screenshotsObservable({
     logger,
     urls,
@@ -39,13 +41,13 @@ export function screenshotsObservableFactory(
           mergeMap(({ driver, exit$ }) => {
             const setup$: Rx.Observable<ScreenSetupData> = Rx.of(1).pipe(
               takeUntil(exit$),
-              mergeMap(() => openUrl(captureConfig, driver, url, conditionalHeaders, logger)),
-              mergeMap(() => getNumberOfItems(captureConfig, driver, layout, logger)),
+              mergeMap(() => openUrl(server, driver, url, conditionalHeaders, logger)),
+              mergeMap(() => getNumberOfItems(server, driver, layout, logger)),
               mergeMap(async itemsCount => {
                 const viewport = layout.getViewport(itemsCount);
                 await Promise.all([
                   driver.setViewport(viewport, logger),
-                  waitForVisualizations(captureConfig, driver, itemsCount, layout, logger),
+                  waitForVisualizations(server, driver, itemsCount, layout, logger),
                 ]);
               }),
               mergeMap(async () => {
@@ -58,7 +60,7 @@ export function screenshotsObservableFactory(
                   await layout.positionElements(driver, logger);
                 }
 
-                await waitForRenderComplete(captureConfig, driver, layout, logger);
+                await waitForRenderComplete(driver, layout, captureConfig, logger);
               }),
               mergeMap(async () => {
                 return await Promise.all([
diff --git a/x-pack/legacy/plugins/reporting/export_types/common/lib/screenshots/open_url.ts b/x-pack/legacy/plugins/reporting/export_types/common/lib/screenshots/open_url.ts
index a484dfb243563..fbae1f91a7a6a 100644
--- a/x-pack/legacy/plugins/reporting/export_types/common/lib/screenshots/open_url.ts
+++ b/x-pack/legacy/plugins/reporting/export_types/common/lib/screenshots/open_url.ts
@@ -5,26 +5,27 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { HeadlessChromiumDriver as HeadlessBrowser } from '../../../../server/browsers';
+import { ConditionalHeaders, ServerFacade } from '../../../../types';
 import { LevelLogger } from '../../../../server/lib';
-import { CaptureConfig } from '../../../../server/types';
-import { ConditionalHeaders } from '../../../../types';
+import { HeadlessChromiumDriver as HeadlessBrowser } from '../../../../server/browsers';
 import { PAGELOAD_SELECTOR } from '../../constants';
 
 export const openUrl = async (
-  captureConfig: CaptureConfig,
+  server: ServerFacade,
   browser: HeadlessBrowser,
   url: string,
   conditionalHeaders: ConditionalHeaders,
   logger: LevelLogger
 ): Promise<void> => {
+  const config = server.config();
+
   try {
     await browser.open(
       url,
       {
         conditionalHeaders,
         waitForSelector: PAGELOAD_SELECTOR,
-        timeout: captureConfig.timeouts.openUrl,
+        timeout: config.get('xpack.reporting.capture.timeouts.openUrl'),
       },
       logger
     );
diff --git a/x-pack/legacy/plugins/reporting/export_types/common/lib/screenshots/types.ts b/x-pack/legacy/plugins/reporting/export_types/common/lib/screenshots/types.ts
index 76613c2d631d6..ab81a952f345c 100644
--- a/x-pack/legacy/plugins/reporting/export_types/common/lib/screenshots/types.ts
+++ b/x-pack/legacy/plugins/reporting/export_types/common/lib/screenshots/types.ts
@@ -4,8 +4,8 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+import { ElementPosition, ConditionalHeaders } from '../../../../types';
 import { LevelLogger } from '../../../../server/lib';
-import { ConditionalHeaders, ElementPosition } from '../../../../types';
 import { LayoutInstance } from '../../layouts/layout';
 
 export interface ScreenshotObservableOpts {
diff --git a/x-pack/legacy/plugins/reporting/export_types/common/lib/screenshots/wait_for_render.ts b/x-pack/legacy/plugins/reporting/export_types/common/lib/screenshots/wait_for_render.ts
index 069896c8d9e90..2f6dc2829dfd8 100644
--- a/x-pack/legacy/plugins/reporting/export_types/common/lib/screenshots/wait_for_render.ts
+++ b/x-pack/legacy/plugins/reporting/export_types/common/lib/screenshots/wait_for_render.ts
@@ -5,16 +5,16 @@
  */
 
 import { i18n } from '@kbn/i18n';
+import { CaptureConfig } from '../../../../types';
 import { HeadlessChromiumDriver as HeadlessBrowser } from '../../../../server/browsers';
 import { LevelLogger } from '../../../../server/lib';
-import { CaptureConfig } from '../../../../server/types';
 import { LayoutInstance } from '../../layouts/layout';
 import { CONTEXT_WAITFORRENDER } from './constants';
 
 export const waitForRenderComplete = async (
-  captureConfig: CaptureConfig,
   browser: HeadlessBrowser,
   layout: LayoutInstance,
+  captureConfig: CaptureConfig,
   logger: LevelLogger
 ) => {
   logger.debug(
diff --git a/x-pack/legacy/plugins/reporting/export_types/common/lib/screenshots/wait_for_visualizations.ts b/x-pack/legacy/plugins/reporting/export_types/common/lib/screenshots/wait_for_visualizations.ts
index 7960e1552e559..93ad40026dff8 100644
--- a/x-pack/legacy/plugins/reporting/export_types/common/lib/screenshots/wait_for_visualizations.ts
+++ b/x-pack/legacy/plugins/reporting/export_types/common/lib/screenshots/wait_for_visualizations.ts
@@ -5,9 +5,9 @@
  */
 
 import { i18n } from '@kbn/i18n';
+import { ServerFacade } from '../../../../types';
 import { HeadlessChromiumDriver as HeadlessBrowser } from '../../../../server/browsers';
 import { LevelLogger } from '../../../../server/lib';
-import { CaptureConfig } from '../../../../server/types';
 import { LayoutInstance } from '../../layouts/layout';
 import { CONTEXT_WAITFORELEMENTSTOBEINDOM } from './constants';
 
@@ -23,12 +23,13 @@ const getCompletedItemsCount = ({ renderCompleteSelector }: SelectorArgs) => {
  * 3. Wait for the render complete event to be fired once for each item
  */
 export const waitForVisualizations = async (
-  captureConfig: CaptureConfig,
+  server: ServerFacade,
   browser: HeadlessBrowser,
   itemsCount: number,
   layout: LayoutInstance,
   logger: LevelLogger
 ): Promise<void> => {
+  const config = server.config();
   const { renderComplete: renderCompleteSelector } = layout.selectors;
 
   logger.debug(
@@ -44,7 +45,7 @@ export const waitForVisualizations = async (
         fn: getCompletedItemsCount,
         args: [{ renderCompleteSelector }],
         toEqual: itemsCount,
-        timeout: captureConfig.timeouts.renderComplete,
+        timeout: config.get('xpack.reporting.capture.timeouts.renderComplete'),
       },
       { context: CONTEXT_WAITFORELEMENTSTOBEINDOM },
       logger
diff --git a/x-pack/legacy/plugins/reporting/export_types/csv/server/create_job.ts b/x-pack/legacy/plugins/reporting/export_types/csv/server/create_job.ts
index b87403ac74f89..7ea67277015ab 100644
--- a/x-pack/legacy/plugins/reporting/export_types/csv/server/create_job.ts
+++ b/x-pack/legacy/plugins/reporting/export_types/csv/server/create_job.ts
@@ -11,14 +11,14 @@ import {
   CreateJobFactory,
   ESQueueCreateJobFn,
   RequestFacade,
+  ServerFacade,
 } from '../../../types';
 import { JobParamsDiscoverCsv } from '../types';
 
 export const createJobFactory: CreateJobFactory<ESQueueCreateJobFn<
   JobParamsDiscoverCsv
->> = async function createJobFactoryFn(reporting: ReportingCore) {
-  const config = await reporting.getConfig();
-  const crypto = cryptoFactory(config.get('encryptionKey'));
+>> = function createJobFactoryFn(reporting: ReportingCore, server: ServerFacade) {
+  const crypto = cryptoFactory(server);
 
   return async function createJob(
     jobParams: JobParamsDiscoverCsv,
diff --git a/x-pack/legacy/plugins/reporting/export_types/csv/server/execute_job.test.js b/x-pack/legacy/plugins/reporting/export_types/csv/server/execute_job.test.js
index 7dfa705901fbe..f12916b734dbf 100644
--- a/x-pack/legacy/plugins/reporting/export_types/csv/server/execute_job.test.js
+++ b/x-pack/legacy/plugins/reporting/export_types/csv/server/execute_job.test.js
@@ -36,12 +36,11 @@ describe('CSV Execute Job', function() {
   let defaultElasticsearchResponse;
   let encryptedHeaders;
 
-  let clusterStub;
-  let configGetStub;
-  let mockReportingConfig;
+  let cancellationToken;
   let mockReportingPlugin;
+  let mockServer;
+  let clusterStub;
   let callAsCurrentUserStub;
-  let cancellationToken;
 
   const mockElasticsearch = {
     dataClient: {
@@ -59,17 +58,7 @@ describe('CSV Execute Job', function() {
 
   beforeEach(async function() {
     mockReportingPlugin = await createMockReportingCore();
-
-    configGetStub = sinon.stub();
-    configGetStub.withArgs('encryptionKey').returns(encryptionKey);
-    configGetStub.withArgs('csv', 'maxSizeBytes').returns(1024 * 1000); // 1mB
-    configGetStub.withArgs('csv', 'scroll').returns({});
-    mockReportingConfig = { get: configGetStub, kbnConfig: { get: configGetStub } };
-
-    mockReportingPlugin.getConfig = () => Promise.resolve(mockReportingConfig);
-    mockReportingPlugin.getUiSettingsServiceFactory = () => Promise.resolve(mockUiSettingsClient);
-    mockReportingPlugin.getElasticsearchService = () => Promise.resolve(mockElasticsearch);
-
+    mockReportingPlugin.getUiSettingsServiceFactory = () => mockUiSettingsClient;
     cancellationToken = new CancellationToken();
 
     defaultElasticsearchResponse = {
@@ -86,6 +75,7 @@ describe('CSV Execute Job', function() {
       .stub(clusterStub, 'callAsCurrentUser')
       .resolves(defaultElasticsearchResponse);
 
+    const configGetStub = sinon.stub();
     mockUiSettingsClient.get.withArgs('csv:separator').returns(',');
     mockUiSettingsClient.get.withArgs('csv:quoteValues').returns(true);
 
@@ -103,11 +93,36 @@ describe('CSV Execute Job', function() {
         return fieldFormatsRegistry;
       },
     });
+
+    mockServer = {
+      config: function() {
+        return {
+          get: configGetStub,
+        };
+      },
+    };
+    mockServer
+      .config()
+      .get.withArgs('xpack.reporting.encryptionKey')
+      .returns(encryptionKey);
+    mockServer
+      .config()
+      .get.withArgs('xpack.reporting.csv.maxSizeBytes')
+      .returns(1024 * 1000); // 1mB
+    mockServer
+      .config()
+      .get.withArgs('xpack.reporting.csv.scroll')
+      .returns({});
   });
 
   describe('basic Elasticsearch call behavior', function() {
     it('should decrypt encrypted headers and pass to callAsCurrentUser', async function() {
-      const executeJob = await executeJobFactory(mockReportingPlugin, mockLogger);
+      const executeJob = await executeJobFactory(
+        mockReportingPlugin,
+        mockServer,
+        mockElasticsearch,
+        mockLogger
+      );
       await executeJob(
         'job456',
         { headers: encryptedHeaders, fields: [], searchRequest: { index: null, body: null } },
@@ -123,7 +138,12 @@ describe('CSV Execute Job', function() {
         testBody: true,
       };
 
-      const executeJob = await executeJobFactory(mockReportingPlugin, mockLogger);
+      const executeJob = await executeJobFactory(
+        mockReportingPlugin,
+        mockServer,
+        mockElasticsearch,
+        mockLogger
+      );
       const job = {
         headers: encryptedHeaders,
         fields: [],
@@ -150,7 +170,12 @@ describe('CSV Execute Job', function() {
         _scroll_id: scrollId,
       });
       callAsCurrentUserStub.onSecondCall().resolves(defaultElasticsearchResponse);
-      const executeJob = await executeJobFactory(mockReportingPlugin, mockLogger);
+      const executeJob = await executeJobFactory(
+        mockReportingPlugin,
+        mockServer,
+        mockElasticsearch,
+        mockLogger
+      );
       await executeJob(
         'job456',
         { headers: encryptedHeaders, fields: [], searchRequest: { index: null, body: null } },
@@ -164,7 +189,12 @@ describe('CSV Execute Job', function() {
     });
 
     it('should not execute scroll if there are no hits from the search', async function() {
-      const executeJob = await executeJobFactory(mockReportingPlugin, mockLogger);
+      const executeJob = await executeJobFactory(
+        mockReportingPlugin,
+        mockServer,
+        mockElasticsearch,
+        mockLogger
+      );
       await executeJob(
         'job456',
         { headers: encryptedHeaders, fields: [], searchRequest: { index: null, body: null } },
@@ -194,7 +224,12 @@ describe('CSV Execute Job', function() {
         _scroll_id: 'scrollId',
       });
 
-      const executeJob = await executeJobFactory(mockReportingPlugin, mockLogger);
+      const executeJob = await executeJobFactory(
+        mockReportingPlugin,
+        mockServer,
+        mockElasticsearch,
+        mockLogger
+      );
       await executeJob(
         'job456',
         { headers: encryptedHeaders, fields: [], searchRequest: { index: null, body: null } },
@@ -229,7 +264,12 @@ describe('CSV Execute Job', function() {
         _scroll_id: lastScrollId,
       });
 
-      const executeJob = await executeJobFactory(mockReportingPlugin, mockLogger);
+      const executeJob = await executeJobFactory(
+        mockReportingPlugin,
+        mockServer,
+        mockElasticsearch,
+        mockLogger
+      );
       await executeJob(
         'job456',
         { headers: encryptedHeaders, fields: [], searchRequest: { index: null, body: null } },
@@ -257,7 +297,12 @@ describe('CSV Execute Job', function() {
         _scroll_id: lastScrollId,
       });
 
-      const executeJob = await executeJobFactory(mockReportingPlugin, mockLogger);
+      const executeJob = await executeJobFactory(
+        mockReportingPlugin,
+        mockServer,
+        mockElasticsearch,
+        mockLogger
+      );
       const jobParams = {
         headers: encryptedHeaders,
         fields: ['one', 'two'],
@@ -276,7 +321,10 @@ describe('CSV Execute Job', function() {
 
   describe('Cells with formula values', () => {
     it('returns `csv_contains_formulas` when cells contain formulas', async function() {
-      configGetStub.withArgs('csv', 'checkForFormulas').returns(true);
+      mockServer
+        .config()
+        .get.withArgs('xpack.reporting.csv.checkForFormulas')
+        .returns(true);
       callAsCurrentUserStub.onFirstCall().returns({
         hits: {
           hits: [{ _source: { one: '=SUM(A1:A2)', two: 'bar' } }],
@@ -284,7 +332,12 @@ describe('CSV Execute Job', function() {
         _scroll_id: 'scrollId',
       });
 
-      const executeJob = await executeJobFactory(mockReportingPlugin, mockLogger);
+      const executeJob = await executeJobFactory(
+        mockReportingPlugin,
+        mockServer,
+        mockElasticsearch,
+        mockLogger
+      );
       const jobParams = {
         headers: encryptedHeaders,
         fields: ['one', 'two'],
@@ -301,7 +354,10 @@ describe('CSV Execute Job', function() {
     });
 
     it('returns warnings when headings contain formulas', async function() {
-      configGetStub.withArgs('csv', 'checkForFormulas').returns(true);
+      mockServer
+        .config()
+        .get.withArgs('xpack.reporting.csv.checkForFormulas')
+        .returns(true);
       callAsCurrentUserStub.onFirstCall().returns({
         hits: {
           hits: [{ _source: { '=SUM(A1:A2)': 'foo', two: 'bar' } }],
@@ -309,7 +365,12 @@ describe('CSV Execute Job', function() {
         _scroll_id: 'scrollId',
       });
 
-      const executeJob = await executeJobFactory(mockReportingPlugin, mockLogger);
+      const executeJob = await executeJobFactory(
+        mockReportingPlugin,
+        mockServer,
+        mockElasticsearch,
+        mockLogger
+      );
       const jobParams = {
         headers: encryptedHeaders,
         fields: ['=SUM(A1:A2)', 'two'],
@@ -326,7 +387,10 @@ describe('CSV Execute Job', function() {
     });
 
     it('returns no warnings when cells have no formulas', async function() {
-      configGetStub.withArgs('csv', 'checkForFormulas').returns(true);
+      mockServer
+        .config()
+        .get.withArgs('xpack.reporting.csv.checkForFormulas')
+        .returns(true);
       callAsCurrentUserStub.onFirstCall().returns({
         hits: {
           hits: [{ _source: { one: 'foo', two: 'bar' } }],
@@ -334,7 +398,12 @@ describe('CSV Execute Job', function() {
         _scroll_id: 'scrollId',
       });
 
-      const executeJob = await executeJobFactory(mockReportingPlugin, mockLogger);
+      const executeJob = await executeJobFactory(
+        mockReportingPlugin,
+        mockServer,
+        mockElasticsearch,
+        mockLogger
+      );
       const jobParams = {
         headers: encryptedHeaders,
         fields: ['one', 'two'],
@@ -351,7 +420,10 @@ describe('CSV Execute Job', function() {
     });
 
     it('returns no warnings when configured not to', async () => {
-      configGetStub.withArgs('csv', 'checkForFormulas').returns(false);
+      mockServer
+        .config()
+        .get.withArgs('xpack.reporting.csv.checkForFormulas')
+        .returns(false);
       callAsCurrentUserStub.onFirstCall().returns({
         hits: {
           hits: [{ _source: { one: '=SUM(A1:A2)', two: 'bar' } }],
@@ -359,7 +431,12 @@ describe('CSV Execute Job', function() {
         _scroll_id: 'scrollId',
       });
 
-      const executeJob = await executeJobFactory(mockReportingPlugin, mockLogger);
+      const executeJob = await executeJobFactory(
+        mockReportingPlugin,
+        mockServer,
+        mockElasticsearch,
+        mockLogger
+      );
       const jobParams = {
         headers: encryptedHeaders,
         fields: ['one', 'two'],
@@ -379,7 +456,12 @@ describe('CSV Execute Job', function() {
   describe('Elasticsearch call errors', function() {
     it('should reject Promise if search call errors out', async function() {
       callAsCurrentUserStub.rejects(new Error());
-      const executeJob = await executeJobFactory(mockReportingPlugin, mockLogger);
+      const executeJob = await executeJobFactory(
+        mockReportingPlugin,
+        mockServer,
+        mockElasticsearch,
+        mockLogger
+      );
       const jobParams = {
         headers: encryptedHeaders,
         fields: [],
@@ -398,7 +480,12 @@ describe('CSV Execute Job', function() {
         _scroll_id: 'scrollId',
       });
       callAsCurrentUserStub.onSecondCall().rejects(new Error());
-      const executeJob = await executeJobFactory(mockReportingPlugin, mockLogger);
+      const executeJob = await executeJobFactory(
+        mockReportingPlugin,
+        mockServer,
+        mockElasticsearch,
+        mockLogger
+      );
       const jobParams = {
         headers: encryptedHeaders,
         fields: [],
@@ -419,7 +506,12 @@ describe('CSV Execute Job', function() {
         _scroll_id: undefined,
       });
 
-      const executeJob = await executeJobFactory(mockReportingPlugin, mockLogger);
+      const executeJob = await executeJobFactory(
+        mockReportingPlugin,
+        mockServer,
+        mockElasticsearch,
+        mockLogger
+      );
       const jobParams = {
         headers: encryptedHeaders,
         fields: [],
@@ -440,7 +532,12 @@ describe('CSV Execute Job', function() {
         _scroll_id: undefined,
       });
 
-      const executeJob = await executeJobFactory(mockReportingPlugin, mockLogger);
+      const executeJob = await executeJobFactory(
+        mockReportingPlugin,
+        mockServer,
+        mockElasticsearch,
+        mockLogger
+      );
       const jobParams = {
         headers: encryptedHeaders,
         fields: [],
@@ -468,7 +565,12 @@ describe('CSV Execute Job', function() {
         _scroll_id: undefined,
       });
 
-      const executeJob = await executeJobFactory(mockReportingPlugin, mockLogger);
+      const executeJob = await executeJobFactory(
+        mockReportingPlugin,
+        mockServer,
+        mockElasticsearch,
+        mockLogger
+      );
       const jobParams = {
         headers: encryptedHeaders,
         fields: [],
@@ -496,7 +598,12 @@ describe('CSV Execute Job', function() {
         _scroll_id: undefined,
       });
 
-      const executeJob = await executeJobFactory(mockReportingPlugin, mockLogger);
+      const executeJob = await executeJobFactory(
+        mockReportingPlugin,
+        mockServer,
+        mockElasticsearch,
+        mockLogger
+      );
       const jobParams = {
         headers: encryptedHeaders,
         fields: [],
@@ -532,7 +639,12 @@ describe('CSV Execute Job', function() {
     });
 
     it('should stop calling Elasticsearch when cancellationToken.cancel is called', async function() {
-      const executeJob = await executeJobFactory(mockReportingPlugin, mockLogger);
+      const executeJob = await executeJobFactory(
+        mockReportingPlugin,
+        mockServer,
+        mockElasticsearch,
+        mockLogger
+      );
       executeJob(
         'job345',
         { headers: encryptedHeaders, fields: [], searchRequest: { index: null, body: null } },
@@ -547,7 +659,12 @@ describe('CSV Execute Job', function() {
     });
 
     it(`shouldn't call clearScroll if it never got a scrollId`, async function() {
-      const executeJob = await executeJobFactory(mockReportingPlugin, mockLogger);
+      const executeJob = await executeJobFactory(
+        mockReportingPlugin,
+        mockServer,
+        mockElasticsearch,
+        mockLogger
+      );
       executeJob(
         'job345',
         { headers: encryptedHeaders, fields: [], searchRequest: { index: null, body: null } },
@@ -561,7 +678,12 @@ describe('CSV Execute Job', function() {
     });
 
     it('should call clearScroll if it got a scrollId', async function() {
-      const executeJob = await executeJobFactory(mockReportingPlugin, mockLogger);
+      const executeJob = await executeJobFactory(
+        mockReportingPlugin,
+        mockServer,
+        mockElasticsearch,
+        mockLogger
+      );
       executeJob(
         'job345',
         { headers: encryptedHeaders, fields: [], searchRequest: { index: null, body: null } },
@@ -579,7 +701,12 @@ describe('CSV Execute Job', function() {
 
   describe('csv content', function() {
     it('should write column headers to output, even if there are no results', async function() {
-      const executeJob = await executeJobFactory(mockReportingPlugin, mockLogger);
+      const executeJob = await executeJobFactory(
+        mockReportingPlugin,
+        mockServer,
+        mockElasticsearch,
+        mockLogger
+      );
       const jobParams = {
         headers: encryptedHeaders,
         fields: ['one', 'two'],
@@ -591,7 +718,12 @@ describe('CSV Execute Job', function() {
 
     it('should use custom uiSettings csv:separator for header', async function() {
       mockUiSettingsClient.get.withArgs('csv:separator').returns(';');
-      const executeJob = await executeJobFactory(mockReportingPlugin, mockLogger);
+      const executeJob = await executeJobFactory(
+        mockReportingPlugin,
+        mockServer,
+        mockElasticsearch,
+        mockLogger
+      );
       const jobParams = {
         headers: encryptedHeaders,
         fields: ['one', 'two'],
@@ -603,7 +735,12 @@ describe('CSV Execute Job', function() {
 
     it('should escape column headers if uiSettings csv:quoteValues is true', async function() {
       mockUiSettingsClient.get.withArgs('csv:quoteValues').returns(true);
-      const executeJob = await executeJobFactory(mockReportingPlugin, mockLogger);
+      const executeJob = await executeJobFactory(
+        mockReportingPlugin,
+        mockServer,
+        mockElasticsearch,
+        mockLogger
+      );
       const jobParams = {
         headers: encryptedHeaders,
         fields: ['one and a half', 'two', 'three-and-four', 'five & six'],
@@ -615,7 +752,12 @@ describe('CSV Execute Job', function() {
 
     it(`shouldn't escape column headers if uiSettings csv:quoteValues is false`, async function() {
       mockUiSettingsClient.get.withArgs('csv:quoteValues').returns(false);
-      const executeJob = await executeJobFactory(mockReportingPlugin, mockLogger);
+      const executeJob = await executeJobFactory(
+        mockReportingPlugin,
+        mockServer,
+        mockElasticsearch,
+        mockLogger
+      );
       const jobParams = {
         headers: encryptedHeaders,
         fields: ['one and a half', 'two', 'three-and-four', 'five & six'],
@@ -626,7 +768,12 @@ describe('CSV Execute Job', function() {
     });
 
     it('should write column headers to output, when there are results', async function() {
-      const executeJob = await executeJobFactory(mockReportingPlugin, mockLogger);
+      const executeJob = await executeJobFactory(
+        mockReportingPlugin,
+        mockServer,
+        mockElasticsearch,
+        mockLogger
+      );
       callAsCurrentUserStub.onFirstCall().resolves({
         hits: {
           hits: [{ one: '1', two: '2' }],
@@ -646,7 +793,12 @@ describe('CSV Execute Job', function() {
     });
 
     it('should use comma separated values of non-nested fields from _source', async function() {
-      const executeJob = await executeJobFactory(mockReportingPlugin, mockLogger);
+      const executeJob = await executeJobFactory(
+        mockReportingPlugin,
+        mockServer,
+        mockElasticsearch,
+        mockLogger
+      );
       callAsCurrentUserStub.onFirstCall().resolves({
         hits: {
           hits: [{ _source: { one: 'foo', two: 'bar' } }],
@@ -667,7 +819,12 @@ describe('CSV Execute Job', function() {
     });
 
     it('should concatenate the hits from multiple responses', async function() {
-      const executeJob = await executeJobFactory(mockReportingPlugin, mockLogger);
+      const executeJob = await executeJobFactory(
+        mockReportingPlugin,
+        mockServer,
+        mockElasticsearch,
+        mockLogger
+      );
       callAsCurrentUserStub.onFirstCall().resolves({
         hits: {
           hits: [{ _source: { one: 'foo', two: 'bar' } }],
@@ -695,7 +852,12 @@ describe('CSV Execute Job', function() {
     });
 
     it('should use field formatters to format fields', async function() {
-      const executeJob = await executeJobFactory(mockReportingPlugin, mockLogger);
+      const executeJob = await executeJobFactory(
+        mockReportingPlugin,
+        mockServer,
+        mockElasticsearch,
+        mockLogger
+      );
       callAsCurrentUserStub.onFirstCall().resolves({
         hits: {
           hits: [{ _source: { one: 'foo', two: 'bar' } }],
@@ -735,9 +897,17 @@ describe('CSV Execute Job', function() {
       let maxSizeReached;
 
       beforeEach(async function() {
-        configGetStub.withArgs('csv', 'maxSizeBytes').returns(1);
-
-        const executeJob = await executeJobFactory(mockReportingPlugin, mockLogger);
+        mockServer
+          .config()
+          .get.withArgs('xpack.reporting.csv.maxSizeBytes')
+          .returns(1);
+
+        const executeJob = await executeJobFactory(
+          mockReportingPlugin,
+          mockServer,
+          mockElasticsearch,
+          mockLogger
+        );
         const jobParams = {
           headers: encryptedHeaders,
           fields: ['one', 'two'],
@@ -765,9 +935,17 @@ describe('CSV Execute Job', function() {
       let maxSizeReached;
 
       beforeEach(async function() {
-        configGetStub.withArgs('csv', 'maxSizeBytes').returns(9);
-
-        const executeJob = await executeJobFactory(mockReportingPlugin, mockLogger);
+        mockServer
+          .config()
+          .get.withArgs('xpack.reporting.csv.maxSizeBytes')
+          .returns(9);
+
+        const executeJob = await executeJobFactory(
+          mockReportingPlugin,
+          mockServer,
+          mockElasticsearch,
+          mockLogger
+        );
         const jobParams = {
           headers: encryptedHeaders,
           fields: ['one', 'two'],
@@ -795,7 +973,10 @@ describe('CSV Execute Job', function() {
       let maxSizeReached;
 
       beforeEach(async function() {
-        configGetStub.withArgs('csv', 'maxSizeBytes').returns(9);
+        mockServer
+          .config()
+          .get.withArgs('xpack.reporting.csv.maxSizeBytes')
+          .returns(9);
 
         callAsCurrentUserStub.onFirstCall().returns({
           hits: {
@@ -804,7 +985,12 @@ describe('CSV Execute Job', function() {
           _scroll_id: 'scrollId',
         });
 
-        const executeJob = await executeJobFactory(mockReportingPlugin, mockLogger);
+        const executeJob = await executeJobFactory(
+          mockReportingPlugin,
+          mockServer,
+          mockElasticsearch,
+          mockLogger
+        );
         const jobParams = {
           headers: encryptedHeaders,
           fields: ['one', 'two'],
@@ -834,7 +1020,10 @@ describe('CSV Execute Job', function() {
 
       beforeEach(async function() {
         mockReportingPlugin.getUiSettingsServiceFactory = () => mockUiSettingsClient;
-        configGetStub.withArgs('csv', 'maxSizeBytes').returns(18);
+        mockServer
+          .config()
+          .get.withArgs('xpack.reporting.csv.maxSizeBytes')
+          .returns(18);
 
         callAsCurrentUserStub.onFirstCall().returns({
           hits: {
@@ -843,7 +1032,12 @@ describe('CSV Execute Job', function() {
           _scroll_id: 'scrollId',
         });
 
-        const executeJob = await executeJobFactory(mockReportingPlugin, mockLogger);
+        const executeJob = await executeJobFactory(
+          mockReportingPlugin,
+          mockServer,
+          mockElasticsearch,
+          mockLogger
+        );
         const jobParams = {
           headers: encryptedHeaders,
           fields: ['one', 'two'],
@@ -871,7 +1065,10 @@ describe('CSV Execute Job', function() {
   describe('scroll settings', function() {
     it('passes scroll duration to initial search call', async function() {
       const scrollDuration = 'test';
-      configGetStub.withArgs('csv', 'scroll').returns({ duration: scrollDuration });
+      mockServer
+        .config()
+        .get.withArgs('xpack.reporting.csv.scroll')
+        .returns({ duration: scrollDuration });
 
       callAsCurrentUserStub.onFirstCall().returns({
         hits: {
@@ -880,7 +1077,12 @@ describe('CSV Execute Job', function() {
         _scroll_id: 'scrollId',
       });
 
-      const executeJob = await executeJobFactory(mockReportingPlugin, mockLogger);
+      const executeJob = await executeJobFactory(
+        mockReportingPlugin,
+        mockServer,
+        mockElasticsearch,
+        mockLogger
+      );
       const jobParams = {
         headers: encryptedHeaders,
         fields: ['one', 'two'],
@@ -897,7 +1099,10 @@ describe('CSV Execute Job', function() {
 
     it('passes scroll size to initial search call', async function() {
       const scrollSize = 100;
-      configGetStub.withArgs('csv', 'scroll').returns({ size: scrollSize });
+      mockServer
+        .config()
+        .get.withArgs('xpack.reporting.csv.scroll')
+        .returns({ size: scrollSize });
 
       callAsCurrentUserStub.onFirstCall().resolves({
         hits: {
@@ -906,7 +1111,12 @@ describe('CSV Execute Job', function() {
         _scroll_id: 'scrollId',
       });
 
-      const executeJob = await executeJobFactory(mockReportingPlugin, mockLogger);
+      const executeJob = await executeJobFactory(
+        mockReportingPlugin,
+        mockServer,
+        mockElasticsearch,
+        mockLogger
+      );
       const jobParams = {
         headers: encryptedHeaders,
         fields: ['one', 'two'],
@@ -923,7 +1133,10 @@ describe('CSV Execute Job', function() {
 
     it('passes scroll duration to subsequent scroll call', async function() {
       const scrollDuration = 'test';
-      configGetStub.withArgs('csv', 'scroll').returns({ duration: scrollDuration });
+      mockServer
+        .config()
+        .get.withArgs('xpack.reporting.csv.scroll')
+        .returns({ duration: scrollDuration });
 
       callAsCurrentUserStub.onFirstCall().resolves({
         hits: {
@@ -932,7 +1145,12 @@ describe('CSV Execute Job', function() {
         _scroll_id: 'scrollId',
       });
 
-      const executeJob = await executeJobFactory(mockReportingPlugin, mockLogger);
+      const executeJob = await executeJobFactory(
+        mockReportingPlugin,
+        mockServer,
+        mockElasticsearch,
+        mockLogger
+      );
       const jobParams = {
         headers: encryptedHeaders,
         fields: ['one', 'two'],
diff --git a/x-pack/legacy/plugins/reporting/export_types/csv/server/execute_job.ts b/x-pack/legacy/plugins/reporting/export_types/csv/server/execute_job.ts
index a8249e5810d3c..1579985891053 100644
--- a/x-pack/legacy/plugins/reporting/export_types/csv/server/execute_job.ts
+++ b/x-pack/legacy/plugins/reporting/export_types/csv/server/execute_job.ts
@@ -6,26 +6,32 @@
 
 import { i18n } from '@kbn/i18n';
 import Hapi from 'hapi';
-import { IUiSettingsClient, KibanaRequest } from '../../../../../../../src/core/server';
+import {
+  ElasticsearchServiceSetup,
+  IUiSettingsClient,
+  KibanaRequest,
+} from '../../../../../../../src/core/server';
 import { CSV_JOB_TYPE } from '../../../common/constants';
 import { ReportingCore } from '../../../server';
 import { cryptoFactory } from '../../../server/lib';
 import { getFieldFormats } from '../../../server/services';
-import { ESQueueWorkerExecuteFn, ExecuteJobFactory, Logger } from '../../../types';
+import { ESQueueWorkerExecuteFn, ExecuteJobFactory, Logger, ServerFacade } from '../../../types';
 import { JobDocPayloadDiscoverCsv } from '../types';
 import { fieldFormatMapFactory } from './lib/field_format_map';
 import { createGenerateCsv } from './lib/generate_csv';
 
 export const executeJobFactory: ExecuteJobFactory<ESQueueWorkerExecuteFn<
   JobDocPayloadDiscoverCsv
->> = async function executeJobFactoryFn(reporting: ReportingCore, parentLogger: Logger) {
-  const [config, elasticsearch] = await Promise.all([
-    reporting.getConfig(),
-    reporting.getElasticsearchService(),
-  ]);
-  const crypto = cryptoFactory(config.get('encryptionKey'));
+>> = async function executeJobFactoryFn(
+  reporting: ReportingCore,
+  server: ServerFacade,
+  elasticsearch: ElasticsearchServiceSetup,
+  parentLogger: Logger
+) {
+  const crypto = cryptoFactory(server);
+  const config = server.config();
   const logger = parentLogger.clone([CSV_JOB_TYPE, 'execute-job']);
-  const serverBasePath = config.kbnConfig.get('server', 'basePath');
+  const serverBasePath = config.get('server.basePath');
 
   return async function executeJob(
     jobId: string,
@@ -125,9 +131,9 @@ export const executeJobFactory: ExecuteJobFactory<ESQueueWorkerExecuteFn<
       formatsMap,
       settings: {
         ...uiSettings,
-        checkForFormulas: config.get('csv', 'checkForFormulas'),
-        maxSizeBytes: config.get('csv', 'maxSizeBytes'),
-        scroll: config.get('csv', 'scroll'),
+        checkForFormulas: config.get('xpack.reporting.csv.checkForFormulas'),
+        maxSizeBytes: config.get('xpack.reporting.csv.maxSizeBytes'),
+        scroll: config.get('xpack.reporting.csv.scroll'),
       },
     });
 
diff --git a/x-pack/legacy/plugins/reporting/export_types/csv/server/lib/hit_iterator.test.ts b/x-pack/legacy/plugins/reporting/export_types/csv/server/lib/hit_iterator.test.ts
index a9f0015e49360..3765217de9285 100644
--- a/x-pack/legacy/plugins/reporting/export_types/csv/server/lib/hit_iterator.test.ts
+++ b/x-pack/legacy/plugins/reporting/export_types/csv/server/lib/hit_iterator.test.ts
@@ -7,8 +7,7 @@
 import expect from '@kbn/expect';
 import sinon from 'sinon';
 import { CancellationToken } from '../../../../common/cancellation_token';
-import { ScrollConfig } from '../../../../server/types';
-import { Logger } from '../../../../types';
+import { Logger, ScrollConfig } from '../../../../types';
 import { createHitIterator } from './hit_iterator';
 
 const mockLogger = {
diff --git a/x-pack/legacy/plugins/reporting/export_types/csv/server/lib/hit_iterator.ts b/x-pack/legacy/plugins/reporting/export_types/csv/server/lib/hit_iterator.ts
index 2ca19dd07a627..90690b62ff4a4 100644
--- a/x-pack/legacy/plugins/reporting/export_types/csv/server/lib/hit_iterator.ts
+++ b/x-pack/legacy/plugins/reporting/export_types/csv/server/lib/hit_iterator.ts
@@ -4,10 +4,9 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { i18n } from '@kbn/i18n';
 import { SearchParams, SearchResponse } from 'elasticsearch';
-import { ScrollConfig } from '../../../../server/types';
-import { CancellationToken, Logger } from '../../../../types';
+import { i18n } from '@kbn/i18n';
+import { CancellationToken, ScrollConfig, Logger } from '../../../../types';
 
 async function parseResponse(request: SearchResponse<any>) {
   const response = await request;
diff --git a/x-pack/legacy/plugins/reporting/export_types/csv/types.d.ts b/x-pack/legacy/plugins/reporting/export_types/csv/types.d.ts
index 529c195486bc6..842330fa7c93f 100644
--- a/x-pack/legacy/plugins/reporting/export_types/csv/types.d.ts
+++ b/x-pack/legacy/plugins/reporting/export_types/csv/types.d.ts
@@ -5,8 +5,7 @@
  */
 
 import { CancellationToken } from '../../common/cancellation_token';
-import { ScrollConfig } from '../../server/types';
-import { JobDocPayload, JobParamPostPayload } from '../../types';
+import { JobDocPayload, JobParamPostPayload, ConditionalHeaders, RequestFacade } from '../../types';
 
 interface DocValueField {
   field: string;
@@ -107,7 +106,7 @@ export interface GenerateCsvParams {
     quoteValues: boolean;
     timezone: string | null;
     maxSizeBytes: number;
-    scroll: ScrollConfig;
+    scroll: { duration: string; size: number };
     checkForFormulas?: boolean;
   };
 }
diff --git a/x-pack/legacy/plugins/reporting/export_types/csv_from_savedobject/server/create_job/create_job.ts b/x-pack/legacy/plugins/reporting/export_types/csv_from_savedobject/server/create_job/create_job.ts
index 15a1c3e0a9fad..17072d311b35f 100644
--- a/x-pack/legacy/plugins/reporting/export_types/csv_from_savedobject/server/create_job/create_job.ts
+++ b/x-pack/legacy/plugins/reporting/export_types/csv_from_savedobject/server/create_job/create_job.ts
@@ -5,11 +5,18 @@
  */
 
 import { notFound, notImplemented } from 'boom';
+import { ElasticsearchServiceSetup } from 'kibana/server';
 import { get } from 'lodash';
 import { CSV_FROM_SAVEDOBJECT_JOB_TYPE } from '../../../../common/constants';
 import { ReportingCore } from '../../../../server';
 import { cryptoFactory } from '../../../../server/lib';
-import { CreateJobFactory, ImmediateCreateJobFn, Logger, RequestFacade } from '../../../../types';
+import {
+  CreateJobFactory,
+  ImmediateCreateJobFn,
+  Logger,
+  RequestFacade,
+  ServerFacade,
+} from '../../../../types';
 import {
   JobDocPayloadPanelCsv,
   JobParamsPanelCsv,
@@ -30,9 +37,13 @@ interface VisData {
 
 export const createJobFactory: CreateJobFactory<ImmediateCreateJobFn<
   JobParamsPanelCsv
->> = async function createJobFactoryFn(reporting: ReportingCore, parentLogger: Logger) {
-  const config = await reporting.getConfig();
-  const crypto = cryptoFactory(config.get('encryptionKey'));
+>> = function createJobFactoryFn(
+  reporting: ReportingCore,
+  server: ServerFacade,
+  elasticsearch: ElasticsearchServiceSetup,
+  parentLogger: Logger
+) {
+  const crypto = cryptoFactory(server);
   const logger = parentLogger.clone([CSV_FROM_SAVEDOBJECT_JOB_TYPE, 'create-job']);
 
   return async function createJob(
diff --git a/x-pack/legacy/plugins/reporting/export_types/csv_from_savedobject/server/execute_job.ts b/x-pack/legacy/plugins/reporting/export_types/csv_from_savedobject/server/execute_job.ts
index debcdb47919f1..6bb3e73fcfe84 100644
--- a/x-pack/legacy/plugins/reporting/export_types/csv_from_savedobject/server/execute_job.ts
+++ b/x-pack/legacy/plugins/reporting/export_types/csv_from_savedobject/server/execute_job.ts
@@ -5,6 +5,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
+import { ElasticsearchServiceSetup } from 'kibana/server';
 import { CONTENT_TYPE_CSV, CSV_FROM_SAVEDOBJECT_JOB_TYPE } from '../../../common/constants';
 import { ReportingCore } from '../../../server';
 import { cryptoFactory } from '../../../server/lib';
@@ -14,6 +15,7 @@ import {
   JobDocOutput,
   Logger,
   RequestFacade,
+  ServerFacade,
 } from '../../../types';
 import { CsvResultFromSearch } from '../../csv/types';
 import { FakeRequest, JobDocPayloadPanelCsv, JobParamsPanelCsv, SearchPanel } from '../types';
@@ -21,11 +23,15 @@ import { createGenerateCsv } from './lib';
 
 export const executeJobFactory: ExecuteJobFactory<ImmediateExecuteFn<
   JobParamsPanelCsv
->> = async function executeJobFactoryFn(reporting: ReportingCore, parentLogger: Logger) {
-  const config = await reporting.getConfig();
-  const crypto = cryptoFactory(config.get('encryptionKey'));
+>> = async function executeJobFactoryFn(
+  reporting: ReportingCore,
+  server: ServerFacade,
+  elasticsearch: ElasticsearchServiceSetup,
+  parentLogger: Logger
+) {
+  const crypto = cryptoFactory(server);
   const logger = parentLogger.clone([CSV_FROM_SAVEDOBJECT_JOB_TYPE, 'execute-job']);
-  const generateCsv = await createGenerateCsv(reporting, parentLogger);
+  const generateCsv = createGenerateCsv(reporting, server, elasticsearch, parentLogger);
 
   return async function executeJob(
     jobId: string | null,
@@ -51,11 +57,11 @@ export const executeJobFactory: ExecuteJobFactory<ImmediateExecuteFn<
 
     let requestObject: RequestFacade | FakeRequest;
     if (isImmediate && realRequest) {
-      jobLogger.info(`Executing job from Immediate API using request context`);
+      jobLogger.info(`Executing job from immediate API`);
       requestObject = realRequest;
     } else {
       jobLogger.info(`Executing job async using encrypted headers`);
-      let decryptedHeaders: Record<string, unknown>;
+      let decryptedHeaders;
       const serializedEncryptedHeaders = job.headers;
       try {
         decryptedHeaders = await crypto.decrypt(serializedEncryptedHeaders);
@@ -73,7 +79,10 @@ export const executeJobFactory: ExecuteJobFactory<ImmediateExecuteFn<
         );
       }
 
-      requestObject = { headers: decryptedHeaders };
+      requestObject = {
+        headers: decryptedHeaders,
+        server,
+      };
     }
 
     let content: string;
diff --git a/x-pack/legacy/plugins/reporting/export_types/csv_from_savedobject/server/lib/generate_csv.ts b/x-pack/legacy/plugins/reporting/export_types/csv_from_savedobject/server/lib/generate_csv.ts
index c81060d8ca05d..b18f597cbaa41 100644
--- a/x-pack/legacy/plugins/reporting/export_types/csv_from_savedobject/server/lib/generate_csv.ts
+++ b/x-pack/legacy/plugins/reporting/export_types/csv_from_savedobject/server/lib/generate_csv.ts
@@ -5,12 +5,18 @@
  */
 
 import { badRequest } from 'boom';
-import { ReportingCore } from '../../../../server/types';
-import { Logger, RequestFacade } from '../../../../types';
-import { FakeRequest, JobParamsPanelCsv, SearchPanel, VisPanel } from '../../types';
+import { ElasticsearchServiceSetup } from 'kibana/server';
+import { ReportingCore } from '../../../../server';
+import { ServerFacade, RequestFacade, Logger } from '../../../../types';
+import { SearchPanel, VisPanel, JobParamsPanelCsv, FakeRequest } from '../../types';
 import { generateCsvSearch } from './generate_csv_search';
 
-export function createGenerateCsv(reporting: ReportingCore, logger: Logger) {
+export function createGenerateCsv(
+  reporting: ReportingCore,
+  server: ServerFacade,
+  elasticsearch: ElasticsearchServiceSetup,
+  logger: Logger
+) {
   return async function generateCsv(
     request: RequestFacade | FakeRequest,
     visType: string,
@@ -27,6 +33,8 @@ export function createGenerateCsv(reporting: ReportingCore, logger: Logger) {
         return await generateCsvSearch(
           request as RequestFacade,
           reporting,
+          server,
+          elasticsearch,
           logger,
           panel as SearchPanel,
           jobParams
diff --git a/x-pack/legacy/plugins/reporting/export_types/csv_from_savedobject/server/lib/generate_csv_search.ts b/x-pack/legacy/plugins/reporting/export_types/csv_from_savedobject/server/lib/generate_csv_search.ts
index 9a35b96f8a240..b1691ec71f520 100644
--- a/x-pack/legacy/plugins/reporting/export_types/csv_from_savedobject/server/lib/generate_csv_search.ts
+++ b/x-pack/legacy/plugins/reporting/export_types/csv_from_savedobject/server/lib/generate_csv_search.ts
@@ -4,7 +4,11 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { IUiSettingsClient, KibanaRequest } from '../../../../../../../../src/core/server';
+import {
+  ElasticsearchServiceSetup,
+  KibanaRequest,
+  IUiSettingsClient,
+} from '../../../../../../../../src/core/server';
 import {
   esQuery,
   EsQueryConfig,
@@ -17,7 +21,7 @@ import {
 } from '../../../../../../../../src/plugins/data/server';
 import { CancellationToken } from '../../../../common/cancellation_token';
 import { ReportingCore } from '../../../../server';
-import { Logger, RequestFacade } from '../../../../types';
+import { Logger, RequestFacade, ServerFacade } from '../../../../types';
 import { createGenerateCsv } from '../../../csv/server/lib/generate_csv';
 import {
   CsvResultFromSearch,
@@ -58,6 +62,8 @@ const getUiSettings = async (config: IUiSettingsClient) => {
 export async function generateCsvSearch(
   req: RequestFacade,
   reporting: ReportingCore,
+  server: ServerFacade,
+  elasticsearch: ElasticsearchServiceSetup,
   logger: Logger,
   searchPanel: SearchPanel,
   jobParams: JobParamsDiscoverCsv
@@ -153,15 +159,11 @@ export async function generateCsvSearch(
     },
   };
 
-  const [elasticsearch, config] = await Promise.all([
-    reporting.getElasticsearchService(),
-    reporting.getConfig(),
-  ]);
-
   const { callAsCurrentUser } = elasticsearch.dataClient.asScoped(
     KibanaRequest.from(req.getRawRequest())
   );
   const callCluster = (...params: [string, object]) => callAsCurrentUser(...params);
+  const config = server.config();
   const uiSettings = await getUiSettings(uiConfig);
 
   const generateCsvParams: GenerateCsvParams = {
@@ -174,8 +176,8 @@ export async function generateCsvSearch(
     cancellationToken: new CancellationToken(),
     settings: {
       ...uiSettings,
-      maxSizeBytes: config.get('csv', 'maxSizeBytes'),
-      scroll: config.get('csv', 'scroll'),
+      maxSizeBytes: config.get('xpack.reporting.csv.maxSizeBytes'),
+      scroll: config.get('xpack.reporting.csv.scroll'),
       timezone,
     },
   };
diff --git a/x-pack/legacy/plugins/reporting/export_types/csv_from_savedobject/types.d.ts b/x-pack/legacy/plugins/reporting/export_types/csv_from_savedobject/types.d.ts
index ab14d2dd8a660..6a7d5f336e238 100644
--- a/x-pack/legacy/plugins/reporting/export_types/csv_from_savedobject/types.d.ts
+++ b/x-pack/legacy/plugins/reporting/export_types/csv_from_savedobject/types.d.ts
@@ -4,10 +4,11 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { JobDocPayload, JobParamPostPayload } from '../../types';
+import { JobParamPostPayload, JobDocPayload, ServerFacade } from '../../types';
 
 export interface FakeRequest {
-  headers: Record<string, unknown>;
+  headers: any;
+  server: ServerFacade;
 }
 
 export interface JobParamsPostPayloadPanelCsv extends JobParamPostPayload {
diff --git a/x-pack/legacy/plugins/reporting/export_types/png/server/create_job/index.ts b/x-pack/legacy/plugins/reporting/export_types/png/server/create_job/index.ts
index 9aac612677094..a6911e1f14704 100644
--- a/x-pack/legacy/plugins/reporting/export_types/png/server/create_job/index.ts
+++ b/x-pack/legacy/plugins/reporting/export_types/png/server/create_job/index.ts
@@ -12,14 +12,14 @@ import {
   CreateJobFactory,
   ESQueueCreateJobFn,
   RequestFacade,
+  ServerFacade,
 } from '../../../../types';
 import { JobParamsPNG } from '../../types';
 
 export const createJobFactory: CreateJobFactory<ESQueueCreateJobFn<
   JobParamsPNG
->> = async function createJobFactoryFn(reporting: ReportingCore) {
-  const config = await reporting.getConfig();
-  const crypto = cryptoFactory(config.get('encryptionKey'));
+>> = function createJobFactoryFn(reporting: ReportingCore, server: ServerFacade) {
+  const crypto = cryptoFactory(server);
 
   return async function createJob(
     { objectType, title, relativeUrl, browserTimezone, layout }: JobParamsPNG,
diff --git a/x-pack/legacy/plugins/reporting/export_types/png/server/execute_job/index.test.js b/x-pack/legacy/plugins/reporting/export_types/png/server/execute_job/index.test.js
index 267321d33809d..e2e6ba1b89096 100644
--- a/x-pack/legacy/plugins/reporting/export_types/png/server/execute_job/index.test.js
+++ b/x-pack/legacy/plugins/reporting/export_types/png/server/execute_job/index.test.js
@@ -5,6 +5,7 @@
  */
 
 import * as Rx from 'rxjs';
+import { memoize } from 'lodash';
 import { createMockReportingCore } from '../../../../test_helpers';
 import { cryptoFactory } from '../../../../server/lib/crypto';
 import { executeJobFactory } from './index';
@@ -13,70 +14,63 @@ import { LevelLogger } from '../../../../server/lib';
 
 jest.mock('../lib/generate_png', () => ({ generatePngObservableFactory: jest.fn() }));
 
-let mockReporting;
-let mockReportingConfig;
-
 const cancellationToken = {
   on: jest.fn(),
 };
 
-const mockLoggerFactory = {
-  get: jest.fn().mockImplementation(() => ({
-    error: jest.fn(),
-    debug: jest.fn(),
-    warn: jest.fn(),
-  })),
-};
-const getMockLogger = () => new LevelLogger(mockLoggerFactory);
-
-const mockEncryptionKey = 'abcabcsecuresecret';
-const encryptHeaders = async headers => {
-  const crypto = cryptoFactory(mockEncryptionKey);
-  return await crypto.encrypt(headers);
-};
+let config;
+let mockServer;
+let mockReporting;
 
 beforeEach(async () => {
   mockReporting = await createMockReportingCore();
 
-  const kbnConfig = {
+  config = {
+    'xpack.reporting.encryptionKey': 'testencryptionkey',
     'server.basePath': '/sbp',
+    'server.host': 'localhost',
+    'server.port': 5601,
   };
-  const reportingConfig = {
-    encryptionKey: mockEncryptionKey,
-    'kibanaServer.hostname': 'localhost',
-    'kibanaServer.port': 5601,
-    'kibanaServer.protocol': 'http',
-  };
-
-  const mockGetConfig = jest.fn();
-  mockReportingConfig = {
-    get: (...keys) => reportingConfig[keys.join('.')],
-    kbnConfig: { get: (...keys) => kbnConfig[keys.join('.')] },
-  };
-  mockGetConfig.mockImplementation(() => Promise.resolve(mockReportingConfig));
-  mockReporting.getConfig = mockGetConfig;
-
-  const mockElasticsearch = {
-    dataClient: {
-      asScoped: () => ({ callAsCurrentUser: jest.fn() }),
+  mockServer = {
+    config: memoize(() => ({ get: jest.fn() })),
+    info: {
+      protocol: 'http',
     },
   };
-  const mockGetElasticsearch = jest.fn();
-  mockGetElasticsearch.mockImplementation(() => Promise.resolve(mockElasticsearch));
-  mockReporting.getElasticsearchService = mockGetElasticsearch;
+  mockServer.config().get.mockImplementation(key => {
+    return config[key];
+  });
 
   generatePngObservableFactory.mockReturnValue(jest.fn());
 });
 
 afterEach(() => generatePngObservableFactory.mockReset());
 
+const mockElasticsearch = {
+  dataClient: {
+    asScoped: () => ({ callAsCurrentUser: jest.fn() }),
+  },
+};
+
+const getMockLogger = () => new LevelLogger();
+
+const encryptHeaders = async headers => {
+  const crypto = cryptoFactory(mockServer);
+  return await crypto.encrypt(headers);
+};
+
 test(`passes browserTimezone to generatePng`, async () => {
   const encryptedHeaders = await encryptHeaders({});
 
   const generatePngObservable = generatePngObservableFactory();
   generatePngObservable.mockReturnValue(Rx.of(Buffer.from('')));
 
-  const executeJob = await executeJobFactory(mockReporting, getMockLogger());
+  const executeJob = await executeJobFactory(
+    mockReporting,
+    mockServer,
+    mockElasticsearch,
+    getMockLogger()
+  );
   const browserTimezone = 'UTC';
   await executeJob(
     'pngJobId',
@@ -94,7 +88,15 @@ test(`passes browserTimezone to generatePng`, async () => {
 });
 
 test(`returns content_type of application/png`, async () => {
-  const executeJob = await executeJobFactory(mockReporting, getMockLogger());
+  const executeJob = await executeJobFactory(
+    mockReporting,
+    mockServer,
+    mockElasticsearch,
+    getMockLogger(),
+    {
+      browserDriverFactory: {},
+    }
+  );
   const encryptedHeaders = await encryptHeaders({});
 
   const generatePngObservable = generatePngObservableFactory();
@@ -114,7 +116,15 @@ test(`returns content of generatePng getBuffer base64 encoded`, async () => {
   const generatePngObservable = generatePngObservableFactory();
   generatePngObservable.mockReturnValue(Rx.of({ buffer: Buffer.from(testContent) }));
 
-  const executeJob = await executeJobFactory(mockReporting, getMockLogger());
+  const executeJob = await executeJobFactory(
+    mockReporting,
+    mockServer,
+    mockElasticsearch,
+    getMockLogger(),
+    {
+      browserDriverFactory: {},
+    }
+  );
   const encryptedHeaders = await encryptHeaders({});
   const { content } = await executeJob(
     'pngJobId',
diff --git a/x-pack/legacy/plugins/reporting/export_types/png/server/execute_job/index.ts b/x-pack/legacy/plugins/reporting/export_types/png/server/execute_job/index.ts
index c53c20efec247..8670f0027af89 100644
--- a/x-pack/legacy/plugins/reporting/export_types/png/server/execute_job/index.ts
+++ b/x-pack/legacy/plugins/reporting/export_types/png/server/execute_job/index.ts
@@ -4,11 +4,18 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+import { ElasticsearchServiceSetup } from 'kibana/server';
 import * as Rx from 'rxjs';
 import { catchError, map, mergeMap, takeUntil } from 'rxjs/operators';
 import { PNG_JOB_TYPE } from '../../../../common/constants';
 import { ReportingCore } from '../../../../server';
-import { ESQueueWorkerExecuteFn, ExecuteJobFactory, JobDocOutput, Logger } from '../../../../types';
+import {
+  ESQueueWorkerExecuteFn,
+  ExecuteJobFactory,
+  JobDocOutput,
+  Logger,
+  ServerFacade,
+} from '../../../../types';
 import {
   decryptJobHeaders,
   getConditionalHeaders,
@@ -22,24 +29,22 @@ type QueuedPngExecutorFactory = ExecuteJobFactory<ESQueueWorkerExecuteFn<JobDocP
 
 export const executeJobFactory: QueuedPngExecutorFactory = async function executeJobFactoryFn(
   reporting: ReportingCore,
+  server: ServerFacade,
+  elasticsearch: ElasticsearchServiceSetup,
   parentLogger: Logger
 ) {
-  const config = await reporting.getConfig();
-  const captureConfig = config.get('capture');
-  const encryptionKey = config.get('encryptionKey');
-
   const browserDriverFactory = await reporting.getBrowserDriverFactory();
-  const generatePngObservable = generatePngObservableFactory(captureConfig, browserDriverFactory);
+  const generatePngObservable = generatePngObservableFactory(server, browserDriverFactory);
   const logger = parentLogger.clone([PNG_JOB_TYPE, 'execute']);
 
   return function executeJob(jobId: string, job: JobDocPayloadPNG, cancellationToken: any) {
     const jobLogger = logger.clone([jobId]);
     const process$: Rx.Observable<JobDocOutput> = Rx.of(1).pipe(
-      mergeMap(() => decryptJobHeaders({ encryptionKey, job, logger })),
+      mergeMap(() => decryptJobHeaders({ server, job, logger })),
       map(decryptedHeaders => omitBlacklistedHeaders({ job, decryptedHeaders })),
-      map(filteredHeaders => getConditionalHeaders({ config, job, filteredHeaders })),
+      map(filteredHeaders => getConditionalHeaders({ server, job, filteredHeaders })),
       mergeMap(conditionalHeaders => {
-        const urls = getFullUrls({ config, job });
+        const urls = getFullUrls({ server, job });
         const hashUrl = urls[0];
         return generatePngObservable(
           jobLogger,
diff --git a/x-pack/legacy/plugins/reporting/export_types/png/server/lib/generate_png.ts b/x-pack/legacy/plugins/reporting/export_types/png/server/lib/generate_png.ts
index a15541d99f6fb..88e91982adc63 100644
--- a/x-pack/legacy/plugins/reporting/export_types/png/server/lib/generate_png.ts
+++ b/x-pack/legacy/plugins/reporting/export_types/png/server/lib/generate_png.ts
@@ -7,18 +7,17 @@
 import * as Rx from 'rxjs';
 import { map } from 'rxjs/operators';
 import { LevelLogger } from '../../../../server/lib';
-import { CaptureConfig } from '../../../../server/types';
-import { ConditionalHeaders, HeadlessChromiumDriverFactory } from '../../../../types';
+import { ConditionalHeaders, HeadlessChromiumDriverFactory, ServerFacade } from '../../../../types';
 import { LayoutParams } from '../../../common/layouts/layout';
 import { PreserveLayout } from '../../../common/layouts/preserve_layout';
 import { screenshotsObservableFactory } from '../../../common/lib/screenshots';
 import { ScreenshotResults } from '../../../common/lib/screenshots/types';
 
 export function generatePngObservableFactory(
-  captureConfig: CaptureConfig,
+  server: ServerFacade,
   browserDriverFactory: HeadlessChromiumDriverFactory
 ) {
-  const screenshotsObservable = screenshotsObservableFactory(captureConfig, browserDriverFactory);
+  const screenshotsObservable = screenshotsObservableFactory(server, browserDriverFactory);
 
   return function generatePngObservable(
     logger: LevelLogger,
diff --git a/x-pack/legacy/plugins/reporting/export_types/printable_pdf/server/create_job/index.ts b/x-pack/legacy/plugins/reporting/export_types/printable_pdf/server/create_job/index.ts
index 8e1d5404a5984..656c99991e1f6 100644
--- a/x-pack/legacy/plugins/reporting/export_types/printable_pdf/server/create_job/index.ts
+++ b/x-pack/legacy/plugins/reporting/export_types/printable_pdf/server/create_job/index.ts
@@ -12,14 +12,14 @@ import {
   CreateJobFactory,
   ESQueueCreateJobFn,
   RequestFacade,
+  ServerFacade,
 } from '../../../../types';
 import { JobParamsPDF } from '../../types';
 
 export const createJobFactory: CreateJobFactory<ESQueueCreateJobFn<
   JobParamsPDF
->> = async function createJobFactoryFn(reporting: ReportingCore) {
-  const config = await reporting.getConfig();
-  const crypto = cryptoFactory(config.get('encryptionKey'));
+>> = function createJobFactoryFn(reporting: ReportingCore, server: ServerFacade) {
+  const crypto = cryptoFactory(server);
 
   return async function createJobFn(
     { title, relativeUrls, browserTimezone, layout, objectType }: JobParamsPDF,
diff --git a/x-pack/legacy/plugins/reporting/export_types/printable_pdf/server/execute_job/index.test.js b/x-pack/legacy/plugins/reporting/export_types/printable_pdf/server/execute_job/index.test.js
index 29769108bf4ac..484842ba18f2a 100644
--- a/x-pack/legacy/plugins/reporting/export_types/printable_pdf/server/execute_job/index.test.js
+++ b/x-pack/legacy/plugins/reporting/export_types/printable_pdf/server/execute_job/index.test.js
@@ -5,6 +5,7 @@
  */
 
 import * as Rx from 'rxjs';
+import { memoize } from 'lodash';
 import { createMockReportingCore } from '../../../../test_helpers';
 import { cryptoFactory } from '../../../../server/lib/crypto';
 import { executeJobFactory } from './index';
@@ -13,65 +14,57 @@ import { LevelLogger } from '../../../../server/lib';
 
 jest.mock('../lib/generate_pdf', () => ({ generatePdfObservableFactory: jest.fn() }));
 
-let mockReporting;
-let mockReportingConfig;
-
 const cancellationToken = {
   on: jest.fn(),
 };
 
-const mockLoggerFactory = {
-  get: jest.fn().mockImplementation(() => ({
-    error: jest.fn(),
-    debug: jest.fn(),
-    warn: jest.fn(),
-  })),
-};
-const getMockLogger = () => new LevelLogger(mockLoggerFactory);
-
-const mockEncryptionKey = 'testencryptionkey';
-const encryptHeaders = async headers => {
-  const crypto = cryptoFactory(mockEncryptionKey);
-  return await crypto.encrypt(headers);
-};
+let config;
+let mockServer;
+let mockReporting;
 
 beforeEach(async () => {
   mockReporting = await createMockReportingCore();
 
-  const kbnConfig = {
+  config = {
+    'xpack.reporting.encryptionKey': 'testencryptionkey',
     'server.basePath': '/sbp',
+    'server.host': 'localhost',
+    'server.port': 5601,
   };
-  const reportingConfig = {
-    encryptionKey: mockEncryptionKey,
-    'kibanaServer.hostname': 'localhost',
-    'kibanaServer.port': 5601,
-    'kibanaServer.protocol': 'http',
-  };
-
-  const mockGetConfig = jest.fn();
-  mockReportingConfig = {
-    get: (...keys) => reportingConfig[keys.join('.')],
-    kbnConfig: { get: (...keys) => kbnConfig[keys.join('.')] },
-  };
-  mockGetConfig.mockImplementation(() => Promise.resolve(mockReportingConfig));
-  mockReporting.getConfig = mockGetConfig;
-
-  const mockElasticsearch = {
-    dataClient: {
-      asScoped: () => ({ callAsCurrentUser: jest.fn() }),
+  mockServer = {
+    config: memoize(() => ({ get: jest.fn() })),
+    info: {
+      protocol: 'http',
     },
   };
-  const mockGetElasticsearch = jest.fn();
-  mockGetElasticsearch.mockImplementation(() => Promise.resolve(mockElasticsearch));
-  mockReporting.getElasticsearchService = mockGetElasticsearch;
+  mockServer.config().get.mockImplementation(key => {
+    return config[key];
+  });
 
   generatePdfObservableFactory.mockReturnValue(jest.fn());
 });
 
 afterEach(() => generatePdfObservableFactory.mockReset());
 
+const getMockLogger = () => new LevelLogger();
+const mockElasticsearch = {
+  dataClient: {
+    asScoped: () => ({ callAsCurrentUser: jest.fn() }),
+  },
+};
+
+const encryptHeaders = async headers => {
+  const crypto = cryptoFactory(mockServer);
+  return await crypto.encrypt(headers);
+};
+
 test(`returns content_type of application/pdf`, async () => {
-  const executeJob = await executeJobFactory(mockReporting, getMockLogger());
+  const executeJob = await executeJobFactory(
+    mockReporting,
+    mockServer,
+    mockElasticsearch,
+    getMockLogger()
+  );
   const encryptedHeaders = await encryptHeaders({});
 
   const generatePdfObservable = generatePdfObservableFactory();
@@ -91,7 +84,12 @@ test(`returns content of generatePdf getBuffer base64 encoded`, async () => {
   const generatePdfObservable = generatePdfObservableFactory();
   generatePdfObservable.mockReturnValue(Rx.of({ buffer: Buffer.from(testContent) }));
 
-  const executeJob = await executeJobFactory(mockReporting, getMockLogger());
+  const executeJob = await executeJobFactory(
+    mockReporting,
+    mockServer,
+    mockElasticsearch,
+    getMockLogger()
+  );
   const encryptedHeaders = await encryptHeaders({});
   const { content } = await executeJob(
     'pdfJobId',
diff --git a/x-pack/legacy/plugins/reporting/export_types/printable_pdf/server/execute_job/index.ts b/x-pack/legacy/plugins/reporting/export_types/printable_pdf/server/execute_job/index.ts
index e614db46c5730..535c2dcd439a7 100644
--- a/x-pack/legacy/plugins/reporting/export_types/printable_pdf/server/execute_job/index.ts
+++ b/x-pack/legacy/plugins/reporting/export_types/printable_pdf/server/execute_job/index.ts
@@ -4,11 +4,18 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+import { ElasticsearchServiceSetup } from 'kibana/server';
 import * as Rx from 'rxjs';
 import { catchError, map, mergeMap, takeUntil } from 'rxjs/operators';
 import { PDF_JOB_TYPE } from '../../../../common/constants';
 import { ReportingCore } from '../../../../server';
-import { ESQueueWorkerExecuteFn, ExecuteJobFactory, JobDocOutput, Logger } from '../../../../types';
+import {
+  ESQueueWorkerExecuteFn,
+  ExecuteJobFactory,
+  JobDocOutput,
+  Logger,
+  ServerFacade,
+} from '../../../../types';
 import {
   decryptJobHeaders,
   getConditionalHeaders,
@@ -23,25 +30,23 @@ type QueuedPdfExecutorFactory = ExecuteJobFactory<ESQueueWorkerExecuteFn<JobDocP
 
 export const executeJobFactory: QueuedPdfExecutorFactory = async function executeJobFactoryFn(
   reporting: ReportingCore,
+  server: ServerFacade,
+  elasticsearch: ElasticsearchServiceSetup,
   parentLogger: Logger
 ) {
-  const config = await reporting.getConfig();
-  const captureConfig = config.get('capture');
-  const encryptionKey = config.get('encryptionKey');
-
   const browserDriverFactory = await reporting.getBrowserDriverFactory();
-  const generatePdfObservable = generatePdfObservableFactory(captureConfig, browserDriverFactory);
+  const generatePdfObservable = generatePdfObservableFactory(server, browserDriverFactory);
   const logger = parentLogger.clone([PDF_JOB_TYPE, 'execute']);
 
   return function executeJob(jobId: string, job: JobDocPayloadPDF, cancellationToken: any) {
     const jobLogger = logger.clone([jobId]);
     const process$: Rx.Observable<JobDocOutput> = Rx.of(1).pipe(
-      mergeMap(() => decryptJobHeaders({ encryptionKey, job, logger })),
+      mergeMap(() => decryptJobHeaders({ server, job, logger })),
       map(decryptedHeaders => omitBlacklistedHeaders({ job, decryptedHeaders })),
-      map(filteredHeaders => getConditionalHeaders({ config, job, filteredHeaders })),
-      mergeMap(conditionalHeaders => getCustomLogo({ reporting, config, job, conditionalHeaders })),
+      map(filteredHeaders => getConditionalHeaders({ server, job, filteredHeaders })),
+      mergeMap(conditionalHeaders => getCustomLogo({ reporting, server, job, conditionalHeaders })),
       mergeMap(({ logo, conditionalHeaders }) => {
-        const urls = getFullUrls({ config, job });
+        const urls = getFullUrls({ server, job });
 
         const { browserTimezone, layout, title } = job;
         return generatePdfObservable(
diff --git a/x-pack/legacy/plugins/reporting/export_types/printable_pdf/server/lib/generate_pdf.ts b/x-pack/legacy/plugins/reporting/export_types/printable_pdf/server/lib/generate_pdf.ts
index 7021fae983aa2..d78effaa1fc2f 100644
--- a/x-pack/legacy/plugins/reporting/export_types/printable_pdf/server/lib/generate_pdf.ts
+++ b/x-pack/legacy/plugins/reporting/export_types/printable_pdf/server/lib/generate_pdf.ts
@@ -8,8 +8,7 @@ import { groupBy } from 'lodash';
 import * as Rx from 'rxjs';
 import { mergeMap } from 'rxjs/operators';
 import { LevelLogger } from '../../../../server/lib';
-import { ReportingConfigType } from '../../../../server/core';
-import { ConditionalHeaders, HeadlessChromiumDriverFactory } from '../../../../types';
+import { ConditionalHeaders, HeadlessChromiumDriverFactory, ServerFacade } from '../../../../types';
 import { createLayout } from '../../../common/layouts';
 import { LayoutInstance, LayoutParams } from '../../../common/layouts/layout';
 import { screenshotsObservableFactory } from '../../../common/lib/screenshots';
@@ -28,10 +27,10 @@ const getTimeRange = (urlScreenshots: ScreenshotResults[]) => {
 };
 
 export function generatePdfObservableFactory(
-  captureConfig: ReportingConfigType['capture'],
+  server: ServerFacade,
   browserDriverFactory: HeadlessChromiumDriverFactory
 ) {
-  const screenshotsObservable = screenshotsObservableFactory(captureConfig, browserDriverFactory);
+  const screenshotsObservable = screenshotsObservableFactory(server, browserDriverFactory);
 
   return function generatePdfObservable(
     logger: LevelLogger,
@@ -42,7 +41,7 @@ export function generatePdfObservableFactory(
     layoutParams: LayoutParams,
     logo?: string
   ): Rx.Observable<{ buffer: Buffer; warnings: string[] }> {
-    const layout = createLayout(captureConfig, layoutParams) as LayoutInstance;
+    const layout = createLayout(server, layoutParams) as LayoutInstance;
     const screenshots$ = screenshotsObservable({
       logger,
       urls,
diff --git a/x-pack/legacy/plugins/reporting/export_types/printable_pdf/types.d.ts b/x-pack/legacy/plugins/reporting/export_types/printable_pdf/types.d.ts
index e8dd3c5207d92..0a9dcfe986ca6 100644
--- a/x-pack/legacy/plugins/reporting/export_types/printable_pdf/types.d.ts
+++ b/x-pack/legacy/plugins/reporting/export_types/printable_pdf/types.d.ts
@@ -4,8 +4,8 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { JobDocPayload } from '../../types';
 import { LayoutInstance, LayoutParams } from '../common/layouts/layout';
+import { JobDocPayload, ServerFacade, RequestFacade } from '../../types';
 
 // Job params: structure of incoming user request data, after being parsed from RISON
 export interface JobParamsPDF {
diff --git a/x-pack/legacy/plugins/reporting/index.test.js b/x-pack/legacy/plugins/reporting/index.test.js
new file mode 100644
index 0000000000000..0d9a717bd7d81
--- /dev/null
+++ b/x-pack/legacy/plugins/reporting/index.test.js
@@ -0,0 +1,34 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { reporting } from './index';
+import { getConfigSchema } from '../../../test_utils';
+
+// The snapshot records the number of cpus available
+// to make the snapshot deterministic `os.cpus` needs to be mocked
+// but the other members on `os` must remain untouched
+jest.mock('os', () => {
+  const os = jest.requireActual('os');
+  os.cpus = () => [{}, {}, {}, {}];
+  return os;
+});
+
+// eslint-disable-next-line jest/valid-describe
+const describeWithContext = describe.each([
+  [{ dev: false, dist: false }],
+  [{ dev: true, dist: false }],
+  [{ dev: false, dist: true }],
+  [{ dev: true, dist: true }],
+]);
+
+describeWithContext('config schema with context %j', context => {
+  it('produces correct config', async () => {
+    const schema = await getConfigSchema(reporting);
+    const value = await schema.validate({}, { context });
+    value.capture.browser.chromium.disableSandbox = '<platform dependent>';
+    await expect(value).toMatchSnapshot();
+  });
+});
diff --git a/x-pack/legacy/plugins/reporting/index.ts b/x-pack/legacy/plugins/reporting/index.ts
index fb95e2c2edc24..89e98302cddc9 100644
--- a/x-pack/legacy/plugins/reporting/index.ts
+++ b/x-pack/legacy/plugins/reporting/index.ts
@@ -8,16 +8,21 @@ import { i18n } from '@kbn/i18n';
 import { Legacy } from 'kibana';
 import { resolve } from 'path';
 import { PLUGIN_ID, UI_SETTINGS_CUSTOM_PDF_LOGO } from './common/constants';
+import { config as reportingConfig } from './config';
 import { legacyInit } from './server/legacy';
 import { ReportingPluginSpecOptions } from './types';
 
-const kbToBase64Length = (kb: number) => Math.floor((kb * 1024 * 8) / 6);
+const kbToBase64Length = (kb: number) => {
+  return Math.floor((kb * 1024 * 8) / 6);
+};
 
 export const reporting = (kibana: any) => {
   return new kibana.Plugin({
     id: PLUGIN_ID,
+    configPrefix: 'xpack.reporting',
     publicDir: resolve(__dirname, 'public'),
     require: ['kibana', 'elasticsearch', 'xpack_main'],
+    config: reportingConfig,
 
     uiExports: {
       uiSettingDefaults: {
@@ -44,5 +49,14 @@ export const reporting = (kibana: any) => {
     async init(server: Legacy.Server) {
       return legacyInit(server, this);
     },
+
+    deprecations({ unused }: any) {
+      return [
+        unused('capture.concurrency'),
+        unused('capture.timeout'),
+        unused('capture.settleTime'),
+        unused('kibanaApp'),
+      ];
+    },
   } as ReportingPluginSpecOptions);
 };
diff --git a/x-pack/legacy/plugins/reporting/log_configuration.ts b/x-pack/legacy/plugins/reporting/log_configuration.ts
index 7aaed2038bd52..b07475df6304f 100644
--- a/x-pack/legacy/plugins/reporting/log_configuration.ts
+++ b/x-pack/legacy/plugins/reporting/log_configuration.ts
@@ -6,23 +6,22 @@
 
 import getosSync, { LinuxOs } from 'getos';
 import { promisify } from 'util';
-import { BROWSER_TYPE } from './common/constants';
-import { CaptureConfig } from './server/types';
-import { Logger } from './types';
+import { ServerFacade, Logger } from './types';
 
 const getos = promisify(getosSync);
 
-export async function logConfiguration(captureConfig: CaptureConfig, logger: Logger) {
-  const {
-    browser: {
-      type: browserType,
-      chromium: { disableSandbox },
-    },
-  } = captureConfig;
+export async function logConfiguration(server: ServerFacade, logger: Logger) {
+  const config = server.config();
 
+  const browserType = config.get('xpack.reporting.capture.browser.type');
   logger.debug(`Browser type: ${browserType}`);
-  if (browserType === BROWSER_TYPE) {
-    logger.debug(`Chromium sandbox disabled: ${disableSandbox}`);
+
+  if (browserType === 'chromium') {
+    logger.debug(
+      `Chromium sandbox disabled: ${config.get(
+        'xpack.reporting.capture.browser.chromium.disableSandbox'
+      )}`
+    );
   }
 
   const os = await getos();
diff --git a/x-pack/legacy/plugins/reporting/server/browsers/chromium/driver_factory/args.ts b/x-pack/legacy/plugins/reporting/server/browsers/chromium/driver_factory/args.ts
index a2f7a1f3ad0da..dc79a6b9db2c1 100644
--- a/x-pack/legacy/plugins/reporting/server/browsers/chromium/driver_factory/args.ts
+++ b/x-pack/legacy/plugins/reporting/server/browsers/chromium/driver_factory/args.ts
@@ -4,14 +4,11 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { CaptureConfig } from '../../../../server/types';
-
-type ViewportConfig = CaptureConfig['viewport'];
-type BrowserConfig = CaptureConfig['browser']['chromium'];
+import { BrowserConfig } from '../../../../types';
 
 interface LaunchArgs {
   userDataDir: BrowserConfig['userDataDir'];
-  viewport: ViewportConfig;
+  viewport: BrowserConfig['viewport'];
   disableSandbox: BrowserConfig['disableSandbox'];
   proxy: BrowserConfig['proxy'];
 }
diff --git a/x-pack/legacy/plugins/reporting/server/browsers/chromium/driver_factory/index.ts b/x-pack/legacy/plugins/reporting/server/browsers/chromium/driver_factory/index.ts
index cb228150efbcd..f90f2c7aee395 100644
--- a/x-pack/legacy/plugins/reporting/server/browsers/chromium/driver_factory/index.ts
+++ b/x-pack/legacy/plugins/reporting/server/browsers/chromium/driver_factory/index.ts
@@ -19,8 +19,7 @@ import {
 import * as Rx from 'rxjs';
 import { InnerSubscriber } from 'rxjs/internal/InnerSubscriber';
 import { ignoreElements, map, mergeMap, tap } from 'rxjs/operators';
-import { BROWSER_TYPE } from '../../../../common/constants';
-import { CaptureConfig } from '../../../../server/types';
+import { BrowserConfig, CaptureConfig } from '../../../../types';
 import { LevelLogger as Logger } from '../../../lib/level_logger';
 import { safeChildProcess } from '../../safe_child_process';
 import { HeadlessChromiumDriver } from '../driver';
@@ -29,8 +28,7 @@ import { puppeteerLaunch } from '../puppeteer';
 import { args } from './args';
 
 type binaryPath = string;
-type BrowserConfig = CaptureConfig['browser']['chromium'];
-type ViewportConfig = CaptureConfig['viewport'];
+type ViewportConfig = BrowserConfig['viewport'];
 
 export class HeadlessChromiumDriverFactory {
   private binaryPath: binaryPath;
@@ -39,10 +37,15 @@ export class HeadlessChromiumDriverFactory {
   private userDataDir: string;
   private getChromiumArgs: (viewport: ViewportConfig) => string[];
 
-  constructor(binaryPath: binaryPath, logger: Logger, captureConfig: CaptureConfig) {
+  constructor(
+    binaryPath: binaryPath,
+    logger: Logger,
+    browserConfig: BrowserConfig,
+    captureConfig: CaptureConfig
+  ) {
     this.binaryPath = binaryPath;
+    this.browserConfig = browserConfig;
     this.captureConfig = captureConfig;
-    this.browserConfig = captureConfig.browser.chromium;
 
     this.userDataDir = fs.mkdtempSync(path.join(os.tmpdir(), 'chromium-'));
     this.getChromiumArgs = (viewport: ViewportConfig) =>
@@ -54,7 +57,7 @@ export class HeadlessChromiumDriverFactory {
       });
   }
 
-  type = BROWSER_TYPE;
+  type = 'chromium';
 
   test(logger: Logger) {
     const chromiumArgs = args({
@@ -150,7 +153,7 @@ export class HeadlessChromiumDriverFactory {
 
       // HeadlessChromiumDriver: object to "drive" a browser page
       const driver = new HeadlessChromiumDriver(page, {
-        inspect: !!this.browserConfig.inspect,
+        inspect: this.browserConfig.inspect,
         networkPolicy: this.captureConfig.networkPolicy,
       });
 
diff --git a/x-pack/legacy/plugins/reporting/server/browsers/chromium/index.ts b/x-pack/legacy/plugins/reporting/server/browsers/chromium/index.ts
index 5f89662c94da2..d32338ae3e311 100644
--- a/x-pack/legacy/plugins/reporting/server/browsers/chromium/index.ts
+++ b/x-pack/legacy/plugins/reporting/server/browsers/chromium/index.ts
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { CaptureConfig } from '../../../server/types';
+import { BrowserConfig, CaptureConfig } from '../../../types';
 import { LevelLogger } from '../../lib';
 import { HeadlessChromiumDriverFactory } from './driver_factory';
 
@@ -13,7 +13,8 @@ export { paths } from './paths';
 export async function createDriverFactory(
   binaryPath: string,
   logger: LevelLogger,
+  browserConfig: BrowserConfig,
   captureConfig: CaptureConfig
 ): Promise<HeadlessChromiumDriverFactory> {
-  return new HeadlessChromiumDriverFactory(binaryPath, logger, captureConfig);
+  return new HeadlessChromiumDriverFactory(binaryPath, logger, browserConfig, captureConfig);
 }
diff --git a/x-pack/legacy/plugins/reporting/server/browsers/create_browser_driver_factory.ts b/x-pack/legacy/plugins/reporting/server/browsers/create_browser_driver_factory.ts
index af3b86919dc50..49c6222c9f276 100644
--- a/x-pack/legacy/plugins/reporting/server/browsers/create_browser_driver_factory.ts
+++ b/x-pack/legacy/plugins/reporting/server/browsers/create_browser_driver_factory.ts
@@ -4,22 +4,24 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { Logger } from '../../types';
-import { ReportingConfig } from '../types';
-import { HeadlessChromiumDriverFactory } from './chromium/driver_factory';
 import { ensureBrowserDownloaded } from './download';
-import { chromium } from './index';
 import { installBrowser } from './install';
+import { ServerFacade, CaptureConfig, Logger } from '../../types';
+import { BROWSER_TYPE } from '../../common/constants';
+import { chromium } from './index';
+import { HeadlessChromiumDriverFactory } from './chromium/driver_factory';
 
 export async function createBrowserDriverFactory(
-  config: ReportingConfig,
+  server: ServerFacade,
   logger: Logger
 ): Promise<HeadlessChromiumDriverFactory> {
-  const captureConfig = config.get('capture');
-  const browserConfig = captureConfig.browser.chromium;
-  const browserAutoDownload = captureConfig.browser.autoDownload;
+  const config = server.config();
+
+  const dataDir: string = config.get('path.data');
+  const captureConfig: CaptureConfig = config.get('xpack.reporting.capture');
   const browserType = captureConfig.browser.type;
-  const dataDir = config.kbnConfig.get('path', 'data');
+  const browserAutoDownload = captureConfig.browser.autoDownload;
+  const browserConfig = captureConfig.browser[BROWSER_TYPE];
 
   if (browserConfig.disableSandbox) {
     logger.warning(`Enabling the Chromium sandbox provides an additional layer of protection.`);
@@ -30,7 +32,7 @@ export async function createBrowserDriverFactory(
 
   try {
     const { binaryPath } = await installBrowser(logger, chromium, dataDir);
-    return chromium.createDriverFactory(binaryPath, logger, captureConfig);
+    return chromium.createDriverFactory(binaryPath, logger, browserConfig, captureConfig);
   } catch (error) {
     if (error.cause && ['EACCES', 'EEXIST'].includes(error.cause.code)) {
       logger.error(
diff --git a/x-pack/legacy/plugins/reporting/server/browsers/download/ensure_downloaded.ts b/x-pack/legacy/plugins/reporting/server/browsers/download/ensure_downloaded.ts
index 3697c4b86ce3c..73186966e3d2f 100644
--- a/x-pack/legacy/plugins/reporting/server/browsers/download/ensure_downloaded.ts
+++ b/x-pack/legacy/plugins/reporting/server/browsers/download/ensure_downloaded.ts
@@ -4,15 +4,16 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { existsSync } from 'fs';
 import { resolve as resolvePath } from 'path';
-import { BROWSER_TYPE } from '../../../common/constants';
+import { existsSync } from 'fs';
+
 import { chromium } from '../index';
-import { BrowserDownload } from '../types';
+import { BrowserDownload, BrowserType } from '../types';
+
 import { md5 } from './checksum';
-import { clean } from './clean';
-import { download } from './download';
 import { asyncMap } from './util';
+import { download } from './download';
+import { clean } from './clean';
 
 /**
  * Check for the downloaded archive of each requested browser type and
@@ -20,7 +21,7 @@ import { asyncMap } from './util';
  * @param  {String} browserType
  * @return {Promise<undefined>}
  */
-export async function ensureBrowserDownloaded(browserType = BROWSER_TYPE) {
+export async function ensureBrowserDownloaded(browserType: BrowserType) {
   await ensureDownloaded([chromium]);
 }
 
diff --git a/x-pack/legacy/plugins/reporting/server/browsers/network_policy.ts b/x-pack/legacy/plugins/reporting/server/browsers/network_policy.ts
index 9714c5965a5db..b36345c08bfee 100644
--- a/x-pack/legacy/plugins/reporting/server/browsers/network_policy.ts
+++ b/x-pack/legacy/plugins/reporting/server/browsers/network_policy.ts
@@ -6,7 +6,12 @@
 
 import * as _ from 'lodash';
 import { parse } from 'url';
-import { NetworkPolicyRule } from '../../types';
+
+interface FirewallRule {
+  allow: boolean;
+  host?: string;
+  protocol?: string;
+}
 
 const isHostMatch = (actualHost: string, ruleHost: string) => {
   const hostParts = actualHost.split('.').reverse();
@@ -15,7 +20,7 @@ const isHostMatch = (actualHost: string, ruleHost: string) => {
   return _.every(ruleParts, (part, idx) => part === hostParts[idx]);
 };
 
-export const allowRequest = (url: string, rules: NetworkPolicyRule[]) => {
+export const allowRequest = (url: string, rules: FirewallRule[]) => {
   const parsed = parse(url);
 
   if (!rules.length) {
diff --git a/x-pack/legacy/plugins/reporting/server/browsers/types.d.ts b/x-pack/legacy/plugins/reporting/server/browsers/types.d.ts
index f096073ec2f5f..0c480fc82752b 100644
--- a/x-pack/legacy/plugins/reporting/server/browsers/types.d.ts
+++ b/x-pack/legacy/plugins/reporting/server/browsers/types.d.ts
@@ -4,6 +4,8 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+export type BrowserType = 'chromium';
+
 export interface BrowserDownload {
   paths: {
     archivesPath: string;
diff --git a/x-pack/legacy/plugins/reporting/server/config/config.js b/x-pack/legacy/plugins/reporting/server/config/config.js
new file mode 100644
index 0000000000000..08e4db464b003
--- /dev/null
+++ b/x-pack/legacy/plugins/reporting/server/config/config.js
@@ -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 { cpus } from 'os';
+
+const defaultCPUCount = 2;
+
+function cpuCount() {
+  try {
+    return cpus().length;
+  } catch (e) {
+    return defaultCPUCount;
+  }
+}
+
+export const config = {
+  concurrency: cpuCount(),
+};
diff --git a/x-pack/legacy/plugins/reporting/server/core.ts b/x-pack/legacy/plugins/reporting/server/core.ts
index c233a63833950..4506d41e4f5c3 100644
--- a/x-pack/legacy/plugins/reporting/server/core.ts
+++ b/x-pack/legacy/plugins/reporting/server/core.ts
@@ -7,14 +7,12 @@
 import * as Rx from 'rxjs';
 import { first, mapTo } from 'rxjs/operators';
 import {
-  ElasticsearchServiceSetup,
   IUiSettingsClient,
   KibanaRequest,
   SavedObjectsClient,
   SavedObjectsServiceStart,
   UiSettingsServiceStart,
 } from 'src/core/server';
-import { ConfigType as ReportingConfigType } from '../../../../plugins/reporting/server';
 // @ts-ignore no module definition
 import { mirrorPluginStatus } from '../../../server/lib/mirror_plugin_status';
 import { XPackMainPlugin } from '../../xpack_main/server/xpack_main';
@@ -27,63 +25,14 @@ import { ReportingSetupDeps } from './types';
 
 interface ReportingInternalSetup {
   browserDriverFactory: HeadlessChromiumDriverFactory;
-  config: ReportingConfig;
-  elasticsearch: ElasticsearchServiceSetup;
 }
 interface ReportingInternalStart {
-  enqueueJob: EnqueueJobFn;
-  esqueue: ESQueueInstance;
   savedObjects: SavedObjectsServiceStart;
   uiSettings: UiSettingsServiceStart;
+  esqueue: ESQueueInstance;
+  enqueueJob: EnqueueJobFn;
 }
 
-// make config.get() aware of the value type it returns
-interface Config<BaseType> {
-  get<Key1 extends keyof BaseType>(key1: Key1): BaseType[Key1];
-  get<Key1 extends keyof BaseType, Key2 extends keyof BaseType[Key1]>(
-    key1: Key1,
-    key2: Key2
-  ): BaseType[Key1][Key2];
-  get<
-    Key1 extends keyof BaseType,
-    Key2 extends keyof BaseType[Key1],
-    Key3 extends keyof BaseType[Key1][Key2]
-  >(
-    key1: Key1,
-    key2: Key2,
-    key3: Key3
-  ): BaseType[Key1][Key2][Key3];
-  get<
-    Key1 extends keyof BaseType,
-    Key2 extends keyof BaseType[Key1],
-    Key3 extends keyof BaseType[Key1][Key2],
-    Key4 extends keyof BaseType[Key1][Key2][Key3]
-  >(
-    key1: Key1,
-    key2: Key2,
-    key3: Key3,
-    key4: Key4
-  ): BaseType[Key1][Key2][Key3][Key4];
-}
-
-interface KbnServerConfigType {
-  path: { data: string };
-  server: {
-    basePath: string;
-    host: string;
-    name: string;
-    port: number;
-    protocol: string;
-    uuid: string;
-  };
-}
-
-export interface ReportingConfig extends Config<ReportingConfigType> {
-  kbnConfig: Config<KbnServerConfigType>;
-}
-
-export { ReportingConfigType };
-
 export class ReportingCore {
   private pluginSetupDeps?: ReportingInternalSetup;
   private pluginStartDeps?: ReportingInternalStart;
@@ -96,7 +45,6 @@ export class ReportingCore {
   legacySetup(
     xpackMainPlugin: XPackMainPlugin,
     reporting: ReportingPluginSpecOptions,
-    config: ReportingConfig,
     __LEGACY: ServerFacade,
     plugins: ReportingSetupDeps
   ) {
@@ -108,7 +56,7 @@ export class ReportingCore {
       xpackMainPlugin.info.feature(PLUGIN_ID).registerLicenseCheckResultsGenerator(checkLicense);
     });
     // Reporting routes
-    registerRoutes(this, config, __LEGACY, plugins, this.logger);
+    registerRoutes(this, __LEGACY, plugins, this.logger);
   }
 
   public pluginSetup(reportingSetupDeps: ReportingInternalSetup) {
@@ -142,31 +90,23 @@ export class ReportingCore {
     return (await this.getPluginSetupDeps()).browserDriverFactory;
   }
 
-  public async getConfig(): Promise<ReportingConfig> {
-    return (await this.getPluginSetupDeps()).config;
-  }
-
   /*
-   * Outside dependencies
+   * Kibana core module dependencies
    */
-  private async getPluginSetupDeps(): Promise<ReportingInternalSetup> {
+  private async getPluginSetupDeps() {
     if (this.pluginSetupDeps) {
       return this.pluginSetupDeps;
     }
     return await this.pluginSetup$.pipe(first()).toPromise();
   }
 
-  private async getPluginStartDeps(): Promise<ReportingInternalStart> {
+  private async getPluginStartDeps() {
     if (this.pluginStartDeps) {
       return this.pluginStartDeps;
     }
     return await this.pluginStart$.pipe(first()).toPromise();
   }
 
-  public async getElasticsearchService(): Promise<ElasticsearchServiceSetup> {
-    return (await this.getPluginSetupDeps()).elasticsearch;
-  }
-
   public async getSavedObjectsClient(fakeRequest: KibanaRequest): Promise<SavedObjectsClient> {
     const { savedObjects } = await this.getPluginStartDeps();
     return savedObjects.getScopedClient(fakeRequest) as SavedObjectsClient;
diff --git a/x-pack/legacy/plugins/reporting/server/index.ts b/x-pack/legacy/plugins/reporting/server/index.ts
index efcfd6b7f783d..24e2a954415d9 100644
--- a/x-pack/legacy/plugins/reporting/server/index.ts
+++ b/x-pack/legacy/plugins/reporting/server/index.ts
@@ -11,5 +11,5 @@ export const plugin = (context: PluginInitializerContext) => {
   return new Plugin(context);
 };
 
+export { ReportingCore } from './core';
 export { ReportingPlugin } from './plugin';
-export { ReportingConfig, ReportingCore } from './core';
diff --git a/x-pack/legacy/plugins/reporting/server/legacy.ts b/x-pack/legacy/plugins/reporting/server/legacy.ts
index 29e5af529767e..336ff5f4d2ee7 100644
--- a/x-pack/legacy/plugins/reporting/server/legacy.ts
+++ b/x-pack/legacy/plugins/reporting/server/legacy.ts
@@ -4,75 +4,35 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 import { Legacy } from 'kibana';
-import { get } from 'lodash';
-import { take } from 'rxjs/operators';
-import { CoreSetup, PluginInitializerContext } from 'src/core/server';
-import { ConfigType, PluginsSetup } from '../../../../plugins/reporting/server';
+import { PluginInitializerContext } from 'src/core/server';
 import { SecurityPluginSetup } from '../../../../plugins/security/server';
 import { ReportingPluginSpecOptions } from '../types';
 import { plugin } from './index';
-import { LegacySetup, ReportingConfig, ReportingStartDeps } from './types';
+import { LegacySetup, ReportingStartDeps } from './types';
 
 const buildLegacyDependencies = (
-  coreSetup: CoreSetup,
   server: Legacy.Server,
   reportingPlugin: ReportingPluginSpecOptions
-): LegacySetup => {
-  return {
-    route: server.route.bind(server),
-    plugins: {
-      xpack_main: server.plugins.xpack_main,
-      reporting: reportingPlugin,
-    },
-  };
-};
-
-const buildConfig = (
-  coreSetup: CoreSetup,
-  server: Legacy.Server,
-  reportingConfig: ConfigType
-): ReportingConfig => {
-  const config = server.config();
-  const { http } = coreSetup;
-  const serverInfo = http.getServerInfo();
-
-  const kbnConfig = {
-    path: {
-      data: config.get('path.data'), // FIXME: get from the real PluginInitializerContext
-    },
-    server: {
-      basePath: coreSetup.http.basePath.serverBasePath,
-      host: serverInfo.host,
-      name: serverInfo.name,
-      port: serverInfo.port,
-      uuid: coreSetup.uuid.getInstanceUuid(),
-      protocol: serverInfo.protocol,
-    },
-  };
-
-  // spreading arguments as an array allows the return type to be known by the compiler
-  return {
-    get: (...keys: string[]) => get(reportingConfig, keys.join('.'), null),
-    kbnConfig: {
-      get: (...keys: string[]) => get(kbnConfig, keys.join('.'), null),
-    },
-  };
-};
+): LegacySetup => ({
+  config: server.config,
+  info: server.info,
+  route: server.route.bind(server),
+  plugins: {
+    elasticsearch: server.plugins.elasticsearch,
+    xpack_main: server.plugins.xpack_main,
+    reporting: reportingPlugin,
+  },
+});
 
 export const legacyInit = async (
   server: Legacy.Server,
-  reportingLegacyPlugin: ReportingPluginSpecOptions
+  reportingPlugin: ReportingPluginSpecOptions
 ) => {
-  const { core: coreSetup } = server.newPlatform.setup;
-  const { config$ } = (server.newPlatform.setup.plugins.reporting as PluginsSetup).__legacy;
-  const reportingConfig = await config$.pipe(take(1)).toPromise();
-  const reporting = { config: buildConfig(coreSetup, server, reportingConfig) };
-
-  const __LEGACY = buildLegacyDependencies(coreSetup, server, reportingLegacyPlugin);
+  const coreSetup = server.newPlatform.setup.core;
+  const pluginInstance = plugin(server.newPlatform.coreContext as PluginInitializerContext);
 
-  const pluginInstance = plugin(server.newPlatform.coreContext as PluginInitializerContext); // NOTE: mocked-out PluginInitializerContext
+  const __LEGACY = buildLegacyDependencies(server, reportingPlugin);
   await pluginInstance.setup(coreSetup, {
-    reporting,
     elasticsearch: coreSetup.elasticsearch,
     security: server.newPlatform.setup.plugins.security as SecurityPluginSetup,
     usageCollection: server.newPlatform.setup.plugins.usageCollection,
@@ -82,6 +42,7 @@ export const legacyInit = async (
   // Schedule to call the "start" hook only after start dependencies are ready
   coreSetup.getStartServices().then(([core, plugins]) =>
     pluginInstance.start(core, {
+      elasticsearch: coreSetup.elasticsearch,
       data: (plugins as ReportingStartDeps).data,
       __LEGACY,
     })
diff --git a/x-pack/legacy/plugins/reporting/server/lib/create_queue.ts b/x-pack/legacy/plugins/reporting/server/lib/create_queue.ts
index a05205526dd3e..d593e4625cdf4 100644
--- a/x-pack/legacy/plugins/reporting/server/lib/create_queue.ts
+++ b/x-pack/legacy/plugins/reporting/server/lib/create_queue.ts
@@ -4,24 +4,22 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { ESQueueInstance, Logger } from '../../types';
+import { ElasticsearchServiceSetup } from 'kibana/server';
+import { ESQueueInstance, ServerFacade, QueueConfig, Logger } from '../../types';
 import { ReportingCore } from '../core';
-import { createTaggedLogger } from './create_tagged_logger'; // TODO remove createTaggedLogger once esqueue is removed
-import { createWorkerFactory } from './create_worker';
 // @ts-ignore
 import { Esqueue } from './esqueue';
+import { createWorkerFactory } from './create_worker';
+import { createTaggedLogger } from './create_tagged_logger'; // TODO remove createTaggedLogger once esqueue is removed
 
 export async function createQueueFactory<JobParamsType, JobPayloadType>(
   reporting: ReportingCore,
+  server: ServerFacade,
+  elasticsearch: ElasticsearchServiceSetup,
   logger: Logger
 ): Promise<ESQueueInstance> {
-  const [config, elasticsearch] = await Promise.all([
-    reporting.getConfig(),
-    reporting.getElasticsearchService(),
-  ]);
-
-  const queueConfig = config.get('queue');
-  const index = config.get('index');
+  const queueConfig: QueueConfig = server.config().get('xpack.reporting.queue');
+  const index = server.config().get('xpack.reporting.index');
 
   const queueOptions = {
     interval: queueConfig.indexInterval,
@@ -35,7 +33,7 @@ export async function createQueueFactory<JobParamsType, JobPayloadType>(
 
   if (queueConfig.pollEnabled) {
     // create workers to poll the index for idle jobs waiting to be claimed and executed
-    const createWorker = await createWorkerFactory(reporting, config, logger);
+    const createWorker = createWorkerFactory(reporting, server, elasticsearch, logger);
     await createWorker(queue);
   } else {
     logger.info(
diff --git a/x-pack/legacy/plugins/reporting/server/lib/create_worker.test.ts b/x-pack/legacy/plugins/reporting/server/lib/create_worker.test.ts
index 01a937a49873a..d4d913243e18d 100644
--- a/x-pack/legacy/plugins/reporting/server/lib/create_worker.test.ts
+++ b/x-pack/legacy/plugins/reporting/server/lib/create_worker.test.ts
@@ -4,9 +4,11 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+import { ElasticsearchServiceSetup } from 'kibana/server';
 import * as sinon from 'sinon';
-import { ReportingConfig, ReportingCore } from '../../server/types';
+import { ReportingCore } from '../../server';
 import { createMockReportingCore } from '../../test_helpers';
+import { ServerFacade } from '../../types';
 import { createWorkerFactory } from './create_worker';
 // @ts-ignore
 import { Esqueue } from './esqueue';
@@ -15,15 +17,21 @@ import { ClientMock } from './esqueue/__tests__/fixtures/legacy_elasticsearch';
 import { ExportTypesRegistry } from './export_types_registry';
 
 const configGetStub = sinon.stub();
-configGetStub.withArgs('queue').returns({
+configGetStub.withArgs('xpack.reporting.queue').returns({
   pollInterval: 3300,
   pollIntervalErrorMultiplier: 10,
 });
-configGetStub.withArgs('server', 'name').returns('test-server-123');
-configGetStub.withArgs('server', 'uuid').returns('g9ymiujthvy6v8yrh7567g6fwzgzftzfr');
+configGetStub.withArgs('server.name').returns('test-server-123');
+configGetStub.withArgs('server.uuid').returns('g9ymiujthvy6v8yrh7567g6fwzgzftzfr');
 
 const executeJobFactoryStub = sinon.stub();
-const getMockLogger = sinon.stub();
+
+const getMockServer = (): ServerFacade => {
+  return ({
+    config: () => ({ get: configGetStub }),
+  } as unknown) as ServerFacade;
+};
+const getMockLogger = jest.fn();
 
 const getMockExportTypesRegistry = (
   exportTypes: any[] = [{ executeJobFactory: executeJobFactoryStub }]
@@ -33,23 +41,25 @@ const getMockExportTypesRegistry = (
   } as ExportTypesRegistry);
 
 describe('Create Worker', () => {
-  let mockReporting: ReportingCore;
-  let mockConfig: ReportingConfig;
   let queue: Esqueue;
   let client: ClientMock;
+  let mockReporting: ReportingCore;
 
   beforeEach(async () => {
     mockReporting = await createMockReportingCore();
-    mockReporting.getExportTypesRegistry = () => getMockExportTypesRegistry();
-    mockConfig = { get: configGetStub, kbnConfig: { get: configGetStub } };
-    mockReporting.getConfig = () => Promise.resolve(mockConfig);
     client = new ClientMock();
     queue = new Esqueue('reporting-queue', { client });
     executeJobFactoryStub.reset();
   });
 
   test('Creates a single Esqueue worker for Reporting', async () => {
-    const createWorker = await createWorkerFactory(mockReporting, mockConfig, getMockLogger());
+    mockReporting.getExportTypesRegistry = () => getMockExportTypesRegistry();
+    const createWorker = createWorkerFactory(
+      mockReporting,
+      getMockServer(),
+      {} as ElasticsearchServiceSetup,
+      getMockLogger()
+    );
     const registerWorkerSpy = sinon.spy(queue, 'registerWorker');
 
     await createWorker(queue);
@@ -81,7 +91,12 @@ Object {
       { executeJobFactory: executeJobFactoryStub },
     ]);
     mockReporting.getExportTypesRegistry = () => exportTypesRegistry;
-    const createWorker = await createWorkerFactory(mockReporting, mockConfig, getMockLogger());
+    const createWorker = createWorkerFactory(
+      mockReporting,
+      getMockServer(),
+      {} as ElasticsearchServiceSetup,
+      getMockLogger()
+    );
     const registerWorkerSpy = sinon.spy(queue, 'registerWorker');
 
     await createWorker(queue);
diff --git a/x-pack/legacy/plugins/reporting/server/lib/create_worker.ts b/x-pack/legacy/plugins/reporting/server/lib/create_worker.ts
index e9d0acf29c721..3567712367608 100644
--- a/x-pack/legacy/plugins/reporting/server/lib/create_worker.ts
+++ b/x-pack/legacy/plugins/reporting/server/lib/create_worker.ts
@@ -4,9 +4,9 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+import { ElasticsearchServiceSetup } from 'kibana/server';
 import { CancellationToken } from '../../common/cancellation_token';
 import { PLUGIN_ID } from '../../common/constants';
-import { ReportingConfig } from '../../server/types';
 import {
   ESQueueInstance,
   ESQueueWorkerExecuteFn,
@@ -15,22 +15,25 @@ import {
   JobDocPayload,
   JobSource,
   Logger,
+  QueueConfig,
   RequestFacade,
+  ServerFacade,
 } from '../../types';
 import { ReportingCore } from '../core';
 // @ts-ignore untyped dependency
 import { events as esqueueEvents } from './esqueue';
 
-export async function createWorkerFactory<JobParamsType>(
+export function createWorkerFactory<JobParamsType>(
   reporting: ReportingCore,
-  config: ReportingConfig,
+  server: ServerFacade,
+  elasticsearch: ElasticsearchServiceSetup,
   logger: Logger
 ) {
   type JobDocPayloadType = JobDocPayload<JobParamsType>;
-
-  const queueConfig = config.get('queue');
-  const kibanaName = config.kbnConfig.get('server', 'name');
-  const kibanaId = config.kbnConfig.get('server', 'uuid');
+  const config = server.config();
+  const queueConfig: QueueConfig = config.get('xpack.reporting.queue');
+  const kibanaName: string = config.get('server.name');
+  const kibanaId: string = config.get('server.uuid');
 
   // Once more document types are added, this will need to be passed in
   return async function createWorker(queue: ESQueueInstance) {
@@ -44,7 +47,12 @@ export async function createWorkerFactory<JobParamsType>(
       ExportTypeDefinition<JobParamsType, unknown, unknown, any>
     >) {
       // TODO: the executeJobFn should be unwrapped in the register method of the export types registry
-      const jobExecutor = await exportType.executeJobFactory(reporting, logger);
+      const jobExecutor = await exportType.executeJobFactory(
+        reporting,
+        server,
+        elasticsearch,
+        logger
+      );
       jobExecutors.set(exportType.jobType, jobExecutor);
     }
 
diff --git a/x-pack/legacy/plugins/reporting/server/lib/crypto.ts b/x-pack/legacy/plugins/reporting/server/lib/crypto.ts
index 97876529ecfa7..dbc01fc947f8b 100644
--- a/x-pack/legacy/plugins/reporting/server/lib/crypto.ts
+++ b/x-pack/legacy/plugins/reporting/server/lib/crypto.ts
@@ -5,7 +5,12 @@
  */
 
 import nodeCrypto from '@elastic/node-crypto';
+import { oncePerServer } from './once_per_server';
+import { ServerFacade } from '../../types';
 
-export function cryptoFactory(encryptionKey: string | undefined) {
+function cryptoFn(server: ServerFacade) {
+  const encryptionKey = server.config().get('xpack.reporting.encryptionKey');
   return nodeCrypto({ encryptionKey });
 }
+
+export const cryptoFactory = oncePerServer(cryptoFn);
diff --git a/x-pack/legacy/plugins/reporting/server/lib/enqueue_job.ts b/x-pack/legacy/plugins/reporting/server/lib/enqueue_job.ts
index bc4754b02ed57..c215bdc398904 100644
--- a/x-pack/legacy/plugins/reporting/server/lib/enqueue_job.ts
+++ b/x-pack/legacy/plugins/reporting/server/lib/enqueue_job.ts
@@ -5,18 +5,22 @@
  */
 
 import { get } from 'lodash';
+import { ElasticsearchServiceSetup } from 'kibana/server';
+// @ts-ignore
+import { events as esqueueEvents } from './esqueue';
 import {
-  ConditionalHeaders,
   EnqueueJobFn,
   ESQueueCreateJobFn,
   ImmediateCreateJobFn,
   Job,
-  Logger,
+  ServerFacade,
   RequestFacade,
+  Logger,
+  CaptureConfig,
+  QueueConfig,
+  ConditionalHeaders,
 } from '../../types';
 import { ReportingCore } from '../core';
-// @ts-ignore
-import { events as esqueueEvents } from './esqueue';
 
 interface ConfirmedJob {
   id: string;
@@ -25,16 +29,18 @@ interface ConfirmedJob {
   _primary_term: number;
 }
 
-export async function enqueueJobFactory(
+export function enqueueJobFactory(
   reporting: ReportingCore,
+  server: ServerFacade,
+  elasticsearch: ElasticsearchServiceSetup,
   parentLogger: Logger
-): Promise<EnqueueJobFn> {
-  const config = await reporting.getConfig();
+): EnqueueJobFn {
   const logger = parentLogger.clone(['queue-job']);
-  const captureConfig = config.get('capture');
+  const config = server.config();
+  const captureConfig: CaptureConfig = config.get('xpack.reporting.capture');
   const browserType = captureConfig.browser.type;
   const maxAttempts = captureConfig.maxAttempts;
-  const queueConfig = config.get('queue');
+  const queueConfig: QueueConfig = config.get('xpack.reporting.queue');
 
   return async function enqueueJob<JobParamsType>(
     exportTypeId: string,
@@ -53,7 +59,12 @@ export async function enqueueJobFactory(
     }
 
     // TODO: the createJobFn should be unwrapped in the register method of the export types registry
-    const createJob = (await exportType.createJobFactory(reporting, logger)) as CreateJobFn;
+    const createJob = exportType.createJobFactory(
+      reporting,
+      server,
+      elasticsearch,
+      logger
+    ) as CreateJobFn;
     const payload = await createJob(jobParams, headers, request);
 
     const options = {
diff --git a/x-pack/legacy/plugins/reporting/server/lib/esqueue/helpers/index_timestamp.js b/x-pack/legacy/plugins/reporting/server/lib/esqueue/helpers/index_timestamp.js
index 8e4047e2f22e5..6cdbe8f968f75 100644
--- a/x-pack/legacy/plugins/reporting/server/lib/esqueue/helpers/index_timestamp.js
+++ b/x-pack/legacy/plugins/reporting/server/lib/esqueue/helpers/index_timestamp.js
@@ -8,7 +8,6 @@ import moment from 'moment';
 
 export const intervals = ['year', 'month', 'week', 'day', 'hour', 'minute'];
 
-// TODO: remove this helper by using `schema.duration` objects in the reporting config schema
 export function indexTimestamp(intervalStr, separator = '-') {
   if (separator.match(/[a-z]/i)) throw new Error('Interval separator can not be a letter');
 
diff --git a/x-pack/legacy/plugins/reporting/server/lib/get_user.ts b/x-pack/legacy/plugins/reporting/server/lib/get_user.ts
index 5e73fe77ecb79..49d5c568c3981 100644
--- a/x-pack/legacy/plugins/reporting/server/lib/get_user.ts
+++ b/x-pack/legacy/plugins/reporting/server/lib/get_user.ts
@@ -6,10 +6,10 @@
 
 import { Legacy } from 'kibana';
 import { KibanaRequest } from '../../../../../../src/core/server';
-import { Logger } from '../../types';
+import { ServerFacade } from '../../types';
 import { ReportingSetupDeps } from '../types';
 
-export function getUserFactory(security: ReportingSetupDeps['security'], logger: Logger) {
+export function getUserFactory(server: ServerFacade, security: ReportingSetupDeps['security']) {
   /*
    * Legacy.Request because this is called from routing middleware
    */
diff --git a/x-pack/legacy/plugins/reporting/server/lib/index.ts b/x-pack/legacy/plugins/reporting/server/lib/index.ts
index f5ccbe493a91f..0a2db749cb954 100644
--- a/x-pack/legacy/plugins/reporting/server/lib/index.ts
+++ b/x-pack/legacy/plugins/reporting/server/lib/index.ts
@@ -4,10 +4,11 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-export { checkLicenseFactory } from './check_license';
-export { createQueueFactory } from './create_queue';
-export { cryptoFactory } from './crypto';
-export { enqueueJobFactory } from './enqueue_job';
 export { getExportTypesRegistry } from './export_types_registry';
+export { checkLicenseFactory } from './check_license';
 export { LevelLogger } from './level_logger';
+export { cryptoFactory } from './crypto';
+export { oncePerServer } from './once_per_server';
 export { runValidations } from './validate';
+export { createQueueFactory } from './create_queue';
+export { enqueueJobFactory } from './enqueue_job';
diff --git a/x-pack/legacy/plugins/reporting/server/lib/jobs_query.ts b/x-pack/legacy/plugins/reporting/server/lib/jobs_query.ts
index 0affc111c1368..c01e6377b039e 100644
--- a/x-pack/legacy/plugins/reporting/server/lib/jobs_query.ts
+++ b/x-pack/legacy/plugins/reporting/server/lib/jobs_query.ts
@@ -9,8 +9,7 @@ import Boom from 'boom';
 import { errors as elasticsearchErrors } from 'elasticsearch';
 import { ElasticsearchServiceSetup } from 'kibana/server';
 import { get } from 'lodash';
-import { JobSource } from '../../types';
-import { ReportingConfig } from '../types';
+import { JobSource, ServerFacade } from '../../types';
 
 const esErrors = elasticsearchErrors as Record<string, any>;
 const defaultSize = 10;
@@ -40,11 +39,8 @@ interface CountAggResult {
   count: number;
 }
 
-export function jobsQueryFactory(
-  config: ReportingConfig,
-  elasticsearch: ElasticsearchServiceSetup
-) {
-  const index = config.get('index');
+export function jobsQueryFactory(server: ServerFacade, elasticsearch: ElasticsearchServiceSetup) {
+  const index = server.config().get('xpack.reporting.index');
   const { callAsInternalUser } = elasticsearch.adminClient;
 
   function getUsername(user: any) {
diff --git a/x-pack/legacy/plugins/reporting/server/lib/once_per_server.ts b/x-pack/legacy/plugins/reporting/server/lib/once_per_server.ts
new file mode 100644
index 0000000000000..ae3636079a9bb
--- /dev/null
+++ b/x-pack/legacy/plugins/reporting/server/lib/once_per_server.ts
@@ -0,0 +1,43 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { memoize, MemoizedFunction } from 'lodash';
+import { ServerFacade } from '../../types';
+
+type ServerFn = (server: ServerFacade) => any;
+type Memo = ((server: ServerFacade) => any) & MemoizedFunction;
+
+/**
+ * allow this function to be called multiple times, but
+ * ensure that it only received one argument, the server,
+ * and cache the return value so that subsequent calls get
+ * the exact same value.
+ *
+ * This is intended to be used by service factories like getObjectQueueFactory
+ *
+ * @param  {Function} fn - the factory function
+ * @return {any}
+ */
+export function oncePerServer(fn: ServerFn) {
+  const memoized: Memo = memoize(function(server: ServerFacade) {
+    if (arguments.length !== 1) {
+      throw new TypeError('This function expects to be called with a single argument');
+    }
+
+    // @ts-ignore
+    return fn.call(this, server);
+  });
+
+  // @ts-ignore
+  // Type 'WeakMap<object, any>' is not assignable to type 'MapCache
+
+  // use a weak map a the cache so that:
+  //  1. return values mapped to the actual server instance
+  //  2. return value lifecycle matches that of the server
+  memoized.cache = new WeakMap();
+
+  return memoized;
+}
diff --git a/x-pack/legacy/plugins/reporting/server/lib/validate/__tests__/validate_encryption_key.js b/x-pack/legacy/plugins/reporting/server/lib/validate/__tests__/validate_encryption_key.js
new file mode 100644
index 0000000000000..10980f702d849
--- /dev/null
+++ b/x-pack/legacy/plugins/reporting/server/lib/validate/__tests__/validate_encryption_key.js
@@ -0,0 +1,34 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import expect from '@kbn/expect';
+import sinon from 'sinon';
+import { validateEncryptionKey } from '../validate_encryption_key';
+
+describe('Reporting: Validate config', () => {
+  const logger = {
+    warning: sinon.spy(),
+  };
+
+  beforeEach(() => {
+    logger.warning.resetHistory();
+  });
+
+  [undefined, null].forEach(value => {
+    it(`should log a warning and set xpack.reporting.encryptionKey if encryptionKey is ${value}`, () => {
+      const config = {
+        get: sinon.stub().returns(value),
+        set: sinon.stub(),
+      };
+
+      expect(() => validateEncryptionKey({ config: () => config }, logger)).not.to.throwError();
+
+      sinon.assert.calledWith(config.set, 'xpack.reporting.encryptionKey');
+      sinon.assert.calledWithMatch(logger.warning, /Generating a random key/);
+      sinon.assert.calledWithMatch(logger.warning, /please set xpack.reporting.encryptionKey/);
+    });
+  });
+});
diff --git a/x-pack/legacy/plugins/reporting/server/lib/validate/__tests__/validate_server_host.ts b/x-pack/legacy/plugins/reporting/server/lib/validate/__tests__/validate_server_host.ts
new file mode 100644
index 0000000000000..04f998fd3e5a5
--- /dev/null
+++ b/x-pack/legacy/plugins/reporting/server/lib/validate/__tests__/validate_server_host.ts
@@ -0,0 +1,30 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import expect from '@kbn/expect';
+import sinon from 'sinon';
+import { ServerFacade } from '../../../../types';
+import { validateServerHost } from '../validate_server_host';
+
+const configKey = 'xpack.reporting.kibanaServer.hostname';
+
+describe('Reporting: Validate server host setting', () => {
+  it(`should log a warning and set ${configKey} if server.host is "0"`, () => {
+    const getStub = sinon.stub();
+    getStub.withArgs('server.host').returns('0');
+    getStub.withArgs(configKey).returns(undefined);
+    const config = {
+      get: getStub,
+      set: sinon.stub(),
+    };
+
+    expect(() =>
+      validateServerHost(({ config: () => config } as unknown) as ServerFacade)
+    ).to.throwError();
+
+    sinon.assert.calledWith(config.set, configKey);
+  });
+});
diff --git a/x-pack/legacy/plugins/reporting/server/lib/validate/index.ts b/x-pack/legacy/plugins/reporting/server/lib/validate/index.ts
index 85d9f727d7fa7..0fdbd858b8e3c 100644
--- a/x-pack/legacy/plugins/reporting/server/lib/validate/index.ts
+++ b/x-pack/legacy/plugins/reporting/server/lib/validate/index.ts
@@ -6,22 +6,25 @@
 
 import { i18n } from '@kbn/i18n';
 import { ElasticsearchServiceSetup } from 'kibana/server';
-import { Logger } from '../../../types';
+import { Logger, ServerFacade } from '../../../types';
 import { HeadlessChromiumDriverFactory } from '../../browsers/chromium/driver_factory';
-import { ReportingConfig } from '../../types';
 import { validateBrowser } from './validate_browser';
+import { validateEncryptionKey } from './validate_encryption_key';
 import { validateMaxContentLength } from './validate_max_content_length';
+import { validateServerHost } from './validate_server_host';
 
 export async function runValidations(
-  config: ReportingConfig,
+  server: ServerFacade,
   elasticsearch: ElasticsearchServiceSetup,
   browserFactory: HeadlessChromiumDriverFactory,
   logger: Logger
 ) {
   try {
     await Promise.all([
-      validateBrowser(browserFactory, logger),
-      validateMaxContentLength(config, elasticsearch, logger),
+      validateBrowser(server, browserFactory, logger),
+      validateEncryptionKey(server, logger),
+      validateMaxContentLength(server, elasticsearch, logger),
+      validateServerHost(server),
     ]);
     logger.debug(
       i18n.translate('xpack.reporting.selfCheck.ok', {
diff --git a/x-pack/legacy/plugins/reporting/server/lib/validate/validate_browser.ts b/x-pack/legacy/plugins/reporting/server/lib/validate/validate_browser.ts
index d6512d5eb718b..89c49123e85bf 100644
--- a/x-pack/legacy/plugins/reporting/server/lib/validate/validate_browser.ts
+++ b/x-pack/legacy/plugins/reporting/server/lib/validate/validate_browser.ts
@@ -3,10 +3,9 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-
 import { Browser } from 'puppeteer';
 import { BROWSER_TYPE } from '../../../common/constants';
-import { Logger } from '../../../types';
+import { ServerFacade, Logger } from '../../../types';
 import { HeadlessChromiumDriverFactory } from '../../browsers/chromium/driver_factory';
 
 /*
@@ -14,6 +13,7 @@ import { HeadlessChromiumDriverFactory } from '../../browsers/chromium/driver_fa
  * to the locally running Kibana instance.
  */
 export const validateBrowser = async (
+  server: ServerFacade,
   browserFactory: HeadlessChromiumDriverFactory,
   logger: Logger
 ) => {
diff --git a/x-pack/legacy/plugins/reporting/server/lib/validate/validate_encryption_key.ts b/x-pack/legacy/plugins/reporting/server/lib/validate/validate_encryption_key.ts
new file mode 100644
index 0000000000000..e0af94cbdc29c
--- /dev/null
+++ b/x-pack/legacy/plugins/reporting/server/lib/validate/validate_encryption_key.ts
@@ -0,0 +1,31 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { i18n } from '@kbn/i18n';
+import crypto from 'crypto';
+import { ServerFacade, Logger } from '../../../types';
+
+export function validateEncryptionKey(serverFacade: ServerFacade, logger: Logger) {
+  const config = serverFacade.config();
+
+  const encryptionKey = config.get('xpack.reporting.encryptionKey');
+  if (encryptionKey == null) {
+    // TODO this should simply throw an error and let the handler conver it to a warning mesasge. See validateServerHost.
+    logger.warning(
+      i18n.translate('xpack.reporting.selfCheckEncryptionKey.warning', {
+        defaultMessage:
+          `Generating a random key for {setting}. To prevent pending reports ` +
+          `from failing on restart, please set {setting} in kibana.yml`,
+        values: {
+          setting: 'xpack.reporting.encryptionKey',
+        },
+      })
+    );
+
+    // @ts-ignore: No set() method on KibanaConfig, just get() and has()
+    config.set('xpack.reporting.encryptionKey', crypto.randomBytes(16).toString('hex')); // update config in memory to contain a usable encryption key
+  }
+}
diff --git a/x-pack/legacy/plugins/reporting/server/lib/validate/validate_max_content_length.test.js b/x-pack/legacy/plugins/reporting/server/lib/validate/validate_max_content_length.test.js
index 2551fd48b91f3..942dcaf842696 100644
--- a/x-pack/legacy/plugins/reporting/server/lib/validate/validate_max_content_length.test.js
+++ b/x-pack/legacy/plugins/reporting/server/lib/validate/validate_max_content_length.test.js
@@ -32,7 +32,11 @@ describe('Reporting: Validate Max Content Length', () => {
   });
 
   it('should log warning messages when reporting has a higher max-size than elasticsearch', async () => {
-    const config = { get: sinon.stub().returns(FIVE_HUNDRED_MEGABYTES) };
+    const server = {
+      config: () => ({
+        get: sinon.stub().returns(FIVE_HUNDRED_MEGABYTES),
+      }),
+    };
     const elasticsearch = {
       dataClient: {
         callAsInternalUser: () => ({
@@ -45,7 +49,7 @@ describe('Reporting: Validate Max Content Length', () => {
       },
     };
 
-    await validateMaxContentLength(config, elasticsearch, logger);
+    await validateMaxContentLength(server, elasticsearch, logger);
 
     sinon.assert.calledWithMatch(
       logger.warning,
@@ -66,10 +70,14 @@ describe('Reporting: Validate Max Content Length', () => {
   });
 
   it('should do nothing when reporting has the same max-size as elasticsearch', async () => {
-    const config = { get: sinon.stub().returns(ONE_HUNDRED_MEGABYTES) };
+    const server = {
+      config: () => ({
+        get: sinon.stub().returns(ONE_HUNDRED_MEGABYTES),
+      }),
+    };
 
     expect(
-      async () => await validateMaxContentLength(config, elasticsearch, logger.warning)
+      async () => await validateMaxContentLength(server, elasticsearch, logger.warning)
     ).not.toThrow();
     sinon.assert.notCalled(logger.warning);
   });
diff --git a/x-pack/legacy/plugins/reporting/server/lib/validate/validate_max_content_length.ts b/x-pack/legacy/plugins/reporting/server/lib/validate/validate_max_content_length.ts
index a20905ba093d4..ce4a5b93e7431 100644
--- a/x-pack/legacy/plugins/reporting/server/lib/validate/validate_max_content_length.ts
+++ b/x-pack/legacy/plugins/reporting/server/lib/validate/validate_max_content_length.ts
@@ -7,17 +7,17 @@
 import numeral from '@elastic/numeral';
 import { ElasticsearchServiceSetup } from 'kibana/server';
 import { defaults, get } from 'lodash';
-import { Logger } from '../../../types';
-import { ReportingConfig } from '../../types';
+import { Logger, ServerFacade } from '../../../types';
 
-const KIBANA_MAX_SIZE_BYTES_PATH = 'csv.maxSizeBytes';
+const KIBANA_MAX_SIZE_BYTES_PATH = 'xpack.reporting.csv.maxSizeBytes';
 const ES_MAX_SIZE_BYTES_PATH = 'http.max_content_length';
 
 export async function validateMaxContentLength(
-  config: ReportingConfig,
+  server: ServerFacade,
   elasticsearch: ElasticsearchServiceSetup,
   logger: Logger
 ) {
+  const config = server.config();
   const { callAsInternalUser } = elasticsearch.dataClient;
 
   const elasticClusterSettingsResponse = await callAsInternalUser('cluster.getSettings', {
@@ -28,13 +28,13 @@ export async function validateMaxContentLength(
 
   const elasticSearchMaxContent = get(elasticClusterSettings, 'http.max_content_length', '100mb');
   const elasticSearchMaxContentBytes = numeral().unformat(elasticSearchMaxContent.toUpperCase());
-  const kibanaMaxContentBytes = config.get('csv', 'maxSizeBytes');
+  const kibanaMaxContentBytes: number = config.get(KIBANA_MAX_SIZE_BYTES_PATH);
 
   if (kibanaMaxContentBytes > elasticSearchMaxContentBytes) {
     // TODO this should simply throw an error and let the handler conver it to a warning mesasge. See validateServerHost.
     logger.warning(
-      `xpack.reporting.${KIBANA_MAX_SIZE_BYTES_PATH} (${kibanaMaxContentBytes}) is higher than ElasticSearch's ${ES_MAX_SIZE_BYTES_PATH} (${elasticSearchMaxContentBytes}). ` +
-        `Please set ${ES_MAX_SIZE_BYTES_PATH} in ElasticSearch to match, or lower your xpack.reporting.${KIBANA_MAX_SIZE_BYTES_PATH} in Kibana to avoid this warning.`
+      `${KIBANA_MAX_SIZE_BYTES_PATH} (${kibanaMaxContentBytes}) is higher than ElasticSearch's ${ES_MAX_SIZE_BYTES_PATH} (${elasticSearchMaxContentBytes}). ` +
+        `Please set ${ES_MAX_SIZE_BYTES_PATH} in ElasticSearch to match, or lower your ${KIBANA_MAX_SIZE_BYTES_PATH} in Kibana to avoid this warning.`
     );
   }
 }
diff --git a/x-pack/legacy/plugins/reporting/server/lib/validate/validate_server_host.ts b/x-pack/legacy/plugins/reporting/server/lib/validate/validate_server_host.ts
new file mode 100644
index 0000000000000..f4f4d61246b6a
--- /dev/null
+++ b/x-pack/legacy/plugins/reporting/server/lib/validate/validate_server_host.ts
@@ -0,0 +1,27 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { ServerFacade } from '../../../types';
+
+const configKey = 'xpack.reporting.kibanaServer.hostname';
+
+export function validateServerHost(serverFacade: ServerFacade) {
+  const config = serverFacade.config();
+
+  const serverHost = config.get('server.host');
+  const reportingKibanaHostName = config.get(configKey);
+
+  if (!reportingKibanaHostName && serverHost === '0') {
+    // @ts-ignore: No set() method on KibanaConfig, just get() and has()
+    config.set(configKey, '0.0.0.0'); // update config in memory to allow Reporting to work
+
+    throw new Error(
+      `Found 'server.host: "0"' in settings. This is incompatible with Reporting. ` +
+        `To enable Reporting to work, '${configKey}: 0.0.0.0' is being automatically to the configuration. ` +
+        `You can change to 'server.host: 0.0.0.0' or add '${configKey}: 0.0.0.0' in kibana.yml to prevent this message.`
+    );
+  }
+}
diff --git a/x-pack/legacy/plugins/reporting/server/plugin.ts b/x-pack/legacy/plugins/reporting/server/plugin.ts
index 1d7cc075b690d..4f24cc16b2277 100644
--- a/x-pack/legacy/plugins/reporting/server/plugin.ts
+++ b/x-pack/legacy/plugins/reporting/server/plugin.ts
@@ -12,6 +12,8 @@ import { createQueueFactory, enqueueJobFactory, LevelLogger, runValidations } fr
 import { setFieldFormats } from './services';
 import { ReportingSetup, ReportingSetupDeps, ReportingStart, ReportingStartDeps } from './types';
 import { registerReportingUsageCollector } from './usage';
+// @ts-ignore no module definition
+import { mirrorPluginStatus } from '../../../server/lib/mirror_plugin_status';
 
 export class ReportingPlugin
   implements Plugin<ReportingSetup, ReportingStart, ReportingSetupDeps, ReportingStartDeps> {
@@ -24,29 +26,29 @@ export class ReportingPlugin
   }
 
   public async setup(core: CoreSetup, plugins: ReportingSetupDeps) {
-    const { reporting: reportingNewPlatform, elasticsearch, __LEGACY } = plugins;
-    const { config } = reportingNewPlatform;
+    const { elasticsearch, usageCollection, __LEGACY } = plugins;
 
-    const browserDriverFactory = await createBrowserDriverFactory(config, this.logger); // required for validations :(
-    runValidations(config, elasticsearch, browserDriverFactory, this.logger); // this must run early, as it sets up config defaults
+    const browserDriverFactory = await createBrowserDriverFactory(__LEGACY, this.logger); // required for validations :(
+    runValidations(__LEGACY, elasticsearch, browserDriverFactory, this.logger); // this must run early, as it sets up config defaults
 
     const { xpack_main: xpackMainLegacy, reporting: reportingLegacy } = __LEGACY.plugins;
-    this.reportingCore.legacySetup(xpackMainLegacy, reportingLegacy, config, __LEGACY, plugins);
+    this.reportingCore.legacySetup(xpackMainLegacy, reportingLegacy, __LEGACY, plugins);
 
     // Register a function with server to manage the collection of usage stats
-    registerReportingUsageCollector(this.reportingCore, config, plugins);
+    registerReportingUsageCollector(this.reportingCore, __LEGACY, usageCollection);
 
     // regsister setup internals
-    this.reportingCore.pluginSetup({ browserDriverFactory, config, elasticsearch });
+    this.reportingCore.pluginSetup({ browserDriverFactory });
 
     return {};
   }
 
   public async start(core: CoreStart, plugins: ReportingStartDeps) {
     const { reportingCore, logger } = this;
+    const { elasticsearch, __LEGACY } = plugins;
 
-    const esqueue = await createQueueFactory(reportingCore, logger);
-    const enqueueJob = await enqueueJobFactory(reportingCore, logger);
+    const esqueue = await createQueueFactory(reportingCore, __LEGACY, elasticsearch, logger);
+    const enqueueJob = enqueueJobFactory(reportingCore, __LEGACY, elasticsearch, logger);
 
     this.reportingCore.pluginStart({
       savedObjects: core.savedObjects,
@@ -56,9 +58,7 @@ export class ReportingPlugin
     });
 
     setFieldFormats(plugins.data.fieldFormats);
-
-    const config = await reportingCore.getConfig();
-    logConfiguration(config.get('capture'), this.logger);
+    logConfiguration(__LEGACY, this.logger);
 
     return {};
   }
diff --git a/x-pack/legacy/plugins/reporting/server/routes/generate_from_jobparams.ts b/x-pack/legacy/plugins/reporting/server/routes/generate_from_jobparams.ts
index dc58e97ff3e41..56622617586f7 100644
--- a/x-pack/legacy/plugins/reporting/server/routes/generate_from_jobparams.ts
+++ b/x-pack/legacy/plugins/reporting/server/routes/generate_from_jobparams.ts
@@ -10,7 +10,7 @@ import { Legacy } from 'kibana';
 import rison from 'rison-node';
 import { API_BASE_URL } from '../../common/constants';
 import { Logger, ReportingResponseToolkit, ServerFacade } from '../../types';
-import { ReportingConfig, ReportingSetupDeps } from '../types';
+import { ReportingSetupDeps } from '../types';
 import { makeRequestFacade } from './lib/make_request_facade';
 import {
   GetRouteConfigFactoryFn,
@@ -22,7 +22,6 @@ import { HandlerErrorFunction, HandlerFunction } from './types';
 const BASE_GENERATE = `${API_BASE_URL}/generate`;
 
 export function registerGenerateFromJobParams(
-  config: ReportingConfig,
   server: ServerFacade,
   plugins: ReportingSetupDeps,
   handler: HandlerFunction,
@@ -31,7 +30,7 @@ export function registerGenerateFromJobParams(
 ) {
   const getRouteConfig = () => {
     const getOriginalRouteConfig: GetRouteConfigFactoryFn = getRouteConfigFactoryReportingPre(
-      config,
+      server,
       plugins,
       logger
     );
diff --git a/x-pack/legacy/plugins/reporting/server/routes/generate_from_savedobject.ts b/x-pack/legacy/plugins/reporting/server/routes/generate_from_savedobject.ts
index 23ab7ee0d9e6b..415b6b7d64366 100644
--- a/x-pack/legacy/plugins/reporting/server/routes/generate_from_savedobject.ts
+++ b/x-pack/legacy/plugins/reporting/server/routes/generate_from_savedobject.ts
@@ -9,7 +9,7 @@ import { get } from 'lodash';
 import { API_BASE_GENERATE_V1, CSV_FROM_SAVEDOBJECT_JOB_TYPE } from '../../common/constants';
 import { getJobParamsFromRequest } from '../../export_types/csv_from_savedobject/server/lib/get_job_params_from_request';
 import { Logger, ReportingResponseToolkit, ServerFacade } from '../../types';
-import { ReportingConfig, ReportingSetupDeps } from '../types';
+import { ReportingSetupDeps } from '../types';
 import { makeRequestFacade } from './lib/make_request_facade';
 import { getRouteOptionsCsv } from './lib/route_config_factories';
 import { HandlerErrorFunction, HandlerFunction, QueuedJobPayload } from './types';
@@ -24,14 +24,13 @@ import { HandlerErrorFunction, HandlerFunction, QueuedJobPayload } from './types
  *     - local (transient) changes the user made to the saved object
  */
 export function registerGenerateCsvFromSavedObject(
-  config: ReportingConfig,
   server: ServerFacade,
   plugins: ReportingSetupDeps,
   handleRoute: HandlerFunction,
   handleRouteError: HandlerErrorFunction,
   logger: Logger
 ) {
-  const routeOptions = getRouteOptionsCsv(config, plugins, logger);
+  const routeOptions = getRouteOptionsCsv(server, plugins, logger);
 
   server.route({
     path: `${API_BASE_GENERATE_V1}/csv/saved-object/{savedObjectType}:{savedObjectId}`,
diff --git a/x-pack/legacy/plugins/reporting/server/routes/generate_from_savedobject_immediate.ts b/x-pack/legacy/plugins/reporting/server/routes/generate_from_savedobject_immediate.ts
index 5bd07aa6049ed..5d17fa2e82b8c 100644
--- a/x-pack/legacy/plugins/reporting/server/routes/generate_from_savedobject_immediate.ts
+++ b/x-pack/legacy/plugins/reporting/server/routes/generate_from_savedobject_immediate.ts
@@ -16,7 +16,7 @@ import {
   ResponseFacade,
   ServerFacade,
 } from '../../types';
-import { ReportingConfig, ReportingCore, ReportingSetupDeps } from '../types';
+import { ReportingSetupDeps, ReportingCore } from '../types';
 import { makeRequestFacade } from './lib/make_request_facade';
 import { getRouteOptionsCsv } from './lib/route_config_factories';
 
@@ -31,12 +31,12 @@ import { getRouteOptionsCsv } from './lib/route_config_factories';
  */
 export function registerGenerateCsvFromSavedObjectImmediate(
   reporting: ReportingCore,
-  config: ReportingConfig,
   server: ServerFacade,
   plugins: ReportingSetupDeps,
   parentLogger: Logger
 ) {
-  const routeOptions = getRouteOptionsCsv(config, plugins, parentLogger);
+  const routeOptions = getRouteOptionsCsv(server, plugins, parentLogger);
+  const { elasticsearch } = plugins;
 
   /*
    * CSV export with the `immediate` option does not queue a job with Reporting's ESQueue to run the job async. Instead, this does:
@@ -52,10 +52,14 @@ export function registerGenerateCsvFromSavedObjectImmediate(
       const logger = parentLogger.clone(['savedobject-csv']);
       const jobParams = getJobParamsFromRequest(request, { isImmediate: true });
 
-      const [createJobFn, executeJobFn] = await Promise.all([
-        createJobFactory(reporting, logger),
-        executeJobFactory(reporting, logger),
-      ]);
+      /* TODO these functions should be made available in the export types registry:
+       *
+       *     const { createJobFn, executeJobFn } = exportTypesRegistry.getById(CSV_FROM_SAVEDOBJECT_JOB_TYPE)
+       *
+       * Calling an execute job factory requires passing a browserDriverFactory option, so we should not call the factory from here
+       */
+      const createJobFn = createJobFactory(reporting, server, elasticsearch, logger);
+      const executeJobFn = await executeJobFactory(reporting, server, elasticsearch, logger);
       const jobDocPayload: JobDocPayloadPanelCsv = await createJobFn(
         jobParams,
         request.headers,
diff --git a/x-pack/legacy/plugins/reporting/server/routes/generation.test.ts b/x-pack/legacy/plugins/reporting/server/routes/generation.test.ts
index 44a98dac2d4a9..54d9671692c5d 100644
--- a/x-pack/legacy/plugins/reporting/server/routes/generation.test.ts
+++ b/x-pack/legacy/plugins/reporting/server/routes/generation.test.ts
@@ -7,7 +7,7 @@
 import Hapi from 'hapi';
 import { createMockReportingCore } from '../../test_helpers';
 import { Logger, ServerFacade } from '../../types';
-import { ReportingConfig, ReportingCore, ReportingSetupDeps } from '../types';
+import { ReportingCore, ReportingSetupDeps } from '../../server/types';
 
 jest.mock('./lib/authorized_user_pre_routing', () => ({
   authorizedUserPreRoutingFactory: () => () => ({}),
@@ -22,8 +22,6 @@ import { registerJobGenerationRoutes } from './generation';
 
 let mockServer: Hapi.Server;
 let mockReportingPlugin: ReportingCore;
-let mockReportingConfig: ReportingConfig;
-
 const mockLogger = ({
   error: jest.fn(),
   debug: jest.fn(),
@@ -35,12 +33,10 @@ beforeEach(async () => {
     port: 8080,
     routes: { log: { collect: true } },
   });
-
+  mockServer.config = () => ({ get: jest.fn(), has: jest.fn() });
   mockReportingPlugin = await createMockReportingCore();
   mockReportingPlugin.getEnqueueJob = async () =>
     jest.fn().mockImplementation(() => ({ toJSON: () => '{ "job": "data" }' }));
-
-  mockReportingConfig = { get: jest.fn(), kbnConfig: { get: jest.fn() } };
 });
 
 const mockPlugins = {
@@ -58,7 +54,6 @@ const getErrorsFromRequest = (request: Hapi.Request) => {
 test(`returns 400 if there are no job params`, async () => {
   registerJobGenerationRoutes(
     mockReportingPlugin,
-    (mockReportingConfig as unknown) as ReportingConfig,
     (mockServer as unknown) as ServerFacade,
     (mockPlugins as unknown) as ReportingSetupDeps,
     mockLogger
@@ -85,7 +80,6 @@ test(`returns 400 if there are no job params`, async () => {
 test(`returns 400 if job params is invalid`, async () => {
   registerJobGenerationRoutes(
     mockReportingPlugin,
-    (mockReportingConfig as unknown) as ReportingConfig,
     (mockServer as unknown) as ServerFacade,
     (mockPlugins as unknown) as ReportingSetupDeps,
     mockLogger
@@ -120,7 +114,6 @@ test(`returns 500 if job handler throws an error`, async () => {
 
   registerJobGenerationRoutes(
     mockReportingPlugin,
-    (mockReportingConfig as unknown) as ReportingConfig,
     (mockServer as unknown) as ServerFacade,
     (mockPlugins as unknown) as ReportingSetupDeps,
     mockLogger
diff --git a/x-pack/legacy/plugins/reporting/server/routes/generation.ts b/x-pack/legacy/plugins/reporting/server/routes/generation.ts
index 0ac6a34dd75bb..096ba84b63d1a 100644
--- a/x-pack/legacy/plugins/reporting/server/routes/generation.ts
+++ b/x-pack/legacy/plugins/reporting/server/routes/generation.ts
@@ -9,7 +9,7 @@ import { errors as elasticsearchErrors } from 'elasticsearch';
 import { Legacy } from 'kibana';
 import { API_BASE_URL } from '../../common/constants';
 import { Logger, ReportingResponseToolkit, ServerFacade } from '../../types';
-import { ReportingConfig, ReportingCore, ReportingSetupDeps } from '../types';
+import { ReportingSetupDeps, ReportingCore } from '../types';
 import { registerGenerateFromJobParams } from './generate_from_jobparams';
 import { registerGenerateCsvFromSavedObject } from './generate_from_savedobject';
 import { registerGenerateCsvFromSavedObjectImmediate } from './generate_from_savedobject_immediate';
@@ -19,13 +19,12 @@ const esErrors = elasticsearchErrors as Record<string, any>;
 
 export function registerJobGenerationRoutes(
   reporting: ReportingCore,
-  config: ReportingConfig,
   server: ServerFacade,
   plugins: ReportingSetupDeps,
   logger: Logger
 ) {
-  const DOWNLOAD_BASE_URL =
-    `${config.kbnConfig.get('server', 'basePath')}` + `${API_BASE_URL}/jobs/download`;
+  const config = server.config();
+  const DOWNLOAD_BASE_URL = config.get('server.basePath') + `${API_BASE_URL}/jobs/download`;
 
   /*
    * Generates enqueued job details to use in responses
@@ -67,11 +66,11 @@ export function registerJobGenerationRoutes(
     return err;
   }
 
-  registerGenerateFromJobParams(config, server, plugins, handler, handleError, logger);
+  registerGenerateFromJobParams(server, plugins, handler, handleError, logger);
 
   // Register beta panel-action download-related API's
-  if (config.get('csv', 'enablePanelActionDownload')) {
-    registerGenerateCsvFromSavedObject(config, server, plugins, handler, handleError, logger);
-    registerGenerateCsvFromSavedObjectImmediate(reporting, config, server, plugins, logger);
+  if (config.get('xpack.reporting.csv.enablePanelActionDownload')) {
+    registerGenerateCsvFromSavedObject(server, plugins, handler, handleError, logger);
+    registerGenerateCsvFromSavedObjectImmediate(reporting, server, plugins, logger);
   }
 }
diff --git a/x-pack/legacy/plugins/reporting/server/routes/index.ts b/x-pack/legacy/plugins/reporting/server/routes/index.ts
index 21eeb901d9b96..610ab4907d369 100644
--- a/x-pack/legacy/plugins/reporting/server/routes/index.ts
+++ b/x-pack/legacy/plugins/reporting/server/routes/index.ts
@@ -5,17 +5,16 @@
  */
 
 import { Logger, ServerFacade } from '../../types';
-import { ReportingConfig, ReportingCore, ReportingSetupDeps } from '../types';
+import { ReportingCore, ReportingSetupDeps } from '../types';
 import { registerJobGenerationRoutes } from './generation';
 import { registerJobInfoRoutes } from './jobs';
 
 export function registerRoutes(
   reporting: ReportingCore,
-  config: ReportingConfig,
   server: ServerFacade,
   plugins: ReportingSetupDeps,
   logger: Logger
 ) {
-  registerJobGenerationRoutes(reporting, config, server, plugins, logger);
-  registerJobInfoRoutes(reporting, config, server, plugins, logger);
+  registerJobGenerationRoutes(reporting, server, plugins, logger);
+  registerJobInfoRoutes(reporting, server, plugins, logger);
 }
diff --git a/x-pack/legacy/plugins/reporting/server/routes/jobs.test.js b/x-pack/legacy/plugins/reporting/server/routes/jobs.test.js
index b12aa44487523..071b401d2321b 100644
--- a/x-pack/legacy/plugins/reporting/server/routes/jobs.test.js
+++ b/x-pack/legacy/plugins/reporting/server/routes/jobs.test.js
@@ -5,6 +5,7 @@
  */
 
 import Hapi from 'hapi';
+import { memoize } from 'lodash';
 import { createMockReportingCore } from '../../test_helpers';
 import { ExportTypesRegistry } from '../lib/export_types_registry';
 
@@ -22,7 +23,6 @@ import { registerJobInfoRoutes } from './jobs';
 let mockServer;
 let exportTypesRegistry;
 let mockReportingPlugin;
-let mockReportingConfig;
 const mockLogger = {
   error: jest.fn(),
   debug: jest.fn(),
@@ -30,6 +30,7 @@ const mockLogger = {
 
 beforeEach(async () => {
   mockServer = new Hapi.Server({ debug: false, port: 8080, routes: { log: { collect: true } } });
+  mockServer.config = memoize(() => ({ get: jest.fn() }));
   exportTypesRegistry = new ExportTypesRegistry();
   exportTypesRegistry.register({
     id: 'unencoded',
@@ -42,11 +43,8 @@ beforeEach(async () => {
     jobContentEncoding: 'base64',
     jobContentExtension: 'pdf',
   });
-
   mockReportingPlugin = await createMockReportingCore();
   mockReportingPlugin.getExportTypesRegistry = () => exportTypesRegistry;
-
-  mockReportingConfig = { get: jest.fn(), kbnConfig: { get: jest.fn() } };
 });
 
 const mockPlugins = {
@@ -72,13 +70,7 @@ test(`returns 404 if job not found`, async () => {
     callAsInternalUser: jest.fn().mockReturnValue(Promise.resolve(getHits())),
   };
 
-  registerJobInfoRoutes(
-    mockReportingPlugin,
-    mockReportingConfig,
-    mockServer,
-    mockPlugins,
-    mockLogger
-  );
+  registerJobInfoRoutes(mockReportingPlugin, mockServer, mockPlugins, mockLogger);
 
   const request = {
     method: 'GET',
@@ -97,13 +89,7 @@ test(`returns 401 if not valid job type`, async () => {
       .mockReturnValue(Promise.resolve(getHits({ jobtype: 'invalidJobType' }))),
   };
 
-  registerJobInfoRoutes(
-    mockReportingPlugin,
-    mockReportingConfig,
-    mockServer,
-    mockPlugins,
-    mockLogger
-  );
+  registerJobInfoRoutes(mockReportingPlugin, mockServer, mockPlugins, mockLogger);
 
   const request = {
     method: 'GET',
@@ -124,13 +110,7 @@ describe(`when job is incomplete`, () => {
         ),
     };
 
-    registerJobInfoRoutes(
-      mockReportingPlugin,
-      mockReportingConfig,
-      mockServer,
-      mockPlugins,
-      mockLogger
-    );
+    registerJobInfoRoutes(mockReportingPlugin, mockServer, mockPlugins, mockLogger);
 
     const request = {
       method: 'GET',
@@ -172,13 +152,7 @@ describe(`when job is failed`, () => {
       callAsInternalUser: jest.fn().mockReturnValue(Promise.resolve(hits)),
     };
 
-    registerJobInfoRoutes(
-      mockReportingPlugin,
-      mockReportingConfig,
-      mockServer,
-      mockPlugins,
-      mockLogger
-    );
+    registerJobInfoRoutes(mockReportingPlugin, mockServer, mockPlugins, mockLogger);
 
     const request = {
       method: 'GET',
@@ -223,13 +197,7 @@ describe(`when job is completed`, () => {
       callAsInternalUser: jest.fn().mockReturnValue(Promise.resolve(hits)),
     };
 
-    registerJobInfoRoutes(
-      mockReportingPlugin,
-      mockReportingConfig,
-      mockServer,
-      mockPlugins,
-      mockLogger
-    );
+    registerJobInfoRoutes(mockReportingPlugin, mockServer, mockPlugins, mockLogger);
 
     const request = {
       method: 'GET',
diff --git a/x-pack/legacy/plugins/reporting/server/routes/jobs.ts b/x-pack/legacy/plugins/reporting/server/routes/jobs.ts
index 4f29e561431fa..b9aa75e0ddd00 100644
--- a/x-pack/legacy/plugins/reporting/server/routes/jobs.ts
+++ b/x-pack/legacy/plugins/reporting/server/routes/jobs.ts
@@ -17,7 +17,7 @@ import {
   ServerFacade,
 } from '../../types';
 import { jobsQueryFactory } from '../lib/jobs_query';
-import { ReportingConfig, ReportingCore, ReportingSetupDeps } from '../types';
+import { ReportingSetupDeps, ReportingCore } from '../types';
 import {
   deleteJobResponseHandlerFactory,
   downloadJobResponseHandlerFactory,
@@ -37,14 +37,13 @@ function isResponse(response: Boom<null> | ResponseObject): response is Response
 
 export function registerJobInfoRoutes(
   reporting: ReportingCore,
-  config: ReportingConfig,
   server: ServerFacade,
   plugins: ReportingSetupDeps,
   logger: Logger
 ) {
   const { elasticsearch } = plugins;
-  const jobsQuery = jobsQueryFactory(config, elasticsearch);
-  const getRouteConfig = getRouteConfigFactoryManagementPre(config, plugins, logger);
+  const jobsQuery = jobsQueryFactory(server, elasticsearch);
+  const getRouteConfig = getRouteConfigFactoryManagementPre(server, plugins, logger);
 
   // list jobs in the queue, paginated
   server.route({
@@ -142,8 +141,8 @@ export function registerJobInfoRoutes(
 
   // trigger a download of the output from a job
   const exportTypesRegistry = reporting.getExportTypesRegistry();
-  const getRouteConfigDownload = getRouteConfigFactoryDownloadPre(config, plugins, logger);
-  const downloadResponseHandler = downloadJobResponseHandlerFactory(config, elasticsearch, exportTypesRegistry); // prettier-ignore
+  const getRouteConfigDownload = getRouteConfigFactoryDownloadPre(server, plugins, logger);
+  const downloadResponseHandler = downloadJobResponseHandlerFactory(server, elasticsearch, exportTypesRegistry); // prettier-ignore
   server.route({
     path: `${MAIN_ENTRY}/download/{docId}`,
     method: 'GET',
@@ -182,8 +181,8 @@ export function registerJobInfoRoutes(
   });
 
   // allow a report to be deleted
-  const getRouteConfigDelete = getRouteConfigFactoryDeletePre(config, plugins, logger);
-  const deleteResponseHandler = deleteJobResponseHandlerFactory(config, elasticsearch);
+  const getRouteConfigDelete = getRouteConfigFactoryDeletePre(server, plugins, logger);
+  const deleteResponseHandler = deleteJobResponseHandlerFactory(server, elasticsearch);
   server.route({
     path: `${MAIN_ENTRY}/delete/{docId}`,
     method: 'DELETE',
diff --git a/x-pack/legacy/plugins/reporting/server/routes/lib/authorized_user_pre_routing.test.js b/x-pack/legacy/plugins/reporting/server/routes/lib/authorized_user_pre_routing.test.js
index b5d6ae59ce5dd..3460d22592e3d 100644
--- a/x-pack/legacy/plugins/reporting/server/routes/lib/authorized_user_pre_routing.test.js
+++ b/x-pack/legacy/plugins/reporting/server/routes/lib/authorized_user_pre_routing.test.js
@@ -7,48 +7,56 @@
 import { authorizedUserPreRoutingFactory } from './authorized_user_pre_routing';
 
 describe('authorized_user_pre_routing', function() {
-  const createMockConfig = (mockConfig = {}) => {
-    return {
-      get: (...keys) => mockConfig[keys.join('.')],
-      kbnConfig: { get: (...keys) => mockConfig[keys.join('.')] },
-    };
-  };
-  const createMockPlugins = (function() {
+  // the getClientShield is using `once` which forces us to use a constant mock
+  // which makes testing anything that is dependent on `oncePerServer` confusing.
+  // so createMockServer reuses the same 'instance' of the server and overwrites
+  // the properties to contain different values
+  const createMockServer = (function() {
     const getUserStub = jest.fn();
+    let mockConfig;
+
+    const mockServer = {
+      expose() {},
+      config() {
+        return {
+          get(key) {
+            return mockConfig[key];
+          },
+        };
+      },
+      log: function() {},
+      plugins: {
+        xpack_main: {},
+        security: { getUser: getUserStub },
+      },
+    };
 
     return function({
       securityEnabled = true,
       xpackInfoUndefined = false,
       xpackInfoAvailable = true,
-      getCurrentUser = undefined,
       user = undefined,
+      config = {},
     }) {
-      getUserStub.mockReset();
-      getUserStub.mockResolvedValue(user);
-      return {
-        security: securityEnabled
-          ? {
-              authc: { getCurrentUser },
-            }
-          : null,
-        __LEGACY: {
-          plugins: {
-            xpack_main: {
-              info: !xpackInfoUndefined && {
+      mockConfig = config;
+
+      mockServer.plugins.xpack_main = {
+        info: !xpackInfoUndefined && {
+          isAvailable: () => xpackInfoAvailable,
+          feature(featureName) {
+            if (featureName === 'security') {
+              return {
+                isEnabled: () => securityEnabled,
                 isAvailable: () => xpackInfoAvailable,
-                feature(featureName) {
-                  if (featureName === 'security') {
-                    return {
-                      isEnabled: () => securityEnabled,
-                      isAvailable: () => xpackInfoAvailable,
-                    };
-                  }
-                },
-              },
-            },
+              };
+            }
           },
         },
       };
+
+      getUserStub.mockReset();
+      getUserStub.mockResolvedValue(user);
+      return mockServer;
     };
   })();
 
@@ -67,6 +75,10 @@ describe('authorized_user_pre_routing', function() {
     raw: { req: mockRequestRaw },
   });
 
+  const getMockPlugins = pluginSet => {
+    return pluginSet || { security: null };
+  };
+
   const getMockLogger = () => ({
     warn: jest.fn(),
     error: msg => {
@@ -75,9 +87,11 @@ describe('authorized_user_pre_routing', function() {
   });
 
   it('should return with boom notFound when xpackInfo is undefined', async function() {
+    const mockServer = createMockServer({ xpackInfoUndefined: true });
+
     const authorizedUserPreRouting = authorizedUserPreRoutingFactory(
-      createMockConfig(),
-      createMockPlugins({ xpackInfoUndefined: true }),
+      mockServer,
+      getMockPlugins(),
       getMockLogger()
     );
     const response = await authorizedUserPreRouting(getMockRequest());
@@ -86,9 +100,11 @@ describe('authorized_user_pre_routing', function() {
   });
 
   it(`should return with boom notFound when xpackInfo isn't available`, async function() {
+    const mockServer = createMockServer({ xpackInfoAvailable: false });
+
     const authorizedUserPreRouting = authorizedUserPreRoutingFactory(
-      createMockConfig(),
-      createMockPlugins({ xpackInfoAvailable: false }),
+      mockServer,
+      getMockPlugins(),
       getMockLogger()
     );
     const response = await authorizedUserPreRouting(getMockRequest());
@@ -97,9 +113,11 @@ describe('authorized_user_pre_routing', function() {
   });
 
   it('should return with null user when security is disabled in Elasticsearch', async function() {
+    const mockServer = createMockServer({ securityEnabled: false });
+
     const authorizedUserPreRouting = authorizedUserPreRoutingFactory(
-      createMockConfig(),
-      createMockPlugins({ securityEnabled: false }),
+      mockServer,
+      getMockPlugins(),
       getMockLogger()
     );
     const response = await authorizedUserPreRouting(getMockRequest());
@@ -107,14 +125,16 @@ describe('authorized_user_pre_routing', function() {
   });
 
   it('should return with boom unauthenticated when security is enabled but no authenticated user', async function() {
-    const mockPlugins = createMockPlugins({
+    const mockServer = createMockServer({
       user: null,
       config: { 'xpack.reporting.roles.allow': ['.reporting_user'] },
     });
-    mockPlugins.security = { authc: { getCurrentUser: () => null } };
+    const mockPlugins = getMockPlugins({
+      security: { authc: { getCurrentUser: () => null } },
+    });
 
     const authorizedUserPreRouting = authorizedUserPreRoutingFactory(
-      createMockConfig(),
+      mockServer,
       mockPlugins,
       getMockLogger()
     );
@@ -124,14 +144,16 @@ describe('authorized_user_pre_routing', function() {
   });
 
   it(`should return with boom forbidden when security is enabled but user doesn't have allowed role`, async function() {
-    const mockConfig = createMockConfig({ 'roles.allow': ['.reporting_user'] });
-    const mockPlugins = createMockPlugins({
+    const mockServer = createMockServer({
       user: { roles: [] },
-      getCurrentUser: () => ({ roles: ['something_else'] }),
+      config: { 'xpack.reporting.roles.allow': ['.reporting_user'] },
+    });
+    const mockPlugins = getMockPlugins({
+      security: { authc: { getCurrentUser: () => ({ roles: ['something_else'] }) } },
     });
 
     const authorizedUserPreRouting = authorizedUserPreRoutingFactory(
-      mockConfig,
+      mockServer,
       mockPlugins,
       getMockLogger()
     );
@@ -142,14 +164,18 @@ describe('authorized_user_pre_routing', function() {
 
   it('should return with user when security is enabled and user has explicitly allowed role', async function() {
     const user = { roles: ['.reporting_user', 'something_else'] };
-    const mockConfig = createMockConfig({ 'roles.allow': ['.reporting_user'] });
-    const mockPlugins = createMockPlugins({
+    const mockServer = createMockServer({
       user,
-      getCurrentUser: () => ({ roles: ['.reporting_user', 'something_else'] }),
+      config: { 'xpack.reporting.roles.allow': ['.reporting_user'] },
+    });
+    const mockPlugins = getMockPlugins({
+      security: {
+        authc: { getCurrentUser: () => ({ roles: ['.reporting_user', 'something_else'] }) },
+      },
     });
 
     const authorizedUserPreRouting = authorizedUserPreRoutingFactory(
-      mockConfig,
+      mockServer,
       mockPlugins,
       getMockLogger()
     );
@@ -159,13 +185,16 @@ describe('authorized_user_pre_routing', function() {
 
   it('should return with user when security is enabled and user has superuser role', async function() {
     const user = { roles: ['superuser', 'something_else'] };
-    const mockConfig = createMockConfig({ 'roles.allow': [] });
-    const mockPlugins = createMockPlugins({
-      getCurrentUser: () => ({ roles: ['superuser', 'something_else'] }),
+    const mockServer = createMockServer({
+      user,
+      config: { 'xpack.reporting.roles.allow': [] },
+    });
+    const mockPlugins = getMockPlugins({
+      security: { authc: { getCurrentUser: () => ({ roles: ['superuser', 'something_else'] }) } },
     });
 
     const authorizedUserPreRouting = authorizedUserPreRoutingFactory(
-      mockConfig,
+      mockServer,
       mockPlugins,
       getMockLogger()
     );
diff --git a/x-pack/legacy/plugins/reporting/server/routes/lib/authorized_user_pre_routing.ts b/x-pack/legacy/plugins/reporting/server/routes/lib/authorized_user_pre_routing.ts
index 1ca28ca62a7f2..c5f8c78016f61 100644
--- a/x-pack/legacy/plugins/reporting/server/routes/lib/authorized_user_pre_routing.ts
+++ b/x-pack/legacy/plugins/reporting/server/routes/lib/authorized_user_pre_routing.ts
@@ -7,8 +7,7 @@
 import Boom from 'boom';
 import { Legacy } from 'kibana';
 import { AuthenticatedUser } from '../../../../../../plugins/security/server';
-import { ReportingConfig } from '../../../server';
-import { Logger } from '../../../types';
+import { Logger, ServerFacade } from '../../../types';
 import { getUserFactory } from '../../lib/get_user';
 import { ReportingSetupDeps } from '../../types';
 
@@ -19,14 +18,16 @@ export type PreRoutingFunction = (
 ) => Promise<Boom<null> | AuthenticatedUser | null>;
 
 export const authorizedUserPreRoutingFactory = function authorizedUserPreRoutingFn(
-  config: ReportingConfig,
+  server: ServerFacade,
   plugins: ReportingSetupDeps,
   logger: Logger
 ) {
-  const getUser = getUserFactory(plugins.security, logger);
-  const { info: xpackInfo } = plugins.__LEGACY.plugins.xpack_main;
+  const getUser = getUserFactory(server, plugins.security);
+  const config = server.config();
 
   return async function authorizedUserPreRouting(request: Legacy.Request) {
+    const xpackInfo = server.plugins.xpack_main.info;
+
     if (!xpackInfo || !xpackInfo.isAvailable()) {
       logger.warn('Unable to authorize user before xpack info is available.', [
         'authorizedUserPreRouting',
@@ -45,7 +46,10 @@ export const authorizedUserPreRoutingFactory = function authorizedUserPreRouting
       return Boom.unauthorized(`Sorry, you aren't authenticated`);
     }
 
-    const authorizedRoles = [superuserRole, ...(config.get('roles', 'allow') as string[])];
+    const authorizedRoles = [
+      superuserRole,
+      ...(config.get('xpack.reporting.roles.allow') as string[]),
+    ];
     if (!user.roles.find(role => authorizedRoles.includes(role))) {
       return Boom.forbidden(`Sorry, you don't have access to Reporting`);
     }
diff --git a/x-pack/legacy/plugins/reporting/server/routes/lib/get_document_payload.ts b/x-pack/legacy/plugins/reporting/server/routes/lib/get_document_payload.ts
index aef37754681ec..fb3944ea33552 100644
--- a/x-pack/legacy/plugins/reporting/server/routes/lib/get_document_payload.ts
+++ b/x-pack/legacy/plugins/reporting/server/routes/lib/get_document_payload.ts
@@ -8,7 +8,13 @@
 import contentDisposition from 'content-disposition';
 import * as _ from 'lodash';
 import { CSV_JOB_TYPE } from '../../../common/constants';
-import { ExportTypeDefinition, ExportTypesRegistry, JobDocOutput, JobSource } from '../../../types';
+import {
+  ExportTypeDefinition,
+  ExportTypesRegistry,
+  JobDocOutput,
+  JobSource,
+  ServerFacade,
+} from '../../../types';
 
 interface ICustomHeaders {
   [x: string]: any;
@@ -16,15 +22,9 @@ interface ICustomHeaders {
 
 type ExportTypeType = ExportTypeDefinition<unknown, unknown, unknown, unknown>;
 
-interface ErrorFromPayload {
-  message: string;
-  reason: string | null;
-}
-
-// A camelCase version of JobDocOutput
 interface Payload {
   statusCode: number;
-  content: string | Buffer | ErrorFromPayload;
+  content: any;
   contentType: string;
   headers: Record<string, any>;
 }
@@ -48,17 +48,20 @@ const getReportingHeaders = (output: JobDocOutput, exportType: ExportTypeType) =
   return metaDataHeaders;
 };
 
-export function getDocumentPayloadFactory(exportTypesRegistry: ExportTypesRegistry) {
-  function encodeContent(content: string | null, exportType: ExportTypeType): Buffer | string {
+export function getDocumentPayloadFactory(
+  server: ServerFacade,
+  exportTypesRegistry: ExportTypesRegistry
+) {
+  function encodeContent(content: string | null, exportType: ExportTypeType) {
     switch (exportType.jobContentEncoding) {
       case 'base64':
-        return content ? Buffer.from(content, 'base64') : ''; // convert null to empty string
+        return content ? Buffer.from(content, 'base64') : content; // Buffer.from rejects null
       default:
-        return content ? content : ''; // convert null to empty string
+        return content;
     }
   }
 
-  function getCompleted(output: JobDocOutput, jobType: string, title: string): Payload {
+  function getCompleted(output: JobDocOutput, jobType: string, title: string) {
     const exportType = exportTypesRegistry.get((item: ExportTypeType) => item.jobType === jobType);
     const filename = getTitle(exportType, title);
     const headers = getReportingHeaders(output, exportType);
@@ -74,7 +77,7 @@ export function getDocumentPayloadFactory(exportTypesRegistry: ExportTypesRegist
     };
   }
 
-  function getFailure(output: JobDocOutput): Payload {
+  function getFailure(output: JobDocOutput) {
     return {
       statusCode: 500,
       content: {
diff --git a/x-pack/legacy/plugins/reporting/server/routes/lib/job_response_handler.ts b/x-pack/legacy/plugins/reporting/server/routes/lib/job_response_handler.ts
index e7e7c866db96a..30627d5b23230 100644
--- a/x-pack/legacy/plugins/reporting/server/routes/lib/job_response_handler.ts
+++ b/x-pack/legacy/plugins/reporting/server/routes/lib/job_response_handler.ts
@@ -5,12 +5,11 @@
  */
 
 import Boom from 'boom';
-import { ResponseToolkit } from 'hapi';
 import { ElasticsearchServiceSetup } from 'kibana/server';
+import { ResponseToolkit } from 'hapi';
 import { WHITELISTED_JOB_CONTENT_TYPES } from '../../../common/constants';
-import { ExportTypesRegistry } from '../../../types';
+import { ExportTypesRegistry, ServerFacade } from '../../../types';
 import { jobsQueryFactory } from '../../lib/jobs_query';
-import { ReportingConfig } from '../../types';
 import { getDocumentPayloadFactory } from './get_document_payload';
 
 interface JobResponseHandlerParams {
@@ -22,12 +21,12 @@ interface JobResponseHandlerOpts {
 }
 
 export function downloadJobResponseHandlerFactory(
-  config: ReportingConfig,
+  server: ServerFacade,
   elasticsearch: ElasticsearchServiceSetup,
   exportTypesRegistry: ExportTypesRegistry
 ) {
-  const jobsQuery = jobsQueryFactory(config, elasticsearch);
-  const getDocumentPayload = getDocumentPayloadFactory(exportTypesRegistry);
+  const jobsQuery = jobsQueryFactory(server, elasticsearch);
+  const getDocumentPayload = getDocumentPayloadFactory(server, exportTypesRegistry);
 
   return function jobResponseHandler(
     validJobTypes: string[],
@@ -71,10 +70,10 @@ export function downloadJobResponseHandlerFactory(
 }
 
 export function deleteJobResponseHandlerFactory(
-  config: ReportingConfig,
+  server: ServerFacade,
   elasticsearch: ElasticsearchServiceSetup
 ) {
-  const jobsQuery = jobsQueryFactory(config, elasticsearch);
+  const jobsQuery = jobsQueryFactory(server, elasticsearch);
 
   return async function deleteJobResponseHander(
     validJobTypes: string[],
diff --git a/x-pack/legacy/plugins/reporting/server/routes/lib/reporting_feature_pre_routing.ts b/x-pack/legacy/plugins/reporting/server/routes/lib/reporting_feature_pre_routing.ts
index 8a79566aafae2..9e618ff1fe40a 100644
--- a/x-pack/legacy/plugins/reporting/server/routes/lib/reporting_feature_pre_routing.ts
+++ b/x-pack/legacy/plugins/reporting/server/routes/lib/reporting_feature_pre_routing.ts
@@ -6,17 +6,17 @@
 
 import Boom from 'boom';
 import { Legacy } from 'kibana';
-import { Logger } from '../../../types';
-import { ReportingConfig, ReportingSetupDeps } from '../../types';
+import { Logger, ServerFacade } from '../../../types';
+import { ReportingSetupDeps } from '../../types';
 
 export type GetReportingFeatureIdFn = (request: Legacy.Request) => string;
 
 export const reportingFeaturePreRoutingFactory = function reportingFeaturePreRoutingFn(
-  config: ReportingConfig,
+  server: ServerFacade,
   plugins: ReportingSetupDeps,
   logger: Logger
 ) {
-  const xpackMainPlugin = plugins.__LEGACY.plugins.xpack_main;
+  const xpackMainPlugin = server.plugins.xpack_main;
   const pluginId = 'reporting';
 
   // License checking and enable/disable logic
diff --git a/x-pack/legacy/plugins/reporting/server/routes/lib/route_config_factories.ts b/x-pack/legacy/plugins/reporting/server/routes/lib/route_config_factories.ts
index 06f7efaa9dcbb..3d275d34e2f7d 100644
--- a/x-pack/legacy/plugins/reporting/server/routes/lib/route_config_factories.ts
+++ b/x-pack/legacy/plugins/reporting/server/routes/lib/route_config_factories.ts
@@ -6,8 +6,8 @@
 
 import Joi from 'joi';
 import { CSV_FROM_SAVEDOBJECT_JOB_TYPE } from '../../../common/constants';
-import { Logger } from '../../../types';
-import { ReportingConfig, ReportingSetupDeps } from '../../types';
+import { Logger, ServerFacade } from '../../../types';
+import { ReportingSetupDeps } from '../../types';
 import { authorizedUserPreRoutingFactory } from './authorized_user_pre_routing';
 import {
   GetReportingFeatureIdFn,
@@ -29,12 +29,12 @@ export type GetRouteConfigFactoryFn = (
 ) => RouteConfigFactory;
 
 export function getRouteConfigFactoryReportingPre(
-  config: ReportingConfig,
+  server: ServerFacade,
   plugins: ReportingSetupDeps,
   logger: Logger
 ): GetRouteConfigFactoryFn {
-  const authorizedUserPreRouting = authorizedUserPreRoutingFactory(config, plugins, logger);
-  const reportingFeaturePreRouting = reportingFeaturePreRoutingFactory(config, plugins, logger);
+  const authorizedUserPreRouting = authorizedUserPreRoutingFactory(server, plugins, logger);
+  const reportingFeaturePreRouting = reportingFeaturePreRoutingFactory(server, plugins, logger);
 
   return (getFeatureId?: GetReportingFeatureIdFn): RouteConfigFactory => {
     const preRouting: any[] = [{ method: authorizedUserPreRouting, assign: 'user' }];
@@ -50,11 +50,11 @@ export function getRouteConfigFactoryReportingPre(
 }
 
 export function getRouteOptionsCsv(
-  config: ReportingConfig,
+  server: ServerFacade,
   plugins: ReportingSetupDeps,
   logger: Logger
 ) {
-  const getRouteConfig = getRouteConfigFactoryReportingPre(config, plugins, logger);
+  const getRouteConfig = getRouteConfigFactoryReportingPre(server, plugins, logger);
   return {
     ...getRouteConfig(() => CSV_FROM_SAVEDOBJECT_JOB_TYPE),
     validate: {
@@ -75,12 +75,12 @@ export function getRouteOptionsCsv(
 }
 
 export function getRouteConfigFactoryManagementPre(
-  config: ReportingConfig,
+  server: ServerFacade,
   plugins: ReportingSetupDeps,
   logger: Logger
 ): GetRouteConfigFactoryFn {
-  const authorizedUserPreRouting = authorizedUserPreRoutingFactory(config, plugins, logger);
-  const reportingFeaturePreRouting = reportingFeaturePreRoutingFactory(config, plugins, logger);
+  const authorizedUserPreRouting = authorizedUserPreRoutingFactory(server, plugins, logger);
+  const reportingFeaturePreRouting = reportingFeaturePreRoutingFactory(server, plugins, logger);
   const managementPreRouting = reportingFeaturePreRouting(() => 'management');
 
   return (): RouteConfigFactory => {
@@ -99,11 +99,11 @@ export function getRouteConfigFactoryManagementPre(
 // Additionally, the range-request doesn't alleviate any performance issues on the server as the entire
 // download is loaded into memory.
 export function getRouteConfigFactoryDownloadPre(
-  config: ReportingConfig,
+  server: ServerFacade,
   plugins: ReportingSetupDeps,
   logger: Logger
 ): GetRouteConfigFactoryFn {
-  const getManagementRouteConfig = getRouteConfigFactoryManagementPre(config, plugins, logger);
+  const getManagementRouteConfig = getRouteConfigFactoryManagementPre(server, plugins, logger);
   return (): RouteConfigFactory => ({
     ...getManagementRouteConfig(),
     tags: [API_TAG, 'download'],
@@ -114,11 +114,11 @@ export function getRouteConfigFactoryDownloadPre(
 }
 
 export function getRouteConfigFactoryDeletePre(
-  config: ReportingConfig,
+  server: ServerFacade,
   plugins: ReportingSetupDeps,
   logger: Logger
 ): GetRouteConfigFactoryFn {
-  const getManagementRouteConfig = getRouteConfigFactoryManagementPre(config, plugins, logger);
+  const getManagementRouteConfig = getRouteConfigFactoryManagementPre(server, plugins, logger);
   return (): RouteConfigFactory => ({
     ...getManagementRouteConfig(),
     tags: [API_TAG, 'delete'],
diff --git a/x-pack/legacy/plugins/reporting/server/types.d.ts b/x-pack/legacy/plugins/reporting/server/types.d.ts
index c773e2d556648..59b7bc2020ad9 100644
--- a/x-pack/legacy/plugins/reporting/server/types.d.ts
+++ b/x-pack/legacy/plugins/reporting/server/types.d.ts
@@ -11,17 +11,16 @@ import { PluginStart as DataPluginStart } from '../../../../../src/plugins/data/
 import { SecurityPluginSetup } from '../../../../plugins/security/server';
 import { XPackMainPlugin } from '../../xpack_main/server/xpack_main';
 import { ReportingPluginSpecOptions } from '../types';
-import { ReportingConfig, ReportingConfigType } from './core';
 
 export interface ReportingSetupDeps {
   elasticsearch: ElasticsearchServiceSetup;
   security: SecurityPluginSetup;
   usageCollection: UsageCollectionSetup;
-  reporting: { config: ReportingConfig };
   __LEGACY: LegacySetup;
 }
 
 export interface ReportingStartDeps {
+  elasticsearch: ElasticsearchServiceSetup;
   data: DataPluginStart;
   __LEGACY: LegacySetup;
 }
@@ -31,7 +30,10 @@ export type ReportingSetup = object;
 export type ReportingStart = object;
 
 export interface LegacySetup {
+  config: Legacy.Server['config'];
+  info: Legacy.Server['info'];
   plugins: {
+    elasticsearch: Legacy.Server['plugins']['elasticsearch'];
     xpack_main: XPackMainPlugin & {
       status?: any;
     };
@@ -40,7 +42,4 @@ export interface LegacySetup {
   route: Legacy.Server['route'];
 }
 
-export { ReportingConfig, ReportingCore } from './core';
-
-export type CaptureConfig = ReportingConfigType['capture'];
-export type ScrollConfig = ReportingConfigType['csv']['scroll'];
+export { ReportingCore } from './core';
diff --git a/x-pack/legacy/plugins/reporting/server/usage/get_reporting_usage.ts b/x-pack/legacy/plugins/reporting/server/usage/get_reporting_usage.ts
index 5f12f2b7f044d..bd2d0cb835a79 100644
--- a/x-pack/legacy/plugins/reporting/server/usage/get_reporting_usage.ts
+++ b/x-pack/legacy/plugins/reporting/server/usage/get_reporting_usage.ts
@@ -5,10 +5,7 @@
  */
 
 import { get } from 'lodash';
-import { ESCallCluster, ExportTypesRegistry } from '../../types';
-import { ReportingConfig, ReportingSetupDeps } from '../types';
-import { decorateRangeStats } from './decorate_range_stats';
-import { getExportTypesHandler } from './get_export_type_handler';
+import { ServerFacade, ExportTypesRegistry, ESCallCluster } from '../../types';
 import {
   AggregationBuckets,
   AggregationResults,
@@ -18,6 +15,8 @@ import {
   RangeAggregationResults,
   RangeStats,
 } from './types';
+import { decorateRangeStats } from './decorate_range_stats';
+import { getExportTypesHandler } from './get_export_type_handler';
 
 const JOB_TYPES_KEY = 'jobTypes';
 const JOB_TYPES_FIELD = 'jobtype';
@@ -80,7 +79,10 @@ type RangeStatSets = Partial<
     last7Days: RangeStats;
   }
 >;
-async function handleResponse(response: AggregationResults): Promise<RangeStatSets> {
+async function handleResponse(
+  server: ServerFacade,
+  response: AggregationResults
+): Promise<RangeStatSets> {
   const buckets = get(response, 'aggregations.ranges.buckets');
   if (!buckets) {
     return {};
@@ -99,12 +101,12 @@ async function handleResponse(response: AggregationResults): Promise<RangeStatSe
 }
 
 export async function getReportingUsage(
-  config: ReportingConfig,
-  plugins: ReportingSetupDeps,
+  server: ServerFacade,
   callCluster: ESCallCluster,
   exportTypesRegistry: ExportTypesRegistry
 ) {
-  const reportingIndex = config.get('index');
+  const config = server.config();
+  const reportingIndex = config.get('xpack.reporting.index');
 
   const params = {
     index: `${reportingIndex}-*`,
@@ -137,18 +139,16 @@ export async function getReportingUsage(
     },
   };
 
-  const { info: xpackMainInfo } = plugins.__LEGACY.plugins.xpack_main;
   return callCluster('search', params)
-    .then((response: AggregationResults) => handleResponse(response))
+    .then((response: AggregationResults) => handleResponse(server, response))
     .then((usage: RangeStatSets) => {
       // Allow this to explicitly throw an exception if/when this config is deprecated,
       // because we shouldn't collect browserType in that case!
-      const browserType = config.get('capture', 'browser', 'type');
+      const browserType = config.get('xpack.reporting.capture.browser.type');
 
+      const xpackInfo = server.plugins.xpack_main.info;
       const exportTypesHandler = getExportTypesHandler(exportTypesRegistry);
-      const availability = exportTypesHandler.getAvailability(
-        xpackMainInfo
-      ) as FeatureAvailabilityMap;
+      const availability = exportTypesHandler.getAvailability(xpackInfo) as FeatureAvailabilityMap;
 
       const { lastDay, last7Days, ...all } = usage;
 
diff --git a/x-pack/legacy/plugins/reporting/server/usage/reporting_usage_collector.test.js b/x-pack/legacy/plugins/reporting/server/usage/reporting_usage_collector.test.js
index 905d2fe9b995c..a6d753f9b107a 100644
--- a/x-pack/legacy/plugins/reporting/server/usage/reporting_usage_collector.test.js
+++ b/x-pack/legacy/plugins/reporting/server/usage/reporting_usage_collector.test.js
@@ -24,52 +24,62 @@ function getMockUsageCollection() {
     makeUsageCollector: options => {
       return new MockUsageCollector(this, options);
     },
-    registerCollector: sinon.stub(),
   };
 }
 
-function getPluginsMock(
-  { license, usageCollection = getMockUsageCollection() } = { license: 'platinum' }
-) {
-  const mockXpackMain = {
-    info: {
-      isAvailable: sinon.stub().returns(true),
-      feature: () => ({
-        getLicenseCheckResults: sinon.stub(),
-      }),
-      license: {
-        isOneOf: sinon.stub().returns(false),
-        getType: sinon.stub().returns(license),
+function getServerMock(customization) {
+  const getLicenseCheckResults = sinon.stub().returns({});
+  const defaultServerMock = {
+    plugins: {
+      security: {
+        isAuthenticated: sinon.stub().returns(true),
       },
-      toJSON: () => ({ b: 1 }),
-    },
-  };
-  return {
-    usageCollection,
-    __LEGACY: {
-      plugins: {
-        xpack_main: mockXpackMain,
+      xpack_main: {
+        info: {
+          isAvailable: sinon.stub().returns(true),
+          feature: () => ({
+            getLicenseCheckResults,
+          }),
+          license: {
+            isOneOf: sinon.stub().returns(false),
+            getType: sinon.stub().returns('platinum'),
+          },
+          toJSON: () => ({ b: 1 }),
+        },
       },
     },
+    log: () => {},
+    config: () => ({
+      get: key => {
+        if (key === 'xpack.reporting.enabled') {
+          return true;
+        } else if (key === 'xpack.reporting.index') {
+          return '.reporting-index';
+        }
+      },
+    }),
   };
+  return Object.assign(defaultServerMock, customization);
 }
 
 const getResponseMock = (customization = {}) => customization;
 
 describe('license checks', () => {
-  let mockConfig;
-  beforeAll(async () => {
-    const mockReporting = await createMockReportingCore();
-    mockConfig = await mockReporting.getConfig();
-  });
-
   describe('with a basic license', () => {
     let usageStats;
     beforeAll(async () => {
-      const plugins = getPluginsMock({ license: 'basic' });
+      const serverWithBasicLicenseMock = getServerMock();
+      serverWithBasicLicenseMock.plugins.xpack_main.info.license.getType = sinon
+        .stub()
+        .returns('basic');
       const callClusterMock = jest.fn(() => Promise.resolve(getResponseMock()));
-      const { fetch } = getReportingUsageCollector(mockConfig, plugins, exportTypesRegistry);
-      usageStats = await fetch(callClusterMock, exportTypesRegistry);
+      const usageCollection = getMockUsageCollection();
+      const { fetch: getReportingUsage } = getReportingUsageCollector(
+        serverWithBasicLicenseMock,
+        usageCollection,
+        exportTypesRegistry
+      );
+      usageStats = await getReportingUsage(callClusterMock, exportTypesRegistry);
     });
 
     test('sets enables to true', async () => {
@@ -88,10 +98,18 @@ describe('license checks', () => {
   describe('with no license', () => {
     let usageStats;
     beforeAll(async () => {
-      const plugins = getPluginsMock({ license: 'none' });
+      const serverWithNoLicenseMock = getServerMock();
+      serverWithNoLicenseMock.plugins.xpack_main.info.license.getType = sinon
+        .stub()
+        .returns('none');
       const callClusterMock = jest.fn(() => Promise.resolve(getResponseMock()));
-      const { fetch } = getReportingUsageCollector(mockConfig, plugins, exportTypesRegistry);
-      usageStats = await fetch(callClusterMock, exportTypesRegistry);
+      const usageCollection = getMockUsageCollection();
+      const { fetch: getReportingUsage } = getReportingUsageCollector(
+        serverWithNoLicenseMock,
+        usageCollection,
+        exportTypesRegistry
+      );
+      usageStats = await getReportingUsage(callClusterMock, exportTypesRegistry);
     });
 
     test('sets enables to true', async () => {
@@ -110,10 +128,18 @@ describe('license checks', () => {
   describe('with platinum license', () => {
     let usageStats;
     beforeAll(async () => {
-      const plugins = getPluginsMock({ license: 'platinum' });
+      const serverWithPlatinumLicenseMock = getServerMock();
+      serverWithPlatinumLicenseMock.plugins.xpack_main.info.license.getType = sinon
+        .stub()
+        .returns('platinum');
       const callClusterMock = jest.fn(() => Promise.resolve(getResponseMock()));
-      const { fetch } = getReportingUsageCollector(mockConfig, plugins, exportTypesRegistry);
-      usageStats = await fetch(callClusterMock, exportTypesRegistry);
+      const usageCollection = getMockUsageCollection();
+      const { fetch: getReportingUsage } = getReportingUsageCollector(
+        serverWithPlatinumLicenseMock,
+        usageCollection,
+        exportTypesRegistry
+      );
+      usageStats = await getReportingUsage(callClusterMock, exportTypesRegistry);
     });
 
     test('sets enables to true', async () => {
@@ -132,10 +158,18 @@ describe('license checks', () => {
   describe('with no usage data', () => {
     let usageStats;
     beforeAll(async () => {
-      const plugins = getPluginsMock({ license: 'basic' });
+      const serverWithBasicLicenseMock = getServerMock();
+      serverWithBasicLicenseMock.plugins.xpack_main.info.license.getType = sinon
+        .stub()
+        .returns('basic');
       const callClusterMock = jest.fn(() => Promise.resolve({}));
-      const { fetch } = getReportingUsageCollector(mockConfig, plugins, exportTypesRegistry);
-      usageStats = await fetch(callClusterMock, exportTypesRegistry);
+      const usageCollection = getMockUsageCollection();
+      const { fetch: getReportingUsage } = getReportingUsageCollector(
+        serverWithBasicLicenseMock,
+        usageCollection,
+        exportTypesRegistry
+      );
+      usageStats = await getReportingUsage(callClusterMock, exportTypesRegistry);
     });
 
     test('sets enables to true', async () => {
@@ -149,11 +183,21 @@ describe('license checks', () => {
 });
 
 describe('data modeling', () => {
+  let getReportingUsage;
+  beforeAll(async () => {
+    const usageCollection = getMockUsageCollection();
+    const serverWithPlatinumLicenseMock = getServerMock();
+    serverWithPlatinumLicenseMock.plugins.xpack_main.info.license.getType = sinon
+      .stub()
+      .returns('platinum');
+    ({ fetch: getReportingUsage } = getReportingUsageCollector(
+      serverWithPlatinumLicenseMock,
+      usageCollection,
+      exportTypesRegistry
+    ));
+  });
+
   test('with normal looking usage data', async () => {
-    const mockReporting = await createMockReportingCore();
-    const mockConfig = await mockReporting.getConfig();
-    const plugins = getPluginsMock();
-    const { fetch } = getReportingUsageCollector(mockConfig, plugins, exportTypesRegistry);
     const callClusterMock = jest.fn(() =>
       Promise.resolve(
         getResponseMock({
@@ -276,7 +320,7 @@ describe('data modeling', () => {
       )
     );
 
-    const usageStats = await fetch(callClusterMock);
+    const usageStats = await getReportingUsage(callClusterMock);
     expect(usageStats).toMatchInlineSnapshot(`
       Object {
         "PNG": Object {
@@ -371,16 +415,20 @@ describe('data modeling', () => {
 });
 
 describe('Ready for collection observable', () => {
-  test('converts observable to promise', async () => {
-    const mockReporting = await createMockReportingCore();
-    const mockConfig = await mockReporting.getConfig();
+  let mockReporting;
 
-    const usageCollection = getMockUsageCollection();
-    const makeCollectorSpy = sinon.spy();
-    usageCollection.makeUsageCollector = makeCollectorSpy;
+  beforeEach(async () => {
+    mockReporting = await createMockReportingCore();
+  });
 
-    const plugins = getPluginsMock({ usageCollection });
-    registerReportingUsageCollector(mockReporting, mockConfig, plugins);
+  test('converts observable to promise', async () => {
+    const serverWithBasicLicenseMock = getServerMock();
+    const makeCollectorSpy = sinon.spy();
+    const usageCollection = {
+      makeUsageCollector: makeCollectorSpy,
+      registerCollector: sinon.stub(),
+    };
+    registerReportingUsageCollector(mockReporting, serverWithBasicLicenseMock, usageCollection);
 
     const [args] = makeCollectorSpy.firstCall.args;
     expect(args).toMatchInlineSnapshot(`
diff --git a/x-pack/legacy/plugins/reporting/server/usage/reporting_usage_collector.ts b/x-pack/legacy/plugins/reporting/server/usage/reporting_usage_collector.ts
index ab4ec3a0edf57..14202530fb6c7 100644
--- a/x-pack/legacy/plugins/reporting/server/usage/reporting_usage_collector.ts
+++ b/x-pack/legacy/plugins/reporting/server/usage/reporting_usage_collector.ts
@@ -4,9 +4,10 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+import { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
 import { KIBANA_REPORTING_TYPE } from '../../common/constants';
-import { ReportingConfig, ReportingCore, ReportingSetupDeps } from '../../server/types';
-import { ESCallCluster, ExportTypesRegistry } from '../../types';
+import { ReportingCore } from '../../server';
+import { ESCallCluster, ExportTypesRegistry, ServerFacade } from '../../types';
 import { getReportingUsage } from './get_reporting_usage';
 import { RangeStats } from './types';
 
@@ -14,19 +15,19 @@ import { RangeStats } from './types';
 const METATYPE = 'kibana_stats';
 
 /*
+ * @param {Object} server
  * @return {Object} kibana usage stats type collection object
  */
 export function getReportingUsageCollector(
-  config: ReportingConfig,
-  plugins: ReportingSetupDeps,
+  server: ServerFacade,
+  usageCollection: UsageCollectionSetup,
   exportTypesRegistry: ExportTypesRegistry,
   isReady: () => Promise<boolean>
 ) {
-  const { usageCollection } = plugins;
   return usageCollection.makeUsageCollector({
     type: KIBANA_REPORTING_TYPE,
     fetch: (callCluster: ESCallCluster) =>
-      getReportingUsage(config, plugins, callCluster, exportTypesRegistry),
+      getReportingUsage(server, callCluster, exportTypesRegistry),
     isReady,
 
     /*
@@ -51,17 +52,17 @@ export function getReportingUsageCollector(
 
 export function registerReportingUsageCollector(
   reporting: ReportingCore,
-  config: ReportingConfig,
-  plugins: ReportingSetupDeps
+  server: ServerFacade,
+  usageCollection: UsageCollectionSetup
 ) {
   const exportTypesRegistry = reporting.getExportTypesRegistry();
   const collectionIsReady = reporting.pluginHasStarted.bind(reporting);
 
   const collector = getReportingUsageCollector(
-    config,
-    plugins,
+    server,
+    usageCollection,
     exportTypesRegistry,
     collectionIsReady
   );
-  plugins.usageCollection.registerCollector(collector);
+  usageCollection.registerCollector(collector);
 }
diff --git a/x-pack/legacy/plugins/reporting/test_helpers/create_mock_browserdriverfactory.ts b/x-pack/legacy/plugins/reporting/test_helpers/create_mock_browserdriverfactory.ts
index 930aa7601b8cb..883276d43e27e 100644
--- a/x-pack/legacy/plugins/reporting/test_helpers/create_mock_browserdriverfactory.ts
+++ b/x-pack/legacy/plugins/reporting/test_helpers/create_mock_browserdriverfactory.ts
@@ -10,8 +10,7 @@ import * as contexts from '../export_types/common/lib/screenshots/constants';
 import { ElementsPositionAndAttribute } from '../export_types/common/lib/screenshots/types';
 import { HeadlessChromiumDriver, HeadlessChromiumDriverFactory } from '../server/browsers';
 import { createDriverFactory } from '../server/browsers/chromium';
-import { CaptureConfig } from '../server/types';
-import { Logger } from '../types';
+import { BrowserConfig, CaptureConfig, Logger } from '../types';
 
 interface CreateMockBrowserDriverFactoryOpts {
   evaluate: jest.Mock<Promise<any>, any[]>;
@@ -94,34 +93,24 @@ export const createMockBrowserDriverFactory = async (
   logger: Logger,
   opts: Partial<CreateMockBrowserDriverFactoryOpts>
 ): Promise<HeadlessChromiumDriverFactory> => {
-  const captureConfig = {
-    timeouts: { openUrl: 30000, waitForElements: 30000, renderComplete: 30000 },
-    browser: {
-      type: 'chromium',
-      chromium: {
-        inspect: false,
-        disableSandbox: false,
-        userDataDir: '/usr/data/dir',
-        viewport: { width: 12, height: 12 },
-        proxy: { enabled: false, server: undefined, bypass: undefined },
-      },
-      autoDownload: false,
-      inspect: true,
-      userDataDir: '/usr/data/dir',
-      viewport: { width: 12, height: 12 },
-      disableSandbox: false,
-      proxy: { enabled: false, server: undefined, bypass: undefined },
-      maxScreenshotDimension: undefined,
-    },
-    networkPolicy: { enabled: true, rules: [] },
-    viewport: { width: 800, height: 600 },
-    loadDelay: 2000,
-    zoom: 1,
-    maxAttempts: 1,
-  } as CaptureConfig;
+  const browserConfig = {
+    inspect: true,
+    userDataDir: '/usr/data/dir',
+    viewport: { width: 12, height: 12 },
+    disableSandbox: false,
+    proxy: { enabled: false },
+  } as BrowserConfig;
 
   const binaryPath = '/usr/local/share/common/secure/';
-  const mockBrowserDriverFactory = await createDriverFactory(binaryPath, logger, captureConfig);
+  const captureConfig = { networkPolicy: {}, timeouts: {} } as CaptureConfig;
+
+  const mockBrowserDriverFactory = await createDriverFactory(
+    binaryPath,
+    logger,
+    browserConfig,
+    captureConfig
+  );
+
   const mockPage = {} as Page;
   const mockBrowserDriver = new HeadlessChromiumDriver(mockPage, {
     inspect: true,
diff --git a/x-pack/legacy/plugins/reporting/test_helpers/create_mock_layoutinstance.ts b/x-pack/legacy/plugins/reporting/test_helpers/create_mock_layoutinstance.ts
index be60b56dcc0c1..0250e6c0a9afd 100644
--- a/x-pack/legacy/plugins/reporting/test_helpers/create_mock_layoutinstance.ts
+++ b/x-pack/legacy/plugins/reporting/test_helpers/create_mock_layoutinstance.ts
@@ -4,13 +4,13 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { LayoutTypes } from '../export_types/common/constants';
 import { createLayout } from '../export_types/common/layouts';
+import { LayoutTypes } from '../export_types/common/constants';
 import { LayoutInstance } from '../export_types/common/layouts/layout';
-import { CaptureConfig } from '../server/types';
+import { ServerFacade } from '../types';
 
-export const createMockLayoutInstance = (captureConfig: CaptureConfig) => {
-  const mockLayout = createLayout(captureConfig, {
+export const createMockLayoutInstance = (__LEGACY: ServerFacade) => {
+  const mockLayout = createLayout(__LEGACY, {
     id: LayoutTypes.PRESERVE_LAYOUT,
     dimensions: { height: 12, width: 12 },
   }) as LayoutInstance;
diff --git a/x-pack/legacy/plugins/reporting/test_helpers/create_mock_reportingplugin.ts b/x-pack/legacy/plugins/reporting/test_helpers/create_mock_reportingplugin.ts
index 332b37b58cb7d..2cd129d47b3f9 100644
--- a/x-pack/legacy/plugins/reporting/test_helpers/create_mock_reportingplugin.ts
+++ b/x-pack/legacy/plugins/reporting/test_helpers/create_mock_reportingplugin.ts
@@ -19,24 +19,16 @@ import { coreMock } from 'src/core/server/mocks';
 import { ReportingPlugin, ReportingCore } from '../server';
 import { ReportingSetupDeps, ReportingStartDeps } from '../server/types';
 
-const createMockSetupDeps = (setupMock?: any): ReportingSetupDeps => {
-  const configGetStub = jest.fn();
-  return {
-    elasticsearch: setupMock.elasticsearch,
-    security: setupMock.security,
-    usageCollection: {} as any,
-    reporting: {
-      config: {
-        get: configGetStub,
-        kbnConfig: { get: configGetStub },
-      },
-    },
-    __LEGACY: { plugins: { xpack_main: { status: new EventEmitter() } } } as any,
-  };
-};
+export const createMockSetupDeps = (setupMock?: any): ReportingSetupDeps => ({
+  elasticsearch: setupMock.elasticsearch,
+  security: setupMock.security,
+  usageCollection: {} as any,
+  __LEGACY: { plugins: { xpack_main: { status: new EventEmitter() } } } as any,
+});
 
 export const createMockStartDeps = (startMock?: any): ReportingStartDeps => ({
   data: startMock.data,
+  elasticsearch: startMock.elasticsearch,
   __LEGACY: {} as any,
 });
 
diff --git a/x-pack/legacy/plugins/reporting/test_helpers/create_mock_server.ts b/x-pack/legacy/plugins/reporting/test_helpers/create_mock_server.ts
index 531e1dcaf84e0..bb7851ba036a9 100644
--- a/x-pack/legacy/plugins/reporting/test_helpers/create_mock_server.ts
+++ b/x-pack/legacy/plugins/reporting/test_helpers/create_mock_server.ts
@@ -3,10 +3,36 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-
+import { memoize } from 'lodash';
 import { ServerFacade } from '../types';
 
-export const createMockServer = (): ServerFacade => {
-  const mockServer = {};
-  return mockServer as any;
+export const createMockServer = ({ settings = {} }: any): ServerFacade => {
+  const mockServer = {
+    config: memoize(() => ({ get: jest.fn() })),
+    info: {
+      protocol: 'http',
+    },
+    plugins: {
+      elasticsearch: {
+        getCluster: memoize(() => {
+          return {
+            callWithRequest: jest.fn(),
+          };
+        }),
+      },
+    },
+  };
+
+  const defaultSettings: any = {
+    'xpack.reporting.encryptionKey': 'testencryptionkey',
+    'server.basePath': '/sbp',
+    'server.host': 'localhost',
+    'server.port': 5601,
+    'xpack.reporting.kibanaServer': {},
+  };
+  mockServer.config().get.mockImplementation((key: any) => {
+    return key in settings ? settings[key] : defaultSettings[key];
+  });
+
+  return (mockServer as unknown) as ServerFacade;
 };
diff --git a/x-pack/legacy/plugins/reporting/types.d.ts b/x-pack/legacy/plugins/reporting/types.d.ts
index 76253752be1b7..238079ba92a29 100644
--- a/x-pack/legacy/plugins/reporting/types.d.ts
+++ b/x-pack/legacy/plugins/reporting/types.d.ts
@@ -7,11 +7,14 @@
 import { EventEmitter } from 'events';
 import { ResponseObject } from 'hapi';
 import { Legacy } from 'kibana';
+import { ElasticsearchServiceSetup } from 'kibana/server';
 import { CallCluster } from '../../../../src/legacy/core_plugins/elasticsearch';
 import { CancellationToken } from './common/cancellation_token';
-import { ReportingCore } from './server/core';
+import { HeadlessChromiumDriverFactory } from './server/browsers/chromium/driver_factory';
+import { BrowserType } from './server/browsers/types';
 import { LevelLogger } from './server/lib/level_logger';
-import { LegacySetup } from './server/types';
+import { ReportingCore } from './server/core';
+import { LegacySetup, ReportingStartDeps, ReportingSetup, ReportingStart } from './server/types';
 
 export type Job = EventEmitter & {
   id: string;
@@ -22,8 +25,8 @@ export type Job = EventEmitter & {
 
 export interface NetworkPolicyRule {
   allow: boolean;
-  protocol?: string;
-  host?: string;
+  protocol: string;
+  host: string;
 }
 
 export interface NetworkPolicy {
@@ -90,6 +93,51 @@ export type ReportingResponseToolkit = Legacy.ResponseToolkit;
 
 export type ESCallCluster = CallCluster;
 
+/*
+ * Reporting Config
+ */
+
+export interface CaptureConfig {
+  browser: {
+    type: BrowserType;
+    autoDownload: boolean;
+    chromium: BrowserConfig;
+  };
+  maxAttempts: number;
+  networkPolicy: NetworkPolicy;
+  loadDelay: number;
+  timeouts: {
+    openUrl: number;
+    waitForElements: number;
+    renderComplet: number;
+  };
+}
+
+export interface BrowserConfig {
+  inspect: boolean;
+  userDataDir: string;
+  viewport: { width: number; height: number };
+  disableSandbox: boolean;
+  proxy: {
+    enabled: boolean;
+    server: string;
+    bypass?: string[];
+  };
+}
+
+export interface QueueConfig {
+  indexInterval: string;
+  pollEnabled: boolean;
+  pollInterval: number;
+  pollIntervalErrorMultiplier: number;
+  timeout: number;
+}
+
+export interface ScrollConfig {
+  duration: string;
+  size: number;
+}
+
 export interface ElementPosition {
   boundingClientRect: {
     // modern browsers support x/y, but older ones don't
@@ -226,10 +274,14 @@ export interface ESQueueInstance {
 
 export type CreateJobFactory<CreateJobFnType> = (
   reporting: ReportingCore,
+  server: ServerFacade,
+  elasticsearch: ElasticsearchServiceSetup,
   logger: LevelLogger
-) => Promise<CreateJobFnType>;
+) => CreateJobFnType;
 export type ExecuteJobFactory<ExecuteJobFnType> = (
   reporting: ReportingCore,
+  server: ServerFacade,
+  elasticsearch: ElasticsearchServiceSetup,
   logger: LevelLogger
 ) => Promise<ExecuteJobFnType>;
 
diff --git a/x-pack/plugins/reporting/config.ts b/x-pack/plugins/reporting/config.ts
new file mode 100644
index 0000000000000..f1d6b1a8f248f
--- /dev/null
+++ b/x-pack/plugins/reporting/config.ts
@@ -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.
+ */
+
+export const reportingPollConfig = {
+  jobCompletionNotifier: { interval: 10000, intervalErrorMultiplier: 5 },
+  jobsRefresh: { interval: 5000, intervalErrorMultiplier: 5 },
+};
diff --git a/x-pack/plugins/reporting/kibana.json b/x-pack/plugins/reporting/kibana.json
index d330eb9b7872a..a7e2bd288f0b1 100644
--- a/x-pack/plugins/reporting/kibana.json
+++ b/x-pack/plugins/reporting/kibana.json
@@ -1,11 +1,7 @@
 {
-  "configPath": [ "xpack", "reporting" ],
   "id": "reporting",
   "version": "8.0.0",
   "kibanaVersion": "kibana",
-  "optionalPlugins": [
-    "usageCollection"
-  ],
   "requiredPlugins": [
     "home",
     "management",
@@ -15,6 +11,6 @@
     "share",
     "kibanaLegacy"
   ],
-  "server": true,
+  "server": false,
   "ui": true
 }
diff --git a/x-pack/plugins/reporting/server/config/index.test.ts b/x-pack/plugins/reporting/server/config/index.test.ts
deleted file mode 100644
index 08fe2c5861311..0000000000000
--- a/x-pack/plugins/reporting/server/config/index.test.ts
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import * as Rx from 'rxjs';
-import { CoreSetup, Logger, PluginInitializerContext } from '../../../../../src/core/server';
-import { createConfig$ } from './';
-
-interface KibanaServer {
-  host?: string;
-  port?: number;
-  protocol?: string;
-}
-interface ReportingKibanaServer {
-  hostname?: string;
-  port?: number;
-  protocol?: string;
-}
-
-const makeMockInitContext = (config: {
-  encryptionKey?: string;
-  kibanaServer: ReportingKibanaServer;
-}): PluginInitializerContext =>
-  ({
-    config: { create: () => Rx.of(config) },
-  } as PluginInitializerContext);
-
-const makeMockCoreSetup = (serverInfo: KibanaServer): CoreSetup =>
-  ({ http: { getServerInfo: () => serverInfo } } as any);
-
-describe('Reporting server createConfig$', () => {
-  let mockCoreSetup: CoreSetup;
-  let mockInitContext: PluginInitializerContext;
-  let mockLogger: Logger;
-
-  beforeEach(() => {
-    mockCoreSetup = makeMockCoreSetup({ host: 'kibanaHost', port: 5601, protocol: 'http' });
-    mockInitContext = makeMockInitContext({
-      kibanaServer: {},
-    });
-    mockLogger = ({ warn: jest.fn() } as unknown) as Logger;
-  });
-
-  afterEach(() => {
-    jest.resetAllMocks();
-  });
-
-  it('creates random encryption key and default config using host, protocol, and port from server info', async () => {
-    const result = await createConfig$(mockCoreSetup, mockInitContext, mockLogger).toPromise();
-
-    expect(result.encryptionKey).toMatch(/\S{32,}/);
-    expect(result.kibanaServer).toMatchInlineSnapshot(`
-      Object {
-        "hostname": "kibanaHost",
-        "port": 5601,
-        "protocol": "http",
-      }
-    `);
-    expect((mockLogger.warn as any).mock.calls.length).toBe(1);
-    expect((mockLogger.warn as any).mock.calls[0]).toMatchObject([
-      'Generating a random key for xpack.reporting.encryptionKey. To prevent sessions from being invalidated on restart, please set xpack.reporting.encryptionKey in kibana.yml',
-    ]);
-  });
-
-  it('uses the encryption key', async () => {
-    mockInitContext = makeMockInitContext({
-      encryptionKey: 'iiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii',
-      kibanaServer: {},
-    });
-    const result = await createConfig$(mockCoreSetup, mockInitContext, mockLogger).toPromise();
-
-    expect(result.encryptionKey).toMatch('iiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii');
-    expect((mockLogger.warn as any).mock.calls.length).toBe(0);
-  });
-
-  it('uses the encryption key, reporting kibanaServer settings to override server info', async () => {
-    mockInitContext = makeMockInitContext({
-      encryptionKey: 'iiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii',
-      kibanaServer: {
-        hostname: 'reportingHost',
-        port: 5677,
-        protocol: 'httpsa',
-      },
-    });
-    const result = await createConfig$(mockCoreSetup, mockInitContext, mockLogger).toPromise();
-
-    expect(result).toMatchInlineSnapshot(`
-      Object {
-        "encryptionKey": "iiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii",
-        "kibanaServer": Object {
-          "hostname": "reportingHost",
-          "port": 5677,
-          "protocol": "httpsa",
-        },
-      }
-    `);
-    expect((mockLogger.warn as any).mock.calls.length).toBe(0);
-  });
-
-  it('show warning when kibanaServer.hostName === "0"', async () => {
-    mockInitContext = makeMockInitContext({
-      encryptionKey: 'aaaaaaaaaaaaabbbbbbbbbbbbaaaaaaaaa',
-      kibanaServer: { hostname: '0' },
-    });
-    const result = await createConfig$(mockCoreSetup, mockInitContext, mockLogger).toPromise();
-
-    expect(result.kibanaServer).toMatchInlineSnapshot(`
-      Object {
-        "hostname": "0.0.0.0",
-        "port": 5601,
-        "protocol": "http",
-      }
-    `);
-    expect((mockLogger.warn as any).mock.calls.length).toBe(1);
-    expect((mockLogger.warn as any).mock.calls[0]).toMatchObject([
-      `Found 'server.host: \"0\" in Kibana configuration. This is incompatible with Reporting. To enable Reporting to work, 'xpack.reporting.kibanaServer.hostname: 0.0.0.0' is being automatically ` +
-        `to the configuration. You can change the setting to 'server.host: 0.0.0.0' or add 'xpack.reporting.kibanaServer.hostname: 0.0.0.0' in kibana.yml to prevent this message.`,
-    ]);
-  });
-});
diff --git a/x-pack/plugins/reporting/server/config/index.ts b/x-pack/plugins/reporting/server/config/index.ts
deleted file mode 100644
index ac51b39ae23b4..0000000000000
--- a/x-pack/plugins/reporting/server/config/index.ts
+++ /dev/null
@@ -1,85 +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 { TypeOf } from '@kbn/config-schema';
-import crypto from 'crypto';
-import { map } from 'rxjs/operators';
-import { PluginConfigDescriptor } from 'kibana/server';
-import { CoreSetup, Logger, PluginInitializerContext } from '../../../../../src/core/server';
-import { ConfigSchema, ConfigType } from './schema';
-
-export function createConfig$(core: CoreSetup, context: PluginInitializerContext, logger: Logger) {
-  return context.config.create<TypeOf<typeof ConfigSchema>>().pipe(
-    map(config => {
-      // encryption key
-      let encryptionKey = config.encryptionKey;
-      if (encryptionKey === undefined) {
-        logger.warn(
-          i18n.translate('xpack.reporting.serverConfig.randomEncryptionKey', {
-            defaultMessage:
-              'Generating a random key for xpack.reporting.encryptionKey. To prevent sessions from being invalidated on ' +
-              'restart, please set xpack.reporting.encryptionKey in kibana.yml',
-          })
-        );
-        encryptionKey = crypto.randomBytes(16).toString('hex');
-      }
-
-      const { kibanaServer: reportingServer } = config;
-      const serverInfo = core.http.getServerInfo();
-
-      // kibanaServer.hostname, default to server.host, don't allow "0"
-      let kibanaServerHostname = reportingServer.hostname
-        ? reportingServer.hostname
-        : serverInfo.host;
-      if (kibanaServerHostname === '0') {
-        logger.warn(
-          i18n.translate('xpack.reporting.serverConfig.invalidServerHostname', {
-            defaultMessage:
-              `Found 'server.host: "0" in Kibana configuration. This is incompatible with Reporting. ` +
-              `To enable Reporting to work, '{configKey}: 0.0.0.0' is being automatically to the configuration. ` +
-              `You can change the setting to 'server.host: 0.0.0.0' or add '{configKey}: 0.0.0.0' in kibana.yml to prevent this message.`,
-            values: { configKey: 'xpack.reporting.kibanaServer.hostname' },
-          })
-        );
-        kibanaServerHostname = '0.0.0.0';
-      }
-
-      // kibanaServer.port, default to server.port
-      const kibanaServerPort = reportingServer.port
-        ? reportingServer.port
-        : serverInfo.port; // prettier-ignore
-
-      // kibanaServer.protocol, default to server.protocol
-      const kibanaServerProtocol = reportingServer.protocol
-        ? reportingServer.protocol
-        : serverInfo.protocol;
-
-      return {
-        ...config,
-        encryptionKey,
-        kibanaServer: {
-          hostname: kibanaServerHostname,
-          port: kibanaServerPort,
-          protocol: kibanaServerProtocol,
-        },
-      };
-    })
-  );
-}
-
-export const config: PluginConfigDescriptor<ConfigType> = {
-  schema: ConfigSchema,
-  deprecations: ({ unused }) => [
-    unused('capture.browser.chromium.maxScreenshotDimension'),
-    unused('capture.concurrency'),
-    unused('capture.settleTime'),
-    unused('capture.timeout'),
-    unused('kibanaApp'),
-  ],
-};
-
-export { ConfigSchema, ConfigType };
diff --git a/x-pack/plugins/reporting/server/config/schema.test.ts b/x-pack/plugins/reporting/server/config/schema.test.ts
deleted file mode 100644
index d8fe6d1ff084a..0000000000000
--- a/x-pack/plugins/reporting/server/config/schema.test.ts
+++ /dev/null
@@ -1,103 +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 { ConfigSchema } from './schema';
-
-describe('Reporting Config Schema', () => {
-  it(`context {"dev":false,"dist":false} produces correct config`, () => {
-    expect(ConfigSchema.validate({}, { dev: false, dist: false })).toMatchObject({
-      capture: {
-        browser: {
-          autoDownload: true,
-          chromium: { disableSandbox: false, proxy: { enabled: false } },
-          type: 'chromium',
-        },
-        loadDelay: 3000,
-        maxAttempts: 1,
-        networkPolicy: {
-          enabled: true,
-          rules: [
-            { allow: true, host: undefined, protocol: 'http:' },
-            { allow: true, host: undefined, protocol: 'https:' },
-            { allow: true, host: undefined, protocol: 'ws:' },
-            { allow: true, host: undefined, protocol: 'wss:' },
-            { allow: true, host: undefined, protocol: 'data:' },
-            { allow: false, host: undefined, protocol: undefined },
-          ],
-        },
-        viewport: { height: 1200, width: 1950 },
-        zoom: 2,
-      },
-      csv: {
-        checkForFormulas: true,
-        enablePanelActionDownload: true,
-        maxSizeBytes: 10485760,
-        scroll: { duration: '30s', size: 500 },
-      },
-      encryptionKey: 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa',
-      index: '.reporting',
-      kibanaServer: {},
-      poll: {
-        jobCompletionNotifier: { interval: 10000, intervalErrorMultiplier: 5 },
-        jobsRefresh: { interval: 5000, intervalErrorMultiplier: 5 },
-      },
-      queue: {
-        indexInterval: 'week',
-        pollEnabled: true,
-        pollInterval: 3000,
-        pollIntervalErrorMultiplier: 10,
-        timeout: 120000,
-      },
-      roles: { allow: ['reporting_user'] },
-    });
-  });
-  it(`context {"dev":false,"dist":true} produces correct config`, () => {
-    expect(ConfigSchema.validate({}, { dev: false, dist: true })).toMatchObject({
-      capture: {
-        browser: {
-          autoDownload: false,
-          chromium: { disableSandbox: false, inspect: false, proxy: { enabled: false } },
-          type: 'chromium',
-        },
-        loadDelay: 3000,
-        maxAttempts: 3,
-        networkPolicy: {
-          enabled: true,
-          rules: [
-            { allow: true, host: undefined, protocol: 'http:' },
-            { allow: true, host: undefined, protocol: 'https:' },
-            { allow: true, host: undefined, protocol: 'ws:' },
-            { allow: true, host: undefined, protocol: 'wss:' },
-            { allow: true, host: undefined, protocol: 'data:' },
-            { allow: false, host: undefined, protocol: undefined },
-          ],
-        },
-        viewport: { height: 1200, width: 1950 },
-        zoom: 2,
-      },
-      csv: {
-        checkForFormulas: true,
-        enablePanelActionDownload: true,
-        maxSizeBytes: 10485760,
-        scroll: { duration: '30s', size: 500 },
-      },
-      index: '.reporting',
-      kibanaServer: {},
-      poll: {
-        jobCompletionNotifier: { interval: 10000, intervalErrorMultiplier: 5 },
-        jobsRefresh: { interval: 5000, intervalErrorMultiplier: 5 },
-      },
-      queue: {
-        indexInterval: 'week',
-        pollEnabled: true,
-        pollInterval: 3000,
-        pollIntervalErrorMultiplier: 10,
-        timeout: 120000,
-      },
-      roles: { allow: ['reporting_user'] },
-    });
-  });
-});
diff --git a/x-pack/plugins/reporting/server/config/schema.ts b/x-pack/plugins/reporting/server/config/schema.ts
deleted file mode 100644
index 0058b7a5096f0..0000000000000
--- a/x-pack/plugins/reporting/server/config/schema.ts
+++ /dev/null
@@ -1,174 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { schema, TypeOf } from '@kbn/config-schema';
-import moment from 'moment';
-
-const KibanaServerSchema = schema.object({
-  hostname: schema.maybe(
-    schema.string({
-      validate(value) {
-        if (value === '0') {
-          return 'must not be "0" for the headless browser to correctly resolve the host';
-        }
-      },
-      hostname: true,
-    })
-  ),
-  port: schema.maybe(schema.number()),
-  protocol: schema.maybe(
-    schema.string({
-      validate(value) {
-        if (!/^https?$/.test(value)) {
-          return 'must be "http" or "https"';
-        }
-      },
-    })
-  ),
-});
-
-const QueueSchema = schema.object({
-  indexInterval: schema.string({ defaultValue: 'week' }),
-  pollEnabled: schema.boolean({ defaultValue: true }),
-  pollInterval: schema.number({ defaultValue: 3000 }),
-  pollIntervalErrorMultiplier: schema.number({ defaultValue: 10 }),
-  timeout: schema.number({ defaultValue: moment.duration(2, 'm').asMilliseconds() }),
-});
-
-const RulesSchema = schema.object({
-  allow: schema.boolean(),
-  host: schema.maybe(schema.string()),
-  protocol: schema.maybe(schema.string()),
-});
-
-const CaptureSchema = schema.object({
-  timeouts: schema.object({
-    openUrl: schema.number({ defaultValue: 30000 }),
-    waitForElements: schema.number({ defaultValue: 30000 }),
-    renderComplete: schema.number({ defaultValue: 30000 }),
-  }),
-  networkPolicy: schema.object({
-    enabled: schema.boolean({ defaultValue: true }),
-    rules: schema.arrayOf(RulesSchema, {
-      defaultValue: [
-        { host: undefined, allow: true, protocol: 'http:' },
-        { host: undefined, allow: true, protocol: 'https:' },
-        { host: undefined, allow: true, protocol: 'ws:' },
-        { host: undefined, allow: true, protocol: 'wss:' },
-        { host: undefined, allow: true, protocol: 'data:' },
-        { host: undefined, allow: false, protocol: undefined }, // Default action is to deny!
-      ],
-    }),
-  }),
-  zoom: schema.number({ defaultValue: 2 }),
-  viewport: schema.object({
-    width: schema.number({ defaultValue: 1950 }),
-    height: schema.number({ defaultValue: 1200 }),
-  }),
-  loadDelay: schema.number({
-    defaultValue: moment.duration(3, 's').asMilliseconds(),
-  }), // TODO: use schema.duration
-  browser: schema.object({
-    autoDownload: schema.conditional(
-      schema.contextRef('dist'),
-      true,
-      schema.boolean({ defaultValue: false }),
-      schema.boolean({ defaultValue: true })
-    ),
-    chromium: schema.object({
-      inspect: schema.conditional(
-        schema.contextRef('dist'),
-        true,
-        schema.boolean({ defaultValue: false }),
-        schema.maybe(schema.never())
-      ),
-      disableSandbox: schema.boolean({ defaultValue: false }),
-      proxy: schema.object({
-        enabled: schema.boolean({ defaultValue: false }),
-        server: schema.conditional(
-          schema.siblingRef('enabled'),
-          true,
-          schema.uri({ scheme: ['http', 'https'] }),
-          schema.maybe(schema.never())
-        ),
-        bypass: schema.conditional(
-          schema.siblingRef('enabled'),
-          true,
-          schema.arrayOf(schema.string({ hostname: true })),
-          schema.maybe(schema.never())
-        ),
-      }),
-      userDataDir: schema.maybe(schema.string()), // FIXME unused?
-    }),
-    type: schema.string({ defaultValue: 'chromium' }),
-  }),
-  maxAttempts: schema.conditional(
-    schema.contextRef('dist'),
-    true,
-    schema.number({ defaultValue: 3 }),
-    schema.number({ defaultValue: 1 })
-  ),
-});
-
-const CsvSchema = schema.object({
-  checkForFormulas: schema.boolean({ defaultValue: true }),
-  enablePanelActionDownload: schema.boolean({ defaultValue: true }),
-  maxSizeBytes: schema.number({
-    defaultValue: 1024 * 1024 * 10, // 10MB
-  }), // TODO: use schema.byteSize
-  scroll: schema.object({
-    duration: schema.string({
-      defaultValue: '30s',
-      validate(value) {
-        if (!/^[0-9]+(d|h|m|s|ms|micros|nanos)$/.test(value)) {
-          return 'must be a duration string';
-        }
-      },
-    }),
-    size: schema.number({ defaultValue: 500 }),
-  }),
-});
-
-const EncryptionKeySchema = schema.conditional(
-  schema.contextRef('dist'),
-  true,
-  schema.maybe(schema.string({ minLength: 32 })),
-  schema.string({ minLength: 32, defaultValue: 'a'.repeat(32) })
-);
-
-const RolesSchema = schema.object({
-  allow: schema.arrayOf(schema.string(), { defaultValue: ['reporting_user'] }),
-});
-
-const IndexSchema = schema.string({ defaultValue: '.reporting' });
-
-const PollSchema = schema.object({
-  jobCompletionNotifier: schema.object({
-    interval: schema.number({
-      defaultValue: moment.duration(10, 's').asMilliseconds(),
-    }), // TODO: use schema.duration
-    intervalErrorMultiplier: schema.number({ defaultValue: 5 }),
-  }),
-  jobsRefresh: schema.object({
-    interval: schema.number({
-      defaultValue: moment.duration(5, 's').asMilliseconds(),
-    }), // TODO: use schema.duration
-    intervalErrorMultiplier: schema.number({ defaultValue: 5 }),
-  }),
-});
-
-export const ConfigSchema = schema.object({
-  kibanaServer: KibanaServerSchema,
-  queue: QueueSchema,
-  capture: CaptureSchema,
-  csv: CsvSchema,
-  encryptionKey: EncryptionKeySchema,
-  roles: RolesSchema,
-  index: IndexSchema,
-  poll: PollSchema,
-});
-
-export type ConfigType = TypeOf<typeof ConfigSchema>;
diff --git a/x-pack/plugins/reporting/server/index.ts b/x-pack/plugins/reporting/server/index.ts
deleted file mode 100644
index 2b1844cf2e10e..0000000000000
--- a/x-pack/plugins/reporting/server/index.ts
+++ /dev/null
@@ -1,14 +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 { PluginInitializerContext } from 'src/core/server';
-import { ReportingPlugin } from './plugin';
-
-export { config, ConfigSchema } from './config';
-export { ConfigType, PluginsSetup } from './plugin';
-
-export const plugin = (initializerContext: PluginInitializerContext) =>
-  new ReportingPlugin(initializerContext);
diff --git a/x-pack/plugins/reporting/server/plugin.ts b/x-pack/plugins/reporting/server/plugin.ts
deleted file mode 100644
index 53d821cffbb1f..0000000000000
--- a/x-pack/plugins/reporting/server/plugin.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { Observable } from 'rxjs';
-import { first } from 'rxjs/operators';
-import { CoreSetup, Logger, Plugin, PluginInitializerContext } from '../../../../src/core/server';
-import { ConfigType, createConfig$ } from './config';
-
-export interface PluginsSetup {
-  /** @deprecated */
-  __legacy: {
-    config$: Observable<ConfigType>;
-  };
-}
-
-export class ReportingPlugin implements Plugin<PluginsSetup> {
-  private readonly log: Logger;
-
-  constructor(private readonly initializerContext: PluginInitializerContext) {
-    this.log = this.initializerContext.logger.get();
-  }
-
-  public async setup(core: CoreSetup): Promise<PluginsSetup> {
-    return {
-      __legacy: {
-        config$: createConfig$(core, this.initializerContext, this.log).pipe(first()),
-      },
-    };
-  }
-
-  public start() {}
-  public stop() {}
-}
-
-export { ConfigType };

From b0eb79858f2d9fd42e9608f16a00c4ed068460dc Mon Sep 17 00:00:00 2001
From: Phillip Burch <phillip.burch@live.com>
Date: Tue, 24 Mar 2020 11:19:04 -0500
Subject: [PATCH 087/179] Default duration to minutes, only show alerting on
 metrics explorer (#61058)

---
 .../infra/public/components/alerting/metrics/expression.tsx   | 4 ++--
 x-pack/plugins/infra/public/pages/infrastructure/index.tsx    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/x-pack/plugins/infra/public/components/alerting/metrics/expression.tsx b/x-pack/plugins/infra/public/components/alerting/metrics/expression.tsx
index ea8dd1484a670..0909a3c2ed569 100644
--- a/x-pack/plugins/infra/public/components/alerting/metrics/expression.tsx
+++ b/x-pack/plugins/infra/public/components/alerting/metrics/expression.tsx
@@ -70,7 +70,7 @@ export const Expressions: React.FC<Props> = props => {
   const { setAlertParams, alertParams, errors, alertsContext } = props;
   const { source, createDerivedIndexPattern } = useSource({ sourceId: 'default' });
   const [timeSize, setTimeSize] = useState<number | undefined>(1);
-  const [timeUnit, setTimeUnit] = useState<TimeUnit>('s');
+  const [timeUnit, setTimeUnit] = useState<TimeUnit>('m');
 
   const derivedIndexPattern = useMemo(() => createDerivedIndexPattern('metrics'), [
     createDerivedIndexPattern,
@@ -93,7 +93,7 @@ export const Expressions: React.FC<Props> = props => {
       comparator: '>',
       threshold: [],
       timeSize: 1,
-      timeUnit: 's',
+      timeUnit: 'm',
       indexPattern: source?.configuration.metricAlias,
     }),
     [source]
diff --git a/x-pack/plugins/infra/public/pages/infrastructure/index.tsx b/x-pack/plugins/infra/public/pages/infrastructure/index.tsx
index 730f67ab2bdca..422eb53148fe6 100644
--- a/x-pack/plugins/infra/public/pages/infrastructure/index.tsx
+++ b/x-pack/plugins/infra/public/pages/infrastructure/index.tsx
@@ -91,7 +91,7 @@ export const InfrastructurePage = ({ match }: RouteComponentProps) => {
               />
             </EuiFlexItem>
             <EuiFlexItem grow={false}>
-              <AlertDropdown />
+              <Route path={'/explorer'} component={AlertDropdown} />
             </EuiFlexItem>
           </EuiFlexGroup>
         </AppNavigation>

From 03877d09ef2f64e795b1bad91604e4a5fc06d371 Mon Sep 17 00:00:00 2001
From: Chris Mark <chrismarkou92@gmail.com>
Date: Tue, 24 Mar 2020 18:59:09 +0200
Subject: [PATCH 088/179] [Home][Tutorial] Add Openmetrics data UI (#61073)

---
 .../tutorial_resources/logos/openmetrics.svg  |  1 +
 .../tutorials/openmetrics_metrics/index.ts    | 63 +++++++++++++++++++
 src/plugins/home/server/tutorials/register.ts |  2 +
 3 files changed, 66 insertions(+)
 create mode 100644 src/legacy/core_plugins/kibana/public/home/tutorial_resources/logos/openmetrics.svg
 create mode 100644 src/plugins/home/server/tutorials/openmetrics_metrics/index.ts

diff --git a/src/legacy/core_plugins/kibana/public/home/tutorial_resources/logos/openmetrics.svg b/src/legacy/core_plugins/kibana/public/home/tutorial_resources/logos/openmetrics.svg
new file mode 100644
index 0000000000000..feccb88a3f34b
--- /dev/null
+++ b/src/legacy/core_plugins/kibana/public/home/tutorial_resources/logos/openmetrics.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="-4.08 0.293 64 64" width="64" height="64"><path d="M59.737 30.82C59.24 12.254 41.2-2.538 22.952.754 4.476 4.1-6.927 20.874-3.21 39.262.283 56.55 19.062 67.936 35.978 63.225c1.195-.394 2.118-.796 2.118-.796l-1.172-5.813-2.243.824c-3.397.995-6.975 1.212-10.468.637C9.642 55.865-.524 41.798 2.247 27.88c3.037-15.256 17.362-24.477 32.25-20.76 18.426 4.6 25.725 28.6 12.862 42.203-.23-.83-.38-1.21-.502-1.755L41.47 23.32c-.453-2.084-.895-4.163-3.464-4.436-2.545-.27-3.534 1.527-4.327 3.572-1.8 4.668-3.758 9.687-5.788 14.176l-1.185-2.066c-1.763-2.922-3.36-5.942-5.06-8.9-.784-1.364-1.93-2.25-3.576-2.08A3.33 3.33 0 0 0 15.042 26l-5.08 17.557 6.118-.265s.432-1.658.68-2.92c.546-2.78 1.393-5.5 2.26-8.82l5.01 9.56c.92 1.763 2.23 3.057 4.335 2.923 2.076-.133 2.923-2.015 3.647-3.665.508-1.158 3.346-8.587 4.864-12.785.19.99.317 1.364.435 1.936l5.734 28.073a70.51 70.51 0 0 0 .54 2.507 20.27 20.27 0 0 0 2.321-1.402c9.434-6.904 14.145-16.11 13.83-27.88z" fill="#c42227"/></svg>
\ No newline at end of file
diff --git a/src/plugins/home/server/tutorials/openmetrics_metrics/index.ts b/src/plugins/home/server/tutorials/openmetrics_metrics/index.ts
new file mode 100644
index 0000000000000..b0ff61c7116ce
--- /dev/null
+++ b/src/plugins/home/server/tutorials/openmetrics_metrics/index.ts
@@ -0,0 +1,63 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { i18n } from '@kbn/i18n';
+import { TutorialsCategory } from '../../services/tutorials';
+import {
+  onPremInstructions,
+  cloudInstructions,
+  onPremCloudInstructions,
+} from '../instructions/metricbeat_instructions';
+import {
+  TutorialContext,
+  TutorialSchema,
+} from '../../services/tutorials/lib/tutorials_registry_types';
+
+export function openmetricsMetricsSpecProvider(context: TutorialContext): TutorialSchema {
+  const moduleName = 'openmetrics';
+  return {
+    id: 'openmetricsMetrics',
+    name: i18n.translate('home.tutorials.openmetricsMetrics.nameTitle', {
+      defaultMessage: 'OpenMetrics metrics',
+    }),
+    category: TutorialsCategory.METRICS,
+    shortDescription: i18n.translate('home.tutorials.openmetricsMetrics.shortDescription', {
+      defaultMessage: 'Fetch metrics from an endpoint that serves metrics in OpenMetrics format.',
+    }),
+    longDescription: i18n.translate('home.tutorials.openmetricsMetrics.longDescription', {
+      defaultMessage:
+        'The `openmetrics` Metricbeat module fetches metrics from an endpoint that serves metrics in OpenMetrics format. \
+[Learn more]({learnMoreLink}).',
+      values: {
+        learnMoreLink: '{config.docs.beats.metricbeat}/metricbeat-module-openmetrics.html',
+      },
+    }),
+    euiIconType: '/plugins/kibana/home/tutorial_resources/logos/openmetrics.svg',
+    artifacts: {
+      dashboards: [],
+      exportedFields: {
+        documentationUrl: '{config.docs.beats.metricbeat}/exported-fields-openmetrics.html',
+      },
+    },
+    completionTimeMinutes: 10,
+    onPrem: onPremInstructions(moduleName, context),
+    elasticCloud: cloudInstructions(moduleName),
+    onPremElasticCloud: onPremCloudInstructions(moduleName),
+  };
+}
diff --git a/src/plugins/home/server/tutorials/register.ts b/src/plugins/home/server/tutorials/register.ts
index f1a51018bfd98..b6c56a35554b2 100644
--- a/src/plugins/home/server/tutorials/register.ts
+++ b/src/plugins/home/server/tutorials/register.ts
@@ -87,6 +87,7 @@ import { envoyproxyMetricsSpecProvider } from './envoyproxy_metrics';
 import { ibmmqMetricsSpecProvider } from './ibmmq_metrics';
 import { statsdMetricsSpecProvider } from './statsd_metrics';
 import { redisenterpriseMetricsSpecProvider } from './redisenterprise_metrics';
+import { openmetricsMetricsSpecProvider } from './openmetrics_metrics';
 
 export const builtInTutorials = [
   systemLogsSpecProvider,
@@ -160,4 +161,5 @@ export const builtInTutorials = [
   envoyproxyMetricsSpecProvider,
   statsdMetricsSpecProvider,
   redisenterpriseMetricsSpecProvider,
+  openmetricsMetricsSpecProvider,
 ];

From 5ff4c4ca6e4f4f5633329deb821909d9de2ce107 Mon Sep 17 00:00:00 2001
From: Yuliia Naumenko <jo.naumenko@gmail.com>
Date: Tue, 24 Mar 2020 10:11:36 -0700
Subject: [PATCH 089/179] UI changes due to the text review (#61019)

* Fixed UI due to text review

* Fixed due to comments

* Fixed due to review comments
---
 .../components/builtin_action_types/email.tsx |  17 +-
 .../builtin_action_types/es_index.tsx         |   8 +-
 .../builtin_action_types/pagerduty.tsx        |  10 +-
 .../builtin_action_types/server_log.tsx       |   6 +
 .../components/builtin_action_types/slack.tsx |  12 +-
 .../builtin_action_types/webhook.tsx          |  18 +-
 .../threshold/expression.tsx                  | 295 ++++++++++--------
 .../builtin_alert_types/threshold/index.ts    |   2 +-
 .../threshold/visualization.tsx               |   4 +-
 .../public/application/home.tsx               |  16 +-
 .../lib/check_action_type_enabled.test.tsx    |   4 +-
 .../lib/check_action_type_enabled.tsx         |   8 +-
 .../action_connector_form/action_form.tsx     |  17 +-
 .../action_type_menu.test.tsx                 |   2 +-
 .../connector_add_flyout.tsx                  |  25 +-
 .../connector_add_modal.tsx                   |   6 +-
 .../connector_edit_flyout.tsx                 |  40 ++-
 .../components/actions_connectors_list.tsx    |  12 +-
 .../components/alert_details.test.tsx         |   7 +-
 .../components/alert_details.tsx              |   8 +-
 .../sections/alert_form/alert_add.tsx         |  19 +-
 .../sections/alert_form/alert_edit.test.tsx   |   4 +-
 .../sections/alert_form/alert_edit.tsx        |  39 ++-
 .../sections/alert_form/alert_form.tsx        |   8 +-
 .../alerts_list/components/alerts_list.tsx    |   6 +-
 25 files changed, 344 insertions(+), 249 deletions(-)

diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/email.tsx b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/email.tsx
index f17180ee74e56..b4bbb8af36a19 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/email.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/email.tsx
@@ -137,7 +137,7 @@ export function getActionType(): ActionTypeModel {
         const errorText = i18n.translate(
           'xpack.triggersActionsUI.components.builtinActionTypes.error.requiredEntryText',
           {
-            defaultMessage: 'No [to], [cc], or [bcc] entries. At least one entry is required.',
+            defaultMessage: 'No To, Cc, or Bcc entry.  At least one entry is required.',
           }
         );
         errors.to.push(errorText);
@@ -396,7 +396,7 @@ const EmailParamsFields: React.FunctionComponent<ActionParamsProps<EmailActionPa
         label={i18n.translate(
           'xpack.triggersActionsUI.sections.builtinActionTypes.emailAction.recipientTextFieldLabel',
           {
-            defaultMessage: 'To:',
+            defaultMessage: 'To',
           }
         )}
         labelAppend={
@@ -405,7 +405,7 @@ const EmailParamsFields: React.FunctionComponent<ActionParamsProps<EmailActionPa
               {!addCC ? (
                 <EuiButtonEmpty size="xs" onClick={() => setAddCC(true)}>
                   <FormattedMessage
-                    defaultMessage="Add CC"
+                    defaultMessage="Add Cc"
                     id="xpack.triggersActionsUI.sections.builtinActionTypes.emailAction.addCcButton"
                   />
                 </EuiButtonEmpty>
@@ -415,7 +415,7 @@ const EmailParamsFields: React.FunctionComponent<ActionParamsProps<EmailActionPa
                   <FormattedMessage
                     defaultMessage="{titleBcc}"
                     id="xpack.triggersActionsUI.sections.builtinActionTypes.emailAction.addBccButton"
-                    values={{ titleBcc: !addCC ? '/ BCC' : 'Add BCC' }}
+                    values={{ titleBcc: !addCC ? '/ Bcc' : 'Add Bcc' }}
                   />
                 </EuiButtonEmpty>
               ) : null}
@@ -459,7 +459,7 @@ const EmailParamsFields: React.FunctionComponent<ActionParamsProps<EmailActionPa
           label={i18n.translate(
             'xpack.triggersActionsUI.sections.builtinActionTypes.emailAction.recipientCopyTextFieldLabel',
             {
-              defaultMessage: 'Cc:',
+              defaultMessage: 'Cc',
             }
           )}
         >
@@ -500,7 +500,7 @@ const EmailParamsFields: React.FunctionComponent<ActionParamsProps<EmailActionPa
           label={i18n.translate(
             'xpack.triggersActionsUI.sections.builtinActionTypes.emailAction.recipientBccTextFieldLabel',
             {
-              defaultMessage: 'Bcc:',
+              defaultMessage: 'Bcc',
             }
           )}
         >
@@ -540,7 +540,7 @@ const EmailParamsFields: React.FunctionComponent<ActionParamsProps<EmailActionPa
         label={i18n.translate(
           'xpack.triggersActionsUI.sections.builtinActionTypes.emailAction.subjectTextFieldLabel',
           {
-            defaultMessage: 'Subject:',
+            defaultMessage: 'Subject',
           }
         )}
       >
@@ -550,7 +550,6 @@ const EmailParamsFields: React.FunctionComponent<ActionParamsProps<EmailActionPa
           name="subject"
           data-test-subj="emailSubjectInput"
           value={subject || ''}
-          placeholder="Text field (placeholder)"
           onChange={e => {
             editAction('subject', e.target.value, index);
           }}
@@ -568,7 +567,7 @@ const EmailParamsFields: React.FunctionComponent<ActionParamsProps<EmailActionPa
         label={i18n.translate(
           'xpack.triggersActionsUI.sections.builtinActionTypes.emailAction.messageTextAreaFieldLabel',
           {
-            defaultMessage: 'Message:',
+            defaultMessage: 'Message',
           }
         )}
         labelAppend={
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/es_index.tsx b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/es_index.tsx
index b3e62e022c412..00660b214c7cf 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/es_index.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/es_index.tsx
@@ -42,6 +42,12 @@ export function getActionType(): ActionTypeModel {
         defaultMessage: 'Index data into Elasticsearch.',
       }
     ),
+    actionTypeTitle: i18n.translate(
+      'xpack.triggersActionsUI.components.builtinActionTypes.indexAction.actionTypeTitle',
+      {
+        defaultMessage: 'Index data',
+      }
+    ),
     validateConnector: (action: EsIndexActionConnector): ValidationResult => {
       const validationResult = { errors: {} };
       const errors = {
@@ -179,7 +185,7 @@ const IndexActionConnectorFields: React.FunctionComponent<ActionConnectorFieldsP
           <>
             <FormattedMessage
               id="xpack.triggersActionsUI.components.builtinActionTypes.indexAction.refreshLabel"
-              defaultMessage="Refresh"
+              defaultMessage="Refresh index"
             />{' '}
             <EuiIconTip
               position="right"
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/pagerduty.tsx b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/pagerduty.tsx
index 7666129e4abdc..947d098c46483 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/pagerduty.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/pagerduty.tsx
@@ -125,7 +125,7 @@ const PagerDutyActionConnectorFields: React.FunctionComponent<ActionConnectorFie
           >
             <FormattedMessage
               id="xpack.triggersActionsUI.components.builtinActionTypes.pagerDutyAction.routingKeyNameHelpLabel"
-              defaultMessage="Learn how to configure PagerDuty Accounts"
+              defaultMessage="Configure a PagerDuty account."
             />
           </EuiLink>
         }
@@ -270,12 +270,20 @@ const PagerDutyParamsFields: React.FunctionComponent<ActionParamsProps<PagerDuty
       </EuiContextMenuItem>
     ));
 
+  const addVariableButtonTitle = i18n.translate(
+    'xpack.triggersActionsUI.components.builtinActionTypes.pagerDutyAction.addVariableTitle',
+    {
+      defaultMessage: 'Add alert variable',
+    }
+  );
+
   const getAddVariableComponent = (paramsProperty: string, buttonName: string) => {
     return (
       <EuiPopover
         button={
           <EuiButtonIcon
             data-test-subj={`${paramsProperty}AddVariableButton`}
+            title={addVariableButtonTitle}
             onClick={() =>
               setIsVariablesPopoverOpen({ ...isVariablesPopoverOpen, [paramsProperty]: true })
             }
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/server_log.tsx b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/server_log.tsx
index f0ac43c04ee0e..8f84e9da5ada0 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/server_log.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/server_log.tsx
@@ -134,6 +134,12 @@ export const ServerLogParamsFields: React.FunctionComponent<ActionParamsProps<
               <EuiButtonIcon
                 onClick={() => setIsVariablesPopoverOpen(true)}
                 iconType="indexOpen"
+                title={i18n.translate(
+                  'xpack.triggersActionsUI.components.builtinActionTypes.serverLogAction.addVariableTitle',
+                  {
+                    defaultMessage: 'Add variable',
+                  }
+                )}
                 aria-label={i18n.translate(
                   'xpack.triggersActionsUI.components.builtinActionTypes.serverLogAction.addVariablePopoverButton',
                   {
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/slack.tsx b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/slack.tsx
index a8ba11faa08dd..2ca07e0d57a8e 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/slack.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/slack.tsx
@@ -98,7 +98,7 @@ const SlackActionFields: React.FunctionComponent<ActionConnectorFieldsProps<
           >
             <FormattedMessage
               id="xpack.triggersActionsUI.components.builtinActionTypes.slackAction.webhookUrlHelpLabel"
-              defaultMessage="Learn how to create a Slack webhook URL"
+              defaultMessage="Create a Slack webhook URL"
             />
           </EuiLink>
         }
@@ -115,7 +115,7 @@ const SlackActionFields: React.FunctionComponent<ActionConnectorFieldsProps<
           fullWidth
           isInvalid={errors.webhookUrl.length > 0 && webhookUrl !== undefined}
           name="webhookUrl"
-          placeholder="URL like https://hooks.slack.com/services"
+          placeholder="Example: https://hooks.slack.com/services"
           value={webhookUrl || ''}
           data-test-subj="slackWebhookUrlInput"
           onChange={e => {
@@ -182,10 +182,16 @@ const SlackParamsFields: React.FunctionComponent<ActionParamsProps<SlackActionPa
                 data-test-subj="slackAddVariableButton"
                 onClick={() => setIsVariablesPopoverOpen(true)}
                 iconType="indexOpen"
+                title={i18n.translate(
+                  'xpack.triggersActionsUI.components.builtinActionTypes.slackAction.addVariableTitle',
+                  {
+                    defaultMessage: 'Add alert variable',
+                  }
+                )}
                 aria-label={i18n.translate(
                   'xpack.triggersActionsUI.components.builtinActionTypes.slackAction.addVariablePopoverButton',
                   {
-                    defaultMessage: 'Add variable',
+                    defaultMessage: 'Add alert variable',
                   }
                 )}
               />
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/webhook.tsx b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/webhook.tsx
index 5d07483c8a989..f611c3715e56a 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/webhook.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/webhook.tsx
@@ -47,6 +47,12 @@ export function getActionType(): ActionTypeModel {
         defaultMessage: 'Send a request to a web service.',
       }
     ),
+    actionTypeTitle: i18n.translate(
+      'xpack.triggersActionsUI.components.builtinActionTypes.webhookAction.actionTypeTitle',
+      {
+        defaultMessage: 'Webhook data',
+      }
+    ),
     validateConnector: (action: WebhookActionConnector): ValidationResult => {
       const validationResult = { errors: {} };
       const errors = {
@@ -142,7 +148,7 @@ const WebhookActionConnectorFields: React.FunctionComponent<ActionConnectorField
       i18n.translate(
         'xpack.triggersActionsUI.sections.addAction.webhookAction.error.requiredHeaderKeyText',
         {
-          defaultMessage: 'Header key is required.',
+          defaultMessage: 'Key is required.',
         }
       )
     );
@@ -152,7 +158,7 @@ const WebhookActionConnectorFields: React.FunctionComponent<ActionConnectorField
       i18n.translate(
         'xpack.triggersActionsUI.sections.addAction.webhookAction.error.requiredHeaderValueText',
         {
-          defaultMessage: 'Header value is required.',
+          defaultMessage: 'Value is required.',
         }
       )
     );
@@ -195,7 +201,7 @@ const WebhookActionConnectorFields: React.FunctionComponent<ActionConnectorField
         <EuiTitle size="xxs">
           <h5>
             <FormattedMessage
-              defaultMessage="Add a new header"
+              defaultMessage="Add header"
               id="xpack.triggersActionsUI.components.builtinActionTypes.webhookAction.addHeader"
             />
           </h5>
@@ -496,6 +502,12 @@ const WebhookParamsFields: React.FunctionComponent<ActionParamsProps<WebhookActi
                 data-test-subj="webhookAddVariableButton"
                 onClick={() => setIsVariablesPopoverOpen(true)}
                 iconType="indexOpen"
+                title={i18n.translate(
+                  'xpack.triggersActionsUI.components.builtinActionTypes.webhookAction.addVariableTitle',
+                  {
+                    defaultMessage: 'Add variable',
+                  }
+                )}
                 aria-label={i18n.translate(
                   'xpack.triggersActionsUI.components.builtinActionTypes.webhookAction.addVariablePopoverButton',
                   {
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 fa26e8b11bfec..96513f0563ad0 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
@@ -10,7 +10,6 @@ import { FormattedMessage } from '@kbn/i18n/react';
 import {
   EuiFlexItem,
   EuiFlexGroup,
-  EuiFormLabel,
   EuiExpression,
   EuiPopover,
   EuiPopoverTitle,
@@ -23,6 +22,8 @@ import {
   EuiEmptyPrompt,
   EuiText,
 } from '@elastic/eui';
+import { EuiSteps } from '@elastic/eui';
+import { EuiButtonIcon } from '@elastic/eui';
 import {
   firstFieldOption,
   getIndexPatterns,
@@ -213,6 +214,7 @@ export const IndexThresholdAlertTypeExpression: React.FunctionComponent<IndexThr
                     timeWindowUnit: DEFAULT_VALUES.TIME_WINDOW_UNIT,
                     groupBy: DEFAULT_VALUES.GROUP_BY,
                     threshold: DEFAULT_VALUES.THRESHOLD,
+                    timeField: '',
                   });
                   return;
                 }
@@ -271,6 +273,164 @@ export const IndexThresholdAlertTypeExpression: React.FunctionComponent<IndexThr
     </Fragment>
   );
 
+  const firstSetOfSteps = [
+    {
+      title: i18n.translate('xpack.triggersActionsUI.sections.alertAdd.selectIndex', {
+        defaultMessage: 'Select an index.',
+      }),
+      children: (
+        <>
+          <EuiFlexGroup wrap>
+            <EuiFlexItem grow={false}>
+              <EuiPopover
+                id="indexPopover"
+                button={
+                  <EuiExpression
+                    data-test-subj="selectIndexExpression"
+                    description={i18n.translate(
+                      'xpack.triggersActionsUI.sections.alertAdd.threshold.indexLabel',
+                      {
+                        defaultMessage: 'index',
+                      }
+                    )}
+                    value={index ? index.join(' ') : firstFieldOption.text}
+                    isActive={indexPopoverOpen}
+                    onClick={() => {
+                      setIndexPopoverOpen(true);
+                    }}
+                    color={index ? 'secondary' : 'danger'}
+                  />
+                }
+                isOpen={indexPopoverOpen}
+                closePopover={() => {
+                  setIndexPopoverOpen(false);
+                }}
+                ownFocus
+                withTitle
+                anchorPosition="downLeft"
+                zIndex={8000}
+              >
+                <div style={{ width: '450px' }}>
+                  <EuiPopoverTitle>
+                    <EuiFlexGroup alignItems="center" gutterSize="s">
+                      <EuiFlexItem>
+                        {i18n.translate(
+                          'xpack.triggersActionsUI.sections.alertAdd.threshold.indexButtonLabel',
+                          {
+                            defaultMessage: 'index',
+                          }
+                        )}
+                      </EuiFlexItem>
+                      <EuiFlexItem grow={false}>
+                        <EuiButtonIcon
+                          iconType="cross"
+                          color="danger"
+                          aria-label={i18n.translate(
+                            'xpack.triggersActionsUI.sections.alertAdd.threshold.closeIndexPopoverLabel',
+                            {
+                              defaultMessage: 'Close',
+                            }
+                          )}
+                          onClick={() => {
+                            setIndexPopoverOpen(false);
+                          }}
+                        />
+                      </EuiFlexItem>
+                    </EuiFlexGroup>
+                  </EuiPopoverTitle>
+
+                  {indexPopover}
+                </div>
+              </EuiPopover>
+            </EuiFlexItem>
+          </EuiFlexGroup>
+          <EuiFlexGroup>
+            <EuiFlexItem grow={false}>
+              <WhenExpression
+                aggType={aggType ?? DEFAULT_VALUES.AGGREGATION_TYPE}
+                onChangeSelectedAggType={(selectedAggType: string) =>
+                  setAlertParams('aggType', selectedAggType)
+                }
+              />
+            </EuiFlexItem>
+            {aggType && builtInAggregationTypes[aggType].fieldRequired ? (
+              <EuiFlexItem grow={false}>
+                <OfExpression
+                  aggField={aggField}
+                  fields={esFields}
+                  aggType={aggType}
+                  errors={errors}
+                  onChangeSelectedAggField={(selectedAggField?: string) =>
+                    setAlertParams('aggField', selectedAggField)
+                  }
+                />
+              </EuiFlexItem>
+            ) : null}
+          </EuiFlexGroup>
+          <EuiFlexGroup>
+            <EuiFlexItem grow={false}>
+              <GroupByExpression
+                groupBy={groupBy || DEFAULT_VALUES.GROUP_BY}
+                termField={termField}
+                termSize={termSize}
+                errors={errors}
+                fields={esFields}
+                onChangeSelectedGroupBy={selectedGroupBy =>
+                  setAlertParams('groupBy', selectedGroupBy)
+                }
+                onChangeSelectedTermField={selectedTermField =>
+                  setAlertParams('termField', selectedTermField)
+                }
+                onChangeSelectedTermSize={selectedTermSize =>
+                  setAlertParams('termSize', selectedTermSize)
+                }
+              />
+            </EuiFlexItem>
+          </EuiFlexGroup>
+        </>
+      ),
+    },
+    {
+      title: i18n.translate('xpack.triggersActionsUI.sections.alertAdd.conditionPrompt', {
+        defaultMessage: 'Define the condition.',
+      }),
+      children: (
+        <>
+          <EuiFlexGroup>
+            <EuiFlexItem grow={false}>
+              <ThresholdExpression
+                thresholdComparator={thresholdComparator ?? DEFAULT_VALUES.THRESHOLD_COMPARATOR}
+                threshold={threshold}
+                errors={errors}
+                popupPosition={'upLeft'}
+                onChangeSelectedThreshold={selectedThresholds =>
+                  setAlertParams('threshold', selectedThresholds)
+                }
+                onChangeSelectedThresholdComparator={selectedThresholdComparator =>
+                  setAlertParams('thresholdComparator', selectedThresholdComparator)
+                }
+              />
+            </EuiFlexItem>
+            <EuiFlexItem grow={false}>
+              <ForLastExpression
+                popupPosition={'upLeft'}
+                timeWindowSize={timeWindowSize}
+                timeWindowUnit={timeWindowUnit}
+                errors={errors}
+                onChangeWindowSize={(selectedWindowSize: any) =>
+                  setAlertParams('timeWindowSize', selectedWindowSize)
+                }
+                onChangeWindowUnit={(selectedWindowUnit: any) =>
+                  setAlertParams('timeWindowUnit', selectedWindowUnit)
+                }
+              />
+            </EuiFlexItem>
+          </EuiFlexGroup>
+        </>
+      ),
+    },
+  ];
+
   return (
     <Fragment>
       {hasExpressionErrors ? (
@@ -281,136 +441,7 @@ export const IndexThresholdAlertTypeExpression: React.FunctionComponent<IndexThr
         </Fragment>
       ) : null}
       <EuiSpacer size="l" />
-      <EuiFormLabel>
-        <FormattedMessage
-          defaultMessage="Select Index to query:"
-          id="xpack.triggersActionsUI.sections.alertAdd.selectIndex"
-        />
-      </EuiFormLabel>
-      <EuiSpacer size="m" />
-      <EuiFlexGroup wrap>
-        <EuiFlexItem grow={false}>
-          <EuiPopover
-            id="indexPopover"
-            button={
-              <EuiExpression
-                data-test-subj="selectIndexExpression"
-                description={i18n.translate(
-                  'xpack.triggersActionsUI.sections.alertAdd.threshold.indexLabel',
-                  {
-                    defaultMessage: 'index',
-                  }
-                )}
-                value={index ? index.join(' ') : firstFieldOption.text}
-                isActive={indexPopoverOpen}
-                onClick={() => {
-                  setIndexPopoverOpen(true);
-                }}
-                color={index ? 'secondary' : 'danger'}
-              />
-            }
-            isOpen={indexPopoverOpen}
-            closePopover={() => {
-              setIndexPopoverOpen(false);
-            }}
-            ownFocus
-            withTitle
-            anchorPosition="downLeft"
-            zIndex={8000}
-          >
-            <div style={{ width: '450px' }}>
-              <EuiPopoverTitle>
-                {i18n.translate(
-                  'xpack.triggersActionsUI.sections.alertAdd.threshold.indexButtonLabel',
-                  {
-                    defaultMessage: 'index',
-                  }
-                )}
-              </EuiPopoverTitle>
-              {indexPopover}
-            </div>
-          </EuiPopover>
-        </EuiFlexItem>
-      </EuiFlexGroup>
-      <EuiFlexGroup>
-        <EuiFlexItem grow={false}>
-          <WhenExpression
-            aggType={aggType ?? DEFAULT_VALUES.AGGREGATION_TYPE}
-            onChangeSelectedAggType={(selectedAggType: string) =>
-              setAlertParams('aggType', selectedAggType)
-            }
-          />
-        </EuiFlexItem>
-        {aggType && builtInAggregationTypes[aggType].fieldRequired ? (
-          <EuiFlexItem grow={false}>
-            <OfExpression
-              aggField={aggField}
-              fields={esFields}
-              aggType={aggType}
-              errors={errors}
-              onChangeSelectedAggField={(selectedAggField?: string) =>
-                setAlertParams('aggField', selectedAggField)
-              }
-            />
-          </EuiFlexItem>
-        ) : null}
-      </EuiFlexGroup>
-      <EuiFlexGroup>
-        <EuiFlexItem grow={false}>
-          <GroupByExpression
-            groupBy={groupBy || DEFAULT_VALUES.GROUP_BY}
-            termField={termField}
-            termSize={termSize}
-            errors={errors}
-            fields={esFields}
-            onChangeSelectedGroupBy={selectedGroupBy => setAlertParams('groupBy', selectedGroupBy)}
-            onChangeSelectedTermField={selectedTermField =>
-              setAlertParams('termField', selectedTermField)
-            }
-            onChangeSelectedTermSize={selectedTermSize =>
-              setAlertParams('termSize', selectedTermSize)
-            }
-          />
-        </EuiFlexItem>
-      </EuiFlexGroup>
-      <EuiSpacer size="xl" />
-      <EuiFormLabel>
-        <FormattedMessage
-          defaultMessage="Define the alert condition:"
-          id="xpack.triggersActionsUI.sections.alertAdd.conditionPrompt"
-        />
-      </EuiFormLabel>
-      <EuiSpacer size="m" />
-      <EuiFlexGroup>
-        <EuiFlexItem grow={false}>
-          <ThresholdExpression
-            thresholdComparator={thresholdComparator ?? DEFAULT_VALUES.THRESHOLD_COMPARATOR}
-            threshold={threshold}
-            errors={errors}
-            popupPosition={'upLeft'}
-            onChangeSelectedThreshold={selectedThresholds =>
-              setAlertParams('threshold', selectedThresholds)
-            }
-            onChangeSelectedThresholdComparator={selectedThresholdComparator =>
-              setAlertParams('thresholdComparator', selectedThresholdComparator)
-            }
-          />
-        </EuiFlexItem>
-        <EuiFlexItem grow={false}>
-          <ForLastExpression
-            popupPosition={'upLeft'}
-            timeWindowSize={timeWindowSize}
-            timeWindowUnit={timeWindowUnit}
-            errors={errors}
-            onChangeWindowSize={(selectedWindowSize: any) =>
-              setAlertParams('timeWindowSize', selectedWindowSize)
-            }
-            onChangeWindowUnit={(selectedWindowUnit: any) =>
-              setAlertParams('timeWindowUnit', selectedWindowUnit)
-            }
-          />
-        </EuiFlexItem>
-      </EuiFlexGroup>
+      <EuiSteps steps={firstSetOfSteps} />
       <EuiSpacer size="l" />
       <div className="actAlertVisualization__chart">
         {canShowVizualization ? (
@@ -422,7 +453,7 @@ export const IndexThresholdAlertTypeExpression: React.FunctionComponent<IndexThr
                 <EuiText color="subdued">
                   <FormattedMessage
                     id="xpack.triggersActionsUI.sections.alertAdd.previewAlertVisualizationDescription"
-                    defaultMessage="Complete the expression above to generate a preview"
+                    defaultMessage="Complete the expression to generate a preview."
                   />
                 </EuiText>
               }
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_alert_types/threshold/index.ts b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_alert_types/threshold/index.ts
index ecf60e995d1a1..983f759214b6b 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_alert_types/threshold/index.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_alert_types/threshold/index.ts
@@ -10,7 +10,7 @@ import { validateExpression } from './validation';
 export function getAlertType(): AlertTypeModel {
   return {
     id: '.index-threshold',
-    name: 'Index Threshold',
+    name: 'Index threshold',
     iconClass: 'alert',
     alertParamsExpression: IndexThresholdAlertTypeExpression,
     validate: validateExpression,
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 ef08ac9a9d0de..06d311ef064c3 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
@@ -305,14 +305,14 @@ export const ThresholdVisualization: React.FunctionComponent<Props> = ({
             title={
               <FormattedMessage
                 id="xpack.triggersActionsUI.sections.alertAdd.thresholdPreviewChart.noDataTitle"
-                defaultMessage="No data matches that query"
+                defaultMessage="No data matches this query"
               />
             }
             color="warning"
           >
             <FormattedMessage
               id="xpack.triggersActionsUI.sections.alertAdd.thresholdPreviewChart.dataDoesNotExistTextMessage"
-              defaultMessage="Check your time range and filters to make sure they are correct"
+              defaultMessage="Check that your time range and filters are correct."
             />
           </EuiCallOut>
         )}
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/home.tsx b/x-pack/plugins/triggers_actions_ui/public/application/home.tsx
index b478a9f0ced8b..6130233f33815 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/home.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/home.tsx
@@ -17,6 +17,7 @@ import {
   EuiTabs,
   EuiTitle,
   EuiBetaBadge,
+  EuiText,
 } from '@elastic/eui';
 
 import { i18n } from '@kbn/i18n';
@@ -28,6 +29,7 @@ import { hasShowActionsCapability, hasShowAlertsCapability } from './lib/capabil
 
 import { ActionsConnectorsList } from './sections/actions_connectors_list/components/actions_connectors_list';
 import { AlertsList } from './sections/alerts_list/components/alerts_list';
+import { PLUGIN } from './constants/plugin';
 
 interface MatchParams {
   section: Section;
@@ -100,12 +102,24 @@ export const TriggersActionsUIHome: React.FunctionComponent<RouteComponentProps<
                     'xpack.triggersActionsUI.home.betaBadgeTooltipContent',
                     {
                       defaultMessage:
-                        'This module is not GA. Please help us by reporting any bugs.',
+                        '{pluginName} is in beta and is subject to change. The design and code is less mature than official GA features and is being provided as-is with no warranties. Beta features are not subject to the support SLA of official GA features.',
+                      values: {
+                        pluginName: PLUGIN.getI18nName(i18n),
+                      },
                     }
                   )}
                 />
               </h1>
             </EuiTitle>
+            <EuiSpacer size="s" />
+            <EuiText>
+              <p>
+                <FormattedMessage
+                  id="xpack.triggersActionsUI.home.sectionDescription"
+                  defaultMessage="Detect conditions using alerts, and take actions using connectors."
+                />
+              </p>
+            </EuiText>
           </EuiPageContentHeaderSection>
         </EuiPageContentHeader>
 
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
index eb51bb8ac5098..566ed7935e013 100644
--- 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
@@ -43,11 +43,11 @@ test('returns isEnabled:false when action type is disabled by license', async ()
   expect(checkActionTypeEnabled(actionType)).toMatchInlineSnapshot(`
     Object {
       "isEnabled": false,
-      "message": "This connector is disabled because it requires a basic license.",
+      "message": "This connector 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."
+        title="This feature requires a Basic license."
         titleSize="xs"
       >
         <ForwardRef
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
index 7691c3741468c..263502a82ec79 100644
--- 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
@@ -5,6 +5,7 @@
  */
 
 import React from 'react';
+import { capitalize } from 'lodash';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n/react';
 import { EuiCard, EuiLink } from '@elastic/eui';
@@ -30,10 +31,9 @@ export function checkActionTypeEnabled(
       message: i18n.translate(
         'xpack.triggersActionsUI.checkActionTypeEnabled.actionTypeDisabledByLicenseMessage',
         {
-          defaultMessage:
-            'This connector is disabled because it requires a {minimumLicenseRequired} license.',
+          defaultMessage: 'This connector requires a {minimumLicenseRequired} license.',
           values: {
-            minimumLicenseRequired: actionType.minimumLicenseRequired,
+            minimumLicenseRequired: capitalize(actionType.minimumLicenseRequired),
           },
         }
       ),
@@ -45,7 +45,7 @@ export function checkActionTypeEnabled(
             {
               defaultMessage: 'This feature requires a {minimumLicenseRequired} license.',
               values: {
-                minimumLicenseRequired: actionType.minimumLicenseRequired,
+                minimumLicenseRequired: capitalize(actionType.minimumLicenseRequired),
               },
             }
           )}
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 4dcbfeaaf1d3a..3ade4e6368f96 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
@@ -93,7 +93,9 @@ export const ActionForm = ({
     (async () => {
       try {
         setIsLoadingActionTypes(true);
-        const registeredActionTypes = actionTypes ?? (await loadActionTypes({ http }));
+        const registeredActionTypes = (
+          actionTypes ?? (await loadActionTypes({ http }))
+        ).sort((a, b) => a.name.localeCompare(b.name));
         const index: ActionTypeIndex = {};
         for (const actionTypeItem of registeredActionTypes) {
           index[actionTypeItem.id] = actionTypeItem;
@@ -188,7 +190,7 @@ export const ActionForm = ({
               label={
                 <FormattedMessage
                   id="xpack.triggersActionsUI.sections.alertForm.actionIdLabel"
-                  defaultMessage="{connectorInstance} instance"
+                  defaultMessage="{connectorInstance} connector"
                   values={{
                     connectorInstance: actionTypesIndex
                       ? actionTypesIndex[actionConnector.actionTypeId].name
@@ -259,7 +261,7 @@ export const ActionForm = ({
                   <EuiFlexGroup gutterSize="s">
                     <EuiFlexItem grow={false}>
                       <FormattedMessage
-                        defaultMessage="Action: {actionConnectorName}"
+                        defaultMessage="{actionConnectorName}"
                         id="xpack.triggersActionsUI.sections.alertForm.selectAlertActionTypeEditTitle"
                         values={{
                           actionConnectorName: actionConnector.name,
@@ -340,7 +342,7 @@ export const ActionForm = ({
               <EuiTitle size="s">
                 <h5>
                   <FormattedMessage
-                    defaultMessage="Action: {actionConnectorName}"
+                    defaultMessage="{actionConnectorName}"
                     id="xpack.triggersActionsUI.sections.alertForm.selectAlertActionTypeEditTitle"
                     values={{
                       actionConnectorName: actionTypeRegistered.actionTypeTitle,
@@ -378,7 +380,7 @@ export const ActionForm = ({
           title={
             <FormattedMessage
               id="xpack.triggersActionsUI.sections.alertForm.emptyConnectorsLabel"
-              defaultMessage="There are no {actionTypeName} connectors"
+              defaultMessage="No {actionTypeName} connectors."
               values={{
                 actionTypeName,
               }}
@@ -396,10 +398,7 @@ export const ActionForm = ({
             >
               <FormattedMessage
                 id="xpack.triggersActionsUI.sections.alertForm.addConnectorButtonLabel"
-                defaultMessage="Add {actionTypeName} connector"
-                values={{
-                  actionTypeName,
-                }}
+                defaultMessage="Create a connector"
               />
             </EuiButton>,
           ]}
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 84d5269337b9e..70aa862aa3c3d 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
@@ -188,7 +188,7 @@ describe('connector_add_flyout', () => {
     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.'
+      'This connector requires a Gold license.'
     );
   });
 });
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 665eeca43acb4..6b4a461bad24d 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
@@ -31,6 +31,7 @@ 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';
+import { PLUGIN } from '../../constants/plugin';
 
 export interface ConnectorAddFlyoutProps {
   addFlyoutVisible: boolean;
@@ -138,15 +139,11 @@ export const ConnectorAddFlyout = ({
       })
       .catch(errorRes => {
         toastNotifications.addDanger(
-          i18n.translate(
-            'xpack.triggersActionsUI.sections.addConnectorForm.updateErrorNotificationText',
-            {
-              defaultMessage: 'Failed to create connector: {message}',
-              values: {
-                message: errorRes.body?.message ?? '',
-              },
-            }
-          )
+          errorRes.body?.message ??
+            i18n.translate(
+              'xpack.triggersActionsUI.sections.addConnectorForm.updateErrorNotificationText',
+              { defaultMessage: 'Cannot create a connector.' }
+            )
         );
         return undefined;
       });
@@ -179,7 +176,10 @@ export const ConnectorAddFlyout = ({
                         'xpack.triggersActionsUI.sections.addConnectorForm.betaBadgeTooltipContent',
                         {
                           defaultMessage:
-                            'This module is not GA. Please help us by reporting any bugs.',
+                            '{pluginName} is in beta and is subject to change. The design and code is less mature than official GA features and is being provided as-is with no warranties. Beta features are not subject to the support SLA of official GA features.',
+                          values: {
+                            pluginName: PLUGIN.getI18nName(i18n),
+                          },
                         }
                       )}
                     />
@@ -203,7 +203,10 @@ export const ConnectorAddFlyout = ({
                       'xpack.triggersActionsUI.sections.addFlyout.betaBadgeTooltipContent',
                       {
                         defaultMessage:
-                          'This module is not GA. Please help us by reporting any bugs.',
+                          '{pluginName} is in beta and is subject to change. The design and code is less mature than official GA features and is being provided as-is with no warranties. Beta features are not subject to the support SLA of official GA features.',
+                        values: {
+                          pluginName: PLUGIN.getI18nName(i18n),
+                        },
                       }
                     )}
                   />
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/connector_add_modal.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/connector_add_modal.tsx
index 977a908fd86f0..e04484b897e1c 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/connector_add_modal.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/connector_add_modal.tsx
@@ -24,6 +24,7 @@ import { connectorReducer } from './connector_reducer';
 import { createActionConnector } from '../../lib/action_connector_api';
 import { TypeRegistry } from '../../type_registry';
 import './connector_add_modal.scss';
+import { PLUGIN } from '../../constants/plugin';
 
 interface ConnectorAddModalProps {
   actionType: ActionType;
@@ -133,7 +134,10 @@ export const ConnectorAddModal = ({
                         'xpack.triggersActionsUI.sections.addModalConnectorForm.betaBadgeTooltipContent',
                         {
                           defaultMessage:
-                            'This module is not GA. Please help us by reporting any bugs.',
+                            '{pluginName} is in beta and is subject to change. The design and code is less mature than official GA features and is being provided as-is with no warranties. Beta features are not subject to the support SLA of official GA features.',
+                          values: {
+                            pluginName: PLUGIN.getI18nName(i18n),
+                          },
                         }
                       )}
                     />
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/connector_edit_flyout.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/connector_edit_flyout.tsx
index 39c0b7255a7b9..ed8811d26331b 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/connector_edit_flyout.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/connector_edit_flyout.tsx
@@ -25,6 +25,7 @@ import { connectorReducer } from './connector_reducer';
 import { updateActionConnector } from '../../lib/action_connector_api';
 import { hasSaveActionsCapability } from '../../lib/capabilities';
 import { useActionsConnectorsContext } from '../../context/actions_connectors_context';
+import { PLUGIN } from '../../constants/plugin';
 
 export interface ConnectorEditProps {
   initialConnector: ActionConnectorTableItem;
@@ -66,33 +67,27 @@ export const ConnectorEditFlyout = ({
   const onActionConnectorSave = async (): Promise<ActionConnector | undefined> =>
     await updateActionConnector({ http, connector, id: connector.id })
       .then(savedConnector => {
-        if (toastNotifications) {
-          toastNotifications.addSuccess(
-            i18n.translate(
-              'xpack.triggersActionsUI.sections.editConnectorForm.updateSuccessNotificationText',
-              {
-                defaultMessage: "Updated '{connectorName}'",
-                values: {
-                  connectorName: savedConnector.name,
-                },
-              }
-            )
-          );
-        }
-        return savedConnector;
-      })
-      .catch(errorRes => {
-        toastNotifications.addDanger(
+        toastNotifications.addSuccess(
           i18n.translate(
-            'xpack.triggersActionsUI.sections.editConnectorForm.updateErrorNotificationText',
+            'xpack.triggersActionsUI.sections.editConnectorForm.updateSuccessNotificationText',
             {
-              defaultMessage: 'Failed to update connector: {message}',
+              defaultMessage: "Updated '{connectorName}'",
               values: {
-                message: errorRes.body?.message ?? '',
+                connectorName: savedConnector.name,
               },
             }
           )
         );
+        return savedConnector;
+      })
+      .catch(errorRes => {
+        toastNotifications.addDanger(
+          errorRes.body?.message ??
+            i18n.translate(
+              'xpack.triggersActionsUI.sections.editConnectorForm.updateErrorNotificationText',
+              { defaultMessage: 'Cannot update a connector.' }
+            )
+        );
         return undefined;
       });
 
@@ -119,7 +114,10 @@ export const ConnectorEditFlyout = ({
                     'xpack.triggersActionsUI.sections.editConnectorForm.betaBadgeTooltipContent',
                     {
                       defaultMessage:
-                        'This module is not GA. Please help us by reporting any bugs.',
+                        '{pluginName} is in beta and is subject to change. The design and code is less mature than official GA features and is being provided as-is with no warranties. Beta features are not subject to the support SLA of official GA features.',
+                      values: {
+                        pluginName: PLUGIN.getI18nName(i18n),
+                      },
                     }
                   )}
                 />
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 8c2565538f718..facfc8efa299e 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
@@ -114,7 +114,7 @@ export const ActionsConnectorsList: React.FunctionComponent = () => {
         title: i18n.translate(
           'xpack.triggersActionsUI.sections.actionsConnectorsList.unableToLoadActionsMessage',
           {
-            defaultMessage: 'Unable to load actions',
+            defaultMessage: 'Unable to load connectors',
           }
         ),
       });
@@ -213,11 +213,11 @@ export const ActionsConnectorsList: React.FunctionComponent = () => {
           description: canDelete
             ? i18n.translate(
                 'xpack.triggersActionsUI.sections.actionsConnectorsList.connectorsListTable.columns.actions.deleteActionDescription',
-                { defaultMessage: 'Delete this action' }
+                { defaultMessage: 'Delete this connector' }
               )
             : i18n.translate(
                 'xpack.triggersActionsUI.sections.actionsConnectorsList.connectorsListTable.columns.actions.deleteActionDisabledDescription',
-                { defaultMessage: 'Unable to delete actions' }
+                { defaultMessage: 'Unable to delete connectors' }
               ),
           type: 'icon',
           icon: 'trash',
@@ -290,13 +290,13 @@ export const ActionsConnectorsList: React.FunctionComponent = () => {
                       ? undefined
                       : i18n.translate(
                           'xpack.triggersActionsUI.sections.actionsConnectorsList.buttons.deleteDisabledTitle',
-                          { defaultMessage: 'Unable to delete actions' }
+                          { defaultMessage: 'Unable to delete connectors' }
                         )
                   }
                 >
                   <FormattedMessage
                     id="xpack.triggersActionsUI.sections.actionsConnectorsList.buttons.deleteLabel"
-                    defaultMessage="Delete ({count})"
+                    defaultMessage="Delete {count}"
                     values={{
                       count: selectedItems.length,
                     }}
@@ -393,7 +393,7 @@ export const ActionsConnectorsList: React.FunctionComponent = () => {
           toastNotifications.addDanger({
             title: i18n.translate(
               'xpack.triggersActionsUI.sections.actionsConnectorsList.failedToDeleteActionsMessage',
-              { defaultMessage: 'Failed to delete action(s)' }
+              { defaultMessage: 'Failed to delete connectors(s)' }
             ),
           });
           // Refresh the actions from the server, some actions may have beend deleted
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 d781e8b761845..9da4f059f8967 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
@@ -12,6 +12,7 @@ import { EuiTitle, EuiBadge, EuiFlexItem, EuiSwitch, EuiBetaBadge } from '@elast
 import { times, random } from 'lodash';
 import { i18n } from '@kbn/i18n';
 import { ViewInApp } from './view_in_app';
+import { PLUGIN } from '../../../constants/plugin';
 
 jest.mock('../../../app_context', () => ({
   useAppDependencies: jest.fn(() => ({
@@ -63,7 +64,11 @@ describe('alert_details', () => {
               tooltipContent={i18n.translate(
                 'xpack.triggersActionsUI.sections.alertDetails.betaBadgeTooltipContent',
                 {
-                  defaultMessage: 'This module is not GA. Please help us by reporting any bugs.',
+                  defaultMessage:
+                    '{pluginName} is in beta and is subject to change. The design and code is less mature than official GA features and is being provided as-is with no warranties. Beta features are not subject to the support SLA of official GA features.',
+                  values: {
+                    pluginName: PLUGIN.getI18nName(i18n),
+                  },
                 }
               )}
             />
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_details/components/alert_details.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_details/components/alert_details.tsx
index 1f55e61e9ee0d..5bfcf9fd2d4e6 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_details/components/alert_details.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_details/components/alert_details.tsx
@@ -33,6 +33,7 @@ import {
 } from '../../common/components/with_bulk_alert_api_operations';
 import { AlertInstancesRouteWithApi } from './alert_instances_route';
 import { ViewInApp } from './view_in_app';
+import { PLUGIN } from '../../../constants/plugin';
 
 type AlertDetailsProps = {
   alert: Alert;
@@ -77,7 +78,10 @@ export const AlertDetails: React.FunctionComponent<AlertDetailsProps> = ({
                       'xpack.triggersActionsUI.sections.alertDetails.betaBadgeTooltipContent',
                       {
                         defaultMessage:
-                          'This module is not GA. Please help us by reporting any bugs.',
+                          '{pluginName} is in beta and is subject to change. The design and code is less mature than official GA features and is being provided as-is with no warranties. Beta features are not subject to the support SLA of official GA features.',
+                        values: {
+                          pluginName: PLUGIN.getI18nName(i18n),
+                        },
                       }
                     )}
                   />
@@ -177,7 +181,7 @@ export const AlertDetails: React.FunctionComponent<AlertDetailsProps> = ({
                     <p>
                       <FormattedMessage
                         id="xpack.triggersActionsUI.sections.alertDetails.alertInstances.disabledAlert"
-                        defaultMessage="Disabled Alerts do not have an active state, hence Alert Instances cannot be displayed."
+                        defaultMessage="This alert is disabled and cannot be displayed. Toggle Enable ↑ to activate it."
                       />
                     </p>
                   </EuiCallOut>
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 4e6d63e97ec45..6600a2379cd23 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
@@ -24,6 +24,7 @@ import { Alert, AlertAction, IErrorObject } from '../../../types';
 import { AlertForm, validateBaseProperties } from './alert_form';
 import { alertReducer } from './alert_reducer';
 import { createAlert } from '../../lib/alert_api';
+import { PLUGIN } from '../../constants/plugin';
 
 interface AlertAddProps {
   consumer: string;
@@ -109,12 +110,10 @@ export const AlertAdd = ({
       return newAlert;
     } catch (errorRes) {
       toastNotifications.addDanger(
-        i18n.translate('xpack.triggersActionsUI.sections.alertAdd.saveErrorNotificationText', {
-          defaultMessage: 'Failed to save alert: {message}',
-          values: {
-            message: errorRes.body?.message ?? '',
-          },
-        })
+        errorRes.body?.message ??
+          i18n.translate('xpack.triggersActionsUI.sections.alertAdd.saveErrorNotificationText', {
+            defaultMessage: 'Cannot create alert.',
+          })
       );
     }
   }
@@ -132,7 +131,7 @@ export const AlertAdd = ({
           <EuiTitle size="s" data-test-subj="addAlertFlyoutTitle">
             <h3 id="flyoutTitle">
               <FormattedMessage
-                defaultMessage="Create Alert"
+                defaultMessage="Create alert"
                 id="xpack.triggersActionsUI.sections.alertAdd.flyoutTitle"
               />
               &emsp;
@@ -141,7 +140,11 @@ export const AlertAdd = ({
                 tooltipContent={i18n.translate(
                   'xpack.triggersActionsUI.sections.alertAdd.betaBadgeTooltipContent',
                   {
-                    defaultMessage: 'This module is not GA. Please help us by reporting any bugs.',
+                    defaultMessage:
+                      '{pluginName} is in beta and is subject to change. The design and code is less mature than official GA features and is being provided as-is with no warranties. Beta features are not subject to the support SLA of official GA features.',
+                    values: {
+                      pluginName: PLUGIN.getI18nName(i18n),
+                    },
                   }
                 )}
               />
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_form/alert_edit.test.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_form/alert_edit.test.tsx
index 9a335b2f2c242..e9ef6712b88e9 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_form/alert_edit.test.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_form/alert_edit.test.tsx
@@ -147,8 +147,6 @@ describe('alert_edit', () => {
         .first()
         .simulate('click');
     });
-    expect(mockedCoreSetup.notifications.toasts.addDanger).toHaveBeenCalledWith(
-      'Failed to save alert: Fail message'
-    );
+    expect(mockedCoreSetup.notifications.toasts.addDanger).toHaveBeenCalledWith('Fail message');
   });
 });
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 3feceb42e6ddc..41ab3279f91c6 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
@@ -26,6 +26,7 @@ import { Alert, AlertAction, IErrorObject } from '../../../types';
 import { AlertForm, validateBaseProperties } from './alert_form';
 import { alertReducer } from './alert_reducer';
 import { updateAlert } from '../../lib/alert_api';
+import { PLUGIN } from '../../constants/plugin';
 
 interface AlertEditProps {
   initialAlert: Alert;
@@ -82,28 +83,22 @@ export const AlertEdit = ({
   async function onSaveAlert(): Promise<Alert | undefined> {
     try {
       const newAlert = await updateAlert({ http, alert, id: alert.id });
-      if (toastNotifications) {
-        toastNotifications.addSuccess(
-          i18n.translate('xpack.triggersActionsUI.sections.alertEdit.saveSuccessNotificationText', {
-            defaultMessage: "Updated '{alertName}'",
-            values: {
-              alertName: newAlert.name,
-            },
-          })
-        );
-      }
+      toastNotifications.addSuccess(
+        i18n.translate('xpack.triggersActionsUI.sections.alertEdit.saveSuccessNotificationText', {
+          defaultMessage: "Updated '{alertName}'",
+          values: {
+            alertName: newAlert.name,
+          },
+        })
+      );
       return newAlert;
     } catch (errorRes) {
-      if (toastNotifications) {
-        toastNotifications.addDanger(
+      toastNotifications.addDanger(
+        errorRes.body?.message ??
           i18n.translate('xpack.triggersActionsUI.sections.alertEdit.saveErrorNotificationText', {
-            defaultMessage: 'Failed to save alert: {message}',
-            values: {
-              message: errorRes.body?.message ?? '',
-            },
+            defaultMessage: 'Cannot update alert.',
           })
-        );
-      }
+      );
     }
   }
 
@@ -120,7 +115,7 @@ export const AlertEdit = ({
           <EuiTitle size="s" data-test-subj="editAlertFlyoutTitle">
             <h3 id="flyoutTitle">
               <FormattedMessage
-                defaultMessage="Edit Alert"
+                defaultMessage="Edit alert"
                 id="xpack.triggersActionsUI.sections.alertEdit.flyoutTitle"
               />
               &emsp;
@@ -129,7 +124,11 @@ export const AlertEdit = ({
                 tooltipContent={i18n.translate(
                   'xpack.triggersActionsUI.sections.alertEdit.betaBadgeTooltipContent',
                   {
-                    defaultMessage: 'This module is not GA. Please help us by reporting any bugs.',
+                    defaultMessage:
+                      '{pluginName} is in beta and is subject to change. The design and code is less mature than official GA features and is being provided as-is with no warranties. Beta features are not subject to the support SLA of official GA features.',
+                    values: {
+                      pluginName: PLUGIN.getI18nName(i18n),
+                    },
                   }
                 )}
               />
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 2c601eeb75645..4b8045d1bc8a4 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
@@ -260,7 +260,7 @@ export const AlertForm = ({
         position="right"
         type="questionInCircle"
         content={i18n.translate('xpack.triggersActionsUI.sections.alertForm.checkWithTooltip', {
-          defaultMessage: 'This is some help text here for check alert.',
+          defaultMessage: 'Define how often to evaluate the condition.',
         })}
       />
     </>
@@ -270,13 +270,13 @@ export const AlertForm = ({
     <>
       <FormattedMessage
         id="xpack.triggersActionsUI.sections.alertForm.renotifyFieldLabel"
-        defaultMessage="Re-notify every"
+        defaultMessage="Notify every"
       />{' '}
       <EuiIconTip
         position="right"
         type="questionInCircle"
         content={i18n.translate('xpack.triggersActionsUI.sections.alertForm.renotifyWithTooltip', {
-          defaultMessage: 'This is some help text here for re-notify alert.',
+          defaultMessage: 'Define how often to repeat the action while the alert is active.',
         })}
       />
     </>
@@ -456,7 +456,7 @@ export const AlertForm = ({
           <EuiTitle size="s">
             <h5 id="alertTypeTitle">
               <FormattedMessage
-                defaultMessage="Trigger: Select a trigger type"
+                defaultMessage="Select a trigger type"
                 id="xpack.triggersActionsUI.sections.alertForm.selectAlertTypeTitle"
               />
             </h5>
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 84e4d5794859c..9f10528b1dd46 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
@@ -120,7 +120,7 @@ export const AlertsList: React.FunctionComponent = () => {
     (async () => {
       try {
         const result = await loadActionTypes({ http });
-        setActionTypes(result);
+        setActionTypes(result.filter(actionType => actionTypeRegistry.has(actionType.id)));
       } catch (e) {
         toastNotifications.addDanger({
           title: i18n.translate(
@@ -285,7 +285,7 @@ export const AlertsList: React.FunctionComponent = () => {
       >
         <FormattedMessage
           id="xpack.triggersActionsUI.sections.alertsList.addActionButtonLabel"
-          defaultMessage="Create"
+          defaultMessage="Create alert"
         />
       </EuiButton>
     );
@@ -307,7 +307,7 @@ export const AlertsList: React.FunctionComponent = () => {
         <p>
           <FormattedMessage
             id="xpack.triggersActionsUI.sections.alertsList.emptyDesc"
-            defaultMessage="Recieve an alert through email, slack or other connectors when a certain trigger is hit"
+            defaultMessage="Receive an alert through email, Slack, or another connector when a trigger is hit."
           />
         </p>
       }

From 676a03d8c5e566085d08983aa2500f504c26d41d Mon Sep 17 00:00:00 2001
From: Brandon Kobel <brandon.kobel@elastic.co>
Date: Tue, 24 Mar 2020 10:11:51 -0700
Subject: [PATCH 090/179] Update crypto-js to 3.3.0 (#58911)

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 37cebe420a362..f88db13f4ead1 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -10525,9 +10525,9 @@ crypto-browserify@^3.11.0:
     randomfill "^1.0.3"
 
 crypto-js@^3.1.9-1:
-  version "3.1.9-1"
-  resolved "https://registry.yarnpkg.com/crypto-js/-/crypto-js-3.1.9-1.tgz#fda19e761fc077e01ffbfdc6e9fdfc59e8806cd8"
-  integrity sha1-/aGedh/Ad+Af+/3G6f38WeiAbNg=
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/crypto-js/-/crypto-js-3.3.0.tgz#846dd1cce2f68aacfa156c8578f926a609b7976b"
+  integrity sha512-DIT51nX0dCfKltpRiXV+/TVZq+Qq2NgF4644+K7Ttnla7zEzqc+kjJyiB96BHNyUTBxyjzRcZYpUdZa+QAqi6Q==
 
 crypto-random-string@^1.0.0:
   version "1.0.0"

From 6950c260efb0955d9212a96d9d956ee998127a85 Mon Sep 17 00:00:00 2001
From: Brian Seeders <brian.seeders@elastic.co>
Date: Tue, 24 Mar 2020 14:12:54 -0400
Subject: [PATCH 091/179] kbn-es: Support choosing the correct architecture
 (#61096)

---
 packages/kbn-es/src/artifact.js      |  5 ++++-
 packages/kbn-es/src/artifact.test.js | 24 ++++++++++++++++++++++--
 2 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/packages/kbn-es/src/artifact.js b/packages/kbn-es/src/artifact.js
index 9ea78386269d9..83dcd1cf36d2e 100644
--- a/packages/kbn-es/src/artifact.js
+++ b/packages/kbn-es/src/artifact.js
@@ -117,11 +117,14 @@ async function getArtifactSpecForSnapshot(urlVersion, license, log) {
   const manifest = JSON.parse(json);
 
   const platform = process.platform === 'win32' ? 'windows' : process.platform;
+  const arch = process.arch === 'arm64' ? 'aarch64' : 'x86_64';
+
   const archive = manifest.archives.find(
     archive =>
       archive.version === desiredVersion &&
       archive.platform === platform &&
-      archive.license === desiredLicense
+      archive.license === desiredLicense &&
+      archive.architecture === arch
   );
 
   if (!archive) {
diff --git a/packages/kbn-es/src/artifact.test.js b/packages/kbn-es/src/artifact.test.js
index 453eb1a9a7689..02e4d5318f63f 100644
--- a/packages/kbn-es/src/artifact.test.js
+++ b/packages/kbn-es/src/artifact.test.js
@@ -28,6 +28,7 @@ const log = new ToolingLog();
 let MOCKS;
 
 const PLATFORM = process.platform === 'win32' ? 'windows' : process.platform;
+const ARCHITECTURE = process.arch === 'arm64' ? 'aarch64' : 'x86_64';
 const MOCK_VERSION = 'test-version';
 const MOCK_URL = 'http://127.0.0.1:12345';
 const MOCK_FILENAME = 'test-filename';
@@ -38,13 +39,15 @@ const PERMANENT_SNAPSHOT_BASE_URL =
 
 const createArchive = (params = {}) => {
   const license = params.license || 'default';
+  const architecture = params.architecture || ARCHITECTURE;
 
   return {
     license: 'default',
+    architecture,
     version: MOCK_VERSION,
     url: MOCK_URL + `/${license}`,
     platform: PLATFORM,
-    filename: MOCK_FILENAME + `.${license}`,
+    filename: MOCK_FILENAME + `-${architecture}.${license}`,
     ...params,
   };
 };
@@ -77,6 +80,12 @@ beforeEach(() => {
     valid: {
       archives: [createArchive({ license: 'oss' }), createArchive({ license: 'default' })],
     },
+    multipleArch: {
+      archives: [
+        createArchive({ architecture: 'fake_arch', license: 'oss' }),
+        createArchive({ architecture: ARCHITECTURE, license: 'oss' }),
+      ],
+    },
   };
 });
 
@@ -95,7 +104,7 @@ const artifactTest = (requestedLicense, expectedLicense, fetchTimesCalled = 1) =
     expect(artifact.getUrl()).toEqual(MOCK_URL + `/${expectedLicense}`);
     expect(artifact.getChecksumUrl()).toEqual(MOCK_URL + `/${expectedLicense}.sha512`);
     expect(artifact.getChecksumType()).toEqual('sha512');
-    expect(artifact.getFilename()).toEqual(MOCK_FILENAME + `.${expectedLicense}`);
+    expect(artifact.getFilename()).toEqual(MOCK_FILENAME + `-${ARCHITECTURE}.${expectedLicense}`);
   };
 };
 
@@ -153,6 +162,17 @@ describe('Artifact', () => {
       });
     });
 
+    describe('with snapshots for multiple architectures', () => {
+      beforeEach(() => {
+        mockFetch(MOCKS.multipleArch);
+      });
+
+      it('should return artifact metadata for the correct architecture', async () => {
+        const artifact = await Artifact.getSnapshot('oss', MOCK_VERSION, log);
+        expect(artifact.getFilename()).toEqual(MOCK_FILENAME + `-${ARCHITECTURE}.oss`);
+      });
+    });
+
     describe('with custom snapshot manifest URL', () => {
       const CUSTOM_URL = 'http://www.creedthoughts.gov.www/creedthoughts';
 

From be1953a4dc3a3beebc39e328ee26bc4083c85c5a Mon Sep 17 00:00:00 2001
From: Chris Cowan <chris@chriscowan.us>
Date: Tue, 24 Mar 2020 11:33:29 -0700
Subject: [PATCH 092/179] [Metric Alerts] Align date histogram buckets to the
 last bucket (#60714)

* [Metrics Alert] Align date_histogram to last bucket

- adds extended_bounds to date_histogram
- change range query to use epoch_millis
- add lte to range query
- add offset to date_histogram to realign buckets

* Removing unused import

* Adding note about calculating FROM to be more clear

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 .../metric_threshold_executor.ts              | 19 ++++++++++++++++++-
 .../server/lib/snapshot/query_helpers.ts      |  3 +--
 .../infra/server/lib/snapshot/snapshot.ts     |  2 +-
 3 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/x-pack/plugins/infra/server/lib/alerting/metric_threshold/metric_threshold_executor.ts b/x-pack/plugins/infra/server/lib/alerting/metric_threshold/metric_threshold_executor.ts
index 778889ba0c7a5..bfe04b82b95fc 100644
--- a/x-pack/plugins/infra/server/lib/alerting/metric_threshold/metric_threshold_executor.ts
+++ b/x-pack/plugins/infra/server/lib/alerting/metric_threshold/metric_threshold_executor.ts
@@ -11,6 +11,10 @@ import { getAllCompositeData } from '../../../utils/get_all_composite_data';
 import { networkTraffic } from '../../../../common/inventory_models/shared/metrics/snapshot/network_traffic';
 import { MetricExpressionParams, Comparator, AlertStates } from './types';
 import { AlertServices, AlertExecutorOptions } from '../../../../../alerting/server';
+import { getIntervalInSeconds } from '../../../utils/get_interval_in_seconds';
+import { getDateHistogramOffset } from '../../snapshot/query_helpers';
+
+const TOTAL_BUCKETS = 5;
 
 interface Aggregation {
   aggregatedIntervals: {
@@ -70,6 +74,12 @@ export const getElasticsearchMetricQuery = (
     throw new Error('Can only aggregate without a metric if using the document count aggregator');
   }
   const interval = `${timeSize}${timeUnit}`;
+  const to = Date.now();
+  const intervalAsSeconds = getIntervalInSeconds(interval);
+  // We need enough data for 5 buckets worth of data. We also need
+  // to convert the intervalAsSeconds to milliseconds.
+  const from = to - intervalAsSeconds * 1000 * TOTAL_BUCKETS;
+  const offset = getDateHistogramOffset(from, interval);
 
   const aggregations =
     aggType === 'count'
@@ -89,6 +99,11 @@ export const getElasticsearchMetricQuery = (
       date_histogram: {
         field: '@timestamp',
         fixed_interval: interval,
+        offset,
+        extended_bounds: {
+          min: from,
+          max: to,
+        },
       },
       aggregations,
     },
@@ -118,7 +133,9 @@ export const getElasticsearchMetricQuery = (
     {
       range: {
         '@timestamp': {
-          gte: `now-${interval}`,
+          gte: from,
+          lte: to,
+          format: 'epoch_millis',
         },
       },
     },
diff --git a/x-pack/plugins/infra/server/lib/snapshot/query_helpers.ts b/x-pack/plugins/infra/server/lib/snapshot/query_helpers.ts
index 383dc9a773abe..82a393079745f 100644
--- a/x-pack/plugins/infra/server/lib/snapshot/query_helpers.ts
+++ b/x-pack/plugins/infra/server/lib/snapshot/query_helpers.ts
@@ -87,8 +87,7 @@ export const getMetricsAggregations = (options: InfraSnapshotRequestOptions): Sn
   return aggregation;
 };
 
-export const getDateHistogramOffset = (options: InfraSnapshotRequestOptions): string => {
-  const { from, interval } = options.timerange;
+export const getDateHistogramOffset = (from: number, interval: string): string => {
   const fromInSeconds = Math.floor(from / 1000);
   const bucketSizeInSeconds = getIntervalInSeconds(interval);
 
diff --git a/x-pack/plugins/infra/server/lib/snapshot/snapshot.ts b/x-pack/plugins/infra/server/lib/snapshot/snapshot.ts
index 8e5f8e6716f3c..07abfa5fd474a 100644
--- a/x-pack/plugins/infra/server/lib/snapshot/snapshot.ts
+++ b/x-pack/plugins/infra/server/lib/snapshot/snapshot.ts
@@ -159,7 +159,7 @@ const requestNodeMetrics = async (
               date_histogram: {
                 field: options.sourceConfiguration.fields.timestamp,
                 interval: options.timerange.interval || '1m',
-                offset: getDateHistogramOffset(options),
+                offset: getDateHistogramOffset(options.timerange.from, options.timerange.interval),
                 extended_bounds: {
                   min: options.timerange.from,
                   max: options.timerange.to,

From ec8ac301ddc2676f80e8270285ac1b22e8014395 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alejandro=20Fern=C3=A1ndez=20Haro?=
 <alejandro.haro@elastic.co>
Date: Tue, 24 Mar 2020 18:57:35 +0000
Subject: [PATCH 093/179] [skip-ci] Fix README in usageCollection (#61137)

* Fix README in usageCollection

* savedObjectsRepository instead of savedObjectsClient
---
 src/plugins/usage_collection/README.md | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/plugins/usage_collection/README.md b/src/plugins/usage_collection/README.md
index 1c97c9c63c0e2..e32dfae35832b 100644
--- a/src/plugins/usage_collection/README.md
+++ b/src/plugins/usage_collection/README.md
@@ -83,14 +83,14 @@ import { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
 import { CoreSetup, CoreStart } from 'kibana/server';
 
 class Plugin {
-  private savedObjectsClient?: ISavedObjectsRepository;
+  private savedObjectsRepository?: ISavedObjectsRepository;
 
   public setup(core: CoreSetup, plugins: { usageCollection?: UsageCollectionSetup }) {
-    registerMyPluginUsageCollector(() => this.savedObjectsClient, plugins.usageCollection);
+    registerMyPluginUsageCollector(() => this.savedObjectsRepository, plugins.usageCollection);
   }
 
   public start(core: CoreStart) {
-    this.savedObjectsClient = core.savedObjects.client
+    this.savedObjectsRepository = core.savedObjects.createInternalRepository();
   }
 }
 ```
@@ -101,7 +101,7 @@ import { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
 import { ISavedObjectsRepository } from 'kibana/server';
 
 export function registerMyPluginUsageCollector(
-  getSavedObjectsClient: () => ISavedObjectsRepository | undefined,
+  getSavedObjectsRepository: () => ISavedObjectsRepository | undefined,
   usageCollection?: UsageCollectionSetup
   ): void {
   // usageCollection is an optional dependency, so make sure to return if it is not registered.
@@ -112,9 +112,9 @@ export function registerMyPluginUsageCollector(
   // create usage collector
   const myCollector = usageCollection.makeUsageCollector({
     type: MY_USAGE_TYPE,
-    isReady: () => typeof getSavedObjectsClient() !== 'undefined',
+    isReady: () => typeof getSavedObjectsRepository() !== 'undefined',
     fetch: async () => {
-      const savedObjectsClient = getSavedObjectsClient()!;
+      const savedObjectsRepository = getSavedObjectsRepository()!;
       // get something from the savedObjects
 
       return { my_objects };

From 18793dbc6cd922184390e9ef507c1366e26d5e6e Mon Sep 17 00:00:00 2001
From: Gidi Meir Morris <github@gidi.io>
Date: Tue, 24 Mar 2020 19:15:27 +0000
Subject: [PATCH 094/179] [Alerting] notifies user when security is enabled but
 TLS is not (#60270)

This PR:
1. Adds a callout on the Alerting UI when security is enabled but TLS is not
2. Cleans up displayed error message when creation fails due to TLS being switched off
---
 .../alerting_example/public/application.tsx   |   5 +-
 .../public/components/create_alert.tsx        |   2 +
 .../apm/public/new-platform/plugin.tsx        |   1 +
 .../alerts/uptime_alerts_context_provider.tsx |   2 +
 x-pack/plugins/alerting/common/index.ts       |   9 +
 x-pack/plugins/alerting/server/plugin.ts      |   2 +
 .../server/routes/_mock_handler_arguments.ts  |   3 +-
 .../plugins/alerting/server/routes/create.ts  |  35 ++--
 .../plugins/alerting/server/routes/enable.ts  |  31 ++--
 .../alerting/server/routes/health.test.ts     | 171 ++++++++++++++++++
 .../plugins/alerting/server/routes/health.ts  |  67 +++++++
 .../plugins/alerting/server/routes/index.ts   |   1 +
 .../server/routes/lib/error_handler.ts        |  47 +++++
 .../plugins/alerting/server/routes/update.ts  |  41 +++--
 .../alerting/server/routes/update_api_key.ts  |  31 ++--
 .../alerting/metrics/alert_flyout.tsx         |   1 +
 x-pack/plugins/triggers_actions_ui/README.md  |   5 +
 .../alert_action_security_call_out.test.tsx   |  78 ++++++++
 .../alert_action_security_call_out.tsx        |  78 ++++++++
 .../components/security_call_out.test.tsx     |  72 ++++++++
 .../components/security_call_out.tsx          |  75 ++++++++
 .../application/context/alerts_context.tsx    |   3 +-
 .../public/application/home.tsx               |   4 +-
 .../public/application/lib/alert_api.test.ts  |  15 ++
 .../public/application/lib/alert_api.ts       |   6 +-
 .../sections/alert_form/alert_add.test.tsx    |  46 +++--
 .../sections/alert_form/alert_add.tsx         |  12 ++
 .../sections/alert_form/alert_edit.test.tsx   |  44 +++--
 .../sections/alert_form/alert_edit.tsx        |  12 ++
 .../sections/alert_form/alert_form.test.tsx   |   3 +
 .../alerts_list/components/alerts_list.tsx    |   2 +
 .../with_bulk_alert_api_operations.tsx        |   5 +-
 .../triggers_actions_ui/public/types.ts       |   3 +-
 33 files changed, 809 insertions(+), 103 deletions(-)
 create mode 100644 x-pack/plugins/alerting/server/routes/health.test.ts
 create mode 100644 x-pack/plugins/alerting/server/routes/health.ts
 create mode 100644 x-pack/plugins/alerting/server/routes/lib/error_handler.ts
 create mode 100644 x-pack/plugins/triggers_actions_ui/public/application/components/alert_action_security_call_out.test.tsx
 create mode 100644 x-pack/plugins/triggers_actions_ui/public/application/components/alert_action_security_call_out.tsx
 create mode 100644 x-pack/plugins/triggers_actions_ui/public/application/components/security_call_out.test.tsx
 create mode 100644 x-pack/plugins/triggers_actions_ui/public/application/components/security_call_out.tsx

diff --git a/examples/alerting_example/public/application.tsx b/examples/alerting_example/public/application.tsx
index d71db92d3d421..6ff5a7d0880b8 100644
--- a/examples/alerting_example/public/application.tsx
+++ b/examples/alerting_example/public/application.tsx
@@ -25,6 +25,7 @@ import {
   AppMountParameters,
   CoreStart,
   IUiSettingsClient,
+  DocLinksStart,
   ToastsSetup,
 } from '../../../src/core/public';
 import { DataPublicPluginStart } from '../../../src/plugins/data/public';
@@ -45,6 +46,7 @@ export interface AlertingExampleComponentParams {
   data: DataPublicPluginStart;
   charts: ChartsPluginStart;
   uiSettings: IUiSettingsClient;
+  docLinks: DocLinksStart;
   toastNotifications: ToastsSetup;
 }
 
@@ -88,7 +90,7 @@ const AlertingExampleApp = (deps: AlertingExampleComponentParams) => {
 };
 
 export const renderApp = (
-  { application, notifications, http, uiSettings }: CoreStart,
+  { application, notifications, http, uiSettings, docLinks }: CoreStart,
   deps: AlertingExamplePublicStartDeps,
   { appBasePath, element }: AppMountParameters
 ) => {
@@ -99,6 +101,7 @@ export const renderApp = (
       toastNotifications={notifications.toasts}
       http={http}
       uiSettings={uiSettings}
+      docLinks={docLinks}
       {...deps}
     />,
     element
diff --git a/examples/alerting_example/public/components/create_alert.tsx b/examples/alerting_example/public/components/create_alert.tsx
index 65b8a9412dcda..0541e0b18a2e1 100644
--- a/examples/alerting_example/public/components/create_alert.tsx
+++ b/examples/alerting_example/public/components/create_alert.tsx
@@ -33,6 +33,7 @@ export const CreateAlert = ({
   triggers_actions_ui,
   charts,
   uiSettings,
+  docLinks,
   data,
   toastNotifications,
 }: AlertingExampleComponentParams) => {
@@ -56,6 +57,7 @@ export const CreateAlert = ({
             alertTypeRegistry: triggers_actions_ui.alertTypeRegistry,
             toastNotifications,
             uiSettings,
+            docLinks,
             charts,
             dataFieldsFormats: data.fieldFormats,
           }}
diff --git a/x-pack/legacy/plugins/apm/public/new-platform/plugin.tsx b/x-pack/legacy/plugins/apm/public/new-platform/plugin.tsx
index f95767492d85b..e30bed1810c1d 100644
--- a/x-pack/legacy/plugins/apm/public/new-platform/plugin.tsx
+++ b/x-pack/legacy/plugins/apm/public/new-platform/plugin.tsx
@@ -173,6 +173,7 @@ export class ApmPlugin
         <AlertsContextProvider
           value={{
             http: core.http,
+            docLinks: core.docLinks,
             toastNotifications: core.notifications.toasts,
             actionTypeRegistry: plugins.triggers_actions_ui.actionTypeRegistry,
             alertTypeRegistry: plugins.triggers_actions_ui.alertTypeRegistry
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/alerts/uptime_alerts_context_provider.tsx b/x-pack/legacy/plugins/uptime/public/components/functional/alerts/uptime_alerts_context_provider.tsx
index a174a7d9c0ea4..09e6dc72b7f98 100644
--- a/x-pack/legacy/plugins/uptime/public/components/functional/alerts/uptime_alerts_context_provider.tsx
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/alerts/uptime_alerts_context_provider.tsx
@@ -17,6 +17,7 @@ export const UptimeAlertsContextProvider: React.FC = ({ children }) => {
       notifications,
       triggers_actions_ui: { actionTypeRegistry, alertTypeRegistry },
       uiSettings,
+      docLinks,
     },
   } = useKibana();
 
@@ -26,6 +27,7 @@ export const UptimeAlertsContextProvider: React.FC = ({ children }) => {
         actionTypeRegistry,
         alertTypeRegistry,
         charts,
+        docLinks,
         dataFieldsFormats: fieldFormats,
         http,
         toastNotifications: notifications?.toasts,
diff --git a/x-pack/plugins/alerting/common/index.ts b/x-pack/plugins/alerting/common/index.ts
index b705a334bc2b5..9d4ea69a63609 100644
--- a/x-pack/plugins/alerting/common/index.ts
+++ b/x-pack/plugins/alerting/common/index.ts
@@ -10,4 +10,13 @@ export * from './alert_instance';
 export * from './alert_task_instance';
 export * from './alert_navigation';
 
+export interface ActionGroup {
+  id: string;
+  name: string;
+}
+
+export interface AlertingFrameworkHealth {
+  isSufficientlySecure: boolean;
+}
+
 export const BASE_ALERT_API_PATH = '/api/alert';
diff --git a/x-pack/plugins/alerting/server/plugin.ts b/x-pack/plugins/alerting/server/plugin.ts
index 58807b42dc278..e88124322c1eb 100644
--- a/x-pack/plugins/alerting/server/plugin.ts
+++ b/x-pack/plugins/alerting/server/plugin.ts
@@ -46,6 +46,7 @@ import {
   unmuteAllAlertRoute,
   muteAlertInstanceRoute,
   unmuteAlertInstanceRoute,
+  healthRoute,
 } from './routes';
 import { LicensingPluginSetup } from '../../licensing/server';
 import {
@@ -173,6 +174,7 @@ export class AlertingPlugin {
     unmuteAllAlertRoute(router, this.licenseState);
     muteAlertInstanceRoute(router, this.licenseState);
     unmuteAlertInstanceRoute(router, this.licenseState);
+    healthRoute(router, this.licenseState);
 
     return {
       registerType: alertTypeRegistry.register.bind(alertTypeRegistry),
diff --git a/x-pack/plugins/alerting/server/routes/_mock_handler_arguments.ts b/x-pack/plugins/alerting/server/routes/_mock_handler_arguments.ts
index 9815ad5194af7..5a1d680eb06f3 100644
--- a/x-pack/plugins/alerting/server/routes/_mock_handler_arguments.ts
+++ b/x-pack/plugins/alerting/server/routes/_mock_handler_arguments.ts
@@ -10,13 +10,14 @@ import { httpServerMock } from '../../../../../src/core/server/mocks';
 import { alertsClientMock } from '../alerts_client.mock';
 
 export function mockHandlerArguments(
-  { alertsClient, listTypes: listTypesRes = [] }: any,
+  { alertsClient, listTypes: listTypesRes = [], elasticsearch }: any,
   req: any,
   res?: Array<MethodKeysOf<KibanaResponseFactory>>
 ): [RequestHandlerContext, KibanaRequest<any, any, any, any>, KibanaResponseFactory] {
   const listTypes = jest.fn(() => listTypesRes);
   return [
     ({
+      core: { elasticsearch },
       alerting: {
         listTypes,
         getAlertsClient() {
diff --git a/x-pack/plugins/alerting/server/routes/create.ts b/x-pack/plugins/alerting/server/routes/create.ts
index 7e17a66e84547..f08460ffcb453 100644
--- a/x-pack/plugins/alerting/server/routes/create.ts
+++ b/x-pack/plugins/alerting/server/routes/create.ts
@@ -15,6 +15,7 @@ import {
 import { LicenseState } from '../lib/license_state';
 import { verifyApiAccess } from '../lib/license_api_access';
 import { validateDurationSchema } from '../lib';
+import { handleDisabledApiKeysError } from './lib/error_handler';
 import { Alert, BASE_ALERT_API_PATH } from '../types';
 
 export const bodySchema = schema.object({
@@ -50,22 +51,24 @@ export const createAlertRoute = (router: IRouter, licenseState: LicenseState) =>
         tags: ['access:alerting-all'],
       },
     },
-    router.handleLegacyErrors(async function(
-      context: RequestHandlerContext,
-      req: KibanaRequest<any, any, TypeOf<typeof bodySchema>, any>,
-      res: KibanaResponseFactory
-    ): Promise<IKibanaResponse<any>> {
-      verifyApiAccess(licenseState);
+    handleDisabledApiKeysError(
+      router.handleLegacyErrors(async function(
+        context: RequestHandlerContext,
+        req: KibanaRequest<any, any, TypeOf<typeof bodySchema>, any>,
+        res: KibanaResponseFactory
+      ): Promise<IKibanaResponse<any>> {
+        verifyApiAccess(licenseState);
 
-      if (!context.alerting) {
-        return res.badRequest({ body: 'RouteHandlerContext is not registered for alerting' });
-      }
-      const alertsClient = context.alerting.getAlertsClient();
-      const alert = req.body;
-      const alertRes: Alert = await alertsClient.create({ data: alert });
-      return res.ok({
-        body: alertRes,
-      });
-    })
+        if (!context.alerting) {
+          return res.badRequest({ body: 'RouteHandlerContext is not registered for alerting' });
+        }
+        const alertsClient = context.alerting.getAlertsClient();
+        const alert = req.body;
+        const alertRes: Alert = await alertsClient.create({ data: alert });
+        return res.ok({
+          body: alertRes,
+        });
+      })
+    )
   );
 };
diff --git a/x-pack/plugins/alerting/server/routes/enable.ts b/x-pack/plugins/alerting/server/routes/enable.ts
index 9fb837e5074e8..2283ae4a4c765 100644
--- a/x-pack/plugins/alerting/server/routes/enable.ts
+++ b/x-pack/plugins/alerting/server/routes/enable.ts
@@ -15,6 +15,7 @@ import {
 import { LicenseState } from '../lib/license_state';
 import { verifyApiAccess } from '../lib/license_api_access';
 import { BASE_ALERT_API_PATH } from '../../common';
+import { handleDisabledApiKeysError } from './lib/error_handler';
 
 const paramSchema = schema.object({
   id: schema.string(),
@@ -31,19 +32,21 @@ export const enableAlertRoute = (router: IRouter, licenseState: LicenseState) =>
         tags: ['access:alerting-all'],
       },
     },
-    router.handleLegacyErrors(async function(
-      context: RequestHandlerContext,
-      req: KibanaRequest<TypeOf<typeof paramSchema>, any, any, any>,
-      res: KibanaResponseFactory
-    ): Promise<IKibanaResponse<any>> {
-      verifyApiAccess(licenseState);
-      if (!context.alerting) {
-        return res.badRequest({ body: 'RouteHandlerContext is not registered for alerting' });
-      }
-      const alertsClient = context.alerting.getAlertsClient();
-      const { id } = req.params;
-      await alertsClient.enable({ id });
-      return res.noContent();
-    })
+    handleDisabledApiKeysError(
+      router.handleLegacyErrors(async function(
+        context: RequestHandlerContext,
+        req: KibanaRequest<TypeOf<typeof paramSchema>, any, any, any>,
+        res: KibanaResponseFactory
+      ): Promise<IKibanaResponse<any>> {
+        verifyApiAccess(licenseState);
+        if (!context.alerting) {
+          return res.badRequest({ body: 'RouteHandlerContext is not registered for alerting' });
+        }
+        const alertsClient = context.alerting.getAlertsClient();
+        const { id } = req.params;
+        await alertsClient.enable({ id });
+        return res.noContent();
+      })
+    )
   );
 };
diff --git a/x-pack/plugins/alerting/server/routes/health.test.ts b/x-pack/plugins/alerting/server/routes/health.test.ts
new file mode 100644
index 0000000000000..9efe020bc10c4
--- /dev/null
+++ b/x-pack/plugins/alerting/server/routes/health.test.ts
@@ -0,0 +1,171 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { healthRoute } from './health';
+import { mockRouter, RouterMock } from '../../../../../src/core/server/http/router/router.mock';
+import { mockHandlerArguments } from './_mock_handler_arguments';
+import { elasticsearchServiceMock } from '../../../../../src/core/server/mocks';
+import { verifyApiAccess } from '../lib/license_api_access';
+import { mockLicenseState } from '../lib/license_state.mock';
+
+jest.mock('../lib/license_api_access.ts', () => ({
+  verifyApiAccess: jest.fn(),
+}));
+
+beforeEach(() => {
+  jest.resetAllMocks();
+});
+
+describe('healthRoute', () => {
+  it('registers the route', async () => {
+    const router: RouterMock = mockRouter.create();
+
+    const licenseState = mockLicenseState();
+    healthRoute(router, licenseState);
+
+    const [config] = router.get.mock.calls[0];
+
+    expect(config.path).toMatchInlineSnapshot(`"/api/alert/_health"`);
+  });
+
+  it('queries the usage api', async () => {
+    const router: RouterMock = mockRouter.create();
+
+    const licenseState = mockLicenseState();
+    healthRoute(router, licenseState);
+    const [, handler] = router.get.mock.calls[0];
+
+    const elasticsearch = elasticsearchServiceMock.createSetup();
+    elasticsearch.adminClient.callAsInternalUser.mockReturnValue(Promise.resolve({}));
+
+    const [context, req, res] = mockHandlerArguments({ elasticsearch }, {}, ['ok']);
+
+    await handler(context, req, res);
+
+    expect(verifyApiAccess).toHaveBeenCalledWith(licenseState);
+
+    expect(elasticsearch.adminClient.callAsInternalUser.mock.calls[0]).toMatchInlineSnapshot(`
+      Array [
+        "transport.request",
+        Object {
+          "method": "GET",
+          "path": "/_xpack/usage",
+        },
+      ]
+    `);
+  });
+
+  it('evaluates missing security info from the usage api to mean that the security plugin is disbled', async () => {
+    const router: RouterMock = mockRouter.create();
+
+    const licenseState = mockLicenseState();
+    healthRoute(router, licenseState);
+    const [, handler] = router.get.mock.calls[0];
+
+    const elasticsearch = elasticsearchServiceMock.createSetup();
+    elasticsearch.adminClient.callAsInternalUser.mockReturnValue(Promise.resolve({}));
+
+    const [context, req, res] = mockHandlerArguments({ elasticsearch }, {}, ['ok']);
+
+    expect(await handler(context, req, res)).toMatchInlineSnapshot(`
+      Object {
+        "body": Object {
+          "isSufficientlySecure": true,
+        },
+      }
+    `);
+  });
+
+  it('evaluates missing security http info from the usage api to mean that the security plugin is disbled', async () => {
+    const router: RouterMock = mockRouter.create();
+
+    const licenseState = mockLicenseState();
+    healthRoute(router, licenseState);
+    const [, handler] = router.get.mock.calls[0];
+
+    const elasticsearch = elasticsearchServiceMock.createSetup();
+    elasticsearch.adminClient.callAsInternalUser.mockReturnValue(Promise.resolve({ security: {} }));
+
+    const [context, req, res] = mockHandlerArguments({ elasticsearch }, {}, ['ok']);
+
+    expect(await handler(context, req, res)).toMatchInlineSnapshot(`
+      Object {
+        "body": Object {
+          "isSufficientlySecure": true,
+        },
+      }
+    `);
+  });
+
+  it('evaluates security enabled, and missing ssl info from the usage api to mean that the user cannot generate keys', async () => {
+    const router: RouterMock = mockRouter.create();
+
+    const licenseState = mockLicenseState();
+    healthRoute(router, licenseState);
+    const [, handler] = router.get.mock.calls[0];
+
+    const elasticsearch = elasticsearchServiceMock.createSetup();
+    elasticsearch.adminClient.callAsInternalUser.mockReturnValue(
+      Promise.resolve({ security: { enabled: true } })
+    );
+
+    const [context, req, res] = mockHandlerArguments({ elasticsearch }, {}, ['ok']);
+
+    expect(await handler(context, req, res)).toMatchInlineSnapshot(`
+      Object {
+        "body": Object {
+          "isSufficientlySecure": false,
+        },
+      }
+    `);
+  });
+
+  it('evaluates security enabled, SSL info present but missing http info from the usage api to mean that the user cannot generate keys', async () => {
+    const router: RouterMock = mockRouter.create();
+
+    const licenseState = mockLicenseState();
+    healthRoute(router, licenseState);
+    const [, handler] = router.get.mock.calls[0];
+
+    const elasticsearch = elasticsearchServiceMock.createSetup();
+    elasticsearch.adminClient.callAsInternalUser.mockReturnValue(
+      Promise.resolve({ security: { enabled: true, ssl: {} } })
+    );
+
+    const [context, req, res] = mockHandlerArguments({ elasticsearch }, {}, ['ok']);
+
+    expect(await handler(context, req, res)).toMatchInlineSnapshot(`
+      Object {
+        "body": Object {
+          "isSufficientlySecure": false,
+        },
+      }
+    `);
+  });
+
+  it('evaluates security and tls enabled to mean that the user can generate keys', async () => {
+    const router: RouterMock = mockRouter.create();
+
+    const licenseState = mockLicenseState();
+    healthRoute(router, licenseState);
+    const [, handler] = router.get.mock.calls[0];
+
+    const elasticsearch = elasticsearchServiceMock.createSetup();
+    elasticsearch.adminClient.callAsInternalUser.mockReturnValue(
+      Promise.resolve({ security: { enabled: true, ssl: { http: { enabled: true } } } })
+    );
+
+    const [context, req, res] = mockHandlerArguments({ elasticsearch }, {}, ['ok']);
+
+    expect(await handler(context, req, res)).toMatchInlineSnapshot(`
+      Object {
+        "body": Object {
+          "isSufficientlySecure": true,
+        },
+      }
+    `);
+  });
+});
diff --git a/x-pack/plugins/alerting/server/routes/health.ts b/x-pack/plugins/alerting/server/routes/health.ts
new file mode 100644
index 0000000000000..29c2f3c5730f4
--- /dev/null
+++ b/x-pack/plugins/alerting/server/routes/health.ts
@@ -0,0 +1,67 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import {
+  IRouter,
+  RequestHandlerContext,
+  KibanaRequest,
+  IKibanaResponse,
+  KibanaResponseFactory,
+} from 'kibana/server';
+import { LicenseState } from '../lib/license_state';
+import { verifyApiAccess } from '../lib/license_api_access';
+import { AlertingFrameworkHealth } from '../types';
+
+interface XPackUsageSecurity {
+  security?: {
+    enabled?: boolean;
+    ssl?: {
+      http?: {
+        enabled?: boolean;
+      };
+    };
+  };
+}
+
+export function healthRoute(router: IRouter, licenseState: LicenseState) {
+  router.get(
+    {
+      path: '/api/alert/_health',
+      validate: false,
+    },
+    router.handleLegacyErrors(async function(
+      context: RequestHandlerContext,
+      req: KibanaRequest<any, any, any, any>,
+      res: KibanaResponseFactory
+    ): Promise<IKibanaResponse<any>> {
+      verifyApiAccess(licenseState);
+      try {
+        const {
+          security: {
+            enabled: isSecurityEnabled = false,
+            ssl: { http: { enabled: isTLSEnabled = false } = {} } = {},
+          } = {},
+        }: XPackUsageSecurity = await context.core.elasticsearch.adminClient
+          // `transport.request` is potentially unsafe when combined with untrusted user input.
+          // Do not augment with such input.
+          .callAsInternalUser('transport.request', {
+            method: 'GET',
+            path: '/_xpack/usage',
+          });
+
+        const frameworkHealth: AlertingFrameworkHealth = {
+          isSufficientlySecure: !isSecurityEnabled || (isSecurityEnabled && isTLSEnabled),
+        };
+
+        return res.ok({
+          body: frameworkHealth,
+        });
+      } catch (error) {
+        return res.badRequest({ body: error });
+      }
+    })
+  );
+}
diff --git a/x-pack/plugins/alerting/server/routes/index.ts b/x-pack/plugins/alerting/server/routes/index.ts
index 7ec901ae685c4..f833a29c67bb9 100644
--- a/x-pack/plugins/alerting/server/routes/index.ts
+++ b/x-pack/plugins/alerting/server/routes/index.ts
@@ -18,3 +18,4 @@ export { muteAlertInstanceRoute } from './mute_instance';
 export { unmuteAlertInstanceRoute } from './unmute_instance';
 export { muteAllAlertRoute } from './mute_all';
 export { unmuteAllAlertRoute } from './unmute_all';
+export { healthRoute } from './health';
diff --git a/x-pack/plugins/alerting/server/routes/lib/error_handler.ts b/x-pack/plugins/alerting/server/routes/lib/error_handler.ts
new file mode 100644
index 0000000000000..b3cf48c52fe17
--- /dev/null
+++ b/x-pack/plugins/alerting/server/routes/lib/error_handler.ts
@@ -0,0 +1,47 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { i18n } from '@kbn/i18n';
+import {
+  RequestHandler,
+  KibanaRequest,
+  KibanaResponseFactory,
+  RequestHandlerContext,
+  RouteMethod,
+} from 'kibana/server';
+
+export function handleDisabledApiKeysError<P, Q, B>(
+  handler: RequestHandler<P, Q, B>
+): RequestHandler<P, Q, B> {
+  return async (
+    context: RequestHandlerContext,
+    request: KibanaRequest<P, Q, B, RouteMethod>,
+    response: KibanaResponseFactory
+  ) => {
+    try {
+      return await handler(context, request, response);
+    } catch (e) {
+      if (isApiKeyDisabledError(e)) {
+        return response.badRequest({
+          body: new Error(
+            i18n.translate('xpack.alerting.api.error.disabledApiKeys', {
+              defaultMessage: 'Alerting relies upon API keys which appear to be disabled',
+            })
+          ),
+        });
+      }
+      throw e;
+    }
+  };
+}
+
+export function isApiKeyDisabledError(e: Error) {
+  return e?.message?.includes('api keys are not enabled') ?? false;
+}
+
+export function isSecurityPluginDisabledError(e: Error) {
+  return e?.message?.includes('no handler found') ?? false;
+}
diff --git a/x-pack/plugins/alerting/server/routes/update.ts b/x-pack/plugins/alerting/server/routes/update.ts
index 26a8320fffebb..45f7b26b521d4 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 { handleDisabledApiKeysError } from './lib/error_handler';
 import { BASE_ALERT_API_PATH } from '../../common';
 
 const paramSchema = schema.object({
@@ -52,24 +53,26 @@ export const updateAlertRoute = (router: IRouter, licenseState: LicenseState) =>
         tags: ['access:alerting-all'],
       },
     },
-    router.handleLegacyErrors(async function(
-      context: RequestHandlerContext,
-      req: KibanaRequest<TypeOf<typeof paramSchema>, any, TypeOf<typeof bodySchema>, any>,
-      res: KibanaResponseFactory
-    ): Promise<IKibanaResponse<any>> {
-      verifyApiAccess(licenseState);
-      if (!context.alerting) {
-        return res.badRequest({ body: 'RouteHandlerContext is not registered for alerting' });
-      }
-      const alertsClient = context.alerting.getAlertsClient();
-      const { id } = req.params;
-      const { name, actions, params, schedule, tags, throttle } = req.body;
-      return res.ok({
-        body: await alertsClient.update({
-          id,
-          data: { name, actions, params, schedule, tags, throttle },
-        }),
-      });
-    })
+    handleDisabledApiKeysError(
+      router.handleLegacyErrors(async function(
+        context: RequestHandlerContext,
+        req: KibanaRequest<TypeOf<typeof paramSchema>, any, TypeOf<typeof bodySchema>, any>,
+        res: KibanaResponseFactory
+      ): Promise<IKibanaResponse<any>> {
+        verifyApiAccess(licenseState);
+        if (!context.alerting) {
+          return res.badRequest({ body: 'RouteHandlerContext is not registered for alerting' });
+        }
+        const alertsClient = context.alerting.getAlertsClient();
+        const { id } = req.params;
+        const { name, actions, params, schedule, tags, throttle } = req.body;
+        return res.ok({
+          body: await alertsClient.update({
+            id,
+            data: { name, actions, params, schedule, tags, throttle },
+          }),
+        });
+      })
+    )
   );
 };
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 62c1b1510ddac..f70d30f0bb5da 100644
--- a/x-pack/plugins/alerting/server/routes/update_api_key.ts
+++ b/x-pack/plugins/alerting/server/routes/update_api_key.ts
@@ -15,6 +15,7 @@ import {
 import { LicenseState } from '../lib/license_state';
 import { verifyApiAccess } from '../lib/license_api_access';
 import { BASE_ALERT_API_PATH } from '../../common';
+import { handleDisabledApiKeysError } from './lib/error_handler';
 
 const paramSchema = schema.object({
   id: schema.string(),
@@ -31,19 +32,21 @@ export const updateApiKeyRoute = (router: IRouter, licenseState: LicenseState) =
         tags: ['access:alerting-all'],
       },
     },
-    router.handleLegacyErrors(async function(
-      context: RequestHandlerContext,
-      req: KibanaRequest<TypeOf<typeof paramSchema>, any, any, any>,
-      res: KibanaResponseFactory
-    ): Promise<IKibanaResponse<any>> {
-      verifyApiAccess(licenseState);
-      if (!context.alerting) {
-        return res.badRequest({ body: 'RouteHandlerContext is not registered for alerting' });
-      }
-      const alertsClient = context.alerting.getAlertsClient();
-      const { id } = req.params;
-      await alertsClient.updateApiKey({ id });
-      return res.noContent();
-    })
+    handleDisabledApiKeysError(
+      router.handleLegacyErrors(async function(
+        context: RequestHandlerContext,
+        req: KibanaRequest<TypeOf<typeof paramSchema>, any, any, any>,
+        res: KibanaResponseFactory
+      ): Promise<IKibanaResponse<any>> {
+        verifyApiAccess(licenseState);
+        if (!context.alerting) {
+          return res.badRequest({ body: 'RouteHandlerContext is not registered for alerting' });
+        }
+        const alertsClient = context.alerting.getAlertsClient();
+        const { id } = req.params;
+        await alertsClient.updateApiKey({ id });
+        return res.noContent();
+      })
+    )
   );
 };
diff --git a/x-pack/plugins/infra/public/components/alerting/metrics/alert_flyout.tsx b/x-pack/plugins/infra/public/components/alerting/metrics/alert_flyout.tsx
index a00d63af8aac2..914054e1fd9b7 100644
--- a/x-pack/plugins/infra/public/components/alerting/metrics/alert_flyout.tsx
+++ b/x-pack/plugins/infra/public/components/alerting/metrics/alert_flyout.tsx
@@ -35,6 +35,7 @@ export const AlertFlyout = (props: Props) => {
             },
             toastNotifications: services.notifications?.toasts,
             http: services.http,
+            docLinks: services.docLinks,
             actionTypeRegistry: triggersActionsUI.actionTypeRegistry,
             alertTypeRegistry: triggersActionsUI.alertTypeRegistry,
           }}
diff --git a/x-pack/plugins/triggers_actions_ui/README.md b/x-pack/plugins/triggers_actions_ui/README.md
index e6af63ecd4359..3b6ca4f9da7cc 100644
--- a/x-pack/plugins/triggers_actions_ui/README.md
+++ b/x-pack/plugins/triggers_actions_ui/README.md
@@ -660,6 +660,7 @@ const [alertFlyoutVisible, setAlertFlyoutVisibility] = useState<boolean>(false);
     alertTypeRegistry: triggers_actions_ui.alertTypeRegistry,
     toastNotifications: toasts,
     uiSettings,
+    docLinks,
     charts,
     dataFieldsFormats,
     metadata: { test: 'some value', fields: ['test'] },
@@ -697,6 +698,7 @@ export interface AlertsContextValue<MetaData = Record<string, any>> {
   alertTypeRegistry: TypeRegistry<AlertTypeModel>;
   actionTypeRegistry: TypeRegistry<ActionTypeModel>;
   uiSettings?: IUiSettingsClient;
+  docLinks: DocLinksStart;
   toastNotifications: Pick<
     ToastsApi,
     'get$' | 'add' | 'remove' | 'addSuccess' | 'addWarning' | 'addDanger' | 'addError'
@@ -714,6 +716,7 @@ export interface AlertsContextValue<MetaData = Record<string, any>> {
 |alertTypeRegistry|Registry for alert types.|
 |actionTypeRegistry|Registry for action types.|
 |uiSettings|Optional property, which is needed to display visualization of alert type expression. Will be changed after visualization refactoring.|
+|docLinks|Documentation Links, needed to link to the documentation from informational callouts.|
 |toastNotifications|Toast messages.|
 |charts|Optional property, which is needed to display visualization of alert type expression. Will be changed after visualization refactoring.|
 |dataFieldsFormats|Optional property, which is needed to display visualization of alert type expression. Will be changed after visualization refactoring.|
@@ -1322,6 +1325,7 @@ export interface AlertsContextValue {
   alertTypeRegistry: TypeRegistry<AlertTypeModel>;
   actionTypeRegistry: TypeRegistry<ActionTypeModel>;
   uiSettings?: IUiSettingsClient;
+  docLinks: DocLinksStart;
   toastNotifications: Pick<
     ToastsApi,
     'get$' | 'add' | 'remove' | 'addSuccess' | 'addWarning' | 'addDanger' | 'addError'
@@ -1338,6 +1342,7 @@ export interface AlertsContextValue {
 |alertTypeRegistry|Registry for alert types.|
 |actionTypeRegistry|Registry for action types.|
 |uiSettings|Optional property, which is needed to display visualization of alert type expression. Will be changed after visualization refactoring.|
+|docLinks|Documentation Links, needed to link to the documentation from informational callouts.|
 |toastNotifications|Toast messages.|
 |charts|Optional property, which is needed to display visualization of alert type expression. Will be changed after visualization refactoring.|
 |dataFieldsFormats|Optional property, which is needed to display visualization of alert type expression. Will be changed after visualization refactoring.|
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/alert_action_security_call_out.test.tsx b/x-pack/plugins/triggers_actions_ui/public/application/components/alert_action_security_call_out.test.tsx
new file mode 100644
index 0000000000000..85699cfbd750f
--- /dev/null
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/alert_action_security_call_out.test.tsx
@@ -0,0 +1,78 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+import React, { Fragment } from 'react';
+import { shallow, ShallowWrapper } from 'enzyme';
+import { AlertActionSecurityCallOut } from './alert_action_security_call_out';
+
+import { EuiCallOut, EuiButton } from '@elastic/eui';
+import { act } from 'react-dom/test-utils';
+import { httpServiceMock } from '../../../../../../src/core/public/mocks';
+
+const docLinks = { ELASTIC_WEBSITE_URL: 'elastic.co/', DOC_LINK_VERSION: 'current' };
+
+const http = httpServiceMock.createStartContract();
+
+describe('alert action security call out', () => {
+  let useEffect: any;
+
+  const mockUseEffect = () => {
+    // make react execute useEffects despite shallow rendering
+    useEffect.mockImplementationOnce((f: Function) => f());
+  };
+
+  beforeEach(() => {
+    jest.resetAllMocks();
+    useEffect = jest.spyOn(React, 'useEffect');
+    mockUseEffect();
+  });
+
+  test('renders nothing while health is loading', async () => {
+    http.get.mockImplementationOnce(() => new Promise(() => {}));
+
+    let component: ShallowWrapper | undefined;
+    await act(async () => {
+      component = shallow(
+        <AlertActionSecurityCallOut action="created" http={http} docLinks={docLinks} />
+      );
+    });
+
+    expect(component?.is(Fragment)).toBeTruthy();
+    expect(component?.html()).toBe('');
+  });
+
+  test('renders nothing if keys are enabled', async () => {
+    http.get.mockResolvedValue({ isSufficientlySecure: true });
+
+    let component: ShallowWrapper | undefined;
+    await act(async () => {
+      component = shallow(
+        <AlertActionSecurityCallOut action="created" http={http} docLinks={docLinks} />
+      );
+    });
+
+    expect(component?.is(Fragment)).toBeTruthy();
+    expect(component?.html()).toBe('');
+  });
+
+  test('renders the callout if keys are disabled', async () => {
+    http.get.mockResolvedValue({ isSufficientlySecure: false });
+
+    let component: ShallowWrapper | undefined;
+    await act(async () => {
+      component = shallow(
+        <AlertActionSecurityCallOut action="creation" http={http} docLinks={docLinks} />
+      );
+    });
+
+    expect(component?.find(EuiCallOut).prop('title')).toMatchInlineSnapshot(
+      `"Alert creation requires TLS between Elasticsearch and Kibana."`
+    );
+
+    expect(component?.find(EuiButton).prop('href')).toMatchInlineSnapshot(
+      `"elastic.co/guide/en/kibana/current/configuring-tls.html"`
+    );
+  });
+});
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/alert_action_security_call_out.tsx b/x-pack/plugins/triggers_actions_ui/public/application/components/alert_action_security_call_out.tsx
new file mode 100644
index 0000000000000..f7a80202dff89
--- /dev/null
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/alert_action_security_call_out.tsx
@@ -0,0 +1,78 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React, { Fragment } from 'react';
+import { Option, none, some, fold, filter } from 'fp-ts/lib/Option';
+import { pipe } from 'fp-ts/lib/pipeable';
+
+import { EuiCallOut, EuiButton, EuiSpacer } from '@elastic/eui';
+import { i18n } from '@kbn/i18n';
+import { FormattedMessage } from '@kbn/i18n/react';
+
+import { DocLinksStart, HttpSetup } from 'kibana/public';
+import { AlertingFrameworkHealth } from '../../types';
+import { health } from '../lib/alert_api';
+
+interface Props {
+  docLinks: Pick<DocLinksStart, 'ELASTIC_WEBSITE_URL' | 'DOC_LINK_VERSION'>;
+  action: string;
+  http: HttpSetup;
+}
+
+export const AlertActionSecurityCallOut: React.FunctionComponent<Props> = ({
+  http,
+  action,
+  docLinks,
+}) => {
+  const { ELASTIC_WEBSITE_URL, DOC_LINK_VERSION } = docLinks;
+
+  const [alertingHealth, setAlertingHealth] = React.useState<Option<AlertingFrameworkHealth>>(none);
+
+  React.useEffect(() => {
+    async function fetchSecurityConfigured() {
+      setAlertingHealth(some(await health({ http })));
+    }
+
+    fetchSecurityConfigured();
+  }, [http]);
+
+  return pipe(
+    alertingHealth,
+    filter(healthCheck => !healthCheck.isSufficientlySecure),
+    fold(
+      () => <Fragment />,
+      () => (
+        <Fragment>
+          <EuiCallOut
+            title={i18n.translate(
+              'xpack.triggersActionsUI.components.alertActionSecurityCallOut.tlsDisabledTitle',
+              {
+                defaultMessage: 'Alert {action} requires TLS between Elasticsearch and Kibana.',
+                values: {
+                  action,
+                },
+              }
+            )}
+            color="warning"
+            size="s"
+            iconType="iInCircle"
+          >
+            <EuiButton
+              color="warning"
+              href={`${ELASTIC_WEBSITE_URL}guide/en/kibana/${DOC_LINK_VERSION}/configuring-tls.html`}
+            >
+              <FormattedMessage
+                id="xpack.triggersActionsUI.components.alertActionSecurityCallOut.enableTlsCta"
+                defaultMessage="Enable TLS"
+              />
+            </EuiButton>
+          </EuiCallOut>
+          <EuiSpacer />
+        </Fragment>
+      )
+    )
+  );
+};
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/security_call_out.test.tsx b/x-pack/plugins/triggers_actions_ui/public/application/components/security_call_out.test.tsx
new file mode 100644
index 0000000000000..28bc02ec3392f
--- /dev/null
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/security_call_out.test.tsx
@@ -0,0 +1,72 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+import React, { Fragment } from 'react';
+import { shallow, ShallowWrapper } from 'enzyme';
+import { SecurityEnabledCallOut } from './security_call_out';
+
+import { EuiCallOut, EuiButton } from '@elastic/eui';
+import { act } from 'react-dom/test-utils';
+import { httpServiceMock } from '../../../../../../src/core/public/mocks';
+
+const docLinks = { ELASTIC_WEBSITE_URL: 'elastic.co/', DOC_LINK_VERSION: 'current' };
+
+const http = httpServiceMock.createStartContract();
+
+describe('security call out', () => {
+  let useEffect: any;
+
+  const mockUseEffect = () => {
+    // make react execute useEffects despite shallow rendering
+    useEffect.mockImplementationOnce((f: Function) => f());
+  };
+
+  beforeEach(() => {
+    jest.resetAllMocks();
+    useEffect = jest.spyOn(React, 'useEffect');
+    mockUseEffect();
+  });
+
+  test('renders nothing while health is loading', async () => {
+    http.get.mockImplementationOnce(() => new Promise(() => {}));
+
+    let component: ShallowWrapper | undefined;
+    await act(async () => {
+      component = shallow(<SecurityEnabledCallOut http={http} docLinks={docLinks} />);
+    });
+
+    expect(component?.is(Fragment)).toBeTruthy();
+    expect(component?.html()).toBe('');
+  });
+
+  test('renders nothing if keys are enabled', async () => {
+    http.get.mockResolvedValue({ isSufficientlySecure: true });
+
+    let component: ShallowWrapper | undefined;
+    await act(async () => {
+      component = shallow(<SecurityEnabledCallOut http={http} docLinks={docLinks} />);
+    });
+
+    expect(component?.is(Fragment)).toBeTruthy();
+    expect(component?.html()).toBe('');
+  });
+
+  test('renders the callout if keys are disabled', async () => {
+    http.get.mockImplementationOnce(async () => ({ isSufficientlySecure: false }));
+
+    let component: ShallowWrapper | undefined;
+    await act(async () => {
+      component = shallow(<SecurityEnabledCallOut http={http} docLinks={docLinks} />);
+    });
+
+    expect(component?.find(EuiCallOut).prop('title')).toMatchInlineSnapshot(
+      `"Enable Transport Layer Security"`
+    );
+
+    expect(component?.find(EuiButton).prop('href')).toMatchInlineSnapshot(
+      `"elastic.co/guide/en/kibana/current/configuring-tls.html"`
+    );
+  });
+});
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/security_call_out.tsx b/x-pack/plugins/triggers_actions_ui/public/application/components/security_call_out.tsx
new file mode 100644
index 0000000000000..9874a3a0697d2
--- /dev/null
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/security_call_out.tsx
@@ -0,0 +1,75 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React, { Fragment } from 'react';
+import { Option, none, some, fold, filter } from 'fp-ts/lib/Option';
+import { pipe } from 'fp-ts/lib/pipeable';
+
+import { EuiCallOut, EuiButton, EuiSpacer } from '@elastic/eui';
+import { i18n } from '@kbn/i18n';
+import { FormattedMessage } from '@kbn/i18n/react';
+
+import { DocLinksStart, HttpSetup } from 'kibana/public';
+
+import { AlertingFrameworkHealth } from '../../types';
+import { health } from '../lib/alert_api';
+
+interface Props {
+  docLinks: Pick<DocLinksStart, 'ELASTIC_WEBSITE_URL' | 'DOC_LINK_VERSION'>;
+  http: HttpSetup;
+}
+
+export const SecurityEnabledCallOut: React.FunctionComponent<Props> = ({ docLinks, http }) => {
+  const { ELASTIC_WEBSITE_URL, DOC_LINK_VERSION } = docLinks;
+
+  const [alertingHealth, setAlertingHealth] = React.useState<Option<AlertingFrameworkHealth>>(none);
+
+  React.useEffect(() => {
+    async function fetchSecurityConfigured() {
+      setAlertingHealth(some(await health({ http })));
+    }
+
+    fetchSecurityConfigured();
+  }, [http]);
+
+  return pipe(
+    alertingHealth,
+    filter(healthCheck => !healthCheck?.isSufficientlySecure),
+    fold(
+      () => <Fragment />,
+      () => (
+        <Fragment>
+          <EuiCallOut
+            title={i18n.translate(
+              'xpack.triggersActionsUI.components.securityCallOut.tlsDisabledTitle',
+              {
+                defaultMessage: 'Enable Transport Layer Security',
+              }
+            )}
+            color="primary"
+            iconType="iInCircle"
+          >
+            <p>
+              <FormattedMessage
+                id="xpack.triggersActionsUI.components.securityCallOut.tlsDisabledDescription"
+                defaultMessage="Alerting relies on API keys, which require TLS between Elasticsearch and Kibana."
+              />
+            </p>
+            <EuiButton
+              href={`${ELASTIC_WEBSITE_URL}guide/en/kibana/${DOC_LINK_VERSION}/configuring-tls.html`}
+            >
+              <FormattedMessage
+                id="xpack.triggersActionsUI.components.securityCallOut.enableTlsCta"
+                defaultMessage="Enable TLS"
+              />
+            </EuiButton>
+          </EuiCallOut>
+          <EuiSpacer />
+        </Fragment>
+      )
+    )
+  );
+};
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/context/alerts_context.tsx b/x-pack/plugins/triggers_actions_ui/public/application/context/alerts_context.tsx
index 1944cdeab7552..340370cc0314b 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/context/alerts_context.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/context/alerts_context.tsx
@@ -5,7 +5,7 @@
  */
 
 import React, { useContext, createContext } from 'react';
-import { HttpSetup, IUiSettingsClient, ToastsApi } from 'kibana/public';
+import { HttpSetup, IUiSettingsClient, ToastsApi, DocLinksStart } from 'kibana/public';
 import { ChartsPluginSetup } from 'src/plugins/charts/public';
 import { DataPublicPluginSetup } from 'src/plugins/data/public';
 import { TypeRegistry } from '../type_registry';
@@ -22,6 +22,7 @@ export interface AlertsContextValue<MetaData = Record<string, any>> {
   >;
   uiSettings?: IUiSettingsClient;
   charts?: ChartsPluginSetup;
+  docLinks: DocLinksStart;
   dataFieldsFormats?: DataPublicPluginSetup['fieldFormats'];
   metadata?: MetaData;
 }
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/home.tsx b/x-pack/plugins/triggers_actions_ui/public/application/home.tsx
index 6130233f33815..7c8d798984bf2 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/home.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/home.tsx
@@ -29,6 +29,7 @@ import { hasShowActionsCapability, hasShowAlertsCapability } from './lib/capabil
 
 import { ActionsConnectorsList } from './sections/actions_connectors_list/components/actions_connectors_list';
 import { AlertsList } from './sections/alerts_list/components/alerts_list';
+import { SecurityEnabledCallOut } from './components/security_call_out';
 import { PLUGIN } from './constants/plugin';
 
 interface MatchParams {
@@ -41,7 +42,7 @@ export const TriggersActionsUIHome: React.FunctionComponent<RouteComponentProps<
   },
   history,
 }) => {
-  const { chrome, capabilities, setBreadcrumbs } = useAppDependencies();
+  const { chrome, capabilities, setBreadcrumbs, docLinks, http } = useAppDependencies();
 
   const canShowActions = hasShowActionsCapability(capabilities);
   const canShowAlerts = hasShowAlertsCapability(capabilities);
@@ -87,6 +88,7 @@ export const TriggersActionsUIHome: React.FunctionComponent<RouteComponentProps<
   return (
     <EuiPageBody>
       <EuiPageContent>
+        <SecurityEnabledCallOut docLinks={docLinks} http={http} />
         <EuiPageContentHeader>
           <EuiPageContentHeaderSection>
             <EuiTitle size="m">
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/lib/alert_api.test.ts b/x-pack/plugins/triggers_actions_ui/public/application/lib/alert_api.test.ts
index 453fbc4a9eb4f..b830ac471c4d0 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/lib/alert_api.test.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/lib/alert_api.test.ts
@@ -24,6 +24,7 @@ import {
   updateAlert,
   muteAlertInstance,
   unmuteAlertInstance,
+  health,
 } from './alert_api';
 import uuid from 'uuid';
 
@@ -618,3 +619,17 @@ describe('unmuteAlerts', () => {
     `);
   });
 });
+
+describe('health', () => {
+  test('should call health API', async () => {
+    const result = await health({ http });
+    expect(result).toEqual(undefined);
+    expect(http.get.mock.calls).toMatchInlineSnapshot(`
+      Array [
+        Array [
+          "/api/alert/_health",
+        ],
+      ]
+    `);
+  });
+});
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/lib/alert_api.ts b/x-pack/plugins/triggers_actions_ui/public/application/lib/alert_api.ts
index 359c48850549a..0fec2d49df986 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/lib/alert_api.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/lib/alert_api.ts
@@ -9,7 +9,7 @@ import * as t from 'io-ts';
 import { pipe } from 'fp-ts/lib/pipeable';
 import { fold } from 'fp-ts/lib/Either';
 import { pick } from 'lodash';
-import { alertStateSchema } from '../../../../alerting/common';
+import { alertStateSchema, AlertingFrameworkHealth } from '../../../../alerting/common';
 import { BASE_ALERT_API_PATH } from '../constants';
 import { Alert, AlertType, AlertWithoutId, AlertTaskState } from '../../types';
 
@@ -214,3 +214,7 @@ export async function unmuteAlerts({
 }): Promise<void> {
   await Promise.all(ids.map(id => unmuteAlert({ id, http })));
 }
+
+export async function health({ http }: { http: HttpSetup }): Promise<AlertingFrameworkHealth> {
+  return await http.get(`${BASE_ALERT_API_PATH}/_health`);
+}
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_form/alert_add.test.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_form/alert_add.test.tsx
index fc524debe7443..ff83737325e8b 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_form/alert_add.test.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_form/alert_add.test.tsx
@@ -17,6 +17,7 @@ import { alertTypeRegistryMock } from '../../alert_type_registry.mock';
 import { chartPluginMock } from '../../../../../../../src/plugins/charts/public/mocks';
 import { dataPluginMock } from '../../../../../../../src/plugins/data/public/mocks';
 import { ReactWrapper } from 'enzyme';
+import { AppContextProvider } from '../../app_context';
 const actionTypeRegistry = actionTypeRegistryMock.create();
 const alertTypeRegistry = alertTypeRegistryMock.create();
 
@@ -49,7 +50,11 @@ describe('alert_add', () => {
       charts: chartPluginMock.createStartContract(),
       actionTypeRegistry: actionTypeRegistry as any,
       alertTypeRegistry: alertTypeRegistry as any,
+      docLinks: { ELASTIC_WEBSITE_URL: '', DOC_LINK_VERSION: '' },
     };
+
+    mockes.http.get.mockResolvedValue({ isSufficientlySecure: true });
+
     const alertType = {
       id: 'my-alert-type',
       iconClass: 'test',
@@ -83,22 +88,30 @@ describe('alert_add', () => {
     actionTypeRegistry.has.mockReturnValue(true);
 
     wrapper = mountWithIntl(
-      <AlertsContextProvider
-        value={{
-          reloadAlerts: () => {
-            return new Promise<void>(() => {});
-          },
-          http: deps.http,
-          actionTypeRegistry: deps.actionTypeRegistry,
-          alertTypeRegistry: deps.alertTypeRegistry,
-          toastNotifications: deps.toastNotifications,
-          uiSettings: deps.uiSettings,
-          metadata: { test: 'some value', fields: ['test'] },
-        }}
-      >
-        <AlertAdd consumer={'alerting'} addFlyoutVisible={true} setAddFlyoutVisibility={() => {}} />
-      </AlertsContextProvider>
+      <AppContextProvider appDeps={deps}>
+        <AlertsContextProvider
+          value={{
+            reloadAlerts: () => {
+              return new Promise<void>(() => {});
+            },
+            http: deps.http,
+            actionTypeRegistry: deps.actionTypeRegistry,
+            alertTypeRegistry: deps.alertTypeRegistry,
+            toastNotifications: deps.toastNotifications,
+            uiSettings: deps.uiSettings,
+            docLinks: deps.docLinks,
+            metadata: { test: 'some value', fields: ['test'] },
+          }}
+        >
+          <AlertAdd
+            consumer={'alerting'}
+            addFlyoutVisible={true}
+            setAddFlyoutVisibility={() => {}}
+          />
+        </AlertsContextProvider>
+      </AppContextProvider>
     );
+
     // Wait for active space to resolve before requesting the component to update
     await act(async () => {
       await nextTick();
@@ -108,12 +121,15 @@ describe('alert_add', () => {
 
   it('renders alert add flyout', async () => {
     await setup();
+
     expect(wrapper.find('[data-test-subj="addAlertFlyoutTitle"]').exists()).toBeTruthy();
     expect(wrapper.find('[data-test-subj="saveAlertButton"]').exists()).toBeTruthy();
+
     wrapper
       .find('[data-test-subj="my-alert-type-SelectOption"]')
       .first()
       .simulate('click');
+
     expect(wrapper.contains('Metadata: some value. Fields: test.')).toBeTruthy();
   });
 });
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 6600a2379cd23..e44e20751b315 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
@@ -24,6 +24,7 @@ import { Alert, AlertAction, IErrorObject } from '../../../types';
 import { AlertForm, validateBaseProperties } from './alert_form';
 import { alertReducer } from './alert_reducer';
 import { createAlert } from '../../lib/alert_api';
+import { AlertActionSecurityCallOut } from '../../components/alert_action_security_call_out';
 import { PLUGIN } from '../../constants/plugin';
 
 interface AlertAddProps {
@@ -65,6 +66,7 @@ export const AlertAdd = ({
     toastNotifications,
     alertTypeRegistry,
     actionTypeRegistry,
+    docLinks,
   } = useAlertsContext();
 
   const closeFlyout = useCallback(() => {
@@ -151,6 +153,16 @@ export const AlertAdd = ({
             </h3>
           </EuiTitle>
         </EuiFlyoutHeader>
+        <AlertActionSecurityCallOut
+          docLinks={docLinks}
+          action={i18n.translate(
+            'xpack.triggersActionsUI.sections.alertAdd.securityCalloutAction',
+            {
+              defaultMessage: 'creation',
+            }
+          )}
+          http={http}
+        />
         <EuiFlyoutBody>
           <AlertForm
             alert={alert}
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_form/alert_edit.test.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_form/alert_edit.test.tsx
index e9ef6712b88e9..6fcfb463c4c77 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_form/alert_edit.test.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_form/alert_edit.test.tsx
@@ -13,6 +13,7 @@ import { AlertsContextProvider } from '../../context/alerts_context';
 import { alertTypeRegistryMock } from '../../alert_type_registry.mock';
 import { ReactWrapper } from 'enzyme';
 import { AlertEdit } from './alert_edit';
+import { AppContextProvider } from '../../app_context';
 const actionTypeRegistry = actionTypeRegistryMock.create();
 const alertTypeRegistry = alertTypeRegistryMock.create();
 
@@ -32,7 +33,11 @@ describe('alert_edit', () => {
       uiSettings: mockedCoreSetup.uiSettings,
       actionTypeRegistry: actionTypeRegistry as any,
       alertTypeRegistry: alertTypeRegistry as any,
+      docLinks: { ELASTIC_WEBSITE_URL: '', DOC_LINK_VERSION: '' },
     };
+
+    mockedCoreSetup.http.get.mockResolvedValue({ isSufficientlySecure: true });
+
     const alertType = {
       id: 'my-alert-type',
       iconClass: 'test',
@@ -102,24 +107,27 @@ describe('alert_edit', () => {
     actionTypeRegistry.has.mockReturnValue(true);
 
     wrapper = mountWithIntl(
-      <AlertsContextProvider
-        value={{
-          reloadAlerts: () => {
-            return new Promise<void>(() => {});
-          },
-          http: deps!.http,
-          actionTypeRegistry: deps!.actionTypeRegistry,
-          alertTypeRegistry: deps!.alertTypeRegistry,
-          toastNotifications: deps!.toastNotifications,
-          uiSettings: deps!.uiSettings,
-        }}
-      >
-        <AlertEdit
-          editFlyoutVisible={true}
-          setEditFlyoutVisibility={() => {}}
-          initialAlert={alert}
-        />
-      </AlertsContextProvider>
+      <AppContextProvider appDeps={deps}>
+        <AlertsContextProvider
+          value={{
+            reloadAlerts: () => {
+              return new Promise<void>(() => {});
+            },
+            http: deps!.http,
+            actionTypeRegistry: deps!.actionTypeRegistry,
+            alertTypeRegistry: deps!.alertTypeRegistry,
+            toastNotifications: deps!.toastNotifications,
+            uiSettings: deps!.uiSettings,
+            docLinks: deps.docLinks,
+          }}
+        >
+          <AlertEdit
+            editFlyoutVisible={true}
+            setEditFlyoutVisibility={() => {}}
+            initialAlert={alert}
+          />
+        </AlertsContextProvider>
+      </AppContextProvider>
     );
     // Wait for active space to resolve before requesting the component to update
     await act(async () => {
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 41ab3279f91c6..3f27a7860bafa 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
@@ -26,6 +26,7 @@ import { Alert, AlertAction, IErrorObject } from '../../../types';
 import { AlertForm, validateBaseProperties } from './alert_form';
 import { alertReducer } from './alert_reducer';
 import { updateAlert } from '../../lib/alert_api';
+import { AlertActionSecurityCallOut } from '../../components/alert_action_security_call_out';
 import { PLUGIN } from '../../constants/plugin';
 
 interface AlertEditProps {
@@ -49,6 +50,7 @@ export const AlertEdit = ({
     toastNotifications,
     alertTypeRegistry,
     actionTypeRegistry,
+    docLinks,
   } = useAlertsContext();
 
   const closeFlyout = useCallback(() => {
@@ -135,6 +137,16 @@ export const AlertEdit = ({
             </h3>
           </EuiTitle>
         </EuiFlyoutHeader>
+        <AlertActionSecurityCallOut
+          docLinks={docLinks}
+          action={i18n.translate(
+            'xpack.triggersActionsUI.sections.alertEdit.securityCalloutAction',
+            {
+              defaultMessage: 'editing',
+            }
+          )}
+          http={http}
+        />
         <EuiFlyoutBody>
           {hasActionsDisabled && (
             <Fragment>
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 b87aaacb3ec0e..72c22f46f217e 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
@@ -53,6 +53,7 @@ describe('alert_form', () => {
         uiSettings: mockes.uiSettings,
         actionTypeRegistry: actionTypeRegistry as any,
         alertTypeRegistry: alertTypeRegistry as any,
+        docLinks: { ELASTIC_WEBSITE_URL: '', DOC_LINK_VERSION: '' },
       };
       alertTypeRegistry.list.mockReturnValue([alertType]);
       alertTypeRegistry.has.mockReturnValue(true);
@@ -80,6 +81,7 @@ describe('alert_form', () => {
               return new Promise<void>(() => {});
             },
             http: deps!.http,
+            docLinks: deps.docLinks,
             actionTypeRegistry: deps!.actionTypeRegistry,
             alertTypeRegistry: deps!.alertTypeRegistry,
             toastNotifications: deps!.toastNotifications,
@@ -159,6 +161,7 @@ describe('alert_form', () => {
               return new Promise<void>(() => {});
             },
             http: deps!.http,
+            docLinks: deps.docLinks,
             actionTypeRegistry: deps!.actionTypeRegistry,
             alertTypeRegistry: deps!.alertTypeRegistry,
             toastNotifications: deps!.toastNotifications,
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 9f10528b1dd46..2be8418cd9802 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
@@ -59,6 +59,7 @@ export const AlertsList: React.FunctionComponent = () => {
     alertTypeRegistry,
     actionTypeRegistry,
     uiSettings,
+    docLinks,
     charts,
     dataPlugin,
   } = useAppDependencies();
@@ -480,6 +481,7 @@ export const AlertsList: React.FunctionComponent = () => {
           alertTypeRegistry,
           toastNotifications,
           uiSettings,
+          docLinks,
           charts,
           dataFieldsFormats: dataPlugin.fieldFormats,
         }}
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/common/components/with_bulk_alert_api_operations.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/common/components/with_bulk_alert_api_operations.tsx
index 0ba590ab462a7..a60b7e68f1f94 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/common/components/with_bulk_alert_api_operations.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/common/components/with_bulk_alert_api_operations.tsx
@@ -6,7 +6,7 @@
 
 import React from 'react';
 
-import { Alert, AlertType, AlertTaskState } from '../../../../types';
+import { Alert, AlertType, AlertTaskState, AlertingFrameworkHealth } from '../../../../types';
 import { useAppDependencies } from '../../../app_context';
 import {
   deleteAlerts,
@@ -23,6 +23,7 @@ import {
   loadAlert,
   loadAlertState,
   loadAlertTypes,
+  health,
 } from '../../../lib/alert_api';
 
 export interface ComponentOpts {
@@ -51,6 +52,7 @@ export interface ComponentOpts {
   loadAlert: (id: Alert['id']) => Promise<Alert>;
   loadAlertState: (id: Alert['id']) => Promise<AlertTaskState>;
   loadAlertTypes: () => Promise<AlertType[]>;
+  getHealth: () => Promise<AlertingFrameworkHealth>;
 }
 
 export type PropsWithOptionalApiHandlers<T> = Omit<T, keyof ComponentOpts> & Partial<ComponentOpts>;
@@ -115,6 +117,7 @@ export function withBulkAlertOperations<T>(
         loadAlert={async (alertId: Alert['id']) => loadAlert({ http, alertId })}
         loadAlertState={async (alertId: Alert['id']) => loadAlertState({ http, alertId })}
         loadAlertTypes={async () => loadAlertTypes({ http })}
+        getHealth={async () => health({ http })}
       />
     );
   };
diff --git a/x-pack/plugins/triggers_actions_ui/public/types.ts b/x-pack/plugins/triggers_actions_ui/public/types.ts
index 900521830571c..7dfaa7b918f70 100644
--- a/x-pack/plugins/triggers_actions_ui/public/types.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/types.ts
@@ -12,8 +12,9 @@ import {
   AlertAction,
   AlertTaskState,
   RawAlertInstance,
+  AlertingFrameworkHealth,
 } from '../../../plugins/alerting/common';
-export { Alert, AlertAction, AlertTaskState, RawAlertInstance };
+export { Alert, AlertAction, AlertTaskState, RawAlertInstance, AlertingFrameworkHealth };
 export { ActionType };
 
 export type ActionTypeIndex = Record<string, ActionType>;

From 0fc0440cdc59df97d10b4a0161cd516ef87a998f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B8ren=20Louv-Jansen?= <sorenlouv@gmail.com>
Date: Tue, 24 Mar 2020 20:28:11 +0100
Subject: [PATCH 095/179] [APM] E2E: Zero config for running e2e locally
 (#59152)

---
 .gitignore                                    |    3 +
 x-pack/legacy/plugins/apm/e2e/.gitignore      |    3 +-
 x-pack/legacy/plugins/apm/e2e/README.md       |   54 +-
 .../legacy/plugins/apm/e2e/ci/entrypoint.sh   |    2 +-
 .../legacy/plugins/apm/e2e/ci/kibana.dev.yml  |    7 -
 .../legacy/plugins/apm/e2e/ci/kibana.e2e.yml  |   31 +
 .../plugins/apm/e2e/ci/prepare-kibana.sh      |   11 +-
 x-pack/legacy/plugins/apm/e2e/cypress.json    |    9 +-
 .../apm/e2e/cypress/integration/apm.feature   |    4 +-
 .../apm/e2e/cypress/integration/helpers.ts    |   41 +-
 .../apm/e2e/cypress/integration/snapshots.js  |   19 +-
 .../cypress/support/step_definitions/apm.ts   |    8 +-
 .../e2e/{cypress => }/ingest-data/replay.js   |   61 +-
 x-pack/legacy/plugins/apm/e2e/package.json    |   14 +-
 x-pack/legacy/plugins/apm/e2e/run-e2e.sh      |   93 ++
 x-pack/legacy/plugins/apm/e2e/tsconfig.json   |   11 +-
 x-pack/legacy/plugins/apm/e2e/yarn.lock       | 1210 +++++++++--------
 17 files changed, 873 insertions(+), 708 deletions(-)
 delete mode 100644 x-pack/legacy/plugins/apm/e2e/ci/kibana.dev.yml
 create mode 100644 x-pack/legacy/plugins/apm/e2e/ci/kibana.e2e.yml
 rename x-pack/legacy/plugins/apm/e2e/{cypress => }/ingest-data/replay.js (60%)
 create mode 100755 x-pack/legacy/plugins/apm/e2e/run-e2e.sh

diff --git a/.gitignore b/.gitignore
index efb5c57774633..bd7a954f950e9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -44,3 +44,6 @@ package-lock.json
 *.sublime-*
 npm-debug.log*
 .tern-project
+x-pack/legacy/plugins/apm/tsconfig.json
+apm.tsconfig.json
+/x-pack/legacy/plugins/apm/e2e/snapshots.js
diff --git a/x-pack/legacy/plugins/apm/e2e/.gitignore b/x-pack/legacy/plugins/apm/e2e/.gitignore
index 10c769065fc28..a14856506bc6c 100644
--- a/x-pack/legacy/plugins/apm/e2e/.gitignore
+++ b/x-pack/legacy/plugins/apm/e2e/.gitignore
@@ -1,4 +1,3 @@
-cypress/ingest-data/events.json
 cypress/screenshots/*
-
 cypress/test-results
+tmp
diff --git a/x-pack/legacy/plugins/apm/e2e/README.md b/x-pack/legacy/plugins/apm/e2e/README.md
index 73a1e860f5564..a891d64539a3f 100644
--- a/x-pack/legacy/plugins/apm/e2e/README.md
+++ b/x-pack/legacy/plugins/apm/e2e/README.md
@@ -1,58 +1,16 @@
 # End-To-End (e2e) Test for APM UI
 
-## Ingest static data into Elasticsearch via APM Server
+**Run E2E tests**
 
-1. Start Elasticsearch and APM Server, using [apm-integration-testing](https://github.com/elastic/apm-integration-testing):
-
-```shell
-$ git clone https://github.com/elastic/apm-integration-testing.git
-$ cd apm-integration-testing
-./scripts/compose.py start master --no-kibana --no-xpack-secure
-```
-
-2. Download [static data file](https://storage.googleapis.com/apm-ui-e2e-static-data/events.json)
-
-```shell
-$ cd x-pack/legacy/plugins/apm/e2e/cypress/ingest-data
-$ curl https://storage.googleapis.com/apm-ui-e2e-static-data/events.json --output events.json
-```
-
-3. Post to APM Server
-
-```shell
-$ cd x-pack/legacy/plugins/apm/e2e/cypress/ingest-data
-$ node replay.js --server-url http://localhost:8200 --secret-token abcd --events ./events.json
-```
->This process will take a few minutes to ingest all data
-
-4. Start Kibana
-
-```shell
-$ yarn kbn bootstrap
-$ yarn start --no-base-path --csp.strict=false
-```
-
-> Content Security Policy (CSP) Settings: Your Kibana instance must have the `csp.strict: false`.
-
-## How to run the tests
-
-_Note: Run the following commands from `kibana/x-pack/legacy/plugins/apm/e2e/cypress`._
-
-### Interactive mode
-
-```
-yarn cypress open
+```sh
+x-pack/legacy/plugins/apm/e2e/run-e2e.sh
 ```
 
-### Headless mode
-
-```
-yarn cypress run
-```
+_Starts Kibana, APM Server, Elasticsearch (with sample data) and runs the tests_
 
 ## Reproducing CI builds
 
->This process is very slow compared to the local development described above. Consider that the CI must install and configure the build tools and create a Docker image for the project to run tests in a consistent manner.
+> This process is very slow compared to the local development described above. Consider that the CI must install and configure the build tools and create a Docker image for the project to run tests in a consistent manner.
 
 The Jenkins CI uses a shell script to prepare Kibana:
 
@@ -60,7 +18,7 @@ The Jenkins CI uses a shell script to prepare Kibana:
 # Prepare and run Kibana locally
 $ x-pack/legacy/plugins/apm/e2e/ci/prepare-kibana.sh
 # Build Docker image for Kibana
-$ docker build --tag cypress --build-arg NODE_VERSION=$(cat .node-version) x-pack/legacy/plugins/apm/e2e/ci 
+$ docker build --tag cypress --build-arg NODE_VERSION=$(cat .node-version) x-pack/legacy/plugins/apm/e2e/ci
 # Run Docker image
 $ docker run --rm -t --user "$(id -u):$(id -g)" \
     -v `pwd`:/app --network="host" \
diff --git a/x-pack/legacy/plugins/apm/e2e/ci/entrypoint.sh b/x-pack/legacy/plugins/apm/e2e/ci/entrypoint.sh
index f7226dca1d276..ae5155d966e58 100755
--- a/x-pack/legacy/plugins/apm/e2e/ci/entrypoint.sh
+++ b/x-pack/legacy/plugins/apm/e2e/ci/entrypoint.sh
@@ -7,7 +7,7 @@ if [ -z "${kibana}" ] ; then
   kibana=127.0.0.1
 fi
 
-export CYPRESS_BASE_URL=http://${kibana}:5601
+export CYPRESS_BASE_URL=http://${kibana}:5701
 
 ## To avoid issues with the home and caching artifacts
 export HOME=/tmp
diff --git a/x-pack/legacy/plugins/apm/e2e/ci/kibana.dev.yml b/x-pack/legacy/plugins/apm/e2e/ci/kibana.dev.yml
deleted file mode 100644
index db57db9a1abe9..0000000000000
--- a/x-pack/legacy/plugins/apm/e2e/ci/kibana.dev.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-##
-# Disabled plugins
-########################
-logging.verbose: true
-elasticsearch.username: "kibana_system_user"
-elasticsearch.password: "changeme"
-xpack.security.encryptionKey: "something_at_least_32_characters"
diff --git a/x-pack/legacy/plugins/apm/e2e/ci/kibana.e2e.yml b/x-pack/legacy/plugins/apm/e2e/ci/kibana.e2e.yml
new file mode 100644
index 0000000000000..19f3f7c8978fa
--- /dev/null
+++ b/x-pack/legacy/plugins/apm/e2e/ci/kibana.e2e.yml
@@ -0,0 +1,31 @@
+# Kibana
+server.port: 5701
+xpack.security.encryptionKey: 'something_at_least_32_characters'
+csp.strict: false
+logging.verbose: true
+
+# Elasticsearch
+# Started via apm-integration-testing
+# ./scripts/compose.py start master --no-kibana --elasticsearch-port 9201 --apm-server-port 8201
+elasticsearch.hosts: http://localhost:9201
+elasticsearch.username: 'kibana_system_user'
+elasticsearch.password: 'changeme'
+
+# APM index pattern
+apm_oss.indexPattern: apm-*
+
+# APM Indices
+apm_oss.errorIndices: apm-*-error*
+apm_oss.sourcemapIndices: apm-*-sourcemap
+apm_oss.transactionIndices: apm-*-transaction*
+apm_oss.spanIndices: apm-*-span*
+apm_oss.metricsIndices: apm-*-metric*
+apm_oss.onboardingIndices: apm-*-onboarding*
+
+# APM options
+xpack.apm.enabled: true
+xpack.apm.serviceMapEnabled: false
+xpack.apm.autocreateApmIndexPattern: true
+xpack.apm.ui.enabled: true
+xpack.apm.ui.transactionGroupBucketSize: 100
+xpack.apm.ui.maxTraceItems: 1000
diff --git a/x-pack/legacy/plugins/apm/e2e/ci/prepare-kibana.sh b/x-pack/legacy/plugins/apm/e2e/ci/prepare-kibana.sh
index 4f176fd0070f5..6df17bd51e0e8 100755
--- a/x-pack/legacy/plugins/apm/e2e/ci/prepare-kibana.sh
+++ b/x-pack/legacy/plugins/apm/e2e/ci/prepare-kibana.sh
@@ -1,24 +1,21 @@
 #!/usr/bin/env bash
 set -e
 
-CYPRESS_DIR="x-pack/legacy/plugins/apm/e2e"
+E2E_DIR="x-pack/legacy/plugins/apm/e2e"
 
 echo "1/3 Install dependencies ..."
 # shellcheck disable=SC1091
 source src/dev/ci_setup/setup_env.sh true
 yarn kbn bootstrap
-cp ${CYPRESS_DIR}/ci/kibana.dev.yml config/kibana.dev.yml
-echo 'elasticsearch:' >> config/kibana.dev.yml
-cp ${CYPRESS_DIR}/ci/kibana.dev.yml config/kibana.yml
 
 echo "2/3 Ingest test data ..."
-pushd ${CYPRESS_DIR}
+pushd ${E2E_DIR}
 yarn install
 curl --silent https://storage.googleapis.com/apm-ui-e2e-static-data/events.json --output ingest-data/events.json
-node ingest-data/replay.js --server-url http://localhost:8200 --secret-token abcd --events ./events.json > ingest-data.log
+node ingest-data/replay.js --server-url http://localhost:8201 --secret-token abcd --events ./events.json > ingest-data.log
 
 echo "3/3 Start Kibana ..."
 popd
 ## Might help to avoid FATAL ERROR: Ineffective mark-compacts near heap limit Allocation failed - JavaScript heap out of memory
 export NODE_OPTIONS="--max-old-space-size=4096"
-nohup node scripts/kibana --no-base-path --csp.strict=false --optimize.watch=false> kibana.log 2>&1 &
+nohup node scripts/kibana --config "${E2E_DIR}/ci/kibana.e2e.yml" --no-base-path --optimize.watch=false> kibana.log 2>&1 &
diff --git a/x-pack/legacy/plugins/apm/e2e/cypress.json b/x-pack/legacy/plugins/apm/e2e/cypress.json
index 310964656f107..0894cfd13a197 100644
--- a/x-pack/legacy/plugins/apm/e2e/cypress.json
+++ b/x-pack/legacy/plugins/apm/e2e/cypress.json
@@ -1,5 +1,6 @@
 {
-  "baseUrl": "http://localhost:5601",
+  "nodeVersion": "system",
+  "baseUrl": "http://localhost:5701",
   "video": false,
   "trashAssetsBeforeRuns": false,
   "fileServerFolder": "../",
@@ -15,5 +16,9 @@
     "mochaFile": "./cypress/test-results/[hash]-e2e-tests.xml",
     "toConsole": false
   },
-  "testFiles": "**/*.{feature,features}"
+  "testFiles": "**/*.{feature,features}",
+  "env": {
+    "elasticsearch_username": "admin",
+    "elasticsearch_password": "changeme"
+  }
 }
diff --git a/x-pack/legacy/plugins/apm/e2e/cypress/integration/apm.feature b/x-pack/legacy/plugins/apm/e2e/cypress/integration/apm.feature
index 01fee2bf68b09..285615108266b 100644
--- a/x-pack/legacy/plugins/apm/e2e/cypress/integration/apm.feature
+++ b/x-pack/legacy/plugins/apm/e2e/cypress/integration/apm.feature
@@ -2,6 +2,6 @@ Feature: APM
 
   Scenario: Transaction duration charts
     Given a user browses the APM UI application
-    When the user inspects the opbeans-go service
+    When the user inspects the opbeans-node service
     Then should redirect to correct path with correct params
-      And should have correct y-axis ticks
\ No newline at end of file
+      And should have correct y-axis ticks
diff --git a/x-pack/legacy/plugins/apm/e2e/cypress/integration/helpers.ts b/x-pack/legacy/plugins/apm/e2e/cypress/integration/helpers.ts
index 1239ef397e086..90d5c9eda632d 100644
--- a/x-pack/legacy/plugins/apm/e2e/cypress/integration/helpers.ts
+++ b/x-pack/legacy/plugins/apm/e2e/cypress/integration/helpers.ts
@@ -6,45 +6,26 @@
 
 /* eslint-disable import/no-extraneous-dependencies */
 
-import { safeLoad } from 'js-yaml';
-
-const RANGE_FROM = '2019-09-04T18:00:00.000Z';
-const RANGE_TO = '2019-09-05T06:00:00.000Z';
+const RANGE_FROM = '2020-03-04T12:30:00.000Z';
+const RANGE_TO = '2020-03-04T13:00:00.000Z';
 const BASE_URL = Cypress.config().baseUrl;
 
-/**
- * Credentials in the `kibana.dev.yml` config file will be used to authenticate with Kibana
- */
-const KIBANA_DEV_YML_PATH = '../../../../../config/kibana.dev.yml';
-
 /** The default time in ms to wait for a Cypress command to complete */
-export const DEFAULT_TIMEOUT = 30 * 1000;
+export const DEFAULT_TIMEOUT = 60 * 1000;
 
 export function loginAndWaitForPage(url: string) {
-  // read the login details from `kibana.dev.yml`
-  cy.readFile(KIBANA_DEV_YML_PATH).then(kibanaDevYml => {
-    const config = safeLoad(kibanaDevYml);
-    const username = config['elasticsearch.username'];
-    const password = config['elasticsearch.password'];
-
-    const hasCredentials = username && password;
-
-    cy.log(
-      `Authenticating via config credentials from "${KIBANA_DEV_YML_PATH}". username: ${username}, password: ${password}`
-    );
+  const username = Cypress.env('elasticsearch_username');
+  const password = Cypress.env('elasticsearch_password');
 
-    const options = hasCredentials
-      ? {
-          auth: { username, password }
-        }
-      : {};
+  cy.log(`Authenticating via ${username} / ${password}`);
 
-    const fullUrl = `${BASE_URL}${url}?rangeFrom=${RANGE_FROM}&rangeTo=${RANGE_TO}`;
-    cy.visit(fullUrl, options);
-  });
+  const fullUrl = `${BASE_URL}${url}?rangeFrom=${RANGE_FROM}&rangeTo=${RANGE_TO}`;
+  cy.visit(fullUrl, { auth: { username, password } });
 
   cy.viewport('macbook-15');
 
   // wait for loading spinner to disappear
-  cy.get('.kibanaLoaderWrap', { timeout: DEFAULT_TIMEOUT }).should('not.exist');
+  cy.get('#kbn_loading_message', { timeout: DEFAULT_TIMEOUT }).should(
+    'not.exist'
+  );
 }
diff --git a/x-pack/legacy/plugins/apm/e2e/cypress/integration/snapshots.js b/x-pack/legacy/plugins/apm/e2e/cypress/integration/snapshots.js
index 0e4b91ab45a40..968c2675a62e7 100644
--- a/x-pack/legacy/plugins/apm/e2e/cypress/integration/snapshots.js
+++ b/x-pack/legacy/plugins/apm/e2e/cypress/integration/snapshots.js
@@ -1,19 +1,10 @@
 module.exports = {
-  "When clicking opbeans-go service": {
-    "transaction duration charts": {
-      "should have correct y-axis ticks": {
-        "1": "3.7 min",
-        "2": "1.8 min",
-        "3": "0.0 min"
-      }
-    }
-  },
-  "__version": "3.8.3",
   "APM": {
     "Transaction duration charts": {
-      "1": "3.7 min",
-      "2": "1.8 min",
-      "3": "0.0 min"
+      "1": "500 ms",
+      "2": "250 ms",
+      "3": "0 ms"
     }
-  }
+  },
+  "__version": "4.2.0"
 }
diff --git a/x-pack/legacy/plugins/apm/e2e/cypress/support/step_definitions/apm.ts b/x-pack/legacy/plugins/apm/e2e/cypress/support/step_definitions/apm.ts
index f2f1e515f967a..f58118f3352ea 100644
--- a/x-pack/legacy/plugins/apm/e2e/cypress/support/step_definitions/apm.ts
+++ b/x-pack/legacy/plugins/apm/e2e/cypress/support/step_definitions/apm.ts
@@ -12,15 +12,15 @@ Given(`a user browses the APM UI application`, () => {
   loginAndWaitForPage(`/app/apm#/services`);
 });
 
-When(`the user inspects the opbeans-go service`, () => {
-  // click opbeans-go service
-  cy.get(':contains(opbeans-go)')
+When(`the user inspects the opbeans-node service`, () => {
+  // click opbeans-node service
+  cy.get(':contains(opbeans-node)')
     .last()
     .click({ force: true });
 });
 
 Then(`should redirect to correct path with correct params`, () => {
-  cy.url().should('contain', `/app/apm#/services/opbeans-go/transactions`);
+  cy.url().should('contain', `/app/apm#/services/opbeans-node/transactions`);
   cy.url().should('contain', `transactionType=request`);
 });
 
diff --git a/x-pack/legacy/plugins/apm/e2e/cypress/ingest-data/replay.js b/x-pack/legacy/plugins/apm/e2e/ingest-data/replay.js
similarity index 60%
rename from x-pack/legacy/plugins/apm/e2e/cypress/ingest-data/replay.js
rename to x-pack/legacy/plugins/apm/e2e/ingest-data/replay.js
index 990fc37bb7b2e..59cd34704d624 100644
--- a/x-pack/legacy/plugins/apm/e2e/cypress/ingest-data/replay.js
+++ b/x-pack/legacy/plugins/apm/e2e/ingest-data/replay.js
@@ -4,15 +4,21 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-/* eslint-disable import/no-extraneous-dependencies */
 /* eslint-disable no-console */
 
+/* eslint-disable import/no-extraneous-dependencies */
+
 /**
  * This script is useful for ingesting previously generated APM data into Elasticsearch via APM Server
  *
  * You can either:
  *  1. Download a static test data file from: https://storage.googleapis.com/apm-ui-e2e-static-data/events.json
- *  2. Or, generate the test data file yourself by following the steps in: https://github.com/elastic/kibana/blob/5207a0b68a66d4f513fe1b0cedb021b296641712/x-pack/legacy/plugins/apm/cypress/README.md#generate-static-data
+ *  2. Or, generate the test data file yourself:
+ *    git clone https://github.com/elastic/apm-integration-testing.git
+ *    ./scripts/compose.py start master --no-kibana --with-opbeans-node --apm-server-record
+ *    docker cp localtesting_8.0.0_apm-server-2:/app/events.json . && cat events.json | wc -l
+ *
+ *
  *
  * Run the script:
  *
@@ -27,6 +33,7 @@ const axios = require('axios');
 const readFile = promisify(fs.readFile);
 const pLimit = require('p-limit');
 const { argv } = require('yargs');
+const ora = require('ora');
 
 const APM_SERVER_URL = argv.serverUrl;
 const SECRET_TOKEN = argv.secretToken;
@@ -43,10 +50,27 @@ if (!EVENTS_PATH) {
 }
 
 const delay = ms => new Promise(resolve => setTimeout(resolve, ms));
+
+const requestProgress = {
+  succeeded: 0,
+  failed: 0,
+  total: 0
+};
+
+const spinner = ora({ text: 'Warming up...', stream: process.stdout });
+
+function updateSpinnerText({ success }) {
+  success ? requestProgress.succeeded++ : requestProgress.failed++;
+  const remaining =
+    requestProgress.total -
+    (requestProgress.succeeded + requestProgress.failed);
+
+  spinner.text = `Remaining: ${remaining}. Succeeded: ${requestProgress.succeeded}. Failed: ${requestProgress.failed}.`;
+}
+
 async function insertItem(item) {
   try {
     const url = `${APM_SERVER_URL}${item.url}`;
-    console.log(Date.now(), url);
 
     const headers = {
       'content-type': 'application/x-ndjson'
@@ -63,20 +87,20 @@ async function insertItem(item) {
       data: item.body
     });
 
+    updateSpinnerText({ success: true });
+
     // add delay to avoid flooding the queue
     return delay(500);
   } catch (e) {
-    console.log('an error occurred');
-    if (e.response) {
-      console.log(e.response.data);
-    } else {
-      console.log('error', e);
-    }
+    console.error(
+      `${e.response ? JSON.stringify(e.response.data) : e.message}`
+    );
+    updateSpinnerText({ success: false });
   }
 }
 
 async function init() {
-  const content = await readFile(path.resolve(__dirname, EVENTS_PATH));
+  const content = await readFile(path.resolve(EVENTS_PATH));
   const items = content
     .toString()
     .split('\n')
@@ -84,10 +108,21 @@ async function init() {
     .map(item => JSON.parse(item))
     .filter(item => item.url === '/intake/v2/events');
 
+  spinner.start();
+  requestProgress.total = items.length;
+
   const limit = pLimit(20); // number of concurrent requests
   await Promise.all(items.map(item => limit(() => insertItem(item))));
 }
 
-init().catch(e => {
-  console.log('An error occurred:', e);
-});
+init()
+  .catch(e => {
+    console.log('An error occurred:', e);
+    process.exit(1);
+  })
+  .then(() => {
+    spinner.succeed(
+      `Successfully ingested ${requestProgress.succeeded} of ${requestProgress.total} events`
+    );
+    process.exit(0);
+  });
diff --git a/x-pack/legacy/plugins/apm/e2e/package.json b/x-pack/legacy/plugins/apm/e2e/package.json
index c9026636e64fb..e298be7db514c 100644
--- a/x-pack/legacy/plugins/apm/e2e/package.json
+++ b/x-pack/legacy/plugins/apm/e2e/package.json
@@ -9,16 +9,18 @@
   },
   "dependencies": {
     "@cypress/snapshot": "^2.1.3",
-    "@cypress/webpack-preprocessor": "^4.1.0",
-    "@types/cypress-cucumber-preprocessor": "^1.14.0",
+    "@cypress/webpack-preprocessor": "^4.1.3",
+    "@types/cypress-cucumber-preprocessor": "^1.14.1",
     "@types/js-yaml": "^3.12.1",
     "@types/node": "^10.12.11",
-    "cypress": "^3.5.0",
+    "cypress": "^4.2.0",
     "cypress-cucumber-preprocessor": "^2.0.1",
     "js-yaml": "^3.13.1",
+    "ora": "^4.0.3",
     "p-limit": "^2.2.1",
-    "ts-loader": "^6.1.0",
-    "typescript": "3.7.5",
-    "webpack": "^4.41.5"
+    "ts-loader": "^6.2.2",
+    "typescript": "3.8.3",
+    "wait-on": "^4.0.1",
+    "webpack": "^4.42.1"
   }
 }
diff --git a/x-pack/legacy/plugins/apm/e2e/run-e2e.sh b/x-pack/legacy/plugins/apm/e2e/run-e2e.sh
new file mode 100755
index 0000000000000..6c9ac83678682
--- /dev/null
+++ b/x-pack/legacy/plugins/apm/e2e/run-e2e.sh
@@ -0,0 +1,93 @@
+# variables
+KIBANA_PORT=5701
+ELASTICSEARCH_PORT=9201
+APM_SERVER_PORT=8201
+
+# ensure Docker is running
+docker ps &> /dev/null
+if [ $? -ne 0 ]; then
+    echo "⚠️  Please start Docker"
+    exit 1
+fi
+
+# formatting
+bold=$(tput bold)
+normal=$(tput sgr0)
+
+# Create tmp folder
+mkdir -p tmp
+
+# Ask user to start Kibana
+echo "
+${bold}To start Kibana please run the following command:${normal}
+
+node ./scripts/kibana --no-base-path --dev --no-dev-config --config x-pack/legacy/plugins/apm/e2e/ci/kibana.e2e.yml
+"
+
+# Clone or pull apm-integration-testing
+printf "\n${bold}=== apm-integration-testing ===\n${normal}"
+
+git clone "https://github.com/elastic/apm-integration-testing.git" "./tmp/apm-integration-testing" &> /dev/null
+if [ $? -eq 0 ]; then
+    echo "Cloning repository"
+else
+    echo "Pulling from master..."
+    git -C "./tmp/apm-integration-testing" pull &> /dev/null
+fi
+
+# Start apm-integration-testing
+echo "Starting (logs: ./tmp/apm-it.log)"
+./tmp/apm-integration-testing/scripts/compose.py start master \
+    --no-kibana \
+    --elasticsearch-port $ELASTICSEARCH_PORT \
+    --apm-server-port=$APM_SERVER_PORT \
+    --elasticsearch-heap 4g \
+    &> ./tmp/apm-it.log
+
+# Stop if apm-integration-testing failed to start correctly
+if [ $? -ne 0 ]; then
+    printf "⚠️  apm-integration-testing could not be started.\n"
+    printf "Please see the logs in ./tmp/apm-it.log\n\n"
+    printf "As a last resort, reset docker with:\n\n./tmp/apm-integration-testing/scripts/compose.py stop && system prune --all --force --volumes\n"
+    exit 1
+fi
+
+printf "\n${bold}=== Static mock data ===\n${normal}"
+
+# Download static data if not already done
+if [ -e "./tmp/events.json" ]; then
+    echo 'Skip: events.json already exists. Not downloading'
+else
+    echo 'Downloading events.json...'
+    curl --silent https://storage.googleapis.com/apm-ui-e2e-static-data/events.json --output ./tmp/events.json
+fi
+
+# echo "Deleting existing indices (apm* and .apm*)"
+curl --silent --user admin:changeme -XDELETE "localhost:${ELASTICSEARCH_PORT}/.apm*" > /dev/null
+curl --silent --user admin:changeme -XDELETE "localhost:${ELASTICSEARCH_PORT}/apm*" > /dev/null
+
+# Ingest data into APM Server
+echo "Ingesting data (logs: tmp/ingest-data.log)"
+node ingest-data/replay.js --server-url http://localhost:$APM_SERVER_PORT --events ./tmp/events.json  2> ./tmp/ingest-data.log
+
+# Install local dependencies
+printf "\n"
+echo "Installing local dependencies (logs: tmp/e2e-yarn.log)"
+yarn &> ./tmp/e2e-yarn.log
+
+# Wait for Kibana to start
+echo "Waiting for Kibana to start..."
+yarn wait-on -i 500 -w 500 http://localhost:$KIBANA_PORT > /dev/null
+
+echo "\n✅ Setup completed successfully. Running tests...\n"
+
+# run cypress tests
+yarn cypress run --config pageLoadTimeout=100000,watchForFileChanges=true
+
+echo "
+
+${bold}If you want to run the test interactively, run:${normal}
+
+yarn cypress open --config pageLoadTimeout=100000,watchForFileChanges=true
+"
+
diff --git a/x-pack/legacy/plugins/apm/e2e/tsconfig.json b/x-pack/legacy/plugins/apm/e2e/tsconfig.json
index de498816e30a4..a7091a20186b2 100644
--- a/x-pack/legacy/plugins/apm/e2e/tsconfig.json
+++ b/x-pack/legacy/plugins/apm/e2e/tsconfig.json
@@ -1,13 +1,8 @@
 {
   "extends": "../../../../tsconfig.json",
-  "exclude": [],
-  "include": [
-    "./**/*"
-  ],
+  "exclude": ["tmp"],
+  "include": ["./**/*"],
   "compilerOptions": {
-    "types": [
-      "cypress",
-      "node"
-    ]
+    "types": ["cypress", "node"]
   }
 }
diff --git a/x-pack/legacy/plugins/apm/e2e/yarn.lock b/x-pack/legacy/plugins/apm/e2e/yarn.lock
index 48e6013fb6986..474337931d665 100644
--- a/x-pack/legacy/plugins/apm/e2e/yarn.lock
+++ b/x-pack/legacy/plugins/apm/e2e/yarn.lock
@@ -932,10 +932,10 @@
     snap-shot-compare "2.8.3"
     snap-shot-store "1.2.3"
 
-"@cypress/webpack-preprocessor@^4.1.0":
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/@cypress/webpack-preprocessor/-/webpack-preprocessor-4.1.1.tgz#3c0b5b8de6eaac605dac3b1f1c3f5916c1c6eaea"
-  integrity sha512-SfzDqOvWBSlfGRm8ak/XHUXAnndwHU2qJIRr1LIC7j2UqWcZoJ+286CuNloJbkwfyEAO6tQggLd4E/WHUAcKZQ==
+"@cypress/webpack-preprocessor@^4.1.3":
+  version "4.1.3"
+  resolved "https://registry.yarnpkg.com/@cypress/webpack-preprocessor/-/webpack-preprocessor-4.1.3.tgz#d5fad767a304c16ec05ca08034827c601f1c9c0c"
+  integrity sha512-VtTzStrKtwyftLkcgopwCHzgjefK3uHHL6FgbAQP1o5N1pa/zYUb0g7hH2skrMAlKOmLGdbySlISkUl18Y3wHg==
   dependencies:
     bluebird "3.7.1"
     debug "4.1.1"
@@ -952,10 +952,62 @@
     debug "^3.1.0"
     lodash.once "^4.1.1"
 
-"@types/cypress-cucumber-preprocessor@^1.14.0":
-  version "1.14.0"
-  resolved "https://registry.yarnpkg.com/@types/cypress-cucumber-preprocessor/-/cypress-cucumber-preprocessor-1.14.0.tgz#41d8ffb2b608d3ed4ab998a0c4394056f75af1e0"
-  integrity sha512-bOl4u6seZtxNIGa6J6xydroPntTxxWy8uqIrZ3OY10C96fUes4mZvJKY6NvOoe61/OVafG/UEFa+X2ZWKE6Ltw==
+"@hapi/address@^4.0.0":
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/@hapi/address/-/address-4.0.0.tgz#36affb4509b5a6adc628bcc394450f2a7d51d111"
+  integrity sha512-GDDpkCdSUfkQCznmWUHh9dDN85BWf/V8TFKQ2JLuHdGB4Yy3YTEGBzZxoBNxfNBEvreSR/o+ZxBBSNNEVzY+lQ==
+  dependencies:
+    "@hapi/hoek" "^9.0.0"
+
+"@hapi/formula@^2.0.0":
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/@hapi/formula/-/formula-2.0.0.tgz#edade0619ed58c8e4f164f233cda70211e787128"
+  integrity sha512-V87P8fv7PI0LH7LiVi8Lkf3x+KCO7pQozXRssAHNXXL9L1K+uyu4XypLXwxqVDKgyQai6qj3/KteNlrqDx4W5A==
+
+"@hapi/hoek@^9.0.0":
+  version "9.0.3"
+  resolved "https://registry.yarnpkg.com/@hapi/hoek/-/hoek-9.0.3.tgz#e49e637d5de8faa4f0d313c2590b455d7c00afd7"
+  integrity sha512-jKtjLLDiH95b002sJVc5c74PE6KKYftuyVdVmsuYId5stTaWcRFqE+5ukZI4gDUKjGn8wv2C3zPn3/nyjEI7gg==
+
+"@hapi/joi@^17.1.0":
+  version "17.1.0"
+  resolved "https://registry.yarnpkg.com/@hapi/joi/-/joi-17.1.0.tgz#cc4000b6c928a6a39b9bef092151b6bdee10ce55"
+  integrity sha512-ob67RcPlwRWxBzLCnWvcwx5qbwf88I3ykD7gcJLWOTRfLLgosK7r6aeChz4thA3XRvuBfI0KB1tPVl2EQFlPXw==
+  dependencies:
+    "@hapi/address" "^4.0.0"
+    "@hapi/formula" "^2.0.0"
+    "@hapi/hoek" "^9.0.0"
+    "@hapi/pinpoint" "^2.0.0"
+    "@hapi/topo" "^5.0.0"
+
+"@hapi/pinpoint@^2.0.0":
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/@hapi/pinpoint/-/pinpoint-2.0.0.tgz#805b40d4dbec04fc116a73089494e00f073de8df"
+  integrity sha512-vzXR5MY7n4XeIvLpfl3HtE3coZYO4raKXW766R6DZw/6aLqR26iuZ109K7a0NtF2Db0jxqh7xz2AxkUwpUFybw==
+
+"@hapi/topo@^5.0.0":
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/@hapi/topo/-/topo-5.0.0.tgz#c19af8577fa393a06e9c77b60995af959be721e7"
+  integrity sha512-tFJlT47db0kMqVm3H4nQYgn6Pwg10GTZHb1pwmSiv1K4ks6drQOtfEF5ZnPjkvC+y4/bUPHK+bc87QvLcL+WMw==
+  dependencies:
+    "@hapi/hoek" "^9.0.0"
+
+"@samverschueren/stream-to-observable@^0.3.0":
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/@samverschueren/stream-to-observable/-/stream-to-observable-0.3.0.tgz#ecdf48d532c58ea477acfcab80348424f8d0662f"
+  integrity sha512-MI4Xx6LHs4Webyvi6EbspgyAb4D2Q2VtnCQ1blOJcoLS6mVa8lNN2rkIy1CVxfTUpoyIbCTkXES1rLXztFD1lg==
+  dependencies:
+    any-observable "^0.3.0"
+
+"@types/color-name@^1.1.1":
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/@types/color-name/-/color-name-1.1.1.tgz#1c1261bbeaa10a8055bbc5d8ab84b7b2afc846a0"
+  integrity sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ==
+
+"@types/cypress-cucumber-preprocessor@^1.14.1":
+  version "1.14.1"
+  resolved "https://registry.yarnpkg.com/@types/cypress-cucumber-preprocessor/-/cypress-cucumber-preprocessor-1.14.1.tgz#9787f4e89553ebc6359ce157a26ad51ed14aa98b"
+  integrity sha512-CpYsiQ49UrOmadhFg0G5RkokPUmGGctD01mOWjNxFxHw5VgIRv33L2RyFHL8klaAI4HaedGN3Tcj4HTQ65hn+A==
 
 "@types/js-yaml@^3.12.1":
   version "3.12.2"
@@ -972,150 +1024,149 @@
   resolved "https://registry.yarnpkg.com/@types/sizzle/-/sizzle-2.3.2.tgz#a811b8c18e2babab7d542b3365887ae2e4d9de47"
   integrity sha512-7EJYyKTL7tFR8+gDbB6Wwz/arpGa0Mywk1TJbNzKzHtzbwVmY4HR9WqS5VV7dsBUKQmPNr192jHr/VpBluj/hg==
 
-"@webassemblyjs/ast@1.8.5":
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.8.5.tgz#51b1c5fe6576a34953bf4b253df9f0d490d9e359"
-  integrity sha512-aJMfngIZ65+t71C3y2nBBg5FFG0Okt9m0XEgWZ7Ywgn1oMAT8cNwx00Uv1cQyHtidq0Xn94R4TAywO+LCQ+ZAQ==
-  dependencies:
-    "@webassemblyjs/helper-module-context" "1.8.5"
-    "@webassemblyjs/helper-wasm-bytecode" "1.8.5"
-    "@webassemblyjs/wast-parser" "1.8.5"
-
-"@webassemblyjs/floating-point-hex-parser@1.8.5":
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.8.5.tgz#1ba926a2923613edce496fd5b02e8ce8a5f49721"
-  integrity sha512-9p+79WHru1oqBh9ewP9zW95E3XAo+90oth7S5Re3eQnECGq59ly1Ri5tsIipKGpiStHsUYmY3zMLqtk3gTcOtQ==
-
-"@webassemblyjs/helper-api-error@1.8.5":
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.8.5.tgz#c49dad22f645227c5edb610bdb9697f1aab721f7"
-  integrity sha512-Za/tnzsvnqdaSPOUXHyKJ2XI7PDX64kWtURyGiJJZKVEdFOsdKUCPTNEVFZq3zJ2R0G5wc2PZ5gvdTRFgm81zA==
-
-"@webassemblyjs/helper-buffer@1.8.5":
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.8.5.tgz#fea93e429863dd5e4338555f42292385a653f204"
-  integrity sha512-Ri2R8nOS0U6G49Q86goFIPNgjyl6+oE1abW1pS84BuhP1Qcr5JqMwRFT3Ah3ADDDYGEgGs1iyb1DGX+kAi/c/Q==
-
-"@webassemblyjs/helper-code-frame@1.8.5":
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.8.5.tgz#9a740ff48e3faa3022b1dff54423df9aa293c25e"
-  integrity sha512-VQAadSubZIhNpH46IR3yWO4kZZjMxN1opDrzePLdVKAZ+DFjkGD/rf4v1jap744uPVU6yjL/smZbRIIJTOUnKQ==
-  dependencies:
-    "@webassemblyjs/wast-printer" "1.8.5"
-
-"@webassemblyjs/helper-fsm@1.8.5":
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-fsm/-/helper-fsm-1.8.5.tgz#ba0b7d3b3f7e4733da6059c9332275d860702452"
-  integrity sha512-kRuX/saORcg8se/ft6Q2UbRpZwP4y7YrWsLXPbbmtepKr22i8Z4O3V5QE9DbZK908dh5Xya4Un57SDIKwB9eow==
-
-"@webassemblyjs/helper-module-context@1.8.5":
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-module-context/-/helper-module-context-1.8.5.tgz#def4b9927b0101dc8cbbd8d1edb5b7b9c82eb245"
-  integrity sha512-/O1B236mN7UNEU4t9X7Pj38i4VoU8CcMHyy3l2cV/kIF4U5KoHXDVqcDuOs1ltkac90IM4vZdHc52t1x8Yfs3g==
-  dependencies:
-    "@webassemblyjs/ast" "1.8.5"
-    mamacro "^0.0.3"
-
-"@webassemblyjs/helper-wasm-bytecode@1.8.5":
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.8.5.tgz#537a750eddf5c1e932f3744206551c91c1b93e61"
-  integrity sha512-Cu4YMYG3Ddl72CbmpjU/wbP6SACcOPVbHN1dI4VJNJVgFwaKf1ppeFJrwydOG3NDHxVGuCfPlLZNyEdIYlQ6QQ==
-
-"@webassemblyjs/helper-wasm-section@1.8.5":
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.8.5.tgz#74ca6a6bcbe19e50a3b6b462847e69503e6bfcbf"
-  integrity sha512-VV083zwR+VTrIWWtgIUpqfvVdK4ff38loRmrdDBgBT8ADXYsEZ5mPQ4Nde90N3UYatHdYoDIFb7oHzMncI02tA==
-  dependencies:
-    "@webassemblyjs/ast" "1.8.5"
-    "@webassemblyjs/helper-buffer" "1.8.5"
-    "@webassemblyjs/helper-wasm-bytecode" "1.8.5"
-    "@webassemblyjs/wasm-gen" "1.8.5"
-
-"@webassemblyjs/ieee754@1.8.5":
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.8.5.tgz#712329dbef240f36bf57bd2f7b8fb9bf4154421e"
-  integrity sha512-aaCvQYrvKbY/n6wKHb/ylAJr27GglahUO89CcGXMItrOBqRarUMxWLJgxm9PJNuKULwN5n1csT9bYoMeZOGF3g==
+"@webassemblyjs/ast@1.9.0":
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.9.0.tgz#bd850604b4042459a5a41cd7d338cbed695ed964"
+  integrity sha512-C6wW5L+b7ogSDVqymbkkvuW9kruN//YisMED04xzeBBqjHa2FYnmvOlS6Xj68xWQRgWvI9cIglsjFowH/RJyEA==
+  dependencies:
+    "@webassemblyjs/helper-module-context" "1.9.0"
+    "@webassemblyjs/helper-wasm-bytecode" "1.9.0"
+    "@webassemblyjs/wast-parser" "1.9.0"
+
+"@webassemblyjs/floating-point-hex-parser@1.9.0":
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.9.0.tgz#3c3d3b271bddfc84deb00f71344438311d52ffb4"
+  integrity sha512-TG5qcFsS8QB4g4MhrxK5TqfdNe7Ey/7YL/xN+36rRjl/BlGE/NcBvJcqsRgCP6Z92mRE+7N50pRIi8SmKUbcQA==
+
+"@webassemblyjs/helper-api-error@1.9.0":
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.9.0.tgz#203f676e333b96c9da2eeab3ccef33c45928b6a2"
+  integrity sha512-NcMLjoFMXpsASZFxJ5h2HZRcEhDkvnNFOAKneP5RbKRzaWJN36NC4jqQHKwStIhGXu5mUWlUUk7ygdtrO8lbmw==
+
+"@webassemblyjs/helper-buffer@1.9.0":
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.9.0.tgz#a1442d269c5feb23fcbc9ef759dac3547f29de00"
+  integrity sha512-qZol43oqhq6yBPx7YM3m9Bv7WMV9Eevj6kMi6InKOuZxhw+q9hOkvq5e/PpKSiLfyetpaBnogSbNCfBwyB00CA==
+
+"@webassemblyjs/helper-code-frame@1.9.0":
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.9.0.tgz#647f8892cd2043a82ac0c8c5e75c36f1d9159f27"
+  integrity sha512-ERCYdJBkD9Vu4vtjUYe8LZruWuNIToYq/ME22igL+2vj2dQ2OOujIZr3MEFvfEaqKoVqpsFKAGsRdBSBjrIvZA==
+  dependencies:
+    "@webassemblyjs/wast-printer" "1.9.0"
+
+"@webassemblyjs/helper-fsm@1.9.0":
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-fsm/-/helper-fsm-1.9.0.tgz#c05256b71244214671f4b08ec108ad63b70eddb8"
+  integrity sha512-OPRowhGbshCb5PxJ8LocpdX9Kl0uB4XsAjl6jH/dWKlk/mzsANvhwbiULsaiqT5GZGT9qinTICdj6PLuM5gslw==
+
+"@webassemblyjs/helper-module-context@1.9.0":
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-module-context/-/helper-module-context-1.9.0.tgz#25d8884b76839871a08a6c6f806c3979ef712f07"
+  integrity sha512-MJCW8iGC08tMk2enck1aPW+BE5Cw8/7ph/VGZxwyvGbJwjktKkDK7vy7gAmMDx88D7mhDTCNKAW5tED+gZ0W8g==
+  dependencies:
+    "@webassemblyjs/ast" "1.9.0"
+
+"@webassemblyjs/helper-wasm-bytecode@1.9.0":
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.9.0.tgz#4fed8beac9b8c14f8c58b70d124d549dd1fe5790"
+  integrity sha512-R7FStIzyNcd7xKxCZH5lE0Bqy+hGTwS3LJjuv1ZVxd9O7eHCedSdrId/hMOd20I+v8wDXEn+bjfKDLzTepoaUw==
+
+"@webassemblyjs/helper-wasm-section@1.9.0":
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.9.0.tgz#5a4138d5a6292ba18b04c5ae49717e4167965346"
+  integrity sha512-XnMB8l3ek4tvrKUUku+IVaXNHz2YsJyOOmz+MMkZvh8h1uSJpSen6vYnw3IoQ7WwEuAhL8Efjms1ZWjqh2agvw==
+  dependencies:
+    "@webassemblyjs/ast" "1.9.0"
+    "@webassemblyjs/helper-buffer" "1.9.0"
+    "@webassemblyjs/helper-wasm-bytecode" "1.9.0"
+    "@webassemblyjs/wasm-gen" "1.9.0"
+
+"@webassemblyjs/ieee754@1.9.0":
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.9.0.tgz#15c7a0fbaae83fb26143bbacf6d6df1702ad39e4"
+  integrity sha512-dcX8JuYU/gvymzIHc9DgxTzUUTLexWwt8uCTWP3otys596io0L5aW02Gb1RjYpx2+0Jus1h4ZFqjla7umFniTg==
   dependencies:
     "@xtuc/ieee754" "^1.2.0"
 
-"@webassemblyjs/leb128@1.8.5":
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.8.5.tgz#044edeb34ea679f3e04cd4fd9824d5e35767ae10"
-  integrity sha512-plYUuUwleLIziknvlP8VpTgO4kqNaH57Y3JnNa6DLpu/sGcP6hbVdfdX5aHAV716pQBKrfuU26BJK29qY37J7A==
+"@webassemblyjs/leb128@1.9.0":
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.9.0.tgz#f19ca0b76a6dc55623a09cffa769e838fa1e1c95"
+  integrity sha512-ENVzM5VwV1ojs9jam6vPys97B/S65YQtv/aanqnU7D8aSoHFX8GyhGg0CMfyKNIHBuAVjy3tlzd5QMMINa7wpw==
   dependencies:
     "@xtuc/long" "4.2.2"
 
-"@webassemblyjs/utf8@1.8.5":
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.8.5.tgz#a8bf3b5d8ffe986c7c1e373ccbdc2a0915f0cedc"
-  integrity sha512-U7zgftmQriw37tfD934UNInokz6yTmn29inT2cAetAsaU9YeVCveWEwhKL1Mg4yS7q//NGdzy79nlXh3bT8Kjw==
-
-"@webassemblyjs/wasm-edit@1.8.5":
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.8.5.tgz#962da12aa5acc1c131c81c4232991c82ce56e01a"
-  integrity sha512-A41EMy8MWw5yvqj7MQzkDjU29K7UJq1VrX2vWLzfpRHt3ISftOXqrtojn7nlPsZ9Ijhp5NwuODuycSvfAO/26Q==
-  dependencies:
-    "@webassemblyjs/ast" "1.8.5"
-    "@webassemblyjs/helper-buffer" "1.8.5"
-    "@webassemblyjs/helper-wasm-bytecode" "1.8.5"
-    "@webassemblyjs/helper-wasm-section" "1.8.5"
-    "@webassemblyjs/wasm-gen" "1.8.5"
-    "@webassemblyjs/wasm-opt" "1.8.5"
-    "@webassemblyjs/wasm-parser" "1.8.5"
-    "@webassemblyjs/wast-printer" "1.8.5"
-
-"@webassemblyjs/wasm-gen@1.8.5":
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.8.5.tgz#54840766c2c1002eb64ed1abe720aded714f98bc"
-  integrity sha512-BCZBT0LURC0CXDzj5FXSc2FPTsxwp3nWcqXQdOZE4U7h7i8FqtFK5Egia6f9raQLpEKT1VL7zr4r3+QX6zArWg==
-  dependencies:
-    "@webassemblyjs/ast" "1.8.5"
-    "@webassemblyjs/helper-wasm-bytecode" "1.8.5"
-    "@webassemblyjs/ieee754" "1.8.5"
-    "@webassemblyjs/leb128" "1.8.5"
-    "@webassemblyjs/utf8" "1.8.5"
-
-"@webassemblyjs/wasm-opt@1.8.5":
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.8.5.tgz#b24d9f6ba50394af1349f510afa8ffcb8a63d264"
-  integrity sha512-HKo2mO/Uh9A6ojzu7cjslGaHaUU14LdLbGEKqTR7PBKwT6LdPtLLh9fPY33rmr5wcOMrsWDbbdCHq4hQUdd37Q==
-  dependencies:
-    "@webassemblyjs/ast" "1.8.5"
-    "@webassemblyjs/helper-buffer" "1.8.5"
-    "@webassemblyjs/wasm-gen" "1.8.5"
-    "@webassemblyjs/wasm-parser" "1.8.5"
-
-"@webassemblyjs/wasm-parser@1.8.5":
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.8.5.tgz#21576f0ec88b91427357b8536383668ef7c66b8d"
-  integrity sha512-pi0SYE9T6tfcMkthwcgCpL0cM9nRYr6/6fjgDtL6q/ZqKHdMWvxitRi5JcZ7RI4SNJJYnYNaWy5UUrHQy998lw==
-  dependencies:
-    "@webassemblyjs/ast" "1.8.5"
-    "@webassemblyjs/helper-api-error" "1.8.5"
-    "@webassemblyjs/helper-wasm-bytecode" "1.8.5"
-    "@webassemblyjs/ieee754" "1.8.5"
-    "@webassemblyjs/leb128" "1.8.5"
-    "@webassemblyjs/utf8" "1.8.5"
-
-"@webassemblyjs/wast-parser@1.8.5":
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-parser/-/wast-parser-1.8.5.tgz#e10eecd542d0e7bd394f6827c49f3df6d4eefb8c"
-  integrity sha512-daXC1FyKWHF1i11obK086QRlsMsY4+tIOKgBqI1lxAnkp9xe9YMcgOxm9kLe+ttjs5aWV2KKE1TWJCN57/Btsg==
-  dependencies:
-    "@webassemblyjs/ast" "1.8.5"
-    "@webassemblyjs/floating-point-hex-parser" "1.8.5"
-    "@webassemblyjs/helper-api-error" "1.8.5"
-    "@webassemblyjs/helper-code-frame" "1.8.5"
-    "@webassemblyjs/helper-fsm" "1.8.5"
+"@webassemblyjs/utf8@1.9.0":
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.9.0.tgz#04d33b636f78e6a6813227e82402f7637b6229ab"
+  integrity sha512-GZbQlWtopBTP0u7cHrEx+73yZKrQoBMpwkGEIqlacljhXCkVM1kMQge/Mf+csMJAjEdSwhOyLAS0AoR3AG5P8w==
+
+"@webassemblyjs/wasm-edit@1.9.0":
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.9.0.tgz#3fe6d79d3f0f922183aa86002c42dd256cfee9cf"
+  integrity sha512-FgHzBm80uwz5M8WKnMTn6j/sVbqilPdQXTWraSjBwFXSYGirpkSWE2R9Qvz9tNiTKQvoKILpCuTjBKzOIm0nxw==
+  dependencies:
+    "@webassemblyjs/ast" "1.9.0"
+    "@webassemblyjs/helper-buffer" "1.9.0"
+    "@webassemblyjs/helper-wasm-bytecode" "1.9.0"
+    "@webassemblyjs/helper-wasm-section" "1.9.0"
+    "@webassemblyjs/wasm-gen" "1.9.0"
+    "@webassemblyjs/wasm-opt" "1.9.0"
+    "@webassemblyjs/wasm-parser" "1.9.0"
+    "@webassemblyjs/wast-printer" "1.9.0"
+
+"@webassemblyjs/wasm-gen@1.9.0":
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.9.0.tgz#50bc70ec68ded8e2763b01a1418bf43491a7a49c"
+  integrity sha512-cPE3o44YzOOHvlsb4+E9qSqjc9Qf9Na1OO/BHFy4OI91XDE14MjFN4lTMezzaIWdPqHnsTodGGNP+iRSYfGkjA==
+  dependencies:
+    "@webassemblyjs/ast" "1.9.0"
+    "@webassemblyjs/helper-wasm-bytecode" "1.9.0"
+    "@webassemblyjs/ieee754" "1.9.0"
+    "@webassemblyjs/leb128" "1.9.0"
+    "@webassemblyjs/utf8" "1.9.0"
+
+"@webassemblyjs/wasm-opt@1.9.0":
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.9.0.tgz#2211181e5b31326443cc8112eb9f0b9028721a61"
+  integrity sha512-Qkjgm6Anhm+OMbIL0iokO7meajkzQD71ioelnfPEj6r4eOFuqm4YC3VBPqXjFyyNwowzbMD+hizmprP/Fwkl2A==
+  dependencies:
+    "@webassemblyjs/ast" "1.9.0"
+    "@webassemblyjs/helper-buffer" "1.9.0"
+    "@webassemblyjs/wasm-gen" "1.9.0"
+    "@webassemblyjs/wasm-parser" "1.9.0"
+
+"@webassemblyjs/wasm-parser@1.9.0":
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.9.0.tgz#9d48e44826df4a6598294aa6c87469d642fff65e"
+  integrity sha512-9+wkMowR2AmdSWQzsPEjFU7njh8HTO5MqO8vjwEHuM+AMHioNqSBONRdr0NQQ3dVQrzp0s8lTcYqzUdb7YgELA==
+  dependencies:
+    "@webassemblyjs/ast" "1.9.0"
+    "@webassemblyjs/helper-api-error" "1.9.0"
+    "@webassemblyjs/helper-wasm-bytecode" "1.9.0"
+    "@webassemblyjs/ieee754" "1.9.0"
+    "@webassemblyjs/leb128" "1.9.0"
+    "@webassemblyjs/utf8" "1.9.0"
+
+"@webassemblyjs/wast-parser@1.9.0":
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-parser/-/wast-parser-1.9.0.tgz#3031115d79ac5bd261556cecc3fa90a3ef451914"
+  integrity sha512-qsqSAP3QQ3LyZjNC/0jBJ/ToSxfYJ8kYyuiGvtn/8MK89VrNEfwj7BPQzJVHi0jGTRK2dGdJ5PRqhtjzoww+bw==
+  dependencies:
+    "@webassemblyjs/ast" "1.9.0"
+    "@webassemblyjs/floating-point-hex-parser" "1.9.0"
+    "@webassemblyjs/helper-api-error" "1.9.0"
+    "@webassemblyjs/helper-code-frame" "1.9.0"
+    "@webassemblyjs/helper-fsm" "1.9.0"
     "@xtuc/long" "4.2.2"
 
-"@webassemblyjs/wast-printer@1.8.5":
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.8.5.tgz#114bbc481fd10ca0e23b3560fa812748b0bae5bc"
-  integrity sha512-w0U0pD4EhlnvRyeJzBqaVSJAo9w/ce7/WPogeXLzGkO6hzhr4GnQIZ4W4uUt5b9ooAaXPtnXlj0gzsXEOUNYMg==
+"@webassemblyjs/wast-printer@1.9.0":
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.9.0.tgz#4935d54c85fef637b00ce9f52377451d00d47899"
+  integrity sha512-2J0nE95rHXHyQ24cWjMKJ1tqB/ds8z/cyeOZxJhcb+rW+SQASVjuznUSmdz5GpVJTzU8JkhYut0D3siFDD6wsA==
   dependencies:
-    "@webassemblyjs/ast" "1.8.5"
-    "@webassemblyjs/wast-parser" "1.8.5"
+    "@webassemblyjs/ast" "1.9.0"
+    "@webassemblyjs/wast-parser" "1.9.0"
     "@xtuc/long" "4.2.2"
 
 "@wildpeaks/snapshot-dom@1.6.0":
@@ -1195,10 +1246,10 @@ am-i-a-dependency@1.1.2:
   resolved "https://registry.yarnpkg.com/am-i-a-dependency/-/am-i-a-dependency-1.1.2.tgz#f9d3422304d6f642f821e4c407565035f6167f1f"
   integrity sha1-+dNCIwTW9kL4IeTEB1ZQNfYWfx8=
 
-ansi-escapes@^1.0.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-1.4.0.tgz#d3a8a83b319aa67793662b13e761c7911422306e"
-  integrity sha1-06ioOzGapneTZisT52HHkRQiMG4=
+ansi-escapes@^3.0.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.2.0.tgz#8780b98ff9dbf5638152d1f1fe5c1d7b4442976b"
+  integrity sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==
 
 ansi-regex@^2.0.0:
   version "2.1.1"
@@ -1215,6 +1266,11 @@ ansi-regex@^4.1.0:
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.0.tgz#8b9f8f08cf1acb843756a839ca8c7e3168c51997"
   integrity sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==
 
+ansi-regex@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.0.tgz#388539f55179bf39339c81af30a654d69f87cb75"
+  integrity sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==
+
 ansi-styles@^2.0.1, ansi-styles@^2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
@@ -1227,6 +1283,19 @@ ansi-styles@^3.2.1:
   dependencies:
     color-convert "^1.9.0"
 
+ansi-styles@^4.1.0:
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.2.1.tgz#90ae75c424d008d2624c5bf29ead3177ebfcf359"
+  integrity sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==
+  dependencies:
+    "@types/color-name" "^1.1.1"
+    color-convert "^2.0.1"
+
+any-observable@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/any-observable/-/any-observable-0.3.0.tgz#af933475e5806a67d0d7df090dd5e8bef65d119b"
+  integrity sha512-/FQM1EDkTsf63Ub2C6O7GuYFDsSXUwsaZDurV0np41ocwq0jthUAYCmhBX9f+KwlaCgIuWyr/4WlUQUBfKfZog==
+
 any-promise@^1.0.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/any-promise/-/any-promise-1.3.0.tgz#abc6afeedcea52e809cdc0376aed3ce39635d17f"
@@ -1240,7 +1309,7 @@ anymatch@^2.0.0:
     micromatch "^3.1.4"
     normalize-path "^2.1.1"
 
-aproba@^1.0.3, aproba@^1.1.1:
+aproba@^1.1.1:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a"
   integrity sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==
@@ -1250,14 +1319,6 @@ arch@2.1.1:
   resolved "https://registry.yarnpkg.com/arch/-/arch-2.1.1.tgz#8f5c2731aa35a30929221bb0640eed65175ec84e"
   integrity sha512-BLM56aPo9vLLFVa8+/+pJLnrZ7QGGTVHWsCwieAWT9o9K8UeGaQbzZbGoabWLOo2ksBCztoXdqBZBplqLDDCSg==
 
-are-we-there-yet@~1.1.2:
-  version "1.1.5"
-  resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz#4b35c2944f062a8bfcda66410760350fe9ddfc21"
-  integrity sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==
-  dependencies:
-    delegates "^1.0.0"
-    readable-stream "^2.0.6"
-
 argparse@^1.0.7:
   version "1.0.10"
   resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911"
@@ -1338,12 +1399,10 @@ async-each@^1.0.1:
   resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.3.tgz#b727dbf87d7651602f06f4d4ac387f47d91b0cbf"
   integrity sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ==
 
-async@2.6.1:
-  version "2.6.1"
-  resolved "https://registry.yarnpkg.com/async/-/async-2.6.1.tgz#b245a23ca71930044ec53fa46aa00a3e87c6a610"
-  integrity sha512-fNEiL2+AZt6AlAw/29Cr0UDe4sRAHCpEHh54WMz+Bb7QfNcFw4h3loofyJpLeQs4Yx7yuqu/2dLgM5hKOs6HlQ==
-  dependencies:
-    lodash "^4.17.10"
+async@^3.1.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/async/-/async-3.2.0.tgz#b3a2685c5ebb641d3de02d161002c60fc9f85720"
+  integrity sha512-TR2mEZFVOj2pLStYxLht7TyfuRzaydfpxr3k9RpHIzMgw7A64dzsdqCxH1WJyQdoe8T10nDXd9wnEigmiuHIZw==
 
 asynckit@^0.4.0:
   version "0.4.0"
@@ -1447,11 +1506,6 @@ bindings@^1.5.0:
   dependencies:
     file-uri-to-path "1.0.0"
 
-bluebird@3.5.0:
-  version "3.5.0"
-  resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.0.tgz#791420d7f551eea2897453a8a77653f96606d67c"
-  integrity sha1-eRQg1/VR7qKJdFOop3ZT+WYG1nw=
-
 bluebird@3.5.3:
   version "3.5.3"
   resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.3.tgz#7d01c6f9616c9a51ab0f8c549a79dfe6ec33efa7"
@@ -1462,7 +1516,7 @@ bluebird@3.7.1:
   resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.1.tgz#df70e302b471d7473489acf26a93d63b53f874de"
   integrity sha512-DdmyoGCleJnkbp3nkbxTLJ18rjDsE4yCggEwKNXkeV123sPNfOCYeDoeuOY+F2FrSjO1YXcTU+dsy96KMy+gcg==
 
-bluebird@^3.4.1, bluebird@^3.5.5:
+bluebird@3.7.2, bluebird@^3.4.1, bluebird@^3.5.5:
   version "3.7.2"
   resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f"
   integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==
@@ -1781,12 +1835,10 @@ cached-path-relative@^1.0.0, cached-path-relative@^1.0.2:
   resolved "https://registry.yarnpkg.com/cached-path-relative/-/cached-path-relative-1.0.2.tgz#a13df4196d26776220cc3356eb147a52dba2c6db"
   integrity sha512-5r2GqsoEb4qMTTN9J+WzXfjov+hjxT+j3u5K+kIVNIwAd99DLCJE9pBIMP1qVeybV6JiijL385Oz0DcYxfbOIg==
 
-cachedir@1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/cachedir/-/cachedir-1.3.0.tgz#5e01928bf2d95b5edd94b0942188246740e0dbc4"
-  integrity sha512-O1ji32oyON9laVPJL1IZ5bmwd2cB46VfpxkDequezH+15FDzzVddEyrGEeX4WusDSqKxdyFdDQDEG1yo1GoWkg==
-  dependencies:
-    os-homedir "^1.0.1"
+cachedir@2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/cachedir/-/cachedir-2.3.0.tgz#0c75892a052198f0b21c7c1804d8331edfcae0e8"
+  integrity sha512-A+Fezp4zxnit6FanDmv9EqXNAi3vt9DWp51/71UEhXukb7QUuvtv9344h91dyAxuTLoSYJFU299qzR3tzwPAhw==
 
 caniuse-lite@^1.0.30001023:
   version "1.0.30001027"
@@ -1810,7 +1862,7 @@ chai@^4.1.2:
     pathval "^1.1.0"
     type-detect "^4.0.5"
 
-chalk@2.4.2, chalk@^2.0.0, chalk@^2.0.1, chalk@^2.3.0:
+chalk@2.4.2, chalk@^2.0.0, chalk@^2.3.0, chalk@^2.4.1, chalk@^2.4.2:
   version "2.4.2"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
   integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
@@ -1830,6 +1882,14 @@ chalk@^1.0.0, chalk@^1.1.1, chalk@^1.1.3:
     strip-ansi "^3.0.0"
     supports-color "^2.0.0"
 
+chalk@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-3.0.0.tgz#3f73c2bf526591f574cc492c51e2456349f844e4"
+  integrity sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==
+  dependencies:
+    ansi-styles "^4.1.0"
+    supports-color "^7.1.0"
+
 check-error@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/check-error/-/check-error-1.0.2.tgz#574d312edd88bb5dd8912e9286dd6c0aed4aac82"
@@ -1871,10 +1931,10 @@ chrome-trace-event@^1.0.2:
   dependencies:
     tslib "^1.9.0"
 
-ci-info@^1.5.0:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-1.6.0.tgz#2ca20dbb9ceb32d4524a683303313f0304b1e497"
-  integrity sha512-vsGdkwSCDpWmP80ncATX7iea5DWQemg1UgCW5J8tqjU3lYw4FBYuj89J0CTVomA7BEfvSZd84GmHko+MxFQU2A==
+ci-info@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-2.0.0.tgz#67a9e964be31a51e15e5010d58e6f12834002f46"
+  integrity sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==
 
 cipher-base@^1.0.0, cipher-base@^1.0.1, cipher-base@^1.0.3:
   version "1.0.4"
@@ -1901,10 +1961,34 @@ cli-cursor@^1.0.2:
   dependencies:
     restore-cursor "^1.0.1"
 
-cli-spinners@^0.1.2:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-0.1.2.tgz#bb764d88e185fb9e1e6a2a1f19772318f605e31c"
-  integrity sha1-u3ZNiOGF+54eaiofGXcjGPYF4xw=
+cli-cursor@^2.0.0, cli-cursor@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-2.1.0.tgz#b35dac376479facc3e94747d41d0d0f5238ffcb5"
+  integrity sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=
+  dependencies:
+    restore-cursor "^2.0.0"
+
+cli-cursor@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-3.1.0.tgz#264305a7ae490d1d03bf0c9ba7c925d1753af307"
+  integrity sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==
+  dependencies:
+    restore-cursor "^3.1.0"
+
+cli-spinners@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-2.2.0.tgz#e8b988d9206c692302d8ee834e7a85c0144d8f77"
+  integrity sha512-tgU3fKwzYjiLEQgPMD9Jt+JjHVL9kW93FiIMX/l7rivvOD4/LL0Mf7gda3+4U2KJBloybwgj5KEoQgGRioMiKQ==
+
+cli-table3@0.5.1:
+  version "0.5.1"
+  resolved "https://registry.yarnpkg.com/cli-table3/-/cli-table3-0.5.1.tgz#0252372d94dfc40dbd8df06005f48f31f656f202"
+  integrity sha512-7Qg2Jrep1S/+Q3EceiZtQcDPWxhAvBw+ERf1162v4sikJrvojMHFqXt8QIVha8UlH9rgU0BeWPytZ9/TzYqlUw==
+  dependencies:
+    object-assign "^4.1.0"
+    string-width "^2.1.1"
+  optionalDependencies:
+    colors "^1.1.2"
 
 cli-table@^0.3.1:
   version "0.3.1"
@@ -1921,6 +2005,11 @@ cli-truncate@^0.2.1:
     slice-ansi "0.0.4"
     string-width "^1.0.1"
 
+clone@^1.0.2:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.4.tgz#da309cc263df15994c688ca902179ca3c7cd7c7e"
+  integrity sha1-2jCcwmPfFZlMaIypAheco8fNfH4=
+
 code-point-at@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
@@ -1954,11 +2043,23 @@ color-convert@^1.9.0:
   dependencies:
     color-name "1.1.3"
 
+color-convert@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3"
+  integrity sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==
+  dependencies:
+    color-name "~1.1.4"
+
 color-name@1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
   integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=
 
+color-name@~1.1.4:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
+  integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
+
 colors@1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/colors/-/colors-1.0.3.tgz#0433f44d809680fdeb60ed260f1b0c262e82a40b"
@@ -1986,10 +2087,10 @@ combined-stream@^1.0.6, combined-stream@~1.0.6:
   dependencies:
     delayed-stream "~1.0.0"
 
-commander@2.15.1:
-  version "2.15.1"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-2.15.1.tgz#df46e867d0fc2aec66a34662b406a9ccafff5b0f"
-  integrity sha512-VlfT9F3V0v+jr4yxPc5gg9s62/fIVWsd2Bk2iD435um1NlGMYdVCq+MjcXnhYq2icNOizHr1kK+5TI6H0Hy0ag==
+commander@4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-4.1.0.tgz#545983a0603fe425bc672d66c9e3c89c42121a83"
+  integrity sha512-NIQrwvv9V39FHgGFm36+U9SMQzbiHvU79k+iADraJTpmrFFfx7Ds0IvDoAdZsDrknlkRk14OYoWXb57uTh7/sw==
 
 commander@^2.19.0, commander@^2.20.0, commander@^2.9.0:
   version "2.20.3"
@@ -2039,11 +2140,6 @@ console-browserify@^1.1.0:
   resolved "https://registry.yarnpkg.com/console-browserify/-/console-browserify-1.2.0.tgz#67063cef57ceb6cf4993a2ab3a55840ae8c49336"
   integrity sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA==
 
-console-control-strings@^1.0.0, console-control-strings@~1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e"
-  integrity sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=
-
 constants-browserify@^1.0.0, constants-browserify@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/constants-browserify/-/constants-browserify-1.0.0.tgz#c20b96d8c617748aaf1c16021760cd27fcb8cb75"
@@ -2242,42 +2338,45 @@ cypress-cucumber-preprocessor@^2.0.1:
     minimist "^1.2.0"
     through "^2.3.8"
 
-cypress@^3.5.0:
-  version "3.8.3"
-  resolved "https://registry.yarnpkg.com/cypress/-/cypress-3.8.3.tgz#e921f5482f1cbe5814891c878f26e704bbffd8f4"
-  integrity sha512-I9L/d+ilTPPA4vq3NC1OPKmw7jJIpMKNdyfR8t1EXYzYCjyqbc59migOm1YSse/VRbISLJ+QGb5k4Y3bz2lkYw==
+cypress@^4.2.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/cypress/-/cypress-4.2.0.tgz#45673fb648b1a77b9a78d73e58b89ed05212d243"
+  integrity sha512-8LdreL91S/QiTCLYLNbIjLL8Ht4fJmu/4HGLxUI20Tc7JSfqEfCmXELrRfuPT0kjosJwJJZacdSji9XSRkPKUw==
   dependencies:
     "@cypress/listr-verbose-renderer" "0.4.1"
     "@cypress/xvfb" "1.2.4"
     "@types/sizzle" "2.3.2"
     arch "2.1.1"
-    bluebird "3.5.0"
-    cachedir "1.3.0"
+    bluebird "3.7.2"
+    cachedir "2.3.0"
     chalk "2.4.2"
     check-more-types "2.24.0"
-    commander "2.15.1"
+    cli-table3 "0.5.1"
+    commander "4.1.0"
     common-tags "1.8.0"
-    debug "3.2.6"
+    debug "4.1.1"
     eventemitter2 "4.1.2"
-    execa "0.10.0"
+    execa "1.0.0"
     executable "4.1.1"
     extract-zip "1.6.7"
-    fs-extra "5.0.0"
-    getos "3.1.1"
-    is-ci "1.2.1"
+    fs-extra "8.1.0"
+    getos "3.1.4"
+    is-ci "2.0.0"
     is-installed-globally "0.1.0"
     lazy-ass "1.6.0"
-    listr "0.12.0"
+    listr "0.14.3"
     lodash "4.17.15"
-    log-symbols "2.2.0"
-    minimist "1.2.0"
+    log-symbols "3.0.0"
+    minimist "1.2.2"
     moment "2.24.0"
-    ramda "0.24.1"
-    request "2.88.0"
+    ospath "1.2.2"
+    pretty-bytes "5.3.0"
+    ramda "0.26.1"
+    request cypress-io/request#b5af0d1fa47eec97ba980cde90a13e69a2afcd16
     request-progress "3.0.0"
-    supports-color "5.5.0"
+    supports-color "7.1.0"
     tmp "0.1.0"
-    untildify "3.0.3"
+    untildify "4.0.0"
     url "0.11.0"
     yauzl "2.10.0"
 
@@ -2320,13 +2419,6 @@ debug@3.1.0:
   dependencies:
     ms "2.0.0"
 
-debug@3.2.6, debug@^3.0.1, debug@^3.1.0, debug@^3.2.6:
-  version "3.2.6"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b"
-  integrity sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==
-  dependencies:
-    ms "^2.1.1"
-
 debug@4.1.1, debug@^4.1.0:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.1.tgz#3b72260255109c6b589cee050f1d516139664791"
@@ -2334,6 +2426,13 @@ debug@4.1.1, debug@^4.1.0:
   dependencies:
     ms "^2.1.1"
 
+debug@^3.0.1, debug@^3.1.0:
+  version "3.2.6"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b"
+  integrity sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==
+  dependencies:
+    ms "^2.1.1"
+
 decode-uri-component@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545"
@@ -2346,10 +2445,12 @@ deep-eql@^3.0.1:
   dependencies:
     type-detect "^4.0.0"
 
-deep-extend@^0.6.0:
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac"
-  integrity sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==
+defaults@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/defaults/-/defaults-1.0.3.tgz#c656051e9817d9ff08ed881477f3fe4019f3ef7d"
+  integrity sha1-xlYFHpgX2f8I7YgUd/P+QBnz730=
+  dependencies:
+    clone "^1.0.2"
 
 define-properties@^1.1.2:
   version "1.1.3"
@@ -2390,11 +2491,6 @@ delayed-stream@~1.0.0:
   resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
   integrity sha1-3zrhmayt+31ECqrgsp4icrJOxhk=
 
-delegates@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a"
-  integrity sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=
-
 deps-sort@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/deps-sort/-/deps-sort-2.0.1.tgz#9dfdc876d2bcec3386b6829ac52162cda9fa208d"
@@ -2413,11 +2509,6 @@ des.js@^1.0.0:
     inherits "^2.0.1"
     minimalistic-assert "^1.0.0"
 
-detect-libc@^1.0.2:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"
-  integrity sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=
-
 detective@^5.2.0:
   version "5.2.0"
   resolved "https://registry.yarnpkg.com/detective/-/detective-5.2.0.tgz#feb2a77e85b904ecdea459ad897cc90a99bd2a7b"
@@ -2651,13 +2742,13 @@ evp_bytestokey@^1.0.0, evp_bytestokey@^1.0.3:
     md5.js "^1.3.4"
     safe-buffer "^5.1.1"
 
-execa@0.10.0:
-  version "0.10.0"
-  resolved "https://registry.yarnpkg.com/execa/-/execa-0.10.0.tgz#ff456a8f53f90f8eccc71a96d11bdfc7f082cb50"
-  integrity sha512-7XOMnz8Ynx1gGo/3hyV9loYNPWM94jG3+3T3Y8tsfSstFmETmENCMU/A/zj8Lyaj1lkgEepKepvd6240tBRvlw==
+execa@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/execa/-/execa-1.0.0.tgz#c6236a5bb4df6d6f15e88e7f017798216749ddd8"
+  integrity sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==
   dependencies:
     cross-spawn "^6.0.0"
-    get-stream "^3.0.0"
+    get-stream "^4.0.0"
     is-stream "^1.1.0"
     npm-run-path "^2.0.0"
     p-finally "^1.0.0"
@@ -2784,7 +2875,7 @@ figgy-pudding@^3.5.1:
   resolved "https://registry.yarnpkg.com/figgy-pudding/-/figgy-pudding-3.5.1.tgz#862470112901c727a0e495a80744bd5baa1d6790"
   integrity sha512-vNKxJHTEKNThjfrdJwHc7brvM6eVevuO5nTj6ez8ZQ1qbXTvGthucRF7S4vf2cr71QVnT70V34v0S1DyQsti0w==
 
-figures@2.0.0:
+figures@2.0.0, figures@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/figures/-/figures-2.0.0.tgz#3ab1a2d2a62c8bfb431a0c94cb797a2fce27c962"
   integrity sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=
@@ -2889,15 +2980,6 @@ from2@^2.1.0:
     inherits "^2.0.1"
     readable-stream "^2.0.0"
 
-fs-extra@5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-5.0.0.tgz#414d0110cdd06705734d055652c5411260c31abd"
-  integrity sha512-66Pm4RYbjzdyeuqudYqhFiNBbCIuI9kgRqLPSHIlXHidW8NIQtVdkM1yeZ4lXwuhbTETv3EUGMNHAAw6hiundQ==
-  dependencies:
-    graceful-fs "^4.1.2"
-    jsonfile "^4.0.0"
-    universalify "^0.1.0"
-
 fs-extra@7.0.1:
   version "7.0.1"
   resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-7.0.1.tgz#4f189c44aa123b895f722804f55ea23eadc348e9"
@@ -2907,12 +2989,14 @@ fs-extra@7.0.1:
     jsonfile "^4.0.0"
     universalify "^0.1.0"
 
-fs-minipass@^1.2.5:
-  version "1.2.7"
-  resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.7.tgz#ccff8570841e7fe4265693da88936c55aed7f7c7"
-  integrity sha512-GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA==
+fs-extra@8.1.0:
+  version "8.1.0"
+  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-8.1.0.tgz#49d43c45a88cd9677668cb7be1b46efdb8d2e1c0"
+  integrity sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==
   dependencies:
-    minipass "^2.6.0"
+    graceful-fs "^4.2.0"
+    jsonfile "^4.0.0"
+    universalify "^0.1.0"
 
 fs-write-stream-atomic@^1.0.8:
   version "1.0.10"
@@ -2942,20 +3026,6 @@ function-bind@^1.1.1:
   resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
   integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==
 
-gauge@~2.7.3:
-  version "2.7.4"
-  resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7"
-  integrity sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=
-  dependencies:
-    aproba "^1.0.3"
-    console-control-strings "^1.0.0"
-    has-unicode "^2.0.0"
-    object-assign "^4.1.0"
-    signal-exit "^3.0.0"
-    string-width "^1.0.1"
-    strip-ansi "^3.0.1"
-    wide-align "^1.1.0"
-
 gensync@^1.0.0-beta.1:
   version "1.0.0-beta.1"
   resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.1.tgz#58f4361ff987e5ff6e1e7a210827aa371eaac269"
@@ -2971,22 +3041,24 @@ get-func-name@^2.0.0:
   resolved "https://registry.yarnpkg.com/get-func-name/-/get-func-name-2.0.0.tgz#ead774abee72e20409433a066366023dd6887a41"
   integrity sha1-6td0q+5y4gQJQzoGY2YCPdaIekE=
 
-get-stream@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-3.0.0.tgz#8e943d1358dc37555054ecbe2edb05aa174ede14"
-  integrity sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=
+get-stream@^4.0.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-4.1.0.tgz#c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5"
+  integrity sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==
+  dependencies:
+    pump "^3.0.0"
 
 get-value@^2.0.3, get-value@^2.0.6:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28"
   integrity sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=
 
-getos@3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/getos/-/getos-3.1.1.tgz#967a813cceafee0156b0483f7cffa5b3eff029c5"
-  integrity sha512-oUP1rnEhAr97rkitiszGP9EgDVYnmchgFzfqRzSkgtfv7ai6tEi7Ko8GgjNXts7VLWEqrTWyhsOKLe5C5b/Zkg==
+getos@3.1.4:
+  version "3.1.4"
+  resolved "https://registry.yarnpkg.com/getos/-/getos-3.1.4.tgz#29cdf240ed10a70c049add7b6f8cb08c81876faf"
+  integrity sha512-UORPzguEB/7UG5hqiZai8f0vQ7hzynMQyJLxStoQ8dPGAcmgsfXOPA4iE/fGtweHYkK+z4zc9V0g+CIFRf5HYw==
   dependencies:
-    async "2.6.1"
+    async "^3.1.0"
 
 getpass@^0.1.1:
   version "0.1.7"
@@ -3032,7 +3104,7 @@ globals@^11.1.0:
   resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e"
   integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==
 
-graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6:
+graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0:
   version "4.2.3"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.3.tgz#4a12ff1b60376ef09862c2093edd908328be8423"
   integrity sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ==
@@ -3042,7 +3114,7 @@ har-schema@^2.0.0:
   resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92"
   integrity sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=
 
-har-validator@~5.1.0:
+har-validator@~5.1.3:
   version "5.1.3"
   resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.3.tgz#1ef89ebd3e4996557675eed9893110dc350fa080"
   integrity sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==
@@ -3062,16 +3134,16 @@ has-flag@^3.0.0:
   resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
   integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0=
 
+has-flag@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b"
+  integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==
+
 has-symbols@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.1.tgz#9f5214758a44196c406d9bd76cebf81ec2dd31e8"
   integrity sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==
 
-has-unicode@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9"
-  integrity sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=
-
 has-value@^0.3.1:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/has-value/-/has-value-0.3.1.tgz#7b1f58bada62ca827ec0a2078025654845995e1f"
@@ -3154,13 +3226,6 @@ https-browserify@^1.0.0:
   resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-1.0.0.tgz#ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73"
   integrity sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM=
 
-iconv-lite@^0.4.4:
-  version "0.4.24"
-  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
-  integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==
-  dependencies:
-    safer-buffer ">= 2.1.2 < 3"
-
 ieee754@^1.1.4:
   version "1.1.13"
   resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.13.tgz#ec168558e95aa181fd87d37f55c32bbcb6708b84"
@@ -3171,25 +3236,11 @@ iferr@^0.1.5:
   resolved "https://registry.yarnpkg.com/iferr/-/iferr-0.1.5.tgz#c60eed69e6d8fdb6b3104a1fcbca1c192dc5b501"
   integrity sha1-xg7taebY/bazEEofy8ocGS3FtQE=
 
-ignore-walk@^3.0.1:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-3.0.3.tgz#017e2447184bfeade7c238e4aefdd1e8f95b1e37"
-  integrity sha512-m7o6xuOaT1aqheYHKf8W6J5pYH85ZI9w077erOzLje3JsB1gkafkAhHHY19dqjulgIZHFm32Cp5uNZgcQqdJKw==
-  dependencies:
-    minimatch "^3.0.4"
-
 imurmurhash@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
   integrity sha1-khi5srkoojixPcT7a21XbyMUU+o=
 
-indent-string@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-2.1.0.tgz#8e2d48348742121b4a8218b7a137e9a52049dc80"
-  integrity sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=
-  dependencies:
-    repeating "^2.0.0"
-
 indent-string@^3.0.0, indent-string@^3.1.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-3.2.0.tgz#4a5fd6d27cc332f37e5419a504dbb837105c9289"
@@ -3223,7 +3274,7 @@ inherits@2.0.3:
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
   integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=
 
-ini@^1.3.4, ini@~1.3.0:
+ini@^1.3.4:
   version "1.3.5"
   resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927"
   integrity sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==
@@ -3289,12 +3340,12 @@ is-buffer@^1.1.0, is-buffer@^1.1.5:
   resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
   integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==
 
-is-ci@1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-1.2.1.tgz#e3779c8ee17fccf428488f6e281187f2e632841c"
-  integrity sha512-s6tfsaQaQi3JNciBH6shVqEDvhGut0SUXr31ag8Pd8BBbVVlcGfWhpPmEOoM6RJ5TFhbypvf5yyRw/VXW1IiWg==
+is-ci@2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-2.0.0.tgz#6bc6334181810e04b5c22b3d589fdca55026404c"
+  integrity sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w==
   dependencies:
-    ci-info "^1.5.0"
+    ci-info "^2.0.0"
 
 is-data-descriptor@^0.1.4:
   version "0.1.4"
@@ -3350,11 +3401,6 @@ is-extglob@^2.1.0, is-extglob@^2.1.1:
   resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
   integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=
 
-is-finite@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/is-finite/-/is-finite-1.1.0.tgz#904135c77fb42c0641d6aa1bcdbc4daa8da082f3"
-  integrity sha512-cdyMtqX/BOqqNBBiKlIVkytNHm49MtMlYyn1zxzvJKWmFMlGzm+ry5BBfYyeY9YmNKbRSo/o7OX9w9ale0wg3w==
-
 is-fullwidth-code-point@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb"
@@ -3394,6 +3440,11 @@ is-installed-globally@0.1.0:
     global-dirs "^0.1.0"
     is-path-inside "^1.0.0"
 
+is-interactive@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-interactive/-/is-interactive-1.0.0.tgz#cea6e6ae5c870a7b0a0004070b7b587e0252912e"
+  integrity sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==
+
 is-number@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195"
@@ -3406,6 +3457,13 @@ is-number@^7.0.0:
   resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b"
   integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==
 
+is-observable@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/is-observable/-/is-observable-1.1.0.tgz#b3e986c8f44de950867cab5403f5a3465005975e"
+  integrity sha512-NqCa4Sa2d+u7BWc6CukaObG3Fh+CU9bvixbpcXYhy2VvYS7vVGIdAgnIS5Ks3A/cqk4rebLJ9s8zBstT2aKnIA==
+  dependencies:
+    symbol-observable "^1.1.0"
+
 is-path-inside@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-1.0.1.tgz#8ef5b7de50437a3fdca6b4e865ef7aa55cb48036"
@@ -3655,10 +3713,10 @@ listr-silent-renderer@^1.1.1:
   resolved "https://registry.yarnpkg.com/listr-silent-renderer/-/listr-silent-renderer-1.1.1.tgz#924b5a3757153770bf1a8e3fbf74b8bbf3f9242e"
   integrity sha1-kktaN1cVN3C/Go4/v3S4u/P5JC4=
 
-listr-update-renderer@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/listr-update-renderer/-/listr-update-renderer-0.2.0.tgz#ca80e1779b4e70266807e8eed1ad6abe398550f9"
-  integrity sha1-yoDhd5tOcCZoB+ju0a1qvjmFUPk=
+listr-update-renderer@^0.5.0:
+  version "0.5.0"
+  resolved "https://registry.yarnpkg.com/listr-update-renderer/-/listr-update-renderer-0.5.0.tgz#4ea8368548a7b8aecb7e06d8c95cb45ae2ede6a2"
+  integrity sha512-tKRsZpKz8GSGqoI/+caPmfrypiaq+OQCbd+CovEC24uk1h952lVj5sC7SqyFUm+OaJ5HN/a1YLt5cit2FMNsFA==
   dependencies:
     chalk "^1.1.3"
     cli-truncate "^0.2.1"
@@ -3666,40 +3724,33 @@ listr-update-renderer@^0.2.0:
     figures "^1.7.0"
     indent-string "^3.0.0"
     log-symbols "^1.0.2"
-    log-update "^1.0.2"
+    log-update "^2.3.0"
     strip-ansi "^3.0.1"
 
-listr-verbose-renderer@^0.4.0:
-  version "0.4.1"
-  resolved "https://registry.yarnpkg.com/listr-verbose-renderer/-/listr-verbose-renderer-0.4.1.tgz#8206f4cf6d52ddc5827e5fd14989e0e965933a35"
-  integrity sha1-ggb0z21S3cWCfl/RSYng6WWTOjU=
+listr-verbose-renderer@^0.5.0:
+  version "0.5.0"
+  resolved "https://registry.yarnpkg.com/listr-verbose-renderer/-/listr-verbose-renderer-0.5.0.tgz#f1132167535ea4c1261102b9f28dac7cba1e03db"
+  integrity sha512-04PDPqSlsqIOaaaGZ+41vq5FejI9auqTInicFRndCBgE3bXG8D6W1I+mWhk+1nqbHmyhla/6BUrd5OSiHwKRXw==
   dependencies:
-    chalk "^1.1.3"
-    cli-cursor "^1.0.2"
+    chalk "^2.4.1"
+    cli-cursor "^2.1.0"
     date-fns "^1.27.2"
-    figures "^1.7.0"
+    figures "^2.0.0"
 
-listr@0.12.0:
-  version "0.12.0"
-  resolved "https://registry.yarnpkg.com/listr/-/listr-0.12.0.tgz#6bce2c0f5603fa49580ea17cd6a00cc0e5fa451a"
-  integrity sha1-a84sD1YD+klYDqF81qAMwOX6RRo=
+listr@0.14.3:
+  version "0.14.3"
+  resolved "https://registry.yarnpkg.com/listr/-/listr-0.14.3.tgz#2fea909604e434be464c50bddba0d496928fa586"
+  integrity sha512-RmAl7su35BFd/xoMamRjpIE4j3v+L28o8CT5YhAXQJm1fD+1l9ngXY8JAQRJ+tFK2i5njvi0iRUKV09vPwA0iA==
   dependencies:
-    chalk "^1.1.3"
-    cli-truncate "^0.2.1"
-    figures "^1.7.0"
-    indent-string "^2.1.0"
+    "@samverschueren/stream-to-observable" "^0.3.0"
+    is-observable "^1.1.0"
     is-promise "^2.1.0"
     is-stream "^1.1.0"
     listr-silent-renderer "^1.1.1"
-    listr-update-renderer "^0.2.0"
-    listr-verbose-renderer "^0.4.0"
-    log-symbols "^1.0.2"
-    log-update "^1.0.2"
-    ora "^0.2.3"
-    p-map "^1.1.1"
-    rxjs "^5.0.0-beta.11"
-    stream-to-observable "^0.1.0"
-    strip-ansi "^3.0.1"
+    listr-update-renderer "^0.5.0"
+    listr-verbose-renderer "^0.5.0"
+    p-map "^2.0.0"
+    rxjs "^6.3.3"
 
 loader-runner@^2.4.0:
   version "2.4.0"
@@ -3738,17 +3789,17 @@ lodash.once@^4.1.1:
   resolved "https://registry.yarnpkg.com/lodash.once/-/lodash.once-4.1.1.tgz#0dd3971213c7c56df880977d504c88fb471a97ac"
   integrity sha1-DdOXEhPHxW34gJd9UEyI+0cal6w=
 
-lodash@4.17.15, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.13, lodash@^4.17.4:
+lodash@4.17.15, lodash@^4.17.11, lodash@^4.17.13, lodash@^4.17.15, lodash@^4.17.4:
   version "4.17.15"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548"
   integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==
 
-log-symbols@2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-2.2.0.tgz#5740e1c5d6f0dfda4ad9323b5332107ef6b4c40a"
-  integrity sha512-VeIAFslyIerEJLXHziedo2basKbMKtTw3vfn5IzG0XTjhAVEJyNHnL2p7vc+wBDSdQuUpNw3M2u6xb9QsAY5Eg==
+log-symbols@3.0.0, log-symbols@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-3.0.0.tgz#f3a08516a5dea893336a7dee14d18a1cfdab77c4"
+  integrity sha512-dSkNGuI7iG3mfvDzUuYZyvk5dD9ocYCYzNU6CYDE6+Xqd+gwme6Z00NS3dUh8mq/73HaEtT7m6W+yUPtU6BZnQ==
   dependencies:
-    chalk "^2.0.1"
+    chalk "^2.4.2"
 
 log-symbols@^1.0.2:
   version "1.0.2"
@@ -3757,13 +3808,14 @@ log-symbols@^1.0.2:
   dependencies:
     chalk "^1.0.0"
 
-log-update@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/log-update/-/log-update-1.0.2.tgz#19929f64c4093d2d2e7075a1dad8af59c296b8d1"
-  integrity sha1-GZKfZMQJPS0ucHWh2tivWcKWuNE=
+log-update@^2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/log-update/-/log-update-2.3.0.tgz#88328fd7d1ce7938b29283746f0b1bc126b24708"
+  integrity sha1-iDKP19HOeTiykoN0bwsbwSayRwg=
   dependencies:
-    ansi-escapes "^1.0.0"
-    cli-cursor "^1.0.2"
+    ansi-escapes "^3.0.0"
+    cli-cursor "^2.0.0"
+    wrap-ansi "^3.0.1"
 
 loose-envify@^1.0.0:
   version "1.4.0"
@@ -3800,11 +3852,6 @@ make-dir@^2.0.0:
     pify "^4.0.1"
     semver "^5.6.0"
 
-mamacro@^0.0.3:
-  version "0.0.3"
-  resolved "https://registry.yarnpkg.com/mamacro/-/mamacro-0.0.3.tgz#ad2c9576197c9f1abf308d0787865bd975a3f3e4"
-  integrity sha512-qMEwh+UujcQ+kbz3T6V+wAmO2U8veoq2w+3wY8MquqwVA3jChfwY+Tk52GZKDfACEPjuZ7r2oJLejwpt8jtwTA==
-
 map-cache@^0.2.2:
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf"
@@ -3889,6 +3936,16 @@ mime-types@^2.1.12, mime-types@~2.1.19:
   dependencies:
     mime-db "1.43.0"
 
+mimic-fn@^1.0.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.2.0.tgz#820c86a39334640e99516928bd03fca88057d022"
+  integrity sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==
+
+mimic-fn@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b"
+  integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==
+
 minimalistic-assert@^1.0.0, minimalistic-assert@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz#2e194de044626d4a10e7f7fbc00ce73e83e4d5c7"
@@ -3911,25 +3968,20 @@ minimist@0.0.8:
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
   integrity sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=
 
-minimist@1.2.0, minimist@^1.1.0, minimist@^1.1.1, minimist@^1.2.0:
+minimist@1.2.2:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.2.tgz#b00a00230a1108c48c169e69a291aafda3aacd63"
+  integrity sha512-rIqbOrKb8GJmx/5bc2M0QchhUouMXSpd1RTclXsB41JdL+VtnojfaJR+h7F9k18/4kHUsBFgk80Uk+q569vjPA==
+
+minimist@^1.1.0, minimist@^1.1.1, minimist@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
   integrity sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=
 
-minipass@^2.6.0, minipass@^2.8.6, minipass@^2.9.0:
-  version "2.9.0"
-  resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.9.0.tgz#e713762e7d3e32fed803115cf93e04bca9fcc9a6"
-  integrity sha512-wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg==
-  dependencies:
-    safe-buffer "^5.1.2"
-    yallist "^3.0.0"
-
-minizlib@^1.2.1:
-  version "1.3.3"
-  resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.3.3.tgz#2290de96818a34c29551c8a8d301216bd65a861d"
-  integrity sha512-6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q==
-  dependencies:
-    minipass "^2.9.0"
+minimist@^1.2.5:
+  version "1.2.5"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602"
+  integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==
 
 mississippi@^3.0.0:
   version "3.0.0"
@@ -3962,6 +4014,13 @@ mkdirp@0.5.1, mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.1:
   dependencies:
     minimist "0.0.8"
 
+mkdirp@^0.5.3:
+  version "0.5.4"
+  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.4.tgz#fd01504a6797ec5c9be81ff43d204961ed64a512"
+  integrity sha512-iG9AK/dJLtJ0XNgTuDbSyNS3zECqDlAhnQW4CsNxBG3LQJBbHmRX1egw39DmtOdCAqY+dKXV+sgPgilNWUKMVw==
+  dependencies:
+    minimist "^1.2.5"
+
 module-deps@^6.0.0:
   version "6.2.2"
   resolved "https://registry.yarnpkg.com/module-deps/-/module-deps-6.2.2.tgz#d8a15c2265dfc119153c29bb47386987d0ee423b"
@@ -4010,6 +4069,11 @@ ms@^2.1.1:
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
   integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
 
+mute-stream@0.0.8:
+  version "0.0.8"
+  resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.8.tgz#1630c42b2251ff81e2a283de96a5497ea92e5e0d"
+  integrity sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==
+
 mz@^2.4.0:
   version "2.7.0"
   resolved "https://registry.yarnpkg.com/mz/-/mz-2.7.0.tgz#95008057a56cafadc2bc63dde7f9ff6955948e32"
@@ -4041,15 +4105,6 @@ nanomatch@^1.2.9:
     snapdragon "^0.8.1"
     to-regex "^3.0.1"
 
-needle@^2.2.1:
-  version "2.3.2"
-  resolved "https://registry.yarnpkg.com/needle/-/needle-2.3.2.tgz#3342dea100b7160960a450dc8c22160ac712a528"
-  integrity sha512-DUzITvPVDUy6vczKKYTnWc/pBZ0EnjMJnQ3y+Jo5zfKFimJs7S3HFCxCRZYB9FUZcrzUQr3WsmvZgddMEIZv6w==
-  dependencies:
-    debug "^3.2.6"
-    iconv-lite "^0.4.4"
-    sax "^1.2.4"
-
 neo-async@^2.5.0, neo-async@^2.6.1:
   version "2.6.1"
   resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.1.tgz#ac27ada66167fa8849a6addd837f6b189ad2081c"
@@ -4101,22 +4156,6 @@ node-libs-browser@^2.2.1:
     util "^0.11.0"
     vm-browserify "^1.0.1"
 
-node-pre-gyp@*:
-  version "0.14.0"
-  resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.14.0.tgz#9a0596533b877289bcad4e143982ca3d904ddc83"
-  integrity sha512-+CvDC7ZttU/sSt9rFjix/P05iS43qHCOOGzcr3Ry99bXG7VX953+vFyEuph/tfqoYu8dttBkE86JSKBO2OzcxA==
-  dependencies:
-    detect-libc "^1.0.2"
-    mkdirp "^0.5.1"
-    needle "^2.2.1"
-    nopt "^4.0.1"
-    npm-packlist "^1.1.6"
-    npmlog "^4.0.2"
-    rc "^1.2.7"
-    rimraf "^2.6.1"
-    semver "^5.3.0"
-    tar "^4.4.2"
-
 node-releases@^1.1.47:
   version "1.1.48"
   resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.48.tgz#7f647f0c453a0495bcd64cbd4778c26035c2f03a"
@@ -4124,7 +4163,7 @@ node-releases@^1.1.47:
   dependencies:
     semver "^6.3.0"
 
-nopt@^4.0.1, nopt@~4.0.1:
+nopt@~4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.1.tgz#d0d4685afd5415193c8c7505602d0d17cd64474d"
   integrity sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=
@@ -4144,27 +4183,6 @@ normalize-path@^3.0.0:
   resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65"
   integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==
 
-npm-bundled@^1.0.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.1.1.tgz#1edd570865a94cdb1bc8220775e29466c9fb234b"
-  integrity sha512-gqkfgGePhTpAEgUsGEgcq1rqPXA+tv/aVBlgEzfXwA1yiUJF7xtEt3CtVwOjNYQOVknDk0F20w58Fnm3EtG0fA==
-  dependencies:
-    npm-normalize-package-bin "^1.0.1"
-
-npm-normalize-package-bin@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/npm-normalize-package-bin/-/npm-normalize-package-bin-1.0.1.tgz#6e79a41f23fd235c0623218228da7d9c23b8f6e2"
-  integrity sha512-EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA==
-
-npm-packlist@^1.1.6:
-  version "1.4.8"
-  resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.4.8.tgz#56ee6cc135b9f98ad3d51c1c95da22bbb9b2ef3e"
-  integrity sha512-5+AZgwru5IevF5ZdnFglB5wNlHG1AOOuw28WhUq8/8emhBmLv6jX5by4WJCh7lW0uSYZYS6DXqIsyZVIXRZU9A==
-  dependencies:
-    ignore-walk "^3.0.1"
-    npm-bundled "^1.0.1"
-    npm-normalize-package-bin "^1.0.1"
-
 npm-run-path@^2.0.0:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f"
@@ -4172,16 +4190,6 @@ npm-run-path@^2.0.0:
   dependencies:
     path-key "^2.0.0"
 
-npmlog@^4.0.2:
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b"
-  integrity sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==
-  dependencies:
-    are-we-there-yet "~1.1.2"
-    console-control-strings "~1.1.0"
-    gauge "~2.7.3"
-    set-blocking "~2.0.0"
-
 number-is-nan@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
@@ -4247,22 +4255,40 @@ onetime@^1.0.0:
   resolved "https://registry.yarnpkg.com/onetime/-/onetime-1.1.0.tgz#a1f7838f8314c516f05ecefcbc4ccfe04b4ed789"
   integrity sha1-ofeDj4MUxRbwXs78vEzP4EtO14k=
 
-ora@^0.2.3:
-  version "0.2.3"
-  resolved "https://registry.yarnpkg.com/ora/-/ora-0.2.3.tgz#37527d220adcd53c39b73571d754156d5db657a4"
-  integrity sha1-N1J9Igrc1Tw5tzVx11QVbV22V6Q=
+onetime@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/onetime/-/onetime-2.0.1.tgz#067428230fd67443b2794b22bba528b6867962d4"
+  integrity sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=
   dependencies:
-    chalk "^1.1.1"
-    cli-cursor "^1.0.2"
-    cli-spinners "^0.1.2"
-    object-assign "^4.0.1"
+    mimic-fn "^1.0.0"
+
+onetime@^5.1.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.0.tgz#fff0f3c91617fe62bb50189636e99ac8a6df7be5"
+  integrity sha512-5NcSkPHhwTVFIQN+TUqXoS5+dlElHXdpAWu9I0HP20YOtIi+aZ0Ct82jdlILDxjLEAWwvm+qj1m6aEtsDVmm6Q==
+  dependencies:
+    mimic-fn "^2.1.0"
+
+ora@^4.0.3:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/ora/-/ora-4.0.3.tgz#752a1b7b4be4825546a7a3d59256fa523b6b6d05"
+  integrity sha512-fnDebVFyz309A73cqCipVL1fBZewq4vwgSHfxh43vVy31mbyoQ8sCH3Oeaog/owYOs/lLlGVPCISQonTneg6Pg==
+  dependencies:
+    chalk "^3.0.0"
+    cli-cursor "^3.1.0"
+    cli-spinners "^2.2.0"
+    is-interactive "^1.0.0"
+    log-symbols "^3.0.0"
+    mute-stream "0.0.8"
+    strip-ansi "^6.0.0"
+    wcwidth "^1.0.1"
 
 os-browserify@^0.3.0, os-browserify@~0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/os-browserify/-/os-browserify-0.3.0.tgz#854373c7f5c2315914fc9bfc6bd8238fdda1ec27"
   integrity sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc=
 
-os-homedir@^1.0.0, os-homedir@^1.0.1:
+os-homedir@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3"
   integrity sha1-/7xJiDNuDoM94MFox+8VISGqf7M=
@@ -4280,6 +4306,11 @@ osenv@^0.1.4:
     os-homedir "^1.0.0"
     os-tmpdir "^1.0.0"
 
+ospath@1.2.2:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/ospath/-/ospath-1.2.2.tgz#1276639774a3f8ef2572f7fe4280e0ea4550c07b"
+  integrity sha1-EnZjl3Sj+O8lcvf+QoDg6kVQwHs=
+
 outpipe@^1.1.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/outpipe/-/outpipe-1.1.1.tgz#50cf8616365e87e031e29a5ec9339a3da4725fa2"
@@ -4306,10 +4337,10 @@ p-locate@^3.0.0:
   dependencies:
     p-limit "^2.0.0"
 
-p-map@^1.1.1:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/p-map/-/p-map-1.2.0.tgz#e4e94f311eabbc8633a1e79908165fca26241b6b"
-  integrity sha512-r6zKACMNhjPJMTl8KcFH4li//gkrXWfbD6feV8l6doRHlzljFWGJ2AP6iKaCJXyZmAUMOPtvbW7EXkbWO/pLEA==
+p-map@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/p-map/-/p-map-2.1.0.tgz#310928feef9c9ecc65b68b17693018a665cea175"
+  integrity sha512-y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw==
 
 p-try@^2.0.0:
   version "2.2.0"
@@ -4462,6 +4493,11 @@ posix-character-classes@^0.1.0:
   resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab"
   integrity sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=
 
+pretty-bytes@5.3.0:
+  version "5.3.0"
+  resolved "https://registry.yarnpkg.com/pretty-bytes/-/pretty-bytes-5.3.0.tgz#f2849e27db79fb4d6cfe24764fc4134f165989f2"
+  integrity sha512-hjGrh+P926p4R4WbaB6OckyRtO0F0/lQBiT+0gnxjV+5kjPBrfVBFCsCLbMqVQeydvIoouYTCmmEURiH3R1Bdg==
+
 private@^0.1.6:
   version "0.1.8"
   resolved "https://registry.yarnpkg.com/private/-/private-0.1.8.tgz#2381edb3689f7a53d653190060fcf822d2f368ff"
@@ -4502,7 +4538,7 @@ pseudomap@^1.0.2:
   resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3"
   integrity sha1-8FKijacOYYkX7wqKw0wa5aaChrM=
 
-psl@^1.1.24:
+psl@^1.1.28:
   version "1.7.0"
   resolved "https://registry.yarnpkg.com/psl/-/psl-1.7.0.tgz#f1c4c47a8ef97167dea5d6bbf4816d736e884a3c"
   integrity sha512-5NsSEDv8zY70ScRnOTn7bK7eanl2MvFrOrS/R6x+dBt5g1ghnj9Zv90kO8GwT8gxcu2ANyFprnFYB85IogIJOQ==
@@ -4549,12 +4585,12 @@ punycode@1.3.2:
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.3.2.tgz#9653a036fb7c1ee42342f2325cceefea3926c48d"
   integrity sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=
 
-punycode@^1.2.4, punycode@^1.3.2, punycode@^1.4.1:
+punycode@^1.2.4, punycode@^1.3.2:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
   integrity sha1-wNWmOycYgArY4esPpSachN1BhF4=
 
-punycode@^2.1.0:
+punycode@^2.1.0, punycode@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
   integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==
@@ -4574,16 +4610,16 @@ querystring@0.2.0:
   resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620"
   integrity sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=
 
-ramda@0.24.1:
-  version "0.24.1"
-  resolved "https://registry.yarnpkg.com/ramda/-/ramda-0.24.1.tgz#c3b7755197f35b8dc3502228262c4c91ddb6b857"
-  integrity sha1-w7d1UZfzW43DUCIoJixMkd22uFc=
-
 ramda@0.25.0:
   version "0.25.0"
   resolved "https://registry.yarnpkg.com/ramda/-/ramda-0.25.0.tgz#8fdf68231cffa90bc2f9460390a0cb74a29b29a9"
   integrity sha512-GXpfrYVPwx3K7RQ6aYT8KPS8XViSXUVJT1ONhoKPE9VAleW42YE+U+8VEyGWt41EnEQW7gwecYJriTI0pKoecQ==
 
+ramda@0.26.1:
+  version "0.26.1"
+  resolved "https://registry.yarnpkg.com/ramda/-/ramda-0.26.1.tgz#8d41351eb8111c55353617fc3bbffad8e4d35d06"
+  integrity sha512-hLWjpy7EnsDBb0p+Z3B7rPi3GDeRG5ZtiI33kJhTt+ORCd38AbAIjB/9zRIUoeTbE/AVX5ZkU7m6bznsvrf8eQ==
+
 randombytes@^2.0.0, randombytes@^2.0.1, randombytes@^2.0.5:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.1.0.tgz#df6f84372f0270dc65cdf6291349ab7a473d4f2a"
@@ -4599,16 +4635,6 @@ randomfill@^1.0.3:
     randombytes "^2.0.5"
     safe-buffer "^5.1.0"
 
-rc@^1.2.7:
-  version "1.2.8"
-  resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed"
-  integrity sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==
-  dependencies:
-    deep-extend "^0.6.0"
-    ini "~1.3.0"
-    minimist "^1.2.0"
-    strip-json-comments "~2.0.1"
-
 read-only-stream@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/read-only-stream/-/read-only-stream-2.0.0.tgz#2724fd6a8113d73764ac288d4386270c1dbf17f0"
@@ -4616,7 +4642,7 @@ read-only-stream@^2.0.0:
   dependencies:
     readable-stream "^2.0.2"
 
-"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@^2.3.6, readable-stream@~2.3.6:
+"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@^2.3.6, readable-stream@~2.3.6:
   version "2.3.7"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57"
   integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==
@@ -4723,13 +4749,6 @@ repeat-string@^1.5.2, repeat-string@^1.6.1:
   resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637"
   integrity sha1-jcrkcOHIirwtYA//Sndihtp15jc=
 
-repeating@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/repeating/-/repeating-2.0.1.tgz#5214c53a926d3552707527fbab415dbc08d06dda"
-  integrity sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=
-  dependencies:
-    is-finite "^1.0.0"
-
 request-progress@3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/request-progress/-/request-progress-3.0.0.tgz#4ca754081c7fec63f505e4faa825aa06cd669dbe"
@@ -4737,10 +4756,51 @@ request-progress@3.0.0:
   dependencies:
     throttleit "^1.0.0"
 
-request@2.88.0:
-  version "2.88.0"
-  resolved "https://registry.yarnpkg.com/request/-/request-2.88.0.tgz#9c2fca4f7d35b592efe57c7f0a55e81052124fef"
-  integrity sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==
+request-promise-core@1.1.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/request-promise-core/-/request-promise-core-1.1.3.tgz#e9a3c081b51380dfea677336061fea879a829ee9"
+  integrity sha512-QIs2+ArIGQVp5ZYbWD5ZLCY29D5CfWizP8eWnm8FoGD1TX61veauETVQbrV60662V0oFBkrDOuaBI8XgtuyYAQ==
+  dependencies:
+    lodash "^4.17.15"
+
+request-promise-native@^1.0.8:
+  version "1.0.8"
+  resolved "https://registry.yarnpkg.com/request-promise-native/-/request-promise-native-1.0.8.tgz#a455b960b826e44e2bf8999af64dff2bfe58cb36"
+  integrity sha512-dapwLGqkHtwL5AEbfenuzjTYg35Jd6KPytsC2/TLkVMz8rm+tNt72MGUWT1RP/aYawMpN6HqbNGBQaRcBtjQMQ==
+  dependencies:
+    request-promise-core "1.1.3"
+    stealthy-require "^1.1.1"
+    tough-cookie "^2.3.3"
+
+request@^2.88.0:
+  version "2.88.2"
+  resolved "https://registry.yarnpkg.com/request/-/request-2.88.2.tgz#d73c918731cb5a87da047e207234146f664d12b3"
+  integrity sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==
+  dependencies:
+    aws-sign2 "~0.7.0"
+    aws4 "^1.8.0"
+    caseless "~0.12.0"
+    combined-stream "~1.0.6"
+    extend "~3.0.2"
+    forever-agent "~0.6.1"
+    form-data "~2.3.2"
+    har-validator "~5.1.3"
+    http-signature "~1.2.0"
+    is-typedarray "~1.0.0"
+    isstream "~0.1.2"
+    json-stringify-safe "~5.0.1"
+    mime-types "~2.1.19"
+    oauth-sign "~0.9.0"
+    performance-now "^2.1.0"
+    qs "~6.5.2"
+    safe-buffer "^5.1.2"
+    tough-cookie "~2.5.0"
+    tunnel-agent "^0.6.0"
+    uuid "^3.3.2"
+
+request@cypress-io/request#b5af0d1fa47eec97ba980cde90a13e69a2afcd16:
+  version "2.88.1"
+  resolved "https://codeload.github.com/cypress-io/request/tar.gz/b5af0d1fa47eec97ba980cde90a13e69a2afcd16"
   dependencies:
     aws-sign2 "~0.7.0"
     aws4 "^1.8.0"
@@ -4749,7 +4809,7 @@ request@2.88.0:
     extend "~3.0.2"
     forever-agent "~0.6.1"
     form-data "~2.3.2"
-    har-validator "~5.1.0"
+    har-validator "~5.1.3"
     http-signature "~1.2.0"
     is-typedarray "~1.0.0"
     isstream "~0.1.2"
@@ -4759,7 +4819,7 @@ request@2.88.0:
     performance-now "^2.1.0"
     qs "~6.5.2"
     safe-buffer "^5.1.2"
-    tough-cookie "~2.4.3"
+    tough-cookie "~2.5.0"
     tunnel-agent "^0.6.0"
     uuid "^3.3.2"
 
@@ -4793,12 +4853,28 @@ restore-cursor@^1.0.1:
     exit-hook "^1.0.0"
     onetime "^1.0.0"
 
+restore-cursor@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-2.0.0.tgz#9f7ee287f82fd326d4fd162923d62129eee0dfaf"
+  integrity sha1-n37ih/gv0ybU/RYpI9YhKe7g368=
+  dependencies:
+    onetime "^2.0.0"
+    signal-exit "^3.0.2"
+
+restore-cursor@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-3.1.0.tgz#39f67c54b3a7a58cea5236d95cf0034239631f7e"
+  integrity sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==
+  dependencies:
+    onetime "^5.1.0"
+    signal-exit "^3.0.2"
+
 ret@~0.1.10:
   version "0.1.15"
   resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc"
   integrity sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==
 
-rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.3:
+rimraf@^2.5.4, rimraf@^2.6.3:
   version "2.7.1"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec"
   integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==
@@ -4820,12 +4896,12 @@ run-queue@^1.0.0, run-queue@^1.0.3:
   dependencies:
     aproba "^1.1.1"
 
-rxjs@^5.0.0-beta.11:
-  version "5.5.12"
-  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-5.5.12.tgz#6fa61b8a77c3d793dbaf270bee2f43f652d741cc"
-  integrity sha512-xx2itnL5sBbqeeiVgNPVuQQ1nC8Jp2WfNJhXWHmElW9YmrpS9UVnNzhP3EH3HFqexO5Tlp8GhYY+WEcqcVMvGw==
+rxjs@^6.3.3, rxjs@^6.5.4:
+  version "6.5.4"
+  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.5.4.tgz#e0777fe0d184cec7872df147f303572d414e211c"
+  integrity sha512-naMQXcgEo3csAEGvw/NydRA0fuS2nDZJiw1YUWFKU7aPPAPGZEsD4Iimit96qwCieH6y614MCLYwdkrWx7z/7Q==
   dependencies:
-    symbol-observable "1.0.1"
+    tslib "^1.9.0"
 
 safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@~5.2.0:
   version "5.2.0"
@@ -4844,16 +4920,11 @@ safe-regex@^1.1.0:
   dependencies:
     ret "~0.1.10"
 
-"safer-buffer@>= 2.1.2 < 3", safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0:
+safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
   integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
 
-sax@^1.2.4:
-  version "1.2.4"
-  resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
-  integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==
-
 schema-utils@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-1.0.0.tgz#0b79a93204d7b600d4b2850d1f66c2a34951c770"
@@ -4873,7 +4944,7 @@ semver@7.0.0:
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e"
   integrity sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==
 
-semver@^5.3.0, semver@^5.4.1, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0:
+semver@^5.4.1, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0:
   version "5.7.1"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
   integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
@@ -4893,11 +4964,6 @@ serialize-javascript@^2.1.2:
   resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-2.1.2.tgz#ecec53b0e0317bdc95ef76ab7074b7384785fa61"
   integrity sha512-rs9OggEUF0V4jUSecXazOYsLfu7OGK2qIn3c7IPBiffz32XniEp/TX9Xmc9LQfK2nQ2QKHvZ2oygKUGU0lG4jQ==
 
-set-blocking@~2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
-  integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc=
-
 set-value@^2.0.0, set-value@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/set-value/-/set-value-2.0.1.tgz#a18d40530e6f07de4228c7defe4227af8cad005b"
@@ -4958,7 +5024,7 @@ sigmund@^1.0.1:
   resolved "https://registry.yarnpkg.com/sigmund/-/sigmund-1.0.1.tgz#3ff21f198cad2175f9f3b781853fd94d0d19b590"
   integrity sha1-P/IfGYytIXX587eBhT/ZTQ0ZtZA=
 
-signal-exit@^3.0.0:
+signal-exit@^3.0.0, signal-exit@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d"
   integrity sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=
@@ -5147,6 +5213,11 @@ static-extend@^0.1.1:
     define-property "^0.2.5"
     object-copy "^0.1.0"
 
+stealthy-require@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/stealthy-require/-/stealthy-require-1.1.1.tgz#35b09875b4ff49f26a777e509b3090a3226bf24b"
+  integrity sha1-NbCYdbT/SfJqd35QmzCQoyJr8ks=
+
 stream-browserify@^2.0.0, stream-browserify@^2.0.1:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/stream-browserify/-/stream-browserify-2.0.2.tgz#87521d38a44aa7ee91ce1cd2a47df0cb49dd660b"
@@ -5205,11 +5276,6 @@ stream-splicer@^2.0.0:
     inherits "^2.0.1"
     readable-stream "^2.0.2"
 
-stream-to-observable@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/stream-to-observable/-/stream-to-observable-0.1.0.tgz#45bf1d9f2d7dc09bed81f1c307c430e68b84cffe"
-  integrity sha1-Rb8dny19wJvtgfHDB8Qw5ouEz/4=
-
 string-argv@0.0.2:
   version "0.0.2"
   resolved "https://registry.yarnpkg.com/string-argv/-/string-argv-0.0.2.tgz#dac30408690c21f3c3630a3ff3a05877bdcbd736"
@@ -5224,7 +5290,7 @@ string-width@^1.0.1:
     is-fullwidth-code-point "^1.0.0"
     strip-ansi "^3.0.0"
 
-"string-width@^1.0.2 || 2":
+string-width@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e"
   integrity sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==
@@ -5267,16 +5333,18 @@ strip-ansi@^4.0.0:
   dependencies:
     ansi-regex "^3.0.0"
 
+strip-ansi@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.0.tgz#0b1571dd7669ccd4f3e06e14ef1eed26225ae532"
+  integrity sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==
+  dependencies:
+    ansi-regex "^5.0.0"
+
 strip-eof@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf"
   integrity sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=
 
-strip-json-comments@~2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
-  integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo=
-
 subarg@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/subarg/-/subarg-1.0.0.tgz#f62cf17581e996b48fc965699f54c06ae268b8d2"
@@ -5284,22 +5352,29 @@ subarg@^1.0.0:
   dependencies:
     minimist "^1.1.0"
 
-supports-color@5.5.0, supports-color@^5.3.0:
-  version "5.5.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f"
-  integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==
+supports-color@7.1.0, supports-color@^7.1.0:
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.1.0.tgz#68e32591df73e25ad1c4b49108a2ec507962bfd1"
+  integrity sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==
   dependencies:
-    has-flag "^3.0.0"
+    has-flag "^4.0.0"
 
 supports-color@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
   integrity sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=
 
-symbol-observable@1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.0.1.tgz#8340fc4702c3122df5d22288f88283f513d3fdd4"
-  integrity sha1-g0D8RwLDEi310iKI+IKD9RPT/dQ=
+supports-color@^5.3.0:
+  version "5.5.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f"
+  integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==
+  dependencies:
+    has-flag "^3.0.0"
+
+symbol-observable@^1.1.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.2.0.tgz#c22688aed4eab3cdc2dfeacbb561660560a00804"
+  integrity sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ==
 
 syntax-error@^1.1.1:
   version "1.4.0"
@@ -5313,19 +5388,6 @@ tapable@^1.0.0, tapable@^1.1.3:
   resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.1.3.tgz#a1fccc06b58db61fd7a45da2da44f5f3a3e67ba2"
   integrity sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==
 
-tar@^4.4.2:
-  version "4.4.13"
-  resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.13.tgz#43b364bc52888d555298637b10d60790254ab525"
-  integrity sha512-w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA==
-  dependencies:
-    chownr "^1.1.1"
-    fs-minipass "^1.2.5"
-    minipass "^2.8.6"
-    minizlib "^1.2.1"
-    mkdirp "^0.5.0"
-    safe-buffer "^5.1.2"
-    yallist "^3.0.3"
-
 terser-webpack-plugin@^1.4.3:
   version "1.4.3"
   resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.4.3.tgz#5ecaf2dbdc5fb99745fd06791f46fc9ddb1c9a7c"
@@ -5453,18 +5515,18 @@ to-regex@^3.0.1, to-regex@^3.0.2:
     regex-not "^1.0.2"
     safe-regex "^1.1.0"
 
-tough-cookie@~2.4.3:
-  version "2.4.3"
-  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.4.3.tgz#53f36da3f47783b0925afa06ff9f3b165280f781"
-  integrity sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==
+tough-cookie@^2.3.3, tough-cookie@~2.5.0:
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz#cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2"
+  integrity sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==
   dependencies:
-    psl "^1.1.24"
-    punycode "^1.4.1"
+    psl "^1.1.28"
+    punycode "^2.1.1"
 
-ts-loader@^6.1.0:
-  version "6.2.1"
-  resolved "https://registry.yarnpkg.com/ts-loader/-/ts-loader-6.2.1.tgz#67939d5772e8a8c6bdaf6277ca023a4812da02ef"
-  integrity sha512-Dd9FekWuABGgjE1g0TlQJ+4dFUfYGbYcs52/HQObE0ZmUNjQlmLAS7xXsSzy23AMaMwipsx5sNHvoEpT2CZq1g==
+ts-loader@^6.2.2:
+  version "6.2.2"
+  resolved "https://registry.yarnpkg.com/ts-loader/-/ts-loader-6.2.2.tgz#dffa3879b01a1a1e0a4b85e2b8421dc0dfff1c58"
+  integrity sha512-HDo5kXZCBml3EUPcc7RlZOV/JGlLHwppTLEHb3SHnr5V7NXD4klMEkrhJe5wgRbaWsSXi+Y1SIBN/K9B6zWGWQ==
   dependencies:
     chalk "^2.3.0"
     enhanced-resolve "^4.0.0"
@@ -5519,10 +5581,10 @@ typedarray@^0.0.6:
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
   integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
 
-typescript@3.7.5:
-  version "3.7.5"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.7.5.tgz#0692e21f65fd4108b9330238aac11dd2e177a1ae"
-  integrity sha512-/P5lkRXkWHNAbcJIiHPfRoKqyd7bsyCma1hZNUGfn20qm64T6ZBlrzprymeu918H+mB/0rIg2gGK/BXkhhYgBw==
+typescript@3.8.3:
+  version "3.8.3"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.8.3.tgz#409eb8544ea0335711205869ec458ab109ee1061"
+  integrity sha512-MYlEfn5VrLNsgudQTVJeNaQFUAI7DkhnOjdpAp4T+ku1TfQClewlbSuTVHiA+8skNBgaf02TL/kLOvig4y3G8w==
 
 umd@^3.0.0:
   version "3.0.3"
@@ -5600,10 +5662,10 @@ unset-value@^1.0.0:
     has-value "^0.3.1"
     isobject "^3.0.0"
 
-untildify@3.0.3:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/untildify/-/untildify-3.0.3.tgz#1e7b42b140bcfd922b22e70ca1265bfe3634c7c9"
-  integrity sha512-iSk/J8efr8uPT/Z4eSUywnqyrQU7DSdMfdqK4iWEaUVVmcP5JcnpRqmVMwcwcnmI1ATFNgC5V90u09tBynNFKA==
+untildify@4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/untildify/-/untildify-4.0.0.tgz#2bc947b953652487e4600949fb091e3ae8cd919b"
+  integrity sha512-KK8xQ1mkzZeg9inewmFVDNkg3l5LUhoq9kN6iWYB/CC9YMG8HA+c1Q8HwDe6dEX7kErrEVNVBO3fWsVq5iDgtw==
 
 upath@^1.1.1:
   version "1.2.0"
@@ -5698,6 +5760,18 @@ vm-browserify@^1.0.0, vm-browserify@^1.0.1:
   resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-1.1.2.tgz#78641c488b8e6ca91a75f511e7a3b32a86e5dda0"
   integrity sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ==
 
+wait-on@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/wait-on/-/wait-on-4.0.1.tgz#c49ca18b1ea60580404feed9df76ab3af2425a56"
+  integrity sha512-x83fmTH2X0KL7vXoGt9aV5x4SMCvO8A/NbwWpaYYh4NJ16d3KSgbHwBy9dVdHj0B30cEhOFRvDob4fnpUmZxvA==
+  dependencies:
+    "@hapi/joi" "^17.1.0"
+    lodash "^4.17.15"
+    minimist "^1.2.0"
+    request "^2.88.0"
+    request-promise-native "^1.0.8"
+    rxjs "^6.5.4"
+
 watchify@3.11.1:
   version "3.11.1"
   resolved "https://registry.yarnpkg.com/watchify/-/watchify-3.11.1.tgz#8e4665871fff1ef64c0430d1a2c9d084d9721881"
@@ -5720,6 +5794,13 @@ watchpack@^1.6.0:
     graceful-fs "^4.1.2"
     neo-async "^2.5.0"
 
+wcwidth@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/wcwidth/-/wcwidth-1.0.1.tgz#f0b0dcf915bc5ff1528afadb2c0e17b532da2fe8"
+  integrity sha1-8LDc+RW8X/FSivrbLA4XtTLaL+g=
+  dependencies:
+    defaults "^1.0.3"
+
 webpack-sources@^1.4.0, webpack-sources@^1.4.1:
   version "1.4.3"
   resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.4.3.tgz#eedd8ec0b928fbf1cbfe994e22d2d890f330a933"
@@ -5728,15 +5809,15 @@ webpack-sources@^1.4.0, webpack-sources@^1.4.1:
     source-list-map "^2.0.0"
     source-map "~0.6.1"
 
-webpack@^4.40.2:
-  version "4.41.5"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.41.5.tgz#3210f1886bce5310e62bb97204d18c263341b77c"
-  integrity sha512-wp0Co4vpyumnp3KlkmpM5LWuzvZYayDwM2n17EHFr4qxBBbRokC7DJawPJC7TfSFZ9HZ6GsdH40EBj4UV0nmpw==
+webpack@^4.42.1:
+  version "4.42.1"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.42.1.tgz#ae707baf091f5ca3ef9c38b884287cfe8f1983ef"
+  integrity sha512-SGfYMigqEfdGchGhFFJ9KyRpQKnipvEvjc1TwrXEPCM6H5Wywu10ka8o3KGrMzSMxMQKt8aCHUFh5DaQ9UmyRg==
   dependencies:
-    "@webassemblyjs/ast" "1.8.5"
-    "@webassemblyjs/helper-module-context" "1.8.5"
-    "@webassemblyjs/wasm-edit" "1.8.5"
-    "@webassemblyjs/wasm-parser" "1.8.5"
+    "@webassemblyjs/ast" "1.9.0"
+    "@webassemblyjs/helper-module-context" "1.9.0"
+    "@webassemblyjs/wasm-edit" "1.9.0"
+    "@webassemblyjs/wasm-parser" "1.9.0"
     acorn "^6.2.1"
     ajv "^6.10.2"
     ajv-keywords "^3.4.1"
@@ -5748,7 +5829,7 @@ webpack@^4.40.2:
     loader-utils "^1.2.3"
     memory-fs "^0.4.1"
     micromatch "^3.1.10"
-    mkdirp "^0.5.1"
+    mkdirp "^0.5.3"
     neo-async "^2.6.1"
     node-libs-browser "^2.2.1"
     schema-utils "^1.0.0"
@@ -5764,13 +5845,6 @@ which@^1.2.9:
   dependencies:
     isexe "^2.0.0"
 
-wide-align@^1.1.0:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.3.tgz#ae074e6bdc0c14a431e804e624549c633b000457"
-  integrity sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==
-  dependencies:
-    string-width "^1.0.2 || 2"
-
 worker-farm@^1.7.0:
   version "1.7.0"
   resolved "https://registry.yarnpkg.com/worker-farm/-/worker-farm-1.7.0.tgz#26a94c5391bbca926152002f69b84a4bf772e5a8"
@@ -5778,6 +5852,14 @@ worker-farm@^1.7.0:
   dependencies:
     errno "~0.1.7"
 
+wrap-ansi@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-3.0.1.tgz#288a04d87eda5c286e060dfe8f135ce8d007f8ba"
+  integrity sha1-KIoE2H7aXChuBg3+jxNc6NAH+Lo=
+  dependencies:
+    string-width "^2.1.1"
+    strip-ansi "^4.0.0"
+
 wrappy@1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
@@ -5798,7 +5880,7 @@ yallist@^2.1.2:
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52"
   integrity sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=
 
-yallist@^3.0.0, yallist@^3.0.2, yallist@^3.0.3:
+yallist@^3.0.2:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd"
   integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==

From 6b6f6aec8b38063d5ca428e7fa3448c80659a483 Mon Sep 17 00:00:00 2001
From: Alison Goryachev <alison.goryachev@elastic.co>
Date: Tue, 24 Mar 2020 15:35:08 -0400
Subject: [PATCH 096/179] [Remote clusters] Fix serialization for server_name
 field (#60953)

---
 .../common/lib/cluster_serialization.ts            | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/x-pack/plugins/remote_clusters/common/lib/cluster_serialization.ts b/x-pack/plugins/remote_clusters/common/lib/cluster_serialization.ts
index fbea311cdeefa..d0898fda93a41 100644
--- a/x-pack/plugins/remote_clusters/common/lib/cluster_serialization.ts
+++ b/x-pack/plugins/remote_clusters/common/lib/cluster_serialization.ts
@@ -153,13 +153,13 @@ export function serializeCluster(deserializedClusterObject: Cluster): ClusterPay
       cluster: {
         remote: {
           [name]: {
-            skip_unavailable: skipUnavailable !== undefined ? skipUnavailable : null,
-            mode: mode ?? null,
-            proxy_address: proxyAddress ?? null,
-            proxy_socket_connections: proxySocketConnections ?? null,
-            server_name: serverName ?? null,
-            seeds: seeds ?? null,
-            node_connections: nodeConnections ?? null,
+            skip_unavailable: typeof skipUnavailable === 'boolean' ? skipUnavailable : null,
+            mode: mode || null,
+            proxy_address: proxyAddress || null,
+            proxy_socket_connections: proxySocketConnections || null,
+            server_name: serverName || null,
+            seeds: seeds || null,
+            node_connections: nodeConnections || null,
           },
         },
       },

From f9088ebcec6c2ecb9613c9a6761a3d0682676ef0 Mon Sep 17 00:00:00 2001
From: Yuliia Naumenko <jo.naumenko@gmail.com>
Date: Tue, 24 Mar 2020 12:49:17 -0700
Subject: [PATCH 097/179] Remove "Upgrade" badge on disabled action types in
 the create connector flyout (#61111)

* Remove "Upgrade" badge on disabled action types in the create connector flyout

* Fix height of disabled cards

Co-authored-by: defazio <michael.defazio@elastic.co>
---
 .../lib/check_action_type_enabled.scss        |  7 ++++++
 .../action_type_menu.test.tsx                 |  7 +-----
 .../action_type_menu.tsx                      | 23 +++++++++----------
 3 files changed, 19 insertions(+), 18 deletions(-)

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
index 32ab1bd7b1821..24dbb865742d8 100644
--- 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
@@ -7,3 +7,10 @@
     box-shadow: none;
   }
 }
+
+.actConnectorsListGrid {
+  .euiToolTipAnchor,
+  .euiCard {
+    height: 100%;
+  }
+}
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 70aa862aa3c3d..0fb759226c21f 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
@@ -184,11 +184,6 @@ describe('connector_add_flyout', () => {
       </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 requires a Gold license.'
-    );
+    expect(wrapper.find('EuiToolTip [data-test-subj="my-action-type-card"]').exists()).toBeTruthy();
   });
 });
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 2dd5e413faf9c..91ecfb2fa8ded 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
@@ -6,6 +6,7 @@
 import React, { useEffect, useState } from 'react';
 import { EuiFlexItem, EuiCard, EuiIcon, EuiFlexGrid, EuiSpacer } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
+import { EuiToolTip } from '@elastic/eui';
 import { ActionType, ActionTypeIndex } from '../../../types';
 import { loadActionTypes } from '../../lib/action_connector_api';
 import { useActionsConnectorsContext } from '../../context/actions_connectors_context';
@@ -81,21 +82,19 @@ export const ActionTypeMenu = ({
           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 (
+        <EuiFlexItem key={index}>
+          {checkEnabledResult.isEnabled && card}
+          {checkEnabledResult.isEnabled === false && (
+            <EuiToolTip position="top" content={checkEnabledResult.message}>
+              {card}
+            </EuiToolTip>
+          )}
+        </EuiFlexItem>
+      );
     });
 
   return (

From 2f1e689c91c52a0ff15acde1c12f27b527b0f9ab Mon Sep 17 00:00:00 2001
From: Wylie Conlon <william.conlon@elastic.co>
Date: Tue, 24 Mar 2020 15:51:00 -0400
Subject: [PATCH 098/179] [Lens] Create filters on click with bar, line, area
 charts (#57261)

---
 .../public/lib/triggers/triggers.ts           |   6 +-
 .../lens/public/app_plugin/app.test.tsx       |  19 ++-
 .../plugins/lens/public/app_plugin/app.tsx    |  15 ++
 .../embeddable/embeddable.tsx                 |  15 ++
 x-pack/legacy/plugins/lens/public/plugin.tsx  |   5 +-
 .../__snapshots__/xy_expression.test.tsx.snap |   7 +
 .../lens/public/xy_visualization/index.ts     |  11 +-
 .../lens/public/xy_visualization/services.ts  |  12 ++
 .../xy_visualization/xy_expression.test.tsx   |  89 ++++++++++++
 .../public/xy_visualization/xy_expression.tsx | 130 ++++++++++++++----
 .../api_integration/apis/lens/telemetry.ts    |   3 +-
 .../test/functional/apps/lens/smokescreen.ts  |  45 +++++-
 .../es_archives/lens/basic/data.json.gz       | Bin 3004 -> 4183 bytes
 13 files changed, 323 insertions(+), 34 deletions(-)
 create mode 100644 x-pack/legacy/plugins/lens/public/xy_visualization/services.ts

diff --git a/src/plugins/embeddable/public/lib/triggers/triggers.ts b/src/plugins/embeddable/public/lib/triggers/triggers.ts
index 0052403816eb8..e29302fd6cc13 100644
--- a/src/plugins/embeddable/public/lib/triggers/triggers.ts
+++ b/src/plugins/embeddable/public/lib/triggers/triggers.ts
@@ -25,10 +25,10 @@ export interface EmbeddableContext {
 }
 
 export interface EmbeddableVisTriggerContext {
-  embeddable: IEmbeddable;
-  timeFieldName: string;
+  embeddable?: IEmbeddable;
+  timeFieldName?: string;
   data: {
-    e: MouseEvent;
+    e?: MouseEvent;
     data: unknown;
   };
 }
diff --git a/x-pack/legacy/plugins/lens/public/app_plugin/app.test.tsx b/x-pack/legacy/plugins/lens/public/app_plugin/app.test.tsx
index fbda18cc0e307..be72dd4b4edef 100644
--- a/x-pack/legacy/plugins/lens/public/app_plugin/app.test.tsx
+++ b/x-pack/legacy/plugins/lens/public/app_plugin/app.test.tsx
@@ -77,6 +77,20 @@ function createMockFilterManager() {
   };
 }
 
+function createMockTimefilter() {
+  const unsubscribe = jest.fn();
+
+  return {
+    getTime: jest.fn(() => ({ from: 'now-7d', to: 'now' })),
+    setTime: jest.fn(),
+    getTimeUpdate$: () => ({
+      subscribe: ({ next }: { next: () => void }) => {
+        return unsubscribe;
+      },
+    }),
+  };
+}
+
 describe('Lens App', () => {
   let frame: jest.Mocked<EditorFrameInstance>;
   let core: ReturnType<typeof coreMock['createStart']>;
@@ -108,10 +122,7 @@ describe('Lens App', () => {
         query: {
           filterManager: createMockFilterManager(),
           timefilter: {
-            timefilter: {
-              getTime: jest.fn(() => ({ from: 'now-7d', to: 'now' })),
-              setTime: jest.fn(),
-            },
+            timefilter: createMockTimefilter(),
           },
         },
         indexPatterns: {
diff --git a/x-pack/legacy/plugins/lens/public/app_plugin/app.tsx b/x-pack/legacy/plugins/lens/public/app_plugin/app.tsx
index a0c6e4c21a34b..dfea2e39fcbc5 100644
--- a/x-pack/legacy/plugins/lens/public/app_plugin/app.tsx
+++ b/x-pack/legacy/plugins/lens/public/app_plugin/app.tsx
@@ -94,8 +94,23 @@ export function App({
         trackUiEvent('app_filters_updated');
       },
     });
+
+    const timeSubscription = data.query.timefilter.timefilter.getTimeUpdate$().subscribe({
+      next: () => {
+        const currentRange = data.query.timefilter.timefilter.getTime();
+        setState(s => ({
+          ...s,
+          dateRange: {
+            fromDate: currentRange.from,
+            toDate: currentRange.to,
+          },
+        }));
+      },
+    });
+
     return () => {
       filterSubscription.unsubscribe();
+      timeSubscription.unsubscribe();
     };
   }, []);
 
diff --git a/x-pack/legacy/plugins/lens/public/editor_frame_service/embeddable/embeddable.tsx b/x-pack/legacy/plugins/lens/public/editor_frame_service/embeddable/embeddable.tsx
index 252ba5c9bc0bc..d18174baacdb9 100644
--- a/x-pack/legacy/plugins/lens/public/editor_frame_service/embeddable/embeddable.tsx
+++ b/x-pack/legacy/plugins/lens/public/editor_frame_service/embeddable/embeddable.tsx
@@ -14,8 +14,11 @@ import {
   IIndexPattern,
   TimefilterContract,
 } from 'src/plugins/data/public';
+
 import { Subscription } from 'rxjs';
 import { ReactExpressionRendererType } from '../../../../../../../src/plugins/expressions/public';
+import { VIS_EVENT_TO_TRIGGER } from '../../../../../../../src/legacy/core_plugins/visualizations/public/np_ready/public/embeddable/events';
+
 import {
   Embeddable as AbstractEmbeddable,
   EmbeddableOutput,
@@ -90,6 +93,18 @@ export class Embeddable extends AbstractEmbeddable<LensEmbeddableInput, LensEmbe
       .subscribe(this.reload.bind(this));
   }
 
+  public supportedTriggers() {
+    switch (this.savedVis.visualizationType) {
+      case 'lnsXY':
+        // TODO: case 'lnsDatatable':
+        return [VIS_EVENT_TO_TRIGGER.filter];
+
+      case 'lnsMetric':
+      default:
+        return [];
+    }
+  }
+
   onContainerStateChanged(containerState: LensEmbeddableInput) {
     const cleanedFilters = containerState.filters
       ? containerState.filters.filter(filter => !filter.meta.disabled)
diff --git a/x-pack/legacy/plugins/lens/public/plugin.tsx b/x-pack/legacy/plugins/lens/public/plugin.tsx
index c74653c70703c..16f1d194b240a 100644
--- a/x-pack/legacy/plugins/lens/public/plugin.tsx
+++ b/x-pack/legacy/plugins/lens/public/plugin.tsx
@@ -28,6 +28,8 @@ import {
   stopReportManager,
   trackUiEvent,
 } from './lens_ui_telemetry';
+
+import { UiActionsStart } from '../../../../../src/plugins/ui_actions/public';
 import { KibanaLegacySetup } from '../../../../../src/plugins/kibana_legacy/public';
 import { NOT_INTERNATIONALIZED_PRODUCT_NAME } from '../../../../plugins/lens/common';
 import {
@@ -40,7 +42,6 @@ import { EmbeddableSetup, EmbeddableStart } from '../../../../../src/plugins/emb
 import { EditorFrameStart } from './types';
 import { getLensAliasConfig } from './vis_type_alias';
 import { VisualizationsSetup } from './legacy_imports';
-
 export interface LensPluginSetupDependencies {
   kibanaLegacy: KibanaLegacySetup;
   expressions: ExpressionsSetup;
@@ -56,6 +57,7 @@ export interface LensPluginStartDependencies {
   data: DataPublicPluginStart;
   embeddable: EmbeddableStart;
   expressions: ExpressionsStart;
+  uiActions: UiActionsStart;
 }
 
 export const isRisonObject = (value: RisonValue): value is RisonObject => {
@@ -217,6 +219,7 @@ export class LensPlugin {
 
   start(core: CoreStart, startDependencies: LensPluginStartDependencies) {
     this.createEditorFrame = this.editorFrameService.start(core, startDependencies).createInstance;
+    this.xyVisualization.start(core, startDependencies);
   }
 
   stop() {
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 4b19ad288ddaa..bef53c2fd266e 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
@@ -6,6 +6,7 @@ exports[`xy_expression XYChart component it renders area 1`] = `
 >
   <Connect(spec)
     legendPosition="top"
+    onElementClick={[Function]}
     rotation={0}
     showLegend={false}
     showLegendExtra={false}
@@ -72,6 +73,7 @@ exports[`xy_expression XYChart component it renders bar 1`] = `
 >
   <Connect(spec)
     legendPosition="top"
+    onElementClick={[Function]}
     rotation={0}
     showLegend={false}
     showLegendExtra={false}
@@ -138,6 +140,7 @@ exports[`xy_expression XYChart component it renders horizontal bar 1`] = `
 >
   <Connect(spec)
     legendPosition="top"
+    onElementClick={[Function]}
     rotation={90}
     showLegend={false}
     showLegendExtra={false}
@@ -204,6 +207,7 @@ exports[`xy_expression XYChart component it renders line 1`] = `
 >
   <Connect(spec)
     legendPosition="top"
+    onElementClick={[Function]}
     rotation={0}
     showLegend={false}
     showLegendExtra={false}
@@ -270,6 +274,7 @@ exports[`xy_expression XYChart component it renders stacked area 1`] = `
 >
   <Connect(spec)
     legendPosition="top"
+    onElementClick={[Function]}
     rotation={0}
     showLegend={false}
     showLegendExtra={false}
@@ -340,6 +345,7 @@ exports[`xy_expression XYChart component it renders stacked bar 1`] = `
 >
   <Connect(spec)
     legendPosition="top"
+    onElementClick={[Function]}
     rotation={0}
     showLegend={false}
     showLegendExtra={false}
@@ -410,6 +416,7 @@ exports[`xy_expression XYChart component it renders stacked horizontal bar 1`] =
 >
   <Connect(spec)
     legendPosition="top"
+    onElementClick={[Function]}
     rotation={90}
     showLegend={false}
     showLegendExtra={false}
diff --git a/x-pack/legacy/plugins/lens/public/xy_visualization/index.ts b/x-pack/legacy/plugins/lens/public/xy_visualization/index.ts
index 86c52e0577616..fc836d81ada2b 100644
--- a/x-pack/legacy/plugins/lens/public/xy_visualization/index.ts
+++ b/x-pack/legacy/plugins/lens/public/xy_visualization/index.ts
@@ -5,7 +5,7 @@
  */
 
 import { EUI_CHARTS_THEME_DARK, EUI_CHARTS_THEME_LIGHT } from '@elastic/eui/dist/eui_charts_theme';
-import { CoreSetup, IUiSettingsClient } from 'src/core/public';
+import { CoreSetup, IUiSettingsClient, CoreStart } from 'src/core/public';
 import moment from 'moment-timezone';
 import { FormatFactory } from '../legacy_imports';
 import { ExpressionsSetup } from '../../../../../../src/plugins/expressions/public';
@@ -13,6 +13,8 @@ import { xyVisualization } from './xy_visualization';
 import { xyChart, getXyChartRenderer } from './xy_expression';
 import { legendConfig, xConfig, layerConfig } from './types';
 import { EditorFrameSetup } from '../types';
+import { UiActionsStart } from '../../../../../../src/plugins/ui_actions/public';
+import { setExecuteTriggerActions } from './services';
 
 export interface XyVisualizationPluginSetupPlugins {
   expressions: ExpressionsSetup;
@@ -20,6 +22,10 @@ export interface XyVisualizationPluginSetupPlugins {
   editorFrame: EditorFrameSetup;
 }
 
+interface XyVisualizationPluginStartPlugins {
+  uiActions: UiActionsStart;
+}
+
 function getTimeZone(uiSettings: IUiSettingsClient) {
   const configuredTimeZone = uiSettings.get('dateFormat:tz');
   if (configuredTimeZone === 'Browser') {
@@ -53,4 +59,7 @@ export class XyVisualization {
 
     editorFrame.registerVisualization(xyVisualization);
   }
+  start(core: CoreStart, { uiActions }: XyVisualizationPluginStartPlugins) {
+    setExecuteTriggerActions(uiActions.executeTriggerActions);
+  }
 }
diff --git a/x-pack/legacy/plugins/lens/public/xy_visualization/services.ts b/x-pack/legacy/plugins/lens/public/xy_visualization/services.ts
new file mode 100644
index 0000000000000..af683efb86534
--- /dev/null
+++ b/x-pack/legacy/plugins/lens/public/xy_visualization/services.ts
@@ -0,0 +1,12 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { createGetterSetter } from '../../../../../../src/plugins/kibana_utils/public';
+import { UiActionsStart } from '../../../../../../src/plugins/ui_actions/public';
+
+export const [getExecuteTriggerActions, setExecuteTriggerActions] = createGetterSetter<
+  UiActionsStart['executeTriggerActions']
+>('executeTriggerActions');
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 adf64fece2942..d6abee101db31 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
@@ -12,6 +12,8 @@ import {
   LineSeries,
   Settings,
   ScaleType,
+  GeometryValue,
+  XYChartSeriesIdentifier,
   SeriesNameFn,
 } from '@elastic/charts';
 import { xyChart, XYChart } from './xy_expression';
@@ -20,6 +22,9 @@ import React from 'react';
 import { shallow } from 'enzyme';
 import { XYArgs, LegendConfig, legendConfig, layerConfig, LayerArgs } from './types';
 import { createMockExecutionContext } from '../../../../../../src/plugins/expressions/common/mocks';
+import { mountWithIntl } from 'test_utils/enzyme_helpers';
+
+const executeTriggerActions = jest.fn();
 
 function sampleArgs() {
   const data: LensMultiTable = {
@@ -141,6 +146,7 @@ describe('xy_expression', () => {
           formatFactory={getFormatSpy}
           timeZone="UTC"
           chartTheme={{}}
+          executeTriggerActions={executeTriggerActions}
         />
       );
       expect(component).toMatchSnapshot();
@@ -166,6 +172,7 @@ describe('xy_expression', () => {
           formatFactory={getFormatSpy}
           timeZone="UTC"
           chartTheme={{}}
+          executeTriggerActions={executeTriggerActions}
         />
       );
       expect(component.find(Settings).prop('xDomain')).toMatchInlineSnapshot(`
@@ -195,6 +202,7 @@ describe('xy_expression', () => {
           formatFactory={getFormatSpy}
           timeZone="UTC"
           chartTheme={{}}
+          executeTriggerActions={executeTriggerActions}
         />
       );
       expect(component.find(Settings).prop('xDomain')).toBeUndefined();
@@ -209,6 +217,7 @@ describe('xy_expression', () => {
           formatFactory={getFormatSpy}
           timeZone="UTC"
           chartTheme={{}}
+          executeTriggerActions={executeTriggerActions}
         />
       );
       expect(component).toMatchSnapshot();
@@ -224,6 +233,7 @@ describe('xy_expression', () => {
           formatFactory={getFormatSpy}
           timeZone="UTC"
           chartTheme={{}}
+          executeTriggerActions={executeTriggerActions}
         />
       );
       expect(component).toMatchSnapshot();
@@ -239,6 +249,7 @@ describe('xy_expression', () => {
           formatFactory={getFormatSpy}
           timeZone="UTC"
           chartTheme={{}}
+          executeTriggerActions={executeTriggerActions}
         />
       );
       expect(component).toMatchSnapshot();
@@ -246,6 +257,69 @@ describe('xy_expression', () => {
       expect(component.find(Settings).prop('rotation')).toEqual(90);
     });
 
+    test('onElementClick returns correct context data', () => {
+      const geometry: GeometryValue = { x: 5, y: 1, accessor: 'y1' };
+      const series = {
+        key: 'spec{d}yAccessor{d}splitAccessors{b-2}',
+        specId: 'd',
+        yAccessor: 'd',
+        splitAccessors: {},
+        seriesKeys: [2, 'd'],
+      };
+
+      const { args, data } = sampleArgs();
+
+      const wrapper = mountWithIntl(
+        <XYChart
+          data={data}
+          args={{
+            ...args,
+            layers: [
+              {
+                layerId: 'first',
+                isHistogram: true,
+                seriesType: 'bar_stacked',
+                xAccessor: 'b',
+                yScaleType: 'linear',
+                xScaleType: 'time',
+                splitAccessor: 'b',
+                accessors: ['d'],
+                columnToLabel: '{"a": "Label A", "b": "Label B", "d": "Label D"}',
+              },
+            ],
+          }}
+          formatFactory={getFormatSpy}
+          timeZone="UTC"
+          chartTheme={{}}
+          executeTriggerActions={executeTriggerActions}
+        />
+      );
+
+      wrapper
+        .find(Settings)
+        .first()
+        .prop('onElementClick')!([[geometry, series as XYChartSeriesIdentifier]]);
+
+      expect(executeTriggerActions).toHaveBeenCalledWith('VALUE_CLICK_TRIGGER', {
+        data: {
+          data: [
+            {
+              column: 1,
+              row: 1,
+              table: data.tables.first,
+              value: 5,
+            },
+            {
+              column: 1,
+              row: 0,
+              table: data.tables.first,
+              value: 2,
+            },
+          ],
+        },
+      });
+    });
+
     test('it renders stacked bar', () => {
       const { data, args } = sampleArgs();
       const component = shallow(
@@ -255,6 +329,7 @@ describe('xy_expression', () => {
           formatFactory={getFormatSpy}
           timeZone="UTC"
           chartTheme={{}}
+          executeTriggerActions={executeTriggerActions}
         />
       );
       expect(component).toMatchSnapshot();
@@ -271,6 +346,7 @@ describe('xy_expression', () => {
           formatFactory={getFormatSpy}
           timeZone="UTC"
           chartTheme={{}}
+          executeTriggerActions={executeTriggerActions}
         />
       );
       expect(component).toMatchSnapshot();
@@ -290,6 +366,7 @@ describe('xy_expression', () => {
           formatFactory={getFormatSpy}
           timeZone="UTC"
           chartTheme={{}}
+          executeTriggerActions={executeTriggerActions}
         />
       );
       expect(component).toMatchSnapshot();
@@ -307,6 +384,7 @@ describe('xy_expression', () => {
           formatFactory={getFormatSpy}
           timeZone="CEST"
           chartTheme={{}}
+          executeTriggerActions={executeTriggerActions}
         />
       );
       expect(component.find(LineSeries).prop('timeZone')).toEqual('CEST');
@@ -323,6 +401,7 @@ describe('xy_expression', () => {
           formatFactory={getFormatSpy}
           timeZone="UTC"
           chartTheme={{}}
+          executeTriggerActions={executeTriggerActions}
         />
       );
       expect(component.find(BarSeries).prop('enableHistogramMode')).toEqual(true);
@@ -346,6 +425,7 @@ describe('xy_expression', () => {
           formatFactory={getFormatSpy}
           timeZone="UTC"
           chartTheme={{}}
+          executeTriggerActions={executeTriggerActions}
         />
       );
       expect(component.find(BarSeries).prop('enableHistogramMode')).toEqual(true);
@@ -363,6 +443,7 @@ describe('xy_expression', () => {
           formatFactory={getFormatSpy}
           timeZone="UTC"
           chartTheme={{}}
+          executeTriggerActions={executeTriggerActions}
         />
       );
       expect(component.find(BarSeries).prop('enableHistogramMode')).toEqual(false);
@@ -378,6 +459,7 @@ describe('xy_expression', () => {
           formatFactory={getFormatSpy}
           timeZone="UTC"
           chartTheme={{}}
+          executeTriggerActions={executeTriggerActions}
         />
       );
       const nameFn = component.find(LineSeries).prop('name') as SeriesNameFn;
@@ -414,6 +496,7 @@ describe('xy_expression', () => {
           formatFactory={getFormatSpy}
           timeZone="UTC"
           chartTheme={{}}
+          executeTriggerActions={executeTriggerActions}
         />
       );
       const nameFn = component.find(LineSeries).prop('name') as SeriesNameFn;
@@ -442,6 +525,7 @@ describe('xy_expression', () => {
           formatFactory={getFormatSpy}
           timeZone="UTC"
           chartTheme={{}}
+          executeTriggerActions={executeTriggerActions}
         />
       );
       expect(component.find(LineSeries).prop('xScaleType')).toEqual(ScaleType.Ordinal);
@@ -457,6 +541,7 @@ describe('xy_expression', () => {
           formatFactory={getFormatSpy}
           timeZone="UTC"
           chartTheme={{}}
+          executeTriggerActions={executeTriggerActions}
         />
       );
       expect(component.find(LineSeries).prop('yScaleType')).toEqual(ScaleType.Sqrt);
@@ -472,6 +557,7 @@ describe('xy_expression', () => {
           formatFactory={getFormatSpy}
           timeZone="UTC"
           chartTheme={{}}
+          executeTriggerActions={executeTriggerActions}
         />
       );
 
@@ -488,6 +574,7 @@ describe('xy_expression', () => {
           formatFactory={getFormatSpy}
           timeZone="UTC"
           chartTheme={{}}
+          executeTriggerActions={executeTriggerActions}
         />
       );
 
@@ -504,6 +591,7 @@ describe('xy_expression', () => {
           formatFactory={getFormatSpy}
           chartTheme={{}}
           timeZone="UTC"
+          executeTriggerActions={executeTriggerActions}
         />
       );
       expect(getFormatSpy).toHaveBeenCalledWith({
@@ -522,6 +610,7 @@ describe('xy_expression', () => {
           formatFactory={getFormatSpy}
           timeZone="UTC"
           chartTheme={{}}
+          executeTriggerActions={executeTriggerActions}
         />
       );
 
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 ce966ee6150a0..98d95c2ea7715 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
@@ -15,6 +15,8 @@ import {
   BarSeries,
   Position,
   PartialTheme,
+  GeometryValue,
+  XYChartSeriesIdentifier,
 } from '@elastic/charts';
 import { I18nProvider } from '@kbn/i18n/react';
 import {
@@ -26,11 +28,15 @@ import {
 import { EuiIcon, EuiText, IconType, EuiSpacer } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n/react';
 import { i18n } from '@kbn/i18n';
-import { FormatFactory } from '../legacy_imports';
+import { EmbeddableVisTriggerContext } from '../../../../../../src/plugins/embeddable/public';
+import { VIS_EVENT_TO_TRIGGER } from '../../../../../../src/legacy/core_plugins/visualizations/public/np_ready/public/embeddable/events';
+import { FormatFactory } from '../../../../../../src/legacy/ui/public/visualize/loader/pipeline_helpers/utilities';
 import { LensMultiTable } from '../types';
 import { XYArgs, SeriesType, visualizationTypes } from './types';
 import { VisualizationContainer } from '../visualization_container';
 import { isHorizontalChart } from './state_helpers';
+import { UiActionsStart } from '../../../../../../src/plugins/ui_actions/public';
+import { getExecuteTriggerActions } from './services';
 
 type InferPropType<T> = T extends React.FunctionComponent<infer P> ? P : T;
 type SeriesSpec = InferPropType<typeof LineSeries> &
@@ -52,6 +58,7 @@ type XYChartRenderProps = XYChartProps & {
   chartTheme: PartialTheme;
   formatFactory: FormatFactory;
   timeZone: string;
+  executeTriggerActions: UiActionsStart['executeTriggerActions'];
 };
 
 export const xyChart: ExpressionFunctionDefinition<
@@ -113,10 +120,15 @@ export const getXyChartRenderer = (dependencies: {
   validate: () => undefined,
   reuseDomNode: true,
   render: (domNode: Element, config: XYChartProps, handlers: IInterpreterRenderHandlers) => {
+    const executeTriggerActions = getExecuteTriggerActions();
     handlers.onDestroy(() => ReactDOM.unmountComponentAtNode(domNode));
     ReactDOM.render(
       <I18nProvider>
-        <XYChartReportable {...config} {...dependencies} />
+        <XYChartReportable
+          {...config}
+          {...dependencies}
+          executeTriggerActions={executeTriggerActions}
+        />
       </I18nProvider>,
       domNode,
       () => handlers.done()
@@ -148,7 +160,14 @@ export function XYChartReportable(props: XYChartRenderProps) {
   );
 }
 
-export function XYChart({ data, args, formatFactory, timeZone, chartTheme }: XYChartRenderProps) {
+export function XYChart({
+  data,
+  args,
+  formatFactory,
+  timeZone,
+  chartTheme,
+  executeTriggerActions,
+}: XYChartRenderProps) {
   const { legend, layers } = args;
 
   if (Object.values(data.tables).every(table => table.rows.length === 0)) {
@@ -189,7 +208,13 @@ export function XYChart({ data, args, formatFactory, timeZone, chartTheme }: XYC
   const shouldRotate = isHorizontalChart(layers);
 
   const xTitle = (xAxisColumn && xAxisColumn.name) || args.xTitle;
-
+  const xDomain =
+    data.dateRange && layers.every(l => l.xScaleType === 'time')
+      ? {
+          min: data.dateRange.fromDate.getTime(),
+          max: data.dateRange.toDate.getTime(),
+        }
+      : undefined;
   return (
     <Chart>
       <Settings
@@ -198,14 +223,63 @@ export function XYChart({ data, args, formatFactory, timeZone, chartTheme }: XYC
         showLegendExtra={false}
         theme={chartTheme}
         rotation={shouldRotate ? 90 : 0}
-        xDomain={
-          data.dateRange && layers.every(l => l.xScaleType === 'time')
-            ? {
-                min: data.dateRange.fromDate.getTime(),
-                max: data.dateRange.toDate.getTime(),
-              }
-            : undefined
-        }
+        xDomain={xDomain}
+        onElementClick={([[geometry, series]]) => {
+          // for xyChart series is always XYChartSeriesIdentifier and geometry is always type of GeometryValue
+          const xySeries = series as XYChartSeriesIdentifier;
+          const xyGeometry = geometry as GeometryValue;
+
+          const layer = layers.find(l =>
+            xySeries.seriesKeys.some((key: string | number) => l.accessors.includes(key.toString()))
+          );
+          if (!layer) {
+            return;
+          }
+
+          const table = data.tables[layer.layerId];
+
+          const points = [
+            {
+              row: table.rows.findIndex(
+                row => layer.xAccessor && row[layer.xAccessor] === xyGeometry.x
+              ),
+              column: table.columns.findIndex(col => col.id === layer.xAccessor),
+              value: xyGeometry.x,
+            },
+          ];
+
+          if (xySeries.seriesKeys.length > 1) {
+            const pointValue = xySeries.seriesKeys[0];
+
+            points.push({
+              row: table.rows.findIndex(
+                row => layer.splitAccessor && row[layer.splitAccessor] === pointValue
+              ),
+              column: table.columns.findIndex(col => col.id === layer.splitAccessor),
+              value: pointValue,
+            });
+          }
+
+          const xAxisFieldName: string | undefined = table.columns.find(
+            col => col.id === layer.xAccessor
+          )?.meta?.aggConfigParams?.field;
+
+          const timeFieldName = xDomain && xAxisFieldName;
+
+          const context: EmbeddableVisTriggerContext = {
+            data: {
+              data: points.map(point => ({
+                row: point.row,
+                column: point.column,
+                value: point.value,
+                table,
+              })),
+            },
+            timeFieldName,
+          };
+
+          executeTriggerActions(VIS_EVENT_TO_TRIGGER.filter, context);
+        }}
       />
 
       <Axis
@@ -254,14 +328,23 @@ export function XYChart({ data, args, formatFactory, timeZone, chartTheme }: XYC
           const columnToLabelMap: Record<string, string> = columnToLabel
             ? JSON.parse(columnToLabel)
             : {};
+
           const table = data.tables[layerId];
+
+          // For date histogram chart type, we're getting the rows that represent intervals without data.
+          // To not display them in the legend, they need to be filtered out.
+          const rows = table.rows.filter(
+            row =>
+              !(splitAccessor && !row[splitAccessor] && accessors.every(accessor => !row[accessor]))
+          );
+
           const seriesProps: SeriesSpec = {
             splitSeriesAccessors: splitAccessor ? [splitAccessor] : [],
             stackAccessors: seriesType.includes('stacked') ? [xAccessor] : [],
             id: splitAccessor || accessors.join(','),
             xAccessor,
             yAccessors: accessors,
-            data: table.rows,
+            data: rows,
             xScaleType,
             yScaleType,
             enableHistogramMode: isHistogram && (seriesType.includes('stacked') || !splitAccessor),
@@ -276,16 +359,17 @@ export function XYChart({ data, args, formatFactory, timeZone, chartTheme }: XYC
             },
           };
 
-          return seriesType === 'line' ? (
-            <LineSeries key={index} {...seriesProps} />
-          ) : seriesType === 'bar' ||
-            seriesType === 'bar_stacked' ||
-            seriesType === 'bar_horizontal' ||
-            seriesType === 'bar_horizontal_stacked' ? (
-            <BarSeries key={index} {...seriesProps} />
-          ) : (
-            <AreaSeries key={index} {...seriesProps} />
-          );
+          switch (seriesType) {
+            case 'line':
+              return <LineSeries key={index} {...seriesProps} />;
+            case 'bar':
+            case 'bar_stacked':
+            case 'bar_horizontal':
+            case 'bar_horizontal_stacked':
+              return <BarSeries key={index} {...seriesProps} />;
+            default:
+              return <AreaSeries key={index} {...seriesProps} />;
+          }
         }
       )}
     </Chart>
diff --git a/x-pack/test/api_integration/apis/lens/telemetry.ts b/x-pack/test/api_integration/apis/lens/telemetry.ts
index 653df453c2560..fce76bfc96e2c 100644
--- a/x-pack/test/api_integration/apis/lens/telemetry.ts
+++ b/x-pack/test/api_integration/apis/lens/telemetry.ts
@@ -201,8 +201,9 @@ export default ({ getService }: FtrProviderContext) => {
 
       expect(results.saved_overall).to.eql({
         lnsMetric: 1,
+        bar_stacked: 1,
       });
-      expect(results.saved_overall_total).to.eql(1);
+      expect(results.saved_overall_total).to.eql(2);
 
       await esArchiver.unload('lens/basic');
     });
diff --git a/x-pack/test/functional/apps/lens/smokescreen.ts b/x-pack/test/functional/apps/lens/smokescreen.ts
index 5768e51ae5f9f..be7a2faae6711 100644
--- a/x-pack/test/functional/apps/lens/smokescreen.ts
+++ b/x-pack/test/functional/apps/lens/smokescreen.ts
@@ -21,6 +21,10 @@ export default function({ getService, getPageObjects }: FtrProviderContext) {
   ]);
   const find = getService('find');
   const dashboardAddPanel = getService('dashboardAddPanel');
+  const elasticChart = getService('elasticChart');
+  const browser = getService('browser');
+  const testSubjects = getService('testSubjects');
+  const filterBar = getService('filterBar');
 
   async function assertExpectedMetric() {
     await PageObjects.lens.assertExactText(
@@ -41,6 +45,29 @@ export default function({ getService, getPageObjects }: FtrProviderContext) {
     );
   }
 
+  async function assertExpectedChart() {
+    await PageObjects.lens.assertExactText(
+      '[data-test-subj="embeddablePanelHeading-lnsXYvis"]',
+      'lnsXYvis'
+    );
+  }
+
+  async function assertExpectedTimerange() {
+    const time = await PageObjects.timePicker.getTimeConfig();
+    expect(time.start).to.equal('Sep 21, 2015 @ 09:00:00.000');
+    expect(time.end).to.equal('Sep 21, 2015 @ 12:00:00.000');
+  }
+
+  async function clickOnBarHistogram() {
+    const el = await elasticChart.getCanvas();
+
+    await browser
+      .getActions()
+      .move({ x: 5, y: 5, origin: el._webElement })
+      .click()
+      .perform();
+  }
+
   describe('lens smokescreen tests', () => {
     it('should allow editing saved visualizations', async () => {
       await PageObjects.visualize.gotoVisualizationLandingPage();
@@ -49,7 +76,7 @@ export default function({ getService, getPageObjects }: FtrProviderContext) {
       await assertExpectedMetric();
     });
 
-    it('should be embeddable in dashboards', async () => {
+    it('metric should be embeddable in dashboards', async () => {
       await PageObjects.common.navigateToApp('dashboard');
       await PageObjects.dashboard.clickNewDashboard();
       await dashboardAddPanel.clickOpenAddPanel();
@@ -59,6 +86,22 @@ export default function({ getService, getPageObjects }: FtrProviderContext) {
       await assertExpectedMetric();
     });
 
+    it('click on the bar in XYChart adds proper filters/timerange', async () => {
+      await PageObjects.common.navigateToApp('dashboard');
+      await PageObjects.dashboard.clickNewDashboard();
+      await dashboardAddPanel.clickOpenAddPanel();
+      await find.clickByButtonText('lnsXYvis');
+      await dashboardAddPanel.closeAddPanel();
+      await PageObjects.lens.goToTimeRange();
+      await clickOnBarHistogram();
+      await testSubjects.click('applyFiltersPopoverButton');
+
+      await assertExpectedChart();
+      await assertExpectedTimerange();
+      const hasIpFilter = await filterBar.hasFilter('ip', '97.220.3.248');
+      expect(hasIpFilter).to.be(true);
+    });
+
     it('should allow seamless transition to and from table view', async () => {
       await PageObjects.visualize.gotoVisualizationLandingPage();
       await PageObjects.lens.clickVisualizeListItemTitle('Artistpreviouslyknownaslens');
diff --git a/x-pack/test/functional/es_archives/lens/basic/data.json.gz b/x-pack/test/functional/es_archives/lens/basic/data.json.gz
index a5079d92e77f082ca2a30559e9a8c1bbcace01ff..4ed7c29f7391e4b01ea2737a318cb533d72bf63a 100644
GIT binary patch
literal 4183
zcmV-d5UB4TiwFpe1bSWo17u-zVJ>QOZ*BnX9cz!<Hu8IZh0eH7hn1n19}=*@<(dnc
zUh_b+E!vA01|?B88(DHhX|tQ0|ND^?B~ve3_U?AMfQ)uy@i83E42LsAj{N<FqKwkJ
zEgU(@$dA3z1ueJ%VMa^7lLzvMd|HdQz=Mtt1CWI&Ye%ahAKud1@n__M2rTuY2FF?A
z?SYVz4O%52MRD{SOfdOJs8cw23TZl?j<pf5*j*I86Bxh*MjphZ(I;MdT~-&}1&GT8
zVwl`OihY`7@M2%(L+mAJo90-IuGR=E<iB(c6+S_Q0sPxY?1V6IL+HPTAkC5r9s(w$
zVFWg8Ca*ZH8gnTKo+JH2s4T0Nlo_OG_hR?r#rOVPVhmBYAWdNsIbpoQDZp#>ALlTv
z0;@{f0Kw3w6c~N_zF-qxjGV>jpBsoVSdoW|1w)vX;xs|gij{eB7Nw+6Bj0ltK%YDY
zAjFUsL6CTBN@Y^Wc(xdU)hdB2kn+-^X##=&I*B*0V(&Lf2wc?dF4`~}C*bQNV#Q0_
zkfK#JoKmpD5|N0aBNu%T;aUnd+bTvrNa0i9vqb*Wkfw!MOSUNGK?i$rQd{m(wsB!{
zGCD=!{e*d$tFbCZV&M~@l;a@@$A~VZ<H@3Y7&<a3ANMYW_(25v0g&-RM970`dXPW=
z#kj!R6h_o;lSg<;lw=a16^zGT949`CKtq&B<#HP%z5<^BGh+EZ=ITEgADnoSp(7K8
z)}$2~S|Veyz(}SQw~il`W2aJxU?UTC>c;ES?PiZ{x}L}=hK^L6l473^QS@0Ng~QO1
ziAx*ctx*KWu|!1L<0K=c60ng)1#RFaPVVHvCIw>xFp-916rlu$fDI#!bW^M{43lwy
z5}fAc@*x+3Hr$?0y0+`BT;iUG@TC!UF6TeQQA%SFAW4xILT3~EC_vC((kP@H0mu$a
zx0xFvynYU-V(6t(g$@qmDbp_6foTd>(o>V*C^04Dl_Q)3N=wWtnsU<<ZKOK<>p<`s
z(9l^!v|39P)i{jjbD-!~<fm)-3Chrvo1Pe@a4DA+egH|iX_=xll$wqVLCI<OxaX_)
zCm}&gZVF~eC^G>GdJ@ww{fg)fDaQkeL_w1SNInBvJ_p0R1=nXlS-DO03YO1+n$*gW
zo|qKLXFyB2O`!^w5>r#=tz5c&{7d$@mpx7<7eh!c8sTjmVX4+-j*(1MVi)-(IuFkA
zk%>Z2cL%nKi&QF7GM$*Eo<yffw^*V@MUZ)7PF;)XNR&&jX&TNuo^G^Ho2WJ;_6n^Q
za)BBNNrzLj>Ult;>3DKRidK=pR0UU7XIm;|{t~3Lk)i2xRX0>aztS|vG97I;*6itj
zA2wUc%WxWRmU(L1kUBM_PMu1kA$4j<of=Z79uK7<b!teR8d9f*)G233of=Z7PC{u&
zof=Z7?n|8^b!teRIt7a%b!teRdRR&gsZ&Gh)Q~zgq)rW~Q$y;MEX#ICo%#!?IiyZK
z05ONusUdYrT2c<FQ$y;MoYWjrryhomvR@S*Ql}n(f>K>398#wqfr>-w)T5E~d06K|
z>eP@rB{wbQHid@Nsr%DVx_x{|of=Z79)e0k>eP@rHKa~GJT^n>)N@LmqLeCs0ZYtE
z8a?CesvCqe5Tb94JPuOfEy9oR%VCvaD8$*=9P2&P(-Z+xiFhOTOW+c%&oTZ8ZlM3(
z{S$iWTY8frm(q_6`=36(e>cvjSb@;arLx7YldaWBcC*!1HC;7~E8TWX!!h--p%J#0
z?d!A>$XNSLG;txc&bQK=vaL3K3WVqYVwTZs6prw9F=C581koyE9yPtImU%EDUw5P;
zKw(PnIyj%MFZf-<UtsXAP$s8Pp8yo7+qSk}DjyIOC!3*<DWPdOg`HS=QwpGdQISB_
zhfkS%V+2(OysGuKykH9wu)#TD8kNBJui`jl=?kU8^ZlRU3P%3EC}htcV&bK;Xb&~<
z%Cj$oU&T?D3ax<)Lp~y2$6o~ndn4*f))c495Z=IWUq=3kJhquRx~5S+`9x{590Cq>
z1BpiW^6$VS>kP*USL#8WY(Sb<(Ob2`Wtv@u7`t4xUlkPLJHu|rD`=xndmuWSDvanZ
zAP^?4b!Xek8g9UX-#cP>RtIJ~76)q_0ZYVlgX>^1Ty2U3A(6W*;ghuxZ|!6Bjl!Cc
zuW{ltabK`C$ZA>9zwU%N#_5`rWZq|(3XBs<f2QnZ9p2MI)@g$<CVOn7Tcv#8@oipA
z$$ed}o89AO+)B1VoVy7Rdq{!Wu!nGx4tvP3hYWkjBkdtf2RQNPKesD<&Thf_A5>iL
zKPyG73@b$L6f%@TR0_o6Le6zebtkCq1*Fm6F<;fya*9|QCv3K0yUmw=rN!=|3TV^R
zm#mzqVnA_-vM{`;R~ElnOzLyK)f<#_bM=X<`<AAHx$COB4sF$*dx2`Wt~Q0i)P$Nl
zYIOe$DIu%bq|H_lb<|-e4!NMW%uV3ch;U$3tKKyr74oxPCji4HB850Lq1CC~lo4J*
zRFJoB$F)j@wkGun)e&r)M5D>BPKFm<Py6rU&r`Qet=veNX~G&*Y>pD^Vp%wbrXAT8
z-~Z<)x<LE+;Z1AhO9hKoD`lqYvnze(Of1Kkj?LNpp<fRZM*&(n^RYJ8&QUaZ|Ei|R
zH#Ov<5T$nxU!N}{v|;8HZvIxeo1xHumu*Omt!XpewvCB3vozZl%?C=H*KC7y(r*;K
zU$1_s{CIi(TjXyF><@*sdNPR5?jVQAf7X>gcdVIXSmW7Le_#%UWWhPJY2aBz9#t=}
ztXy@uwrQ$?KevpT7MQ@(&tV@0US%G<-6oWK`7V(|SVaF*I4qAI*4?Ix!esYyK@7Qt
zV52VR21)*~^+ms2&_7>_Css%Q-z`Q8-&+WbPuHZBj6tzkZeX&4OBVFRN(k;?^2Vo)
zyr~Z6AaGTn&nK!C0H^|OYN>&1&aG)M^{fdo0hC3gD0%10?+{Z{NMQsa5cUE=+U3>_
zewn@u!=I@MhcB7xR<`thItYJ>zZNAZ^1{sLviBp3QhZ4TSRufFU;;vhVyJ^Gjh9qH
z#Hs~-3DSbuOa%oD&)4j^HdjqsCsVNlOLa|GQ|HEPI)g4S%wSd$uQ0C`rGd5JCRPD%
z18&RK+|VkkavQFw<@VNsSzL?4<|-QJFSl4QyN3KxI77%fAwC7+e3)$_LQVfI*cOZ@
zg{r3Zolia}ArQC{@#iLPfh5AY!Nupyjj;u{%*$SH!7bWk8zl~u5^>fn-oo5dzUn3t
z2=_It@xG3&k=N~nxj2)NyB!tzy@XSyENN<As<6G}vSm6WrEm@|dk#c|I`%27fY?ck
zifh_tp)p3})1|KAE6`$maRZP_Ak(WKa#y@=5YkVJwQw*@P^jAO6Nutd-Tkk{-T$I}
zKFro^np?SQY<p!HulKTqNP8+y_06$4jF^t<u<iONtu8YvUvTfKi_=1G-l&gYH0`U3
zwbU50eJ=fn>*~!}bj7#5eA%}eh^*~i4|JK;WmBdZD9rjQ>V{s?60|E(5Z$er#$d)F
z?Q@{rUVAW)gW=HHxNhRIvR0;`L(+I3)48&E+C9DNRuj3lstz00qG>(q9KJi^#;OZd
z$jq)jGFZa^;UD7!eIv#T2-~G;#7zxm_Vrn{ZQXn7#bP#X%~=EAgi`~|fa)0&n;;Mb
zDlh_1h0qNQ&7Eo59JG5@261F(8n9JwZq8K8vOIM@pF(x&`nEQKaAum5rqHx#gL~40
zfxs|95Ely!B(M$X5#AC%;ibUfiRJlI3;L=7h_P!;Y+VJxoN(Eg8rDR!CR4i=(5(o>
zpF&IXAW)}<O-N|EmTG&pueuh5rZxeF2j@pNnmUJB7_n{JK=?OA{2itts;&)hu;sBw
zra@@v@vvvUW$sA={f|uow)(#9AzNa{;*`L;L2-t|yU$VlH3FEK{MD%Je&rQIg%N(s
ztdz4|r^+yGj+3sb`jno{8*@jSkL{WLM2?g3gpO0wGrBnJPo3d7SuW6l?h+jUr$i-~
zmP_;{(A2=xe0L7P#Iz^R#BrK|i9a_@SM|U&P%UW9RbU&I>KnkA`{s1wd*%s_Qy!o0
zaGi=cbwA$;ZTJ2M4@wtRrtfL4Kbfe8HYfClQ%waB7;0eKx;E3TVCK8k&Sh5?=q~Z2
zp>SGb<}HOtchyg7M7s-cdBnSbSB-jCL9|4^OTUXpznNQeQRk591^PTN$mVR>WUKJ4
zi3%o@K=tieFrRCNq1pBc9HKI@ToW}GujqSX9)wlG3uKE98HVqukP<Zr{eR;(WT_@Z
zr&JL`Vk!MYrM3j&C-HX4mjG^1GongtnIE$(^2445e?y^9)S^o&e2(z0jjE@J&~d7Q
zn^hMn&kGocGLz5m)DS}7mF;|QMgp$lt&$(jQM+GQiH%5uxJp~21a*xd#tHJ5HirA!
zY_%eC1pN;QBF1HUCvdhciXaSL3vrZOs*}6E<OR+0y}{L-y5$)8<D1ikXty8h6-xN4
zIqDi|R}Y2sW#FzrPSw@E%A$?wEvvY}Zgw&CFvGhPOe=5oPTsa))5YVeP>D*VRRlV<
zPJ;t|sk!HXq4t%DHV(YJAp~8)W&rM3fUlhs6{U1M2-g)PJQUkIL!(wBcei&uYIl3Z
z!*=4^$d$XIv_YDYl6w!_-XU=E=iJs&N(Umhj|z9;vb?CUW9C`zV+t_nb7AWBxAfM?
zhulIdU8c*P@<S&1ky4nl?vlNK57HNuDYs&2enp(j>c?VX<@2g|dY3(Q#z@(_k))3c
zk|m)x;k_?}NU62hi=`ta*Nay%vucV>sP{TJDEPfMv94W<3S0G5vh!%YNAQ-n>>t7{
zK3(BE(YZPl)D>Fy2=5l3wusnut*m(-el+M?pnW*>TedqV1YCAL5DFGr^;xDzVC1Ow
z2oTr0^pVhm3@st`(H1=+^;mmdGE;n7!`YQlj)k_*nO;9w44xSHrZz_}(y*SDFnC*Z
zsk3Jp6>rV`IMTThAFo<U{Q(`g`f{LGVfL`N7qNJb2|)2_4WYM=P=@r&q55~NM)}Vn
zZ^OVOfb<@nd(E%kk~&j*j~v@H`u0D@X>=_GxW41wLyU=;c><UE9s4x<^*#owe)@5@
zml8jdyXXWNegMr>H-hfLSmwGvwp!vI_=(+E*TNsCxb|9~eWy~6u)noLN9wCF>8H2W
zWaCsr18i@A*gFYd7TF*@&Bs&gJX~}3qCG_z+qAjXXT2Y3b9CA#9u6NLx%F83s1Yt4
z9yctp&U>b;^4QsN4aVsB1=+(V$>p#er?tiBpaFmE{I=5gzUJ*g(^fpC?d4V+1Xew-
z6+G=D-RcLp_x3WXN4dRh@l%}2RuStw-Yr`kJLWAL9y#vin6+Zjar7(l;=rMG^-jg!
z_m1%Ie~@)i4J~vX{QmyOGd}dqkeVN1IIoBfbYqbCA3y{{o;CL-`ZWp9zwKP$P>v!@
hwk)cg3bP|0!M5M^rH)~ZO}htm{tsj#%=zD{001+P{;2=}

literal 3004
zcmc)4^*<br!vOHpy&b2gj_H`rF&!tTdt&Mi$7bSmowj3`n;es4+DzP;X1Z&b?wI(v
zsqgFgE1vfcZ}uco!2iJq9ogBymt^U~#%jjNZyIYUb+TM^l_QRt`AQqSO!Oo|=jBED
z66)n9ytD;Ay56pS{34R&Dd#)o*99P4?AhMh-H?lmi_5_59;;9JA#9X?&t336zNCKE
zg0C~Edpyr@MW@l8MavNrM(AwBW7@c3W<>}OJi4YK;vmrdS^*A9=&lBurx(!?({3#=
z#FO33R7^q7Y||C|`%CRDJT>*<l+N*v^r~IVq1C$27WYeowbp6W@XzQrclkyBxZBXF
z&^VcnlgEZ(G}WCScA24<04eY(JK{TtlSA9#f*#*`oh|hd&8#Rv1><0jwMDSA2d#ai
z(w=FvnXWgbd86DyZtgNGoZAst49HN;#pz%;X;DpQHT{fLykBdU7=J!pXCB9{2=_!V
zv|`5}@>Eqj6GNGV2_0TS_%s(F8L>g=m*(#EW0_<QJ(xZYFp5DXqFZWCT##1UX4j#q
z%ZJF_Zc(xqs1End#|(Bqv!(u0v6PGiriiuNCzS6`f{ogtBp@O|&a^~XmLC_<*)x3F
zNlHbeM%OHXS$qh#8A?VNKTpYXAMNaoyuJKP55QSKw+DInF#4kz;{n$`y%NC}^0=q;
z&UL6)hFNP|YXh_)Q8wg*A7n2;5oDmA>1h9Thr2s?A3mIKIB<pM{dptm^_xPv;eN;b
z4N@0}u}sUY`hk~<1O<3Zzd|bXK5@!sP^RiJTQ`^=PSS8EQE{SOm*shBs@+*q^cENN
z?F-;iHwzU90nCujv>{{Ts&ld-5pHr>{8T-2h)Rnl6Uz<_zekderoJO;h$hN7d;8j)
zO_DYltt^z%E6YI%;t=6V33zMD9T~{NrRQ!Y!rnqi=@_hZA}||kdu-48M|b0}sQ^1F
zF*L>jDCN^DEZC+_q)yJdr8Q0^7$DG264wS=VF}9#k*1Z!(Ko(Bjfrf^ke?8Qmv}M_
zO#Brt?<QhWpy9EJcW9AmWllH=00UtC2a7j{33Ld+a-XRb&+!$(aC8C=L)C^+e6~ZG
zv8x2e-gd_7po&XA0OVVDL2&qGzuADpVD(QLUU5Ox&kvU27tCk8Uv7bG+SbDUDj0wr
zCZ;C@a6mC$wakxryhSn2GbaAUf`<f$@5dh?Fs;U4C+%WCRASTrAOuc>eh>x>mT(zw
zGNnQ7&EsEBrU#;472W)#V?#?`gp73_JEsY#L+C-e%n(1BJ*2i|1!J~b^R&jt)Sl{#
ztSKL*S-)aoucFoDEy4EIZlXo5r@swH7Ps*BjsyRZCYq}`>?gs#{)!5=Y9!2%sn>^j
zTQ)n|?3C^)fL3!;^vCX2r|L_((#N0MnNLe=<QY%%|9@5i-lv^2y&<j=5!4C)c~~i^
z4nY;dRTY)Q*QhvO{26iV_~nz(aQ51hRmX5jKHYjPc)2EzA=oVbMYJGe9#MEFDs0VA
z+|>S`RpG<s`9i<1R8M}4qhOP;G|9*!`=(<90_nlj9O@l(-*d$~J1>p4TDod$ZB@87
zXgpSDWP#Vn$SjSX{s7VwSX%e77oRGyGqh%3kPVoZ%)dN$n;8PS9&RAbdiXxyT9G^)
z^p=Osp2{$WdqxfZ=UzZ|=pNwijh$2i&$D_aD4CQ_`IF{&Z<!rL%$Dy&78xpTB4qjs
z$^YDyTTBxXb#icLI$a5<(B|y~aqd!hbtV=4=R?%sZj%vzQt+l(m#$3lc`xiF6#SQG
z46^7!g`Yib@$}%f735IUT4yZD?T79Z%=Y{>Un4}DgodMezMJ$!m97D&RZRvs5tgCE
z;2gK7{qKz4zs<$BHajbWDm<R@L=4TFe!gp;(C!fTlzvA9zj!CuL!%ap4itMua$pcp
zS5@Um{%I$baP&U5H_<Gqi5>WBS%SOGiOjZyN~IiTr*gd<3@s>x+s<Z$4*Nb`4h3%)
zmeXlG{5VP$D}$LEBR``2Dd+e@$3_I@bI(*K_%&i`rTlAbYC@LI)XauwLMKLZM#h|%
zA<fFq{i)4i@z!e7%tf=nCgiOmEIuADEDWbr$NAn$Sp6ZGU~ZvgHaC+x1((++Qc{P)
z*9qXX5G%#fT+HFm?iPH>pSgSUD0$m5nVwcd>M~eZx)@XF_rgB$4SgbBKPpp4e6iYd
z#cFt8u<c0N{gU2tsxy&g3UJOLDnx-m$~<=NeuO_2Tc;4|T6ppf8)KUmD!mu>H5oqr
zM};!8_;GTzvtXW;@@mD(p$_!6%+gtTO$pVPcU5u(4PMn^mH;q+i>te85}ke>pj`Z!
zULkrORxkJCB>2B2*VD^sH8mK6aoVSN;*Q*6jo*3{tI{JR=DiIM_d~q9&JTLS1&XxM
zRzt(Jt~;~C1@f4qRNe-h$wN@~^Q4KPg7+hJxNK#U%M-0n(3fg>5MamU0S+giR-s)s
zaNjl*O~XCWFYY3h?=dPg)=)M&ET&kKqvW&IPDk;@5bGO=Ex;akw6`M|aBakQp<32j
z%;jvqJLsJra^J#^6(m;u`y}QNP88gpT{sDuN37fLH5nBQ=vwjN;$rLW$MX^r`4QuY
zWL(QB=4?$r^2cSRSy6iJ!2KlD3XHW1P?OTXKHiJsev@R7+PX&Z^ai}m@F2SW;@%UJ
zAb%g;Fy4glaumnd*Bbj%rMjY3+oN=ScXb*GmsM{?)>BmH@ZSPSh-<e^x)bmuBlhGq
zS@gD3pR|3JaN&<=9+0fw4?&QS8OBO}2J$!_0ITdWf1@le%+lL;_*vxWKHCUhpYL(t
zgt6WbBYGYe)0>rNe8rm?3blPPSo%j@BHV@1>D#);;NO)*4_w+5X%bS*wcP_3+uO_8
zf%H!j85A@{$@HAP$CjBWBNP+ds{ekvfKKpOCdv0gdrH<yz3h0cz05MZrJCMhnt)7m
zMT0*+_06z<w~TK`-i<?}YlFJ3Xovsmpk4KHCP<7Vk#4a_4;F>|{USY;we}>ef$tMk
zyeXN5;<h}K%``e_>42a`#RClus%q-gXlRd^F~Hr{rYqN1Q>T1?=akycYCgQ1hFtb+
z`2|<Zed01$5o!v84eoXN_*E~k<gx{Ux2J=8TzZ8JtuLBO)tEkss!Q2oq(TUY(`)4M
zHre>r_sgJym>l3SZ|q}s(DM)yr@%|BtQ>06uaE1^$erI;@)Wi3`YNjt$Z&g}f84+0
z&tkirnydpysbto1ljYE^yffj^h}Hwmep#f__@$HIb^0ct$oW}7d4N~ZIbz{!>77HA
zCDYdwg1E{3R5HugYvKWJ6OMZwd_UXj0lqCw@r;~uo1w=Z-&5F}`oW@<(kql1-oz<U
z$LD?QI(fk#+ycu2#IiY0hAVGC2j0+X_V(L9pzj6{v~!w2>qfK!DG<lqzxzbjURnH5
zACU)*Z#>DiQkcFQXqit&vSiO8BqP63xptBsRrCXT>hKO_B{?XamMC3I<w&{}1arJz
zyYZYR`zWEAQa57yLXK6tsW``SRb_MZN^cA#fK*{d?3Y%&nkY#Sr2{Fk4V`DfX{Ga8
z1xWK70arJ%(89aYe3yv8(JIfjW(ldhiUTV0);;nB+udw1Arcm>7yF@8tbIHwxiiwo
z$sm%o3r9dP@-4PkY<;{wa)6=dN`X`L;=A<76;>&jmO6%AaRn>!tmlfbd-oiJPx2q8
zTdP^<J$J@nt7?!=`qD2U>?nYm|6#YYI(pk!M^h<YXlufzY{dmBZII<*DT0-OkA=Qf
zx^i6s!E+(6P0?8o$lf6i64`%*;@Q(OMk_AZjm@(stHf%-nWGL%MJuBamioV3XNs9h
Wg{;lhxq({lI}d4<a)|w80N{Uf<+dsS


From 693e74b1caf3f5767a2430dc8830193ba488b879 Mon Sep 17 00:00:00 2001
From: Oliver Gupte <ogupte@users.noreply.github.com>
Date: Tue, 24 Mar 2020 12:53:31 -0700
Subject: [PATCH 099/179] [APM] Service map - add page load and interaction
 telemetry (#61009)

* Closes #60527 by adding called to shared observability usage tracking
function when service map page is loaded, and if the user interacts with
it

* trigger usage tracking on specific cytoscape events: node select, object hover
---
 .../apm/public/components/app/ServiceMap/Cytoscape.tsx     | 7 ++++++-
 .../plugins/apm/public/components/app/ServiceMap/index.tsx | 4 ++++
 2 files changed, 10 insertions(+), 1 deletion(-)

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 a4cd6f4ed09a9..168b470580279 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
@@ -20,6 +20,7 @@ import {
   cytoscapeOptions,
   nodeHeight
 } from './cytoscapeOptions';
+import { useUiTracker } from '../../../../../../../plugins/observability/public';
 
 export const CytoscapeContext = createContext<cytoscape.Core | undefined>(
   undefined
@@ -117,6 +118,8 @@ export function Cytoscape({
   // is required and can trigger rendering when changed.
   const divStyle = { ...style, height };
 
+  const trackApmEvent = useUiTracker({ app: 'apm' });
+
   // Trigger a custom "data" event when data changes
   useEffect(() => {
     if (cy && elements.length > 0) {
@@ -169,6 +172,7 @@ export function Cytoscape({
       });
     };
     const mouseoverHandler: cytoscape.EventHandler = event => {
+      trackApmEvent({ metric: 'service_map_object_hover' });
       event.target.addClass('hover');
       event.target.connectedEdges().addClass('nodeHover');
     };
@@ -177,6 +181,7 @@ export function Cytoscape({
       event.target.connectedEdges().removeClass('nodeHover');
     };
     const selectHandler: cytoscape.EventHandler = event => {
+      trackApmEvent({ metric: 'service_map_node_select' });
       resetConnectedEdgeStyle(event.target);
     };
     const unselectHandler: cytoscape.EventHandler = event => {
@@ -215,7 +220,7 @@ export function Cytoscape({
         cy.removeListener('unselect', 'node', unselectHandler);
       }
     };
-  }, [cy, height, serviceName, width]);
+  }, [cy, height, serviceName, trackApmEvent, width]);
 
   return (
     <CytoscapeContext.Provider value={cy}>
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 4974553f6ca93..d523a7cb331e1 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
@@ -23,6 +23,7 @@ import { EmptyBanner } from './EmptyBanner';
 import { Popover } from './Popover';
 import { useRefDimensions } from './useRefDimensions';
 import { BetaBadge } from './BetaBadge';
+import { useTrackPageview } from '../../../../../../../plugins/observability/public';
 
 interface ServiceMapProps {
   serviceName?: string;
@@ -55,6 +56,9 @@ export function ServiceMap({ serviceName }: ServiceMapProps) {
 
   const { ref, height, width } = useRefDimensions();
 
+  useTrackPageview({ app: 'apm', path: 'service_map' });
+  useTrackPageview({ app: 'apm', path: 'service_map', delay: 15000 });
+
   if (!license) {
     return null;
   }

From 223f774c3ff6abafb1ff78f3005a3ffd7c5bac53 Mon Sep 17 00:00:00 2001
From: Chris Roberson <chrisronline@gmail.com>
Date: Tue, 24 Mar 2020 15:53:43 -0400
Subject: [PATCH 100/179] [Monitoring] Update /api/stats to use core.metrics
 (#60974)

* Align api/stats with the monitoring logic for kibana ops metrics

* Align collectors

* Add in locale to kibana_settings

* More tweaks

* PR feedback

* PR feedback
---
 src/legacy/server/status/index.js             |  2 +-
 .../status/routes/api/register_stats.js       | 29 +++++++++++++------
 .../server/kibana_monitoring/bulk_uploader.js | 18 +++++++++---
 .../collectors/get_ops_stats_collector.ts     | 11 ++++++-
 .../collectors/get_settings_collector.ts      |  3 --
 x-pack/plugins/monitoring/server/plugin.ts    |  4 +--
 6 files changed, 47 insertions(+), 20 deletions(-)

diff --git a/src/legacy/server/status/index.js b/src/legacy/server/status/index.js
index a9544049182a7..df02b3c45ec2f 100644
--- a/src/legacy/server/status/index.js
+++ b/src/legacy/server/status/index.js
@@ -57,7 +57,7 @@ export function statusMixin(kbnServer, server, config) {
   // init routes
   registerStatusPage(kbnServer, server, config);
   registerStatusApi(kbnServer, server, config);
-  registerStatsApi(usageCollection, server, config);
+  registerStatsApi(usageCollection, server, config, kbnServer);
 
   // expore shared functionality
   server.decorate('server', 'getOSInfo', getOSInfo);
diff --git a/src/legacy/server/status/routes/api/register_stats.js b/src/legacy/server/status/routes/api/register_stats.js
index e218c1caf1701..2dd66cb8caff7 100644
--- a/src/legacy/server/status/routes/api/register_stats.js
+++ b/src/legacy/server/status/routes/api/register_stats.js
@@ -21,7 +21,7 @@ import Joi from 'joi';
 import boom from 'boom';
 import { i18n } from '@kbn/i18n';
 import { wrapAuthConfig } from '../../wrap_auth_config';
-import { KIBANA_STATS_TYPE } from '../../constants';
+import { getKibanaInfoForStats } from '../../lib';
 
 const STATS_NOT_READY_MESSAGE = i18n.translate('server.stats.notReadyMessage', {
   defaultMessage: 'Stats are not ready yet. Please try again later.',
@@ -37,7 +37,7 @@ const STATS_NOT_READY_MESSAGE = i18n.translate('server.stats.notReadyMessage', {
  *   - Any other value causes a statusCode 400 response (Bad Request)
  * Including ?exclude_usage in the query string excludes the usage stats from the response. Same value semantics as ?extended
  */
-export function registerStatsApi(usageCollection, server, config) {
+export function registerStatsApi(usageCollection, server, config, kbnServer) {
   const wrapAuth = wrapAuthConfig(config.get('status.allowAnonymous'));
 
   const getClusterUuid = async callCluster => {
@@ -50,6 +50,17 @@ export function registerStatsApi(usageCollection, server, config) {
     return usageCollection.toObject(usage);
   };
 
+  let lastMetrics = null;
+  /* kibana_stats gets singled out from the collector set as it is used
+   * for health-checking Kibana and fetch does not rely on fetching data
+   * from ES */
+  server.newPlatform.setup.core.metrics.getOpsMetrics$().subscribe(metrics => {
+    lastMetrics = {
+      ...metrics,
+      timestamp: new Date().toISOString(),
+    };
+  });
+
   server.route(
     wrapAuth({
       method: 'GET',
@@ -133,15 +144,15 @@ export function registerStatsApi(usageCollection, server, config) {
           }
         }
 
-        /* kibana_stats gets singled out from the collector set as it is used
-         * for health-checking Kibana and fetch does not rely on fetching data
-         * from ES */
-        const kibanaStatsCollector = usageCollection.getCollectorByType(KIBANA_STATS_TYPE);
-        if (!(await kibanaStatsCollector.isReady())) {
+        if (!lastMetrics) {
           return boom.serverUnavailable(STATS_NOT_READY_MESSAGE);
         }
-        let kibanaStats = await kibanaStatsCollector.fetch();
-        kibanaStats = usageCollection.toApiFieldNames(kibanaStats);
+        const kibanaStats = usageCollection.toApiFieldNames({
+          ...lastMetrics,
+          kibana: getKibanaInfoForStats(server, kbnServer),
+          last_updated: new Date().toISOString(),
+          collection_interval_in_millis: config.get('ops.interval'),
+        });
 
         return {
           ...kibanaStats,
diff --git a/x-pack/plugins/monitoring/server/kibana_monitoring/bulk_uploader.js b/x-pack/plugins/monitoring/server/kibana_monitoring/bulk_uploader.js
index c09a08f61dc0a..b90a9aa7d139a 100644
--- a/x-pack/plugins/monitoring/server/kibana_monitoring/bulk_uploader.js
+++ b/x-pack/plugins/monitoring/server/kibana_monitoring/bulk_uploader.js
@@ -6,7 +6,10 @@
 
 import { defaultsDeep, uniq, compact, get } from 'lodash';
 
-import { TELEMETRY_COLLECTION_INTERVAL } from '../../common/constants';
+import {
+  TELEMETRY_COLLECTION_INTERVAL,
+  KIBANA_STATS_TYPE_MONITORING,
+} from '../../common/constants';
 
 import { sendBulkPayload, monitoringBulk } from './lib';
 import { hasMonitoringCluster } from '../es_client/instantiate_client';
@@ -188,11 +191,18 @@ export class BulkUploader {
     );
   }
 
-  getKibanaStats() {
-    return {
+  getKibanaStats(type) {
+    const stats = {
       ...this.kibanaStats,
       status: this.kibanaStatusGetter(),
     };
+
+    if (type === KIBANA_STATS_TYPE_MONITORING) {
+      delete stats.port;
+      delete stats.locale;
+    }
+
+    return stats;
   }
 
   /*
@@ -252,7 +262,7 @@ export class BulkUploader {
         ...accum,
         { index: { _type: type } },
         {
-          kibana: this.getKibanaStats(),
+          kibana: this.getKibanaStats(type),
           ...typesNested[type],
         },
       ];
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
index 00197e98948bf..85357f786ddc1 100644
--- 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
@@ -5,6 +5,7 @@
  */
 
 import { Observable } from 'rxjs';
+import { cloneDeep } from 'lodash';
 import moment from 'moment';
 import { OpsMetrics } from 'kibana/server';
 import { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
@@ -22,7 +23,15 @@ export function getOpsStatsCollector(
   metrics$: Observable<OpsMetrics>
 ) {
   let lastMetrics: MonitoringOpsMetrics | null = null;
-  metrics$.subscribe(metrics => {
+  metrics$.subscribe(_metrics => {
+    const metrics: any = cloneDeep(_metrics);
+    // Ensure we only include the same data that Metricbeat collection would get
+    delete metrics.process.pid;
+    metrics.response_times = {
+      average: metrics.response_times.avg_in_millis,
+      max: metrics.response_times.max_in_millis,
+    };
+    delete metrics.requests.statusCodes;
     lastMetrics = {
       ...metrics,
       timestamp: moment.utc().toISOString(),
diff --git a/x-pack/plugins/monitoring/server/kibana_monitoring/collectors/get_settings_collector.ts b/x-pack/plugins/monitoring/server/kibana_monitoring/collectors/get_settings_collector.ts
index 63e1dbc400787..c66adfcabd671 100644
--- a/x-pack/plugins/monitoring/server/kibana_monitoring/collectors/get_settings_collector.ts
+++ b/x-pack/plugins/monitoring/server/kibana_monitoring/collectors/get_settings_collector.ts
@@ -12,9 +12,6 @@ import { MonitoringConfig } from '../../config';
  * If so, get email from kibana.yml
  */
 export async function getDefaultAdminEmail(config: MonitoringConfig) {
-  if (!config.cluster_alerts.email_notifications.enabled) {
-    return null;
-  }
   return config.cluster_alerts.email_notifications.email_address || null;
 }
 
diff --git a/x-pack/plugins/monitoring/server/plugin.ts b/x-pack/plugins/monitoring/server/plugin.ts
index b8216f037eabb..d9500284b52dc 100644
--- a/x-pack/plugins/monitoring/server/plugin.ts
+++ b/x-pack/plugins/monitoring/server/plugin.ts
@@ -51,7 +51,6 @@ import { InfraPluginSetup } from '../../infra/server';
 
 export interface LegacyAPI {
   getServerStatus: () => string;
-  infra: any;
 }
 
 interface PluginsSetup {
@@ -189,8 +188,9 @@ export class Plugin {
           name: serverInfo.name,
           index: get(legacyConfig, 'kibana.index'),
           host: serverInfo.host,
-          transport_address: `${serverInfo.host}:${serverInfo.port}`,
+          locale: i18n.getLocale(),
           port: serverInfo.port.toString(),
+          transport_address: `${serverInfo.host}:${serverInfo.port}`,
           version: this.initializerContext.env.packageInfo.version,
           snapshot: snapshotRegex.test(this.initializerContext.env.packageInfo.version),
         },

From 30f5b7fa225fbb98c7e4438277261dad6b2eb627 Mon Sep 17 00:00:00 2001
From: Dario Gieselaar <dario.gieselaar@elastic.co>
Date: Tue, 24 Mar 2020 20:59:23 +0100
Subject: [PATCH 101/179] [APM] Display service.framework.name in popover
 (#61101)

Closes #60771.
---
 .../service_map/dedupe_connections/index.ts   | 47 ++++++++++++-------
 1 file changed, 29 insertions(+), 18 deletions(-)

diff --git a/x-pack/plugins/apm/server/lib/service_map/dedupe_connections/index.ts b/x-pack/plugins/apm/server/lib/service_map/dedupe_connections/index.ts
index d256f657bb778..6a433367d8217 100644
--- a/x-pack/plugins/apm/server/lib/service_map/dedupe_connections/index.ts
+++ b/x-pack/plugins/apm/server/lib/service_map/dedupe_connections/index.ts
@@ -3,7 +3,7 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-import { isEqual, sortBy } from 'lodash';
+import { sortBy, pick, identity } from 'lodash';
 import { ValuesType } from 'utility-types';
 import {
   SERVICE_NAME,
@@ -72,24 +72,35 @@ export function dedupeConnections(response: ServiceMapResponse) {
       return map;
     }
 
-    const service =
-      discoveredServices.find(({ from }) => {
-        if ('span.destination.service.resource' in node) {
-          return (
-            node[SPAN_DESTINATION_SERVICE_RESOURCE] ===
-            from[SPAN_DESTINATION_SERVICE_RESOURCE]
-          );
-        }
-        return false;
-      })?.to ?? serviceNodes.find(serviceNode => serviceNode.id === node.id);
-
-    if (service) {
+    const matchedService = discoveredServices.find(({ from }) => {
+      if ('span.destination.service.resource' in node) {
+        return (
+          node[SPAN_DESTINATION_SERVICE_RESOURCE] ===
+          from[SPAN_DESTINATION_SERVICE_RESOURCE]
+        );
+      }
+      return false;
+    })?.to;
+
+    let serviceName: string | undefined = matchedService?.[SERVICE_NAME];
+
+    if (!serviceName && 'service.name' in node) {
+      serviceName = node[SERVICE_NAME];
+    }
+
+    const matchedServiceNodes = services.filter(
+      serviceNode => serviceNode[SERVICE_NAME] === serviceName
+    );
+
+    if (matchedServiceNodes.length) {
       return {
         ...map,
-        [node.id]: {
-          id: service[SERVICE_NAME],
-          ...service
-        }
+        [node.id]: Object.assign(
+          {
+            id: matchedServiceNodes[0][SERVICE_NAME]
+          },
+          ...matchedServiceNodes.map(serviceNode => pick(serviceNode, identity))
+        )
       };
     }
 
@@ -138,7 +149,7 @@ export function dedupeConnections(response: ServiceMapResponse) {
   const dedupedNodes: typeof nodes = [];
 
   nodes.forEach(node => {
-    if (!dedupedNodes.find(dedupedNode => isEqual(node, dedupedNode))) {
+    if (!dedupedNodes.find(dedupedNode => node.id === dedupedNode.id)) {
       dedupedNodes.push(node);
     }
   });

From 17db8a66b33ae81e700cc8ab15f8d0e476224cff Mon Sep 17 00:00:00 2001
From: Corey Robertson <corey.robertson@elastic.co>
Date: Tue, 24 Mar 2020 16:04:43 -0400
Subject: [PATCH 102/179] [Canvas] Visualize embeddable (#60859)

* Enables Visualize Embeddable

* Fix i18n

* Fix tests

* Remove unused import
---
 .../common/saved_visualization.test.ts        |  11 +-
 .../functions/common/saved_visualization.ts   |  50 +++++++-
 .../renderers/embeddable/embeddable.tsx       |   7 +-
 .../embeddable_input_to_expression.test.ts    | 116 ++----------------
 .../embeddable_input_to_expression.ts         |  65 ++--------
 .../input_type_to_expression/lens.test.ts     |  55 +++++++++
 .../input_type_to_expression/lens.ts          |  27 ++++
 .../input_type_to_expression/map.test.ts      |  72 +++++++++++
 .../input_type_to_expression/map.ts           |  38 ++++++
 .../visualization.test.ts                     |  72 +++++++++++
 .../input_type_to_expression/visualization.ts |  35 ++++++
 .../functions/dict/saved_visualization.ts     |  16 ++-
 .../components/embeddable_flyout/index.tsx    |   6 +-
 13 files changed, 398 insertions(+), 172 deletions(-)
 create mode 100644 x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/embeddable/input_type_to_expression/lens.test.ts
 create mode 100644 x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/embeddable/input_type_to_expression/lens.ts
 create mode 100644 x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/embeddable/input_type_to_expression/map.test.ts
 create mode 100644 x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/embeddable/input_type_to_expression/map.ts
 create mode 100644 x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/embeddable/input_type_to_expression/visualization.test.ts
 create mode 100644 x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/embeddable/input_type_to_expression/visualization.ts

diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/saved_visualization.test.ts b/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/saved_visualization.test.ts
index 9c3e80bc22af1..754a113b87554 100644
--- a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/saved_visualization.test.ts
+++ b/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/saved_visualization.test.ts
@@ -5,7 +5,7 @@
  */
 jest.mock('ui/new_platform');
 import { savedVisualization } from './saved_visualization';
-import { buildEmbeddableFilters } from '../../../public/lib/build_embeddable_filters';
+import { getQueryFilters } from '../../../public/lib/build_embeddable_filters';
 
 const filterContext = {
   and: [
@@ -24,20 +24,21 @@ describe('savedVisualization', () => {
   const fn = savedVisualization().fn;
   const args = {
     id: 'some-id',
+    timerange: null,
+    colors: null,
+    hideLegend: null,
   };
 
   it('accepts null context', () => {
     const expression = fn(null, args, {} as any);
 
     expect(expression.input.filters).toEqual([]);
-    expect(expression.input.timeRange).toBeUndefined();
   });
 
   it('accepts filter context', () => {
     const expression = fn(filterContext, args, {} as any);
-    const embeddableFilters = buildEmbeddableFilters(filterContext.and);
+    const embeddableFilters = getQueryFilters(filterContext.and);
 
-    expect(expression.input.filters).toEqual(embeddableFilters.filters);
-    expect(expression.input.timeRange).toEqual(embeddableFilters.timeRange);
+    expect(expression.input.filters).toEqual(embeddableFilters);
   });
 });
diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/saved_visualization.ts b/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/saved_visualization.ts
index 5b612b7cbd666..9777eaebb36ed 100644
--- a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/saved_visualization.ts
+++ b/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/saved_visualization.ts
@@ -11,16 +11,24 @@ import {
   EmbeddableExpressionType,
   EmbeddableExpression,
 } from '../../expression_types';
-import { buildEmbeddableFilters } from '../../../public/lib/build_embeddable_filters';
-import { Filter } from '../../../types';
+import { getQueryFilters } from '../../../public/lib/build_embeddable_filters';
+import { Filter, TimeRange as TimeRangeArg, SeriesStyle } from '../../../types';
 import { getFunctionHelp } from '../../../i18n';
 
 interface Arguments {
   id: string;
+  timerange: TimeRangeArg | null;
+  colors: SeriesStyle[] | null;
+  hideLegend: boolean | null;
 }
 
 type Output = EmbeddableExpression<VisualizeInput>;
 
+const defaultTimeRange = {
+  from: 'now-15m',
+  to: 'now',
+};
+
 export function savedVisualization(): ExpressionFunctionDefinition<
   'savedVisualization',
   Filter | null,
@@ -37,17 +45,51 @@ export function savedVisualization(): ExpressionFunctionDefinition<
         required: false,
         help: argHelp.id,
       },
+      timerange: {
+        types: ['timerange'],
+        help: argHelp.timerange,
+        required: false,
+      },
+      colors: {
+        types: ['seriesStyle'],
+        help: argHelp.colors,
+        multi: true,
+        required: false,
+      },
+      hideLegend: {
+        types: ['boolean'],
+        help: argHelp.hideLegend,
+        required: false,
+      },
     },
     type: EmbeddableExpressionType,
-    fn: (input, { id }) => {
+    fn: (input, { id, timerange, colors, hideLegend }) => {
       const filters = input ? input.and : [];
 
+      const visOptions: VisualizeInput['vis'] = {};
+
+      if (colors) {
+        visOptions.colors = colors.reduce((reduction, color) => {
+          if (color.label && color.color) {
+            reduction[color.label] = color.color;
+          }
+          return reduction;
+        }, {} as Record<string, string>);
+      }
+
+      if (hideLegend === true) {
+        // @ts-ignore LegendOpen missing on VisualizeInput
+        visOptions.legendOpen = false;
+      }
+
       return {
         type: EmbeddableExpressionType,
         input: {
           id,
           disableTriggers: true,
-          ...buildEmbeddableFilters(filters),
+          timeRange: timerange || defaultTimeRange,
+          filters: getQueryFilters(filters),
+          vis: visOptions,
         },
         embeddableType: EmbeddableTypes.visualization,
       };
diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/embeddable/embeddable.tsx b/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/embeddable/embeddable.tsx
index d91e70e43bfd5..3cdb6eb460224 100644
--- a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/embeddable/embeddable.tsx
+++ b/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/embeddable/embeddable.tsx
@@ -82,8 +82,13 @@ const embeddable = () => ({
       ReactDOM.unmountComponentAtNode(domNode);
 
       const subscription = embeddableObject.getInput$().subscribe(function(updatedInput) {
-        handlers.onEmbeddableInputChange(embeddableInputToExpression(updatedInput, embeddableType));
+        const updatedExpression = embeddableInputToExpression(updatedInput, embeddableType);
+
+        if (updatedExpression) {
+          handlers.onEmbeddableInputChange(updatedExpression);
+        }
       });
+
       ReactDOM.render(renderEmbeddable(embeddableObject, domNode), domNode, () => handlers.done());
 
       handlers.onResize(() => {
diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/embeddable/embeddable_input_to_expression.test.ts b/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/embeddable/embeddable_input_to_expression.test.ts
index 4c622b0c247fa..9dee40c0f683b 100644
--- a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/embeddable/embeddable_input_to_expression.test.ts
+++ b/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/embeddable/embeddable_input_to_expression.test.ts
@@ -4,119 +4,25 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-jest.mock('ui/new_platform');
-import { embeddableInputToExpression } from './embeddable_input_to_expression';
-import { SavedMapInput } from '../../functions/common/saved_map';
-import { SavedLensInput } from '../../functions/common/saved_lens';
-import { EmbeddableTypes } from '../../expression_types';
-import { fromExpression, Ast } from '@kbn/interpreter/common';
+import {
+  embeddableInputToExpression,
+  inputToExpressionTypeMap,
+} from './embeddable_input_to_expression';
 
-const baseEmbeddableInput = {
+const input = {
   id: 'embeddableId',
   filters: [],
-};
-
-const baseSavedMapInput = {
-  ...baseEmbeddableInput,
-  isLayerTOCOpen: false,
-  refreshConfig: {
-    isPaused: true,
-    interval: 0,
-  },
   hideFilterActions: true as true,
 };
 
 describe('input to expression', () => {
-  describe('Map Embeddable', () => {
-    it('converts to a savedMap expression', () => {
-      const input: SavedMapInput = {
-        ...baseSavedMapInput,
-      };
-
-      const expression = embeddableInputToExpression(input, EmbeddableTypes.map);
-      const ast = fromExpression(expression);
-
-      expect(ast.type).toBe('expression');
-      expect(ast.chain[0].function).toBe('savedMap');
-
-      expect(ast.chain[0].arguments.id).toStrictEqual([input.id]);
-
-      expect(ast.chain[0].arguments).not.toHaveProperty('title');
-      expect(ast.chain[0].arguments).not.toHaveProperty('center');
-      expect(ast.chain[0].arguments).not.toHaveProperty('timerange');
-    });
-
-    it('includes optional input values', () => {
-      const input: SavedMapInput = {
-        ...baseSavedMapInput,
-        mapCenter: {
-          lat: 1,
-          lon: 2,
-          zoom: 3,
-        },
-        title: 'title',
-        timeRange: {
-          from: 'now-1h',
-          to: 'now',
-        },
-      };
-
-      const expression = embeddableInputToExpression(input, EmbeddableTypes.map);
-      const ast = fromExpression(expression);
-
-      const centerExpression = ast.chain[0].arguments.center[0] as Ast;
-
-      expect(centerExpression.chain[0].function).toBe('mapCenter');
-      expect(centerExpression.chain[0].arguments.lat[0]).toEqual(input.mapCenter?.lat);
-      expect(centerExpression.chain[0].arguments.lon[0]).toEqual(input.mapCenter?.lon);
-      expect(centerExpression.chain[0].arguments.zoom[0]).toEqual(input.mapCenter?.zoom);
-
-      const timerangeExpression = ast.chain[0].arguments.timerange[0] as Ast;
-
-      expect(timerangeExpression.chain[0].function).toBe('timerange');
-      expect(timerangeExpression.chain[0].arguments.from[0]).toEqual(input.timeRange?.from);
-      expect(timerangeExpression.chain[0].arguments.to[0]).toEqual(input.timeRange?.to);
-    });
-  });
-
-  describe('Lens Embeddable', () => {
-    it('converts to a savedLens expression', () => {
-      const input: SavedLensInput = {
-        ...baseEmbeddableInput,
-      };
-
-      const expression = embeddableInputToExpression(input, EmbeddableTypes.lens);
-      const ast = fromExpression(expression);
-
-      expect(ast.type).toBe('expression');
-      expect(ast.chain[0].function).toBe('savedLens');
-
-      expect(ast.chain[0].arguments.id).toStrictEqual([input.id]);
-
-      expect(ast.chain[0].arguments).not.toHaveProperty('title');
-      expect(ast.chain[0].arguments).not.toHaveProperty('timerange');
-    });
-
-    it('includes optional input values', () => {
-      const input: SavedLensInput = {
-        ...baseEmbeddableInput,
-        title: 'title',
-        timeRange: {
-          from: 'now-1h',
-          to: 'now',
-        },
-      };
-
-      const expression = embeddableInputToExpression(input, EmbeddableTypes.map);
-      const ast = fromExpression(expression);
+  it('converts to expression if method is available', () => {
+    const newType = 'newType';
+    const mockReturn = 'expression';
+    inputToExpressionTypeMap[newType] = jest.fn().mockReturnValue(mockReturn);
 
-      expect(ast.chain[0].arguments).toHaveProperty('title', [input.title]);
-      expect(ast.chain[0].arguments).toHaveProperty('timerange');
+    const expression = embeddableInputToExpression(input, newType);
 
-      const timerangeExpression = ast.chain[0].arguments.timerange[0] as Ast;
-      expect(timerangeExpression.chain[0].function).toBe('timerange');
-      expect(timerangeExpression.chain[0].arguments.from[0]).toEqual(input.timeRange?.from);
-      expect(timerangeExpression.chain[0].arguments.to[0]).toEqual(input.timeRange?.to);
-    });
+    expect(expression).toBe(mockReturn);
   });
 });
diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/embeddable/embeddable_input_to_expression.ts b/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/embeddable/embeddable_input_to_expression.ts
index 6428507b16a0c..5cba012fcb8e3 100644
--- a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/embeddable/embeddable_input_to_expression.ts
+++ b/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/embeddable/embeddable_input_to_expression.ts
@@ -5,8 +5,15 @@
  */
 
 import { EmbeddableTypes, EmbeddableInput } from '../../expression_types';
-import { SavedMapInput } from '../../functions/common/saved_map';
-import { SavedLensInput } from '../../functions/common/saved_lens';
+import { toExpression as mapToExpression } from './input_type_to_expression/map';
+import { toExpression as visualizationToExpression } from './input_type_to_expression/visualization';
+import { toExpression as lensToExpression } from './input_type_to_expression/lens';
+
+export const inputToExpressionTypeMap = {
+  [EmbeddableTypes.map]: mapToExpression,
+  [EmbeddableTypes.visualization]: visualizationToExpression,
+  [EmbeddableTypes.lens]: lensToExpression,
+};
 
 /*
   Take the input from an embeddable and the type of embeddable and convert it into an expression
@@ -14,56 +21,8 @@ import { SavedLensInput } from '../../functions/common/saved_lens';
 export function embeddableInputToExpression(
   input: EmbeddableInput,
   embeddableType: string
-): string {
-  const expressionParts: string[] = [];
-
-  if (embeddableType === EmbeddableTypes.map) {
-    const mapInput = input as SavedMapInput;
-
-    expressionParts.push('savedMap');
-
-    expressionParts.push(`id="${input.id}"`);
-
-    if (input.title) {
-      expressionParts.push(`title="${input.title}"`);
-    }
-
-    if (mapInput.mapCenter) {
-      expressionParts.push(
-        `center={mapCenter lat=${mapInput.mapCenter.lat} lon=${mapInput.mapCenter.lon} zoom=${mapInput.mapCenter.zoom}}`
-      );
-    }
-
-    if (mapInput.timeRange) {
-      expressionParts.push(
-        `timerange={timerange from="${mapInput.timeRange.from}" to="${mapInput.timeRange.to}"}`
-      );
-    }
-
-    if (mapInput.hiddenLayers && mapInput.hiddenLayers.length) {
-      for (const layerId of mapInput.hiddenLayers) {
-        expressionParts.push(`hideLayer="${layerId}"`);
-      }
-    }
+): string | undefined {
+  if (inputToExpressionTypeMap[embeddableType]) {
+    return inputToExpressionTypeMap[embeddableType](input as any);
   }
-
-  if (embeddableType === EmbeddableTypes.lens) {
-    const lensInput = input as SavedLensInput;
-
-    expressionParts.push('savedLens');
-
-    expressionParts.push(`id="${input.id}"`);
-
-    if (input.title) {
-      expressionParts.push(`title="${input.title}"`);
-    }
-
-    if (lensInput.timeRange) {
-      expressionParts.push(
-        `timerange={timerange from="${lensInput.timeRange.from}" to="${lensInput.timeRange.to}"}`
-      );
-    }
-  }
-
-  return expressionParts.join(' ');
 }
diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/embeddable/input_type_to_expression/lens.test.ts b/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/embeddable/input_type_to_expression/lens.test.ts
new file mode 100644
index 0000000000000..c4a9a22be3202
--- /dev/null
+++ b/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/embeddable/input_type_to_expression/lens.test.ts
@@ -0,0 +1,55 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { toExpression } from './lens';
+import { SavedLensInput } from '../../../functions/common/saved_lens';
+import { fromExpression, Ast } from '@kbn/interpreter/common';
+
+const baseEmbeddableInput = {
+  id: 'embeddableId',
+  filters: [],
+};
+
+describe('toExpression', () => {
+  it('converts to a savedLens expression', () => {
+    const input: SavedLensInput = {
+      ...baseEmbeddableInput,
+    };
+
+    const expression = toExpression(input);
+    const ast = fromExpression(expression);
+
+    expect(ast.type).toBe('expression');
+    expect(ast.chain[0].function).toBe('savedLens');
+
+    expect(ast.chain[0].arguments.id).toStrictEqual([input.id]);
+
+    expect(ast.chain[0].arguments).not.toHaveProperty('title');
+    expect(ast.chain[0].arguments).not.toHaveProperty('timerange');
+  });
+
+  it('includes optional input values', () => {
+    const input: SavedLensInput = {
+      ...baseEmbeddableInput,
+      title: 'title',
+      timeRange: {
+        from: 'now-1h',
+        to: 'now',
+      },
+    };
+
+    const expression = toExpression(input);
+    const ast = fromExpression(expression);
+
+    expect(ast.chain[0].arguments).toHaveProperty('title', [input.title]);
+    expect(ast.chain[0].arguments).toHaveProperty('timerange');
+
+    const timerangeExpression = ast.chain[0].arguments.timerange[0] as Ast;
+    expect(timerangeExpression.chain[0].function).toBe('timerange');
+    expect(timerangeExpression.chain[0].arguments.from[0]).toEqual(input.timeRange?.from);
+    expect(timerangeExpression.chain[0].arguments.to[0]).toEqual(input.timeRange?.to);
+  });
+});
diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/embeddable/input_type_to_expression/lens.ts b/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/embeddable/input_type_to_expression/lens.ts
new file mode 100644
index 0000000000000..445cb7480ff80
--- /dev/null
+++ b/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/embeddable/input_type_to_expression/lens.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 { SavedLensInput } from '../../../functions/common/saved_lens';
+
+export function toExpression(input: SavedLensInput): string {
+  const expressionParts = [] as string[];
+
+  expressionParts.push('savedLens');
+
+  expressionParts.push(`id="${input.id}"`);
+
+  if (input.title) {
+    expressionParts.push(`title="${input.title}"`);
+  }
+
+  if (input.timeRange) {
+    expressionParts.push(
+      `timerange={timerange from="${input.timeRange.from}" to="${input.timeRange.to}"}`
+    );
+  }
+
+  return expressionParts.join(' ');
+}
diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/embeddable/input_type_to_expression/map.test.ts b/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/embeddable/input_type_to_expression/map.test.ts
new file mode 100644
index 0000000000000..4c294fb37c2db
--- /dev/null
+++ b/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/embeddable/input_type_to_expression/map.test.ts
@@ -0,0 +1,72 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { toExpression } from './map';
+import { SavedMapInput } from '../../../functions/common/saved_map';
+import { fromExpression, Ast } from '@kbn/interpreter/common';
+
+const baseSavedMapInput = {
+  id: 'embeddableId',
+  filters: [],
+  isLayerTOCOpen: false,
+  refreshConfig: {
+    isPaused: true,
+    interval: 0,
+  },
+  hideFilterActions: true as true,
+};
+
+describe('toExpression', () => {
+  it('converts to a savedMap expression', () => {
+    const input: SavedMapInput = {
+      ...baseSavedMapInput,
+    };
+
+    const expression = toExpression(input);
+    const ast = fromExpression(expression);
+
+    expect(ast.type).toBe('expression');
+    expect(ast.chain[0].function).toBe('savedMap');
+
+    expect(ast.chain[0].arguments.id).toStrictEqual([input.id]);
+
+    expect(ast.chain[0].arguments).not.toHaveProperty('title');
+    expect(ast.chain[0].arguments).not.toHaveProperty('center');
+    expect(ast.chain[0].arguments).not.toHaveProperty('timerange');
+  });
+
+  it('includes optional input values', () => {
+    const input: SavedMapInput = {
+      ...baseSavedMapInput,
+      mapCenter: {
+        lat: 1,
+        lon: 2,
+        zoom: 3,
+      },
+      title: 'title',
+      timeRange: {
+        from: 'now-1h',
+        to: 'now',
+      },
+    };
+
+    const expression = toExpression(input);
+    const ast = fromExpression(expression);
+
+    const centerExpression = ast.chain[0].arguments.center[0] as Ast;
+
+    expect(centerExpression.chain[0].function).toBe('mapCenter');
+    expect(centerExpression.chain[0].arguments.lat[0]).toEqual(input.mapCenter?.lat);
+    expect(centerExpression.chain[0].arguments.lon[0]).toEqual(input.mapCenter?.lon);
+    expect(centerExpression.chain[0].arguments.zoom[0]).toEqual(input.mapCenter?.zoom);
+
+    const timerangeExpression = ast.chain[0].arguments.timerange[0] as Ast;
+
+    expect(timerangeExpression.chain[0].function).toBe('timerange');
+    expect(timerangeExpression.chain[0].arguments.from[0]).toEqual(input.timeRange?.from);
+    expect(timerangeExpression.chain[0].arguments.to[0]).toEqual(input.timeRange?.to);
+  });
+});
diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/embeddable/input_type_to_expression/map.ts b/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/embeddable/input_type_to_expression/map.ts
new file mode 100644
index 0000000000000..e3f9eca61ae28
--- /dev/null
+++ b/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/embeddable/input_type_to_expression/map.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 { SavedMapInput } from '../../../functions/common/saved_map';
+
+export function toExpression(input: SavedMapInput): string {
+  const expressionParts = [] as string[];
+
+  expressionParts.push('savedMap');
+  expressionParts.push(`id="${input.id}"`);
+
+  if (input.title) {
+    expressionParts.push(`title="${input.title}"`);
+  }
+
+  if (input.mapCenter) {
+    expressionParts.push(
+      `center={mapCenter lat=${input.mapCenter.lat} lon=${input.mapCenter.lon} zoom=${input.mapCenter.zoom}}`
+    );
+  }
+
+  if (input.timeRange) {
+    expressionParts.push(
+      `timerange={timerange from="${input.timeRange.from}" to="${input.timeRange.to}"}`
+    );
+  }
+
+  if (input.hiddenLayers && input.hiddenLayers.length) {
+    for (const layerId of input.hiddenLayers) {
+      expressionParts.push(`hideLayer="${layerId}"`);
+    }
+  }
+
+  return expressionParts.join(' ');
+}
diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/embeddable/input_type_to_expression/visualization.test.ts b/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/embeddable/input_type_to_expression/visualization.test.ts
new file mode 100644
index 0000000000000..306020293abe6
--- /dev/null
+++ b/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/embeddable/input_type_to_expression/visualization.test.ts
@@ -0,0 +1,72 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { toExpression } from './visualization';
+import { fromExpression, Ast } from '@kbn/interpreter/common';
+
+const baseInput = {
+  id: 'embeddableId',
+};
+
+describe('toExpression', () => {
+  it('converts to a savedVisualization expression', () => {
+    const input = {
+      ...baseInput,
+    };
+
+    const expression = toExpression(input);
+    const ast = fromExpression(expression);
+
+    expect(ast.type).toBe('expression');
+    expect(ast.chain[0].function).toBe('savedVisualization');
+
+    expect(ast.chain[0].arguments.id).toStrictEqual([input.id]);
+  });
+
+  it('includes timerange if given', () => {
+    const input = {
+      ...baseInput,
+      timeRange: {
+        from: 'now-1h',
+        to: 'now',
+      },
+    };
+
+    const expression = toExpression(input);
+    const ast = fromExpression(expression);
+
+    const timerangeExpression = ast.chain[0].arguments.timerange[0] as Ast;
+
+    expect(timerangeExpression.chain[0].function).toBe('timerange');
+    expect(timerangeExpression.chain[0].arguments.from[0]).toEqual(input.timeRange?.from);
+    expect(timerangeExpression.chain[0].arguments.to[0]).toEqual(input.timeRange?.to);
+  });
+
+  it('includes colors if given', () => {
+    const colorMap = { a: 'red', b: 'blue' };
+
+    const input = {
+      ...baseInput,
+      vis: {
+        colors: {
+          a: 'red',
+          b: 'blue',
+        },
+      },
+    };
+
+    const expression = toExpression(input);
+    const ast = fromExpression(expression);
+
+    const colors = ast.chain[0].arguments.colors as Ast[];
+
+    const aColor = colors.find(color => color.chain[0].arguments.label[0] === 'a');
+    const bColor = colors.find(color => color.chain[0].arguments.label[0] === 'b');
+
+    expect(aColor?.chain[0].arguments.color[0]).toBe(colorMap.a);
+    expect(bColor?.chain[0].arguments.color[0]).toBe(colorMap.b);
+  });
+});
diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/embeddable/input_type_to_expression/visualization.ts b/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/embeddable/input_type_to_expression/visualization.ts
new file mode 100644
index 0000000000000..be0dd6a79292f
--- /dev/null
+++ b/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/embeddable/input_type_to_expression/visualization.ts
@@ -0,0 +1,35 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { VisualizeInput } from 'src/legacy/core_plugins/visualizations/public';
+
+export function toExpression(input: VisualizeInput): string {
+  const expressionParts = [] as string[];
+
+  expressionParts.push('savedVisualization');
+  expressionParts.push(`id="${input.id}"`);
+
+  if (input.timeRange) {
+    expressionParts.push(
+      `timerange={timerange from="${input.timeRange.from}" to="${input.timeRange.to}"}`
+    );
+  }
+
+  if (input.vis?.colors) {
+    Object.entries(input.vis.colors)
+      .map(([label, color]) => {
+        return `colors={seriesStyle label="${label}" color="${color}"}`;
+      })
+      .reduce((_, part) => expressionParts.push(part), 0);
+  }
+
+  // @ts-ignore LegendOpen missing on VisualizeInput type
+  if (input.vis?.legendOpen !== undefined && input.vis.legendOpen === false) {
+    expressionParts.push(`hideLegend=true`);
+  }
+
+  return expressionParts.join(' ');
+}
diff --git a/x-pack/legacy/plugins/canvas/i18n/functions/dict/saved_visualization.ts b/x-pack/legacy/plugins/canvas/i18n/functions/dict/saved_visualization.ts
index e3b412284442d..21a2e1c1b8800 100644
--- a/x-pack/legacy/plugins/canvas/i18n/functions/dict/saved_visualization.ts
+++ b/x-pack/legacy/plugins/canvas/i18n/functions/dict/saved_visualization.ts
@@ -14,6 +14,20 @@ export const help: FunctionHelp<FunctionFactory<typeof savedVisualization>> = {
     defaultMessage: `Returns an embeddable for a saved visualization object`,
   }),
   args: {
-    id: 'The id of the saved visualization object',
+    id: i18n.translate('xpack.canvas.functions.savedVisualization.args.idHelpText', {
+      defaultMessage: `The ID of the Saved Visualization Object`,
+    }),
+    timerange: i18n.translate('xpack.canvas.functions.savedVisualization.args.timerangeHelpText', {
+      defaultMessage: `The timerange of data that should be included`,
+    }),
+    colors: i18n.translate('xpack.canvas.functions.savedVisualization.args.colorsHelpText', {
+      defaultMessage: `Define the color to use for a specific series`,
+    }),
+    hideLegend: i18n.translate(
+      'xpack.canvas.functions.savedVisualization.args.hideLegendHelpText',
+      {
+        defaultMessage: `Should the legend be hidden`,
+      }
+    ),
   },
 };
diff --git a/x-pack/legacy/plugins/canvas/public/components/embeddable_flyout/index.tsx b/x-pack/legacy/plugins/canvas/public/components/embeddable_flyout/index.tsx
index 353a59397d6b6..a86784d374f49 100644
--- a/x-pack/legacy/plugins/canvas/public/components/embeddable_flyout/index.tsx
+++ b/x-pack/legacy/plugins/canvas/public/components/embeddable_flyout/index.tsx
@@ -24,10 +24,10 @@ const allowedEmbeddables = {
   [EmbeddableTypes.lens]: (id: string) => {
     return `savedLens id="${id}" | render`;
   },
-  // FIX: Only currently allow Map embeddables
-  /* [EmbeddableTypes.visualization]: (id: string) => {
-    return `filters | savedVisualization id="${id}" | render`;
+  [EmbeddableTypes.visualization]: (id: string) => {
+    return `savedVisualization id="${id}" | render`;
   },
+  /*
   [EmbeddableTypes.search]: (id: string) => {
     return `filters | savedSearch id="${id}" | render`;
   },*/

From a68eaf22c944faf16740e78ac64b5f13703f0aeb Mon Sep 17 00:00:00 2001
From: Pete Harverson <peteharverson@users.noreply.github.com>
Date: Tue, 24 Mar 2020 20:18:53 +0000
Subject: [PATCH 103/179] [ML] Allow edits to jobs with additional
 custom_settings props (#61067)

* [ML] Allow edits to jobs with additional custom_settings props

* [ML] Minor text edit

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 .../server/routes/schemas/anomaly_detectors_schema.ts | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/x-pack/plugins/ml/server/routes/schemas/anomaly_detectors_schema.ts b/x-pack/plugins/ml/server/routes/schemas/anomaly_detectors_schema.ts
index 6002bb218c41b..22c3d94dfb29e 100644
--- a/x-pack/plugins/ml/server/routes/schemas/anomaly_detectors_schema.ts
+++ b/x-pack/plugins/ml/server/routes/schemas/anomaly_detectors_schema.ts
@@ -35,10 +35,13 @@ const customUrlSchema = {
   time_range: schema.maybe(schema.any()),
 };
 
-const customSettingsSchema = schema.object({
-  created_by: schema.maybe(schema.string()),
-  custom_urls: schema.maybe(schema.arrayOf(schema.maybe(schema.object({ ...customUrlSchema })))),
-});
+const customSettingsSchema = schema.object(
+  {
+    created_by: schema.maybe(schema.string()),
+    custom_urls: schema.maybe(schema.arrayOf(schema.maybe(schema.object({ ...customUrlSchema })))),
+  },
+  { unknowns: 'allow' } // Create / Update job API allows other fields to be added to custom_settings.
+);
 
 export const anomalyDetectionUpdateJobSchema = {
   description: schema.maybe(schema.string()),

From e19ab1ef4b8e93380e5fdd7b9e225e92357ab913 Mon Sep 17 00:00:00 2001
From: Lee Drengenberg <lee.drengenberg@elastic.co>
Date: Tue, 24 Mar 2020 20:24:37 +0000
Subject: [PATCH 104/179] streamline indexPatternTitle usage (#60999)

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 test/functional/apps/getting_started/_shakespeare.js        | 3 +--
 test/functional/apps/management/_handle_alias.js            | 6 ++----
 .../apps/management/_index_pattern_create_delete.js         | 3 +--
 test/functional/page_objects/settings_page.ts               | 2 +-
 4 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/test/functional/apps/getting_started/_shakespeare.js b/test/functional/apps/getting_started/_shakespeare.js
index ded4eca908410..9a4bb0081b7ad 100644
--- a/test/functional/apps/getting_started/_shakespeare.js
+++ b/test/functional/apps/getting_started/_shakespeare.js
@@ -60,8 +60,7 @@ export default function({ getService, getPageObjects }) {
     it('should create shakespeare index pattern', async function() {
       log.debug('Create shakespeare index pattern');
       await PageObjects.settings.createIndexPattern('shakes', null);
-      const indexPageHeading = await PageObjects.settings.getIndexPageHeading();
-      const patternName = await indexPageHeading.getVisibleText();
+      const patternName = await PageObjects.settings.getIndexPageHeading();
       expect(patternName).to.be('shakes*');
     });
 
diff --git a/test/functional/apps/management/_handle_alias.js b/test/functional/apps/management/_handle_alias.js
index 4ef02f6c9e873..35c43c4633410 100644
--- a/test/functional/apps/management/_handle_alias.js
+++ b/test/functional/apps/management/_handle_alias.js
@@ -51,8 +51,7 @@ export default function({ getService, getPageObjects }) {
 
     it('should be able to create index pattern without time field', async function() {
       await PageObjects.settings.createIndexPattern('alias1', null);
-      const indexPageHeading = await PageObjects.settings.getIndexPageHeading();
-      const patternName = await indexPageHeading.getVisibleText();
+      const patternName = await PageObjects.settings.getIndexPageHeading();
       expect(patternName).to.be('alias1*');
     });
 
@@ -66,8 +65,7 @@ export default function({ getService, getPageObjects }) {
 
     it('should be able to create index pattern with timefield', async function() {
       await PageObjects.settings.createIndexPattern('alias2', 'date');
-      const indexPageHeading = await PageObjects.settings.getIndexPageHeading();
-      const patternName = await indexPageHeading.getVisibleText();
+      const patternName = await PageObjects.settings.getIndexPageHeading();
       expect(patternName).to.be('alias2*');
     });
 
diff --git a/test/functional/apps/management/_index_pattern_create_delete.js b/test/functional/apps/management/_index_pattern_create_delete.js
index 4661c9b4d53b8..a74620b696d1b 100644
--- a/test/functional/apps/management/_index_pattern_create_delete.js
+++ b/test/functional/apps/management/_index_pattern_create_delete.js
@@ -71,8 +71,7 @@ export default function({ getService, getPageObjects }) {
       });
 
       it('should have index pattern in page header', async function() {
-        const indexPageHeading = await PageObjects.settings.getIndexPageHeading();
-        const patternName = await indexPageHeading.getVisibleText();
+        const patternName = await PageObjects.settings.getIndexPageHeading();
         expect(patternName).to.be('logstash-*');
       });
 
diff --git a/test/functional/page_objects/settings_page.ts b/test/functional/page_objects/settings_page.ts
index 25706fda74925..3f6036f58f0a9 100644
--- a/test/functional/page_objects/settings_page.ts
+++ b/test/functional/page_objects/settings_page.ts
@@ -169,7 +169,7 @@ export function SettingsPageProvider({ getService, getPageObjects }: FtrProvider
     }
 
     async getIndexPageHeading() {
-      return await testSubjects.find('indexPatternTitle');
+      return await testSubjects.getVisibleText('indexPatternTitle');
     }
 
     async getConfigureHeader() {

From 36285d62b65da3d3153c779c0ac81b4f9a064168 Mon Sep 17 00:00:00 2001
From: Oliver Gupte <ogupte@users.noreply.github.com>
Date: Tue, 24 Mar 2020 13:56:08 -0700
Subject: [PATCH 105/179] Closes #60754 by removing uiFilters from the API
 route for service map (#61012)

since it is unused.
---
 .../apm/public/components/app/ServiceMap/index.tsx   | 10 +++-------
 .../apm/server/lib/service_map/get_service_map.ts    | 12 +++++-------
 .../server/lib/service_map/get_trace_sample_ids.ts   |  8 ++------
 x-pack/plugins/apm/server/routes/service_map.ts      |  3 +--
 4 files changed, 11 insertions(+), 22 deletions(-)

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 d523a7cb331e1..0abaa9d76fc07 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
@@ -31,7 +31,7 @@ interface ServiceMapProps {
 
 export function ServiceMap({ serviceName }: ServiceMapProps) {
   const license = useLicense();
-  const { urlParams, uiFilters } = useUrlParams();
+  const { urlParams } = useUrlParams();
 
   const { data } = useFetcher(() => {
     const { start, end, environment } = urlParams;
@@ -43,16 +43,12 @@ export function ServiceMap({ serviceName }: ServiceMapProps) {
             start,
             end,
             environment,
-            serviceName,
-            uiFilters: JSON.stringify({
-              ...uiFilters,
-              environment: undefined
-            })
+            serviceName
           }
         }
       });
     }
-  }, [serviceName, uiFilters, urlParams]);
+  }, [serviceName, urlParams]);
 
   const { ref, height, width } = useRefDimensions();
 
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 1414f743e8a03..17b595385a84e 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
@@ -13,17 +13,13 @@ import {
 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 { Setup, SetupTimeRange } 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';
 
 export interface IEnvOptions {
-  setup: Setup & SetupTimeRange & SetupUIFilters;
+  setup: Setup & SetupTimeRange;
   serviceName?: string;
   environment?: string;
 }
@@ -77,7 +73,9 @@ async function getConnectionData({
 async function getServicesData(options: IEnvOptions) {
   const { setup } = options;
 
-  const projection = getServicesProjection({ setup });
+  const projection = getServicesProjection({
+    setup: { ...setup, uiFiltersES: [] }
+  });
 
   const { filter } = projection.body.query.bool;
 
diff --git a/x-pack/plugins/apm/server/lib/service_map/get_trace_sample_ids.ts b/x-pack/plugins/apm/server/lib/service_map/get_trace_sample_ids.ts
index 9cb1a61e1d76f..5e2ab82239d9f 100644
--- a/x-pack/plugins/apm/server/lib/service_map/get_trace_sample_ids.ts
+++ b/x-pack/plugins/apm/server/lib/service_map/get_trace_sample_ids.ts
@@ -4,11 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 import { uniq, take, sortBy } from 'lodash';
-import {
-  Setup,
-  SetupUIFilters,
-  SetupTimeRange
-} from '../helpers/setup_request';
+import { Setup, SetupTimeRange } from '../helpers/setup_request';
 import { rangeFilter } from '../helpers/range_filter';
 import { ESFilter } from '../../../typings/elasticsearch';
 import {
@@ -28,7 +24,7 @@ export async function getTraceSampleIds({
 }: {
   serviceName?: string;
   environment?: string;
-  setup: Setup & SetupTimeRange & SetupUIFilters;
+  setup: Setup & SetupTimeRange;
 }) {
   const { start, end, client, indices, config } = setup;
 
diff --git a/x-pack/plugins/apm/server/routes/service_map.ts b/x-pack/plugins/apm/server/routes/service_map.ts
index a61a61e3ccaac..6838717cbc6da 100644
--- a/x-pack/plugins/apm/server/routes/service_map.ts
+++ b/x-pack/plugins/apm/server/routes/service_map.ts
@@ -14,7 +14,7 @@ import { setupRequest } from '../lib/helpers/setup_request';
 import { getServiceMap } from '../lib/service_map/get_service_map';
 import { getServiceMapServiceNodeInfo } from '../lib/service_map/get_service_map_service_node_info';
 import { createRoute } from './create_route';
-import { rangeRt, uiFiltersRt } from './default_api_types';
+import { rangeRt } from './default_api_types';
 
 export const serviceMapRoute = createRoute(() => ({
   path: '/api/apm/service-map',
@@ -24,7 +24,6 @@ export const serviceMapRoute = createRoute(() => ({
         environment: t.string,
         serviceName: t.string
       }),
-      uiFiltersRt,
       rangeRt
     ])
   },

From 34bfc1bfc7d0a912e9f33f3282e5601c2ac3690e Mon Sep 17 00:00:00 2001
From: Thomas Watson <w@tson.dk>
Date: Tue, 24 Mar 2020 21:59:27 +0100
Subject: [PATCH 106/179] Bump core-js and jimp (#61124)

This commit bumps the following dependencies:

- core-js (prod-dependency): 3.2.1 -> 3.6.4
- jimp (dev-dependency): 0.8.4 -> 0.9.6
---
 package.json |   4 +-
 yarn.lock    | 418 +++++++++++++++++++++++++++------------------------
 2 files changed, 225 insertions(+), 197 deletions(-)

diff --git a/package.json b/package.json
index 9bb9b505f54a2..9c8cc6538269f 100644
--- a/package.json
+++ b/package.json
@@ -162,7 +162,7 @@
     "color": "1.0.3",
     "commander": "3.0.2",
     "compare-versions": "3.5.1",
-    "core-js": "^3.2.1",
+    "core-js": "^3.6.4",
     "css-loader": "^3.4.2",
     "d3": "3.5.17",
     "d3-cloud": "1.2.5",
@@ -443,7 +443,7 @@
     "jest": "^24.9.0",
     "jest-cli": "^24.9.0",
     "jest-raw-loader": "^1.0.1",
-    "jimp": "0.8.4",
+    "jimp": "^0.9.6",
     "json5": "^1.0.1",
     "karma": "3.1.4",
     "karma-chrome-launcher": "2.2.0",
diff --git a/yarn.lock b/yarn.lock
index f88db13f4ead1..5c988ccd3e736 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2416,257 +2416,284 @@
     "@types/yargs" "^15.0.0"
     chalk "^3.0.0"
 
-"@jimp/bmp@^0.8.4":
-  version "0.8.4"
-  resolved "https://registry.yarnpkg.com/@jimp/bmp/-/bmp-0.8.4.tgz#3246e0c6b073b3e2d9b61075ac0146d9124c9277"
-  integrity sha512-Cf/V+SUyEVxCCP8q1emkarCHJ8NkLFcLp41VMqBihoR4ke0TIPfCSdgW/JXbM/28vvZ5a2bvMe6uOll6cFggvA==
+"@jimp/bmp@^0.9.6":
+  version "0.9.6"
+  resolved "https://registry.yarnpkg.com/@jimp/bmp/-/bmp-0.9.6.tgz#379e261615d7c1f3b52af4d5a0f324666de53d7d"
+  integrity sha512-T2Fh/k/eN6cDyOx0KQ4y56FMLo8+mKNhBh7GXMQXLK2NNZ0ckpFo3VHDBZ3HnaFeVTZXF/atLiR9CfnXH+rLxA==
   dependencies:
-    "@jimp/utils" "^0.8.4"
+    "@babel/runtime" "^7.7.2"
+    "@jimp/utils" "^0.9.6"
     bmp-js "^0.1.0"
-    core-js "^2.5.7"
+    core-js "^3.4.1"
 
-"@jimp/core@^0.8.4":
-  version "0.8.4"
-  resolved "https://registry.yarnpkg.com/@jimp/core/-/core-0.8.4.tgz#fbdb3cb0823301381736e988674f14c282dc5c63"
-  integrity sha512-3fK5UEOEQsfSDhsrAgBT6W8Up51qkeCj9RVjusxUaEGmix34PO/KTVfzURlu6NOpOUvtfNXsCq9xS7cxBTWSCA==
+"@jimp/core@^0.9.6":
+  version "0.9.6"
+  resolved "https://registry.yarnpkg.com/@jimp/core/-/core-0.9.6.tgz#a553f801bd436526d36e8982b99e58e8afc3d17a"
+  integrity sha512-sQO04S+HZNid68a9ehb4BC2lmW6iZ5JgU9tC+thC2Lhix+N/XKDJcBJ6HevbLgeTzuIAw24C5EKuUeO3C+rE5w==
   dependencies:
-    "@jimp/utils" "^0.8.4"
+    "@babel/runtime" "^7.7.2"
+    "@jimp/utils" "^0.9.6"
     any-base "^1.1.0"
     buffer "^5.2.0"
-    core-js "^2.5.7"
+    core-js "^3.4.1"
     exif-parser "^0.1.12"
     file-type "^9.0.0"
     load-bmfont "^1.3.1"
-    mkdirp "0.5.1"
+    mkdirp "^0.5.1"
     phin "^2.9.1"
     pixelmatch "^4.0.2"
     tinycolor2 "^1.4.1"
 
-"@jimp/custom@^0.8.4":
-  version "0.8.4"
-  resolved "https://registry.yarnpkg.com/@jimp/custom/-/custom-0.8.4.tgz#abd61281ce12194ae23046ee71d60b754b515bc8"
-  integrity sha512-iS/RB3QQKpm4QS8lxxtQzvYDMph9YvOn3d68gMM4pDKn95n3nt5/ySHFv6fQq/yzfox1OPdeYaXbOLvC3+ofqw==
+"@jimp/custom@^0.9.6":
+  version "0.9.6"
+  resolved "https://registry.yarnpkg.com/@jimp/custom/-/custom-0.9.6.tgz#3d8a19d6ed717f0f1aa3f1b8f42fa374f43bc715"
+  integrity sha512-ZYKgrBZVoQwvIGlQSO7MFmn7Jn8a9X5g1g+KOTDO9Q0s4vnxdPTtr/qUjG9QYX6zW/6AK4LaIsDinDrrKDnOag==
   dependencies:
-    "@jimp/core" "^0.8.4"
-    core-js "^2.5.7"
+    "@babel/runtime" "^7.7.2"
+    "@jimp/core" "^0.9.6"
+    core-js "^3.4.1"
 
-"@jimp/gif@^0.8.4":
-  version "0.8.4"
-  resolved "https://registry.yarnpkg.com/@jimp/gif/-/gif-0.8.4.tgz#1429a71ed3b055f73d63c9b195fa7f0a46e947b5"
-  integrity sha512-YpHZ7aWzmrviY7YigXRolHs6oBhGJItRry8fh3zebAgKth06GMv58ce84yXXOKX4yQ+QGd6GgOWzePx+KMP9TA==
+"@jimp/gif@^0.9.6":
+  version "0.9.6"
+  resolved "https://registry.yarnpkg.com/@jimp/gif/-/gif-0.9.6.tgz#0a7b1e521daca635b02259f941bdb3600569d8e6"
+  integrity sha512-Z2muC2On8KHEVrWKCCM0L2eua9kw4bQETzT7gmVsizc8MXAKdS8AyVV9T3ZrImiI0o5UkAN/u0cPi1U2pSiD8Q==
   dependencies:
-    "@jimp/utils" "^0.8.4"
-    core-js "^2.5.7"
+    "@babel/runtime" "^7.7.2"
+    "@jimp/utils" "^0.9.6"
+    core-js "^3.4.1"
     omggif "^1.0.9"
 
-"@jimp/jpeg@^0.8.4":
-  version "0.8.4"
-  resolved "https://registry.yarnpkg.com/@jimp/jpeg/-/jpeg-0.8.4.tgz#effde867116f88f59ac20b44b1a526b11caca026"
-  integrity sha512-7exKk3LNPKJgsFzUPL+mOJtIEHcLp6yU9sVbULffVDjVUun6/Are2tCX8rCXZq28yiUhofzr61k5UqjkKFJXrA==
+"@jimp/jpeg@^0.9.6":
+  version "0.9.6"
+  resolved "https://registry.yarnpkg.com/@jimp/jpeg/-/jpeg-0.9.6.tgz#fb90bdc0111966987c5ba59cdca7040be86ead41"
+  integrity sha512-igSe0pIX3le/CKdvqW4vLXMxoFjTLjEaW6ZHt/h63OegaEa61TzJ2OM7j7DxrEHcMCMlkhUc9Bapk57MAefCTQ==
   dependencies:
-    "@jimp/utils" "^0.8.4"
-    core-js "^2.5.7"
+    "@babel/runtime" "^7.7.2"
+    "@jimp/utils" "^0.9.6"
+    core-js "^3.4.1"
     jpeg-js "^0.3.4"
 
-"@jimp/plugin-blit@^0.8.4":
-  version "0.8.4"
-  resolved "https://registry.yarnpkg.com/@jimp/plugin-blit/-/plugin-blit-0.8.4.tgz#991b4199cc5506f0faae22b821b14ec93fbce1bb"
-  integrity sha512-H9bpetmOUgEHpkDSRzbXLMXQhr34i8YicYV3EDeuHU8mKlAjtMbVpbp5ZN4mcadTz+EYdTdVNfQNsRCcIb5Oeg==
+"@jimp/plugin-blit@^0.9.6":
+  version "0.9.6"
+  resolved "https://registry.yarnpkg.com/@jimp/plugin-blit/-/plugin-blit-0.9.6.tgz#7937e02e3514b95dbe4c70d444054847f6e9ce3c"
+  integrity sha512-zp7X6uDU1lCu44RaSY88aAvsSKbgqUrfDyWRX1wsamJvvZpRnp1WekWlGyydRtnlUBAGIpiHCHmyh/TJ2I4RWA==
   dependencies:
-    "@jimp/utils" "^0.8.4"
-    core-js "^2.5.7"
+    "@babel/runtime" "^7.7.2"
+    "@jimp/utils" "^0.9.6"
+    core-js "^3.4.1"
 
-"@jimp/plugin-blur@^0.8.4":
-  version "0.8.4"
-  resolved "https://registry.yarnpkg.com/@jimp/plugin-blur/-/plugin-blur-0.8.4.tgz#460f79c45eda7f24adf624a691134d6192d3dbb4"
-  integrity sha512-gvEDWW7+MI9Hk1KKzuFliRdDPaofkxB4pRJ/n1hipDoOGcNYFqxx5FGNQ4wsGSDpQ+RiHZF+JGKKb+EIwHg+0Q==
+"@jimp/plugin-blur@^0.9.6":
+  version "0.9.6"
+  resolved "https://registry.yarnpkg.com/@jimp/plugin-blur/-/plugin-blur-0.9.6.tgz#3d74b18c27e9eae11b956ffe26290ece6d250813"
+  integrity sha512-xEi63hvzewUp7kzw+PI3f9CIrgZbphLI4TDDHWNYuS70RvhTuplbR6RMHD/zFhosrANCkJGr5OZJlrJnsCg6ug==
   dependencies:
-    "@jimp/utils" "^0.8.4"
-    core-js "^2.5.7"
+    "@babel/runtime" "^7.7.2"
+    "@jimp/utils" "^0.9.6"
+    core-js "^3.4.1"
 
-"@jimp/plugin-color@^0.8.4":
-  version "0.8.4"
-  resolved "https://registry.yarnpkg.com/@jimp/plugin-color/-/plugin-color-0.8.4.tgz#a9aa525421ea50bf2c1baec7618f73b7e4fc3464"
-  integrity sha512-DHCGMxInCI1coXMIfdZJ5G/4hpt5yZLNB5+oUIxT4aClzyhUjqD4xOcnO7hlPY6LuX8+FX7cYMHhdMfhTXB3Dg==
+"@jimp/plugin-color@^0.9.6":
+  version "0.9.6"
+  resolved "https://registry.yarnpkg.com/@jimp/plugin-color/-/plugin-color-0.9.6.tgz#d0fca0ed4c2c48fd6f929ef4a03cebf9c1342e14"
+  integrity sha512-o1HSoqBVUUAsWbqSXnpiHU0atKWy/Q1GUbZ3F5GWt/0OSDyl9RWM82V9axT2vePZHInKjIaimhnx1gGj8bfxkQ==
   dependencies:
-    "@jimp/utils" "^0.8.4"
-    core-js "^2.5.7"
+    "@babel/runtime" "^7.7.2"
+    "@jimp/utils" "^0.9.6"
+    core-js "^3.4.1"
     tinycolor2 "^1.4.1"
 
-"@jimp/plugin-contain@^0.8.4":
-  version "0.8.4"
-  resolved "https://registry.yarnpkg.com/@jimp/plugin-contain/-/plugin-contain-0.8.4.tgz#2db8c12de910490cd74f339e9414a968b8c9328e"
-  integrity sha512-3wwLXig5LkOMg5FrNZrX/r99ehaA+0s3dkro3CiRg0Ez6Y0fz067so+HdsmqmoG78WY/dCdgdps/xLOW2VV4DQ==
+"@jimp/plugin-contain@^0.9.6":
+  version "0.9.6"
+  resolved "https://registry.yarnpkg.com/@jimp/plugin-contain/-/plugin-contain-0.9.6.tgz#7d7bbd5e9c2fa4391a3d63620e13a28f51e1e7e8"
+  integrity sha512-Xz467EN1I104yranET4ff1ViVKMtwKLg1uRe8j3b5VOrjtiXpDbjirNZjP3HTlv8IEUreWNz4BK7ZtfHSptufA==
   dependencies:
-    "@jimp/utils" "^0.8.4"
-    core-js "^2.5.7"
+    "@babel/runtime" "^7.7.2"
+    "@jimp/utils" "^0.9.6"
+    core-js "^3.4.1"
 
-"@jimp/plugin-cover@^0.8.4":
-  version "0.8.4"
-  resolved "https://registry.yarnpkg.com/@jimp/plugin-cover/-/plugin-cover-0.8.4.tgz#a09bfbbe88129754ca35e281707bc5ed3f3f0c63"
-  integrity sha512-U0xmSfGLmw0Ieiw00CM8DQ+XoQVBxbjsLE5To8EejnyLx5X+oNZ8r7E5EsQaushUlzij95IqMCloo+nCGhdYMw==
+"@jimp/plugin-cover@^0.9.6":
+  version "0.9.6"
+  resolved "https://registry.yarnpkg.com/@jimp/plugin-cover/-/plugin-cover-0.9.6.tgz#2853de7f8302f655ae8e95f51ab25a0ed77e3756"
+  integrity sha512-Ocr27AvtvH4ZT/9EWZgT3+HQV9fG5njwh2CYMHbdpx09O62Asj6pZ4QI0kKzOcux1oLgv59l7a93pEfMOfkfwQ==
   dependencies:
-    "@jimp/utils" "^0.8.4"
-    core-js "^2.5.7"
+    "@babel/runtime" "^7.7.2"
+    "@jimp/utils" "^0.9.6"
+    core-js "^3.4.1"
 
-"@jimp/plugin-crop@^0.8.4":
-  version "0.8.4"
-  resolved "https://registry.yarnpkg.com/@jimp/plugin-crop/-/plugin-crop-0.8.4.tgz#ca5bd359c4e4b2374777bae6130e8b94552932fa"
-  integrity sha512-Neqs0K4cr7SU9nSte2qvGVh/8+K9ArH8mH1fWhZw4Zq8qD9NicX+g5hqmpmeSjOKD73t/jOmwvBevfJDu2KKSA==
+"@jimp/plugin-crop@^0.9.6":
+  version "0.9.6"
+  resolved "https://registry.yarnpkg.com/@jimp/plugin-crop/-/plugin-crop-0.9.6.tgz#82e539af2a2417783abbd143124a57672ff4cc31"
+  integrity sha512-d9rNdmz3+eYLbSKcTyyp+b8Nmhf6HySnimDXlTej4UP6LDtkq2VAyVaJ12fz9x6dfd8qcXOBXMozSfNCcgpXYA==
   dependencies:
-    "@jimp/utils" "^0.8.4"
-    core-js "^2.5.7"
+    "@babel/runtime" "^7.7.2"
+    "@jimp/utils" "^0.9.6"
+    core-js "^3.4.1"
 
-"@jimp/plugin-displace@^0.8.4":
-  version "0.8.4"
-  resolved "https://registry.yarnpkg.com/@jimp/plugin-displace/-/plugin-displace-0.8.4.tgz#c6d5cff889e52cb64194979967e6bd7fff4d5d1b"
-  integrity sha512-qKCwAP2lAO3R8ofYaEF/Gh+sfcjzZLtEiYHzjx/mYvPpXS6Yvkvl28aUH8pwdJYT+QYGelHmOne0RJvjsac1NQ==
+"@jimp/plugin-displace@^0.9.6":
+  version "0.9.6"
+  resolved "https://registry.yarnpkg.com/@jimp/plugin-displace/-/plugin-displace-0.9.6.tgz#67564d081dc6b19007248ca222d025fd6f90c03b"
+  integrity sha512-SWpbrxiHmUYBVWtDDMjaG3eRDBASrTPaad7l07t73/+kmU6owAKWQW6KtVs05MYSJgXz7Ggdr0fhEn9AYLH1Rg==
   dependencies:
-    "@jimp/utils" "^0.8.4"
-    core-js "^2.5.7"
+    "@babel/runtime" "^7.7.2"
+    "@jimp/utils" "^0.9.6"
+    core-js "^3.4.1"
 
-"@jimp/plugin-dither@^0.8.4":
-  version "0.8.4"
-  resolved "https://registry.yarnpkg.com/@jimp/plugin-dither/-/plugin-dither-0.8.4.tgz#a2320d6a8c467cf7697109e0c5ed4ee3d3898b73"
-  integrity sha512-19+y5VAO6d0keRne9eJCdOeB9X0LFuRdRSjgwl/57JtREeoPj+iKBg6REBl4atiSGd7/UCFg3wRtFOw24XFKgw==
+"@jimp/plugin-dither@^0.9.6":
+  version "0.9.6"
+  resolved "https://registry.yarnpkg.com/@jimp/plugin-dither/-/plugin-dither-0.9.6.tgz#dc48669cf51f3933761aa9137e99ebfa000b8cce"
+  integrity sha512-abm1GjfYK7ru/PoxH9fAUmhl+meHhGEClbVvjjMMe5g2S0BSTvMJl3SrkQD/FMkRLniaS/Qci6aQhIi+8rZmSw==
   dependencies:
-    "@jimp/utils" "^0.8.4"
-    core-js "^2.5.7"
+    "@babel/runtime" "^7.7.2"
+    "@jimp/utils" "^0.9.6"
+    core-js "^3.4.1"
 
-"@jimp/plugin-flip@^0.8.4":
-  version "0.8.4"
-  resolved "https://registry.yarnpkg.com/@jimp/plugin-flip/-/plugin-flip-0.8.4.tgz#08bf46470c3c0b4890691f554c28ccf17813746f"
-  integrity sha512-1BtKtc8cANuGgiWyOmltQZaR3Y5Og/GS/db8wBpFNLJ33Ir5UAGN2raDtx4EYEd5okuRVFj3OP+wAZl69m72LQ==
+"@jimp/plugin-flip@^0.9.6":
+  version "0.9.6"
+  resolved "https://registry.yarnpkg.com/@jimp/plugin-flip/-/plugin-flip-0.9.6.tgz#f81f9b886da8cd56e23dd04d5aa359f2b94f939e"
+  integrity sha512-KFZTzAzQQ5bct3ii7gysOhWrTKVdUOghkkoSzLi+14nO3uS/dxiu8fPeH1m683ligbdnuM/b22OuLwEwrboTHA==
   dependencies:
-    "@jimp/utils" "^0.8.4"
-    core-js "^2.5.7"
+    "@babel/runtime" "^7.7.2"
+    "@jimp/utils" "^0.9.6"
+    core-js "^3.4.1"
 
-"@jimp/plugin-gaussian@^0.8.4":
-  version "0.8.4"
-  resolved "https://registry.yarnpkg.com/@jimp/plugin-gaussian/-/plugin-gaussian-0.8.4.tgz#f3be12c5f16c5670959ab711e69b2963f66f7b4f"
-  integrity sha512-qYcVmiJn8l8uDZqk4FlB/qTV8fJgiJAh/xc/WKNEp2E8qFEgxoIPeimPHO8cJorEHqlh8I8l24OZkTkkEKaFfw==
+"@jimp/plugin-gaussian@^0.9.6":
+  version "0.9.6"
+  resolved "https://registry.yarnpkg.com/@jimp/plugin-gaussian/-/plugin-gaussian-0.9.6.tgz#6c93897ee0ff979466184d7d0ec0fbc95c679be4"
+  integrity sha512-WXKLtJKWchXfWHT5HIOq1HkPKpbH7xBLWPgVRxw00NV/6I8v4xT63A7/Nag78m00JgjwwiE7eK2tLGDbbrPYig==
   dependencies:
-    "@jimp/utils" "^0.8.4"
-    core-js "^2.5.7"
+    "@babel/runtime" "^7.7.2"
+    "@jimp/utils" "^0.9.6"
+    core-js "^3.4.1"
 
-"@jimp/plugin-invert@^0.8.4":
-  version "0.8.4"
-  resolved "https://registry.yarnpkg.com/@jimp/plugin-invert/-/plugin-invert-0.8.4.tgz#fd4577beba2973f663164f5ee454b2172ca56b34"
-  integrity sha512-OQ/dFDbBUmEd935Gitl5Pmgz+nLVyszwS0RqL6+G1U9EHYBeiHDrmY2sj7NgDjDEJYlRLxGlBRsTIPHzF3tdNw==
+"@jimp/plugin-invert@^0.9.6":
+  version "0.9.6"
+  resolved "https://registry.yarnpkg.com/@jimp/plugin-invert/-/plugin-invert-0.9.6.tgz#4b3fa7b81ea976b09b82b3db59ee00ac3093d2fd"
+  integrity sha512-Pab/cupZrYxeRp07N4L5a4C/3ksTN9k6Knm/o2G5C789OF0rYsGGLcnBR/6h69nPizRZHBYdXCEyXYgujlIFiw==
   dependencies:
-    "@jimp/utils" "^0.8.4"
-    core-js "^2.5.7"
+    "@babel/runtime" "^7.7.2"
+    "@jimp/utils" "^0.9.6"
+    core-js "^3.4.1"
 
-"@jimp/plugin-mask@^0.8.4":
-  version "0.8.4"
-  resolved "https://registry.yarnpkg.com/@jimp/plugin-mask/-/plugin-mask-0.8.4.tgz#0dfe02a14530c3bddfc258e83bd3c979e53d15ef"
-  integrity sha512-uqLdRGShHwCd9RHv8bMntTfDNDI2pcEeE7+F868P6PngWLKrzQCpuAyTnK6WK0ZN95fSsgy7TzCoesYk+FchkQ==
+"@jimp/plugin-mask@^0.9.6":
+  version "0.9.6"
+  resolved "https://registry.yarnpkg.com/@jimp/plugin-mask/-/plugin-mask-0.9.6.tgz#d70be0030ab3294b191f5b487fb655d776820b19"
+  integrity sha512-ikypRoDJkbxXlo6gW+EZOcTiLDIt0DrPwOFMt1bvL8UV2QPgX+GJ685IYwhIfEhBf/GSNFgB/NYsVvuSufTGeg==
   dependencies:
-    "@jimp/utils" "^0.8.4"
-    core-js "^2.5.7"
+    "@babel/runtime" "^7.7.2"
+    "@jimp/utils" "^0.9.6"
+    core-js "^3.4.1"
 
-"@jimp/plugin-normalize@^0.8.4":
-  version "0.8.4"
-  resolved "https://registry.yarnpkg.com/@jimp/plugin-normalize/-/plugin-normalize-0.8.4.tgz#aa2c3131082b6ceef2fb6222323db9f7d837447c"
-  integrity sha512-+ihgQeVD8syWxw12F5ngUUdtlIcGDqH7hEoHcwVVGOFfaJqR4YBQR4FM3QLFFFdi2X/uK2nGJt9cMh0UaINEgw==
+"@jimp/plugin-normalize@^0.9.6":
+  version "0.9.6"
+  resolved "https://registry.yarnpkg.com/@jimp/plugin-normalize/-/plugin-normalize-0.9.6.tgz#c9128412a53485d91236a1da241f3166e572be4a"
+  integrity sha512-V3GeuAJ1NeL7qsLoDjnypJq24RWDCwbXpKhtxB+Yg9zzgOCkmb041p7ysxbcpkuJsRpKLNABZeNCCqd83bRawA==
   dependencies:
-    "@jimp/utils" "^0.8.4"
-    core-js "^2.5.7"
+    "@babel/runtime" "^7.7.2"
+    "@jimp/utils" "^0.9.6"
+    core-js "^3.4.1"
 
-"@jimp/plugin-print@^0.8.4":
-  version "0.8.4"
-  resolved "https://registry.yarnpkg.com/@jimp/plugin-print/-/plugin-print-0.8.4.tgz#c110d6e7632e3c9cf47ce395e36b0f3c1461a9ca"
-  integrity sha512-Wg5tZI3hW5DG9Caz4wg4ZolS3Lvv4MFAxORPAeWeahDpHs38XZ7ydJ0KR39p2oWJPP0yIFv1fETYpU7BiJPRRw==
+"@jimp/plugin-print@^0.9.6":
+  version "0.9.6"
+  resolved "https://registry.yarnpkg.com/@jimp/plugin-print/-/plugin-print-0.9.6.tgz#fea31ffeafee18ae7b5cfd6fa131bb205abfee51"
+  integrity sha512-gKkqZZPQtMSufHOL0mtJm5d/KI2O6+0kUpOBVSYdGedtPXA61kmVnsOd3wwajIMlXA3E0bDxLXLdAguWqjjGgw==
   dependencies:
-    "@jimp/utils" "^0.8.4"
-    core-js "^2.5.7"
+    "@babel/runtime" "^7.7.2"
+    "@jimp/utils" "^0.9.6"
+    core-js "^3.4.1"
     load-bmfont "^1.4.0"
 
-"@jimp/plugin-resize@^0.8.4":
-  version "0.8.4"
-  resolved "https://registry.yarnpkg.com/@jimp/plugin-resize/-/plugin-resize-0.8.4.tgz#6690f50c98cfd89ac3682b58ba9623e7c46e0be6"
-  integrity sha512-z9tumvsQja/YFTSeGvofYLvVws8LZYLYVW8l17hBETzfZQdVEvPOdWKkXqsAsK5uY9m8M5rH7kR8NZbCDVbyzA==
+"@jimp/plugin-resize@^0.9.6":
+  version "0.9.6"
+  resolved "https://registry.yarnpkg.com/@jimp/plugin-resize/-/plugin-resize-0.9.6.tgz#7fb939c8a42e2a3639d661cc7ab24057598693bd"
+  integrity sha512-r5wJcVII7ZWMuY2l6WSbHPG6gKMFemtCHmJRXGUu+/ZhPGBz3IFluycBpHkWW3OB+jfvuyv1EGQWHU50N1l8Og==
   dependencies:
-    "@jimp/utils" "^0.8.4"
-    core-js "^2.5.7"
+    "@babel/runtime" "^7.7.2"
+    "@jimp/utils" "^0.9.6"
+    core-js "^3.4.1"
 
-"@jimp/plugin-rotate@^0.8.4":
-  version "0.8.4"
-  resolved "https://registry.yarnpkg.com/@jimp/plugin-rotate/-/plugin-rotate-0.8.4.tgz#bf3ea70d10123f1372507b74d06bfefb40b3e526"
-  integrity sha512-PVxpt3DjqaUnHP6Nd3tzZjl4SYe/FYXszGTshtx51AMuvZLnpvekrrclYyc7Dc1Ry3kx3ma6UuLCvmf85hrdmw==
+"@jimp/plugin-rotate@^0.9.6":
+  version "0.9.6"
+  resolved "https://registry.yarnpkg.com/@jimp/plugin-rotate/-/plugin-rotate-0.9.6.tgz#06d725155e5cdb615133f57a52f5a860a9d03f3e"
+  integrity sha512-B2nm/eO2nbvn1DgmnzMd79yt3V6kffhRNrKoo2VKcKFiVze1vGP3MD3fVyw5U1PeqwAFu7oTICFnCf9wKDWSqg==
   dependencies:
-    "@jimp/utils" "^0.8.4"
-    core-js "^2.5.7"
+    "@babel/runtime" "^7.7.2"
+    "@jimp/utils" "^0.9.6"
+    core-js "^3.4.1"
 
-"@jimp/plugin-scale@^0.8.4":
-  version "0.8.4"
-  resolved "https://registry.yarnpkg.com/@jimp/plugin-scale/-/plugin-scale-0.8.4.tgz#2de9cc80d49f6a36e4177b22e0ab1d4305331c2e"
-  integrity sha512-PrBTOMJ5n4gbIvRNxWfc1MdgHw4vd5r1UOHRVuc6ZQ9Z/FueBuvIidnz7GBRHbsRm3IjckvsLfEL1nIK0Kqh3A==
+"@jimp/plugin-scale@^0.9.6":
+  version "0.9.6"
+  resolved "https://registry.yarnpkg.com/@jimp/plugin-scale/-/plugin-scale-0.9.6.tgz#3fa939c1a4f44383e12afeb7c434eb41f20e4a1c"
+  integrity sha512-DLsLB5S3mh9+TZY5ycwfLgOJvUcoS7bP0Mi3I8vE1J91qmA+TXoWFFgrIVgnEPw5jSKzNTt8WhykQ0x2lKXncw==
   dependencies:
-    "@jimp/utils" "^0.8.4"
-    core-js "^2.5.7"
+    "@babel/runtime" "^7.7.2"
+    "@jimp/utils" "^0.9.6"
+    core-js "^3.4.1"
 
-"@jimp/plugins@^0.8.4":
-  version "0.8.4"
-  resolved "https://registry.yarnpkg.com/@jimp/plugins/-/plugins-0.8.4.tgz#af24c0686aec327f3abcc50ba5bbae1df2113fb0"
-  integrity sha512-Vd0oCe0bj7c+crHL6ee178q2c1o50UnbCmc0imHYg7M+pY8S1kl4ubZWwkAg2W96FCarGrm9eqPvCUyAdFOi9w==
-  dependencies:
-    "@jimp/plugin-blit" "^0.8.4"
-    "@jimp/plugin-blur" "^0.8.4"
-    "@jimp/plugin-color" "^0.8.4"
-    "@jimp/plugin-contain" "^0.8.4"
-    "@jimp/plugin-cover" "^0.8.4"
-    "@jimp/plugin-crop" "^0.8.4"
-    "@jimp/plugin-displace" "^0.8.4"
-    "@jimp/plugin-dither" "^0.8.4"
-    "@jimp/plugin-flip" "^0.8.4"
-    "@jimp/plugin-gaussian" "^0.8.4"
-    "@jimp/plugin-invert" "^0.8.4"
-    "@jimp/plugin-mask" "^0.8.4"
-    "@jimp/plugin-normalize" "^0.8.4"
-    "@jimp/plugin-print" "^0.8.4"
-    "@jimp/plugin-resize" "^0.8.4"
-    "@jimp/plugin-rotate" "^0.8.4"
-    "@jimp/plugin-scale" "^0.8.4"
-    core-js "^2.5.7"
+"@jimp/plugins@^0.9.6":
+  version "0.9.6"
+  resolved "https://registry.yarnpkg.com/@jimp/plugins/-/plugins-0.9.6.tgz#a1cfdf9f3e1adf5b124686486343888a16c8fd27"
+  integrity sha512-eQI29e+K+3L/fb5GbPgsBdoftvaYetSOO2RL5z+Gjk6R4EF4QFRo63YcFl+f72Kc1b0JTOoDxClvn/s5GMV0tg==
+  dependencies:
+    "@babel/runtime" "^7.7.2"
+    "@jimp/plugin-blit" "^0.9.6"
+    "@jimp/plugin-blur" "^0.9.6"
+    "@jimp/plugin-color" "^0.9.6"
+    "@jimp/plugin-contain" "^0.9.6"
+    "@jimp/plugin-cover" "^0.9.6"
+    "@jimp/plugin-crop" "^0.9.6"
+    "@jimp/plugin-displace" "^0.9.6"
+    "@jimp/plugin-dither" "^0.9.6"
+    "@jimp/plugin-flip" "^0.9.6"
+    "@jimp/plugin-gaussian" "^0.9.6"
+    "@jimp/plugin-invert" "^0.9.6"
+    "@jimp/plugin-mask" "^0.9.6"
+    "@jimp/plugin-normalize" "^0.9.6"
+    "@jimp/plugin-print" "^0.9.6"
+    "@jimp/plugin-resize" "^0.9.6"
+    "@jimp/plugin-rotate" "^0.9.6"
+    "@jimp/plugin-scale" "^0.9.6"
+    core-js "^3.4.1"
     timm "^1.6.1"
 
-"@jimp/png@^0.8.4":
-  version "0.8.4"
-  resolved "https://registry.yarnpkg.com/@jimp/png/-/png-0.8.4.tgz#d150ddaaebafcda83d820390f62a4d3c409acc03"
-  integrity sha512-DLj260SwQr9ZNhSto1BacXGNRhIQiLNOESPoq5DGjbqiPCmYNxE7CPlXB1BVh0T3AmZBjnZkZORU0Y9wTi3gJw==
+"@jimp/png@^0.9.6":
+  version "0.9.6"
+  resolved "https://registry.yarnpkg.com/@jimp/png/-/png-0.9.6.tgz#00ed7e6fb783b94f2f1a9fadf9a42bd75f70cc7f"
+  integrity sha512-9vhOG2xylcDqPbBf4lzpa2Sa1WNJrEZNGvPvWcM+XVhqYa8+DJBLYkoBlpI/qWIYA+eVWDnLF3ygtGj8CElICw==
   dependencies:
-    "@jimp/utils" "^0.8.4"
-    core-js "^2.5.7"
+    "@babel/runtime" "^7.7.2"
+    "@jimp/utils" "^0.9.6"
+    core-js "^3.4.1"
     pngjs "^3.3.3"
 
-"@jimp/tiff@^0.8.4":
-  version "0.8.4"
-  resolved "https://registry.yarnpkg.com/@jimp/tiff/-/tiff-0.8.4.tgz#bc18c32cef996ad986a92bb7d926d6abd1db9d10"
-  integrity sha512-SQmf1B/TbCtbwzJReLw/lzGqbeu8MOfT+wkaia0XWS72H6bEW66PTQKhB4/3uzC/Xnmsep1WNQITlwcWdgc36Q==
+"@jimp/tiff@^0.9.6":
+  version "0.9.6"
+  resolved "https://registry.yarnpkg.com/@jimp/tiff/-/tiff-0.9.6.tgz#9ff12122e727ee15f27f40a710516102a636f66b"
+  integrity sha512-pKKEMqPzX9ak8mek2iVVoW34+h/TSWUyI4NjbYWJMQ2WExfuvEJvLocy9Q9xi6HqRuJmUxgNIiC5iZM1PDEEfg==
   dependencies:
-    core-js "^2.5.7"
+    "@babel/runtime" "^7.7.2"
+    core-js "^3.4.1"
     utif "^2.0.1"
 
-"@jimp/types@^0.8.4":
-  version "0.8.4"
-  resolved "https://registry.yarnpkg.com/@jimp/types/-/types-0.8.4.tgz#01df00a5adb955cb4ba79df1288408faa3bb40ed"
-  integrity sha512-BCehQ5hrTOGDGdeROwXOYqgFGAzJPkuXmVJXgMgBoW1YjoGWhXJ5iShaJ/l7DRErrdezoWUdAhTFlV5bJf51dg==
-  dependencies:
-    "@jimp/bmp" "^0.8.4"
-    "@jimp/gif" "^0.8.4"
-    "@jimp/jpeg" "^0.8.4"
-    "@jimp/png" "^0.8.4"
-    "@jimp/tiff" "^0.8.4"
-    core-js "^2.5.7"
+"@jimp/types@^0.9.6":
+  version "0.9.6"
+  resolved "https://registry.yarnpkg.com/@jimp/types/-/types-0.9.6.tgz#7be7f415ad93be733387c03b8a228c587a868a18"
+  integrity sha512-PSjdbLZ8d50En+Wf1XkWFfrXaf/GqyrxxgIwFWPbL+wrW4pmbYovfxSLCY61s8INsOFOft9dzzllhLBtg1aQ6A==
+  dependencies:
+    "@babel/runtime" "^7.7.2"
+    "@jimp/bmp" "^0.9.6"
+    "@jimp/gif" "^0.9.6"
+    "@jimp/jpeg" "^0.9.6"
+    "@jimp/png" "^0.9.6"
+    "@jimp/tiff" "^0.9.6"
+    core-js "^3.4.1"
     timm "^1.6.1"
 
-"@jimp/utils@^0.8.4":
-  version "0.8.4"
-  resolved "https://registry.yarnpkg.com/@jimp/utils/-/utils-0.8.4.tgz#a6bbdc13dba99b95d4cabf0bde87b1bcd2230d25"
-  integrity sha512-6Cwplao7IgwhFRijMvvyjdV7Sa7Fw71vS1aDsUDCVpi3XHsiLUM+nPTno6OKjzg2z2EufuolWPEvuq/GSte4lA==
+"@jimp/utils@^0.9.6":
+  version "0.9.6"
+  resolved "https://registry.yarnpkg.com/@jimp/utils/-/utils-0.9.6.tgz#a3e6c29e835e2b9ea9f3899c9d3d230dc63bd518"
+  integrity sha512-kzxcp0i4ecSdMXFEmtH+NYdBQysINEUTsrjm7v0zH8t/uwaEMOG46I16wo/iPBXJkUeNdL2rbXoGoxxoeSfrrA==
   dependencies:
-    core-js "^2.5.7"
+    "@babel/runtime" "^7.7.2"
+    core-js "^3.4.1"
 
 "@mapbox/extent@0.4.0":
   version "0.4.0"
@@ -10219,10 +10246,10 @@ core-js@^2.2.0, core-js@^2.4.0, core-js@^2.5.0, core-js@^2.5.1, core-js@^2.5.3,
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.9.tgz#6b4b214620c834152e179323727fc19741b084f2"
   integrity sha512-HOpZf6eXmnl7la+cUdMnLvUxKNqLUzJvgIziQ0DiF3JwSImNphIqdGqzj6hIKyX04MmV0poclQ7+wjWvxQyR2A==
 
-core-js@^3.0.1, core-js@^3.0.4, core-js@^3.2.1:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.2.1.tgz#cd41f38534da6cc59f7db050fe67307de9868b09"
-  integrity sha512-Qa5XSVefSVPRxy2XfUC13WbvqkxhkwB3ve+pgCQveNgYzbM/UxZeu1dcOX/xr4UmfUd+muuvsaxilQzCyUurMw==
+core-js@^3.0.1, core-js@^3.0.4, core-js@^3.2.1, core-js@^3.4.1, core-js@^3.6.4:
+  version "3.6.4"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.6.4.tgz#440a83536b458114b9cb2ac1580ba377dc470647"
+  integrity sha512-4paDGScNgZP2IXXilaffL9X7968RuvwlkK3xWtZRVqgd8SYNiVKRJvkFd1aqqEuPfN7E68ZHEp9hDj6lHj4Hyw==
 
 core-util-is@1.0.2, core-util-is@^1.0.2, core-util-is@~1.0.0:
   version "1.0.2"
@@ -18479,15 +18506,16 @@ jest@^24.9.0:
     import-local "^2.0.0"
     jest-cli "^24.9.0"
 
-jimp@0.8.4:
-  version "0.8.4"
-  resolved "https://registry.yarnpkg.com/jimp/-/jimp-0.8.4.tgz#9c7c6ee4c8992e585a60914c62aee0c5e5c7955b"
-  integrity sha512-xCPvd2HIH8iR7+gWVnivzXwiQGnLBmLDpaEj5M0vQf3uur5MuLCOWbBduAdk6r3ur8X0kwgM4eEM0i7o+k9x9g==
+jimp@^0.9.6:
+  version "0.9.6"
+  resolved "https://registry.yarnpkg.com/jimp/-/jimp-0.9.6.tgz#abf381daf193a4fa335cb4ee0e22948049251eb9"
+  integrity sha512-DBDHYeNVqVpoPkcvo0PKTNGvD+i7NYvkKTsl0I3k7ql36uN8wGTptRg0HtgQyYE/bhGSLI6Lq5qLwewaOPXNfg==
   dependencies:
-    "@jimp/custom" "^0.8.4"
-    "@jimp/plugins" "^0.8.4"
-    "@jimp/types" "^0.8.4"
-    core-js "^2.5.7"
+    "@babel/runtime" "^7.7.2"
+    "@jimp/custom" "^0.9.6"
+    "@jimp/plugins" "^0.9.6"
+    "@jimp/types" "^0.9.6"
+    core-js "^3.4.1"
     regenerator-runtime "^0.13.3"
 
 jit-grunt@0.10.0:

From e251310000bcad8649b4993f547e156237714732 Mon Sep 17 00:00:00 2001
From: Srikanth Suresh <4140019+srikwit@users.noreply.github.com>
Date: Wed, 25 Mar 2020 00:01:19 +0300
Subject: [PATCH 107/179] [SR] Updating href for source-only repository
 documentation (#60951)

---
 .../snapshot_restore/public/application/constants/index.ts      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x-pack/plugins/snapshot_restore/public/application/constants/index.ts b/x-pack/plugins/snapshot_restore/public/application/constants/index.ts
index 481516479df4e..9c8fb3d288d24 100644
--- a/x-pack/plugins/snapshot_restore/public/application/constants/index.ts
+++ b/x-pack/plugins/snapshot_restore/public/application/constants/index.ts
@@ -17,7 +17,7 @@ export enum REPOSITORY_DOC_PATHS {
   default = 'modules-snapshots.html',
   fs = 'modules-snapshots.html#_shared_file_system_repository',
   url = 'modules-snapshots.html#_read_only_url_repository',
-  source = 'modules-snapshots.html#_source_only_repository',
+  source = 'snapshots-register-repository.html#snapshots-source-only-repository',
   s3 = 'repository-s3.html',
   hdfs = 'repository-hdfs.html',
   azure = 'repository-azure.html',

From 498abb4152c8d22d1bee15b9c357b8daea3261d6 Mon Sep 17 00:00:00 2001
From: Matthew Kime <matt@mattki.me>
Date: Tue, 24 Mar 2020 16:22:11 -0500
Subject: [PATCH 108/179] Revert "Drilldowns (#59632)" (#61136)

This reverts commit 5abb2c8c7dbc6dfca05059261708f800ca1807bb.
---
 .github/CODEOWNERS                            |   1 -
 examples/ui_action_examples/public/plugin.ts  |   2 +-
 examples/ui_actions_explorer/public/app.tsx   |   3 +-
 .../ui_actions_explorer/public/plugin.tsx     |  16 +-
 .../public/overlays/flyout/flyout_service.tsx |   1 -
 src/dev/storybook/aliases.ts                  |   4 +-
 .../public/embeddable/visualize_embeddable.ts |   8 +-
 .../visualize_embeddable_factory.tsx          |  10 +-
 .../public/np_ready/public/mocks.ts           |   5 +-
 .../public/np_ready/public/plugin.ts          |   6 +-
 .../public/actions/replace_panel_action.tsx   |   2 +-
 src/plugins/dashboard/public/plugin.tsx       |   4 +-
 .../public/tests/dashboard_container.test.tsx |   2 +-
 src/plugins/data/public/plugin.ts             |   9 +-
 .../public/lib/actions/edit_panel_action.ts   |   2 +-
 .../public/lib/embeddables/embeddable.tsx     |  73 +-
 .../embeddable_action_storage.test.ts         | 128 ++--
 .../embeddables/embeddable_action_storage.ts  |  53 +-
 .../public/lib/embeddables/i_embeddable.ts    |  16 +-
 .../lib/panel/embeddable_panel.test.tsx       |  14 +-
 .../public/lib/panel/embeddable_panel.tsx     |  38 +-
 .../customize_title/customize_panel_action.ts |   8 +-
 .../panel_actions/inspect_panel_action.ts     |   2 +-
 .../panel_actions/remove_panel_action.ts      |   2 +-
 .../lib/panel/panel_header/panel_header.tsx   |   9 +-
 .../create_state_container_react_helpers.ts   |  69 +-
 .../common/state_containers/types.ts          |   2 +-
 src/plugins/kibana_utils/index.ts             |  20 -
 .../ui_actions/public/actions/action.ts       |  26 +-
 .../action_definition.ts}                     |  47 +-
 .../public/actions/action_factory.ts          |  71 --
 .../actions/action_factory_definition.ts      |  46 --
 .../public/actions/action_internal.test.ts    |  33 -
 .../public/actions/action_internal.ts         |  58 --
 .../public/actions/create_action.ts           |  14 +-
 .../actions/dynamic_action_manager.test.ts    | 646 ------------------
 .../public/actions/dynamic_action_manager.ts  | 284 --------
 .../actions/dynamic_action_manager_state.ts   | 111 ---
 .../public/actions/dynamic_action_storage.ts  | 102 ---
 .../ui_actions/public/actions/index.ts        |   6 -
 .../ui_actions/public/actions/types.ts        |  24 -
 .../build_eui_context_menu_panels.tsx         |  61 +-
 src/plugins/ui_actions/public/index.ts        |  22 +-
 src/plugins/ui_actions/public/mocks.ts        |  18 +-
 src/plugins/ui_actions/public/plugin.ts       |   8 +-
 .../public/service/ui_actions_service.test.ts | 114 +---
 .../public/service/ui_actions_service.ts      | 122 +---
 .../tests/execute_trigger_actions.test.ts     |  10 +-
 .../public/tests/get_trigger_actions.test.ts  |   9 +-
 .../get_trigger_compatible_actions.test.ts    |   6 +-
 .../public/tests/test_samples/index.ts        |   1 -
 .../public/triggers/select_range_trigger.ts   |   2 +-
 .../public/triggers/trigger_internal.ts       |   1 -
 .../public/triggers/value_click_trigger.ts    |   2 +-
 src/plugins/ui_actions/public/types.ts        |   6 +-
 .../ui_actions/public/util/configurable.ts    |  60 --
 src/plugins/ui_actions/public/util/index.ts   |  21 -
 src/plugins/ui_actions/scripts/storybook.js   |  26 -
 .../public/np_ready/public/plugin.tsx         |   3 +-
 .../public/sample_panel_action.tsx            |   3 +-
 .../public/sample_panel_link.ts               |   3 +-
 x-pack/.i18nrc.json                           |   1 -
 .../action_wizard/action_wizard.scss          |   5 +
 .../action_wizard/action_wizard.story.tsx     |  24 +-
 .../action_wizard/action_wizard.test.tsx      |  13 +-
 .../action_wizard/action_wizard.tsx           |  95 +--
 .../public/components/action_wizard/i18n.ts   |   2 +-
 .../public/components/action_wizard/index.ts  |   2 +-
 .../components/action_wizard/test_data.tsx    | 218 +++---
 .../public/custom_time_range_action.tsx       |   2 +-
 .../advanced_ui_actions/public/index.ts       |  14 -
 .../advanced_ui_actions/public/plugin.ts      |  28 +-
 .../action_factory_service/action_factory.ts  |  11 -
 .../action_factory_definition.ts              |  11 -
 .../services/action_factory_service/index.ts  |   8 -
 .../advanced_ui_actions/public/util/index.ts  |  10 -
 x-pack/plugins/dashboard_enhanced/README.md   |   1 -
 x-pack/plugins/dashboard_enhanced/kibana.json |   8 -
 .../public/components/README.md               |   5 -
 .../dashboard_drilldown_config.story.tsx      |  54 --
 .../dashboard_drilldown_config.test.tsx       |  11 -
 .../dashboard_drilldown_config.tsx            |  69 --
 .../dashboard_drilldown_config/i18n.ts        |  14 -
 .../dashboard_drilldown_config/index.ts       |   7 -
 .../public/components/index.ts                |   7 -
 .../dashboard_enhanced/public/index.ts        |  19 -
 .../dashboard_enhanced/public/mocks.ts        |  27 -
 .../dashboard_enhanced/public/plugin.ts       |  50 --
 .../flyout_create_drilldown.test.tsx          | 124 ----
 .../flyout_create_drilldown.tsx               |  74 --
 .../actions/flyout_create_drilldown/index.ts  |  11 -
 .../flyout_edit_drilldown.test.tsx            | 102 ---
 .../flyout_edit_drilldown.tsx                 |  71 --
 .../actions/flyout_edit_drilldown/index.tsx   |  11 -
 .../flyout_edit_drilldown/menu_item.test.tsx  |  37 -
 .../flyout_edit_drilldown/menu_item.tsx       |  30 -
 .../drilldowns/actions/test_helpers.ts        |  28 -
 .../dashboard_drilldowns_services.ts          |  60 --
 .../collect_config.test.tsx                   |   9 -
 .../collect_config.tsx                        |  55 --
 .../constants.ts                              |   7 -
 .../drilldown.test.tsx                        |  20 -
 .../drilldown.tsx                             |  52 --
 .../dashboard_to_dashboard_drilldown/i18n.ts  |  11 -
 .../dashboard_to_dashboard_drilldown/index.ts |  16 -
 .../dashboard_to_dashboard_drilldown/types.ts |  22 -
 .../public/services/drilldowns/index.ts       |   7 -
 .../public/services/index.ts                  |   7 -
 .../dashboard_enhanced/server/config.ts       |  23 -
 .../dashboard_enhanced/server/index.ts        |  12 -
 x-pack/plugins/drilldowns/kibana.json         |   5 +-
 .../actions/flyout_create_drilldown/index.tsx |  52 ++
 .../actions/flyout_edit_drilldown/index.tsx   |  72 ++
 .../public}/actions/index.ts                  |   0
 ...nnected_flyout_manage_drilldowns.story.tsx |  43 --
 ...onnected_flyout_manage_drilldowns.test.tsx | 221 ------
 .../connected_flyout_manage_drilldowns.tsx    | 332 ---------
 .../i18n.ts                                   |  88 ---
 .../index.ts                                  |   7 -
 .../test_data.ts                              |  89 ---
 .../drilldown_hello_bar.story.tsx             |  16 +-
 .../drilldown_hello_bar.tsx                   |  58 +-
 .../components/drilldown_hello_bar/i18n.ts    |  29 -
 .../drilldown_picker.story.tsx}               |  10 +-
 .../drilldown_picker/drilldown_picker.tsx     |  21 +
 .../components/drilldown_picker/index.tsx}    |   2 +-
 .../flyout_create_drilldown.story.tsx         |  24 +
 .../flyout_create_drilldown.tsx               |  34 +
 .../flyout_create_drilldown}/i18n.ts          |   6 +-
 .../flyout_create_drilldown}/index.ts         |   2 +-
 .../flyout_drilldown_wizard.story.tsx         |  70 --
 .../flyout_drilldown_wizard.tsx               | 139 ----
 .../flyout_drilldown_wizard/i18n.ts           |  42 --
 .../flyout_drilldown_wizard/index.ts          |   7 -
 .../flyout_frame/flyout_frame.story.tsx       |   7 -
 .../flyout_frame/flyout_frame.test.tsx        |   4 +-
 .../components/flyout_frame/flyout_frame.tsx  |  31 +-
 .../public/components/flyout_frame/i18n.ts    |   6 +-
 .../flyout_list_manage_drilldowns.story.tsx   |  22 -
 .../flyout_list_manage_drilldowns.tsx         |  46 --
 .../flyout_list_manage_drilldowns/i18n.ts     |  14 -
 .../flyout_list_manage_drilldowns/index.ts    |   7 -
 .../form_create_drilldown.story.tsx           |  34 +
 .../form_create_drilldown.test.tsx}           |  20 +-
 .../form_create_drilldown.tsx                 |  52 ++
 .../i18n.ts                                   |   4 +-
 .../index.tsx                                 |   2 +-
 .../form_drilldown_wizard.story.tsx           |  29 -
 .../form_drilldown_wizard.tsx                 |  79 ---
 .../components/list_manage_drilldowns/i18n.ts |  36 -
 .../list_manage_drilldowns/index.tsx          |   7 -
 .../list_manage_drilldowns.story.tsx          |  19 -
 .../list_manage_drilldowns.test.tsx           |  70 --
 .../list_manage_drilldowns.tsx                | 116 ----
 x-pack/plugins/drilldowns/public/index.ts     |  10 +-
 x-pack/plugins/drilldowns/public/mocks.ts     |  12 +-
 x-pack/plugins/drilldowns/public/plugin.ts    |  54 +-
 .../public/service/drilldown_service.ts       |  32 +
 .../public/{services => service}/index.ts     |   0
 .../public/services/drilldown_service.ts      |  79 ---
 x-pack/plugins/drilldowns/public/types.ts     | 120 ----
 x-pack/plugins/reporting/public/plugin.tsx    |   3 +-
 .../translations/translations/ja-JP.json      |   1 +
 .../translations/translations/zh-CN.json      |   1 +
 164 files changed, 898 insertions(+), 5368 deletions(-)
 delete mode 100644 src/plugins/kibana_utils/index.ts
 rename src/plugins/ui_actions/public/{util/presentable.ts => actions/action_definition.ts} (50%)
 delete mode 100644 src/plugins/ui_actions/public/actions/action_factory.ts
 delete mode 100644 src/plugins/ui_actions/public/actions/action_factory_definition.ts
 delete mode 100644 src/plugins/ui_actions/public/actions/action_internal.test.ts
 delete mode 100644 src/plugins/ui_actions/public/actions/action_internal.ts
 delete mode 100644 src/plugins/ui_actions/public/actions/dynamic_action_manager.test.ts
 delete mode 100644 src/plugins/ui_actions/public/actions/dynamic_action_manager.ts
 delete mode 100644 src/plugins/ui_actions/public/actions/dynamic_action_manager_state.ts
 delete mode 100644 src/plugins/ui_actions/public/actions/dynamic_action_storage.ts
 delete mode 100644 src/plugins/ui_actions/public/actions/types.ts
 delete mode 100644 src/plugins/ui_actions/public/util/configurable.ts
 delete mode 100644 src/plugins/ui_actions/public/util/index.ts
 delete mode 100644 src/plugins/ui_actions/scripts/storybook.js
 delete mode 100644 x-pack/plugins/advanced_ui_actions/public/services/action_factory_service/action_factory.ts
 delete mode 100644 x-pack/plugins/advanced_ui_actions/public/services/action_factory_service/action_factory_definition.ts
 delete mode 100644 x-pack/plugins/advanced_ui_actions/public/services/action_factory_service/index.ts
 delete mode 100644 x-pack/plugins/advanced_ui_actions/public/util/index.ts
 delete mode 100644 x-pack/plugins/dashboard_enhanced/README.md
 delete mode 100644 x-pack/plugins/dashboard_enhanced/kibana.json
 delete mode 100644 x-pack/plugins/dashboard_enhanced/public/components/README.md
 delete mode 100644 x-pack/plugins/dashboard_enhanced/public/components/dashboard_drilldown_config/dashboard_drilldown_config.story.tsx
 delete mode 100644 x-pack/plugins/dashboard_enhanced/public/components/dashboard_drilldown_config/dashboard_drilldown_config.test.tsx
 delete mode 100644 x-pack/plugins/dashboard_enhanced/public/components/dashboard_drilldown_config/dashboard_drilldown_config.tsx
 delete mode 100644 x-pack/plugins/dashboard_enhanced/public/components/dashboard_drilldown_config/i18n.ts
 delete mode 100644 x-pack/plugins/dashboard_enhanced/public/components/dashboard_drilldown_config/index.ts
 delete mode 100644 x-pack/plugins/dashboard_enhanced/public/components/index.ts
 delete mode 100644 x-pack/plugins/dashboard_enhanced/public/index.ts
 delete mode 100644 x-pack/plugins/dashboard_enhanced/public/mocks.ts
 delete mode 100644 x-pack/plugins/dashboard_enhanced/public/plugin.ts
 delete mode 100644 x-pack/plugins/dashboard_enhanced/public/services/drilldowns/actions/flyout_create_drilldown/flyout_create_drilldown.test.tsx
 delete mode 100644 x-pack/plugins/dashboard_enhanced/public/services/drilldowns/actions/flyout_create_drilldown/flyout_create_drilldown.tsx
 delete mode 100644 x-pack/plugins/dashboard_enhanced/public/services/drilldowns/actions/flyout_create_drilldown/index.ts
 delete mode 100644 x-pack/plugins/dashboard_enhanced/public/services/drilldowns/actions/flyout_edit_drilldown/flyout_edit_drilldown.test.tsx
 delete mode 100644 x-pack/plugins/dashboard_enhanced/public/services/drilldowns/actions/flyout_edit_drilldown/flyout_edit_drilldown.tsx
 delete mode 100644 x-pack/plugins/dashboard_enhanced/public/services/drilldowns/actions/flyout_edit_drilldown/index.tsx
 delete mode 100644 x-pack/plugins/dashboard_enhanced/public/services/drilldowns/actions/flyout_edit_drilldown/menu_item.test.tsx
 delete mode 100644 x-pack/plugins/dashboard_enhanced/public/services/drilldowns/actions/flyout_edit_drilldown/menu_item.tsx
 delete mode 100644 x-pack/plugins/dashboard_enhanced/public/services/drilldowns/actions/test_helpers.ts
 delete mode 100644 x-pack/plugins/dashboard_enhanced/public/services/drilldowns/dashboard_drilldowns_services.ts
 delete mode 100644 x-pack/plugins/dashboard_enhanced/public/services/drilldowns/dashboard_to_dashboard_drilldown/collect_config.test.tsx
 delete mode 100644 x-pack/plugins/dashboard_enhanced/public/services/drilldowns/dashboard_to_dashboard_drilldown/collect_config.tsx
 delete mode 100644 x-pack/plugins/dashboard_enhanced/public/services/drilldowns/dashboard_to_dashboard_drilldown/constants.ts
 delete mode 100644 x-pack/plugins/dashboard_enhanced/public/services/drilldowns/dashboard_to_dashboard_drilldown/drilldown.test.tsx
 delete mode 100644 x-pack/plugins/dashboard_enhanced/public/services/drilldowns/dashboard_to_dashboard_drilldown/drilldown.tsx
 delete mode 100644 x-pack/plugins/dashboard_enhanced/public/services/drilldowns/dashboard_to_dashboard_drilldown/i18n.ts
 delete mode 100644 x-pack/plugins/dashboard_enhanced/public/services/drilldowns/dashboard_to_dashboard_drilldown/index.ts
 delete mode 100644 x-pack/plugins/dashboard_enhanced/public/services/drilldowns/dashboard_to_dashboard_drilldown/types.ts
 delete mode 100644 x-pack/plugins/dashboard_enhanced/public/services/drilldowns/index.ts
 delete mode 100644 x-pack/plugins/dashboard_enhanced/public/services/index.ts
 delete mode 100644 x-pack/plugins/dashboard_enhanced/server/config.ts
 delete mode 100644 x-pack/plugins/dashboard_enhanced/server/index.ts
 create mode 100644 x-pack/plugins/drilldowns/public/actions/flyout_create_drilldown/index.tsx
 create mode 100644 x-pack/plugins/drilldowns/public/actions/flyout_edit_drilldown/index.tsx
 rename x-pack/plugins/{dashboard_enhanced/public/services/drilldowns => drilldowns/public}/actions/index.ts (100%)
 delete mode 100644 x-pack/plugins/drilldowns/public/components/connected_flyout_manage_drilldowns/connected_flyout_manage_drilldowns.story.tsx
 delete mode 100644 x-pack/plugins/drilldowns/public/components/connected_flyout_manage_drilldowns/connected_flyout_manage_drilldowns.test.tsx
 delete mode 100644 x-pack/plugins/drilldowns/public/components/connected_flyout_manage_drilldowns/connected_flyout_manage_drilldowns.tsx
 delete mode 100644 x-pack/plugins/drilldowns/public/components/connected_flyout_manage_drilldowns/i18n.ts
 delete mode 100644 x-pack/plugins/drilldowns/public/components/connected_flyout_manage_drilldowns/index.ts
 delete mode 100644 x-pack/plugins/drilldowns/public/components/connected_flyout_manage_drilldowns/test_data.ts
 delete mode 100644 x-pack/plugins/drilldowns/public/components/drilldown_hello_bar/i18n.ts
 rename x-pack/plugins/{dashboard_enhanced/scripts/storybook.js => drilldowns/public/components/drilldown_picker/drilldown_picker.story.tsx} (53%)
 create mode 100644 x-pack/plugins/drilldowns/public/components/drilldown_picker/drilldown_picker.tsx
 rename x-pack/plugins/{advanced_ui_actions/public/components/index.ts => drilldowns/public/components/drilldown_picker/index.tsx} (87%)
 create mode 100644 x-pack/plugins/drilldowns/public/components/flyout_create_drilldown/flyout_create_drilldown.story.tsx
 create mode 100644 x-pack/plugins/drilldowns/public/components/flyout_create_drilldown/flyout_create_drilldown.tsx
 rename x-pack/plugins/{dashboard_enhanced/public/services/drilldowns/actions/flyout_edit_drilldown => drilldowns/public/components/flyout_create_drilldown}/i18n.ts (64%)
 rename x-pack/plugins/{advanced_ui_actions/public/services => drilldowns/public/components/flyout_create_drilldown}/index.ts (84%)
 delete mode 100644 x-pack/plugins/drilldowns/public/components/flyout_drilldown_wizard/flyout_drilldown_wizard.story.tsx
 delete mode 100644 x-pack/plugins/drilldowns/public/components/flyout_drilldown_wizard/flyout_drilldown_wizard.tsx
 delete mode 100644 x-pack/plugins/drilldowns/public/components/flyout_drilldown_wizard/i18n.ts
 delete mode 100644 x-pack/plugins/drilldowns/public/components/flyout_drilldown_wizard/index.ts
 delete mode 100644 x-pack/plugins/drilldowns/public/components/flyout_list_manage_drilldowns/flyout_list_manage_drilldowns.story.tsx
 delete mode 100644 x-pack/plugins/drilldowns/public/components/flyout_list_manage_drilldowns/flyout_list_manage_drilldowns.tsx
 delete mode 100644 x-pack/plugins/drilldowns/public/components/flyout_list_manage_drilldowns/i18n.ts
 delete mode 100644 x-pack/plugins/drilldowns/public/components/flyout_list_manage_drilldowns/index.ts
 create mode 100644 x-pack/plugins/drilldowns/public/components/form_create_drilldown/form_create_drilldown.story.tsx
 rename x-pack/plugins/drilldowns/public/components/{form_drilldown_wizard/form_drilldown_wizard.test.tsx => form_create_drilldown/form_create_drilldown.test.tsx} (70%)
 create mode 100644 x-pack/plugins/drilldowns/public/components/form_create_drilldown/form_create_drilldown.tsx
 rename x-pack/plugins/drilldowns/public/components/{form_drilldown_wizard => form_create_drilldown}/i18n.ts (89%)
 rename x-pack/plugins/drilldowns/public/components/{form_drilldown_wizard => form_create_drilldown}/index.tsx (85%)
 delete mode 100644 x-pack/plugins/drilldowns/public/components/form_drilldown_wizard/form_drilldown_wizard.story.tsx
 delete mode 100644 x-pack/plugins/drilldowns/public/components/form_drilldown_wizard/form_drilldown_wizard.tsx
 delete mode 100644 x-pack/plugins/drilldowns/public/components/list_manage_drilldowns/i18n.ts
 delete mode 100644 x-pack/plugins/drilldowns/public/components/list_manage_drilldowns/index.tsx
 delete mode 100644 x-pack/plugins/drilldowns/public/components/list_manage_drilldowns/list_manage_drilldowns.story.tsx
 delete mode 100644 x-pack/plugins/drilldowns/public/components/list_manage_drilldowns/list_manage_drilldowns.test.tsx
 delete mode 100644 x-pack/plugins/drilldowns/public/components/list_manage_drilldowns/list_manage_drilldowns.tsx
 create mode 100644 x-pack/plugins/drilldowns/public/service/drilldown_service.ts
 rename x-pack/plugins/drilldowns/public/{services => service}/index.ts (100%)
 delete mode 100644 x-pack/plugins/drilldowns/public/services/drilldown_service.ts
 delete mode 100644 x-pack/plugins/drilldowns/public/types.ts

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 6519bf9c493f9..f9f43b804fc92 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -3,7 +3,6 @@
 # For more info, see https://help.github.com/articles/about-codeowners/
 
 # App
-/x-pack/legacy/plugins/dashboard_enhanced/ @elastic/kibana-app
 /x-pack/legacy/plugins/lens/ @elastic/kibana-app
 /x-pack/legacy/plugins/graph/ @elastic/kibana-app
 /src/legacy/server/url_shortening/ @elastic/kibana-app
diff --git a/examples/ui_action_examples/public/plugin.ts b/examples/ui_action_examples/public/plugin.ts
index d053f7e82862c..c47746d4b3fd6 100644
--- a/examples/ui_action_examples/public/plugin.ts
+++ b/examples/ui_action_examples/public/plugin.ts
@@ -46,7 +46,7 @@ export class UiActionExamplesPlugin
     }));
 
     uiActions.registerAction(helloWorldAction);
-    uiActions.addTriggerAction(helloWorldTrigger.id, helloWorldAction);
+    uiActions.attachAction(helloWorldTrigger.id, helloWorldAction);
   }
 
   public start() {}
diff --git a/examples/ui_actions_explorer/public/app.tsx b/examples/ui_actions_explorer/public/app.tsx
index f08b8bb29bdd3..462f5c3bf88ba 100644
--- a/examples/ui_actions_explorer/public/app.tsx
+++ b/examples/ui_actions_explorer/public/app.tsx
@@ -95,7 +95,8 @@ const ActionsExplorer = ({ uiActionsApi, openModal }: Props) => {
                       );
                     },
                   });
-                  uiActionsApi.addTriggerAction(HELLO_WORLD_TRIGGER_ID, dynamicAction);
+                  uiActionsApi.registerAction(dynamicAction);
+                  uiActionsApi.attachAction(HELLO_WORLD_TRIGGER_ID, dynamicAction);
                   setConfirmationText(
                     `You've successfully added a new action: ${dynamicAction.getDisplayName(
                       {}
diff --git a/examples/ui_actions_explorer/public/plugin.tsx b/examples/ui_actions_explorer/public/plugin.tsx
index de86b51aee3a8..f1895905a45e1 100644
--- a/examples/ui_actions_explorer/public/plugin.tsx
+++ b/examples/ui_actions_explorer/public/plugin.tsx
@@ -79,21 +79,21 @@ export class UiActionsExplorerPlugin implements Plugin<void, void, {}, StartDeps
 
     const startServices = core.getStartServices();
 
-    deps.uiActions.addTriggerAction(
+    deps.uiActions.attachAction(
       USER_TRIGGER,
       createPhoneUserAction(async () => (await startServices)[1].uiActions)
     );
-    deps.uiActions.addTriggerAction(
+    deps.uiActions.attachAction(
       USER_TRIGGER,
       createEditUserAction(async () => (await startServices)[0].overlays.openModal)
     );
 
-    deps.uiActions.addTriggerAction(COUNTRY_TRIGGER, viewInMapsAction);
-    deps.uiActions.addTriggerAction(COUNTRY_TRIGGER, lookUpWeatherAction);
-    deps.uiActions.addTriggerAction(COUNTRY_TRIGGER, showcasePluggability);
-    deps.uiActions.addTriggerAction(PHONE_TRIGGER, makePhoneCallAction);
-    deps.uiActions.addTriggerAction(PHONE_TRIGGER, showcasePluggability);
-    deps.uiActions.addTriggerAction(USER_TRIGGER, showcasePluggability);
+    deps.uiActions.attachAction(COUNTRY_TRIGGER, viewInMapsAction);
+    deps.uiActions.attachAction(COUNTRY_TRIGGER, lookUpWeatherAction);
+    deps.uiActions.attachAction(COUNTRY_TRIGGER, showcasePluggability);
+    deps.uiActions.attachAction(PHONE_TRIGGER, makePhoneCallAction);
+    deps.uiActions.attachAction(PHONE_TRIGGER, showcasePluggability);
+    deps.uiActions.attachAction(USER_TRIGGER, showcasePluggability);
 
     core.application.register({
       id: 'uiActionsExplorer',
diff --git a/src/core/public/overlays/flyout/flyout_service.tsx b/src/core/public/overlays/flyout/flyout_service.tsx
index 444430175d4f2..b609b2ce1d741 100644
--- a/src/core/public/overlays/flyout/flyout_service.tsx
+++ b/src/core/public/overlays/flyout/flyout_service.tsx
@@ -91,7 +91,6 @@ export interface OverlayFlyoutStart {
 export interface OverlayFlyoutOpenOptions {
   className?: string;
   closeButtonAriaLabel?: string;
-  ownFocus?: boolean;
   'data-test-subj'?: string;
 }
 
diff --git a/src/dev/storybook/aliases.ts b/src/dev/storybook/aliases.ts
index 370abc120d475..8ed64f004c9be 100644
--- a/src/dev/storybook/aliases.ts
+++ b/src/dev/storybook/aliases.ts
@@ -18,14 +18,12 @@
  */
 
 export const storybookAliases = {
-  advanced_ui_actions: 'x-pack/plugins/advanced_ui_actions/scripts/storybook.js',
   apm: 'x-pack/legacy/plugins/apm/scripts/storybook.js',
   canvas: 'x-pack/legacy/plugins/canvas/scripts/storybook_new.js',
   codeeditor: 'src/plugins/kibana_react/public/code_editor/scripts/storybook.ts',
-  dashboard_enhanced: 'x-pack/plugins/dashboard_enhanced/scripts/storybook.js',
   drilldowns: 'x-pack/plugins/drilldowns/scripts/storybook.js',
   embeddable: 'src/plugins/embeddable/scripts/storybook.js',
   infra: 'x-pack/legacy/plugins/infra/scripts/storybook.js',
   siem: 'x-pack/legacy/plugins/siem/scripts/storybook.js',
-  ui_actions: 'src/plugins/ui_actions/scripts/storybook.js',
+  ui_actions: 'x-pack/plugins/advanced_ui_actions/scripts/storybook.js',
 };
diff --git a/src/legacy/core_plugins/visualizations/public/np_ready/public/embeddable/visualize_embeddable.ts b/src/legacy/core_plugins/visualizations/public/np_ready/public/embeddable/visualize_embeddable.ts
index 4b21be83f1722..342824bade3dd 100644
--- a/src/legacy/core_plugins/visualizations/public/np_ready/public/embeddable/visualize_embeddable.ts
+++ b/src/legacy/core_plugins/visualizations/public/np_ready/public/embeddable/visualize_embeddable.ts
@@ -45,7 +45,6 @@ import { PersistedState } from '../../../../../../../plugins/visualizations/publ
 import { buildPipeline } from '../legacy/build_pipeline';
 import { Vis } from '../vis';
 import { getExpressions, getUiActions } from '../services';
-import { VisualizationsStartDeps } from '../plugin';
 import { VIS_EVENT_TO_TRIGGER } from './events';
 
 const getKeys = <T extends {}>(o: T): Array<keyof T> => Object.keys(o) as Array<keyof T>;
@@ -57,7 +56,6 @@ export interface VisualizeEmbeddableConfiguration {
   editable: boolean;
   appState?: { save(): void };
   uiState?: PersistedState;
-  uiActions?: VisualizationsStartDeps['uiActions'];
 }
 
 export interface VisualizeInput extends EmbeddableInput {
@@ -96,7 +94,7 @@ export class VisualizeEmbeddable extends Embeddable<VisualizeInput, VisualizeOut
 
   constructor(
     timefilter: TimefilterContract,
-    { vis, editUrl, indexPatterns, editable, uiActions }: VisualizeEmbeddableConfiguration,
+    { vis, editUrl, indexPatterns, editable }: VisualizeEmbeddableConfiguration,
     initialInput: VisualizeInput,
     parent?: Container
   ) {
@@ -109,8 +107,7 @@ export class VisualizeEmbeddable extends Embeddable<VisualizeInput, VisualizeOut
         editable,
         visTypeName: vis.type.name,
       },
-      parent,
-      { uiActions }
+      parent
     );
     this.timefilter = timefilter;
     this.vis = vis;
@@ -268,7 +265,6 @@ export class VisualizeEmbeddable extends Embeddable<VisualizeInput, VisualizeOut
             timeFieldName: this.vis.data.indexPattern!.timeFieldName!,
             data: event.data,
           };
-
           getUiActions()
             .getTrigger(triggerId)
             .exec(context);
diff --git a/src/legacy/core_plugins/visualizations/public/np_ready/public/embeddable/visualize_embeddable_factory.tsx b/src/legacy/core_plugins/visualizations/public/np_ready/public/embeddable/visualize_embeddable_factory.tsx
index 0fd1352f203db..911f5530e97e3 100644
--- a/src/legacy/core_plugins/visualizations/public/np_ready/public/embeddable/visualize_embeddable_factory.tsx
+++ b/src/legacy/core_plugins/visualizations/public/np_ready/public/embeddable/visualize_embeddable_factory.tsx
@@ -38,7 +38,6 @@ import {
   getTimeFilter,
 } from '../services';
 import { showNewVisModal } from '../wizard';
-import { VisualizationsStartDeps } from '../plugin';
 import { convertToSerializedVis } from '../saved_visualizations/_saved_vis';
 
 interface VisualizationAttributes extends SavedObjectAttributes {
@@ -53,11 +52,7 @@ export class VisualizeEmbeddableFactory extends EmbeddableFactory<
 > {
   public readonly type = VISUALIZE_EMBEDDABLE_TYPE;
 
-  constructor(
-    private readonly getUiActions: () => Promise<
-      Pick<VisualizationsStartDeps, 'uiActions'>['uiActions']
-    >
-  ) {
+  constructor() {
     super({
       savedObjectMetaData: {
         name: i18n.translate('visualizations.savedObjectName', { defaultMessage: 'Visualization' }),
@@ -119,8 +114,6 @@ export class VisualizeEmbeddableFactory extends EmbeddableFactory<
 
       const indexPattern = vis.data.indexPattern;
       const indexPatterns = indexPattern ? [indexPattern] : [];
-      const uiActions = await this.getUiActions();
-
       const editable = await this.isEditable();
       return new VisualizeEmbeddable(
         getTimeFilter(),
@@ -131,7 +124,6 @@ export class VisualizeEmbeddableFactory extends EmbeddableFactory<
           editable,
           appState: input.appState,
           uiState: input.uiState,
-          uiActions,
         },
         input,
         parent
diff --git a/src/legacy/core_plugins/visualizations/public/np_ready/public/mocks.ts b/src/legacy/core_plugins/visualizations/public/np_ready/public/mocks.ts
index dcd11c920f17c..17f777e4e80e1 100644
--- a/src/legacy/core_plugins/visualizations/public/np_ready/public/mocks.ts
+++ b/src/legacy/core_plugins/visualizations/public/np_ready/public/mocks.ts
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { CoreSetup, PluginInitializerContext } from '../../../../../../core/public';
+import { PluginInitializerContext } from '../../../../../../core/public';
 import { VisualizationsSetup, VisualizationsStart } from './';
 import { VisualizationsPlugin } from './plugin';
 import { coreMock } from '../../../../../../core/public/mocks';
@@ -26,7 +26,6 @@ import { expressionsPluginMock } from '../../../../../../plugins/expressions/pub
 import { dataPluginMock } from '../../../../../../plugins/data/public/mocks';
 import { usageCollectionPluginMock } from '../../../../../../plugins/usage_collection/public/mocks';
 import { uiActionsPluginMock } from '../../../../../../plugins/ui_actions/public/mocks';
-import { VisualizationsStartDeps } from './plugin';
 
 const createSetupContract = (): VisualizationsSetup => ({
   createBaseVisualization: jest.fn(),
@@ -49,7 +48,7 @@ const createStartContract = (): VisualizationsStart => ({
 const createInstance = async () => {
   const plugin = new VisualizationsPlugin({} as PluginInitializerContext);
 
-  const setup = plugin.setup(coreMock.createSetup() as CoreSetup<VisualizationsStartDeps>, {
+  const setup = plugin.setup(coreMock.createSetup(), {
     data: dataPluginMock.createSetupContract(),
     expressions: expressionsPluginMock.createSetupContract(),
     embeddable: embeddablePluginMock.createSetupContract(),
diff --git a/src/legacy/core_plugins/visualizations/public/np_ready/public/plugin.ts b/src/legacy/core_plugins/visualizations/public/np_ready/public/plugin.ts
index c826841e2bcf3..3ade6cee0d4d2 100644
--- a/src/legacy/core_plugins/visualizations/public/np_ready/public/plugin.ts
+++ b/src/legacy/core_plugins/visualizations/public/np_ready/public/plugin.ts
@@ -111,7 +111,7 @@ export class VisualizationsPlugin
   constructor(initializerContext: PluginInitializerContext) {}
 
   public setup(
-    core: CoreSetup<VisualizationsStartDeps>,
+    core: CoreSetup,
     { expressions, embeddable, usageCollection, data }: VisualizationsSetupDeps
   ): VisualizationsSetup {
     setUISettings(core.uiSettings);
@@ -120,9 +120,7 @@ export class VisualizationsPlugin
     expressions.registerFunction(visualizationFunction);
     expressions.registerRenderer(visualizationRenderer);
 
-    const embeddableFactory = new VisualizeEmbeddableFactory(
-      async () => (await core.getStartServices())[1].uiActions
-    );
+    const embeddableFactory = new VisualizeEmbeddableFactory();
     embeddable.registerEmbeddableFactory(VISUALIZE_EMBEDDABLE_TYPE, embeddableFactory);
 
     return {
diff --git a/src/plugins/dashboard/public/actions/replace_panel_action.tsx b/src/plugins/dashboard/public/actions/replace_panel_action.tsx
index 4e20aa3c35088..21ec961917d17 100644
--- a/src/plugins/dashboard/public/actions/replace_panel_action.tsx
+++ b/src/plugins/dashboard/public/actions/replace_panel_action.tsx
@@ -37,7 +37,7 @@ export interface ReplacePanelActionContext {
 export class ReplacePanelAction implements ActionByType<typeof ACTION_REPLACE_PANEL> {
   public readonly type = ACTION_REPLACE_PANEL;
   public readonly id = ACTION_REPLACE_PANEL;
-  public order = 3;
+  public order = 11;
 
   constructor(
     private core: CoreStart,
diff --git a/src/plugins/dashboard/public/plugin.tsx b/src/plugins/dashboard/public/plugin.tsx
index 3d67435e6d8f7..df3c312c7ae1b 100644
--- a/src/plugins/dashboard/public/plugin.tsx
+++ b/src/plugins/dashboard/public/plugin.tsx
@@ -87,7 +87,7 @@ export class DashboardEmbeddableContainerPublicPlugin
   ): Setup {
     const expandPanelAction = new ExpandPanelAction();
     uiActions.registerAction(expandPanelAction);
-    uiActions.attachAction(CONTEXT_MENU_TRIGGER, expandPanelAction.id);
+    uiActions.attachAction(CONTEXT_MENU_TRIGGER, expandPanelAction);
     const startServices = core.getStartServices();
 
     if (share) {
@@ -146,7 +146,7 @@ export class DashboardEmbeddableContainerPublicPlugin
       plugins.embeddable.getEmbeddableFactories
     );
     uiActions.registerAction(changeViewAction);
-    uiActions.addTriggerAction(CONTEXT_MENU_TRIGGER, changeViewAction);
+    uiActions.attachAction(CONTEXT_MENU_TRIGGER, changeViewAction);
     const savedDashboardLoader = createSavedDashboardLoader({
       savedObjectsClient: core.savedObjects.client,
       indexPatterns,
diff --git a/src/plugins/dashboard/public/tests/dashboard_container.test.tsx b/src/plugins/dashboard/public/tests/dashboard_container.test.tsx
index 4aede3f3442fb..a81d80b440e04 100644
--- a/src/plugins/dashboard/public/tests/dashboard_container.test.tsx
+++ b/src/plugins/dashboard/public/tests/dashboard_container.test.tsx
@@ -49,7 +49,7 @@ test('DashboardContainer in edit mode shows edit mode actions', async () => {
 
   const editModeAction = createEditModeAction();
   uiActionsSetup.registerAction(editModeAction);
-  uiActionsSetup.addTriggerAction(CONTEXT_MENU_TRIGGER, editModeAction);
+  uiActionsSetup.attachAction(CONTEXT_MENU_TRIGGER, editModeAction);
   setup.registerEmbeddableFactory(
     CONTACT_CARD_EMBEDDABLE,
     new ContactCardEmbeddableFactory({} as any, (() => null) as any, {} as any)
diff --git a/src/plugins/data/public/plugin.ts b/src/plugins/data/public/plugin.ts
index ea2e85947aa12..fc5dde94fa851 100644
--- a/src/plugins/data/public/plugin.ts
+++ b/src/plugins/data/public/plugin.ts
@@ -109,12 +109,12 @@ export class DataPublicPlugin implements Plugin<DataPublicPluginSetup, DataPubli
       createFilterAction(queryService.filterManager, queryService.timefilter.timefilter)
     );
 
-    uiActions.addTriggerAction(
+    uiActions.attachAction(
       SELECT_RANGE_TRIGGER,
       selectRangeAction(queryService.filterManager, queryService.timefilter.timefilter)
     );
 
-    uiActions.addTriggerAction(
+    uiActions.attachAction(
       VALUE_CLICK_TRIGGER,
       valueClickAction(queryService.filterManager, queryService.timefilter.timefilter)
     );
@@ -146,10 +146,7 @@ export class DataPublicPlugin implements Plugin<DataPublicPluginSetup, DataPubli
     const search = this.searchService.start(core);
     setSearchService(search);
 
-    uiActions.addTriggerAction(
-      APPLY_FILTER_TRIGGER,
-      uiActions.getAction(ACTION_GLOBAL_APPLY_FILTER)
-    );
+    uiActions.attachAction(APPLY_FILTER_TRIGGER, uiActions.getAction(ACTION_GLOBAL_APPLY_FILTER));
 
     const dataServices = {
       actions: {
diff --git a/src/plugins/embeddable/public/lib/actions/edit_panel_action.ts b/src/plugins/embeddable/public/lib/actions/edit_panel_action.ts
index d37cba6f897c8..9125dc0813f98 100644
--- a/src/plugins/embeddable/public/lib/actions/edit_panel_action.ts
+++ b/src/plugins/embeddable/public/lib/actions/edit_panel_action.ts
@@ -33,7 +33,7 @@ interface ActionContext {
 export class EditPanelAction implements Action<ActionContext> {
   public readonly type = ACTION_EDIT_PANEL;
   public readonly id = ACTION_EDIT_PANEL;
-  public order = 50;
+  public order = 15;
 
   constructor(private readonly getEmbeddableFactory: EmbeddableStart['getEmbeddableFactory']) {}
 
diff --git a/src/plugins/embeddable/public/lib/embeddables/embeddable.tsx b/src/plugins/embeddable/public/lib/embeddables/embeddable.tsx
index 35973cc16cf9b..eb10c16806640 100644
--- a/src/plugins/embeddable/public/lib/embeddables/embeddable.tsx
+++ b/src/plugins/embeddable/public/lib/embeddables/embeddable.tsx
@@ -16,35 +16,23 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { cloneDeep, isEqual } from 'lodash';
+import { isEqual, cloneDeep } from 'lodash';
 import * as Rx from 'rxjs';
-import { Adapters, ViewMode } from '../types';
+import { Adapters } from '../types';
 import { IContainer } from '../containers';
-import { EmbeddableInput, EmbeddableOutput, IEmbeddable } from './i_embeddable';
+import { IEmbeddable, EmbeddableInput, EmbeddableOutput } from './i_embeddable';
+import { ViewMode } from '../types';
 import { TriggerContextMapping } from '../ui_actions';
 import { EmbeddableActionStorage } from './embeddable_action_storage';
-import {
-  UiActionsDynamicActionManager,
-  UiActionsStart,
-} from '../../../../../plugins/ui_actions/public';
-import { EmbeddableContext } from '../triggers';
 
 function getPanelTitle(input: EmbeddableInput, output: EmbeddableOutput) {
   return input.hidePanelTitles ? '' : input.title === undefined ? output.defaultTitle : input.title;
 }
 
-export interface EmbeddableParams {
-  uiActions?: UiActionsStart;
-}
-
 export abstract class Embeddable<
   TEmbeddableInput extends EmbeddableInput = EmbeddableInput,
   TEmbeddableOutput extends EmbeddableOutput = EmbeddableOutput
 > implements IEmbeddable<TEmbeddableInput, TEmbeddableOutput> {
-  static runtimeId: number = 0;
-
-  public readonly runtimeId = Embeddable.runtimeId++;
-
   public readonly parent?: IContainer;
   public readonly isContainer: boolean = false;
   public abstract readonly type: string;
@@ -60,34 +48,15 @@ export abstract class Embeddable<
   // to update input when the parent changes.
   private parentSubscription?: Rx.Subscription;
 
-  private storageSubscription?: Rx.Subscription;
-
   // TODO: Rename to destroyed.
   private destoyed: boolean = false;
 
-  private storage = new EmbeddableActionStorage((this as unknown) as Embeddable);
-
-  private cachedDynamicActions?: UiActionsDynamicActionManager;
-  public get dynamicActions(): UiActionsDynamicActionManager | undefined {
-    if (!this.params.uiActions) return undefined;
-    if (!this.cachedDynamicActions) {
-      this.cachedDynamicActions = new UiActionsDynamicActionManager({
-        isCompatible: async (context: unknown) =>
-          (context as EmbeddableContext).embeddable.runtimeId === this.runtimeId,
-        storage: this.storage,
-        uiActions: this.params.uiActions,
-      });
-    }
-
-    return this.cachedDynamicActions;
+  private __actionStorage?: EmbeddableActionStorage;
+  public get actionStorage(): EmbeddableActionStorage {
+    return this.__actionStorage || (this.__actionStorage = new EmbeddableActionStorage(this));
   }
 
-  constructor(
-    input: TEmbeddableInput,
-    output: TEmbeddableOutput,
-    parent?: IContainer,
-    public readonly params: EmbeddableParams = {}
-  ) {
+  constructor(input: TEmbeddableInput, output: TEmbeddableOutput, parent?: IContainer) {
     this.id = input.id;
     this.output = {
       title: getPanelTitle(input, output),
@@ -111,18 +80,6 @@ export abstract class Embeddable<
         this.onResetInput(newInput);
       });
     }
-
-    if (this.dynamicActions) {
-      this.dynamicActions.start().catch(error => {
-        /* eslint-disable */
-        console.log('Failed to start embeddable dynamic actions', this);
-        console.error(error);
-        /* eslint-enable */
-      });
-      this.storageSubscription = this.input$.subscribe(() => {
-        this.storage.reload$.next();
-      });
-    }
   }
 
   public getIsContainer(): this is IContainer {
@@ -201,20 +158,6 @@ export abstract class Embeddable<
    */
   public destroy(): void {
     this.destoyed = true;
-
-    if (this.dynamicActions) {
-      this.dynamicActions.stop().catch(error => {
-        /* eslint-disable */
-        console.log('Failed to stop embeddable dynamic actions', this);
-        console.error(error);
-        /* eslint-enable */
-      });
-    }
-
-    if (this.storageSubscription) {
-      this.storageSubscription.unsubscribe();
-    }
-
     if (this.parentSubscription) {
       this.parentSubscription.unsubscribe();
     }
diff --git a/src/plugins/embeddable/public/lib/embeddables/embeddable_action_storage.test.ts b/src/plugins/embeddable/public/lib/embeddables/embeddable_action_storage.test.ts
index 83fd3f184e098..56facc37fc666 100644
--- a/src/plugins/embeddable/public/lib/embeddables/embeddable_action_storage.test.ts
+++ b/src/plugins/embeddable/public/lib/embeddables/embeddable_action_storage.test.ts
@@ -20,8 +20,7 @@
 import { Embeddable } from './embeddable';
 import { EmbeddableInput } from './i_embeddable';
 import { ViewMode } from '../types';
-import { EmbeddableActionStorage } from './embeddable_action_storage';
-import { UiActionsSerializedEvent } from '../../../../ui_actions/public';
+import { EmbeddableActionStorage, SerializedEvent } from './embeddable_action_storage';
 import { of } from '../../../../kibana_utils/common';
 
 class TestEmbeddable extends Embeddable<EmbeddableInput> {
@@ -43,9 +42,9 @@ describe('EmbeddableActionStorage', () => {
     test('can add event to embeddable', async () => {
       const embeddable = new TestEmbeddable();
       const storage = new EmbeddableActionStorage(embeddable);
-      const event: UiActionsSerializedEvent = {
+      const event: SerializedEvent = {
         eventId: 'EVENT_ID',
-        triggers: ['TRIGGER-ID'],
+        triggerId: 'TRIGGER-ID',
         action: {} as any,
       };
 
@@ -58,40 +57,23 @@ describe('EmbeddableActionStorage', () => {
       expect(events2).toEqual([event]);
     });
 
-    test('does not merge .getInput() into .updateInput()', async () => {
-      const embeddable = new TestEmbeddable();
-      const storage = new EmbeddableActionStorage(embeddable);
-      const event: UiActionsSerializedEvent = {
-        eventId: 'EVENT_ID',
-        triggers: ['TRIGGER-ID'],
-        action: {} as any,
-      };
-
-      const spy = jest.spyOn(embeddable, 'updateInput');
-
-      await storage.create(event);
-
-      expect(spy.mock.calls[0][0].id).toBe(undefined);
-      expect(spy.mock.calls[0][0].viewMode).toBe(undefined);
-    });
-
     test('can create multiple events', async () => {
       const embeddable = new TestEmbeddable();
       const storage = new EmbeddableActionStorage(embeddable);
 
-      const event1: UiActionsSerializedEvent = {
+      const event1: SerializedEvent = {
         eventId: 'EVENT_ID1',
-        triggers: ['TRIGGER-ID'],
+        triggerId: 'TRIGGER-ID',
         action: {} as any,
       };
-      const event2: UiActionsSerializedEvent = {
+      const event2: SerializedEvent = {
         eventId: 'EVENT_ID2',
-        triggers: ['TRIGGER-ID'],
+        triggerId: 'TRIGGER-ID',
         action: {} as any,
       };
-      const event3: UiActionsSerializedEvent = {
+      const event3: SerializedEvent = {
         eventId: 'EVENT_ID3',
-        triggers: ['TRIGGER-ID'],
+        triggerId: 'TRIGGER-ID',
         action: {} as any,
       };
 
@@ -113,9 +95,9 @@ describe('EmbeddableActionStorage', () => {
     test('throws when creating an event with the same ID', async () => {
       const embeddable = new TestEmbeddable();
       const storage = new EmbeddableActionStorage(embeddable);
-      const event: UiActionsSerializedEvent = {
+      const event: SerializedEvent = {
         eventId: 'EVENT_ID',
-        triggers: ['TRIGGER-ID'],
+        triggerId: 'TRIGGER-ID',
         action: {} as any,
       };
 
@@ -140,16 +122,16 @@ describe('EmbeddableActionStorage', () => {
       const embeddable = new TestEmbeddable();
       const storage = new EmbeddableActionStorage(embeddable);
 
-      const event1: UiActionsSerializedEvent = {
+      const event1: SerializedEvent = {
         eventId: 'EVENT_ID',
-        triggers: ['TRIGGER-ID'],
+        triggerId: 'TRIGGER-ID',
         action: {
           name: 'foo',
         } as any,
       };
-      const event2: UiActionsSerializedEvent = {
+      const event2: SerializedEvent = {
         eventId: 'EVENT_ID',
-        triggers: ['TRIGGER-ID'],
+        triggerId: 'TRIGGER-ID',
         action: {
           name: 'bar',
         } as any,
@@ -166,30 +148,30 @@ describe('EmbeddableActionStorage', () => {
       const embeddable = new TestEmbeddable();
       const storage = new EmbeddableActionStorage(embeddable);
 
-      const event1: UiActionsSerializedEvent = {
+      const event1: SerializedEvent = {
         eventId: 'EVENT_ID1',
-        triggers: ['TRIGGER-ID'],
+        triggerId: 'TRIGGER-ID',
         action: {
           name: 'foo',
         } as any,
       };
-      const event2: UiActionsSerializedEvent = {
+      const event2: SerializedEvent = {
         eventId: 'EVENT_ID2',
-        triggers: ['TRIGGER-ID'],
+        triggerId: 'TRIGGER-ID',
         action: {
           name: 'bar',
         } as any,
       };
-      const event22: UiActionsSerializedEvent = {
+      const event22: SerializedEvent = {
         eventId: 'EVENT_ID2',
-        triggers: ['TRIGGER-ID'],
+        triggerId: 'TRIGGER-ID',
         action: {
           name: 'baz',
         } as any,
       };
-      const event3: UiActionsSerializedEvent = {
+      const event3: SerializedEvent = {
         eventId: 'EVENT_ID3',
-        triggers: ['TRIGGER-ID'],
+        triggerId: 'TRIGGER-ID',
         action: {
           name: 'qux',
         } as any,
@@ -217,9 +199,9 @@ describe('EmbeddableActionStorage', () => {
       const embeddable = new TestEmbeddable();
       const storage = new EmbeddableActionStorage(embeddable);
 
-      const event: UiActionsSerializedEvent = {
+      const event: SerializedEvent = {
         eventId: 'EVENT_ID',
-        triggers: ['TRIGGER-ID'],
+        triggerId: 'TRIGGER-ID',
         action: {} as any,
       };
 
@@ -235,14 +217,14 @@ describe('EmbeddableActionStorage', () => {
       const embeddable = new TestEmbeddable();
       const storage = new EmbeddableActionStorage(embeddable);
 
-      const event1: UiActionsSerializedEvent = {
+      const event1: SerializedEvent = {
         eventId: 'EVENT_ID1',
-        triggers: ['TRIGGER-ID'],
+        triggerId: 'TRIGGER-ID',
         action: {} as any,
       };
-      const event2: UiActionsSerializedEvent = {
+      const event2: SerializedEvent = {
         eventId: 'EVENT_ID2',
-        triggers: ['TRIGGER-ID'],
+        triggerId: 'TRIGGER-ID',
         action: {} as any,
       };
 
@@ -267,9 +249,9 @@ describe('EmbeddableActionStorage', () => {
       const embeddable = new TestEmbeddable();
       const storage = new EmbeddableActionStorage(embeddable);
 
-      const event: UiActionsSerializedEvent = {
+      const event: SerializedEvent = {
         eventId: 'EVENT_ID',
-        triggers: ['TRIGGER-ID'],
+        triggerId: 'TRIGGER-ID',
         action: {} as any,
       };
 
@@ -284,23 +266,23 @@ describe('EmbeddableActionStorage', () => {
       const embeddable = new TestEmbeddable();
       const storage = new EmbeddableActionStorage(embeddable);
 
-      const event1: UiActionsSerializedEvent = {
+      const event1: SerializedEvent = {
         eventId: 'EVENT_ID1',
-        triggers: ['TRIGGER-ID'],
+        triggerId: 'TRIGGER-ID',
         action: {
           name: 'foo',
         } as any,
       };
-      const event2: UiActionsSerializedEvent = {
+      const event2: SerializedEvent = {
         eventId: 'EVENT_ID2',
-        triggers: ['TRIGGER-ID'],
+        triggerId: 'TRIGGER-ID',
         action: {
           name: 'bar',
         } as any,
       };
-      const event3: UiActionsSerializedEvent = {
+      const event3: SerializedEvent = {
         eventId: 'EVENT_ID3',
-        triggers: ['TRIGGER-ID'],
+        triggerId: 'TRIGGER-ID',
         action: {
           name: 'qux',
         } as any,
@@ -345,9 +327,9 @@ describe('EmbeddableActionStorage', () => {
       const embeddable = new TestEmbeddable();
       const storage = new EmbeddableActionStorage(embeddable);
 
-      const event: UiActionsSerializedEvent = {
+      const event: SerializedEvent = {
         eventId: 'EVENT_ID',
-        triggers: ['TRIGGER-ID'],
+        triggerId: 'TRIGGER-ID',
         action: {} as any,
       };
 
@@ -373,9 +355,9 @@ describe('EmbeddableActionStorage', () => {
       const embeddable = new TestEmbeddable();
       const storage = new EmbeddableActionStorage(embeddable);
 
-      const event: UiActionsSerializedEvent = {
+      const event: SerializedEvent = {
         eventId: 'EVENT_ID',
-        triggers: ['TRIGGER-ID'],
+        triggerId: 'TRIGGER-ID',
         action: {} as any,
       };
 
@@ -401,9 +383,9 @@ describe('EmbeddableActionStorage', () => {
       const embeddable = new TestEmbeddable();
       const storage = new EmbeddableActionStorage(embeddable);
 
-      const event: UiActionsSerializedEvent = {
+      const event: SerializedEvent = {
         eventId: 'EVENT_ID',
-        triggers: ['TRIGGER-ID'],
+        triggerId: 'TRIGGER-ID',
         action: {} as any,
       };
 
@@ -420,19 +402,19 @@ describe('EmbeddableActionStorage', () => {
       const embeddable = new TestEmbeddable();
       const storage = new EmbeddableActionStorage(embeddable);
 
-      const event1: UiActionsSerializedEvent = {
+      const event1: SerializedEvent = {
         eventId: 'EVENT_ID1',
-        triggers: ['TRIGGER-ID'],
+        triggerId: 'TRIGGER-ID1',
         action: {} as any,
       };
-      const event2: UiActionsSerializedEvent = {
+      const event2: SerializedEvent = {
         eventId: 'EVENT_ID2',
-        triggers: ['TRIGGER-ID'],
+        triggerId: 'TRIGGER-ID2',
         action: {} as any,
       };
-      const event3: UiActionsSerializedEvent = {
+      const event3: SerializedEvent = {
         eventId: 'EVENT_ID3',
-        triggers: ['TRIGGER-ID'],
+        triggerId: 'TRIGGER-ID3',
         action: {} as any,
       };
 
@@ -476,7 +458,7 @@ describe('EmbeddableActionStorage', () => {
 
       await storage.create({
         eventId: 'EVENT_ID1',
-        triggers: ['TRIGGER-ID'],
+        triggerId: 'TRIGGER-ID1',
         action: {} as any,
       });
 
@@ -484,7 +466,7 @@ describe('EmbeddableActionStorage', () => {
 
       await storage.create({
         eventId: 'EVENT_ID2',
-        triggers: ['TRIGGER-ID'],
+        triggerId: 'TRIGGER-ID1',
         action: {} as any,
       });
 
@@ -520,15 +502,15 @@ describe('EmbeddableActionStorage', () => {
       const embeddable = new TestEmbeddable();
       const storage = new EmbeddableActionStorage(embeddable);
 
-      const event1: UiActionsSerializedEvent = {
+      const event1: SerializedEvent = {
         eventId: 'EVENT_ID1',
-        triggers: ['TRIGGER-ID'],
+        triggerId: 'TRIGGER-ID1',
         action: {} as any,
       };
 
-      const event2: UiActionsSerializedEvent = {
+      const event2: SerializedEvent = {
         eventId: 'EVENT_ID2',
-        triggers: ['TRIGGER-ID'],
+        triggerId: 'TRIGGER-ID1',
         action: {} as any,
       };
 
diff --git a/src/plugins/embeddable/public/lib/embeddables/embeddable_action_storage.ts b/src/plugins/embeddable/public/lib/embeddables/embeddable_action_storage.ts
index fad5b4d535d6c..520f92840c5f9 100644
--- a/src/plugins/embeddable/public/lib/embeddables/embeddable_action_storage.ts
+++ b/src/plugins/embeddable/public/lib/embeddables/embeddable_action_storage.ts
@@ -17,20 +17,32 @@
  * under the License.
  */
 
-import {
-  UiActionsAbstractActionStorage,
-  UiActionsSerializedEvent,
-} from '../../../../ui_actions/public';
 import { Embeddable } from '..';
 
-export class EmbeddableActionStorage extends UiActionsAbstractActionStorage {
-  constructor(private readonly embbeddable: Embeddable) {
-    super();
-  }
+/**
+ * Below two interfaces are here temporarily, they will move to `ui_actions`
+ * plugin once #58216 is merged.
+ */
+export interface SerializedEvent {
+  eventId: string;
+  triggerId: string;
+  action: unknown;
+}
+export interface ActionStorage {
+  create(event: SerializedEvent): Promise<void>;
+  update(event: SerializedEvent): Promise<void>;
+  remove(eventId: string): Promise<void>;
+  read(eventId: string): Promise<SerializedEvent>;
+  count(): Promise<number>;
+  list(): Promise<SerializedEvent[]>;
+}
 
-  async create(event: UiActionsSerializedEvent) {
+export class EmbeddableActionStorage implements ActionStorage {
+  constructor(private readonly embbeddable: Embeddable<any, any>) {}
+
+  async create(event: SerializedEvent) {
     const input = this.embbeddable.getInput();
-    const events = (input.events || []) as UiActionsSerializedEvent[];
+    const events = (input.events || []) as SerializedEvent[];
     const exists = !!events.find(({ eventId }) => eventId === event.eventId);
 
     if (exists) {
@@ -41,13 +53,14 @@ export class EmbeddableActionStorage extends UiActionsAbstractActionStorage {
     }
 
     this.embbeddable.updateInput({
+      ...input,
       events: [...events, event],
     });
   }
 
-  async update(event: UiActionsSerializedEvent) {
+  async update(event: SerializedEvent) {
     const input = this.embbeddable.getInput();
-    const events = (input.events || []) as UiActionsSerializedEvent[];
+    const events = (input.events || []) as SerializedEvent[];
     const index = events.findIndex(({ eventId }) => eventId === event.eventId);
 
     if (index === -1) {
@@ -59,13 +72,14 @@ export class EmbeddableActionStorage extends UiActionsAbstractActionStorage {
     }
 
     this.embbeddable.updateInput({
+      ...input,
       events: [...events.slice(0, index), event, ...events.slice(index + 1)],
     });
   }
 
   async remove(eventId: string) {
     const input = this.embbeddable.getInput();
-    const events = (input.events || []) as UiActionsSerializedEvent[];
+    const events = (input.events || []) as SerializedEvent[];
     const index = events.findIndex(event => eventId === event.eventId);
 
     if (index === -1) {
@@ -77,13 +91,14 @@ export class EmbeddableActionStorage extends UiActionsAbstractActionStorage {
     }
 
     this.embbeddable.updateInput({
+      ...input,
       events: [...events.slice(0, index), ...events.slice(index + 1)],
     });
   }
 
-  async read(eventId: string): Promise<UiActionsSerializedEvent> {
+  async read(eventId: string): Promise<SerializedEvent> {
     const input = this.embbeddable.getInput();
-    const events = (input.events || []) as UiActionsSerializedEvent[];
+    const events = (input.events || []) as SerializedEvent[];
     const event = events.find(ev => eventId === ev.eventId);
 
     if (!event) {
@@ -98,10 +113,14 @@ export class EmbeddableActionStorage extends UiActionsAbstractActionStorage {
 
   private __list() {
     const input = this.embbeddable.getInput();
-    return (input.events || []) as UiActionsSerializedEvent[];
+    return (input.events || []) as SerializedEvent[];
+  }
+
+  async count(): Promise<number> {
+    return this.__list().length;
   }
 
-  async list(): Promise<UiActionsSerializedEvent[]> {
+  async list(): Promise<SerializedEvent[]> {
     return this.__list();
   }
 }
diff --git a/src/plugins/embeddable/public/lib/embeddables/i_embeddable.ts b/src/plugins/embeddable/public/lib/embeddables/i_embeddable.ts
index 9a4452aceba00..6345c34b0dda2 100644
--- a/src/plugins/embeddable/public/lib/embeddables/i_embeddable.ts
+++ b/src/plugins/embeddable/public/lib/embeddables/i_embeddable.ts
@@ -18,7 +18,6 @@
  */
 
 import { Observable } from 'rxjs';
-import { UiActionsDynamicActionManager } from '../../../../../plugins/ui_actions/public';
 import { Adapters } from '../types';
 import { IContainer } from '../containers/i_container';
 import { ViewMode } from '../types';
@@ -34,7 +33,7 @@ export interface EmbeddableInput {
   /**
    * Reserved key for `ui_actions` events.
    */
-  events?: Array<{ eventId: string }>;
+  events?: unknown;
 
   /**
    * List of action IDs that this embeddable should not render.
@@ -83,19 +82,6 @@ export interface IEmbeddable<
    **/
   readonly id: string;
 
-  /**
-   * Unique ID an embeddable is assigned each time it is initialized. This ID
-   * is different for different instances of the same embeddable. For example,
-   * if the same dashboard is rendered twice on the screen, all embeddable
-   * instances will have a unique `runtimeId`.
-   */
-  readonly runtimeId?: number;
-
-  /**
-   * Default implementation of dynamic action API for embeddables.
-   */
-  dynamicActions?: UiActionsDynamicActionManager;
-
   /**
    * A functional representation of the isContainer variable, but helpful for typescript to
    * know the shape if this returns true
diff --git a/src/plugins/embeddable/public/lib/panel/embeddable_panel.test.tsx b/src/plugins/embeddable/public/lib/panel/embeddable_panel.test.tsx
index 83d3d5e10761b..757d4e6bfddef 100644
--- a/src/plugins/embeddable/public/lib/panel/embeddable_panel.test.tsx
+++ b/src/plugins/embeddable/public/lib/panel/embeddable_panel.test.tsx
@@ -44,7 +44,7 @@ import {
 import { inspectorPluginMock } from 'src/plugins/inspector/public/mocks';
 import { EuiBadge } from '@elastic/eui';
 
-const actionRegistry = new Map<string, Action>();
+const actionRegistry = new Map<string, Action<object | undefined | string | number>>();
 const triggerRegistry = new Map<string, Trigger>();
 const embeddableFactories = new Map<string, EmbeddableFactory>();
 const getEmbeddableFactory = (id: string) => embeddableFactories.get(id);
@@ -213,17 +213,13 @@ const renderInEditModeAndOpenContextMenu = async (
 };
 
 test('HelloWorldContainer in edit mode hides disabledActions', async () => {
-  const action = {
+  const action: Action = {
     id: 'FOO',
     type: 'FOO' as ActionType,
     getIconType: () => undefined,
     getDisplayName: () => 'foo',
     isCompatible: async () => true,
     execute: async () => {},
-    order: 10,
-    getHref: () => {
-      return undefined;
-    },
   };
   const getActions = () => Promise.resolve([action]);
 
@@ -249,17 +245,13 @@ test('HelloWorldContainer in edit mode hides disabledActions', async () => {
 });
 
 test('HelloWorldContainer hides disabled badges', async () => {
-  const action = {
+  const action: Action = {
     id: 'BAR',
     type: 'BAR' as ActionType,
     getIconType: () => undefined,
     getDisplayName: () => 'bar',
     isCompatible: async () => true,
     execute: async () => {},
-    order: 10,
-    getHref: () => {
-      return undefined;
-    },
   };
   const getActions = () => Promise.resolve([action]);
 
diff --git a/src/plugins/embeddable/public/lib/panel/embeddable_panel.tsx b/src/plugins/embeddable/public/lib/panel/embeddable_panel.tsx
index c6537f2d94994..b95060a73252f 100644
--- a/src/plugins/embeddable/public/lib/panel/embeddable_panel.tsx
+++ b/src/plugins/embeddable/public/lib/panel/embeddable_panel.tsx
@@ -38,14 +38,6 @@ import { EditPanelAction } from '../actions';
 import { CustomizePanelModal } from './panel_header/panel_actions/customize_title/customize_panel_modal';
 import { EmbeddableStart } from '../../plugin';
 
-const sortByOrderField = (
-  { order: orderA }: { order?: number },
-  { order: orderB }: { order?: number }
-) => (orderB || 0) - (orderA || 0);
-
-const removeById = (disabledActions: string[]) => ({ id }: { id: string }) =>
-  disabledActions.indexOf(id) === -1;
-
 interface Props {
   embeddable: IEmbeddable<any, any>;
   getActions: UiActionsService['getTriggerCompatibleActions'];
@@ -65,14 +57,12 @@ interface State {
   hidePanelTitles: boolean;
   closeContextMenu: boolean;
   badges: Array<Action<EmbeddableContext>>;
-  eventCount?: number;
 }
 
 export class EmbeddablePanel extends React.Component<Props, State> {
   private embeddableRoot: React.RefObject<HTMLDivElement>;
   private parentSubscription?: Subscription;
   private subscription?: Subscription;
-  private eventCountSubscription?: Subscription;
   private mounted: boolean = false;
   private generateId = htmlIdGenerator();
 
@@ -146,9 +136,6 @@ export class EmbeddablePanel extends React.Component<Props, State> {
     if (this.subscription) {
       this.subscription.unsubscribe();
     }
-    if (this.eventCountSubscription) {
-      this.eventCountSubscription.unsubscribe();
-    }
     if (this.parentSubscription) {
       this.parentSubscription.unsubscribe();
     }
@@ -190,7 +177,6 @@ export class EmbeddablePanel extends React.Component<Props, State> {
             badges={this.state.badges}
             embeddable={this.props.embeddable}
             headerId={headerId}
-            eventCount={this.state.eventCount}
           />
         )}
         <div className="embPanel__content" ref={this.embeddableRoot} />
@@ -202,15 +188,6 @@ export class EmbeddablePanel extends React.Component<Props, State> {
     if (this.embeddableRoot.current) {
       this.props.embeddable.render(this.embeddableRoot.current);
     }
-
-    const dynamicActions = this.props.embeddable.dynamicActions;
-    if (dynamicActions) {
-      this.setState({ eventCount: dynamicActions.state.get().events.length });
-      this.eventCountSubscription = dynamicActions.state.state$.subscribe(({ events }) => {
-        if (!this.mounted) return;
-        this.setState({ eventCount: events.length });
-      });
-    }
   }
 
   closeMyContextMenuPanel = () => {
@@ -224,14 +201,13 @@ export class EmbeddablePanel extends React.Component<Props, State> {
   };
 
   private getActionContextMenuPanel = async () => {
-    let regularActions = await this.props.getActions(CONTEXT_MENU_TRIGGER, {
+    let actions = await this.props.getActions(CONTEXT_MENU_TRIGGER, {
       embeddable: this.props.embeddable,
     });
 
     const { disabledActions } = this.props.embeddable.getInput();
     if (disabledActions) {
-      const removeDisabledActions = removeById(disabledActions);
-      regularActions = regularActions.filter(removeDisabledActions);
+      actions = actions.filter(action => disabledActions.indexOf(action.id) === -1);
     }
 
     const createGetUserData = (overlays: OverlayStart) =>
@@ -270,10 +246,16 @@ export class EmbeddablePanel extends React.Component<Props, State> {
       new EditPanelAction(this.props.getEmbeddableFactory),
     ];
 
-    const sortedActions = [...regularActions, ...extraActions].sort(sortByOrderField);
+    const sorted = actions
+      .concat(extraActions)
+      .sort((a: Action<EmbeddableContext>, b: Action<EmbeddableContext>) => {
+        const bOrder = b.order || 0;
+        const aOrder = a.order || 0;
+        return bOrder - aOrder;
+      });
 
     return await buildContextMenuForActions({
-      actions: sortedActions,
+      actions: sorted,
       actionContext: { embeddable: this.props.embeddable },
       closeMenu: this.closeMyContextMenuPanel,
     });
diff --git a/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/customize_title/customize_panel_action.ts b/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/customize_title/customize_panel_action.ts
index 36957c3b79491..c0e43c0538833 100644
--- a/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/customize_title/customize_panel_action.ts
+++ b/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/customize_title/customize_panel_action.ts
@@ -33,13 +33,15 @@ interface ActionContext {
 export class CustomizePanelTitleAction implements Action<ActionContext> {
   public readonly type = ACTION_CUSTOMIZE_PANEL;
   public id = ACTION_CUSTOMIZE_PANEL;
-  public order = 40;
+  public order = 10;
 
-  constructor(private readonly getDataFromUser: GetUserData) {}
+  constructor(private readonly getDataFromUser: GetUserData) {
+    this.order = 10;
+  }
 
   public getDisplayName() {
     return i18n.translate('embeddableApi.customizePanel.action.displayName', {
-      defaultMessage: 'Edit panel title',
+      defaultMessage: 'Customize panel',
     });
   }
 
diff --git a/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/inspect_panel_action.ts b/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/inspect_panel_action.ts
index ae9645767b267..d04f35715537c 100644
--- a/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/inspect_panel_action.ts
+++ b/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/inspect_panel_action.ts
@@ -31,7 +31,7 @@ interface ActionContext {
 export class InspectPanelAction implements Action<ActionContext> {
   public readonly type = ACTION_INSPECT_PANEL;
   public readonly id = ACTION_INSPECT_PANEL;
-  public order = 20;
+  public order = 10;
 
   constructor(private readonly inspector: InspectorStartContract) {}
 
diff --git a/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/remove_panel_action.ts b/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/remove_panel_action.ts
index a6d4128f3f106..ee7948f3d6a4a 100644
--- a/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/remove_panel_action.ts
+++ b/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/remove_panel_action.ts
@@ -41,7 +41,7 @@ function hasExpandedPanelInput(
 export class RemovePanelAction implements Action<ActionContext> {
   public readonly type = REMOVE_PANEL_ACTION;
   public readonly id = REMOVE_PANEL_ACTION;
-  public order = 1;
+  public order = 5;
 
   constructor() {}
 
diff --git a/src/plugins/embeddable/public/lib/panel/panel_header/panel_header.tsx b/src/plugins/embeddable/public/lib/panel/panel_header/panel_header.tsx
index 2a856af7ae916..99516a1d21d6f 100644
--- a/src/plugins/embeddable/public/lib/panel/panel_header/panel_header.tsx
+++ b/src/plugins/embeddable/public/lib/panel/panel_header/panel_header.tsx
@@ -23,7 +23,6 @@ import {
   EuiIcon,
   EuiToolTip,
   EuiScreenReaderOnly,
-  EuiNotificationBadge,
 } from '@elastic/eui';
 import classNames from 'classnames';
 import React from 'react';
@@ -41,7 +40,6 @@ export interface PanelHeaderProps {
   badges: Array<Action<EmbeddableContext>>;
   embeddable: IEmbeddable;
   headerId?: string;
-  eventCount?: number;
 }
 
 function renderBadges(badges: Array<Action<EmbeddableContext>>, embeddable: IEmbeddable) {
@@ -92,7 +90,6 @@ export function PanelHeader({
   badges,
   embeddable,
   headerId,
-  eventCount,
 }: PanelHeaderProps) {
   const viewDescription = getViewDescription(embeddable);
   const showTitle = !isViewMode || (title && !hidePanelTitles) || viewDescription !== '';
@@ -150,11 +147,7 @@ export function PanelHeader({
         )}
         {renderBadges(badges, embeddable)}
       </h2>
-      {!isViewMode && !!eventCount && (
-        <EuiNotificationBadge style={{ marginTop: '4px', marginRight: '4px' }}>
-          {eventCount}
-        </EuiNotificationBadge>
-      )}
+
       <PanelOptionsMenu
         isViewMode={isViewMode}
         getActionContextMenuPanel={getActionContextMenuPanel}
diff --git a/src/plugins/kibana_utils/common/state_containers/create_state_container_react_helpers.ts b/src/plugins/kibana_utils/common/state_containers/create_state_container_react_helpers.ts
index 90823359359a1..36903f2d7c90f 100644
--- a/src/plugins/kibana_utils/common/state_containers/create_state_container_react_helpers.ts
+++ b/src/plugins/kibana_utils/common/state_containers/create_state_container_react_helpers.ts
@@ -24,58 +24,15 @@ import { Comparator, Connect, StateContainer, UnboxState } from './types';
 
 const { useContext, useLayoutEffect, useRef, createElement: h } = React;
 
-/**
- * Returns the latest state of a state container.
- *
- * @param container State container which state to track.
- */
-export const useContainerState = <Container extends StateContainer<any, any>>(
-  container: Container
-): UnboxState<Container> => useObservable(container.state$, container.get());
-
-/**
- * Apply selector to state container to extract only needed information. Will
- * re-render your component only when the section changes.
- *
- * @param container State container which state to track.
- * @param selector Function used to pick parts of state.
- * @param comparator Comparator function used to memoize previous result, to not
- *    re-render React component if state did not change. By default uses
- *    `fast-deep-equal` package.
- */
-export const useContainerSelector = <Container extends StateContainer<any, any>, Result>(
-  container: Container,
-  selector: (state: UnboxState<Container>) => Result,
-  comparator: Comparator<Result> = defaultComparator
-): Result => {
-  const { state$, get } = container;
-  const lastValueRef = useRef<Result>(get());
-  const [value, setValue] = React.useState<Result>(() => {
-    const newValue = selector(get());
-    lastValueRef.current = newValue;
-    return newValue;
-  });
-  useLayoutEffect(() => {
-    const subscription = state$.subscribe((currentState: UnboxState<Container>) => {
-      const newValue = selector(currentState);
-      if (!comparator(lastValueRef.current, newValue)) {
-        lastValueRef.current = newValue;
-        setValue(newValue);
-      }
-    });
-    return () => subscription.unsubscribe();
-  }, [state$, comparator]);
-  return value;
-};
-
 export const createStateContainerReactHelpers = <Container extends StateContainer<any, any>>() => {
   const context = React.createContext<Container>(null as any);
 
   const useContainer = (): Container => useContext(context);
 
   const useState = (): UnboxState<Container> => {
-    const container = useContainer();
-    return useContainerState(container);
+    const { state$, get } = useContainer();
+    const value = useObservable(state$, get());
+    return value;
   };
 
   const useTransitions: () => Container['transitions'] = () => useContainer().transitions;
@@ -84,8 +41,24 @@ export const createStateContainerReactHelpers = <Container extends StateContaine
     selector: (state: UnboxState<Container>) => Result,
     comparator: Comparator<Result> = defaultComparator
   ): Result => {
-    const container = useContainer();
-    return useContainerSelector<Container, Result>(container, selector, comparator);
+    const { state$, get } = useContainer();
+    const lastValueRef = useRef<Result>(get());
+    const [value, setValue] = React.useState<Result>(() => {
+      const newValue = selector(get());
+      lastValueRef.current = newValue;
+      return newValue;
+    });
+    useLayoutEffect(() => {
+      const subscription = state$.subscribe((currentState: UnboxState<Container>) => {
+        const newValue = selector(currentState);
+        if (!comparator(lastValueRef.current, newValue)) {
+          lastValueRef.current = newValue;
+          setValue(newValue);
+        }
+      });
+      return () => subscription.unsubscribe();
+    }, [state$, comparator]);
+    return value;
   };
 
   const connect: Connect<UnboxState<Container>> = mapStateToProp => component => props =>
diff --git a/src/plugins/kibana_utils/common/state_containers/types.ts b/src/plugins/kibana_utils/common/state_containers/types.ts
index 29ffa4cd486b5..26a29bc470e8a 100644
--- a/src/plugins/kibana_utils/common/state_containers/types.ts
+++ b/src/plugins/kibana_utils/common/state_containers/types.ts
@@ -43,7 +43,7 @@ export interface BaseStateContainer<State extends BaseState> {
 
 export interface StateContainer<
   State extends BaseState,
-  PureTransitions extends object = object,
+  PureTransitions extends object,
   PureSelectors extends object = {}
 > extends BaseStateContainer<State> {
   transitions: Readonly<PureTransitionsToTransitions<PureTransitions>>;
diff --git a/src/plugins/kibana_utils/index.ts b/src/plugins/kibana_utils/index.ts
deleted file mode 100644
index 14d6e52dc0465..0000000000000
--- a/src/plugins/kibana_utils/index.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-export { createStateContainer, StateContainer, of } from './common';
diff --git a/src/plugins/ui_actions/public/actions/action.ts b/src/plugins/ui_actions/public/actions/action.ts
index 15f1d6dd79289..2b2fc004a84c6 100644
--- a/src/plugins/ui_actions/public/actions/action.ts
+++ b/src/plugins/ui_actions/public/actions/action.ts
@@ -19,12 +19,10 @@
 
 import { UiComponent } from 'src/plugins/kibana_utils/common';
 import { ActionType, ActionContextMapping } from '../types';
-import { Presentable } from '../util/presentable';
 
 export type ActionByType<T extends ActionType> = Action<ActionContextMapping[T], T>;
 
-export interface Action<Context extends {} = {}, T = ActionType>
-  extends Partial<Presentable<Context>> {
+export interface Action<Context = {}, T = ActionType> {
   /**
    * Determined the order when there is more than one action matched to a trigger.
    * Higher numbers are displayed first.
@@ -65,30 +63,12 @@ export interface Action<Context extends {} = {}, T = ActionType>
   isCompatible(context: Context): Promise<boolean>;
 
   /**
-   * Executes the action.
+   * If this returns something truthy, this is used in addition to the `execute` method when clicked.
    */
-  execute(context: Context): Promise<void>;
-}
-
-/**
- * A convenience interface used to register an action.
- */
-export interface ActionDefinition<Context extends object = object>
-  extends Partial<Presentable<Context>> {
-  /**
-   * ID of the action that uniquely identifies this action in the actions registry.
-   */
-  readonly id: string;
-
-  /**
-   * ID of the factory for this action. Used to construct dynamic actions.
-   */
-  readonly type?: ActionType;
+  getHref?(context: Context): string | undefined;
 
   /**
    * Executes the action.
    */
   execute(context: Context): Promise<void>;
 }
-
-export type ActionContext<A> = A extends ActionDefinition<infer Context> ? Context : never;
diff --git a/src/plugins/ui_actions/public/util/presentable.ts b/src/plugins/ui_actions/public/actions/action_definition.ts
similarity index 50%
rename from src/plugins/ui_actions/public/util/presentable.ts
rename to src/plugins/ui_actions/public/actions/action_definition.ts
index 945fd2065ce78..c590cf8f34ee0 100644
--- a/src/plugins/ui_actions/public/util/presentable.ts
+++ b/src/plugins/ui_actions/public/actions/action_definition.ts
@@ -18,46 +18,55 @@
  */
 
 import { UiComponent } from 'src/plugins/kibana_utils/common';
+import { ActionType, ActionContextMapping } from '../types';
 
-/**
- * Represents something that can be displayed to user in UI.
- */
-export interface Presentable<Context extends object = object> {
+export interface ActionDefinition<T extends ActionType> {
   /**
-   * ID that uniquely identifies this object.
+   * Determined the order when there is more than one action matched to a trigger.
+   * Higher numbers are displayed first.
    */
-  readonly id: string;
+  order?: number;
 
   /**
-   * Determines the display order in relation to other items. Higher numbers are
-   * displayed first.
+   * A unique identifier for this action instance.
    */
-  readonly order: number;
+  id?: string;
 
   /**
-   * `UiComponent` to render when displaying this entity as a context menu item.
-   * If not provided, `getDisplayName` will be used instead.
+   * The action type is what determines the context shape.
    */
-  readonly MenuItem?: UiComponent<{ context: Context }>;
+  readonly type: T;
 
   /**
    * Optional EUI icon type that can be displayed along with the title.
    */
-  getIconType(context: Context): string | undefined;
+  getIconType?(context: ActionContextMapping[T]): string;
 
   /**
    * Returns a title to be displayed to the user.
+   * @param context
+   */
+  getDisplayName?(context: ActionContextMapping[T]): string;
+
+  /**
+   * `UiComponent` to render when displaying this action as a context menu item.
+   * If not provided, `getDisplayName` will be used instead.
+   */
+  MenuItem?: UiComponent<{ context: ActionContextMapping[T] }>;
+
+  /**
+   * Returns a promise that resolves to true if this action is compatible given the context,
+   * otherwise resolves to false.
    */
-  getDisplayName(context: Context): string;
+  isCompatible?(context: ActionContextMapping[T]): Promise<boolean>;
 
   /**
-   * This method should return a link if this item can be clicked on.
+   * If this returns something truthy, this is used in addition to the `execute` method when clicked.
    */
-  getHref?(context: Context): string | undefined;
+  getHref?(context: ActionContextMapping[T]): string | undefined;
 
   /**
-   * Returns a promise that resolves to true if this item is compatible given
-   * the context and should be displayed to user, otherwise resolves to false.
+   * Executes the action.
    */
-  isCompatible(context: Context): Promise<boolean>;
+  execute(context: ActionContextMapping[T]): Promise<void>;
 }
diff --git a/src/plugins/ui_actions/public/actions/action_factory.ts b/src/plugins/ui_actions/public/actions/action_factory.ts
deleted file mode 100644
index bc0ec844d00f5..0000000000000
--- a/src/plugins/ui_actions/public/actions/action_factory.ts
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import { uiToReactComponent } from '../../../kibana_react/public';
-import { Presentable } from '../util/presentable';
-import { ActionDefinition } from './action';
-import { ActionFactoryDefinition } from './action_factory_definition';
-import { Configurable } from '../util';
-import { SerializedAction } from './types';
-
-export class ActionFactory<
-  Config extends object = object,
-  FactoryContext extends object = object,
-  ActionContext extends object = object
-> implements Presentable<FactoryContext>, Configurable<Config, FactoryContext> {
-  constructor(
-    protected readonly def: ActionFactoryDefinition<Config, FactoryContext, ActionContext>
-  ) {}
-
-  public readonly id = this.def.id;
-  public readonly order = this.def.order || 0;
-  public readonly MenuItem? = this.def.MenuItem;
-  public readonly ReactMenuItem? = this.MenuItem ? uiToReactComponent(this.MenuItem) : undefined;
-
-  public readonly CollectConfig = this.def.CollectConfig;
-  public readonly ReactCollectConfig = uiToReactComponent(this.CollectConfig);
-  public readonly createConfig = this.def.createConfig;
-  public readonly isConfigValid = this.def.isConfigValid;
-
-  public getIconType(context: FactoryContext): string | undefined {
-    if (!this.def.getIconType) return undefined;
-    return this.def.getIconType(context);
-  }
-
-  public getDisplayName(context: FactoryContext): string {
-    if (!this.def.getDisplayName) return '';
-    return this.def.getDisplayName(context);
-  }
-
-  public async isCompatible(context: FactoryContext): Promise<boolean> {
-    if (!this.def.isCompatible) return true;
-    return await this.def.isCompatible(context);
-  }
-
-  public getHref(context: FactoryContext): string | undefined {
-    if (!this.def.getHref) return undefined;
-    return this.def.getHref(context);
-  }
-
-  public create(
-    serializedAction: Omit<SerializedAction<Config>, 'factoryId'>
-  ): ActionDefinition<ActionContext> {
-    return this.def.create(serializedAction);
-  }
-}
diff --git a/src/plugins/ui_actions/public/actions/action_factory_definition.ts b/src/plugins/ui_actions/public/actions/action_factory_definition.ts
deleted file mode 100644
index 7ac94a41e7076..0000000000000
--- a/src/plugins/ui_actions/public/actions/action_factory_definition.ts
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import { ActionDefinition } from './action';
-import { Presentable, Configurable } from '../util';
-import { SerializedAction } from './types';
-
-/**
- * This is a convenience interface for registering new action factories.
- */
-export interface ActionFactoryDefinition<
-  Config extends object = object,
-  FactoryContext extends object = object,
-  ActionContext extends object = object
-> extends Partial<Presentable<FactoryContext>>, Configurable<Config, FactoryContext> {
-  /**
-   * Unique ID of the action factory. This ID is used to identify this action
-   * factory in the registry as well as to construct actions of this type and
-   * identify this action factory when presenting it to the user in UI.
-   */
-  id: string;
-
-  /**
-   * This method should return a definition of a new action, normally used to
-   * register it in `ui_actions` registry.
-   */
-  create(
-    serializedAction: Omit<SerializedAction<Config>, 'factoryId'>
-  ): ActionDefinition<ActionContext>;
-}
diff --git a/src/plugins/ui_actions/public/actions/action_internal.test.ts b/src/plugins/ui_actions/public/actions/action_internal.test.ts
deleted file mode 100644
index b14346180c274..0000000000000
--- a/src/plugins/ui_actions/public/actions/action_internal.test.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import { ActionDefinition } from './action';
-import { ActionInternal } from './action_internal';
-
-const defaultActionDef: ActionDefinition = {
-  id: 'test-action',
-  execute: jest.fn(),
-};
-
-describe('ActionInternal', () => {
-  test('can instantiate from action definition', () => {
-    const action = new ActionInternal(defaultActionDef);
-    expect(action.id).toBe('test-action');
-  });
-});
diff --git a/src/plugins/ui_actions/public/actions/action_internal.ts b/src/plugins/ui_actions/public/actions/action_internal.ts
deleted file mode 100644
index 245ded991c032..0000000000000
--- a/src/plugins/ui_actions/public/actions/action_internal.ts
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import { Action, ActionContext as Context, ActionDefinition } from './action';
-import { Presentable } from '../util/presentable';
-import { uiToReactComponent } from '../../../kibana_react/public';
-import { ActionType } from '../types';
-
-export class ActionInternal<A extends ActionDefinition = ActionDefinition>
-  implements Action<Context<A>>, Presentable<Context<A>> {
-  constructor(public readonly definition: A) {}
-
-  public readonly id: string = this.definition.id;
-  public readonly type: ActionType = this.definition.type || '';
-  public readonly order: number = this.definition.order || 0;
-  public readonly MenuItem? = this.definition.MenuItem;
-  public readonly ReactMenuItem? = this.MenuItem ? uiToReactComponent(this.MenuItem) : undefined;
-
-  public execute(context: Context<A>) {
-    return this.definition.execute(context);
-  }
-
-  public getIconType(context: Context<A>): string | undefined {
-    if (!this.definition.getIconType) return undefined;
-    return this.definition.getIconType(context);
-  }
-
-  public getDisplayName(context: Context<A>): string {
-    if (!this.definition.getDisplayName) return `Action: ${this.id}`;
-    return this.definition.getDisplayName(context);
-  }
-
-  public async isCompatible(context: Context<A>): Promise<boolean> {
-    if (!this.definition.isCompatible) return true;
-    return await this.definition.isCompatible(context);
-  }
-
-  public getHref(context: Context<A>): string | undefined {
-    if (!this.definition.getHref) return undefined;
-    return this.definition.getHref(context);
-  }
-}
diff --git a/src/plugins/ui_actions/public/actions/create_action.ts b/src/plugins/ui_actions/public/actions/create_action.ts
index 8f1cd23715d3f..90a9415c0b497 100644
--- a/src/plugins/ui_actions/public/actions/create_action.ts
+++ b/src/plugins/ui_actions/public/actions/create_action.ts
@@ -17,19 +17,11 @@
  * under the License.
  */
 
-import { ActionContextMapping } from '../types';
 import { ActionByType } from './action';
 import { ActionType } from '../types';
-import { ActionDefinition } from './action';
+import { ActionDefinition } from './action_definition';
 
-interface ActionDefinitionByType<T extends ActionType>
-  extends Omit<ActionDefinition<ActionContextMapping[T]>, 'id'> {
-  id?: string;
-}
-
-export function createAction<T extends ActionType>(
-  action: ActionDefinitionByType<T>
-): ActionByType<T> {
+export function createAction<T extends ActionType>(action: ActionDefinition<T>): ActionByType<T> {
   return {
     getIconType: () => undefined,
     order: 0,
@@ -38,5 +30,5 @@ export function createAction<T extends ActionType>(
     getDisplayName: () => '',
     getHref: () => undefined,
     ...action,
-  } as ActionByType<T>;
+  };
 }
diff --git a/src/plugins/ui_actions/public/actions/dynamic_action_manager.test.ts b/src/plugins/ui_actions/public/actions/dynamic_action_manager.test.ts
deleted file mode 100644
index 2574a9e529ebf..0000000000000
--- a/src/plugins/ui_actions/public/actions/dynamic_action_manager.test.ts
+++ /dev/null
@@ -1,646 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import { DynamicActionManager } from './dynamic_action_manager';
-import { ActionStorage, MemoryActionStorage, SerializedEvent } from './dynamic_action_storage';
-import { UiActionsService } from '../service';
-import { ActionFactoryDefinition } from './action_factory_definition';
-import { ActionRegistry } from '../types';
-import { SerializedAction } from './types';
-import { of } from '../../../kibana_utils';
-
-const actionFactoryDefinition1: ActionFactoryDefinition = {
-  id: 'ACTION_FACTORY_1',
-  CollectConfig: {} as any,
-  createConfig: () => ({}),
-  isConfigValid: (() => true) as any,
-  create: ({ name }) => ({
-    id: '',
-    execute: async () => {},
-    getDisplayName: () => name,
-  }),
-};
-
-const actionFactoryDefinition2: ActionFactoryDefinition = {
-  id: 'ACTION_FACTORY_2',
-  CollectConfig: {} as any,
-  createConfig: () => ({}),
-  isConfigValid: (() => true) as any,
-  create: ({ name }) => ({
-    id: '',
-    execute: async () => {},
-    getDisplayName: () => name,
-  }),
-};
-
-const event1: SerializedEvent = {
-  eventId: 'EVENT_ID_1',
-  triggers: ['VALUE_CLICK_TRIGGER'],
-  action: {
-    factoryId: actionFactoryDefinition1.id,
-    name: 'Action 1',
-    config: {},
-  },
-};
-
-const event2: SerializedEvent = {
-  eventId: 'EVENT_ID_2',
-  triggers: ['VALUE_CLICK_TRIGGER'],
-  action: {
-    factoryId: actionFactoryDefinition1.id,
-    name: 'Action 2',
-    config: {},
-  },
-};
-
-const event3: SerializedEvent = {
-  eventId: 'EVENT_ID_3',
-  triggers: ['VALUE_CLICK_TRIGGER'],
-  action: {
-    factoryId: actionFactoryDefinition2.id,
-    name: 'Action 3',
-    config: {},
-  },
-};
-
-const setup = (events: readonly SerializedEvent[] = []) => {
-  const isCompatible = async () => true;
-  const storage: ActionStorage = new MemoryActionStorage(events);
-  const actions: ActionRegistry = new Map();
-  const uiActions = new UiActionsService({
-    actions,
-  });
-  const manager = new DynamicActionManager({
-    isCompatible,
-    storage,
-    uiActions,
-  });
-
-  uiActions.registerTrigger({
-    id: 'VALUE_CLICK_TRIGGER',
-  });
-
-  return {
-    isCompatible,
-    actions,
-    storage,
-    uiActions,
-    manager,
-  };
-};
-
-describe('DynamicActionManager', () => {
-  test('can instantiate', () => {
-    const { manager } = setup([event1]);
-    expect(manager).toBeInstanceOf(DynamicActionManager);
-  });
-
-  describe('.start()', () => {
-    test('instantiates stored events', async () => {
-      const { manager, actions, uiActions } = setup([event1]);
-      const create1 = jest.fn();
-      const create2 = jest.fn();
-
-      uiActions.registerActionFactory({ ...actionFactoryDefinition1, create: create1 });
-      uiActions.registerActionFactory({ ...actionFactoryDefinition2, create: create2 });
-
-      expect(create1).toHaveBeenCalledTimes(0);
-      expect(create2).toHaveBeenCalledTimes(0);
-      expect(actions.size).toBe(0);
-
-      await manager.start();
-
-      expect(create1).toHaveBeenCalledTimes(1);
-      expect(create2).toHaveBeenCalledTimes(0);
-      expect(actions.size).toBe(1);
-    });
-
-    test('does nothing when no events stored', async () => {
-      const { manager, actions, uiActions } = setup();
-      const create1 = jest.fn();
-      const create2 = jest.fn();
-
-      uiActions.registerActionFactory({ ...actionFactoryDefinition1, create: create1 });
-      uiActions.registerActionFactory({ ...actionFactoryDefinition2, create: create2 });
-
-      expect(create1).toHaveBeenCalledTimes(0);
-      expect(create2).toHaveBeenCalledTimes(0);
-      expect(actions.size).toBe(0);
-
-      await manager.start();
-
-      expect(create1).toHaveBeenCalledTimes(0);
-      expect(create2).toHaveBeenCalledTimes(0);
-      expect(actions.size).toBe(0);
-    });
-
-    test('UI state is empty before manager starts', async () => {
-      const { manager } = setup([event1]);
-
-      expect(manager.state.get()).toMatchObject({
-        events: [],
-        isFetchingEvents: false,
-        fetchCount: 0,
-      });
-    });
-
-    test('loads events into UI state', async () => {
-      const { manager, uiActions } = setup([event1, event2, event3]);
-
-      uiActions.registerActionFactory(actionFactoryDefinition1);
-      uiActions.registerActionFactory(actionFactoryDefinition2);
-
-      await manager.start();
-
-      expect(manager.state.get()).toMatchObject({
-        events: [event1, event2, event3],
-        isFetchingEvents: false,
-        fetchCount: 1,
-      });
-    });
-
-    test('sets isFetchingEvents to true while fetching events', async () => {
-      const { manager, uiActions } = setup([event1, event2, event3]);
-
-      uiActions.registerActionFactory(actionFactoryDefinition1);
-      uiActions.registerActionFactory(actionFactoryDefinition2);
-
-      const promise = manager.start().catch(() => {});
-
-      expect(manager.state.get().isFetchingEvents).toBe(true);
-
-      await promise;
-
-      expect(manager.state.get().isFetchingEvents).toBe(false);
-    });
-
-    test('throws if storage threw', async () => {
-      const { manager, storage } = setup([event1]);
-
-      storage.list = async () => {
-        throw new Error('baz');
-      };
-
-      const [, error] = await of(manager.start());
-
-      expect(error).toEqual(new Error('baz'));
-    });
-
-    test('sets UI state error if error happened during initial fetch', async () => {
-      const { manager, storage } = setup([event1]);
-
-      storage.list = async () => {
-        throw new Error('baz');
-      };
-
-      await of(manager.start());
-
-      expect(manager.state.get().fetchError!.message).toBe('baz');
-    });
-  });
-
-  describe('.stop()', () => {
-    test('removes events from UI actions registry', async () => {
-      const { manager, actions, uiActions } = setup([event1, event2]);
-      const create1 = jest.fn();
-      const create2 = jest.fn();
-
-      uiActions.registerActionFactory({ ...actionFactoryDefinition1, create: create1 });
-      uiActions.registerActionFactory({ ...actionFactoryDefinition2, create: create2 });
-
-      expect(actions.size).toBe(0);
-
-      await manager.start();
-
-      expect(actions.size).toBe(2);
-
-      await manager.stop();
-
-      expect(actions.size).toBe(0);
-    });
-  });
-
-  describe('.createEvent()', () => {
-    describe('when storage succeeds', () => {
-      test('stores new event in storage', async () => {
-        const { manager, storage, uiActions } = setup([]);
-
-        uiActions.registerActionFactory(actionFactoryDefinition1);
-        await manager.start();
-
-        const action: SerializedAction<unknown> = {
-          factoryId: actionFactoryDefinition1.id,
-          name: 'foo',
-          config: {},
-        };
-
-        expect(await storage.count()).toBe(0);
-
-        await manager.createEvent(action, ['VALUE_CLICK_TRIGGER']);
-
-        expect(await storage.count()).toBe(1);
-
-        const [event] = await storage.list();
-
-        expect(event).toMatchObject({
-          eventId: expect.any(String),
-          triggers: ['VALUE_CLICK_TRIGGER'],
-          action: {
-            factoryId: actionFactoryDefinition1.id,
-            name: 'foo',
-            config: {},
-          },
-        });
-      });
-
-      test('adds event to UI state', async () => {
-        const { manager, uiActions } = setup([]);
-        const action: SerializedAction<unknown> = {
-          factoryId: actionFactoryDefinition1.id,
-          name: 'foo',
-          config: {},
-        };
-
-        uiActions.registerActionFactory(actionFactoryDefinition1);
-
-        await manager.start();
-
-        expect(manager.state.get().events.length).toBe(0);
-
-        await manager.createEvent(action, ['VALUE_CLICK_TRIGGER']);
-
-        expect(manager.state.get().events.length).toBe(1);
-      });
-
-      test('optimistically adds event to UI state', async () => {
-        const { manager, uiActions } = setup([]);
-        const action: SerializedAction<unknown> = {
-          factoryId: actionFactoryDefinition1.id,
-          name: 'foo',
-          config: {},
-        };
-
-        uiActions.registerActionFactory(actionFactoryDefinition1);
-
-        await manager.start();
-
-        expect(manager.state.get().events.length).toBe(0);
-
-        const promise = manager.createEvent(action, ['VALUE_CLICK_TRIGGER']).catch(e => e);
-
-        expect(manager.state.get().events.length).toBe(1);
-
-        await promise;
-
-        expect(manager.state.get().events.length).toBe(1);
-      });
-
-      test('instantiates event in actions service', async () => {
-        const { manager, uiActions, actions } = setup([]);
-        const action: SerializedAction<unknown> = {
-          factoryId: actionFactoryDefinition1.id,
-          name: 'foo',
-          config: {},
-        };
-
-        uiActions.registerActionFactory(actionFactoryDefinition1);
-
-        await manager.start();
-
-        expect(actions.size).toBe(0);
-
-        await manager.createEvent(action, ['VALUE_CLICK_TRIGGER']);
-
-        expect(actions.size).toBe(1);
-      });
-    });
-
-    describe('when storage fails', () => {
-      test('throws an error', async () => {
-        const { manager, storage, uiActions } = setup([]);
-
-        storage.create = async () => {
-          throw new Error('foo');
-        };
-
-        uiActions.registerActionFactory(actionFactoryDefinition1);
-        await manager.start();
-
-        const action: SerializedAction<unknown> = {
-          factoryId: actionFactoryDefinition1.id,
-          name: 'foo',
-          config: {},
-        };
-
-        const [, error] = await of(manager.createEvent(action, ['VALUE_CLICK_TRIGGER']));
-
-        expect(error).toEqual(new Error('foo'));
-      });
-
-      test('does not add even to UI state', async () => {
-        const { manager, storage, uiActions } = setup([]);
-        const action: SerializedAction<unknown> = {
-          factoryId: actionFactoryDefinition1.id,
-          name: 'foo',
-          config: {},
-        };
-
-        storage.create = async () => {
-          throw new Error('foo');
-        };
-        uiActions.registerActionFactory(actionFactoryDefinition1);
-
-        await manager.start();
-        await of(manager.createEvent(action, ['VALUE_CLICK_TRIGGER']));
-
-        expect(manager.state.get().events.length).toBe(0);
-      });
-
-      test('optimistically adds event to UI state and then removes it', async () => {
-        const { manager, storage, uiActions } = setup([]);
-        const action: SerializedAction<unknown> = {
-          factoryId: actionFactoryDefinition1.id,
-          name: 'foo',
-          config: {},
-        };
-
-        storage.create = async () => {
-          throw new Error('foo');
-        };
-        uiActions.registerActionFactory(actionFactoryDefinition1);
-
-        await manager.start();
-
-        expect(manager.state.get().events.length).toBe(0);
-
-        const promise = manager.createEvent(action, ['VALUE_CLICK_TRIGGER']).catch(e => e);
-
-        expect(manager.state.get().events.length).toBe(1);
-
-        await promise;
-
-        expect(manager.state.get().events.length).toBe(0);
-      });
-
-      test('does not instantiate event in actions service', async () => {
-        const { manager, storage, uiActions, actions } = setup([]);
-        const action: SerializedAction<unknown> = {
-          factoryId: actionFactoryDefinition1.id,
-          name: 'foo',
-          config: {},
-        };
-
-        storage.create = async () => {
-          throw new Error('foo');
-        };
-        uiActions.registerActionFactory(actionFactoryDefinition1);
-
-        await manager.start();
-
-        expect(actions.size).toBe(0);
-
-        await of(manager.createEvent(action, ['VALUE_CLICK_TRIGGER']));
-
-        expect(actions.size).toBe(0);
-      });
-    });
-  });
-
-  describe('.updateEvent()', () => {
-    describe('when storage succeeds', () => {
-      test('un-registers old event from ui actions service and registers the new one', async () => {
-        const { manager, actions, uiActions } = setup([event3]);
-
-        uiActions.registerActionFactory(actionFactoryDefinition2);
-        await manager.start();
-
-        expect(actions.size).toBe(1);
-
-        const registeredAction1 = actions.values().next().value;
-
-        expect(registeredAction1.getDisplayName()).toBe('Action 3');
-
-        const action: SerializedAction<unknown> = {
-          factoryId: actionFactoryDefinition2.id,
-          name: 'foo',
-          config: {},
-        };
-
-        await manager.updateEvent(event3.eventId, action, ['VALUE_CLICK_TRIGGER']);
-
-        expect(actions.size).toBe(1);
-
-        const registeredAction2 = actions.values().next().value;
-
-        expect(registeredAction2.getDisplayName()).toBe('foo');
-      });
-
-      test('updates event in storage', async () => {
-        const { manager, storage, uiActions } = setup([event3]);
-        const storageUpdateSpy = jest.spyOn(storage, 'update');
-
-        uiActions.registerActionFactory(actionFactoryDefinition2);
-        await manager.start();
-
-        const action: SerializedAction<unknown> = {
-          factoryId: actionFactoryDefinition2.id,
-          name: 'foo',
-          config: {},
-        };
-
-        expect(storageUpdateSpy).toHaveBeenCalledTimes(0);
-
-        await manager.updateEvent(event3.eventId, action, ['VALUE_CLICK_TRIGGER']);
-
-        expect(storageUpdateSpy).toHaveBeenCalledTimes(1);
-        expect(storageUpdateSpy.mock.calls[0][0]).toMatchObject({
-          eventId: expect.any(String),
-          triggers: ['VALUE_CLICK_TRIGGER'],
-          action: {
-            factoryId: actionFactoryDefinition2.id,
-          },
-        });
-      });
-
-      test('updates event in UI state', async () => {
-        const { manager, uiActions } = setup([event3]);
-
-        uiActions.registerActionFactory(actionFactoryDefinition2);
-        await manager.start();
-
-        const action: SerializedAction<unknown> = {
-          factoryId: actionFactoryDefinition2.id,
-          name: 'foo',
-          config: {},
-        };
-
-        expect(manager.state.get().events[0].action.name).toBe('Action 3');
-
-        await manager.updateEvent(event3.eventId, action, ['VALUE_CLICK_TRIGGER']);
-
-        expect(manager.state.get().events[0].action.name).toBe('foo');
-      });
-
-      test('optimistically updates event in UI state', async () => {
-        const { manager, uiActions } = setup([event3]);
-
-        uiActions.registerActionFactory(actionFactoryDefinition2);
-        await manager.start();
-
-        const action: SerializedAction<unknown> = {
-          factoryId: actionFactoryDefinition2.id,
-          name: 'foo',
-          config: {},
-        };
-
-        expect(manager.state.get().events[0].action.name).toBe('Action 3');
-
-        const promise = manager
-          .updateEvent(event3.eventId, action, ['VALUE_CLICK_TRIGGER'])
-          .catch(e => e);
-
-        expect(manager.state.get().events[0].action.name).toBe('foo');
-
-        await promise;
-      });
-    });
-
-    describe('when storage fails', () => {
-      test('throws error', async () => {
-        const { manager, storage, uiActions } = setup([event3]);
-
-        storage.update = () => {
-          throw new Error('bar');
-        };
-        uiActions.registerActionFactory(actionFactoryDefinition2);
-        await manager.start();
-
-        const action: SerializedAction<unknown> = {
-          factoryId: actionFactoryDefinition2.id,
-          name: 'foo',
-          config: {},
-        };
-
-        const [, error] = await of(
-          manager.updateEvent(event3.eventId, action, ['VALUE_CLICK_TRIGGER'])
-        );
-
-        expect(error).toEqual(new Error('bar'));
-      });
-
-      test('keeps the old action in actions registry', async () => {
-        const { manager, storage, actions, uiActions } = setup([event3]);
-
-        storage.update = () => {
-          throw new Error('bar');
-        };
-        uiActions.registerActionFactory(actionFactoryDefinition2);
-        await manager.start();
-
-        expect(actions.size).toBe(1);
-
-        const registeredAction1 = actions.values().next().value;
-
-        expect(registeredAction1.getDisplayName()).toBe('Action 3');
-
-        const action: SerializedAction<unknown> = {
-          factoryId: actionFactoryDefinition2.id,
-          name: 'foo',
-          config: {},
-        };
-
-        await of(manager.updateEvent(event3.eventId, action, ['VALUE_CLICK_TRIGGER']));
-
-        expect(actions.size).toBe(1);
-
-        const registeredAction2 = actions.values().next().value;
-
-        expect(registeredAction2.getDisplayName()).toBe('Action 3');
-      });
-
-      test('keeps old event in UI state', async () => {
-        const { manager, storage, uiActions } = setup([event3]);
-
-        storage.update = () => {
-          throw new Error('bar');
-        };
-        uiActions.registerActionFactory(actionFactoryDefinition2);
-        await manager.start();
-
-        const action: SerializedAction<unknown> = {
-          factoryId: actionFactoryDefinition2.id,
-          name: 'foo',
-          config: {},
-        };
-
-        expect(manager.state.get().events[0].action.name).toBe('Action 3');
-
-        await of(manager.updateEvent(event3.eventId, action, ['VALUE_CLICK_TRIGGER']));
-
-        expect(manager.state.get().events[0].action.name).toBe('Action 3');
-      });
-    });
-  });
-
-  describe('.deleteEvents()', () => {
-    describe('when storage succeeds', () => {
-      test('removes all actions from uiActions service', async () => {
-        const { manager, actions, uiActions } = setup([event2, event1]);
-
-        uiActions.registerActionFactory(actionFactoryDefinition1);
-
-        await manager.start();
-
-        expect(actions.size).toBe(2);
-
-        await manager.deleteEvents([event1.eventId, event2.eventId]);
-
-        expect(actions.size).toBe(0);
-      });
-
-      test('removes all events from storage', async () => {
-        const { manager, uiActions, storage } = setup([event2, event1]);
-
-        uiActions.registerActionFactory(actionFactoryDefinition1);
-
-        await manager.start();
-
-        expect(await storage.list()).toEqual([event2, event1]);
-
-        await manager.deleteEvents([event1.eventId, event2.eventId]);
-
-        expect(await storage.list()).toEqual([]);
-      });
-
-      test('removes all events from UI state', async () => {
-        const { manager, uiActions } = setup([event2, event1]);
-
-        uiActions.registerActionFactory(actionFactoryDefinition1);
-
-        await manager.start();
-
-        expect(manager.state.get().events).toEqual([event2, event1]);
-
-        await manager.deleteEvents([event1.eventId, event2.eventId]);
-
-        expect(manager.state.get().events).toEqual([]);
-      });
-    });
-  });
-});
diff --git a/src/plugins/ui_actions/public/actions/dynamic_action_manager.ts b/src/plugins/ui_actions/public/actions/dynamic_action_manager.ts
deleted file mode 100644
index 97eb5b05fbbc2..0000000000000
--- a/src/plugins/ui_actions/public/actions/dynamic_action_manager.ts
+++ /dev/null
@@ -1,284 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import { v4 as uuidv4 } from 'uuid';
-import { Subscription } from 'rxjs';
-import { ActionStorage, SerializedEvent } from './dynamic_action_storage';
-import { UiActionsService } from '../service';
-import { SerializedAction } from './types';
-import { TriggerContextMapping } from '../types';
-import { ActionDefinition } from './action';
-import { defaultState, transitions, selectors, State } from './dynamic_action_manager_state';
-import { StateContainer, createStateContainer } from '../../../kibana_utils';
-
-const compareEvents = (
-  a: ReadonlyArray<{ eventId: string }>,
-  b: ReadonlyArray<{ eventId: string }>
-) => {
-  if (a.length !== b.length) return false;
-  for (let i = 0; i < a.length; i++) if (a[i].eventId !== b[i].eventId) return false;
-  return true;
-};
-
-export type DynamicActionManagerState = State;
-
-export interface DynamicActionManagerParams {
-  storage: ActionStorage;
-  uiActions: Pick<
-    UiActionsService,
-    'registerAction' | 'attachAction' | 'unregisterAction' | 'detachAction' | 'getActionFactory'
-  >;
-  isCompatible: <C = unknown>(context: C) => Promise<boolean>;
-}
-
-export class DynamicActionManager {
-  static idPrefixCounter = 0;
-
-  private readonly idPrefix = `D_ACTION_${DynamicActionManager.idPrefixCounter++}_`;
-  private stopped: boolean = false;
-  private reloadSubscription?: Subscription;
-
-  /**
-   * UI State of the dynamic action manager.
-   */
-  protected readonly ui = createStateContainer(defaultState, transitions, selectors);
-
-  constructor(protected readonly params: DynamicActionManagerParams) {}
-
-  protected getEvent(eventId: string): SerializedEvent {
-    const oldEvent = this.ui.selectors.getEvent(eventId);
-    if (!oldEvent) throw new Error(`Could not find event [eventId = ${eventId}].`);
-    return oldEvent;
-  }
-
-  /**
-   * We prefix action IDs with a unique `.idPrefix`, so we can render the
-   * same dashboard twice on the screen.
-   */
-  protected generateActionId(eventId: string): string {
-    return this.idPrefix + eventId;
-  }
-
-  protected reviveAction(event: SerializedEvent) {
-    const { eventId, triggers, action } = event;
-    const { uiActions, isCompatible } = this.params;
-
-    const actionId = this.generateActionId(eventId);
-    const factory = uiActions.getActionFactory(event.action.factoryId);
-    const actionDefinition: ActionDefinition = {
-      ...factory.create(action as SerializedAction<object>),
-      id: actionId,
-      isCompatible,
-    };
-
-    uiActions.registerAction(actionDefinition);
-    for (const trigger of triggers) uiActions.attachAction(trigger as any, actionId);
-  }
-
-  protected killAction({ eventId, triggers }: SerializedEvent) {
-    const { uiActions } = this.params;
-    const actionId = this.generateActionId(eventId);
-
-    for (const trigger of triggers) uiActions.detachAction(trigger as any, actionId);
-    uiActions.unregisterAction(actionId);
-  }
-
-  private syncId = 0;
-
-  /**
-   * This function is called every time stored events might have changed not by
-   * us. For example, when in edit mode on dashboard user presses "back" button
-   * in the browser, then contents of storage changes.
-   */
-  private onSync = () => {
-    if (this.stopped) return;
-
-    (async () => {
-      const syncId = ++this.syncId;
-      const events = await this.params.storage.list();
-
-      if (this.stopped) return;
-      if (syncId !== this.syncId) return;
-      if (compareEvents(events, this.ui.get().events)) return;
-
-      for (const event of this.ui.get().events) this.killAction(event);
-      for (const event of events) this.reviveAction(event);
-      this.ui.transitions.finishFetching(events);
-    })().catch(error => {
-      /* eslint-disable */
-      console.log('Dynamic action manager storage reload failed.');
-      console.error(error);
-      /* eslint-enable */
-    });
-  };
-
-  // Public API: ---------------------------------------------------------------
-
-  /**
-   * Read-only state container of dynamic action manager. Use it to perform all
-   * *read* operations.
-   */
-  public readonly state: StateContainer<State> = this.ui;
-
-  /**
-   * 1. Loads all events from  @type {DynamicActionStorage} storage.
-   * 2. Creates actions for each event in `ui_actions` registry.
-   * 3. Adds events to UI state.
-   * 4. Does nothing if dynamic action manager was stopped or if event fetching
-   *    is already taking place.
-   */
-  public async start() {
-    if (this.stopped) return;
-    if (this.ui.get().isFetchingEvents) return;
-
-    this.ui.transitions.startFetching();
-    try {
-      const events = await this.params.storage.list();
-      for (const event of events) this.reviveAction(event);
-      this.ui.transitions.finishFetching(events);
-    } catch (error) {
-      this.ui.transitions.failFetching(error instanceof Error ? error : { message: String(error) });
-      throw error;
-    }
-
-    if (this.params.storage.reload$) {
-      this.reloadSubscription = this.params.storage.reload$.subscribe(this.onSync);
-    }
-  }
-
-  /**
-   * 1. Removes all events from `ui_actions` registry.
-   * 2. Puts dynamic action manager is stopped state.
-   */
-  public async stop() {
-    this.stopped = true;
-    const events = await this.params.storage.list();
-
-    for (const event of events) {
-      this.killAction(event);
-    }
-
-    if (this.reloadSubscription) {
-      this.reloadSubscription.unsubscribe();
-    }
-  }
-
-  /**
-   * Creates a new event.
-   *
-   * 1. Stores event in @type {DynamicActionStorage} storage.
-   * 2. Optimistically adds it to UI state, and rolls back on failure.
-   * 3. Adds action to `ui_actions` registry.
-   *
-   * @param action Dynamic action for which to create an event.
-   * @param triggers List of triggers to which action should react.
-   */
-  public async createEvent(
-    action: SerializedAction<unknown>,
-    triggers: Array<keyof TriggerContextMapping>
-  ) {
-    const event: SerializedEvent = {
-      eventId: uuidv4(),
-      triggers,
-      action,
-    };
-
-    this.ui.transitions.addEvent(event);
-    try {
-      await this.params.storage.create(event);
-      this.reviveAction(event);
-    } catch (error) {
-      this.ui.transitions.removeEvent(event.eventId);
-      throw error;
-    }
-  }
-
-  /**
-   * Updates an existing event. Fails if event with given `eventId` does not
-   * exit.
-   *
-   * 1. Updates the event in @type {DynamicActionStorage} storage.
-   * 2. Optimistically replaces the old event by the new one in UI state, and
-   *    rolls back on failure.
-   * 3. Replaces action in `ui_actions` registry with the new event.
-   *
-   *
-   * @param eventId ID of the event to replace.
-   * @param action New action for which to create the event.
-   * @param triggers List of triggers to which action should react.
-   */
-  public async updateEvent(
-    eventId: string,
-    action: SerializedAction<unknown>,
-    triggers: Array<keyof TriggerContextMapping>
-  ) {
-    const event: SerializedEvent = {
-      eventId,
-      triggers,
-      action,
-    };
-    const oldEvent = this.getEvent(eventId);
-    this.killAction(oldEvent);
-
-    this.reviveAction(event);
-    this.ui.transitions.replaceEvent(event);
-
-    try {
-      await this.params.storage.update(event);
-    } catch (error) {
-      this.killAction(event);
-      this.reviveAction(oldEvent);
-      this.ui.transitions.replaceEvent(oldEvent);
-      throw error;
-    }
-  }
-
-  /**
-   * Removes existing event. Throws if event does not exist.
-   *
-   * 1. Removes the event from @type {DynamicActionStorage} storage.
-   * 2. Optimistically removes event from UI state, and puts it back on failure.
-   * 3. Removes associated action from `ui_actions` registry.
-   *
-   * @param eventId ID of the event to remove.
-   */
-  public async deleteEvent(eventId: string) {
-    const event = this.getEvent(eventId);
-
-    this.killAction(event);
-    this.ui.transitions.removeEvent(eventId);
-
-    try {
-      await this.params.storage.remove(eventId);
-    } catch (error) {
-      this.reviveAction(event);
-      this.ui.transitions.addEvent(event);
-      throw error;
-    }
-  }
-
-  /**
-   * Deletes multiple events at once.
-   *
-   * @param eventIds List of event IDs.
-   */
-  public async deleteEvents(eventIds: string[]) {
-    await Promise.all(eventIds.map(this.deleteEvent.bind(this)));
-  }
-}
diff --git a/src/plugins/ui_actions/public/actions/dynamic_action_manager_state.ts b/src/plugins/ui_actions/public/actions/dynamic_action_manager_state.ts
deleted file mode 100644
index 636af076ea39f..0000000000000
--- a/src/plugins/ui_actions/public/actions/dynamic_action_manager_state.ts
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import { SerializedEvent } from './dynamic_action_storage';
-
-/**
- * This interface represents the state of @type {DynamicActionManager} at any
- * point in time.
- */
-export interface State {
-  /**
-   * Whether dynamic action manager is currently in process of fetching events
-   * from storage.
-   */
-  readonly isFetchingEvents: boolean;
-
-  /**
-   * Number of times event fetching has been completed.
-   */
-  readonly fetchCount: number;
-
-  /**
-   * Error received last time when fetching events.
-   */
-  readonly fetchError?: {
-    message: string;
-  };
-
-  /**
-   * List of all fetched events.
-   */
-  readonly events: readonly SerializedEvent[];
-}
-
-export interface Transitions {
-  startFetching: (state: State) => () => State;
-  finishFetching: (state: State) => (events: SerializedEvent[]) => State;
-  failFetching: (state: State) => (error: { message: string }) => State;
-  addEvent: (state: State) => (event: SerializedEvent) => State;
-  removeEvent: (state: State) => (eventId: string) => State;
-  replaceEvent: (state: State) => (event: SerializedEvent) => State;
-}
-
-export interface Selectors {
-  getEvent: (state: State) => (eventId: string) => SerializedEvent | null;
-}
-
-export const defaultState: State = {
-  isFetchingEvents: false,
-  fetchCount: 0,
-  events: [],
-};
-
-export const transitions: Transitions = {
-  startFetching: state => () => ({ ...state, isFetchingEvents: true }),
-
-  finishFetching: state => events => ({
-    ...state,
-    isFetchingEvents: false,
-    fetchCount: state.fetchCount + 1,
-    fetchError: undefined,
-    events,
-  }),
-
-  failFetching: state => ({ message }) => ({
-    ...state,
-    isFetchingEvents: false,
-    fetchCount: state.fetchCount + 1,
-    fetchError: { message },
-  }),
-
-  addEvent: state => (event: SerializedEvent) => ({
-    ...state,
-    events: [...state.events, event],
-  }),
-
-  removeEvent: state => (eventId: string) => ({
-    ...state,
-    events: state.events ? state.events.filter(event => event.eventId !== eventId) : state.events,
-  }),
-
-  replaceEvent: state => event => {
-    const index = state.events.findIndex(({ eventId }) => eventId === event.eventId);
-    if (index === -1) return state;
-
-    return {
-      ...state,
-      events: [...state.events.slice(0, index), event, ...state.events.slice(index + 1)],
-    };
-  },
-};
-
-export const selectors: Selectors = {
-  getEvent: state => eventId => state.events.find(event => event.eventId === eventId) || null,
-};
diff --git a/src/plugins/ui_actions/public/actions/dynamic_action_storage.ts b/src/plugins/ui_actions/public/actions/dynamic_action_storage.ts
deleted file mode 100644
index 28550a671782e..0000000000000
--- a/src/plugins/ui_actions/public/actions/dynamic_action_storage.ts
+++ /dev/null
@@ -1,102 +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.
- */
-
-/* eslint-disable max-classes-per-file */
-
-import { Observable, Subject } from 'rxjs';
-import { SerializedAction } from './types';
-
-/**
- * Serialized representation of event-action pair, used to persist in storage.
- */
-export interface SerializedEvent {
-  eventId: string;
-  triggers: string[];
-  action: SerializedAction<unknown>;
-}
-
-/**
- * This CRUD interface needs to be implemented by dynamic action users if they
- * want to persist the dynamic actions. It has a default implementation in
- * Embeddables, however one can use the dynamic actions without Embeddables,
- * in that case they have to implement this interface.
- */
-export interface ActionStorage {
-  create(event: SerializedEvent): Promise<void>;
-  update(event: SerializedEvent): Promise<void>;
-  remove(eventId: string): Promise<void>;
-  read(eventId: string): Promise<SerializedEvent>;
-  count(): Promise<number>;
-  list(): Promise<SerializedEvent[]>;
-
-  /**
-   * Triggered every time events changed in storage and should be re-loaded.
-   */
-  readonly reload$?: Observable<void>;
-}
-
-export abstract class AbstractActionStorage implements ActionStorage {
-  public readonly reload$: Observable<void> & Pick<Subject<void>, 'next'> = new Subject<void>();
-
-  public async count(): Promise<number> {
-    return (await this.list()).length;
-  }
-
-  public async read(eventId: string): Promise<SerializedEvent> {
-    const events = await this.list();
-    const event = events.find(ev => ev.eventId === eventId);
-    if (!event) throw new Error(`Event [eventId = ${eventId}] not found.`);
-    return event;
-  }
-
-  abstract create(event: SerializedEvent): Promise<void>;
-  abstract update(event: SerializedEvent): Promise<void>;
-  abstract remove(eventId: string): Promise<void>;
-  abstract list(): Promise<SerializedEvent[]>;
-}
-
-/**
- * This is an in-memory implementation of ActionStorage. It is used in testing,
- * but can also be used production code to store events in memory.
- */
-export class MemoryActionStorage extends AbstractActionStorage {
-  constructor(public events: readonly SerializedEvent[] = []) {
-    super();
-  }
-
-  public async list() {
-    return this.events.map(event => ({ ...event }));
-  }
-
-  public async create(event: SerializedEvent) {
-    this.events = [...this.events, { ...event }];
-  }
-
-  public async update(event: SerializedEvent) {
-    const index = this.events.findIndex(({ eventId }) => eventId === event.eventId);
-    if (index < 0) throw new Error(`Event [eventId = ${event.eventId}] not found`);
-    this.events = [...this.events.slice(0, index), { ...event }, ...this.events.slice(index + 1)];
-  }
-
-  public async remove(eventId: string) {
-    const index = this.events.findIndex(ev => eventId === ev.eventId);
-    if (index < 0) throw new Error(`Event [eventId = ${eventId}] not found`);
-    this.events = [...this.events.slice(0, index), ...this.events.slice(index + 1)];
-  }
-}
diff --git a/src/plugins/ui_actions/public/actions/index.ts b/src/plugins/ui_actions/public/actions/index.ts
index 0ddba197aced6..64bfd368e3dfa 100644
--- a/src/plugins/ui_actions/public/actions/index.ts
+++ b/src/plugins/ui_actions/public/actions/index.ts
@@ -18,11 +18,5 @@
  */
 
 export * from './action';
-export * from './action_internal';
-export * from './action_factory_definition';
-export * from './action_factory';
 export * from './create_action';
 export * from './incompatible_action_error';
-export * from './dynamic_action_storage';
-export * from './dynamic_action_manager';
-export * from './types';
diff --git a/src/plugins/ui_actions/public/actions/types.ts b/src/plugins/ui_actions/public/actions/types.ts
deleted file mode 100644
index 465f091e45ef1..0000000000000
--- a/src/plugins/ui_actions/public/actions/types.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-export interface SerializedAction<Config> {
-  readonly factoryId: string;
-  readonly name: string;
-  readonly config: Config;
-}
diff --git a/src/plugins/ui_actions/public/context_menu/build_eui_context_menu_panels.tsx b/src/plugins/ui_actions/public/context_menu/build_eui_context_menu_panels.tsx
index ec58261d9e4f7..3dce2c1f4c257 100644
--- a/src/plugins/ui_actions/public/context_menu/build_eui_context_menu_panels.tsx
+++ b/src/plugins/ui_actions/public/context_menu/build_eui_context_menu_panels.tsx
@@ -24,25 +24,19 @@ import { i18n } from '@kbn/i18n';
 import { uiToReactComponent } from '../../../kibana_react/public';
 import { Action } from '../actions';
 
-export const defaultTitle = i18n.translate('uiActions.actionPanel.title', {
-  defaultMessage: 'Options',
-});
-
 /**
  * Transforms an array of Actions to the shape EuiContextMenuPanel expects.
  */
-export async function buildContextMenuForActions<Context extends object>({
+export async function buildContextMenuForActions<A>({
   actions,
   actionContext,
-  title = defaultTitle,
   closeMenu,
 }: {
-  actions: Array<Action<Context>>;
-  actionContext: Context;
-  title?: string;
+  actions: Array<Action<A>>;
+  actionContext: A;
   closeMenu: () => void;
 }): Promise<EuiContextMenuPanelDescriptor> {
-  const menuItems = await buildEuiContextMenuPanelItems<Context>({
+  const menuItems = await buildEuiContextMenuPanelItems<A>({
     actions,
     actionContext,
     closeMenu,
@@ -50,7 +44,9 @@ export async function buildContextMenuForActions<Context extends object>({
 
   return {
     id: 'mainMenu',
-    title,
+    title: i18n.translate('uiActions.actionPanel.title', {
+      defaultMessage: 'Options',
+    }),
     items: menuItems,
   };
 }
@@ -58,41 +54,49 @@ export async function buildContextMenuForActions<Context extends object>({
 /**
  * Transform an array of Actions into the shape needed to build an EUIContextMenu
  */
-async function buildEuiContextMenuPanelItems<Context extends object>({
+async function buildEuiContextMenuPanelItems<A>({
   actions,
   actionContext,
   closeMenu,
 }: {
-  actions: Array<Action<Context>>;
-  actionContext: Context;
+  actions: Array<Action<A>>;
+  actionContext: A;
   closeMenu: () => void;
 }) {
-  const items: EuiContextMenuPanelItemDescriptor[] = new Array(actions.length);
-  const promises = actions.map(async (action, index) => {
+  const items: EuiContextMenuPanelItemDescriptor[] = [];
+  const promises = actions.map(async action => {
     const isCompatible = await action.isCompatible(actionContext);
     if (!isCompatible) {
       return;
     }
 
-    items[index] = convertPanelActionToContextMenuItem({
-      action,
-      actionContext,
-      closeMenu,
-    });
+    items.push(
+      convertPanelActionToContextMenuItem({
+        action,
+        actionContext,
+        closeMenu,
+      })
+    );
   });
 
   await Promise.all(promises);
 
-  return items.filter(Boolean);
+  return items;
 }
 
-function convertPanelActionToContextMenuItem<Context extends object>({
+/**
+ *
+ * @param {ContextMenuAction} action
+ * @param {Embeddable} embeddable
+ * @return {EuiContextMenuPanelItemDescriptor}
+ */
+function convertPanelActionToContextMenuItem<A>({
   action,
   actionContext,
   closeMenu,
 }: {
-  action: Action<Context>;
-  actionContext: Context;
+  action: Action<A>;
+  actionContext: A;
   closeMenu: () => void;
 }): EuiContextMenuPanelItemDescriptor {
   const menuPanelItem: EuiContextMenuPanelItemDescriptor = {
@@ -111,11 +115,8 @@ function convertPanelActionToContextMenuItem<Context extends object>({
     closeMenu();
   };
 
-  if (action.getHref) {
-    const href = action.getHref(actionContext);
-    if (href) {
-      menuPanelItem.href = action.getHref(actionContext);
-    }
+  if (action.getHref && action.getHref(actionContext)) {
+    menuPanelItem.href = action.getHref(actionContext);
   }
 
   return menuPanelItem;
diff --git a/src/plugins/ui_actions/public/index.ts b/src/plugins/ui_actions/public/index.ts
index 9265d35bad9a9..49b6bd5e17699 100644
--- a/src/plugins/ui_actions/public/index.ts
+++ b/src/plugins/ui_actions/public/index.ts
@@ -26,26 +26,8 @@ export function plugin(initializerContext: PluginInitializerContext) {
 
 export { UiActionsSetup, UiActionsStart } from './plugin';
 export { UiActionsServiceParams, UiActionsService } from './service';
-export {
-  Action,
-  ActionDefinition as UiActionsActionDefinition,
-  ActionFactoryDefinition as UiActionsActionFactoryDefinition,
-  ActionInternal as UiActionsActionInternal,
-  ActionStorage as UiActionsActionStorage,
-  AbstractActionStorage as UiActionsAbstractActionStorage,
-  createAction,
-  DynamicActionManager,
-  DynamicActionManagerState,
-  IncompatibleActionError,
-  SerializedAction as UiActionsSerializedAction,
-  SerializedEvent as UiActionsSerializedEvent,
-} from './actions';
+export { Action, createAction, IncompatibleActionError } from './actions';
 export { buildContextMenuForActions } from './context_menu';
-export {
-  Presentable as UiActionsPresentable,
-  Configurable as UiActionsConfigurable,
-  CollectConfigProps as UiActionsCollectConfigProps,
-} from './util';
 export {
   Trigger,
   TriggerContext,
@@ -57,4 +39,4 @@ export {
   applyFilterTrigger,
 } from './triggers';
 export { TriggerContextMapping, TriggerId, ActionContextMapping, ActionType } from './types';
-export { ActionByType, DynamicActionManager as UiActionsDynamicActionManager } from './actions';
+export { ActionByType } from './actions';
diff --git a/src/plugins/ui_actions/public/mocks.ts b/src/plugins/ui_actions/public/mocks.ts
index 4de38eb5421e9..c1be6b2626525 100644
--- a/src/plugins/ui_actions/public/mocks.ts
+++ b/src/plugins/ui_actions/public/mocks.ts
@@ -28,13 +28,10 @@ export type Start = jest.Mocked<UiActionsStart>;
 
 const createSetupContract = (): Setup => {
   const setupContract: Setup = {
-    addTriggerAction: jest.fn(),
     attachAction: jest.fn(),
     detachAction: jest.fn(),
     registerAction: jest.fn(),
-    registerActionFactory: jest.fn(),
     registerTrigger: jest.fn(),
-    unregisterAction: jest.fn(),
   };
   return setupContract;
 };
@@ -42,21 +39,16 @@ const createSetupContract = (): Setup => {
 const createStartContract = (): Start => {
   const startContract: Start = {
     attachAction: jest.fn(),
-    unregisterAction: jest.fn(),
-    addTriggerAction: jest.fn(),
-    clear: jest.fn(),
+    registerAction: jest.fn(),
+    registerTrigger: jest.fn(),
+    getAction: jest.fn(),
     detachAction: jest.fn(),
     executeTriggerActions: jest.fn(),
-    fork: jest.fn(),
-    getAction: jest.fn(),
-    getActionFactories: jest.fn(),
-    getActionFactory: jest.fn(),
     getTrigger: jest.fn(),
     getTriggerActions: jest.fn((id: TriggerId) => []),
     getTriggerCompatibleActions: jest.fn(),
-    registerAction: jest.fn(),
-    registerActionFactory: jest.fn(),
-    registerTrigger: jest.fn(),
+    clear: jest.fn(),
+    fork: jest.fn(),
   };
 
   return startContract;
diff --git a/src/plugins/ui_actions/public/plugin.ts b/src/plugins/ui_actions/public/plugin.ts
index 88a5cb04eac6f..928e57937a9b5 100644
--- a/src/plugins/ui_actions/public/plugin.ts
+++ b/src/plugins/ui_actions/public/plugin.ts
@@ -23,13 +23,7 @@ import { selectRangeTrigger, valueClickTrigger, applyFilterTrigger } from './tri
 
 export type UiActionsSetup = Pick<
   UiActionsService,
-  | 'addTriggerAction'
-  | 'attachAction'
-  | 'detachAction'
-  | 'registerAction'
-  | 'registerActionFactory'
-  | 'registerTrigger'
-  | 'unregisterAction'
+  'attachAction' | 'detachAction' | 'registerAction' | 'registerTrigger'
 >;
 
 export type UiActionsStart = PublicMethodsOf<UiActionsService>;
diff --git a/src/plugins/ui_actions/public/service/ui_actions_service.test.ts b/src/plugins/ui_actions/public/service/ui_actions_service.test.ts
index 41e2b57d53dd8..bdf71a25e6dbc 100644
--- a/src/plugins/ui_actions/public/service/ui_actions_service.test.ts
+++ b/src/plugins/ui_actions/public/service/ui_actions_service.test.ts
@@ -18,13 +18,7 @@
  */
 
 import { UiActionsService } from './ui_actions_service';
-import {
-  Action,
-  ActionInternal,
-  createAction,
-  ActionFactoryDefinition,
-  ActionFactory,
-} from '../actions';
+import { Action, createAction } from '../actions';
 import { createHelloWorldAction } from '../tests/test_samples';
 import { ActionRegistry, TriggerRegistry, TriggerId, ActionType } from '../types';
 import { Trigger } from '../triggers';
@@ -108,21 +102,6 @@ describe('UiActionsService', () => {
         type: 'test' as ActionType,
       });
     });
-
-    test('return action instance', () => {
-      const service = new UiActionsService();
-      const action = service.registerAction({
-        id: 'test',
-        execute: async () => {},
-        getDisplayName: () => 'test',
-        getIconType: () => '',
-        isCompatible: async () => true,
-        type: 'test' as ActionType,
-      });
-
-      expect(action).toBeInstanceOf(ActionInternal);
-      expect(action.id).toBe('test');
-    });
   });
 
   describe('.getTriggerActions()', () => {
@@ -160,14 +139,13 @@ describe('UiActionsService', () => {
 
       expect(list0).toHaveLength(0);
 
-      service.addTriggerAction(FOO_TRIGGER, action1);
+      service.attachAction(FOO_TRIGGER, action1);
       const list1 = service.getTriggerActions(FOO_TRIGGER);
 
       expect(list1).toHaveLength(1);
-      expect(list1[0]).toBeInstanceOf(ActionInternal);
-      expect(list1[0].id).toBe(action1.id);
+      expect(list1).toEqual([action1]);
 
-      service.addTriggerAction(FOO_TRIGGER, action2);
+      service.attachAction(FOO_TRIGGER, action2);
       const list2 = service.getTriggerActions(FOO_TRIGGER);
 
       expect(list2).toHaveLength(2);
@@ -186,7 +164,7 @@ describe('UiActionsService', () => {
       service.registerAction(helloWorldAction);
 
       expect(actions.size - length).toBe(1);
-      expect(actions.get(helloWorldAction.id)!.id).toBe(helloWorldAction.id);
+      expect(actions.get(helloWorldAction.id)).toBe(helloWorldAction);
     });
 
     test('getTriggerCompatibleActions returns attached actions', async () => {
@@ -200,7 +178,7 @@ describe('UiActionsService', () => {
         title: 'My trigger',
       };
       service.registerTrigger(testTrigger);
-      service.addTriggerAction(MY_TRIGGER, helloWorldAction);
+      service.attachAction(MY_TRIGGER, helloWorldAction);
 
       const compatibleActions = await service.getTriggerCompatibleActions(MY_TRIGGER, {
         hi: 'there',
@@ -226,7 +204,7 @@ describe('UiActionsService', () => {
       };
 
       service.registerTrigger(testTrigger);
-      service.addTriggerAction(testTrigger.id, action);
+      service.attachAction(testTrigger.id, action);
 
       const compatibleActions1 = await service.getTriggerCompatibleActions(testTrigger.id, {
         accept: true,
@@ -310,7 +288,7 @@ describe('UiActionsService', () => {
         id: FOO_TRIGGER,
       });
       service1.registerAction(testAction1);
-      service1.addTriggerAction(FOO_TRIGGER, testAction1);
+      service1.attachAction(FOO_TRIGGER, testAction1);
 
       const service2 = service1.fork();
 
@@ -331,14 +309,14 @@ describe('UiActionsService', () => {
       });
       service1.registerAction(testAction1);
       service1.registerAction(testAction2);
-      service1.addTriggerAction(FOO_TRIGGER, testAction1);
+      service1.attachAction(FOO_TRIGGER, testAction1);
 
       const service2 = service1.fork();
 
       expect(service1.getTriggerActions(FOO_TRIGGER)).toHaveLength(1);
       expect(service2.getTriggerActions(FOO_TRIGGER)).toHaveLength(1);
 
-      service2.addTriggerAction(FOO_TRIGGER, testAction2);
+      service2.attachAction(FOO_TRIGGER, testAction2);
 
       expect(service1.getTriggerActions(FOO_TRIGGER)).toHaveLength(1);
       expect(service2.getTriggerActions(FOO_TRIGGER)).toHaveLength(2);
@@ -352,14 +330,14 @@ describe('UiActionsService', () => {
       });
       service1.registerAction(testAction1);
       service1.registerAction(testAction2);
-      service1.addTriggerAction(FOO_TRIGGER, testAction1);
+      service1.attachAction(FOO_TRIGGER, testAction1);
 
       const service2 = service1.fork();
 
       expect(service1.getTriggerActions(FOO_TRIGGER)).toHaveLength(1);
       expect(service2.getTriggerActions(FOO_TRIGGER)).toHaveLength(1);
 
-      service1.addTriggerAction(FOO_TRIGGER, testAction2);
+      service1.attachAction(FOO_TRIGGER, testAction2);
 
       expect(service1.getTriggerActions(FOO_TRIGGER)).toHaveLength(2);
       expect(service2.getTriggerActions(FOO_TRIGGER)).toHaveLength(1);
@@ -414,7 +392,7 @@ describe('UiActionsService', () => {
       } as any;
 
       service.registerTrigger(trigger);
-      service.addTriggerAction(MY_TRIGGER, action);
+      service.attachAction(MY_TRIGGER, action);
 
       const actions = service.getTriggerActions(trigger.id);
 
@@ -422,7 +400,7 @@ describe('UiActionsService', () => {
       expect(actions[0].id).toBe(ACTION_HELLO_WORLD);
     });
 
-    test('can detach an action from a trigger', () => {
+    test('can detach an action to a trigger', () => {
       const service = new UiActionsService();
 
       const trigger: Trigger = {
@@ -435,7 +413,7 @@ describe('UiActionsService', () => {
 
       service.registerTrigger(trigger);
       service.registerAction(action);
-      service.addTriggerAction(trigger.id, action);
+      service.attachAction(trigger.id, action);
       service.detachAction(trigger.id, action.id);
 
       const actions2 = service.getTriggerActions(trigger.id);
@@ -467,7 +445,7 @@ describe('UiActionsService', () => {
       } as any;
 
       service.registerAction(action);
-      expect(() => service.addTriggerAction('i do not exist' as TriggerId, action)).toThrowError(
+      expect(() => service.attachAction('i do not exist' as TriggerId, action)).toThrowError(
         'No trigger [triggerId = i do not exist] exists, for attaching action [actionId = ACTION_HELLO_WORLD].'
       );
     });
@@ -497,64 +475,4 @@ describe('UiActionsService', () => {
       );
     });
   });
-
-  describe('action factories', () => {
-    const factoryDefinition1: ActionFactoryDefinition = {
-      id: 'test-factory-1',
-      CollectConfig: {} as any,
-      createConfig: () => ({}),
-      isConfigValid: () => true,
-      create: () => ({} as any),
-    };
-    const factoryDefinition2: ActionFactoryDefinition = {
-      id: 'test-factory-2',
-      CollectConfig: {} as any,
-      createConfig: () => ({}),
-      isConfigValid: () => true,
-      create: () => ({} as any),
-    };
-
-    test('.getActionFactories() returns empty array if no action factories registered', () => {
-      const service = new UiActionsService();
-
-      const factories = service.getActionFactories();
-
-      expect(factories).toEqual([]);
-    });
-
-    test('can register and retrieve an action factory', () => {
-      const service = new UiActionsService();
-
-      service.registerActionFactory(factoryDefinition1);
-
-      const factory = service.getActionFactory(factoryDefinition1.id);
-
-      expect(factory).toBeInstanceOf(ActionFactory);
-      expect(factory.id).toBe(factoryDefinition1.id);
-    });
-
-    test('can retrieve all action factories', () => {
-      const service = new UiActionsService();
-
-      service.registerActionFactory(factoryDefinition1);
-      service.registerActionFactory(factoryDefinition2);
-
-      const factories = service.getActionFactories();
-      const factoriesSorted = [...factories].sort((f1, f2) => (f1.id > f2.id ? 1 : -1));
-
-      expect(factoriesSorted.length).toBe(2);
-      expect(factoriesSorted[0].id).toBe(factoryDefinition1.id);
-      expect(factoriesSorted[1].id).toBe(factoryDefinition2.id);
-    });
-
-    test('throws when retrieving action factory that does not exist', () => {
-      const service = new UiActionsService();
-
-      service.registerActionFactory(factoryDefinition1);
-
-      expect(() => service.getActionFactory('UNKNOWN_ID')).toThrowError(
-        'Action factory [actionFactoryId = UNKNOWN_ID] does not exist.'
-      );
-    });
-  });
 });
diff --git a/src/plugins/ui_actions/public/service/ui_actions_service.ts b/src/plugins/ui_actions/public/service/ui_actions_service.ts
index 8bd3bb34fbbd8..f7718e63773f5 100644
--- a/src/plugins/ui_actions/public/service/ui_actions_service.ts
+++ b/src/plugins/ui_actions/public/service/ui_actions_service.ts
@@ -24,17 +24,8 @@ import {
   TriggerId,
   TriggerContextMapping,
   ActionType,
-  ActionFactoryRegistry,
 } from '../types';
-import {
-  ActionInternal,
-  Action,
-  ActionByType,
-  ActionFactory,
-  ActionDefinition,
-  ActionFactoryDefinition,
-  ActionContext,
-} from '../actions';
+import { Action, ActionByType } from '../actions';
 import { Trigger, TriggerContext } from '../triggers/trigger';
 import { TriggerInternal } from '../triggers/trigger_internal';
 import { TriggerContract } from '../triggers/trigger_contract';
@@ -47,25 +38,21 @@ export interface UiActionsServiceParams {
    * A 1-to-N mapping from `Trigger` to zero or more `Action`.
    */
   readonly triggerToActions?: TriggerToActionsRegistry;
-  readonly actionFactories?: ActionFactoryRegistry;
 }
 
 export class UiActionsService {
   protected readonly triggers: TriggerRegistry;
   protected readonly actions: ActionRegistry;
   protected readonly triggerToActions: TriggerToActionsRegistry;
-  protected readonly actionFactories: ActionFactoryRegistry;
 
   constructor({
     triggers = new Map(),
     actions = new Map(),
     triggerToActions = new Map(),
-    actionFactories = new Map(),
   }: UiActionsServiceParams = {}) {
     this.triggers = triggers;
     this.actions = actions;
     this.triggerToActions = triggerToActions;
-    this.actionFactories = actionFactories;
   }
 
   public readonly registerTrigger = (trigger: Trigger) => {
@@ -89,44 +76,49 @@ export class UiActionsService {
     return trigger.contract;
   };
 
-  public readonly registerAction = <A extends ActionDefinition>(
-    definition: A
-  ): ActionInternal<A> => {
-    if (this.actions.has(definition.id)) {
-      throw new Error(`Action [action.id = ${definition.id}] already registered.`);
+  public readonly registerAction = <T extends ActionType>(action: ActionByType<T>) => {
+    if (this.actions.has(action.id)) {
+      throw new Error(`Action [action.id = ${action.id}] already registered.`);
     }
 
-    const action = new ActionInternal(definition);
-
     this.actions.set(action.id, action);
-
-    return action;
   };
 
-  public readonly unregisterAction = (actionId: string): void => {
-    if (!this.actions.has(actionId)) {
-      throw new Error(`Action [action.id = ${actionId}] is not registered.`);
+  public readonly getAction = <T extends ActionType>(id: string): ActionByType<T> => {
+    if (!this.actions.has(id)) {
+      throw new Error(`Action [action.id = ${id}] not registered.`);
     }
 
-    this.actions.delete(actionId);
+    return this.actions.get(id) as ActionByType<T>;
   };
 
-  public readonly attachAction = <TriggerId extends keyof TriggerContextMapping>(
-    triggerId: TriggerId,
-    actionId: string
+  public readonly attachAction = <TType extends TriggerId, AType extends ActionType>(
+    triggerId: TType,
+    // The action can accept partial or no context, but if it needs context not provided
+    // by this type of trigger, typescript will complain. yay!
+    action: ActionByType<AType> & Action<TriggerContextMapping[TType]>
   ): void => {
+    if (!this.actions.has(action.id)) {
+      this.registerAction(action);
+    } else {
+      const registeredAction = this.actions.get(action.id);
+      if (registeredAction !== action) {
+        throw new Error(`A different action instance with this id is already registered.`);
+      }
+    }
+
     const trigger = this.triggers.get(triggerId);
 
     if (!trigger) {
       throw new Error(
-        `No trigger [triggerId = ${triggerId}] exists, for attaching action [actionId = ${actionId}].`
+        `No trigger [triggerId = ${triggerId}] exists, for attaching action [actionId = ${action.id}].`
       );
     }
 
     const actionIds = this.triggerToActions.get(triggerId);
 
-    if (!actionIds!.find(id => id === actionId)) {
-      this.triggerToActions.set(triggerId, [...actionIds!, actionId]);
+    if (!actionIds!.find(id => id === action.id)) {
+      this.triggerToActions.set(triggerId, [...actionIds!, action.id]);
     }
   };
 
@@ -147,26 +139,6 @@ export class UiActionsService {
     );
   };
 
-  public readonly addTriggerAction = <TType extends TriggerId, AType extends ActionType>(
-    triggerId: TType,
-    // The action can accept partial or no context, but if it needs context not provided
-    // by this type of trigger, typescript will complain. yay!
-    action: ActionByType<AType> & Action<TriggerContextMapping[TType]>
-  ): void => {
-    if (!this.actions.has(action.id)) this.registerAction(action);
-    this.attachAction(triggerId, action.id);
-  };
-
-  public readonly getAction = <T extends ActionDefinition>(
-    id: string
-  ): Action<ActionContext<T>> => {
-    if (!this.actions.has(id)) {
-      throw new Error(`Action [action.id = ${id}] not registered.`);
-    }
-
-    return this.actions.get(id) as ActionInternal<T>;
-  };
-
   public readonly getTriggerActions = <T extends TriggerId>(
     triggerId: T
   ): Array<Action<TriggerContextMapping[T]>> => {
@@ -175,9 +147,9 @@ export class UiActionsService {
 
     const actionIds = this.triggerToActions.get(triggerId);
 
-    const actions = actionIds!
-      .map(actionId => this.actions.get(actionId) as ActionInternal)
-      .filter(Boolean);
+    const actions = actionIds!.map(actionId => this.actions.get(actionId)).filter(Boolean) as Array<
+      Action<TriggerContextMapping[T]>
+    >;
 
     return actions as Array<Action<TriggerContext<T>>>;
   };
@@ -215,7 +187,6 @@ export class UiActionsService {
     this.actions.clear();
     this.triggers.clear();
     this.triggerToActions.clear();
-    this.actionFactories.clear();
   };
 
   /**
@@ -235,41 +206,4 @@ export class UiActionsService {
 
     return new UiActionsService({ triggers, actions, triggerToActions });
   };
-
-  /**
-   * Register an action factory. Action factories are used to configure and
-   * serialize/deserialize dynamic actions.
-   */
-  public readonly registerActionFactory = <
-    Config extends object = object,
-    FactoryContext extends object = object,
-    ActionContext extends object = object
-  >(
-    definition: ActionFactoryDefinition<Config, FactoryContext, ActionContext>
-  ) => {
-    if (this.actionFactories.has(definition.id)) {
-      throw new Error(`ActionFactory [actionFactory.id = ${definition.id}] already registered.`);
-    }
-
-    const actionFactory = new ActionFactory<Config, FactoryContext, ActionContext>(definition);
-
-    this.actionFactories.set(actionFactory.id, actionFactory as ActionFactory<any, any, any>);
-  };
-
-  public readonly getActionFactory = (actionFactoryId: string): ActionFactory => {
-    const actionFactory = this.actionFactories.get(actionFactoryId);
-
-    if (!actionFactory) {
-      throw new Error(`Action factory [actionFactoryId = ${actionFactoryId}] does not exist.`);
-    }
-
-    return actionFactory;
-  };
-
-  /**
-   * Returns an array of all action factories.
-   */
-  public readonly getActionFactories = (): ActionFactory[] => {
-    return [...this.actionFactories.values()];
-  };
 }
diff --git a/src/plugins/ui_actions/public/tests/execute_trigger_actions.test.ts b/src/plugins/ui_actions/public/tests/execute_trigger_actions.test.ts
index ade21ee4b7d91..5b427f918c173 100644
--- a/src/plugins/ui_actions/public/tests/execute_trigger_actions.test.ts
+++ b/src/plugins/ui_actions/public/tests/execute_trigger_actions.test.ts
@@ -69,7 +69,7 @@ test('executes a single action mapped to a trigger', async () => {
   const action = createTestAction('test1', () => true);
 
   setup.registerTrigger(trigger);
-  setup.addTriggerAction(trigger.id, action);
+  setup.attachAction(trigger.id, action);
 
   const context = {};
   const start = doStart();
@@ -109,7 +109,7 @@ test('does not execute an incompatible action', async () => {
   );
 
   setup.registerTrigger(trigger);
-  setup.addTriggerAction(trigger.id, action);
+  setup.attachAction(trigger.id, action);
 
   const start = doStart();
   const context = {
@@ -130,8 +130,8 @@ test('shows a context menu when more than one action is mapped to a trigger', as
   const action2 = createTestAction('test2', () => true);
 
   setup.registerTrigger(trigger);
-  setup.addTriggerAction(trigger.id, action1);
-  setup.addTriggerAction(trigger.id, action2);
+  setup.attachAction(trigger.id, action1);
+  setup.attachAction(trigger.id, action2);
 
   expect(openContextMenu).toHaveBeenCalledTimes(0);
 
@@ -155,7 +155,7 @@ test('passes whole action context to isCompatible()', async () => {
   });
 
   setup.registerTrigger(trigger);
-  setup.addTriggerAction(trigger.id, action);
+  setup.attachAction(trigger.id, action);
 
   const start = doStart();
 
diff --git a/src/plugins/ui_actions/public/tests/get_trigger_actions.test.ts b/src/plugins/ui_actions/public/tests/get_trigger_actions.test.ts
index 55ccac42ff255..f5a6a96fb41a4 100644
--- a/src/plugins/ui_actions/public/tests/get_trigger_actions.test.ts
+++ b/src/plugins/ui_actions/public/tests/get_trigger_actions.test.ts
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { ActionInternal, Action } from '../actions';
+import { Action } from '../actions';
 import { uiActionsPluginMock } from '../mocks';
 import { TriggerId, ActionType } from '../types';
 
@@ -47,14 +47,13 @@ test('returns actions set on trigger', () => {
 
   expect(list0).toHaveLength(0);
 
-  setup.addTriggerAction('trigger' as TriggerId, action1);
+  setup.attachAction('trigger' as TriggerId, action1);
   const list1 = start.getTriggerActions('trigger' as TriggerId);
 
   expect(list1).toHaveLength(1);
-  expect(list1[0]).toBeInstanceOf(ActionInternal);
-  expect(list1[0].id).toBe(action1.id);
+  expect(list1).toEqual([action1]);
 
-  setup.addTriggerAction('trigger' as TriggerId, action2);
+  setup.attachAction('trigger' as TriggerId, action2);
   const list2 = start.getTriggerActions('trigger' as TriggerId);
 
   expect(list2).toHaveLength(2);
diff --git a/src/plugins/ui_actions/public/tests/get_trigger_compatible_actions.test.ts b/src/plugins/ui_actions/public/tests/get_trigger_compatible_actions.test.ts
index 21dd17ed82e3f..c5e68e5d5ca5a 100644
--- a/src/plugins/ui_actions/public/tests/get_trigger_compatible_actions.test.ts
+++ b/src/plugins/ui_actions/public/tests/get_trigger_compatible_actions.test.ts
@@ -37,7 +37,7 @@ beforeEach(() => {
     id: 'trigger' as TriggerId,
     title: 'trigger',
   });
-  uiActions.setup.addTriggerAction('trigger' as TriggerId, action);
+  uiActions.setup.attachAction('trigger' as TriggerId, action);
 });
 
 test('can register action', async () => {
@@ -58,7 +58,7 @@ test('getTriggerCompatibleActions returns attached actions', async () => {
     title: 'My trigger',
   };
   setup.registerTrigger(testTrigger);
-  setup.addTriggerAction('MY-TRIGGER' as TriggerId, helloWorldAction);
+  setup.attachAction('MY-TRIGGER' as TriggerId, helloWorldAction);
 
   const start = doStart();
   const actions = await start.getTriggerCompatibleActions('MY-TRIGGER' as TriggerId, {});
@@ -84,7 +84,7 @@ test('filters out actions not applicable based on the context', async () => {
 
   setup.registerTrigger(testTrigger);
   setup.registerAction(action1);
-  setup.addTriggerAction(testTrigger.id, action1);
+  setup.attachAction(testTrigger.id, action1);
 
   const start = doStart();
   let actions = await start.getTriggerCompatibleActions(testTrigger.id, { accept: true });
diff --git a/src/plugins/ui_actions/public/tests/test_samples/index.ts b/src/plugins/ui_actions/public/tests/test_samples/index.ts
index dfa71cec89595..7d63b1b6d5669 100644
--- a/src/plugins/ui_actions/public/tests/test_samples/index.ts
+++ b/src/plugins/ui_actions/public/tests/test_samples/index.ts
@@ -16,5 +16,4 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 export { createHelloWorldAction } from './hello_world_action';
diff --git a/src/plugins/ui_actions/public/triggers/select_range_trigger.ts b/src/plugins/ui_actions/public/triggers/select_range_trigger.ts
index 9758508dc3dac..c638db0ce9dab 100644
--- a/src/plugins/ui_actions/public/triggers/select_range_trigger.ts
+++ b/src/plugins/ui_actions/public/triggers/select_range_trigger.ts
@@ -22,6 +22,6 @@ import { Trigger } from '.';
 export const SELECT_RANGE_TRIGGER = 'SELECT_RANGE_TRIGGER';
 export const selectRangeTrigger: Trigger<'SELECT_RANGE_TRIGGER'> = {
   id: SELECT_RANGE_TRIGGER,
-  title: '',
+  title: 'Select range',
   description: 'Applies a range filter',
 };
diff --git a/src/plugins/ui_actions/public/triggers/trigger_internal.ts b/src/plugins/ui_actions/public/triggers/trigger_internal.ts
index 9885ed3abe93b..5b670df354f78 100644
--- a/src/plugins/ui_actions/public/triggers/trigger_internal.ts
+++ b/src/plugins/ui_actions/public/triggers/trigger_internal.ts
@@ -72,7 +72,6 @@ export class TriggerInternal<T extends TriggerId> {
     const panel = await buildContextMenuForActions({
       actions,
       actionContext: context,
-      title: this.trigger.title,
       closeMenu: () => session.close(),
     });
     const session = openContextMenu([panel]);
diff --git a/src/plugins/ui_actions/public/triggers/value_click_trigger.ts b/src/plugins/ui_actions/public/triggers/value_click_trigger.ts
index 2671584d105c8..ad32bdc1b564e 100644
--- a/src/plugins/ui_actions/public/triggers/value_click_trigger.ts
+++ b/src/plugins/ui_actions/public/triggers/value_click_trigger.ts
@@ -22,6 +22,6 @@ import { Trigger } from '.';
 export const VALUE_CLICK_TRIGGER = 'VALUE_CLICK_TRIGGER';
 export const valueClickTrigger: Trigger<'VALUE_CLICK_TRIGGER'> = {
   id: VALUE_CLICK_TRIGGER,
-  title: '',
+  title: 'Value clicked',
   description: 'Value was clicked',
 };
diff --git a/src/plugins/ui_actions/public/types.ts b/src/plugins/ui_actions/public/types.ts
index 2cb4a8f26a879..c7e6d61e15f31 100644
--- a/src/plugins/ui_actions/public/types.ts
+++ b/src/plugins/ui_actions/public/types.ts
@@ -17,17 +17,15 @@
  * under the License.
  */
 
-import { ActionInternal } from './actions/action_internal';
+import { ActionByType } from './actions/action';
 import { TriggerInternal } from './triggers/trigger_internal';
-import { ActionFactory } from './actions';
 import { EmbeddableVisTriggerContext, IEmbeddable } from '../../embeddable/public';
 import { Filter } from '../../data/public';
 import { SELECT_RANGE_TRIGGER, VALUE_CLICK_TRIGGER, APPLY_FILTER_TRIGGER } from './triggers';
 
 export type TriggerRegistry = Map<TriggerId, TriggerInternal<any>>;
-export type ActionRegistry = Map<string, ActionInternal>;
+export type ActionRegistry = Map<string, ActionByType<any>>;
 export type TriggerToActionsRegistry = Map<TriggerId, string[]>;
-export type ActionFactoryRegistry = Map<string, ActionFactory>;
 
 const DEFAULT_TRIGGER = '';
 
diff --git a/src/plugins/ui_actions/public/util/configurable.ts b/src/plugins/ui_actions/public/util/configurable.ts
deleted file mode 100644
index d3a527a2183b1..0000000000000
--- a/src/plugins/ui_actions/public/util/configurable.ts
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import { UiComponent } from 'src/plugins/kibana_utils/common';
-
-/**
- * Represents something that can be configured by user using UI.
- */
-export interface Configurable<Config extends object = object, Context = object> {
-  /**
-   * Create default config for this item, used when item is created for the first time.
-   */
-  readonly createConfig: () => Config;
-
-  /**
-   * Is this config valid. Used to validate user's input before saving.
-   */
-  readonly isConfigValid: (config: Config) => boolean;
-
-  /**
-   * `UiComponent` to be rendered when collecting configuration for this item.
-   */
-  readonly CollectConfig: UiComponent<CollectConfigProps<Config, Context>>;
-}
-
-/**
- * Props provided to `CollectConfig` component on every re-render.
- */
-export interface CollectConfigProps<Config extends object = object, Context = object> {
-  /**
-   * Current (latest) config of the item.
-   */
-  config: Config;
-
-  /**
-   * Callback called when user updates the config in UI.
-   */
-  onConfig: (config: Config) => void;
-
-  /**
-   * Context information about where component is being rendered.
-   */
-  context: Context;
-}
diff --git a/src/plugins/ui_actions/public/util/index.ts b/src/plugins/ui_actions/public/util/index.ts
deleted file mode 100644
index 53c6109cac4ca..0000000000000
--- a/src/plugins/ui_actions/public/util/index.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-export * from './presentable';
-export * from './configurable';
diff --git a/src/plugins/ui_actions/scripts/storybook.js b/src/plugins/ui_actions/scripts/storybook.js
deleted file mode 100644
index cb2eda610170d..0000000000000
--- a/src/plugins/ui_actions/scripts/storybook.js
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import { join } from 'path';
-
-// eslint-disable-next-line
-require('@kbn/storybook').runStorybookCli({
-  name: 'ui_actions',
-  storyGlobs: [join(__dirname, '..', 'public', 'components', '**', '*.story.tsx')],
-});
diff --git a/test/plugin_functional/plugins/kbn_tp_embeddable_explorer/public/np_ready/public/plugin.tsx b/test/plugin_functional/plugins/kbn_tp_embeddable_explorer/public/np_ready/public/plugin.tsx
index 8ddb2e1a4803b..18ceec652392d 100644
--- a/test/plugin_functional/plugins/kbn_tp_embeddable_explorer/public/np_ready/public/plugin.tsx
+++ b/test/plugin_functional/plugins/kbn_tp_embeddable_explorer/public/np_ready/public/plugin.tsx
@@ -70,10 +70,11 @@ export class EmbeddableExplorerPublicPlugin
     const sayHelloAction = new SayHelloAction(alert);
     const sendMessageAction = createSendMessageAction(core.overlays);
 
+    plugins.uiActions.registerAction(helloWorldAction);
     plugins.uiActions.registerAction(sayHelloAction);
     plugins.uiActions.registerAction(sendMessageAction);
 
-    plugins.uiActions.addTriggerAction(CONTEXT_MENU_TRIGGER, helloWorldAction);
+    plugins.uiActions.attachAction(CONTEXT_MENU_TRIGGER, helloWorldAction);
 
     plugins.__LEGACY.onRenderComplete(() => {
       const root = document.getElementById(REACT_ROOT_ID);
diff --git a/test/plugin_functional/plugins/kbn_tp_sample_panel_action/public/sample_panel_action.tsx b/test/plugin_functional/plugins/kbn_tp_sample_panel_action/public/sample_panel_action.tsx
index 7c7cc689d05e5..8395fddece2a4 100644
--- a/test/plugin_functional/plugins/kbn_tp_sample_panel_action/public/sample_panel_action.tsx
+++ b/test/plugin_functional/plugins/kbn_tp_sample_panel_action/public/sample_panel_action.tsx
@@ -62,4 +62,5 @@ function createSamplePanelAction() {
 }
 
 const action = createSamplePanelAction();
-npSetup.plugins.uiActions.addTriggerAction(CONTEXT_MENU_TRIGGER, action);
+npSetup.plugins.uiActions.registerAction(action);
+npSetup.plugins.uiActions.attachAction(CONTEXT_MENU_TRIGGER, action);
diff --git a/test/plugin_functional/plugins/kbn_tp_sample_panel_action/public/sample_panel_link.ts b/test/plugin_functional/plugins/kbn_tp_sample_panel_action/public/sample_panel_link.ts
index e034fbe320608..4b09be4db8a60 100644
--- a/test/plugin_functional/plugins/kbn_tp_sample_panel_action/public/sample_panel_link.ts
+++ b/test/plugin_functional/plugins/kbn_tp_sample_panel_action/public/sample_panel_link.ts
@@ -33,4 +33,5 @@ export const createSamplePanelLink = (): Action =>
   });
 
 const action = createSamplePanelLink();
-npStart.plugins.uiActions.addTriggerAction(CONTEXT_MENU_TRIGGER, action);
+npStart.plugins.uiActions.registerAction(action);
+npStart.plugins.uiActions.attachAction(CONTEXT_MENU_TRIGGER, action);
diff --git a/x-pack/.i18nrc.json b/x-pack/.i18nrc.json
index 784b5a5a42ace..2a28e349ace99 100644
--- a/x-pack/.i18nrc.json
+++ b/x-pack/.i18nrc.json
@@ -9,7 +9,6 @@
     "xpack.beatsManagement": "legacy/plugins/beats_management",
     "xpack.canvas": "legacy/plugins/canvas",
     "xpack.crossClusterReplication": "legacy/plugins/cross_cluster_replication",
-    "xpack.dashboard": "plugins/dashboard_enhanced",
     "xpack.dashboardMode": "legacy/plugins/dashboard_mode",
     "xpack.data": "plugins/data_enhanced",
     "xpack.drilldowns": "plugins/drilldowns",
diff --git a/x-pack/plugins/advanced_ui_actions/public/components/action_wizard/action_wizard.scss b/x-pack/plugins/advanced_ui_actions/public/components/action_wizard/action_wizard.scss
index 87ec3f8fc7ec1..2ba6f9baca90d 100644
--- a/x-pack/plugins/advanced_ui_actions/public/components/action_wizard/action_wizard.scss
+++ b/x-pack/plugins/advanced_ui_actions/public/components/action_wizard/action_wizard.scss
@@ -1,3 +1,8 @@
+.auaActionWizard__selectedActionFactoryContainer {
+  background-color: $euiColorLightestShade;
+  padding: $euiSize;
+}
+
 .auaActionWizard__actionFactoryItem {
   .euiKeyPadMenuItem__label {
     height: #{$euiSizeXL};
diff --git a/x-pack/plugins/advanced_ui_actions/public/components/action_wizard/action_wizard.story.tsx b/x-pack/plugins/advanced_ui_actions/public/components/action_wizard/action_wizard.story.tsx
index 9c73f07289dc9..62f16890cade2 100644
--- a/x-pack/plugins/advanced_ui_actions/public/components/action_wizard/action_wizard.story.tsx
+++ b/x-pack/plugins/advanced_ui_actions/public/components/action_wizard/action_wizard.story.tsx
@@ -6,26 +6,28 @@
 
 import React from 'react';
 import { storiesOf } from '@storybook/react';
-import { Demo, dashboardFactory, urlFactory } from './test_data';
+import { dashboardDrilldownActionFactory, Demo, urlDrilldownActionFactory } from './test_data';
 
 storiesOf('components/ActionWizard', module)
-  .add('default', () => <Demo actionFactories={[dashboardFactory, urlFactory]} />)
+  .add('default', () => (
+    <Demo actionFactories={[dashboardDrilldownActionFactory, urlDrilldownActionFactory]} />
+  ))
   .add('Only one factory is available', () => (
     // to make sure layout doesn't break
-    <Demo actionFactories={[dashboardFactory]} />
+    <Demo actionFactories={[dashboardDrilldownActionFactory]} />
   ))
   .add('Long list of action factories', () => (
     // to make sure layout doesn't break
     <Demo
       actionFactories={[
-        dashboardFactory,
-        urlFactory,
-        dashboardFactory,
-        urlFactory,
-        dashboardFactory,
-        urlFactory,
-        dashboardFactory,
-        urlFactory,
+        dashboardDrilldownActionFactory,
+        urlDrilldownActionFactory,
+        dashboardDrilldownActionFactory,
+        urlDrilldownActionFactory,
+        dashboardDrilldownActionFactory,
+        urlDrilldownActionFactory,
+        dashboardDrilldownActionFactory,
+        urlDrilldownActionFactory,
       ]}
     />
   ));
diff --git a/x-pack/plugins/advanced_ui_actions/public/components/action_wizard/action_wizard.test.tsx b/x-pack/plugins/advanced_ui_actions/public/components/action_wizard/action_wizard.test.tsx
index cc56714fcb2f8..aea47be693b8f 100644
--- a/x-pack/plugins/advanced_ui_actions/public/components/action_wizard/action_wizard.test.tsx
+++ b/x-pack/plugins/advanced_ui_actions/public/components/action_wizard/action_wizard.test.tsx
@@ -8,14 +8,21 @@ import React from 'react';
 import { cleanup, fireEvent, render } from '@testing-library/react/pure';
 import '@testing-library/jest-dom/extend-expect'; // TODO: this should be global
 import { TEST_SUBJ_ACTION_FACTORY_ITEM, TEST_SUBJ_SELECTED_ACTION_FACTORY } from './action_wizard';
-import { dashboardFactory, dashboards, Demo, urlFactory } from './test_data';
+import {
+  dashboardDrilldownActionFactory,
+  dashboards,
+  Demo,
+  urlDrilldownActionFactory,
+} from './test_data';
 
 // TODO: afterEach is not available for it globally during setup
 // https://github.com/elastic/kibana/issues/59469
 afterEach(cleanup);
 
 test('Pick and configure action', () => {
-  const screen = render(<Demo actionFactories={[dashboardFactory, urlFactory]} />);
+  const screen = render(
+    <Demo actionFactories={[dashboardDrilldownActionFactory, urlDrilldownActionFactory]} />
+  );
 
   // check that all factories are displayed to pick
   expect(screen.getAllByTestId(TEST_SUBJ_ACTION_FACTORY_ITEM)).toHaveLength(2);
@@ -40,7 +47,7 @@ test('Pick and configure action', () => {
 });
 
 test('If only one actions factory is available then actionFactory selection is emitted without user input', () => {
-  const screen = render(<Demo actionFactories={[urlFactory]} />);
+  const screen = render(<Demo actionFactories={[urlDrilldownActionFactory]} />);
 
   // check that no factories are displayed to pick from
   expect(screen.queryByTestId(TEST_SUBJ_ACTION_FACTORY_ITEM)).not.toBeInTheDocument();
diff --git a/x-pack/plugins/advanced_ui_actions/public/components/action_wizard/action_wizard.tsx b/x-pack/plugins/advanced_ui_actions/public/components/action_wizard/action_wizard.tsx
index 846f6d41eb30d..41ef863c00e44 100644
--- a/x-pack/plugins/advanced_ui_actions/public/components/action_wizard/action_wizard.tsx
+++ b/x-pack/plugins/advanced_ui_actions/public/components/action_wizard/action_wizard.tsx
@@ -16,23 +16,40 @@ import {
 } from '@elastic/eui';
 import { txtChangeButton } from './i18n';
 import './action_wizard.scss';
-import { ActionFactory } from '../../services';
 
-type ActionBaseConfig = object;
-type ActionFactoryBaseContext = object;
+// TODO: this interface is temporary for just moving forward with the component
+// and it will be imported from the ../ui_actions when implemented properly
+// eslint-disable-next-line @typescript-eslint/consistent-type-definitions
+export type ActionBaseConfig = {};
+export interface ActionFactory<Config extends ActionBaseConfig = ActionBaseConfig> {
+  type: string; // TODO: type should be tied to Action and ActionByType
+  displayName: string;
+  iconType?: string;
+  wizard: React.FC<ActionFactoryWizardProps<Config>>;
+  createConfig: () => Config;
+  isValid: (config: Config) => boolean;
+}
+
+export interface ActionFactoryWizardProps<Config extends ActionBaseConfig> {
+  config?: Config;
+
+  /**
+   * Callback called when user updates the config in UI.
+   */
+  onConfig: (config: Config) => void;
+}
 
 export interface ActionWizardProps {
   /**
    * List of available action factories
    */
-  actionFactories: ActionFactory[];
+  actionFactories: Array<ActionFactory<any>>; // any here to be able to pass array of ActionFactory<Config> with different configs
 
   /**
    * Currently selected action factory
    * undefined - is allowed and means that non is selected
    */
   currentActionFactory?: ActionFactory;
-
   /**
    * Action factory selected changed
    * null - means user click "change" and removed action factory selection
@@ -48,11 +65,6 @@ export interface ActionWizardProps {
    * config changed
    */
   onConfigChange: (config: ActionBaseConfig) => void;
-
-  /**
-   * Context will be passed into ActionFactory's methods
-   */
-  context: ActionFactoryBaseContext;
 }
 
 export const ActionWizard: React.FC<ActionWizardProps> = ({
@@ -61,7 +73,6 @@ export const ActionWizard: React.FC<ActionWizardProps> = ({
   onActionFactoryChange,
   onConfigChange,
   config,
-  context,
 }) => {
   // auto pick action factory if there is only 1 available
   if (!currentActionFactory && actionFactories.length === 1) {
@@ -76,7 +87,6 @@ export const ActionWizard: React.FC<ActionWizardProps> = ({
         onDeselect={() => {
           onActionFactoryChange(null);
         }}
-        context={context}
         config={config}
         onConfigChange={newConfig => {
           onConfigChange(newConfig);
@@ -87,7 +97,6 @@ export const ActionWizard: React.FC<ActionWizardProps> = ({
 
   return (
     <ActionFactorySelector
-      context={context}
       actionFactories={actionFactories}
       onActionFactorySelected={actionFactory => {
         onActionFactoryChange(actionFactory);
@@ -96,11 +105,10 @@ export const ActionWizard: React.FC<ActionWizardProps> = ({
   );
 };
 
-interface SelectedActionFactoryProps {
-  actionFactory: ActionFactory;
-  config: ActionBaseConfig;
-  context: ActionFactoryBaseContext;
-  onConfigChange: (config: ActionBaseConfig) => void;
+interface SelectedActionFactoryProps<Config extends ActionBaseConfig = ActionBaseConfig> {
+  actionFactory: ActionFactory<Config>;
+  config: Config;
+  onConfigChange: (config: Config) => void;
   showDeselect: boolean;
   onDeselect: () => void;
 }
@@ -113,28 +121,28 @@ const SelectedActionFactory: React.FC<SelectedActionFactoryProps> = ({
   showDeselect,
   onConfigChange,
   config,
-  context,
 }) => {
   return (
     <div
       className="auaActionWizard__selectedActionFactoryContainer"
       data-test-subj={TEST_SUBJ_SELECTED_ACTION_FACTORY}
+      data-testid={TEST_SUBJ_SELECTED_ACTION_FACTORY}
     >
       <header>
         <EuiFlexGroup alignItems="center" gutterSize="s">
-          {actionFactory.getIconType(context) && (
+          {actionFactory.iconType && (
             <EuiFlexItem grow={false}>
-              <EuiIcon type={actionFactory.getIconType(context)!} size="m" />
+              <EuiIcon type={actionFactory.iconType} size="m" />
             </EuiFlexItem>
           )}
           <EuiFlexItem grow={true}>
             <EuiText>
-              <h4>{actionFactory.getDisplayName(context)}</h4>
+              <h4>{actionFactory.displayName}</h4>
             </EuiText>
           </EuiFlexItem>
           {showDeselect && (
             <EuiFlexItem grow={false}>
-              <EuiButtonEmpty size="xs" onClick={() => onDeselect()}>
+              <EuiButtonEmpty size="s" onClick={() => onDeselect()}>
                 {txtChangeButton}
               </EuiButtonEmpty>
             </EuiFlexItem>
@@ -143,11 +151,10 @@ const SelectedActionFactory: React.FC<SelectedActionFactoryProps> = ({
       </header>
       <EuiSpacer size="m" />
       <div>
-        <actionFactory.ReactCollectConfig
-          config={config}
-          onConfig={onConfigChange}
-          context={context}
-        />
+        {actionFactory.wizard({
+          config,
+          onConfig: onConfigChange,
+        })}
       </div>
     </div>
   );
@@ -155,7 +162,6 @@ const SelectedActionFactory: React.FC<SelectedActionFactoryProps> = ({
 
 interface ActionFactorySelectorProps {
   actionFactories: ActionFactory[];
-  context: ActionFactoryBaseContext;
   onActionFactorySelected: (actionFactory: ActionFactory) => void;
 }
 
@@ -164,7 +170,6 @@ export const TEST_SUBJ_ACTION_FACTORY_ITEM = 'action-factory-item';
 const ActionFactorySelector: React.FC<ActionFactorySelectorProps> = ({
   actionFactories,
   onActionFactorySelected,
-  context,
 }) => {
   if (actionFactories.length === 0) {
     // this is not user facing, as it would be impossible to get into this state
@@ -173,23 +178,19 @@ const ActionFactorySelector: React.FC<ActionFactorySelectorProps> = ({
   }
 
   return (
-    <EuiFlexGroup gutterSize="m" wrap={true}>
-      {[...actionFactories]
-        .sort((f1, f2) => f1.order - f2.order)
-        .map(actionFactory => (
-          <EuiFlexItem grow={false} key={actionFactory.id}>
-            <EuiKeyPadMenuItemButton
-              className="auaActionWizard__actionFactoryItem"
-              label={actionFactory.getDisplayName(context)}
-              data-test-subj={TEST_SUBJ_ACTION_FACTORY_ITEM}
-              onClick={() => onActionFactorySelected(actionFactory)}
-            >
-              {actionFactory.getIconType(context) && (
-                <EuiIcon type={actionFactory.getIconType(context)!} size="m" />
-              )}
-            </EuiKeyPadMenuItemButton>
-          </EuiFlexItem>
-        ))}
+    <EuiFlexGroup wrap>
+      {actionFactories.map(actionFactory => (
+        <EuiKeyPadMenuItemButton
+          className="auaActionWizard__actionFactoryItem"
+          key={actionFactory.type}
+          label={actionFactory.displayName}
+          data-testid={TEST_SUBJ_ACTION_FACTORY_ITEM}
+          data-test-subj={TEST_SUBJ_ACTION_FACTORY_ITEM}
+          onClick={() => onActionFactorySelected(actionFactory)}
+        >
+          {actionFactory.iconType && <EuiIcon type={actionFactory.iconType} size="m" />}
+        </EuiKeyPadMenuItemButton>
+      ))}
     </EuiFlexGroup>
   );
 };
diff --git a/x-pack/plugins/advanced_ui_actions/public/components/action_wizard/i18n.ts b/x-pack/plugins/advanced_ui_actions/public/components/action_wizard/i18n.ts
index a315184bf68ef..641f25176264a 100644
--- a/x-pack/plugins/advanced_ui_actions/public/components/action_wizard/i18n.ts
+++ b/x-pack/plugins/advanced_ui_actions/public/components/action_wizard/i18n.ts
@@ -9,6 +9,6 @@ import { i18n } from '@kbn/i18n';
 export const txtChangeButton = i18n.translate(
   'xpack.advancedUiActions.components.actionWizard.changeButton',
   {
-    defaultMessage: 'Change',
+    defaultMessage: 'change',
   }
 );
diff --git a/x-pack/plugins/advanced_ui_actions/public/components/action_wizard/index.ts b/x-pack/plugins/advanced_ui_actions/public/components/action_wizard/index.ts
index a189afbf956ee..ed224248ec4cd 100644
--- a/x-pack/plugins/advanced_ui_actions/public/components/action_wizard/index.ts
+++ b/x-pack/plugins/advanced_ui_actions/public/components/action_wizard/index.ts
@@ -4,4 +4,4 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-export { ActionWizard } from './action_wizard';
+export { ActionFactory, ActionWizard } from './action_wizard';
diff --git a/x-pack/plugins/advanced_ui_actions/public/components/action_wizard/test_data.tsx b/x-pack/plugins/advanced_ui_actions/public/components/action_wizard/test_data.tsx
index 167cb130fdb4a..8ecdde681069e 100644
--- a/x-pack/plugins/advanced_ui_actions/public/components/action_wizard/test_data.tsx
+++ b/x-pack/plugins/advanced_ui_actions/public/components/action_wizard/test_data.tsx
@@ -6,161 +6,124 @@
 
 import React, { useState } from 'react';
 import { EuiFieldText, EuiFormRow, EuiSelect, EuiSwitch } from '@elastic/eui';
-import { reactToUiComponent } from '../../../../../../src/plugins/kibana_react/public';
-import { ActionWizard } from './action_wizard';
-import { ActionFactoryDefinition, ActionFactory } from '../../services';
-import { CollectConfigProps } from '../../util';
-
-type ActionBaseConfig = object;
+import { ActionFactory, ActionBaseConfig, ActionWizard } from './action_wizard';
 
 export const dashboards = [
   { id: 'dashboard1', title: 'Dashboard 1' },
   { id: 'dashboard2', title: 'Dashboard 2' },
 ];
 
-interface DashboardDrilldownConfig {
+export const dashboardDrilldownActionFactory: ActionFactory<{
   dashboardId?: string;
-  useCurrentFilters: boolean;
-  useCurrentDateRange: boolean;
-}
-
-function DashboardDrilldownCollectConfig(props: CollectConfigProps<DashboardDrilldownConfig>) {
-  const config = props.config ?? {
-    dashboardId: undefined,
-    useCurrentFilters: true,
-    useCurrentDateRange: true,
-  };
-  return (
-    <>
-      <EuiFormRow label="Choose destination dashboard:">
-        <EuiSelect
-          name="selectDashboard"
-          hasNoInitialSelection={true}
-          options={dashboards.map(({ id, title }) => ({ value: id, text: title }))}
-          value={config.dashboardId}
-          onChange={e => {
-            props.onConfig({ ...config, dashboardId: e.target.value });
-          }}
-        />
-      </EuiFormRow>
-      <EuiFormRow hasChildLabel={false}>
-        <EuiSwitch
-          name="useCurrentFilters"
-          label="Use current dashboard's filters"
-          checked={config.useCurrentFilters}
-          onChange={() =>
-            props.onConfig({
-              ...config,
-              useCurrentFilters: !config.useCurrentFilters,
-            })
-          }
-        />
-      </EuiFormRow>
-      <EuiFormRow hasChildLabel={false}>
-        <EuiSwitch
-          name="useCurrentDateRange"
-          label="Use current dashboard's date range"
-          checked={config.useCurrentDateRange}
-          onChange={() =>
-            props.onConfig({
-              ...config,
-              useCurrentDateRange: !config.useCurrentDateRange,
-            })
-          }
-        />
-      </EuiFormRow>
-    </>
-  );
-}
-
-export const dashboardDrilldownActionFactory: ActionFactoryDefinition<
-  DashboardDrilldownConfig,
-  any,
-  any
-> = {
-  id: 'Dashboard',
-  getDisplayName: () => 'Go to Dashboard',
-  getIconType: () => 'dashboardApp',
+  useCurrentDashboardFilters: boolean;
+  useCurrentDashboardDataRange: boolean;
+}> = {
+  type: 'Dashboard',
+  displayName: 'Go to Dashboard',
+  iconType: 'dashboardApp',
   createConfig: () => {
     return {
       dashboardId: undefined,
-      useCurrentFilters: true,
-      useCurrentDateRange: true,
+      useCurrentDashboardDataRange: true,
+      useCurrentDashboardFilters: true,
     };
   },
-  isConfigValid: (config: DashboardDrilldownConfig): config is DashboardDrilldownConfig => {
+  isValid: config => {
     if (!config.dashboardId) return false;
     return true;
   },
-  CollectConfig: reactToUiComponent(DashboardDrilldownCollectConfig),
-
-  isCompatible(context?: object): Promise<boolean> {
-    return Promise.resolve(true);
+  wizard: props => {
+    const config = props.config ?? {
+      dashboardId: undefined,
+      useCurrentDashboardDataRange: true,
+      useCurrentDashboardFilters: true,
+    };
+    return (
+      <>
+        <EuiFormRow label="Choose destination dashboard:">
+          <EuiSelect
+            name="selectDashboard"
+            hasNoInitialSelection={true}
+            options={dashboards.map(({ id, title }) => ({ value: id, text: title }))}
+            value={config.dashboardId}
+            onChange={e => {
+              props.onConfig({ ...config, dashboardId: e.target.value });
+            }}
+          />
+        </EuiFormRow>
+        <EuiFormRow hasChildLabel={false}>
+          <EuiSwitch
+            name="useCurrentFilters"
+            label="Use current dashboard's filters"
+            checked={config.useCurrentDashboardFilters}
+            onChange={() =>
+              props.onConfig({
+                ...config,
+                useCurrentDashboardFilters: !config.useCurrentDashboardFilters,
+              })
+            }
+          />
+        </EuiFormRow>
+        <EuiFormRow hasChildLabel={false}>
+          <EuiSwitch
+            name="useCurrentDateRange"
+            label="Use current dashboard's date range"
+            checked={config.useCurrentDashboardDataRange}
+            onChange={() =>
+              props.onConfig({
+                ...config,
+                useCurrentDashboardDataRange: !config.useCurrentDashboardDataRange,
+              })
+            }
+          />
+        </EuiFormRow>
+      </>
+    );
   },
-  order: 0,
-  create: () => ({
-    id: 'test',
-    execute: async () => alert('Navigate to dashboard!'),
-  }),
 };
 
-export const dashboardFactory = new ActionFactory(dashboardDrilldownActionFactory);
-
-interface UrlDrilldownConfig {
-  url: string;
-  openInNewTab: boolean;
-}
-function UrlDrilldownCollectConfig(props: CollectConfigProps<UrlDrilldownConfig>) {
-  const config = props.config ?? {
-    url: '',
-    openInNewTab: false,
-  };
-  return (
-    <>
-      <EuiFormRow label="Enter target URL">
-        <EuiFieldText
-          placeholder="Enter URL"
-          name="url"
-          value={config.url}
-          onChange={event => props.onConfig({ ...config, url: event.target.value })}
-        />
-      </EuiFormRow>
-      <EuiFormRow hasChildLabel={false}>
-        <EuiSwitch
-          name="openInNewTab"
-          label="Open in new tab?"
-          checked={config.openInNewTab}
-          onChange={() => props.onConfig({ ...config, openInNewTab: !config.openInNewTab })}
-        />
-      </EuiFormRow>
-    </>
-  );
-}
-export const urlDrilldownActionFactory: ActionFactoryDefinition<UrlDrilldownConfig> = {
-  id: 'Url',
-  getDisplayName: () => 'Go to URL',
-  getIconType: () => 'link',
+export const urlDrilldownActionFactory: ActionFactory<{ url: string; openInNewTab: boolean }> = {
+  type: 'Url',
+  displayName: 'Go to URL',
+  iconType: 'link',
   createConfig: () => {
     return {
       url: '',
       openInNewTab: false,
     };
   },
-  isConfigValid: (config: UrlDrilldownConfig): config is UrlDrilldownConfig => {
+  isValid: config => {
     if (!config.url) return false;
     return true;
   },
-  CollectConfig: reactToUiComponent(UrlDrilldownCollectConfig),
-
-  order: 10,
-  isCompatible(context?: object): Promise<boolean> {
-    return Promise.resolve(true);
+  wizard: props => {
+    const config = props.config ?? {
+      url: '',
+      openInNewTab: false,
+    };
+    return (
+      <>
+        <EuiFormRow label="Enter target URL">
+          <EuiFieldText
+            placeholder="Enter URL"
+            name="url"
+            value={config.url}
+            onChange={event => props.onConfig({ ...config, url: event.target.value })}
+          />
+        </EuiFormRow>
+        <EuiFormRow hasChildLabel={false}>
+          <EuiSwitch
+            name="openInNewTab"
+            label="Open in new tab?"
+            checked={config.openInNewTab}
+            onChange={() => props.onConfig({ ...config, openInNewTab: !config.openInNewTab })}
+          />
+        </EuiFormRow>
+      </>
+    );
   },
-  create: () => null as any,
 };
 
-export const urlFactory = new ActionFactory(urlDrilldownActionFactory);
-
 export function Demo({ actionFactories }: { actionFactories: Array<ActionFactory<any>> }) {
   const [state, setState] = useState<{
     currentActionFactory?: ActionFactory;
@@ -194,15 +157,14 @@ export function Demo({ actionFactories }: { actionFactories: Array<ActionFactory
           changeActionFactory(newActionFactory);
         }}
         currentActionFactory={state.currentActionFactory}
-        context={{}}
       />
       <div style={{ marginTop: '44px' }} />
       <hr />
-      <div>Action Factory Id: {state.currentActionFactory?.id}</div>
+      <div>Action Factory Type: {state.currentActionFactory?.type}</div>
       <div>Action Factory Config: {JSON.stringify(state.config)}</div>
       <div>
         Is config valid:{' '}
-        {JSON.stringify(state.currentActionFactory?.isConfigValid(state.config!) ?? false)}
+        {JSON.stringify(state.currentActionFactory?.isValid(state.config!) ?? false)}
       </div>
     </>
   );
diff --git a/x-pack/plugins/advanced_ui_actions/public/custom_time_range_action.tsx b/x-pack/plugins/advanced_ui_actions/public/custom_time_range_action.tsx
index c0cd8d5540db2..325a5ddc10179 100644
--- a/x-pack/plugins/advanced_ui_actions/public/custom_time_range_action.tsx
+++ b/x-pack/plugins/advanced_ui_actions/public/custom_time_range_action.tsx
@@ -44,7 +44,7 @@ export class CustomTimeRangeAction implements ActionByType<typeof CUSTOM_TIME_RA
   private dateFormat?: string;
   private commonlyUsedRanges: CommonlyUsedRange[];
   public readonly id = CUSTOM_TIME_RANGE;
-  public order = 30;
+  public order = 7;
 
   constructor({
     openModal,
diff --git a/x-pack/plugins/advanced_ui_actions/public/index.ts b/x-pack/plugins/advanced_ui_actions/public/index.ts
index 55361105dcb0f..c11c1119a9b13 100644
--- a/x-pack/plugins/advanced_ui_actions/public/index.ts
+++ b/x-pack/plugins/advanced_ui_actions/public/index.ts
@@ -12,17 +12,3 @@ export function plugin(initializerContext: PluginInitializerContext) {
 }
 
 export { AdvancedUiActionsPublicPlugin as Plugin };
-export {
-  SetupContract as AdvancedUiActionsSetup,
-  StartContract as AdvancedUiActionsStart,
-} from './plugin';
-
-export { ActionWizard } from './components';
-export {
-  ActionFactoryDefinition as AdvancedUiActionsActionFactoryDefinition,
-  ActionFactory as AdvancedUiActionsActionFactory,
-} from './services/action_factory_service';
-export {
-  Configurable as AdvancedUiActionsConfigurable,
-  CollectConfigProps as AdvancedUiActionsCollectConfigProps,
-} from './util';
diff --git a/x-pack/plugins/advanced_ui_actions/public/plugin.ts b/x-pack/plugins/advanced_ui_actions/public/plugin.ts
index 71ea72499d87f..b9f0ce43d3cdc 100644
--- a/x-pack/plugins/advanced_ui_actions/public/plugin.ts
+++ b/x-pack/plugins/advanced_ui_actions/public/plugin.ts
@@ -11,7 +11,7 @@ import {
   Plugin,
 } from '../../../../src/core/public';
 import { createReactOverlays } from '../../../../src/plugins/kibana_react/public';
-import { UiActionsSetup, UiActionsStart } from '../../../../src/plugins/ui_actions/public';
+import { UiActionsStart, UiActionsSetup } from '../../../../src/plugins/ui_actions/public';
 import {
   CONTEXT_MENU_TRIGGER,
   PANEL_BADGE_TRIGGER,
@@ -41,10 +41,8 @@ interface StartDependencies {
   uiActions: UiActionsStart;
 }
 
-// eslint-disable-next-line @typescript-eslint/no-empty-interface
-export interface SetupContract extends UiActionsSetup {}
-// eslint-disable-next-line @typescript-eslint/no-empty-interface
-export interface StartContract extends UiActionsStart {}
+export type Setup = void;
+export type Start = void;
 
 declare module '../../../../src/plugins/ui_actions/public' {
   export interface ActionContextMapping {
@@ -54,16 +52,12 @@ declare module '../../../../src/plugins/ui_actions/public' {
 }
 
 export class AdvancedUiActionsPublicPlugin
-  implements Plugin<SetupContract, StartContract, SetupDependencies, StartDependencies> {
+  implements Plugin<Setup, Start, SetupDependencies, StartDependencies> {
   constructor(initializerContext: PluginInitializerContext) {}
 
-  public setup(core: CoreSetup, { uiActions }: SetupDependencies): SetupContract {
-    return {
-      ...uiActions,
-    };
-  }
+  public setup(core: CoreSetup, { uiActions }: SetupDependencies): Setup {}
 
-  public start(core: CoreStart, { uiActions }: StartDependencies): StartContract {
+  public start(core: CoreStart, { uiActions }: StartDependencies): Start {
     const dateFormat = core.uiSettings.get('dateFormat') as string;
     const commonlyUsedRanges = core.uiSettings.get('timepicker:quickRanges') as CommonlyUsedRange[];
     const { openModal } = createReactOverlays(core);
@@ -72,18 +66,16 @@ export class AdvancedUiActionsPublicPlugin
       dateFormat,
       commonlyUsedRanges,
     });
-    uiActions.addTriggerAction(CONTEXT_MENU_TRIGGER, timeRangeAction);
+    uiActions.registerAction(timeRangeAction);
+    uiActions.attachAction(CONTEXT_MENU_TRIGGER, timeRangeAction);
 
     const timeRangeBadge = new CustomTimeRangeBadge({
       openModal,
       dateFormat,
       commonlyUsedRanges,
     });
-    uiActions.addTriggerAction(PANEL_BADGE_TRIGGER, timeRangeBadge);
-
-    return {
-      ...uiActions,
-    };
+    uiActions.registerAction(timeRangeBadge);
+    uiActions.attachAction(PANEL_BADGE_TRIGGER, timeRangeBadge);
   }
 
   public stop() {}
diff --git a/x-pack/plugins/advanced_ui_actions/public/services/action_factory_service/action_factory.ts b/x-pack/plugins/advanced_ui_actions/public/services/action_factory_service/action_factory.ts
deleted file mode 100644
index 66e2a4eafa880..0000000000000
--- a/x-pack/plugins/advanced_ui_actions/public/services/action_factory_service/action_factory.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-/* eslint-disable */
-
-export {
-  ActionFactory
-} from '../../../../../../src/plugins/ui_actions/public/actions/action_factory';
diff --git a/x-pack/plugins/advanced_ui_actions/public/services/action_factory_service/action_factory_definition.ts b/x-pack/plugins/advanced_ui_actions/public/services/action_factory_service/action_factory_definition.ts
deleted file mode 100644
index f8669a4bf813f..0000000000000
--- a/x-pack/plugins/advanced_ui_actions/public/services/action_factory_service/action_factory_definition.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-/* eslint-disable */
-
-export {
-  ActionFactoryDefinition
-} from '../../../../../../src/plugins/ui_actions/public/actions/action_factory_definition';
diff --git a/x-pack/plugins/advanced_ui_actions/public/services/action_factory_service/index.ts b/x-pack/plugins/advanced_ui_actions/public/services/action_factory_service/index.ts
deleted file mode 100644
index db5bb3aa62a16..0000000000000
--- a/x-pack/plugins/advanced_ui_actions/public/services/action_factory_service/index.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-export * from './action_factory_definition';
-export * from './action_factory';
diff --git a/x-pack/plugins/advanced_ui_actions/public/util/index.ts b/x-pack/plugins/advanced_ui_actions/public/util/index.ts
deleted file mode 100644
index fd3ab89973348..0000000000000
--- a/x-pack/plugins/advanced_ui_actions/public/util/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.
- */
-
-export {
-  UiActionsConfigurable as Configurable,
-  UiActionsCollectConfigProps as CollectConfigProps,
-} from '../../../../../src/plugins/ui_actions/public';
diff --git a/x-pack/plugins/dashboard_enhanced/README.md b/x-pack/plugins/dashboard_enhanced/README.md
deleted file mode 100644
index d9296ae158621..0000000000000
--- a/x-pack/plugins/dashboard_enhanced/README.md
+++ /dev/null
@@ -1 +0,0 @@
-# X-Pack part of Dashboard app
diff --git a/x-pack/plugins/dashboard_enhanced/kibana.json b/x-pack/plugins/dashboard_enhanced/kibana.json
deleted file mode 100644
index acbca5c33295c..0000000000000
--- a/x-pack/plugins/dashboard_enhanced/kibana.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "id": "dashboardEnhanced",
-  "version": "kibana",
-  "server": true,
-  "ui": true,
-  "requiredPlugins": ["uiActions", "embeddable", "dashboard", "drilldowns"],
-  "configPath": ["xpack", "dashboardEnhanced"]
-}
diff --git a/x-pack/plugins/dashboard_enhanced/public/components/README.md b/x-pack/plugins/dashboard_enhanced/public/components/README.md
deleted file mode 100644
index 8081f8a2451cf..0000000000000
--- a/x-pack/plugins/dashboard_enhanced/public/components/README.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# Presentation React components
-
-Here we keep reusable *presentation* (aka *dumb*) React components&mdash;these
-components should not be connected to state and ideally should not know anything
-about Kibana.
diff --git a/x-pack/plugins/dashboard_enhanced/public/components/dashboard_drilldown_config/dashboard_drilldown_config.story.tsx b/x-pack/plugins/dashboard_enhanced/public/components/dashboard_drilldown_config/dashboard_drilldown_config.story.tsx
deleted file mode 100644
index 8e204b044a136..0000000000000
--- a/x-pack/plugins/dashboard_enhanced/public/components/dashboard_drilldown_config/dashboard_drilldown_config.story.tsx
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-/* eslint-disable no-console */
-
-import * as React from 'react';
-import { storiesOf } from '@storybook/react';
-import { DashboardDrilldownConfig } from '.';
-
-export const dashboards = [
-  { id: 'dashboard1', title: 'Dashboard 1' },
-  { id: 'dashboard2', title: 'Dashboard 2' },
-  { id: 'dashboard3', title: 'Dashboard 3' },
-];
-
-const InteractiveDemo: React.FC = () => {
-  const [activeDashboardId, setActiveDashboardId] = React.useState('dashboard1');
-  const [currentFilters, setCurrentFilters] = React.useState(false);
-  const [keepRange, setKeepRange] = React.useState(false);
-
-  return (
-    <DashboardDrilldownConfig
-      activeDashboardId={activeDashboardId}
-      dashboards={dashboards}
-      currentFilters={currentFilters}
-      keepRange={keepRange}
-      onDashboardSelect={id => setActiveDashboardId(id)}
-      onCurrentFiltersToggle={() => setCurrentFilters(old => !old)}
-      onKeepRangeToggle={() => setKeepRange(old => !old)}
-    />
-  );
-};
-
-storiesOf('components/DashboardDrilldownConfig', module)
-  .add('default', () => (
-    <DashboardDrilldownConfig
-      activeDashboardId={'dashboard2'}
-      dashboards={dashboards}
-      onDashboardSelect={e => console.log('onDashboardSelect', e)}
-    />
-  ))
-  .add('with switches', () => (
-    <DashboardDrilldownConfig
-      activeDashboardId={'dashboard2'}
-      dashboards={dashboards}
-      onDashboardSelect={e => console.log('onDashboardSelect', e)}
-      onCurrentFiltersToggle={() => console.log('onCurrentFiltersToggle')}
-      onKeepRangeToggle={() => console.log('onKeepRangeToggle')}
-    />
-  ))
-  .add('interactive demo', () => <InteractiveDemo />);
diff --git a/x-pack/plugins/dashboard_enhanced/public/components/dashboard_drilldown_config/dashboard_drilldown_config.test.tsx b/x-pack/plugins/dashboard_enhanced/public/components/dashboard_drilldown_config/dashboard_drilldown_config.test.tsx
deleted file mode 100644
index 911ff6f632635..0000000000000
--- a/x-pack/plugins/dashboard_enhanced/public/components/dashboard_drilldown_config/dashboard_drilldown_config.test.tsx
+++ /dev/null
@@ -1,11 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-test.todo('renders list of dashboards');
-test.todo('renders correct selected dashboard');
-test.todo('can change dashboard');
-test.todo('can toggle "use current filters" switch');
-test.todo('can toggle "date range" switch');
diff --git a/x-pack/plugins/dashboard_enhanced/public/components/dashboard_drilldown_config/dashboard_drilldown_config.tsx b/x-pack/plugins/dashboard_enhanced/public/components/dashboard_drilldown_config/dashboard_drilldown_config.tsx
deleted file mode 100644
index b45ba602b9bb1..0000000000000
--- a/x-pack/plugins/dashboard_enhanced/public/components/dashboard_drilldown_config/dashboard_drilldown_config.tsx
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import React from 'react';
-import { EuiFormRow, EuiSelect, EuiSwitch } from '@elastic/eui';
-import { txtChooseDestinationDashboard } from './i18n';
-
-export interface DashboardItem {
-  id: string;
-  title: string;
-}
-
-export interface DashboardDrilldownConfigProps {
-  activeDashboardId?: string;
-  dashboards: DashboardItem[];
-  currentFilters?: boolean;
-  keepRange?: boolean;
-  onDashboardSelect: (dashboardId: string) => void;
-  onCurrentFiltersToggle?: () => void;
-  onKeepRangeToggle?: () => void;
-}
-
-export const DashboardDrilldownConfig: React.FC<DashboardDrilldownConfigProps> = ({
-  activeDashboardId,
-  dashboards,
-  currentFilters,
-  keepRange,
-  onDashboardSelect,
-  onCurrentFiltersToggle,
-  onKeepRangeToggle,
-}) => {
-  // TODO: use i18n below.
-  return (
-    <>
-      <EuiFormRow label={txtChooseDestinationDashboard}>
-        <EuiSelect
-          name="selectDashboard"
-          hasNoInitialSelection={true}
-          options={dashboards.map(({ id, title }) => ({ value: id, text: title }))}
-          value={activeDashboardId}
-          onChange={e => onDashboardSelect(e.target.value)}
-        />
-      </EuiFormRow>
-      {!!onCurrentFiltersToggle && (
-        <EuiFormRow hasChildLabel={false}>
-          <EuiSwitch
-            name="useCurrentFilters"
-            label="Use current dashboard's filters"
-            checked={!!currentFilters}
-            onChange={onCurrentFiltersToggle}
-          />
-        </EuiFormRow>
-      )}
-      {!!onKeepRangeToggle && (
-        <EuiFormRow hasChildLabel={false}>
-          <EuiSwitch
-            name="useCurrentDateRange"
-            label="Use current dashboard's date range"
-            checked={!!keepRange}
-            onChange={onKeepRangeToggle}
-          />
-        </EuiFormRow>
-      )}
-    </>
-  );
-};
diff --git a/x-pack/plugins/dashboard_enhanced/public/components/dashboard_drilldown_config/i18n.ts b/x-pack/plugins/dashboard_enhanced/public/components/dashboard_drilldown_config/i18n.ts
deleted file mode 100644
index 38fe6dd150853..0000000000000
--- a/x-pack/plugins/dashboard_enhanced/public/components/dashboard_drilldown_config/i18n.ts
+++ /dev/null
@@ -1,14 +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';
-
-export const txtChooseDestinationDashboard = i18n.translate(
-  'xpack.dashboard.components.DashboardDrilldownConfig.chooseDestinationDashboard',
-  {
-    defaultMessage: 'Choose destination dashboard',
-  }
-);
diff --git a/x-pack/plugins/dashboard_enhanced/public/components/dashboard_drilldown_config/index.ts b/x-pack/plugins/dashboard_enhanced/public/components/dashboard_drilldown_config/index.ts
deleted file mode 100644
index b9a64a3cc17e6..0000000000000
--- a/x-pack/plugins/dashboard_enhanced/public/components/dashboard_drilldown_config/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 * from './dashboard_drilldown_config';
diff --git a/x-pack/plugins/dashboard_enhanced/public/components/index.ts b/x-pack/plugins/dashboard_enhanced/public/components/index.ts
deleted file mode 100644
index b9a64a3cc17e6..0000000000000
--- a/x-pack/plugins/dashboard_enhanced/public/components/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 * from './dashboard_drilldown_config';
diff --git a/x-pack/plugins/dashboard_enhanced/public/index.ts b/x-pack/plugins/dashboard_enhanced/public/index.ts
deleted file mode 100644
index 53540a4a1ad2e..0000000000000
--- a/x-pack/plugins/dashboard_enhanced/public/index.ts
+++ /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 { PluginInitializerContext } from 'src/core/public';
-import { DashboardEnhancedPlugin } from './plugin';
-
-export {
-  SetupContract as DashboardEnhancedSetupContract,
-  SetupDependencies as DashboardEnhancedSetupDependencies,
-  StartContract as DashboardEnhancedStartContract,
-  StartDependencies as DashboardEnhancedStartDependencies,
-} from './plugin';
-
-export function plugin(context: PluginInitializerContext) {
-  return new DashboardEnhancedPlugin(context);
-}
diff --git a/x-pack/plugins/dashboard_enhanced/public/mocks.ts b/x-pack/plugins/dashboard_enhanced/public/mocks.ts
deleted file mode 100644
index 67dc1fd97d521..0000000000000
--- a/x-pack/plugins/dashboard_enhanced/public/mocks.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { DashboardEnhancedSetupContract, DashboardEnhancedStartContract } from '.';
-
-export type Setup = jest.Mocked<DashboardEnhancedSetupContract>;
-export type Start = jest.Mocked<DashboardEnhancedStartContract>;
-
-const createSetupContract = (): Setup => {
-  const setupContract: Setup = {};
-
-  return setupContract;
-};
-
-const createStartContract = (): Start => {
-  const startContract: Start = {};
-
-  return startContract;
-};
-
-export const dashboardEnhancedPluginMock = {
-  createSetupContract,
-  createStartContract,
-};
diff --git a/x-pack/plugins/dashboard_enhanced/public/plugin.ts b/x-pack/plugins/dashboard_enhanced/public/plugin.ts
deleted file mode 100644
index 30b3f3c080f49..0000000000000
--- a/x-pack/plugins/dashboard_enhanced/public/plugin.ts
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { CoreStart, CoreSetup, Plugin, PluginInitializerContext } from 'src/core/public';
-import { UiActionsSetup, UiActionsStart } from '../../../../src/plugins/ui_actions/public';
-import { DashboardDrilldownsService } from './services';
-import { DrilldownsSetup, DrilldownsStart } from '../../drilldowns/public';
-
-export interface SetupDependencies {
-  uiActions: UiActionsSetup;
-  drilldowns: DrilldownsSetup;
-}
-
-export interface StartDependencies {
-  uiActions: UiActionsStart;
-  drilldowns: DrilldownsStart;
-}
-
-// eslint-disable-next-line
-export interface SetupContract {}
-
-// eslint-disable-next-line
-export interface StartContract {}
-
-export class DashboardEnhancedPlugin
-  implements Plugin<SetupContract, StartContract, SetupDependencies, StartDependencies> {
-  public readonly drilldowns = new DashboardDrilldownsService();
-  public readonly config: { drilldowns: { enabled: boolean } };
-
-  constructor(protected readonly context: PluginInitializerContext) {
-    this.config = context.config.get();
-  }
-
-  public setup(core: CoreSetup<StartDependencies>, plugins: SetupDependencies): SetupContract {
-    this.drilldowns.bootstrap(core, plugins, {
-      enableDrilldowns: this.config.drilldowns.enabled,
-    });
-
-    return {};
-  }
-
-  public start(core: CoreStart, plugins: StartDependencies): StartContract {
-    return {};
-  }
-
-  public stop() {}
-}
diff --git a/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/actions/flyout_create_drilldown/flyout_create_drilldown.test.tsx b/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/actions/flyout_create_drilldown/flyout_create_drilldown.test.tsx
deleted file mode 100644
index 31ee9e29938cb..0000000000000
--- a/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/actions/flyout_create_drilldown/flyout_create_drilldown.test.tsx
+++ /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 {
-  FlyoutCreateDrilldownAction,
-  OpenFlyoutAddDrilldownParams,
-} from './flyout_create_drilldown';
-import { coreMock } from '../../../../../../../../src/core/public/mocks';
-import { drilldownsPluginMock } from '../../../../../../drilldowns/public/mocks';
-import { ViewMode } from '../../../../../../../../src/plugins/embeddable/public';
-import { uiActionsPluginMock } from '../../../../../../../../src/plugins/ui_actions/public/mocks';
-import { TriggerContextMapping } from '../../../../../../../../src/plugins/ui_actions/public';
-import { MockEmbeddable } from '../test_helpers';
-
-const overlays = coreMock.createStart().overlays;
-const drilldowns = drilldownsPluginMock.createStartContract();
-const uiActions = uiActionsPluginMock.createStartContract();
-
-const actionParams: OpenFlyoutAddDrilldownParams = {
-  drilldowns: () => Promise.resolve(drilldowns),
-  overlays: () => Promise.resolve(overlays),
-};
-
-test('should create', () => {
-  expect(() => new FlyoutCreateDrilldownAction(actionParams)).not.toThrow();
-});
-
-test('title is a string', () => {
-  expect(typeof new FlyoutCreateDrilldownAction(actionParams).getDisplayName() === 'string').toBe(
-    true
-  );
-});
-
-test('icon exists', () => {
-  expect(typeof new FlyoutCreateDrilldownAction(actionParams).getIconType() === 'string').toBe(
-    true
-  );
-});
-
-describe('isCompatible', () => {
-  const drilldownAction = new FlyoutCreateDrilldownAction(actionParams);
-
-  function checkCompatibility(params: {
-    isEdit: boolean;
-    withUiActions: boolean;
-    isValueClickTriggerSupported: boolean;
-  }): Promise<boolean> {
-    return drilldownAction.isCompatible({
-      embeddable: new MockEmbeddable(
-        { id: '', viewMode: params.isEdit ? ViewMode.EDIT : ViewMode.VIEW },
-        {
-          supportedTriggers: (params.isValueClickTriggerSupported
-            ? ['VALUE_CLICK_TRIGGER']
-            : []) as Array<keyof TriggerContextMapping>,
-          uiActions: params.withUiActions ? uiActions : undefined, // dynamic actions support
-        }
-      ),
-    });
-  }
-
-  test("compatible if dynamicUiActions enabled, 'VALUE_CLICK_TRIGGER' is supported, in edit mode", async () => {
-    expect(
-      await checkCompatibility({
-        withUiActions: true,
-        isEdit: true,
-        isValueClickTriggerSupported: true,
-      })
-    ).toBe(true);
-  });
-
-  test('not compatible if dynamicUiActions disabled', async () => {
-    expect(
-      await checkCompatibility({
-        withUiActions: false,
-        isEdit: true,
-        isValueClickTriggerSupported: true,
-      })
-    ).toBe(false);
-  });
-
-  test("not compatible if 'VALUE_CLICK_TRIGGER' is not supported", async () => {
-    expect(
-      await checkCompatibility({
-        withUiActions: true,
-        isEdit: true,
-        isValueClickTriggerSupported: false,
-      })
-    ).toBe(false);
-  });
-
-  test('not compatible if in view mode', async () => {
-    expect(
-      await checkCompatibility({
-        withUiActions: true,
-        isEdit: false,
-        isValueClickTriggerSupported: true,
-      })
-    ).toBe(false);
-  });
-});
-
-describe('execute', () => {
-  const drilldownAction = new FlyoutCreateDrilldownAction(actionParams);
-  test('throws error if no dynamicUiActions', async () => {
-    await expect(
-      drilldownAction.execute({
-        embeddable: new MockEmbeddable({ id: '' }, {}),
-      })
-    ).rejects.toThrowErrorMatchingInlineSnapshot(
-      `"Can't execute FlyoutCreateDrilldownAction without dynamicActionsManager"`
-    );
-  });
-
-  test('should open flyout', async () => {
-    const spy = jest.spyOn(overlays, 'openFlyout');
-    await drilldownAction.execute({
-      embeddable: new MockEmbeddable({ id: '' }, { uiActions }),
-    });
-    expect(spy).toBeCalled();
-  });
-});
diff --git a/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/actions/flyout_create_drilldown/flyout_create_drilldown.tsx b/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/actions/flyout_create_drilldown/flyout_create_drilldown.tsx
deleted file mode 100644
index 00e74ea570a11..0000000000000
--- a/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/actions/flyout_create_drilldown/flyout_create_drilldown.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 from 'react';
-import { i18n } from '@kbn/i18n';
-import { CoreStart } from 'src/core/public';
-import { ActionByType } from '../../../../../../../../src/plugins/ui_actions/public';
-import { toMountPoint } from '../../../../../../../../src/plugins/kibana_react/public';
-import { DrilldownsStart } from '../../../../../../drilldowns/public';
-import { EmbeddableContext } from '../../../../../../../../src/plugins/embeddable/public';
-
-export const OPEN_FLYOUT_ADD_DRILLDOWN = 'OPEN_FLYOUT_ADD_DRILLDOWN';
-
-export interface OpenFlyoutAddDrilldownParams {
-  overlays: () => Promise<CoreStart['overlays']>;
-  drilldowns: () => Promise<DrilldownsStart>;
-}
-
-export class FlyoutCreateDrilldownAction implements ActionByType<typeof OPEN_FLYOUT_ADD_DRILLDOWN> {
-  public readonly type = OPEN_FLYOUT_ADD_DRILLDOWN;
-  public readonly id = OPEN_FLYOUT_ADD_DRILLDOWN;
-  public order = 12;
-
-  constructor(protected readonly params: OpenFlyoutAddDrilldownParams) {}
-
-  public getDisplayName() {
-    return i18n.translate('xpack.dashboard.FlyoutCreateDrilldownAction.displayName', {
-      defaultMessage: 'Create drilldown',
-    });
-  }
-
-  public getIconType() {
-    return 'plusInCircle';
-  }
-
-  private isEmbeddableCompatible(context: EmbeddableContext) {
-    if (!context.embeddable.dynamicActions) return false;
-    const supportedTriggers = context.embeddable.supportedTriggers();
-    if (!supportedTriggers || !supportedTriggers.length) return false;
-    return supportedTriggers.indexOf('VALUE_CLICK_TRIGGER') > -1;
-  }
-
-  public async isCompatible(context: EmbeddableContext) {
-    const isEditMode = context.embeddable.getInput().viewMode === 'edit';
-    return isEditMode && this.isEmbeddableCompatible(context);
-  }
-
-  public async execute(context: EmbeddableContext) {
-    const overlays = await this.params.overlays();
-    const drilldowns = await this.params.drilldowns();
-    const dynamicActionManager = context.embeddable.dynamicActions;
-
-    if (!dynamicActionManager) {
-      throw new Error(`Can't execute FlyoutCreateDrilldownAction without dynamicActionsManager`);
-    }
-
-    const handle = overlays.openFlyout(
-      toMountPoint(
-        <drilldowns.FlyoutManageDrilldowns
-          onClose={() => handle.close()}
-          placeContext={context}
-          viewMode={'create'}
-          dynamicActionManager={dynamicActionManager}
-        />
-      ),
-      {
-        ownFocus: true,
-      }
-    );
-  }
-}
diff --git a/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/actions/flyout_create_drilldown/index.ts b/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/actions/flyout_create_drilldown/index.ts
deleted file mode 100644
index 4d2db209fc961..0000000000000
--- a/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/actions/flyout_create_drilldown/index.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-export {
-  FlyoutCreateDrilldownAction,
-  OpenFlyoutAddDrilldownParams,
-  OPEN_FLYOUT_ADD_DRILLDOWN,
-} from './flyout_create_drilldown';
diff --git a/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/actions/flyout_edit_drilldown/flyout_edit_drilldown.test.tsx b/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/actions/flyout_edit_drilldown/flyout_edit_drilldown.test.tsx
deleted file mode 100644
index a3f11eb976f90..0000000000000
--- a/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/actions/flyout_edit_drilldown/flyout_edit_drilldown.test.tsx
+++ /dev/null
@@ -1,102 +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 { FlyoutEditDrilldownAction, FlyoutEditDrilldownParams } from './flyout_edit_drilldown';
-import { coreMock } from '../../../../../../../../src/core/public/mocks';
-import { drilldownsPluginMock } from '../../../../../../drilldowns/public/mocks';
-import { ViewMode } from '../../../../../../../../src/plugins/embeddable/public';
-import { uiActionsPluginMock } from '../../../../../../../../src/plugins/ui_actions/public/mocks';
-import { MockEmbeddable } from '../test_helpers';
-
-const overlays = coreMock.createStart().overlays;
-const drilldowns = drilldownsPluginMock.createStartContract();
-const uiActions = uiActionsPluginMock.createStartContract();
-
-const actionParams: FlyoutEditDrilldownParams = {
-  drilldowns: () => Promise.resolve(drilldowns),
-  overlays: () => Promise.resolve(overlays),
-};
-
-test('should create', () => {
-  expect(() => new FlyoutEditDrilldownAction(actionParams)).not.toThrow();
-});
-
-test('title is a string', () => {
-  expect(typeof new FlyoutEditDrilldownAction(actionParams).getDisplayName() === 'string').toBe(
-    true
-  );
-});
-
-test('icon exists', () => {
-  expect(typeof new FlyoutEditDrilldownAction(actionParams).getIconType() === 'string').toBe(true);
-});
-
-test('MenuItem exists', () => {
-  expect(new FlyoutEditDrilldownAction(actionParams).MenuItem).toBeDefined();
-});
-
-describe('isCompatible', () => {
-  const drilldownAction = new FlyoutEditDrilldownAction(actionParams);
-
-  function checkCompatibility(params: {
-    isEdit: boolean;
-    withUiActions: boolean;
-  }): Promise<boolean> {
-    return drilldownAction.isCompatible({
-      embeddable: new MockEmbeddable(
-        {
-          id: '',
-          viewMode: params.isEdit ? ViewMode.EDIT : ViewMode.VIEW,
-        },
-        {
-          uiActions: params.withUiActions ? uiActions : undefined, // dynamic actions support
-        }
-      ),
-    });
-  }
-
-  // TODO: need proper DynamicActionsMock and ActionFactory mock
-  test.todo('compatible if dynamicUiActions enabled, in edit view, and have at least 1 drilldown');
-
-  test('not compatible if dynamicUiActions disabled', async () => {
-    expect(
-      await checkCompatibility({
-        withUiActions: false,
-        isEdit: true,
-      })
-    ).toBe(false);
-  });
-
-  test('not compatible if no drilldowns', async () => {
-    expect(
-      await checkCompatibility({
-        withUiActions: true,
-        isEdit: true,
-      })
-    ).toBe(false);
-  });
-});
-
-describe('execute', () => {
-  const drilldownAction = new FlyoutEditDrilldownAction(actionParams);
-  test('throws error if no dynamicUiActions', async () => {
-    await expect(
-      drilldownAction.execute({
-        embeddable: new MockEmbeddable({ id: '' }, {}),
-      })
-    ).rejects.toThrowErrorMatchingInlineSnapshot(
-      `"Can't execute FlyoutEditDrilldownAction without dynamicActionsManager"`
-    );
-  });
-
-  test('should open flyout', async () => {
-    const spy = jest.spyOn(overlays, 'openFlyout');
-    await drilldownAction.execute({
-      embeddable: new MockEmbeddable({ id: '' }, { uiActions }),
-    });
-    expect(spy).toBeCalled();
-  });
-});
diff --git a/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/actions/flyout_edit_drilldown/flyout_edit_drilldown.tsx b/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/actions/flyout_edit_drilldown/flyout_edit_drilldown.tsx
deleted file mode 100644
index 816b757592a72..0000000000000
--- a/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/actions/flyout_edit_drilldown/flyout_edit_drilldown.tsx
+++ /dev/null
@@ -1,71 +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 { CoreStart } from 'src/core/public';
-import { ActionByType } from '../../../../../../../../src/plugins/ui_actions/public';
-import {
-  reactToUiComponent,
-  toMountPoint,
-} from '../../../../../../../../src/plugins/kibana_react/public';
-import { EmbeddableContext, ViewMode } from '../../../../../../../../src/plugins/embeddable/public';
-import { DrilldownsStart } from '../../../../../../drilldowns/public';
-import { txtDisplayName } from './i18n';
-import { MenuItem } from './menu_item';
-
-export const OPEN_FLYOUT_EDIT_DRILLDOWN = 'OPEN_FLYOUT_EDIT_DRILLDOWN';
-
-export interface FlyoutEditDrilldownParams {
-  overlays: () => Promise<CoreStart['overlays']>;
-  drilldowns: () => Promise<DrilldownsStart>;
-}
-
-export class FlyoutEditDrilldownAction implements ActionByType<typeof OPEN_FLYOUT_EDIT_DRILLDOWN> {
-  public readonly type = OPEN_FLYOUT_EDIT_DRILLDOWN;
-  public readonly id = OPEN_FLYOUT_EDIT_DRILLDOWN;
-  public order = 10;
-
-  constructor(protected readonly params: FlyoutEditDrilldownParams) {}
-
-  public getDisplayName() {
-    return txtDisplayName;
-  }
-
-  public getIconType() {
-    return 'list';
-  }
-
-  MenuItem = reactToUiComponent(MenuItem);
-
-  public async isCompatible({ embeddable }: EmbeddableContext) {
-    if (embeddable.getInput().viewMode !== ViewMode.EDIT) return false;
-    if (!embeddable.dynamicActions) return false;
-    return embeddable.dynamicActions.state.get().events.length > 0;
-  }
-
-  public async execute(context: EmbeddableContext) {
-    const overlays = await this.params.overlays();
-    const drilldowns = await this.params.drilldowns();
-    const dynamicActionManager = context.embeddable.dynamicActions;
-    if (!dynamicActionManager) {
-      throw new Error(`Can't execute FlyoutEditDrilldownAction without dynamicActionsManager`);
-    }
-
-    const handle = overlays.openFlyout(
-      toMountPoint(
-        <drilldowns.FlyoutManageDrilldowns
-          onClose={() => handle.close()}
-          placeContext={context}
-          viewMode={'manage'}
-          dynamicActionManager={dynamicActionManager}
-        />
-      ),
-      {
-        ownFocus: true,
-      }
-    );
-  }
-}
diff --git a/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/actions/flyout_edit_drilldown/index.tsx b/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/actions/flyout_edit_drilldown/index.tsx
deleted file mode 100644
index 3e1b37f270708..0000000000000
--- a/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/actions/flyout_edit_drilldown/index.tsx
+++ /dev/null
@@ -1,11 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-export {
-  FlyoutEditDrilldownAction,
-  FlyoutEditDrilldownParams,
-  OPEN_FLYOUT_EDIT_DRILLDOWN,
-} from './flyout_edit_drilldown';
diff --git a/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/actions/flyout_edit_drilldown/menu_item.test.tsx b/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/actions/flyout_edit_drilldown/menu_item.test.tsx
deleted file mode 100644
index be693fadf9282..0000000000000
--- a/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/actions/flyout_edit_drilldown/menu_item.test.tsx
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import React from 'react';
-import { render, cleanup, act } from '@testing-library/react/pure';
-import { MenuItem } from './menu_item';
-import { createStateContainer } from '../../../../../../../../src/plugins/kibana_utils/common';
-import { DynamicActionManager } from '../../../../../../../../src/plugins/ui_actions/public';
-import { IEmbeddable } from '../../../../../../../../src/plugins/embeddable/public/lib/embeddables';
-import '@testing-library/jest-dom';
-
-afterEach(cleanup);
-
-test('<MenuItem/>', () => {
-  const state = createStateContainer<{ events: object[] }>({ events: [] });
-  const { getByText, queryByText } = render(
-    <MenuItem
-      context={{
-        embeddable: ({
-          dynamicActions: ({ state } as unknown) as DynamicActionManager,
-        } as unknown) as IEmbeddable,
-      }}
-    />
-  );
-
-  expect(getByText(/manage drilldowns/i)).toBeInTheDocument();
-  expect(queryByText('0')).not.toBeInTheDocument();
-
-  act(() => {
-    state.set({ events: [{}] });
-  });
-
-  expect(queryByText('1')).toBeInTheDocument();
-});
diff --git a/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/actions/flyout_edit_drilldown/menu_item.tsx b/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/actions/flyout_edit_drilldown/menu_item.tsx
deleted file mode 100644
index 4f99fca511b07..0000000000000
--- a/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/actions/flyout_edit_drilldown/menu_item.tsx
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import React from 'react';
-import { EuiNotificationBadge, EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
-import { EmbeddableContext } from '../../../../../../../../src/plugins/embeddable/public';
-import { txtDisplayName } from './i18n';
-import { useContainerState } from '../../../../../../../../src/plugins/kibana_utils/common';
-
-export const MenuItem: React.FC<{ context: EmbeddableContext }> = ({ context }) => {
-  if (!context.embeddable.dynamicActions)
-    throw new Error('Flyout edit drillldown context menu item requires `dynamicActions`');
-
-  const { events } = useContainerState(context.embeddable.dynamicActions.state);
-  const count = events.length;
-
-  return (
-    <EuiFlexGroup alignItems={'center'}>
-      <EuiFlexItem grow={true}>{txtDisplayName}</EuiFlexItem>
-      {count > 0 && (
-        <EuiFlexItem grow={false}>
-          <EuiNotificationBadge>{count}</EuiNotificationBadge>
-        </EuiFlexItem>
-      )}
-    </EuiFlexGroup>
-  );
-};
diff --git a/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/actions/test_helpers.ts b/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/actions/test_helpers.ts
deleted file mode 100644
index 9b156b0ba85b4..0000000000000
--- a/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/actions/test_helpers.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { Embeddable, EmbeddableInput } from '../../../../../../../src/plugins/embeddable/public/';
-import {
-  TriggerContextMapping,
-  UiActionsStart,
-} from '../../../../../../../src/plugins/ui_actions/public';
-
-export class MockEmbeddable extends Embeddable {
-  public readonly type = 'mock';
-  private readonly triggers: Array<keyof TriggerContextMapping> = [];
-  constructor(
-    initialInput: EmbeddableInput,
-    params: { uiActions?: UiActionsStart; supportedTriggers?: Array<keyof TriggerContextMapping> }
-  ) {
-    super(initialInput, {}, undefined, params);
-    this.triggers = params.supportedTriggers ?? [];
-  }
-  public render(node: HTMLElement) {}
-  public reload() {}
-  public supportedTriggers(): Array<keyof TriggerContextMapping> {
-    return this.triggers;
-  }
-}
diff --git a/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/dashboard_drilldowns_services.ts b/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/dashboard_drilldowns_services.ts
deleted file mode 100644
index 4bdf03dff3531..0000000000000
--- a/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/dashboard_drilldowns_services.ts
+++ /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 { CoreSetup } from 'src/core/public';
-import { SetupDependencies } from '../../plugin';
-import {
-  CONTEXT_MENU_TRIGGER,
-  EmbeddableContext,
-} from '../../../../../../src/plugins/embeddable/public';
-import {
-  FlyoutCreateDrilldownAction,
-  FlyoutEditDrilldownAction,
-  OPEN_FLYOUT_ADD_DRILLDOWN,
-  OPEN_FLYOUT_EDIT_DRILLDOWN,
-} from './actions';
-import { DrilldownsStart } from '../../../../drilldowns/public';
-import { DashboardToDashboardDrilldown } from './dashboard_to_dashboard_drilldown';
-
-declare module '../../../../../../src/plugins/ui_actions/public' {
-  export interface ActionContextMapping {
-    [OPEN_FLYOUT_ADD_DRILLDOWN]: EmbeddableContext;
-    [OPEN_FLYOUT_EDIT_DRILLDOWN]: EmbeddableContext;
-  }
-}
-
-interface BootstrapParams {
-  enableDrilldowns: boolean;
-}
-
-export class DashboardDrilldownsService {
-  bootstrap(
-    core: CoreSetup<{ drilldowns: DrilldownsStart }>,
-    plugins: SetupDependencies,
-    { enableDrilldowns }: BootstrapParams
-  ) {
-    if (enableDrilldowns) {
-      this.setupDrilldowns(core, plugins);
-    }
-  }
-
-  setupDrilldowns(core: CoreSetup<{ drilldowns: DrilldownsStart }>, plugins: SetupDependencies) {
-    const overlays = async () => (await core.getStartServices())[0].overlays;
-    const drilldowns = async () => (await core.getStartServices())[1].drilldowns;
-    const savedObjects = async () => (await core.getStartServices())[0].savedObjects.client;
-
-    const actionFlyoutCreateDrilldown = new FlyoutCreateDrilldownAction({ overlays, drilldowns });
-    plugins.uiActions.addTriggerAction(CONTEXT_MENU_TRIGGER, actionFlyoutCreateDrilldown);
-
-    const actionFlyoutEditDrilldown = new FlyoutEditDrilldownAction({ overlays, drilldowns });
-    plugins.uiActions.addTriggerAction(CONTEXT_MENU_TRIGGER, actionFlyoutEditDrilldown);
-
-    const dashboardToDashboardDrilldown = new DashboardToDashboardDrilldown({
-      savedObjects,
-    });
-    plugins.drilldowns.registerDrilldown(dashboardToDashboardDrilldown);
-  }
-}
diff --git a/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/dashboard_to_dashboard_drilldown/collect_config.test.tsx b/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/dashboard_to_dashboard_drilldown/collect_config.test.tsx
deleted file mode 100644
index 95101605ce468..0000000000000
--- a/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/dashboard_to_dashboard_drilldown/collect_config.test.tsx
+++ /dev/null
@@ -1,9 +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.
- */
-
-test.todo('displays all dashboard in a list');
-test.todo('does not display dashboard on which drilldown is being created');
-test.todo('updates config object correctly');
diff --git a/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/dashboard_to_dashboard_drilldown/collect_config.tsx b/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/dashboard_to_dashboard_drilldown/collect_config.tsx
deleted file mode 100644
index e463cc38b6fbf..0000000000000
--- a/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/dashboard_to_dashboard_drilldown/collect_config.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 React, { useState, useEffect } from 'react';
-import { CollectConfigProps } from './types';
-import { DashboardDrilldownConfig } from '../../../components/dashboard_drilldown_config';
-import { Params } from './drilldown';
-
-export interface CollectConfigContainerProps extends CollectConfigProps {
-  params: Params;
-}
-
-export const CollectConfigContainer: React.FC<CollectConfigContainerProps> = ({
-  config,
-  onConfig,
-  params: { savedObjects },
-}) => {
-  const [dashboards] = useState([
-    { id: 'dashboard1', title: 'Dashboard 1' },
-    { id: 'dashboard2', title: 'Dashboard 2' },
-    { id: 'dashboard3', title: 'Dashboard 3' },
-    { id: 'dashboard4', title: 'Dashboard 4' },
-  ]);
-
-  useEffect(() => {
-    // TODO: Load dashboards...
-  }, [savedObjects]);
-
-  return (
-    <DashboardDrilldownConfig
-      activeDashboardId={config.dashboardId}
-      dashboards={dashboards}
-      currentFilters={config.useCurrentFilters}
-      keepRange={config.useCurrentDateRange}
-      onDashboardSelect={dashboardId => {
-        onConfig({ ...config, dashboardId });
-      }}
-      onCurrentFiltersToggle={() =>
-        onConfig({
-          ...config,
-          useCurrentFilters: !config.useCurrentFilters,
-        })
-      }
-      onKeepRangeToggle={() =>
-        onConfig({
-          ...config,
-          useCurrentDateRange: !config.useCurrentDateRange,
-        })
-      }
-    />
-  );
-};
diff --git a/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/dashboard_to_dashboard_drilldown/constants.ts b/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/dashboard_to_dashboard_drilldown/constants.ts
deleted file mode 100644
index e2a530b156da5..0000000000000
--- a/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/dashboard_to_dashboard_drilldown/constants.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-export const DASHBOARD_TO_DASHBOARD_DRILLDOWN = 'DASHBOARD_TO_DASHBOARD_DRILLDOWN';
diff --git a/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/dashboard_to_dashboard_drilldown/drilldown.test.tsx b/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/dashboard_to_dashboard_drilldown/drilldown.test.tsx
deleted file mode 100644
index 0fb60bb1064a1..0000000000000
--- a/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/dashboard_to_dashboard_drilldown/drilldown.test.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.
- */
-
-describe('.isConfigValid()', () => {
-  test.todo('returns false for incorrect config');
-  test.todo('returns true for incorrect config');
-});
-
-describe('.execute()', () => {
-  test.todo('navigates to correct dashboard');
-  test.todo(
-    'when user chooses to keep current filters, current fileters are set on destination dashboard'
-  );
-  test.todo(
-    'when user chooses to keep current time range, current time range is set on destination dashboard'
-  );
-});
diff --git a/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/dashboard_to_dashboard_drilldown/drilldown.tsx b/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/dashboard_to_dashboard_drilldown/drilldown.tsx
deleted file mode 100644
index 9d2a378f08acd..0000000000000
--- a/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/dashboard_to_dashboard_drilldown/drilldown.tsx
+++ /dev/null
@@ -1,52 +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 { CoreStart } from 'src/core/public';
-import { reactToUiComponent } from '../../../../../../../src/plugins/kibana_react/public';
-import { PlaceContext, ActionContext, Config, CollectConfigProps } from './types';
-import { CollectConfigContainer } from './collect_config';
-import { DASHBOARD_TO_DASHBOARD_DRILLDOWN } from './constants';
-import { DrilldownDefinition as Drilldown } from '../../../../../drilldowns/public';
-import { txtGoToDashboard } from './i18n';
-
-export interface Params {
-  savedObjects: () => Promise<CoreStart['savedObjects']['client']>;
-}
-
-export class DashboardToDashboardDrilldown
-  implements Drilldown<Config, PlaceContext, ActionContext> {
-  constructor(protected readonly params: Params) {}
-
-  public readonly id = DASHBOARD_TO_DASHBOARD_DRILLDOWN;
-
-  public readonly order = 100;
-
-  public readonly getDisplayName = () => txtGoToDashboard;
-
-  public readonly euiIcon = 'dashboardApp';
-
-  private readonly ReactCollectConfig: React.FC<CollectConfigProps> = props => (
-    <CollectConfigContainer {...props} params={this.params} />
-  );
-
-  public readonly CollectConfig = reactToUiComponent(this.ReactCollectConfig);
-
-  public readonly createConfig = () => ({
-    dashboardId: '123',
-    useCurrentFilters: true,
-    useCurrentDateRange: true,
-  });
-
-  public readonly isConfigValid = (config: Config): config is Config => {
-    if (!config.dashboardId) return false;
-    return true;
-  };
-
-  public readonly execute = () => {
-    alert('Go to another dashboard!');
-  };
-}
diff --git a/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/dashboard_to_dashboard_drilldown/i18n.ts b/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/dashboard_to_dashboard_drilldown/i18n.ts
deleted file mode 100644
index 98b746bafd24a..0000000000000
--- a/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/dashboard_to_dashboard_drilldown/i18n.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { i18n } from '@kbn/i18n';
-
-export const txtGoToDashboard = i18n.translate('xpack.dashboard.drilldown.goToDashboard', {
-  defaultMessage: 'Go to Dashboard',
-});
diff --git a/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/dashboard_to_dashboard_drilldown/index.ts b/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/dashboard_to_dashboard_drilldown/index.ts
deleted file mode 100644
index 9daa485bb6e6c..0000000000000
--- a/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/dashboard_to_dashboard_drilldown/index.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-export { DASHBOARD_TO_DASHBOARD_DRILLDOWN } from './constants';
-export {
-  DashboardToDashboardDrilldown,
-  Params as DashboardToDashboardDrilldownParams,
-} from './drilldown';
-export {
-  PlaceContext as DashboardToDashboardPlaceContext,
-  ActionContext as DashboardToDashboardActionContext,
-  Config as DashboardToDashboardConfig,
-} from './types';
diff --git a/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/dashboard_to_dashboard_drilldown/types.ts b/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/dashboard_to_dashboard_drilldown/types.ts
deleted file mode 100644
index 398a259491e3e..0000000000000
--- a/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/dashboard_to_dashboard_drilldown/types.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import {
-  EmbeddableVisTriggerContext,
-  EmbeddableContext,
-} from '../../../../../../../src/plugins/embeddable/public';
-import { UiActionsCollectConfigProps } from '../../../../../../../src/plugins/ui_actions/public';
-
-export type PlaceContext = EmbeddableContext;
-export type ActionContext = EmbeddableVisTriggerContext;
-
-export interface Config {
-  dashboardId?: string;
-  useCurrentFilters: boolean;
-  useCurrentDateRange: boolean;
-}
-
-export type CollectConfigProps = UiActionsCollectConfigProps<Config>;
diff --git a/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/index.ts b/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/index.ts
deleted file mode 100644
index 7be8f1c65da12..0000000000000
--- a/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/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 * from './dashboard_drilldowns_services';
diff --git a/x-pack/plugins/dashboard_enhanced/public/services/index.ts b/x-pack/plugins/dashboard_enhanced/public/services/index.ts
deleted file mode 100644
index 8cc3e12906531..0000000000000
--- a/x-pack/plugins/dashboard_enhanced/public/services/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 * from './drilldowns';
diff --git a/x-pack/plugins/dashboard_enhanced/server/config.ts b/x-pack/plugins/dashboard_enhanced/server/config.ts
deleted file mode 100644
index b75c95d5f8832..0000000000000
--- a/x-pack/plugins/dashboard_enhanced/server/config.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { schema, TypeOf } from '@kbn/config-schema';
-import { PluginConfigDescriptor } from '../../../../src/core/server';
-
-export const configSchema = schema.object({
-  drilldowns: schema.object({
-    enabled: schema.boolean({ defaultValue: false }),
-  }),
-});
-
-export type ConfigSchema = TypeOf<typeof configSchema>;
-
-export const config: PluginConfigDescriptor<ConfigSchema> = {
-  schema: configSchema,
-  exposeToBrowser: {
-    drilldowns: true,
-  },
-};
diff --git a/x-pack/plugins/dashboard_enhanced/server/index.ts b/x-pack/plugins/dashboard_enhanced/server/index.ts
deleted file mode 100644
index e361b9fb075ed..0000000000000
--- a/x-pack/plugins/dashboard_enhanced/server/index.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-export { config } from './config';
-
-export const plugin = () => ({
-  setup() {},
-  start() {},
-});
diff --git a/x-pack/plugins/drilldowns/kibana.json b/x-pack/plugins/drilldowns/kibana.json
index 8372d87166364..b951c7dc1fc87 100644
--- a/x-pack/plugins/drilldowns/kibana.json
+++ b/x-pack/plugins/drilldowns/kibana.json
@@ -3,5 +3,8 @@
   "version": "kibana",
   "server": false,
   "ui": true,
-  "requiredPlugins": ["uiActions", "embeddable", "advancedUiActions"]
+  "requiredPlugins": [
+    "uiActions",
+    "embeddable"
+  ]
 }
diff --git a/x-pack/plugins/drilldowns/public/actions/flyout_create_drilldown/index.tsx b/x-pack/plugins/drilldowns/public/actions/flyout_create_drilldown/index.tsx
new file mode 100644
index 0000000000000..4834cc8081374
--- /dev/null
+++ b/x-pack/plugins/drilldowns/public/actions/flyout_create_drilldown/index.tsx
@@ -0,0 +1,52 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * 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 { CoreStart } from 'src/core/public';
+import { ActionByType } from '../../../../../../src/plugins/ui_actions/public';
+import { toMountPoint } from '../../../../../../src/plugins/kibana_react/public';
+import { IEmbeddable } from '../../../../../../src/plugins/embeddable/public';
+import { FlyoutCreateDrilldown } from '../../components/flyout_create_drilldown';
+
+export const OPEN_FLYOUT_ADD_DRILLDOWN = 'OPEN_FLYOUT_ADD_DRILLDOWN';
+
+export interface FlyoutCreateDrilldownActionContext {
+  embeddable: IEmbeddable;
+}
+
+export interface OpenFlyoutAddDrilldownParams {
+  overlays: () => Promise<CoreStart['overlays']>;
+}
+
+export class FlyoutCreateDrilldownAction implements ActionByType<typeof OPEN_FLYOUT_ADD_DRILLDOWN> {
+  public readonly type = OPEN_FLYOUT_ADD_DRILLDOWN;
+  public readonly id = OPEN_FLYOUT_ADD_DRILLDOWN;
+  public order = 100;
+
+  constructor(protected readonly params: OpenFlyoutAddDrilldownParams) {}
+
+  public getDisplayName() {
+    return i18n.translate('xpack.drilldowns.FlyoutCreateDrilldownAction.displayName', {
+      defaultMessage: 'Create drilldown',
+    });
+  }
+
+  public getIconType() {
+    return 'plusInCircle';
+  }
+
+  public async isCompatible({ embeddable }: FlyoutCreateDrilldownActionContext) {
+    return embeddable.getInput().viewMode === 'edit';
+  }
+
+  public async execute(context: FlyoutCreateDrilldownActionContext) {
+    const overlays = await this.params.overlays();
+    const handle = overlays.openFlyout(
+      toMountPoint(<FlyoutCreateDrilldown context={context} onClose={() => handle.close()} />)
+    );
+  }
+}
diff --git a/x-pack/plugins/drilldowns/public/actions/flyout_edit_drilldown/index.tsx b/x-pack/plugins/drilldowns/public/actions/flyout_edit_drilldown/index.tsx
new file mode 100644
index 0000000000000..f109da94fcaca
--- /dev/null
+++ b/x-pack/plugins/drilldowns/public/actions/flyout_edit_drilldown/index.tsx
@@ -0,0 +1,72 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * 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 { CoreStart } from 'src/core/public';
+import { EuiNotificationBadge } from '@elastic/eui';
+import { ActionByType } from '../../../../../../src/plugins/ui_actions/public';
+import {
+  toMountPoint,
+  reactToUiComponent,
+} from '../../../../../../src/plugins/kibana_react/public';
+import { IEmbeddable } from '../../../../../../src/plugins/embeddable/public';
+import { FormCreateDrilldown } from '../../components/form_create_drilldown';
+
+export const OPEN_FLYOUT_EDIT_DRILLDOWN = 'OPEN_FLYOUT_EDIT_DRILLDOWN';
+
+export interface FlyoutEditDrilldownActionContext {
+  embeddable: IEmbeddable;
+}
+
+export interface FlyoutEditDrilldownParams {
+  overlays: () => Promise<CoreStart['overlays']>;
+}
+
+const displayName = i18n.translate('xpack.drilldowns.panel.openFlyoutEditDrilldown.displayName', {
+  defaultMessage: 'Manage drilldowns',
+});
+
+// mocked data
+const drilldrownCount = 2;
+
+export class FlyoutEditDrilldownAction implements ActionByType<typeof OPEN_FLYOUT_EDIT_DRILLDOWN> {
+  public readonly type = OPEN_FLYOUT_EDIT_DRILLDOWN;
+  public readonly id = OPEN_FLYOUT_EDIT_DRILLDOWN;
+  public order = 100;
+
+  constructor(protected readonly params: FlyoutEditDrilldownParams) {}
+
+  public getDisplayName() {
+    return displayName;
+  }
+
+  public getIconType() {
+    return 'list';
+  }
+
+  private ReactComp: React.FC<{ context: FlyoutEditDrilldownActionContext }> = () => {
+    return (
+      <>
+        {displayName}{' '}
+        <EuiNotificationBadge color="subdued" style={{ float: 'right' }}>
+          {drilldrownCount}
+        </EuiNotificationBadge>
+      </>
+    );
+  };
+
+  MenuItem = reactToUiComponent(this.ReactComp);
+
+  public async isCompatible({ embeddable }: FlyoutEditDrilldownActionContext) {
+    return embeddable.getInput().viewMode === 'edit' && drilldrownCount > 0;
+  }
+
+  public async execute({ embeddable }: FlyoutEditDrilldownActionContext) {
+    const overlays = await this.params.overlays();
+    overlays.openFlyout(toMountPoint(<FormCreateDrilldown />));
+  }
+}
diff --git a/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/actions/index.ts b/x-pack/plugins/drilldowns/public/actions/index.ts
similarity index 100%
rename from x-pack/plugins/dashboard_enhanced/public/services/drilldowns/actions/index.ts
rename to x-pack/plugins/drilldowns/public/actions/index.ts
diff --git a/x-pack/plugins/drilldowns/public/components/connected_flyout_manage_drilldowns/connected_flyout_manage_drilldowns.story.tsx b/x-pack/plugins/drilldowns/public/components/connected_flyout_manage_drilldowns/connected_flyout_manage_drilldowns.story.tsx
deleted file mode 100644
index 16b4d3a25d9e5..0000000000000
--- a/x-pack/plugins/drilldowns/public/components/connected_flyout_manage_drilldowns/connected_flyout_manage_drilldowns.story.tsx
+++ /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 * as React from 'react';
-import { EuiFlyout } from '@elastic/eui';
-import { storiesOf } from '@storybook/react';
-import { createFlyoutManageDrilldowns } from './connected_flyout_manage_drilldowns';
-import {
-  dashboardFactory,
-  urlFactory,
-  // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-} from '../../../../advanced_ui_actions/public/components/action_wizard/test_data';
-import { Storage } from '../../../../../../src/plugins/kibana_utils/public';
-import { StubBrowserStorage } from '../../../../../../src/test_utils/public/stub_browser_storage';
-import { mockDynamicActionManager } from './test_data';
-
-const FlyoutManageDrilldowns = createFlyoutManageDrilldowns({
-  advancedUiActions: {
-    getActionFactories() {
-      return [dashboardFactory, urlFactory];
-    },
-  } as any,
-  storage: new Storage(new StubBrowserStorage()),
-  notifications: {
-    toasts: {
-      addError: (...args: any[]) => {
-        alert(JSON.stringify(args));
-      },
-      addSuccess: (...args: any[]) => {
-        alert(JSON.stringify(args));
-      },
-    } as any,
-  },
-});
-
-storiesOf('components/FlyoutManageDrilldowns', module).add('default', () => (
-  <EuiFlyout onClose={() => {}}>
-    <FlyoutManageDrilldowns placeContext={{}} dynamicActionManager={mockDynamicActionManager} />
-  </EuiFlyout>
-));
diff --git a/x-pack/plugins/drilldowns/public/components/connected_flyout_manage_drilldowns/connected_flyout_manage_drilldowns.test.tsx b/x-pack/plugins/drilldowns/public/components/connected_flyout_manage_drilldowns/connected_flyout_manage_drilldowns.test.tsx
deleted file mode 100644
index 6749b41e81fc7..0000000000000
--- a/x-pack/plugins/drilldowns/public/components/connected_flyout_manage_drilldowns/connected_flyout_manage_drilldowns.test.tsx
+++ /dev/null
@@ -1,221 +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 { cleanup, fireEvent, render, wait } from '@testing-library/react/pure';
-import '@testing-library/jest-dom/extend-expect';
-import { createFlyoutManageDrilldowns } from './connected_flyout_manage_drilldowns';
-import {
-  dashboardFactory,
-  urlFactory,
-} from '../../../../advanced_ui_actions/public/components/action_wizard/test_data';
-import { StubBrowserStorage } from '../../../../../../src/test_utils/public/stub_browser_storage';
-import { Storage } from '../../../../../../src/plugins/kibana_utils/public';
-import { mockDynamicActionManager } from './test_data';
-import { TEST_SUBJ_DRILLDOWN_ITEM } from '../list_manage_drilldowns';
-import { WELCOME_MESSAGE_TEST_SUBJ } from '../drilldown_hello_bar';
-import { coreMock } from '../../../../../../src/core/public/mocks';
-import { NotificationsStart } from 'kibana/public';
-import { toastDrilldownsCRUDError } from './i18n';
-
-const storage = new Storage(new StubBrowserStorage());
-const notifications = coreMock.createStart().notifications;
-const FlyoutManageDrilldowns = createFlyoutManageDrilldowns({
-  advancedUiActions: {
-    getActionFactories() {
-      return [dashboardFactory, urlFactory];
-    },
-  } as any,
-  storage,
-  notifications,
-});
-
-// https://github.com/elastic/kibana/issues/59469
-afterEach(cleanup);
-
-beforeEach(() => {
-  storage.clear();
-  (notifications.toasts as jest.Mocked<NotificationsStart['toasts']>).addSuccess.mockClear();
-  (notifications.toasts as jest.Mocked<NotificationsStart['toasts']>).addError.mockClear();
-});
-
-test('Allows to manage drilldowns', async () => {
-  const screen = render(
-    <FlyoutManageDrilldowns placeContext={{}} dynamicActionManager={mockDynamicActionManager} />
-  );
-
-  // wait for initial render. It is async because resolving compatible action factories is async
-  await wait(() => expect(screen.getByText(/Manage Drilldowns/i)).toBeVisible());
-
-  // no drilldowns in the list
-  expect(screen.queryAllByTestId(TEST_SUBJ_DRILLDOWN_ITEM)).toHaveLength(0);
-
-  fireEvent.click(screen.getByText(/Create new/i));
-
-  let [createHeading, createButton] = screen.getAllByText(/Create Drilldown/i);
-  expect(createHeading).toBeVisible();
-  expect(screen.getByLabelText(/Back/i)).toBeVisible();
-
-  expect(createButton).toBeDisabled();
-
-  // input drilldown name
-  const name = 'Test name';
-  fireEvent.change(screen.getByLabelText(/name/i), {
-    target: { value: name },
-  });
-
-  // select URL one
-  fireEvent.click(screen.getByText(/Go to URL/i));
-
-  // Input url
-  const URL = 'https://elastic.co';
-  fireEvent.change(screen.getByLabelText(/url/i), {
-    target: { value: URL },
-  });
-
-  [createHeading, createButton] = screen.getAllByText(/Create Drilldown/i);
-
-  expect(createButton).toBeEnabled();
-  fireEvent.click(createButton);
-
-  expect(screen.getByText(/Manage Drilldowns/i)).toBeVisible();
-
-  await wait(() => expect(screen.queryAllByTestId(TEST_SUBJ_DRILLDOWN_ITEM)).toHaveLength(1));
-  expect(screen.getByText(name)).toBeVisible();
-  const editButton = screen.getByText(/edit/i);
-  fireEvent.click(editButton);
-
-  expect(screen.getByText(/Edit Drilldown/i)).toBeVisible();
-  // check that wizard is prefilled with current drilldown values
-  expect(screen.getByLabelText(/name/i)).toHaveValue(name);
-  expect(screen.getByLabelText(/url/i)).toHaveValue(URL);
-
-  // input new drilldown name
-  const newName = 'New drilldown name';
-  fireEvent.change(screen.getByLabelText(/name/i), {
-    target: { value: newName },
-  });
-  fireEvent.click(screen.getByText(/save/i));
-
-  expect(screen.getByText(/Manage Drilldowns/i)).toBeVisible();
-  await wait(() => screen.getByText(newName));
-
-  // delete drilldown from edit view
-  fireEvent.click(screen.getByText(/edit/i));
-  fireEvent.click(screen.getByText(/delete/i));
-
-  expect(screen.getByText(/Manage Drilldowns/i)).toBeVisible();
-  await wait(() => expect(screen.queryAllByTestId(TEST_SUBJ_DRILLDOWN_ITEM)).toHaveLength(0));
-});
-
-test('Can delete multiple drilldowns', async () => {
-  const screen = render(
-    <FlyoutManageDrilldowns placeContext={{}} dynamicActionManager={mockDynamicActionManager} />
-  );
-  // wait for initial render. It is async because resolving compatible action factories is async
-  await wait(() => expect(screen.getByText(/Manage Drilldowns/i)).toBeVisible());
-
-  const createDrilldown = async () => {
-    const oldCount = screen.queryAllByTestId(TEST_SUBJ_DRILLDOWN_ITEM).length;
-    fireEvent.click(screen.getByText(/Create new/i));
-    fireEvent.change(screen.getByLabelText(/name/i), {
-      target: { value: 'test' },
-    });
-    fireEvent.click(screen.getByText(/Go to URL/i));
-    fireEvent.change(screen.getByLabelText(/url/i), {
-      target: { value: 'https://elastic.co' },
-    });
-    fireEvent.click(screen.getAllByText(/Create Drilldown/i)[1]);
-    await wait(() =>
-      expect(screen.queryAllByTestId(TEST_SUBJ_DRILLDOWN_ITEM)).toHaveLength(oldCount + 1)
-    );
-  };
-
-  await createDrilldown();
-  await createDrilldown();
-  await createDrilldown();
-
-  const checkboxes = screen.getAllByLabelText(/Select this drilldown/i);
-  expect(checkboxes).toHaveLength(3);
-  checkboxes.forEach(checkbox => fireEvent.click(checkbox));
-  expect(screen.queryByText(/Create/i)).not.toBeInTheDocument();
-  fireEvent.click(screen.getByText(/Delete \(3\)/i));
-
-  await wait(() => expect(screen.queryAllByTestId(TEST_SUBJ_DRILLDOWN_ITEM)).toHaveLength(0));
-});
-
-test('Create only mode', async () => {
-  const onClose = jest.fn();
-  const screen = render(
-    <FlyoutManageDrilldowns
-      placeContext={{}}
-      dynamicActionManager={mockDynamicActionManager}
-      viewMode={'create'}
-      onClose={onClose}
-    />
-  );
-  // wait for initial render. It is async because resolving compatible action factories is async
-  await wait(() => expect(screen.getAllByText(/Create/i).length).toBeGreaterThan(0));
-  fireEvent.change(screen.getByLabelText(/name/i), {
-    target: { value: 'test' },
-  });
-  fireEvent.click(screen.getByText(/Go to URL/i));
-  fireEvent.change(screen.getByLabelText(/url/i), {
-    target: { value: 'https://elastic.co' },
-  });
-  fireEvent.click(screen.getAllByText(/Create Drilldown/i)[1]);
-
-  await wait(() => expect(notifications.toasts.addSuccess).toBeCalled());
-  expect(onClose).toBeCalled();
-  expect(await mockDynamicActionManager.state.get().events.length).toBe(1);
-});
-
-test.todo("Error when can't fetch drilldown list");
-
-test("Error when can't save drilldown changes", async () => {
-  const error = new Error('Oops');
-  jest.spyOn(mockDynamicActionManager, 'createEvent').mockImplementationOnce(async () => {
-    throw error;
-  });
-  const screen = render(
-    <FlyoutManageDrilldowns placeContext={{}} dynamicActionManager={mockDynamicActionManager} />
-  );
-  // wait for initial render. It is async because resolving compatible action factories is async
-  await wait(() => expect(screen.getByText(/Manage Drilldowns/i)).toBeVisible());
-  fireEvent.click(screen.getByText(/Create new/i));
-  fireEvent.change(screen.getByLabelText(/name/i), {
-    target: { value: 'test' },
-  });
-  fireEvent.click(screen.getByText(/Go to URL/i));
-  fireEvent.change(screen.getByLabelText(/url/i), {
-    target: { value: 'https://elastic.co' },
-  });
-  fireEvent.click(screen.getAllByText(/Create Drilldown/i)[1]);
-  await wait(() =>
-    expect(notifications.toasts.addError).toBeCalledWith(error, { title: toastDrilldownsCRUDError })
-  );
-});
-
-test('Should show drilldown welcome message. Should be able to dismiss it', async () => {
-  let screen = render(
-    <FlyoutManageDrilldowns placeContext={{}} dynamicActionManager={mockDynamicActionManager} />
-  );
-
-  // wait for initial render. It is async because resolving compatible action factories is async
-  await wait(() => expect(screen.getByText(/Manage Drilldowns/i)).toBeVisible());
-
-  expect(screen.getByTestId(WELCOME_MESSAGE_TEST_SUBJ)).toBeVisible();
-  fireEvent.click(screen.getByText(/hide/i));
-  expect(screen.queryByTestId(WELCOME_MESSAGE_TEST_SUBJ)).toBeNull();
-  cleanup();
-
-  screen = render(
-    <FlyoutManageDrilldowns placeContext={{}} dynamicActionManager={mockDynamicActionManager} />
-  );
-  // wait for initial render. It is async because resolving compatible action factories is async
-  await wait(() => expect(screen.getByText(/Manage Drilldowns/i)).toBeVisible());
-  expect(screen.queryByTestId(WELCOME_MESSAGE_TEST_SUBJ)).toBeNull();
-});
diff --git a/x-pack/plugins/drilldowns/public/components/connected_flyout_manage_drilldowns/connected_flyout_manage_drilldowns.tsx b/x-pack/plugins/drilldowns/public/components/connected_flyout_manage_drilldowns/connected_flyout_manage_drilldowns.tsx
deleted file mode 100644
index f22ccc2f26f02..0000000000000
--- a/x-pack/plugins/drilldowns/public/components/connected_flyout_manage_drilldowns/connected_flyout_manage_drilldowns.tsx
+++ /dev/null
@@ -1,332 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import React, { useEffect, useState } from 'react';
-import useMountedState from 'react-use/lib/useMountedState';
-import {
-  AdvancedUiActionsActionFactory as ActionFactory,
-  AdvancedUiActionsStart,
-} from '../../../../advanced_ui_actions/public';
-import { NotificationsStart } from '../../../../../../src/core/public';
-import { DrilldownWizardConfig, FlyoutDrilldownWizard } from '../flyout_drilldown_wizard';
-import { FlyoutListManageDrilldowns } from '../flyout_list_manage_drilldowns';
-import { IStorageWrapper } from '../../../../../../src/plugins/kibana_utils/public';
-import {
-  DynamicActionManager,
-  UiActionsSerializedEvent,
-  UiActionsSerializedAction,
-  VALUE_CLICK_TRIGGER,
-  SELECT_RANGE_TRIGGER,
-  TriggerContextMapping,
-} from '../../../../../../src/plugins/ui_actions/public';
-import { useContainerState } from '../../../../../../src/plugins/kibana_utils/common';
-import { DrilldownListItem } from '../list_manage_drilldowns';
-import {
-  toastDrilldownCreated,
-  toastDrilldownDeleted,
-  toastDrilldownEdited,
-  toastDrilldownsCRUDError,
-  toastDrilldownsDeleted,
-} from './i18n';
-import { DrilldownFactoryContext } from '../../types';
-
-interface ConnectedFlyoutManageDrilldownsProps<Context extends object = object> {
-  placeContext: Context;
-  dynamicActionManager: DynamicActionManager;
-  viewMode?: 'create' | 'manage';
-  onClose?: () => void;
-}
-
-/**
- * Represent current state (route) of FlyoutManageDrilldowns
- */
-enum Routes {
-  Manage = 'manage',
-  Create = 'create',
-  Edit = 'edit',
-}
-
-export function createFlyoutManageDrilldowns({
-  advancedUiActions,
-  storage,
-  notifications,
-}: {
-  advancedUiActions: AdvancedUiActionsStart;
-  storage: IStorageWrapper;
-  notifications: NotificationsStart;
-}) {
-  // fine to assume this is static,
-  // because all action factories should be registered in setup phase
-  const allActionFactories = advancedUiActions.getActionFactories();
-  const allActionFactoriesById = allActionFactories.reduce((acc, next) => {
-    acc[next.id] = next;
-    return acc;
-  }, {} as Record<string, ActionFactory>);
-
-  return (props: ConnectedFlyoutManageDrilldownsProps) => {
-    const isCreateOnly = props.viewMode === 'create';
-
-    const selectedTriggers: Array<keyof TriggerContextMapping> = React.useMemo(
-      () => [VALUE_CLICK_TRIGGER, SELECT_RANGE_TRIGGER],
-      []
-    );
-
-    const factoryContext: DrilldownFactoryContext<unknown> = React.useMemo(
-      () => ({
-        placeContext: props.placeContext,
-        triggers: selectedTriggers,
-      }),
-      [props.placeContext, selectedTriggers]
-    );
-
-    const actionFactories = useCompatibleActionFactoriesForCurrentContext(
-      allActionFactories,
-      factoryContext
-    );
-
-    const [route, setRoute] = useState<Routes>(
-      () => (isCreateOnly ? Routes.Create : Routes.Manage) // initial state is different depending on `viewMode`
-    );
-    const [currentEditId, setCurrentEditId] = useState<string | null>(null);
-
-    const [shouldShowWelcomeMessage, onHideWelcomeMessage] = useWelcomeMessage(storage);
-
-    const {
-      drilldowns,
-      createDrilldown,
-      editDrilldown,
-      deleteDrilldown,
-    } = useDrilldownsStateManager(props.dynamicActionManager, notifications);
-
-    /**
-     * isCompatible promise is not yet resolved.
-     * Skip rendering until it is resolved
-     */
-    if (!actionFactories) return null;
-    /**
-     * Drilldowns are not fetched yet or error happened during fetching
-     * In case of error user is notified with toast
-     */
-    if (!drilldowns) return null;
-
-    /**
-     * Needed for edit mode to prefill wizard fields with data from current edited drilldown
-     */
-    function resolveInitialDrilldownWizardConfig(): DrilldownWizardConfig | undefined {
-      if (route !== Routes.Edit) return undefined;
-      if (!currentEditId) return undefined;
-      const drilldownToEdit = drilldowns?.find(d => d.eventId === currentEditId);
-      if (!drilldownToEdit) return undefined;
-
-      return {
-        actionFactory: allActionFactoriesById[drilldownToEdit.action.factoryId],
-        actionConfig: drilldownToEdit.action.config as object, // TODO: config is unknown, but we know it always extends object
-        name: drilldownToEdit.action.name,
-      };
-    }
-
-    /**
-     * Maps drilldown to list item view model
-     */
-    function mapToDrilldownToDrilldownListItem(
-      drilldown: UiActionsSerializedEvent
-    ): DrilldownListItem {
-      const actionFactory = allActionFactoriesById[drilldown.action.factoryId];
-      return {
-        id: drilldown.eventId,
-        drilldownName: drilldown.action.name,
-        actionName: actionFactory?.getDisplayName(factoryContext) ?? drilldown.action.factoryId,
-        icon: actionFactory?.getIconType(factoryContext),
-      };
-    }
-
-    switch (route) {
-      case Routes.Create:
-      case Routes.Edit:
-        return (
-          <FlyoutDrilldownWizard
-            showWelcomeMessage={shouldShowWelcomeMessage}
-            onWelcomeHideClick={onHideWelcomeMessage}
-            drilldownActionFactories={actionFactories}
-            onClose={props.onClose}
-            mode={route === Routes.Create ? 'create' : 'edit'}
-            onBack={isCreateOnly ? undefined : () => setRoute(Routes.Manage)}
-            onSubmit={({ actionConfig, actionFactory, name }) => {
-              if (route === Routes.Create) {
-                createDrilldown(
-                  {
-                    name,
-                    config: actionConfig,
-                    factoryId: actionFactory.id,
-                  },
-                  selectedTriggers
-                );
-              } else {
-                editDrilldown(
-                  currentEditId!,
-                  {
-                    name,
-                    config: actionConfig,
-                    factoryId: actionFactory.id,
-                  },
-                  selectedTriggers
-                );
-              }
-
-              if (isCreateOnly) {
-                if (props.onClose) {
-                  props.onClose();
-                }
-              } else {
-                setRoute(Routes.Manage);
-              }
-
-              setCurrentEditId(null);
-            }}
-            onDelete={() => {
-              deleteDrilldown(currentEditId!);
-              setRoute(Routes.Manage);
-              setCurrentEditId(null);
-            }}
-            actionFactoryContext={factoryContext}
-            initialDrilldownWizardConfig={resolveInitialDrilldownWizardConfig()}
-          />
-        );
-
-      case Routes.Manage:
-      default:
-        return (
-          <FlyoutListManageDrilldowns
-            showWelcomeMessage={shouldShowWelcomeMessage}
-            onWelcomeHideClick={onHideWelcomeMessage}
-            drilldowns={drilldowns.map(mapToDrilldownToDrilldownListItem)}
-            onDelete={ids => {
-              setCurrentEditId(null);
-              deleteDrilldown(ids);
-            }}
-            onEdit={id => {
-              setCurrentEditId(id);
-              setRoute(Routes.Edit);
-            }}
-            onCreate={() => {
-              setCurrentEditId(null);
-              setRoute(Routes.Create);
-            }}
-            onClose={props.onClose}
-          />
-        );
-    }
-  };
-}
-
-function useCompatibleActionFactoriesForCurrentContext<Context extends object = object>(
-  actionFactories: Array<ActionFactory<any>>,
-  context: Context
-) {
-  const [compatibleActionFactories, setCompatibleActionFactories] = useState<
-    Array<ActionFactory<any>>
-  >();
-  useEffect(() => {
-    let canceled = false;
-    async function updateCompatibleFactoriesForContext() {
-      const compatibility = await Promise.all(
-        actionFactories.map(factory => factory.isCompatible(context))
-      );
-      if (canceled) return;
-      setCompatibleActionFactories(actionFactories.filter((_, i) => compatibility[i]));
-    }
-    updateCompatibleFactoriesForContext();
-    return () => {
-      canceled = true;
-    };
-  }, [context, actionFactories]);
-
-  return compatibleActionFactories;
-}
-
-function useWelcomeMessage(storage: IStorageWrapper): [boolean, () => void] {
-  const key = `drilldowns:hidWelcomeMessage`;
-  const [hidWelcomeMessage, setHidWelcomeMessage] = useState<boolean>(storage.get(key) ?? false);
-
-  return [
-    !hidWelcomeMessage,
-    () => {
-      if (hidWelcomeMessage) return;
-      setHidWelcomeMessage(true);
-      storage.set(key, true);
-    },
-  ];
-}
-
-function useDrilldownsStateManager(
-  actionManager: DynamicActionManager,
-  notifications: NotificationsStart
-) {
-  const { events: drilldowns } = useContainerState(actionManager.state);
-  const [isLoading, setIsLoading] = useState(false);
-  const isMounted = useMountedState();
-
-  async function run(op: () => Promise<void>) {
-    setIsLoading(true);
-    try {
-      await op();
-    } catch (e) {
-      notifications.toasts.addError(e, {
-        title: toastDrilldownsCRUDError,
-      });
-      if (!isMounted) return;
-      setIsLoading(false);
-      return;
-    }
-  }
-
-  async function createDrilldown(
-    action: UiActionsSerializedAction<any>,
-    selectedTriggers: Array<keyof TriggerContextMapping>
-  ) {
-    await run(async () => {
-      await actionManager.createEvent(action, selectedTriggers);
-      notifications.toasts.addSuccess({
-        title: toastDrilldownCreated.title,
-        text: toastDrilldownCreated.text(action.name),
-      });
-    });
-  }
-
-  async function editDrilldown(
-    drilldownId: string,
-    action: UiActionsSerializedAction<any>,
-    selectedTriggers: Array<keyof TriggerContextMapping>
-  ) {
-    await run(async () => {
-      await actionManager.updateEvent(drilldownId, action, selectedTriggers);
-      notifications.toasts.addSuccess({
-        title: toastDrilldownEdited.title,
-        text: toastDrilldownEdited.text(action.name),
-      });
-    });
-  }
-
-  async function deleteDrilldown(drilldownIds: string | string[]) {
-    await run(async () => {
-      drilldownIds = Array.isArray(drilldownIds) ? drilldownIds : [drilldownIds];
-      await actionManager.deleteEvents(drilldownIds);
-      notifications.toasts.addSuccess(
-        drilldownIds.length === 1
-          ? {
-              title: toastDrilldownDeleted.title,
-              text: toastDrilldownDeleted.text,
-            }
-          : {
-              title: toastDrilldownsDeleted.title,
-              text: toastDrilldownsDeleted.text(drilldownIds.length),
-            }
-      );
-    });
-  }
-
-  return { drilldowns, isLoading, createDrilldown, editDrilldown, deleteDrilldown };
-}
diff --git a/x-pack/plugins/drilldowns/public/components/connected_flyout_manage_drilldowns/i18n.ts b/x-pack/plugins/drilldowns/public/components/connected_flyout_manage_drilldowns/i18n.ts
deleted file mode 100644
index 70f4d735e2a74..0000000000000
--- a/x-pack/plugins/drilldowns/public/components/connected_flyout_manage_drilldowns/i18n.ts
+++ /dev/null
@@ -1,88 +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';
-
-export const toastDrilldownCreated = {
-  title: i18n.translate(
-    'xpack.drilldowns.components.flyoutDrilldownWizard.toast.drilldownCreatedTitle',
-    {
-      defaultMessage: 'Drilldown created',
-    }
-  ),
-  text: (drilldownName: string) =>
-    i18n.translate('xpack.drilldowns.components.flyoutDrilldownWizard.toast.drilldownCreatedText', {
-      defaultMessage: 'You created "{drilldownName}"',
-      values: {
-        drilldownName,
-      },
-    }),
-};
-
-export const toastDrilldownEdited = {
-  title: i18n.translate(
-    'xpack.drilldowns.components.flyoutDrilldownWizard.toast.drilldownEditedTitle',
-    {
-      defaultMessage: 'Drilldown edited',
-    }
-  ),
-  text: (drilldownName: string) =>
-    i18n.translate('xpack.drilldowns.components.flyoutDrilldownWizard.toast.drilldownEditedText', {
-      defaultMessage: 'You edited "{drilldownName}"',
-      values: {
-        drilldownName,
-      },
-    }),
-};
-
-export const toastDrilldownDeleted = {
-  title: i18n.translate(
-    'xpack.drilldowns.components.flyoutDrilldownWizard.toast.drilldownDeletedTitle',
-    {
-      defaultMessage: 'Drilldown deleted',
-    }
-  ),
-  text: i18n.translate(
-    'xpack.drilldowns.components.flyoutDrilldownWizard.toast.drilldownDeletedText',
-    {
-      defaultMessage: 'You deleted a drilldown',
-    }
-  ),
-};
-
-export const toastDrilldownsDeleted = {
-  title: i18n.translate(
-    'xpack.drilldowns.components.flyoutDrilldownWizard.toast.drilldownsDeletedTitle',
-    {
-      defaultMessage: 'Drilldowns deleted',
-    }
-  ),
-  text: (n: number) =>
-    i18n.translate(
-      'xpack.drilldowns.components.flyoutDrilldownWizard.toast.drilldownsDeletedText',
-      {
-        defaultMessage: 'You deleted {n} drilldowns',
-        values: {
-          n,
-        },
-      }
-    ),
-};
-
-export const toastDrilldownsCRUDError = i18n.translate(
-  'xpack.drilldowns.components.flyoutDrilldownWizard.toast.drilldownsCRUDErrorTitle',
-  {
-    defaultMessage: 'Error saving drilldown',
-    description: 'Title for generic error toast when persisting drilldown updates failed',
-  }
-);
-
-export const toastDrilldownsFetchError = i18n.translate(
-  'xpack.drilldowns.components.flyoutDrilldownWizard.toast.drilldownsFetchErrorTitle',
-  {
-    defaultMessage: 'Error fetching drilldowns',
-  }
-);
diff --git a/x-pack/plugins/drilldowns/public/components/connected_flyout_manage_drilldowns/index.ts b/x-pack/plugins/drilldowns/public/components/connected_flyout_manage_drilldowns/index.ts
deleted file mode 100644
index f084a3e563c23..0000000000000
--- a/x-pack/plugins/drilldowns/public/components/connected_flyout_manage_drilldowns/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 * from './connected_flyout_manage_drilldowns';
diff --git a/x-pack/plugins/drilldowns/public/components/connected_flyout_manage_drilldowns/test_data.ts b/x-pack/plugins/drilldowns/public/components/connected_flyout_manage_drilldowns/test_data.ts
deleted file mode 100644
index b8deaa8b842bc..0000000000000
--- a/x-pack/plugins/drilldowns/public/components/connected_flyout_manage_drilldowns/test_data.ts
+++ /dev/null
@@ -1,89 +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 uuid from 'uuid';
-import {
-  DynamicActionManager,
-  DynamicActionManagerState,
-  UiActionsSerializedAction,
-  TriggerContextMapping,
-} from '../../../../../../src/plugins/ui_actions/public';
-import { createStateContainer } from '../../../../../../src/plugins/kibana_utils/common';
-
-class MockDynamicActionManager implements PublicMethodsOf<DynamicActionManager> {
-  public readonly state = createStateContainer<DynamicActionManagerState>({
-    isFetchingEvents: false,
-    fetchCount: 0,
-    events: [],
-  });
-
-  async count() {
-    return this.state.get().events.length;
-  }
-
-  async list() {
-    return this.state.get().events;
-  }
-
-  async createEvent(
-    action: UiActionsSerializedAction<any>,
-    triggers: Array<keyof TriggerContextMapping>
-  ) {
-    const event = {
-      action,
-      triggers,
-      eventId: uuid(),
-    };
-    const state = this.state.get();
-    this.state.set({
-      ...state,
-      events: [...state.events, event],
-    });
-  }
-
-  async deleteEvents(eventIds: string[]) {
-    const state = this.state.get();
-    let events = state.events;
-
-    eventIds.forEach(id => {
-      events = events.filter(e => e.eventId !== id);
-    });
-
-    this.state.set({
-      ...state,
-      events,
-    });
-  }
-
-  async updateEvent(
-    eventId: string,
-    action: UiActionsSerializedAction<unknown>,
-    triggers: Array<keyof TriggerContextMapping>
-  ) {
-    const state = this.state.get();
-    const events = state.events;
-    const idx = events.findIndex(e => e.eventId === eventId);
-    const event = {
-      eventId,
-      action,
-      triggers,
-    };
-
-    this.state.set({
-      ...state,
-      events: [...events.slice(0, idx), event, ...events.slice(idx + 1)],
-    });
-  }
-
-  async deleteEvent() {
-    throw new Error('not implemented');
-  }
-
-  async start() {}
-  async stop() {}
-}
-
-export const mockDynamicActionManager = (new MockDynamicActionManager() as unknown) as DynamicActionManager;
diff --git a/x-pack/plugins/drilldowns/public/components/drilldown_hello_bar/drilldown_hello_bar.story.tsx b/x-pack/plugins/drilldowns/public/components/drilldown_hello_bar/drilldown_hello_bar.story.tsx
index c4a4630397f1c..7a9e19342f27c 100644
--- a/x-pack/plugins/drilldowns/public/components/drilldown_hello_bar/drilldown_hello_bar.story.tsx
+++ b/x-pack/plugins/drilldowns/public/components/drilldown_hello_bar/drilldown_hello_bar.story.tsx
@@ -8,16 +8,6 @@ import * as React from 'react';
 import { storiesOf } from '@storybook/react';
 import { DrilldownHelloBar } from '.';
 
-const Demo = () => {
-  const [show, setShow] = React.useState(true);
-  return show ? (
-    <DrilldownHelloBar
-      docsLink={'https://elastic.co'}
-      onHideClick={() => {
-        setShow(false);
-      }}
-    />
-  ) : null;
-};
-
-storiesOf('components/DrilldownHelloBar', module).add('default', () => <Demo />);
+storiesOf('components/DrilldownHelloBar', module).add('default', () => {
+  return <DrilldownHelloBar />;
+});
diff --git a/x-pack/plugins/drilldowns/public/components/drilldown_hello_bar/drilldown_hello_bar.tsx b/x-pack/plugins/drilldowns/public/components/drilldown_hello_bar/drilldown_hello_bar.tsx
index 8c6739a8ad6c8..1ef714f7b86e2 100644
--- a/x-pack/plugins/drilldowns/public/components/drilldown_hello_bar/drilldown_hello_bar.tsx
+++ b/x-pack/plugins/drilldowns/public/components/drilldown_hello_bar/drilldown_hello_bar.tsx
@@ -5,58 +5,22 @@
  */
 
 import React from 'react';
-import {
-  EuiCallOut,
-  EuiFlexGroup,
-  EuiFlexItem,
-  EuiTextColor,
-  EuiText,
-  EuiLink,
-  EuiSpacer,
-  EuiButtonEmpty,
-  EuiIcon,
-} from '@elastic/eui';
-import { txtHideHelpButtonLabel, txtHelpText, txtViewDocsLinkLabel } from './i18n';
 
 export interface DrilldownHelloBarProps {
   docsLink?: string;
-  onHideClick?: () => void;
 }
 
-export const WELCOME_MESSAGE_TEST_SUBJ = 'drilldowns-welcome-message-test-subj';
-
-export const DrilldownHelloBar: React.FC<DrilldownHelloBarProps> = ({
-  docsLink,
-  onHideClick = () => {},
-}) => {
+/**
+ * @todo https://github.com/elastic/kibana/issues/55311
+ */
+export const DrilldownHelloBar: React.FC<DrilldownHelloBarProps> = ({ docsLink }) => {
   return (
-    <EuiCallOut
-      data-test-subj={WELCOME_MESSAGE_TEST_SUBJ}
-      title={
-        <EuiFlexGroup className="drdHelloBar__content">
-          <EuiFlexItem grow={false}>
-            <div style={{ marginLeft: '8px' }}>
-              <EuiIcon type="help" />
-            </div>
-          </EuiFlexItem>
-          <EuiFlexItem grow={true}>
-            <EuiText size={'s'}>
-              <EuiTextColor color="subdued">{txtHelpText}</EuiTextColor>
-            </EuiText>
-            {docsLink && (
-              <>
-                <EuiSpacer size={'xs'} />
-                <EuiLink href={docsLink}>{txtViewDocsLinkLabel}</EuiLink>
-              </>
-            )}
-          </EuiFlexItem>
-          <EuiFlexItem grow={false}>
-            <EuiButtonEmpty size="xs" onClick={onHideClick}>
-              {txtHideHelpButtonLabel}
-            </EuiButtonEmpty>
-          </EuiFlexItem>
-        </EuiFlexGroup>
-      }
-    />
+    <div>
+      <p>
+        Drilldowns provide the ability to define a new behavior when interacting with a panel. You
+        can add multiple options or simply override the default filtering behavior.
+      </p>
+      <a href={docsLink}>View docs</a>
+    </div>
   );
 };
diff --git a/x-pack/plugins/drilldowns/public/components/drilldown_hello_bar/i18n.ts b/x-pack/plugins/drilldowns/public/components/drilldown_hello_bar/i18n.ts
deleted file mode 100644
index 63dc95dabc0fb..0000000000000
--- a/x-pack/plugins/drilldowns/public/components/drilldown_hello_bar/i18n.ts
+++ /dev/null
@@ -1,29 +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';
-
-export const txtHelpText = i18n.translate(
-  'xpack.drilldowns.components.DrilldownHelloBar.helpText',
-  {
-    defaultMessage:
-      'Drilldowns provide the ability to define a new behavior when interacting with a panel. You can add multiple options or simply override the default filtering behavior.',
-  }
-);
-
-export const txtViewDocsLinkLabel = i18n.translate(
-  'xpack.drilldowns.components.DrilldownHelloBar.viewDocsLinkLabel',
-  {
-    defaultMessage: 'View docs',
-  }
-);
-
-export const txtHideHelpButtonLabel = i18n.translate(
-  'xpack.drilldowns.components.DrilldownHelloBar.hideHelpButtonLabel',
-  {
-    defaultMessage: 'Hide',
-  }
-);
diff --git a/x-pack/plugins/dashboard_enhanced/scripts/storybook.js b/x-pack/plugins/drilldowns/public/components/drilldown_picker/drilldown_picker.story.tsx
similarity index 53%
rename from x-pack/plugins/dashboard_enhanced/scripts/storybook.js
rename to x-pack/plugins/drilldowns/public/components/drilldown_picker/drilldown_picker.story.tsx
index f2cbe4135f4cb..5627a5d6f4522 100644
--- a/x-pack/plugins/dashboard_enhanced/scripts/storybook.js
+++ b/x-pack/plugins/drilldowns/public/components/drilldown_picker/drilldown_picker.story.tsx
@@ -4,10 +4,10 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { join } from 'path';
+import * as React from 'react';
+import { storiesOf } from '@storybook/react';
+import { DrilldownPicker } from '.';
 
-// eslint-disable-next-line
-require('@kbn/storybook').runStorybookCli({
-  name: 'dashboard_enhanced',
-  storyGlobs: [join(__dirname, '..', 'public', 'components', '**', '*.story.tsx')],
+storiesOf('components/DrilldownPicker', module).add('default', () => {
+  return <DrilldownPicker />;
 });
diff --git a/x-pack/plugins/drilldowns/public/components/drilldown_picker/drilldown_picker.tsx b/x-pack/plugins/drilldowns/public/components/drilldown_picker/drilldown_picker.tsx
new file mode 100644
index 0000000000000..3748fc666c81c
--- /dev/null
+++ b/x-pack/plugins/drilldowns/public/components/drilldown_picker/drilldown_picker.tsx
@@ -0,0 +1,21 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React from 'react';
+
+// eslint-disable-next-line
+export interface DrilldownPickerProps {}
+
+export const DrilldownPicker: React.FC<DrilldownPickerProps> = () => {
+  return (
+    <img
+      src={
+        'https://user-images.githubusercontent.com/9773803/72725665-9e8e3e00-3b86-11ea-9314-8724c521b41f.png'
+      }
+      alt=""
+    />
+  );
+};
diff --git a/x-pack/plugins/advanced_ui_actions/public/components/index.ts b/x-pack/plugins/drilldowns/public/components/drilldown_picker/index.tsx
similarity index 87%
rename from x-pack/plugins/advanced_ui_actions/public/components/index.ts
rename to x-pack/plugins/drilldowns/public/components/drilldown_picker/index.tsx
index 236b1a6ec4611..3be289fe6d46e 100644
--- a/x-pack/plugins/advanced_ui_actions/public/components/index.ts
+++ b/x-pack/plugins/drilldowns/public/components/drilldown_picker/index.tsx
@@ -4,4 +4,4 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-export * from './action_wizard';
+export * from './drilldown_picker';
diff --git a/x-pack/plugins/drilldowns/public/components/flyout_create_drilldown/flyout_create_drilldown.story.tsx b/x-pack/plugins/drilldowns/public/components/flyout_create_drilldown/flyout_create_drilldown.story.tsx
new file mode 100644
index 0000000000000..4f024b7d9cd6a
--- /dev/null
+++ b/x-pack/plugins/drilldowns/public/components/flyout_create_drilldown/flyout_create_drilldown.story.tsx
@@ -0,0 +1,24 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+/* eslint-disable no-console */
+
+import * as React from 'react';
+import { EuiFlyout } from '@elastic/eui';
+import { storiesOf } from '@storybook/react';
+import { FlyoutCreateDrilldown } from '.';
+
+storiesOf('components/FlyoutCreateDrilldown', module)
+  .add('default', () => {
+    return <FlyoutCreateDrilldown context={{} as any} />;
+  })
+  .add('open in flyout', () => {
+    return (
+      <EuiFlyout>
+        <FlyoutCreateDrilldown context={{} as any} />
+      </EuiFlyout>
+    );
+  });
diff --git a/x-pack/plugins/drilldowns/public/components/flyout_create_drilldown/flyout_create_drilldown.tsx b/x-pack/plugins/drilldowns/public/components/flyout_create_drilldown/flyout_create_drilldown.tsx
new file mode 100644
index 0000000000000..b45ac9197c7e0
--- /dev/null
+++ b/x-pack/plugins/drilldowns/public/components/flyout_create_drilldown/flyout_create_drilldown.tsx
@@ -0,0 +1,34 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React from 'react';
+import { EuiButton } from '@elastic/eui';
+import { FormCreateDrilldown } from '../form_create_drilldown';
+import { FlyoutFrame } from '../flyout_frame';
+import { txtCreateDrilldown } from './i18n';
+import { FlyoutCreateDrilldownActionContext } from '../../actions';
+
+export interface FlyoutCreateDrilldownProps {
+  context: FlyoutCreateDrilldownActionContext;
+  onClose?: () => void;
+}
+
+export const FlyoutCreateDrilldown: React.FC<FlyoutCreateDrilldownProps> = ({
+  context,
+  onClose,
+}) => {
+  const footer = (
+    <EuiButton onClick={() => {}} fill>
+      {txtCreateDrilldown}
+    </EuiButton>
+  );
+
+  return (
+    <FlyoutFrame title={txtCreateDrilldown} footer={footer} onClose={onClose}>
+      <FormCreateDrilldown />
+    </FlyoutFrame>
+  );
+};
diff --git a/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/actions/flyout_edit_drilldown/i18n.ts b/x-pack/plugins/drilldowns/public/components/flyout_create_drilldown/i18n.ts
similarity index 64%
rename from x-pack/plugins/dashboard_enhanced/public/services/drilldowns/actions/flyout_edit_drilldown/i18n.ts
rename to x-pack/plugins/drilldowns/public/components/flyout_create_drilldown/i18n.ts
index 4e2e5eb7092e4..ceabc6d3a9aa5 100644
--- a/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/actions/flyout_edit_drilldown/i18n.ts
+++ b/x-pack/plugins/drilldowns/public/components/flyout_create_drilldown/i18n.ts
@@ -6,9 +6,9 @@
 
 import { i18n } from '@kbn/i18n';
 
-export const txtDisplayName = i18n.translate(
-  'xpack.dashboard.panel.openFlyoutEditDrilldown.displayName',
+export const txtCreateDrilldown = i18n.translate(
+  'xpack.drilldowns.components.FlyoutCreateDrilldown.CreateDrilldown',
   {
-    defaultMessage: 'Manage drilldowns',
+    defaultMessage: 'Create drilldown',
   }
 );
diff --git a/x-pack/plugins/advanced_ui_actions/public/services/index.ts b/x-pack/plugins/drilldowns/public/components/flyout_create_drilldown/index.ts
similarity index 84%
rename from x-pack/plugins/advanced_ui_actions/public/services/index.ts
rename to x-pack/plugins/drilldowns/public/components/flyout_create_drilldown/index.ts
index 0f8b4c8d8f409..ce235043b4ef6 100644
--- a/x-pack/plugins/advanced_ui_actions/public/services/index.ts
+++ b/x-pack/plugins/drilldowns/public/components/flyout_create_drilldown/index.ts
@@ -4,4 +4,4 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-export * from './action_factory_service';
+export * from './flyout_create_drilldown';
diff --git a/x-pack/plugins/drilldowns/public/components/flyout_drilldown_wizard/flyout_drilldown_wizard.story.tsx b/x-pack/plugins/drilldowns/public/components/flyout_drilldown_wizard/flyout_drilldown_wizard.story.tsx
deleted file mode 100644
index 152cd393b9d3e..0000000000000
--- a/x-pack/plugins/drilldowns/public/components/flyout_drilldown_wizard/flyout_drilldown_wizard.story.tsx
+++ /dev/null
@@ -1,70 +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.
- */
-
-/* eslint-disable no-console */
-
-import * as React from 'react';
-import { EuiFlyout } from '@elastic/eui';
-import { storiesOf } from '@storybook/react';
-import { FlyoutDrilldownWizard } from '.';
-import {
-  dashboardFactory,
-  urlFactory,
-  // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-} from '../../../../advanced_ui_actions/public/components/action_wizard/test_data';
-
-storiesOf('components/FlyoutDrilldownWizard', module)
-  .add('default', () => {
-    return <FlyoutDrilldownWizard drilldownActionFactories={[urlFactory, dashboardFactory]} />;
-  })
-  .add('open in flyout - create', () => {
-    return (
-      <EuiFlyout onClose={() => {}}>
-        <FlyoutDrilldownWizard
-          onClose={() => {}}
-          drilldownActionFactories={[urlFactory, dashboardFactory]}
-        />
-      </EuiFlyout>
-    );
-  })
-  .add('open in flyout - edit', () => {
-    return (
-      <EuiFlyout onClose={() => {}}>
-        <FlyoutDrilldownWizard
-          onClose={() => {}}
-          drilldownActionFactories={[urlFactory, dashboardFactory]}
-          initialDrilldownWizardConfig={{
-            name: 'My fancy drilldown',
-            actionFactory: urlFactory as any,
-            actionConfig: {
-              url: 'https://elastic.co',
-              openInNewTab: true,
-            },
-          }}
-          mode={'edit'}
-        />
-      </EuiFlyout>
-    );
-  })
-  .add('open in flyout - edit, just 1 action type', () => {
-    return (
-      <EuiFlyout onClose={() => {}}>
-        <FlyoutDrilldownWizard
-          onClose={() => {}}
-          drilldownActionFactories={[dashboardFactory]}
-          initialDrilldownWizardConfig={{
-            name: 'My fancy drilldown',
-            actionFactory: urlFactory as any,
-            actionConfig: {
-              url: 'https://elastic.co',
-              openInNewTab: true,
-            },
-          }}
-          mode={'edit'}
-        />
-      </EuiFlyout>
-    );
-  });
diff --git a/x-pack/plugins/drilldowns/public/components/flyout_drilldown_wizard/flyout_drilldown_wizard.tsx b/x-pack/plugins/drilldowns/public/components/flyout_drilldown_wizard/flyout_drilldown_wizard.tsx
deleted file mode 100644
index faa965a98a4bb..0000000000000
--- a/x-pack/plugins/drilldowns/public/components/flyout_drilldown_wizard/flyout_drilldown_wizard.tsx
+++ /dev/null
@@ -1,139 +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, { useState } from 'react';
-import { EuiButton, EuiSpacer } from '@elastic/eui';
-import { FormDrilldownWizard } from '../form_drilldown_wizard';
-import { FlyoutFrame } from '../flyout_frame';
-import {
-  txtCreateDrilldownButtonLabel,
-  txtCreateDrilldownTitle,
-  txtDeleteDrilldownButtonLabel,
-  txtEditDrilldownButtonLabel,
-  txtEditDrilldownTitle,
-} from './i18n';
-import { DrilldownHelloBar } from '../drilldown_hello_bar';
-import { AdvancedUiActionsActionFactory as ActionFactory } from '../../../../advanced_ui_actions/public';
-
-export interface DrilldownWizardConfig<ActionConfig extends object = object> {
-  name: string;
-  actionFactory?: ActionFactory;
-  actionConfig?: ActionConfig;
-}
-
-export interface FlyoutDrilldownWizardProps<CurrentActionConfig extends object = object> {
-  drilldownActionFactories: Array<ActionFactory<any>>;
-
-  onSubmit?: (drilldownWizardConfig: Required<DrilldownWizardConfig>) => void;
-  onDelete?: () => void;
-  onClose?: () => void;
-  onBack?: () => void;
-
-  mode?: 'create' | 'edit';
-  initialDrilldownWizardConfig?: DrilldownWizardConfig<CurrentActionConfig>;
-
-  showWelcomeMessage?: boolean;
-  onWelcomeHideClick?: () => void;
-
-  actionFactoryContext?: object;
-}
-
-export function FlyoutDrilldownWizard<CurrentActionConfig extends object = object>({
-  onClose,
-  onBack,
-  onSubmit = () => {},
-  initialDrilldownWizardConfig,
-  mode = 'create',
-  onDelete = () => {},
-  showWelcomeMessage = true,
-  onWelcomeHideClick,
-  drilldownActionFactories,
-  actionFactoryContext,
-}: FlyoutDrilldownWizardProps<CurrentActionConfig>) {
-  const [wizardConfig, setWizardConfig] = useState<DrilldownWizardConfig>(
-    () =>
-      initialDrilldownWizardConfig ?? {
-        name: '',
-      }
-  );
-
-  const isActionValid = (
-    config: DrilldownWizardConfig
-  ): config is Required<DrilldownWizardConfig> => {
-    if (!wizardConfig.name) return false;
-    if (!wizardConfig.actionFactory) return false;
-    if (!wizardConfig.actionConfig) return false;
-
-    return wizardConfig.actionFactory.isConfigValid(wizardConfig.actionConfig);
-  };
-
-  const footer = (
-    <EuiButton
-      onClick={() => {
-        if (isActionValid(wizardConfig)) {
-          onSubmit(wizardConfig);
-        }
-      }}
-      fill
-      isDisabled={!isActionValid(wizardConfig)}
-    >
-      {mode === 'edit' ? txtEditDrilldownButtonLabel : txtCreateDrilldownButtonLabel}
-    </EuiButton>
-  );
-
-  return (
-    <FlyoutFrame
-      title={mode === 'edit' ? txtEditDrilldownTitle : txtCreateDrilldownTitle}
-      footer={footer}
-      onClose={onClose}
-      onBack={onBack}
-      banner={showWelcomeMessage && <DrilldownHelloBar onHideClick={onWelcomeHideClick} />}
-    >
-      <FormDrilldownWizard
-        name={wizardConfig.name}
-        onNameChange={newName => {
-          setWizardConfig({
-            ...wizardConfig,
-            name: newName,
-          });
-        }}
-        actionConfig={wizardConfig.actionConfig}
-        onActionConfigChange={newActionConfig => {
-          setWizardConfig({
-            ...wizardConfig,
-            actionConfig: newActionConfig,
-          });
-        }}
-        currentActionFactory={wizardConfig.actionFactory}
-        onActionFactoryChange={actionFactory => {
-          if (!actionFactory) {
-            setWizardConfig({
-              ...wizardConfig,
-              actionFactory: undefined,
-              actionConfig: undefined,
-            });
-          } else {
-            setWizardConfig({
-              ...wizardConfig,
-              actionFactory,
-              actionConfig: actionFactory.createConfig(),
-            });
-          }
-        }}
-        actionFactories={drilldownActionFactories}
-        actionFactoryContext={actionFactoryContext!}
-      />
-      {mode === 'edit' && (
-        <>
-          <EuiSpacer size={'xl'} />
-          <EuiButton onClick={onDelete} color={'danger'}>
-            {txtDeleteDrilldownButtonLabel}
-          </EuiButton>
-        </>
-      )}
-    </FlyoutFrame>
-  );
-}
diff --git a/x-pack/plugins/drilldowns/public/components/flyout_drilldown_wizard/i18n.ts b/x-pack/plugins/drilldowns/public/components/flyout_drilldown_wizard/i18n.ts
deleted file mode 100644
index a4a2754a444ab..0000000000000
--- a/x-pack/plugins/drilldowns/public/components/flyout_drilldown_wizard/i18n.ts
+++ /dev/null
@@ -1,42 +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';
-
-export const txtCreateDrilldownTitle = i18n.translate(
-  'xpack.drilldowns.components.flyoutDrilldownWizard.createDrilldownTitle',
-  {
-    defaultMessage: 'Create Drilldown',
-  }
-);
-
-export const txtEditDrilldownTitle = i18n.translate(
-  'xpack.drilldowns.components.flyoutDrilldownWizard.editDrilldownTitle',
-  {
-    defaultMessage: 'Edit Drilldown',
-  }
-);
-
-export const txtCreateDrilldownButtonLabel = i18n.translate(
-  'xpack.drilldowns.components.flyoutDrilldownWizard.createDrilldownButtonLabel',
-  {
-    defaultMessage: 'Create drilldown',
-  }
-);
-
-export const txtEditDrilldownButtonLabel = i18n.translate(
-  'xpack.drilldowns.components.flyoutDrilldownWizard.editDrilldownButtonLabel',
-  {
-    defaultMessage: 'Save',
-  }
-);
-
-export const txtDeleteDrilldownButtonLabel = i18n.translate(
-  'xpack.drilldowns.components.flyoutDrilldownWizard.deleteDrilldownButtonLabel',
-  {
-    defaultMessage: 'Delete drilldown',
-  }
-);
diff --git a/x-pack/plugins/drilldowns/public/components/flyout_drilldown_wizard/index.ts b/x-pack/plugins/drilldowns/public/components/flyout_drilldown_wizard/index.ts
deleted file mode 100644
index 96ed23bf112c9..0000000000000
--- a/x-pack/plugins/drilldowns/public/components/flyout_drilldown_wizard/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 * from './flyout_drilldown_wizard';
diff --git a/x-pack/plugins/drilldowns/public/components/flyout_frame/flyout_frame.story.tsx b/x-pack/plugins/drilldowns/public/components/flyout_frame/flyout_frame.story.tsx
index cb223db556f56..2715637f6392f 100644
--- a/x-pack/plugins/drilldowns/public/components/flyout_frame/flyout_frame.story.tsx
+++ b/x-pack/plugins/drilldowns/public/components/flyout_frame/flyout_frame.story.tsx
@@ -21,13 +21,6 @@ storiesOf('components/FlyoutFrame', module)
   .add('with onClose', () => {
     return <FlyoutFrame onClose={() => console.log('onClose')}>test</FlyoutFrame>;
   })
-  .add('with onBack', () => {
-    return (
-      <FlyoutFrame onBack={() => console.log('onClose')} title={'Title'}>
-        test
-      </FlyoutFrame>
-    );
-  })
   .add('custom footer', () => {
     return <FlyoutFrame footer={<button>click me!</button>}>test</FlyoutFrame>;
   })
diff --git a/x-pack/plugins/drilldowns/public/components/flyout_frame/flyout_frame.test.tsx b/x-pack/plugins/drilldowns/public/components/flyout_frame/flyout_frame.test.tsx
index 0a3989487745f..b5fb52fcf5c18 100644
--- a/x-pack/plugins/drilldowns/public/components/flyout_frame/flyout_frame.test.tsx
+++ b/x-pack/plugins/drilldowns/public/components/flyout_frame/flyout_frame.test.tsx
@@ -6,11 +6,9 @@
 
 import React from 'react';
 import { render } from 'react-dom';
-import { render as renderTestingLibrary, fireEvent, cleanup } from '@testing-library/react/pure';
+import { render as renderTestingLibrary, fireEvent } from '@testing-library/react';
 import { FlyoutFrame } from '.';
 
-afterEach(cleanup);
-
 describe('<FlyoutFrame>', () => {
   test('renders without crashing', () => {
     const div = document.createElement('div');
diff --git a/x-pack/plugins/drilldowns/public/components/flyout_frame/flyout_frame.tsx b/x-pack/plugins/drilldowns/public/components/flyout_frame/flyout_frame.tsx
index b55cbd88d0dc0..2945cfd739482 100644
--- a/x-pack/plugins/drilldowns/public/components/flyout_frame/flyout_frame.tsx
+++ b/x-pack/plugins/drilldowns/public/components/flyout_frame/flyout_frame.tsx
@@ -13,16 +13,13 @@ import {
   EuiFlexGroup,
   EuiFlexItem,
   EuiButtonEmpty,
-  EuiButtonIcon,
 } from '@elastic/eui';
-import { txtClose, txtBack } from './i18n';
+import { txtClose } from './i18n';
 
 export interface FlyoutFrameProps {
   title?: React.ReactNode;
   footer?: React.ReactNode;
-  banner?: React.ReactNode;
   onClose?: () => void;
-  onBack?: () => void;
 }
 
 /**
@@ -33,31 +30,11 @@ export const FlyoutFrame: React.FC<FlyoutFrameProps> = ({
   footer,
   onClose,
   children,
-  onBack,
-  banner,
 }) => {
-  const headerFragment = (title || onBack) && (
+  const headerFragment = title && (
     <EuiFlyoutHeader hasBorder>
       <EuiTitle size="s">
-        <EuiFlexGroup alignItems="center" gutterSize={'s'} responsive={false}>
-          {onBack && (
-            <EuiFlexItem grow={false}>
-              <div style={{ marginLeft: '-8px', marginTop: '-4px' }}>
-                <EuiButtonIcon
-                  color={'subdued'}
-                  onClick={onBack}
-                  iconType="arrowLeft"
-                  aria-label={txtBack}
-                />
-              </div>
-            </EuiFlexItem>
-          )}
-          {title && (
-            <EuiFlexItem grow={true}>
-              <h1>{title}</h1>
-            </EuiFlexItem>
-          )}
-        </EuiFlexGroup>
+        <h1>{title}</h1>
       </EuiTitle>
     </EuiFlyoutHeader>
   );
@@ -87,7 +64,7 @@ export const FlyoutFrame: React.FC<FlyoutFrameProps> = ({
   return (
     <>
       {headerFragment}
-      <EuiFlyoutBody banner={banner}>{children}</EuiFlyoutBody>
+      <EuiFlyoutBody>{children}</EuiFlyoutBody>
       {footerFragment}
     </>
   );
diff --git a/x-pack/plugins/drilldowns/public/components/flyout_frame/i18n.ts b/x-pack/plugins/drilldowns/public/components/flyout_frame/i18n.ts
index 23af89ebf9bc7..257d7d36dbee1 100644
--- a/x-pack/plugins/drilldowns/public/components/flyout_frame/i18n.ts
+++ b/x-pack/plugins/drilldowns/public/components/flyout_frame/i18n.ts
@@ -6,10 +6,6 @@
 
 import { i18n } from '@kbn/i18n';
 
-export const txtClose = i18n.translate('xpack.drilldowns.components.FlyoutFrame.CloseButtonLabel', {
+export const txtClose = i18n.translate('xpack.drilldowns.components.FlyoutFrame.Close', {
   defaultMessage: 'Close',
 });
-
-export const txtBack = i18n.translate('xpack.drilldowns.components.FlyoutFrame.BackButtonLabel', {
-  defaultMessage: 'Back',
-});
diff --git a/x-pack/plugins/drilldowns/public/components/flyout_list_manage_drilldowns/flyout_list_manage_drilldowns.story.tsx b/x-pack/plugins/drilldowns/public/components/flyout_list_manage_drilldowns/flyout_list_manage_drilldowns.story.tsx
deleted file mode 100644
index 0529f0451b16a..0000000000000
--- a/x-pack/plugins/drilldowns/public/components/flyout_list_manage_drilldowns/flyout_list_manage_drilldowns.story.tsx
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import * as React from 'react';
-import { EuiFlyout } from '@elastic/eui';
-import { storiesOf } from '@storybook/react';
-import { FlyoutListManageDrilldowns } from './flyout_list_manage_drilldowns';
-
-storiesOf('components/FlyoutListManageDrilldowns', module).add('default', () => (
-  <EuiFlyout onClose={() => {}}>
-    <FlyoutListManageDrilldowns
-      drilldowns={[
-        { id: '1', actionName: 'Dashboard', drilldownName: 'Drilldown 1' },
-        { id: '2', actionName: 'Dashboard', drilldownName: 'Drilldown 2' },
-        { id: '3', actionName: 'Dashboard', drilldownName: 'Drilldown 3' },
-      ]}
-    />
-  </EuiFlyout>
-));
diff --git a/x-pack/plugins/drilldowns/public/components/flyout_list_manage_drilldowns/flyout_list_manage_drilldowns.tsx b/x-pack/plugins/drilldowns/public/components/flyout_list_manage_drilldowns/flyout_list_manage_drilldowns.tsx
deleted file mode 100644
index a44a7ccccb4dc..0000000000000
--- a/x-pack/plugins/drilldowns/public/components/flyout_list_manage_drilldowns/flyout_list_manage_drilldowns.tsx
+++ /dev/null
@@ -1,46 +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 { FlyoutFrame } from '../flyout_frame';
-import { DrilldownListItem, ListManageDrilldowns } from '../list_manage_drilldowns';
-import { txtManageDrilldowns } from './i18n';
-import { DrilldownHelloBar } from '../drilldown_hello_bar';
-
-export interface FlyoutListManageDrilldownsProps {
-  drilldowns: DrilldownListItem[];
-  onClose?: () => void;
-  onCreate?: () => void;
-  onEdit?: (drilldownId: string) => void;
-  onDelete?: (drilldownIds: string[]) => void;
-  showWelcomeMessage?: boolean;
-  onWelcomeHideClick?: () => void;
-}
-
-export function FlyoutListManageDrilldowns({
-  drilldowns,
-  onClose = () => {},
-  onCreate,
-  onDelete,
-  onEdit,
-  showWelcomeMessage = true,
-  onWelcomeHideClick,
-}: FlyoutListManageDrilldownsProps) {
-  return (
-    <FlyoutFrame
-      title={txtManageDrilldowns}
-      onClose={onClose}
-      banner={showWelcomeMessage && <DrilldownHelloBar onHideClick={onWelcomeHideClick} />}
-    >
-      <ListManageDrilldowns
-        drilldowns={drilldowns}
-        onCreate={onCreate}
-        onEdit={onEdit}
-        onDelete={onDelete}
-      />
-    </FlyoutFrame>
-  );
-}
diff --git a/x-pack/plugins/drilldowns/public/components/flyout_list_manage_drilldowns/i18n.ts b/x-pack/plugins/drilldowns/public/components/flyout_list_manage_drilldowns/i18n.ts
deleted file mode 100644
index 0dd4e37d4dddd..0000000000000
--- a/x-pack/plugins/drilldowns/public/components/flyout_list_manage_drilldowns/i18n.ts
+++ /dev/null
@@ -1,14 +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';
-
-export const txtManageDrilldowns = i18n.translate(
-  'xpack.drilldowns.components.FlyoutListManageDrilldowns.manageDrilldownsTitle',
-  {
-    defaultMessage: 'Manage Drilldowns',
-  }
-);
diff --git a/x-pack/plugins/drilldowns/public/components/flyout_list_manage_drilldowns/index.ts b/x-pack/plugins/drilldowns/public/components/flyout_list_manage_drilldowns/index.ts
deleted file mode 100644
index f8c9d224fb292..0000000000000
--- a/x-pack/plugins/drilldowns/public/components/flyout_list_manage_drilldowns/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 * from './flyout_list_manage_drilldowns';
diff --git a/x-pack/plugins/drilldowns/public/components/form_create_drilldown/form_create_drilldown.story.tsx b/x-pack/plugins/drilldowns/public/components/form_create_drilldown/form_create_drilldown.story.tsx
new file mode 100644
index 0000000000000..e7e1d67473e8c
--- /dev/null
+++ b/x-pack/plugins/drilldowns/public/components/form_create_drilldown/form_create_drilldown.story.tsx
@@ -0,0 +1,34 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+/* eslint-disable no-console */
+
+import * as React from 'react';
+import { EuiFlyout } from '@elastic/eui';
+import { storiesOf } from '@storybook/react';
+import { FormCreateDrilldown } from '.';
+
+const DemoEditName: React.FC = () => {
+  const [name, setName] = React.useState('');
+
+  return <FormCreateDrilldown name={name} onNameChange={setName} />;
+};
+
+storiesOf('components/FormCreateDrilldown', module)
+  .add('default', () => {
+    return <FormCreateDrilldown />;
+  })
+  .add('[name=foobar]', () => {
+    return <FormCreateDrilldown name={'foobar'} />;
+  })
+  .add('can edit name', () => <DemoEditName />)
+  .add('open in flyout', () => {
+    return (
+      <EuiFlyout>
+        <FormCreateDrilldown />
+      </EuiFlyout>
+    );
+  });
diff --git a/x-pack/plugins/drilldowns/public/components/form_drilldown_wizard/form_drilldown_wizard.test.tsx b/x-pack/plugins/drilldowns/public/components/form_create_drilldown/form_create_drilldown.test.tsx
similarity index 70%
rename from x-pack/plugins/drilldowns/public/components/form_drilldown_wizard/form_drilldown_wizard.test.tsx
rename to x-pack/plugins/drilldowns/public/components/form_create_drilldown/form_create_drilldown.test.tsx
index 4560773cc8a6d..6691966e47e64 100644
--- a/x-pack/plugins/drilldowns/public/components/form_drilldown_wizard/form_drilldown_wizard.test.tsx
+++ b/x-pack/plugins/drilldowns/public/components/form_create_drilldown/form_create_drilldown.test.tsx
@@ -6,23 +6,21 @@
 
 import React from 'react';
 import { render } from 'react-dom';
-import { FormDrilldownWizard } from './form_drilldown_wizard';
-import { render as renderTestingLibrary, fireEvent, cleanup } from '@testing-library/react/pure';
+import { FormCreateDrilldown } from '.';
+import { render as renderTestingLibrary, fireEvent } from '@testing-library/react';
 import { txtNameOfDrilldown } from './i18n';
 
-afterEach(cleanup);
-
-describe('<FormDrilldownWizard>', () => {
+describe('<FormCreateDrilldown>', () => {
   test('renders without crashing', () => {
     const div = document.createElement('div');
-    render(<FormDrilldownWizard onNameChange={() => {}} actionFactoryContext={{}} />, div);
+    render(<FormCreateDrilldown name={''} onNameChange={() => {}} />, div);
   });
 
   describe('[name=]', () => {
     test('if name not provided, uses to empty string', () => {
       const div = document.createElement('div');
 
-      render(<FormDrilldownWizard actionFactoryContext={{}} />, div);
+      render(<FormCreateDrilldown />, div);
 
       const input = div.querySelector(
         '[data-test-subj="dynamicActionNameInput"]'
@@ -31,10 +29,10 @@ describe('<FormDrilldownWizard>', () => {
       expect(input?.value).toBe('');
     });
 
-    test('can set initial name input field value', () => {
+    test('can set name input field value', () => {
       const div = document.createElement('div');
 
-      render(<FormDrilldownWizard name={'foo'} actionFactoryContext={{}} />, div);
+      render(<FormCreateDrilldown name={'foo'} />, div);
 
       const input = div.querySelector(
         '[data-test-subj="dynamicActionNameInput"]'
@@ -42,7 +40,7 @@ describe('<FormDrilldownWizard>', () => {
 
       expect(input?.value).toBe('foo');
 
-      render(<FormDrilldownWizard name={'bar'} actionFactoryContext={{}} />, div);
+      render(<FormCreateDrilldown name={'bar'} />, div);
 
       expect(input?.value).toBe('bar');
     });
@@ -50,7 +48,7 @@ describe('<FormDrilldownWizard>', () => {
     test('fires onNameChange callback on name change', () => {
       const onNameChange = jest.fn();
       const utils = renderTestingLibrary(
-        <FormDrilldownWizard name={''} onNameChange={onNameChange} actionFactoryContext={{}} />
+        <FormCreateDrilldown name={''} onNameChange={onNameChange} />
       );
       const input = utils.getByLabelText(txtNameOfDrilldown);
 
diff --git a/x-pack/plugins/drilldowns/public/components/form_create_drilldown/form_create_drilldown.tsx b/x-pack/plugins/drilldowns/public/components/form_create_drilldown/form_create_drilldown.tsx
new file mode 100644
index 0000000000000..4422de604092b
--- /dev/null
+++ b/x-pack/plugins/drilldowns/public/components/form_create_drilldown/form_create_drilldown.tsx
@@ -0,0 +1,52 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * 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 { EuiForm, EuiFormRow, EuiFieldText } from '@elastic/eui';
+import { DrilldownHelloBar } from '../drilldown_hello_bar';
+import { txtNameOfDrilldown, txtUntitledDrilldown, txtDrilldownAction } from './i18n';
+import { DrilldownPicker } from '../drilldown_picker';
+
+const noop = () => {};
+
+export interface FormCreateDrilldownProps {
+  name?: string;
+  onNameChange?: (name: string) => void;
+}
+
+export const FormCreateDrilldown: React.FC<FormCreateDrilldownProps> = ({
+  name = '',
+  onNameChange = noop,
+}) => {
+  const nameFragment = (
+    <EuiFormRow label={txtNameOfDrilldown}>
+      <EuiFieldText
+        name="drilldown_name"
+        placeholder={txtUntitledDrilldown}
+        value={name}
+        disabled={onNameChange === noop}
+        onChange={event => onNameChange(event.target.value)}
+        data-test-subj="dynamicActionNameInput"
+      />
+    </EuiFormRow>
+  );
+
+  const triggerPicker = <div>Trigger Picker will be here</div>;
+  const actionPicker = (
+    <EuiFormRow label={txtDrilldownAction}>
+      <DrilldownPicker />
+    </EuiFormRow>
+  );
+
+  return (
+    <>
+      <DrilldownHelloBar />
+      <EuiForm>{nameFragment}</EuiForm>
+      {triggerPicker}
+      {actionPicker}
+    </>
+  );
+};
diff --git a/x-pack/plugins/drilldowns/public/components/form_drilldown_wizard/i18n.ts b/x-pack/plugins/drilldowns/public/components/form_create_drilldown/i18n.ts
similarity index 89%
rename from x-pack/plugins/drilldowns/public/components/form_drilldown_wizard/i18n.ts
rename to x-pack/plugins/drilldowns/public/components/form_create_drilldown/i18n.ts
index e9b19ab0afa97..4c0e287935edd 100644
--- a/x-pack/plugins/drilldowns/public/components/form_drilldown_wizard/i18n.ts
+++ b/x-pack/plugins/drilldowns/public/components/form_create_drilldown/i18n.ts
@@ -9,7 +9,7 @@ import { i18n } from '@kbn/i18n';
 export const txtNameOfDrilldown = i18n.translate(
   'xpack.drilldowns.components.FormCreateDrilldown.nameOfDrilldown',
   {
-    defaultMessage: 'Name',
+    defaultMessage: 'Name of drilldown',
   }
 );
 
@@ -23,6 +23,6 @@ export const txtUntitledDrilldown = i18n.translate(
 export const txtDrilldownAction = i18n.translate(
   'xpack.drilldowns.components.FormCreateDrilldown.drilldownAction',
   {
-    defaultMessage: 'Action',
+    defaultMessage: 'Drilldown action',
   }
 );
diff --git a/x-pack/plugins/drilldowns/public/components/form_drilldown_wizard/index.tsx b/x-pack/plugins/drilldowns/public/components/form_create_drilldown/index.tsx
similarity index 85%
rename from x-pack/plugins/drilldowns/public/components/form_drilldown_wizard/index.tsx
rename to x-pack/plugins/drilldowns/public/components/form_create_drilldown/index.tsx
index 4aea824de00d7..c2c5a7e435b39 100644
--- a/x-pack/plugins/drilldowns/public/components/form_drilldown_wizard/index.tsx
+++ b/x-pack/plugins/drilldowns/public/components/form_create_drilldown/index.tsx
@@ -4,4 +4,4 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-export * from './form_drilldown_wizard';
+export * from './form_create_drilldown';
diff --git a/x-pack/plugins/drilldowns/public/components/form_drilldown_wizard/form_drilldown_wizard.story.tsx b/x-pack/plugins/drilldowns/public/components/form_drilldown_wizard/form_drilldown_wizard.story.tsx
deleted file mode 100644
index 2fc35eb6b5298..0000000000000
--- a/x-pack/plugins/drilldowns/public/components/form_drilldown_wizard/form_drilldown_wizard.story.tsx
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import * as React from 'react';
-import { storiesOf } from '@storybook/react';
-import { FormDrilldownWizard } from '.';
-
-const DemoEditName: React.FC = () => {
-  const [name, setName] = React.useState('');
-
-  return (
-    <>
-      <FormDrilldownWizard name={name} onNameChange={setName} actionFactoryContext={{}} />{' '}
-      <div>name: {name}</div>
-    </>
-  );
-};
-
-storiesOf('components/FormDrilldownWizard', module)
-  .add('default', () => {
-    return <FormDrilldownWizard actionFactoryContext={{}} />;
-  })
-  .add('[name=foobar]', () => {
-    return <FormDrilldownWizard name={'foobar'} actionFactoryContext={{}} />;
-  })
-  .add('can edit name', () => <DemoEditName />);
diff --git a/x-pack/plugins/drilldowns/public/components/form_drilldown_wizard/form_drilldown_wizard.tsx b/x-pack/plugins/drilldowns/public/components/form_drilldown_wizard/form_drilldown_wizard.tsx
deleted file mode 100644
index bdafaaf07873c..0000000000000
--- a/x-pack/plugins/drilldowns/public/components/form_drilldown_wizard/form_drilldown_wizard.tsx
+++ /dev/null
@@ -1,79 +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 { EuiFieldText, EuiForm, EuiFormRow, EuiSpacer } from '@elastic/eui';
-import { txtDrilldownAction, txtNameOfDrilldown, txtUntitledDrilldown } from './i18n';
-import {
-  AdvancedUiActionsActionFactory as ActionFactory,
-  ActionWizard,
-} from '../../../../advanced_ui_actions/public';
-
-const noopFn = () => {};
-
-export interface FormDrilldownWizardProps {
-  name?: string;
-  onNameChange?: (name: string) => void;
-
-  currentActionFactory?: ActionFactory;
-  onActionFactoryChange?: (actionFactory: ActionFactory | null) => void;
-  actionFactoryContext: object;
-
-  actionConfig?: object;
-  onActionConfigChange?: (config: object) => void;
-
-  actionFactories?: ActionFactory[];
-}
-
-export const FormDrilldownWizard: React.FC<FormDrilldownWizardProps> = ({
-  name = '',
-  actionConfig,
-  currentActionFactory,
-  onNameChange = noopFn,
-  onActionConfigChange = noopFn,
-  onActionFactoryChange = noopFn,
-  actionFactories = [],
-  actionFactoryContext,
-}) => {
-  const nameFragment = (
-    <EuiFormRow label={txtNameOfDrilldown}>
-      <EuiFieldText
-        name="drilldown_name"
-        placeholder={txtUntitledDrilldown}
-        value={name}
-        disabled={onNameChange === noopFn}
-        onChange={event => onNameChange(event.target.value)}
-        data-test-subj="dynamicActionNameInput"
-      />
-    </EuiFormRow>
-  );
-
-  const actionWizard = (
-    <EuiFormRow
-      label={actionFactories?.length > 1 ? txtDrilldownAction : undefined}
-      fullWidth={true}
-    >
-      <ActionWizard
-        actionFactories={actionFactories}
-        currentActionFactory={currentActionFactory}
-        config={actionConfig}
-        onActionFactoryChange={actionFactory => onActionFactoryChange(actionFactory)}
-        onConfigChange={config => onActionConfigChange(config)}
-        context={actionFactoryContext}
-      />
-    </EuiFormRow>
-  );
-
-  return (
-    <>
-      <EuiForm>
-        {nameFragment}
-        <EuiSpacer size={'xl'} />
-        {actionWizard}
-      </EuiForm>
-    </>
-  );
-};
diff --git a/x-pack/plugins/drilldowns/public/components/list_manage_drilldowns/i18n.ts b/x-pack/plugins/drilldowns/public/components/list_manage_drilldowns/i18n.ts
deleted file mode 100644
index fbc7c9dcfb4a1..0000000000000
--- a/x-pack/plugins/drilldowns/public/components/list_manage_drilldowns/i18n.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { i18n } from '@kbn/i18n';
-
-export const txtCreateDrilldown = i18n.translate(
-  'xpack.drilldowns.components.ListManageDrilldowns.createDrilldownButtonLabel',
-  {
-    defaultMessage: 'Create new',
-  }
-);
-
-export const txtEditDrilldown = i18n.translate(
-  'xpack.drilldowns.components.ListManageDrilldowns.editDrilldownButtonLabel',
-  {
-    defaultMessage: 'Edit',
-  }
-);
-
-export const txtDeleteDrilldowns = (count: number) =>
-  i18n.translate('xpack.drilldowns.components.ListManageDrilldowns.deleteDrilldownsButtonLabel', {
-    defaultMessage: 'Delete ({count})',
-    values: {
-      count,
-    },
-  });
-
-export const txtSelectDrilldown = i18n.translate(
-  'xpack.drilldowns.components.ListManageDrilldowns.selectThisDrilldownCheckboxLabel',
-  {
-    defaultMessage: 'Select this drilldown',
-  }
-);
diff --git a/x-pack/plugins/drilldowns/public/components/list_manage_drilldowns/index.tsx b/x-pack/plugins/drilldowns/public/components/list_manage_drilldowns/index.tsx
deleted file mode 100644
index 82b6ce27af6d4..0000000000000
--- a/x-pack/plugins/drilldowns/public/components/list_manage_drilldowns/index.tsx
+++ /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 * from './list_manage_drilldowns';
diff --git a/x-pack/plugins/drilldowns/public/components/list_manage_drilldowns/list_manage_drilldowns.story.tsx b/x-pack/plugins/drilldowns/public/components/list_manage_drilldowns/list_manage_drilldowns.story.tsx
deleted file mode 100644
index eafe50bab2016..0000000000000
--- a/x-pack/plugins/drilldowns/public/components/list_manage_drilldowns/list_manage_drilldowns.story.tsx
+++ /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 * as React from 'react';
-import { storiesOf } from '@storybook/react';
-import { ListManageDrilldowns } from './list_manage_drilldowns';
-
-storiesOf('components/ListManageDrilldowns', module).add('default', () => (
-  <ListManageDrilldowns
-    drilldowns={[
-      { id: '1', actionName: 'Dashboard', drilldownName: 'Drilldown 1', icon: 'dashboardApp' },
-      { id: '2', actionName: 'Dashboard', drilldownName: 'Drilldown 2', icon: 'dashboardApp' },
-      { id: '3', actionName: 'Dashboard', drilldownName: 'Drilldown 3' },
-    ]}
-  />
-));
diff --git a/x-pack/plugins/drilldowns/public/components/list_manage_drilldowns/list_manage_drilldowns.test.tsx b/x-pack/plugins/drilldowns/public/components/list_manage_drilldowns/list_manage_drilldowns.test.tsx
deleted file mode 100644
index 4a4d67b08b1d3..0000000000000
--- a/x-pack/plugins/drilldowns/public/components/list_manage_drilldowns/list_manage_drilldowns.test.tsx
+++ /dev/null
@@ -1,70 +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 { cleanup, fireEvent, render } from '@testing-library/react/pure';
-import '@testing-library/jest-dom/extend-expect'; // TODO: this should be global
-import {
-  DrilldownListItem,
-  ListManageDrilldowns,
-  TEST_SUBJ_DRILLDOWN_ITEM,
-} from './list_manage_drilldowns';
-
-// TODO: for some reason global cleanup from RTL doesn't work
-// afterEach is not available for it globally during setup
-afterEach(cleanup);
-
-const drilldowns: DrilldownListItem[] = [
-  { id: '1', actionName: 'Dashboard', drilldownName: 'Drilldown 1' },
-  { id: '2', actionName: 'Dashboard', drilldownName: 'Drilldown 2' },
-  { id: '3', actionName: 'Dashboard', drilldownName: 'Drilldown 3' },
-];
-
-test('Render list of drilldowns', () => {
-  const screen = render(<ListManageDrilldowns drilldowns={drilldowns} />);
-  expect(screen.getAllByTestId(TEST_SUBJ_DRILLDOWN_ITEM)).toHaveLength(drilldowns.length);
-});
-
-test('Emit onEdit() when clicking on edit drilldown', () => {
-  const fn = jest.fn();
-  const screen = render(<ListManageDrilldowns drilldowns={drilldowns} onEdit={fn} />);
-
-  const editButtons = screen.getAllByText('Edit');
-  expect(editButtons).toHaveLength(drilldowns.length);
-  fireEvent.click(editButtons[1]);
-  expect(fn).toBeCalledWith(drilldowns[1].id);
-});
-
-test('Emit onCreate() when clicking on create drilldown', () => {
-  const fn = jest.fn();
-  const screen = render(<ListManageDrilldowns drilldowns={drilldowns} onCreate={fn} />);
-  fireEvent.click(screen.getByText('Create new'));
-  expect(fn).toBeCalled();
-});
-
-test('Delete button is not visible when non is selected', () => {
-  const fn = jest.fn();
-  const screen = render(<ListManageDrilldowns drilldowns={drilldowns} onCreate={fn} />);
-  expect(screen.queryByText(/Delete/i)).not.toBeInTheDocument();
-  expect(screen.queryByText(/Create/i)).toBeInTheDocument();
-});
-
-test('Can delete drilldowns', () => {
-  const fn = jest.fn();
-  const screen = render(<ListManageDrilldowns drilldowns={drilldowns} onDelete={fn} />);
-
-  const checkboxes = screen.getAllByLabelText(/Select this drilldown/i);
-  expect(checkboxes).toHaveLength(3);
-
-  fireEvent.click(checkboxes[1]);
-  fireEvent.click(checkboxes[2]);
-
-  expect(screen.queryByText(/Create/i)).not.toBeInTheDocument();
-
-  fireEvent.click(screen.getByText(/Delete \(2\)/i));
-
-  expect(fn).toBeCalledWith([drilldowns[1].id, drilldowns[2].id]);
-});
diff --git a/x-pack/plugins/drilldowns/public/components/list_manage_drilldowns/list_manage_drilldowns.tsx b/x-pack/plugins/drilldowns/public/components/list_manage_drilldowns/list_manage_drilldowns.tsx
deleted file mode 100644
index 5a15781a1faf2..0000000000000
--- a/x-pack/plugins/drilldowns/public/components/list_manage_drilldowns/list_manage_drilldowns.tsx
+++ /dev/null
@@ -1,116 +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 {
-  EuiBasicTable,
-  EuiBasicTableColumn,
-  EuiButton,
-  EuiButtonEmpty,
-  EuiFlexGroup,
-  EuiFlexItem,
-  EuiIcon,
-  EuiSpacer,
-  EuiTextColor,
-} from '@elastic/eui';
-import React, { useState } from 'react';
-import {
-  txtCreateDrilldown,
-  txtDeleteDrilldowns,
-  txtEditDrilldown,
-  txtSelectDrilldown,
-} from './i18n';
-
-export interface DrilldownListItem {
-  id: string;
-  actionName: string;
-  drilldownName: string;
-  icon?: string;
-}
-
-export interface ListManageDrilldownsProps {
-  drilldowns: DrilldownListItem[];
-
-  onEdit?: (id: string) => void;
-  onCreate?: () => void;
-  onDelete?: (ids: string[]) => void;
-}
-
-const noop = () => {};
-
-export const TEST_SUBJ_DRILLDOWN_ITEM = 'list-manage-drilldowns-item';
-
-export function ListManageDrilldowns({
-  drilldowns,
-  onEdit = noop,
-  onCreate = noop,
-  onDelete = noop,
-}: ListManageDrilldownsProps) {
-  const [selectedDrilldowns, setSelectedDrilldowns] = useState<string[]>([]);
-
-  const columns: Array<EuiBasicTableColumn<DrilldownListItem>> = [
-    {
-      field: 'drilldownName',
-      name: 'Name',
-      truncateText: true,
-      width: '50%',
-    },
-    {
-      name: 'Action',
-      render: (drilldown: DrilldownListItem) => (
-        <EuiFlexGroup responsive={false} alignItems="center" gutterSize={'s'}>
-          {drilldown.icon && (
-            <EuiFlexItem grow={false}>
-              <EuiIcon type={drilldown.icon} />
-            </EuiFlexItem>
-          )}
-          <EuiFlexItem grow={false} className="eui-textTruncate">
-            <EuiTextColor color="subdued">{drilldown.actionName}</EuiTextColor>
-          </EuiFlexItem>
-        </EuiFlexGroup>
-      ),
-    },
-    {
-      align: 'right',
-      render: (drilldown: DrilldownListItem) => (
-        <EuiButtonEmpty size="xs" onClick={() => onEdit(drilldown.id)}>
-          {txtEditDrilldown}
-        </EuiButtonEmpty>
-      ),
-    },
-  ];
-
-  return (
-    <>
-      <EuiBasicTable
-        items={drilldowns}
-        itemId="id"
-        columns={columns}
-        isSelectable={true}
-        responsive={false}
-        selection={{
-          onSelectionChange: selection => {
-            setSelectedDrilldowns(selection.map(drilldown => drilldown.id));
-          },
-          selectableMessage: () => txtSelectDrilldown,
-        }}
-        rowProps={{
-          'data-test-subj': TEST_SUBJ_DRILLDOWN_ITEM,
-        }}
-        hasActions={true}
-      />
-      <EuiSpacer />
-      {selectedDrilldowns.length === 0 ? (
-        <EuiButton fill onClick={() => onCreate()}>
-          {txtCreateDrilldown}
-        </EuiButton>
-      ) : (
-        <EuiButton color="danger" fill onClick={() => onDelete(selectedDrilldowns)}>
-          {txtDeleteDrilldowns(selectedDrilldowns.length)}
-        </EuiButton>
-      )}
-    </>
-  );
-}
diff --git a/x-pack/plugins/drilldowns/public/index.ts b/x-pack/plugins/drilldowns/public/index.ts
index 044e29c671de4..63e7a12235462 100644
--- a/x-pack/plugins/drilldowns/public/index.ts
+++ b/x-pack/plugins/drilldowns/public/index.ts
@@ -7,14 +7,12 @@
 import { DrilldownsPlugin } from './plugin';
 
 export {
-  SetupContract as DrilldownsSetup,
-  SetupDependencies as DrilldownsSetupDependencies,
-  StartContract as DrilldownsStart,
-  StartDependencies as DrilldownsStartDependencies,
+  DrilldownsSetupContract,
+  DrilldownsSetupDependencies,
+  DrilldownsStartContract,
+  DrilldownsStartDependencies,
 } from './plugin';
 
 export function plugin() {
   return new DrilldownsPlugin();
 }
-
-export { DrilldownDefinition } from './types';
diff --git a/x-pack/plugins/drilldowns/public/mocks.ts b/x-pack/plugins/drilldowns/public/mocks.ts
index 18816243a3572..bfade1674072a 100644
--- a/x-pack/plugins/drilldowns/public/mocks.ts
+++ b/x-pack/plugins/drilldowns/public/mocks.ts
@@ -4,10 +4,10 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { DrilldownsSetup, DrilldownsStart } from '.';
+import { DrilldownsSetupContract, DrilldownsStartContract } from '.';
 
-export type Setup = jest.Mocked<DrilldownsSetup>;
-export type Start = jest.Mocked<DrilldownsStart>;
+export type Setup = jest.Mocked<DrilldownsSetupContract>;
+export type Start = jest.Mocked<DrilldownsStartContract>;
 
 const createSetupContract = (): Setup => {
   const setupContract: Setup = {
@@ -17,14 +17,12 @@ const createSetupContract = (): Setup => {
 };
 
 const createStartContract = (): Start => {
-  const startContract: Start = {
-    FlyoutManageDrilldowns: jest.fn(),
-  };
+  const startContract: Start = {};
 
   return startContract;
 };
 
-export const drilldownsPluginMock = {
+export const bfetchPluginMock = {
   createSetupContract,
   createStartContract,
 };
diff --git a/x-pack/plugins/drilldowns/public/plugin.ts b/x-pack/plugins/drilldowns/public/plugin.ts
index bbc06847d5842..b89172541b91e 100644
--- a/x-pack/plugins/drilldowns/public/plugin.ts
+++ b/x-pack/plugins/drilldowns/public/plugin.ts
@@ -6,46 +6,52 @@
 
 import { CoreStart, CoreSetup, Plugin } from 'src/core/public';
 import { UiActionsSetup, UiActionsStart } from '../../../../src/plugins/ui_actions/public';
-import { AdvancedUiActionsSetup, AdvancedUiActionsStart } from '../../advanced_ui_actions/public';
-import { DrilldownService, DrilldownServiceSetupContract } from './services';
-import { createFlyoutManageDrilldowns } from './components/connected_flyout_manage_drilldowns';
-import { Storage } from '../../../../src/plugins/kibana_utils/public';
-
-export interface SetupDependencies {
+import { DrilldownService } from './service';
+import {
+  FlyoutCreateDrilldownActionContext,
+  FlyoutEditDrilldownActionContext,
+  OPEN_FLYOUT_ADD_DRILLDOWN,
+  OPEN_FLYOUT_EDIT_DRILLDOWN,
+} from './actions';
+
+export interface DrilldownsSetupDependencies {
   uiActions: UiActionsSetup;
-  advancedUiActions: AdvancedUiActionsSetup;
 }
 
-export interface StartDependencies {
+export interface DrilldownsStartDependencies {
   uiActions: UiActionsStart;
-  advancedUiActions: AdvancedUiActionsStart;
 }
 
-export type SetupContract = DrilldownServiceSetupContract;
+export type DrilldownsSetupContract = Pick<DrilldownService, 'registerDrilldown'>;
 
 // eslint-disable-next-line
-export interface StartContract {
-  FlyoutManageDrilldowns: ReturnType<typeof createFlyoutManageDrilldowns>;
+export interface DrilldownsStartContract {}
+
+declare module '../../../../src/plugins/ui_actions/public' {
+  export interface ActionContextMapping {
+    [OPEN_FLYOUT_ADD_DRILLDOWN]: FlyoutCreateDrilldownActionContext;
+    [OPEN_FLYOUT_EDIT_DRILLDOWN]: FlyoutEditDrilldownActionContext;
+  }
 }
 
 export class DrilldownsPlugin
-  implements Plugin<SetupContract, StartContract, SetupDependencies, StartDependencies> {
+  implements
+    Plugin<
+      DrilldownsSetupContract,
+      DrilldownsStartContract,
+      DrilldownsSetupDependencies,
+      DrilldownsStartDependencies
+    > {
   private readonly service = new DrilldownService();
 
-  public setup(core: CoreSetup, plugins: SetupDependencies): SetupContract {
-    const setup = this.service.setup(core, plugins);
+  public setup(core: CoreSetup, plugins: DrilldownsSetupDependencies): DrilldownsSetupContract {
+    this.service.bootstrap(core, plugins);
 
-    return setup;
+    return this.service;
   }
 
-  public start(core: CoreStart, plugins: StartDependencies): StartContract {
-    return {
-      FlyoutManageDrilldowns: createFlyoutManageDrilldowns({
-        advancedUiActions: plugins.advancedUiActions,
-        storage: new Storage(localStorage),
-        notifications: core.notifications,
-      }),
-    };
+  public start(core: CoreStart, plugins: DrilldownsStartDependencies): DrilldownsStartContract {
+    return {};
   }
 
   public stop() {}
diff --git a/x-pack/plugins/drilldowns/public/service/drilldown_service.ts b/x-pack/plugins/drilldowns/public/service/drilldown_service.ts
new file mode 100644
index 0000000000000..7745c30b4e335
--- /dev/null
+++ b/x-pack/plugins/drilldowns/public/service/drilldown_service.ts
@@ -0,0 +1,32 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { CoreSetup } from 'src/core/public';
+// import { CONTEXT_MENU_TRIGGER } from '../../../../../src/plugins/embeddable/public';
+import { FlyoutCreateDrilldownAction, FlyoutEditDrilldownAction } from '../actions';
+import { DrilldownsSetupDependencies } from '../plugin';
+
+export class DrilldownService {
+  bootstrap(core: CoreSetup, { uiActions }: DrilldownsSetupDependencies) {
+    const overlays = async () => (await core.getStartServices())[0].overlays;
+
+    const actionFlyoutCreateDrilldown = new FlyoutCreateDrilldownAction({ overlays });
+    uiActions.registerAction(actionFlyoutCreateDrilldown);
+    // uiActions.attachAction(CONTEXT_MENU_TRIGGER, actionFlyoutCreateDrilldown);
+
+    const actionFlyoutEditDrilldown = new FlyoutEditDrilldownAction({ overlays });
+    uiActions.registerAction(actionFlyoutEditDrilldown);
+    // uiActions.attachAction(CONTEXT_MENU_TRIGGER, actionFlyoutEditDrilldown);
+  }
+
+  /**
+   * Convenience method to register a drilldown. (It should set-up all the
+   * necessary triggers and actions.)
+   */
+  registerDrilldown = (): void => {
+    throw new Error('not implemented');
+  };
+}
diff --git a/x-pack/plugins/drilldowns/public/services/index.ts b/x-pack/plugins/drilldowns/public/service/index.ts
similarity index 100%
rename from x-pack/plugins/drilldowns/public/services/index.ts
rename to x-pack/plugins/drilldowns/public/service/index.ts
diff --git a/x-pack/plugins/drilldowns/public/services/drilldown_service.ts b/x-pack/plugins/drilldowns/public/services/drilldown_service.ts
deleted file mode 100644
index bfbe514d46095..0000000000000
--- a/x-pack/plugins/drilldowns/public/services/drilldown_service.ts
+++ /dev/null
@@ -1,79 +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 { CoreSetup } from 'src/core/public';
-import { AdvancedUiActionsSetup } from '../../../advanced_ui_actions/public';
-import { DrilldownDefinition, DrilldownFactoryContext } from '../types';
-import { UiActionsActionFactoryDefinition as ActionFactoryDefinition } from '../../../../../src/plugins/ui_actions/public';
-
-export interface DrilldownServiceSetupDeps {
-  advancedUiActions: AdvancedUiActionsSetup;
-}
-
-export interface DrilldownServiceSetupContract {
-  /**
-   * Convenience method to register a drilldown.
-   */
-  registerDrilldown: <
-    Config extends object = object,
-    CreationContext extends object = object,
-    ExecutionContext extends object = object
-  >(
-    drilldown: DrilldownDefinition<Config, CreationContext, ExecutionContext>
-  ) => void;
-}
-
-export class DrilldownService {
-  setup(
-    core: CoreSetup,
-    { advancedUiActions }: DrilldownServiceSetupDeps
-  ): DrilldownServiceSetupContract {
-    const registerDrilldown = <
-      Config extends object = object,
-      CreationContext extends object = object,
-      ExecutionContext extends object = object
-    >({
-      id: factoryId,
-      CollectConfig,
-      createConfig,
-      isConfigValid,
-      getDisplayName,
-      euiIcon,
-      execute,
-    }: DrilldownDefinition<Config, CreationContext, ExecutionContext>) => {
-      const actionFactory: ActionFactoryDefinition<
-        Config,
-        DrilldownFactoryContext<CreationContext>,
-        ExecutionContext
-      > = {
-        id: factoryId,
-        CollectConfig,
-        createConfig,
-        isConfigValid,
-        getDisplayName,
-        getIconType: () => euiIcon,
-        isCompatible: async () => true,
-        create: serializedAction => ({
-          id: '',
-          type: factoryId,
-          getIconType: () => euiIcon,
-          getDisplayName: () => serializedAction.name,
-          execute: async context => await execute(serializedAction.config, context),
-        }),
-      } as ActionFactoryDefinition<
-        Config,
-        DrilldownFactoryContext<CreationContext>,
-        ExecutionContext
-      >;
-
-      advancedUiActions.registerActionFactory(actionFactory);
-    };
-
-    return {
-      registerDrilldown,
-    };
-  }
-}
diff --git a/x-pack/plugins/drilldowns/public/types.ts b/x-pack/plugins/drilldowns/public/types.ts
deleted file mode 100644
index a8232887f9ca6..0000000000000
--- a/x-pack/plugins/drilldowns/public/types.ts
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { AdvancedUiActionsActionFactoryDefinition as ActionFactoryDefinition } from '../../advanced_ui_actions/public';
-
-/**
- * This is a convenience interface to register a drilldown. Drilldown has
- * ability to collect configuration from user. Once drilldown is executed it
- * receives the collected information together with the context of the
- * user's interaction.
- *
- * `Config` is a serializable object containing the configuration that the
- * drilldown is able to collect using UI.
- *
- * `PlaceContext` is an object that the app that opens drilldown management
- * flyout provides to the React component, specifying the contextual information
- * about that app. For example, on Dashboard app this context contains
- * information about the current embeddable and dashboard.
- *
- * `ExecutionContext` is an object created in response to user's interaction
- * and provided to the `execute` function of the drilldown. This object contains
- * information about the action user performed.
- */
-export interface DrilldownDefinition<
-  Config extends object = object,
-  PlaceContext extends object = object,
-  ExecutionContext extends object = object
-> {
-  /**
-   * Globally unique identifier for this drilldown.
-   */
-  id: string;
-
-  /**
-   * Function that returns default config for this drilldown.
-   */
-  createConfig: ActionFactoryDefinition<
-    Config,
-    DrilldownFactoryContext<PlaceContext>,
-    ExecutionContext
-  >['createConfig'];
-
-  /**
-   * `UiComponent` that collections config for this drilldown. You can create
-   * a React component and transform it `UiComponent` using `uiToReactComponent`
-   * helper from `kibana_utils` plugin.
-   *
-   * ```tsx
-   * import React from 'react';
-   * import { uiToReactComponent } from 'src/plugins/kibana_utils';
-   * import { UiActionsCollectConfigProps as CollectConfigProps } from 'src/plugins/ui_actions/public';
-   *
-   * type Props = CollectConfigProps<Config>;
-   *
-   * const ReactCollectConfig: React.FC<Props> = () => {
-   *   return <div>Collecting config...'</div>;
-   * };
-   *
-   * export const CollectConfig = uiToReactComponent(ReactCollectConfig);
-   * ```
-   */
-  CollectConfig: ActionFactoryDefinition<
-    Config,
-    DrilldownFactoryContext<PlaceContext>,
-    ExecutionContext
-  >['CollectConfig'];
-
-  /**
-   * A validator function for the config object. Should always return a boolean
-   * given any input.
-   */
-  isConfigValid: ActionFactoryDefinition<
-    Config,
-    DrilldownFactoryContext<PlaceContext>,
-    ExecutionContext
-  >['isConfigValid'];
-
-  /**
-   * Name of EUI icon to display when showing this drilldown to user.
-   */
-  euiIcon?: string;
-
-  /**
-   * Should return an internationalized name of the drilldown, which will be
-   * displayed to the user.
-   */
-  getDisplayName: () => string;
-
-  /**
-   * Implements the "navigation" action of the drilldown. This happens when
-   * user clicks something in the UI that executes a trigger to which this
-   * drilldown was attached.
-   *
-   * @param config Config object that user configured this drilldown with.
-   * @param context Object that represents context in which the underlying
-   *  `UIAction` of this drilldown is being executed in.
-   */
-  execute(config: Config, context: ExecutionContext): void;
-}
-
-/**
- * Context object used when creating a drilldown.
- */
-export interface DrilldownFactoryContext<T> {
-  /**
-   * Context provided to the drilldown factory by the place where the UI is
-   * rendered. For example, for the "dashboard" place, this context contains
-   * the ID of the current dashboard, which could be used for filtering it out
-   * of the list.
-   */
-  placeContext: T;
-
-  /**
-   * List of triggers that user selected in the UI.
-   */
-  triggers: string[];
-}
diff --git a/x-pack/plugins/reporting/public/plugin.tsx b/x-pack/plugins/reporting/public/plugin.tsx
index ac46d84469513..08ba10ff69207 100644
--- a/x-pack/plugins/reporting/public/plugin.tsx
+++ b/x-pack/plugins/reporting/public/plugin.tsx
@@ -143,7 +143,8 @@ export class ReportingPublicPlugin implements Plugin<any, any> {
       },
     });
 
-    uiActions.addTriggerAction(CONTEXT_MENU_TRIGGER, action);
+    uiActions.registerAction(action);
+    uiActions.attachAction(CONTEXT_MENU_TRIGGER, action);
 
     share.register(csvReportingProvider({ apiClient, toasts, license$ }));
     share.register(
diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json
index 09392093b8f62..129aa25c27e84 100644
--- a/x-pack/plugins/translations/translations/ja-JP.json
+++ b/x-pack/plugins/translations/translations/ja-JP.json
@@ -636,6 +636,7 @@
     "embeddableApi.addPanel.noMatchingObjectsMessage": "一致するオブジェクトが見つかりませんでした。",
     "embeddableApi.addPanel.savedObjectAddedToContainerSuccessMessageTitle": "{savedObjectName} が追加されました",
     "embeddableApi.addPanel.Title": "パネルの追加",
+    "embeddableApi.customizePanel.action.displayName": "パネルをカスタマイズ",
     "embeddableApi.customizePanel.modal.cancel": "キャンセル",
     "embeddableApi.customizePanel.modal.optionsMenuForm.panelTitleFormRowLabel": "パネルタイトル",
     "embeddableApi.customizePanel.modal.optionsMenuForm.panelTitleInputAriaLabel": "パネルのカスタムタイトルを入力してください",
diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json
index a3382a19f76b7..d0a354a2108d4 100644
--- a/x-pack/plugins/translations/translations/zh-CN.json
+++ b/x-pack/plugins/translations/translations/zh-CN.json
@@ -636,6 +636,7 @@
     "embeddableApi.addPanel.noMatchingObjectsMessage": "未找到任何匹配对象。",
     "embeddableApi.addPanel.savedObjectAddedToContainerSuccessMessageTitle": "{savedObjectName} 已添加",
     "embeddableApi.addPanel.Title": "添加面板",
+    "embeddableApi.customizePanel.action.displayName": "定制面板",
     "embeddableApi.customizePanel.modal.cancel": "取消",
     "embeddableApi.customizePanel.modal.optionsMenuForm.panelTitleFormRowLabel": "面板标题",
     "embeddableApi.customizePanel.modal.optionsMenuForm.panelTitleInputAriaLabel": "为面板输入定制标题",

From 72afbbbd72a027c24fbc0a6e0fe56c5c9970ff9f Mon Sep 17 00:00:00 2001
From: Nick Peihl <nick.peihl@elastic.co>
Date: Tue, 24 Mar 2020 14:30:44 -0700
Subject: [PATCH 109/179] [Maps] Fix cross origin error for icon spritesheets
 when Kibana secured via OAuth proxy (#53896)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Set crossOrigin to anonymous only on requests from external hosts

* Update x-pack/legacy/plugins/maps/public/connected_components/map/mb/utils.js

Co-Authored-By: Joe Portner <5295965+jportner@users.noreply.github.com>

* 🙇‍♂️ Lint

Co-authored-by: Joe Portner <5295965+jportner@users.noreply.github.com>
Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 .../public/connected_components/map/mb/utils.js    | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/x-pack/legacy/plugins/maps/public/connected_components/map/mb/utils.js b/x-pack/legacy/plugins/maps/public/connected_components/map/mb/utils.js
index 413d66fce7f70..a2850d2bb6c23 100644
--- a/x-pack/legacy/plugins/maps/public/connected_components/map/mb/utils.js
+++ b/x-pack/legacy/plugins/maps/public/connected_components/map/mb/utils.js
@@ -110,7 +110,9 @@ function getImageData(img) {
 export async function loadSpriteSheetImageData(imgUrl) {
   return new Promise((resolve, reject) => {
     const image = new Image();
-    image.crossOrigin = 'Anonymous';
+    if (isCrossOriginUrl(imgUrl)) {
+      image.crossOrigin = 'Anonymous';
+    }
     image.onload = el => {
       const imgData = getImageData(el.currentTarget);
       resolve(imgData);
@@ -142,3 +144,13 @@ export async function addSpritesheetToMap(json, imgUrl, mbMap) {
   const imgData = await loadSpriteSheetImageData(imgUrl);
   addSpriteSheetToMapFromImageData(json, imgData, mbMap);
 }
+
+function isCrossOriginUrl(url) {
+  const a = window.document.createElement('a');
+  a.href = url;
+  return (
+    a.protocol !== window.document.location.protocol ||
+    a.host !== window.document.location.host ||
+    a.port !== window.document.location.port
+  );
+}

From 506e5d6fb07d26bcfcc03c0e22b99bbb7d2130b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B8ren=20Louv-Jansen?= <sorenlouv@gmail.com>
Date: Tue, 24 Mar 2020 22:38:38 +0100
Subject: [PATCH 110/179] [APM] Add capture_body option to dotnet (#61099)

---
 .../setting_definitions/general_settings.ts   | 72 +++++++++----------
 .../setting_definitions/index.test.ts         |  2 +
 2 files changed, 38 insertions(+), 36 deletions(-)

diff --git a/x-pack/plugins/apm/common/agent_configuration/setting_definitions/general_settings.ts b/x-pack/plugins/apm/common/agent_configuration/setting_definitions/general_settings.ts
index b6eb40305dae7..b83c03c543295 100644
--- a/x-pack/plugins/apm/common/agent_configuration/setting_definitions/general_settings.ts
+++ b/x-pack/plugins/apm/common/agent_configuration/setting_definitions/general_settings.ts
@@ -64,24 +64,6 @@ export const generalSettings: RawSettingDefinition[] = [
     excludeAgents: ['js-base', 'rum-js', 'dotnet']
   },
 
-  // Capture headers
-  {
-    key: 'capture_headers',
-    type: 'boolean',
-    defaultValue: 'true',
-    label: i18n.translate('xpack.apm.agentConfig.captureHeaders.label', {
-      defaultMessage: 'Capture Headers'
-    }),
-    description: i18n.translate(
-      'xpack.apm.agentConfig.captureHeaders.description',
-      {
-        defaultMessage:
-          'If set to `true`, the agent will capture request and response headers, including cookies.\n\nNOTE: Setting this to `false` reduces network bandwidth, disk space and object allocations.'
-      }
-    ),
-    excludeAgents: ['js-base', 'rum-js']
-  },
-
   // Capture body
   {
     key: 'capture_body',
@@ -104,7 +86,25 @@ export const generalSettings: RawSettingDefinition[] = [
       { text: 'transactions' },
       { text: 'all' }
     ],
-    excludeAgents: ['js-base', 'rum-js', 'dotnet']
+    excludeAgents: ['js-base', 'rum-js']
+  },
+
+  // Capture headers
+  {
+    key: 'capture_headers',
+    type: 'boolean',
+    defaultValue: 'true',
+    label: i18n.translate('xpack.apm.agentConfig.captureHeaders.label', {
+      defaultMessage: 'Capture Headers'
+    }),
+    description: i18n.translate(
+      'xpack.apm.agentConfig.captureHeaders.description',
+      {
+        defaultMessage:
+          'If set to `true`, the agent will capture request and response headers, including cookies.\n\nNOTE: Setting this to `false` reduces network bandwidth, disk space and object allocations.'
+      }
+    ),
+    excludeAgents: ['js-base', 'rum-js']
   },
 
   // LOG_LEVEL
@@ -175,23 +175,6 @@ export const generalSettings: RawSettingDefinition[] = [
     includeAgents: ['nodejs', 'java', 'dotnet', 'go']
   },
 
-  // Transaction sample rate
-  {
-    key: 'transaction_sample_rate',
-    type: 'float',
-    defaultValue: '1.0',
-    label: i18n.translate('xpack.apm.agentConfig.transactionSampleRate.label', {
-      defaultMessage: 'Transaction sample rate'
-    }),
-    description: i18n.translate(
-      'xpack.apm.agentConfig.transactionSampleRate.description',
-      {
-        defaultMessage:
-          'By default, the agent will sample every transaction (e.g. request to your service). To reduce overhead and storage requirements, you can set the sample rate to a value between 0.0 and 1.0. We still record overall time and the result for unsampled transactions, but no context information, labels, or spans.'
-      }
-    )
-  },
-
   // Transaction max spans
   {
     key: 'transaction_max_spans',
@@ -215,5 +198,22 @@ export const generalSettings: RawSettingDefinition[] = [
     min: 0,
     max: 32000,
     excludeAgents: ['js-base', 'rum-js']
+  },
+
+  // Transaction sample rate
+  {
+    key: 'transaction_sample_rate',
+    type: 'float',
+    defaultValue: '1.0',
+    label: i18n.translate('xpack.apm.agentConfig.transactionSampleRate.label', {
+      defaultMessage: 'Transaction sample rate'
+    }),
+    description: i18n.translate(
+      'xpack.apm.agentConfig.transactionSampleRate.description',
+      {
+        defaultMessage:
+          'By default, the agent will sample every transaction (e.g. request to your service). To reduce overhead and storage requirements, you can set the sample rate to a value between 0.0 and 1.0. We still record overall time and the result for unsampled transactions, but no context information, labels, or spans.'
+      }
+    )
   }
 ];
diff --git a/x-pack/plugins/apm/common/agent_configuration/setting_definitions/index.test.ts b/x-pack/plugins/apm/common/agent_configuration/setting_definitions/index.test.ts
index 0d1113d74c98b..fe55442324c92 100644
--- a/x-pack/plugins/apm/common/agent_configuration/setting_definitions/index.test.ts
+++ b/x-pack/plugins/apm/common/agent_configuration/setting_definitions/index.test.ts
@@ -127,6 +127,7 @@ describe('filterByAgent', () => {
 
     it('dotnet', () => {
       expect(getSettingKeysForAgent('dotnet')).toEqual([
+        'capture_body',
         'capture_headers',
         'log_level',
         'span_frames_min_duration',
@@ -152,6 +153,7 @@ describe('filterByAgent', () => {
 
     it('"All" services (no agent name)', () => {
       expect(getSettingKeysForAgent(undefined)).toEqual([
+        'capture_body',
         'capture_headers',
         'transaction_max_spans',
         'transaction_sample_rate'

From 64a5734439755399116450fbc1eb79d3227b35c3 Mon Sep 17 00:00:00 2001
From: Ryland Herrick <ryalnd@gmail.com>
Date: Tue, 24 Mar 2020 16:49:35 -0500
Subject: [PATCH 111/179] [SIEM] Add license checks for ML Rules on the backend
 (#61023)

* WIP: Check license on simple rule creation

We'll add this to the rest of the routes momentarily.

* Add license checks around all rule-modifying endpoints

This ensures that you cannot create nor update an ML Rule if your
license is not Platinum (or Trial).

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 .../legacy/plugins/siem/common/constants.ts   |  5 +++
 .../routes/__mocks__/request_context.ts       |  3 ++
 .../routes/__mocks__/request_responses.ts     | 26 ++++++++++----
 .../routes/__mocks__/utils.ts                 | 15 ++++++++
 .../rules/create_rules_bulk_route.test.ts     | 17 ++++++++++
 .../routes/rules/create_rules_bulk_route.ts   |  3 ++
 .../routes/rules/create_rules_route.test.ts   | 18 ++++++++++
 .../routes/rules/create_rules_route.ts        |  8 ++++-
 .../routes/rules/import_rules_route.test.ts   | 26 ++++++++++++++
 .../routes/rules/import_rules_route.ts        |  6 ++++
 .../rules/patch_rules_bulk_route.test.ts      | 22 ++++++++++++
 .../routes/rules/patch_rules_bulk_route.ts    | 11 +++++-
 .../routes/rules/patch_rules_route.test.ts    | 17 ++++++++++
 .../routes/rules/patch_rules_route.ts         | 11 +++++-
 .../rules/update_rules_bulk_route.test.ts     | 22 ++++++++++++
 .../routes/rules/update_rules_bulk_route.ts   |  9 ++++-
 .../routes/rules/update_rules_route.test.ts   | 17 ++++++++++
 .../routes/rules/update_rules_route.ts        |  9 ++++-
 .../detection_engine/routes/rules/utils.ts    |  9 ++++-
 .../lib/detection_engine/routes/utils.test.ts | 34 +++++++++++++++++++
 .../lib/detection_engine/routes/utils.ts      | 30 ++++++++++++++++
 x-pack/legacy/plugins/siem/server/plugin.ts   |  4 ++-
 22 files changed, 308 insertions(+), 14 deletions(-)

diff --git a/x-pack/legacy/plugins/siem/common/constants.ts b/x-pack/legacy/plugins/siem/common/constants.ts
index ec720164e9bd7..eb22c0bdf93c3 100644
--- a/x-pack/legacy/plugins/siem/common/constants.ts
+++ b/x-pack/legacy/plugins/siem/common/constants.ts
@@ -94,4 +94,9 @@ export const DETECTION_ENGINE_QUERY_SIGNALS_URL = `${DETECTION_ENGINE_SIGNALS_UR
  */
 export const UNAUTHENTICATED_USER = 'Unauthenticated';
 
+/*
+  Licensing requirements
+ */
+export const MINIMUM_ML_LICENSE = 'platinum';
+
 export const NOTIFICATION_THROTTLE_RULE = 'rule';
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/__mocks__/request_context.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/__mocks__/request_context.ts
index ebf6b3ae79ea8..2e5c29bc0221a 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/__mocks__/request_context.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/__mocks__/request_context.ts
@@ -12,11 +12,13 @@ import {
 } from '../../../../../../../../../src/core/server/mocks';
 import { alertsClientMock } from '../../../../../../../../plugins/alerting/server/mocks';
 import { actionsClientMock } from '../../../../../../../../plugins/actions/server/mocks';
+import { licensingMock } from '../../../../../../../../plugins/licensing/server/mocks';
 
 const createMockClients = () => ({
   actionsClient: actionsClientMock.create(),
   alertsClient: alertsClientMock.create(),
   clusterClient: elasticsearchServiceMock.createScopedClusterClient(),
+  licensing: { license: licensingMock.createLicenseMock() },
   savedObjectsClient: savedObjectsClientMock.create(),
   siemClient: { signalsIndex: 'mockSignalsIndex' },
 });
@@ -33,6 +35,7 @@ const createRequestContextMock = (
       elasticsearch: { ...coreContext.elasticsearch, dataClient: clients.clusterClient },
       savedObjects: { client: clients.savedObjectsClient },
     },
+    licensing: clients.licensing,
     siem: { getSiemClient: jest.fn(() => clients.siemClient) },
   } as unknown) as RequestHandlerContext;
 };
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/__mocks__/request_responses.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/__mocks__/request_responses.ts
index 6435410f31797..10e53d94de90a 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/__mocks__/request_responses.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/__mocks__/request_responses.ts
@@ -295,18 +295,30 @@ export const getCreateRequest = () =>
     body: typicalPayload(),
   });
 
-export const createMlRuleRequest = () => {
+export const typicalMlRulePayload = () => {
   const { query, language, index, ...mlParams } = typicalPayload();
 
+  return {
+    ...mlParams,
+    type: 'machine_learning',
+    anomaly_threshold: 58,
+    machine_learning_job_id: 'typical-ml-job-id',
+  };
+};
+
+export const createMlRuleRequest = () => {
   return requestMock.create({
     method: 'post',
     path: DETECTION_ENGINE_RULES_URL,
-    body: {
-      ...mlParams,
-      type: 'machine_learning',
-      anomaly_threshold: 50,
-      machine_learning_job_id: 'some-uuid',
-    },
+    body: typicalMlRulePayload(),
+  });
+};
+
+export const createBulkMlRuleRequest = () => {
+  return requestMock.create({
+    method: 'post',
+    path: DETECTION_ENGINE_RULES_URL,
+    body: [typicalMlRulePayload()],
   });
 };
 
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/__mocks__/utils.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/__mocks__/utils.ts
index 13d75cc44992c..a2485ec477453 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/__mocks__/utils.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/__mocks__/utils.ts
@@ -23,6 +23,21 @@ export const getSimpleRule = (ruleId = 'rule-1'): Partial<OutputRuleAlertRest> =
   query: 'user.name: root or user.name: admin',
 });
 
+/**
+ * This is a typical ML rule for testing
+ * @param ruleId
+ */
+export const getSimpleMlRule = (ruleId = 'rule-1'): Partial<OutputRuleAlertRest> => ({
+  name: 'Simple Rule Query',
+  description: 'Simple Rule Query',
+  risk_score: 1,
+  rule_id: ruleId,
+  severity: 'high',
+  type: 'machine_learning',
+  anomaly_threshold: 44,
+  machine_learning_job_id: 'some_job_id',
+});
+
 /**
  * This is a typical simple rule for testing that is easy for most basic testing
  * @param ruleId
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/create_rules_bulk_route.test.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/create_rules_bulk_route.test.ts
index e2af678c828e6..32b8eca298229 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/create_rules_bulk_route.test.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/create_rules_bulk_route.test.ts
@@ -13,6 +13,7 @@ import {
   getFindResultWithSingleHit,
   getEmptyFindResult,
   getResult,
+  createBulkMlRuleRequest,
 } from '../__mocks__/request_responses';
 import { requestContextMock, serverMock, requestMock } from '../__mocks__';
 import { createRulesBulkRoute } from './create_rules_bulk_route';
@@ -56,6 +57,22 @@ describe('create_rules_bulk', () => {
   });
 
   describe('unhappy paths', () => {
+    it('returns an error object if creating an ML rule with an insufficient license', async () => {
+      (context.licensing.license.hasAtLeast as jest.Mock).mockReturnValue(false);
+
+      const response = await server.inject(createBulkMlRuleRequest(), context);
+      expect(response.status).toEqual(200);
+      expect(response.body).toEqual([
+        {
+          error: {
+            message: 'Your license does not support machine learning. Please upgrade your license.',
+            status_code: 400,
+          },
+          rule_id: 'rule-1',
+        },
+      ]);
+    });
+
     it('returns an error object if the index does not exist', async () => {
       clients.clusterClient.callAsCurrentUser.mockResolvedValue(getEmptyIndex());
       const response = await server.inject(getReadBulkRequest(), context);
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/create_rules_bulk_route.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/create_rules_bulk_route.ts
index 4ffa29c385f28..1ca9f7ef9075e 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/create_rules_bulk_route.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/create_rules_bulk_route.ts
@@ -19,6 +19,7 @@ import {
   createBulkErrorObject,
   buildRouteValidation,
   buildSiemResponse,
+  validateLicenseForRuleType,
 } from '../utils';
 import { createRulesBulkSchema } from '../schemas/create_rules_bulk_schema';
 import { rulesBulkSchema } from '../schemas/response/rules_bulk_schema';
@@ -90,6 +91,8 @@ export const createRulesBulkRoute = (router: IRouter) => {
             } = payloadRule;
             const ruleIdOrUuid = ruleId ?? uuid.v4();
             try {
+              validateLicenseForRuleType({ license: context.licensing.license, ruleType: type });
+
               const finalIndex = outputIndex ?? siemClient.signalsIndex;
               const indexExists = await getIndexExists(clusterClient.callAsCurrentUser, finalIndex);
               if (!indexExists) {
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/create_rules_route.test.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/create_rules_route.test.ts
index 14592dd499d43..4da879d12f809 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/create_rules_route.test.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/create_rules_route.test.ts
@@ -59,6 +59,13 @@ describe('create_rules', () => {
       expect(response.status).toEqual(404);
       expect(response.body).toEqual({ message: 'Not Found', status_code: 404 });
     });
+
+    it('returns 200 if license is not platinum', async () => {
+      (context.licensing.license.hasAtLeast as jest.Mock).mockReturnValue(false);
+
+      const response = await server.inject(getCreateRequest(), context);
+      expect(response.status).toEqual(200);
+    });
   });
 
   describe('creating an ML Rule', () => {
@@ -66,6 +73,17 @@ describe('create_rules', () => {
       const response = await server.inject(createMlRuleRequest(), context);
       expect(response.status).toEqual(200);
     });
+
+    it('rejects the request if licensing is not platinum', async () => {
+      (context.licensing.license.hasAtLeast as jest.Mock).mockReturnValue(false);
+
+      const response = await server.inject(createMlRuleRequest(), context);
+      expect(response.status).toEqual(400);
+      expect(response.body).toEqual({
+        message: 'Your license does not support machine learning. Please upgrade your license.',
+        status_code: 400,
+      });
+    });
   });
 
   describe('creating a Notification if throttle and actions were provided ', () => {
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/create_rules_route.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/create_rules_route.ts
index 1fbbb5274d738..edf37bcb8dbe7 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/create_rules_route.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/create_rules_route.ts
@@ -16,7 +16,12 @@ import { ruleStatusSavedObjectType } from '../../rules/saved_object_mappings';
 import { transformValidate } from './validate';
 import { getIndexExists } from '../../index/get_index_exists';
 import { createRulesSchema } from '../schemas/create_rules_schema';
-import { buildRouteValidation, transformError, buildSiemResponse } from '../utils';
+import {
+  buildRouteValidation,
+  transformError,
+  buildSiemResponse,
+  validateLicenseForRuleType,
+} from '../utils';
 import { createNotifications } from '../../notifications/create_notifications';
 
 export const createRulesRoute = (router: IRouter): void => {
@@ -66,6 +71,7 @@ export const createRulesRoute = (router: IRouter): void => {
       const siemResponse = buildSiemResponse(response);
 
       try {
+        validateLicenseForRuleType({ license: context.licensing.license, ruleType: type });
         if (!context.alerting || !context.actions) {
           return siemResponse.error({ statusCode: 404 });
         }
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/import_rules_route.test.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/import_rules_route.test.ts
index f6e1cf6e2420c..aacf83b9ec58a 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/import_rules_route.test.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/import_rules_route.test.ts
@@ -9,6 +9,8 @@ import {
   ruleIdsToNdJsonString,
   rulesToNdJsonString,
   getSimpleRuleWithId,
+  getSimpleRule,
+  getSimpleMlRule,
 } from '../__mocks__/utils';
 import {
   getImportRulesRequest,
@@ -102,6 +104,30 @@ describe('import_rules_route', () => {
   });
 
   describe('unhappy paths', () => {
+    it('returns an error object if creating an ML rule with an insufficient license', async () => {
+      (context.licensing.license.hasAtLeast as jest.Mock).mockReturnValue(false);
+      const rules = [getSimpleRule(), getSimpleMlRule('rule-2')];
+      const hapiStreamWithMlRule = buildHapiStream(rulesToNdJsonString(rules));
+      request = getImportRulesRequest(hapiStreamWithMlRule);
+
+      const response = await server.inject(request, context);
+      expect(response.status).toEqual(200);
+      expect(response.body).toEqual({
+        errors: [
+          {
+            error: {
+              message:
+                'Your license does not support machine learning. Please upgrade your license.',
+              status_code: 400,
+            },
+            rule_id: 'rule-2',
+          },
+        ],
+        success: false,
+        success_count: 1,
+      });
+    });
+
     test('returns error if createPromiseFromStreams throws error', async () => {
       jest
         .spyOn(createRulesStreamFromNdJson, 'createRulesStreamFromNdJson')
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/import_rules_route.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/import_rules_route.ts
index 4a5ea33025d49..2e6c72a87ec7f 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/import_rules_route.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/import_rules_route.ts
@@ -24,6 +24,7 @@ import {
   isImportRegular,
   transformError,
   buildSiemResponse,
+  validateLicenseForRuleType,
 } from '../utils';
 import { createRulesStreamFromNdJson } from '../../rules/create_rules_stream_from_ndjson';
 import { ImportRuleAlertRest } from '../../types';
@@ -146,6 +147,11 @@ export const importRulesRoute = (router: IRouter, config: LegacyServices['config
                   } = parsedRule;
 
                   try {
+                    validateLicenseForRuleType({
+                      license: context.licensing.license,
+                      ruleType: type,
+                    });
+
                     const signalsIndex = siemClient.signalsIndex;
                     const indexExists = await getIndexExists(
                       clusterClient.callAsCurrentUser,
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/patch_rules_bulk_route.test.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/patch_rules_bulk_route.test.ts
index 4c00cfa51c8ee..a1f39936dd674 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/patch_rules_bulk_route.test.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/patch_rules_bulk_route.test.ts
@@ -11,6 +11,7 @@ import {
   getFindResultWithSingleHit,
   getPatchBulkRequest,
   getResult,
+  typicalMlRulePayload,
 } from '../__mocks__/request_responses';
 import { serverMock, requestContextMock, requestMock } from '../__mocks__';
 import { patchRulesBulkRoute } from './patch_rules_bulk_route';
@@ -88,6 +89,27 @@ describe('patch_rules_bulk', () => {
       expect(response.status).toEqual(404);
       expect(response.body).toEqual({ message: 'Not Found', status_code: 404 });
     });
+
+    it('rejects patching of an ML rule with an insufficient license', async () => {
+      (context.licensing.license.hasAtLeast as jest.Mock).mockReturnValue(false);
+      const request = requestMock.create({
+        method: 'patch',
+        path: `${DETECTION_ENGINE_RULES_URL}/_bulk_update`,
+        body: [typicalMlRulePayload()],
+      });
+
+      const response = await server.inject(request, context);
+      expect(response.status).toEqual(200);
+      expect(response.body).toEqual([
+        {
+          error: {
+            message: 'Your license does not support machine learning. Please upgrade your license.',
+            status_code: 400,
+          },
+          rule_id: 'rule-1',
+        },
+      ]);
+    });
   });
 
   describe('request validation', () => {
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/patch_rules_bulk_route.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/patch_rules_bulk_route.ts
index a80f3fee6b433..645dbdadf8cab 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/patch_rules_bulk_route.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/patch_rules_bulk_route.ts
@@ -10,7 +10,12 @@ import {
   IRuleSavedAttributesSavedObjectAttributes,
   PatchRuleAlertParamsRest,
 } from '../../rules/types';
-import { transformBulkError, buildRouteValidation, buildSiemResponse } from '../utils';
+import {
+  transformBulkError,
+  buildRouteValidation,
+  buildSiemResponse,
+  validateLicenseForRuleType,
+} from '../utils';
 import { getIdBulkError } from './utils';
 import { transformValidateBulkError, validate } from './validate';
 import { patchRulesBulkSchema } from '../schemas/patch_rules_bulk_schema';
@@ -80,6 +85,10 @@ export const patchRulesBulkRoute = (router: IRouter) => {
           } = payloadRule;
           const idOrRuleIdOrUnknown = id ?? ruleId ?? '(unknown id)';
           try {
+            if (type) {
+              validateLicenseForRuleType({ license: context.licensing.license, ruleType: type });
+            }
+
             const rule = await patchRules({
               alertsClient,
               actionsClient,
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/patch_rules_route.test.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/patch_rules_route.test.ts
index 07519733db291..1e344d8ea7e31 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/patch_rules_route.test.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/patch_rules_route.test.ts
@@ -13,6 +13,7 @@ import {
   typicalPayload,
   getFindResultWithSingleHit,
   nonRuleFindResult,
+  typicalMlRulePayload,
 } from '../__mocks__/request_responses';
 import { requestContextMock, serverMock, requestMock } from '../__mocks__';
 import { patchRulesRoute } from './patch_rules_route';
@@ -109,6 +110,22 @@ describe('patch_rules', () => {
         })
       );
     });
+
+    it('rejects patching a rule to ML if licensing is not platinum', async () => {
+      (context.licensing.license.hasAtLeast as jest.Mock).mockReturnValue(false);
+      const request = requestMock.create({
+        method: 'patch',
+        path: DETECTION_ENGINE_RULES_URL,
+        body: typicalMlRulePayload(),
+      });
+      const response = await server.inject(request, context);
+
+      expect(response.status).toEqual(400);
+      expect(response.body).toEqual({
+        message: 'Your license does not support machine learning. Please upgrade your license.',
+        status_code: 400,
+      });
+    });
   });
 
   describe('request validation', () => {
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/patch_rules_route.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/patch_rules_route.ts
index c5ecb109f4595..620bcd8fc17b0 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/patch_rules_route.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/patch_rules_route.ts
@@ -12,7 +12,12 @@ import {
   IRuleSavedAttributesSavedObjectAttributes,
 } from '../../rules/types';
 import { patchRulesSchema } from '../schemas/patch_rules_schema';
-import { buildRouteValidation, transformError, buildSiemResponse } from '../utils';
+import {
+  buildRouteValidation,
+  transformError,
+  buildSiemResponse,
+  validateLicenseForRuleType,
+} from '../utils';
 import { getIdError } from './utils';
 import { transformValidate } from './validate';
 import { ruleStatusSavedObjectType } from '../../rules/saved_object_mappings';
@@ -65,6 +70,10 @@ export const patchRulesRoute = (router: IRouter) => {
       const siemResponse = buildSiemResponse(response);
 
       try {
+        if (type) {
+          validateLicenseForRuleType({ license: context.licensing.license, ruleType: type });
+        }
+
         if (!context.alerting || !context.actions) {
           return siemResponse.error({ statusCode: 404 });
         }
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/update_rules_bulk_route.test.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/update_rules_bulk_route.test.ts
index d530866edaf0d..611b38ccbae8b 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/update_rules_bulk_route.test.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/update_rules_bulk_route.test.ts
@@ -11,6 +11,7 @@ import {
   getFindResultWithSingleHit,
   getUpdateBulkRequest,
   getFindResultStatus,
+  typicalMlRulePayload,
 } from '../__mocks__/request_responses';
 import { serverMock, requestContextMock, requestMock } from '../__mocks__';
 import { updateRulesBulkRoute } from './update_rules_bulk_route';
@@ -83,6 +84,27 @@ describe('update_rules_bulk', () => {
       expect(response.status).toEqual(200);
       expect(response.body).toEqual(expected);
     });
+
+    it('returns an error object if creating an ML rule with an insufficient license', async () => {
+      (context.licensing.license.hasAtLeast as jest.Mock).mockReturnValue(false);
+      const request = requestMock.create({
+        method: 'put',
+        path: `${DETECTION_ENGINE_RULES_URL}/_bulk_update`,
+        body: [typicalMlRulePayload()],
+      });
+
+      const response = await server.inject(request, context);
+      expect(response.status).toEqual(200);
+      expect(response.body).toEqual([
+        {
+          error: {
+            message: 'Your license does not support machine learning. Please upgrade your license.',
+            status_code: 400,
+          },
+          rule_id: 'rule-1',
+        },
+      ]);
+    });
   });
 
   describe('request validation', () => {
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/update_rules_bulk_route.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/update_rules_bulk_route.ts
index 6c3c8dffa3dfa..4abeb840c8c0a 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/update_rules_bulk_route.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/update_rules_bulk_route.ts
@@ -12,7 +12,12 @@ import {
 } from '../../rules/types';
 import { getIdBulkError } from './utils';
 import { transformValidateBulkError, validate } from './validate';
-import { buildRouteValidation, transformBulkError, buildSiemResponse } from '../utils';
+import {
+  buildRouteValidation,
+  transformBulkError,
+  buildSiemResponse,
+  validateLicenseForRuleType,
+} from '../utils';
 import { updateRulesBulkSchema } from '../schemas/update_rules_bulk_schema';
 import { ruleStatusSavedObjectType } from '../../rules/saved_object_mappings';
 import { updateRules } from '../../rules/update_rules';
@@ -83,6 +88,8 @@ export const updateRulesBulkRoute = (router: IRouter) => {
           const finalIndex = outputIndex ?? siemClient.signalsIndex;
           const idOrRuleIdOrUnknown = id ?? ruleId ?? '(unknown id)';
           try {
+            validateLicenseForRuleType({ license: context.licensing.license, ruleType: type });
+
             const rule = await updateRules({
               alertsClient,
               actionsClient,
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/update_rules_route.test.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/update_rules_route.test.ts
index a15f1ca9b044e..717f2cc4a52fe 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/update_rules_route.test.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/update_rules_route.test.ts
@@ -13,6 +13,7 @@ import {
   getFindResultWithSingleHit,
   getFindResultStatusEmpty,
   nonRuleFindResult,
+  typicalMlRulePayload,
 } from '../__mocks__/request_responses';
 import { requestContextMock, serverMock, requestMock } from '../__mocks__';
 import { DETECTION_ENGINE_RULES_URL } from '../../../../../common/constants';
@@ -88,6 +89,22 @@ describe('update_rules', () => {
         status_code: 500,
       });
     });
+
+    it('rejects the request if licensing is not adequate', async () => {
+      (context.licensing.license.hasAtLeast as jest.Mock).mockReturnValue(false);
+      const request = requestMock.create({
+        method: 'put',
+        path: DETECTION_ENGINE_RULES_URL,
+        body: typicalMlRulePayload(),
+      });
+
+      const response = await server.inject(request, context);
+      expect(response.status).toEqual(400);
+      expect(response.body).toEqual({
+        message: 'Your license does not support machine learning. Please upgrade your license.',
+        status_code: 400,
+      });
+    });
   });
 
   describe('request validation', () => {
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/update_rules_route.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/update_rules_route.ts
index f8cca6494e000..f0d5f08c5f636 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/update_rules_route.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/update_rules_route.ts
@@ -11,7 +11,12 @@ import {
   IRuleSavedAttributesSavedObjectAttributes,
 } from '../../rules/types';
 import { updateRulesSchema } from '../schemas/update_rules_schema';
-import { buildRouteValidation, transformError, buildSiemResponse } from '../utils';
+import {
+  buildRouteValidation,
+  transformError,
+  buildSiemResponse,
+  validateLicenseForRuleType,
+} from '../utils';
 import { getIdError } from './utils';
 import { transformValidate } from './validate';
 import { ruleStatusSavedObjectType } from '../../rules/saved_object_mappings';
@@ -67,6 +72,8 @@ export const updateRulesRoute = (router: IRouter) => {
       const siemResponse = buildSiemResponse(response);
 
       try {
+        validateLicenseForRuleType({ license: context.licensing.license, ruleType: type });
+
         if (!context.alerting || !context.actions) {
           return siemResponse.error({ statusCode: 404 });
         }
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/utils.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/utils.ts
index a0458dc3a133d..ca0d133627210 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/utils.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/utils.ts
@@ -19,7 +19,12 @@ import {
   isRuleStatusFindTypes,
   isRuleStatusSavedObjectType,
 } from '../../rules/types';
-import { OutputRuleAlertRest, ImportRuleAlertRest, RuleAlertParamsRest } from '../../types';
+import {
+  OutputRuleAlertRest,
+  ImportRuleAlertRest,
+  RuleAlertParamsRest,
+  RuleType,
+} from '../../types';
 import {
   createBulkErrorObject,
   BulkError,
@@ -295,3 +300,5 @@ export const getTupleDuplicateErrorsAndUniqueRules = (
 
   return [Array.from(errors.values()), Array.from(rulesAcc.values())];
 };
+
+export const isMlRule = (ruleType: RuleType) => ruleType === 'machine_learning';
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/utils.test.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/utils.test.ts
index fdb1cd148c7fa..9efe4e491968b 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/utils.test.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/utils.test.ts
@@ -19,9 +19,11 @@ import {
   transformImportError,
   convertToSnakeCase,
   SiemResponseFactory,
+  validateLicenseForRuleType,
 } from './utils';
 import { responseMock } from './__mocks__';
 import { setFeatureFlagsForTestsOnly, unSetFeatureFlagsForTestsOnly } from '../feature_flags';
+import { licensingMock } from '../../../../../../../plugins/licensing/server/mocks';
 
 describe('utils', () => {
   beforeAll(() => {
@@ -359,4 +361,36 @@ describe('utils', () => {
       );
     });
   });
+
+  describe('validateLicenseForRuleType', () => {
+    let licenseMock: ReturnType<typeof licensingMock.createLicenseMock>;
+
+    beforeEach(() => {
+      licenseMock = licensingMock.createLicenseMock();
+    });
+
+    it('throws a BadRequestError if operating on an ML Rule with an insufficient license', () => {
+      licenseMock.hasAtLeast.mockReturnValue(false);
+
+      expect(() =>
+        validateLicenseForRuleType({ license: licenseMock, ruleType: 'machine_learning' })
+      ).toThrowError(BadRequestError);
+    });
+
+    it('does not throw if operating on an ML Rule with a sufficient license', () => {
+      licenseMock.hasAtLeast.mockReturnValue(true);
+
+      expect(() =>
+        validateLicenseForRuleType({ license: licenseMock, ruleType: 'machine_learning' })
+      ).not.toThrowError(BadRequestError);
+    });
+
+    it('does not throw if operating on a query rule', () => {
+      licenseMock.hasAtLeast.mockReturnValue(false);
+
+      expect(() =>
+        validateLicenseForRuleType({ license: licenseMock, ruleType: 'query' })
+      ).not.toThrowError(BadRequestError);
+    });
+  });
 });
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/utils.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/utils.ts
index 79c2f47658f7e..90c7d4a07ddf8 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/utils.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/utils.ts
@@ -7,13 +7,18 @@
 import Boom from 'boom';
 import Joi from 'joi';
 import { has, snakeCase } from 'lodash/fp';
+import { i18n } from '@kbn/i18n';
 
 import {
   RouteValidationFunction,
   KibanaResponseFactory,
   CustomHttpResponseOptions,
 } from '../../../../../../../../src/core/server';
+import { ILicense } from '../../../../../../../plugins/licensing/server';
+import { MINIMUM_ML_LICENSE } from '../../../../common/constants';
 import { BadRequestError } from '../errors/bad_request_error';
+import { RuleType } from '../types';
+import { isMlRule } from './rules/utils';
 
 export interface OutputError {
   message: string;
@@ -289,3 +294,28 @@ export const convertToSnakeCase = <T extends Record<string, unknown>>(
     return { ...acc, [newKey]: obj[item] };
   }, {});
 };
+
+/**
+ * Checks the current Kibana License against the rule under operation.
+ *
+ * @param license ILicense representing the user license
+ * @param ruleType the type of the current rule
+ *
+ * @throws BadRequestError if rule and license are incompatible
+ */
+export const validateLicenseForRuleType = ({
+  license,
+  ruleType,
+}: {
+  license: ILicense;
+  ruleType: RuleType;
+}) => {
+  if (isMlRule(ruleType) && !license.hasAtLeast(MINIMUM_ML_LICENSE)) {
+    const message = i18n.translate('xpack.siem.licensing.unsupportedMachineLearningMessage', {
+      defaultMessage:
+        'Your license does not support machine learning. Please upgrade your license.',
+    });
+
+    throw new BadRequestError(message);
+  }
+};
diff --git a/x-pack/legacy/plugins/siem/server/plugin.ts b/x-pack/legacy/plugins/siem/server/plugin.ts
index d785de32eab7e..44e6b7a32a842 100644
--- a/x-pack/legacy/plugins/siem/server/plugin.ts
+++ b/x-pack/legacy/plugins/siem/server/plugin.ts
@@ -21,6 +21,7 @@ import { PluginSetupContract as FeaturesSetup } from '../../../../plugins/featur
 import { EncryptedSavedObjectsPluginSetup as EncryptedSavedObjectsSetup } from '../../../../plugins/encrypted_saved_objects/server';
 import { SpacesPluginSetup as SpacesSetup } from '../../../../plugins/spaces/server';
 import { PluginStartContract as ActionsStart } from '../../../../plugins/actions/server';
+import { LicensingPluginSetup } from '../../../../plugins/licensing/server';
 import { LegacyServices } from './types';
 import { initServer } from './init_server';
 import { compose } from './lib/compose/kibana';
@@ -41,11 +42,12 @@ import { hasListsFeature, listsEnvFeatureFlagName } from './lib/detection_engine
 export { CoreSetup, CoreStart };
 
 export interface SetupPlugins {
+  alerting: AlertingSetup;
   encryptedSavedObjects: EncryptedSavedObjectsSetup;
   features: FeaturesSetup;
+  licensing: LicensingPluginSetup;
   security: SecuritySetup;
   spaces?: SpacesSetup;
-  alerting: AlertingSetup;
 }
 
 export interface StartPlugins {

From 24438275794d95fb29b271197a2518c1f33b4690 Mon Sep 17 00:00:00 2001
From: Shahzad <shahzad.muhammad@elastic.co>
Date: Wed, 25 Mar 2020 00:05:57 +0100
Subject: [PATCH 112/179] [Uptime] Feature/enhance telemetry Phase 1 (#61062)

* add telemetry

* update telemetry

* update telemetry

* update types

* fix issue when no data

* use dynamic settings in telemtry

* fix type

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 .../uptime/common/constants/rest_api.ts       |   1 +
 .../uptime/public/hooks/use_telemetry.ts      |  42 ++--
 .../plugins/uptime/public/pages/settings.tsx  |  23 +-
 x-pack/plugins/uptime/server/kibana.index.ts  |   4 +-
 .../lib/adapters/framework/adapter_types.ts   |  11 +-
 .../kibana_telemetry_adapter.test.ts.snap     |  54 ++++-
 .../kibana_telemetry_adapter.test.ts          |  69 ++++--
 .../telemetry/kibana_telemetry_adapter.ts     | 203 ++++++++++++++++--
 .../server/lib/adapters/telemetry/types.ts    |  35 +++
 .../server/lib/requests/get_filter_bar.ts     |   2 +-
 x-pack/plugins/uptime/server/plugin.ts        |  21 +-
 .../plugins/uptime/server/rest_api/index.ts   |   5 +-
 .../uptime/server/rest_api/telemetry/index.ts |   3 +-
 .../rest_api/telemetry/log_monitor_page.ts    |  21 --
 .../rest_api/telemetry/log_overview_page.ts   |  21 --
 .../rest_api/telemetry/log_page_view.ts       |  33 +++
 16 files changed, 427 insertions(+), 121 deletions(-)
 create mode 100644 x-pack/plugins/uptime/server/lib/adapters/telemetry/types.ts
 delete mode 100644 x-pack/plugins/uptime/server/rest_api/telemetry/log_monitor_page.ts
 delete mode 100644 x-pack/plugins/uptime/server/rest_api/telemetry/log_overview_page.ts
 create mode 100644 x-pack/plugins/uptime/server/rest_api/telemetry/log_page_view.ts

diff --git a/x-pack/legacy/plugins/uptime/common/constants/rest_api.ts b/x-pack/legacy/plugins/uptime/common/constants/rest_api.ts
index a1a3e86e6a97e..7fafe6584d831 100644
--- a/x-pack/legacy/plugins/uptime/common/constants/rest_api.ts
+++ b/x-pack/legacy/plugins/uptime/common/constants/rest_api.ts
@@ -16,6 +16,7 @@ export enum API_URLS {
   PING_HISTOGRAM = `/api/uptime/ping/histogram`,
   SNAPSHOT_COUNT = `/api/uptime/snapshot/count`,
   FILTERS = `/api/uptime/filters`,
+  logPageView = `/api/uptime/logPageView`,
 
   ML_MODULE_JOBS = `/api/ml/modules/jobs_exist/`,
   ML_SETUP_MODULE = '/api/ml/modules/setup/',
diff --git a/x-pack/legacy/plugins/uptime/public/hooks/use_telemetry.ts b/x-pack/legacy/plugins/uptime/public/hooks/use_telemetry.ts
index 7eb18404decfd..fc0e0ce1c3e88 100644
--- a/x-pack/legacy/plugins/uptime/public/hooks/use_telemetry.ts
+++ b/x-pack/legacy/plugins/uptime/public/hooks/use_telemetry.ts
@@ -5,33 +5,31 @@
  */
 
 import { useEffect } from 'react';
-import { HttpHandler } from 'kibana/public';
-import { useKibana } from '../../../../../../src/plugins/kibana_react/public';
+import { useUrlParams } from './use_url_params';
+import { apiService } from '../state/api/utils';
+import { API_URLS } from '../../common/constants';
 
 export enum UptimePage {
-  Overview = '/api/uptime/logOverview',
-  Monitor = '/api/uptime/logMonitor',
+  Overview = 'Overview',
+  Monitor = 'Monitor',
+  Settings = 'Settings',
   NotFound = '__not-found__',
 }
 
-const getApiPath = (page?: UptimePage) => {
-  if (!page) throw new Error('Telemetry logging for this page not yet implemented');
-  if (page === '__not-found__')
-    throw new Error('Telemetry logging for 404 page not yet implemented');
-  return page.valueOf();
-};
-
-const logPageLoad = async (fetch: HttpHandler, page?: UptimePage) => {
-  await fetch(getApiPath(page), {
-    method: 'POST',
-  });
-};
-
 export const useUptimeTelemetry = (page?: UptimePage) => {
-  const kibana = useKibana();
-  const fetch = kibana.services.http?.fetch;
+  const [getUrlParams] = useUrlParams();
+  const { dateRangeStart, dateRangeEnd, autorefreshInterval, autorefreshIsPaused } = getUrlParams();
+
   useEffect(() => {
-    if (!fetch) throw new Error('Core http services are not defined');
-    logPageLoad(fetch, page);
-  }, [fetch, page]);
+    if (!apiService.http) throw new Error('Core http services are not defined');
+
+    const params = {
+      page,
+      autorefreshInterval: autorefreshInterval / 1000, // divide by 1000 to keep it in secs
+      dateStart: dateRangeStart,
+      dateEnd: dateRangeEnd,
+      autoRefreshEnabled: !autorefreshIsPaused,
+    };
+    apiService.post(API_URLS.logPageView, params);
+  }, [autorefreshInterval, autorefreshIsPaused, dateRangeEnd, dateRangeStart, page]);
 };
diff --git a/x-pack/legacy/plugins/uptime/public/pages/settings.tsx b/x-pack/legacy/plugins/uptime/public/pages/settings.tsx
index 679a61686e435..e78c3e0f7de09 100644
--- a/x-pack/legacy/plugins/uptime/public/pages/settings.tsx
+++ b/x-pack/legacy/plugins/uptime/public/pages/settings.tsx
@@ -6,19 +6,19 @@
 
 import React, { useEffect, useState } from 'react';
 import {
-  EuiForm,
-  EuiTitle,
-  EuiSpacer,
+  EuiButton,
+  EuiButtonEmpty,
+  EuiCallOut,
+  EuiCode,
   EuiDescribedFormGroup,
   EuiFieldText,
-  EuiFormRow,
-  EuiCode,
-  EuiPanel,
   EuiFlexGroup,
   EuiFlexItem,
-  EuiButton,
-  EuiButtonEmpty,
-  EuiCallOut,
+  EuiForm,
+  EuiFormRow,
+  EuiPanel,
+  EuiSpacer,
+  EuiTitle,
 } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n/react';
 import { connect } from 'react-redux';
@@ -29,10 +29,11 @@ import { AppState } from '../state';
 import { selectDynamicSettings } from '../state/selectors';
 import { DynamicSettingsState } from '../state/reducers/dynamic_settings';
 import { getDynamicSettings, setDynamicSettings } from '../state/actions/dynamic_settings';
-import { DynamicSettings, defaultDynamicSettings } from '../../common/runtime_types';
+import { defaultDynamicSettings, DynamicSettings } from '../../common/runtime_types';
 import { useBreadcrumbs } from '../hooks/use_breadcrumbs';
 import { OVERVIEW_ROUTE } from '../../common/constants';
 import { useKibana } from '../../../../../../src/plugins/kibana_react/public';
+import { UptimePage, useUptimeTelemetry } from '../hooks';
 
 interface Props {
   dynamicSettingsState: DynamicSettingsState;
@@ -53,6 +54,8 @@ export const SettingsPageComponent = ({
   });
   useBreadcrumbs([{ text: settingsBreadcrumbText }]);
 
+  useUptimeTelemetry(UptimePage.Settings);
+
   useEffect(() => {
     dispatchGetDynamicSettings({});
   }, [dispatchGetDynamicSettings]);
diff --git a/x-pack/plugins/uptime/server/kibana.index.ts b/x-pack/plugins/uptime/server/kibana.index.ts
index da208e13acdad..c206cfa06e272 100644
--- a/x-pack/plugins/uptime/server/kibana.index.ts
+++ b/x-pack/plugins/uptime/server/kibana.index.ts
@@ -6,7 +6,6 @@
 
 import { Request, Server } from 'hapi';
 import { PLUGIN } from '../../../legacy/plugins/uptime/common/constants';
-import { KibanaTelemetryAdapter } from './lib/adapters/telemetry';
 import { compose } from './lib/compose/kibana';
 import { initUptimeServer } from './uptime_server';
 import { UptimeCorePlugins, UptimeCoreSetup } from './lib/adapters/framework';
@@ -25,9 +24,8 @@ export interface KibanaServer extends Server {
 }
 
 export const initServerWithKibana = (server: UptimeCoreSetup, plugins: UptimeCorePlugins) => {
-  const { features, usageCollection } = plugins;
+  const { features } = plugins;
   const libs = compose(server);
-  KibanaTelemetryAdapter.registerUsageCollector(usageCollection);
 
   features.registerFeature({
     id: PLUGIN.ID,
diff --git a/x-pack/plugins/uptime/server/lib/adapters/framework/adapter_types.ts b/x-pack/plugins/uptime/server/lib/adapters/framework/adapter_types.ts
index a6dd8efd57c14..47fe5f2af4263 100644
--- a/x-pack/plugins/uptime/server/lib/adapters/framework/adapter_types.ts
+++ b/x-pack/plugins/uptime/server/lib/adapters/framework/adapter_types.ts
@@ -6,12 +6,17 @@
 
 import { GraphQLSchema } from 'graphql';
 import { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
-import { IRouter, CallAPIOptions, SavedObjectsClientContract } from 'src/core/server';
+import {
+  IRouter,
+  CallAPIOptions,
+  SavedObjectsClientContract,
+  ISavedObjectsRepository,
+} from 'src/core/server';
 import { UMKibanaRoute } from '../../../rest_api';
 import { PluginSetupContract } from '../../../../../features/server';
 import { DynamicSettings } from '../../../../../../legacy/plugins/uptime/common/runtime_types';
 
-type APICaller = (
+export type APICaller = (
   endpoint: string,
   clientParams: Record<string, any>,
   options?: CallAPIOptions
@@ -22,7 +27,7 @@ export type UMElasticsearchQueryFn<P, R = any> = (
 ) => Promise<R> | R;
 
 export type UMSavedObjectsQueryFn<T = any, P = undefined> = (
-  client: SavedObjectsClientContract,
+  client: SavedObjectsClientContract | ISavedObjectsRepository,
   params?: P
 ) => Promise<T> | T;
 
diff --git a/x-pack/plugins/uptime/server/lib/adapters/telemetry/__tests__/__snapshots__/kibana_telemetry_adapter.test.ts.snap b/x-pack/plugins/uptime/server/lib/adapters/telemetry/__tests__/__snapshots__/kibana_telemetry_adapter.test.ts.snap
index e88a2cdc50cd9..8c55d5da54ac7 100644
--- a/x-pack/plugins/uptime/server/lib/adapters/telemetry/__tests__/__snapshots__/kibana_telemetry_adapter.test.ts.snap
+++ b/x-pack/plugins/uptime/server/lib/adapters/telemetry/__tests__/__snapshots__/kibana_telemetry_adapter.test.ts.snap
@@ -4,8 +4,32 @@ exports[`KibanaTelemetryAdapter collects monitor and overview data 1`] = `
 Object {
   "last_24_hours": Object {
     "hits": Object {
+      "autoRefreshEnabled": true,
+      "autorefreshInterval": Array [
+        30,
+      ],
+      "dateRangeEnd": Array [
+        "now",
+      ],
+      "dateRangeStart": Array [
+        "now-15",
+      ],
+      "monitor_frequency": Array [],
+      "monitor_name_stats": Object {
+        "avg_length": 0,
+        "max_length": 0,
+        "min_length": 0,
+      },
       "monitor_page": 1,
-      "overview_page": 2,
+      "no_of_unique_monitors": 0,
+      "no_of_unique_observer_locations": 0,
+      "observer_location_name_stats": Object {
+        "avg_length": 0,
+        "max_length": 0,
+        "min_length": 0,
+      },
+      "overview_page": 1,
+      "settings_page": 1,
     },
   },
 }
@@ -15,8 +39,32 @@ exports[`KibanaTelemetryAdapter drops old buckets and reduces current window 1`]
 Object {
   "last_24_hours": Object {
     "hits": Object {
-      "monitor_page": 3,
-      "overview_page": 4,
+      "autoRefreshEnabled": true,
+      "autorefreshInterval": Array [
+        30,
+      ],
+      "dateRangeEnd": Array [
+        "now",
+      ],
+      "dateRangeStart": Array [
+        "now-15",
+      ],
+      "monitor_frequency": Array [],
+      "monitor_name_stats": Object {
+        "avg_length": 0,
+        "max_length": 0,
+        "min_length": 0,
+      },
+      "monitor_page": 2,
+      "no_of_unique_monitors": 0,
+      "no_of_unique_observer_locations": 0,
+      "observer_location_name_stats": Object {
+        "avg_length": 0,
+        "max_length": 0,
+        "min_length": 0,
+      },
+      "overview_page": 1,
+      "settings_page": 2,
     },
   },
 }
diff --git a/x-pack/plugins/uptime/server/lib/adapters/telemetry/__tests__/kibana_telemetry_adapter.test.ts b/x-pack/plugins/uptime/server/lib/adapters/telemetry/__tests__/kibana_telemetry_adapter.test.ts
index 8e4011b4cf0eb..c2437dbf35307 100644
--- a/x-pack/plugins/uptime/server/lib/adapters/telemetry/__tests__/kibana_telemetry_adapter.test.ts
+++ b/x-pack/plugins/uptime/server/lib/adapters/telemetry/__tests__/kibana_telemetry_adapter.test.ts
@@ -8,6 +8,7 @@ import { KibanaTelemetryAdapter } from '../kibana_telemetry_adapter';
 
 describe('KibanaTelemetryAdapter', () => {
   let usageCollection: any;
+  let getSavedObjectsClient: any;
   let collector: { type: string; fetch: () => Promise<any>; isReady: () => boolean };
   beforeEach(() => {
     usageCollection = {
@@ -15,14 +16,35 @@ describe('KibanaTelemetryAdapter', () => {
         collector = val;
       },
     };
+    getSavedObjectsClient = () => {
+      return {};
+    };
   });
 
   it('collects monitor and overview data', async () => {
     expect.assertions(1);
-    KibanaTelemetryAdapter.initUsageCollector(usageCollection);
-    KibanaTelemetryAdapter.countMonitor();
-    KibanaTelemetryAdapter.countOverview();
-    KibanaTelemetryAdapter.countOverview();
+    KibanaTelemetryAdapter.initUsageCollector(usageCollection, getSavedObjectsClient);
+    KibanaTelemetryAdapter.countPageView({
+      page: 'Overview',
+      dateStart: 'now-15',
+      dateEnd: 'now',
+      autoRefreshEnabled: true,
+      autorefreshInterval: 30,
+    });
+    KibanaTelemetryAdapter.countPageView({
+      page: 'Monitor',
+      dateStart: 'now-15',
+      dateEnd: 'now',
+      autoRefreshEnabled: true,
+      autorefreshInterval: 30,
+    });
+    KibanaTelemetryAdapter.countPageView({
+      page: 'Settings',
+      dateStart: 'now-15',
+      dateEnd: 'now',
+      autoRefreshEnabled: true,
+      autorefreshInterval: 30,
+    });
     const result = await collector.fetch();
     expect(result).toMatchSnapshot();
   });
@@ -31,21 +53,42 @@ describe('KibanaTelemetryAdapter', () => {
     expect.assertions(1);
     // give a time of > 24 hours ago
     Date.now = jest.fn(() => 1559053560000);
-    KibanaTelemetryAdapter.initUsageCollector(usageCollection);
-    KibanaTelemetryAdapter.countMonitor();
-    KibanaTelemetryAdapter.countOverview();
-    // give a time of now
+    KibanaTelemetryAdapter.initUsageCollector(usageCollection, getSavedObjectsClient);
+    KibanaTelemetryAdapter.countPageView({
+      page: 'Overview',
+      dateStart: 'now-20',
+      dateEnd: 'now',
+      autoRefreshEnabled: true,
+      autorefreshInterval: 30,
+    });
+    KibanaTelemetryAdapter.countPageView({
+      page: 'Monitor',
+      dateStart: 'now-15',
+      dateEnd: 'now',
+      autoRefreshEnabled: true,
+      autorefreshInterval: 30,
+    }); // give a time of now
     Date.now = jest.fn(() => new Date().valueOf());
-    KibanaTelemetryAdapter.countMonitor();
-    KibanaTelemetryAdapter.countMonitor();
-    KibanaTelemetryAdapter.countOverview();
-    KibanaTelemetryAdapter.countOverview();
+    KibanaTelemetryAdapter.countPageView({
+      page: 'Monitor',
+      dateStart: 'now-15',
+      dateEnd: 'now',
+      autoRefreshEnabled: true,
+      autorefreshInterval: 30,
+    });
+    KibanaTelemetryAdapter.countPageView({
+      page: 'Settings',
+      dateStart: 'now-15',
+      dateEnd: 'now',
+      autoRefreshEnabled: true,
+      autorefreshInterval: 30,
+    });
     const result = await collector.fetch();
     expect(result).toMatchSnapshot();
   });
 
   it('defaults ready to `true`', async () => {
-    KibanaTelemetryAdapter.initUsageCollector(usageCollection);
+    KibanaTelemetryAdapter.initUsageCollector(usageCollection, getSavedObjectsClient);
     expect(collector.isReady()).toBe(true);
   });
 });
diff --git a/x-pack/plugins/uptime/server/lib/adapters/telemetry/kibana_telemetry_adapter.ts b/x-pack/plugins/uptime/server/lib/adapters/telemetry/kibana_telemetry_adapter.ts
index 8dec0c1d2d485..e10a476bcc668 100644
--- a/x-pack/plugins/uptime/server/lib/adapters/telemetry/kibana_telemetry_adapter.ts
+++ b/x-pack/plugins/uptime/server/lib/adapters/telemetry/kibana_telemetry_adapter.ts
@@ -3,12 +3,13 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-import { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
 
-interface UptimeTelemetry {
-  overview_page: number;
-  monitor_page: number;
-}
+import moment from 'moment';
+import { ISavedObjectsRepository } from 'kibana/server';
+import { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
+import { PageViewParams, UptimeTelemetry } from './types';
+import { APICaller } from '../framework';
+import { savedObjectsAdapter } from '../../saved_objects';
 
 interface UptimeTelemetryCollector {
   [key: number]: UptimeTelemetry;
@@ -20,30 +21,180 @@ const BUCKET_SIZE = 3600;
 const BUCKET_NUMBER = 24;
 
 export class KibanaTelemetryAdapter {
-  public static registerUsageCollector = (usageCollector: UsageCollectionSetup) => {
-    const collector = KibanaTelemetryAdapter.initUsageCollector(usageCollector);
+  public static registerUsageCollector = (
+    usageCollector: UsageCollectionSetup,
+    getSavedObjectsClient: () => ISavedObjectsRepository | undefined
+  ) => {
+    if (!usageCollector) {
+      return;
+    }
+    const collector = KibanaTelemetryAdapter.initUsageCollector(
+      usageCollector,
+      getSavedObjectsClient
+    );
     usageCollector.registerCollector(collector);
   };
 
-  public static initUsageCollector(usageCollector: UsageCollectionSetup) {
+  public static initUsageCollector(
+    usageCollector: UsageCollectionSetup,
+    getSavedObjectsClient: () => ISavedObjectsRepository | undefined
+  ) {
     return usageCollector.makeUsageCollector({
       type: 'uptime',
-      fetch: async () => {
+      fetch: async (callCluster: APICaller) => {
+        const savedObjectsClient = getSavedObjectsClient()!;
+        if (savedObjectsClient) {
+          this.countNoOfUniqueMonitorAndLocations(callCluster, savedObjectsClient);
+        }
         const report = this.getReport();
         return { last_24_hours: { hits: { ...report } } };
       },
-      isReady: () => true,
+      isReady: () => typeof getSavedObjectsClient() !== 'undefined',
     });
   }
 
-  public static countOverview() {
-    const bucket = this.getBucketToIncrement();
-    this.collector[bucket].overview_page += 1;
+  public static countPageView(pageView: PageViewParams) {
+    const bucketId = this.getBucketToIncrement();
+    const bucket = this.collector[bucketId];
+    if (pageView.page === 'Overview') {
+      bucket.overview_page += 1;
+    }
+    if (pageView.page === 'Monitor') {
+      bucket.monitor_page += 1;
+    }
+    if (pageView.page === 'Settings') {
+      bucket.settings_page += 1;
+    }
+    this.updateDateData(pageView, bucket);
+    return bucket;
+  }
+
+  public static updateDateData(
+    { dateStart, dateEnd, autoRefreshEnabled, autorefreshInterval }: PageViewParams,
+    bucket: UptimeTelemetry
+  ) {
+    const prevDateStart = [...bucket.dateRangeStart].pop();
+    if (!prevDateStart || prevDateStart !== dateStart) {
+      bucket.dateRangeStart.push(dateStart);
+      bucket.dateRangeEnd.push(dateEnd);
+    } else {
+      const prevDateEnd = [...bucket.dateRangeEnd].pop();
+      if (!prevDateEnd || prevDateEnd !== dateEnd) {
+        bucket.dateRangeStart.push(dateStart);
+        bucket.dateRangeEnd.push(dateEnd);
+      }
+    }
+
+    const prevAutorefreshInterval = [...bucket.autorefreshInterval].pop();
+    if (!prevAutorefreshInterval || prevAutorefreshInterval !== autorefreshInterval) {
+      bucket.autorefreshInterval.push(autorefreshInterval);
+    }
+    bucket.autoRefreshEnabled = autoRefreshEnabled;
   }
 
-  public static countMonitor() {
+  public static async countNoOfUniqueMonitorAndLocations(
+    callCluster: APICaller,
+    savedObjectsClient: ISavedObjectsRepository
+  ) {
+    const dynamicSettings = await savedObjectsAdapter.getUptimeDynamicSettings(savedObjectsClient);
+    const params = {
+      index: dynamicSettings.heartbeatIndices,
+      body: {
+        query: {
+          bool: {
+            must: [
+              {
+                range: {
+                  '@timestamp': {
+                    gte: 'now-1d/d',
+                    lt: 'now',
+                  },
+                },
+              },
+            ],
+          },
+        },
+        size: 0,
+        aggs: {
+          unique_monitors: {
+            cardinality: {
+              field: 'monitor.id',
+            },
+          },
+          unique_locations: {
+            cardinality: {
+              field: 'observer.geo.name',
+              missing: 'N/A',
+            },
+          },
+          monitor_name: {
+            string_stats: {
+              field: 'monitor.name',
+            },
+          },
+          observer_loc_name: {
+            string_stats: {
+              field: 'observer.geo.name',
+            },
+          },
+          monitors: {
+            terms: {
+              field: 'monitor.id',
+              size: 1000,
+            },
+            aggs: {
+              docs: {
+                top_hits: {
+                  size: 1,
+                  _source: ['monitor.timespan'],
+                },
+              },
+            },
+          },
+        },
+      },
+    };
+
+    const result = await callCluster('search', params);
+    const numberOfUniqueMonitors: number = result?.aggregations?.unique_monitors?.value ?? 0;
+    const numberOfUniqueLocations: number = result?.aggregations?.unique_locations?.value ?? 0;
+    const monitorNameStats: any = result?.aggregations?.monitor_name;
+    const locationNameStats: any = result?.aggregations?.observer_loc_name;
+    const uniqueMonitors: any = result?.aggregations?.monitors.buckets;
     const bucket = this.getBucketToIncrement();
-    this.collector[bucket].monitor_page += 1;
+
+    this.collector[bucket].no_of_unique_monitors = numberOfUniqueMonitors;
+    this.collector[bucket].no_of_unique_observer_locations = numberOfUniqueLocations;
+    this.collector[bucket].no_of_unique_observer_locations = numberOfUniqueLocations;
+    this.collector[bucket].monitor_name_stats = {
+      min_length: monitorNameStats?.min_length ?? 0,
+      max_length: monitorNameStats?.max_length ?? 0,
+      avg_length: +monitorNameStats?.avg_length.toFixed(2),
+    };
+
+    this.collector[bucket].observer_location_name_stats = {
+      min_length: locationNameStats?.min_length ?? 0,
+      max_length: locationNameStats?.max_length ?? 0,
+      avg_length: +locationNameStats?.avg_length.toFixed(2),
+    };
+
+    this.collector[bucket].monitor_frequency = this.getMonitorsFrequency(uniqueMonitors);
+  }
+
+  private static getMonitorsFrequency(uniqueMonitors = []) {
+    const frequencies: number[] = [];
+    uniqueMonitors
+      .map((item: any) => item!.docs.hits?.hits?.[0] ?? {})
+      .forEach(monitor => {
+        const timespan = monitor?._source?.monitor?.timespan;
+        if (timespan) {
+          const timeDiffSec = moment
+            .duration(moment(timespan.lt).diff(moment(timespan.gte)))
+            .asSeconds();
+          frequencies.push(timeDiffSec);
+        }
+      });
+    return frequencies;
   }
 
   private static collector: UptimeTelemetryCollector = {};
@@ -59,10 +210,12 @@ export class KibanaTelemetryAdapter {
 
     return Object.values(this.collector).reduce(
       (acc, cum) => ({
+        ...cum,
         overview_page: acc.overview_page + cum.overview_page,
         monitor_page: acc.monitor_page + cum.monitor_page,
+        settings_page: acc.settings_page + cum.settings_page,
       }),
-      { overview_page: 0, monitor_page: 0 }
+      { overview_page: 0, monitor_page: 0, settings_page: 0 }
     );
   }
 
@@ -77,6 +230,24 @@ export class KibanaTelemetryAdapter {
       this.collector[bucketId] = {
         overview_page: 0,
         monitor_page: 0,
+        no_of_unique_monitors: 0,
+        settings_page: 0,
+        monitor_frequency: [],
+        monitor_name_stats: {
+          min_length: 0,
+          max_length: 0,
+          avg_length: 0,
+        },
+        no_of_unique_observer_locations: 0,
+        observer_location_name_stats: {
+          min_length: 0,
+          max_length: 0,
+          avg_length: 0,
+        },
+        dateRangeStart: [],
+        dateRangeEnd: [],
+        autoRefreshEnabled: false,
+        autorefreshInterval: [],
       };
     }
     return bucketId;
diff --git a/x-pack/plugins/uptime/server/lib/adapters/telemetry/types.ts b/x-pack/plugins/uptime/server/lib/adapters/telemetry/types.ts
new file mode 100644
index 0000000000000..059bea6cc3215
--- /dev/null
+++ b/x-pack/plugins/uptime/server/lib/adapters/telemetry/types.ts
@@ -0,0 +1,35 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+export interface PageViewParams {
+  page: string;
+  dateStart: string;
+  dateEnd: string;
+  autoRefreshEnabled: boolean;
+  autorefreshInterval: number;
+}
+
+export interface Stats {
+  min_length: number;
+  max_length: number;
+  avg_length: number;
+}
+
+export interface UptimeTelemetry {
+  overview_page: number;
+  monitor_page: number;
+  settings_page: number;
+  no_of_unique_monitors: number;
+  monitor_frequency: number[];
+  no_of_unique_observer_locations: number;
+  monitor_name_stats: Stats;
+  observer_location_name_stats: Stats;
+
+  dateRangeStart: string[];
+  dateRangeEnd: string[];
+  autorefreshInterval: number[];
+  autoRefreshEnabled: boolean;
+}
diff --git a/x-pack/plugins/uptime/server/lib/requests/get_filter_bar.ts b/x-pack/plugins/uptime/server/lib/requests/get_filter_bar.ts
index b533c990083ab..95d23ddcbf466 100644
--- a/x-pack/plugins/uptime/server/lib/requests/get_filter_bar.ts
+++ b/x-pack/plugins/uptime/server/lib/requests/get_filter_bar.ts
@@ -58,7 +58,7 @@ export const extractFilterAggsResults = (
     tags: [],
   };
   keys.forEach(key => {
-    const buckets = responseAggregations[key]?.term?.buckets ?? [];
+    const buckets = responseAggregations?.[key]?.term?.buckets ?? [];
     values[key] = buckets.map((item: { key: string | number }) => item.key);
   });
   return values;
diff --git a/x-pack/plugins/uptime/server/plugin.ts b/x-pack/plugins/uptime/server/plugin.ts
index 00e36be50d24e..7cc591a6b2db1 100644
--- a/x-pack/plugins/uptime/server/plugin.ts
+++ b/x-pack/plugins/uptime/server/plugin.ts
@@ -4,16 +4,31 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { PluginInitializerContext, CoreStart, CoreSetup } from '../../../../src/core/server';
+import {
+  PluginInitializerContext,
+  CoreStart,
+  CoreSetup,
+  ISavedObjectsRepository,
+} from '../../../../src/core/server';
 import { initServerWithKibana } from './kibana.index';
-import { UptimeCorePlugins } from './lib/adapters';
+import { KibanaTelemetryAdapter, UptimeCorePlugins } from './lib/adapters';
 import { umDynamicSettings } from './lib/saved_objects';
 
 export class Plugin {
+  private savedObjectsClient?: ISavedObjectsRepository;
+
   constructor(_initializerContext: PluginInitializerContext) {}
+
   public setup(core: CoreSetup, plugins: UptimeCorePlugins) {
     initServerWithKibana({ route: core.http.createRouter() }, plugins);
     core.savedObjects.registerType(umDynamicSettings);
+    KibanaTelemetryAdapter.registerUsageCollector(
+      plugins.usageCollection,
+      () => this.savedObjectsClient
+    );
+  }
+
+  public start(_core: CoreStart, _plugins: any) {
+    this.savedObjectsClient = _core.savedObjects.createInternalRepository();
   }
-  public start(_core: CoreStart, _plugins: any) {}
 }
diff --git a/x-pack/plugins/uptime/server/rest_api/index.ts b/x-pack/plugins/uptime/server/rest_api/index.ts
index 000fba69fab00..561997c3567d0 100644
--- a/x-pack/plugins/uptime/server/rest_api/index.ts
+++ b/x-pack/plugins/uptime/server/rest_api/index.ts
@@ -7,7 +7,7 @@
 import { createGetOverviewFilters } from './overview_filters';
 import { createGetPingsRoute } from './pings';
 import { createGetDynamicSettingsRoute, createPostDynamicSettingsRoute } from './dynamic_settings';
-import { createLogMonitorPageRoute, createLogOverviewPageRoute } from './telemetry';
+import { createLogPageViewRoute } from './telemetry';
 import { createGetSnapshotCount } from './snapshot';
 import { UMRestApiRouteFactory } from './types';
 import {
@@ -36,8 +36,7 @@ export const restApiRoutes: UMRestApiRouteFactory[] = [
   createGetMonitorLocationsRoute,
   createGetStatusBarRoute,
   createGetSnapshotCount,
-  createLogMonitorPageRoute,
-  createLogOverviewPageRoute,
+  createLogPageViewRoute,
   createGetPingHistogramRoute,
   createGetMonitorDurationRoute,
 ];
diff --git a/x-pack/plugins/uptime/server/rest_api/telemetry/index.ts b/x-pack/plugins/uptime/server/rest_api/telemetry/index.ts
index 29640d97213a6..f16080296dc67 100644
--- a/x-pack/plugins/uptime/server/rest_api/telemetry/index.ts
+++ b/x-pack/plugins/uptime/server/rest_api/telemetry/index.ts
@@ -4,5 +4,4 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-export { createLogMonitorPageRoute } from './log_monitor_page';
-export { createLogOverviewPageRoute } from './log_overview_page';
+export { createLogPageViewRoute } from './log_page_view';
diff --git a/x-pack/plugins/uptime/server/rest_api/telemetry/log_monitor_page.ts b/x-pack/plugins/uptime/server/rest_api/telemetry/log_monitor_page.ts
deleted file mode 100644
index 71d6b8025dff2..0000000000000
--- a/x-pack/plugins/uptime/server/rest_api/telemetry/log_monitor_page.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 { KibanaTelemetryAdapter } from '../../lib/adapters/telemetry';
-import { UMRestApiRouteFactory } from '../types';
-
-export const createLogMonitorPageRoute: UMRestApiRouteFactory = () => ({
-  method: 'POST',
-  path: '/api/uptime/logMonitor',
-  validate: false,
-  handler: async (_customParams, _context, _request, response): Promise<any> => {
-    await KibanaTelemetryAdapter.countMonitor();
-    return response.ok();
-  },
-  options: {
-    tags: ['access:uptime-read'],
-  },
-});
diff --git a/x-pack/plugins/uptime/server/rest_api/telemetry/log_overview_page.ts b/x-pack/plugins/uptime/server/rest_api/telemetry/log_overview_page.ts
deleted file mode 100644
index de1ac5f4ed735..0000000000000
--- a/x-pack/plugins/uptime/server/rest_api/telemetry/log_overview_page.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 { KibanaTelemetryAdapter } from '../../lib/adapters/telemetry';
-import { UMRestApiRouteFactory } from '../types';
-
-export const createLogOverviewPageRoute: UMRestApiRouteFactory = () => ({
-  method: 'POST',
-  path: '/api/uptime/logOverview',
-  validate: false,
-  handler: async (_customParams, _context, _request, response): Promise<any> => {
-    await KibanaTelemetryAdapter.countOverview();
-    return response.ok();
-  },
-  options: {
-    tags: ['access:uptime-read'],
-  },
-});
diff --git a/x-pack/plugins/uptime/server/rest_api/telemetry/log_page_view.ts b/x-pack/plugins/uptime/server/rest_api/telemetry/log_page_view.ts
new file mode 100644
index 0000000000000..1f6f052019870
--- /dev/null
+++ b/x-pack/plugins/uptime/server/rest_api/telemetry/log_page_view.ts
@@ -0,0 +1,33 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { schema } from '@kbn/config-schema';
+import { KibanaTelemetryAdapter } from '../../lib/adapters/telemetry';
+import { UMRestApiRouteFactory } from '../types';
+import { PageViewParams } from '../../lib/adapters/telemetry/types';
+
+export const createLogPageViewRoute: UMRestApiRouteFactory = () => ({
+  method: 'POST',
+  path: '/api/uptime/logPageView',
+  validate: {
+    body: schema.object({
+      page: schema.string(),
+      dateStart: schema.string(),
+      dateEnd: schema.string(),
+      autoRefreshEnabled: schema.boolean(),
+      autorefreshInterval: schema.number(),
+    }),
+  },
+  handler: async ({ callES, dynamicSettings }, _context, _request, response): Promise<any> => {
+    const result = KibanaTelemetryAdapter.countPageView(_request.body as PageViewParams);
+    return response.ok({
+      body: result,
+    });
+  },
+  options: {
+    tags: ['access:uptime-read'],
+  },
+});

From 846e84b6b71f544fefd2284e4097912084433e17 Mon Sep 17 00:00:00 2001
From: Jean-Louis Leysens <jloleysens@gmail.com>
Date: Wed, 25 Mar 2020 00:14:06 +0100
Subject: [PATCH 113/179] [Console] Update spec definitions for 7.7.0 (#61080)

* Update and cleanup existing OSS spec
* Including some maintenance on existing overrides
* Update x-pack spec definitions and overrides
---
 packages/kbn-spec-to-console/README.md        |  4 +-
 .../bin/spec_to_console.js                    | 27 ++++++-
 packages/kbn-spec-to-console/lib/convert.js   |  5 ++
 .../kbn-spec-to-console/lib/convert/params.js |  1 +
 .../json/generated/cat.aliases.json           |  9 ++-
 .../json/generated/cat.indices.json           |  9 ++-
 .../cluster.delete_component_template.json    | 15 ++++
 .../json/generated/cluster.health.json        |  1 +
 .../json/generated/cluster.state.json         |  1 +
 .../json/generated/count.json                 |  1 +
 .../json/generated/delete_by_query.json       |  2 +
 .../json/generated/field_caps.json            |  1 +
 .../json/generated/indices.clear_cache.json   |  1 +
 .../json/generated/indices.close.json         |  1 +
 .../json/generated/indices.create.json        |  1 +
 .../json/generated/indices.delete.json        |  1 +
 .../json/generated/indices.exists.json        |  1 +
 .../json/generated/indices.exists_alias.json  |  1 +
 .../json/generated/indices.exists_type.json   |  1 +
 .../json/generated/indices.flush.json         |  1 +
 .../json/generated/indices.forcemerge.json    |  1 +
 .../json/generated/indices.get.json           |  2 +
 .../json/generated/indices.get_alias.json     |  1 +
 .../generated/indices.get_field_mapping.json  |  2 +
 .../json/generated/indices.get_mapping.json   |  2 +
 .../json/generated/indices.get_settings.json  |  1 +
 .../json/generated/indices.get_template.json  |  1 +
 .../json/generated/indices.get_upgrade.json   |  1 +
 .../json/generated/indices.open.json          |  1 +
 .../json/generated/indices.put_mapping.json   |  2 +
 .../json/generated/indices.put_settings.json  |  1 +
 .../json/generated/indices.put_template.json  |  5 +-
 .../json/generated/indices.refresh.json       |  1 +
 .../json/generated/indices.rollover.json      |  1 +
 .../json/generated/indices.segments.json      |  1 +
 .../json/generated/indices.shard_stores.json  |  1 +
 .../json/generated/indices.stats.json         |  1 +
 .../json/generated/indices.upgrade.json       |  1 +
 .../generated/indices.validate_query.json     |  1 +
 .../json/generated/msearch_template.json      |  3 +-
 .../json/generated/rank_eval.json             |  1 +
 .../json/generated/search.json                |  1 +
 .../json/generated/search_shards.json         |  1 +
 .../json/generated/search_template.json       |  4 +-
 .../json/generated/update_by_query.json       |  1 +
 .../json/overrides/cluster.health.json        | 37 ++++++++--
 .../json/overrides/indices.get_template.json  |  8 ---
 .../spec/generated/async_search.delete.json   | 11 +++
 .../spec/generated/async_search.get.json      | 16 +++++
 .../spec/generated/async_search.submit.json   | 70 +++++++++++++++++++
 .../autoscaling.get_autoscaling_decision.json | 11 +++
 .../cat.ml_data_frame_analytics.json          | 42 +++++++++++
 .../spec/generated/cat.ml_datafeeds.json      | 29 ++++++++
 .../server/spec/generated/cat.ml_jobs.json    | 42 +++++++++++
 .../spec/generated/cat.ml_trained_models.json | 44 ++++++++++++
 .../spec/generated/ccr.forget_follower.json   |  2 +-
 .../server/spec/generated/ccr.unfollow.json   |  2 +-
 .../spec/generated/enrich.delete_policy.json  |  3 +-
 .../spec/generated/enrich.execute_policy.json |  3 +-
 .../spec/generated/enrich.get_policy.json     |  3 +-
 .../spec/generated/enrich.put_policy.json     |  3 +-
 .../server/spec/generated/enrich.stats.json   |  3 +-
 .../generated/migration.deprecations.json     |  2 +-
 .../server/spec/generated/ml.close_job.json   |  2 +-
 .../ml.delete_data_frame_analytics.json       |  2 +-
 .../spec/generated/ml.delete_datafeed.json    |  2 +-
 .../spec/generated/ml.delete_forecast.json    |  2 +-
 .../server/spec/generated/ml.delete_job.json  |  2 +-
 .../generated/ml.delete_model_snapshot.json   |  2 +-
 .../generated/ml.estimate_memory_usage.json   | 11 ---
 .../generated/ml.evaluate_data_frame.json     |  2 +-
 .../generated/ml.find_file_structure.json     |  2 +-
 .../server/spec/generated/ml.flush_job.json   |  2 +-
 .../server/spec/generated/ml.get_buckets.json |  2 +-
 .../spec/generated/ml.get_categories.json     |  2 +-
 .../ml.get_data_frame_analytics.json          |  2 +-
 .../ml.get_data_frame_analytics_stats.json    |  2 +-
 .../spec/generated/ml.get_datafeed_stats.json |  2 +-
 .../spec/generated/ml.get_datafeeds.json      |  2 +-
 .../spec/generated/ml.get_influencers.json    |  2 +-
 .../spec/generated/ml.get_job_stats.json      |  2 +-
 .../server/spec/generated/ml.get_jobs.json    |  2 +-
 .../generated/ml.get_model_snapshots.json     |  2 +-
 .../generated/ml.get_overall_buckets.json     |  2 +-
 .../server/spec/generated/ml.get_records.json |  2 +-
 .../spec/generated/ml.get_trained_models.json |  3 +-
 .../server/spec/generated/ml.open_job.json    |  2 +-
 .../server/spec/generated/ml.post_data.json   |  2 +-
 .../spec/generated/ml.preview_datafeed.json   |  2 +-
 .../ml.put_data_frame_analytics.json          |  2 +-
 .../spec/generated/ml.put_datafeed.json       | 14 +++-
 .../server/spec/generated/ml.put_job.json     |  2 +-
 .../generated/ml.revert_model_snapshot.json   |  2 +-
 .../spec/generated/ml.set_upgrade_mode.json   |  2 +-
 .../ml.start_data_frame_analytics.json        |  2 +-
 .../spec/generated/ml.start_datafeed.json     |  2 +-
 .../ml.stop_data_frame_analytics.json         |  2 +-
 .../spec/generated/ml.stop_datafeed.json      |  2 +-
 .../spec/generated/ml.update_datafeed.json    | 14 +++-
 .../server/spec/generated/ml.update_job.json  |  2 +-
 .../generated/ml.update_model_snapshot.json   |  2 +-
 .../generated/security.delete_privileges.json |  2 +-
 .../generated/security.put_privileges.json    |  4 +-
 .../spec/generated/slm.delete_lifecycle.json  |  2 +-
 .../spec/generated/slm.execute_lifecycle.json |  2 +-
 .../spec/generated/slm.get_lifecycle.json     |  2 +-
 .../server/spec/generated/slm.get_stats.json  |  2 +-
 .../server/spec/generated/slm.get_status.json |  2 +-
 .../spec/generated/slm.put_lifecycle.json     |  2 +-
 .../server/spec/generated/slm.start.json      |  2 +-
 .../server/spec/generated/slm.stop.json       |  2 +-
 .../spec/generated/sql.clear_cursor.json      |  2 +-
 .../server/spec/generated/sql.query.json      |  2 +-
 .../server/spec/generated/sql.translate.json  |  2 +-
 .../generated/transform.cat_transform.json    | 31 ++++++++
 .../spec/generated/watcher.ack_watch.json     |  2 +-
 .../spec/generated/watcher.delete_watch.json  |  2 +-
 .../spec/generated/watcher.execute_watch.json |  2 +-
 .../spec/generated/watcher.get_watch.json     |  2 +-
 .../spec/generated/watcher.put_watch.json     |  2 +-
 .../server/spec/generated/watcher.start.json  |  2 +-
 .../server/spec/generated/watcher.stats.json  |  2 +-
 .../server/spec/generated/watcher.stop.json   |  2 +-
 .../server/spec/generated/xpack.usage.json    |  2 +-
 .../spec/overrides/async_search.submit.json   |  7 ++
 .../overrides/ml.estimate_memory_usage.json   | 38 ----------
 .../overrides/security.delete_privileges.json |  5 --
 .../overrides/security.put_privileges.json    |  5 --
 128 files changed, 544 insertions(+), 151 deletions(-)
 create mode 100644 src/plugins/console/server/lib/spec_definitions/json/generated/cluster.delete_component_template.json
 delete mode 100644 src/plugins/console/server/lib/spec_definitions/json/overrides/indices.get_template.json
 create mode 100644 x-pack/plugins/console_extensions/server/spec/generated/async_search.delete.json
 create mode 100644 x-pack/plugins/console_extensions/server/spec/generated/async_search.get.json
 create mode 100644 x-pack/plugins/console_extensions/server/spec/generated/async_search.submit.json
 create mode 100644 x-pack/plugins/console_extensions/server/spec/generated/autoscaling.get_autoscaling_decision.json
 create mode 100644 x-pack/plugins/console_extensions/server/spec/generated/cat.ml_data_frame_analytics.json
 create mode 100644 x-pack/plugins/console_extensions/server/spec/generated/cat.ml_datafeeds.json
 create mode 100644 x-pack/plugins/console_extensions/server/spec/generated/cat.ml_jobs.json
 create mode 100644 x-pack/plugins/console_extensions/server/spec/generated/cat.ml_trained_models.json
 delete mode 100644 x-pack/plugins/console_extensions/server/spec/generated/ml.estimate_memory_usage.json
 create mode 100644 x-pack/plugins/console_extensions/server/spec/generated/transform.cat_transform.json
 create mode 100644 x-pack/plugins/console_extensions/server/spec/overrides/async_search.submit.json
 delete mode 100644 x-pack/plugins/console_extensions/server/spec/overrides/ml.estimate_memory_usage.json
 delete mode 100644 x-pack/plugins/console_extensions/server/spec/overrides/security.delete_privileges.json
 delete mode 100644 x-pack/plugins/console_extensions/server/spec/overrides/security.put_privileges.json

diff --git a/packages/kbn-spec-to-console/README.md b/packages/kbn-spec-to-console/README.md
index 6729f03b3d4db..bf60afd88f494 100644
--- a/packages/kbn-spec-to-console/README.md
+++ b/packages/kbn-spec-to-console/README.md
@@ -23,10 +23,10 @@ At the root of the Kibana repository, run the following commands:
 
 ```sh
 # OSS
-yarn spec_to_console -g "<ELASTICSEARCH-REPO-FOLDER>/rest-api-spec/src/main/resources/rest-api-spec/api/*" -d "src/legacy/core_plugins/console/server/api_server/spec/generated"
+yarn spec_to_console -g "<ELASTICSEARCH-REPO-FOLDER>/rest-api-spec/src/main/resources/rest-api-spec/api/*" -d "src/plugins/console/server/lib/spec_definitions/json"
 
 # X-pack
-yarn spec_to_console -g "<ELASTICSEARCH-REPO-FOLDER>/x-pack/plugin/src/test/resources/rest-api-spec/api/*" -d "x-pack/legacy/plugins/console_extensions/spec/generated"
+yarn spec_to_console -g "<ELASTICSEARCH-REPO-FOLDER>/x-pack/plugin/src/test/resources/rest-api-spec/api/*" -d "x-pack/plugins/console_extensions/server/spec/generated"
 ```
 
 ### Information used in Console that is not available in the REST spec
diff --git a/packages/kbn-spec-to-console/bin/spec_to_console.js b/packages/kbn-spec-to-console/bin/spec_to_console.js
index 20e870963e4b4..20b42c67f3b89 100644
--- a/packages/kbn-spec-to-console/bin/spec_to_console.js
+++ b/packages/kbn-spec-to-console/bin/spec_to_console.js
@@ -21,6 +21,7 @@ const fs = require('fs');
 const path = require('path');
 const program = require('commander');
 const glob = require('glob');
+const chalk = require('chalk');
 
 const packageJSON = require('../package.json');
 const convert = require('../lib/convert');
@@ -37,10 +38,26 @@ if (!program.glob) {
 }
 
 const files = glob.sync(program.glob);
-console.log(files.length, files);
+const totalFilesCount = files.length;
+let convertedFilesCount = 0;
+
+console.log(chalk.bold(`Detected files (count: ${totalFilesCount}):`));
+console.log();
+console.log(files);
+console.log();
+
 files.forEach(file => {
   const spec = JSON.parse(fs.readFileSync(file));
-  const output = JSON.stringify(convert(spec), null, 2);
+  const convertedSpec = convert(spec);
+  if (!Object.keys(convertedSpec).length) {
+    console.log(
+      // prettier-ignore
+      `${chalk.yellow('Detected')} ${chalk.grey(file)} but no endpoints were converted; ${chalk.yellow('skipping')}...`
+    );
+    return;
+  }
+  const output = JSON.stringify(convertedSpec, null, 2);
+  ++convertedFilesCount;
   if (program.directory) {
     const outputName = path.basename(file);
     const outputPath = path.resolve(program.directory, outputName);
@@ -54,3 +71,9 @@ files.forEach(file => {
     console.log(output);
   }
 });
+
+console.log();
+// prettier-ignore
+console.log(`${chalk.grey('Converted')} ${chalk.bold(`${convertedFilesCount}/${totalFilesCount}`)} ${chalk.grey('files')}`);
+console.log(`Check your ${chalk.bold('git status')}.`);
+console.log();
diff --git a/packages/kbn-spec-to-console/lib/convert.js b/packages/kbn-spec-to-console/lib/convert.js
index 5dbdd6e1c94e4..88e3693d702e5 100644
--- a/packages/kbn-spec-to-console/lib/convert.js
+++ b/packages/kbn-spec-to-console/lib/convert.js
@@ -36,6 +36,11 @@ module.exports = spec => {
    */
   Object.keys(spec).forEach(api => {
     const source = spec[api];
+
+    if (source.url.paths.every(path => Boolean(path.deprecated))) {
+      return;
+    }
+
     if (!source.url) {
       return result;
     }
diff --git a/packages/kbn-spec-to-console/lib/convert/params.js b/packages/kbn-spec-to-console/lib/convert/params.js
index 86ac1667282f0..0d1747ae4f685 100644
--- a/packages/kbn-spec-to-console/lib/convert/params.js
+++ b/packages/kbn-spec-to-console/lib/convert/params.js
@@ -47,6 +47,7 @@ module.exports = params => {
       case 'date':
       case 'string':
       case 'number':
+      case 'number|string':
         result[param] = defaultValue || '';
         break;
       case 'list':
diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/cat.aliases.json b/src/plugins/console/server/lib/spec_definitions/json/generated/cat.aliases.json
index 2135bd67e57d8..40b0e56782641 100644
--- a/src/plugins/console/server/lib/spec_definitions/json/generated/cat.aliases.json
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/cat.aliases.json
@@ -6,7 +6,14 @@
       "h": [],
       "help": "__flag__",
       "s": [],
-      "v": "__flag__"
+      "v": "__flag__",
+      "expand_wildcards": [
+        "open",
+        "closed",
+        "hidden",
+        "none",
+        "all"
+      ]
     },
     "methods": [
       "GET"
diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/cat.indices.json b/src/plugins/console/server/lib/spec_definitions/json/generated/cat.indices.json
index e6ca1fb575396..410350df13721 100644
--- a/src/plugins/console/server/lib/spec_definitions/json/generated/cat.indices.json
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/cat.indices.json
@@ -36,7 +36,14 @@
         "nanos"
       ],
       "v": "__flag__",
-      "include_unloaded_segments": "__flag__"
+      "include_unloaded_segments": "__flag__",
+      "expand_wildcards": [
+        "open",
+        "closed",
+        "hidden",
+        "none",
+        "all"
+      ]
     },
     "methods": [
       "GET"
diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/cluster.delete_component_template.json b/src/plugins/console/server/lib/spec_definitions/json/generated/cluster.delete_component_template.json
new file mode 100644
index 0000000000000..e935b8999e6d3
--- /dev/null
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/cluster.delete_component_template.json
@@ -0,0 +1,15 @@
+{
+  "cluster.delete_component_template": {
+    "url_params": {
+      "timeout": "",
+      "master_timeout": ""
+    },
+    "methods": [
+      "DELETE"
+    ],
+    "patterns": [
+      "_component_template/{name}"
+    ],
+    "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/master/indices-component-templates.html"
+  }
+}
diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/cluster.health.json b/src/plugins/console/server/lib/spec_definitions/json/generated/cluster.health.json
index 64ede603c0e0d..1758ea44d92c0 100644
--- a/src/plugins/console/server/lib/spec_definitions/json/generated/cluster.health.json
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/cluster.health.json
@@ -4,6 +4,7 @@
       "expand_wildcards": [
         "open",
         "closed",
+        "hidden",
         "none",
         "all"
       ],
diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/cluster.state.json b/src/plugins/console/server/lib/spec_definitions/json/generated/cluster.state.json
index ba9c8d427e7bd..fb4a02c603174 100644
--- a/src/plugins/console/server/lib/spec_definitions/json/generated/cluster.state.json
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/cluster.state.json
@@ -11,6 +11,7 @@
       "expand_wildcards": [
         "open",
         "closed",
+        "hidden",
         "none",
         "all"
       ]
diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/count.json b/src/plugins/console/server/lib/spec_definitions/json/generated/count.json
index bd69fd0c77ec8..67386eb7c6f1b 100644
--- a/src/plugins/console/server/lib/spec_definitions/json/generated/count.json
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/count.json
@@ -7,6 +7,7 @@
       "expand_wildcards": [
         "open",
         "closed",
+        "hidden",
         "none",
         "all"
       ],
diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/delete_by_query.json b/src/plugins/console/server/lib/spec_definitions/json/generated/delete_by_query.json
index 2d1636d5f2c02..e01ea8b2dec6d 100644
--- a/src/plugins/console/server/lib/spec_definitions/json/generated/delete_by_query.json
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/delete_by_query.json
@@ -1,6 +1,7 @@
 {
   "delete_by_query": {
     "url_params": {
+      "analyzer": "",
       "analyze_wildcard": "__flag__",
       "default_operator": [
         "AND",
@@ -17,6 +18,7 @@
       "expand_wildcards": [
         "open",
         "closed",
+        "hidden",
         "none",
         "all"
       ],
diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/field_caps.json b/src/plugins/console/server/lib/spec_definitions/json/generated/field_caps.json
index 5e632018bef25..4bf63d7566788 100644
--- a/src/plugins/console/server/lib/spec_definitions/json/generated/field_caps.json
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/field_caps.json
@@ -7,6 +7,7 @@
       "expand_wildcards": [
         "open",
         "closed",
+        "hidden",
         "none",
         "all"
       ],
diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.clear_cache.json b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.clear_cache.json
index f5cf05c9a3f7f..fc84d07df88a4 100644
--- a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.clear_cache.json
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.clear_cache.json
@@ -9,6 +9,7 @@
       "expand_wildcards": [
         "open",
         "closed",
+        "hidden",
         "none",
         "all"
       ],
diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.close.json b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.close.json
index 676f20632e63b..1b58a27829bc7 100644
--- a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.close.json
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.close.json
@@ -8,6 +8,7 @@
       "expand_wildcards": [
         "open",
         "closed",
+        "hidden",
         "none",
         "all"
       ],
diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.create.json b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.create.json
index 8227e38d3c6d9..1970f88b30958 100644
--- a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.create.json
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.create.json
@@ -1,6 +1,7 @@
 {
   "indices.create": {
     "url_params": {
+      "include_type_name": "__flag__",
       "wait_for_active_shards": "",
       "timeout": "",
       "master_timeout": ""
diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.delete.json b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.delete.json
index b006d5ea7a3cb..084828108123b 100644
--- a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.delete.json
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.delete.json
@@ -8,6 +8,7 @@
       "expand_wildcards": [
         "open",
         "closed",
+        "hidden",
         "none",
         "all"
       ]
diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.exists.json b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.exists.json
index 33c845210ea87..09f6c7fd780f8 100644
--- a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.exists.json
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.exists.json
@@ -7,6 +7,7 @@
       "expand_wildcards": [
         "open",
         "closed",
+        "hidden",
         "none",
         "all"
       ],
diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.exists_alias.json b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.exists_alias.json
index d302bbe6b93de..4b93184ed52f1 100644
--- a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.exists_alias.json
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.exists_alias.json
@@ -6,6 +6,7 @@
       "expand_wildcards": [
         "open",
         "closed",
+        "hidden",
         "none",
         "all"
       ],
diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.exists_type.json b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.exists_type.json
index 70d35e6c453c9..0b11356155b50 100644
--- a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.exists_type.json
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.exists_type.json
@@ -6,6 +6,7 @@
       "expand_wildcards": [
         "open",
         "closed",
+        "hidden",
         "none",
         "all"
       ],
diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.flush.json b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.flush.json
index 0ad1a250229b2..63c86d10a9864 100644
--- a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.flush.json
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.flush.json
@@ -8,6 +8,7 @@
       "expand_wildcards": [
         "open",
         "closed",
+        "hidden",
         "none",
         "all"
       ]
diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.forcemerge.json b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.forcemerge.json
index 0e705e2e721ee..b642d5f04a044 100644
--- a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.forcemerge.json
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.forcemerge.json
@@ -7,6 +7,7 @@
       "expand_wildcards": [
         "open",
         "closed",
+        "hidden",
         "none",
         "all"
       ],
diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.get.json b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.get.json
index 7ca9e88274aa5..6df796ed6c4cf 100644
--- a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.get.json
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.get.json
@@ -1,12 +1,14 @@
 {
   "indices.get": {
     "url_params": {
+      "include_type_name": "__flag__",
       "local": "__flag__",
       "ignore_unavailable": "__flag__",
       "allow_no_indices": "__flag__",
       "expand_wildcards": [
         "open",
         "closed",
+        "hidden",
         "none",
         "all"
       ],
diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.get_alias.json b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.get_alias.json
index d687cab56630f..95bc74edc5865 100644
--- a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.get_alias.json
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.get_alias.json
@@ -6,6 +6,7 @@
       "expand_wildcards": [
         "open",
         "closed",
+        "hidden",
         "none",
         "all"
       ],
diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.get_field_mapping.json b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.get_field_mapping.json
index ea952435566ed..c95e2efc73fab 100644
--- a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.get_field_mapping.json
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.get_field_mapping.json
@@ -1,12 +1,14 @@
 {
   "indices.get_field_mapping": {
     "url_params": {
+      "include_type_name": "__flag__",
       "include_defaults": "__flag__",
       "ignore_unavailable": "__flag__",
       "allow_no_indices": "__flag__",
       "expand_wildcards": [
         "open",
         "closed",
+        "hidden",
         "none",
         "all"
       ],
diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.get_mapping.json b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.get_mapping.json
index 73f4e42262bf2..555137d0e2ee0 100644
--- a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.get_mapping.json
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.get_mapping.json
@@ -1,11 +1,13 @@
 {
   "indices.get_mapping": {
     "url_params": {
+      "include_type_name": "__flag__",
       "ignore_unavailable": "__flag__",
       "allow_no_indices": "__flag__",
       "expand_wildcards": [
         "open",
         "closed",
+        "hidden",
         "none",
         "all"
       ],
diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.get_settings.json b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.get_settings.json
index 1c84258d0fce9..a6777f7a820aa 100644
--- a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.get_settings.json
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.get_settings.json
@@ -7,6 +7,7 @@
       "expand_wildcards": [
         "open",
         "closed",
+        "hidden",
         "none",
         "all"
       ],
diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.get_template.json b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.get_template.json
index f5902929c25cc..d5f52ec76b374 100644
--- a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.get_template.json
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.get_template.json
@@ -1,6 +1,7 @@
 {
   "indices.get_template": {
     "url_params": {
+      "include_type_name": "__flag__",
       "flat_settings": "__flag__",
       "master_timeout": "",
       "local": "__flag__"
diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.get_upgrade.json b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.get_upgrade.json
index d781172c54d63..99ac958523084 100644
--- a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.get_upgrade.json
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.get_upgrade.json
@@ -6,6 +6,7 @@
       "expand_wildcards": [
         "open",
         "closed",
+        "hidden",
         "none",
         "all"
       ]
diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.open.json b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.open.json
index b5c4c5501d05d..6369238739203 100644
--- a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.open.json
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.open.json
@@ -8,6 +8,7 @@
       "expand_wildcards": [
         "open",
         "closed",
+        "hidden",
         "none",
         "all"
       ],
diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.put_mapping.json b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.put_mapping.json
index 07a62a64b64e1..e36783c815e3f 100644
--- a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.put_mapping.json
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.put_mapping.json
@@ -1,6 +1,7 @@
 {
   "indices.put_mapping": {
     "url_params": {
+      "include_type_name": "__flag__",
       "timeout": "",
       "master_timeout": "",
       "ignore_unavailable": "__flag__",
@@ -8,6 +9,7 @@
       "expand_wildcards": [
         "open",
         "closed",
+        "hidden",
         "none",
         "all"
       ]
diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.put_settings.json b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.put_settings.json
index fe7b938d2f3fc..a2508cd0fc817 100644
--- a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.put_settings.json
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.put_settings.json
@@ -9,6 +9,7 @@
       "expand_wildcards": [
         "open",
         "closed",
+        "hidden",
         "none",
         "all"
       ],
diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.put_template.json b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.put_template.json
index 54a7625a2713c..e6317bd6eb537 100644
--- a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.put_template.json
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.put_template.json
@@ -1,11 +1,10 @@
 {
   "indices.put_template": {
     "url_params": {
+      "include_type_name": "__flag__",
       "order": "",
       "create": "__flag__",
-      "timeout": "",
-      "master_timeout": "",
-      "flat_settings": "__flag__"
+      "master_timeout": ""
     },
     "methods": [
       "PUT",
diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.refresh.json b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.refresh.json
index 54cd2a869902a..2906349d3fdae 100644
--- a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.refresh.json
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.refresh.json
@@ -6,6 +6,7 @@
       "expand_wildcards": [
         "open",
         "closed",
+        "hidden",
         "none",
         "all"
       ]
diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.rollover.json b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.rollover.json
index 19e0f1f909ab8..7fa76a687eb77 100644
--- a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.rollover.json
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.rollover.json
@@ -1,6 +1,7 @@
 {
   "indices.rollover": {
     "url_params": {
+      "include_type_name": "__flag__",
       "timeout": "",
       "dry_run": "__flag__",
       "master_timeout": "",
diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.segments.json b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.segments.json
index 9e2eb6efce27e..b3c07150699af 100644
--- a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.segments.json
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.segments.json
@@ -6,6 +6,7 @@
       "expand_wildcards": [
         "open",
         "closed",
+        "hidden",
         "none",
         "all"
       ],
diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.shard_stores.json b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.shard_stores.json
index f8e026eb89984..c50f4cf501698 100644
--- a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.shard_stores.json
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.shard_stores.json
@@ -7,6 +7,7 @@
       "expand_wildcards": [
         "open",
         "closed",
+        "hidden",
         "none",
         "all"
       ]
diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.stats.json b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.stats.json
index c3fc0f8f7055f..1fa32265c91ee 100644
--- a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.stats.json
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.stats.json
@@ -16,6 +16,7 @@
       "expand_wildcards": [
         "open",
         "closed",
+        "hidden",
         "none",
         "all"
       ],
diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.upgrade.json b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.upgrade.json
index 68ee06dd1b0bd..484115bb9b260 100644
--- a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.upgrade.json
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.upgrade.json
@@ -5,6 +5,7 @@
       "expand_wildcards": [
         "open",
         "closed",
+        "hidden",
         "none",
         "all"
       ],
diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.validate_query.json b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.validate_query.json
index 33720576ef8a3..315aa13d4b4e8 100644
--- a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.validate_query.json
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.validate_query.json
@@ -7,6 +7,7 @@
       "expand_wildcards": [
         "open",
         "closed",
+        "hidden",
         "none",
         "all"
       ],
diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/msearch_template.json b/src/plugins/console/server/lib/spec_definitions/json/generated/msearch_template.json
index c2f741066bbdb..0b0ca087b1819 100644
--- a/src/plugins/console/server/lib/spec_definitions/json/generated/msearch_template.json
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/msearch_template.json
@@ -9,7 +9,8 @@
       ],
       "typed_keys": "__flag__",
       "max_concurrent_searches": "",
-      "rest_total_hits_as_int": "__flag__"
+      "rest_total_hits_as_int": "__flag__",
+      "ccs_minimize_roundtrips": "__flag__"
     },
     "methods": [
       "GET",
diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/rank_eval.json b/src/plugins/console/server/lib/spec_definitions/json/generated/rank_eval.json
index c2bed081124a8..4d73e58bd4c06 100644
--- a/src/plugins/console/server/lib/spec_definitions/json/generated/rank_eval.json
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/rank_eval.json
@@ -6,6 +6,7 @@
       "expand_wildcards": [
         "open",
         "closed",
+        "hidden",
         "none",
         "all"
       ],
diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/search.json b/src/plugins/console/server/lib/spec_definitions/json/generated/search.json
index eb21b43644d77..78b969d3ed8f2 100644
--- a/src/plugins/console/server/lib/spec_definitions/json/generated/search.json
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/search.json
@@ -19,6 +19,7 @@
       "expand_wildcards": [
         "open",
         "closed",
+        "hidden",
         "none",
         "all"
       ],
diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/search_shards.json b/src/plugins/console/server/lib/spec_definitions/json/generated/search_shards.json
index cbeb0a429352d..b0819f8e066c8 100644
--- a/src/plugins/console/server/lib/spec_definitions/json/generated/search_shards.json
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/search_shards.json
@@ -9,6 +9,7 @@
       "expand_wildcards": [
         "open",
         "closed",
+        "hidden",
         "none",
         "all"
       ]
diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/search_template.json b/src/plugins/console/server/lib/spec_definitions/json/generated/search_template.json
index cf5a5c5f32db3..748326522e5c2 100644
--- a/src/plugins/console/server/lib/spec_definitions/json/generated/search_template.json
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/search_template.json
@@ -7,6 +7,7 @@
       "expand_wildcards": [
         "open",
         "closed",
+        "hidden",
         "none",
         "all"
       ],
@@ -22,7 +23,8 @@
       "explain": "__flag__",
       "profile": "__flag__",
       "typed_keys": "__flag__",
-      "rest_total_hits_as_int": "__flag__"
+      "rest_total_hits_as_int": "__flag__",
+      "ccs_minimize_roundtrips": "__flag__"
     },
     "methods": [
       "GET",
diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/update_by_query.json b/src/plugins/console/server/lib/spec_definitions/json/generated/update_by_query.json
index 393197949e86c..596f8f8b83963 100644
--- a/src/plugins/console/server/lib/spec_definitions/json/generated/update_by_query.json
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/update_by_query.json
@@ -18,6 +18,7 @@
       "expand_wildcards": [
         "open",
         "closed",
+        "hidden",
         "none",
         "all"
       ],
diff --git a/src/plugins/console/server/lib/spec_definitions/json/overrides/cluster.health.json b/src/plugins/console/server/lib/spec_definitions/json/overrides/cluster.health.json
index 7e1655e680b8f..949b897b29ff4 100644
--- a/src/plugins/console/server/lib/spec_definitions/json/overrides/cluster.health.json
+++ b/src/plugins/console/server/lib/spec_definitions/json/overrides/cluster.health.json
@@ -1,11 +1,38 @@
 {
   "cluster.health": {
     "url_params": {
-      "master_timeout": "30s",
-      "timeout": "30s",
-      "wait_for_relocating_shards": 0,
-      "wait_for_active_shards": 0,
-      "wait_for_nodes": 0
+      "expand_wildcards": [
+        "open",
+        "closed",
+        "hidden",
+        "none",
+        "all"
+      ],
+      "level": [
+        "cluster",
+        "indices",
+        "shards"
+      ],
+      "local": "__flag__",
+      "master_timeout": "",
+      "timeout": "",
+      "wait_for_active_shards": "",
+      "wait_for_nodes": "",
+      "wait_for_events": [
+        "immediate",
+        "urgent",
+        "high",
+        "normal",
+        "low",
+        "languid"
+      ],
+      "wait_for_no_relocating_shards": "__flag__",
+      "wait_for_no_initializing_shards": "__flag__",
+      "wait_for_status": [
+        "green",
+        "yellow",
+        "red"
+      ]
     }
   }
 }
diff --git a/src/plugins/console/server/lib/spec_definitions/json/overrides/indices.get_template.json b/src/plugins/console/server/lib/spec_definitions/json/overrides/indices.get_template.json
deleted file mode 100644
index e0cbcc9cee2ec..0000000000000
--- a/src/plugins/console/server/lib/spec_definitions/json/overrides/indices.get_template.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "indices.get_template": {
-    "patterns": [
-      "_template",
-      "_template/{template}"
-    ]
-  }
-}
diff --git a/x-pack/plugins/console_extensions/server/spec/generated/async_search.delete.json b/x-pack/plugins/console_extensions/server/spec/generated/async_search.delete.json
new file mode 100644
index 0000000000000..a0be8f05e7722
--- /dev/null
+++ b/x-pack/plugins/console_extensions/server/spec/generated/async_search.delete.json
@@ -0,0 +1,11 @@
+{
+  "async_search.delete": {
+    "methods": [
+      "DELETE"
+    ],
+    "patterns": [
+      "_async_search/{id}"
+    ],
+    "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/async-search.html"
+  }
+}
diff --git a/x-pack/plugins/console_extensions/server/spec/generated/async_search.get.json b/x-pack/plugins/console_extensions/server/spec/generated/async_search.get.json
new file mode 100644
index 0000000000000..09f4520d580e3
--- /dev/null
+++ b/x-pack/plugins/console_extensions/server/spec/generated/async_search.get.json
@@ -0,0 +1,16 @@
+{
+  "async_search.get": {
+    "url_params": {
+      "wait_for_completion": "",
+      "keep_alive": "",
+      "typed_keys": "__flag__"
+    },
+    "methods": [
+      "GET"
+    ],
+    "patterns": [
+      "_async_search/{id}"
+    ],
+    "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/async-search.html"
+  }
+}
diff --git a/x-pack/plugins/console_extensions/server/spec/generated/async_search.submit.json b/x-pack/plugins/console_extensions/server/spec/generated/async_search.submit.json
new file mode 100644
index 0000000000000..83fb7c0fe75ad
--- /dev/null
+++ b/x-pack/plugins/console_extensions/server/spec/generated/async_search.submit.json
@@ -0,0 +1,70 @@
+{
+  "async_search.submit": {
+    "url_params": {
+      "wait_for_completion": "",
+      "clean_on_completion": "__flag__",
+      "keep_alive": "",
+      "batched_reduce_size": "",
+      "request_cache": "__flag__",
+      "analyzer": "",
+      "analyze_wildcard": "__flag__",
+      "default_operator": [
+        "AND",
+        "OR"
+      ],
+      "df": "",
+      "explain": "__flag__",
+      "stored_fields": [],
+      "docvalue_fields": [],
+      "from": "0",
+      "ignore_unavailable": "__flag__",
+      "ignore_throttled": "__flag__",
+      "allow_no_indices": "__flag__",
+      "expand_wildcards": [
+        "open",
+        "closed",
+        "none",
+        "all"
+      ],
+      "lenient": "__flag__",
+      "preference": "random",
+      "q": "",
+      "routing": [],
+      "search_type": [
+        "query_then_fetch",
+        "dfs_query_then_fetch"
+      ],
+      "size": "10",
+      "sort": [],
+      "_source": [],
+      "_source_excludes": [],
+      "_source_includes": [],
+      "terminate_after": "",
+      "stats": [],
+      "suggest_field": "",
+      "suggest_mode": [
+        "missing",
+        "popular",
+        "always"
+      ],
+      "suggest_size": "",
+      "suggest_text": "",
+      "timeout": "",
+      "track_scores": "__flag__",
+      "track_total_hits": "__flag__",
+      "allow_partial_search_results": "__flag__",
+      "typed_keys": "__flag__",
+      "version": "__flag__",
+      "seq_no_primary_term": "__flag__",
+      "max_concurrent_shard_requests": ""
+    },
+    "methods": [
+      "POST"
+    ],
+    "patterns": [
+      "_async_search",
+      "{indices}/_async_search"
+    ],
+    "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/async-search.html"
+  }
+}
diff --git a/x-pack/plugins/console_extensions/server/spec/generated/autoscaling.get_autoscaling_decision.json b/x-pack/plugins/console_extensions/server/spec/generated/autoscaling.get_autoscaling_decision.json
new file mode 100644
index 0000000000000..241075f4ca538
--- /dev/null
+++ b/x-pack/plugins/console_extensions/server/spec/generated/autoscaling.get_autoscaling_decision.json
@@ -0,0 +1,11 @@
+{
+  "autoscaling.get_autoscaling_decision": {
+    "methods": [
+      "GET"
+    ],
+    "patterns": [
+      "_autoscaling/decision"
+    ],
+    "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/autoscaling-get-autoscaling-decision.html"
+  }
+}
diff --git a/x-pack/plugins/console_extensions/server/spec/generated/cat.ml_data_frame_analytics.json b/x-pack/plugins/console_extensions/server/spec/generated/cat.ml_data_frame_analytics.json
new file mode 100644
index 0000000000000..e2ddaefd87dea
--- /dev/null
+++ b/x-pack/plugins/console_extensions/server/spec/generated/cat.ml_data_frame_analytics.json
@@ -0,0 +1,42 @@
+{
+  "cat.ml_data_frame_analytics": {
+    "url_params": {
+      "allow_no_match": "__flag__",
+      "bytes": [
+        "b",
+        "k",
+        "kb",
+        "m",
+        "mb",
+        "g",
+        "gb",
+        "t",
+        "tb",
+        "p",
+        "pb"
+      ],
+      "format": "",
+      "h": [],
+      "help": "__flag__",
+      "s": [],
+      "time": [
+        "d",
+        "h",
+        "m",
+        "s",
+        "ms",
+        "micros",
+        "nanos"
+      ],
+      "v": "__flag__"
+    },
+    "methods": [
+      "GET"
+    ],
+    "patterns": [
+      "_cat/ml/data_frame/analytics",
+      "_cat/ml/data_frame/analytics/{id}"
+    ],
+    "documentation": "http://www.elastic.co/guide/en/elasticsearch/reference/current/cat-dfanalytics.html"
+  }
+}
diff --git a/x-pack/plugins/console_extensions/server/spec/generated/cat.ml_datafeeds.json b/x-pack/plugins/console_extensions/server/spec/generated/cat.ml_datafeeds.json
new file mode 100644
index 0000000000000..04f4e45782e1f
--- /dev/null
+++ b/x-pack/plugins/console_extensions/server/spec/generated/cat.ml_datafeeds.json
@@ -0,0 +1,29 @@
+{
+  "cat.ml_datafeeds": {
+    "url_params": {
+      "allow_no_datafeeds": "__flag__",
+      "format": "",
+      "h": [],
+      "help": "__flag__",
+      "s": [],
+      "time": [
+        "d",
+        "h",
+        "m",
+        "s",
+        "ms",
+        "micros",
+        "nanos"
+      ],
+      "v": "__flag__"
+    },
+    "methods": [
+      "GET"
+    ],
+    "patterns": [
+      "_cat/ml/datafeeds",
+      "_cat/ml/datafeeds/{datafeed_id}"
+    ],
+    "documentation": "http://www.elastic.co/guide/en/elasticsearch/reference/current/cat-datafeeds.html"
+  }
+}
diff --git a/x-pack/plugins/console_extensions/server/spec/generated/cat.ml_jobs.json b/x-pack/plugins/console_extensions/server/spec/generated/cat.ml_jobs.json
new file mode 100644
index 0000000000000..2f7e03e564b5d
--- /dev/null
+++ b/x-pack/plugins/console_extensions/server/spec/generated/cat.ml_jobs.json
@@ -0,0 +1,42 @@
+{
+  "cat.ml_jobs": {
+    "url_params": {
+      "allow_no_jobs": "__flag__",
+      "bytes": [
+        "b",
+        "k",
+        "kb",
+        "m",
+        "mb",
+        "g",
+        "gb",
+        "t",
+        "tb",
+        "p",
+        "pb"
+      ],
+      "format": "",
+      "h": [],
+      "help": "__flag__",
+      "s": [],
+      "time": [
+        "d",
+        "h",
+        "m",
+        "s",
+        "ms",
+        "micros",
+        "nanos"
+      ],
+      "v": "__flag__"
+    },
+    "methods": [
+      "GET"
+    ],
+    "patterns": [
+      "_cat/ml/anomaly_detectors",
+      "_cat/ml/anomaly_detectors/{job_id}"
+    ],
+    "documentation": "http://www.elastic.co/guide/en/elasticsearch/reference/current/cat-anomaly-detectors.html"
+  }
+}
diff --git a/x-pack/plugins/console_extensions/server/spec/generated/cat.ml_trained_models.json b/x-pack/plugins/console_extensions/server/spec/generated/cat.ml_trained_models.json
new file mode 100644
index 0000000000000..9ff12e8bf6c57
--- /dev/null
+++ b/x-pack/plugins/console_extensions/server/spec/generated/cat.ml_trained_models.json
@@ -0,0 +1,44 @@
+{
+  "cat.ml_trained_models": {
+    "url_params": {
+      "allow_no_match": "__flag__",
+      "from": 0,
+      "size": 0,
+      "bytes": [
+        "b",
+        "k",
+        "kb",
+        "m",
+        "mb",
+        "g",
+        "gb",
+        "t",
+        "tb",
+        "p",
+        "pb"
+      ],
+      "format": "",
+      "h": [],
+      "help": "__flag__",
+      "s": [],
+      "time": [
+        "d",
+        "h",
+        "m",
+        "s",
+        "ms",
+        "micros",
+        "nanos"
+      ],
+      "v": "__flag__"
+    },
+    "methods": [
+      "GET"
+    ],
+    "patterns": [
+      "_cat/ml/trained_models",
+      "_cat/ml/trained_models/{model_id}"
+    ],
+    "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/cat-trained-model.html"
+  }
+}
diff --git a/x-pack/plugins/console_extensions/server/spec/generated/ccr.forget_follower.json b/x-pack/plugins/console_extensions/server/spec/generated/ccr.forget_follower.json
index aa9a42c54dff4..f2aabe9ef4257 100644
--- a/x-pack/plugins/console_extensions/server/spec/generated/ccr.forget_follower.json
+++ b/x-pack/plugins/console_extensions/server/spec/generated/ccr.forget_follower.json
@@ -6,6 +6,6 @@
     "patterns": [
       "{indices}/_ccr/forget_follower"
     ],
-    "documentation": "http://www.elastic.co/guide/en/elasticsearch/reference/current"
+    "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/ccr-post-forget-follower.html"
   }
 }
diff --git a/x-pack/plugins/console_extensions/server/spec/generated/ccr.unfollow.json b/x-pack/plugins/console_extensions/server/spec/generated/ccr.unfollow.json
index 92759d8222c63..37530bf373c42 100644
--- a/x-pack/plugins/console_extensions/server/spec/generated/ccr.unfollow.json
+++ b/x-pack/plugins/console_extensions/server/spec/generated/ccr.unfollow.json
@@ -6,6 +6,6 @@
     "patterns": [
       "{indices}/_ccr/unfollow"
     ],
-    "documentation": "http://www.elastic.co/guide/en/elasticsearch/reference/current"
+    "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/ccr-post-unfollow.html"
   }
 }
diff --git a/x-pack/plugins/console_extensions/server/spec/generated/enrich.delete_policy.json b/x-pack/plugins/console_extensions/server/spec/generated/enrich.delete_policy.json
index 3d3c40fa093a4..d7615779bc566 100644
--- a/x-pack/plugins/console_extensions/server/spec/generated/enrich.delete_policy.json
+++ b/x-pack/plugins/console_extensions/server/spec/generated/enrich.delete_policy.json
@@ -5,6 +5,7 @@
     ],
     "patterns": [
       "_enrich/policy/{name}"
-    ]
+    ],
+    "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/delete-enrich-policy-api.html"
   }
 }
diff --git a/x-pack/plugins/console_extensions/server/spec/generated/enrich.execute_policy.json b/x-pack/plugins/console_extensions/server/spec/generated/enrich.execute_policy.json
index 542b709c08ec6..a7d6d99753c2e 100644
--- a/x-pack/plugins/console_extensions/server/spec/generated/enrich.execute_policy.json
+++ b/x-pack/plugins/console_extensions/server/spec/generated/enrich.execute_policy.json
@@ -8,6 +8,7 @@
     ],
     "patterns": [
       "_enrich/policy/{name}/_execute"
-    ]
+    ],
+    "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/execute-enrich-policy-api.html"
   }
 }
diff --git a/x-pack/plugins/console_extensions/server/spec/generated/enrich.get_policy.json b/x-pack/plugins/console_extensions/server/spec/generated/enrich.get_policy.json
index b59bf72670b6d..9b91d899d099f 100644
--- a/x-pack/plugins/console_extensions/server/spec/generated/enrich.get_policy.json
+++ b/x-pack/plugins/console_extensions/server/spec/generated/enrich.get_policy.json
@@ -6,6 +6,7 @@
     "patterns": [
       "_enrich/policy/{name}",
       "_enrich/policy"
-    ]
+    ],
+    "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/get-enrich-policy-api.html"
   }
 }
diff --git a/x-pack/plugins/console_extensions/server/spec/generated/enrich.put_policy.json b/x-pack/plugins/console_extensions/server/spec/generated/enrich.put_policy.json
index 96d854f04dcfc..5ff0ab55aef80 100644
--- a/x-pack/plugins/console_extensions/server/spec/generated/enrich.put_policy.json
+++ b/x-pack/plugins/console_extensions/server/spec/generated/enrich.put_policy.json
@@ -5,6 +5,7 @@
     ],
     "patterns": [
       "_enrich/policy/{name}"
-    ]
+    ],
+    "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/put-enrich-policy-api.html"
   }
 }
diff --git a/x-pack/plugins/console_extensions/server/spec/generated/enrich.stats.json b/x-pack/plugins/console_extensions/server/spec/generated/enrich.stats.json
index e6d1b04d63e45..6cdd037a21216 100644
--- a/x-pack/plugins/console_extensions/server/spec/generated/enrich.stats.json
+++ b/x-pack/plugins/console_extensions/server/spec/generated/enrich.stats.json
@@ -5,6 +5,7 @@
     ],
     "patterns": [
       "_enrich/_stats"
-    ]
+    ],
+    "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/enrich-stats-api.html"
   }
 }
diff --git a/x-pack/plugins/console_extensions/server/spec/generated/migration.deprecations.json b/x-pack/plugins/console_extensions/server/spec/generated/migration.deprecations.json
index dce5244ea40ac..597791a2439c2 100644
--- a/x-pack/plugins/console_extensions/server/spec/generated/migration.deprecations.json
+++ b/x-pack/plugins/console_extensions/server/spec/generated/migration.deprecations.json
@@ -7,6 +7,6 @@
       "_migration/deprecations",
       "{indices}/_migration/deprecations"
     ],
-    "documentation": "http://www.elastic.co/guide/en/elasticsearch/reference/current/migration-api-deprecation.html"
+    "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/migration-api-deprecation.html"
   }
 }
diff --git a/x-pack/plugins/console_extensions/server/spec/generated/ml.close_job.json b/x-pack/plugins/console_extensions/server/spec/generated/ml.close_job.json
index 310b0d125b1f9..b0f2c6489b30e 100644
--- a/x-pack/plugins/console_extensions/server/spec/generated/ml.close_job.json
+++ b/x-pack/plugins/console_extensions/server/spec/generated/ml.close_job.json
@@ -11,6 +11,6 @@
     "patterns": [
       "_ml/anomaly_detectors/{job_id}/_close"
     ],
-    "documentation": "http://www.elastic.co/guide/en/elasticsearch/reference/current/ml-close-job.html"
+    "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/ml-close-job.html"
   }
 }
diff --git a/x-pack/plugins/console_extensions/server/spec/generated/ml.delete_data_frame_analytics.json b/x-pack/plugins/console_extensions/server/spec/generated/ml.delete_data_frame_analytics.json
index c3d7048406ef6..2e4593f339212 100644
--- a/x-pack/plugins/console_extensions/server/spec/generated/ml.delete_data_frame_analytics.json
+++ b/x-pack/plugins/console_extensions/server/spec/generated/ml.delete_data_frame_analytics.json
@@ -9,6 +9,6 @@
     "patterns": [
       "_ml/data_frame/analytics/{id}"
     ],
-    "documentation": "http://www.elastic.co/guide/en/elasticsearch/reference/current/delete-dfanalytics.html"
+    "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/delete-dfanalytics.html"
   }
 }
diff --git a/x-pack/plugins/console_extensions/server/spec/generated/ml.delete_datafeed.json b/x-pack/plugins/console_extensions/server/spec/generated/ml.delete_datafeed.json
index 7c7f3c40f23bb..0836a844eb0f5 100644
--- a/x-pack/plugins/console_extensions/server/spec/generated/ml.delete_datafeed.json
+++ b/x-pack/plugins/console_extensions/server/spec/generated/ml.delete_datafeed.json
@@ -9,6 +9,6 @@
     "patterns": [
       "_ml/datafeeds/{datafeed_id}"
     ],
-    "documentation": "http://www.elastic.co/guide/en/elasticsearch/reference/current/ml-delete-datafeed.html"
+    "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/ml-delete-datafeed.html"
   }
 }
diff --git a/x-pack/plugins/console_extensions/server/spec/generated/ml.delete_forecast.json b/x-pack/plugins/console_extensions/server/spec/generated/ml.delete_forecast.json
index 971a761cc77e9..acaddfba74338 100644
--- a/x-pack/plugins/console_extensions/server/spec/generated/ml.delete_forecast.json
+++ b/x-pack/plugins/console_extensions/server/spec/generated/ml.delete_forecast.json
@@ -11,6 +11,6 @@
       "_ml/anomaly_detectors/{job_id}/_forecast",
       "_ml/anomaly_detectors/{job_id}/_forecast/{forecast_id}"
     ],
-    "documentation": "http://www.elastic.co/guide/en/elasticsearch/reference/current/ml-delete-forecast.html"
+    "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/ml-delete-forecast.html"
   }
 }
diff --git a/x-pack/plugins/console_extensions/server/spec/generated/ml.delete_job.json b/x-pack/plugins/console_extensions/server/spec/generated/ml.delete_job.json
index ab518071bf765..aa79a4c195ebe 100644
--- a/x-pack/plugins/console_extensions/server/spec/generated/ml.delete_job.json
+++ b/x-pack/plugins/console_extensions/server/spec/generated/ml.delete_job.json
@@ -10,6 +10,6 @@
     "patterns": [
       "_ml/anomaly_detectors/{job_id}"
     ],
-    "documentation": "http://www.elastic.co/guide/en/elasticsearch/reference/current/ml-delete-job.html"
+    "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/ml-delete-job.html"
   }
 }
diff --git a/x-pack/plugins/console_extensions/server/spec/generated/ml.delete_model_snapshot.json b/x-pack/plugins/console_extensions/server/spec/generated/ml.delete_model_snapshot.json
index 53d45bf0498ab..af4a7a6d68498 100644
--- a/x-pack/plugins/console_extensions/server/spec/generated/ml.delete_model_snapshot.json
+++ b/x-pack/plugins/console_extensions/server/spec/generated/ml.delete_model_snapshot.json
@@ -6,6 +6,6 @@
     "patterns": [
       "_ml/anomaly_detectors/{job_id}/model_snapshots/{snapshot_id}"
     ],
-    "documentation": "http://www.elastic.co/guide/en/elasticsearch/reference/current/ml-delete-snapshot.html"
+    "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/ml-delete-snapshot.html"
   }
 }
diff --git a/x-pack/plugins/console_extensions/server/spec/generated/ml.estimate_memory_usage.json b/x-pack/plugins/console_extensions/server/spec/generated/ml.estimate_memory_usage.json
deleted file mode 100644
index 2195b74640c79..0000000000000
--- a/x-pack/plugins/console_extensions/server/spec/generated/ml.estimate_memory_usage.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "ml.estimate_memory_usage": {
-    "methods": [
-      "PUT"
-    ],
-    "patterns": [
-      "_ml/data_frame/analytics/_estimate_memory_usage"
-    ],
-    "documentation": "http://www.elastic.co/guide/en/elasticsearch/reference/current/estimate-memory-usage-dfanalytics.html"
-  }
-}
diff --git a/x-pack/plugins/console_extensions/server/spec/generated/ml.evaluate_data_frame.json b/x-pack/plugins/console_extensions/server/spec/generated/ml.evaluate_data_frame.json
index c4523a8b41604..40f913383424d 100644
--- a/x-pack/plugins/console_extensions/server/spec/generated/ml.evaluate_data_frame.json
+++ b/x-pack/plugins/console_extensions/server/spec/generated/ml.evaluate_data_frame.json
@@ -6,6 +6,6 @@
     "patterns": [
       "_ml/data_frame/_evaluate"
     ],
-    "documentation": "http://www.elastic.co/guide/en/elasticsearch/reference/current/evaluate-dfanalytics.html"
+    "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/evaluate-dfanalytics.html"
   }
 }
diff --git a/x-pack/plugins/console_extensions/server/spec/generated/ml.find_file_structure.json b/x-pack/plugins/console_extensions/server/spec/generated/ml.find_file_structure.json
index ec51a62c4f901..6e7163ae2b740 100644
--- a/x-pack/plugins/console_extensions/server/spec/generated/ml.find_file_structure.json
+++ b/x-pack/plugins/console_extensions/server/spec/generated/ml.find_file_structure.json
@@ -27,6 +27,6 @@
     "patterns": [
       "_ml/find_file_structure"
     ],
-    "documentation": "http://www.elastic.co/guide/en/elasticsearch/reference/current/ml-find-file-structure.html"
+    "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/ml-find-file-structure.html"
   }
 }
diff --git a/x-pack/plugins/console_extensions/server/spec/generated/ml.flush_job.json b/x-pack/plugins/console_extensions/server/spec/generated/ml.flush_job.json
index 2f496003a2834..38f8cd7e9b90b 100644
--- a/x-pack/plugins/console_extensions/server/spec/generated/ml.flush_job.json
+++ b/x-pack/plugins/console_extensions/server/spec/generated/ml.flush_job.json
@@ -13,6 +13,6 @@
     "patterns": [
       "_ml/anomaly_detectors/{job_id}/_flush"
     ],
-    "documentation": "http://www.elastic.co/guide/en/elasticsearch/reference/current/ml-flush-job.html"
+    "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/ml-flush-job.html"
   }
 }
diff --git a/x-pack/plugins/console_extensions/server/spec/generated/ml.get_buckets.json b/x-pack/plugins/console_extensions/server/spec/generated/ml.get_buckets.json
index 2cbcb9d6155ec..b7c864064496e 100644
--- a/x-pack/plugins/console_extensions/server/spec/generated/ml.get_buckets.json
+++ b/x-pack/plugins/console_extensions/server/spec/generated/ml.get_buckets.json
@@ -19,6 +19,6 @@
       "_ml/anomaly_detectors/{job_id}/results/buckets/{timestamp}",
       "_ml/anomaly_detectors/{job_id}/results/buckets"
     ],
-    "documentation": "http://www.elastic.co/guide/en/elasticsearch/reference/current/ml-get-bucket.html"
+    "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/ml-get-bucket.html"
   }
 }
diff --git a/x-pack/plugins/console_extensions/server/spec/generated/ml.get_categories.json b/x-pack/plugins/console_extensions/server/spec/generated/ml.get_categories.json
index 357a7b7fb0ccc..64edb196bb366 100644
--- a/x-pack/plugins/console_extensions/server/spec/generated/ml.get_categories.json
+++ b/x-pack/plugins/console_extensions/server/spec/generated/ml.get_categories.json
@@ -12,6 +12,6 @@
       "_ml/anomaly_detectors/{job_id}/results/categories/{category_id}",
       "_ml/anomaly_detectors/{job_id}/results/categories/"
     ],
-    "documentation": "http://www.elastic.co/guide/en/elasticsearch/reference/current/ml-get-category.html"
+    "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/ml-get-category.html"
   }
 }
diff --git a/x-pack/plugins/console_extensions/server/spec/generated/ml.get_data_frame_analytics.json b/x-pack/plugins/console_extensions/server/spec/generated/ml.get_data_frame_analytics.json
index b3a0c9cf3ef71..ecccec9c7e059 100644
--- a/x-pack/plugins/console_extensions/server/spec/generated/ml.get_data_frame_analytics.json
+++ b/x-pack/plugins/console_extensions/server/spec/generated/ml.get_data_frame_analytics.json
@@ -12,6 +12,6 @@
       "_ml/data_frame/analytics/{id}",
       "_ml/data_frame/analytics"
     ],
-    "documentation": "http://www.elastic.co/guide/en/elasticsearch/reference/current/get-dfanalytics.html"
+    "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/get-dfanalytics.html"
   }
 }
diff --git a/x-pack/plugins/console_extensions/server/spec/generated/ml.get_data_frame_analytics_stats.json b/x-pack/plugins/console_extensions/server/spec/generated/ml.get_data_frame_analytics_stats.json
index e4b4ee7b1f64e..3ae103f79f798 100644
--- a/x-pack/plugins/console_extensions/server/spec/generated/ml.get_data_frame_analytics_stats.json
+++ b/x-pack/plugins/console_extensions/server/spec/generated/ml.get_data_frame_analytics_stats.json
@@ -12,6 +12,6 @@
       "_ml/data_frame/analytics/_stats",
       "_ml/data_frame/analytics/{id}/_stats"
     ],
-    "documentation": "http://www.elastic.co/guide/en/elasticsearch/reference/current/get-dfanalytics-stats.html"
+    "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/get-dfanalytics-stats.html"
   }
 }
diff --git a/x-pack/plugins/console_extensions/server/spec/generated/ml.get_datafeed_stats.json b/x-pack/plugins/console_extensions/server/spec/generated/ml.get_datafeed_stats.json
index 5c300e444c794..2971b8a7f6c63 100644
--- a/x-pack/plugins/console_extensions/server/spec/generated/ml.get_datafeed_stats.json
+++ b/x-pack/plugins/console_extensions/server/spec/generated/ml.get_datafeed_stats.json
@@ -10,6 +10,6 @@
       "_ml/datafeeds/{datafeed_id}/_stats",
       "_ml/datafeeds/_stats"
     ],
-    "documentation": "http://www.elastic.co/guide/en/elasticsearch/reference/current/ml-get-datafeed-stats.html"
+    "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/ml-get-datafeed-stats.html"
   }
 }
diff --git a/x-pack/plugins/console_extensions/server/spec/generated/ml.get_datafeeds.json b/x-pack/plugins/console_extensions/server/spec/generated/ml.get_datafeeds.json
index 9979a685426be..deeb81d692739 100644
--- a/x-pack/plugins/console_extensions/server/spec/generated/ml.get_datafeeds.json
+++ b/x-pack/plugins/console_extensions/server/spec/generated/ml.get_datafeeds.json
@@ -10,6 +10,6 @@
       "_ml/datafeeds/{datafeed_id}",
       "_ml/datafeeds"
     ],
-    "documentation": "http://www.elastic.co/guide/en/elasticsearch/reference/current/ml-get-datafeed.html"
+    "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/ml-get-datafeed.html"
   }
 }
diff --git a/x-pack/plugins/console_extensions/server/spec/generated/ml.get_influencers.json b/x-pack/plugins/console_extensions/server/spec/generated/ml.get_influencers.json
index 9471fac64d489..6f6745d3a5472 100644
--- a/x-pack/plugins/console_extensions/server/spec/generated/ml.get_influencers.json
+++ b/x-pack/plugins/console_extensions/server/spec/generated/ml.get_influencers.json
@@ -17,6 +17,6 @@
     "patterns": [
       "_ml/anomaly_detectors/{job_id}/results/influencers"
     ],
-    "documentation": "http://www.elastic.co/guide/en/elasticsearch/reference/current/ml-get-influencer.html"
+    "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/ml-get-influencer.html"
   }
 }
diff --git a/x-pack/plugins/console_extensions/server/spec/generated/ml.get_job_stats.json b/x-pack/plugins/console_extensions/server/spec/generated/ml.get_job_stats.json
index b28a2655cbefe..6173b3ebdc6d0 100644
--- a/x-pack/plugins/console_extensions/server/spec/generated/ml.get_job_stats.json
+++ b/x-pack/plugins/console_extensions/server/spec/generated/ml.get_job_stats.json
@@ -10,6 +10,6 @@
       "_ml/anomaly_detectors/_stats",
       "_ml/anomaly_detectors/{job_id}/_stats"
     ],
-    "documentation": "http://www.elastic.co/guide/en/elasticsearch/reference/current/ml-get-job-stats.html"
+    "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/ml-get-job-stats.html"
   }
 }
diff --git a/x-pack/plugins/console_extensions/server/spec/generated/ml.get_jobs.json b/x-pack/plugins/console_extensions/server/spec/generated/ml.get_jobs.json
index 8f7de906578d7..2486684424670 100644
--- a/x-pack/plugins/console_extensions/server/spec/generated/ml.get_jobs.json
+++ b/x-pack/plugins/console_extensions/server/spec/generated/ml.get_jobs.json
@@ -10,6 +10,6 @@
       "_ml/anomaly_detectors/{job_id}",
       "_ml/anomaly_detectors"
     ],
-    "documentation": "http://www.elastic.co/guide/en/elasticsearch/reference/current/ml-get-job.html"
+    "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/ml-get-job.html"
   }
 }
diff --git a/x-pack/plugins/console_extensions/server/spec/generated/ml.get_model_snapshots.json b/x-pack/plugins/console_extensions/server/spec/generated/ml.get_model_snapshots.json
index a3b9702f4e4f0..19a61afc9e0e3 100644
--- a/x-pack/plugins/console_extensions/server/spec/generated/ml.get_model_snapshots.json
+++ b/x-pack/plugins/console_extensions/server/spec/generated/ml.get_model_snapshots.json
@@ -16,6 +16,6 @@
       "_ml/anomaly_detectors/{job_id}/model_snapshots/{snapshot_id}",
       "_ml/anomaly_detectors/{job_id}/model_snapshots"
     ],
-    "documentation": "http://www.elastic.co/guide/en/elasticsearch/reference/current/ml-get-snapshot.html"
+    "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/ml-get-snapshot.html"
   }
 }
diff --git a/x-pack/plugins/console_extensions/server/spec/generated/ml.get_overall_buckets.json b/x-pack/plugins/console_extensions/server/spec/generated/ml.get_overall_buckets.json
index e89d63ae7f49f..3a88c9d8ab9c9 100644
--- a/x-pack/plugins/console_extensions/server/spec/generated/ml.get_overall_buckets.json
+++ b/x-pack/plugins/console_extensions/server/spec/generated/ml.get_overall_buckets.json
@@ -16,6 +16,6 @@
     "patterns": [
       "_ml/anomaly_detectors/{job_id}/results/overall_buckets"
     ],
-    "documentation": "http://www.elastic.co/guide/en/elasticsearch/reference/current/ml-get-overall-buckets.html"
+    "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/ml-get-overall-buckets.html"
   }
 }
diff --git a/x-pack/plugins/console_extensions/server/spec/generated/ml.get_records.json b/x-pack/plugins/console_extensions/server/spec/generated/ml.get_records.json
index fd03c8d34214c..6ad8ecb6f7d6b 100644
--- a/x-pack/plugins/console_extensions/server/spec/generated/ml.get_records.json
+++ b/x-pack/plugins/console_extensions/server/spec/generated/ml.get_records.json
@@ -17,6 +17,6 @@
     "patterns": [
       "_ml/anomaly_detectors/{job_id}/results/records"
     ],
-    "documentation": "http://www.elastic.co/guide/en/elasticsearch/reference/current/ml-get-record.html"
+    "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/ml-get-record.html"
   }
 }
diff --git a/x-pack/plugins/console_extensions/server/spec/generated/ml.get_trained_models.json b/x-pack/plugins/console_extensions/server/spec/generated/ml.get_trained_models.json
index cdeaca9654b77..76598ee015c6d 100644
--- a/x-pack/plugins/console_extensions/server/spec/generated/ml.get_trained_models.json
+++ b/x-pack/plugins/console_extensions/server/spec/generated/ml.get_trained_models.json
@@ -5,7 +5,8 @@
       "include_model_definition": "__flag__",
       "decompress_definition": "__flag__",
       "from": 0,
-      "size": 0
+      "size": 0,
+      "tags": []
     },
     "methods": [
       "GET"
diff --git a/x-pack/plugins/console_extensions/server/spec/generated/ml.open_job.json b/x-pack/plugins/console_extensions/server/spec/generated/ml.open_job.json
index cd330ec4822c0..969da2253cc89 100644
--- a/x-pack/plugins/console_extensions/server/spec/generated/ml.open_job.json
+++ b/x-pack/plugins/console_extensions/server/spec/generated/ml.open_job.json
@@ -6,6 +6,6 @@
     "patterns": [
       "_ml/anomaly_detectors/{job_id}/_open"
     ],
-    "documentation": "http://www.elastic.co/guide/en/elasticsearch/reference/current/ml-open-job.html"
+    "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/ml-open-job.html"
   }
 }
diff --git a/x-pack/plugins/console_extensions/server/spec/generated/ml.post_data.json b/x-pack/plugins/console_extensions/server/spec/generated/ml.post_data.json
index cc6f0b658e111..512d258f52780 100644
--- a/x-pack/plugins/console_extensions/server/spec/generated/ml.post_data.json
+++ b/x-pack/plugins/console_extensions/server/spec/generated/ml.post_data.json
@@ -10,6 +10,6 @@
     "patterns": [
       "_ml/anomaly_detectors/{job_id}/_data"
     ],
-    "documentation": "http://www.elastic.co/guide/en/elasticsearch/reference/current/ml-post-data.html"
+    "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/ml-post-data.html"
   }
 }
diff --git a/x-pack/plugins/console_extensions/server/spec/generated/ml.preview_datafeed.json b/x-pack/plugins/console_extensions/server/spec/generated/ml.preview_datafeed.json
index be3c3d466f37d..6eb537804134b 100644
--- a/x-pack/plugins/console_extensions/server/spec/generated/ml.preview_datafeed.json
+++ b/x-pack/plugins/console_extensions/server/spec/generated/ml.preview_datafeed.json
@@ -6,6 +6,6 @@
     "patterns": [
       "_ml/datafeeds/{datafeed_id}/_preview"
     ],
-    "documentation": "http://www.elastic.co/guide/en/elasticsearch/reference/current/ml-preview-datafeed.html"
+    "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/ml-preview-datafeed.html"
   }
 }
diff --git a/x-pack/plugins/console_extensions/server/spec/generated/ml.put_data_frame_analytics.json b/x-pack/plugins/console_extensions/server/spec/generated/ml.put_data_frame_analytics.json
index 83ffd0da3dda5..fd00ff3a94ebd 100644
--- a/x-pack/plugins/console_extensions/server/spec/generated/ml.put_data_frame_analytics.json
+++ b/x-pack/plugins/console_extensions/server/spec/generated/ml.put_data_frame_analytics.json
@@ -6,6 +6,6 @@
     "patterns": [
       "_ml/data_frame/analytics/{id}"
     ],
-    "documentation": "http://www.elastic.co/guide/en/elasticsearch/reference/current/put-dfanalytics.html"
+    "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/put-dfanalytics.html"
   }
 }
diff --git a/x-pack/plugins/console_extensions/server/spec/generated/ml.put_datafeed.json b/x-pack/plugins/console_extensions/server/spec/generated/ml.put_datafeed.json
index a61f9ab465724..302599b1633f4 100644
--- a/x-pack/plugins/console_extensions/server/spec/generated/ml.put_datafeed.json
+++ b/x-pack/plugins/console_extensions/server/spec/generated/ml.put_datafeed.json
@@ -1,11 +1,23 @@
 {
   "ml.put_datafeed": {
+    "url_params": {
+      "ignore_unavailable": "__flag__",
+      "allow_no_indices": "__flag__",
+      "ignore_throttled": "__flag__",
+      "expand_wildcards": [
+        "open",
+        "closed",
+        "hidden",
+        "none",
+        "all"
+      ]
+    },
     "methods": [
       "PUT"
     ],
     "patterns": [
       "_ml/datafeeds/{datafeed_id}"
     ],
-    "documentation": "http://www.elastic.co/guide/en/elasticsearch/reference/current/ml-put-datafeed.html"
+    "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/ml-put-datafeed.html"
   }
 }
diff --git a/x-pack/plugins/console_extensions/server/spec/generated/ml.put_job.json b/x-pack/plugins/console_extensions/server/spec/generated/ml.put_job.json
index d8e38a0bd4b9d..7a48994bd1a6c 100644
--- a/x-pack/plugins/console_extensions/server/spec/generated/ml.put_job.json
+++ b/x-pack/plugins/console_extensions/server/spec/generated/ml.put_job.json
@@ -6,6 +6,6 @@
     "patterns": [
       "_ml/anomaly_detectors/{job_id}"
     ],
-    "documentation": "http://www.elastic.co/guide/en/elasticsearch/reference/current/ml-put-job.html"
+    "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/ml-put-job.html"
   }
 }
diff --git a/x-pack/plugins/console_extensions/server/spec/generated/ml.revert_model_snapshot.json b/x-pack/plugins/console_extensions/server/spec/generated/ml.revert_model_snapshot.json
index 7b6d74d47a711..b0763d8a9b329 100644
--- a/x-pack/plugins/console_extensions/server/spec/generated/ml.revert_model_snapshot.json
+++ b/x-pack/plugins/console_extensions/server/spec/generated/ml.revert_model_snapshot.json
@@ -9,6 +9,6 @@
     "patterns": [
       "_ml/anomaly_detectors/{job_id}/model_snapshots/{snapshot_id}/_revert"
     ],
-    "documentation": "http://www.elastic.co/guide/en/elasticsearch/reference/current/ml-revert-snapshot.html"
+    "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/ml-revert-snapshot.html"
   }
 }
diff --git a/x-pack/plugins/console_extensions/server/spec/generated/ml.set_upgrade_mode.json b/x-pack/plugins/console_extensions/server/spec/generated/ml.set_upgrade_mode.json
index d46e93c6eee46..71a0f0c042813 100644
--- a/x-pack/plugins/console_extensions/server/spec/generated/ml.set_upgrade_mode.json
+++ b/x-pack/plugins/console_extensions/server/spec/generated/ml.set_upgrade_mode.json
@@ -10,6 +10,6 @@
     "patterns": [
       "_ml/set_upgrade_mode"
     ],
-    "documentation": "http://www.elastic.co/guide/en/elasticsearch/reference/current/ml-set-upgrade-mode.html"
+    "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/ml-set-upgrade-mode.html"
   }
 }
diff --git a/x-pack/plugins/console_extensions/server/spec/generated/ml.start_data_frame_analytics.json b/x-pack/plugins/console_extensions/server/spec/generated/ml.start_data_frame_analytics.json
index 1b5d7c122fc53..0b420733cd9de 100644
--- a/x-pack/plugins/console_extensions/server/spec/generated/ml.start_data_frame_analytics.json
+++ b/x-pack/plugins/console_extensions/server/spec/generated/ml.start_data_frame_analytics.json
@@ -9,6 +9,6 @@
     "patterns": [
       "_ml/data_frame/analytics/{id}/_start"
     ],
-    "documentation": "http://www.elastic.co/guide/en/elasticsearch/reference/current/start-dfanalytics.html"
+    "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/start-dfanalytics.html"
   }
 }
diff --git a/x-pack/plugins/console_extensions/server/spec/generated/ml.start_datafeed.json b/x-pack/plugins/console_extensions/server/spec/generated/ml.start_datafeed.json
index 8171a792d7e33..36f9e5fa93257 100644
--- a/x-pack/plugins/console_extensions/server/spec/generated/ml.start_datafeed.json
+++ b/x-pack/plugins/console_extensions/server/spec/generated/ml.start_datafeed.json
@@ -11,6 +11,6 @@
     "patterns": [
       "_ml/datafeeds/{datafeed_id}/_start"
     ],
-    "documentation": "http://www.elastic.co/guide/en/elasticsearch/reference/current/ml-start-datafeed.html"
+    "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/ml-start-datafeed.html"
   }
 }
diff --git a/x-pack/plugins/console_extensions/server/spec/generated/ml.stop_data_frame_analytics.json b/x-pack/plugins/console_extensions/server/spec/generated/ml.stop_data_frame_analytics.json
index 05edf9bbef3a2..bda7a7c0d414b 100644
--- a/x-pack/plugins/console_extensions/server/spec/generated/ml.stop_data_frame_analytics.json
+++ b/x-pack/plugins/console_extensions/server/spec/generated/ml.stop_data_frame_analytics.json
@@ -11,6 +11,6 @@
     "patterns": [
       "_ml/data_frame/analytics/{id}/_stop"
     ],
-    "documentation": "http://www.elastic.co/guide/en/elasticsearch/reference/current/stop-dfanalytics.html"
+    "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/stop-dfanalytics.html"
   }
 }
diff --git a/x-pack/plugins/console_extensions/server/spec/generated/ml.stop_datafeed.json b/x-pack/plugins/console_extensions/server/spec/generated/ml.stop_datafeed.json
index b10fed7010a7f..d6769ed58148f 100644
--- a/x-pack/plugins/console_extensions/server/spec/generated/ml.stop_datafeed.json
+++ b/x-pack/plugins/console_extensions/server/spec/generated/ml.stop_datafeed.json
@@ -11,6 +11,6 @@
     "patterns": [
       "_ml/datafeeds/{datafeed_id}/_stop"
     ],
-    "documentation": "http://www.elastic.co/guide/en/elasticsearch/reference/current/ml-stop-datafeed.html"
+    "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/ml-stop-datafeed.html"
   }
 }
diff --git a/x-pack/plugins/console_extensions/server/spec/generated/ml.update_datafeed.json b/x-pack/plugins/console_extensions/server/spec/generated/ml.update_datafeed.json
index 9c0d7502d2fbe..4b31a9595659d 100644
--- a/x-pack/plugins/console_extensions/server/spec/generated/ml.update_datafeed.json
+++ b/x-pack/plugins/console_extensions/server/spec/generated/ml.update_datafeed.json
@@ -1,11 +1,23 @@
 {
   "ml.update_datafeed": {
+    "url_params": {
+      "ignore_unavailable": "__flag__",
+      "allow_no_indices": "__flag__",
+      "ignore_throttled": "__flag__",
+      "expand_wildcards": [
+        "open",
+        "closed",
+        "hidden",
+        "none",
+        "all"
+      ]
+    },
     "methods": [
       "POST"
     ],
     "patterns": [
       "_ml/datafeeds/{datafeed_id}/_update"
     ],
-    "documentation": "http://www.elastic.co/guide/en/elasticsearch/reference/current/ml-update-datafeed.html"
+    "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/ml-update-datafeed.html"
   }
 }
diff --git a/x-pack/plugins/console_extensions/server/spec/generated/ml.update_job.json b/x-pack/plugins/console_extensions/server/spec/generated/ml.update_job.json
index 7276183b2e0c9..47ba249374e51 100644
--- a/x-pack/plugins/console_extensions/server/spec/generated/ml.update_job.json
+++ b/x-pack/plugins/console_extensions/server/spec/generated/ml.update_job.json
@@ -6,6 +6,6 @@
     "patterns": [
       "_ml/anomaly_detectors/{job_id}/_update"
     ],
-    "documentation": "http://www.elastic.co/guide/en/elasticsearch/reference/current/ml-update-job.html"
+    "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/ml-update-job.html"
   }
 }
diff --git a/x-pack/plugins/console_extensions/server/spec/generated/ml.update_model_snapshot.json b/x-pack/plugins/console_extensions/server/spec/generated/ml.update_model_snapshot.json
index 80e533eb55826..037982e7ebb2e 100644
--- a/x-pack/plugins/console_extensions/server/spec/generated/ml.update_model_snapshot.json
+++ b/x-pack/plugins/console_extensions/server/spec/generated/ml.update_model_snapshot.json
@@ -6,6 +6,6 @@
     "patterns": [
       "_ml/anomaly_detectors/{job_id}/model_snapshots/{snapshot_id}/_update"
     ],
-    "documentation": "http://www.elastic.co/guide/en/elasticsearch/reference/current/ml-update-snapshot.html"
+    "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/ml-update-snapshot.html"
   }
 }
diff --git a/x-pack/plugins/console_extensions/server/spec/generated/security.delete_privileges.json b/x-pack/plugins/console_extensions/server/spec/generated/security.delete_privileges.json
index b44798013fe59..a7b56aa904bb2 100644
--- a/x-pack/plugins/console_extensions/server/spec/generated/security.delete_privileges.json
+++ b/x-pack/plugins/console_extensions/server/spec/generated/security.delete_privileges.json
@@ -13,6 +13,6 @@
     "patterns": [
       "_security/privilege/{application}/{name}"
     ],
-    "documentation": "TODO"
+    "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/security-api-delete-privilege.html"
   }
 }
diff --git a/x-pack/plugins/console_extensions/server/spec/generated/security.put_privileges.json b/x-pack/plugins/console_extensions/server/spec/generated/security.put_privileges.json
index a42d5eb6c953e..4dbe88c526f0e 100644
--- a/x-pack/plugins/console_extensions/server/spec/generated/security.put_privileges.json
+++ b/x-pack/plugins/console_extensions/server/spec/generated/security.put_privileges.json
@@ -12,8 +12,8 @@
       "POST"
     ],
     "patterns": [
-      "_security/privilege"
+      "_security/privilege/"
     ],
-    "documentation": "TODO"
+    "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/security-api-put-privileges.html"
   }
 }
diff --git a/x-pack/plugins/console_extensions/server/spec/generated/slm.delete_lifecycle.json b/x-pack/plugins/console_extensions/server/spec/generated/slm.delete_lifecycle.json
index 621aa9327e798..ee63fd52eeb5b 100644
--- a/x-pack/plugins/console_extensions/server/spec/generated/slm.delete_lifecycle.json
+++ b/x-pack/plugins/console_extensions/server/spec/generated/slm.delete_lifecycle.json
@@ -6,6 +6,6 @@
     "patterns": [
       "_slm/policy/{policy_id}"
     ],
-    "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/slm-api-delete.html"
+    "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/slm-api-delete-policy.html"
   }
 }
diff --git a/x-pack/plugins/console_extensions/server/spec/generated/slm.execute_lifecycle.json b/x-pack/plugins/console_extensions/server/spec/generated/slm.execute_lifecycle.json
index 6d0b5fe02a9ee..9e50e2fc1009b 100644
--- a/x-pack/plugins/console_extensions/server/spec/generated/slm.execute_lifecycle.json
+++ b/x-pack/plugins/console_extensions/server/spec/generated/slm.execute_lifecycle.json
@@ -6,6 +6,6 @@
     "patterns": [
       "_slm/policy/{policy_id}/_execute"
     ],
-    "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/slm-api-execute.html"
+    "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/slm-api-execute-lifecycle.html"
   }
 }
diff --git a/x-pack/plugins/console_extensions/server/spec/generated/slm.get_lifecycle.json b/x-pack/plugins/console_extensions/server/spec/generated/slm.get_lifecycle.json
index 869438deb9219..93c32091be8e3 100644
--- a/x-pack/plugins/console_extensions/server/spec/generated/slm.get_lifecycle.json
+++ b/x-pack/plugins/console_extensions/server/spec/generated/slm.get_lifecycle.json
@@ -7,6 +7,6 @@
       "_slm/policy/{policy_id}",
       "_slm/policy"
     ],
-    "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/slm-api-get.html"
+    "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/slm-api-get-policy.html"
   }
 }
diff --git a/x-pack/plugins/console_extensions/server/spec/generated/slm.get_stats.json b/x-pack/plugins/console_extensions/server/spec/generated/slm.get_stats.json
index e980534105b3c..b5af57beb2f79 100644
--- a/x-pack/plugins/console_extensions/server/spec/generated/slm.get_stats.json
+++ b/x-pack/plugins/console_extensions/server/spec/generated/slm.get_stats.json
@@ -6,6 +6,6 @@
     "patterns": [
       "_slm/stats"
     ],
-    "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/master/slm-get-stats.html"
+    "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/master/slm-api-get-stats.html"
   }
 }
diff --git a/x-pack/plugins/console_extensions/server/spec/generated/slm.get_status.json b/x-pack/plugins/console_extensions/server/spec/generated/slm.get_status.json
index a7ffde10b316d..3a01a414b5afd 100644
--- a/x-pack/plugins/console_extensions/server/spec/generated/slm.get_status.json
+++ b/x-pack/plugins/console_extensions/server/spec/generated/slm.get_status.json
@@ -6,6 +6,6 @@
     "patterns": [
       "_slm/status"
     ],
-    "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/slm-get-status.html"
+    "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/slm-api-get-status.html"
   }
 }
diff --git a/x-pack/plugins/console_extensions/server/spec/generated/slm.put_lifecycle.json b/x-pack/plugins/console_extensions/server/spec/generated/slm.put_lifecycle.json
index 1391669ed293b..09bc2b7bf836b 100644
--- a/x-pack/plugins/console_extensions/server/spec/generated/slm.put_lifecycle.json
+++ b/x-pack/plugins/console_extensions/server/spec/generated/slm.put_lifecycle.json
@@ -6,6 +6,6 @@
     "patterns": [
       "_slm/policy/{policy_id}"
     ],
-    "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/slm-api-put.html"
+    "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/slm-api-put-policy.html"
   }
 }
diff --git a/x-pack/plugins/console_extensions/server/spec/generated/slm.start.json b/x-pack/plugins/console_extensions/server/spec/generated/slm.start.json
index a5b94d98f08fb..1dff975cb2625 100644
--- a/x-pack/plugins/console_extensions/server/spec/generated/slm.start.json
+++ b/x-pack/plugins/console_extensions/server/spec/generated/slm.start.json
@@ -6,6 +6,6 @@
     "patterns": [
       "_slm/start"
     ],
-    "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/slm-start.html"
+    "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/slm-api-start.html"
   }
 }
diff --git a/x-pack/plugins/console_extensions/server/spec/generated/slm.stop.json b/x-pack/plugins/console_extensions/server/spec/generated/slm.stop.json
index 0b76fe68d2b5e..2970c9a355005 100644
--- a/x-pack/plugins/console_extensions/server/spec/generated/slm.stop.json
+++ b/x-pack/plugins/console_extensions/server/spec/generated/slm.stop.json
@@ -6,6 +6,6 @@
     "patterns": [
       "_slm/stop"
     ],
-    "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/slm-stop.html"
+    "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/slm-api-stop.html"
   }
 }
diff --git a/x-pack/plugins/console_extensions/server/spec/generated/sql.clear_cursor.json b/x-pack/plugins/console_extensions/server/spec/generated/sql.clear_cursor.json
index 6f15e1b979c51..3c98c9d295710 100644
--- a/x-pack/plugins/console_extensions/server/spec/generated/sql.clear_cursor.json
+++ b/x-pack/plugins/console_extensions/server/spec/generated/sql.clear_cursor.json
@@ -6,6 +6,6 @@
     "patterns": [
       "_sql/close"
     ],
-    "documentation": "Clear SQL cursor"
+    "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-pagination.html"
   }
 }
diff --git a/x-pack/plugins/console_extensions/server/spec/generated/sql.query.json b/x-pack/plugins/console_extensions/server/spec/generated/sql.query.json
index 0e4274e772f30..75d0989fb779e 100644
--- a/x-pack/plugins/console_extensions/server/spec/generated/sql.query.json
+++ b/x-pack/plugins/console_extensions/server/spec/generated/sql.query.json
@@ -10,6 +10,6 @@
     "patterns": [
       "_sql"
     ],
-    "documentation": "Execute SQL"
+    "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-rest-overview.html"
   }
 }
diff --git a/x-pack/plugins/console_extensions/server/spec/generated/sql.translate.json b/x-pack/plugins/console_extensions/server/spec/generated/sql.translate.json
index e80ae7f8e3c5f..f93669ad58dc8 100644
--- a/x-pack/plugins/console_extensions/server/spec/generated/sql.translate.json
+++ b/x-pack/plugins/console_extensions/server/spec/generated/sql.translate.json
@@ -7,6 +7,6 @@
     "patterns": [
       "_sql/translate"
     ],
-    "documentation": "Translate SQL into Elasticsearch queries"
+    "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-translate.html"
   }
 }
diff --git a/x-pack/plugins/console_extensions/server/spec/generated/transform.cat_transform.json b/x-pack/plugins/console_extensions/server/spec/generated/transform.cat_transform.json
new file mode 100644
index 0000000000000..6fe19a6e53d28
--- /dev/null
+++ b/x-pack/plugins/console_extensions/server/spec/generated/transform.cat_transform.json
@@ -0,0 +1,31 @@
+{
+  "transform.cat_transform": {
+    "url_params": {
+      "from": 0,
+      "size": 0,
+      "allow_no_match": "__flag__",
+      "format": "",
+      "h": [],
+      "help": "__flag__",
+      "s": [],
+      "time": [
+        "d",
+        "h",
+        "m",
+        "s",
+        "ms",
+        "micros",
+        "nanos"
+      ],
+      "v": "__flag__"
+    },
+    "methods": [
+      "GET"
+    ],
+    "patterns": [
+      "_cat/transforms",
+      "_cat/transforms/{transform_id}"
+    ],
+    "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/cat-transforms.html"
+  }
+}
diff --git a/x-pack/plugins/console_extensions/server/spec/generated/watcher.ack_watch.json b/x-pack/plugins/console_extensions/server/spec/generated/watcher.ack_watch.json
index bedaa40c10548..0eacab92ba98d 100644
--- a/x-pack/plugins/console_extensions/server/spec/generated/watcher.ack_watch.json
+++ b/x-pack/plugins/console_extensions/server/spec/generated/watcher.ack_watch.json
@@ -8,6 +8,6 @@
       "_watcher/watch/{watch_id}/_ack",
       "_watcher/watch/{watch_id}/_ack/{action_id}"
     ],
-    "documentation": "http://www.elastic.co/guide/en/elasticsearch/reference/current/watcher-api-ack-watch.html"
+    "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/watcher-api-ack-watch.html"
   }
 }
diff --git a/x-pack/plugins/console_extensions/server/spec/generated/watcher.delete_watch.json b/x-pack/plugins/console_extensions/server/spec/generated/watcher.delete_watch.json
index 63e76c78c0d4a..4e0153423f540 100644
--- a/x-pack/plugins/console_extensions/server/spec/generated/watcher.delete_watch.json
+++ b/x-pack/plugins/console_extensions/server/spec/generated/watcher.delete_watch.json
@@ -6,6 +6,6 @@
     "patterns": [
       "_watcher/watch/{id}"
     ],
-    "documentation": "http://www.elastic.co/guide/en/elasticsearch/reference/current/watcher-api-delete-watch.html"
+    "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/watcher-api-delete-watch.html"
   }
 }
diff --git a/x-pack/plugins/console_extensions/server/spec/generated/watcher.execute_watch.json b/x-pack/plugins/console_extensions/server/spec/generated/watcher.execute_watch.json
index 7319d68d249ff..249c912637d5e 100644
--- a/x-pack/plugins/console_extensions/server/spec/generated/watcher.execute_watch.json
+++ b/x-pack/plugins/console_extensions/server/spec/generated/watcher.execute_watch.json
@@ -11,6 +11,6 @@
       "_watcher/watch/{id}/_execute",
       "_watcher/watch/_execute"
     ],
-    "documentation": "http://www.elastic.co/guide/en/elasticsearch/reference/current/watcher-api-execute-watch.html"
+    "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/watcher-api-execute-watch.html"
   }
 }
diff --git a/x-pack/plugins/console_extensions/server/spec/generated/watcher.get_watch.json b/x-pack/plugins/console_extensions/server/spec/generated/watcher.get_watch.json
index d9e646712edd6..bc244ed9415d2 100644
--- a/x-pack/plugins/console_extensions/server/spec/generated/watcher.get_watch.json
+++ b/x-pack/plugins/console_extensions/server/spec/generated/watcher.get_watch.json
@@ -6,6 +6,6 @@
     "patterns": [
       "_watcher/watch/{id}"
     ],
-    "documentation": "http://www.elastic.co/guide/en/elasticsearch/reference/current/watcher-api-get-watch.html"
+    "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/watcher-api-get-watch.html"
   }
 }
diff --git a/x-pack/plugins/console_extensions/server/spec/generated/watcher.put_watch.json b/x-pack/plugins/console_extensions/server/spec/generated/watcher.put_watch.json
index 98250da734222..59eba35f7fcbd 100644
--- a/x-pack/plugins/console_extensions/server/spec/generated/watcher.put_watch.json
+++ b/x-pack/plugins/console_extensions/server/spec/generated/watcher.put_watch.json
@@ -13,6 +13,6 @@
     "patterns": [
       "_watcher/watch/{id}"
     ],
-    "documentation": "http://www.elastic.co/guide/en/elasticsearch/reference/current/watcher-api-put-watch.html"
+    "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/watcher-api-put-watch.html"
   }
 }
diff --git a/x-pack/plugins/console_extensions/server/spec/generated/watcher.start.json b/x-pack/plugins/console_extensions/server/spec/generated/watcher.start.json
index 28bc2db990ebd..e1d9e4c820ad7 100644
--- a/x-pack/plugins/console_extensions/server/spec/generated/watcher.start.json
+++ b/x-pack/plugins/console_extensions/server/spec/generated/watcher.start.json
@@ -6,6 +6,6 @@
     "patterns": [
       "_watcher/_start"
     ],
-    "documentation": "http://www.elastic.co/guide/en/elasticsearch/reference/current/watcher-api-start.html"
+    "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/watcher-api-start.html"
   }
 }
diff --git a/x-pack/plugins/console_extensions/server/spec/generated/watcher.stats.json b/x-pack/plugins/console_extensions/server/spec/generated/watcher.stats.json
index 62c6c5fea123e..d19446e0f5bb2 100644
--- a/x-pack/plugins/console_extensions/server/spec/generated/watcher.stats.json
+++ b/x-pack/plugins/console_extensions/server/spec/generated/watcher.stats.json
@@ -19,6 +19,6 @@
         "queued_watches"
       ]
     },
-    "documentation": "http://www.elastic.co/guide/en/elasticsearch/reference/current/watcher-api-stats.html"
+    "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/watcher-api-stats.html"
   }
 }
diff --git a/x-pack/plugins/console_extensions/server/spec/generated/watcher.stop.json b/x-pack/plugins/console_extensions/server/spec/generated/watcher.stop.json
index c2f370981d8e6..ac8fdaf365346 100644
--- a/x-pack/plugins/console_extensions/server/spec/generated/watcher.stop.json
+++ b/x-pack/plugins/console_extensions/server/spec/generated/watcher.stop.json
@@ -6,6 +6,6 @@
     "patterns": [
       "_watcher/_stop"
     ],
-    "documentation": "http://www.elastic.co/guide/en/elasticsearch/reference/current/watcher-api-stop.html"
+    "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/watcher-api-stop.html"
   }
 }
diff --git a/x-pack/plugins/console_extensions/server/spec/generated/xpack.usage.json b/x-pack/plugins/console_extensions/server/spec/generated/xpack.usage.json
index cd43f16ec45f8..90d50ce8aa533 100644
--- a/x-pack/plugins/console_extensions/server/spec/generated/xpack.usage.json
+++ b/x-pack/plugins/console_extensions/server/spec/generated/xpack.usage.json
@@ -9,6 +9,6 @@
     "patterns": [
       "_xpack/usage"
     ],
-    "documentation": "Retrieve information about xpack features usage"
+    "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/usage-api.html"
   }
 }
diff --git a/x-pack/plugins/console_extensions/server/spec/overrides/async_search.submit.json b/x-pack/plugins/console_extensions/server/spec/overrides/async_search.submit.json
new file mode 100644
index 0000000000000..f176bf64fadd3
--- /dev/null
+++ b/x-pack/plugins/console_extensions/server/spec/overrides/async_search.submit.json
@@ -0,0 +1,7 @@
+{
+  "async_search.submit": {
+    "data_autocomplete_rules": {
+      "__scope_link": "search"
+    }
+  }
+}
diff --git a/x-pack/plugins/console_extensions/server/spec/overrides/ml.estimate_memory_usage.json b/x-pack/plugins/console_extensions/server/spec/overrides/ml.estimate_memory_usage.json
deleted file mode 100644
index 4954fd81a55d1..0000000000000
--- a/x-pack/plugins/console_extensions/server/spec/overrides/ml.estimate_memory_usage.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "ml.estimate_memory_usage": {
-    "data_autocomplete_rules": {
-      "data_frame_analytics_config": {
-        "source": {
-          "index": { "__one_of": ["SOURCE_INDEX_NAME", []] },
-          "query": {}
-        },
-        "dest": {
-          "index": "",
-          "results_field": ""
-        },
-        "analysis": {
-          "outlier_detection": {
-            "n_neighbors": 1,
-            "method": {"__one_of": ["lof", "ldof", "distance_knn_nn", "distance_knn"]},
-            "feature_influence_threshold": 1.0
-          }
-        },
-        "analyzed_fields": {
-          "__one_of": [
-            "FIELD_NAME",
-            [],
-            {
-              "includes": {
-                "__one_of": ["FIELD_NAME", []]
-              },
-              "excludes": {
-                "__one_of": ["FIELD_NAME", []]
-              }
-            }
-          ]
-        },
-        "model_memory_limit": ""
-      }
-    }
-  }
-}
diff --git a/x-pack/plugins/console_extensions/server/spec/overrides/security.delete_privileges.json b/x-pack/plugins/console_extensions/server/spec/overrides/security.delete_privileges.json
deleted file mode 100644
index 5486098ff7bd8..0000000000000
--- a/x-pack/plugins/console_extensions/server/spec/overrides/security.delete_privileges.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "security.delete_privileges": {
-    "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/security-api-delete-privilege.html"
-  }
-}
diff --git a/x-pack/plugins/console_extensions/server/spec/overrides/security.put_privileges.json b/x-pack/plugins/console_extensions/server/spec/overrides/security.put_privileges.json
deleted file mode 100644
index 9ebb1046047a7..0000000000000
--- a/x-pack/plugins/console_extensions/server/spec/overrides/security.put_privileges.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "security.put_privileges": {
-    "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/security-api-put-privileges.html"
-  }
-}

From ece82023fe3aa8a50ae873fffd121ab398bc459d Mon Sep 17 00:00:00 2001
From: Melissa Alvarez <melissa.alvarez@elastic.co>
Date: Tue, 24 Mar 2020 19:26:35 -0400
Subject: [PATCH 114/179] [ML] DF Analytics: display multi-class results in
 evaluate panel (#60760)

* update for multiclass confusion matrix

* Limit initial columns shown - add ability to see all

* update colData type and fix trailing col width

* fix wrong size prop passed to icon in explorer

* add missing translation

* show other predicted class column

* update types and add translations
---
 .../anomalies_table/influencers_cell.js       |   4 +-
 .../components/entity_cell/entity_cell.js     |   4 +-
 .../column_data.tsx                           | 130 +++++++++++-------
 .../evaluate_panel.tsx                        |  62 +++++++--
 4 files changed, 137 insertions(+), 63 deletions(-)

diff --git a/x-pack/plugins/ml/public/application/components/anomalies_table/influencers_cell.js b/x-pack/plugins/ml/public/application/components/anomalies_table/influencers_cell.js
index 7d00c9818a1e2..f4b16dab5ef52 100644
--- a/x-pack/plugins/ml/public/application/components/anomalies_table/influencers_cell.js
+++ b/x-pack/plugins/ml/public/application/components/anomalies_table/influencers_cell.js
@@ -56,7 +56,7 @@ export class InfluencersCell extends Component {
               }
             >
               <EuiButtonIcon
-                size="xs"
+                size="s"
                 className="filter-button"
                 onClick={() =>
                   influencerFilter(
@@ -83,7 +83,7 @@ export class InfluencersCell extends Component {
               }
             >
               <EuiButtonIcon
-                size="xs"
+                size="s"
                 className="filter-button"
                 onClick={() =>
                   influencerFilter(
diff --git a/x-pack/plugins/ml/public/application/components/entity_cell/entity_cell.js b/x-pack/plugins/ml/public/application/components/entity_cell/entity_cell.js
index 259e0d335c40f..02a9e569f28a4 100644
--- a/x-pack/plugins/ml/public/application/components/entity_cell/entity_cell.js
+++ b/x-pack/plugins/ml/public/application/components/entity_cell/entity_cell.js
@@ -22,7 +22,7 @@ function getAddFilter({ entityName, entityValue, filter }) {
       }
     >
       <EuiButtonIcon
-        size="xs"
+        size="s"
         className="filter-button"
         onClick={() => filter(entityName, entityValue, '+')}
         iconType="plusInCircle"
@@ -45,7 +45,7 @@ function getRemoveFilter({ entityName, entityValue, filter }) {
       }
     >
       <EuiButtonIcon
-        size="xs"
+        size="s"
         className="filter-button"
         onClick={() => filter(entityName, entityValue, '-')}
         iconType="minusInCircle"
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/classification_exploration/column_data.tsx b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/classification_exploration/column_data.tsx
index baf7fd32b0f60..14493ab024f34 100644
--- a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/classification_exploration/column_data.tsx
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/classification_exploration/column_data.tsx
@@ -4,79 +4,115 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import React from 'react';
-import { ConfusionMatrix, PredictedClass } from '../../../../common/analytics';
+import React, { useState } from 'react';
+import { i18n } from '@kbn/i18n';
+import {
+  EuiButtonEmpty,
+  EuiButtonIcon,
+  EuiDataGridControlColumn,
+  EuiPopover,
+  EuiText,
+} from '@elastic/eui';
+import { ConfusionMatrix } from '../../../../common/analytics';
 
 interface ColumnData {
   actual_class: string;
   actual_class_doc_count: number;
-  predicted_class?: string;
-  count?: number;
-  error_count?: number;
+  [key: string]: string | number;
 }
 
 export const ACTUAL_CLASS_ID = 'actual_class';
+export const OTHER_CLASS_ID = 'other';
+export const MAX_COLUMNS = 6;
 
 export function getColumnData(confusionMatrixData: ConfusionMatrix[]) {
   const colData: Partial<ColumnData[]> = [];
+  const columns: Array<{ id: string; display?: any }> = [
+    {
+      id: ACTUAL_CLASS_ID,
+      display: <span />,
+    },
+  ];
 
-  confusionMatrixData.forEach((classData: any) => {
-    const correctlyPredictedClass = classData.predicted_classes.find(
-      (pc: PredictedClass) => pc.predicted_class === classData.actual_class
-    );
-    const incorrectlyPredictedClass = classData.predicted_classes.find(
-      (pc: PredictedClass) => pc.predicted_class !== classData.actual_class
-    );
+  let showOther = false;
 
-    let accuracy;
-    if (correctlyPredictedClass !== undefined) {
-      accuracy = correctlyPredictedClass.count / classData.actual_class_doc_count;
-      // round to 2 decimal places without converting to string;
-      accuracy = Math.round(accuracy * 100) / 100;
-    }
+  confusionMatrixData.forEach(classData => {
+    const otherCount = classData.other_predicted_class_doc_count;
 
-    let error;
-    if (incorrectlyPredictedClass !== undefined) {
-      error = incorrectlyPredictedClass.count / classData.actual_class_doc_count;
-      error = Math.round(error * 100) / 100;
+    if (otherCount > 0) {
+      showOther = true;
     }
 
-    let col: any = {
+    const col: any = {
       actual_class: classData.actual_class,
       actual_class_doc_count: classData.actual_class_doc_count,
+      other: otherCount,
     };
 
-    if (correctlyPredictedClass !== undefined) {
-      col = {
-        ...col,
-        predicted_class: correctlyPredictedClass.predicted_class,
-        [correctlyPredictedClass.predicted_class]: accuracy,
-        count: correctlyPredictedClass.count,
-        accuracy,
-      };
-    }
+    const predictedClasses = classData.predicted_classes || [];
 
-    if (incorrectlyPredictedClass !== undefined) {
-      col = {
-        ...col,
-        [incorrectlyPredictedClass.predicted_class]: error,
-        error_count: incorrectlyPredictedClass.count,
-      };
+    columns.push({ id: classData.actual_class });
+
+    for (let i = 0; i < predictedClasses.length; i++) {
+      const predictedClass = predictedClasses[i].predicted_class;
+      const predictedClassCount = predictedClasses[i].count;
+      col[predictedClass] = predictedClassCount;
     }
 
     colData.push(col);
   });
 
-  const columns: any = [
+  if (showOther) {
+    columns.push({ id: OTHER_CLASS_ID });
+  }
+
+  return { columns, columnData: colData };
+}
+
+export function getTrailingControlColumns(
+  numColumns: number,
+  setShowFullColumns: any
+): EuiDataGridControlColumn[] {
+  return [
     {
-      id: ACTUAL_CLASS_ID,
-      display: <span />,
+      id: 'actions',
+      width: 60,
+      headerCellRender: () => <span>{`${numColumns} more`}</span>,
+      rowCellRender: function RowCellRender() {
+        const [isPopoverOpen, setIsPopoverOpen] = useState<boolean>(false);
+        return (
+          <EuiPopover
+            isOpen={isPopoverOpen}
+            anchorPosition="upCenter"
+            button={
+              <EuiButtonIcon
+                aria-label={i18n.translate(
+                  'xpack.ml.dataframe.analytics.classificationExploration.showActions',
+                  {
+                    defaultMessage: 'Show actions',
+                  }
+                )}
+                iconType="boxesHorizontal"
+                color="text"
+                onClick={() => setIsPopoverOpen(!isPopoverOpen)}
+              />
+            }
+            closePopover={() => setIsPopoverOpen(false)}
+            ownFocus={true}
+          >
+            <EuiButtonEmpty onClick={() => setShowFullColumns(true)}>
+              <EuiText size="s" grow={false} textAlign="center">
+                {i18n.translate(
+                  'xpack.ml.dataframe.analytics.classificationExploration.showAllColumns',
+                  {
+                    defaultMessage: 'Show all columns',
+                  }
+                )}
+              </EuiText>
+            </EuiButtonEmpty>
+          </EuiPopover>
+        );
+      },
     },
   ];
-
-  colData.forEach((data: any) => {
-    columns.push({ id: data.predicted_class });
-  });
-
-  return { columns, columnData: colData };
 }
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/classification_exploration/evaluate_panel.tsx b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/classification_exploration/evaluate_panel.tsx
index 7bf55f4ecf392..1c5563bdb4f83 100644
--- a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/classification_exploration/evaluate_panel.tsx
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/classification_exploration/evaluate_panel.tsx
@@ -39,7 +39,12 @@ import {
   ANALYSIS_CONFIG_TYPE,
 } from '../../../../common/analytics';
 import { LoadingPanel } from '../loading_panel';
-import { getColumnData, ACTUAL_CLASS_ID } from './column_data';
+import {
+  getColumnData,
+  ACTUAL_CLASS_ID,
+  MAX_COLUMNS,
+  getTrailingControlColumns,
+} from './column_data';
 
 const defaultPanelWidth = 500;
 
@@ -57,6 +62,7 @@ export const EvaluatePanel: FC<Props> = ({ jobConfig, jobStatus, searchQuery })
   const [confusionMatrixData, setConfusionMatrixData] = useState<ConfusionMatrix[]>([]);
   const [columns, setColumns] = useState<any>([]);
   const [columnsData, setColumnsData] = useState<any>([]);
+  const [showFullColumns, setShowFullColumns] = useState<boolean>(false);
   const [popoverContents, setPopoverContents] = useState<any>([]);
   const [docsCount, setDocsCount] = useState<null | number>(null);
   const [error, setError] = useState<null | string>(null);
@@ -168,8 +174,9 @@ export const EvaluatePanel: FC<Props> = ({ jobConfig, jobStatus, searchQuery })
           const colId = children?.props?.columnId;
           const gridItem = columnData[rowIndex];
 
-          if (gridItem !== undefined) {
-            const count = colId === gridItem.actual_class ? gridItem.count : gridItem.error_count;
+          if (gridItem !== undefined && colId !== ACTUAL_CLASS_ID) {
+            // @ts-ignore
+            const count = gridItem[colId];
             return `${count} / ${gridItem.actual_class_doc_count} * 100 = ${cellContentsElement.textContent}`;
           }
 
@@ -203,19 +210,26 @@ export const EvaluatePanel: FC<Props> = ({ jobConfig, jobStatus, searchQuery })
     setCellProps: any;
   }) => {
     const cellValue = columnsData[rowIndex][columnId];
+    const actualCount = columnsData[rowIndex] && columnsData[rowIndex].actual_class_doc_count;
+    let accuracy: number | string = '0%';
+
+    if (columnId !== ACTUAL_CLASS_ID && actualCount) {
+      accuracy = cellValue / actualCount;
+      // round to 2 decimal places without converting to string;
+      accuracy = Math.round(accuracy * 100) / 100;
+      accuracy = `${Math.round(accuracy * 100)}%`;
+    }
     // eslint-disable-next-line react-hooks/rules-of-hooks
     useEffect(() => {
       if (columnId !== ACTUAL_CLASS_ID) {
         setCellProps({
           style: {
-            backgroundColor: `rgba(0, 179, 164, ${cellValue})`,
+            backgroundColor: `rgba(0, 179, 164, ${accuracy})`,
           },
         });
       }
     }, [rowIndex, columnId, setCellProps]);
-    return (
-      <span>{typeof cellValue === 'number' ? `${Math.round(cellValue * 100)}%` : cellValue}</span>
-    );
+    return <span>{columnId === ACTUAL_CLASS_ID ? cellValue : accuracy}</span>;
   };
 
   if (isLoading === true) {
@@ -224,6 +238,15 @@ export const EvaluatePanel: FC<Props> = ({ jobConfig, jobStatus, searchQuery })
 
   const { ELASTIC_WEBSITE_URL, DOC_LINK_VERSION } = docLinks;
 
+  const showTrailingColumns = columnsData.length > MAX_COLUMNS;
+  const extraColumns = columnsData.length - MAX_COLUMNS;
+  const shownColumns =
+    showTrailingColumns === true && showFullColumns === false
+      ? columns.slice(0, MAX_COLUMNS + 1)
+      : columns;
+  const rowCount =
+    showTrailingColumns === true && showFullColumns === false ? MAX_COLUMNS : columnsData.length;
+
   return (
     <EuiPanel
       data-test-subj="mlDFAnalyticsClassificationExplorationEvaluatePanel"
@@ -315,7 +338,7 @@ export const EvaluatePanel: FC<Props> = ({ jobConfig, jobStatus, searchQuery })
             )}
             {/* BEGIN TABLE ELEMENTS */}
             <EuiFlexItem grow={false}>
-              <EuiFlexGroup gutterSize="s" style={{ paddingLeft: '10%', paddingRight: '10%' }}>
+              <EuiFlexGroup gutterSize="s" style={{ paddingLeft: '5%', paddingRight: '5%' }}>
                 <EuiFlexItem grow={false}>
                   <EuiFormRow
                     className="mlDataFrameAnalyticsClassification__actualLabel"
@@ -348,15 +371,30 @@ export const EvaluatePanel: FC<Props> = ({ jobConfig, jobStatus, searchQuery })
                         <EuiFlexItem grow={false} style={{ width: '90%' }}>
                           <EuiDataGrid
                             data-test-subj="mlDFAnalyticsClassificationExplorationConfusionMatrix"
-                            aria-label="Classification confusion matrix"
-                            columns={columns}
+                            aria-label={i18n.translate(
+                              'xpack.ml.dataframe.analytics.classificationExploration.confusionMatrixLabel',
+                              {
+                                defaultMessage: 'Classification confusion matrix',
+                              }
+                            )}
+                            columns={shownColumns}
                             columnVisibility={{ visibleColumns, setVisibleColumns }}
-                            rowCount={columnsData.length}
+                            rowCount={rowCount}
                             renderCellValue={renderCellValue}
                             inMemory={{ level: 'sorting' }}
-                            toolbarVisibility={false}
+                            toolbarVisibility={{
+                              showColumnSelector: true,
+                              showStyleSelector: false,
+                              showFullScreenSelector: false,
+                              showSortSelector: false,
+                            }}
                             popoverContents={popoverContents}
                             gridStyle={{ rowHover: 'none' }}
+                            trailingControlColumns={
+                              showTrailingColumns === true && showFullColumns === false
+                                ? getTrailingControlColumns(extraColumns, setShowFullColumns)
+                                : undefined
+                            }
                           />
                         </EuiFlexItem>
                       </EuiFlexGroup>

From f9d37b392afbe24a36e595ceb1cd754fec83a877 Mon Sep 17 00:00:00 2001
From: patrykkopycinski <patryk.kopycinski@elastic.co>
Date: Wed, 25 Mar 2020 00:49:10 +0100
Subject: [PATCH 115/179] [SIEM] Add rule notifications (#59004)

## Summary

Allow defining notifications that will trigger whenever the rule created new signals.

Requires:
- https://github.com/elastic/kibana/pull/58395
- https://github.com/elastic/kibana/pull/58964
- https://github.com/elastic/kibana/pull/60832


![Screenshot 2020-03-02 at 10 19 18](https://user-images.githubusercontent.com/5188868/75662390-4fe8bf00-5c6f-11ea-943f-591367348b91.png)

![Screenshot 2020-03-02 at 10 13 00](https://user-images.githubusercontent.com/5188868/75662421-5e36db00-5c6f-11ea-9317-d158cddf4344.png)


### Checklist

Delete any items that are not applicable to this PR.

- [ ] Any text added follows [EUI's writing guidelines](https://elastic.github.io/eui/#/guidelines/writing), uses sentence case text and includes [i18n support](https://github.com/elastic/kibana/blob/master/packages/kbn-i18n/README.md)
- [ ] [Documentation](https://github.com/elastic/kibana/blob/master/CONTRIBUTING.md#writing-documentation) was added for features that require explanation or tutorials
- [ ] [Unit or functional tests](https://github.com/elastic/kibana/blob/master/CONTRIBUTING.md#cross-browser-compatibility) were updated or added to match the most common scenarios
- [ ] This was checked for [keyboard-only and screenreader accessibility](https://developer.mozilla.org/en-US/docs/Learn/Tools_and_testing/Cross_browser_testing/Accessibility#Accessibility_testing_checklist)
- [ ] This renders correctly on smaller devices using a responsive layout. (You can test this [in your browser](https://www.browserstack.com/guide/responsive-testing-on-local-server)
- [ ] This was checked for cross-browser compatibility, [including a check against IE11](https://github.com/elastic/kibana/blob/master/CONTRIBUTING.md#cross-browser-compatibility)

### For maintainers

- [ ] This was checked for breaking API changes and was [labeled appropriately](https://github.com/elastic/kibana/blob/master/CONTRIBUTING.md#release-notes-process)
---
 .../legacy/plugins/siem/common/constants.ts   |  12 ++
 .../siem/cypress/screens/create_new_rule.ts   |   7 +-
 .../siem/cypress/tasks/create_new_rule.ts     |   2 +
 .../detection_engine/rules/api.test.ts        |   4 +-
 .../containers/detection_engine/rules/mock.ts |   7 +
 .../detection_engine/rules/types.ts           |  29 ++-
 .../detection_engine/rules/use_rule.test.tsx  |   2 +
 .../detection_engine/rules/use_rules.test.tsx |   4 +
 .../rules/all/__mocks__/mock.ts               |  17 +-
 .../__snapshots__/index.test.tsx.snap         |  28 +++
 .../rules/components/next_step/index.test.tsx |  16 ++
 .../rules/components/next_step/index.tsx      |  32 +++
 .../components/rule_actions_field/index.tsx   |  86 ++++++++
 .../components/step_about_rule/index.test.tsx |  11 ++
 .../components/step_about_rule/index.tsx      |  34 +---
 .../step_about_rule_details/index.tsx         |  15 +-
 .../components/step_define_rule/index.tsx     |  28 +--
 .../components/step_rule_actions/index.tsx    | 184 ++++++++++++++++++
 .../components/step_rule_actions/schema.tsx   |  29 +++
 .../step_rule_actions/translations.tsx        |  21 ++
 .../components/step_schedule_rule/index.tsx   |  57 ++----
 .../throttle_select_field/index.tsx           |  36 ++++
 .../rules/create/helpers.test.ts              | 165 +++++++++++++++-
 .../detection_engine/rules/create/helpers.ts  |  47 ++++-
 .../detection_engine/rules/create/index.tsx   |  88 +++++++--
 .../detection_engine/rules/edit/index.tsx     |  90 ++++++++-
 .../detection_engine/rules/helpers.test.tsx   |  35 +++-
 .../pages/detection_engine/rules/helpers.tsx  |  74 ++++++-
 .../detection_engine/rules/translations.ts    |   8 +
 .../pages/detection_engine/rules/types.ts     |  21 +-
 .../plugins/siem/public/shared_imports.ts     |   5 +-
 .../notifications/build_signals_query.test.ts |   2 +-
 .../notifications/build_signals_query.ts      |   2 +-
 .../create_notifications.test.ts              |   2 +-
 .../notifications/get_signals_count.ts        |   6 +-
 .../rules_notification_alert_type.test.ts     |   2 +-
 .../rules_notification_alert_type.ts          |   4 +-
 .../schedule_notification_actions.ts          |   8 +-
 .../update_notifications.test.ts              |   2 +-
 .../notifications/utils.test.ts               |   2 +-
 .../detection_engine/notifications/utils.ts   |   6 +-
 .../routes/__mocks__/request_responses.ts     |   5 +-
 .../signals/signal_rule_alert_type.ts         |   3 +-
 43 files changed, 1054 insertions(+), 184 deletions(-)
 create mode 100644 x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/next_step/__snapshots__/index.test.tsx.snap
 create mode 100644 x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/next_step/index.test.tsx
 create mode 100644 x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/next_step/index.tsx
 create mode 100644 x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/rule_actions_field/index.tsx
 create mode 100644 x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/step_rule_actions/index.tsx
 create mode 100644 x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/step_rule_actions/schema.tsx
 create mode 100644 x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/step_rule_actions/translations.tsx
 create mode 100644 x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/throttle_select_field/index.tsx

diff --git a/x-pack/legacy/plugins/siem/common/constants.ts b/x-pack/legacy/plugins/siem/common/constants.ts
index eb22c0bdf93c3..85c00562f986b 100644
--- a/x-pack/legacy/plugins/siem/common/constants.ts
+++ b/x-pack/legacy/plugins/siem/common/constants.ts
@@ -65,6 +65,8 @@ export const INTERNAL_IDENTIFIER = '__internal';
 export const INTERNAL_RULE_ID_KEY = `${INTERNAL_IDENTIFIER}_rule_id`;
 export const INTERNAL_RULE_ALERT_ID_KEY = `${INTERNAL_IDENTIFIER}_rule_alert_id`;
 export const INTERNAL_IMMUTABLE_KEY = `${INTERNAL_IDENTIFIER}_immutable`;
+export const INTERNAL_NOTIFICATION_ID_KEY = `${INTERNAL_IDENTIFIER}_notification_id`;
+export const INTERNAL_NOTIFICATION_RULE_ID_KEY = `${INTERNAL_IDENTIFIER}_notification_rule_id`;
 
 /**
  * Detection engine routes
@@ -99,4 +101,14 @@ export const UNAUTHENTICATED_USER = 'Unauthenticated';
  */
 export const MINIMUM_ML_LICENSE = 'platinum';
 
+/*
+  Rule notifications options
+*/
+export const NOTIFICATION_SUPPORTED_ACTION_TYPES_IDS = [
+  '.email',
+  '.slack',
+  '.pagerduty',
+  '.webhook',
+];
+export const NOTIFICATION_THROTTLE_NO_ACTIONS = 'no_actions';
 export const NOTIFICATION_THROTTLE_RULE = 'rule';
diff --git a/x-pack/legacy/plugins/siem/cypress/screens/create_new_rule.ts b/x-pack/legacy/plugins/siem/cypress/screens/create_new_rule.ts
index 1ac9278c3ce1c..a61dc3fe61814 100644
--- a/x-pack/legacy/plugins/siem/cypress/screens/create_new_rule.ts
+++ b/x-pack/legacy/plugins/siem/cypress/screens/create_new_rule.ts
@@ -20,7 +20,9 @@ export const CREATE_AND_ACTIVATE_BTN = '[data-test-subj="create-activate"]';
 
 export const CUSTOM_QUERY_INPUT = '[data-test-subj="queryInput"]';
 
-export const DEFINE_CONTINUE_BUTTON = '[data-test-subj="continue"]';
+export const DEFINE_CONTINUE_BUTTON = '[data-test-subj="define-continue"]';
+
+export const SCHEDULE_CONTINUE_BUTTON = '[data-test-subj="schedule-continue"]';
 
 export const FALSE_POSITIVES_INPUT =
   '[data-test-subj="detectionEngineStepAboutRuleFalsePositives"] input';
@@ -43,7 +45,8 @@ export const RULE_DESCRIPTION_INPUT =
 export const RULE_NAME_INPUT =
   '[data-test-subj="detectionEngineStepAboutRuleName"] [data-test-subj="input"]';
 
-export const SEVERITY_DROPDOWN = '[data-test-subj="select"]';
+export const SEVERITY_DROPDOWN =
+  '[data-test-subj="detectionEngineStepAboutRuleSeverity"] [data-test-subj="select"]';
 
 export const TAGS_INPUT =
   '[data-test-subj="detectionEngineStepAboutRuleTags"] [data-test-subj="comboBoxSearchInput"]';
diff --git a/x-pack/legacy/plugins/siem/cypress/tasks/create_new_rule.ts b/x-pack/legacy/plugins/siem/cypress/tasks/create_new_rule.ts
index 6bd5e0887e2fc..ccaa065754b5b 100644
--- a/x-pack/legacy/plugins/siem/cypress/tasks/create_new_rule.ts
+++ b/x-pack/legacy/plugins/siem/cypress/tasks/create_new_rule.ts
@@ -21,11 +21,13 @@ import {
   REFERENCE_URLS_INPUT,
   RULE_DESCRIPTION_INPUT,
   RULE_NAME_INPUT,
+  SCHEDULE_CONTINUE_BUTTON,
   SEVERITY_DROPDOWN,
   TAGS_INPUT,
 } from '../screens/create_new_rule';
 
 export const createAndActivateRule = () => {
+  cy.get(SCHEDULE_CONTINUE_BUTTON).click({ force: true });
   cy.get(CREATE_AND_ACTIVATE_BTN).click({ force: true });
   cy.get(CREATE_AND_ACTIVATE_BTN).should('not.exist');
 };
diff --git a/x-pack/legacy/plugins/siem/public/containers/detection_engine/rules/api.test.ts b/x-pack/legacy/plugins/siem/public/containers/detection_engine/rules/api.test.ts
index 8fdc6a67f7d71..e8019659d49c6 100644
--- a/x-pack/legacy/plugins/siem/public/containers/detection_engine/rules/api.test.ts
+++ b/x-pack/legacy/plugins/siem/public/containers/detection_engine/rules/api.test.ts
@@ -39,7 +39,7 @@ describe('Detections Rules API', () => {
       await addRule({ rule: ruleMock, signal: abortCtrl.signal });
       expect(fetchMock).toHaveBeenCalledWith('/api/detection_engine/rules', {
         body:
-          '{"description":"some desc","enabled":true,"false_positives":[],"filters":[],"from":"now-360s","index":["apm-*-transaction*","auditbeat-*","endgame-*","filebeat-*","packetbeat-*","winlogbeat-*"],"interval":"5m","rule_id":"bbd3106e-b4b5-4d7c-a1a2-47531d6a2baf","language":"kuery","risk_score":75,"name":"Test rule","query":"user.email: \'root@elastic.co\'","references":[],"severity":"high","tags":["APM"],"to":"now","type":"query","threat":[]}',
+          '{"description":"some desc","enabled":true,"false_positives":[],"filters":[],"from":"now-360s","index":["apm-*-transaction*","auditbeat-*","endgame-*","filebeat-*","packetbeat-*","winlogbeat-*"],"interval":"5m","rule_id":"bbd3106e-b4b5-4d7c-a1a2-47531d6a2baf","language":"kuery","risk_score":75,"name":"Test rule","query":"user.email: \'root@elastic.co\'","references":[],"severity":"high","tags":["APM"],"to":"now","type":"query","threat":[],"throttle":null}',
         method: 'POST',
         signal: abortCtrl.signal,
       });
@@ -291,7 +291,7 @@ describe('Detections Rules API', () => {
       await duplicateRules({ rules: rulesMock.data });
       expect(fetchMock).toHaveBeenCalledWith('/api/detection_engine/rules/_bulk_create', {
         body:
-          '[{"description":"Elastic Endpoint detected Credential Dumping. Click the Elastic Endpoint icon in the event.module column or the link in the rule.reference column in the External Alerts tab of the SIEM Detections page for additional information.","enabled":false,"false_positives":[],"from":"now-660s","index":["endgame-*"],"interval":"10m","language":"kuery","output_index":".siem-signals-default","max_signals":100,"risk_score":73,"name":"Credential Dumping - Detected - Elastic Endpoint [Duplicate]","query":"event.kind:alert and event.module:endgame and event.action:cred_theft_event and endgame.metadata.type:detection","filters":[],"references":[],"severity":"high","tags":["Elastic","Endpoint"],"to":"now","type":"query","threat":[],"version":1},{"description":"Elastic Endpoint detected an Adversary Behavior. Click the Elastic Endpoint icon in the event.module column or the link in the rule.reference column in the External Alerts tab of the SIEM Detections page for additional information.","enabled":false,"false_positives":[],"from":"now-660s","index":["endgame-*"],"interval":"10m","language":"kuery","output_index":".siem-signals-default","max_signals":100,"risk_score":47,"name":"Adversary Behavior - Detected - Elastic Endpoint [Duplicate]","query":"event.kind:alert and event.module:endgame and event.action:rules_engine_event","filters":[],"references":[],"severity":"medium","tags":["Elastic","Endpoint"],"to":"now","type":"query","threat":[],"version":1}]',
+          '[{"actions":[],"description":"Elastic Endpoint detected Credential Dumping. Click the Elastic Endpoint icon in the event.module column or the link in the rule.reference column in the External Alerts tab of the SIEM Detections page for additional information.","enabled":false,"false_positives":[],"from":"now-660s","index":["endgame-*"],"interval":"10m","language":"kuery","output_index":".siem-signals-default","max_signals":100,"risk_score":73,"name":"Credential Dumping - Detected - Elastic Endpoint [Duplicate]","query":"event.kind:alert and event.module:endgame and event.action:cred_theft_event and endgame.metadata.type:detection","filters":[],"references":[],"severity":"high","tags":["Elastic","Endpoint"],"to":"now","type":"query","threat":[],"throttle":null,"version":1},{"actions":[],"description":"Elastic Endpoint detected an Adversary Behavior. Click the Elastic Endpoint icon in the event.module column or the link in the rule.reference column in the External Alerts tab of the SIEM Detections page for additional information.","enabled":false,"false_positives":[],"from":"now-660s","index":["endgame-*"],"interval":"10m","language":"kuery","output_index":".siem-signals-default","max_signals":100,"risk_score":47,"name":"Adversary Behavior - Detected - Elastic Endpoint [Duplicate]","query":"event.kind:alert and event.module:endgame and event.action:rules_engine_event","filters":[],"references":[],"severity":"medium","tags":["Elastic","Endpoint"],"to":"now","type":"query","threat":[],"throttle":null,"version":1}]',
         method: 'POST',
       });
     });
diff --git a/x-pack/legacy/plugins/siem/public/containers/detection_engine/rules/mock.ts b/x-pack/legacy/plugins/siem/public/containers/detection_engine/rules/mock.ts
index 51526c0ab9949..59782e8a36338 100644
--- a/x-pack/legacy/plugins/siem/public/containers/detection_engine/rules/mock.ts
+++ b/x-pack/legacy/plugins/siem/public/containers/detection_engine/rules/mock.ts
@@ -32,9 +32,11 @@ export const ruleMock: NewRule = {
   to: 'now',
   type: 'query',
   threat: [],
+  throttle: null,
 };
 
 export const savedRuleMock: Rule = {
+  actions: [],
   created_at: 'mm/dd/yyyyTHH:MM:sssz',
   created_by: 'mockUser',
   description: 'some desc',
@@ -65,6 +67,7 @@ export const savedRuleMock: Rule = {
   to: 'now',
   type: 'query',
   threat: [],
+  throttle: null,
   updated_at: 'mm/dd/yyyyTHH:MM:sssz',
   updated_by: 'mockUser',
 };
@@ -75,6 +78,7 @@ export const rulesMock: FetchRulesResponse = {
   total: 2,
   data: [
     {
+      actions: [],
       created_at: '2020-02-14T19:49:28.178Z',
       updated_at: '2020-02-14T19:49:28.320Z',
       created_by: 'elastic',
@@ -103,9 +107,11 @@ export const rulesMock: FetchRulesResponse = {
       to: 'now',
       type: 'query',
       threat: [],
+      throttle: null,
       version: 1,
     },
     {
+      actions: [],
       created_at: '2020-02-14T19:49:28.189Z',
       updated_at: '2020-02-14T19:49:28.326Z',
       created_by: 'elastic',
@@ -133,6 +139,7 @@ export const rulesMock: FetchRulesResponse = {
       to: 'now',
       type: 'query',
       threat: [],
+      throttle: null,
       version: 1,
     },
   ],
diff --git a/x-pack/legacy/plugins/siem/public/containers/detection_engine/rules/types.ts b/x-pack/legacy/plugins/siem/public/containers/detection_engine/rules/types.ts
index c75d7b78cf92f..3ec3e6d2b3036 100644
--- a/x-pack/legacy/plugins/siem/public/containers/detection_engine/rules/types.ts
+++ b/x-pack/legacy/plugins/siem/public/containers/detection_engine/rules/types.ts
@@ -13,6 +13,19 @@ export const RuleTypeSchema = t.keyof({
 });
 export type RuleType = t.TypeOf<typeof RuleTypeSchema>;
 
+/**
+ * Params is an "record", since it is a type of AlertActionParams which is action templates.
+ * @see x-pack/plugins/alerting/common/alert.ts
+ */
+export const action = t.exact(
+  t.type({
+    group: t.string,
+    id: t.string,
+    action_type_id: t.string,
+    params: t.record(t.string, t.any),
+  })
+);
+
 export const NewRuleSchema = t.intersection([
   t.type({
     description: t.string,
@@ -24,6 +37,7 @@ export const NewRuleSchema = t.intersection([
     type: RuleTypeSchema,
   }),
   t.partial({
+    actions: t.array(action),
     anomaly_threshold: t.number,
     created_by: t.string,
     false_positives: t.array(t.string),
@@ -40,6 +54,7 @@ export const NewRuleSchema = t.intersection([
     saved_id: t.string,
     tags: t.array(t.string),
     threat: t.array(t.unknown),
+    throttle: t.union([t.string, t.null]),
     to: t.string,
     updated_by: t.string,
     note: t.string,
@@ -54,9 +69,15 @@ export interface AddRulesProps {
   signal: AbortSignal;
 }
 
-const MetaRule = t.type({
-  from: t.string,
-});
+const MetaRule = t.intersection([
+  t.type({
+    from: t.string,
+  }),
+  t.partial({
+    throttle: t.string,
+    kibanaSiemAppUrl: t.string,
+  }),
+]);
 
 export const RuleSchema = t.intersection([
   t.type({
@@ -81,6 +102,8 @@ export const RuleSchema = t.intersection([
     threat: t.array(t.unknown),
     updated_at: t.string,
     updated_by: t.string,
+    actions: t.array(action),
+    throttle: t.union([t.string, t.null]),
   }),
   t.partial({
     anomaly_threshold: t.number,
diff --git a/x-pack/legacy/plugins/siem/public/containers/detection_engine/rules/use_rule.test.tsx b/x-pack/legacy/plugins/siem/public/containers/detection_engine/rules/use_rule.test.tsx
index e0bf2c4907370..ab09f796ad49b 100644
--- a/x-pack/legacy/plugins/siem/public/containers/detection_engine/rules/use_rule.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/containers/detection_engine/rules/use_rule.test.tsx
@@ -31,6 +31,7 @@ describe('useRule', () => {
       expect(result.current).toEqual([
         false,
         {
+          actions: [],
           created_at: 'mm/dd/yyyyTHH:MM:sssz',
           created_by: 'mockUser',
           description: 'some desc',
@@ -59,6 +60,7 @@ describe('useRule', () => {
           severity: 'high',
           tags: ['APM'],
           threat: [],
+          throttle: null,
           to: 'now',
           type: 'query',
           updated_at: 'mm/dd/yyyyTHH:MM:sssz',
diff --git a/x-pack/legacy/plugins/siem/public/containers/detection_engine/rules/use_rules.test.tsx b/x-pack/legacy/plugins/siem/public/containers/detection_engine/rules/use_rules.test.tsx
index 242d715e20f77..5d13b57f862bc 100644
--- a/x-pack/legacy/plugins/siem/public/containers/detection_engine/rules/use_rules.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/containers/detection_engine/rules/use_rules.test.tsx
@@ -58,6 +58,7 @@ describe('useRules', () => {
         {
           data: [
             {
+              actions: [],
               created_at: '2020-02-14T19:49:28.178Z',
               created_by: 'elastic',
               description:
@@ -82,6 +83,7 @@ describe('useRules', () => {
               severity: 'high',
               tags: ['Elastic', 'Endpoint'],
               threat: [],
+              throttle: null,
               to: 'now',
               type: 'query',
               updated_at: '2020-02-14T19:49:28.320Z',
@@ -89,6 +91,7 @@ describe('useRules', () => {
               version: 1,
             },
             {
+              actions: [],
               created_at: '2020-02-14T19:49:28.189Z',
               created_by: 'elastic',
               description:
@@ -113,6 +116,7 @@ describe('useRules', () => {
               severity: 'medium',
               tags: ['Elastic', 'Endpoint'],
               threat: [],
+              throttle: null,
               to: 'now',
               type: 'query',
               updated_at: '2020-02-14T19:49:28.326Z',
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/all/__mocks__/mock.ts b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/all/__mocks__/mock.ts
index a6aefefedd5c3..6d76fde49634d 100644
--- a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/all/__mocks__/mock.ts
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/all/__mocks__/mock.ts
@@ -6,7 +6,7 @@
 
 import { esFilters } from '../../../../../../../../../../src/plugins/data/public';
 import { Rule, RuleError } from '../../../../../containers/detection_engine/rules';
-import { AboutStepRule, DefineStepRule, ScheduleStepRule } from '../../types';
+import { AboutStepRule, ActionsStepRule, DefineStepRule, ScheduleStepRule } from '../../types';
 import { FieldValueQueryBar } from '../../components/query_bar';
 
 export const mockQueryBar: FieldValueQueryBar = {
@@ -40,6 +40,7 @@ export const mockQueryBar: FieldValueQueryBar = {
 };
 
 export const mockRule = (id: string): Rule => ({
+  actions: [],
   created_at: '2020-01-10T21:11:45.839Z',
   updated_at: '2020-01-10T21:11:45.839Z',
   created_by: 'elastic',
@@ -70,11 +71,13 @@ export const mockRule = (id: string): Rule => ({
   to: 'now',
   type: 'saved_query',
   threat: [],
+  throttle: null,
   note: '# this is some markdown documentation',
   version: 1,
 });
 
 export const mockRuleWithEverything = (id: string): Rule => ({
+  actions: [],
   created_at: '2020-01-10T21:11:45.839Z',
   updated_at: '2020-01-10T21:11:45.839Z',
   created_by: 'elastic',
@@ -142,6 +145,7 @@ export const mockRuleWithEverything = (id: string): Rule => ({
       ],
     },
   ],
+  throttle: null,
   note: '# this is some markdown documentation',
   version: 1,
 });
@@ -175,6 +179,14 @@ export const mockAboutStepRule = (isNew = false): AboutStepRule => ({
   note: '# this is some markdown documentation',
 });
 
+export const mockActionsStepRule = (isNew = false, enabled = false): ActionsStepRule => ({
+  isNew,
+  actions: [],
+  kibanaSiemAppUrl: 'http://localhost:5601/app/siem',
+  enabled,
+  throttle: null,
+});
+
 export const mockDefineStepRule = (isNew = false): DefineStepRule => ({
   isNew,
   ruleType: 'query',
@@ -188,9 +200,8 @@ export const mockDefineStepRule = (isNew = false): DefineStepRule => ({
   },
 });
 
-export const mockScheduleStepRule = (isNew = false, enabled = false): ScheduleStepRule => ({
+export const mockScheduleStepRule = (isNew = false): ScheduleStepRule => ({
   isNew,
-  enabled,
   interval: '5m',
   from: '6m',
   to: 'now',
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/next_step/__snapshots__/index.test.tsx.snap b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/next_step/__snapshots__/index.test.tsx.snap
new file mode 100644
index 0000000000000..433b38773c14a
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/next_step/__snapshots__/index.test.tsx.snap
@@ -0,0 +1,28 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`NextStep renders correctly against snapshot 1`] = `
+<Fragment>
+  <EuiHorizontalRule
+    margin="m"
+  />
+  <EuiFlexGroup
+    alignItems="center"
+    gutterSize="xs"
+    justifyContent="flexEnd"
+    responsive={false}
+  >
+    <EuiFlexItem
+      grow={false}
+    >
+      <EuiButton
+        data-test-subj="nextStep-continue"
+        fill={true}
+        isDisabled={false}
+        onClick={[MockFunction]}
+      >
+        Continue
+      </EuiButton>
+    </EuiFlexItem>
+  </EuiFlexGroup>
+</Fragment>
+`;
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/next_step/index.test.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/next_step/index.test.tsx
new file mode 100644
index 0000000000000..552ede90cd018
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/next_step/index.test.tsx
@@ -0,0 +1,16 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { shallow } from 'enzyme';
+import React from 'react';
+import { NextStep } from './index';
+
+describe('NextStep', () => {
+  test('renders correctly against snapshot', () => {
+    const wrapper = shallow(<NextStep onClick={jest.fn()} isDisabled={false} />);
+    expect(wrapper).toMatchSnapshot();
+  });
+});
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/next_step/index.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/next_step/index.tsx
new file mode 100644
index 0000000000000..11332e7af9266
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/next_step/index.tsx
@@ -0,0 +1,32 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React from 'react';
+import { EuiHorizontalRule, EuiFlexGroup, EuiFlexItem, EuiButton } from '@elastic/eui';
+import * as RuleI18n from '../../translations';
+
+interface NextStepProps {
+  onClick: () => Promise<void>;
+  isDisabled: boolean;
+  dataTestSubj?: string;
+}
+
+export const NextStep = React.memo<NextStepProps>(
+  ({ onClick, isDisabled, dataTestSubj = 'nextStep-continue' }) => (
+    <>
+      <EuiHorizontalRule margin="m" />
+      <EuiFlexGroup alignItems="center" justifyContent="flexEnd" gutterSize="xs" responsive={false}>
+        <EuiFlexItem grow={false}>
+          <EuiButton fill onClick={onClick} isDisabled={isDisabled} data-test-subj={dataTestSubj}>
+            {RuleI18n.CONTINUE}
+          </EuiButton>
+        </EuiFlexItem>
+      </EuiFlexGroup>
+    </>
+  )
+);
+
+NextStep.displayName = 'NextStep';
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/rule_actions_field/index.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/rule_actions_field/index.tsx
new file mode 100644
index 0000000000000..a746d381c494c
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/rule_actions_field/index.tsx
@@ -0,0 +1,86 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * 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, useEffect, useState } from 'react';
+import deepMerge from 'deepmerge';
+
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import { loadActionTypes } from '../../../../../../../../../plugins/triggers_actions_ui/public/application/lib/action_connector_api';
+import { SelectField } from '../../../../../shared_imports';
+import {
+  ActionForm,
+  ActionType,
+} from '../../../../../../../../../plugins/triggers_actions_ui/public';
+import { AlertAction } from '../../../../../../../../../plugins/alerting/common';
+import { useKibana } from '../../../../../lib/kibana';
+import { NOTIFICATION_SUPPORTED_ACTION_TYPES_IDS } from '../../../../../../common/constants';
+
+type ThrottleSelectField = typeof SelectField;
+
+const DEFAULT_ACTION_GROUP_ID = 'default';
+const DEFAULT_ACTION_MESSAGE =
+  'Rule {{context.rule.name}} generated {{state.signals_count}} signals';
+
+export const RuleActionsField: ThrottleSelectField = ({ field, messageVariables }) => {
+  const [supportedActionTypes, setSupportedActionTypes] = useState<ActionType[] | undefined>();
+  const {
+    http,
+    triggers_actions_ui: { actionTypeRegistry },
+    notifications,
+  } = useKibana().services;
+
+  const setActionIdByIndex = useCallback(
+    (id: string, index: number) => {
+      const updatedActions = [...(field.value as Array<Partial<AlertAction>>)];
+      updatedActions[index] = deepMerge(updatedActions[index], { id });
+      field.setValue(updatedActions);
+    },
+    [field]
+  );
+
+  const setAlertProperty = useCallback(
+    (updatedActions: AlertAction[]) => field.setValue(updatedActions),
+    [field]
+  );
+
+  const setActionParamsProperty = useCallback(
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    (key: string, value: any, index: number) => {
+      const updatedActions = [...(field.value as AlertAction[])];
+      updatedActions[index].params[key] = value;
+      field.setValue(updatedActions);
+    },
+    [field]
+  );
+
+  useEffect(() => {
+    (async function() {
+      const actionTypes = await loadActionTypes({ http });
+      const supportedTypes = actionTypes.filter(actionType =>
+        NOTIFICATION_SUPPORTED_ACTION_TYPES_IDS.includes(actionType.id)
+      );
+      setSupportedActionTypes(supportedTypes);
+    })();
+  }, []);
+
+  if (!supportedActionTypes) return <></>;
+
+  return (
+    <ActionForm
+      actions={field.value as AlertAction[]}
+      messageVariables={messageVariables}
+      defaultActionGroupId={DEFAULT_ACTION_GROUP_ID}
+      setActionIdByIndex={setActionIdByIndex}
+      setAlertProperty={setAlertProperty}
+      setActionParamsProperty={setActionParamsProperty}
+      http={http}
+      actionTypeRegistry={actionTypeRegistry}
+      actionTypes={supportedActionTypes}
+      defaultActionMessage={DEFAULT_ACTION_MESSAGE}
+      toastNotifications={notifications.toasts}
+    />
+  );
+};
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/step_about_rule/index.test.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/step_about_rule/index.test.tsx
index 0ed479e235151..3c28e697789ac 100644
--- a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/step_about_rule/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/step_about_rule/index.test.tsx
@@ -15,6 +15,17 @@ import { stepAboutDefaultValue } from './default_value';
 
 const theme = () => ({ eui: euiDarkVars, darkMode: true });
 
+/* eslint-disable no-console */
+// Silence until enzyme fixed to use ReactTestUtils.act()
+const originalError = console.error;
+beforeAll(() => {
+  console.error = jest.fn();
+});
+afterAll(() => {
+  console.error = originalError;
+});
+/* eslint-enable no-console */
+
 describe('StepAboutRuleComponent', () => {
   test('it renders StepRuleDescription if isReadOnlyView is true and "name" property exists', () => {
     const wrapper = shallow(
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/step_about_rule/index.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/step_about_rule/index.tsx
index 58b6ca54f5bbd..eaf543780d777 100644
--- a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/step_about_rule/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/step_about_rule/index.tsx
@@ -4,22 +4,13 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import {
-  EuiAccordion,
-  EuiButton,
-  EuiHorizontalRule,
-  EuiFlexGroup,
-  EuiFlexItem,
-  EuiSpacer,
-  EuiButtonEmpty,
-} from '@elastic/eui';
+import { EuiAccordion, EuiFlexItem, EuiSpacer, EuiButtonEmpty } from '@elastic/eui';
 import React, { FC, memo, useCallback, useEffect, useState } from 'react';
 import styled from 'styled-components';
 import deepEqual from 'fast-deep-equal';
 
 import { setFieldValue } from '../../helpers';
 import { RuleStepProps, RuleStep, AboutStepRule } from '../../types';
-import * as RuleI18n from '../../translations';
 import { AddItem } from '../add_item_form';
 import { StepRuleDescription } from '../description_step';
 import { AddMitreThreat } from '../mitre';
@@ -38,6 +29,7 @@ import { isUrlInvalid } from './helpers';
 import { schema } from './schema';
 import * as I18n from './translations';
 import { StepContentWrapper } from '../step_content_wrapper';
+import { NextStep } from '../next_step';
 import { MarkdownEditorForm } from '../../../../../components/markdown_editor/form';
 
 const CommonUseField = getUseField({ component: Field });
@@ -276,27 +268,9 @@ const StepAboutRuleComponent: FC<StepAboutRuleProps> = ({
           </FormDataProvider>
         </Form>
       </StepContentWrapper>
+
       {!isUpdateView && (
-        <>
-          <EuiHorizontalRule margin="m" />
-          <EuiFlexGroup
-            alignItems="center"
-            justifyContent="flexEnd"
-            gutterSize="xs"
-            responsive={false}
-          >
-            <EuiFlexItem grow={false}>
-              <EuiButton
-                data-test-subj="about-continue"
-                fill
-                onClick={onSubmit}
-                isDisabled={isLoading}
-              >
-                {RuleI18n.CONTINUE}
-              </EuiButton>
-            </EuiFlexItem>
-          </EuiFlexGroup>
-        </>
+        <NextStep dataTestSubj="about-continue" onClick={onSubmit} isDisabled={isLoading} />
       )}
     </>
   );
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/step_about_rule_details/index.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/step_about_rule_details/index.tsx
index c61566cb841e8..5d9803214fa0a 100644
--- a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/step_about_rule_details/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/step_about_rule_details/index.tsx
@@ -15,7 +15,7 @@ import {
   EuiFlexGroup,
   EuiResizeObserver,
 } from '@elastic/eui';
-import React, { memo, useState } from 'react';
+import React, { memo, useCallback, useState } from 'react';
 import styled from 'styled-components';
 import { isEmpty } from 'lodash/fp';
 
@@ -71,9 +71,12 @@ const StepAboutRuleToggleDetailsComponent: React.FC<StepPanelProps> = ({
   const [selectedToggleOption, setToggleOption] = useState('details');
   const [aboutPanelHeight, setAboutPanelHeight] = useState(0);
 
-  const onResize = (e: { height: number; width: number }) => {
-    setAboutPanelHeight(e.height);
-  };
+  const onResize = useCallback(
+    (e: { height: number; width: number }) => {
+      setAboutPanelHeight(e.height);
+    },
+    [setAboutPanelHeight]
+  );
 
   return (
     <MyPanel>
@@ -85,7 +88,7 @@ const StepAboutRuleToggleDetailsComponent: React.FC<StepPanelProps> = ({
       )}
       {stepData != null && stepDataDetails != null && (
         <FlexGroupFullHeight gutterSize="xs" direction="column">
-          <EuiFlexItem grow={1}>
+          <EuiFlexItem grow={1} key="header">
             <HeaderSection title={i18n.ABOUT_TEXT}>
               {!isEmpty(stepDataDetails.note) && stepDataDetails.note.trim() !== '' && (
                 <EuiButtonGroup
@@ -99,7 +102,7 @@ const StepAboutRuleToggleDetailsComponent: React.FC<StepPanelProps> = ({
               )}
             </HeaderSection>
           </EuiFlexItem>
-          <EuiFlexItem grow={5}>
+          <EuiFlexItem grow={5} key="details">
             {selectedToggleOption === 'details' ? (
               <EuiResizeObserver data-test-subj="stepAboutDetailsContent" onResize={onResize}>
                 {resizeRef => (
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/step_define_rule/index.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/step_define_rule/index.tsx
index 4027c98a52ace..68ca1840871e3 100644
--- a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/step_define_rule/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/step_define_rule/index.tsx
@@ -4,14 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import {
-  EuiButtonEmpty,
-  EuiHorizontalRule,
-  EuiFlexGroup,
-  EuiFlexItem,
-  EuiFormRow,
-  EuiButton,
-} from '@elastic/eui';
+import { EuiButtonEmpty, EuiFormRow } from '@elastic/eui';
 import React, { FC, memo, useCallback, useState, useEffect, useContext } from 'react';
 import styled from 'styled-components';
 import deepEqual from 'fast-deep-equal';
@@ -23,7 +16,6 @@ import { DEFAULT_TIMELINE_TITLE } from '../../../../../components/timeline/trans
 import { MlCapabilitiesContext } from '../../../../../components/ml/permissions/ml_capabilities_provider';
 import { useUiSetting$ } from '../../../../../lib/kibana';
 import { setFieldValue, isMlRule } from '../../helpers';
-import * as RuleI18n from '../../translations';
 import { DefineStepRule, RuleStep, RuleStepProps } from '../../types';
 import { StepRuleDescription } from '../description_step';
 import { QueryBarDefineRule } from '../query_bar';
@@ -32,6 +24,7 @@ import { AnomalyThresholdSlider } from '../anomaly_threshold_slider';
 import { MlJobSelect } from '../ml_job_select';
 import { PickTimeline } from '../pick_timeline';
 import { StepContentWrapper } from '../step_content_wrapper';
+import { NextStep } from '../next_step';
 import {
   Field,
   Form,
@@ -269,22 +262,9 @@ const StepDefineRuleComponent: FC<StepDefineRuleProps> = ({
           </FormDataProvider>
         </Form>
       </StepContentWrapper>
+
       {!isUpdateView && (
-        <>
-          <EuiHorizontalRule margin="m" />
-          <EuiFlexGroup
-            alignItems="center"
-            justifyContent="flexEnd"
-            gutterSize="xs"
-            responsive={false}
-          >
-            <EuiFlexItem grow={false}>
-              <EuiButton fill onClick={onSubmit} isDisabled={isLoading} data-test-subj="continue">
-                {RuleI18n.CONTINUE}
-              </EuiButton>
-            </EuiFlexItem>
-          </EuiFlexGroup>
-        </>
+        <NextStep dataTestSubj="define-continue" onClick={onSubmit} isDisabled={isLoading} />
       )}
     </>
   );
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/step_rule_actions/index.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/step_rule_actions/index.tsx
new file mode 100644
index 0000000000000..9c16a61822662
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/step_rule_actions/index.tsx
@@ -0,0 +1,184 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { EuiHorizontalRule, EuiFlexGroup, EuiFlexItem, EuiButton, EuiSpacer } from '@elastic/eui';
+import React, { FC, memo, useCallback, useEffect, useMemo, useState } from 'react';
+import deepEqual from 'fast-deep-equal';
+
+import { setFieldValue } from '../../helpers';
+import { RuleStep, RuleStepProps, ActionsStepRule } from '../../types';
+import { StepRuleDescription } from '../description_step';
+import { Form, UseField, useForm } from '../../../../../shared_imports';
+import { StepContentWrapper } from '../step_content_wrapper';
+import { ThrottleSelectField, THROTTLE_OPTIONS } from '../throttle_select_field';
+import { RuleActionsField } from '../rule_actions_field';
+import { useKibana } from '../../../../../lib/kibana';
+import { schema } from './schema';
+import * as I18n from './translations';
+
+interface StepRuleActionsProps extends RuleStepProps {
+  defaultValues?: ActionsStepRule | null;
+  actionMessageParams: string[];
+}
+
+const stepActionsDefaultValue = {
+  enabled: true,
+  isNew: true,
+  actions: [],
+  kibanaSiemAppUrl: '',
+  throttle: THROTTLE_OPTIONS[0].value,
+};
+
+const GhostFormField = () => <></>;
+
+const StepRuleActionsComponent: FC<StepRuleActionsProps> = ({
+  addPadding = false,
+  defaultValues,
+  isReadOnlyView,
+  isLoading,
+  isUpdateView = false,
+  setStepData,
+  setForm,
+  actionMessageParams,
+}) => {
+  const [myStepData, setMyStepData] = useState<ActionsStepRule>(stepActionsDefaultValue);
+  const {
+    services: { application },
+  } = useKibana();
+
+  const { form } = useForm({
+    defaultValue: myStepData,
+    options: { stripEmptyFields: false },
+    schema,
+  });
+
+  const kibanaAbsoluteUrl = useMemo(() => application.getUrlForApp('siem', { absolute: true }), [
+    application,
+  ]);
+
+  const onSubmit = useCallback(
+    async (enabled: boolean) => {
+      if (setStepData) {
+        setStepData(RuleStep.ruleActions, null, false);
+        const { isValid: newIsValid, data } = await form.submit();
+        if (newIsValid) {
+          setStepData(RuleStep.ruleActions, { ...data, enabled }, newIsValid);
+          setMyStepData({ ...data, isNew: false } as ActionsStepRule);
+        }
+      }
+    },
+    [form]
+  );
+
+  useEffect(() => {
+    const { isNew, ...initDefaultValue } = myStepData;
+    if (defaultValues != null && !deepEqual(initDefaultValue, defaultValues)) {
+      const myDefaultValues = {
+        ...defaultValues,
+        isNew: false,
+      };
+      setMyStepData(myDefaultValues);
+      setFieldValue(form, schema, myDefaultValues);
+    }
+  }, [defaultValues]);
+
+  useEffect(() => {
+    if (setForm != null) {
+      setForm(RuleStep.ruleActions, form);
+    }
+  }, [form]);
+
+  const updateThrottle = useCallback(throttle => setMyStepData({ ...myStepData, throttle }), [
+    myStepData,
+    setMyStepData,
+  ]);
+
+  const throttleFieldComponentProps = useMemo(
+    () => ({
+      idAria: 'detectionEngineStepRuleActionsThrottle',
+      isDisabled: isLoading,
+      dataTestSubj: 'detectionEngineStepRuleActionsThrottle',
+      hasNoInitialSelection: false,
+      handleChange: updateThrottle,
+      euiFieldProps: {
+        options: THROTTLE_OPTIONS,
+      },
+    }),
+    [isLoading, updateThrottle]
+  );
+
+  return isReadOnlyView && myStepData != null ? (
+    <StepContentWrapper addPadding={addPadding}>
+      <StepRuleDescription schema={schema} data={myStepData} />
+    </StepContentWrapper>
+  ) : (
+    <>
+      <StepContentWrapper addPadding={!isUpdateView}>
+        <Form form={form} data-test-subj="stepRuleActions">
+          <UseField
+            path="throttle"
+            component={ThrottleSelectField}
+            componentProps={throttleFieldComponentProps}
+          />
+          {myStepData.throttle !== stepActionsDefaultValue.throttle && (
+            <>
+              <EuiSpacer />
+              <UseField
+                path="actions"
+                defaultValue={myStepData.actions}
+                component={RuleActionsField}
+                componentProps={{
+                  messageVariables: actionMessageParams,
+                }}
+              />
+              <UseField
+                path="kibanaSiemAppUrl"
+                defaultValue={kibanaAbsoluteUrl}
+                component={GhostFormField}
+              />
+            </>
+          )}
+        </Form>
+      </StepContentWrapper>
+
+      {!isUpdateView && (
+        <>
+          <EuiHorizontalRule margin="m" />
+          <EuiFlexGroup
+            alignItems="center"
+            justifyContent="flexEnd"
+            gutterSize="xs"
+            responsive={false}
+          >
+            <EuiFlexItem grow={false}>
+              <EuiButton
+                fill={false}
+                isDisabled={isLoading}
+                isLoading={isLoading}
+                onClick={onSubmit.bind(null, false)}
+              >
+                {I18n.COMPLETE_WITHOUT_ACTIVATING}
+              </EuiButton>
+            </EuiFlexItem>
+            <EuiFlexItem grow={false}>
+              <EuiButton
+                fill
+                isDisabled={isLoading}
+                isLoading={isLoading}
+                onClick={onSubmit.bind(null, true)}
+                data-test-subj="create-activate"
+              >
+                {I18n.COMPLETE_WITH_ACTIVATING}
+              </EuiButton>
+            </EuiFlexItem>
+          </EuiFlexGroup>
+        </>
+      )}
+    </>
+  );
+};
+
+export const StepRuleActions = memo(StepRuleActionsComponent);
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/step_rule_actions/schema.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/step_rule_actions/schema.tsx
new file mode 100644
index 0000000000000..511427978db3a
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/step_rule_actions/schema.tsx
@@ -0,0 +1,29 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * 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 { FormSchema } from '../../../../../shared_imports';
+
+export const schema: FormSchema = {
+  actions: {},
+  kibanaSiemAppUrl: {},
+  throttle: {
+    label: i18n.translate(
+      'xpack.siem.detectionEngine.createRule.stepRuleActions.fieldThrottleLabel',
+      {
+        defaultMessage: 'Actions frequency',
+      }
+    ),
+    helpText: i18n.translate(
+      'xpack.siem.detectionEngine.createRule.stepRuleActions.fieldThrottleHelpText',
+      {
+        defaultMessage:
+          'Select when automated actions should be performed if a rule evaluates as true.',
+      }
+    ),
+  },
+};
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/step_rule_actions/translations.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/step_rule_actions/translations.tsx
new file mode 100644
index 0000000000000..67bcc1af8150b
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/step_rule_actions/translations.tsx
@@ -0,0 +1,21 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { i18n } from '@kbn/i18n';
+
+export const COMPLETE_WITHOUT_ACTIVATING = i18n.translate(
+  'xpack.siem.detectionEngine.createRule. stepScheduleRule.completeWithoutActivatingTitle',
+  {
+    defaultMessage: 'Create rule without activating it',
+  }
+);
+
+export const COMPLETE_WITH_ACTIVATING = i18n.translate(
+  'xpack.siem.detectionEngine.createRule. stepScheduleRule.completeWithActivatingTitle',
+  {
+    defaultMessage: 'Create & activate rule',
+  }
+);
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/step_schedule_rule/index.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/step_schedule_rule/index.tsx
index e365443a79fb8..de9abcefdea2e 100644
--- a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/step_schedule_rule/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/step_schedule_rule/index.tsx
@@ -4,7 +4,6 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { EuiHorizontalRule, EuiFlexGroup, EuiFlexItem, EuiButton } from '@elastic/eui';
 import React, { FC, memo, useCallback, useEffect, useState } from 'react';
 import deepEqual from 'fast-deep-equal';
 import styled from 'styled-components';
@@ -15,8 +14,8 @@ import { StepRuleDescription } from '../description_step';
 import { ScheduleItem } from '../schedule_item_form';
 import { Form, UseField, useForm } from '../../../../../shared_imports';
 import { StepContentWrapper } from '../step_content_wrapper';
+import { NextStep } from '../next_step';
 import { schema } from './schema';
-import * as I18n from './translations';
 
 interface StepScheduleRuleProps extends RuleStepProps {
   defaultValues?: ScheduleStepRule | null;
@@ -27,7 +26,6 @@ const RestrictedWidthContainer = styled.div`
 `;
 
 const stepScheduleDefaultValue = {
-  enabled: true,
   interval: '5m',
   isNew: true,
   from: '1m',
@@ -51,19 +49,16 @@ const StepScheduleRuleComponent: FC<StepScheduleRuleProps> = ({
     schema,
   });
 
-  const onSubmit = useCallback(
-    async (enabled: boolean) => {
-      if (setStepData) {
-        setStepData(RuleStep.scheduleRule, null, false);
-        const { isValid: newIsValid, data } = await form.submit();
-        if (newIsValid) {
-          setStepData(RuleStep.scheduleRule, { ...data, enabled }, newIsValid);
-          setMyStepData({ ...data, isNew: false } as ScheduleStepRule);
-        }
+  const onSubmit = useCallback(async () => {
+    if (setStepData) {
+      setStepData(RuleStep.scheduleRule, null, false);
+      const { isValid: newIsValid, data } = await form.submit();
+      if (newIsValid) {
+        setStepData(RuleStep.scheduleRule, { ...data }, newIsValid);
+        setMyStepData({ ...data, isNew: false } as ScheduleStepRule);
       }
-    },
-    [form]
-  );
+    }
+  }, [form]);
 
   useEffect(() => {
     const { isNew, ...initDefaultValue } = myStepData;
@@ -118,37 +113,7 @@ const StepScheduleRuleComponent: FC<StepScheduleRuleProps> = ({
       </StepContentWrapper>
 
       {!isUpdateView && (
-        <>
-          <EuiHorizontalRule margin="m" />
-          <EuiFlexGroup
-            alignItems="center"
-            justifyContent="flexEnd"
-            gutterSize="xs"
-            responsive={false}
-          >
-            <EuiFlexItem grow={false}>
-              <EuiButton
-                fill={false}
-                isDisabled={isLoading}
-                isLoading={isLoading}
-                onClick={onSubmit.bind(null, false)}
-              >
-                {I18n.COMPLETE_WITHOUT_ACTIVATING}
-              </EuiButton>
-            </EuiFlexItem>
-            <EuiFlexItem grow={false}>
-              <EuiButton
-                fill
-                isDisabled={isLoading}
-                isLoading={isLoading}
-                onClick={onSubmit.bind(null, true)}
-                data-test-subj="create-activate"
-              >
-                {I18n.COMPLETE_WITH_ACTIVATING}
-              </EuiButton>
-            </EuiFlexItem>
-          </EuiFlexGroup>
-        </>
+        <NextStep dataTestSubj="schedule-continue" onClick={onSubmit} isDisabled={isLoading} />
       )}
     </>
   );
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/throttle_select_field/index.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/throttle_select_field/index.tsx
new file mode 100644
index 0000000000000..0cf15c41a0f91
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/throttle_select_field/index.tsx
@@ -0,0 +1,36 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React, { useCallback } from 'react';
+
+import {
+  NOTIFICATION_THROTTLE_RULE,
+  NOTIFICATION_THROTTLE_NO_ACTIONS,
+} from '../../../../../../common/constants';
+import { SelectField } from '../../../../../shared_imports';
+
+export const THROTTLE_OPTIONS = [
+  { value: NOTIFICATION_THROTTLE_NO_ACTIONS, text: 'Perform no actions' },
+  { value: NOTIFICATION_THROTTLE_RULE, text: 'On each rule execution' },
+  { value: '1h', text: 'Hourly' },
+  { value: '1d', text: 'Daily' },
+  { value: '7d', text: 'Weekly' },
+];
+
+type ThrottleSelectField = typeof SelectField;
+
+export const ThrottleSelectField: ThrottleSelectField = props => {
+  const onChange = useCallback(
+    e => {
+      const throttle = e.target.value;
+      props.field.setValue(throttle);
+      props.handleChange(throttle);
+    },
+    [props.field.setValue, props.handleChange]
+  );
+  const newEuiFieldProps = { ...props.euiFieldProps, onChange };
+  return <SelectField {...props} euiFieldProps={newEuiFieldProps} />;
+};
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/create/helpers.test.ts b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/create/helpers.test.ts
index dc0459c54adb0..212147ec6d4d8 100644
--- a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/create/helpers.test.ts
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/create/helpers.test.ts
@@ -9,7 +9,9 @@ import {
   DefineStepRuleJson,
   ScheduleStepRuleJson,
   AboutStepRuleJson,
+  ActionsStepRuleJson,
   AboutStepRule,
+  ActionsStepRule,
   ScheduleStepRule,
   DefineStepRule,
 } from '../types';
@@ -18,6 +20,7 @@ import {
   formatDefineStepData,
   formatScheduleStepData,
   formatAboutStepData,
+  formatActionsStepData,
   formatRule,
   filterRuleFieldsForType,
 } from './helpers';
@@ -26,6 +29,7 @@ import {
   mockQueryBar,
   mockScheduleStepRule,
   mockAboutStepRule,
+  mockActionsStepRule,
 } from '../all/__mocks__/mock';
 
 describe('helpers', () => {
@@ -241,7 +245,6 @@ describe('helpers', () => {
     test('returns formatted object as ScheduleStepRuleJson', () => {
       const result: ScheduleStepRuleJson = formatScheduleStepData(mockData);
       const expected = {
-        enabled: false,
         from: 'now-660s',
         to: 'now',
         interval: '5m',
@@ -260,7 +263,6 @@ describe('helpers', () => {
       delete mockStepData.to;
       const result: ScheduleStepRuleJson = formatScheduleStepData(mockStepData);
       const expected = {
-        enabled: false,
         from: 'now-660s',
         to: 'now',
         interval: '5m',
@@ -279,7 +281,6 @@ describe('helpers', () => {
       };
       const result: ScheduleStepRuleJson = formatScheduleStepData(mockStepData);
       const expected = {
-        enabled: false,
         from: 'now-660s',
         to: 'now',
         interval: '5m',
@@ -298,7 +299,6 @@ describe('helpers', () => {
       };
       const result: ScheduleStepRuleJson = formatScheduleStepData(mockStepData);
       const expected = {
-        enabled: false,
         from: 'now-300s',
         to: 'now',
         interval: '5m',
@@ -317,7 +317,6 @@ describe('helpers', () => {
       };
       const result: ScheduleStepRuleJson = formatScheduleStepData(mockStepData);
       const expected = {
-        enabled: false,
         from: 'now-360s',
         to: 'now',
         interval: 'random',
@@ -503,19 +502,164 @@ describe('helpers', () => {
     });
   });
 
+  describe('formatActionsStepData', () => {
+    let mockData: ActionsStepRule;
+
+    beforeEach(() => {
+      mockData = mockActionsStepRule();
+    });
+
+    test('returns formatted object as ActionsStepRuleJson', () => {
+      const result: ActionsStepRuleJson = formatActionsStepData(mockData);
+      const expected = {
+        actions: [],
+        enabled: false,
+        meta: {
+          throttle: 'no_actions',
+          kibanaSiemAppUrl: 'http://localhost:5601/app/siem',
+        },
+        throttle: null,
+      };
+
+      expect(result).toEqual(expected);
+    });
+
+    test('returns proper throttle value for no_actions', () => {
+      const mockStepData = {
+        ...mockData,
+        throttle: 'no_actions',
+      };
+      const result: ActionsStepRuleJson = formatActionsStepData(mockStepData);
+      const expected = {
+        actions: [],
+        enabled: false,
+        meta: {
+          throttle: mockStepData.throttle,
+          kibanaSiemAppUrl: mockStepData.kibanaSiemAppUrl,
+        },
+        throttle: null,
+      };
+
+      expect(result).toEqual(expected);
+    });
+
+    test('returns proper throttle value for rule', () => {
+      const mockStepData = {
+        ...mockData,
+        throttle: 'rule',
+        actions: [
+          {
+            group: 'default',
+            id: 'id',
+            actionTypeId: 'actionTypeId',
+            params: {},
+          },
+        ],
+      };
+      const result: ActionsStepRuleJson = formatActionsStepData(mockStepData);
+      const expected = {
+        actions: [
+          {
+            group: mockStepData.actions[0].group,
+            id: mockStepData.actions[0].id,
+            action_type_id: mockStepData.actions[0].actionTypeId,
+            params: mockStepData.actions[0].params,
+          },
+        ],
+        enabled: false,
+        meta: {
+          throttle: mockStepData.throttle,
+          kibanaSiemAppUrl: mockStepData.kibanaSiemAppUrl,
+        },
+        throttle: null,
+      };
+
+      expect(result).toEqual(expected);
+    });
+
+    test('returns proper throttle value for interval', () => {
+      const mockStepData = {
+        ...mockData,
+        throttle: '1d',
+        actions: [
+          {
+            group: 'default',
+            id: 'id',
+            actionTypeId: 'actionTypeId',
+            params: {},
+          },
+        ],
+      };
+      const result: ActionsStepRuleJson = formatActionsStepData(mockStepData);
+      const expected = {
+        actions: [
+          {
+            group: mockStepData.actions[0].group,
+            id: mockStepData.actions[0].id,
+            action_type_id: mockStepData.actions[0].actionTypeId,
+            params: mockStepData.actions[0].params,
+          },
+        ],
+        enabled: false,
+        meta: {
+          throttle: mockStepData.throttle,
+          kibanaSiemAppUrl: mockStepData.kibanaSiemAppUrl,
+        },
+        throttle: mockStepData.throttle,
+      };
+
+      expect(result).toEqual(expected);
+    });
+
+    test('returns actions with action_type_id', () => {
+      const mockAction = {
+        group: 'default',
+        id: '99403909-ca9b-49ba-9d7a-7e5320e68d05',
+        params: { message: 'ML Rule generated {{state.signals_count}} signals' },
+        actionTypeId: '.slack',
+      };
+
+      const mockStepData = {
+        ...mockData,
+        actions: [mockAction],
+      };
+      const result: ActionsStepRuleJson = formatActionsStepData(mockStepData);
+      const expected = {
+        actions: [
+          {
+            group: mockAction.group,
+            id: mockAction.id,
+            params: mockAction.params,
+            action_type_id: mockAction.actionTypeId,
+          },
+        ],
+        enabled: false,
+        meta: {
+          throttle: null,
+          kibanaSiemAppUrl: mockStepData.kibanaSiemAppUrl,
+        },
+        throttle: null,
+      };
+
+      expect(result).toEqual(expected);
+    });
+  });
+
   describe('formatRule', () => {
     let mockAbout: AboutStepRule;
     let mockDefine: DefineStepRule;
     let mockSchedule: ScheduleStepRule;
+    let mockActions: ActionsStepRule;
 
     beforeEach(() => {
       mockAbout = mockAboutStepRule();
       mockDefine = mockDefineStepRule();
       mockSchedule = mockScheduleStepRule();
+      mockActions = mockActionsStepRule();
     });
 
     test('returns NewRule with type of saved_query when saved_id exists', () => {
-      const result: NewRule = formatRule(mockDefine, mockAbout, mockSchedule);
+      const result: NewRule = formatRule(mockDefine, mockAbout, mockSchedule, mockActions);
 
       expect(result.type).toEqual('saved_query');
     });
@@ -528,13 +672,18 @@ describe('helpers', () => {
           saved_id: '',
         },
       };
-      const result: NewRule = formatRule(mockDefineStepRuleWithoutSavedId, mockAbout, mockSchedule);
+      const result: NewRule = formatRule(
+        mockDefineStepRuleWithoutSavedId,
+        mockAbout,
+        mockSchedule,
+        mockActions
+      );
 
       expect(result.type).toEqual('query');
     });
 
     test('returns NewRule without id if ruleId does not exist', () => {
-      const result: NewRule = formatRule(mockDefine, mockAbout, mockSchedule);
+      const result: NewRule = formatRule(mockDefine, mockAbout, mockSchedule, mockActions);
 
       expect(result.id).toBeUndefined();
     });
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/create/helpers.ts b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/create/helpers.ts
index f8900e6a1129e..7abe5a576c0e5 100644
--- a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/create/helpers.ts
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/create/helpers.ts
@@ -6,16 +6,24 @@
 
 import { has, isEmpty } from 'lodash/fp';
 import moment from 'moment';
+import deepmerge from 'deepmerge';
 
+import {
+  NOTIFICATION_THROTTLE_RULE,
+  NOTIFICATION_THROTTLE_NO_ACTIONS,
+} from '../../../../../common/constants';
 import { NewRule, RuleType } from '../../../../containers/detection_engine/rules';
+import { transformAlertToRuleAction } from '../../../../../common/detection_engine/transform_actions';
 
 import {
   AboutStepRule,
   DefineStepRule,
   ScheduleStepRule,
+  ActionsStepRule,
   DefineStepRuleJson,
   ScheduleStepRuleJson,
   AboutStepRuleJson,
+  ActionsStepRuleJson,
 } from '../types';
 import { isMlRule } from '../helpers';
 
@@ -136,12 +144,39 @@ export const formatAboutStepData = (aboutStepData: AboutStepRule): AboutStepRule
   };
 };
 
+export const getAlertThrottle = (throttle: string | null) =>
+  throttle && ![NOTIFICATION_THROTTLE_NO_ACTIONS, NOTIFICATION_THROTTLE_RULE].includes(throttle)
+    ? throttle
+    : null;
+
+export const formatActionsStepData = (actionsStepData: ActionsStepRule): ActionsStepRuleJson => {
+  const {
+    actions = [],
+    enabled,
+    kibanaSiemAppUrl,
+    throttle = NOTIFICATION_THROTTLE_NO_ACTIONS,
+  } = actionsStepData;
+
+  return {
+    actions: actions.map(transformAlertToRuleAction),
+    enabled,
+    throttle: actions.length ? getAlertThrottle(throttle) : null,
+    meta: {
+      throttle: actions.length ? throttle : NOTIFICATION_THROTTLE_NO_ACTIONS,
+      kibanaSiemAppUrl,
+    },
+  };
+};
+
 export const formatRule = (
   defineStepData: DefineStepRule,
   aboutStepData: AboutStepRule,
-  scheduleData: ScheduleStepRule
-): NewRule => ({
-  ...formatDefineStepData(defineStepData),
-  ...formatAboutStepData(aboutStepData),
-  ...formatScheduleStepData(scheduleData),
-});
+  scheduleData: ScheduleStepRule,
+  actionsData: ActionsStepRule
+): NewRule =>
+  deepmerge.all([
+    formatDefineStepData(defineStepData),
+    formatAboutStepData(aboutStepData),
+    formatScheduleStepData(scheduleData),
+    formatActionsStepData(actionsData),
+  ]) as NewRule;
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/create/index.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/create/index.tsx
index 67aaabfe70fda..0335216672915 100644
--- a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/create/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/create/index.tsx
@@ -5,7 +5,7 @@
  */
 
 import { EuiButtonEmpty, EuiAccordion, EuiHorizontalRule, EuiPanel, EuiSpacer } from '@elastic/eui';
-import React, { useCallback, useRef, useState } from 'react';
+import React, { useCallback, useRef, useState, useMemo } from 'react';
 import { Redirect } from 'react-router-dom';
 import styled, { StyledComponent } from 'styled-components';
 
@@ -21,14 +21,27 @@ import { FormData, FormHook } from '../../../../shared_imports';
 import { StepAboutRule } from '../components/step_about_rule';
 import { StepDefineRule } from '../components/step_define_rule';
 import { StepScheduleRule } from '../components/step_schedule_rule';
+import { StepRuleActions } from '../components/step_rule_actions';
 import { DetectionEngineHeaderPage } from '../../components/detection_engine_header_page';
 import * as RuleI18n from '../translations';
-import { redirectToDetections } from '../helpers';
-import { AboutStepRule, DefineStepRule, RuleStep, RuleStepData, ScheduleStepRule } from '../types';
+import { redirectToDetections, getActionMessageParams } from '../helpers';
+import {
+  AboutStepRule,
+  DefineStepRule,
+  RuleStep,
+  RuleStepData,
+  ScheduleStepRule,
+  ActionsStepRule,
+} from '../types';
 import { formatRule } from './helpers';
 import * as i18n from './translations';
 
-const stepsRuleOrder = [RuleStep.defineRule, RuleStep.aboutRule, RuleStep.scheduleRule];
+const stepsRuleOrder = [
+  RuleStep.defineRule,
+  RuleStep.aboutRule,
+  RuleStep.scheduleRule,
+  RuleStep.ruleActions,
+];
 
 const MyEuiPanel = styled(EuiPanel)<{
   zindex?: number;
@@ -79,22 +92,31 @@ const CreateRulePageComponent: React.FC = () => {
   const defineRuleRef = useRef<EuiAccordion | null>(null);
   const aboutRuleRef = useRef<EuiAccordion | null>(null);
   const scheduleRuleRef = useRef<EuiAccordion | null>(null);
+  const ruleActionsRef = useRef<EuiAccordion | null>(null);
   const stepsForm = useRef<Record<RuleStep, FormHook<FormData> | null>>({
     [RuleStep.defineRule]: null,
     [RuleStep.aboutRule]: null,
     [RuleStep.scheduleRule]: null,
+    [RuleStep.ruleActions]: null,
   });
   const stepsData = useRef<Record<RuleStep, RuleStepData>>({
     [RuleStep.defineRule]: { isValid: false, data: {} },
     [RuleStep.aboutRule]: { isValid: false, data: {} },
     [RuleStep.scheduleRule]: { isValid: false, data: {} },
+    [RuleStep.ruleActions]: { isValid: false, data: {} },
   });
   const [isStepRuleInReadOnlyView, setIsStepRuleInEditView] = useState<Record<RuleStep, boolean>>({
     [RuleStep.defineRule]: false,
     [RuleStep.aboutRule]: false,
     [RuleStep.scheduleRule]: false,
+    [RuleStep.ruleActions]: false,
   });
   const [{ isLoading, isSaved }, setRule] = usePersistRule();
+  const actionMessageParams = useMemo(
+    () =>
+      getActionMessageParams((stepsData.current['define-rule'].data as DefineStepRule).ruleType),
+    [stepsData.current['define-rule'].data]
+  );
   const userHasNoPermissions =
     canUserCRUD != null && hasManageApiKey != null ? !canUserCRUD || !hasManageApiKey : false;
 
@@ -103,7 +125,7 @@ const CreateRulePageComponent: React.FC = () => {
       stepsData.current[step] = { ...stepsData.current[step], data, isValid };
       if (isValid) {
         const stepRuleIdx = stepsRuleOrder.findIndex(item => step === item);
-        if ([0, 1].includes(stepRuleIdx)) {
+        if ([0, 1, 2].includes(stepRuleIdx)) {
           if (isStepRuleInReadOnlyView[stepsRuleOrder[stepRuleIdx + 1]]) {
             setOpenAccordionId(stepsRuleOrder[stepRuleIdx + 1]);
             setIsStepRuleInEditView({
@@ -120,15 +142,17 @@ const CreateRulePageComponent: React.FC = () => {
             setOpenAccordionId(stepsRuleOrder[stepRuleIdx + 1]);
           }
         } else if (
-          stepRuleIdx === 2 &&
+          stepRuleIdx === 3 &&
           stepsData.current[RuleStep.defineRule].isValid &&
-          stepsData.current[RuleStep.aboutRule].isValid
+          stepsData.current[RuleStep.aboutRule].isValid &&
+          stepsData.current[RuleStep.scheduleRule].isValid
         ) {
           setRule(
             formatRule(
               stepsData.current[RuleStep.defineRule].data as DefineStepRule,
               stepsData.current[RuleStep.aboutRule].data as AboutStepRule,
-              stepsData.current[RuleStep.scheduleRule].data as ScheduleStepRule
+              stepsData.current[RuleStep.scheduleRule].data as ScheduleStepRule,
+              stepsData.current[RuleStep.ruleActions].data as ActionsStepRule
             )
           );
         }
@@ -177,6 +201,14 @@ const CreateRulePageComponent: React.FC = () => {
     />
   );
 
+  const ruleActionsButton = (
+    <AccordionTitle
+      name="4"
+      title={RuleI18n.RULE_ACTIONS}
+      type={getAccordionType(RuleStep.ruleActions)}
+    />
+  );
+
   const openCloseAccordion = (accordionId: RuleStep | null) => {
     if (accordionId != null) {
       if (accordionId === RuleStep.defineRule && defineRuleRef.current != null) {
@@ -185,6 +217,8 @@ const CreateRulePageComponent: React.FC = () => {
         aboutRuleRef.current.onToggle();
       } else if (accordionId === RuleStep.scheduleRule && scheduleRuleRef.current != null) {
         scheduleRuleRef.current.onToggle();
+      } else if (accordionId === RuleStep.ruleActions && ruleActionsRef.current != null) {
+        ruleActionsRef.current.onToggle();
       }
     }
   };
@@ -253,7 +287,7 @@ const CreateRulePageComponent: React.FC = () => {
           isLoading={isLoading || loading}
           title={i18n.PAGE_TITLE}
         />
-        <MyEuiPanel zindex={3}>
+        <MyEuiPanel zindex={4}>
           <StepDefineRuleAccordion
             initialIsOpen={true}
             id={RuleStep.defineRule}
@@ -288,7 +322,7 @@ const CreateRulePageComponent: React.FC = () => {
           </StepDefineRuleAccordion>
         </MyEuiPanel>
         <EuiSpacer size="l" />
-        <MyEuiPanel zindex={2}>
+        <MyEuiPanel zindex={3}>
           <EuiAccordion
             initialIsOpen={false}
             id={RuleStep.aboutRule}
@@ -321,7 +355,7 @@ const CreateRulePageComponent: React.FC = () => {
           </EuiAccordion>
         </MyEuiPanel>
         <EuiSpacer size="l" />
-        <MyEuiPanel zindex={1}>
+        <MyEuiPanel zindex={2}>
           <EuiAccordion
             initialIsOpen={false}
             id={RuleStep.scheduleRule}
@@ -355,6 +389,38 @@ const CreateRulePageComponent: React.FC = () => {
             />
           </EuiAccordion>
         </MyEuiPanel>
+        <EuiSpacer size="l" />
+        <MyEuiPanel zindex={1}>
+          <EuiAccordion
+            initialIsOpen={false}
+            id={RuleStep.ruleActions}
+            buttonContent={ruleActionsButton}
+            paddingSize="xs"
+            ref={ruleActionsRef}
+            onToggle={manageAccordions.bind(null, RuleStep.ruleActions)}
+            extraAction={
+              stepsData.current[RuleStep.ruleActions].isValid && (
+                <EuiButtonEmpty
+                  iconType="pencil"
+                  size="xs"
+                  onClick={manageIsEditable.bind(null, RuleStep.ruleActions)}
+                >
+                  {i18n.EDIT_RULE}
+                </EuiButtonEmpty>
+              )
+            }
+          >
+            <EuiHorizontalRule margin="m" />
+            <StepRuleActions
+              addPadding={true}
+              isReadOnlyView={isStepRuleInReadOnlyView[RuleStep.ruleActions]}
+              isLoading={isLoading || loading}
+              setForm={setStepsForm}
+              setStepData={setStepData}
+              actionMessageParams={actionMessageParams}
+            />
+          </EuiAccordion>
+        </MyEuiPanel>
       </WrapperPage>
 
       <SpyRoute />
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/edit/index.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/edit/index.tsx
index 8618bf9504861..f89e3206cc67d 100644
--- a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/edit/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/edit/index.tsx
@@ -31,10 +31,17 @@ import { StepPanel } from '../components/step_panel';
 import { StepAboutRule } from '../components/step_about_rule';
 import { StepDefineRule } from '../components/step_define_rule';
 import { StepScheduleRule } from '../components/step_schedule_rule';
+import { StepRuleActions } from '../components/step_rule_actions';
 import { formatRule } from '../create/helpers';
-import { getStepsData, redirectToDetections } from '../helpers';
+import { getStepsData, redirectToDetections, getActionMessageParams } from '../helpers';
 import * as ruleI18n from '../translations';
-import { RuleStep, DefineStepRule, AboutStepRule, ScheduleStepRule } from '../types';
+import {
+  RuleStep,
+  DefineStepRule,
+  AboutStepRule,
+  ScheduleStepRule,
+  ActionsStepRule,
+} from '../types';
 import * as i18n from './translations';
 
 interface StepRuleForm {
@@ -50,6 +57,10 @@ interface ScheduleStepRuleForm extends StepRuleForm {
   data: ScheduleStepRule | null;
 }
 
+interface ActionsStepRuleForm extends StepRuleForm {
+  data: ActionsStepRule | null;
+}
+
 const EditRulePageComponent: FC = () => {
   const [, dispatchToaster] = useStateToaster();
   const {
@@ -79,14 +90,20 @@ const EditRulePageComponent: FC = () => {
     data: null,
     isValid: false,
   });
+  const [myActionsRuleForm, setMyActionsRuleForm] = useState<ActionsStepRuleForm>({
+    data: null,
+    isValid: false,
+  });
   const [selectedTab, setSelectedTab] = useState<EuiTabbedContentTab>();
   const stepsForm = useRef<Record<RuleStep, FormHook<FormData> | null>>({
     [RuleStep.defineRule]: null,
     [RuleStep.aboutRule]: null,
     [RuleStep.scheduleRule]: null,
+    [RuleStep.ruleActions]: null,
   });
   const [{ isLoading, isSaved }, setRule] = usePersistRule();
   const [tabHasError, setTabHasError] = useState<RuleStep[]>([]);
+  const actionMessageParams = useMemo(() => getActionMessageParams(rule?.type), [rule]);
   const setStepsForm = useCallback(
     (step: RuleStep, form: FormHook<FormData>) => {
       stepsForm.current[step] = form;
@@ -162,6 +179,28 @@ const EditRulePageComponent: FC = () => {
           </>
         ),
       },
+      {
+        id: RuleStep.ruleActions,
+        name: ruleI18n.ACTIONS,
+        content: (
+          <>
+            <EuiSpacer />
+            <StepPanel loading={loading || initLoading} title={ruleI18n.ACTIONS}>
+              {myActionsRuleForm.data != null && (
+                <StepRuleActions
+                  isReadOnlyView={false}
+                  isLoading={isLoading}
+                  isUpdateView
+                  defaultValues={myActionsRuleForm.data}
+                  setForm={setStepsForm}
+                  actionMessageParams={actionMessageParams}
+                />
+              )}
+              <EuiSpacer />
+            </StepPanel>
+          </>
+        ),
+      },
     ],
     [
       loading,
@@ -170,8 +209,10 @@ const EditRulePageComponent: FC = () => {
       myAboutRuleForm,
       myDefineRuleForm,
       myScheduleRuleForm,
+      myActionsRuleForm,
       setStepsForm,
       stepsForm,
+      actionMessageParams,
     ]
   );
 
@@ -179,14 +220,18 @@ const EditRulePageComponent: FC = () => {
     const activeFormId = selectedTab?.id as RuleStep;
     const activeForm = await stepsForm.current[activeFormId]?.submit();
 
-    const invalidForms = [RuleStep.aboutRule, RuleStep.defineRule, RuleStep.scheduleRule].reduce<
-      RuleStep[]
-    >((acc, step) => {
+    const invalidForms = [
+      RuleStep.aboutRule,
+      RuleStep.defineRule,
+      RuleStep.scheduleRule,
+      RuleStep.ruleActions,
+    ].reduce<RuleStep[]>((acc, step) => {
       if (
         (step === activeFormId && activeForm != null && !activeForm?.isValid) ||
         (step === RuleStep.aboutRule && !myAboutRuleForm.isValid) ||
         (step === RuleStep.defineRule && !myDefineRuleForm.isValid) ||
-        (step === RuleStep.scheduleRule && !myScheduleRuleForm.isValid)
+        (step === RuleStep.scheduleRule && !myScheduleRuleForm.isValid) ||
+        (step === RuleStep.ruleActions && !myActionsRuleForm.isValid)
       ) {
         return [...acc, step];
       }
@@ -205,21 +250,35 @@ const EditRulePageComponent: FC = () => {
             : myAboutRuleForm.data) as AboutStepRule,
           (activeFormId === RuleStep.scheduleRule
             ? activeForm.data
-            : myScheduleRuleForm.data) as ScheduleStepRule
+            : myScheduleRuleForm.data) as ScheduleStepRule,
+          (activeFormId === RuleStep.ruleActions
+            ? activeForm.data
+            : myActionsRuleForm.data) as ActionsStepRule
         ),
         ...(ruleId ? { id: ruleId } : {}),
       });
     } else {
       setTabHasError(invalidForms);
     }
-  }, [stepsForm, myAboutRuleForm, myDefineRuleForm, myScheduleRuleForm, selectedTab, ruleId]);
+  }, [
+    stepsForm,
+    myAboutRuleForm,
+    myDefineRuleForm,
+    myScheduleRuleForm,
+    myActionsRuleForm,
+    selectedTab,
+    ruleId,
+  ]);
 
   useEffect(() => {
     if (rule != null) {
-      const { aboutRuleData, defineRuleData, scheduleRuleData } = getStepsData({ rule });
+      const { aboutRuleData, defineRuleData, scheduleRuleData, ruleActionsData } = getStepsData({
+        rule,
+      });
       setMyAboutRuleForm({ data: aboutRuleData, isValid: true });
       setMyDefineRuleForm({ data: defineRuleData, isValid: true });
       setMyScheduleRuleForm({ data: scheduleRuleData, isValid: true });
+      setMyActionsRuleForm({ data: ruleActionsData, isValid: true });
     }
   }, [rule]);
 
@@ -228,6 +287,7 @@ const EditRulePageComponent: FC = () => {
       if (selectedTab != null) {
         const ruleStep = selectedTab.id as RuleStep;
         const respForm = await stepsForm.current[ruleStep]?.submit();
+
         if (respForm != null) {
           if (ruleStep === RuleStep.aboutRule) {
             setMyAboutRuleForm({
@@ -244,6 +304,11 @@ const EditRulePageComponent: FC = () => {
               data: respForm.data as ScheduleStepRule,
               isValid: respForm.isValid,
             });
+          } else if (ruleStep === RuleStep.ruleActions) {
+            setMyActionsRuleForm({
+              data: respForm.data as ActionsStepRule,
+              isValid: respForm.isValid,
+            });
           }
         }
       }
@@ -255,10 +320,13 @@ const EditRulePageComponent: FC = () => {
 
   useEffect(() => {
     if (rule != null) {
-      const { aboutRuleData, defineRuleData, scheduleRuleData } = getStepsData({ rule });
+      const { aboutRuleData, defineRuleData, scheduleRuleData, ruleActionsData } = getStepsData({
+        rule,
+      });
       setMyAboutRuleForm({ data: aboutRuleData, isValid: true });
       setMyDefineRuleForm({ data: defineRuleData, isValid: true });
       setMyScheduleRuleForm({ data: scheduleRuleData, isValid: true });
+      setMyActionsRuleForm({ data: ruleActionsData, isValid: true });
     }
   }, [rule]);
 
@@ -303,6 +371,8 @@ const EditRulePageComponent: FC = () => {
                       return ruleI18n.DEFINITION;
                     } else if (t === RuleStep.scheduleRule) {
                       return ruleI18n.SCHEDULE;
+                    } else if (t === RuleStep.ruleActions) {
+                      return ruleI18n.RULE_ACTIONS;
                     }
                     return t;
                   })
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/helpers.test.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/helpers.test.tsx
index 3224c605192e6..fbdfcf4fc75d8 100644
--- a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/helpers.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/helpers.test.tsx
@@ -10,6 +10,7 @@ import {
   getScheduleStepsData,
   getStepsData,
   getAboutStepsData,
+  getActionsStepsData,
   getHumanizedDuration,
   getModifiedAboutDetailsData,
   determineDetailsValue,
@@ -17,16 +18,23 @@ import {
 import { mockRuleWithEverything, mockRule } from './all/__mocks__/mock';
 import { esFilters } from '../../../../../../../../src/plugins/data/public';
 import { Rule } from '../../../containers/detection_engine/rules';
-import { AboutStepRule, AboutStepRuleDetails, DefineStepRule, ScheduleStepRule } from './types';
+import {
+  AboutStepRule,
+  AboutStepRuleDetails,
+  DefineStepRule,
+  ScheduleStepRule,
+  ActionsStepRule,
+} from './types';
 
 describe('rule helpers', () => {
   describe('getStepsData', () => {
-    test('returns object with about, define, and schedule step properties formatted', () => {
+    test('returns object with about, define, schedule and actions step properties formatted', () => {
       const {
         defineRuleData,
         modifiedAboutRuleDetailsData,
         aboutRuleData,
         scheduleRuleData,
+        ruleActionsData,
       }: GetStepsData = getStepsData({
         rule: mockRuleWithEverything('test-id'),
       });
@@ -98,7 +106,8 @@ describe('rule helpers', () => {
           },
         ],
       };
-      const scheduleRuleStepData = { enabled: true, from: '0s', interval: '5m', isNew: false };
+      const scheduleRuleStepData = { from: '0s', interval: '5m', isNew: false };
+      const ruleActionsStepData = { enabled: true, throttle: undefined, isNew: false, actions: [] };
       const aboutRuleDataDetailsData = {
         note: '# this is some markdown documentation',
         description: '24/7',
@@ -107,6 +116,7 @@ describe('rule helpers', () => {
       expect(defineRuleData).toEqual(defineRuleStepData);
       expect(aboutRuleData).toEqual(aboutRuleStepData);
       expect(scheduleRuleData).toEqual(scheduleRuleStepData);
+      expect(ruleActionsData).toEqual(ruleActionsStepData);
       expect(modifiedAboutRuleDetailsData).toEqual(aboutRuleDataDetailsData);
     });
   });
@@ -274,7 +284,6 @@ describe('rule helpers', () => {
       const result: ScheduleStepRule = getScheduleStepsData(mockedRule);
       const expected = {
         isNew: false,
-        enabled: mockedRule.enabled,
         interval: mockedRule.interval,
         from: '0s',
       };
@@ -283,6 +292,24 @@ describe('rule helpers', () => {
     });
   });
 
+  describe('getActionsStepsData', () => {
+    test('returns expected ActionsStepRule rule object', () => {
+      const mockedRule = {
+        ...mockRule('test-id'),
+        actions: [],
+      };
+      const result: ActionsStepRule = getActionsStepsData(mockedRule);
+      const expected = {
+        actions: [],
+        enabled: mockedRule.enabled,
+        isNew: false,
+        throttle: undefined,
+      };
+
+      expect(result).toEqual(expected);
+    });
+  });
+
   describe('getModifiedAboutDetailsData', () => {
     test('returns object with "note" and "description" being those of passed in rule', () => {
       const result: AboutStepRuleDetails = getModifiedAboutDetailsData(
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/helpers.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/helpers.tsx
index 2ace154482a27..50b76552ddc8f 100644
--- a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/helpers.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/helpers.tsx
@@ -7,8 +7,11 @@
 import dateMath from '@elastic/datemath';
 import { get } from 'lodash/fp';
 import moment from 'moment';
+import memoizeOne from 'memoize-one';
 import { useLocation } from 'react-router-dom';
 
+import { RuleAlertAction } from '../../../../common/detection_engine/types';
+import { transformRuleToAlertAction } from '../../../../common/detection_engine/transform_actions';
 import { Filter } from '../../../../../../../../src/plugins/data/public';
 import { Rule, RuleType } from '../../../containers/detection_engine/rules';
 import { FormData, FormHook, FormSchema } from '../../../shared_imports';
@@ -18,6 +21,7 @@ import {
   DefineStepRule,
   IMitreEnterpriseAttack,
   ScheduleStepRule,
+  ActionsStepRule,
 } from './types';
 
 export interface GetStepsData {
@@ -25,6 +29,7 @@ export interface GetStepsData {
   modifiedAboutRuleDetailsData: AboutStepRuleDetails;
   defineRuleData: DefineStepRule;
   scheduleRuleData: ScheduleStepRule;
+  ruleActionsData: ActionsStepRule;
 }
 
 export const getStepsData = ({
@@ -38,8 +43,29 @@ export const getStepsData = ({
   const aboutRuleData: AboutStepRule = getAboutStepsData(rule, detailsView);
   const modifiedAboutRuleDetailsData: AboutStepRuleDetails = getModifiedAboutDetailsData(rule);
   const scheduleRuleData: ScheduleStepRule = getScheduleStepsData(rule);
+  const ruleActionsData: ActionsStepRule = getActionsStepsData(rule);
 
-  return { aboutRuleData, modifiedAboutRuleDetailsData, defineRuleData, scheduleRuleData };
+  return {
+    aboutRuleData,
+    modifiedAboutRuleDetailsData,
+    defineRuleData,
+    scheduleRuleData,
+    ruleActionsData,
+  };
+};
+
+export const getActionsStepsData = (
+  rule: Omit<Rule, 'actions'> & { actions: RuleAlertAction[] }
+): ActionsStepRule => {
+  const { enabled, actions = [], meta } = rule;
+
+  return {
+    actions: actions?.map(transformRuleToAlertAction),
+    isNew: false,
+    throttle: meta?.throttle,
+    kibanaSiemAppUrl: meta?.kibanaSiemAppUrl,
+    enabled,
+  };
 };
 
 export const getDefineStepsData = (rule: Rule): DefineStepRule => ({
@@ -60,12 +86,11 @@ export const getDefineStepsData = (rule: Rule): DefineStepRule => ({
 });
 
 export const getScheduleStepsData = (rule: Rule): ScheduleStepRule => {
-  const { enabled, interval, from } = rule;
+  const { interval, from } = rule;
   const fromHumanizedValue = getHumanizedDuration(from, interval);
 
   return {
     isNew: false,
-    enabled,
     interval,
     from: fromHumanizedValue,
   };
@@ -200,3 +225,46 @@ export const redirectToDetections = (
   isAuthenticated != null &&
   hasEncryptionKey != null &&
   (!isSignalIndexExists || !isAuthenticated || !hasEncryptionKey);
+
+export const getActionMessageRuleParams = (ruleType: RuleType): string[] => {
+  const commonRuleParamsKeys = [
+    'id',
+    'name',
+    'description',
+    'false_positives',
+    'rule_id',
+    'max_signals',
+    'risk_score',
+    'output_index',
+    'references',
+    'severity',
+    'timeline_id',
+    'timeline_title',
+    'threat',
+    'type',
+    'version',
+    // 'lists',
+  ];
+
+  const ruleParamsKeys = [
+    ...commonRuleParamsKeys,
+    ...(isMlRule(ruleType)
+      ? ['anomaly_threshold', 'machine_learning_job_id']
+      : ['index', 'filters', 'language', 'query', 'saved_id']),
+  ].sort();
+
+  return ruleParamsKeys;
+};
+
+export const getActionMessageParams = memoizeOne((ruleType: RuleType | undefined): string[] => {
+  if (!ruleType) {
+    return [];
+  }
+  const actionMessageRuleParams = getActionMessageRuleParams(ruleType);
+
+  return [
+    'state.signals_count',
+    '{context.results_link}',
+    ...actionMessageRuleParams.map(param => `context.rule.${param}`),
+  ];
+});
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/translations.ts b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/translations.ts
index 5b1ee049371d2..8b5b7a07fda49 100644
--- a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/translations.ts
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/translations.ts
@@ -306,6 +306,10 @@ export const SCHEDULE_RULE = i18n.translate('xpack.siem.detectionEngine.rules.sc
   defaultMessage: 'Schedule rule',
 });
 
+export const RULE_ACTIONS = i18n.translate('xpack.siem.detectionEngine.rules.ruleActionsTitle', {
+  defaultMessage: 'Rule actions',
+});
+
 export const DEFINITION = i18n.translate('xpack.siem.detectionEngine.rules.stepDefinitionTitle', {
   defaultMessage: 'Definition',
 });
@@ -318,6 +322,10 @@ export const SCHEDULE = i18n.translate('xpack.siem.detectionEngine.rules.stepSch
   defaultMessage: 'Schedule',
 });
 
+export const ACTIONS = i18n.translate('xpack.siem.detectionEngine.rules.stepActionsTitle', {
+  defaultMessage: 'Actions',
+});
+
 export const OPTIONAL_FIELD = i18n.translate(
   'xpack.siem.detectionEngine.rules.optionalFieldDescription',
   {
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/types.ts b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/types.ts
index d4caa4639f338..c1db24991c17c 100644
--- a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/types.ts
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/types.ts
@@ -4,6 +4,8 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+import { AlertAction } from '../../../../../../../plugins/alerting/common';
+import { RuleAlertAction } from '../../../../common/detection_engine/types';
 import { Filter } from '../../../../../../../../src/plugins/data/common';
 import { RuleType } from '../../../containers/detection_engine/rules/types';
 import { FieldValueQueryBar } from './components/query_bar';
@@ -27,6 +29,7 @@ export enum RuleStep {
   defineRule = 'define-rule',
   aboutRule = 'about-rule',
   scheduleRule = 'schedule-rule',
+  ruleActions = 'rule-actions',
 }
 export type RuleStatusType = 'passive' | 'active' | 'valid';
 
@@ -76,12 +79,18 @@ export interface DefineStepRule extends StepRuleData {
 }
 
 export interface ScheduleStepRule extends StepRuleData {
-  enabled: boolean;
   interval: string;
   from: string;
   to?: string;
 }
 
+export interface ActionsStepRule extends StepRuleData {
+  actions: AlertAction[];
+  enabled: boolean;
+  kibanaSiemAppUrl?: string;
+  throttle?: string | null;
+}
+
 export interface DefineStepRuleJson {
   anomaly_threshold?: number;
   index?: string[];
@@ -108,16 +117,18 @@ export interface AboutStepRuleJson {
 }
 
 export interface ScheduleStepRuleJson {
-  enabled: boolean;
   interval: string;
   from: string;
   to?: string;
   meta?: unknown;
 }
 
-export type MyRule = Omit<DefineStepRule & ScheduleStepRule & AboutStepRule, 'isNew'> & {
-  immutable: boolean;
-};
+export interface ActionsStepRuleJson {
+  actions: RuleAlertAction[];
+  enabled: boolean;
+  throttle?: string | null;
+  meta?: unknown;
+}
 
 export interface IMitreAttack {
   id: string;
diff --git a/x-pack/legacy/plugins/siem/public/shared_imports.ts b/x-pack/legacy/plugins/siem/public/shared_imports.ts
index edd7812b3bd16..c83433ef129c9 100644
--- a/x-pack/legacy/plugins/siem/public/shared_imports.ts
+++ b/x-pack/legacy/plugins/siem/public/shared_imports.ts
@@ -18,6 +18,9 @@ export {
   useForm,
   ValidationFunc,
 } from '../../../../../src/plugins/es_ui_shared/static/forms/hook_form_lib';
-export { Field } from '../../../../../src/plugins/es_ui_shared/static/forms/components';
+export {
+  Field,
+  SelectField,
+} from '../../../../../src/plugins/es_ui_shared/static/forms/components';
 export { fieldValidators } from '../../../../../src/plugins/es_ui_shared/static/forms/helpers';
 export { ERROR_CODE } from '../../../../../src/plugins/es_ui_shared/static/forms/helpers/field_validators/types';
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/notifications/build_signals_query.test.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/notifications/build_signals_query.test.ts
index f83a8d40d6ae1..189c596a77125 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/notifications/build_signals_query.test.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/notifications/build_signals_query.test.ts
@@ -39,7 +39,7 @@ describe('buildSignalsSearchQuery', () => {
               {
                 range: {
                   '@timestamp': {
-                    gte: from,
+                    gt: from,
                     lte: to,
                   },
                 },
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/notifications/build_signals_query.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/notifications/build_signals_query.ts
index 001650e5b2005..b973d4c5f4e98 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/notifications/build_signals_query.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/notifications/build_signals_query.ts
@@ -30,7 +30,7 @@ export const buildSignalsSearchQuery = ({ ruleId, index, from, to }: BuildSignal
           {
             range: {
               '@timestamp': {
-                gte: from,
+                gt: from,
                 lte: to,
               },
             },
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/notifications/create_notifications.test.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/notifications/create_notifications.test.ts
index dea42b0c852f9..073251b68f414 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/notifications/create_notifications.test.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/notifications/create_notifications.test.ts
@@ -42,7 +42,7 @@ describe('createNotifications', () => {
     const action = {
       group: 'default',
       id: '99403909-ca9b-49ba-9d7a-7e5320e68d05',
-      params: { message: 'Rule generated {{state.signalsCount}} signals' },
+      params: { message: 'Rule generated {{state.signals_count}} signals' },
       action_type_id: '.slack',
     };
     await createNotifications({
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/notifications/get_signals_count.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/notifications/get_signals_count.ts
index 6ae7922660bd7..33cee6d074b70 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/notifications/get_signals_count.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/notifications/get_signals_count.ts
@@ -21,7 +21,7 @@ interface GetSignalsCount {
   ruleAlertId: string;
   ruleId: string;
   index: string;
-  kibanaUrl: string | undefined;
+  kibanaSiemAppUrl: string | undefined;
   callCluster: NotificationExecutorOptions['services']['callCluster'];
 }
 
@@ -32,7 +32,7 @@ export const getSignalsCount = async ({
   ruleId,
   index,
   callCluster,
-  kibanaUrl = '',
+  kibanaSiemAppUrl = '',
 }: GetSignalsCount): Promise<SignalsCountResults> => {
   const fromMoment = moment.isDate(from) ? moment(from) : parseScheduleDates(from);
   const toMoment = moment.isDate(to) ? moment(to) : parseScheduleDates(to);
@@ -53,7 +53,7 @@ export const getSignalsCount = async ({
 
   const result = await callCluster('count', query);
   const resultsLink = getNotificationResultsLink({
-    baseUrl: kibanaUrl,
+    kibanaSiemAppUrl: `${kibanaSiemAppUrl}`,
     id: ruleAlertId,
     from: fromInMs,
     to: toInMs,
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/notifications/rules_notification_alert_type.test.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/notifications/rules_notification_alert_type.test.ts
index ff0126b129636..50ac10347e062 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/notifications/rules_notification_alert_type.test.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/notifications/rules_notification_alert_type.test.ts
@@ -127,7 +127,7 @@ describe('rules_notification_alert_type', () => {
 
       expect(alertInstanceFactoryMock).toHaveBeenCalled();
       expect(alertInstanceMock.replaceState).toHaveBeenCalledWith(
-        expect.objectContaining({ signalsCount: 10 })
+        expect.objectContaining({ signals_count: 10 })
       );
       expect(alertInstanceMock.scheduleActions).toHaveBeenCalledWith(
         'default',
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/notifications/rules_notification_alert_type.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/notifications/rules_notification_alert_type.ts
index c5dc4c3a27e16..32e64138ff6e0 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/notifications/rules_notification_alert_type.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/notifications/rules_notification_alert_type.ts
@@ -40,14 +40,14 @@ export const rulesNotificationAlertType = ({
     }
 
     const { params: ruleAlertParams, name: ruleName } = ruleAlertSavedObject.attributes;
-    const ruleParams = { ...ruleAlertParams, name: ruleName };
+    const ruleParams = { ...ruleAlertParams, name: ruleName, id: ruleAlertSavedObject.id };
 
     const { signalsCount, resultsLink } = await getSignalsCount({
       from: previousStartedAt ?? `now-${ruleParams.interval}`,
       to: startedAt,
       index: ruleParams.outputIndex,
       ruleId: ruleParams.ruleId!,
-      kibanaUrl: ruleAlertParams.meta?.kibanaUrl as string,
+      kibanaSiemAppUrl: ruleAlertParams.meta?.kibanaSiemAppUrl as string,
       ruleAlertId: ruleAlertSavedObject.id,
       callCluster: services.callCluster,
     });
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/notifications/schedule_notification_actions.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/notifications/schedule_notification_actions.ts
index 9c38c88a12411..b858b25377ffe 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/notifications/schedule_notification_actions.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/notifications/schedule_notification_actions.ts
@@ -4,11 +4,13 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+import { mapKeys, snakeCase } from 'lodash/fp';
 import { AlertInstance } from '../../../../../../../plugins/alerting/server';
 import { RuleTypeParams } from '../types';
 
 type NotificationRuleTypeParams = RuleTypeParams & {
   name: string;
+  id: string;
 };
 
 interface ScheduleNotificationActions {
@@ -26,9 +28,9 @@ export const scheduleNotificationActions = ({
 }: ScheduleNotificationActions): AlertInstance =>
   alertInstance
     .replaceState({
-      signalsCount,
+      signals_count: signalsCount,
     })
     .scheduleActions('default', {
-      resultsLink,
-      rule: ruleParams,
+      results_link: resultsLink,
+      rule: mapKeys(snakeCase, ruleParams),
     });
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/notifications/update_notifications.test.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/notifications/update_notifications.test.ts
index e1b452c911443..4c077dd9fc1fb 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/notifications/update_notifications.test.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/notifications/update_notifications.test.ts
@@ -88,7 +88,7 @@ describe('updateNotifications', () => {
     const action = {
       group: 'default',
       id: '99403909-ca9b-49ba-9d7a-7e5320e68d05',
-      params: { message: 'Rule generated {{state.signalsCount}} signals' },
+      params: { message: 'Rule generated {{state.signals_count}} signals' },
       action_type_id: '.slack',
     };
     await updateNotifications({
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/notifications/utils.test.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/notifications/utils.test.ts
index 4c3f311d10acc..0d363e1f6f3c2 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/notifications/utils.test.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/notifications/utils.test.ts
@@ -9,7 +9,7 @@ import { getNotificationResultsLink } from './utils';
 describe('utils', () => {
   it('getNotificationResultsLink', () => {
     const resultLink = getNotificationResultsLink({
-      baseUrl: 'http://localhost:5601',
+      kibanaSiemAppUrl: 'http://localhost:5601/app/siem',
       id: 'notification-id',
       from: '00000',
       to: '1111',
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/notifications/utils.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/notifications/utils.ts
index ed502d31d2fb5..b8a3c4199c4f0 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/notifications/utils.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/notifications/utils.ts
@@ -5,14 +5,14 @@
  */
 
 export const getNotificationResultsLink = ({
-  baseUrl,
+  kibanaSiemAppUrl,
   id,
   from,
   to,
 }: {
-  baseUrl: string;
+  kibanaSiemAppUrl: string;
   id: string;
   from: string;
   to: string;
 }) =>
-  `${baseUrl}/app/siem#/detections/rules/id/${id}?timerange=(global:(linkTo:!(timeline),timerange:(from:${from},kind:absolute,to:${to})),timeline:(linkTo:!(global),timerange:(from:${from},kind:absolute,to:${to})))`;
+  `${kibanaSiemAppUrl}#/detections/rules/id/${id}?timerange=(global:(linkTo:!(timeline),timerange:(from:${from},kind:absolute,to:${to})),timeline:(linkTo:!(global),timerange:(from:${from},kind:absolute,to:${to})))`;
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/__mocks__/request_responses.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/__mocks__/request_responses.ts
index 10e53d94de90a..0ecc1aa28e7e0 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/__mocks__/request_responses.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/__mocks__/request_responses.ts
@@ -335,7 +335,7 @@ export const createRuleWithActionsRequest = () => {
         {
           group: 'default',
           id: '99403909-ca9b-49ba-9d7a-7e5320e68d05',
-          params: { message: 'Rule generated {{state.signalsCount}} signals' },
+          params: { message: 'Rule generated {{state.signals_count}} signals' },
           action_type_id: '.slack',
         },
       ],
@@ -668,7 +668,8 @@ export const getNotificationResult = (): RuleNotificationAlertType => ({
     {
       actionTypeId: '.slack',
       params: {
-        message: 'Rule generated {{state.signalsCount}} signals\n\n{{rule.name}}\n{{resultsLink}}',
+        message:
+          'Rule generated {{state.signals_count}} signals\n\n{{context.rule.name}}\n{{{context.results_link}}}',
       },
       group: 'default',
       id: '99403909-ca9b-49ba-9d7a-7e5320e68d05',
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/signals/signal_rule_alert_type.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/signals/signal_rule_alert_type.ts
index 03d48a6b27867..c004b3d0edd1c 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/signals/signal_rule_alert_type.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/signals/signal_rule_alert_type.ts
@@ -214,13 +214,14 @@ export const signalRulesAlertType = ({
             const notificationRuleParams = {
               ...ruleParams,
               name,
+              id: savedObject.id,
             };
             const { signalsCount, resultsLink } = await getSignalsCount({
               from: `now-${interval}`,
               to: 'now',
               index: ruleParams.outputIndex,
               ruleId: ruleParams.ruleId!,
-              kibanaUrl: meta?.kibanaUrl as string,
+              kibanaSiemAppUrl: meta.kibanaSiemAppUrl as string,
               ruleAlertId: savedObject.id,
               callCluster: services.callCluster,
             });

From 49c7518976a8f17a430902193ff1b6e0e7171d52 Mon Sep 17 00:00:00 2001
From: Nick Peihl <nick.peihl@elastic.co>
Date: Tue, 24 Mar 2020 16:50:09 -0700
Subject: [PATCH 116/179] Bump ems-client to 7.7.1 (#61153)

* Bump ems-client to 7.7.1

* Update in x-pack dir, too

* erg, yarn lock

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 package.json        | 2 +-
 x-pack/package.json | 2 +-
 yarn.lock           | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/package.json b/package.json
index 9c8cc6538269f..4baffa8719fe3 100644
--- a/package.json
+++ b/package.json
@@ -120,7 +120,7 @@
     "@elastic/apm-rum": "^4.6.0",
     "@elastic/charts": "^18.1.0",
     "@elastic/datemath": "5.0.2",
-    "@elastic/ems-client": "7.7.0",
+    "@elastic/ems-client": "7.7.1",
     "@elastic/eui": "21.0.1",
     "@elastic/filesaver": "1.1.2",
     "@elastic/good": "8.1.1-kibana2",
diff --git a/x-pack/package.json b/x-pack/package.json
index 1fd4c261474f7..5e8bffb27a3bf 100644
--- a/x-pack/package.json
+++ b/x-pack/package.json
@@ -181,7 +181,7 @@
     "@babel/runtime": "^7.5.5",
     "@elastic/apm-rum-react": "^0.3.2",
     "@elastic/datemath": "5.0.2",
-    "@elastic/ems-client": "7.7.0",
+    "@elastic/ems-client": "7.7.1",
     "@elastic/eui": "21.0.1",
     "@elastic/filesaver": "1.1.2",
     "@elastic/maki": "6.2.0",
diff --git a/yarn.lock b/yarn.lock
index 5c988ccd3e736..27ba50b07280d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1915,10 +1915,10 @@
     once "^1.4.0"
     pump "^3.0.0"
 
-"@elastic/ems-client@7.7.0":
-  version "7.7.0"
-  resolved "https://registry.yarnpkg.com/@elastic/ems-client/-/ems-client-7.7.0.tgz#7d36d716dd941f060b9fcdae94f186a9aecc5cc2"
-  integrity sha512-JatsSyLik/8MTEOEimzEZ3NYjvGL1YzjbGujuSCgaXhPRqzu/wvMLEL8dlVpmYFZ7ALbGNsVdho4Hr8tngsIMw==
+"@elastic/ems-client@7.7.1":
+  version "7.7.1"
+  resolved "https://registry.yarnpkg.com/@elastic/ems-client/-/ems-client-7.7.1.tgz#cda9277cb851b6d1aa0408fe2814de98f1474fb8"
+  integrity sha512-8ikEUbsM+wxENqi/cwrmo4+2vwZkVoFDPSIrw3bQG2mQaE3l+3w1eMPKxsvQq0r79ivzXJ51gkvr8CffBkBkGw==
   dependencies:
     lodash "^4.17.15"
     node-fetch "^1.7.3"

From f9ad60d4900a6b8a0a6849da464517eac80008c5 Mon Sep 17 00:00:00 2001
From: Oliver Gupte <ogupte@users.noreply.github.com>
Date: Tue, 24 Mar 2020 16:55:05 -0700
Subject: [PATCH 117/179] Renames apm metric event 'service_map_object_hover'
 to 'service_map_node_or_edge_hover' for more clarity (#61178)

---
 .../plugins/apm/public/components/app/ServiceMap/Cytoscape.tsx  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 168b470580279..54a1b4347e29b 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
@@ -172,7 +172,7 @@ export function Cytoscape({
       });
     };
     const mouseoverHandler: cytoscape.EventHandler = event => {
-      trackApmEvent({ metric: 'service_map_object_hover' });
+      trackApmEvent({ metric: 'service_map_node_or_edge_hover' });
       event.target.addClass('hover');
       event.target.connectedEdges().addClass('nodeHover');
     };

From 2ad68f0e9811f94115dae4df5fc976de2ce398d1 Mon Sep 17 00:00:00 2001
From: Angela Chuang <6295984+angorayc@users.noreply.github.com>
Date: Wed, 25 Mar 2020 00:20:40 +0000
Subject: [PATCH 118/179] [SIEM] Import timeline (#60880)

* add import timelines route

* update timeline

* sync with master

* wip

* wip

* update timeline

* overwrite pinned events

* clean up

* init server side unit test

* add server side unit test

* clean up unit test

* unit test

* add unit tests

* clean up

* clean up

* fix unit test

* fix types and unit tests

* rename constants

* fix validation schemas

* review

* fix schemas

* functional test

* skip a functinal test

* add unit tests

* code review

* review with angela

* fix tests

* update modal label

* rename folder to align component name

* fix types

* fix unit test

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
Co-authored-by: Xavier Mouligneau <189600+XavierM@users.noreply.github.com>
---
 .../legacy/plugins/siem/common/constants.ts   |   1 +
 .../__snapshots__/index.test.tsx.snap         |  14 +-
 .../import_data_modal}/index.test.tsx         |  19 +-
 .../import_data_modal}/index.tsx              |  75 ++--
 .../import_data_modal/translations.ts         |  14 +
 .../public/components/open_timeline/index.tsx |   9 +-
 .../open_timeline/open_timeline.tsx           |  39 +-
 .../components/open_timeline/translations.ts  |  58 +++
 .../public/components/open_timeline/types.ts  |   7 +-
 .../public/containers/timeline/all/api.ts     |  20 +-
 .../import_rule_modal/translations.ts         |  68 ----
 .../pages/detection_engine/rules/index.tsx    |  18 +-
 .../detection_engine/rules/translations.ts    |  54 +++
 .../public/pages/timelines/timelines_page.tsx |  15 +-
 .../siem/server/lib/note/saved_object.ts      |   4 +-
 .../server/lib/pinned_event/saved_object.ts   |   5 +-
 .../create_timelines_stream_from_ndjson.ts    |  46 +++
 .../routes/__mocks__/import_timelines.ts      | 177 +++++++++
 .../routes/__mocks__/request_responses.ts     |  22 +-
 .../timeline/routes/export_timelines_route.ts |   2 +-
 .../routes/import_timelines_route.test.ts     | 341 ++++++++++++++++++
 .../timeline/routes/import_timelines_route.ts | 226 ++++++++++++
 .../routes/schemas/import_timelines_schema.ts |  57 +++
 .../lib/timeline/routes/schemas/schemas.ts    | 155 +++++++-
 .../{utils.ts => utils/export_timelines.ts}   |  48 ++-
 .../timeline/routes/utils/import_timelines.ts | 191 ++++++++++
 .../siem/server/lib/timeline/saved_object.ts  |  15 +-
 x-pack/legacy/plugins/siem/server/plugin.ts   |   3 +-
 .../plugins/siem/server/routes/index.ts       |   6 +-
 .../apis/siem/saved_objects/timeline.ts       |   4 +-
 30 files changed, 1560 insertions(+), 153 deletions(-)
 rename x-pack/legacy/plugins/siem/public/{pages/detection_engine/rules/components/import_rule_modal => components/import_data_modal}/__snapshots__/index.test.tsx.snap (75%)
 rename x-pack/legacy/plugins/siem/public/{pages/detection_engine/rules/components/import_rule_modal => components/import_data_modal}/index.test.tsx (51%)
 rename x-pack/legacy/plugins/siem/public/{pages/detection_engine/rules/components/import_rule_modal => components/import_data_modal}/index.tsx (65%)
 create mode 100644 x-pack/legacy/plugins/siem/public/components/import_data_modal/translations.ts
 delete mode 100644 x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/import_rule_modal/translations.ts
 create mode 100644 x-pack/legacy/plugins/siem/server/lib/timeline/create_timelines_stream_from_ndjson.ts
 create mode 100644 x-pack/legacy/plugins/siem/server/lib/timeline/routes/__mocks__/import_timelines.ts
 create mode 100644 x-pack/legacy/plugins/siem/server/lib/timeline/routes/import_timelines_route.test.ts
 create mode 100644 x-pack/legacy/plugins/siem/server/lib/timeline/routes/import_timelines_route.ts
 create mode 100644 x-pack/legacy/plugins/siem/server/lib/timeline/routes/schemas/import_timelines_schema.ts
 rename x-pack/legacy/plugins/siem/server/lib/timeline/routes/{utils.ts => utils/export_timelines.ts} (85%)
 create mode 100644 x-pack/legacy/plugins/siem/server/lib/timeline/routes/utils/import_timelines.ts

diff --git a/x-pack/legacy/plugins/siem/common/constants.ts b/x-pack/legacy/plugins/siem/common/constants.ts
index 85c00562f986b..662fb8fb8ef68 100644
--- a/x-pack/legacy/plugins/siem/common/constants.ts
+++ b/x-pack/legacy/plugins/siem/common/constants.ts
@@ -82,6 +82,7 @@ export const DETECTION_ENGINE_PREPACKAGED_RULES_STATUS_URL = `${DETECTION_ENGINE
 
 export const TIMELINE_URL = '/api/timeline';
 export const TIMELINE_EXPORT_URL = `${TIMELINE_URL}/_export`;
+export const TIMELINE_IMPORT_URL = `${TIMELINE_URL}/_import`;
 
 /**
  * Default signals index key for kibana.dev.yml
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/import_rule_modal/__snapshots__/index.test.tsx.snap b/x-pack/legacy/plugins/siem/public/components/import_data_modal/__snapshots__/index.test.tsx.snap
similarity index 75%
rename from x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/import_rule_modal/__snapshots__/index.test.tsx.snap
rename to x-pack/legacy/plugins/siem/public/components/import_data_modal/__snapshots__/index.test.tsx.snap
index 6b5ea2c5390f1..6503dd8dfb508 100644
--- a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/import_rule_modal/__snapshots__/index.test.tsx.snap
+++ b/x-pack/legacy/plugins/siem/public/components/import_data_modal/__snapshots__/index.test.tsx.snap
@@ -1,6 +1,6 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`ImportRuleModal renders correctly against snapshot 1`] = `
+exports[`ImportDataModal renders correctly against snapshot 1`] = `
 <Fragment>
   <EuiOverlayMask>
     <EuiModal
@@ -9,7 +9,7 @@ exports[`ImportRuleModal renders correctly against snapshot 1`] = `
     >
       <EuiModalHeader>
         <EuiModalHeaderTitle>
-          Import rule
+          title
         </EuiModalHeaderTitle>
       </EuiModalHeader>
       <EuiModalBody>
@@ -17,7 +17,7 @@ exports[`ImportRuleModal renders correctly against snapshot 1`] = `
           size="s"
         >
           <h4>
-            Select a SIEM rule (as exported from the Detection Engine UI) to import
+            description
           </h4>
         </EuiText>
         <EuiSpacer
@@ -28,7 +28,7 @@ exports[`ImportRuleModal renders correctly against snapshot 1`] = `
           display="large"
           fullWidth={true}
           id="rule-file-picker"
-          initialPromptText="Select or drag and drop a valid rules_export.ndjson file"
+          initialPromptText="subtitle"
           isLoading={false}
           onChange={[Function]}
         />
@@ -39,9 +39,9 @@ exports[`ImportRuleModal renders correctly against snapshot 1`] = `
           checked={false}
           compressed={false}
           disabled={false}
-          id="rule-overwrite-saved-object"
+          id="import-data-modal-checkbox-label"
           indeterminate={false}
-          label="Automatically overwrite saved objects with the same rule ID"
+          label="checkBoxLabel"
           onChange={[Function]}
         />
       </EuiModalBody>
@@ -56,7 +56,7 @@ exports[`ImportRuleModal renders correctly against snapshot 1`] = `
           fill={true}
           onClick={[Function]}
         >
-          Import rule
+          submitBtnText
         </EuiButton>
       </EuiModalFooter>
     </EuiModal>
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/import_rule_modal/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/import_data_modal/index.test.tsx
similarity index 51%
rename from x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/import_rule_modal/index.test.tsx
rename to x-pack/legacy/plugins/siem/public/components/import_data_modal/index.test.tsx
index e10194853e7f9..85dcf9eeb3e5e 100644
--- a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/import_rule_modal/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/import_data_modal/index.test.tsx
@@ -6,17 +6,26 @@
 
 import { shallow } from 'enzyme';
 import React from 'react';
-import { ImportRuleModalComponent } from './index';
+import { ImportDataModalComponent } from './index';
+jest.mock('../../lib/kibana');
 
-jest.mock('../../../../../lib/kibana');
-
-describe('ImportRuleModal', () => {
+describe('ImportDataModal', () => {
   test('renders correctly against snapshot', () => {
     const wrapper = shallow(
-      <ImportRuleModalComponent
+      <ImportDataModalComponent
         showModal={true}
         closeModal={jest.fn()}
         importComplete={jest.fn()}
+        checkBoxLabel="checkBoxLabel"
+        description="description"
+        errorMessage="errorMessage"
+        failedDetailed={jest.fn()}
+        importData={jest.fn()}
+        showCheckBox={true}
+        submitBtnText="submitBtnText"
+        subtitle="subtitle"
+        successMessage={jest.fn(totalCount => 'successMessage')}
+        title="title"
       />
     );
     expect(wrapper).toMatchSnapshot();
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/import_rule_modal/index.tsx b/x-pack/legacy/plugins/siem/public/components/import_data_modal/index.tsx
similarity index 65%
rename from x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/import_rule_modal/index.tsx
rename to x-pack/legacy/plugins/siem/public/components/import_data_modal/index.tsx
index 49a181a1cd897..503710f1ee8aa 100644
--- a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/import_rule_modal/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/import_data_modal/index.tsx
@@ -21,29 +21,49 @@ import {
 } from '@elastic/eui';
 import React, { useCallback, useState } from 'react';
 
-import { importRules } from '../../../../../containers/detection_engine/rules';
+import { ImportRulesResponse, ImportRulesProps } from '../../containers/detection_engine/rules';
 import {
   displayErrorToast,
   displaySuccessToast,
   useStateToaster,
   errorToToaster,
-} from '../../../../../components/toasters';
+} from '../toasters';
 import * as i18n from './translations';
 
-interface ImportRuleModalProps {
-  showModal: boolean;
+interface ImportDataModalProps {
+  checkBoxLabel: string;
   closeModal: () => void;
+  description: string;
+  errorMessage: string;
+  failedDetailed: (id: string, statusCode: number, message: string) => string;
   importComplete: () => void;
+  importData: (arg: ImportRulesProps) => Promise<ImportRulesResponse>;
+  showCheckBox: boolean;
+  showModal: boolean;
+  submitBtnText: string;
+  subtitle: string;
+  successMessage: (totalCount: number) => string;
+  title: string;
 }
 
 /**
  * Modal component for importing Rules from a json file
  */
-export const ImportRuleModalComponent = ({
-  showModal,
+export const ImportDataModalComponent = ({
+  checkBoxLabel,
   closeModal,
+  description,
+  errorMessage,
+  failedDetailed,
   importComplete,
-}: ImportRuleModalProps) => {
+  importData,
+  showCheckBox = true,
+  showModal,
+  submitBtnText,
+  subtitle,
+  successMessage,
+  title,
+}: ImportDataModalProps) => {
   const [selectedFiles, setSelectedFiles] = useState<FileList | null>(null);
   const [isImporting, setIsImporting] = useState(false);
   const [overwrite, setOverwrite] = useState(false);
@@ -61,7 +81,7 @@ export const ImportRuleModalComponent = ({
       const abortCtrl = new AbortController();
 
       try {
-        const importResponse = await importRules({
+        const importResponse = await importData({
           fileToImport: selectedFiles[0],
           overwrite,
           signal: abortCtrl.signal,
@@ -70,23 +90,20 @@ export const ImportRuleModalComponent = ({
         // TODO: Improve error toast details for better debugging failed imports
         // e.g. When success == true && success_count === 0 that means no rules were overwritten, etc
         if (importResponse.success) {
-          displaySuccessToast(
-            i18n.SUCCESSFULLY_IMPORTED_RULES(importResponse.success_count),
-            dispatchToaster
-          );
+          displaySuccessToast(successMessage(importResponse.success_count), dispatchToaster);
         }
         if (importResponse.errors.length > 0) {
           const formattedErrors = importResponse.errors.map(e =>
-            i18n.IMPORT_FAILED_DETAILED(e.rule_id, e.error.status_code, e.error.message)
+            failedDetailed(e.rule_id, e.error.status_code, e.error.message)
           );
-          displayErrorToast(i18n.IMPORT_FAILED, formattedErrors, dispatchToaster);
+          displayErrorToast(errorMessage, formattedErrors, dispatchToaster);
         }
 
         importComplete();
         cleanupAndCloseModal();
       } catch (error) {
         cleanupAndCloseModal();
-        errorToToaster({ title: i18n.IMPORT_FAILED, error, dispatchToaster });
+        errorToToaster({ title: errorMessage, error, dispatchToaster });
       }
     }
   }, [selectedFiles, overwrite]);
@@ -102,18 +119,18 @@ export const ImportRuleModalComponent = ({
         <EuiOverlayMask>
           <EuiModal onClose={closeModal} maxWidth={'750px'}>
             <EuiModalHeader>
-              <EuiModalHeaderTitle>{i18n.IMPORT_RULE}</EuiModalHeaderTitle>
+              <EuiModalHeaderTitle>{title}</EuiModalHeaderTitle>
             </EuiModalHeader>
 
             <EuiModalBody>
               <EuiText size="s">
-                <h4>{i18n.SELECT_RULE}</h4>
+                <h4>{description}</h4>
               </EuiText>
 
               <EuiSpacer size="s" />
               <EuiFilePicker
                 id="rule-file-picker"
-                initialPromptText={i18n.INITIAL_PROMPT_TEXT}
+                initialPromptText={subtitle}
                 onChange={(files: FileList | null) => {
                   setSelectedFiles(files && files.length > 0 ? files : null);
                 }}
@@ -122,12 +139,14 @@ export const ImportRuleModalComponent = ({
                 isLoading={isImporting}
               />
               <EuiSpacer size="s" />
-              <EuiCheckbox
-                id="rule-overwrite-saved-object"
-                label={i18n.OVERWRITE_WITH_SAME_NAME}
-                checked={overwrite}
-                onChange={() => setOverwrite(!overwrite)}
-              />
+              {showCheckBox && (
+                <EuiCheckbox
+                  id="import-data-modal-checkbox-label"
+                  label={checkBoxLabel}
+                  checked={overwrite}
+                  onChange={() => setOverwrite(!overwrite)}
+                />
+              )}
             </EuiModalBody>
 
             <EuiModalFooter>
@@ -137,7 +156,7 @@ export const ImportRuleModalComponent = ({
                 disabled={selectedFiles == null || isImporting}
                 fill
               >
-                {i18n.IMPORT_RULE}
+                {submitBtnText}
               </EuiButton>
             </EuiModalFooter>
           </EuiModal>
@@ -147,8 +166,8 @@ export const ImportRuleModalComponent = ({
   );
 };
 
-ImportRuleModalComponent.displayName = 'ImportRuleModalComponent';
+ImportDataModalComponent.displayName = 'ImportDataModalComponent';
 
-export const ImportRuleModal = React.memo(ImportRuleModalComponent);
+export const ImportDataModal = React.memo(ImportDataModalComponent);
 
-ImportRuleModal.displayName = 'ImportRuleModal';
+ImportDataModal.displayName = 'ImportDataModal';
diff --git a/x-pack/legacy/plugins/siem/public/components/import_data_modal/translations.ts b/x-pack/legacy/plugins/siem/public/components/import_data_modal/translations.ts
new file mode 100644
index 0000000000000..3fe8f2e3ee4bb
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/public/components/import_data_modal/translations.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 { i18n } from '@kbn/i18n';
+
+export const CANCEL_BUTTON = i18n.translate(
+  'xpack.siem.detectionEngine.components.importRuleModal.cancelTitle',
+  {
+    defaultMessage: 'Cancel',
+  }
+);
diff --git a/x-pack/legacy/plugins/siem/public/components/open_timeline/index.tsx b/x-pack/legacy/plugins/siem/public/components/open_timeline/index.tsx
index 6d00edf28a88f..6c2cd21d808b7 100644
--- a/x-pack/legacy/plugins/siem/public/components/open_timeline/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/open_timeline/index.tsx
@@ -52,7 +52,10 @@ interface OwnProps<TCache = object> {
 }
 
 export type OpenTimelineOwnProps = OwnProps &
-  Pick<OpenTimelineProps, 'defaultPageSize' | 'title'> &
+  Pick<
+    OpenTimelineProps,
+    'defaultPageSize' | 'title' | 'importCompleteToggle' | 'setImportCompleteToggle'
+  > &
   PropsFromRedux;
 
 /** Returns a collection of selected timeline ids */
@@ -74,7 +77,9 @@ export const StatefulOpenTimelineComponent = React.memo<OpenTimelineOwnProps>(
     defaultPageSize,
     hideActions = [],
     isModal = false,
+    importCompleteToggle,
     onOpenTimeline,
+    setImportCompleteToggle,
     timeline,
     title,
     updateTimeline,
@@ -264,6 +269,7 @@ export const StatefulOpenTimelineComponent = React.memo<OpenTimelineOwnProps>(
               defaultPageSize={defaultPageSize}
               isLoading={loading}
               itemIdToExpandedNotesRowMap={itemIdToExpandedNotesRowMap}
+              importCompleteToggle={importCompleteToggle}
               onAddTimelinesToFavorites={undefined}
               onDeleteSelected={onDeleteSelected}
               onlyFavorites={onlyFavorites}
@@ -278,6 +284,7 @@ export const StatefulOpenTimelineComponent = React.memo<OpenTimelineOwnProps>(
               query={search}
               refetch={refetch}
               searchResults={timelines}
+              setImportCompleteToggle={setImportCompleteToggle}
               selectedItems={selectedItems}
               sortDirection={sortDirection}
               sortField={sortField}
diff --git a/x-pack/legacy/plugins/siem/public/components/open_timeline/open_timeline.tsx b/x-pack/legacy/plugins/siem/public/components/open_timeline/open_timeline.tsx
index b1b100349eb86..8b3da4427a362 100644
--- a/x-pack/legacy/plugins/siem/public/components/open_timeline/open_timeline.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/open_timeline/open_timeline.tsx
@@ -12,8 +12,10 @@ import { OpenTimelineProps, OpenTimelineResult } from './types';
 import { SearchRow } from './search_row';
 import { TimelinesTable } from './timelines_table';
 import { TitleRow } from './title_row';
-
+import { ImportDataModal } from '../import_data_modal';
 import * as i18n from './translations';
+import { importTimelines } from '../../containers/timeline/all/api';
+
 import {
   UtilityBarGroup,
   UtilityBarText,
@@ -31,6 +33,7 @@ export const OpenTimeline = React.memo<OpenTimelineProps>(
     defaultPageSize,
     isLoading,
     itemIdToExpandedNotesRowMap,
+    importCompleteToggle,
     onAddTimelinesToFavorites,
     onDeleteSelected,
     onlyFavorites,
@@ -47,6 +50,7 @@ export const OpenTimeline = React.memo<OpenTimelineProps>(
     searchResults,
     selectedItems,
     sortDirection,
+    setImportCompleteToggle,
     sortField,
     title,
     totalSearchResultsCount,
@@ -93,9 +97,25 @@ export const OpenTimeline = React.memo<OpenTimelineProps>(
     );
 
     const onRefreshBtnClick = useCallback(() => {
-      if (typeof refetch === 'function') refetch();
+      if (refetch != null) {
+        refetch();
+      }
     }, [refetch]);
 
+    const handleCloseModal = useCallback(() => {
+      if (setImportCompleteToggle != null) {
+        setImportCompleteToggle(false);
+      }
+    }, [setImportCompleteToggle]);
+    const handleComplete = useCallback(() => {
+      if (setImportCompleteToggle != null) {
+        setImportCompleteToggle(false);
+      }
+      if (refetch != null) {
+        refetch();
+      }
+    }, [setImportCompleteToggle, refetch]);
+
     return (
       <>
         <EditOneTimelineAction
@@ -106,6 +126,21 @@ export const OpenTimeline = React.memo<OpenTimelineProps>(
           onComplete={onCompleteEditTimelineAction}
           title={actionItem?.title ?? i18n.UNTITLED_TIMELINE}
         />
+        <ImportDataModal
+          checkBoxLabel={i18n.OVERWRITE_WITH_SAME_NAME}
+          closeModal={handleCloseModal}
+          description={i18n.SELECT_TIMELINE}
+          errorMessage={i18n.IMPORT_FAILED}
+          failedDetailed={i18n.IMPORT_FAILED_DETAILED}
+          importComplete={handleComplete}
+          importData={importTimelines}
+          successMessage={i18n.SUCCESSFULLY_IMPORTED_TIMELINES}
+          showCheckBox={false}
+          showModal={importCompleteToggle ?? false}
+          submitBtnText={i18n.IMPORT_TIMELINE_BTN_TITLE}
+          subtitle={i18n.INITIAL_PROMPT_TEXT}
+          title={i18n.IMPORT_TIMELINE}
+        />
 
         <EuiPanel className={OPEN_TIMELINE_CLASS_NAME}>
           <TitleRow
diff --git a/x-pack/legacy/plugins/siem/public/components/open_timeline/translations.ts b/x-pack/legacy/plugins/siem/public/components/open_timeline/translations.ts
index 4063b73d9499a..7914e368166db 100644
--- a/x-pack/legacy/plugins/siem/public/components/open_timeline/translations.ts
+++ b/x-pack/legacy/plugins/siem/public/components/open_timeline/translations.ts
@@ -145,3 +145,61 @@ export const SUCCESSFULLY_EXPORTED_TIMELINES = (totalTimelines: number) =>
     defaultMessage:
       'Successfully exported {totalTimelines, plural, =0 {all timelines} =1 {{totalTimelines} timeline} other {{totalTimelines} timelines}}',
   });
+
+export const IMPORT_TIMELINE_BTN_TITLE = i18n.translate(
+  'xpack.siem.timelines.components.importTimelineModal.importTimelineTitle',
+  {
+    defaultMessage: 'Import timeline',
+  }
+);
+
+export const SELECT_TIMELINE = i18n.translate(
+  'xpack.siem.timelines.components.importTimelineModal.selectTimelineDescription',
+  {
+    defaultMessage: 'Select a SIEM timeline (as exported from the Timeline view) to import',
+  }
+);
+
+export const INITIAL_PROMPT_TEXT = i18n.translate(
+  'xpack.siem.timelines.components.importTimelineModal.initialPromptTextDescription',
+  {
+    defaultMessage: 'Select or drag and drop a valid timelines_export.ndjson file',
+  }
+);
+
+export const OVERWRITE_WITH_SAME_NAME = i18n.translate(
+  'xpack.siem.timelines.components.importTimelineModal.overwriteDescription',
+  {
+    defaultMessage: 'Automatically overwrite saved objects with the same timeline ID',
+  }
+);
+
+export const SUCCESSFULLY_IMPORTED_TIMELINES = (totalCount: number) =>
+  i18n.translate(
+    'xpack.siem.timelines.components.importTimelineModal.successfullyImportedTimelinesTitle',
+    {
+      values: { totalCount },
+      defaultMessage:
+        'Successfully imported {totalCount} {totalCount, plural, =1 {timeline} other {timelines}}',
+    }
+  );
+
+export const IMPORT_FAILED = i18n.translate(
+  'xpack.siem.timelines.components.importTimelineModal.importFailedTitle',
+  {
+    defaultMessage: 'Failed to import timelines',
+  }
+);
+
+export const IMPORT_TIMELINE = i18n.translate(
+  'xpack.siem.timelines.components.importTimelineModal.importTitle',
+  {
+    defaultMessage: 'Import timeline…',
+  }
+);
+
+export const IMPORT_FAILED_DETAILED = (id: string, statusCode: number, message: string) =>
+  i18n.translate('xpack.siem.timelines.components.importTimelineModal.importFailedDetailedTitle', {
+    values: { id, statusCode, message },
+    defaultMessage: 'Timeline ID: {id}\n Status Code: {statusCode}\n Message: {message}',
+  });
diff --git a/x-pack/legacy/plugins/siem/public/components/open_timeline/types.ts b/x-pack/legacy/plugins/siem/public/components/open_timeline/types.ts
index b466ea32799d9..1265c056ec506 100644
--- a/x-pack/legacy/plugins/siem/public/components/open_timeline/types.ts
+++ b/x-pack/legacy/plugins/siem/public/components/open_timeline/types.ts
@@ -120,6 +120,8 @@ export interface OpenTimelineProps {
   isLoading: boolean;
   /** Required by EuiTable for expandable rows: a map of `TimelineResult.savedObjectId` to rendered notes */
   itemIdToExpandedNotesRowMap: Record<string, JSX.Element>;
+  /** Display import timelines modal*/
+  importCompleteToggle?: boolean;
   /** If this callback is specified, a "Favorite Selected" button will be displayed, and this callback will be invoked when the button is clicked */
   onAddTimelinesToFavorites?: OnAddTimelinesToFavorites;
   /** If this callback is specified, a "Delete Selected" button will be displayed, and this callback will be invoked when the button is clicked */
@@ -144,13 +146,14 @@ export interface OpenTimelineProps {
   pageSize: number;
   /** The currently applied search criteria */
   query: string;
-  /** Refetch timelines data */
+  /** Refetch table */
   refetch?: Refetch;
-
   /** The results of executing a search */
   searchResults: OpenTimelineResult[];
   /** the currently-selected timelines in the table */
   selectedItems: OpenTimelineResult[];
+  /** Toggle export timelines modal*/
+  setImportCompleteToggle?: React.Dispatch<React.SetStateAction<boolean>>;
   /** the requested sort direction of the query results */
   sortDirection: 'asc' | 'desc';
   /** the requested field to sort on */
diff --git a/x-pack/legacy/plugins/siem/public/containers/timeline/all/api.ts b/x-pack/legacy/plugins/siem/public/containers/timeline/all/api.ts
index edda2e30ea400..0479851fc5b55 100644
--- a/x-pack/legacy/plugins/siem/public/containers/timeline/all/api.ts
+++ b/x-pack/legacy/plugins/siem/public/containers/timeline/all/api.ts
@@ -4,9 +4,27 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+import { ImportRulesProps, ImportRulesResponse } from '../../detection_engine/rules';
 import { KibanaServices } from '../../../lib/kibana';
+import { TIMELINE_IMPORT_URL, TIMELINE_EXPORT_URL } from '../../../../common/constants';
 import { ExportSelectedData } from '../../../components/generic_downloader';
-import { TIMELINE_EXPORT_URL } from '../../../../common/constants';
+
+export const importTimelines = async ({
+  fileToImport,
+  overwrite = false,
+  signal,
+}: ImportRulesProps): Promise<ImportRulesResponse> => {
+  const formData = new FormData();
+  formData.append('file', fileToImport);
+
+  return KibanaServices.get().http.fetch<ImportRulesResponse>(`${TIMELINE_IMPORT_URL}`, {
+    method: 'POST',
+    headers: { 'Content-Type': undefined },
+    query: { overwrite },
+    body: formData,
+    signal,
+  });
+};
 
 export const exportSelectedTimeline: ExportSelectedData = async ({
   excludeExportDetails = false,
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/import_rule_modal/translations.ts b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/import_rule_modal/translations.ts
deleted file mode 100644
index dab1c9490591f..0000000000000
--- a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/import_rule_modal/translations.ts
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { i18n } from '@kbn/i18n';
-
-export const IMPORT_RULE = i18n.translate(
-  'xpack.siem.detectionEngine.components.importRuleModal.importRuleTitle',
-  {
-    defaultMessage: 'Import rule',
-  }
-);
-
-export const SELECT_RULE = i18n.translate(
-  'xpack.siem.detectionEngine.components.importRuleModal.selectRuleDescription',
-  {
-    defaultMessage: 'Select a SIEM rule (as exported from the Detection Engine UI) to import',
-  }
-);
-
-export const INITIAL_PROMPT_TEXT = i18n.translate(
-  'xpack.siem.detectionEngine.components.importRuleModal.initialPromptTextDescription',
-  {
-    defaultMessage: 'Select or drag and drop a valid rules_export.ndjson file',
-  }
-);
-
-export const OVERWRITE_WITH_SAME_NAME = i18n.translate(
-  'xpack.siem.detectionEngine.components.importRuleModal.overwriteDescription',
-  {
-    defaultMessage: 'Automatically overwrite saved objects with the same rule ID',
-  }
-);
-
-export const CANCEL_BUTTON = i18n.translate(
-  'xpack.siem.detectionEngine.components.importRuleModal.cancelTitle',
-  {
-    defaultMessage: 'Cancel',
-  }
-);
-
-export const SUCCESSFULLY_IMPORTED_RULES = (totalRules: number) =>
-  i18n.translate(
-    'xpack.siem.detectionEngine.components.importRuleModal.successfullyImportedRulesTitle',
-    {
-      values: { totalRules },
-      defaultMessage:
-        'Successfully imported {totalRules} {totalRules, plural, =1 {rule} other {rules}}',
-    }
-  );
-
-export const IMPORT_FAILED = i18n.translate(
-  'xpack.siem.detectionEngine.components.importRuleModal.importFailedTitle',
-  {
-    defaultMessage: 'Failed to import rules',
-  }
-);
-
-export const IMPORT_FAILED_DETAILED = (ruleId: string, statusCode: number, message: string) =>
-  i18n.translate(
-    'xpack.siem.detectionEngine.components.importRuleModal.importFailedDetailedTitle',
-    {
-      values: { ruleId, statusCode, message },
-      defaultMessage: 'Rule ID: {ruleId}\n Status Code: {statusCode}\n Message: {message}',
-    }
-  );
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/index.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/index.tsx
index b2c17fb8d38a8..d228ded5dd741 100644
--- a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/index.tsx
@@ -8,7 +8,7 @@ import { EuiButton, EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
 import React, { useCallback, useRef, useState } from 'react';
 import { Redirect } from 'react-router-dom';
 
-import { usePrePackagedRules } from '../../../containers/detection_engine/rules';
+import { usePrePackagedRules, importRules } from '../../../containers/detection_engine/rules';
 import {
   DETECTION_ENGINE_PAGE_NAME,
   getDetectionEngineUrl,
@@ -20,7 +20,7 @@ import { SpyRoute } from '../../../utils/route/spy_routes';
 
 import { useUserInfo } from '../components/user_info';
 import { AllRules } from './all';
-import { ImportRuleModal } from './components/import_rule_modal';
+import { ImportDataModal } from '../../../components/import_data_modal';
 import { ReadOnlyCallOut } from './components/read_only_callout';
 import { UpdatePrePackagedRulesCallOut } from './components/pre_packaged_rules/update_callout';
 import { getPrePackagedRuleStatus, redirectToDetections } from './helpers';
@@ -96,10 +96,20 @@ const RulesPageComponent: React.FC = () => {
   return (
     <>
       {userHasNoPermissions && <ReadOnlyCallOut />}
-      <ImportRuleModal
-        showModal={showImportModal}
+      <ImportDataModal
+        checkBoxLabel={i18n.OVERWRITE_WITH_SAME_NAME}
         closeModal={() => setShowImportModal(false)}
+        description={i18n.SELECT_RULE}
+        errorMessage={i18n.IMPORT_FAILED}
+        failedDetailed={i18n.IMPORT_FAILED_DETAILED}
         importComplete={handleRefreshRules}
+        importData={importRules}
+        successMessage={i18n.SUCCESSFULLY_IMPORTED_RULES}
+        showCheckBox={true}
+        showModal={showImportModal}
+        submitBtnText={i18n.IMPORT_RULE_BTN_TITLE}
+        subtitle={i18n.INITIAL_PROMPT_TEXT}
+        title={i18n.IMPORT_RULE}
       />
       <WrapperPage>
         <DetectionEngineHeaderPage
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/translations.ts b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/translations.ts
index 8b5b7a07fda49..1c547e215dfdd 100644
--- a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/translations.ts
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/translations.ts
@@ -358,3 +358,57 @@ export const RELOAD_MISSING_PREPACKAGED_RULES = (missingRules: number) =>
     defaultMessage:
       'Reload {missingRules} deleted Elastic prebuilt {missingRules, plural, =1 {rule} other {rules}} ',
   });
+
+export const IMPORT_RULE_BTN_TITLE = i18n.translate(
+  'xpack.siem.detectionEngine.components.importRuleModal.importRuleTitle',
+  {
+    defaultMessage: 'Import rule',
+  }
+);
+
+export const SELECT_RULE = i18n.translate(
+  'xpack.siem.detectionEngine.components.importRuleModal.selectRuleDescription',
+  {
+    defaultMessage: 'Select a SIEM rule (as exported from the Detection Engine view) to import',
+  }
+);
+
+export const INITIAL_PROMPT_TEXT = i18n.translate(
+  'xpack.siem.detectionEngine.components.importRuleModal.initialPromptTextDescription',
+  {
+    defaultMessage: 'Select or drag and drop a valid rules_export.ndjson file',
+  }
+);
+
+export const OVERWRITE_WITH_SAME_NAME = i18n.translate(
+  'xpack.siem.detectionEngine.components.importRuleModal.overwriteDescription',
+  {
+    defaultMessage: 'Automatically overwrite saved objects with the same rule ID',
+  }
+);
+
+export const SUCCESSFULLY_IMPORTED_RULES = (totalRules: number) =>
+  i18n.translate(
+    'xpack.siem.detectionEngine.components.importRuleModal.successfullyImportedRulesTitle',
+    {
+      values: { totalRules },
+      defaultMessage:
+        'Successfully imported {totalRules} {totalRules, plural, =1 {rule} other {rules}}',
+    }
+  );
+
+export const IMPORT_FAILED = i18n.translate(
+  'xpack.siem.detectionEngine.components.importRuleModal.importFailedTitle',
+  {
+    defaultMessage: 'Failed to import rules',
+  }
+);
+
+export const IMPORT_FAILED_DETAILED = (ruleId: string, statusCode: number, message: string) =>
+  i18n.translate(
+    'xpack.siem.detectionEngine.components.importRuleModal.importFailedDetailedTitle',
+    {
+      values: { ruleId, statusCode, message },
+      defaultMessage: 'Rule ID: {ruleId}\n Status Code: {statusCode}\n Message: {message}',
+    }
+  );
diff --git a/x-pack/legacy/plugins/siem/public/pages/timelines/timelines_page.tsx b/x-pack/legacy/plugins/siem/public/pages/timelines/timelines_page.tsx
index 6d30ea58089f0..38462e6526454 100644
--- a/x-pack/legacy/plugins/siem/public/pages/timelines/timelines_page.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/timelines/timelines_page.tsx
@@ -5,9 +5,10 @@
  */
 
 import ApolloClient from 'apollo-client';
-import React from 'react';
+import React, { useState, useCallback } from 'react';
 import styled from 'styled-components';
 
+import { EuiButton } from '@elastic/eui';
 import { HeaderPage } from '../../components/header_page';
 import { StatefulOpenTimeline } from '../../components/open_timeline';
 import { WrapperPage } from '../../components/wrapper_page';
@@ -27,16 +28,26 @@ type OwnProps = TimelinesProps;
 export const DEFAULT_SEARCH_RESULTS_PER_PAGE = 10;
 
 const TimelinesPageComponent: React.FC<OwnProps> = ({ apolloClient }) => {
+  const [importCompleteToggle, setImportCompleteToggle] = useState<boolean>(false);
+  const onImportTimelineBtnClick = useCallback(() => {
+    setImportCompleteToggle(true);
+  }, [setImportCompleteToggle]);
   return (
     <>
       <WrapperPage>
-        <HeaderPage title={i18n.PAGE_TITLE} />
+        <HeaderPage border title={i18n.PAGE_TITLE}>
+          <EuiButton iconType="indexOpen" onClick={onImportTimelineBtnClick}>
+            {i18n.ALL_TIMELINES_IMPORT_TIMELINE_TITLE}
+          </EuiButton>
+        </HeaderPage>
 
         <TimelinesContainer>
           <StatefulOpenTimeline
             apolloClient={apolloClient}
             defaultPageSize={DEFAULT_SEARCH_RESULTS_PER_PAGE}
             isModal={false}
+            importCompleteToggle={importCompleteToggle}
+            setImportCompleteToggle={setImportCompleteToggle}
             title={i18n.ALL_TIMELINES_PANEL_TITLE}
           />
         </TimelinesContainer>
diff --git a/x-pack/legacy/plugins/siem/server/lib/note/saved_object.ts b/x-pack/legacy/plugins/siem/server/lib/note/saved_object.ts
index b6a43fc523adb..23162f38bffba 100644
--- a/x-pack/legacy/plugins/siem/server/lib/note/saved_object.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/note/saved_object.ts
@@ -141,6 +141,8 @@ export class Note {
       }
 
       // Update new note
+
+      const existingNote = await this.getSavedNote(request, noteId);
       return {
         code: 200,
         message: 'success',
@@ -150,7 +152,7 @@ export class Note {
             noteId,
             pickSavedNote(noteId, note, request.user),
             {
-              version: version || undefined,
+              version: existingNote.version || undefined,
             }
           )
         ),
diff --git a/x-pack/legacy/plugins/siem/server/lib/pinned_event/saved_object.ts b/x-pack/legacy/plugins/siem/server/lib/pinned_event/saved_object.ts
index 9ea950e8a443b..a95c1da197f57 100644
--- a/x-pack/legacy/plugins/siem/server/lib/pinned_event/saved_object.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/pinned_event/saved_object.ts
@@ -89,7 +89,7 @@ export class PinnedEvent {
 
   public async persistPinnedEventOnTimeline(
     request: FrameworkRequest,
-    pinnedEventId: string | null,
+    pinnedEventId: string | null, // pinned event saved object id
     eventId: string,
     timelineId: string | null
   ): Promise<PinnedEventResponse | null> {
@@ -116,6 +116,7 @@ export class PinnedEvent {
           const isPinnedAlreadyExisting = allPinnedEventId.filter(
             pinnedEvent => pinnedEvent.eventId === eventId
           );
+
           if (isPinnedAlreadyExisting.length === 0) {
             const savedPinnedEvent: SavedPinnedEvent = {
               eventId,
@@ -204,7 +205,7 @@ export const convertSavedObjectToSavedPinnedEvent = (
 // then this interface does not allow types without index signature
 // this is limiting us with our type for now so the easy way was to use any
 
-const pickSavedPinnedEvent = (
+export const pickSavedPinnedEvent = (
   pinnedEventId: string | null,
   savedPinnedEvent: SavedPinnedEvent,
   userInfo: AuthenticatedUser | null
diff --git a/x-pack/legacy/plugins/siem/server/lib/timeline/create_timelines_stream_from_ndjson.ts b/x-pack/legacy/plugins/siem/server/lib/timeline/create_timelines_stream_from_ndjson.ts
new file mode 100644
index 0000000000000..5373570a4f8cc
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/timeline/create_timelines_stream_from_ndjson.ts
@@ -0,0 +1,46 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { Transform } from 'stream';
+import {
+  createConcatStream,
+  createSplitStream,
+  createMapStream,
+} from '../../../../../../../src/legacy/utils';
+import {
+  parseNdjsonStrings,
+  filterExportedCounts,
+  createLimitStream,
+} from '../detection_engine/rules/create_rules_stream_from_ndjson';
+import { importTimelinesSchema } from './routes/schemas/import_timelines_schema';
+import { BadRequestError } from '../detection_engine/errors/bad_request_error';
+import { ImportTimelineResponse } from './routes/utils/import_timelines';
+
+export const validateTimelines = (): Transform => {
+  return createMapStream((obj: ImportTimelineResponse) => {
+    if (!(obj instanceof Error)) {
+      const validated = importTimelinesSchema.validate(obj);
+      if (validated.error != null) {
+        return new BadRequestError(validated.error.message);
+      } else {
+        return validated.value;
+      }
+    } else {
+      return obj;
+    }
+  });
+};
+
+export const createTimelinesStreamFromNdJson = (ruleLimit: number) => {
+  return [
+    createSplitStream('\n'),
+    parseNdjsonStrings(),
+    filterExportedCounts(),
+    validateTimelines(),
+    createLimitStream(ruleLimit),
+    createConcatStream([]),
+  ];
+};
diff --git a/x-pack/legacy/plugins/siem/server/lib/timeline/routes/__mocks__/import_timelines.ts b/x-pack/legacy/plugins/siem/server/lib/timeline/routes/__mocks__/import_timelines.ts
new file mode 100644
index 0000000000000..74d3744e29299
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/timeline/routes/__mocks__/import_timelines.ts
@@ -0,0 +1,177 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { omit } from 'lodash/fp';
+
+export const mockDuplicateIdErrors = [];
+
+export const mockParsedObjects = [
+  {
+    savedObjectId: '79deb4c0-6bc1-11ea-a90b-f5341fb7a189',
+    version: 'WzEyMjUsMV0=',
+    columns: [],
+    dataProviders: [],
+    description: 'description',
+    eventType: 'all',
+    filters: [],
+    kqlMode: 'filter',
+    kqlQuery: { filterQuery: [Object] },
+    title: 'My duplicate timeline',
+    dateRange: { start: 1584523907294, end: 1584610307294 },
+    savedQueryId: null,
+    sort: { columnId: '@timestamp', sortDirection: 'desc' },
+    created: 1584828930463,
+    createdBy: 'angela',
+    updated: 1584868346013,
+    updatedBy: 'angela',
+    eventNotes: [
+      {
+        noteId: '73ac2370-6bc2-11ea-a90b-f5341fb7a189',
+        version: 'WzExMjgsMV0=',
+        eventId: 'ZaAi8nAB5OldxqFfdhke',
+        note: 'event note2',
+        timelineId: 'da49a0e0-6bc1-11ea-a90b-f5341fb7a189',
+        created: 1584829349563,
+        createdBy: 'angela',
+        updated: 1584829349563,
+        updatedBy: 'angela',
+      },
+      {
+        noteId: 'f7b71620-6bc2-11ea-a0b6-33c7b2a78885',
+        version: 'WzExMzUsMV0=',
+        eventId: 'ZaAi8nAB5OldxqFfdhke',
+        note: 'event note2',
+        timelineId: 'da49a0e0-6bc1-11ea-a90b-f5341fb7a189',
+        created: 1584829571092,
+        createdBy: 'angela',
+        updated: 1584829571092,
+        updatedBy: 'angela',
+      },
+    ],
+    globalNotes: [
+      {
+        noteId: 'd2649d40-6bc5-11ea-86f0-5db0048c6086',
+        version: 'WzExNjQsMV0=',
+        note: 'global',
+        timelineId: 'd123dfe0-6bc5-11ea-86f0-5db0048c6086',
+        created: 1584830796969,
+        createdBy: 'angela',
+        updated: 1584830796969,
+        updatedBy: 'angela',
+      },
+    ],
+    pinnedEventIds: ['k-gi8nABm-sIqJ_scOoS'],
+  },
+];
+
+export const mockUniqueParsedObjects = [
+  {
+    savedObjectId: '79deb4c0-6bc1-11ea-a90b-f5341fb7a189',
+    version: 'WzEyMjUsMV0=',
+    columns: [],
+    dataProviders: [],
+    description: 'description',
+    eventType: 'all',
+    filters: [],
+    kqlMode: 'filter',
+    kqlQuery: { filterQuery: [] },
+    title: 'My duplicate timeline',
+    dateRange: { start: 1584523907294, end: 1584610307294 },
+    savedQueryId: null,
+    sort: { columnId: '@timestamp', sortDirection: 'desc' },
+    created: 1584828930463,
+    createdBy: 'angela',
+    updated: 1584868346013,
+    updatedBy: 'angela',
+    eventNotes: [
+      {
+        noteId: '73ac2370-6bc2-11ea-a90b-f5341fb7a189',
+        version: 'WzExMjgsMV0=',
+        eventId: 'ZaAi8nAB5OldxqFfdhke',
+        note: 'event note1',
+        timelineId: 'da49a0e0-6bc1-11ea-a90b-f5341fb7a189',
+        created: 1584829349563,
+        createdBy: 'angela',
+        updated: 1584829349563,
+        updatedBy: 'angela',
+      },
+      {
+        noteId: 'f7b71620-6bc2-11ea-a0b6-33c7b2a78885',
+        version: 'WzExMzUsMV0=',
+        eventId: 'ZaAi8nAB5OldxqFfdhke',
+        note: 'event note2',
+        timelineId: 'da49a0e0-6bc1-11ea-a90b-f5341fb7a189',
+        created: 1584829571092,
+        createdBy: 'angela',
+        updated: 1584829571092,
+        updatedBy: 'angela',
+      },
+    ],
+    globalNotes: [
+      {
+        noteId: 'd2649d40-6bc5-11ea-86f0-5db0048c6086',
+        version: 'WzExNjQsMV0=',
+        note: 'global',
+        timelineId: 'd123dfe0-6bc5-11ea-86f0-5db0048c6086',
+        created: 1584830796969,
+        createdBy: 'angela',
+        updated: 1584830796969,
+        updatedBy: 'angela',
+      },
+    ],
+    pinnedEventIds: ['k-gi8nABm-sIqJ_scOoS'],
+  },
+];
+
+export const mockGetTimelineValue = {
+  savedObjectId: '79deb4c0-6bc1-11ea-a90b-f5341fb7a189',
+  version: 'WzEyMjUsMV0=',
+  columns: [],
+  dataProviders: [],
+  description: 'description',
+  eventType: 'all',
+  filters: [],
+  kqlMode: 'filter',
+  kqlQuery: { filterQuery: [] },
+  title: 'My duplicate timeline',
+  dateRange: { start: 1584523907294, end: 1584610307294 },
+  savedQueryId: null,
+  sort: { columnId: '@timestamp', sortDirection: 'desc' },
+  created: 1584828930463,
+  createdBy: 'angela',
+  updated: 1584868346013,
+  updatedBy: 'angela',
+  noteIds: [],
+  pinnedEventIds: ['k-gi8nABm-sIqJ_scOoS'],
+};
+
+export const mockParsedTimelineObject = omit(
+  [
+    'globalNotes',
+    'eventNotes',
+    'pinnedEventIds',
+    'version',
+    'savedObjectId',
+    'created',
+    'createdBy',
+    'updated',
+    'updatedBy',
+  ],
+  mockUniqueParsedObjects[0]
+);
+
+export const mockConfig = {
+  get: () => {
+    return 100000000;
+  },
+  has: jest.fn(),
+};
+
+export const mockGetCurrentUser = {
+  user: {
+    username: 'mockUser',
+  },
+};
diff --git a/x-pack/legacy/plugins/siem/server/lib/timeline/routes/__mocks__/request_responses.ts b/x-pack/legacy/plugins/siem/server/lib/timeline/routes/__mocks__/request_responses.ts
index eae1ece7e789d..0e73e4bdd6c97 100644
--- a/x-pack/legacy/plugins/siem/server/lib/timeline/routes/__mocks__/request_responses.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/timeline/routes/__mocks__/request_responses.ts
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { TIMELINE_EXPORT_URL } from '../../../../../common/constants';
+import { TIMELINE_EXPORT_URL, TIMELINE_IMPORT_URL } from '../../../../../common/constants';
 import { requestMock } from '../../../detection_engine/routes/__mocks__';
 
 export const getExportTimelinesRequest = () =>
@@ -16,6 +16,26 @@ export const getExportTimelinesRequest = () =>
     },
   });
 
+export const getImportTimelinesRequest = (filename?: string) =>
+  requestMock.create({
+    method: 'post',
+    path: TIMELINE_IMPORT_URL,
+    query: { overwrite: false },
+    body: {
+      file: { hapi: { filename: filename ?? 'filename.ndjson' } },
+    },
+  });
+
+export const getImportTimelinesRequestEnableOverwrite = (filename?: string) =>
+  requestMock.create({
+    method: 'post',
+    path: TIMELINE_IMPORT_URL,
+    query: { overwrite: true },
+    body: {
+      file: { hapi: { filename: filename ?? 'filename.ndjson' } },
+    },
+  });
+
 export const mockTimelinesSavedObjects = () => ({
   saved_objects: [
     {
diff --git a/x-pack/legacy/plugins/siem/server/lib/timeline/routes/export_timelines_route.ts b/x-pack/legacy/plugins/siem/server/lib/timeline/routes/export_timelines_route.ts
index 3ded959aced36..b8e7be13fff34 100644
--- a/x-pack/legacy/plugins/siem/server/lib/timeline/routes/export_timelines_route.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/timeline/routes/export_timelines_route.ts
@@ -21,7 +21,7 @@ import {
   exportTimelinesQuerySchema,
 } from './schemas/export_timelines_schema';
 
-import { getExportTimelineByObjectIds } from './utils';
+import { getExportTimelineByObjectIds } from './utils/export_timelines';
 
 export const exportTimelinesRoute = (router: IRouter, config: LegacyServices['config']) => {
   router.post(
diff --git a/x-pack/legacy/plugins/siem/server/lib/timeline/routes/import_timelines_route.test.ts b/x-pack/legacy/plugins/siem/server/lib/timeline/routes/import_timelines_route.test.ts
new file mode 100644
index 0000000000000..e89aef4c70ecb
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/timeline/routes/import_timelines_route.test.ts
@@ -0,0 +1,341 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { getImportTimelinesRequest } from './__mocks__/request_responses';
+import {
+  serverMock,
+  requestContextMock,
+  requestMock,
+} from '../../detection_engine/routes/__mocks__';
+import { TIMELINE_EXPORT_URL } from '../../../../common/constants';
+import { SecurityPluginSetup } from '../../../../../../../plugins/security/server';
+
+import {
+  mockConfig,
+  mockUniqueParsedObjects,
+  mockParsedObjects,
+  mockDuplicateIdErrors,
+  mockGetCurrentUser,
+  mockGetTimelineValue,
+  mockParsedTimelineObject,
+} from './__mocks__/import_timelines';
+
+describe('import timelines', () => {
+  let config: jest.Mock;
+  let server: ReturnType<typeof serverMock.create>;
+  let request: ReturnType<typeof requestMock.create>;
+  let securitySetup: SecurityPluginSetup;
+  let { context } = requestContextMock.createTools();
+  let mockGetTimeline: jest.Mock;
+  let mockPersistTimeline: jest.Mock;
+  let mockPersistPinnedEventOnTimeline: jest.Mock;
+  let mockPersistNote: jest.Mock;
+  const newTimelineSavedObjectId = '79deb4c0-6bc1-11ea-9999-f5341fb7a189';
+  const newTimelineVersion = '9999';
+  beforeEach(() => {
+    jest.resetModules();
+    jest.resetAllMocks();
+    jest.restoreAllMocks();
+    jest.clearAllMocks();
+
+    server = serverMock.create();
+    context = requestContextMock.createTools().context;
+    config = jest.fn().mockImplementation(() => {
+      return mockConfig;
+    });
+
+    securitySetup = ({
+      authc: {
+        getCurrentUser: jest.fn().mockReturnValue(mockGetCurrentUser),
+      },
+      authz: {},
+    } as unknown) as SecurityPluginSetup;
+
+    mockGetTimeline = jest.fn();
+    mockPersistTimeline = jest.fn();
+    mockPersistPinnedEventOnTimeline = jest.fn();
+    mockPersistNote = jest.fn();
+
+    jest.doMock('../create_timelines_stream_from_ndjson', () => {
+      return {
+        createTimelinesStreamFromNdJson: jest.fn().mockReturnValue(mockParsedObjects),
+      };
+    });
+
+    jest.doMock('../../../../../../../../src/legacy/utils', () => {
+      return {
+        createPromiseFromStreams: jest.fn().mockReturnValue(mockParsedObjects),
+      };
+    });
+
+    jest.doMock('./utils/import_timelines', () => {
+      const originalModule = jest.requireActual('./utils/import_timelines');
+      return {
+        ...originalModule,
+        getTupleDuplicateErrorsAndUniqueTimeline: jest
+          .fn()
+          .mockReturnValue([mockDuplicateIdErrors, mockUniqueParsedObjects]),
+      };
+    });
+  });
+
+  describe('Import a new timeline', () => {
+    beforeEach(() => {
+      jest.doMock('../saved_object', () => {
+        return {
+          Timeline: jest.fn().mockImplementation(() => {
+            return {
+              getTimeline: mockGetTimeline.mockReturnValue(null),
+              persistTimeline: mockPersistTimeline.mockReturnValue({
+                timeline: { savedObjectId: newTimelineSavedObjectId, version: newTimelineVersion },
+              }),
+            };
+          }),
+        };
+      });
+
+      jest.doMock('../../pinned_event/saved_object', () => {
+        return {
+          PinnedEvent: jest.fn().mockImplementation(() => {
+            return {
+              persistPinnedEventOnTimeline: mockPersistPinnedEventOnTimeline,
+            };
+          }),
+        };
+      });
+
+      jest.doMock('../../note/saved_object', () => {
+        return {
+          Note: jest.fn().mockImplementation(() => {
+            return {
+              persistNote: mockPersistNote,
+            };
+          }),
+        };
+      });
+
+      const importTimelinesRoute = jest.requireActual('./import_timelines_route')
+        .importTimelinesRoute;
+      importTimelinesRoute(server.router, config, securitySetup);
+    });
+
+    test('should use given timelineId to check if the timeline savedObject already exist', async () => {
+      const mockRequest = getImportTimelinesRequest();
+      await server.inject(mockRequest, context);
+      expect(mockGetTimeline.mock.calls[0][1]).toEqual(mockUniqueParsedObjects[0].savedObjectId);
+    });
+
+    test('should Create a new timeline savedObject', async () => {
+      const mockRequest = getImportTimelinesRequest();
+      await server.inject(mockRequest, context);
+      expect(mockPersistTimeline).toHaveBeenCalled();
+    });
+
+    test('should Create a new timeline savedObject without timelineId', async () => {
+      const mockRequest = getImportTimelinesRequest();
+      await server.inject(mockRequest, context);
+      expect(mockPersistTimeline.mock.calls[0][1]).toBeNull();
+    });
+
+    test('should Create a new timeline savedObject without timeline version', async () => {
+      const mockRequest = getImportTimelinesRequest();
+      await server.inject(mockRequest, context);
+      expect(mockPersistTimeline.mock.calls[0][2]).toBeNull();
+    });
+
+    test('should Create a new timeline savedObject witn given timeline', async () => {
+      const mockRequest = getImportTimelinesRequest();
+      await server.inject(mockRequest, context);
+      expect(mockPersistTimeline.mock.calls[0][3]).toEqual(mockParsedTimelineObject);
+    });
+
+    test('should Create new pinned events', async () => {
+      const mockRequest = getImportTimelinesRequest();
+      await server.inject(mockRequest, context);
+      expect(mockPersistPinnedEventOnTimeline).toHaveBeenCalled();
+    });
+
+    test('should Create a new pinned event without pinnedEventSavedObjectId', async () => {
+      const mockRequest = getImportTimelinesRequest();
+      await server.inject(mockRequest, context);
+      expect(mockPersistPinnedEventOnTimeline.mock.calls[0][1]).toBeNull();
+    });
+
+    test('should Create a new pinned event with pinnedEventId', async () => {
+      const mockRequest = getImportTimelinesRequest();
+      await server.inject(mockRequest, context);
+      expect(mockPersistPinnedEventOnTimeline.mock.calls[0][2]).toEqual(
+        mockUniqueParsedObjects[0].pinnedEventIds[0]
+      );
+    });
+
+    test('should Create a new pinned event with new timelineSavedObjectId', async () => {
+      const mockRequest = getImportTimelinesRequest();
+      await server.inject(mockRequest, context);
+      expect(mockPersistPinnedEventOnTimeline.mock.calls[0][3]).toEqual(newTimelineSavedObjectId);
+    });
+
+    test('should Create notes', async () => {
+      const mockRequest = getImportTimelinesRequest();
+      await server.inject(mockRequest, context);
+      expect(mockPersistNote).toHaveBeenCalled();
+    });
+
+    test('should provide no noteSavedObjectId when Creating notes for a timeline', async () => {
+      const mockRequest = getImportTimelinesRequest();
+      await server.inject(mockRequest, context);
+      expect(mockPersistNote.mock.calls[0][1]).toBeNull();
+    });
+
+    test('should provide new timeline version when Creating notes for a timeline', async () => {
+      const mockRequest = getImportTimelinesRequest();
+      await server.inject(mockRequest, context);
+      expect(mockPersistNote.mock.calls[0][1]).toBeNull();
+    });
+
+    test('should provide note content when Creating notes for a timeline', async () => {
+      const mockRequest = getImportTimelinesRequest();
+      await server.inject(mockRequest, context);
+      expect(mockPersistNote.mock.calls[0][2]).toEqual(newTimelineVersion);
+    });
+
+    test('should provide new notes when Creating notes for a timeline', async () => {
+      const mockRequest = getImportTimelinesRequest();
+      await server.inject(mockRequest, context);
+      expect(mockPersistNote.mock.calls[0][3]).toEqual({
+        eventId: undefined,
+        note: mockUniqueParsedObjects[0].globalNotes[0].note,
+        timelineId: newTimelineSavedObjectId,
+      });
+      expect(mockPersistNote.mock.calls[1][3]).toEqual({
+        eventId: mockUniqueParsedObjects[0].eventNotes[0].eventId,
+        note: mockUniqueParsedObjects[0].eventNotes[0].note,
+        timelineId: newTimelineSavedObjectId,
+      });
+      expect(mockPersistNote.mock.calls[2][3]).toEqual({
+        eventId: mockUniqueParsedObjects[0].eventNotes[1].eventId,
+        note: mockUniqueParsedObjects[0].eventNotes[1].note,
+        timelineId: newTimelineSavedObjectId,
+      });
+    });
+
+    test('returns 200 when import timeline successfully', async () => {
+      const response = await server.inject(getImportTimelinesRequest(), context);
+      expect(response.status).toEqual(200);
+    });
+  });
+
+  describe('Import a timeline already exist but overwrite is not allowed', () => {
+    beforeEach(() => {
+      jest.doMock('../saved_object', () => {
+        return {
+          Timeline: jest.fn().mockImplementation(() => {
+            return {
+              getTimeline: mockGetTimeline.mockReturnValue(mockGetTimelineValue),
+              persistTimeline: mockPersistTimeline,
+            };
+          }),
+        };
+      });
+
+      jest.doMock('../../pinned_event/saved_object', () => {
+        return {
+          PinnedEvent: jest.fn().mockImplementation(() => {
+            return {
+              persistPinnedEventOnTimeline: mockPersistPinnedEventOnTimeline,
+            };
+          }),
+        };
+      });
+
+      jest.doMock('../../note/saved_object', () => {
+        return {
+          Note: jest.fn().mockImplementation(() => {
+            return {
+              persistNote: mockPersistNote,
+            };
+          }),
+        };
+      });
+
+      const importTimelinesRoute = jest.requireActual('./import_timelines_route')
+        .importTimelinesRoute;
+      importTimelinesRoute(server.router, config, securitySetup);
+    });
+
+    test('returns error message', async () => {
+      const response = await server.inject(getImportTimelinesRequest(), context);
+      expect(response.body).toEqual({
+        success: false,
+        success_count: 0,
+        errors: [
+          {
+            id: '79deb4c0-6bc1-11ea-a90b-f5341fb7a189',
+            error: {
+              status_code: 409,
+              message: `timeline_id: "79deb4c0-6bc1-11ea-a90b-f5341fb7a189" already exists`,
+            },
+          },
+        ],
+      });
+    });
+  });
+
+  describe('request validation', () => {
+    beforeEach(() => {
+      jest.doMock('../saved_object', () => {
+        return {
+          Timeline: jest.fn().mockImplementation(() => {
+            return {
+              getTimeline: mockGetTimeline.mockReturnValue(null),
+              persistTimeline: mockPersistTimeline.mockReturnValue({
+                timeline: { savedObjectId: '79deb4c0-6bc1-11ea-9999-f5341fb7a189' },
+              }),
+            };
+          }),
+        };
+      });
+
+      jest.doMock('../../pinned_event/saved_object', () => {
+        return {
+          PinnedEvent: jest.fn().mockImplementation(() => {
+            return {
+              persistPinnedEventOnTimeline: mockPersistPinnedEventOnTimeline.mockReturnValue(
+                new Error('Test error')
+              ),
+            };
+          }),
+        };
+      });
+
+      jest.doMock('../../note/saved_object', () => {
+        return {
+          Note: jest.fn().mockImplementation(() => {
+            return {
+              persistNote: mockPersistNote,
+            };
+          }),
+        };
+      });
+    });
+    test('disallows invalid query', async () => {
+      request = requestMock.create({
+        method: 'post',
+        path: TIMELINE_EXPORT_URL,
+        body: { id: 'someId' },
+      });
+      const importTimelinesRoute = jest.requireActual('./import_timelines_route')
+        .importTimelinesRoute;
+
+      importTimelinesRoute(server.router, config, securitySetup);
+      const result = server.validate(request);
+
+      expect(result.badRequest).toHaveBeenCalledWith(
+        'child "file" fails because ["file" is required]'
+      );
+    });
+  });
+});
diff --git a/x-pack/legacy/plugins/siem/server/lib/timeline/routes/import_timelines_route.ts b/x-pack/legacy/plugins/siem/server/lib/timeline/routes/import_timelines_route.ts
new file mode 100644
index 0000000000000..fefe31b2f36d0
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/timeline/routes/import_timelines_route.ts
@@ -0,0 +1,226 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { extname } from 'path';
+import { chunk, omit, set } from 'lodash/fp';
+import {
+  buildRouteValidation,
+  buildSiemResponse,
+  createBulkErrorObject,
+  BulkError,
+  transformError,
+} from '../../detection_engine/routes/utils';
+
+import { createTimelinesStreamFromNdJson } from '../create_timelines_stream_from_ndjson';
+import { createPromiseFromStreams } from '../../../../../../../../src/legacy/utils';
+
+import {
+  createTimelines,
+  getTupleDuplicateErrorsAndUniqueTimeline,
+  isBulkError,
+  isImportRegular,
+  ImportTimelineResponse,
+  ImportTimelinesRequestParams,
+  ImportTimelinesSchema,
+  PromiseFromStreams,
+} from './utils/import_timelines';
+
+import { IRouter } from '../../../../../../../../src/core/server';
+import { TIMELINE_IMPORT_URL } from '../../../../common/constants';
+import { importTimelinesPayloadSchema } from './schemas/import_timelines_schema';
+import { importRulesSchema } from '../../detection_engine/routes/schemas/response/import_rules_schema';
+import { LegacyServices } from '../../../types';
+
+import { Timeline } from '../saved_object';
+import { validate } from '../../detection_engine/routes/rules/validate';
+import { FrameworkRequest } from '../../framework';
+import { SecurityPluginSetup } from '../../../../../../../plugins/security/server';
+
+const CHUNK_PARSED_OBJECT_SIZE = 10;
+
+const timelineLib = new Timeline();
+
+export const importTimelinesRoute = (
+  router: IRouter,
+  config: LegacyServices['config'],
+  securityPluginSetup: SecurityPluginSetup
+) => {
+  router.post(
+    {
+      path: `${TIMELINE_IMPORT_URL}`,
+      validate: {
+        body: buildRouteValidation<ImportTimelinesRequestParams['body']>(
+          importTimelinesPayloadSchema
+        ),
+      },
+      options: {
+        tags: ['access:siem'],
+        body: {
+          maxBytes: config().get('savedObjects.maxImportPayloadBytes'),
+          output: 'stream',
+        },
+      },
+    },
+    async (context, request, response) => {
+      const siemResponse = buildSiemResponse(response);
+      const savedObjectsClient = context.core.savedObjects.client;
+      if (!savedObjectsClient) {
+        return siemResponse.error({ statusCode: 404 });
+      }
+      const { filename } = request.body.file.hapi;
+
+      const fileExtension = extname(filename).toLowerCase();
+
+      if (fileExtension !== '.ndjson') {
+        return siemResponse.error({
+          statusCode: 400,
+          body: `Invalid file extension ${fileExtension}`,
+        });
+      }
+
+      const objectLimit = config().get<number>('savedObjects.maxImportExportSize');
+
+      try {
+        const readStream = createTimelinesStreamFromNdJson(objectLimit);
+        const parsedObjects = await createPromiseFromStreams<PromiseFromStreams[]>([
+          request.body.file,
+          ...readStream,
+        ]);
+        const [duplicateIdErrors, uniqueParsedObjects] = getTupleDuplicateErrorsAndUniqueTimeline(
+          parsedObjects,
+          false
+        );
+        const chunkParseObjects = chunk(CHUNK_PARSED_OBJECT_SIZE, uniqueParsedObjects);
+        let importTimelineResponse: ImportTimelineResponse[] = [];
+
+        const user = await securityPluginSetup.authc.getCurrentUser(request);
+        let frameworkRequest = set('context.core.savedObjects.client', savedObjectsClient, request);
+        frameworkRequest = set('user', user, frameworkRequest);
+
+        while (chunkParseObjects.length) {
+          const batchParseObjects = chunkParseObjects.shift() ?? [];
+          const newImportTimelineResponse = await Promise.all(
+            batchParseObjects.reduce<Array<Promise<ImportTimelineResponse>>>(
+              (accum, parsedTimeline) => {
+                const importsWorkerPromise = new Promise<ImportTimelineResponse>(
+                  async (resolve, reject) => {
+                    if (parsedTimeline instanceof Error) {
+                      // If the JSON object had a validation or parse error then we return
+                      // early with the error and an (unknown) for the ruleId
+                      resolve(
+                        createBulkErrorObject({
+                          statusCode: 400,
+                          message: parsedTimeline.message,
+                        })
+                      );
+
+                      return null;
+                    }
+                    const {
+                      savedObjectId,
+                      pinnedEventIds,
+                      globalNotes,
+                      eventNotes,
+                    } = parsedTimeline;
+                    const parsedTimelineObject = omit(
+                      [
+                        'globalNotes',
+                        'eventNotes',
+                        'pinnedEventIds',
+                        'version',
+                        'savedObjectId',
+                        'created',
+                        'createdBy',
+                        'updated',
+                        'updatedBy',
+                      ],
+                      parsedTimeline
+                    );
+                    try {
+                      let timeline = null;
+                      try {
+                        timeline = await timelineLib.getTimeline(
+                          (frameworkRequest as unknown) as FrameworkRequest,
+                          savedObjectId
+                        );
+                        // eslint-disable-next-line no-empty
+                      } catch (e) {}
+
+                      if (timeline == null) {
+                        const newSavedObjectId = await createTimelines(
+                          (frameworkRequest as unknown) as FrameworkRequest,
+                          parsedTimelineObject,
+                          null, // timelineSavedObjectId
+                          null, // timelineVersion
+                          pinnedEventIds,
+                          [...globalNotes, ...eventNotes],
+                          [] // existing note ids
+                        );
+
+                        resolve({ timeline_id: newSavedObjectId, status_code: 200 });
+                      } else {
+                        resolve(
+                          createBulkErrorObject({
+                            id: savedObjectId,
+                            statusCode: 409,
+                            message: `timeline_id: "${savedObjectId}" already exists`,
+                          })
+                        );
+                      }
+                    } catch (err) {
+                      resolve(
+                        createBulkErrorObject({
+                          id: savedObjectId,
+                          statusCode: 400,
+                          message: err.message,
+                        })
+                      );
+                    }
+                  }
+                );
+                return [...accum, importsWorkerPromise];
+              },
+              []
+            )
+          );
+          importTimelineResponse = [
+            ...duplicateIdErrors,
+            ...importTimelineResponse,
+            ...newImportTimelineResponse,
+          ];
+        }
+
+        const errorsResp = importTimelineResponse.filter(resp => isBulkError(resp)) as BulkError[];
+        const successes = importTimelineResponse.filter(resp => {
+          if (isImportRegular(resp)) {
+            return resp.status_code === 200;
+          } else {
+            return false;
+          }
+        });
+        const importTimelines: ImportTimelinesSchema = {
+          success: errorsResp.length === 0,
+          success_count: successes.length,
+          errors: errorsResp,
+        };
+        const [validated, errors] = validate(importTimelines, importRulesSchema);
+
+        if (errors != null) {
+          return siemResponse.error({ statusCode: 500, body: errors });
+        } else {
+          return response.ok({ body: validated ?? {} });
+        }
+      } catch (err) {
+        const error = transformError(err);
+
+        return siemResponse.error({
+          body: error.message,
+          statusCode: error.statusCode,
+        });
+      }
+    }
+  );
+};
diff --git a/x-pack/legacy/plugins/siem/server/lib/timeline/routes/schemas/import_timelines_schema.ts b/x-pack/legacy/plugins/siem/server/lib/timeline/routes/schemas/import_timelines_schema.ts
new file mode 100644
index 0000000000000..61ffa9681c53a
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/timeline/routes/schemas/import_timelines_schema.ts
@@ -0,0 +1,57 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+import Joi from 'joi';
+import {
+  columns,
+  created,
+  createdBy,
+  dataProviders,
+  dateRange,
+  description,
+  eventNotes,
+  eventType,
+  favorite,
+  filters,
+  globalNotes,
+  kqlMode,
+  kqlQuery,
+  savedObjectId,
+  savedQueryId,
+  sort,
+  title,
+  updated,
+  updatedBy,
+  version,
+  pinnedEventIds,
+} from './schemas';
+
+export const importTimelinesPayloadSchema = Joi.object({
+  file: Joi.object().required(),
+});
+
+export const importTimelinesSchema = Joi.object({
+  columns,
+  created,
+  createdBy,
+  dataProviders,
+  dateRange,
+  description,
+  eventNotes,
+  eventType,
+  filters,
+  favorite,
+  globalNotes,
+  kqlMode,
+  kqlQuery,
+  savedObjectId,
+  savedQueryId,
+  sort,
+  title,
+  updated,
+  updatedBy,
+  version,
+  pinnedEventIds,
+});
diff --git a/x-pack/legacy/plugins/siem/server/lib/timeline/routes/schemas/schemas.ts b/x-pack/legacy/plugins/siem/server/lib/timeline/routes/schemas/schemas.ts
index 67697c347634e..63aee97729141 100644
--- a/x-pack/legacy/plugins/siem/server/lib/timeline/routes/schemas/schemas.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/timeline/routes/schemas/schemas.ts
@@ -5,9 +5,162 @@
  */
 import Joi from 'joi';
 
+const allowEmptyString = Joi.string().allow([null, '']);
+const columnHeaderType = Joi.string();
+export const created = Joi.number().allow(null);
+export const createdBy = Joi.string();
+
+export const description = allowEmptyString;
+export const end = Joi.number();
+export const eventId = allowEmptyString;
+export const eventType = Joi.string();
+
+export const filters = Joi.array()
+  .items(
+    Joi.object({
+      meta: Joi.object({
+        alias: allowEmptyString,
+        controlledBy: allowEmptyString,
+        disabled: Joi.boolean().allow(null),
+        field: allowEmptyString,
+        formattedValue: allowEmptyString,
+        index: {
+          type: 'keyword',
+        },
+        key: {
+          type: 'keyword',
+        },
+        negate: {
+          type: 'boolean',
+        },
+        params: allowEmptyString,
+        type: {
+          type: 'keyword',
+        },
+        value: allowEmptyString,
+      }),
+      exists: allowEmptyString,
+      match_all: allowEmptyString,
+      missing: allowEmptyString,
+      query: allowEmptyString,
+      range: allowEmptyString,
+      script: allowEmptyString,
+    })
+  )
+  .allow(null);
+
+const name = allowEmptyString;
+
+export const noteId = allowEmptyString;
+export const note = allowEmptyString;
+
+export const start = Joi.number();
+export const savedQueryId = allowEmptyString;
+export const savedObjectId = allowEmptyString;
+
+export const timelineId = allowEmptyString;
+export const title = allowEmptyString;
+
+export const updated = Joi.number().allow(null);
+export const updatedBy = allowEmptyString;
+export const version = allowEmptyString;
+
+export const columns = Joi.array().items(
+  Joi.object({
+    aggregatable: Joi.boolean().allow(null),
+    category: Joi.string(),
+    columnHeaderType,
+    description,
+    example: allowEmptyString,
+    indexes: allowEmptyString,
+    id: Joi.string(),
+    name,
+    placeholder: allowEmptyString,
+    searchable: Joi.boolean().allow(null),
+    type: Joi.string(),
+  }).required()
+);
+export const dataProviders = Joi.array()
+  .items(
+    Joi.object({
+      id: Joi.string(),
+      name: allowEmptyString,
+      enabled: Joi.boolean().allow(null),
+      excluded: Joi.boolean().allow(null),
+      kqlQuery: allowEmptyString,
+      queryMatch: Joi.object({
+        field: allowEmptyString,
+        displayField: allowEmptyString,
+        value: allowEmptyString,
+        displayValue: allowEmptyString,
+        operator: allowEmptyString,
+      }),
+      and: Joi.array()
+        .items(
+          Joi.object({
+            id: Joi.string(),
+            name,
+            enabled: Joi.boolean().allow(null),
+            excluded: Joi.boolean().allow(null),
+            kqlQuery: allowEmptyString,
+            queryMatch: Joi.object({
+              field: allowEmptyString,
+              displayField: allowEmptyString,
+              value: allowEmptyString,
+              displayValue: allowEmptyString,
+              operator: allowEmptyString,
+            }).allow(null),
+          })
+        )
+        .allow(null),
+    })
+  )
+  .allow(null);
+export const dateRange = Joi.object({
+  start,
+  end,
+});
+export const favorite = Joi.array().items(
+  Joi.object({
+    keySearch: Joi.string(),
+    fullName: Joi.string(),
+    userName: Joi.string(),
+    favoriteDate: Joi.number(),
+  }).allow(null)
+);
+const noteItem = Joi.object({
+  noteId,
+  version,
+  eventId,
+  note,
+  timelineId,
+  created,
+  createdBy,
+  updated,
+  updatedBy,
+});
+export const eventNotes = Joi.array().items(noteItem);
+export const globalNotes = Joi.array().items(noteItem);
+export const kqlMode = Joi.string();
+export const kqlQuery = Joi.object({
+  filterQuery: Joi.object({
+    kuery: Joi.object({
+      kind: Joi.string(),
+      expression: allowEmptyString,
+    }),
+    serializedQuery: allowEmptyString,
+  }),
+});
+export const pinnedEventIds = Joi.array()
+  .items(Joi.string())
+  .allow(null);
+export const sort = Joi.object({
+  columnId: Joi.string(),
+  sortDirection: Joi.string(),
+});
 /* eslint-disable @typescript-eslint/camelcase */
 
 export const ids = Joi.array().items(Joi.string());
 
 export const exclude_export_details = Joi.boolean();
-export const file_name = Joi.string();
+export const file_name = allowEmptyString;
diff --git a/x-pack/legacy/plugins/siem/server/lib/timeline/routes/utils.ts b/x-pack/legacy/plugins/siem/server/lib/timeline/routes/utils/export_timelines.ts
similarity index 85%
rename from x-pack/legacy/plugins/siem/server/lib/timeline/routes/utils.ts
rename to x-pack/legacy/plugins/siem/server/lib/timeline/routes/utils/export_timelines.ts
index 066862e025833..8a28100fbae82 100644
--- a/x-pack/legacy/plugins/siem/server/lib/timeline/routes/utils.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/timeline/routes/utils/export_timelines.ts
@@ -3,37 +3,53 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
+
 import { set as _set } from 'lodash/fp';
 import {
+  noteSavedObjectType,
+  pinnedEventSavedObjectType,
+  timelineSavedObjectType,
+} from '../../../../saved_objects';
+import { NoteSavedObject } from '../../../note/types';
+import { PinnedEventSavedObject } from '../../../pinned_event/types';
+import { convertSavedObjectToSavedTimeline } from '../../convert_saved_object_to_savedtimeline';
+
+import { convertSavedObjectToSavedPinnedEvent } from '../../../pinned_event/saved_object';
+import { convertSavedObjectToSavedNote } from '../../../note/saved_object';
+
+import {
+  SavedObjectsClient,
   SavedObjectsFindOptions,
   SavedObjectsFindResponse,
-} from '../../../../../../../../src/core/server';
+} from '../../../../../../../../../src/core/server';
 
 import {
+  ExportedTimelines,
   ExportTimelineSavedObjectsClient,
   ExportTimelineRequest,
   ExportedNotes,
   TimelineSavedObject,
-  ExportedTimelines,
-} from '../types';
-import {
-  timelineSavedObjectType,
-  noteSavedObjectType,
-  pinnedEventSavedObjectType,
-} from '../../../saved_objects';
-
-import { convertSavedObjectToSavedNote } from '../../note/saved_object';
-import { convertSavedObjectToSavedPinnedEvent } from '../../pinned_event/saved_object';
-import { convertSavedObjectToSavedTimeline } from '../convert_saved_object_to_savedtimeline';
-import { transformDataToNdjson } from '../../detection_engine/routes/rules/utils';
-import { NoteSavedObject } from '../../note/types';
-import { PinnedEventSavedObject } from '../../pinned_event/types';
+} from '../../types';
+
+import { transformDataToNdjson } from '../../../detection_engine/routes/rules/utils';
+export type TimelineSavedObjectsClient = Pick<
+  SavedObjectsClient,
+  | 'get'
+  | 'errors'
+  | 'create'
+  | 'bulkCreate'
+  | 'delete'
+  | 'find'
+  | 'bulkGet'
+  | 'update'
+  | 'bulkUpdate'
+>;
 
 const getAllSavedPinnedEvents = (
   pinnedEventsSavedObjects: SavedObjectsFindResponse<PinnedEventSavedObject>
 ): PinnedEventSavedObject[] => {
   return pinnedEventsSavedObjects != null
-    ? pinnedEventsSavedObjects.saved_objects.map(savedObject =>
+    ? (pinnedEventsSavedObjects?.saved_objects ?? []).map(savedObject =>
         convertSavedObjectToSavedPinnedEvent(savedObject)
       )
     : [];
diff --git a/x-pack/legacy/plugins/siem/server/lib/timeline/routes/utils/import_timelines.ts b/x-pack/legacy/plugins/siem/server/lib/timeline/routes/utils/import_timelines.ts
new file mode 100644
index 0000000000000..5596d0c70f5ea
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/timeline/routes/utils/import_timelines.ts
@@ -0,0 +1,191 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import uuid from 'uuid';
+import { has } from 'lodash/fp';
+import { createBulkErrorObject, BulkError } from '../../../detection_engine/routes/utils';
+import { PinnedEvent } from '../../../pinned_event/saved_object';
+import { Note } from '../../../note/saved_object';
+
+import { Timeline } from '../../saved_object';
+import { SavedTimeline } from '../../types';
+import { FrameworkRequest } from '../../../framework';
+import { SavedNote } from '../../../note/types';
+import { NoteResult } from '../../../../graphql/types';
+import { HapiReadableStream } from '../../../detection_engine/rules/types';
+
+const pinnedEventLib = new PinnedEvent();
+const timelineLib = new Timeline();
+const noteLib = new Note();
+
+export interface ImportTimelinesSchema {
+  success: boolean;
+  success_count: number;
+  errors: BulkError[];
+}
+
+export type ImportedTimeline = SavedTimeline & {
+  savedObjectId: string;
+  pinnedEventIds: string[];
+  globalNotes: NoteResult[];
+  eventNotes: NoteResult[];
+};
+
+interface ImportRegular {
+  timeline_id: string;
+  status_code: number;
+  message?: string;
+}
+
+export type ImportTimelineResponse = ImportRegular | BulkError;
+export type PromiseFromStreams = ImportedTimeline;
+export interface ImportTimelinesRequestParams {
+  body: { file: HapiReadableStream };
+}
+
+export const getTupleDuplicateErrorsAndUniqueTimeline = (
+  timelines: PromiseFromStreams[],
+  isOverwrite: boolean
+): [BulkError[], PromiseFromStreams[]] => {
+  const { errors, timelinesAcc } = timelines.reduce(
+    (acc, parsedTimeline) => {
+      if (parsedTimeline instanceof Error) {
+        acc.timelinesAcc.set(uuid.v4(), parsedTimeline);
+      } else {
+        const { savedObjectId } = parsedTimeline;
+        if (savedObjectId != null) {
+          if (acc.timelinesAcc.has(savedObjectId) && !isOverwrite) {
+            acc.errors.set(
+              uuid.v4(),
+              createBulkErrorObject({
+                id: savedObjectId,
+                statusCode: 400,
+                message: `More than one timeline with savedObjectId: "${savedObjectId}" found`,
+              })
+            );
+          }
+          acc.timelinesAcc.set(savedObjectId, parsedTimeline);
+        } else {
+          acc.timelinesAcc.set(uuid.v4(), parsedTimeline);
+        }
+      }
+
+      return acc;
+    }, // using map (preserves ordering)
+    {
+      errors: new Map<string, BulkError>(),
+      timelinesAcc: new Map<string, PromiseFromStreams>(),
+    }
+  );
+
+  return [Array.from(errors.values()), Array.from(timelinesAcc.values())];
+};
+
+export const saveTimelines = async (
+  frameworkRequest: FrameworkRequest,
+  timeline: SavedTimeline,
+  timelineSavedObjectId?: string | null,
+  timelineVersion?: string | null
+) => {
+  const newTimelineRes = await timelineLib.persistTimeline(
+    frameworkRequest,
+    timelineSavedObjectId ?? null,
+    timelineVersion ?? null,
+    timeline
+  );
+
+  return {
+    newTimelineSavedObjectId: newTimelineRes?.timeline?.savedObjectId ?? null,
+    newTimelineVersion: newTimelineRes?.timeline?.version ?? null,
+  };
+};
+
+export const savePinnedEvents = (
+  frameworkRequest: FrameworkRequest,
+  timelineSavedObjectId: string,
+  pinnedEventIds?: string[] | null
+) => {
+  return (
+    pinnedEventIds?.map(eventId => {
+      return pinnedEventLib.persistPinnedEventOnTimeline(
+        frameworkRequest,
+        null, // pinnedEventSavedObjectId
+        eventId,
+        timelineSavedObjectId
+      );
+    }) ?? []
+  );
+};
+
+export const saveNotes = (
+  frameworkRequest: FrameworkRequest,
+  timelineSavedObjectId: string,
+  timelineVersion?: string | null,
+  existingNoteIds?: string[],
+  newNotes?: NoteResult[]
+) => {
+  return (
+    newNotes?.map(note => {
+      const newNote: SavedNote = {
+        eventId: note.eventId,
+        note: note.note,
+        timelineId: timelineSavedObjectId,
+      };
+
+      return noteLib.persistNote(
+        frameworkRequest,
+        existingNoteIds?.find(nId => nId === note.noteId) ?? null,
+        timelineVersion ?? null,
+        newNote
+      );
+    }) ?? []
+  );
+};
+
+export const createTimelines = async (
+  frameworkRequest: FrameworkRequest,
+  timeline: SavedTimeline,
+  timelineSavedObjectId?: string | null,
+  timelineVersion?: string | null,
+  pinnedEventIds?: string[] | null,
+  notes?: NoteResult[],
+  existingNoteIds?: string[]
+) => {
+  const { newTimelineSavedObjectId, newTimelineVersion } = await saveTimelines(
+    frameworkRequest,
+    timeline,
+    timelineSavedObjectId,
+    timelineVersion
+  );
+  await Promise.all([
+    savePinnedEvents(
+      frameworkRequest,
+      timelineSavedObjectId ?? newTimelineSavedObjectId,
+      pinnedEventIds
+    ),
+    saveNotes(
+      frameworkRequest,
+      timelineSavedObjectId ?? newTimelineSavedObjectId,
+      newTimelineVersion,
+      existingNoteIds,
+      notes
+    ),
+  ]);
+
+  return newTimelineSavedObjectId;
+};
+
+export const isImportRegular = (
+  importTimelineResponse: ImportTimelineResponse
+): importTimelineResponse is ImportRegular => {
+  return !has('error', importTimelineResponse) && has('status_code', importTimelineResponse);
+};
+
+export const isBulkError = (
+  importRuleResponse: ImportTimelineResponse
+): importRuleResponse is BulkError => {
+  return has('error', importRuleResponse);
+};
diff --git a/x-pack/legacy/plugins/siem/server/lib/timeline/saved_object.ts b/x-pack/legacy/plugins/siem/server/lib/timeline/saved_object.ts
index 88d7fcdb68164..bc6975331ad9b 100644
--- a/x-pack/legacy/plugins/siem/server/lib/timeline/saved_object.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/timeline/saved_object.ts
@@ -138,19 +138,19 @@ export class Timeline {
     timeline: SavedTimeline
   ): Promise<ResponseTimeline> {
     const savedObjectsClient = request.context.core.savedObjects.client;
-
     try {
       if (timelineId == null) {
         // Create new timeline
+        const newTimeline = convertSavedObjectToSavedTimeline(
+          await savedObjectsClient.create(
+            timelineSavedObjectType,
+            pickSavedTimeline(timelineId, timeline, request.user)
+          )
+        );
         return {
           code: 200,
           message: 'success',
-          timeline: convertSavedObjectToSavedTimeline(
-            await savedObjectsClient.create(
-              timelineSavedObjectType,
-              pickSavedTimeline(timelineId, timeline, request.user)
-            )
-          ),
+          timeline: newTimeline,
         };
       }
       // Update Timeline
@@ -162,6 +162,7 @@ export class Timeline {
           version: version || undefined,
         }
       );
+
       return {
         code: 200,
         message: 'success',
diff --git a/x-pack/legacy/plugins/siem/server/plugin.ts b/x-pack/legacy/plugins/siem/server/plugin.ts
index 44e6b7a32a842..2bce9b6a7e1aa 100644
--- a/x-pack/legacy/plugins/siem/server/plugin.ts
+++ b/x-pack/legacy/plugins/siem/server/plugin.ts
@@ -91,7 +91,8 @@ export class Plugin {
     initRoutes(
       router,
       __legacy.config,
-      plugins.encryptedSavedObjects?.usingEphemeralEncryptionKey ?? false
+      plugins.encryptedSavedObjects?.usingEphemeralEncryptionKey ?? false,
+      plugins.security
     );
 
     plugins.features.registerFeature({
diff --git a/x-pack/legacy/plugins/siem/server/routes/index.ts b/x-pack/legacy/plugins/siem/server/routes/index.ts
index 08ff9208ce20b..29c21ad157235 100644
--- a/x-pack/legacy/plugins/siem/server/routes/index.ts
+++ b/x-pack/legacy/plugins/siem/server/routes/index.ts
@@ -29,12 +29,15 @@ import { importRulesRoute } from '../lib/detection_engine/routes/rules/import_ru
 import { exportRulesRoute } from '../lib/detection_engine/routes/rules/export_rules_route';
 import { findRulesStatusesRoute } from '../lib/detection_engine/routes/rules/find_rules_status_route';
 import { getPrepackagedRulesStatusRoute } from '../lib/detection_engine/routes/rules/get_prepackaged_rules_status_route';
+import { importTimelinesRoute } from '../lib/timeline/routes/import_timelines_route';
 import { exportTimelinesRoute } from '../lib/timeline/routes/export_timelines_route';
+import { SecurityPluginSetup } from '../../../../../plugins/security/server/';
 
 export const initRoutes = (
   router: IRouter,
   config: LegacyServices['config'],
-  usingEphemeralEncryptionKey: boolean
+  usingEphemeralEncryptionKey: boolean,
+  security: SecurityPluginSetup
 ) => {
   // Detection Engine Rule routes that have the REST endpoints of /api/detection_engine/rules
   // All REST rule creation, deletion, updating, etc......
@@ -55,6 +58,7 @@ export const initRoutes = (
   importRulesRoute(router, config);
   exportRulesRoute(router, config);
 
+  importTimelinesRoute(router, config, security);
   exportTimelinesRoute(router, config);
 
   findRulesStatusesRoute(router);
diff --git a/x-pack/test/api_integration/apis/siem/saved_objects/timeline.ts b/x-pack/test/api_integration/apis/siem/saved_objects/timeline.ts
index a6ced270e2132..a7e7cf4476f3f 100644
--- a/x-pack/test/api_integration/apis/siem/saved_objects/timeline.ts
+++ b/x-pack/test/api_integration/apis/siem/saved_objects/timeline.ts
@@ -175,7 +175,7 @@ export default function({ getService }: FtrProviderContext) {
         expect(version).to.not.be.empty();
       });
 
-      it('Update a timeline with a new title', async () => {
+      it.skip('Update a timeline with a new title', async () => {
         const titleToSaved = 'hello title';
         const response = await createBasicTimeline(client, titleToSaved);
         const { savedObjectId, version } = response.data && response.data.persistTimeline.timeline;
@@ -192,7 +192,7 @@ export default function({ getService }: FtrProviderContext) {
           },
         });
 
-        expect(responseToTest.data!.persistTimeline.timeline.savedObjectId).to.be(savedObjectId);
+        expect(responseToTest.data!.persistTimeline.timeline.savedObjectId).to.eql(savedObjectId);
         expect(responseToTest.data!.persistTimeline.timeline.title).to.be(newTitle);
         expect(responseToTest.data!.persistTimeline.timeline.version).to.not.be.eql(version);
       });

From 8d45ead109410e1278fb823321078666b482da96 Mon Sep 17 00:00:00 2001
From: Yuliia Naumenko <jo.naumenko@gmail.com>
Date: Tue, 24 Mar 2020 18:08:41 -0700
Subject: [PATCH 119/179] Fixed issue on delete single or multiple alerts from
 the list cancel button doesn't work (#61187)

---
 .../components/delete_modal_confirmation.tsx         |  3 +++
 .../components/actions_connectors_list.tsx           | 11 ++++-------
 .../sections/alerts_list/components/alerts_list.tsx  | 12 +++++-------
 3 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/delete_modal_confirmation.tsx b/x-pack/plugins/triggers_actions_ui/public/application/components/delete_modal_confirmation.tsx
index 80b59e15644ec..5862a567f71ba 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/delete_modal_confirmation.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/delete_modal_confirmation.tsx
@@ -14,6 +14,7 @@ export const DeleteModalConfirmation = ({
   apiDeleteCall,
   onDeleted,
   onCancel,
+  onErrors,
   singleTitle,
   multipleTitle,
 }: {
@@ -27,6 +28,7 @@ export const DeleteModalConfirmation = ({
   }) => Promise<{ successes: string[]; errors: string[] }>;
   onDeleted: (deleted: string[]) => void;
   onCancel: () => void;
+  onErrors: () => void;
   singleTitle: string;
   multipleTitle: string;
 }) => {
@@ -93,6 +95,7 @@ export const DeleteModalConfirmation = ({
                 }
               )
             );
+            onErrors();
           }
         }}
         cancelButtonText={cancelButtonText}
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 facfc8efa299e..0cb9bbbbfb261 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
@@ -389,17 +389,14 @@ export const ActionsConnectorsList: React.FunctionComponent = () => {
           }
           setConnectorsToDelete([]);
         }}
-        onCancel={async () => {
-          toastNotifications.addDanger({
-            title: i18n.translate(
-              'xpack.triggersActionsUI.sections.actionsConnectorsList.failedToDeleteActionsMessage',
-              { defaultMessage: 'Failed to delete connectors(s)' }
-            ),
-          });
+        onErrors={async () => {
           // Refresh the actions from the server, some actions may have beend deleted
           await loadActions();
           setConnectorsToDelete([]);
         }}
+        onCancel={async () => {
+          setConnectorsToDelete([]);
+        }}
         apiDeleteCall={deleteActions}
         idsToDelete={connectorsToDelete}
         singleTitle={i18n.translate(
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 2be8418cd9802..8d675148690c7 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
@@ -446,15 +446,13 @@ export const AlertsList: React.FunctionComponent = () => {
           }
           setAlertsToDelete([]);
         }}
-        onCancel={async () => {
-          toastNotifications.addDanger({
-            title: i18n.translate(
-              'xpack.triggersActionsUI.sections.alertsList.failedToDeleteAlertsMessage',
-              { defaultMessage: 'Failed to delete alert(s)' }
-            ),
-          });
+        onErrors={async () => {
           // Refresh the alerts from the server, some alerts may have beend deleted
           await loadAlertsData();
+          setAlertsToDelete([]);
+        }}
+        onCancel={async () => {
+          setAlertsToDelete([]);
         }}
         apiDeleteCall={deleteAlerts}
         idsToDelete={alertsToDelete}

From 683bf3a72ebc399464f25c6eba1a29846225bddd Mon Sep 17 00:00:00 2001
From: Ryland Herrick <ryalnd@gmail.com>
Date: Tue, 24 Mar 2020 21:39:07 -0500
Subject: [PATCH 120/179] [SIEM] ML Rules Details (#61182)

* Add basic help text to ML Job dropdown on Rule form

* Use EUI's preferred layout for form fields

* Add a link to ML in the Job select help text

* Restrict timeline picker to EUI guidelines

Don't display the row as fullwidth, lest the help text wrap across the
entire page. It only looks okay now because it was a short sentence;
adding the ML Job select with its wrapped text caused some visual
weirdness, so this at least makes it consistent.

* Add placeholder option to ML Job dropdown

* Humanize rule type on Rule Description component

This is displayed both on the readonly form view, and the Rule Details
page.

* Add useMlCapabilities hook

This is a base hook that we can combine with our permissions helpers.

* Restrict ML Rule creation to ML Admins

If we're auto-activating jobs on their behalf, they'll need to be an
admin.

* Extract ML Job status helpers to separate file

* WIP: Enrich Rule Description with ML Job Data

This adds the auditMessage as well as a link to ML; actual status is
next

* Display job status as a badge on Rule Details

Also simplifies the layout of these job details.

* Port helper tests to new location

* Fix DescriptionStep tests now that they use useSiemJobs

UseSiemJobs uses uiSettings, so we need to use our kibana mocks here.

* Fix responsiveness of ML Rule Details

The long job names were causing the panel to overflow.
---
 .../ml/anomaly/use_anomalies_table_data.ts    |  6 +-
 .../components/ml/helpers/index.test.ts       | 57 ++++++++++++
 .../public/components/ml/helpers/index.ts     | 22 +++++
 .../ml/tables/anomalies_host_table.tsx        |  6 +-
 .../ml/tables/anomalies_network_table.tsx     |  6 +-
 .../ml_popover/hooks/use_ml_capabilities.tsx  | 11 +++
 .../ml_popover/hooks/use_siem_jobs.tsx        |  8 +-
 .../ml_popover/jobs_table/job_switch.test.tsx | 52 +----------
 .../ml_popover/jobs_table/job_switch.tsx      | 22 +----
 .../components/ml_popover/ml_popover.tsx      |  6 +-
 .../public/components/ml_popover/types.ts     |  2 +
 .../page/hosts/host_overview/index.tsx        |  6 +-
 .../page/network/ip_overview/index.tsx        |  6 +-
 .../anomaly_threshold_slider/index.tsx        |  7 +-
 .../description_step/helpers.test.tsx         | 27 ++++++
 .../components/description_step/helpers.tsx   | 26 ++++++
 .../description_step/index.test.tsx           |  9 +-
 .../components/description_step/index.tsx     | 28 ++++--
 .../description_step/ml_job_description.tsx   | 93 +++++++++++++++++++
 .../description_step/translations.tsx         | 28 ++++++
 .../rules/components/ml_job_select/index.tsx  | 46 ++++++++-
 .../rules/components/pick_timeline/index.tsx  |  1 -
 .../components/select_rule_type/index.tsx     |  6 +-
 .../step_about_rule_details/index.test.tsx    |  9 +-
 .../components/step_define_rule/index.tsx     | 10 +-
 .../step_define_rule/translations.tsx         |  7 ++
 .../siem/public/pages/hosts/details/index.tsx |  6 +-
 .../plugins/siem/public/pages/hosts/hosts.tsx |  4 +-
 .../siem/public/pages/network/index.tsx       |  6 +-
 29 files changed, 386 insertions(+), 137 deletions(-)
 create mode 100644 x-pack/legacy/plugins/siem/public/components/ml/helpers/index.test.ts
 create mode 100644 x-pack/legacy/plugins/siem/public/components/ml/helpers/index.ts
 create mode 100644 x-pack/legacy/plugins/siem/public/components/ml_popover/hooks/use_ml_capabilities.tsx
 create mode 100644 x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/description_step/ml_job_description.tsx

diff --git a/x-pack/legacy/plugins/siem/public/components/ml/anomaly/use_anomalies_table_data.ts b/x-pack/legacy/plugins/siem/public/components/ml/anomaly/use_anomalies_table_data.ts
index ad59d3dc436a7..c4ca7dc203619 100644
--- a/x-pack/legacy/plugins/siem/public/components/ml/anomaly/use_anomalies_table_data.ts
+++ b/x-pack/legacy/plugins/siem/public/components/ml/anomaly/use_anomalies_table_data.ts
@@ -4,12 +4,12 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { useState, useEffect, useContext } from 'react';
+import { useState, useEffect } from 'react';
 import { anomaliesTableData } from '../api/anomalies_table_data';
 import { InfluencerInput, Anomalies, CriteriaFields } from '../types';
 import { hasMlUserPermissions } from '../permissions/has_ml_user_permissions';
-import { MlCapabilitiesContext } from '../permissions/ml_capabilities_provider';
 import { useSiemJobs } from '../../ml_popover/hooks/use_siem_jobs';
+import { useMlCapabilities } from '../../ml_popover/hooks/use_ml_capabilities';
 import { useStateToaster, errorToToaster } from '../../toasters';
 
 import * as i18n from './translations';
@@ -59,7 +59,7 @@ export const useAnomaliesTableData = ({
   const [tableData, setTableData] = useState<Anomalies | null>(null);
   const [, siemJobs] = useSiemJobs(true);
   const [loading, setLoading] = useState(true);
-  const capabilities = useContext(MlCapabilitiesContext);
+  const capabilities = useMlCapabilities();
   const userPermissions = hasMlUserPermissions(capabilities);
   const [, dispatchToaster] = useStateToaster();
   const timeZone = useTimeZone();
diff --git a/x-pack/legacy/plugins/siem/public/components/ml/helpers/index.test.ts b/x-pack/legacy/plugins/siem/public/components/ml/helpers/index.test.ts
new file mode 100644
index 0000000000000..693f0bd0dd0fd
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/public/components/ml/helpers/index.test.ts
@@ -0,0 +1,57 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { isJobStarted, isJobLoading, isJobFailed } from './';
+
+describe('isJobStarted', () => {
+  test('returns false if only jobState is enabled', () => {
+    expect(isJobStarted('started', 'closing')).toBe(false);
+  });
+
+  test('returns false if only datafeedState is enabled', () => {
+    expect(isJobStarted('stopping', 'opened')).toBe(false);
+  });
+
+  test('returns true if both enabled states are provided', () => {
+    expect(isJobStarted('started', 'opened')).toBe(true);
+  });
+});
+
+describe('isJobLoading', () => {
+  test('returns true if both loading states are not provided', () => {
+    expect(isJobLoading('started', 'closing')).toBe(true);
+  });
+
+  test('returns true if only jobState is loading', () => {
+    expect(isJobLoading('starting', 'opened')).toBe(true);
+  });
+
+  test('returns true if only datafeedState is loading', () => {
+    expect(isJobLoading('started', 'opening')).toBe(true);
+  });
+
+  test('returns false if both disabling states are provided', () => {
+    expect(isJobLoading('stopping', 'closing')).toBe(true);
+  });
+});
+
+describe('isJobFailed', () => {
+  test('returns true if only jobState is failure/deleted', () => {
+    expect(isJobFailed('failed', 'stopping')).toBe(true);
+  });
+
+  test('returns true if only dataFeed is failure/deleted', () => {
+    expect(isJobFailed('started', 'deleted')).toBe(true);
+  });
+
+  test('returns true if both enabled states are failure/deleted', () => {
+    expect(isJobFailed('failed', 'deleted')).toBe(true);
+  });
+
+  test('returns false only if both states are not failure/deleted', () => {
+    expect(isJobFailed('opened', 'stopping')).toBe(false);
+  });
+});
diff --git a/x-pack/legacy/plugins/siem/public/components/ml/helpers/index.ts b/x-pack/legacy/plugins/siem/public/components/ml/helpers/index.ts
new file mode 100644
index 0000000000000..c06596b49317d
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/public/components/ml/helpers/index.ts
@@ -0,0 +1,22 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+// Based on ML Job/Datafeed States from x-pack/legacy/plugins/ml/common/constants/states.js
+const enabledStates = ['started', 'opened'];
+const loadingStates = ['starting', 'stopping', 'opening', 'closing'];
+const failureStates = ['deleted', 'failed'];
+
+export const isJobStarted = (jobState: string, datafeedState: string): boolean => {
+  return enabledStates.includes(jobState) && enabledStates.includes(datafeedState);
+};
+
+export const isJobLoading = (jobState: string, datafeedState: string): boolean => {
+  return loadingStates.includes(jobState) || loadingStates.includes(datafeedState);
+};
+
+export const isJobFailed = (jobState: string, datafeedState: string): boolean => {
+  return failureStates.includes(jobState) || failureStates.includes(datafeedState);
+};
diff --git a/x-pack/legacy/plugins/siem/public/components/ml/tables/anomalies_host_table.tsx b/x-pack/legacy/plugins/siem/public/components/ml/tables/anomalies_host_table.tsx
index 9e58e39a08f67..16bde076ef763 100644
--- a/x-pack/legacy/plugins/siem/public/components/ml/tables/anomalies_host_table.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/ml/tables/anomalies_host_table.tsx
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import React, { useContext } from 'react';
+import React from 'react';
 
 import { useAnomaliesTableData } from '../anomaly/use_anomalies_table_data';
 import { HeaderSection } from '../../header_section';
@@ -16,7 +16,7 @@ import { Loader } from '../../loader';
 import { getIntervalFromAnomalies } from '../anomaly/get_interval_from_anomalies';
 import { AnomaliesHostTableProps } from '../types';
 import { hasMlUserPermissions } from '../permissions/has_ml_user_permissions';
-import { MlCapabilitiesContext } from '../permissions/ml_capabilities_provider';
+import { useMlCapabilities } from '../../ml_popover/hooks/use_ml_capabilities';
 import { BasicTable } from './basic_table';
 import { hostEquality } from './host_equality';
 import { getCriteriaFromHostType } from '../criteria/get_criteria_from_host_type';
@@ -37,7 +37,7 @@ const AnomaliesHostTableComponent: React.FC<AnomaliesHostTableProps> = ({
   skip,
   type,
 }) => {
-  const capabilities = useContext(MlCapabilitiesContext);
+  const capabilities = useMlCapabilities();
   const [loading, tableData] = useAnomaliesTableData({
     startDate,
     endDate,
diff --git a/x-pack/legacy/plugins/siem/public/components/ml/tables/anomalies_network_table.tsx b/x-pack/legacy/plugins/siem/public/components/ml/tables/anomalies_network_table.tsx
index 05f3044ff2929..bba6355f0b8b9 100644
--- a/x-pack/legacy/plugins/siem/public/components/ml/tables/anomalies_network_table.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/ml/tables/anomalies_network_table.tsx
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import React, { useContext } from 'react';
+import React from 'react';
 import { useAnomaliesTableData } from '../anomaly/use_anomalies_table_data';
 import { HeaderSection } from '../../header_section';
 
@@ -13,8 +13,8 @@ import { convertAnomaliesToNetwork } from './convert_anomalies_to_network';
 import { Loader } from '../../loader';
 import { AnomaliesNetworkTableProps } from '../types';
 import { getAnomaliesNetworkTableColumnsCurated } from './get_anomalies_network_table_columns';
+import { useMlCapabilities } from '../../ml_popover/hooks/use_ml_capabilities';
 import { hasMlUserPermissions } from '../permissions/has_ml_user_permissions';
-import { MlCapabilitiesContext } from '../permissions/ml_capabilities_provider';
 import { BasicTable } from './basic_table';
 import { networkEquality } from './network_equality';
 import { getCriteriaFromNetworkType } from '../criteria/get_criteria_from_network_type';
@@ -35,7 +35,7 @@ const AnomaliesNetworkTableComponent: React.FC<AnomaliesNetworkTableProps> = ({
   type,
   flowTarget,
 }) => {
-  const capabilities = useContext(MlCapabilitiesContext);
+  const capabilities = useMlCapabilities();
   const [loading, tableData] = useAnomaliesTableData({
     startDate,
     endDate,
diff --git a/x-pack/legacy/plugins/siem/public/components/ml_popover/hooks/use_ml_capabilities.tsx b/x-pack/legacy/plugins/siem/public/components/ml_popover/hooks/use_ml_capabilities.tsx
new file mode 100644
index 0000000000000..d897b2554b4fd
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/public/components/ml_popover/hooks/use_ml_capabilities.tsx
@@ -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 { useContext } from 'react';
+
+import { MlCapabilitiesContext } from '../../ml/permissions/ml_capabilities_provider';
+
+export const useMlCapabilities = () => useContext(MlCapabilitiesContext);
diff --git a/x-pack/legacy/plugins/siem/public/components/ml_popover/hooks/use_siem_jobs.tsx b/x-pack/legacy/plugins/siem/public/components/ml_popover/hooks/use_siem_jobs.tsx
index 4e4cdbfc109a9..9a82859066f54 100644
--- a/x-pack/legacy/plugins/siem/public/components/ml_popover/hooks/use_siem_jobs.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/ml_popover/hooks/use_siem_jobs.tsx
@@ -4,18 +4,18 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { useContext, useEffect, useState } from 'react';
+import { useEffect, useState } from 'react';
 
 import { checkRecognizer, getJobsSummary, getModules } from '../api';
 import { SiemJob } from '../types';
 import { hasMlUserPermissions } from '../../ml/permissions/has_ml_user_permissions';
-import { MlCapabilitiesContext } from '../../ml/permissions/ml_capabilities_provider';
 import { errorToToaster, useStateToaster } from '../../toasters';
 import { useUiSetting$ } from '../../../lib/kibana';
 import { DEFAULT_INDEX_KEY } from '../../../../common/constants';
 
 import * as i18n from './translations';
 import { createSiemJobs } from './use_siem_jobs_helpers';
+import { useMlCapabilities } from './use_ml_capabilities';
 
 type Return = [boolean, SiemJob[]];
 
@@ -30,8 +30,8 @@ type Return = [boolean, SiemJob[]];
 export const useSiemJobs = (refetchData: boolean): Return => {
   const [siemJobs, setSiemJobs] = useState<SiemJob[]>([]);
   const [loading, setLoading] = useState(true);
-  const capabilities = useContext(MlCapabilitiesContext);
-  const userPermissions = hasMlUserPermissions(capabilities);
+  const mlCapabilities = useMlCapabilities();
+  const userPermissions = hasMlUserPermissions(mlCapabilities);
   const [siemDefaultIndex] = useUiSetting$<string[]>(DEFAULT_INDEX_KEY);
   const [, dispatchToaster] = useStateToaster();
 
diff --git a/x-pack/legacy/plugins/siem/public/components/ml_popover/jobs_table/job_switch.test.tsx b/x-pack/legacy/plugins/siem/public/components/ml_popover/jobs_table/job_switch.test.tsx
index 1186573e3e209..ade8c6fe80525 100644
--- a/x-pack/legacy/plugins/siem/public/components/ml_popover/jobs_table/job_switch.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/ml_popover/jobs_table/job_switch.test.tsx
@@ -7,7 +7,7 @@
 import { shallow, mount } from 'enzyme';
 import React from 'react';
 
-import { isChecked, isFailure, isJobLoading, JobSwitchComponent } from './job_switch';
+import { JobSwitchComponent } from './job_switch';
 import { cloneDeep } from 'lodash/fp';
 import { mockSiemJobs } from '../__mocks__/api';
 import { SiemJob } from '../types';
@@ -75,54 +75,4 @@ describe('JobSwitch', () => {
     );
     expect(wrapper.find('[data-test-subj="job-switch"]').exists()).toBe(false);
   });
-
-  describe('isChecked', () => {
-    test('returns false if only jobState is enabled', () => {
-      expect(isChecked('started', 'closing')).toBe(false);
-    });
-
-    test('returns false if only datafeedState is enabled', () => {
-      expect(isChecked('stopping', 'opened')).toBe(false);
-    });
-
-    test('returns true if both enabled states are provided', () => {
-      expect(isChecked('started', 'opened')).toBe(true);
-    });
-  });
-
-  describe('isJobLoading', () => {
-    test('returns true if both loading states are not provided', () => {
-      expect(isJobLoading('started', 'closing')).toBe(true);
-    });
-
-    test('returns true if only jobState is loading', () => {
-      expect(isJobLoading('starting', 'opened')).toBe(true);
-    });
-
-    test('returns true if only datafeedState is loading', () => {
-      expect(isJobLoading('started', 'opening')).toBe(true);
-    });
-
-    test('returns false if both disabling states are provided', () => {
-      expect(isJobLoading('stopping', 'closing')).toBe(true);
-    });
-  });
-
-  describe('isFailure', () => {
-    test('returns true if only jobState is failure/deleted', () => {
-      expect(isFailure('failed', 'stopping')).toBe(true);
-    });
-
-    test('returns true if only dataFeed is failure/deleted', () => {
-      expect(isFailure('started', 'deleted')).toBe(true);
-    });
-
-    test('returns true if both enabled states are failure/deleted', () => {
-      expect(isFailure('failed', 'deleted')).toBe(true);
-    });
-
-    test('returns false only if both states are not failure/deleted', () => {
-      expect(isFailure('opened', 'stopping')).toBe(false);
-    });
-  });
 });
diff --git a/x-pack/legacy/plugins/siem/public/components/ml_popover/jobs_table/job_switch.tsx b/x-pack/legacy/plugins/siem/public/components/ml_popover/jobs_table/job_switch.tsx
index 39c48413737e2..e5066eef18c8b 100644
--- a/x-pack/legacy/plugins/siem/public/components/ml_popover/jobs_table/job_switch.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/ml_popover/jobs_table/job_switch.tsx
@@ -8,6 +8,7 @@ import styled from 'styled-components';
 import React, { useState, useCallback } from 'react';
 import { EuiFlexGroup, EuiFlexItem, EuiLoadingSpinner, EuiSwitch } from '@elastic/eui';
 import { SiemJob } from '../types';
+import { isJobLoading, isJobStarted, isJobFailed } from '../../ml/helpers';
 
 const StaticSwitch = styled(EuiSwitch)`
   .euiSwitch__thumb,
@@ -24,23 +25,6 @@ export interface JobSwitchProps {
   onJobStateChange: (job: SiemJob, latestTimestampMs: number, enable: boolean) => Promise<void>;
 }
 
-// Based on ML Job/Datafeed States from x-pack/legacy/plugins/ml/common/constants/states.js
-const enabledStates = ['started', 'opened'];
-const loadingStates = ['starting', 'stopping', 'opening', 'closing'];
-const failureStates = ['deleted', 'failed'];
-
-export const isChecked = (jobState: string, datafeedState: string): boolean => {
-  return enabledStates.includes(jobState) && enabledStates.includes(datafeedState);
-};
-
-export const isJobLoading = (jobState: string, datafeedState: string): boolean => {
-  return loadingStates.includes(jobState) || loadingStates.includes(datafeedState);
-};
-
-export const isFailure = (jobState: string, datafeedState: string): boolean => {
-  return failureStates.includes(jobState) || failureStates.includes(datafeedState);
-};
-
 export const JobSwitchComponent = ({
   job,
   isSiemJobsLoading,
@@ -64,8 +48,8 @@ export const JobSwitchComponent = ({
         ) : (
           <StaticSwitch
             data-test-subj="job-switch"
-            disabled={isFailure(job.jobState, job.datafeedState)}
-            checked={isChecked(job.jobState, job.datafeedState)}
+            disabled={isJobFailed(job.jobState, job.datafeedState)}
+            checked={isJobStarted(job.jobState, job.datafeedState)}
             onChange={handleChange}
             showLabel={false}
             label=""
diff --git a/x-pack/legacy/plugins/siem/public/components/ml_popover/ml_popover.tsx b/x-pack/legacy/plugins/siem/public/components/ml_popover/ml_popover.tsx
index ec924889f93f1..05dfd561b1f5e 100644
--- a/x-pack/legacy/plugins/siem/public/components/ml_popover/ml_popover.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/ml_popover/ml_popover.tsx
@@ -7,13 +7,12 @@
 import { EuiButtonEmpty, EuiCallOut, EuiPopover, EuiPopoverTitle, EuiSpacer } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n/react';
 import moment from 'moment';
-import React, { useContext, useReducer, useState } from 'react';
+import React, { useReducer, useState } from 'react';
 import styled from 'styled-components';
 
 import { useKibana } from '../../lib/kibana';
 import { METRIC_TYPE, TELEMETRY_EVENT, track } from '../../lib/telemetry';
 import { hasMlAdminPermissions } from '../ml/permissions/has_ml_admin_permissions';
-import { MlCapabilitiesContext } from '../ml/permissions/ml_capabilities_provider';
 import { errorToToaster, useStateToaster } from '../toasters';
 import { setupMlJob, startDatafeeds, stopDatafeeds } from './api';
 import { filterJobs } from './helpers';
@@ -25,6 +24,7 @@ import { PopoverDescription } from './popover_description';
 import * as i18n from './translations';
 import { JobsFilters, JobSummary, SiemJob } from './types';
 import { UpgradeContents } from './upgrade_contents';
+import { useMlCapabilities } from './hooks/use_ml_capabilities';
 
 const PopoverContentsDiv = styled.div`
   max-width: 684px;
@@ -97,7 +97,7 @@ export const MlPopover = React.memo(() => {
   const [filterProperties, setFilterProperties] = useState(defaultFilterProps);
   const [isLoadingSiemJobs, siemJobs] = useSiemJobs(refreshToggle);
   const [, dispatchToaster] = useStateToaster();
-  const capabilities = useContext(MlCapabilitiesContext);
+  const capabilities = useMlCapabilities();
   const docLinks = useKibana().services.docLinks;
 
   // Enable/Disable Job & Datafeed -- passed to JobsTable for use as callback on JobSwitch
diff --git a/x-pack/legacy/plugins/siem/public/components/ml_popover/types.ts b/x-pack/legacy/plugins/siem/public/components/ml_popover/types.ts
index f3bf78fdbb94c..991c82cf701e8 100644
--- a/x-pack/legacy/plugins/siem/public/components/ml_popover/types.ts
+++ b/x-pack/legacy/plugins/siem/public/components/ml_popover/types.ts
@@ -5,6 +5,7 @@
  */
 
 import { MlError } from '../ml/types';
+import { AuditMessageBase } from '../../../../../../plugins/ml/common/types/audit_message';
 
 export interface Group {
   id: string;
@@ -101,6 +102,7 @@ export interface MlSetupArgs {
  * Representation of an ML Job as returned from the `ml/jobs/jobs_summary` API
  */
 export interface JobSummary {
+  auditMessage?: AuditMessageBase;
   datafeedId: string;
   datafeedIndices: string[];
   datafeedState: string;
diff --git a/x-pack/legacy/plugins/siem/public/components/page/hosts/host_overview/index.tsx b/x-pack/legacy/plugins/siem/public/components/page/hosts/host_overview/index.tsx
index bf32a33af1eac..4d0e6a737d303 100644
--- a/x-pack/legacy/plugins/siem/public/components/page/hosts/host_overview/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/page/hosts/host_overview/index.tsx
@@ -8,7 +8,7 @@ import { EuiFlexItem } from '@elastic/eui';
 import darkTheme from '@elastic/eui/dist/eui_theme_dark.json';
 import lightTheme from '@elastic/eui/dist/eui_theme_light.json';
 import { getOr } from 'lodash/fp';
-import React, { useContext } from 'react';
+import React from 'react';
 
 import { DEFAULT_DARK_MODE } from '../../../../../common/constants';
 import { DescriptionList } from '../../../../../common/utility_types';
@@ -19,8 +19,8 @@ import { InspectButton, InspectButtonContainer } from '../../../inspect';
 import { HostItem } from '../../../../graphql/types';
 import { Loader } from '../../../loader';
 import { IPDetailsLink } from '../../../links';
-import { MlCapabilitiesContext } from '../../../ml/permissions/ml_capabilities_provider';
 import { hasMlUserPermissions } from '../../../ml/permissions/has_ml_user_permissions';
+import { useMlCapabilities } from '../../../ml_popover/hooks/use_ml_capabilities';
 import { AnomalyScores } from '../../../ml/score/anomaly_scores';
 import { Anomalies, NarrowDateRange } from '../../../ml/types';
 import { DescriptionListStyled, OverviewWrapper } from '../../index';
@@ -56,7 +56,7 @@ export const HostOverview = React.memo<HostSummaryProps>(
     anomaliesData,
     narrowDateRange,
   }) => {
-    const capabilities = useContext(MlCapabilitiesContext);
+    const capabilities = useMlCapabilities();
     const userPermissions = hasMlUserPermissions(capabilities);
     const [darkMode] = useUiSetting$<boolean>(DEFAULT_DARK_MODE);
 
diff --git a/x-pack/legacy/plugins/siem/public/components/page/network/ip_overview/index.tsx b/x-pack/legacy/plugins/siem/public/components/page/network/ip_overview/index.tsx
index 901b82210a661..56b59ca97156f 100644
--- a/x-pack/legacy/plugins/siem/public/components/page/network/ip_overview/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/page/network/ip_overview/index.tsx
@@ -7,7 +7,7 @@
 import { EuiFlexItem } from '@elastic/eui';
 import darkTheme from '@elastic/eui/dist/eui_theme_dark.json';
 import lightTheme from '@elastic/eui/dist/eui_theme_light.json';
-import React, { useContext } from 'react';
+import React from 'react';
 
 import { DEFAULT_DARK_MODE } from '../../../../../common/constants';
 import { DescriptionList } from '../../../../../common/utility_types';
@@ -30,7 +30,7 @@ import { DescriptionListStyled, OverviewWrapper } from '../../index';
 import { Loader } from '../../../loader';
 import { Anomalies, NarrowDateRange } from '../../../ml/types';
 import { AnomalyScores } from '../../../ml/score/anomaly_scores';
-import { MlCapabilitiesContext } from '../../../ml/permissions/ml_capabilities_provider';
+import { useMlCapabilities } from '../../../ml_popover/hooks/use_ml_capabilities';
 import { hasMlUserPermissions } from '../../../ml/permissions/has_ml_user_permissions';
 import { InspectButton, InspectButtonContainer } from '../../../inspect';
 
@@ -71,7 +71,7 @@ export const IpOverview = React.memo<IpOverviewProps>(
     anomaliesData,
     narrowDateRange,
   }) => {
-    const capabilities = useContext(MlCapabilitiesContext);
+    const capabilities = useMlCapabilities();
     const userPermissions = hasMlUserPermissions(capabilities);
     const [darkMode] = useUiSetting$<boolean>(DEFAULT_DARK_MODE);
     const typeData: Overview = data[flowTarget]!;
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/anomaly_threshold_slider/index.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/anomaly_threshold_slider/index.tsx
index 1e18023e0c326..19d1c698cbd9b 100644
--- a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/anomaly_threshold_slider/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/anomaly_threshold_slider/index.tsx
@@ -5,7 +5,7 @@
  */
 
 import React, { useCallback } from 'react';
-import { EuiFlexGrid, EuiFlexItem, EuiRange, EuiFormRow } from '@elastic/eui';
+import { EuiFlexGroup, EuiFlexItem, EuiRange, EuiFormRow } from '@elastic/eui';
 
 import { FieldHook } from '../../../../../shared_imports';
 
@@ -31,12 +31,11 @@ export const AnomalyThresholdSlider: React.FC<AnomalyThresholdSliderProps> = ({
 
   return (
     <EuiFormRow
-      fullWidth
       label={field.label}
       data-test-subj="anomalyThresholdSlider"
       describedByIds={describedByIds}
     >
-      <EuiFlexGrid columns={2}>
+      <EuiFlexGroup>
         <EuiFlexItem>
           <EuiRange
             value={threshold}
@@ -48,7 +47,7 @@ export const AnomalyThresholdSlider: React.FC<AnomalyThresholdSliderProps> = ({
             tickInterval={25}
           />
         </EuiFlexItem>
-      </EuiFlexGrid>
+      </EuiFlexGroup>
     </EuiFormRow>
   );
 };
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/description_step/helpers.test.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/description_step/helpers.test.tsx
index 7a3f0105d3d15..af946c6f02cbb 100644
--- a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/description_step/helpers.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/description_step/helpers.test.tsx
@@ -22,6 +22,7 @@ import {
   buildSeverityDescription,
   buildUrlsDescription,
   buildNoteDescription,
+  buildRuleTypeDescription,
 } from './helpers';
 import { ListItems } from './types';
 
@@ -385,4 +386,30 @@ describe('helpers', () => {
       expect(result).toHaveLength(0);
     });
   });
+
+  describe('buildRuleTypeDescription', () => {
+    it('returns the label for a machine_learning type', () => {
+      const [result]: ListItems[] = buildRuleTypeDescription('Test label', 'machine_learning');
+
+      expect(result.title).toEqual('Test label');
+    });
+
+    it('returns a humanized description for a machine_learning type', () => {
+      const [result]: ListItems[] = buildRuleTypeDescription('Test label', 'machine_learning');
+
+      expect(result.description).toEqual('Machine Learning');
+    });
+
+    it('returns the label for a query type', () => {
+      const [result]: ListItems[] = buildRuleTypeDescription('Test label', 'query');
+
+      expect(result.title).toEqual('Test label');
+    });
+
+    it('returns a humanized description for a query type', () => {
+      const [result]: ListItems[] = buildRuleTypeDescription('Test label', 'query');
+
+      expect(result.description).toEqual('Query');
+    });
+  });
 });
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/description_step/helpers.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/description_step/helpers.tsx
index 7b22078c89d1b..f9b255a95d869 100644
--- a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/description_step/helpers.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/description_step/helpers.tsx
@@ -27,6 +27,8 @@ import * as i18n from './translations';
 import { BuildQueryBarDescription, BuildThreatDescription, ListItems } from './types';
 import { SeverityBadge } from '../severity_badge';
 import ListTreeIcon from './assets/list_tree_icon.svg';
+import { RuleType } from '../../../../../containers/detection_engine/rules';
+import { assertUnreachable } from '../../../../../lib/helpers';
 
 const NoteDescriptionContainer = styled(EuiFlexItem)`
   height: 105px;
@@ -266,3 +268,27 @@ export const buildNoteDescription = (label: string, note: string): ListItems[] =
   }
   return [];
 };
+
+export const buildRuleTypeDescription = (label: string, ruleType: RuleType): ListItems[] => {
+  switch (ruleType) {
+    case 'machine_learning': {
+      return [
+        {
+          title: label,
+          description: i18n.ML_TYPE_DESCRIPTION,
+        },
+      ];
+    }
+    case 'query':
+    case 'saved_query': {
+      return [
+        {
+          title: label,
+          description: i18n.QUERY_TYPE_DESCRIPTION,
+        },
+      ];
+    }
+    default:
+      return assertUnreachable(ruleType);
+  }
+};
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/description_step/index.test.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/description_step/index.test.tsx
index 557da8677f777..a01aec0ccf2cf 100644
--- a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/description_step/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/description_step/index.test.tsx
@@ -27,6 +27,8 @@ import { schema } from '../step_about_rule/schema';
 import { ListItems } from './types';
 import { AboutStepRule } from '../../types';
 
+jest.mock('../../../../../lib/kibana');
+
 describe('description_step', () => {
   const setupMock = coreMock.createSetup();
   const uiSettingsMock = (pinnedByDefault: boolean) => (key: string) => {
@@ -41,13 +43,6 @@ describe('description_step', () => {
   let mockAboutStep: AboutStepRule;
 
   beforeEach(() => {
-    // jest carries state between mocked implementations when using
-    // spyOn. So now we're doing all three of these.
-    // https://github.com/facebook/jest/issues/7136#issuecomment-565976599
-    jest.resetAllMocks();
-    jest.restoreAllMocks();
-    jest.clearAllMocks();
-
     setupMock.uiSettings.get.mockImplementation(uiSettingsMock(true));
     mockFilterManager = new FilterManager(setupMock.uiSettings);
     mockAboutStep = mockAboutStepRule();
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/description_step/index.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/description_step/index.tsx
index 43b4a5f781b89..69c4ee1017155 100644
--- a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/description_step/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/description_step/index.tsx
@@ -15,6 +15,7 @@ import {
   esFilters,
   FilterManager,
 } from '../../../../../../../../../../src/plugins/data/public';
+import { RuleType } from '../../../../../containers/detection_engine/rules';
 import { DEFAULT_TIMELINE_TITLE } from '../../../../../components/timeline/translations';
 import { useKibana } from '../../../../../lib/kibana';
 import { IMitreEnterpriseAttack } from '../../types';
@@ -29,7 +30,10 @@ import {
   buildUnorderedListArrayDescription,
   buildUrlsDescription,
   buildNoteDescription,
+  buildRuleTypeDescription,
 } from './helpers';
+import { useSiemJobs } from '../../../../../components/ml_popover/hooks/use_siem_jobs';
+import { buildMlJobDescription } from './ml_job_description';
 
 const DescriptionListContainer = styled(EuiDescriptionList)`
   &.euiDescriptionList--column .euiDescriptionList__title {
@@ -55,15 +59,22 @@ export const StepRuleDescriptionComponent: React.FC<StepRuleDescriptionProps> =
 }) => {
   const kibana = useKibana();
   const [filterManager] = useState<FilterManager>(new FilterManager(kibana.services.uiSettings));
+  const [, siemJobs] = useSiemJobs(true);
 
   const keys = Object.keys(schema);
-  const listItems = keys.reduce(
-    (acc: ListItems[], key: string) => [
-      ...acc,
-      ...buildListItems(data, pick(key, schema), filterManager, indexPatterns),
-    ],
-    []
-  );
+  const listItems = keys.reduce((acc: ListItems[], key: string) => {
+    if (key === 'machineLearningJobId') {
+      return [
+        ...acc,
+        buildMlJobDescription(
+          get(key, data) as string,
+          (get(key, schema) as { label: string }).label,
+          siemJobs
+        ),
+      ];
+    }
+    return [...acc, ...buildListItems(data, pick(key, schema), filterManager, indexPatterns)];
+  }, []);
 
   if (columns === 'multi') {
     return (
@@ -176,6 +187,9 @@ export const getDescriptionItem = (
   } else if (field === 'note') {
     const val: string = get(field, data);
     return buildNoteDescription(label, val);
+  } else if (field === 'ruleType') {
+    const ruleType: RuleType = get(field, data);
+    return buildRuleTypeDescription(label, ruleType);
   }
 
   const description: string = get(field, data);
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/description_step/ml_job_description.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/description_step/ml_job_description.tsx
new file mode 100644
index 0000000000000..6697268defbac
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/description_step/ml_job_description.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 styled from 'styled-components';
+import { EuiBadge, EuiIcon, EuiLink, EuiToolTip } from '@elastic/eui';
+
+import { useKibana } from '../../../../../lib/kibana';
+import { SiemJob } from '../../../../../components/ml_popover/types';
+import { ListItems } from './types';
+import { isJobStarted } from '../../../../../components/ml/helpers';
+import { ML_JOB_STARTED, ML_JOB_STOPPED } from './translations';
+
+enum MessageLevels {
+  info = 'info',
+  warning = 'warning',
+  error = 'error',
+}
+
+const AuditIcon: React.FC<{
+  message: SiemJob['auditMessage'];
+}> = ({ message }) => {
+  if (!message) {
+    return null;
+  }
+
+  let color = 'primary';
+  let icon = 'alert';
+
+  if (message.level === MessageLevels.info) {
+    icon = 'iInCircle';
+  } else if (message.level === MessageLevels.warning) {
+    color = 'warning';
+  } else if (message.level === MessageLevels.error) {
+    color = 'danger';
+  }
+
+  return (
+    <EuiToolTip content={message.text}>
+      <EuiIcon type={icon} color={color} />
+    </EuiToolTip>
+  );
+};
+
+export const JobStatusBadge: React.FC<{ job: SiemJob }> = ({ job }) => {
+  const isStarted = isJobStarted(job.jobState, job.datafeedState);
+
+  return isStarted ? (
+    <EuiBadge color="secondary">{ML_JOB_STARTED}</EuiBadge>
+  ) : (
+    <EuiBadge color="danger">{ML_JOB_STOPPED}</EuiBadge>
+  );
+};
+
+const JobLink = styled(EuiLink)`
+  margin-right: ${({ theme }) => theme.eui.euiSizeS};
+`;
+
+const Wrapper = styled.div`
+  overflow: hidden;
+`;
+
+export const MlJobDescription: React.FC<{ job: SiemJob }> = ({ job }) => {
+  const jobUrl = useKibana().services.application.getUrlForApp('ml#/jobs');
+
+  return (
+    <Wrapper>
+      <div>
+        <JobLink href={jobUrl} target="_blank">
+          {job.id}
+        </JobLink>
+        <AuditIcon message={job.auditMessage} />
+      </div>
+      <JobStatusBadge job={job} />
+    </Wrapper>
+  );
+};
+
+export const buildMlJobDescription = (
+  jobId: string,
+  label: string,
+  siemJobs: SiemJob[]
+): ListItems => {
+  const siemJob = siemJobs.find(job => job.id === jobId);
+
+  return {
+    title: label,
+    description: siemJob ? <MlJobDescription job={siemJob} /> : jobId,
+  };
+};
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/description_step/translations.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/description_step/translations.tsx
index 9695fd21067ee..b494d824679f3 100644
--- a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/description_step/translations.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/description_step/translations.tsx
@@ -17,3 +17,31 @@ export const QUERY_LABEL = i18n.translate('xpack.siem.detectionEngine.createRule
 export const SAVED_ID_LABEL = i18n.translate('xpack.siem.detectionEngine.createRule.savedIdLabel', {
   defaultMessage: 'Saved query name',
 });
+
+export const ML_TYPE_DESCRIPTION = i18n.translate(
+  'xpack.siem.detectionEngine.createRule.mlRuleTypeDescription',
+  {
+    defaultMessage: 'Machine Learning',
+  }
+);
+
+export const QUERY_TYPE_DESCRIPTION = i18n.translate(
+  'xpack.siem.detectionEngine.createRule.queryRuleTypeDescription',
+  {
+    defaultMessage: 'Query',
+  }
+);
+
+export const ML_JOB_STARTED = i18n.translate(
+  'xpack.siem.detectionEngine.ruleDescription.mlJobStartedDescription',
+  {
+    defaultMessage: 'Started',
+  }
+);
+
+export const ML_JOB_STOPPED = i18n.translate(
+  'xpack.siem.detectionEngine.ruleDescription.mlJobStoppedDescription',
+  {
+    defaultMessage: 'Stopped',
+  }
+);
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/ml_job_select/index.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/ml_job_select/index.tsx
index bc32162c2660b..3d253b71b53d6 100644
--- a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/ml_job_select/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/ml_job_select/index.tsx
@@ -5,12 +5,39 @@
  */
 
 import React, { useCallback } from 'react';
-import { EuiFlexGroup, EuiFlexItem, EuiFormRow, EuiSuperSelect, EuiText } from '@elastic/eui';
+import { FormattedMessage } from '@kbn/i18n/react';
+import {
+  EuiFlexGroup,
+  EuiFlexItem,
+  EuiFormRow,
+  EuiLink,
+  EuiSuperSelect,
+  EuiText,
+} from '@elastic/eui';
 
 import { FieldHook, getFieldValidityAndErrorMessage } from '../../../../../shared_imports';
 import { useSiemJobs } from '../../../../../components/ml_popover/hooks/use_siem_jobs';
+import { useKibana } from '../../../../../lib/kibana';
+import { ML_JOB_SELECT_PLACEHOLDER_TEXT } from '../step_define_rule/translations';
 
-const JobDisplay = ({ title, description }: { title: string; description: string }) => (
+const HelpText: React.FC<{ href: string }> = ({ href }) => (
+  <FormattedMessage
+    id="xpack.siem.detectionEngine.createRule.stepDefineRule.machineLearningJobIdHelpText"
+    defaultMessage="We've provided a few common jobs to get you started. To add your own custom jobs, assign a group of “siem” to those jobs in the {machineLearning} application to make them appear here."
+    values={{
+      machineLearning: (
+        <EuiLink href={href} target="_blank">
+          <FormattedMessage
+            id="xpack.siem.components.mlJobSelect.machineLearningLink"
+            defaultMessage="Machine Learning"
+          />
+        </EuiLink>
+      ),
+    }}
+  />
+);
+
+const JobDisplay: React.FC<{ title: string; description: string }> = ({ title, description }) => (
   <>
     <strong>{title}</strong>
     <EuiText size="xs" color="subdued">
@@ -28,23 +55,32 @@ export const MlJobSelect: React.FC<MlJobSelectProps> = ({ describedByIds = [], f
   const jobId = field.value as string;
   const { isInvalid, errorMessage } = getFieldValidityAndErrorMessage(field);
   const [isLoading, siemJobs] = useSiemJobs(false);
+  const mlUrl = useKibana().services.application.getUrlForApp('ml');
   const handleJobChange = useCallback(
     (machineLearningJobId: string) => {
       field.setValue(machineLearningJobId);
     },
     [field]
   );
+  const placeholderOption = {
+    value: 'placeholder',
+    inputDisplay: ML_JOB_SELECT_PLACEHOLDER_TEXT,
+    dropdownDisplay: ML_JOB_SELECT_PLACEHOLDER_TEXT,
+    disabled: true,
+  };
 
-  const options = siemJobs.map(job => ({
+  const jobOptions = siemJobs.map(job => ({
     value: job.id,
     inputDisplay: job.id,
     dropdownDisplay: <JobDisplay title={job.id} description={job.description} />,
   }));
 
+  const options = [placeholderOption, ...jobOptions];
+
   return (
     <EuiFormRow
-      fullWidth
       label={field.label}
+      helpText={<HelpText href={mlUrl} />}
       isInvalid={isInvalid}
       error={errorMessage}
       data-test-subj="mlJobSelect"
@@ -57,7 +93,7 @@ export const MlJobSelect: React.FC<MlJobSelectProps> = ({ describedByIds = [], f
             isLoading={isLoading}
             onChange={handleJobChange}
             options={options}
-            valueOfSelected={jobId}
+            valueOfSelected={jobId || 'placeholder'}
           />
         </EuiFlexItem>
       </EuiFlexGroup>
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/pick_timeline/index.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/pick_timeline/index.tsx
index 923ec3a7f0066..27d668dc6166c 100644
--- a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/pick_timeline/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/pick_timeline/index.tsx
@@ -59,7 +59,6 @@ export const PickTimeline = ({
       helpText={field.helpText}
       error={errorMessage}
       isInvalid={isInvalid}
-      fullWidth
       data-test-subj={dataTestSubj}
       describedByIds={idAria ? [idAria] : undefined}
     >
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/select_rule_type/index.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/select_rule_type/index.tsx
index 219b3d6dc4d58..af7150e083817 100644
--- a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/select_rule_type/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/select_rule_type/index.tsx
@@ -48,14 +48,16 @@ interface SelectRuleTypeProps {
   describedByIds?: string[];
   field: FieldHook;
   hasValidLicense?: boolean;
+  isMlAdmin?: boolean;
   isReadOnly?: boolean;
 }
 
 export const SelectRuleType: React.FC<SelectRuleTypeProps> = ({
   describedByIds = [],
   field,
-  hasValidLicense = false,
   isReadOnly = false,
+  hasValidLicense = false,
+  isMlAdmin = false,
 }) => {
   const ruleType = field.value as RuleType;
   const setType = useCallback(
@@ -66,7 +68,7 @@ export const SelectRuleType: React.FC<SelectRuleTypeProps> = ({
   );
   const setMl = useCallback(() => setType('machine_learning'), [setType]);
   const setQuery = useCallback(() => setType('query'), [setType]);
-  const mlCardDisabled = isReadOnly || !hasValidLicense;
+  const mlCardDisabled = isReadOnly || !hasValidLicense || !isMlAdmin;
 
   return (
     <EuiFormRow
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/step_about_rule_details/index.test.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/step_about_rule_details/index.test.tsx
index 4a4e96ec74902..bbd037af10c3f 100644
--- a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/step_about_rule_details/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/step_about_rule_details/index.test.tsx
@@ -15,19 +15,14 @@ import { HeaderSection } from '../../../../../components/header_section';
 import { StepAboutRule } from '../step_about_rule/';
 import { AboutStepRule } from '../../types';
 
+jest.mock('../../../../../lib/kibana');
+
 const theme = () => ({ eui: euiDarkVars, darkMode: true });
 
 describe('StepAboutRuleToggleDetails', () => {
   let mockRule: AboutStepRule;
 
   beforeEach(() => {
-    // jest carries state between mocked implementations when using
-    // spyOn. So now we're doing all three of these.
-    // https://github.com/facebook/jest/issues/7136#issuecomment-565976599
-    jest.resetAllMocks();
-    jest.restoreAllMocks();
-    jest.clearAllMocks();
-
     mockRule = mockAboutStepRule();
   });
 
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/step_define_rule/index.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/step_define_rule/index.tsx
index 68ca1840871e3..6c46ab0b171a2 100644
--- a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/step_define_rule/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/step_define_rule/index.tsx
@@ -5,7 +5,7 @@
  */
 
 import { EuiButtonEmpty, EuiFormRow } from '@elastic/eui';
-import React, { FC, memo, useCallback, useState, useEffect, useContext } from 'react';
+import React, { FC, memo, useCallback, useState, useEffect } from 'react';
 import styled from 'styled-components';
 import deepEqual from 'fast-deep-equal';
 
@@ -13,7 +13,7 @@ import { IIndexPattern } from '../../../../../../../../../../src/plugins/data/pu
 import { useFetchIndexPatterns } from '../../../../../containers/detection_engine/rules';
 import { DEFAULT_INDEX_KEY } from '../../../../../../common/constants';
 import { DEFAULT_TIMELINE_TITLE } from '../../../../../components/timeline/translations';
-import { MlCapabilitiesContext } from '../../../../../components/ml/permissions/ml_capabilities_provider';
+import { useMlCapabilities } from '../../../../../components/ml_popover/hooks/use_ml_capabilities';
 import { useUiSetting$ } from '../../../../../lib/kibana';
 import { setFieldValue, isMlRule } from '../../helpers';
 import { DefineStepRule, RuleStep, RuleStepProps } from '../../types';
@@ -37,6 +37,7 @@ import {
 import { schema } from './schema';
 import * as i18n from './translations';
 import { filterRuleFieldsForType, RuleFields } from '../../create/helpers';
+import { hasMlAdminPermissions } from '../../../../../components/ml/permissions/has_ml_admin_permissions';
 
 const CommonUseField = getUseField({ component: Field });
 
@@ -85,7 +86,7 @@ const StepDefineRuleComponent: FC<StepDefineRuleProps> = ({
   setForm,
   setStepData,
 }) => {
-  const mlCapabilities = useContext(MlCapabilitiesContext);
+  const mlCapabilities = useMlCapabilities();
   const [openTimelineSearch, setOpenTimelineSearch] = useState(false);
   const [indexModified, setIndexModified] = useState(false);
   const [localIsMlRule, setIsMlRule] = useState(false);
@@ -162,8 +163,9 @@ const StepDefineRuleComponent: FC<StepDefineRuleProps> = ({
             component={SelectRuleType}
             componentProps={{
               describedByIds: ['detectionEngineStepDefineRuleType'],
-              hasValidLicense: mlCapabilities.isPlatinumOrTrialLicense,
               isReadOnly: isUpdateView,
+              hasValidLicense: mlCapabilities.isPlatinumOrTrialLicense,
+              isMlAdmin: hasMlAdminPermissions(mlCapabilities),
             }}
           />
           <EuiFormRow fullWidth style={{ display: localIsMlRule ? 'none' : 'flex' }}>
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/step_define_rule/translations.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/step_define_rule/translations.tsx
index 8394f090e346c..1d8821aceb249 100644
--- a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/step_define_rule/translations.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/step_define_rule/translations.tsx
@@ -55,3 +55,10 @@ export const IMPORT_TIMELINE_QUERY = i18n.translate(
     defaultMessage: 'Import query from saved timeline',
   }
 );
+
+export const ML_JOB_SELECT_PLACEHOLDER_TEXT = i18n.translate(
+  'xpack.siem.detectionEngine.createRule.stepDefineRule.mlJobSelectPlaceholderText',
+  {
+    defaultMessage: 'Select a job',
+  }
+);
diff --git a/x-pack/legacy/plugins/siem/public/pages/hosts/details/index.tsx b/x-pack/legacy/plugins/siem/public/pages/hosts/details/index.tsx
index 8af4731e4dda4..a12c95b3b5a6f 100644
--- a/x-pack/legacy/plugins/siem/public/pages/hosts/details/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/hosts/details/index.tsx
@@ -5,7 +5,7 @@
  */
 
 import { EuiHorizontalRule, EuiSpacer } from '@elastic/eui';
-import React, { useContext, useEffect, useCallback, useMemo } from 'react';
+import React, { useEffect, useCallback, useMemo } from 'react';
 import { connect, ConnectedProps } from 'react-redux';
 import { StickyContainer } from 'react-sticky';
 
@@ -15,7 +15,7 @@ import { LastEventTime } from '../../../components/last_event_time';
 import { AnomalyTableProvider } from '../../../components/ml/anomaly/anomaly_table_provider';
 import { hostToCriteria } from '../../../components/ml/criteria/host_to_criteria';
 import { hasMlUserPermissions } from '../../../components/ml/permissions/has_ml_user_permissions';
-import { MlCapabilitiesContext } from '../../../components/ml/permissions/ml_capabilities_provider';
+import { useMlCapabilities } from '../../../components/ml_popover/hooks/use_ml_capabilities';
 import { scoreIntervalToDateTime } from '../../../components/ml/score/score_interval_to_datetime';
 import { SiemNavigation } from '../../../components/navigation';
 import { KpiHostsComponent } from '../../../components/page/hosts';
@@ -62,7 +62,7 @@ const HostDetailsComponent = React.memo<HostDetailsProps & PropsFromRedux>(
     useEffect(() => {
       setHostDetailsTablesActivePageToZero();
     }, [setHostDetailsTablesActivePageToZero, detailName]);
-    const capabilities = useContext(MlCapabilitiesContext);
+    const capabilities = useMlCapabilities();
     const kibana = useKibana();
     const hostDetailsPageFilters: Filter[] = useMemo(() => getHostDetailsPageFilters(detailName), [
       detailName,
diff --git a/x-pack/legacy/plugins/siem/public/pages/hosts/hosts.tsx b/x-pack/legacy/plugins/siem/public/pages/hosts/hosts.tsx
index a7aa9920b7d08..d574925a91600 100644
--- a/x-pack/legacy/plugins/siem/public/pages/hosts/hosts.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/hosts/hosts.tsx
@@ -14,7 +14,6 @@ import { FiltersGlobal } from '../../components/filters_global';
 import { HeaderPage } from '../../components/header_page';
 import { LastEventTime } from '../../components/last_event_time';
 import { hasMlUserPermissions } from '../../components/ml/permissions/has_ml_user_permissions';
-import { MlCapabilitiesContext } from '../../components/ml/permissions/ml_capabilities_provider';
 import { SiemNavigation } from '../../components/navigation';
 import { KpiHostsComponent } from '../../components/page/hosts';
 import { manageQuery } from '../../components/page/manage_query';
@@ -30,6 +29,7 @@ import { setAbsoluteRangeDatePicker as dispatchSetAbsoluteRangeDatePicker } from
 
 import { SpyRoute } from '../../utils/route/spy_routes';
 import { esQuery } from '../../../../../../../src/plugins/data/public';
+import { useMlCapabilities } from '../../components/ml_popover/hooks/use_ml_capabilities';
 import { HostsEmptyPage } from './hosts_empty_page';
 import { HostsTabs } from './hosts_tabs';
 import { navTabsHosts } from './nav_tabs';
@@ -52,7 +52,7 @@ export const HostsComponent = React.memo<HostsComponentProps & PropsFromRedux>(
     to,
     hostsPagePath,
   }) => {
-    const capabilities = React.useContext(MlCapabilitiesContext);
+    const capabilities = useMlCapabilities();
     const kibana = useKibana();
     const { tabName } = useParams();
     const tabsFilters = React.useMemo(() => {
diff --git a/x-pack/legacy/plugins/siem/public/pages/network/index.tsx b/x-pack/legacy/plugins/siem/public/pages/network/index.tsx
index 48fc1421d90bb..babc153823b5a 100644
--- a/x-pack/legacy/plugins/siem/public/pages/network/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/network/index.tsx
@@ -4,10 +4,10 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import React, { useContext, useMemo } from 'react';
+import React, { useMemo } from 'react';
 import { Redirect, Route, Switch, RouteComponentProps } from 'react-router-dom';
 
-import { MlCapabilitiesContext } from '../../components/ml/permissions/ml_capabilities_provider';
+import { useMlCapabilities } from '../../components/ml_popover/hooks/use_ml_capabilities';
 import { hasMlUserPermissions } from '../../components/ml/permissions/has_ml_user_permissions';
 import { FlowTarget } from '../../graphql/types';
 
@@ -24,7 +24,7 @@ const networkPagePath = `/:pageName(${SiemPageName.network})`;
 const ipDetailsPageBasePath = `${networkPagePath}/ip/:detailName`;
 
 const NetworkContainerComponent: React.FC<Props> = () => {
-  const capabilities = useContext(MlCapabilitiesContext);
+  const capabilities = useMlCapabilities();
   const capabilitiesFetched = capabilities.capabilitiesFetched;
   const userHasMlUserPermissions = useMemo(() => hasMlUserPermissions(capabilities), [
     capabilities,

From aa73e2aee3738fb6437781e242dd3618d09401bd Mon Sep 17 00:00:00 2001
From: Patrick Mueller <pmuellr@gmail.com>
Date: Tue, 24 Mar 2020 23:19:56 -0400
Subject: [PATCH 121/179] [Alerting] change index action config
 executionTimeField to nullable (#61127)

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

When the index action params moved into config, the `schema.maybe()` on the
`executionTimeField` should have been changed to `schema.nullable()`, otherwise
you can never "unset" the field, once it's set.

Changes rippled down to the UI as well.

To be extra safe, we also check that the `executionTimeField` isn't an empty
string when trimmed, as ES will not accept a document with a property that is
the empty string.
---
 .../builtin_action_types/es_index.test.ts     | 21 ++++++++++++++-----
 .../server/builtin_action_types/es_index.ts   |  7 ++++---
 .../builtin_action_types/es_index.test.tsx    | 20 ++++++++++++++++++
 .../builtin_action_types/es_index.tsx         | 19 +++++++++++++----
 .../components/builtin_action_types/types.ts  |  2 +-
 .../actions/builtin_action_types/es_index.ts  |  3 ++-
 .../actions/builtin_action_types/es_index.ts  |  3 ++-
 7 files changed, 60 insertions(+), 15 deletions(-)

diff --git a/x-pack/plugins/actions/server/builtin_action_types/es_index.test.ts b/x-pack/plugins/actions/server/builtin_action_types/es_index.test.ts
index 7eded9bb40964..ec495aed7675a 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/es_index.test.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/es_index.test.ts
@@ -52,6 +52,7 @@ describe('config validation', () => {
       ...config,
       index: 'testing-123',
       refresh: false,
+      executionTimeField: null,
     });
 
     config.executionTimeField = 'field-123';
@@ -62,6 +63,14 @@ describe('config validation', () => {
       executionTimeField: 'field-123',
     });
 
+    config.executionTimeField = null;
+    expect(validateConfig(actionType, config)).toEqual({
+      ...config,
+      index: 'testing-123',
+      refresh: false,
+      executionTimeField: null,
+    });
+
     delete config.index;
 
     expect(() => {
@@ -73,9 +82,11 @@ describe('config validation', () => {
 
     expect(() => {
       validateConfig(actionType, { index: 'testing-123', executionTimeField: true });
-    }).toThrowErrorMatchingInlineSnapshot(
-      `"error validating action type config: [executionTimeField]: expected value of type [string] but got [boolean]"`
-    );
+    }).toThrowErrorMatchingInlineSnapshot(`
+"error validating action type config: [executionTimeField]: types that failed validation:
+- [executionTimeField.0]: expected value of type [string] but got [boolean]
+- [executionTimeField.1]: expected value to equal [null]"
+`);
 
     delete config.refresh;
     expect(() => {
@@ -138,12 +149,12 @@ describe('params validation', () => {
 describe('execute()', () => {
   test('ensure parameters are as expected', async () => {
     const secrets = {};
-    let config: ActionTypeConfigType;
+    let config: Partial<ActionTypeConfigType>;
     let params: ActionParamsType;
     let executorOptions: ActionTypeExecutorOptions;
 
     // minimal params
-    config = { index: 'index-value', refresh: false, executionTimeField: undefined };
+    config = { index: 'index-value', refresh: false };
     params = {
       documents: [{ jim: 'bob' }],
     };
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 b86f0029b5383..ff7b27b3f51fc 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
@@ -18,7 +18,7 @@ export type ActionTypeConfigType = TypeOf<typeof ConfigSchema>;
 const ConfigSchema = schema.object({
   index: schema.string(),
   refresh: schema.boolean({ defaultValue: false }),
-  executionTimeField: schema.maybe(schema.string()),
+  executionTimeField: schema.nullable(schema.string()),
 });
 
 // params definition
@@ -63,8 +63,9 @@ async function executor(
 
   const bulkBody = [];
   for (const document of params.documents) {
-    if (config.executionTimeField != null) {
-      document[config.executionTimeField] = new Date();
+    const timeField = config.executionTimeField == null ? '' : config.executionTimeField.trim();
+    if (timeField !== '') {
+      document[timeField] = new Date();
     }
 
     bulkBody.push({ index: {} });
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/es_index.test.tsx b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/es_index.test.tsx
index f1d4790e67bbe..6ce954f61bcdb 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/es_index.test.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/es_index.test.tsx
@@ -52,6 +52,26 @@ describe('index connector validation', () => {
   });
 });
 
+describe('index connector validation with minimal config', () => {
+  test('connector validation succeeds when connector config is valid', () => {
+    const actionConnector = {
+      secrets: {},
+      id: 'test',
+      actionTypeId: '.index',
+      name: 'es_index',
+      config: {
+        index: 'test_es_index',
+      },
+    } as EsIndexActionConnector;
+
+    expect(actionTypeModel.validateConnector(actionConnector)).toEqual({
+      errors: {
+        index: [],
+      },
+    });
+  });
+});
+
 describe('action params validation', () => {
   test('action params validation succeeds when action params is valid', () => {
     const actionParams = {
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/es_index.tsx b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/es_index.tsx
index 00660b214c7cf..706d746b92995 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/es_index.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/es_index.tsx
@@ -79,7 +79,7 @@ const IndexActionConnectorFields: React.FunctionComponent<ActionConnectorFieldsP
 >> = ({ action, editActionConfig, errors, http }) => {
   const { index, refresh, executionTimeField } = action.config;
   const [hasTimeFieldCheckbox, setTimeFieldCheckboxState] = useState<boolean>(
-    executionTimeField !== undefined
+    executionTimeField != null
   );
 
   const [indexPatterns, setIndexPatterns] = useState([]);
@@ -206,6 +206,11 @@ const IndexActionConnectorFields: React.FunctionComponent<ActionConnectorFieldsP
         checked={hasTimeFieldCheckbox || false}
         onChange={() => {
           setTimeFieldCheckboxState(!hasTimeFieldCheckbox);
+          // if changing from checked to not checked (hasTimeField === true),
+          // set time field to null
+          if (hasTimeFieldCheckbox) {
+            editActionConfig('executionTimeField', null);
+          }
         }}
         label={
           <>
@@ -245,13 +250,13 @@ const IndexActionConnectorFields: React.FunctionComponent<ActionConnectorFieldsP
               fullWidth
               name="executionTimeField"
               data-test-subj="executionTimeFieldSelect"
-              value={executionTimeField}
+              value={executionTimeField ?? ''}
               onChange={e => {
-                editActionConfig('executionTimeField', e.target.value);
+                editActionConfig('executionTimeField', nullableString(e.target.value));
               }}
               onBlur={() => {
                 if (executionTimeField === undefined) {
-                  editActionConfig('executionTimeField', '');
+                  editActionConfig('executionTimeField', null);
                 }
               }}
             />
@@ -312,3 +317,9 @@ const IndexParamsFields: React.FunctionComponent<ActionParamsProps<IndexActionPa
     </Fragment>
   );
 };
+
+// if the string == null or is empty, return null, else return string
+function nullableString(str: string | null | undefined) {
+  if (str == null || str.trim() === '') return null;
+  return str;
+}
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/types.ts b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/types.ts
index 2e0576d933f90..fd35db4304275 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/types.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/types.ts
@@ -83,7 +83,7 @@ export interface EmailActionConnector extends ActionConnector {
 
 interface EsIndexConfig {
   index: string;
-  executionTimeField?: string;
+  executionTimeField?: string | null;
   refresh?: boolean;
 }
 
diff --git a/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/builtin_action_types/es_index.ts b/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/builtin_action_types/es_index.ts
index 6d76a00d39b97..01eaf92da33fe 100644
--- a/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/builtin_action_types/es_index.ts
+++ b/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/builtin_action_types/es_index.ts
@@ -45,6 +45,7 @@ export default function indexTest({ getService }: FtrProviderContext) {
         config: {
           index: ES_TEST_INDEX_NAME,
           refresh: false,
+          executionTimeField: null,
         },
       });
       createdActionID = createdAction.id;
@@ -58,7 +59,7 @@ export default function indexTest({ getService }: FtrProviderContext) {
         id: fetchedAction.id,
         name: 'An index action',
         actionTypeId: '.index',
-        config: { index: ES_TEST_INDEX_NAME, refresh: false },
+        config: { index: ES_TEST_INDEX_NAME, refresh: false, executionTimeField: null },
       });
 
       // create action with all config props
diff --git a/x-pack/test/alerting_api_integration/spaces_only/tests/actions/builtin_action_types/es_index.ts b/x-pack/test/alerting_api_integration/spaces_only/tests/actions/builtin_action_types/es_index.ts
index 5cc3d7275a7bd..3713e9c24419f 100644
--- a/x-pack/test/alerting_api_integration/spaces_only/tests/actions/builtin_action_types/es_index.ts
+++ b/x-pack/test/alerting_api_integration/spaces_only/tests/actions/builtin_action_types/es_index.ts
@@ -43,6 +43,7 @@ export default function indexTest({ getService }: FtrProviderContext) {
         config: {
           index: ES_TEST_INDEX_NAME,
           refresh: false,
+          executionTimeField: null,
         },
       });
       createdActionID = createdAction.id;
@@ -56,7 +57,7 @@ export default function indexTest({ getService }: FtrProviderContext) {
         id: fetchedAction.id,
         name: 'An index action',
         actionTypeId: '.index',
-        config: { index: ES_TEST_INDEX_NAME, refresh: false },
+        config: { index: ES_TEST_INDEX_NAME, refresh: false, executionTimeField: null },
       });
 
       // create action with all config props

From 29a3f559855c92e10197e2d2358248fe0af6925d Mon Sep 17 00:00:00 2001
From: Nathan Reese <reese.nathan@gmail.com>
Date: Tue, 24 Mar 2020 21:24:37 -0600
Subject: [PATCH 122/179] [Maps] clean up icon category UI (#61116)

* [Maps] clean up icon category UI

* fix jest tests

* add unit test for getFirstUnusedSymbol

* remove duplicate icon stop values

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 .../migrate_symbol_style_descriptor.test.js   |  2 +-
 .../vector/components/color/_color_stops.scss | 10 ---
 .../vector/components/color/color_stops.js    |  2 +-
 .../vector/components/symbol/icon_select.js   |  1 +
 .../vector/components/symbol/icon_stops.js    | 81 ++++++++++++-------
 .../components/symbol/icon_stops.test.js      | 59 ++++++++++++++
 .../layers/styles/vector/symbol_utils.js      | 10 +++
 .../layers/styles/vector/vector_style.test.js |  2 +-
 x-pack/plugins/maps/common/constants.ts       |  2 +-
 9 files changed, 128 insertions(+), 41 deletions(-)
 create mode 100644 x-pack/legacy/plugins/maps/public/layers/styles/vector/components/symbol/icon_stops.test.js

diff --git a/x-pack/legacy/plugins/maps/common/migrations/migrate_symbol_style_descriptor.test.js b/x-pack/legacy/plugins/maps/common/migrations/migrate_symbol_style_descriptor.test.js
index 2811b83f46d8f..fc0151083855c 100644
--- a/x-pack/legacy/plugins/maps/common/migrations/migrate_symbol_style_descriptor.test.js
+++ b/x-pack/legacy/plugins/maps/common/migrations/migrate_symbol_style_descriptor.test.js
@@ -120,7 +120,7 @@ describe('migrateSymbolStyleDescriptor', () => {
               },
               icon: {
                 type: STYLE_TYPE.STATIC,
-                options: { value: 'airfield' },
+                options: { value: 'marker' },
               },
             },
           },
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/color/_color_stops.scss b/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/color/_color_stops.scss
index 519e97f4b30cd..09a9ad59bce3c 100644
--- a/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/color/_color_stops.scss
+++ b/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/color/_color_stops.scss
@@ -4,15 +4,5 @@
   & + & {
     margin-top: $euiSizeS;
   }
-
-  &:hover,
-  &:focus {
-    .mapColorStop__icons {
-      visibility: visible;
-      opacity: 1;
-      display: block;
-      animation: mapColorStopBecomeVisible $euiAnimSpeedFast $euiAnimSlightResistance;
-    }
-  }
 }
 
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/color/color_stops.js b/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/color/color_stops.js
index 3e9b9e2aafc47..059543d705fc7 100644
--- a/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/color/color_stops.js
+++ b/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/color/color_stops.js
@@ -12,7 +12,7 @@ import { EuiButtonIcon, EuiColorPicker, EuiFlexGroup, EuiFlexItem, EuiFormRow }
 
 function getColorStopRow({ index, errors, stopInput, onColorChange, color, deleteButton, onAdd }) {
   const colorPickerButtons = (
-    <div className="mapColorStop__icons">
+    <div>
       {deleteButton}
       <EuiButtonIcon
         iconType="plusInCircle"
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/symbol/icon_select.js b/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/symbol/icon_select.js
index 41cba1b76d97a..a036423e71709 100644
--- a/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/symbol/icon_select.js
+++ b/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/symbol/icon_select.js
@@ -70,6 +70,7 @@ export class IconSelect extends Component {
         fullWidth
         compressed
         onKeyDown={this._handleKeyboardActivity}
+        append={this.props.append}
       >
         <EuiFieldText
           onClick={this._togglePopover}
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/symbol/icon_stops.js b/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/symbol/icon_stops.js
index 4475af65be2e2..0da3074f55e49 100644
--- a/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/symbol/icon_stops.js
+++ b/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/symbol/icon_stops.js
@@ -11,6 +11,7 @@ import { getOtherCategoryLabel } from '../../style_util';
 import { EuiButtonIcon, EuiFlexGroup, EuiFlexItem, EuiFormRow, EuiFieldText } from '@elastic/eui';
 import { IconSelect } from './icon_select';
 import { StopInput } from '../stop_input';
+import { PREFERRED_ICONS } from '../../symbol_utils';
 
 function isDuplicateStop(targetStop, iconStops) {
   const stops = iconStops.filter(({ stop }) => {
@@ -19,9 +20,31 @@ function isDuplicateStop(targetStop, iconStops) {
   return stops.length > 1;
 }
 
+export function getFirstUnusedSymbol(symbolOptions, iconStops) {
+  const firstUnusedPreferredIconId = PREFERRED_ICONS.find(iconId => {
+    const isSymbolBeingUsed = iconStops.some(({ icon }) => {
+      return icon === iconId;
+    });
+    return !isSymbolBeingUsed;
+  });
+
+  if (firstUnusedPreferredIconId) {
+    return firstUnusedPreferredIconId;
+  }
+
+  const firstUnusedSymbol = symbolOptions.find(({ value }) => {
+    const isSymbolBeingUsed = iconStops.some(({ icon }) => {
+      return icon === value;
+    });
+    return !isSymbolBeingUsed;
+  });
+
+  return firstUnusedSymbol ? firstUnusedSymbol.value : DEFAULT_ICON;
+}
+
 const DEFAULT_ICON_STOPS = [
-  { stop: null, icon: DEFAULT_ICON }, //first stop is the "other" color
-  { stop: '', icon: DEFAULT_ICON },
+  { stop: null, icon: PREFERRED_ICONS[0] }, //first stop is the "other" color
+  { stop: '', icon: PREFERRED_ICONS[1] },
 ];
 
 export function IconStops({
@@ -58,7 +81,7 @@ export function IconStops({
           ...iconStops.slice(0, index + 1),
           {
             stop: '',
-            icon: DEFAULT_ICON,
+            icon: getFirstUnusedSymbol(symbolOptions, iconStops),
           },
           ...iconStops.slice(index + 1),
         ],
@@ -66,12 +89,12 @@ export function IconStops({
     };
     const onRemove = () => {
       onChange({
-        iconStops: [...iconStops.slice(0, index), ...iconStops.slice(index + 1)],
+        customMapStops: [...iconStops.slice(0, index), ...iconStops.slice(index + 1)],
       });
     };
 
     let deleteButton;
-    if (index > 0) {
+    if (iconStops.length > 2 && index !== 0) {
       deleteButton = (
         <EuiButtonIcon
           iconType="trash"
@@ -87,6 +110,19 @@ export function IconStops({
       );
     }
 
+    const iconStopButtons = (
+      <div>
+        {deleteButton}
+        <EuiButtonIcon
+          iconType="plusInCircle"
+          color="primary"
+          aria-label="Add"
+          title="Add"
+          onClick={onAdd}
+        />
+      </div>
+    );
+
     const errors = [];
     // TODO check for duplicate values and add error messages here
 
@@ -116,29 +152,20 @@ export function IconStops({
         error={errors}
         display="rowCompressed"
       >
-        <div>
-          <EuiFlexGroup responsive={false} alignItems="center" gutterSize="xs">
-            <EuiFlexItem>{stopInput}</EuiFlexItem>
-            <EuiFlexItem>
-              <IconSelect
-                isDarkMode={isDarkMode}
-                onChange={onIconSelect}
-                symbolOptions={symbolOptions}
-                value={icon}
-              />
-            </EuiFlexItem>
-          </EuiFlexGroup>
-          <div className="mapColorStop__icons">
-            {deleteButton}
-            <EuiButtonIcon
-              iconType="plusInCircle"
-              color="primary"
-              aria-label="Add"
-              title="Add"
-              onClick={onAdd}
+        <EuiFlexGroup alignItems="center" gutterSize="xs">
+          <EuiFlexItem grow={false} className="mapStyleSettings__fixedBox">
+            {stopInput}
+          </EuiFlexItem>
+          <EuiFlexItem>
+            <IconSelect
+              isDarkMode={isDarkMode}
+              onChange={onIconSelect}
+              symbolOptions={symbolOptions}
+              value={icon}
+              append={iconStopButtons}
             />
-          </div>
-        </div>
+          </EuiFlexItem>
+        </EuiFlexGroup>
       </EuiFormRow>
     );
   });
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/symbol/icon_stops.test.js b/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/symbol/icon_stops.test.js
new file mode 100644
index 0000000000000..ffe9b6feef462
--- /dev/null
+++ b/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/symbol/icon_stops.test.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 { getFirstUnusedSymbol } from './icon_stops';
+
+describe('getFirstUnusedSymbol', () => {
+  const symbolOptions = [{ value: 'icon1' }, { value: 'icon2' }];
+
+  test('Should return first unused icon from PREFERRED_ICONS', () => {
+    const iconStops = [
+      { stop: 'category1', icon: 'circle' },
+      { stop: 'category2', icon: 'marker' },
+    ];
+    const nextIcon = getFirstUnusedSymbol(symbolOptions, iconStops);
+    expect(nextIcon).toBe('square');
+  });
+
+  test('Should fallback to first unused general icons when all PREFERRED_ICONS are used', () => {
+    const iconStops = [
+      { stop: 'category1', icon: 'circle' },
+      { stop: 'category2', icon: 'marker' },
+      { stop: 'category3', icon: 'square' },
+      { stop: 'category4', icon: 'star' },
+      { stop: 'category5', icon: 'triangle' },
+      { stop: 'category6', icon: 'hospital' },
+      { stop: 'category7', icon: 'circle-stroked' },
+      { stop: 'category8', icon: 'marker-stroked' },
+      { stop: 'category9', icon: 'square-stroked' },
+      { stop: 'category10', icon: 'star-stroked' },
+      { stop: 'category11', icon: 'triangle-stroked' },
+      { stop: 'category12', icon: 'icon1' },
+    ];
+    const nextIcon = getFirstUnusedSymbol(symbolOptions, iconStops);
+    expect(nextIcon).toBe('icon2');
+  });
+
+  test('Should fallback to default icon when all icons are used', () => {
+    const iconStops = [
+      { stop: 'category1', icon: 'circle' },
+      { stop: 'category2', icon: 'marker' },
+      { stop: 'category3', icon: 'square' },
+      { stop: 'category4', icon: 'star' },
+      { stop: 'category5', icon: 'triangle' },
+      { stop: 'category6', icon: 'hospital' },
+      { stop: 'category7', icon: 'circle-stroked' },
+      { stop: 'category8', icon: 'marker-stroked' },
+      { stop: 'category9', icon: 'square-stroked' },
+      { stop: 'category10', icon: 'star-stroked' },
+      { stop: 'category11', icon: 'triangle-stroked' },
+      { stop: 'category12', icon: 'icon1' },
+      { stop: 'category13', icon: 'icon2' },
+    ];
+    const nextIcon = getFirstUnusedSymbol(symbolOptions, iconStops);
+    expect(nextIcon).toBe('marker');
+  });
+});
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/symbol_utils.js b/x-pack/legacy/plugins/maps/public/layers/styles/vector/symbol_utils.js
index affb9c1805170..c1c4375faaeb1 100644
--- a/x-pack/legacy/plugins/maps/public/layers/styles/vector/symbol_utils.js
+++ b/x-pack/legacy/plugins/maps/public/layers/styles/vector/symbol_utils.js
@@ -101,6 +101,16 @@ const ICON_PALETTES = [
   },
 ];
 
+// PREFERRED_ICONS is used to provide less random default icon values for forms that need default icon values
+export const PREFERRED_ICONS = [];
+ICON_PALETTES.forEach(iconPalette => {
+  iconPalette.icons.forEach(iconId => {
+    if (!PREFERRED_ICONS.includes(iconId)) {
+      PREFERRED_ICONS.push(iconId);
+    }
+  });
+});
+
 export function getIconPaletteOptions(isDarkMode) {
   return ICON_PALETTES.map(({ id, icons }) => {
     const iconsDisplay = icons.map(iconId => {
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 d669fd280e32c..426f1d6afa952 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
@@ -96,7 +96,7 @@ describe('getDescriptorWithMissingStylePropsRemoved', () => {
       },
       icon: {
         options: {
-          value: 'airfield',
+          value: 'marker',
         },
         type: 'STATIC',
       },
diff --git a/x-pack/plugins/maps/common/constants.ts b/x-pack/plugins/maps/common/constants.ts
index 12b03f0386304..814825483d0dd 100644
--- a/x-pack/plugins/maps/common/constants.ts
+++ b/x-pack/plugins/maps/common/constants.ts
@@ -188,7 +188,7 @@ export enum LABEL_BORDER_SIZES {
   LARGE = 'LARGE',
 }
 
-export const DEFAULT_ICON = 'airfield';
+export const DEFAULT_ICON = 'marker';
 
 export enum VECTOR_STYLES {
   SYMBOLIZE_AS = 'symbolizeAs',

From 96852249e80d718cd08e51055df4229460c38dda Mon Sep 17 00:00:00 2001
From: "Devin W. Hurley" <devin.hurley@elastic.co>
Date: Tue, 24 Mar 2020 23:49:08 -0400
Subject: [PATCH 123/179] [SIEM] [Detection Engine] Rule activity monitoring
 (#60816)

* backend rule monitoring with gap desc, last look back date, and time duration of search after and bulk create operations

* adds new properties to mocked request_response status saved object

* first pass at UI table

* migrate rule monitoring backend to work with refactor of rule executor, fix some formatting stuff on the frontend, update the mapping for gap to be a string instead of a float

* trying to write a test for rules statuses hook

* fixed hooks tests

* fixes merge conflicts from rebase with master

* add columns for indexing and query time lapse

* i18n

* i18n for tabs

* don't change the mappings in ml es_archives

* remove accidental commit of interval change for shell script detection engine rule

* removes inline object from prop

* fix merge conflicts

* backend changes from pr comments

* updates ui changes from pr feedback

* fix tests and add formatting for dates

* remove null from rulesStatuses initial state and replace with empty array
---
 .../detection_engine/rules/__mocks__/api.ts   |  30 +++++
 .../containers/detection_engine/rules/api.ts  |  26 ++++
 .../detection_engine/rules/types.ts           |   4 +
 .../rules/use_rule_status.test.tsx            | 104 ++++++++++++++-
 .../rules/use_rule_status.tsx                 |  65 ++++++++-
 .../detection_engine/rules/all/columns.tsx    | 124 +++++++++++++++++-
 .../detection_engine/rules/all/index.tsx      |  90 ++++++-------
 .../components/all_rules_tables/index.tsx     | 121 +++++++++++++++++
 .../detection_engine/rules/translations.ts    |  50 +++++++
 .../routes/__mocks__/request_responses.ts     |   8 ++
 .../rules/saved_object_mappings.ts            |  19 ++-
 .../lib/detection_engine/rules/types.ts       |   4 +
 .../signals/bulk_create_ml_signals.ts         |   6 +-
 .../get_current_status_saved_object.ts        |   4 +
 .../signals/search_after_bulk_create.test.ts  |  32 ++---
 .../signals/search_after_bulk_create.ts       |  64 ++++++---
 .../signals/signal_rule_alert_type.ts         |  45 +++++--
 .../signals/single_bulk_create.test.ts        |  20 +--
 .../signals/single_bulk_create.ts             |  16 ++-
 .../signals/single_search_after.test.ts       |   4 +-
 .../signals/single_search_after.ts            |  11 +-
 .../lib/detection_engine/signals/utils.ts     |   2 +
 .../signals/write_current_status_succeeded.ts |  15 +++
 .../write_gap_error_to_saved_object.ts        |   1 +
 ...e_signal_rule_exception_to_saved_object.ts |  15 +++
 25 files changed, 759 insertions(+), 121 deletions(-)
 create mode 100644 x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/all_rules_tables/index.tsx

diff --git a/x-pack/legacy/plugins/siem/public/containers/detection_engine/rules/__mocks__/api.ts b/x-pack/legacy/plugins/siem/public/containers/detection_engine/rules/__mocks__/api.ts
index 9f37f3fecd508..6c9964af25430 100644
--- a/x-pack/legacy/plugins/siem/public/containers/detection_engine/rules/__mocks__/api.ts
+++ b/x-pack/legacy/plugins/siem/public/containers/detection_engine/rules/__mocks__/api.ts
@@ -52,6 +52,36 @@ export const getRuleStatusById = async ({
         last_success_at: 'mm/dd/yyyyTHH:MM:sssz',
         last_failure_message: null,
         last_success_message: 'it is a success',
+        gap: null,
+        bulk_create_time_durations: ['2235.01'],
+        search_after_time_durations: ['616.97'],
+        last_look_back_date: '2020-03-19T00:32:07.996Z',
+      },
+      failures: [],
+    },
+  });
+
+export const getRulesStatusByIds = async ({
+  ids,
+  signal,
+}: {
+  ids: string[];
+  signal: AbortSignal;
+}): Promise<RuleStatusResponse> =>
+  Promise.resolve({
+    '12345678987654321': {
+      current_status: {
+        alert_id: 'alertId',
+        status_date: 'mm/dd/yyyyTHH:MM:sssz',
+        status: 'succeeded',
+        last_failure_at: null,
+        last_success_at: 'mm/dd/yyyyTHH:MM:sssz',
+        last_failure_message: null,
+        last_success_message: 'it is a success',
+        gap: null,
+        bulk_create_time_durations: ['2235.01'],
+        search_after_time_durations: ['616.97'],
+        last_look_back_date: '2020-03-19T00:32:07.996Z',
       },
       failures: [],
     },
diff --git a/x-pack/legacy/plugins/siem/public/containers/detection_engine/rules/api.ts b/x-pack/legacy/plugins/siem/public/containers/detection_engine/rules/api.ts
index 126de9762a696..4b0e0030be53d 100644
--- a/x-pack/legacy/plugins/siem/public/containers/detection_engine/rules/api.ts
+++ b/x-pack/legacy/plugins/siem/public/containers/detection_engine/rules/api.ts
@@ -271,6 +271,32 @@ export const getRuleStatusById = async ({
     signal,
   });
 
+/**
+ * Return rule statuses given list of alert ids
+ *
+ * @param ids array of string of Rule ID's (not rule_id)
+ * @param signal AbortSignal for cancelling request
+ *
+ * @throws An error if response is not OK
+ */
+export const getRulesStatusByIds = async ({
+  ids,
+  signal,
+}: {
+  ids: string[];
+  signal: AbortSignal;
+}): Promise<RuleStatusResponse> => {
+  const res = await KibanaServices.get().http.fetch<RuleStatusResponse>(
+    DETECTION_ENGINE_RULES_STATUS_URL,
+    {
+      method: 'GET',
+      query: { ids: JSON.stringify(ids) },
+      signal,
+    }
+  );
+  return res;
+};
+
 /**
  * Fetch all unique Tags used by Rules
  *
diff --git a/x-pack/legacy/plugins/siem/public/containers/detection_engine/rules/types.ts b/x-pack/legacy/plugins/siem/public/containers/detection_engine/rules/types.ts
index 3ec3e6d2b3036..53a1c0770028c 100644
--- a/x-pack/legacy/plugins/siem/public/containers/detection_engine/rules/types.ts
+++ b/x-pack/legacy/plugins/siem/public/containers/detection_engine/rules/types.ts
@@ -235,6 +235,10 @@ export interface RuleInfoStatus {
   last_success_at: string | null;
   last_failure_message: string | null;
   last_success_message: string | null;
+  last_look_back_date: string | null | undefined;
+  gap: string | null | undefined;
+  bulk_create_time_durations: string[] | null | undefined;
+  search_after_time_durations: string[] | null | undefined;
 }
 
 export type RuleStatusResponse = Record<string, RuleStatus>;
diff --git a/x-pack/legacy/plugins/siem/public/containers/detection_engine/rules/use_rule_status.test.tsx b/x-pack/legacy/plugins/siem/public/containers/detection_engine/rules/use_rule_status.test.tsx
index 25011adcfe98b..834fc1b4196da 100644
--- a/x-pack/legacy/plugins/siem/public/containers/detection_engine/rules/use_rule_status.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/containers/detection_engine/rules/use_rule_status.test.tsx
@@ -4,13 +4,63 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { renderHook, act } from '@testing-library/react-hooks';
-import { useRuleStatus, ReturnRuleStatus } from './use_rule_status';
+import { renderHook, act, cleanup } from '@testing-library/react-hooks';
+import {
+  useRuleStatus,
+  ReturnRuleStatus,
+  useRulesStatuses,
+  ReturnRulesStatuses,
+} from './use_rule_status';
 import * as api from './api';
+import { RuleType } from '../rules/types';
 
 jest.mock('./api');
 
+const testRule = {
+  created_at: 'mm/dd/yyyyTHH:MM:sssz',
+  created_by: 'mockUser',
+  description: 'some desc',
+  enabled: true,
+  false_positives: [],
+  filters: [],
+  from: 'now-360s',
+  id: '12345678987654321',
+  immutable: false,
+  index: [
+    'apm-*-transaction*',
+    'auditbeat-*',
+    'endgame-*',
+    'filebeat-*',
+    'packetbeat-*',
+    'winlogbeat-*',
+  ],
+  interval: '5m',
+  language: 'kuery',
+  name: 'Test rule',
+  max_signals: 100,
+  query: "user.email: 'root@elastic.co'",
+  references: [],
+  risk_score: 75,
+  rule_id: 'bbd3106e-b4b5-4d7c-a1a2-47531d6a2baf',
+  severity: 'high',
+  tags: ['APM'],
+  threat: [],
+  to: 'now',
+  type: 'query' as RuleType,
+  updated_at: 'mm/dd/yyyyTHH:MM:sssz',
+  updated_by: 'mockUser',
+};
+
 describe('useRuleStatus', () => {
+  beforeEach(() => {
+    jest.resetAllMocks();
+    jest.restoreAllMocks();
+    jest.clearAllMocks();
+  });
+  afterEach(async () => {
+    cleanup();
+  });
+
   test('init', async () => {
     await act(async () => {
       const { result, waitForNextUpdate } = renderHook<string, ReturnRuleStatus>(() =>
@@ -39,6 +89,10 @@ describe('useRuleStatus', () => {
             last_success_message: 'it is a success',
             status: 'succeeded',
             status_date: 'mm/dd/yyyyTHH:MM:sssz',
+            gap: null,
+            bulk_create_time_durations: ['2235.01'],
+            search_after_time_durations: ['616.97'],
+            last_look_back_date: '2020-03-19T00:32:07.996Z',
           },
           failures: [],
         },
@@ -62,4 +116,50 @@ describe('useRuleStatus', () => {
       expect(spyOngetRuleStatusById).toHaveBeenCalledTimes(2);
     });
   });
+
+  test('init rules statuses', async () => {
+    const payload = [testRule];
+    await act(async () => {
+      const { result, waitForNextUpdate } = renderHook<string, ReturnRulesStatuses>(() =>
+        useRulesStatuses(payload)
+      );
+      await waitForNextUpdate();
+      expect(result.current).toEqual({ loading: false, rulesStatuses: [] });
+    });
+  });
+
+  test('fetch rules statuses', async () => {
+    const payload = [testRule];
+    await act(async () => {
+      const { result, waitForNextUpdate } = renderHook<string, ReturnRulesStatuses>(() =>
+        useRulesStatuses(payload)
+      );
+      await waitForNextUpdate();
+      await waitForNextUpdate();
+      expect(result.current).toEqual({
+        loading: false,
+        rulesStatuses: [
+          {
+            current_status: {
+              alert_id: 'alertId',
+              bulk_create_time_durations: ['2235.01'],
+              gap: null,
+              last_failure_at: null,
+              last_failure_message: null,
+              last_look_back_date: '2020-03-19T00:32:07.996Z',
+              last_success_at: 'mm/dd/yyyyTHH:MM:sssz',
+              last_success_message: 'it is a success',
+              search_after_time_durations: ['616.97'],
+              status: 'succeeded',
+              status_date: 'mm/dd/yyyyTHH:MM:sssz',
+            },
+            failures: [],
+            id: '12345678987654321',
+            activate: true,
+            name: 'Test rule',
+          },
+        ],
+      });
+    });
+  });
 });
diff --git a/x-pack/legacy/plugins/siem/public/containers/detection_engine/rules/use_rule_status.tsx b/x-pack/legacy/plugins/siem/public/containers/detection_engine/rules/use_rule_status.tsx
index 8d06e037e0979..0d37cce1fd85c 100644
--- a/x-pack/legacy/plugins/siem/public/containers/detection_engine/rules/use_rule_status.tsx
+++ b/x-pack/legacy/plugins/siem/public/containers/detection_engine/rules/use_rule_status.tsx
@@ -7,12 +7,17 @@
 import { useEffect, useRef, useState } from 'react';
 
 import { errorToToaster, useStateToaster } from '../../../components/toasters';
-import { getRuleStatusById } from './api';
+import { RuleStatusRowItemType } from '../../../pages/detection_engine/rules/all/columns';
+import { getRuleStatusById, getRulesStatusByIds } from './api';
 import * as i18n from './translations';
-import { RuleStatus } from './types';
+import { RuleStatus, Rules } from './types';
 
 type Func = (ruleId: string) => void;
 export type ReturnRuleStatus = [boolean, RuleStatus | null, Func | null];
+export interface ReturnRulesStatuses {
+  loading: boolean;
+  rulesStatuses: RuleStatusRowItemType[] | null;
+}
 
 /**
  * Hook for using to get a Rule from the Detection Engine API
@@ -33,7 +38,6 @@ export const useRuleStatus = (id: string | undefined | null): ReturnRuleStatus =
     const fetchData = async (idToFetch: string) => {
       try {
         setLoading(true);
-
         const ruleStatusResponse = await getRuleStatusById({
           id: idToFetch,
           signal: abortCtrl.signal,
@@ -64,3 +68,58 @@ export const useRuleStatus = (id: string | undefined | null): ReturnRuleStatus =
 
   return [loading, ruleStatus, fetchRuleStatus.current];
 };
+
+/**
+ * Hook for using to get all the statuses for all given rule ids
+ *
+ * @param ids desired Rule ID's (not rule_id)
+ *
+ */
+export const useRulesStatuses = (rules: Rules): ReturnRulesStatuses => {
+  const [rulesStatuses, setRuleStatuses] = useState<RuleStatusRowItemType[]>([]);
+  const [loading, setLoading] = useState(false);
+  const [, dispatchToaster] = useStateToaster();
+
+  useEffect(() => {
+    let isSubscribed = true;
+    const abortCtrl = new AbortController();
+
+    const fetchData = async (ids: string[]) => {
+      try {
+        setLoading(true);
+        const ruleStatusesResponse = await getRulesStatusByIds({
+          ids,
+          signal: abortCtrl.signal,
+        });
+
+        if (isSubscribed) {
+          setRuleStatuses(
+            rules.map(rule => ({
+              id: rule.id,
+              activate: rule.enabled,
+              name: rule.name,
+              ...ruleStatusesResponse[rule.id],
+            }))
+          );
+        }
+      } catch (error) {
+        if (isSubscribed) {
+          setRuleStatuses([]);
+          errorToToaster({ title: i18n.RULE_FETCH_FAILURE, error, dispatchToaster });
+        }
+      }
+      if (isSubscribed) {
+        setLoading(false);
+      }
+    };
+    if (rules != null && rules.length > 0) {
+      fetchData(rules.map(r => r.id));
+    }
+    return () => {
+      isSubscribed = false;
+      abortCtrl.abort();
+    };
+  }, [rules]);
+
+  return { loading, rulesStatuses };
+};
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/all/columns.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/all/columns.tsx
index be64499fd47fa..7bfccc554b7e6 100644
--- a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/all/columns.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/all/columns.tsx
@@ -14,10 +14,11 @@ import {
   EuiText,
   EuiHealth,
 } from '@elastic/eui';
+import { FormattedRelative } from '@kbn/i18n/react';
 import * as H from 'history';
 import React, { Dispatch } from 'react';
 
-import { Rule } from '../../../../containers/detection_engine/rules';
+import { Rule, RuleStatus } from '../../../../containers/detection_engine/rules';
 import { getEmptyTagValue } from '../../../../components/empty_value';
 import { FormattedDate } from '../../../../components/formatted_date';
 import { getRuleDetailsUrl } from '../../../../components/link_to/redirect_to_detection_engine';
@@ -34,6 +35,7 @@ import {
   exportRulesAction,
 } from './actions';
 import { Action } from './reducer';
+import { LocalizedDateTooltip } from '../../../../components/localized_date_tooltip';
 
 export const getActions = (
   dispatch: React.Dispatch<Action>,
@@ -75,7 +77,12 @@ export const getActions = (
   },
 ];
 
+export type RuleStatusRowItemType = RuleStatus & {
+  name: string;
+  id: string;
+};
 type RulesColumns = EuiBasicTableColumn<Rule> | EuiTableActionsColumnType<Rule>;
+type RulesStatusesColumns = EuiBasicTableColumn<RuleStatusRowItemType>;
 
 interface GetColumns {
   dispatch: React.Dispatch<Action>;
@@ -132,7 +139,9 @@ export const getColumns = ({
         return value == null ? (
           getEmptyTagValue()
         ) : (
-          <FormattedDate value={value} fieldName={i18n.COLUMN_LAST_COMPLETE_RUN} />
+          <LocalizedDateTooltip fieldName={i18n.COLUMN_LAST_COMPLETE_RUN} date={new Date(value)}>
+            <FormattedRelative value={value} />
+          </LocalizedDateTooltip>
         );
       },
       sortable: true,
@@ -196,3 +205,114 @@ export const getColumns = ({
 
   return hasNoPermissions ? cols : [...cols, ...actions];
 };
+
+export const getMonitoringColumns = (): RulesStatusesColumns[] => {
+  const cols: RulesStatusesColumns[] = [
+    {
+      field: 'name',
+      name: i18n.COLUMN_RULE,
+      render: (value: RuleStatus['current_status']['status'], item: RuleStatusRowItemType) => {
+        return (
+          <EuiLink data-test-subj="ruleName" href={getRuleDetailsUrl(item.id)}>
+            {value}
+          </EuiLink>
+        );
+      },
+      truncateText: true,
+      width: '24%',
+    },
+    {
+      field: 'current_status.bulk_create_time_durations',
+      name: i18n.COLUMN_INDEXING_TIMES,
+      render: (value: RuleStatus['current_status']['bulk_create_time_durations']) => (
+        <EuiText data-test-subj="bulk_create_time_durations" size="s">
+          {value != null && value.length > 0
+            ? Math.max(...value?.map(item => Number.parseFloat(item)))
+            : null}
+        </EuiText>
+      ),
+      truncateText: true,
+      width: '14%',
+    },
+    {
+      field: 'current_status.search_after_time_durations',
+      name: i18n.COLUMN_QUERY_TIMES,
+      render: (value: RuleStatus['current_status']['search_after_time_durations']) => (
+        <EuiText data-test-subj="search_after_time_durations" size="s">
+          {value != null && value.length > 0
+            ? Math.max(...value?.map(item => Number.parseFloat(item)))
+            : null}
+        </EuiText>
+      ),
+      truncateText: true,
+      width: '14%',
+    },
+    {
+      field: 'current_status.gap',
+      name: i18n.COLUMN_GAP,
+      render: (value: RuleStatus['current_status']['gap']) => (
+        <EuiText data-test-subj="gap" size="s">
+          {value}
+        </EuiText>
+      ),
+      truncateText: true,
+      width: '14%',
+    },
+    {
+      field: 'current_status.last_look_back_date',
+      name: i18n.COLUMN_LAST_LOOKBACK_DATE,
+      render: (value: RuleStatus['current_status']['last_look_back_date']) => {
+        return value == null ? (
+          getEmptyTagValue()
+        ) : (
+          <FormattedDate value={value} fieldName={'last look back date'} />
+        );
+      },
+      truncateText: true,
+      width: '16%',
+    },
+    {
+      field: 'current_status.status_date',
+      name: i18n.COLUMN_LAST_COMPLETE_RUN,
+      render: (value: RuleStatus['current_status']['status_date']) => {
+        return value == null ? (
+          getEmptyTagValue()
+        ) : (
+          <LocalizedDateTooltip fieldName={i18n.COLUMN_LAST_COMPLETE_RUN} date={new Date(value)}>
+            <FormattedRelative value={value} />
+          </LocalizedDateTooltip>
+        );
+      },
+      sortable: true,
+      truncateText: true,
+      width: '20%',
+    },
+    {
+      field: 'current_status.status',
+      name: i18n.COLUMN_LAST_RESPONSE,
+      render: (value: RuleStatus['current_status']['status']) => {
+        return (
+          <>
+            <EuiHealth color={getStatusColor(value ?? null)}>
+              {value ?? getEmptyTagValue()}
+            </EuiHealth>
+          </>
+        );
+      },
+      width: '16%',
+      truncateText: true,
+    },
+    {
+      field: 'activate',
+      name: i18n.COLUMN_ACTIVATE,
+      render: (value: Rule['enabled']) => (
+        <EuiText data-test-subj="search_after_time_durations" size="s">
+          {value ? i18n.ACTIVE : i18n.INACTIVE}
+        </EuiText>
+      ),
+      width: '95px',
+    },
+  ];
+
+  return cols;
+};
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/all/index.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/all/index.tsx
index 621c70e391319..1a0de46729312 100644
--- a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/all/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/all/index.tsx
@@ -4,20 +4,14 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import {
-  EuiBasicTable,
-  EuiContextMenuPanel,
-  EuiEmptyPrompt,
-  EuiLoadingContent,
-  EuiSpacer,
-} from '@elastic/eui';
+import { EuiBasicTable, EuiContextMenuPanel, EuiLoadingContent, EuiSpacer } from '@elastic/eui';
 import React, { useCallback, useEffect, useMemo, useReducer, useRef, useState } from 'react';
 import { useHistory } from 'react-router-dom';
-import styled from 'styled-components';
 import uuid from 'uuid';
 
 import {
   useRules,
+  useRulesStatuses,
   CreatePreBuiltRules,
   FilterOptions,
   Rule,
@@ -37,20 +31,16 @@ import { Loader } from '../../../../components/loader';
 import { Panel } from '../../../../components/panel';
 import { PrePackagedRulesPrompt } from '../components/pre_packaged_rules/load_empty_prompt';
 import { GenericDownloader } from '../../../../components/generic_downloader';
+import { AllRulesTables } from '../components/all_rules_tables';
 import { getPrePackagedRuleStatus } from '../helpers';
 import * as i18n from '../translations';
 import { EuiBasicTableOnChange } from '../types';
 import { getBatchItems } from './batch_actions';
-import { getColumns } from './columns';
+import { getColumns, getMonitoringColumns } from './columns';
 import { showRulesTable } from './helpers';
 import { allRulesReducer, State } from './reducer';
 import { RulesTableFilters } from './rules_table_filters/rules_table_filters';
 
-// EuiBasicTable give me a hardtime with adding the ref attributes so I went the easy way
-// after few hours of fight with typescript !!!! I lost :(
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-const MyEuiBasicTable = styled(EuiBasicTable as any)`` as any;
-
 const initialState: State = {
   exportRuleIds: [],
   filterOptions: {
@@ -117,6 +107,7 @@ export const AllRules = React.memo<AllRulesProps>(
       },
       dispatch,
     ] = useReducer(allRulesReducer(tableRef), initialState);
+    const { loading: isLoadingRulesStatuses, rulesStatuses } = useRulesStatuses(rules);
     const history = useHistory();
     const [, dispatchToaster] = useStateToaster();
 
@@ -135,6 +126,13 @@ export const AllRules = React.memo<AllRulesProps>(
       dispatchRulesInReducer: setRules,
     });
 
+    const sorting = useMemo(
+      () => ({
+        sort: { field: 'enabled', direction: filterOptions.sortOrder },
+      }),
+      [filterOptions.sortOrder]
+    );
+
     const prePackagedRuleStatus = getPrePackagedRuleStatus(
       rulesInstalled,
       rulesNotInstalled,
@@ -158,6 +156,16 @@ export const AllRules = React.memo<AllRulesProps>(
       [dispatch, dispatchToaster, loadingRuleIds, reFetchRulesData, rules, selectedRuleIds]
     );
 
+    const paginationMemo = useMemo(
+      () => ({
+        pageIndex: pagination.page - 1,
+        pageSize: pagination.perPage,
+        totalItemCount: pagination.total,
+        pageSizeOptions: [5, 10, 20, 50, 100, 200, 300],
+      }),
+      [pagination]
+    );
+
     const tableOnChangeCallback = useCallback(
       ({ page, sort }: EuiBasicTableOnChange) => {
         dispatch({
@@ -172,7 +180,7 @@ export const AllRules = React.memo<AllRulesProps>(
       [dispatch]
     );
 
-    const columns = useMemo(() => {
+    const rulesColumns = useMemo(() => {
       return getColumns({
         dispatch,
         dispatchToaster,
@@ -187,6 +195,8 @@ export const AllRules = React.memo<AllRulesProps>(
       });
     }, [dispatch, dispatchToaster, history, loadingRuleIds, loadingRulesAction, reFetchRulesData]);
 
+    const monitoringColumns = useMemo(() => getMonitoringColumns(), []);
+
     useEffect(() => {
       if (reFetchRulesData != null) {
         setRefreshRulesData(reFetchRulesData);
@@ -194,10 +204,10 @@ export const AllRules = React.memo<AllRulesProps>(
     }, [reFetchRulesData, setRefreshRulesData]);
 
     useEffect(() => {
-      if (initLoading && !loading && !isLoadingRules) {
+      if (initLoading && !loading && !isLoadingRules && !isLoadingRulesStatuses) {
         setInitLoading(false);
       }
-    }, [initLoading, loading, isLoadingRules]);
+    }, [initLoading, loading, isLoadingRules, isLoadingRulesStatuses]);
 
     const handleCreatePrePackagedRules = useCallback(async () => {
       if (createPrePackagedRules != null && reFetchRulesData != null) {
@@ -225,12 +235,6 @@ export const AllRules = React.memo<AllRulesProps>(
       });
     }, []);
 
-    const emptyPrompt = useMemo(() => {
-      return (
-        <EuiEmptyPrompt title={<h3>{i18n.NO_RULES}</h3>} titleSize="xs" body={i18n.NO_RULES_BODY} />
-      );
-    }, []);
-
     const isLoadingAnActionOnRule = useMemo(() => {
       if (
         loadingRuleIds.length > 0 &&
@@ -264,7 +268,7 @@ export const AllRules = React.memo<AllRulesProps>(
         />
         <EuiSpacer />
 
-        <Panel loading={loading || isLoadingRules}>
+        <Panel loading={loading || isLoadingRules || isLoadingRulesStatuses}>
           <>
             <HeaderSection split title={i18n.ALL_RULES}>
               <RulesTableFilters
@@ -274,12 +278,14 @@ export const AllRules = React.memo<AllRulesProps>(
               />
             </HeaderSection>
 
-            {(loading || isLoadingRules || isLoadingAnActionOnRule) && !initLoading && (
-              <Loader data-test-subj="loadingPanelAllRulesTable" overlay size="xl" />
-            )}
+            {(loading || isLoadingRules || isLoadingAnActionOnRule || isLoadingRulesStatuses) &&
+              !initLoading && (
+                <Loader data-test-subj="loadingPanelAllRulesTable" overlay size="xl" />
+              )}
             {rulesCustomInstalled != null &&
               rulesCustomInstalled === 0 &&
-              prePackagedRuleStatus === 'ruleNotInstalled' && (
+              prePackagedRuleStatus === 'ruleNotInstalled' &&
+              !initLoading && (
                 <PrePackagedRulesPrompt
                   createPrePackagedRules={handleCreatePrePackagedRules}
                   loading={loadingCreatePrePackagedRules}
@@ -318,23 +324,17 @@ export const AllRules = React.memo<AllRulesProps>(
                     </UtilityBarGroup>
                   </UtilityBarSection>
                 </UtilityBar>
-                <MyEuiBasicTable
-                  data-test-subj="rules-table"
-                  columns={columns}
-                  isSelectable={!hasNoPermissions ?? false}
-                  itemId="id"
-                  items={rules ?? []}
-                  noItemsMessage={emptyPrompt}
-                  onChange={tableOnChangeCallback}
-                  pagination={{
-                    pageIndex: pagination.page - 1,
-                    pageSize: pagination.perPage,
-                    totalItemCount: pagination.total,
-                    pageSizeOptions: [5, 10, 20, 50, 100, 200, 300],
-                  }}
-                  ref={tableRef}
-                  sorting={{ sort: { field: 'enabled', direction: filterOptions.sortOrder } }}
-                  selection={hasNoPermissions ? undefined : euiBasicTableSelectionProps}
+                <AllRulesTables
+                  euiBasicTableSelectionProps={euiBasicTableSelectionProps}
+                  hasNoPermissions={hasNoPermissions}
+                  monitoringColumns={monitoringColumns}
+                  paginationMemo={paginationMemo}
+                  rules={rules}
+                  rulesColumns={rulesColumns}
+                  rulesStatuses={rulesStatuses}
+                  sorting={sorting}
+                  tableOnChangeCallback={tableOnChangeCallback}
+                  tableRef={tableRef}
                 />
               </>
             )}
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/all_rules_tables/index.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/all_rules_tables/index.tsx
new file mode 100644
index 0000000000000..92ccbc864ab5a
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/all_rules_tables/index.tsx
@@ -0,0 +1,121 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { EuiBasicTable, EuiTab, EuiTabs, EuiEmptyPrompt } from '@elastic/eui';
+import React, { useMemo, memo, useState } from 'react';
+import styled from 'styled-components';
+
+import * as i18n from '../../translations';
+import { RuleStatusRowItemType } from '../../../../../pages/detection_engine/rules/all/columns';
+import { Rules } from '../../../../../containers/detection_engine/rules';
+
+// EuiBasicTable give me a hardtime with adding the ref attributes so I went the easy way
+// after few hours of fight with typescript !!!! I lost :(
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+const MyEuiBasicTable = styled(EuiBasicTable as any)`` as any;
+
+interface AllRulesTablesProps {
+  euiBasicTableSelectionProps: unknown;
+  hasNoPermissions: boolean;
+  monitoringColumns: unknown;
+  paginationMemo: unknown;
+  rules: Rules;
+  rulesColumns: unknown;
+  rulesStatuses: RuleStatusRowItemType[] | null;
+  sorting: unknown;
+  tableOnChangeCallback: unknown;
+  tableRef?: unknown;
+}
+
+enum AllRulesTabs {
+  rules = 'rules',
+  monitoring = 'monitoring',
+}
+
+const allRulesTabs = [
+  {
+    id: AllRulesTabs.rules,
+    name: i18n.RULES_TAB,
+    disabled: false,
+  },
+  {
+    id: AllRulesTabs.monitoring,
+    name: i18n.MONITORING_TAB,
+    disabled: false,
+  },
+];
+
+const AllRulesTablesComponent: React.FC<AllRulesTablesProps> = ({
+  euiBasicTableSelectionProps,
+  hasNoPermissions,
+  monitoringColumns,
+  paginationMemo,
+  rules,
+  rulesColumns,
+  rulesStatuses,
+  sorting,
+  tableOnChangeCallback,
+  tableRef,
+}) => {
+  const [allRulesTab, setAllRulesTab] = useState(AllRulesTabs.rules);
+  const emptyPrompt = useMemo(() => {
+    return (
+      <EuiEmptyPrompt title={<h3>{i18n.NO_RULES}</h3>} titleSize="xs" body={i18n.NO_RULES_BODY} />
+    );
+  }, []);
+  const tabs = useMemo(
+    () => (
+      <EuiTabs>
+        {allRulesTabs.map(tab => (
+          <EuiTab
+            onClick={() => setAllRulesTab(tab.id)}
+            isSelected={tab.id === allRulesTab}
+            disabled={tab.disabled}
+            key={tab.id}
+          >
+            {tab.name}
+          </EuiTab>
+        ))}
+      </EuiTabs>
+    ),
+    [allRulesTabs, allRulesTab, setAllRulesTab]
+  );
+  return (
+    <>
+      {tabs}
+      {allRulesTab === AllRulesTabs.rules && (
+        <MyEuiBasicTable
+          data-test-subj="rules-table"
+          columns={rulesColumns}
+          isSelectable={!hasNoPermissions ?? false}
+          itemId="id"
+          items={rules ?? []}
+          noItemsMessage={emptyPrompt}
+          onChange={tableOnChangeCallback}
+          pagination={paginationMemo}
+          ref={tableRef}
+          {...sorting}
+          selection={hasNoPermissions ? undefined : euiBasicTableSelectionProps}
+        />
+      )}
+      {allRulesTab === AllRulesTabs.monitoring && (
+        <MyEuiBasicTable
+          data-test-subj="monitoring-table"
+          columns={monitoringColumns}
+          isSelectable={!hasNoPermissions ?? false}
+          itemId="id"
+          items={rulesStatuses}
+          noItemsMessage={emptyPrompt}
+          onChange={tableOnChangeCallback}
+          pagination={paginationMemo}
+          {...sorting}
+        />
+      )}
+    </>
+  );
+};
+
+export const AllRulesTables = memo(AllRulesTablesComponent);
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/translations.ts b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/translations.ts
index 1c547e215dfdd..882263934477d 100644
--- a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/translations.ts
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/translations.ts
@@ -44,6 +44,20 @@ export const BATCH_ACTIONS = i18n.translate(
   }
 );
 
+export const ACTIVE = i18n.translate(
+  'xpack.siem.detectionEngine.rules.allRules.activeRuleDescription',
+  {
+    defaultMessage: 'active',
+  }
+);
+
+export const INACTIVE = i18n.translate(
+  'xpack.siem.detectionEngine.rules.allRules.inactiveRuleDescription',
+  {
+    defaultMessage: 'inactive',
+  }
+);
+
 export const BATCH_ACTION_ACTIVATE_SELECTED = i18n.translate(
   'xpack.siem.detectionEngine.rules.allRules.batchActions.activateSelectedTitle',
   {
@@ -255,6 +269,42 @@ export const COLUMN_ACTIVATE = i18n.translate(
   }
 );
 
+export const COLUMN_INDEXING_TIMES = i18n.translate(
+  'xpack.siem.detectionEngine.rules.allRules.columns.indexingTimes',
+  {
+    defaultMessage: 'Indexing Time (ms)',
+  }
+);
+
+export const COLUMN_QUERY_TIMES = i18n.translate(
+  'xpack.siem.detectionEngine.rules.allRules.columns.queryTimes',
+  {
+    defaultMessage: 'Query Time (ms)',
+  }
+);
+
+export const COLUMN_GAP = i18n.translate('xpack.siem.detectionEngine.rules.allRules.columns.gap', {
+  defaultMessage: 'Gap (if any)',
+});
+
+export const COLUMN_LAST_LOOKBACK_DATE = i18n.translate(
+  'xpack.siem.detectionEngine.rules.allRules.columns.lastLookBackDate',
+  {
+    defaultMessage: 'Last Look-Back Date',
+  }
+);
+
+export const RULES_TAB = i18n.translate('xpack.siem.detectionEngine.rules.allRules.tabs.rules', {
+  defaultMessage: 'Rules',
+});
+
+export const MONITORING_TAB = i18n.translate(
+  'xpack.siem.detectionEngine.rules.allRules.tabs.monitoring',
+  {
+    defaultMessage: 'Monitoring',
+  }
+);
+
 export const CUSTOM_RULES = i18n.translate(
   'xpack.siem.detectionEngine.rules.allRules.filters.customRulesTitle',
   {
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/__mocks__/request_responses.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/__mocks__/request_responses.ts
index 0ecc1aa28e7e0..24f50c5ce87a0 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/__mocks__/request_responses.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/__mocks__/request_responses.ts
@@ -592,6 +592,10 @@ export const getFindResultStatus = (): SavedObjectsFindResponse<IRuleSavedAttrib
         lastSuccessAt: '2020-02-18T15:26:49.783Z',
         lastFailureMessage: null,
         lastSuccessMessage: 'succeeded',
+        lastLookBackDate: new Date('2020-02-18T15:14:58.806Z').toISOString(),
+        gap: '500.32',
+        searchAfterTimeDurations: ['200.00'],
+        bulkCreateTimeDurations: ['800.43'],
       },
       references: [],
       updated_at: '2020-02-18T15:26:51.333Z',
@@ -609,6 +613,10 @@ export const getFindResultStatus = (): SavedObjectsFindResponse<IRuleSavedAttrib
         lastFailureMessage:
           'Signal rule name: "Query with a rule id Number 1", id: "1ea5a820-4da1-4e82-92a1-2b43a7bece08", rule_id: "query-rule-id-1" has a time gap of 5 days (412682928ms), and could be missing signals within that time. Consider increasing your look behind time or adding more Kibana instances.',
         lastSuccessMessage: 'succeeded',
+        lastLookBackDate: new Date('2020-02-18T15:14:58.806Z').toISOString(),
+        gap: '500.32',
+        searchAfterTimeDurations: ['200.00'],
+        bulkCreateTimeDurations: ['800.43'],
       },
       references: [],
       updated_at: '2020-02-18T15:15:58.860Z',
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/saved_object_mappings.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/saved_object_mappings.ts
index fd3d35e9f6785..1d91def5fa6cc 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/saved_object_mappings.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/saved_object_mappings.ts
@@ -4,14 +4,9 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { ElasticsearchMappingOf } from '../../../utils/typed_elasticsearch_mappings';
-import { IRuleStatusAttributes } from './types';
-
 export const ruleStatusSavedObjectType = 'siem-detection-engine-rule-status';
 
-export const ruleStatusSavedObjectMappings: {
-  [ruleStatusSavedObjectType]: ElasticsearchMappingOf<IRuleStatusAttributes>;
-} = {
+export const ruleStatusSavedObjectMappings = {
   [ruleStatusSavedObjectType]: {
     properties: {
       alertId: {
@@ -35,6 +30,18 @@ export const ruleStatusSavedObjectMappings: {
       lastSuccessMessage: {
         type: 'text',
       },
+      lastLookBackDate: {
+        type: 'date',
+      },
+      gap: {
+        type: 'text',
+      },
+      bulkCreateTimeDurations: {
+        type: 'float',
+      },
+      searchAfterTimeDurations: {
+        type: 'float',
+      },
     },
   },
 };
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/types.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/types.ts
index 1efa46c6b8b57..ada11174c5340 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/types.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/types.ts
@@ -60,6 +60,10 @@ export interface IRuleStatusAttributes extends Record<string, any> {
   lastSuccessAt: string | null | undefined;
   lastSuccessMessage: string | null | undefined;
   status: RuleStatusString | null | undefined;
+  lastLookBackDate: string | null | undefined;
+  gap: string | null | undefined;
+  bulkCreateTimeDurations: string[] | null | undefined;
+  searchAfterTimeDurations: string[] | null | undefined;
 }
 
 export interface RuleStatusResponse {
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/signals/bulk_create_ml_signals.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/signals/bulk_create_ml_signals.ts
index 66e9f42061658..c1b61ef24462d 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/signals/bulk_create_ml_signals.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/signals/bulk_create_ml_signals.ts
@@ -11,7 +11,7 @@ import { Logger } from '../../../../../../../../src/core/server';
 import { AlertServices } from '../../../../../../../plugins/alerting/server';
 import { RuleAlertAction } from '../../../../common/detection_engine/types';
 import { RuleTypeParams } from '../types';
-import { singleBulkCreate } from './single_bulk_create';
+import { singleBulkCreate, SingleBulkCreateResponse } from './single_bulk_create';
 import { AnomalyResults, Anomaly } from '../../machine_learning';
 
 interface BulkCreateMlSignalsParams {
@@ -75,7 +75,9 @@ const transformAnomalyResultsToEcs = (results: AnomalyResults): SearchResponse<E
   };
 };
 
-export const bulkCreateMlSignals = async (params: BulkCreateMlSignalsParams) => {
+export const bulkCreateMlSignals = async (
+  params: BulkCreateMlSignalsParams
+): Promise<SingleBulkCreateResponse> => {
   const anomalyResults = params.someResult;
   const ecsResults = transformAnomalyResultsToEcs(anomalyResults);
 
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/signals/get_current_status_saved_object.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/signals/get_current_status_saved_object.ts
index e5057b6b68997..1fee8bcd6c2f0 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/signals/get_current_status_saved_object.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/signals/get_current_status_saved_object.ts
@@ -36,6 +36,10 @@ export const getCurrentStatusSavedObject = async ({
       lastSuccessAt: null,
       lastFailureMessage: null,
       lastSuccessMessage: null,
+      gap: null,
+      bulkCreateTimeDurations: [],
+      searchAfterTimeDurations: [],
+      lastLookBackDate: null,
     });
     return currentStatusSavedObject;
   } else {
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/signals/search_after_bulk_create.test.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/signals/search_after_bulk_create.test.ts
index 315a5dd88d94e..b12c21b7a5b56 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/signals/search_after_bulk_create.test.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/signals/search_after_bulk_create.test.ts
@@ -34,7 +34,7 @@ describe('searchAfterAndBulkCreate', () => {
 
   test('if successful with empty search results', async () => {
     const sampleParams = sampleRuleAlertParams();
-    const result = await searchAfterAndBulkCreate({
+    const { success } = await searchAfterAndBulkCreate({
       someResult: sampleEmptyDocSearchResults(),
       ruleParams: sampleParams,
       services: mockService,
@@ -56,7 +56,7 @@ describe('searchAfterAndBulkCreate', () => {
       throttle: null,
     });
     expect(mockService.callCluster).toHaveBeenCalledTimes(0);
-    expect(result).toEqual(true);
+    expect(success).toEqual(true);
   });
 
   test('if successful iteration of while loop with maxDocs', async () => {
@@ -92,7 +92,7 @@ describe('searchAfterAndBulkCreate', () => {
           },
         ],
       });
-    const result = await searchAfterAndBulkCreate({
+    const { success } = await searchAfterAndBulkCreate({
       someResult: repeatedSearchResultsWithSortId(3, 1, someGuids.slice(6, 9)),
       ruleParams: sampleParams,
       services: mockService,
@@ -114,14 +114,14 @@ describe('searchAfterAndBulkCreate', () => {
       throttle: null,
     });
     expect(mockService.callCluster).toHaveBeenCalledTimes(5);
-    expect(result).toEqual(true);
+    expect(success).toEqual(true);
   });
 
   test('if unsuccessful first bulk create', async () => {
     const someGuids = Array.from({ length: 4 }).map(x => uuid.v4());
     const sampleParams = sampleRuleAlertParams(10);
     mockService.callCluster.mockReturnValue(sampleBulkCreateDuplicateResult);
-    const result = await searchAfterAndBulkCreate({
+    const { success } = await searchAfterAndBulkCreate({
       someResult: repeatedSearchResultsWithSortId(4, 1, someGuids),
       ruleParams: sampleParams,
       services: mockService,
@@ -143,7 +143,7 @@ describe('searchAfterAndBulkCreate', () => {
       throttle: null,
     });
     expect(mockLogger.error).toHaveBeenCalled();
-    expect(result).toEqual(false);
+    expect(success).toEqual(false);
   });
 
   test('if unsuccessful iteration of searchAfterAndBulkCreate due to empty sort ids', async () => {
@@ -157,7 +157,7 @@ describe('searchAfterAndBulkCreate', () => {
         },
       ],
     });
-    const result = await searchAfterAndBulkCreate({
+    const { success } = await searchAfterAndBulkCreate({
       someResult: sampleDocSearchResultsNoSortId(),
       ruleParams: sampleParams,
       services: mockService,
@@ -179,7 +179,7 @@ describe('searchAfterAndBulkCreate', () => {
       throttle: null,
     });
     expect(mockLogger.error).toHaveBeenCalled();
-    expect(result).toEqual(false);
+    expect(success).toEqual(false);
   });
 
   test('if unsuccessful iteration of searchAfterAndBulkCreate due to empty sort ids and 0 total hits', async () => {
@@ -193,7 +193,7 @@ describe('searchAfterAndBulkCreate', () => {
         },
       ],
     });
-    const result = await searchAfterAndBulkCreate({
+    const { success } = await searchAfterAndBulkCreate({
       someResult: sampleDocSearchResultsNoSortIdNoHits(),
       ruleParams: sampleParams,
       services: mockService,
@@ -214,7 +214,7 @@ describe('searchAfterAndBulkCreate', () => {
       tags: ['some fake tag 1', 'some fake tag 2'],
       throttle: null,
     });
-    expect(result).toEqual(true);
+    expect(success).toEqual(true);
   });
 
   test('if successful iteration of while loop with maxDocs and search after returns results with no sort ids', async () => {
@@ -231,7 +231,7 @@ describe('searchAfterAndBulkCreate', () => {
         ],
       })
       .mockReturnValueOnce(sampleDocSearchResultsNoSortId());
-    const result = await searchAfterAndBulkCreate({
+    const { success } = await searchAfterAndBulkCreate({
       someResult: repeatedSearchResultsWithSortId(4, 1, someGuids),
       ruleParams: sampleParams,
       services: mockService,
@@ -252,7 +252,7 @@ describe('searchAfterAndBulkCreate', () => {
       tags: ['some fake tag 1', 'some fake tag 2'],
       throttle: null,
     });
-    expect(result).toEqual(true);
+    expect(success).toEqual(true);
   });
 
   test('if successful iteration of while loop with maxDocs and search after returns empty results with no sort ids', async () => {
@@ -269,7 +269,7 @@ describe('searchAfterAndBulkCreate', () => {
         ],
       })
       .mockReturnValueOnce(sampleEmptyDocSearchResults());
-    const result = await searchAfterAndBulkCreate({
+    const { success } = await searchAfterAndBulkCreate({
       someResult: repeatedSearchResultsWithSortId(4, 1, someGuids),
       ruleParams: sampleParams,
       services: mockService,
@@ -290,7 +290,7 @@ describe('searchAfterAndBulkCreate', () => {
       tags: ['some fake tag 1', 'some fake tag 2'],
       throttle: null,
     });
-    expect(result).toEqual(true);
+    expect(success).toEqual(true);
   });
 
   test('if returns false when singleSearchAfter throws an exception', async () => {
@@ -309,7 +309,7 @@ describe('searchAfterAndBulkCreate', () => {
       .mockImplementation(() => {
         throw Error('Fake Error');
       });
-    const result = await searchAfterAndBulkCreate({
+    const { success } = await searchAfterAndBulkCreate({
       someResult: repeatedSearchResultsWithSortId(4, 1, someGuids),
       ruleParams: sampleParams,
       services: mockService,
@@ -330,6 +330,6 @@ describe('searchAfterAndBulkCreate', () => {
       tags: ['some fake tag 1', 'some fake tag 2'],
       throttle: null,
     });
-    expect(result).toEqual(false);
+    expect(success).toEqual(false);
   });
 });
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/signals/search_after_bulk_create.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/signals/search_after_bulk_create.ts
index 4f1a187a82937..ff263333fb798 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/signals/search_after_bulk_create.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/signals/search_after_bulk_create.ts
@@ -34,6 +34,13 @@ interface SearchAfterAndBulkCreateParams {
   throttle: string | null;
 }
 
+export interface SearchAfterAndBulkCreateReturnType {
+  success: boolean;
+  searchAfterTimes: string[];
+  bulkCreateTimes: string[];
+  lastLookBackDate: Date | null | undefined;
+}
+
 // search_after through documents and re-index using bulk endpoint.
 export const searchAfterAndBulkCreate = async ({
   someResult,
@@ -55,13 +62,20 @@ export const searchAfterAndBulkCreate = async ({
   pageSize,
   tags,
   throttle,
-}: SearchAfterAndBulkCreateParams): Promise<boolean> => {
+}: SearchAfterAndBulkCreateParams): Promise<SearchAfterAndBulkCreateReturnType> => {
+  const toReturn: SearchAfterAndBulkCreateReturnType = {
+    success: false,
+    searchAfterTimes: [],
+    bulkCreateTimes: [],
+    lastLookBackDate: null,
+  };
   if (someResult.hits.hits.length === 0) {
-    return true;
+    toReturn.success = true;
+    return toReturn;
   }
 
   logger.debug('[+] starting bulk insertion');
-  await singleBulkCreate({
+  const { bulkCreateDuration } = await singleBulkCreate({
     someResult,
     ruleParams,
     services,
@@ -79,6 +93,13 @@ export const searchAfterAndBulkCreate = async ({
     tags,
     throttle,
   });
+  toReturn.lastLookBackDate =
+    someResult.hits.hits.length > 0
+      ? new Date(someResult.hits.hits[someResult.hits.hits.length - 1]?._source['@timestamp'])
+      : null;
+  if (bulkCreateDuration) {
+    toReturn.bulkCreateTimes.push(bulkCreateDuration);
+  }
   const totalHits =
     typeof someResult.hits.total === 'number' ? someResult.hits.total : someResult.hits.total.value;
   // maxTotalHitsSize represents the total number of docs to
@@ -94,9 +115,11 @@ export const searchAfterAndBulkCreate = async ({
   let sortIds = someResult.hits.hits[0].sort;
   if (sortIds == null && totalHits > 0) {
     logger.error('sortIds was empty on first search but expected more');
-    return false;
+    toReturn.success = false;
+    return toReturn;
   } else if (sortIds == null && totalHits === 0) {
-    return true;
+    toReturn.success = true;
+    return toReturn;
   }
   let sortId;
   if (sortIds != null) {
@@ -105,7 +128,10 @@ export const searchAfterAndBulkCreate = async ({
   while (hitsSize < maxTotalHitsSize && hitsSize !== 0) {
     try {
       logger.debug(`sortIds: ${sortIds}`);
-      const searchAfterResult: SignalSearchResponse = await singleSearchAfter({
+      const {
+        searchResult,
+        searchDuration,
+      }: { searchResult: SignalSearchResponse; searchDuration: string } = await singleSearchAfter({
         searchAfterSortId: sortId,
         index: inputIndexPattern,
         from: ruleParams.from,
@@ -115,20 +141,23 @@ export const searchAfterAndBulkCreate = async ({
         filter,
         pageSize, // maximum number of docs to receive per search result.
       });
-      if (searchAfterResult.hits.hits.length === 0) {
-        return true;
+      toReturn.searchAfterTimes.push(searchDuration);
+      if (searchResult.hits.hits.length === 0) {
+        toReturn.success = true;
+        return toReturn;
       }
-      hitsSize += searchAfterResult.hits.hits.length;
+      hitsSize += searchResult.hits.hits.length;
       logger.debug(`size adjusted: ${hitsSize}`);
-      sortIds = searchAfterResult.hits.hits[0].sort;
+      sortIds = searchResult.hits.hits[0].sort;
       if (sortIds == null) {
         logger.debug('sortIds was empty on search');
-        return true; // no more search results
+        toReturn.success = true;
+        return toReturn; // no more search results
       }
       sortId = sortIds[0];
       logger.debug('next bulk index');
-      await singleBulkCreate({
-        someResult: searchAfterResult,
+      const { bulkCreateDuration: bulkDuration } = await singleBulkCreate({
+        someResult: searchResult,
         ruleParams,
         services,
         logger,
@@ -146,11 +175,16 @@ export const searchAfterAndBulkCreate = async ({
         throttle,
       });
       logger.debug('finished next bulk index');
+      if (bulkDuration) {
+        toReturn.bulkCreateTimes.push(bulkDuration);
+      }
     } catch (exc) {
       logger.error(`[-] search_after and bulk threw an error ${exc}`);
-      return false;
+      toReturn.success = false;
+      return toReturn;
     }
   }
   logger.debug(`[+] completed bulk index of ${maxTotalHitsSize}`);
-  return true;
+  toReturn.success = true;
+  return toReturn;
 };
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/signals/signal_rule_alert_type.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/signals/signal_rule_alert_type.ts
index c004b3d0edd1c..ab9def14bef65 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/signals/signal_rule_alert_type.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/signals/signal_rule_alert_type.ts
@@ -4,6 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+import { performance } from 'perf_hooks';
 import { Logger } from 'src/core/server';
 import {
   SIGNALS_ID,
@@ -13,10 +14,13 @@ import {
 
 import { buildEventsSearchQuery } from './build_events_query';
 import { getInputIndex } from './get_input_output_index';
-import { searchAfterAndBulkCreate } from './search_after_bulk_create';
+import {
+  searchAfterAndBulkCreate,
+  SearchAfterAndBulkCreateReturnType,
+} from './search_after_bulk_create';
 import { getFilter } from './get_filter';
 import { SignalRuleAlertTypeDefinition, RuleAlertAttributes } from './types';
-import { getGapBetweenRuns } from './utils';
+import { getGapBetweenRuns, makeFloatString } from './utils';
 import { writeSignalRuleExceptionToSavedObject } from './write_signal_rule_exception_to_saved_object';
 import { signalParamsSchema } from './signal_params_schema';
 import { siemRuleActionGroups } from './siem_rule_action_groups';
@@ -92,7 +96,6 @@ export const signalRulesAlertType = ({
       const updatedAt = savedObject.updated_at ?? '';
 
       const gap = getGapBetweenRuns({ previousStartedAt, interval, from, to });
-
       await writeGapErrorToSavedObject({
         alertId,
         logger,
@@ -105,7 +108,12 @@ export const signalRulesAlertType = ({
       });
 
       const searchAfterSize = Math.min(params.maxSignals, DEFAULT_SEARCH_AFTER_PAGE_SIZE);
-      let creationSucceeded = false;
+      let creationSucceeded: SearchAfterAndBulkCreateReturnType = {
+        success: false,
+        bulkCreateTimes: [],
+        searchAfterTimes: [],
+        lastLookBackDate: null,
+      };
 
       try {
         if (type === 'machine_learning') {
@@ -130,7 +138,7 @@ export const signalRulesAlertType = ({
             );
           }
 
-          creationSucceeded = await bulkCreateMlSignals({
+          const { success, bulkCreateDuration } = await bulkCreateMlSignals({
             actions,
             throttle,
             someResult: anomalyResults,
@@ -148,6 +156,10 @@ export const signalRulesAlertType = ({
             enabled,
             tags,
           });
+          creationSucceeded.success = success;
+          if (bulkCreateDuration) {
+            creationSucceeded.bulkCreateTimes.push(bulkCreateDuration);
+          }
         } else {
           const inputIndex = await getInputIndex(services, version, index);
           const esFilter = await getFilter({
@@ -175,7 +187,10 @@ export const signalRulesAlertType = ({
           logger.debug(
             `[+] Initial search call of signal rule name: "${name}", id: "${alertId}", rule_id: "${ruleId}"`
           );
+          const start = performance.now();
           const noReIndexResult = await services.callCluster('search', noReIndex);
+          const end = performance.now();
+
           if (noReIndexResult.hits.total.value !== 0) {
             logger.info(
               `Found ${
@@ -207,9 +222,10 @@ export const signalRulesAlertType = ({
             tags,
             throttle,
           });
+          creationSucceeded.searchAfterTimes.push(makeFloatString(end - start));
         }
 
-        if (creationSucceeded) {
+        if (creationSucceeded.success) {
           if (meta?.throttle === NOTIFICATION_THROTTLE_RULE && actions.length) {
             const notificationRuleParams = {
               ...ruleParams,
@@ -242,11 +258,14 @@ export const signalRulesAlertType = ({
           }
 
           logger.debug(
-            `Finished signal rule name: "${name}", id: "${alertId}", rule_id: "${ruleId}", output_index: "${outputIndex}"`
+            `Finished signal rule name: "${name}", id: "${alertId}", rule_id: "${ruleId}"`
           );
           await writeCurrentStatusSucceeded({
             services,
             currentStatusSavedObject,
+            bulkCreateTimes: creationSucceeded.bulkCreateTimes,
+            searchAfterTimes: creationSucceeded.searchAfterTimes,
+            lastLookBackDate: creationSucceeded.lastLookBackDate?.toISOString() ?? null,
           });
         } else {
           await writeSignalRuleExceptionToSavedObject({
@@ -254,22 +273,28 @@ export const signalRulesAlertType = ({
             alertId,
             currentStatusSavedObject,
             logger,
-            message: `Bulk Indexing signals failed. Check logs for further details Rule name: "${name}" id: "${alertId}" rule_id: "${ruleId}" output_index: "${outputIndex}"`,
+            message: `Bulk Indexing signals failed. Check logs for further details \nRule name: "${name}"\nid: "${alertId}"\nrule_id: "${ruleId}"\n`,
             services,
             ruleStatusSavedObjects,
             ruleId: ruleId ?? '(unknown rule id)',
+            bulkCreateTimes: creationSucceeded.bulkCreateTimes,
+            searchAfterTimes: creationSucceeded.searchAfterTimes,
+            lastLookBackDate: creationSucceeded.lastLookBackDate?.toISOString() ?? null,
           });
         }
-      } catch (error) {
+      } catch (err) {
         await writeSignalRuleExceptionToSavedObject({
           name,
           alertId,
           currentStatusSavedObject,
           logger,
-          message: error?.message ?? '(no error message given)',
+          message: `Bulk Indexing signals failed. Check logs for further details \nRule name: "${name}"\nid: "${alertId}"\nrule_id: "${ruleId}"\n`,
           services,
           ruleStatusSavedObjects,
           ruleId: ruleId ?? '(unknown rule id)',
+          bulkCreateTimes: creationSucceeded.bulkCreateTimes,
+          searchAfterTimes: creationSucceeded.searchAfterTimes,
+          lastLookBackDate: creationSucceeded.lastLookBackDate?.toISOString() ?? null,
         });
       }
     },
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/signals/single_bulk_create.test.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/signals/single_bulk_create.test.ts
index afabd4c44de7d..93f9c24a057f2 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/signals/single_bulk_create.test.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/signals/single_bulk_create.test.ts
@@ -144,7 +144,7 @@ describe('singleBulkCreate', () => {
         },
       ],
     });
-    const successfulsingleBulkCreate = await singleBulkCreate({
+    const { success } = await singleBulkCreate({
       someResult: sampleDocSearchResultsNoSortId(),
       ruleParams: sampleParams,
       services: mockService,
@@ -162,7 +162,7 @@ describe('singleBulkCreate', () => {
       tags: ['some fake tag 1', 'some fake tag 2'],
       throttle: null,
     });
-    expect(successfulsingleBulkCreate).toEqual(true);
+    expect(success).toEqual(true);
   });
 
   test('create successful bulk create with docs with no versioning', async () => {
@@ -176,7 +176,7 @@ describe('singleBulkCreate', () => {
         },
       ],
     });
-    const successfulsingleBulkCreate = await singleBulkCreate({
+    const { success } = await singleBulkCreate({
       someResult: sampleDocSearchResultsNoSortIdNoVersion(),
       ruleParams: sampleParams,
       services: mockService,
@@ -194,13 +194,13 @@ describe('singleBulkCreate', () => {
       tags: ['some fake tag 1', 'some fake tag 2'],
       throttle: null,
     });
-    expect(successfulsingleBulkCreate).toEqual(true);
+    expect(success).toEqual(true);
   });
 
   test('create unsuccessful bulk create due to empty search results', async () => {
     const sampleParams = sampleRuleAlertParams();
     mockService.callCluster.mockReturnValue(false);
-    const successfulsingleBulkCreate = await singleBulkCreate({
+    const { success } = await singleBulkCreate({
       someResult: sampleEmptyDocSearchResults(),
       ruleParams: sampleParams,
       services: mockService,
@@ -218,14 +218,14 @@ describe('singleBulkCreate', () => {
       tags: ['some fake tag 1', 'some fake tag 2'],
       throttle: null,
     });
-    expect(successfulsingleBulkCreate).toEqual(true);
+    expect(success).toEqual(true);
   });
 
   test('create successful bulk create when bulk create has duplicate errors', async () => {
     const sampleParams = sampleRuleAlertParams();
     const sampleSearchResult = sampleDocSearchResultsNoSortId;
     mockService.callCluster.mockReturnValue(sampleBulkCreateDuplicateResult);
-    const successfulsingleBulkCreate = await singleBulkCreate({
+    const { success } = await singleBulkCreate({
       someResult: sampleSearchResult(),
       ruleParams: sampleParams,
       services: mockService,
@@ -245,14 +245,14 @@ describe('singleBulkCreate', () => {
     });
 
     expect(mockLogger.error).not.toHaveBeenCalled();
-    expect(successfulsingleBulkCreate).toEqual(true);
+    expect(success).toEqual(true);
   });
 
   test('create successful bulk create when bulk create has multiple error statuses', async () => {
     const sampleParams = sampleRuleAlertParams();
     const sampleSearchResult = sampleDocSearchResultsNoSortId;
     mockService.callCluster.mockReturnValue(sampleBulkCreateErrorResult);
-    const successfulsingleBulkCreate = await singleBulkCreate({
+    const { success } = await singleBulkCreate({
       someResult: sampleSearchResult(),
       ruleParams: sampleParams,
       services: mockService,
@@ -272,7 +272,7 @@ describe('singleBulkCreate', () => {
     });
 
     expect(mockLogger.error).toHaveBeenCalled();
-    expect(successfulsingleBulkCreate).toEqual(true);
+    expect(success).toEqual(true);
   });
 
   test('filter duplicate rules will return an empty array given an empty array', () => {
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/signals/single_bulk_create.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/signals/single_bulk_create.ts
index e2e4471f609ac..0192ff76efa54 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/signals/single_bulk_create.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/signals/single_bulk_create.ts
@@ -10,7 +10,7 @@ import { AlertServices } from '../../../../../../../plugins/alerting/server';
 import { SignalSearchResponse, BulkResponse } from './types';
 import { RuleAlertAction } from '../../../../common/detection_engine/types';
 import { RuleTypeParams } from '../types';
-import { generateId } from './utils';
+import { generateId, makeFloatString } from './utils';
 import { buildBulkBody } from './build_bulk_body';
 import { Logger } from '../../../../../../../../src/core/server';
 
@@ -55,6 +55,11 @@ export const filterDuplicateRules = (
   });
 };
 
+export interface SingleBulkCreateResponse {
+  success: boolean;
+  bulkCreateDuration?: string;
+}
+
 // Bulk Index documents.
 export const singleBulkCreate = async ({
   someResult,
@@ -73,11 +78,10 @@ export const singleBulkCreate = async ({
   enabled,
   tags,
   throttle,
-}: SingleBulkCreateParams): Promise<boolean> => {
+}: SingleBulkCreateParams): Promise<SingleBulkCreateResponse> => {
   someResult.hits.hits = filterDuplicateRules(id, someResult);
-
   if (someResult.hits.hits.length === 0) {
-    return true;
+    return { success: true };
   }
   // index documents after creating an ID based on the
   // source documents' originating index, and the original
@@ -123,7 +127,7 @@ export const singleBulkCreate = async ({
     body: bulkBody,
   });
   const end = performance.now();
-  logger.debug(`individual bulk process time took: ${Number(end - start).toFixed(2)} milliseconds`);
+  logger.debug(`individual bulk process time took: ${makeFloatString(end - start)} milliseconds`);
   logger.debug(`took property says bulk took: ${response.took} milliseconds`);
 
   if (response.errors) {
@@ -141,5 +145,5 @@ export const singleBulkCreate = async ({
       );
     }
   }
-  return true;
+  return { success: true, bulkCreateDuration: makeFloatString(end - start) };
 };
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/signals/single_search_after.test.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/signals/single_search_after.test.ts
index 1685c6518def3..9b726c38d3d96 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/signals/single_search_after.test.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/signals/single_search_after.test.ts
@@ -42,7 +42,7 @@ describe('singleSearchAfter', () => {
   test('if singleSearchAfter works with a given sort id', async () => {
     const searchAfterSortId = '1234567891111';
     mockService.callCluster.mockReturnValue(sampleDocSearchResultsWithSortId);
-    const searchAfterResult = await singleSearchAfter({
+    const { searchResult } = await singleSearchAfter({
       searchAfterSortId,
       index: [],
       from: 'now-360s',
@@ -52,7 +52,7 @@ describe('singleSearchAfter', () => {
       pageSize: 1,
       filter: undefined,
     });
-    expect(searchAfterResult).toEqual(sampleDocSearchResultsWithSortId);
+    expect(searchResult).toEqual(sampleDocSearchResultsWithSortId);
   });
   test('if singleSearchAfter throws error', async () => {
     const searchAfterSortId = '1234567891111';
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/signals/single_search_after.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/signals/single_search_after.ts
index bb12b5a802f8f..6fc8fe4bd24d9 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/signals/single_search_after.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/signals/single_search_after.ts
@@ -4,10 +4,12 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+import { performance } from 'perf_hooks';
 import { AlertServices } from '../../../../../../../plugins/alerting/server';
 import { Logger } from '../../../../../../../../src/core/server';
 import { SignalSearchResponse } from './types';
 import { buildEventsSearchQuery } from './build_events_query';
+import { makeFloatString } from './utils';
 
 interface SingleSearchAfterParams {
   searchAfterSortId: string | undefined;
@@ -30,7 +32,10 @@ export const singleSearchAfter = async ({
   filter,
   logger,
   pageSize,
-}: SingleSearchAfterParams): Promise<SignalSearchResponse> => {
+}: SingleSearchAfterParams): Promise<{
+  searchResult: SignalSearchResponse;
+  searchDuration: string;
+}> => {
   if (searchAfterSortId == null) {
     throw Error('Attempted to search after with empty sort id');
   }
@@ -43,11 +48,13 @@ export const singleSearchAfter = async ({
       size: pageSize,
       searchAfterSortId,
     });
+    const start = performance.now();
     const nextSearchAfterResult: SignalSearchResponse = await services.callCluster(
       'search',
       searchAfterQuery
     );
-    return nextSearchAfterResult;
+    const end = performance.now();
+    return { searchResult: nextSearchAfterResult, searchDuration: makeFloatString(end - start) };
   } catch (exc) {
     logger.error(`[-] nextSearchAfter threw an error ${exc}`);
     throw exc;
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/signals/utils.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/signals/utils.ts
index 8e7fb9c38d658..49af310db559f 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/signals/utils.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/signals/utils.ts
@@ -89,3 +89,5 @@ export const getGapBetweenRuns = ({
   const drift = diff.subtract(intervalDuration);
   return drift.subtract(driftTolerance);
 };
+
+export const makeFloatString = (num: number): string => Number(num).toFixed(2);
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/signals/write_current_status_succeeded.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/signals/write_current_status_succeeded.ts
index 6b06235b29063..50136790c3479 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/signals/write_current_status_succeeded.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/signals/write_current_status_succeeded.ts
@@ -13,17 +13,32 @@ import { IRuleSavedAttributesSavedObjectAttributes } from '../rules/types';
 interface GetRuleStatusSavedObject {
   services: AlertServices;
   currentStatusSavedObject: SavedObject<IRuleSavedAttributesSavedObjectAttributes>;
+  lastLookBackDate: string | null | undefined;
+  bulkCreateTimes: string[] | null | undefined;
+  searchAfterTimes: string[] | null | undefined;
 }
 
 export const writeCurrentStatusSucceeded = async ({
   services,
   currentStatusSavedObject,
+  lastLookBackDate,
+  bulkCreateTimes,
+  searchAfterTimes,
 }: GetRuleStatusSavedObject): Promise<void> => {
   const sDate = new Date().toISOString();
   currentStatusSavedObject.attributes.status = 'succeeded';
   currentStatusSavedObject.attributes.statusDate = sDate;
   currentStatusSavedObject.attributes.lastSuccessAt = sDate;
   currentStatusSavedObject.attributes.lastSuccessMessage = 'succeeded';
+  if (lastLookBackDate != null) {
+    currentStatusSavedObject.attributes.lastLookBackDate = lastLookBackDate;
+  }
+  if (bulkCreateTimes != null) {
+    currentStatusSavedObject.attributes.bulkCreateTimeDurations = bulkCreateTimes;
+  }
+  if (searchAfterTimes != null) {
+    currentStatusSavedObject.attributes.searchAfterTimeDurations = searchAfterTimes;
+  }
   await services.savedObjectsClient.update(ruleStatusSavedObjectType, currentStatusSavedObject.id, {
     ...currentStatusSavedObject.attributes,
   });
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/signals/write_gap_error_to_saved_object.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/signals/write_gap_error_to_saved_object.ts
index 3650548c80ad5..e47e5388527da 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/signals/write_gap_error_to_saved_object.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/signals/write_gap_error_to_saved_object.ts
@@ -48,6 +48,7 @@ export const writeGapErrorToSavedObject = async ({
       lastSuccessAt: currentStatusSavedObject.attributes.lastSuccessAt,
       lastFailureMessage: `Signal rule name: "${name}", id: "${alertId}", rule_id: "${ruleId}" has a time gap of ${gap.humanize()} (${gap.asMilliseconds()}ms), and could be missing signals within that time. Consider increasing your look behind time or adding more Kibana instances.`,
       lastSuccessMessage: currentStatusSavedObject.attributes.lastSuccessMessage,
+      gap: gap.humanize(),
     });
 
     if (ruleStatusSavedObjects.saved_objects.length >= 6) {
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/signals/write_signal_rule_exception_to_saved_object.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/signals/write_signal_rule_exception_to_saved_object.ts
index 5ca0808902a52..2a14184859591 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/signals/write_signal_rule_exception_to_saved_object.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/signals/write_signal_rule_exception_to_saved_object.ts
@@ -19,6 +19,9 @@ interface SignalRuleExceptionParams {
   message: string;
   services: AlertServices;
   name: string;
+  lastLookBackDate?: string | null | undefined;
+  bulkCreateTimes?: string[] | null | undefined;
+  searchAfterTimes?: string[] | null | undefined;
 }
 
 export const writeSignalRuleExceptionToSavedObject = async ({
@@ -30,6 +33,9 @@ export const writeSignalRuleExceptionToSavedObject = async ({
   ruleStatusSavedObjects,
   ruleId,
   name,
+  lastLookBackDate,
+  bulkCreateTimes,
+  searchAfterTimes,
 }: SignalRuleExceptionParams): Promise<void> => {
   logger.error(
     `Error from signal rule name: "${name}", id: "${alertId}", rule_id: "${ruleId}" message: ${message}`
@@ -39,6 +45,15 @@ export const writeSignalRuleExceptionToSavedObject = async ({
   currentStatusSavedObject.attributes.statusDate = sDate;
   currentStatusSavedObject.attributes.lastFailureAt = sDate;
   currentStatusSavedObject.attributes.lastFailureMessage = message;
+  if (lastLookBackDate) {
+    currentStatusSavedObject.attributes.lastLookBackDate = lastLookBackDate;
+  }
+  if (bulkCreateTimes) {
+    currentStatusSavedObject.attributes.bulkCreateTimeDurations = bulkCreateTimes;
+  }
+  if (searchAfterTimes) {
+    currentStatusSavedObject.attributes.searchAfterTimeDurations = searchAfterTimes;
+  }
   // current status is failing
   await services.savedObjectsClient.update(ruleStatusSavedObjectType, currentStatusSavedObject.id, {
     ...currentStatusSavedObject.attributes,

From e42956151b554d73ce6fb4b15b3a2de2e2646c45 Mon Sep 17 00:00:00 2001
From: Thomas Watson <w@tson.dk>
Date: Wed, 25 Mar 2020 06:24:39 +0100
Subject: [PATCH 124/179] Bump mapbox-gl from 1.3.1 to 1.9.0 (#61135)

This commit also consolidates our versions of pbf to all use the latest
3.x (v3.2.1) and ieee754 to all use the latest 1.x (v1.1.13).
---
 x-pack/package.json |  8 ++---
 yarn.lock           | 75 +++++++++++++++++++++------------------------
 2 files changed, 39 insertions(+), 44 deletions(-)

diff --git a/x-pack/package.json b/x-pack/package.json
index 5e8bffb27a3bf..fcc7e70d3e417 100644
--- a/x-pack/package.json
+++ b/x-pack/package.json
@@ -76,7 +76,7 @@
     "@types/json-stable-stringify": "^1.0.32",
     "@types/jsonwebtoken": "^7.2.8",
     "@types/lodash": "^3.10.1",
-    "@types/mapbox-gl": "^0.54.1",
+    "@types/mapbox-gl": "^1.8.1",
     "@types/memoize-one": "^4.1.0",
     "@types/mime": "^2.0.1",
     "@types/mocha": "^7.0.2",
@@ -193,8 +193,8 @@
     "@kbn/interpreter": "1.0.0",
     "@kbn/storybook": "1.0.0",
     "@kbn/ui-framework": "1.0.0",
-    "@mapbox/mapbox-gl-draw": "^1.1.1",
-    "@mapbox/mapbox-gl-rtl-text": "0.2.3",
+    "@mapbox/mapbox-gl-draw": "^1.1.2",
+    "@mapbox/mapbox-gl-rtl-text": "^0.2.3",
     "@scant/router": "^0.1.0",
     "@slack/webhook": "^5.0.0",
     "@turf/boolean-contains": "6.0.1",
@@ -273,7 +273,7 @@
     "lodash.topath": "^4.5.2",
     "lodash.uniqby": "^4.7.0",
     "lz-string": "^1.4.4",
-    "mapbox-gl": "1.3.1",
+    "mapbox-gl": "^1.9.0",
     "mapbox-gl-draw-rectangle-mode": "^1.0.4",
     "markdown-it": "^10.0.0",
     "memoize-one": "^5.0.0",
diff --git a/yarn.lock b/yarn.lock
index 27ba50b07280d..3997cfbaeca6b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2761,10 +2761,10 @@
   resolved "https://registry.yarnpkg.com/@mapbox/jsonlint-lines-primitives/-/jsonlint-lines-primitives-2.0.2.tgz#ce56e539f83552b58d10d672ea4d6fc9adc7b234"
   integrity sha1-zlblOfg1UrWNENZy6k1vya3HsjQ=
 
-"@mapbox/mapbox-gl-draw@^1.1.1":
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/@mapbox/mapbox-gl-draw/-/mapbox-gl-draw-1.1.1.tgz#b88a7919c8de04eb7946885e747e22049c3a3138"
-  integrity sha512-Xg+R0VUXKdXC7MaSSMiWfz96eLssJZa28/D6MxK/Xc19G5HvU6w/wytm8EeI28T7Sa2C7FII/0/XOwuAfJgDJw==
+"@mapbox/mapbox-gl-draw@^1.1.2":
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/@mapbox/mapbox-gl-draw/-/mapbox-gl-draw-1.1.2.tgz#247b3f0727db34c2641ab718df5eebeee69a2585"
+  integrity sha512-DWtATUAnJaGZYoH/y2O+QTRybxrp5y3w3eV5FXHFNVcKsCAojKEMB8ALKUG2IsiCKqV/JCAguK9AlPWR7Bjafw==
   dependencies:
     "@mapbox/geojson-area" "^0.2.1"
     "@mapbox/geojson-extent" "^0.3.2"
@@ -2775,7 +2775,7 @@
     lodash.isequal "^4.2.0"
     xtend "^4.0.1"
 
-"@mapbox/mapbox-gl-rtl-text@0.2.3":
+"@mapbox/mapbox-gl-rtl-text@^0.2.3":
   version "0.2.3"
   resolved "https://registry.yarnpkg.com/@mapbox/mapbox-gl-rtl-text/-/mapbox-gl-rtl-text-0.2.3.tgz#a26ecfb3f0061456d93ee8570dd9587d226ea8bd"
   integrity sha512-RaCYfnxULUUUxNwcUimV9C/o2295ktTyLEUzD/+VWkqXqvaVfFcZ5slytGzb2Sd/Jj4MlbxD0DCZbfa6CzcmMw==
@@ -4859,10 +4859,10 @@
   resolved "https://registry.yarnpkg.com/@types/lru-cache/-/lru-cache-5.1.0.tgz#57f228f2b80c046b4a1bd5cac031f81f207f4f03"
   integrity sha512-RaE0B+14ToE4l6UqdarKPnXwVDuigfFv+5j9Dze/Nqr23yyuqdNvzcZi3xB+3Agvi5R4EOgAksfv3lXX4vBt9w==
 
-"@types/mapbox-gl@^0.54.1":
-  version "0.54.3"
-  resolved "https://registry.yarnpkg.com/@types/mapbox-gl/-/mapbox-gl-0.54.3.tgz#6215fbf4dbb555d2ca6ce3be0b1de045eec0f967"
-  integrity sha512-/G06vUcV5ucNB7G9ka6J+VbGtffyUYvfe6A3oae/+csTlHIEHcvyJop3Ic4yeMDxycsQCmBvuwz+owseMuiQ3w==
+"@types/mapbox-gl@^1.8.1":
+  version "1.8.1"
+  resolved "https://registry.yarnpkg.com/@types/mapbox-gl/-/mapbox-gl-1.8.1.tgz#dbc12da1324d5bdb3dbf71b90b77cac17994a1a3"
+  integrity sha512-DdT/YzpGiYITkj2cUwyqPilPbtZURr1E0vZX0KTyyeNP0t0bxNyKoXo0seAcvUd2MsMgFYwFQh1WRC3x2V0kKQ==
   dependencies:
     "@types/geojson" "*"
 
@@ -12085,10 +12085,10 @@ earcut@^2.0.0:
   resolved "https://registry.yarnpkg.com/earcut/-/earcut-2.1.3.tgz#ca579545f351941af7c3d0df49c9f7d34af99b0c"
   integrity sha512-AxdCdWUk1zzK/NuZ7e1ljj6IGC+VAdC3Qb7QQDsXpfNrc5IM8tL9nNXUmEGE6jRHTfZ10zhzRhtDmWVsR5pd3A==
 
-earcut@^2.1.5:
-  version "2.1.5"
-  resolved "https://registry.yarnpkg.com/earcut/-/earcut-2.1.5.tgz#829280a9a3a0f5fee0529f0a47c3e4eff09b21e4"
-  integrity sha512-QFWC7ywTVLtvRAJTVp8ugsuuGQ5mVqNmJ1cRYeLrSHgP3nycr2RHTJob9OtM0v8ujuoKN0NY1a93J/omeTL1PA==
+earcut@^2.2.2:
+  version "2.2.2"
+  resolved "https://registry.yarnpkg.com/earcut/-/earcut-2.2.2.tgz#41b0bc35f63e0fe80da7cddff28511e7e2e80d11"
+  integrity sha512-eZoZPPJcUHnfRZ0PjLvx2qBordSiO8ofC3vt+qACLM95u+4DovnbYNpQtJh0DNsWj8RnxrQytD4WA8gj5cRIaQ==
 
 ecc-jsbn@~0.1.1:
   version "0.1.2"
@@ -16654,15 +16654,10 @@ iedriver@^3.14.1:
     request "^2.88.0"
     rimraf "~2.0.2"
 
-ieee754@^1.1.4:
-  version "1.1.8"
-  resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.8.tgz#be33d40ac10ef1926701f6f08a2d86fbfd1ad3e4"
-  integrity sha1-vjPUCsEO8ZJnAfbwii2G+/0a0+Q=
-
-ieee754@^1.1.6:
-  version "1.1.12"
-  resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.12.tgz#50bf24e5b9c8bb98af4964c941cdb0918da7b60b"
-  integrity sha512-GguP+DRY+pJ3soyIiGPTvdiVXjZ+DbXOxGpXn3eMvNW4x4irjqXm4wHKscC+TfxSJ0yw/S1F24tqdMNsMZTiLA==
+ieee754@^1.1.12, ieee754@^1.1.4:
+  version "1.1.13"
+  resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.13.tgz#ec168558e95aa181fd87d37f55c32bbcb6708b84"
+  integrity sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg==
 
 iferr@^0.1.5:
   version "0.1.5"
@@ -20213,10 +20208,10 @@ mapbox-gl-draw-rectangle-mode@^1.0.4:
   resolved "https://registry.yarnpkg.com/mapbox-gl-draw-rectangle-mode/-/mapbox-gl-draw-rectangle-mode-1.0.4.tgz#42987d68872a5fb5cc5d76d3375ee20cd8bab8f7"
   integrity sha512-BdF6nwEK2p8n9LQoMPzBO8LhddW1fe+d5vK8HQIei+4VcRnUbKNsEj7Z15FsJxCHzsc2BQKXbESx5GaE8x0imQ==
 
-mapbox-gl@1.3.1:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/mapbox-gl/-/mapbox-gl-1.3.1.tgz#6be39a207afec3cc6ea4bc241d596140a664e46b"
-  integrity sha512-IF7b0LZd/caTiknPhm8DAcv7bhvOCXO6rsW18rmFxi8Vw0syJXKK8DLLabI5oiJXtUIgLe57XRgduQzAYrb4og==
+mapbox-gl@^1.9.0:
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/mapbox-gl/-/mapbox-gl-1.9.0.tgz#53e3e13c99483f362b07a8a763f2d61d580255a5"
+  integrity sha512-PKpoiB2pPUMrqFfBJpt/oA8On3zcp0adEoDS2YIC2RA6o4EZ9Sq2NPZocb64y7ra3mLUvEb7ps1pLVlPMh6y7w==
   dependencies:
     "@mapbox/geojson-rewind" "^0.4.0"
     "@mapbox/geojson-types" "^1.0.2"
@@ -20228,17 +20223,17 @@ mapbox-gl@1.3.1:
     "@mapbox/vector-tile" "^1.3.1"
     "@mapbox/whoots-js" "^3.1.0"
     csscolorparser "~1.0.2"
-    earcut "^2.1.5"
+    earcut "^2.2.2"
     geojson-vt "^3.2.1"
     gl-matrix "^3.0.0"
     grid-index "^1.1.0"
     minimist "0.0.8"
     murmurhash-js "^1.0.0"
-    pbf "^3.0.5"
+    pbf "^3.2.1"
     potpack "^1.0.1"
     quickselect "^2.0.0"
     rw "^1.3.3"
-    supercluster "^6.0.1"
+    supercluster "^7.0.0"
     tinyqueue "^2.0.0"
     vt-pbf "^3.1.1"
 
@@ -22986,13 +22981,13 @@ path2d-polyfill@^0.4.2:
   resolved "https://registry.yarnpkg.com/path2d-polyfill/-/path2d-polyfill-0.4.2.tgz#594d3103838ef6b9dd4a7fd498fe9a88f1f28531"
   integrity sha512-JSeAnUfkFjl+Ml/EZL898ivMSbGHrOH63Mirx5EQ1ycJiryHDmj1Q7Are+uEPvenVGCUN9YbolfGfyUewJfJEg==
 
-pbf@^3.0.5:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/pbf/-/pbf-3.1.0.tgz#f70004badcb281761eabb1e76c92f179f08189e9"
-  integrity sha512-/hYJmIsTmh7fMkHAWWXJ5b8IKLWdjdlAFb3IHkRBn1XUhIYBChVGfVwmHEAV3UfXTxsP/AKfYTXTS/dCPxJd5w==
+pbf@^3.0.5, pbf@^3.2.1:
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/pbf/-/pbf-3.2.1.tgz#b4c1b9e72af966cd82c6531691115cc0409ffe2a"
+  integrity sha512-ClrV7pNOn7rtmoQVF4TS1vyU0WhYRnP92fzbfF75jAIwpnzdJXf8iTd4CMEqO4yUenH6NDqLiwjqlh6QgZzgLQ==
   dependencies:
-    ieee754 "^1.1.6"
-    resolve-protobuf-schema "^2.0.0"
+    ieee754 "^1.1.12"
+    resolve-protobuf-schema "^2.1.0"
 
 pbkdf2@^3.0.3:
   version "3.0.14"
@@ -26082,7 +26077,7 @@ resolve-pkg@^2.0.0:
   dependencies:
     resolve-from "^5.0.0"
 
-resolve-protobuf-schema@^2.0.0:
+resolve-protobuf-schema@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/resolve-protobuf-schema/-/resolve-protobuf-schema-2.1.0.tgz#9ca9a9e69cf192bbdaf1006ec1973948aa4a3758"
   integrity sha512-kI5ffTiZWmJaS/huM8wZfEMer1eRd7oJQhDuxeCLe3t7N7mX3z94CN0xPxBQxFYQTSNz9T0i+v6inKqSdK8xrQ==
@@ -28336,10 +28331,10 @@ superagent@3.8.2:
     qs "^6.5.1"
     readable-stream "^2.0.5"
 
-supercluster@^6.0.1:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/supercluster/-/supercluster-6.0.1.tgz#4c0177d96daa195d58a5bad9f55dbf12fb727a4c"
-  integrity sha512-NTth/FBFUt9mwW03+Z6Byscex+UHu0utroIe6uXjGu9PrTuWtW70LYv9I1vPSYYIHQL74S5zAkrXrHEk0L7dGA==
+supercluster@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/supercluster/-/supercluster-7.0.0.tgz#75d474fafb0a055db552ed7bd7bbda583f6ab321"
+  integrity sha512-8VuHI8ynylYQj7Qf6PBMWy1PdgsnBiIxujOgc9Z83QvJ8ualIYWNx2iMKyKeC4DZI5ntD9tz/CIwwZvIelixsA==
   dependencies:
     kdbush "^3.0.0"
 

From 1e3c5b1f871bad0313a9b21394b6e7c0dd7055b2 Mon Sep 17 00:00:00 2001
From: Steph Milovic <stephanie.milovic@elastic.co>
Date: Tue, 24 Mar 2020 23:39:46 -0600
Subject: [PATCH 125/179] [SIEM] [Cases] Final case features for 7.7 (#61161)

---
 .../__snapshots__/index.test.tsx.snap         |  2 +
 .../siem/public/components/markdown/index.tsx | 13 +++++-
 .../case/components/add_comment/index.tsx     | 17 +++++--
 .../case/components/all_cases/columns.tsx     | 46 +++++++++++++++++--
 .../pages/case/components/all_cases/index.tsx | 18 +++++---
 .../case/components/all_cases/translations.ts | 14 ++++++
 .../case/components/case_view/translations.ts |  4 ++
 .../components/property_actions/index.tsx     |  2 +-
 .../components/user_action_tree/index.tsx     | 20 +++++++-
 .../user_action_tree/user_action_item.tsx     |  6 +++
 .../user_action_tree/user_action_title.tsx    | 36 ++++++++++-----
 11 files changed, 152 insertions(+), 26 deletions(-)

diff --git a/x-pack/legacy/plugins/siem/public/components/markdown/__snapshots__/index.test.tsx.snap b/x-pack/legacy/plugins/siem/public/components/markdown/__snapshots__/index.test.tsx.snap
index 4b02d23568d26..ce0c797c2b2b4 100644
--- a/x-pack/legacy/plugins/siem/public/components/markdown/__snapshots__/index.test.tsx.snap
+++ b/x-pack/legacy/plugins/siem/public/components/markdown/__snapshots__/index.test.tsx.snap
@@ -10,6 +10,7 @@ exports[`Markdown markdown links it renders the expected content containing a li
   rawSourcePos={false}
   renderers={
     Object {
+      "blockquote": [Function],
       "link": [Function],
       "root": [Function],
       "table": [Function],
@@ -35,6 +36,7 @@ exports[`Markdown markdown tables it renders the expected table content 1`] = `
   rawSourcePos={false}
   renderers={
     Object {
+      "blockquote": [Function],
       "link": [Function],
       "root": [Function],
       "table": [Function],
diff --git a/x-pack/legacy/plugins/siem/public/components/markdown/index.tsx b/x-pack/legacy/plugins/siem/public/components/markdown/index.tsx
index 1368c13619d6b..8e051685af56d 100644
--- a/x-pack/legacy/plugins/siem/public/components/markdown/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/markdown/index.tsx
@@ -9,12 +9,20 @@
 import { EuiLink, EuiTableRow, EuiTableRowCell, EuiText, EuiToolTip } from '@elastic/eui';
 import React from 'react';
 import ReactMarkdown from 'react-markdown';
-import styled from 'styled-components';
+import styled, { css } from 'styled-components';
 
 const TableHeader = styled.thead`
   font-weight: bold;
 `;
 
+const MyBlockquote = styled.div`
+  ${({ theme }) => css`
+    padding: 0 ${theme.eui.euiSize};
+    color: ${theme.eui.euiColorMediumShade};
+    border-left: ${theme.eui.euiSizeXS} solid ${theme.eui.euiColorLightShade};
+  `}
+`;
+
 TableHeader.displayName = 'TableHeader';
 
 /** prevents links to the new pages from accessing `window.opener` */
@@ -63,6 +71,9 @@ export const Markdown = React.memo<{
         </EuiLink>
       </EuiToolTip>
     ),
+    blockquote: ({ children }: { children: React.ReactNode[] }) => (
+      <MyBlockquote>{children}</MyBlockquote>
+    ),
   };
 
   return (
diff --git a/x-pack/legacy/plugins/siem/public/pages/case/components/add_comment/index.tsx b/x-pack/legacy/plugins/siem/public/pages/case/components/add_comment/index.tsx
index 836595c7c45d9..21e4724797c5d 100644
--- a/x-pack/legacy/plugins/siem/public/pages/case/components/add_comment/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/case/components/add_comment/index.tsx
@@ -30,13 +30,14 @@ const initialCommentValue: CommentRequest = {
 
 interface AddCommentProps {
   caseId: string;
+  insertQuote: string | null;
   onCommentSaving?: () => void;
   onCommentPosted: (commentResponse: Comment) => void;
   showLoading?: boolean;
 }
 
 export const AddComment = React.memo<AddCommentProps>(
-  ({ caseId, showLoading = true, onCommentPosted, onCommentSaving }) => {
+  ({ caseId, insertQuote, showLoading = true, onCommentPosted, onCommentSaving }) => {
     const { commentData, isLoading, postComment, resetCommentData } = usePostComment(caseId);
     const { form } = useForm<CommentRequest>({
       defaultValue: initialCommentValue,
@@ -48,6 +49,16 @@ export const AddComment = React.memo<AddCommentProps>(
       'comment'
     );
 
+    useEffect(() => {
+      if (insertQuote !== null) {
+        const { comment } = form.getFormData();
+        form.setFieldValue(
+          'comment',
+          `${comment}${comment.length > 0 ? '\n\n' : ''}${insertQuote}`
+        );
+      }
+    }, [insertQuote]);
+
     useEffect(() => {
       if (commentData !== null) {
         onCommentPosted(commentData);
@@ -67,7 +78,7 @@ export const AddComment = React.memo<AddCommentProps>(
     }, [form]);
 
     return (
-      <>
+      <span id="add-comment-permLink">
         {isLoading && showLoading && <MySpinner size="xl" />}
         <Form form={form}>
           <UseField
@@ -100,7 +111,7 @@ export const AddComment = React.memo<AddCommentProps>(
             }}
           />
         </Form>
-      </>
+      </span>
     );
   }
 );
diff --git a/x-pack/legacy/plugins/siem/public/pages/case/components/all_cases/columns.tsx b/x-pack/legacy/plugins/siem/public/pages/case/components/all_cases/columns.tsx
index 32a29483e9c75..5ca54c7f429d2 100644
--- a/x-pack/legacy/plugins/siem/public/pages/case/components/all_cases/columns.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/case/components/all_cases/columns.tsx
@@ -3,13 +3,15 @@
  * 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 React, { useCallback } from 'react';
 import {
   EuiBadge,
   EuiTableFieldDataColumnType,
   EuiTableComputedColumnType,
   EuiTableActionsColumnType,
   EuiAvatar,
+  EuiLink,
+  EuiLoadingSpinner,
 } from '@elastic/eui';
 import styled from 'styled-components';
 import { DefaultItemIconButtonAction } from '@elastic/eui/src/components/basic_table/action_types';
@@ -19,6 +21,7 @@ import { FormattedRelativePreferenceDate } from '../../../../components/formatte
 import { CaseDetailsLink } from '../../../../components/links';
 import { TruncatableText } from '../../../../components/truncatable_text';
 import * as i18n from './translations';
+import { useGetCaseUserActions } from '../../../../containers/case/use_get_case_user_actions';
 
 export type CasesColumns =
   | EuiTableFieldDataColumnType<Case>
@@ -60,7 +63,6 @@ export const getCasesColumns = (
       }
       return getEmptyTagValue();
     },
-    width: '25%',
   },
   {
     field: 'createdBy',
@@ -105,7 +107,6 @@ export const getCasesColumns = (
       return getEmptyTagValue();
     },
     truncateText: true,
-    width: '20%',
   },
   {
     align: 'right',
@@ -148,8 +149,47 @@ export const getCasesColumns = (
           return getEmptyTagValue();
         },
       },
+  {
+    name: 'ServiceNow Incident',
+    render: (theCase: Case) => {
+      if (theCase.id != null) {
+        return <ServiceNowColumn theCase={theCase} />;
+      }
+      return getEmptyTagValue();
+    },
+  },
   {
     name: 'Actions',
     actions,
   },
 ];
+
+interface Props {
+  theCase: Case;
+}
+
+const ServiceNowColumn: React.FC<Props> = ({ theCase }) => {
+  const { hasDataToPush, isLoading } = useGetCaseUserActions(theCase.id);
+  const handleRenderDataToPush = useCallback(
+    () =>
+      isLoading ? (
+        <EuiLoadingSpinner />
+      ) : (
+        <p>
+          <EuiLink
+            data-test-subj={`case-table-column-external`}
+            href={theCase.externalService?.externalUrl}
+            target="_blank"
+          >
+            {theCase.externalService?.externalTitle}
+          </EuiLink>
+          {hasDataToPush ? i18n.REQUIRES_UPDATE : i18n.UP_TO_DATE}
+        </p>
+      ),
+    [hasDataToPush, isLoading, theCase.externalService]
+  );
+  if (theCase.externalService !== null) {
+    return handleRenderDataToPush();
+  }
+  return renderStringField(i18n.NOT_PUSHED, `case-table-column-external-notPushed`);
+};
diff --git a/x-pack/legacy/plugins/siem/public/pages/case/components/all_cases/index.tsx b/x-pack/legacy/plugins/siem/public/pages/case/components/all_cases/index.tsx
index cbb9ddae22d04..27316ab8427cb 100644
--- a/x-pack/legacy/plugins/siem/public/pages/case/components/all_cases/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/case/components/all_cases/index.tsx
@@ -109,19 +109,21 @@ export const AllCases = React.memo(() => {
 
   const { dispatchResetIsUpdated, isUpdated, updateBulkStatus } = useUpdateCases();
 
+  const refreshCases = useCallback(() => {
+    refetchCases(filterOptions, queryParams);
+    fetchCasesStatus();
+  }, [filterOptions, queryParams]);
+
   useEffect(() => {
     if (isDeleted) {
-      refetchCases(filterOptions, queryParams);
-      fetchCasesStatus();
+      refreshCases();
       dispatchResetIsDeleted();
     }
     if (isUpdated) {
-      refetchCases(filterOptions, queryParams);
-      fetchCasesStatus();
+      refreshCases();
       dispatchResetIsUpdated();
     }
-  }, [isDeleted, isUpdated, filterOptions, queryParams]);
-
+  }, [isDeleted, isUpdated]);
   const [deleteThisCase, setDeleteThisCase] = useState({
     title: '',
     id: '',
@@ -327,6 +329,10 @@ export const AllCases = React.memo(() => {
                   >
                     {i18n.BULK_ACTIONS}
                   </UtilityBarAction>
+
+                  <UtilityBarAction iconSide="left" iconType="refresh" onClick={refreshCases}>
+                    {i18n.REFRESH}
+                  </UtilityBarAction>
                 </UtilityBarGroup>
               </UtilityBarSection>
             </UtilityBar>
diff --git a/x-pack/legacy/plugins/siem/public/pages/case/components/all_cases/translations.ts b/x-pack/legacy/plugins/siem/public/pages/case/components/all_cases/translations.ts
index b18134f6d093e..e8459454576e3 100644
--- a/x-pack/legacy/plugins/siem/public/pages/case/components/all_cases/translations.ts
+++ b/x-pack/legacy/plugins/siem/public/pages/case/components/all_cases/translations.ts
@@ -62,3 +62,17 @@ export const CLOSED = i18n.translate('xpack.siem.case.caseTable.closed', {
 export const DELETE = i18n.translate('xpack.siem.case.caseTable.delete', {
   defaultMessage: 'Delete',
 });
+export const REQUIRES_UPDATE = i18n.translate('xpack.siem.case.caseTable.requiresUpdate', {
+  defaultMessage: ' requires update',
+});
+
+export const UP_TO_DATE = i18n.translate('xpack.siem.case.caseTable.upToDate', {
+  defaultMessage: ' is up to date',
+});
+export const NOT_PUSHED = i18n.translate('xpack.siem.case.caseTable.notPushed', {
+  defaultMessage: 'Not pushed',
+});
+
+export const REFRESH = i18n.translate('xpack.siem.case.caseTable.refreshTitle', {
+  defaultMessage: 'Refresh',
+});
diff --git a/x-pack/legacy/plugins/siem/public/pages/case/components/case_view/translations.ts b/x-pack/legacy/plugins/siem/public/pages/case/components/case_view/translations.ts
index beba80ccd934c..c081567e3be72 100644
--- a/x-pack/legacy/plugins/siem/public/pages/case/components/case_view/translations.ts
+++ b/x-pack/legacy/plugins/siem/public/pages/case/components/case_view/translations.ts
@@ -59,6 +59,10 @@ export const EDIT_DESCRIPTION = i18n.translate('xpack.siem.case.caseView.edit.de
   defaultMessage: 'Edit description',
 });
 
+export const QUOTE = i18n.translate('xpack.siem.case.caseView.edit.quote', {
+  defaultMessage: 'Quote',
+});
+
 export const EDIT_COMMENT = i18n.translate('xpack.siem.case.caseView.edit.comment', {
   defaultMessage: 'Edit comment',
 });
diff --git a/x-pack/legacy/plugins/siem/public/pages/case/components/property_actions/index.tsx b/x-pack/legacy/plugins/siem/public/pages/case/components/property_actions/index.tsx
index 01ccf3c510b60..25332982dca1a 100644
--- a/x-pack/legacy/plugins/siem/public/pages/case/components/property_actions/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/case/components/property_actions/index.tsx
@@ -45,7 +45,7 @@ export const PropertyActions = React.memo<PropertyActionsProps>(({ propertyActio
 
   const onClosePopover = useCallback((cb?: () => void) => {
     setShowActions(false);
-    if (cb) {
+    if (cb != null) {
       cb();
     }
   }, []);
diff --git a/x-pack/legacy/plugins/siem/public/pages/case/components/user_action_tree/index.tsx b/x-pack/legacy/plugins/siem/public/pages/case/components/user_action_tree/index.tsx
index 8b77186f76f77..d8b9ac115426a 100644
--- a/x-pack/legacy/plugins/siem/public/pages/case/components/user_action_tree/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/case/components/user_action_tree/index.tsx
@@ -57,6 +57,7 @@ export const UserActionTree = React.memo(
     );
     const currentUser = useCurrentUser();
     const [manageMarkdownEditIds, setManangeMardownEditIds] = useState<string[]>([]);
+    const [insertQuote, setInsertQuote] = useState<string | null>(null);
 
     const handleManageMarkdownEditId = useCallback(
       (id: string) => {
@@ -92,6 +93,9 @@ export const UserActionTree = React.memo(
             top: y,
             behavior: 'smooth',
           });
+          if (id === 'add-comment') {
+            moveToTarget.getElementsByTagName('textarea')[0].focus();
+          }
         }
         window.clearTimeout(handlerTimeoutId.current);
         setSelectedOutlineCommentId(id);
@@ -103,6 +107,15 @@ export const UserActionTree = React.memo(
       [handlerTimeoutId.current]
     );
 
+    const handleManageQuote = useCallback(
+      (quote: string) => {
+        const addCarrots = quote.replace(new RegExp('\r?\n', 'g'), '  \n> ');
+        setInsertQuote(`> ${addCarrots} \n`);
+        handleOutlineComment('add-comment');
+      },
+      [handleOutlineComment]
+    );
+
     const handleUpdate = useCallback(
       (comment: Comment) => {
         addPostedComment(comment);
@@ -131,12 +144,13 @@ export const UserActionTree = React.memo(
       () => (
         <AddComment
           caseId={caseData.id}
+          insertQuote={insertQuote}
           onCommentPosted={handleUpdate}
           onCommentSaving={handleManageMarkdownEditId.bind(null, NEW_ID)}
           showLoading={false}
         />
       ),
-      [caseData.id, handleUpdate]
+      [caseData.id, handleUpdate, insertQuote]
     );
 
     useEffect(() => {
@@ -156,10 +170,12 @@ export const UserActionTree = React.memo(
           isEditable={manageMarkdownEditIds.includes(DESCRIPTION_ID)}
           isLoading={isLoadingDescription}
           labelEditAction={i18n.EDIT_DESCRIPTION}
+          labelQuoteAction={i18n.QUOTE}
           labelTitle={<>{i18n.ADDED_DESCRIPTION}</>}
           fullName={caseData.createdBy.fullName ?? caseData.createdBy.username}
           markdown={MarkdownDescription}
           onEdit={handleManageMarkdownEditId.bind(null, DESCRIPTION_ID)}
+          onQuote={handleManageQuote.bind(null, caseData.description)}
           userName={caseData.createdBy.username}
         />
 
@@ -176,6 +192,7 @@ export const UserActionTree = React.memo(
                   isEditable={manageMarkdownEditIds.includes(comment.id)}
                   isLoading={isLoadingIds.includes(comment.id)}
                   labelEditAction={i18n.EDIT_COMMENT}
+                  labelQuoteAction={i18n.QUOTE}
                   labelTitle={<>{i18n.ADDED_COMMENT}</>}
                   fullName={comment.createdBy.fullName ?? comment.createdBy.username}
                   markdown={
@@ -188,6 +205,7 @@ export const UserActionTree = React.memo(
                     />
                   }
                   onEdit={handleManageMarkdownEditId.bind(null, comment.id)}
+                  onQuote={handleManageQuote.bind(null, comment.comment)}
                   outlineComment={handleOutlineComment}
                   userName={comment.createdBy.username}
                   updatedAt={comment.updatedAt}
diff --git a/x-pack/legacy/plugins/siem/public/pages/case/components/user_action_tree/user_action_item.tsx b/x-pack/legacy/plugins/siem/public/pages/case/components/user_action_tree/user_action_item.tsx
index 10a7c56e2eb2d..c1dbe3b5fdbfa 100644
--- a/x-pack/legacy/plugins/siem/public/pages/case/components/user_action_tree/user_action_item.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/case/components/user_action_tree/user_action_item.tsx
@@ -25,11 +25,13 @@ interface UserActionItemProps {
   isEditable: boolean;
   isLoading: boolean;
   labelEditAction?: string;
+  labelQuoteAction?: string;
   labelTitle?: JSX.Element;
   linkId?: string | null;
   fullName: string;
   markdown?: React.ReactNode;
   onEdit?: (id: string) => void;
+  onQuote?: (id: string) => void;
   userName: string;
   updatedAt?: string | null;
   outlineComment?: (id: string) => void;
@@ -113,11 +115,13 @@ export const UserActionItem = ({
   isEditable,
   isLoading,
   labelEditAction,
+  labelQuoteAction,
   labelTitle,
   linkId,
   fullName,
   markdown,
   onEdit,
+  onQuote,
   outlineComment,
   showBottomFooter,
   showTopFooter,
@@ -147,11 +151,13 @@ export const UserActionItem = ({
                 id={id}
                 isLoading={isLoading}
                 labelEditAction={labelEditAction}
+                labelQuoteAction={labelQuoteAction}
                 labelTitle={labelTitle ?? <></>}
                 linkId={linkId}
                 userName={userName}
                 updatedAt={updatedAt}
                 onEdit={onEdit}
+                onQuote={onQuote}
                 outlineComment={outlineComment}
               />
               {markdown}
diff --git a/x-pack/legacy/plugins/siem/public/pages/case/components/user_action_tree/user_action_title.tsx b/x-pack/legacy/plugins/siem/public/pages/case/components/user_action_tree/user_action_title.tsx
index 6ca81667d9712..391f54da7e972 100644
--- a/x-pack/legacy/plugins/siem/public/pages/case/components/user_action_tree/user_action_title.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/case/components/user_action_tree/user_action_title.tsx
@@ -30,11 +30,13 @@ interface UserActionTitleProps {
   id: string;
   isLoading: boolean;
   labelEditAction?: string;
+  labelQuoteAction?: string;
   labelTitle: JSX.Element;
   linkId?: string | null;
   updatedAt?: string | null;
   userName: string;
   onEdit?: (id: string) => void;
+  onQuote?: (id: string) => void;
   outlineComment?: (id: string) => void;
 }
 
@@ -43,27 +45,39 @@ export const UserActionTitle = ({
   id,
   isLoading,
   labelEditAction,
+  labelQuoteAction,
   labelTitle,
   linkId,
   userName,
   updatedAt,
   onEdit,
+  onQuote,
   outlineComment,
 }: UserActionTitleProps) => {
   const { detailName: caseId } = useParams();
   const urlSearch = useGetUrlSearch(navTabs.case);
   const propertyActions = useMemo(() => {
-    if (labelEditAction != null && onEdit != null) {
-      return [
-        {
-          iconType: 'pencil',
-          label: labelEditAction,
-          onClick: () => onEdit(id),
-        },
-      ];
-    }
-    return [];
-  }, [id, labelEditAction, onEdit]);
+    return [
+      ...(labelEditAction != null && onEdit != null
+        ? [
+            {
+              iconType: 'pencil',
+              label: labelEditAction,
+              onClick: () => onEdit(id),
+            },
+          ]
+        : []),
+      ...(labelQuoteAction != null && onQuote != null
+        ? [
+            {
+              iconType: 'quote',
+              label: labelQuoteAction,
+              onClick: () => onQuote(id),
+            },
+          ]
+        : []),
+    ];
+  }, [id, labelEditAction, onEdit, labelQuoteAction, onQuote]);
 
   const handleAnchorLink = useCallback(() => {
     copy(

From 411959fc47da4c620bc98f8beec4f21cf69c72f6 Mon Sep 17 00:00:00 2001
From: "Devin W. Hurley" <devin.hurley@elastic.co>
Date: Wed, 25 Mar 2020 01:52:06 -0400
Subject: [PATCH 126/179] fix type check failure on master (#61204)

---
 .../rules/use_rule_status.test.tsx                | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/x-pack/legacy/plugins/siem/public/containers/detection_engine/rules/use_rule_status.test.tsx b/x-pack/legacy/plugins/siem/public/containers/detection_engine/rules/use_rule_status.test.tsx
index 834fc1b4196da..7269bf1baa5e5 100644
--- a/x-pack/legacy/plugins/siem/public/containers/detection_engine/rules/use_rule_status.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/containers/detection_engine/rules/use_rule_status.test.tsx
@@ -12,11 +12,21 @@ import {
   ReturnRulesStatuses,
 } from './use_rule_status';
 import * as api from './api';
-import { RuleType } from '../rules/types';
+import { RuleType, Rule } from '../rules/types';
 
 jest.mock('./api');
 
-const testRule = {
+const testRule: Rule = {
+  actions: [
+    {
+      group: 'fake group',
+      id: 'fake id',
+      action_type_id: 'fake action_type_id',
+      params: {
+        someKey: 'someVal',
+      },
+    },
+  ],
   created_at: 'mm/dd/yyyyTHH:MM:sssz',
   created_by: 'mockUser',
   description: 'some desc',
@@ -45,6 +55,7 @@ const testRule = {
   severity: 'high',
   tags: ['APM'],
   threat: [],
+  throttle: null,
   to: 'now',
   type: 'query' as RuleType,
   updated_at: 'mm/dd/yyyyTHH:MM:sssz',

From 488b9e2648517c1c04a5c99191cb14bfa52f0252 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B8ren=20Louv-Jansen?= <sorenlouv@gmail.com>
Date: Wed, 25 Mar 2020 07:09:28 +0100
Subject: [PATCH 127/179] [APM] Improve e2e runner (#61163)

---
 src/cli/cluster/cluster_manager.ts            |   2 +-
 .../plugins/apm/e2e/cypress/webpack.config.js |   1 +
 .../plugins/apm/e2e/ingest-data/replay.js     |  44 +++++---
 x-pack/legacy/plugins/apm/e2e/package.json    |   1 +
 x-pack/legacy/plugins/apm/e2e/run-e2e.sh      | 101 ++++++++++++------
 x-pack/legacy/plugins/apm/e2e/yarn.lock       |  18 ++++
 x-pack/legacy/plugins/apm/readme.md           |  54 ++++++----
 7 files changed, 151 insertions(+), 70 deletions(-)

diff --git a/src/cli/cluster/cluster_manager.ts b/src/cli/cluster/cluster_manager.ts
index 8862b96e74401..44b6c39556afd 100644
--- a/src/cli/cluster/cluster_manager.ts
+++ b/src/cli/cluster/cluster_manager.ts
@@ -264,7 +264,7 @@ export class ClusterManager {
       fromRoot('src/legacy/server/sass/__tmp__'),
       fromRoot('x-pack/legacy/plugins/reporting/.chromium'),
       fromRoot('x-pack/legacy/plugins/siem/cypress'),
-      fromRoot('x-pack/legacy/plugins/apm/e2e/cypress'),
+      fromRoot('x-pack/legacy/plugins/apm/e2e'),
       fromRoot('x-pack/legacy/plugins/apm/scripts'),
       fromRoot('x-pack/legacy/plugins/canvas/canvas_plugin_src'), // prevents server from restarting twice for Canvas plugin changes,
       'plugins/java_languageserver',
diff --git a/x-pack/legacy/plugins/apm/e2e/cypress/webpack.config.js b/x-pack/legacy/plugins/apm/e2e/cypress/webpack.config.js
index 823b23cfdffec..8db6a1ef83520 100644
--- a/x-pack/legacy/plugins/apm/e2e/cypress/webpack.config.js
+++ b/x-pack/legacy/plugins/apm/e2e/cypress/webpack.config.js
@@ -14,6 +14,7 @@ module.exports = {
       {
         test: /\.ts$/,
         exclude: [/node_modules/],
+        include: [/e2e\/cypress/],
         use: [
           {
             loader: 'ts-loader'
diff --git a/x-pack/legacy/plugins/apm/e2e/ingest-data/replay.js b/x-pack/legacy/plugins/apm/e2e/ingest-data/replay.js
index 59cd34704d624..5301eafece06d 100644
--- a/x-pack/legacy/plugins/apm/e2e/ingest-data/replay.js
+++ b/x-pack/legacy/plugins/apm/e2e/ingest-data/replay.js
@@ -32,6 +32,7 @@ const path = require('path');
 const axios = require('axios');
 const readFile = promisify(fs.readFile);
 const pLimit = require('p-limit');
+const pRetry = require('p-retry');
 const { argv } = require('yargs');
 const ora = require('ora');
 
@@ -49,8 +50,6 @@ if (!EVENTS_PATH) {
   process.exit(1);
 }
 
-const delay = ms => new Promise(resolve => setTimeout(resolve, ms));
-
 const requestProgress = {
   succeeded: 0,
   failed: 0,
@@ -59,7 +58,7 @@ const requestProgress = {
 
 const spinner = ora({ text: 'Warming up...', stream: process.stdout });
 
-function updateSpinnerText({ success }) {
+function incrementSpinnerCount({ success }) {
   success ? requestProgress.succeeded++ : requestProgress.failed++;
   const remaining =
     requestProgress.total -
@@ -71,7 +70,6 @@ function updateSpinnerText({ success }) {
 async function insertItem(item) {
   try {
     const url = `${APM_SERVER_URL}${item.url}`;
-
     const headers = {
       'content-type': 'application/x-ndjson'
     };
@@ -86,16 +84,11 @@ async function insertItem(item) {
       headers,
       data: item.body
     });
-
-    updateSpinnerText({ success: true });
-
-    // add delay to avoid flooding the queue
-    return delay(500);
   } catch (e) {
     console.error(
       `${e.response ? JSON.stringify(e.response.data) : e.message}`
     );
-    updateSpinnerText({ success: false });
+    throw e;
   }
 }
 
@@ -112,17 +105,34 @@ async function init() {
   requestProgress.total = items.length;
 
   const limit = pLimit(20); // number of concurrent requests
-  await Promise.all(items.map(item => limit(() => insertItem(item))));
+  await Promise.all(
+    items.map(async item => {
+      try {
+        // retry 5 times with exponential backoff
+        await pRetry(() => limit(() => insertItem(item)), { retries: 5 });
+        incrementSpinnerCount({ success: true });
+      } catch (e) {
+        incrementSpinnerCount({ success: false });
+      }
+    })
+  );
 }
 
 init()
+  .then(() => {
+    if (requestProgress.succeeded === requestProgress.total) {
+      spinner.succeed(
+        `Successfully ingested ${requestProgress.succeeded} of ${requestProgress.total} events`
+      );
+      process.exit(0);
+    } else {
+      spinner.fail(
+        `Ingested ${requestProgress.succeeded} of ${requestProgress.total} events`
+      );
+      process.exit(1);
+    }
+  })
   .catch(e => {
     console.log('An error occurred:', e);
     process.exit(1);
-  })
-  .then(() => {
-    spinner.succeed(
-      `Successfully ingested ${requestProgress.succeeded} of ${requestProgress.total} events`
-    );
-    process.exit(0);
   });
diff --git a/x-pack/legacy/plugins/apm/e2e/package.json b/x-pack/legacy/plugins/apm/e2e/package.json
index e298be7db514c..57500dfe3fdc8 100644
--- a/x-pack/legacy/plugins/apm/e2e/package.json
+++ b/x-pack/legacy/plugins/apm/e2e/package.json
@@ -18,6 +18,7 @@
     "js-yaml": "^3.13.1",
     "ora": "^4.0.3",
     "p-limit": "^2.2.1",
+    "p-retry": "^4.2.0",
     "ts-loader": "^6.2.2",
     "typescript": "3.8.3",
     "wait-on": "^4.0.1",
diff --git a/x-pack/legacy/plugins/apm/e2e/run-e2e.sh b/x-pack/legacy/plugins/apm/e2e/run-e2e.sh
index 6c9ac83678682..5e55dc1eb834d 100755
--- a/x-pack/legacy/plugins/apm/e2e/run-e2e.sh
+++ b/x-pack/legacy/plugins/apm/e2e/run-e2e.sh
@@ -1,3 +1,5 @@
+#!/bin/sh
+
 # variables
 KIBANA_PORT=5701
 ELASTICSEARCH_PORT=9201
@@ -14,52 +16,74 @@ fi
 bold=$(tput bold)
 normal=$(tput sgr0)
 
-# Create tmp folder
-mkdir -p tmp
+# paths
+E2E_DIR="${0%/*}"
+TMP_DIR="./tmp"
+APM_IT_DIR="./tmp/apm-integration-testing"
 
-# Ask user to start Kibana
-echo "
-${bold}To start Kibana please run the following command:${normal}
+cd ${E2E_DIR}
 
-node ./scripts/kibana --no-base-path --dev --no-dev-config --config x-pack/legacy/plugins/apm/e2e/ci/kibana.e2e.yml
-"
+#
+# Ask user to start Kibana
+##################################################
+echo "\n${bold}To start Kibana please run the following command:${normal}
+node ./scripts/kibana --no-base-path --dev --no-dev-config --config x-pack/legacy/plugins/apm/e2e/ci/kibana.e2e.yml"
 
-# Clone or pull apm-integration-testing
-printf "\n${bold}=== apm-integration-testing ===\n${normal}"
+#
+# Create tmp folder
+##################################################
+echo "\n${bold}Temporary folder${normal}"
+echo "Temporary files will be stored in: ${TMP_DIR}"
+mkdir -p ${TMP_DIR}
+
+#
+# apm-integration-testing
+##################################################
+printf "\n${bold}apm-integration-testing (logs: ${TMP_DIR}/apm-it.log)\n${normal}"
+
+# pull if folder already exists
+if [ -d ${APM_IT_DIR} ]; then
+    echo "Pulling from master..."
+    git -C ${APM_IT_DIR} pull &> ${TMP_DIR}/apm-it.log
 
-git clone "https://github.com/elastic/apm-integration-testing.git" "./tmp/apm-integration-testing" &> /dev/null
-if [ $? -eq 0 ]; then
-    echo "Cloning repository"
+# clone if folder does not exists
 else
-    echo "Pulling from master..."
-    git -C "./tmp/apm-integration-testing" pull &> /dev/null
+    echo "Cloning repository"
+    git clone "https://github.com/elastic/apm-integration-testing.git" ${APM_IT_DIR} &> ${TMP_DIR}/apm-it.log
+fi
+
+# Stop if clone/pull failed
+if [ $? -ne 0 ]; then
+    printf "\n⚠️  Initializing apm-integration-testing failed. \n"
+    exit 1
 fi
 
 # Start apm-integration-testing
-echo "Starting (logs: ./tmp/apm-it.log)"
-./tmp/apm-integration-testing/scripts/compose.py start master \
+echo "Starting docker-compose"
+${APM_IT_DIR}/scripts/compose.py start master \
     --no-kibana \
     --elasticsearch-port $ELASTICSEARCH_PORT \
     --apm-server-port=$APM_SERVER_PORT \
     --elasticsearch-heap 4g \
-    &> ./tmp/apm-it.log
+    &> ${TMP_DIR}/apm-it.log
 
 # Stop if apm-integration-testing failed to start correctly
 if [ $? -ne 0 ]; then
     printf "⚠️  apm-integration-testing could not be started.\n"
-    printf "Please see the logs in ./tmp/apm-it.log\n\n"
-    printf "As a last resort, reset docker with:\n\n./tmp/apm-integration-testing/scripts/compose.py stop && system prune --all --force --volumes\n"
+    printf "Please see the logs in ${TMP_DIR}/apm-it.log\n\n"
+    printf "As a last resort, reset docker with:\n\n cd ${APM_IT_DIR} && scripts/compose.py stop && docker system prune --all --force --volumes\n"
     exit 1
 fi
 
-printf "\n${bold}=== Static mock data ===\n${normal}"
+#
+# Static mock data
+##################################################
+printf "\n${bold}Static mock data (logs: ${TMP_DIR}/ingest-data.log)\n${normal}"
 
 # Download static data if not already done
-if [ -e "./tmp/events.json" ]; then
-    echo 'Skip: events.json already exists. Not downloading'
-else
+if [ ! -e "${TMP_DIR}/events.json" ]; then
     echo 'Downloading events.json...'
-    curl --silent https://storage.googleapis.com/apm-ui-e2e-static-data/events.json --output ./tmp/events.json
+    curl --silent https://storage.googleapis.com/apm-ui-e2e-static-data/events.json --output ${TMP_DIR}/events.json
 fi
 
 # echo "Deleting existing indices (apm* and .apm*)"
@@ -67,23 +91,38 @@ curl --silent --user admin:changeme -XDELETE "localhost:${ELASTICSEARCH_PORT}/.a
 curl --silent --user admin:changeme -XDELETE "localhost:${ELASTICSEARCH_PORT}/apm*" > /dev/null
 
 # Ingest data into APM Server
-echo "Ingesting data (logs: tmp/ingest-data.log)"
-node ingest-data/replay.js --server-url http://localhost:$APM_SERVER_PORT --events ./tmp/events.json  2> ./tmp/ingest-data.log
+node ingest-data/replay.js --server-url http://localhost:$APM_SERVER_PORT --events ${TMP_DIR}/events.json 2> ${TMP_DIR}/ingest-data.log
+
+# Stop if not all events were ingested correctly
+if [ $? -ne 0 ]; then
+    printf "\n⚠️  Not all events were ingested correctly. This might affect test tests. \n"
+    exit 1
+fi
 
-# Install local dependencies
-printf "\n"
-echo "Installing local dependencies (logs: tmp/e2e-yarn.log)"
-yarn &> ./tmp/e2e-yarn.log
+#
+# Cypress
+##################################################
+echo "\n${bold}Cypress (logs: ${TMP_DIR}/e2e-yarn.log)${normal}"
+echo "Installing cypress dependencies "
+yarn &> ${TMP_DIR}/e2e-yarn.log
 
+#
 # Wait for Kibana to start
-echo "Waiting for Kibana to start..."
+##################################################
+echo "\n${bold}Waiting for Kibana to start...${normal}"
+echo "Note: you need to start Kibana manually. Find the instructions at the top."
 yarn wait-on -i 500 -w 500 http://localhost:$KIBANA_PORT > /dev/null
 
 echo "\n✅ Setup completed successfully. Running tests...\n"
 
+#
 # run cypress tests
+##################################################
 yarn cypress run --config pageLoadTimeout=100000,watchForFileChanges=true
 
+#
+# Run interactively
+##################################################
 echo "
 
 ${bold}If you want to run the test interactively, run:${normal}
diff --git a/x-pack/legacy/plugins/apm/e2e/yarn.lock b/x-pack/legacy/plugins/apm/e2e/yarn.lock
index 474337931d665..b7b531a9c73c0 100644
--- a/x-pack/legacy/plugins/apm/e2e/yarn.lock
+++ b/x-pack/legacy/plugins/apm/e2e/yarn.lock
@@ -1019,6 +1019,11 @@
   resolved "https://registry.yarnpkg.com/@types/node/-/node-10.17.14.tgz#b6c60ebf2fb5e4229fdd751ff9ddfae0f5f31541"
   integrity sha512-G0UmX5uKEmW+ZAhmZ6PLTQ5eu/VPaT+d/tdLd5IFsKRPcbe6lPxocBtcYBFSaLaCW8O60AX90e91Nsp8lVHCNw==
 
+"@types/retry@^0.12.0":
+  version "0.12.0"
+  resolved "https://registry.yarnpkg.com/@types/retry/-/retry-0.12.0.tgz#2b35eccfcee7d38cd72ad99232fbd58bffb3c84d"
+  integrity sha512-wWKOClTTiizcZhXnPY4wikVAwmdYHp8q6DmC+EJUzAMsycb7HB32Kh9RN4+0gExjmPmZSAQjgURXIGATPegAvA==
+
 "@types/sizzle@2.3.2":
   version "2.3.2"
   resolved "https://registry.yarnpkg.com/@types/sizzle/-/sizzle-2.3.2.tgz#a811b8c18e2babab7d542b3365887ae2e4d9de47"
@@ -4342,6 +4347,14 @@ p-map@^2.0.0:
   resolved "https://registry.yarnpkg.com/p-map/-/p-map-2.1.0.tgz#310928feef9c9ecc65b68b17693018a665cea175"
   integrity sha512-y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw==
 
+p-retry@^4.2.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/p-retry/-/p-retry-4.2.0.tgz#ea9066c6b44f23cab4cd42f6147cdbbc6604da5d"
+  integrity sha512-jPH38/MRh263KKcq0wBNOGFJbm+U6784RilTmHjB/HM9kH9V8WlCpVUcdOmip9cjXOh6MxZ5yk1z2SjDUJfWmA==
+  dependencies:
+    "@types/retry" "^0.12.0"
+    retry "^0.12.0"
+
 p-try@^2.0.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6"
@@ -4874,6 +4887,11 @@ ret@~0.1.10:
   resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc"
   integrity sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==
 
+retry@^0.12.0:
+  version "0.12.0"
+  resolved "https://registry.yarnpkg.com/retry/-/retry-0.12.0.tgz#1b42a6266a21f07421d1b0b54b7dc167b01c013b"
+  integrity sha1-G0KmJmoh8HQh0bC1S33BZ7AcATs=
+
 rimraf@^2.5.4, rimraf@^2.6.3:
   version "2.7.1"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec"
diff --git a/x-pack/legacy/plugins/apm/readme.md b/x-pack/legacy/plugins/apm/readme.md
index addf73064716c..e8e2514c83fcb 100644
--- a/x-pack/legacy/plugins/apm/readme.md
+++ b/x-pack/legacy/plugins/apm/readme.md
@@ -29,31 +29,13 @@ cd apm-integration-testing/
 
 _Docker Compose is required_
 
-### Setup default APM users
-
-APM behaves differently depending on which the role and permissions a logged in user has.
-For testing purposes APM uses 3 custom users:
-
-**apm_read_user**: Apps: read. Indices: read (`apm-*`)
-
-**apm_write_user**: Apps: read/write. Indices: read (`apm-*`)
-
-**kibana_write_user** Apps: read/write. Indices: None
-
-To create the users with the correct roles run the following script:
+### E2E (Cypress) tests
 
 ```sh
-node x-pack/legacy/plugins/apm/scripts/setup-kibana-security.js --role-suffix <github-username-or-something-unique>
+x-pack/legacy/plugins/apm/e2e/run-e2e.sh
 ```
 
-The users will be created with the password specified in kibana.dev.yml for `elasticsearch.password`
-
-### Debugging Elasticsearch queries
-
-All APM api endpoints accept `_debug=true` as a query param that will result in the underlying ES query being outputted in the Kibana backend process.
-
-Example:
-`/api/apm/services/my_service?_debug=true`
+_Starts Kibana (:5701), APM Server (:8201) and Elasticsearch (:9201). Ingests sample data into Elasticsearch via APM Server and runs the Cypress tests_
 
 ### Unit testing
 
@@ -74,11 +56,13 @@ node scripts/jest.js plugins/apm --updateSnapshot
 ### Functional tests
 
 **Start server**
+
 ```
 node scripts/functional_tests_server --config x-pack/test/functional/config.js
 ```
 
 **Run tests**
+
 ```
 node scripts/functional_test_runner --config x-pack/test/functional/config.js --grep='APM specs'
 ```
@@ -89,11 +73,13 @@ For debugging access Elasticsearch on http://localhost:9220` (elastic/changeme)
 ### API integration tests
 
 **Start server**
+
 ```
 node scripts/functional_tests_server --config x-pack/test/api_integration/config.js
 ```
 
 **Run tests**
+
 ```
 node scripts/functional_test_runner --config x-pack/test/api_integration/config.js --grep='APM specs'
 ```
@@ -117,6 +103,32 @@ yarn prettier  "./x-pack/legacy/plugins/apm/**/*.{tsx,ts,js}" --write
 yarn eslint ./x-pack/legacy/plugins/apm --fix
 ```
 
+### Setup default APM users
+
+APM behaves differently depending on which the role and permissions a logged in user has.
+For testing purposes APM uses 3 custom users:
+
+**apm_read_user**: Apps: read. Indices: read (`apm-*`)
+
+**apm_write_user**: Apps: read/write. Indices: read (`apm-*`)
+
+**kibana_write_user** Apps: read/write. Indices: None
+
+To create the users with the correct roles run the following script:
+
+```sh
+node x-pack/legacy/plugins/apm/scripts/setup-kibana-security.js --role-suffix <github-username-or-something-unique>
+```
+
+The users will be created with the password specified in kibana.dev.yml for `elasticsearch.password`
+
+### Debugging Elasticsearch queries
+
+All APM api endpoints accept `_debug=true` as a query param that will result in the underlying ES query being outputted in the Kibana backend process.
+
+Example:
+`/api/apm/services/my_service?_debug=true`
+
 #### Storybook
 
 Start the [Storybook](https://storybook.js.org/) development environment with

From caaeb3758a86709806f5c7509c93f343b8cfcd52 Mon Sep 17 00:00:00 2001
From: Walter Rafelsberger <walter@elastic.co>
Date: Wed, 25 Mar 2020 07:29:35 +0100
Subject: [PATCH 128/179] [ML] Data Frame Analytics: Use EuiDataGrid for
 outlier result page (#58235)

- Replaces EuiInMemoryTable with EuiDataGrid
- Replaces the memory table's search with QueryInputFilter
---
 .../data_frame_analytics/_index.scss          |   1 -
 .../data_frame_analytics/common/analytics.ts  |   2 +
 .../data_frame_analytics/common/data_grid.ts  |  23 +
 .../data_frame_analytics/common/fields.ts     |  20 +-
 .../data_frame_analytics/common/index.ts      |   2 +
 .../components/exploration/_exploration.scss  |  19 -
 .../components/exploration/_index.scss        |   1 -
 .../components/exploration/exploration.tsx    | 572 ------------------
 .../exploration/use_explore_data.ts           | 153 -----
 .../exploration_data_grid.tsx                 | 145 +++++
 .../components/exploration_data_grid/index.ts |   7 +
 .../exploration_query_bar.tsx                 | 106 ++++
 .../components/exploration_query_bar/index.ts |   7 +
 .../index.ts                                  |   2 +-
 .../outlier_exploration.test.tsx}             |   4 +-
 .../outlier_exploration.tsx                   | 220 +++++++
 .../use_explore_data}/common.test.ts          |   0
 .../use_explore_data}/common.ts               |   0
 .../hooks/use_explore_data/index.ts           |   7 +
 .../use_explore_data/use_explore_data.ts      | 232 +++++++
 .../pages/analytics_exploration/page.tsx      |   8 +-
 .../translations/translations/ja-JP.json      |   7 -
 .../translations/translations/zh-CN.json      |   7 -
 23 files changed, 767 insertions(+), 778 deletions(-)
 create mode 100644 x-pack/plugins/ml/public/application/data_frame_analytics/common/data_grid.ts
 delete mode 100644 x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/exploration/_exploration.scss
 delete mode 100644 x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/exploration/_index.scss
 delete mode 100644 x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/exploration/exploration.tsx
 delete mode 100644 x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/exploration/use_explore_data.ts
 create mode 100644 x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/exploration_data_grid/exploration_data_grid.tsx
 create mode 100644 x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/exploration_data_grid/index.ts
 create mode 100644 x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/exploration_query_bar/exploration_query_bar.tsx
 create mode 100644 x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/exploration_query_bar/index.ts
 rename x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/{exploration => outlier_exploration}/index.ts (80%)
 rename x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/{exploration/exploration.test.tsx => outlier_exploration/outlier_exploration.test.tsx} (88%)
 create mode 100644 x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/outlier_exploration/outlier_exploration.tsx
 rename x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/{components/exploration => hooks/use_explore_data}/common.test.ts (100%)
 rename x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/{components/exploration => hooks/use_explore_data}/common.ts (100%)
 create mode 100644 x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/hooks/use_explore_data/index.ts
 create mode 100644 x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/hooks/use_explore_data/use_explore_data.ts

diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/_index.scss b/x-pack/plugins/ml/public/application/data_frame_analytics/_index.scss
index 962d3f4c7bd54..83314a74331fd 100644
--- a/x-pack/plugins/ml/public/application/data_frame_analytics/_index.scss
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/_index.scss
@@ -1,4 +1,3 @@
-@import 'pages/analytics_exploration/components/exploration/index';
 @import 'pages/analytics_exploration/components/regression_exploration/index';
 @import 'pages/analytics_exploration/components/classification_exploration/index';
 @import 'pages/analytics_management/components/analytics_list/index';
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/common/analytics.ts b/x-pack/plugins/ml/public/application/data_frame_analytics/common/analytics.ts
index 9c239df357163..95a8dfbb308f8 100644
--- a/x-pack/plugins/ml/public/application/data_frame_analytics/common/analytics.ts
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/common/analytics.ts
@@ -56,6 +56,8 @@ export interface LoadExploreDataArg {
   direction: SortDirection;
   searchQuery: SavedSearchQuery;
   requiresKeyword?: boolean;
+  pageIndex?: number;
+  pageSize?: number;
 }
 
 export const SEARCH_SIZE = 1000;
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/common/data_grid.ts b/x-pack/plugins/ml/public/application/data_frame_analytics/common/data_grid.ts
new file mode 100644
index 0000000000000..2b6d733837562
--- /dev/null
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/common/data_grid.ts
@@ -0,0 +1,23 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { EuiDataGridStyle } from '@elastic/eui';
+
+export const euiDataGridStyle: EuiDataGridStyle = {
+  border: 'all',
+  fontSize: 's',
+  cellPadding: 's',
+  stripes: false,
+  rowHover: 'none',
+  header: 'shade',
+};
+
+export const euiDataGridToolbarSettings = {
+  showColumnSelector: true,
+  showStyleSelector: false,
+  showSortSelector: true,
+  showFullScreenSelector: false,
+};
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/common/fields.ts b/x-pack/plugins/ml/public/application/data_frame_analytics/common/fields.ts
index e8ebf2b1cfd56..fb1d4edb37af8 100644
--- a/x-pack/plugins/ml/public/application/data_frame_analytics/common/fields.ts
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/common/fields.ts
@@ -362,18 +362,16 @@ export const getDefaultSelectableFields = (docs: EsDoc[], resultsField: string):
   }
 
   const newDocFields = getFlattenedFields(docs[0]._source, resultsField);
-  return newDocFields
-    .filter(k => {
-      if (k === `${resultsField}.outlier_score`) {
-        return true;
-      }
-      if (k.split('.')[0] === resultsField) {
-        return false;
-      }
+  return newDocFields.filter(k => {
+    if (k === `${resultsField}.outlier_score`) {
+      return true;
+    }
+    if (k.split('.')[0] === resultsField) {
+      return false;
+    }
 
-      return docs.some(row => row._source[k] !== null);
-    })
-    .slice(0, MAX_COLUMNS);
+    return docs.some(row => row._source[k] !== null);
+  });
 };
 
 export const toggleSelectedFieldSimple = (
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/common/index.ts b/x-pack/plugins/ml/public/application/data_frame_analytics/common/index.ts
index 62ef73670d8f5..7b76faf613ce8 100644
--- a/x-pack/plugins/ml/public/application/data_frame_analytics/common/index.ts
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/common/index.ts
@@ -46,3 +46,5 @@ export {
   EsFieldName,
   MAX_COLUMNS,
 } from './fields';
+
+export { euiDataGridStyle, euiDataGridToolbarSettings } from './data_grid';
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/exploration/_exploration.scss b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/exploration/_exploration.scss
deleted file mode 100644
index b5b90347cf0b8..0000000000000
--- a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/exploration/_exploration.scss
+++ /dev/null
@@ -1,19 +0,0 @@
-.mlDataFrameAnalyticsExploration {
-  /* Overwrite to give table cells a more grid-like appearance */
-  .euiTableHeaderCell {
-    padding: 0 4px;
-  }
-  .euiTableCellContent {
-    padding: 0;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-    overflow: hidden;
-    line-height: 2;
-  }
-}
-
-.mlColoredTableCell {
-  width: 100%;
-  height: 100%;
-  padding: 0 4px;
-}
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/exploration/_index.scss b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/exploration/_index.scss
deleted file mode 100644
index ca27eec1d5a4d..0000000000000
--- a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/exploration/_index.scss
+++ /dev/null
@@ -1 +0,0 @@
-@import 'exploration';
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/exploration/exploration.tsx b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/exploration/exploration.tsx
deleted file mode 100644
index 70c29051c8215..0000000000000
--- a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/exploration/exploration.tsx
+++ /dev/null
@@ -1,572 +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, { FC, useEffect, useState } from 'react';
-import moment from 'moment-timezone';
-
-import { i18n } from '@kbn/i18n';
-
-import {
-  EuiBadge,
-  EuiButtonIcon,
-  EuiCallOut,
-  EuiCheckbox,
-  EuiFlexGroup,
-  EuiFlexItem,
-  EuiPanel,
-  EuiPopover,
-  EuiPopoverTitle,
-  EuiProgress,
-  EuiSpacer,
-  EuiText,
-  EuiTitle,
-  EuiToolTip,
-  Query,
-} from '@elastic/eui';
-
-import {
-  useColorRange,
-  ColorRangeLegend,
-  COLOR_RANGE,
-  COLOR_RANGE_SCALE,
-} from '../../../../../components/color_range_legend';
-import {
-  ColumnType,
-  mlInMemoryTableBasicFactory,
-  OnTableChangeArg,
-  SortingPropType,
-  SORT_DIRECTION,
-} from '../../../../../components/ml_in_memory_table';
-
-import { formatHumanReadableDateTimeSeconds } from '../../../../../util/date_utils';
-import { ml } from '../../../../../services/ml_api_service';
-
-import {
-  sortColumns,
-  toggleSelectedFieldSimple,
-  DataFrameAnalyticsConfig,
-  EsFieldName,
-  EsDoc,
-  MAX_COLUMNS,
-  INDEX_STATUS,
-  SEARCH_SIZE,
-  defaultSearchQuery,
-} from '../../../../common';
-import { isKeywordAndTextType } from '../../../../common/fields';
-
-import { getOutlierScoreFieldName } from './common';
-import { useExploreData, TableItem } from './use_explore_data';
-import {
-  DATA_FRAME_TASK_STATE,
-  Query as QueryType,
-} from '../../../analytics_management/components/analytics_list/common';
-import { getTaskStateBadge } from '../../../analytics_management/components/analytics_list/columns';
-import { SavedSearchQuery } from '../../../../../contexts/ml';
-import { getIndexPatternIdFromName } from '../../../../../util/index_utils';
-import { IIndexPattern } from '../../../../../../../../../../src/plugins/data/common/index_patterns';
-import { newJobCapsService } from '../../../../../services/new_job_capabilities_service';
-import { useMlContext } from '../../../../../contexts/ml';
-
-const FEATURE_INFLUENCE = 'feature_influence';
-
-const PAGE_SIZE_OPTIONS = [5, 10, 25, 50];
-
-const ExplorationTitle: React.FC<{ jobId: string }> = ({ jobId }) => (
-  <EuiTitle size="xs">
-    <span>
-      {i18n.translate('xpack.ml.dataframe.analytics.exploration.jobIdTitle', {
-        defaultMessage: 'Outlier detection job ID {jobId}',
-        values: { jobId },
-      })}
-    </span>
-  </EuiTitle>
-);
-
-interface Props {
-  jobId: string;
-  jobStatus: DATA_FRAME_TASK_STATE;
-}
-
-const getFeatureCount = (jobConfig?: DataFrameAnalyticsConfig, tableItems: TableItem[] = []) => {
-  if (jobConfig === undefined || tableItems.length === 0) {
-    return 0;
-  }
-
-  return Object.keys(tableItems[0]).filter(key =>
-    key.includes(`${jobConfig.dest.results_field}.${FEATURE_INFLUENCE}.`)
-  ).length;
-};
-
-export const Exploration: FC<Props> = React.memo(({ jobId, jobStatus }) => {
-  const [jobConfig, setJobConfig] = useState<DataFrameAnalyticsConfig | undefined>(undefined);
-
-  const [pageIndex, setPageIndex] = useState(0);
-  const [pageSize, setPageSize] = useState(25);
-
-  const [searchQuery, setSearchQuery] = useState<SavedSearchQuery>(defaultSearchQuery);
-  const [searchError, setSearchError] = useState<any>(undefined);
-  const [searchString, setSearchString] = useState<string | undefined>(undefined);
-
-  const mlContext = useMlContext();
-
-  const initializeJobCapsService = async () => {
-    if (jobConfig !== undefined) {
-      const sourceIndex = jobConfig.source.index[0];
-      const indexPatternId = getIndexPatternIdFromName(sourceIndex) || sourceIndex;
-      const indexPattern: IIndexPattern = await mlContext.indexPatterns.get(indexPatternId);
-      if (indexPattern !== undefined) {
-        await newJobCapsService.initializeFromIndexPattern(indexPattern, false, false);
-      }
-    }
-  };
-
-  useEffect(() => {
-    (async function() {
-      const analyticsConfigs = await ml.dataFrameAnalytics.getDataFrameAnalytics(jobId);
-      if (
-        Array.isArray(analyticsConfigs.data_frame_analytics) &&
-        analyticsConfigs.data_frame_analytics.length > 0
-      ) {
-        setJobConfig(analyticsConfigs.data_frame_analytics[0]);
-      }
-    })();
-  }, []);
-
-  useEffect(() => {
-    initializeJobCapsService();
-  }, [jobConfig && jobConfig.id]);
-
-  const [selectedFields, setSelectedFields] = useState([] as EsFieldName[]);
-  const [isColumnsPopoverVisible, setColumnsPopoverVisible] = useState(false);
-
-  function toggleColumnsPopover() {
-    setColumnsPopoverVisible(!isColumnsPopoverVisible);
-  }
-
-  function closeColumnsPopover() {
-    setColumnsPopoverVisible(false);
-  }
-
-  function toggleColumn(column: EsFieldName) {
-    if (tableItems.length > 0 && jobConfig !== undefined) {
-      // spread to a new array otherwise the component wouldn't re-render
-      setSelectedFields([...toggleSelectedFieldSimple(selectedFields, column)]);
-    }
-  }
-
-  const {
-    errorMessage,
-    loadExploreData,
-    sortField,
-    sortDirection,
-    status,
-    tableItems,
-  } = useExploreData(jobConfig, selectedFields, setSelectedFields);
-
-  let docFields: EsFieldName[] = [];
-  let docFieldsCount = 0;
-  if (tableItems.length > 0) {
-    docFields = Object.keys(tableItems[0]);
-    docFields.sort();
-    docFieldsCount = docFields.length;
-  }
-
-  const columns: Array<ColumnType<TableItem>> = [];
-
-  const cellBgColor = useColorRange(
-    COLOR_RANGE.BLUE,
-    COLOR_RANGE_SCALE.INFLUENCER,
-    getFeatureCount(jobConfig, tableItems)
-  );
-
-  if (jobConfig !== undefined && selectedFields.length > 0 && tableItems.length > 0) {
-    columns.push(
-      ...selectedFields.sort(sortColumns(tableItems[0], jobConfig.dest.results_field)).map(k => {
-        const column: ColumnType<TableItem> = {
-          field: k,
-          name: k,
-          sortable: true,
-          truncateText: true,
-        };
-
-        const render = (d: any, fullItem: EsDoc) => {
-          if (Array.isArray(d) && d.every(item => typeof item === 'string')) {
-            // If the cells data is an array of strings, return as a comma separated list.
-            // The list will get limited to 5 items with `…` at the end if there's more in the original array.
-            return `${d.slice(0, 5).join(', ')}${d.length > 5 ? ', …' : ''}`;
-          } else if (Array.isArray(d)) {
-            // If the cells data is an array of e.g. objects, display a 'array' badge with a
-            // tooltip that explains that this type of field is not supported in this table.
-            return (
-              <EuiToolTip
-                content={i18n.translate(
-                  'xpack.ml.dataframe.analytics.exploration.indexArrayToolTipContent',
-                  {
-                    defaultMessage:
-                      'The full content of this array based column cannot be displayed.',
-                  }
-                )}
-              >
-                <EuiBadge>
-                  {i18n.translate(
-                    'xpack.ml.dataframe.analytics.exploration.indexArrayBadgeContent',
-                    {
-                      defaultMessage: 'array',
-                    }
-                  )}
-                </EuiBadge>
-              </EuiToolTip>
-            );
-          } else if (typeof d === 'object' && d !== null) {
-            // If the cells data is an object, display a 'object' badge with a
-            // tooltip that explains that this type of field is not supported in this table.
-            return (
-              <EuiToolTip
-                content={i18n.translate(
-                  'xpack.ml.dataframe.analytics.exploration.indexObjectToolTipContent',
-                  {
-                    defaultMessage:
-                      'The full content of this object based column cannot be displayed.',
-                  }
-                )}
-              >
-                <EuiBadge>
-                  {i18n.translate(
-                    'xpack.ml.dataframe.analytics.exploration.indexObjectBadgeContent',
-                    {
-                      defaultMessage: 'object',
-                    }
-                  )}
-                </EuiBadge>
-              </EuiToolTip>
-            );
-          }
-
-          const split = k.split('.');
-          let backgroundColor;
-          const color = undefined;
-          const resultsField = jobConfig.dest.results_field;
-
-          if (fullItem[`${resultsField}.${FEATURE_INFLUENCE}.${k}`] !== undefined) {
-            backgroundColor = cellBgColor(fullItem[`${resultsField}.${FEATURE_INFLUENCE}.${k}`]);
-          }
-
-          if (split.length > 2 && split[0] === resultsField && split[1] === FEATURE_INFLUENCE) {
-            backgroundColor = cellBgColor(d);
-          }
-
-          return (
-            <div
-              className="mlColoredTableCell"
-              style={{
-                backgroundColor,
-                color,
-              }}
-            >
-              {d}
-            </div>
-          );
-        };
-
-        let columnType;
-
-        if (tableItems.length > 0) {
-          columnType = typeof tableItems[0][k];
-        }
-
-        if (typeof columnType !== 'undefined') {
-          switch (columnType) {
-            case 'boolean':
-              column.dataType = 'boolean';
-              break;
-            case 'Date':
-              column.align = 'right';
-              column.render = (d: any) =>
-                formatHumanReadableDateTimeSeconds(moment(d).unix() * 1000);
-              break;
-            case 'number':
-              column.dataType = 'number';
-              column.render = render;
-              break;
-            default:
-              column.render = render;
-              break;
-          }
-        } else {
-          column.render = render;
-        }
-
-        return column;
-      })
-    );
-  }
-
-  useEffect(() => {
-    if (jobConfig !== undefined) {
-      const outlierScoreFieldName = getOutlierScoreFieldName(jobConfig);
-      const outlierScoreFieldSelected = selectedFields.includes(outlierScoreFieldName);
-      let requiresKeyword = false;
-
-      const field = outlierScoreFieldSelected ? outlierScoreFieldName : selectedFields[0];
-      const direction = outlierScoreFieldSelected ? SORT_DIRECTION.DESC : SORT_DIRECTION.ASC;
-
-      if (outlierScoreFieldSelected === false) {
-        requiresKeyword = isKeywordAndTextType(field);
-      }
-
-      loadExploreData({ field, direction, searchQuery, requiresKeyword });
-    }
-  }, [JSON.stringify(searchQuery)]);
-
-  useEffect(() => {
-    // by default set the sorting to descending on the `outlier_score` field.
-    // if that's not available sort ascending on the first column.
-    // also check if the current sorting field is still available.
-    if (jobConfig !== undefined && columns.length > 0 && !selectedFields.includes(sortField)) {
-      const outlierScoreFieldName = getOutlierScoreFieldName(jobConfig);
-      const outlierScoreFieldSelected = selectedFields.includes(outlierScoreFieldName);
-      let requiresKeyword = false;
-
-      const field = outlierScoreFieldSelected ? outlierScoreFieldName : selectedFields[0];
-      const direction = outlierScoreFieldSelected ? SORT_DIRECTION.DESC : SORT_DIRECTION.ASC;
-
-      if (outlierScoreFieldSelected === false) {
-        requiresKeyword = isKeywordAndTextType(field);
-      }
-
-      loadExploreData({ field, direction, searchQuery, requiresKeyword });
-      return;
-    }
-  }, [jobConfig, columns.length, sortField, sortDirection, tableItems.length]);
-
-  let sorting: SortingPropType = false;
-  let onTableChange;
-
-  if (columns.length > 0 && sortField !== '') {
-    sorting = {
-      sort: {
-        field: sortField,
-        direction: sortDirection,
-      },
-    };
-
-    onTableChange = ({
-      page = { index: 0, size: 10 },
-      sort = { field: sortField, direction: sortDirection },
-    }: OnTableChangeArg) => {
-      const { index, size } = page;
-      setPageIndex(index);
-      setPageSize(size);
-
-      if (
-        (sort.field !== sortField || sort.direction !== sortDirection) &&
-        jobConfig !== undefined
-      ) {
-        const outlierScoreFieldName = getOutlierScoreFieldName(jobConfig);
-        let requiresKeyword = false;
-
-        if (outlierScoreFieldName !== sort.field) {
-          requiresKeyword = isKeywordAndTextType(sort.field);
-        }
-        loadExploreData({ ...sort, searchQuery, requiresKeyword });
-      }
-    };
-  }
-
-  const pagination = {
-    initialPageIndex: pageIndex,
-    initialPageSize: pageSize,
-    totalItemCount: tableItems.length,
-    pageSizeOptions: PAGE_SIZE_OPTIONS,
-    hidePerPageOptions: false,
-  };
-
-  const onQueryChange = ({ query, error }: { query: QueryType; error: any }) => {
-    if (error) {
-      setSearchError(error.message);
-    } else {
-      try {
-        const esQueryDsl = Query.toESQuery(query);
-        setSearchQuery(esQueryDsl);
-        setSearchString(query.text);
-        setSearchError(undefined);
-      } catch (e) {
-        setSearchError(e.toString());
-      }
-    }
-  };
-
-  const search = {
-    onChange: onQueryChange,
-    defaultQuery: searchString,
-    box: {
-      incremental: false,
-      placeholder: i18n.translate('xpack.ml.dataframe.analytics.exploration.searchBoxPlaceholder', {
-        defaultMessage: 'E.g. avg>0.5',
-      }),
-    },
-  };
-
-  if (jobConfig === undefined) {
-    return null;
-  }
-  // if it's a searchBar syntax error leave the table visible so they can try again
-  if (status === INDEX_STATUS.ERROR && !errorMessage.includes('parsing_exception')) {
-    return (
-      <EuiPanel grow={false}>
-        <ExplorationTitle jobId={jobConfig.id} />
-        <EuiCallOut
-          title={i18n.translate('xpack.ml.dataframe.analytics.exploration.indexError', {
-            defaultMessage: 'An error occurred loading the index data.',
-          })}
-          color="danger"
-          iconType="cross"
-        >
-          <p>{errorMessage}</p>
-        </EuiCallOut>
-      </EuiPanel>
-    );
-  }
-
-  let tableError =
-    status === INDEX_STATUS.ERROR && errorMessage.includes('parsing_exception')
-      ? errorMessage
-      : searchError;
-
-  if (status === INDEX_STATUS.LOADED && tableItems.length === 0 && tableError === undefined) {
-    tableError = i18n.translate('xpack.ml.dataframe.analytics.exploration.noDataCalloutBody', {
-      defaultMessage:
-        'The query for the index returned no results. Please make sure the index contains documents and your query is not too restrictive.',
-    });
-  }
-
-  const MlInMemoryTableBasic = mlInMemoryTableBasicFactory<TableItem>();
-
-  return (
-    <EuiPanel grow={false} data-test-subj="mlDFAnalyticsOutlierExplorationTablePanel">
-      <EuiFlexGroup alignItems="center" justifyContent="spaceBetween" responsive={false}>
-        <EuiFlexItem grow={false}>
-          <EuiFlexGroup gutterSize="s">
-            <EuiFlexItem grow={false}>
-              <ExplorationTitle jobId={jobConfig.id} />
-            </EuiFlexItem>
-            <EuiFlexItem grow={false}>
-              <span>{getTaskStateBadge(jobStatus)}</span>
-            </EuiFlexItem>
-          </EuiFlexGroup>
-        </EuiFlexItem>
-        <EuiFlexItem>
-          <EuiFlexGroup alignItems="center" gutterSize="xs" responsive={false}>
-            <EuiFlexItem style={{ textAlign: 'right' }}>
-              {docFieldsCount > MAX_COLUMNS && (
-                <EuiText size="s">
-                  {i18n.translate('xpack.ml.dataframe.analytics.exploration.fieldSelection', {
-                    defaultMessage:
-                      '{selectedFieldsLength, number} of {docFieldsCount, number} {docFieldsCount, plural, one {field} other {fields}} selected',
-                    values: { selectedFieldsLength: selectedFields.length, docFieldsCount },
-                  })}
-                </EuiText>
-              )}
-            </EuiFlexItem>
-            <EuiFlexItem grow={false}>
-              <EuiText size="s">
-                <EuiPopover
-                  id="popover"
-                  button={
-                    <EuiButtonIcon
-                      iconType="gear"
-                      onClick={toggleColumnsPopover}
-                      aria-label={i18n.translate(
-                        'xpack.ml.dataframe.analytics.exploration.selectColumnsAriaLabel',
-                        {
-                          defaultMessage: 'Select columns',
-                        }
-                      )}
-                    />
-                  }
-                  isOpen={isColumnsPopoverVisible}
-                  closePopover={closeColumnsPopover}
-                  ownFocus
-                >
-                  <EuiPopoverTitle>
-                    {i18n.translate(
-                      'xpack.ml.dataframe.analytics.exploration.selectFieldsPopoverTitle',
-                      {
-                        defaultMessage: 'Select fields',
-                      }
-                    )}
-                  </EuiPopoverTitle>
-                  <div style={{ maxHeight: '400px', overflowY: 'scroll' }}>
-                    {docFields.map(d => (
-                      <EuiCheckbox
-                        key={d}
-                        id={d}
-                        label={d}
-                        checked={selectedFields.includes(d)}
-                        onChange={() => toggleColumn(d)}
-                        disabled={selectedFields.includes(d) && selectedFields.length === 1}
-                      />
-                    ))}
-                  </div>
-                </EuiPopover>
-              </EuiText>
-            </EuiFlexItem>
-          </EuiFlexGroup>
-        </EuiFlexItem>
-      </EuiFlexGroup>
-      {status === INDEX_STATUS.LOADING && <EuiProgress size="xs" color="accent" />}
-      {status !== INDEX_STATUS.LOADING && (
-        <EuiProgress size="xs" color="accent" max={1} value={0} />
-      )}
-      {(columns.length > 0 || searchQuery !== defaultSearchQuery) && sortField !== '' && (
-        <>
-          <EuiSpacer size="s" />
-          <EuiFlexGroup justifyContent="spaceBetween">
-            <EuiFlexItem grow={false}>
-              {tableItems.length === SEARCH_SIZE && (
-                <EuiText size="xs" color="subdued">
-                  {i18n.translate(
-                    'xpack.ml.dataframe.analytics.exploration.documentsShownHelpText',
-                    {
-                      defaultMessage: 'Showing first {searchSize} documents',
-                      values: { searchSize: SEARCH_SIZE },
-                    }
-                  )}
-                </EuiText>
-              )}
-            </EuiFlexItem>
-            <EuiFlexItem grow={false}>
-              <ColorRangeLegend
-                colorRange={cellBgColor}
-                title={i18n.translate(
-                  'xpack.ml.dataframe.analytics.exploration.colorRangeLegendTitle',
-                  {
-                    defaultMessage: 'Feature influence score',
-                  }
-                )}
-              />
-            </EuiFlexItem>
-          </EuiFlexGroup>
-          <MlInMemoryTableBasic
-            allowNeutralSort={false}
-            className="mlDataFrameAnalyticsExploration"
-            columns={columns}
-            compressed
-            hasActions={false}
-            isSelectable={false}
-            items={tableItems}
-            onTableChange={onTableChange}
-            pagination={pagination}
-            responsive={false}
-            sorting={sorting}
-            search={search}
-            error={tableError}
-          />
-        </>
-      )}
-    </EuiPanel>
-  );
-});
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/exploration/use_explore_data.ts b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/exploration/use_explore_data.ts
deleted file mode 100644
index 24cc8d000de7e..0000000000000
--- a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/exploration/use_explore_data.ts
+++ /dev/null
@@ -1,153 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import React, { useEffect, useState } from 'react';
-
-import { SearchResponse } from 'elasticsearch';
-
-import { SortDirection, SORT_DIRECTION } from '../../../../../components/ml_in_memory_table';
-
-import { ml } from '../../../../../services/ml_api_service';
-import { getNestedProperty } from '../../../../../util/object_utils';
-
-import {
-  getDefaultSelectableFields,
-  getFlattenedFields,
-  DataFrameAnalyticsConfig,
-  EsFieldName,
-  INDEX_STATUS,
-  SEARCH_SIZE,
-  defaultSearchQuery,
-  SearchQuery,
-} from '../../../../common';
-import { LoadExploreDataArg } from '../../../../common/analytics';
-
-import { getOutlierScoreFieldName } from './common';
-
-export type TableItem = Record<string, any>;
-
-export interface UseExploreDataReturnType {
-  errorMessage: string;
-  loadExploreData: (arg: LoadExploreDataArg) => void;
-  sortField: EsFieldName;
-  sortDirection: SortDirection;
-  status: INDEX_STATUS;
-  tableItems: TableItem[];
-}
-
-export const useExploreData = (
-  jobConfig: DataFrameAnalyticsConfig | undefined,
-  selectedFields: EsFieldName[],
-  setSelectedFields: React.Dispatch<React.SetStateAction<EsFieldName[]>>
-): UseExploreDataReturnType => {
-  const [errorMessage, setErrorMessage] = useState('');
-  const [status, setStatus] = useState(INDEX_STATUS.UNUSED);
-  const [tableItems, setTableItems] = useState<TableItem[]>([]);
-  const [sortField, setSortField] = useState<string>('');
-  const [sortDirection, setSortDirection] = useState<SortDirection>(SORT_DIRECTION.ASC);
-
-  const loadExploreData = async ({
-    field,
-    direction,
-    searchQuery,
-    requiresKeyword,
-  }: LoadExploreDataArg) => {
-    if (jobConfig !== undefined) {
-      setErrorMessage('');
-      setStatus(INDEX_STATUS.LOADING);
-
-      try {
-        const resultsField = jobConfig.dest.results_field;
-
-        const body: SearchQuery = {
-          query: searchQuery,
-        };
-
-        if (field !== undefined) {
-          body.sort = [
-            {
-              [`${field}${requiresKeyword ? '.keyword' : ''}`]: {
-                order: direction,
-              },
-            },
-          ];
-        }
-
-        const resp: SearchResponse<any> = await ml.esSearch({
-          index: jobConfig.dest.index,
-          size: SEARCH_SIZE,
-          body,
-        });
-
-        setSortField(field);
-        setSortDirection(direction);
-
-        const docs = resp.hits.hits;
-
-        if (docs.length === 0) {
-          setTableItems([]);
-          setStatus(INDEX_STATUS.LOADED);
-          return;
-        }
-
-        if (selectedFields.length === 0) {
-          const newSelectedFields = getDefaultSelectableFields(docs, resultsField);
-          setSelectedFields(newSelectedFields);
-        }
-
-        // Create a version of the doc's source with flattened field names.
-        // This avoids confusion later on if a field name has dots in its name
-        // or is a nested fields when displaying it via EuiInMemoryTable.
-        const flattenedFields = getFlattenedFields(docs[0]._source, resultsField);
-        const transformedTableItems = docs.map(doc => {
-          const item: TableItem = {};
-          flattenedFields.forEach(ff => {
-            item[ff] = getNestedProperty(doc._source, ff);
-            if (item[ff] === undefined) {
-              // If the attribute is undefined, it means it was not a nested property
-              // but had dots in its actual name. This selects the property by its
-              // full name and assigns it to `item[ff]`.
-              item[ff] = doc._source[`"${ff}"`];
-            }
-            if (item[ff] === undefined) {
-              const parts = ff.split('.');
-              if (parts[0] === resultsField && parts.length >= 2) {
-                parts.shift();
-                if (doc._source[resultsField] !== undefined) {
-                  item[ff] = doc._source[resultsField][parts.join('.')];
-                }
-              }
-            }
-          });
-          return item;
-        });
-
-        setTableItems(transformedTableItems);
-        setStatus(INDEX_STATUS.LOADED);
-      } catch (e) {
-        if (e.message !== undefined) {
-          setErrorMessage(e.message);
-        } else {
-          setErrorMessage(JSON.stringify(e));
-        }
-        setTableItems([]);
-        setStatus(INDEX_STATUS.ERROR);
-      }
-    }
-  };
-
-  useEffect(() => {
-    if (jobConfig !== undefined) {
-      loadExploreData({
-        field: getOutlierScoreFieldName(jobConfig),
-        direction: SORT_DIRECTION.DESC,
-        searchQuery: defaultSearchQuery,
-      });
-    }
-  }, [jobConfig && jobConfig.id]);
-
-  return { errorMessage, loadExploreData, sortField, sortDirection, status, tableItems };
-};
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/exploration_data_grid/exploration_data_grid.tsx b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/exploration_data_grid/exploration_data_grid.tsx
new file mode 100644
index 0000000000000..2df0f70a56722
--- /dev/null
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/exploration_data_grid/exploration_data_grid.tsx
@@ -0,0 +1,145 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React, { Dispatch, FC, SetStateAction, useCallback, useMemo } from 'react';
+
+import { i18n } from '@kbn/i18n';
+
+import { EuiDataGrid, EuiDataGridPaginationProps, EuiDataGridSorting } from '@elastic/eui';
+
+import { euiDataGridStyle, euiDataGridToolbarSettings } from '../../../../common';
+
+const FEATURE_INFLUENCE = 'feature_influence';
+const PAGE_SIZE_OPTIONS = [5, 10, 25, 50];
+
+type Pagination = Pick<EuiDataGridPaginationProps, 'pageIndex' | 'pageSize'>;
+type TableItem = Record<string, any>;
+
+interface ExplorationDataGridProps {
+  colorRange: (d: number) => string;
+  columns: any[];
+  pagination: Pagination;
+  resultsField: string;
+  rowCount: number;
+  selectedFields: string[];
+  setPagination: Dispatch<SetStateAction<Pagination>>;
+  setSelectedFields: Dispatch<SetStateAction<string[]>>;
+  setSortingColumns: Dispatch<SetStateAction<EuiDataGridSorting['columns']>>;
+  sortingColumns: EuiDataGridSorting['columns'];
+  tableItems: TableItem[];
+}
+
+export const ExplorationDataGrid: FC<ExplorationDataGridProps> = ({
+  colorRange,
+  columns,
+  pagination,
+  resultsField,
+  rowCount,
+  selectedFields,
+  setPagination,
+  setSelectedFields,
+  setSortingColumns,
+  sortingColumns,
+  tableItems,
+}) => {
+  const renderCellValue = useMemo(() => {
+    return ({
+      rowIndex,
+      columnId,
+      setCellProps,
+    }: {
+      rowIndex: number;
+      columnId: string;
+      setCellProps: any;
+    }) => {
+      const adjustedRowIndex = rowIndex - pagination.pageIndex * pagination.pageSize;
+
+      const fullItem = tableItems[adjustedRowIndex];
+
+      if (fullItem === undefined) {
+        return null;
+      }
+
+      const cellValue =
+        fullItem.hasOwnProperty(columnId) && fullItem[columnId] !== undefined
+          ? fullItem[columnId]
+          : null;
+
+      const split = columnId.split('.');
+      let backgroundColor;
+
+      // column with feature values get color coded by its corresponding influencer value
+      if (fullItem[`${resultsField}.${FEATURE_INFLUENCE}.${columnId}`] !== undefined) {
+        backgroundColor = colorRange(fullItem[`${resultsField}.${FEATURE_INFLUENCE}.${columnId}`]);
+      }
+
+      // column with influencer values get color coded by its own value
+      if (split.length > 2 && split[0] === resultsField && split[1] === FEATURE_INFLUENCE) {
+        backgroundColor = colorRange(cellValue);
+      }
+
+      if (backgroundColor !== undefined) {
+        setCellProps({
+          style: { backgroundColor },
+        });
+      }
+
+      if (typeof cellValue === 'string' || cellValue === null) {
+        return cellValue;
+      }
+
+      if (typeof cellValue === 'boolean') {
+        return cellValue ? 'true' : 'false';
+      }
+
+      if (typeof cellValue === 'object' && cellValue !== null) {
+        return JSON.stringify(cellValue);
+      }
+
+      return cellValue;
+    };
+  }, [resultsField, rowCount, tableItems, pagination.pageIndex, pagination.pageSize]);
+
+  const onChangeItemsPerPage = useCallback(
+    pageSize => {
+      setPagination(p => {
+        const pageIndex = Math.floor((p.pageSize * p.pageIndex) / pageSize);
+        return { pageIndex, pageSize };
+      });
+    },
+    [setPagination]
+  );
+
+  const onChangePage = useCallback(pageIndex => setPagination(p => ({ ...p, pageIndex })), [
+    setPagination,
+  ]);
+
+  const onSort = useCallback(sc => setSortingColumns(sc), [setSortingColumns]);
+
+  return (
+    <EuiDataGrid
+      aria-label={i18n.translate('xpack.ml.dataframe.analytics.exploration.dataGridAriaLabel', {
+        defaultMessage: 'Outlier detection results table',
+      })}
+      columns={columns}
+      columnVisibility={{
+        visibleColumns: selectedFields,
+        setVisibleColumns: setSelectedFields,
+      }}
+      gridStyle={euiDataGridStyle}
+      rowCount={rowCount}
+      renderCellValue={renderCellValue}
+      sorting={{ columns: sortingColumns, onSort }}
+      toolbarVisibility={euiDataGridToolbarSettings}
+      pagination={{
+        ...pagination,
+        pageSizeOptions: PAGE_SIZE_OPTIONS,
+        onChangeItemsPerPage,
+        onChangePage,
+      }}
+    />
+  );
+};
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/exploration_data_grid/index.ts b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/exploration_data_grid/index.ts
new file mode 100644
index 0000000000000..ea89e91de5046
--- /dev/null
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/exploration_data_grid/index.ts
@@ -0,0 +1,7 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+export { ExplorationDataGrid } from './exploration_data_grid';
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/exploration_query_bar/exploration_query_bar.tsx b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/exploration_query_bar/exploration_query_bar.tsx
new file mode 100644
index 0000000000000..f95e6a93058ba
--- /dev/null
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/exploration_query_bar/exploration_query_bar.tsx
@@ -0,0 +1,106 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * 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, { Dispatch, FC, SetStateAction, useState } from 'react';
+
+import { EuiCode, EuiInputPopover } from '@elastic/eui';
+
+import { i18n } from '@kbn/i18n';
+
+import { IIndexPattern } from '../../../../../../../../../../src/plugins/data/common/index_patterns';
+import {
+  esKuery,
+  esQuery,
+  Query,
+  QueryStringInput,
+} from '../../../../../../../../../../src/plugins/data/public';
+
+import { SEARCH_QUERY_LANGUAGE } from '../../../../../../../common/constants/search';
+
+import { SavedSearchQuery } from '../../../../../contexts/ml';
+
+interface ErrorMessage {
+  query: string;
+  message: string;
+}
+
+interface ExplorationQueryBarProps {
+  indexPattern: IIndexPattern;
+  setSearchQuery: Dispatch<SetStateAction<SavedSearchQuery>>;
+}
+
+export const ExplorationQueryBar: FC<ExplorationQueryBarProps> = ({
+  indexPattern,
+  setSearchQuery,
+}) => {
+  // The internal state of the input query bar updated on every key stroke.
+  const [searchInput, setSearchInput] = useState<Query>({
+    query: '',
+    language: SEARCH_QUERY_LANGUAGE.KUERY,
+  });
+
+  const [errorMessage, setErrorMessage] = useState<ErrorMessage | undefined>(undefined);
+
+  const searchChangeHandler = (query: Query) => setSearchInput(query);
+  const searchSubmitHandler = (query: Query) => {
+    try {
+      switch (query.language) {
+        case SEARCH_QUERY_LANGUAGE.KUERY:
+          setSearchQuery(
+            esKuery.toElasticsearchQuery(
+              esKuery.fromKueryExpression(query.query as string),
+              indexPattern
+            )
+          );
+          return;
+        case SEARCH_QUERY_LANGUAGE.LUCENE:
+          setSearchQuery(esQuery.luceneStringToDsl(query.query as string));
+          return;
+      }
+    } catch (e) {
+      setErrorMessage({ query: query.query as string, message: e.message });
+    }
+  };
+
+  return (
+    <EuiInputPopover
+      style={{ maxWidth: '100%' }}
+      closePopover={() => setErrorMessage(undefined)}
+      input={
+        <QueryStringInput
+          bubbleSubmitEvent={true}
+          query={searchInput}
+          indexPatterns={[indexPattern]}
+          onChange={searchChangeHandler}
+          onSubmit={searchSubmitHandler}
+          placeholder={
+            searchInput.language === SEARCH_QUERY_LANGUAGE.KUERY
+              ? i18n.translate('xpack.ml.stepDefineForm.queryPlaceholderKql', {
+                  defaultMessage: 'e.g. {example}',
+                  values: { example: 'method : "GET" or status : "404"' },
+                })
+              : i18n.translate('xpack.ml.stepDefineForm.queryPlaceholderLucene', {
+                  defaultMessage: 'e.g. {example}',
+                  values: { example: 'method:GET OR status:404' },
+                })
+          }
+          disableAutoFocus={true}
+          dataTestSubj="transformQueryInput"
+          languageSwitcherPopoverAnchorPosition="rightDown"
+        />
+      }
+      isOpen={errorMessage?.query === searchInput.query && errorMessage?.message !== ''}
+    >
+      <EuiCode>
+        {i18n.translate('xpack.ml.stepDefineForm.invalidQuery', {
+          defaultMessage: 'Invalid Query',
+        })}
+        {': '}
+        {errorMessage?.message.split('\n')[0]}
+      </EuiCode>
+    </EuiInputPopover>
+  );
+};
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/exploration_query_bar/index.ts b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/exploration_query_bar/index.ts
new file mode 100644
index 0000000000000..bebf4f65db04e
--- /dev/null
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/exploration_query_bar/index.ts
@@ -0,0 +1,7 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+export { ExplorationQueryBar } from './exploration_query_bar';
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/exploration/index.ts b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/outlier_exploration/index.ts
similarity index 80%
rename from x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/exploration/index.ts
rename to x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/outlier_exploration/index.ts
index 6f15c278158dc..de49556f9cc98 100644
--- a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/exploration/index.ts
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/outlier_exploration/index.ts
@@ -4,4 +4,4 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-export { Exploration } from './exploration';
+export { OutlierExploration } from './outlier_exploration';
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/exploration/exploration.test.tsx b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/outlier_exploration/outlier_exploration.test.tsx
similarity index 88%
rename from x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/exploration/exploration.test.tsx
rename to x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/outlier_exploration/outlier_exploration.test.tsx
index ca8fd68079f7e..030447873f6a5 100644
--- a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/exploration/exploration.test.tsx
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/outlier_exploration/outlier_exploration.test.tsx
@@ -10,7 +10,7 @@ import { DATA_FRAME_TASK_STATE } from '../../../analytics_management/components/
 import { MlContext } from '../../../../../contexts/ml';
 import { kibanaContextValueMock } from '../../../../../contexts/ml/__mocks__/kibana_context_value';
 
-import { Exploration } from './exploration';
+import { OutlierExploration } from './outlier_exploration';
 
 // workaround to make React.memo() work with enzyme
 jest.mock('react', () => {
@@ -22,7 +22,7 @@ describe('Data Frame Analytics: <Exploration />', () => {
   test('Minimal initialization', () => {
     const wrapper = shallow(
       <MlContext.Provider value={kibanaContextValueMock}>
-        <Exploration jobId="the-job-id" jobStatus={DATA_FRAME_TASK_STATE.STOPPED} />
+        <OutlierExploration jobId="the-job-id" jobStatus={DATA_FRAME_TASK_STATE.STOPPED} />
       </MlContext.Provider>
     );
     // Without the jobConfig being loaded, the component will just return empty.
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/outlier_exploration/outlier_exploration.tsx b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/outlier_exploration/outlier_exploration.tsx
new file mode 100644
index 0000000000000..214bc01c6a2ef
--- /dev/null
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/outlier_exploration/outlier_exploration.tsx
@@ -0,0 +1,220 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React, { FC } from 'react';
+
+import { i18n } from '@kbn/i18n';
+
+import {
+  EuiCallOut,
+  EuiFlexGroup,
+  EuiFlexItem,
+  EuiHorizontalRule,
+  EuiPanel,
+  EuiSpacer,
+  EuiTitle,
+} from '@elastic/eui';
+
+import {
+  useColorRange,
+  ColorRangeLegend,
+  COLOR_RANGE,
+  COLOR_RANGE_SCALE,
+} from '../../../../../components/color_range_legend';
+
+import { sortColumns, INDEX_STATUS, defaultSearchQuery } from '../../../../common';
+
+import { DATA_FRAME_TASK_STATE } from '../../../analytics_management/components/analytics_list/common';
+import { getTaskStateBadge } from '../../../analytics_management/components/analytics_list/columns';
+
+import { useExploreData, TableItem } from '../../hooks/use_explore_data';
+
+import { ExplorationDataGrid } from '../exploration_data_grid';
+import { ExplorationQueryBar } from '../exploration_query_bar';
+
+const FEATURE_INFLUENCE = 'feature_influence';
+
+const ExplorationTitle: FC<{ jobId: string }> = ({ jobId }) => (
+  <EuiTitle size="xs">
+    <span>
+      {i18n.translate('xpack.ml.dataframe.analytics.exploration.jobIdTitle', {
+        defaultMessage: 'Outlier detection job ID {jobId}',
+        values: { jobId },
+      })}
+    </span>
+  </EuiTitle>
+);
+
+interface ExplorationProps {
+  jobId: string;
+  jobStatus: DATA_FRAME_TASK_STATE;
+}
+
+const getFeatureCount = (resultsField: string, tableItems: TableItem[] = []) => {
+  if (tableItems.length === 0) {
+    return 0;
+  }
+
+  return Object.keys(tableItems[0]).filter(key =>
+    key.includes(`${resultsField}.${FEATURE_INFLUENCE}.`)
+  ).length;
+};
+
+export const OutlierExploration: FC<ExplorationProps> = React.memo(({ jobId, jobStatus }) => {
+  const {
+    errorMessage,
+    indexPattern,
+    jobConfig,
+    pagination,
+    searchQuery,
+    selectedFields,
+    setPagination,
+    setSearchQuery,
+    setSelectedFields,
+    setSortingColumns,
+    sortingColumns,
+    rowCount,
+    status,
+    tableFields,
+    tableItems,
+  } = useExploreData(jobId);
+
+  const columns = [];
+
+  if (
+    jobConfig !== undefined &&
+    indexPattern !== undefined &&
+    selectedFields.length > 0 &&
+    tableItems.length > 0
+  ) {
+    const resultsField = jobConfig.dest.results_field;
+    const removePrefix = new RegExp(`^${resultsField}\.${FEATURE_INFLUENCE}\.`, 'g');
+    columns.push(
+      ...tableFields.sort(sortColumns(tableItems[0], resultsField)).map(id => {
+        const idWithoutPrefix = id.replace(removePrefix, '');
+        const field = indexPattern.fields.getByName(idWithoutPrefix);
+
+        // Built-in values are ['boolean', 'currency', 'datetime', 'numeric', 'json']
+        // To fall back to the default string schema it needs to be undefined.
+        let schema;
+
+        switch (field?.type) {
+          case 'date':
+            schema = 'datetime';
+            break;
+          case 'geo_point':
+            schema = 'json';
+            break;
+          case 'number':
+            schema = 'numeric';
+            break;
+        }
+
+        if (id === `${resultsField}.outlier_score`) {
+          schema = 'numeric';
+        }
+
+        return { id, schema };
+      })
+    );
+  }
+
+  const colorRange = useColorRange(
+    COLOR_RANGE.BLUE,
+    COLOR_RANGE_SCALE.INFLUENCER,
+    jobConfig !== undefined ? getFeatureCount(jobConfig.dest.results_field, tableItems) : 1
+  );
+
+  if (jobConfig === undefined || indexPattern === undefined) {
+    return null;
+  }
+
+  // if it's a searchBar syntax error leave the table visible so they can try again
+  if (status === INDEX_STATUS.ERROR && !errorMessage.includes('parsing_exception')) {
+    return (
+      <EuiPanel grow={false}>
+        <ExplorationTitle jobId={jobConfig.id} />
+        <EuiCallOut
+          title={i18n.translate('xpack.ml.dataframe.analytics.exploration.indexError', {
+            defaultMessage: 'An error occurred loading the index data.',
+          })}
+          color="danger"
+          iconType="cross"
+        >
+          <p>{errorMessage}</p>
+        </EuiCallOut>
+      </EuiPanel>
+    );
+  }
+
+  let tableError =
+    status === INDEX_STATUS.ERROR && errorMessage.includes('parsing_exception')
+      ? errorMessage
+      : undefined;
+
+  if (status === INDEX_STATUS.LOADED && tableItems.length === 0 && tableError === undefined) {
+    tableError = i18n.translate('xpack.ml.dataframe.analytics.exploration.noDataCalloutBody', {
+      defaultMessage:
+        'The query for the index returned no results. Please make sure the index contains documents and your query is not too restrictive.',
+    });
+  }
+
+  return (
+    <EuiPanel data-test-subj="mlDFAnalyticsOutlierExplorationTablePanel">
+      <EuiFlexGroup
+        alignItems="center"
+        justifyContent="spaceBetween"
+        responsive={false}
+        gutterSize="s"
+      >
+        <EuiFlexItem grow={false}>
+          <ExplorationTitle jobId={jobConfig.id} />
+        </EuiFlexItem>
+        <EuiFlexItem grow={false}>
+          <span>{getTaskStateBadge(jobStatus)}</span>
+        </EuiFlexItem>
+      </EuiFlexGroup>
+      <EuiHorizontalRule margin="xs" />
+      {(columns.length > 0 || searchQuery !== defaultSearchQuery) && (
+        <>
+          <EuiFlexGroup justifyContent="spaceBetween">
+            <EuiFlexItem>
+              <ExplorationQueryBar indexPattern={indexPattern} setSearchQuery={setSearchQuery} />
+            </EuiFlexItem>
+            <EuiFlexItem grow={false}>
+              <EuiSpacer size="s" />
+              <ColorRangeLegend
+                colorRange={colorRange}
+                title={i18n.translate(
+                  'xpack.ml.dataframe.analytics.exploration.colorRangeLegendTitle',
+                  {
+                    defaultMessage: 'Feature influence score',
+                  }
+                )}
+              />
+            </EuiFlexItem>
+          </EuiFlexGroup>
+          <EuiSpacer size="s" />
+          {columns.length > 0 && tableItems.length > 0 && (
+            <ExplorationDataGrid
+              colorRange={colorRange}
+              columns={columns}
+              pagination={pagination}
+              resultsField={jobConfig.dest.results_field}
+              rowCount={rowCount}
+              selectedFields={selectedFields}
+              setPagination={setPagination}
+              setSelectedFields={setSelectedFields}
+              setSortingColumns={setSortingColumns}
+              sortingColumns={sortingColumns}
+              tableItems={tableItems}
+            />
+          )}
+        </>
+      )}
+    </EuiPanel>
+  );
+});
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/exploration/common.test.ts b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/hooks/use_explore_data/common.test.ts
similarity index 100%
rename from x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/exploration/common.test.ts
rename to x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/hooks/use_explore_data/common.test.ts
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/exploration/common.ts b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/hooks/use_explore_data/common.ts
similarity index 100%
rename from x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/exploration/common.ts
rename to x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/hooks/use_explore_data/common.ts
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/hooks/use_explore_data/index.ts b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/hooks/use_explore_data/index.ts
new file mode 100644
index 0000000000000..dd896ca02f7f7
--- /dev/null
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/hooks/use_explore_data/index.ts
@@ -0,0 +1,7 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+export { useExploreData, TableItem } from './use_explore_data';
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/hooks/use_explore_data/use_explore_data.ts b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/hooks/use_explore_data/use_explore_data.ts
new file mode 100644
index 0000000000000..6ad0a1822e490
--- /dev/null
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/hooks/use_explore_data/use_explore_data.ts
@@ -0,0 +1,232 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { useEffect, useState, Dispatch, SetStateAction } from 'react';
+import { SearchResponse } from 'elasticsearch';
+
+import { EuiDataGridPaginationProps, EuiDataGridSorting } from '@elastic/eui';
+
+import { IndexPattern } from '../../../../../../../../../../src/plugins/data/public';
+
+import { Dictionary } from '../../../../../../../common/types/common';
+
+import { SavedSearchQuery } from '../../../../../contexts/ml';
+import { ml } from '../../../../../services/ml_api_service';
+import { newJobCapsService } from '../../../../../services/new_job_capabilities_service';
+import { getIndexPatternIdFromName } from '../../../../../util/index_utils';
+import { getNestedProperty } from '../../../../../util/object_utils';
+import { useMlContext } from '../../../../../contexts/ml';
+
+import {
+  getDefaultSelectableFields,
+  getFlattenedFields,
+  DataFrameAnalyticsConfig,
+  EsFieldName,
+  INDEX_STATUS,
+  defaultSearchQuery,
+} from '../../../../common';
+import { isKeywordAndTextType } from '../../../../common/fields';
+
+import { getOutlierScoreFieldName } from './common';
+
+export type TableItem = Record<string, any>;
+
+type Pagination = Pick<EuiDataGridPaginationProps, 'pageIndex' | 'pageSize'>;
+
+interface UseExploreDataReturnType {
+  errorMessage: string;
+  indexPattern: IndexPattern | undefined;
+  jobConfig: DataFrameAnalyticsConfig | undefined;
+  pagination: Pagination;
+  searchQuery: SavedSearchQuery;
+  selectedFields: EsFieldName[];
+  setJobConfig: Dispatch<SetStateAction<DataFrameAnalyticsConfig | undefined>>;
+  setPagination: Dispatch<SetStateAction<Pagination>>;
+  setSearchQuery: Dispatch<SetStateAction<SavedSearchQuery>>;
+  setSelectedFields: Dispatch<SetStateAction<EsFieldName[]>>;
+  setSortingColumns: Dispatch<SetStateAction<EuiDataGridSorting['columns']>>;
+  rowCount: number;
+  sortingColumns: EuiDataGridSorting['columns'];
+  status: INDEX_STATUS;
+  tableFields: string[];
+  tableItems: TableItem[];
+}
+
+type EsSorting = Dictionary<{
+  order: 'asc' | 'desc';
+}>;
+
+// The types specified in `@types/elasticsearch` are out of date and still have `total: number`.
+interface SearchResponse7 extends SearchResponse<any> {
+  hits: SearchResponse<any>['hits'] & {
+    total: {
+      value: number;
+      relation: string;
+    };
+  };
+}
+
+export const useExploreData = (jobId: string): UseExploreDataReturnType => {
+  const mlContext = useMlContext();
+
+  const [indexPattern, setIndexPattern] = useState<IndexPattern | undefined>(undefined);
+  const [jobConfig, setJobConfig] = useState<DataFrameAnalyticsConfig | undefined>(undefined);
+  const [errorMessage, setErrorMessage] = useState('');
+  const [status, setStatus] = useState(INDEX_STATUS.UNUSED);
+
+  const [selectedFields, setSelectedFields] = useState([] as EsFieldName[]);
+  const [tableFields, setTableFields] = useState<string[]>([]);
+  const [tableItems, setTableItems] = useState<TableItem[]>([]);
+  const [rowCount, setRowCount] = useState(0);
+
+  const [pagination, setPagination] = useState({ pageIndex: 0, pageSize: 25 });
+  const [searchQuery, setSearchQuery] = useState<SavedSearchQuery>(defaultSearchQuery);
+  const [sortingColumns, setSortingColumns] = useState<EuiDataGridSorting['columns']>([]);
+
+  // get analytics configuration
+  useEffect(() => {
+    (async function() {
+      const analyticsConfigs = await ml.dataFrameAnalytics.getDataFrameAnalytics(jobId);
+      if (
+        Array.isArray(analyticsConfigs.data_frame_analytics) &&
+        analyticsConfigs.data_frame_analytics.length > 0
+      ) {
+        setJobConfig(analyticsConfigs.data_frame_analytics[0]);
+      }
+    })();
+  }, []);
+
+  // get index pattern and field caps
+  useEffect(() => {
+    (async () => {
+      if (jobConfig !== undefined) {
+        const sourceIndex = jobConfig.source.index[0];
+        const indexPatternId = getIndexPatternIdFromName(sourceIndex) || sourceIndex;
+        const jobCapsIndexPattern: IndexPattern = await mlContext.indexPatterns.get(indexPatternId);
+        if (jobCapsIndexPattern !== undefined) {
+          setIndexPattern(jobCapsIndexPattern);
+          await newJobCapsService.initializeFromIndexPattern(jobCapsIndexPattern, false, false);
+        }
+      }
+    })();
+  }, [jobConfig && jobConfig.id]);
+
+  // initialize sorting: reverse sort on outlier score column
+  useEffect(() => {
+    if (jobConfig !== undefined) {
+      setSortingColumns([{ id: getOutlierScoreFieldName(jobConfig), direction: 'desc' }]);
+    }
+  }, [jobConfig && jobConfig.id]);
+
+  // update data grid data
+  useEffect(() => {
+    (async () => {
+      if (jobConfig !== undefined) {
+        setErrorMessage('');
+        setStatus(INDEX_STATUS.LOADING);
+
+        try {
+          const resultsField = jobConfig.dest.results_field;
+
+          const sort: EsSorting = sortingColumns
+            .map(column => {
+              const { id } = column;
+              column.id = isKeywordAndTextType(id) ? `${id}.keyword` : id;
+              return column;
+            })
+            .reduce((s, column) => {
+              s[column.id] = { order: column.direction };
+              return s;
+            }, {} as EsSorting);
+
+          const { pageIndex, pageSize } = pagination;
+          const resp: SearchResponse7 = await ml.esSearch({
+            index: jobConfig.dest.index,
+            body: {
+              query: searchQuery,
+              from: pageIndex * pageSize,
+              size: pageSize,
+              ...(Object.keys(sort).length > 0 ? { sort } : {}),
+            },
+          });
+
+          setRowCount(resp.hits.total.value);
+
+          const docs = resp.hits.hits;
+
+          if (docs.length === 0) {
+            setTableItems([]);
+            setStatus(INDEX_STATUS.LOADED);
+            return;
+          }
+
+          if (selectedFields.length === 0) {
+            const newSelectedFields = getDefaultSelectableFields(docs, resultsField);
+            setSelectedFields(newSelectedFields);
+          }
+
+          // Create a version of the doc's source with flattened field names.
+          // This avoids confusion later on if a field name has dots in its name
+          // or is a nested fields when displaying it via EuiInMemoryTable.
+          const flattenedFields = getFlattenedFields(docs[0]._source, resultsField);
+          const transformedTableItems = docs.map(doc => {
+            const item: TableItem = {};
+            flattenedFields.forEach(ff => {
+              item[ff] = getNestedProperty(doc._source, ff);
+              if (item[ff] === undefined) {
+                // If the attribute is undefined, it means it was not a nested property
+                // but had dots in its actual name. This selects the property by its
+                // full name and assigns it to `item[ff]`.
+                item[ff] = doc._source[`"${ff}"`];
+              }
+              if (item[ff] === undefined) {
+                const parts = ff.split('.');
+                if (parts[0] === resultsField && parts.length >= 2) {
+                  parts.shift();
+                  if (doc._source[resultsField] !== undefined) {
+                    item[ff] = doc._source[resultsField][parts.join('.')];
+                  }
+                }
+              }
+            });
+            return item;
+          });
+
+          setTableFields(flattenedFields);
+          setTableItems(transformedTableItems);
+          setStatus(INDEX_STATUS.LOADED);
+        } catch (e) {
+          if (e.message !== undefined) {
+            setErrorMessage(e.message);
+          } else {
+            setErrorMessage(JSON.stringify(e));
+          }
+          setTableItems([]);
+          setStatus(INDEX_STATUS.ERROR);
+        }
+      }
+    })();
+  }, [jobConfig && jobConfig.id, pagination, searchQuery, selectedFields, sortingColumns]);
+
+  return {
+    errorMessage,
+    indexPattern,
+    jobConfig,
+    pagination,
+    rowCount,
+    searchQuery,
+    selectedFields,
+    setJobConfig,
+    setPagination,
+    setSearchQuery,
+    setSelectedFields,
+    setSortingColumns,
+    sortingColumns,
+    status,
+    tableFields,
+    tableItems,
+  };
+};
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/page.tsx b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/page.tsx
index b00a38e2b5f65..efbebc1564bf9 100644
--- a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/page.tsx
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/page.tsx
@@ -22,7 +22,7 @@ import {
 
 import { NavigationMenu } from '../../../components/navigation_menu';
 
-import { Exploration } from './components/exploration';
+import { OutlierExploration } from './components/outlier_exploration';
 import { RegressionExploration } from './components/regression_exploration';
 import { ClassificationExploration } from './components/classification_exploration';
 
@@ -37,7 +37,7 @@ export const Page: FC<{
   <Fragment>
     <NavigationMenu tabId="data_frame_analytics" />
     <EuiPage data-test-subj="mlPageDataFrameAnalyticsExploration">
-      <EuiPageBody>
+      <EuiPageBody style={{ maxWidth: 'calc(100% - 0px)' }}>
         <EuiPageContentHeader>
           <EuiPageContentHeaderSection>
             <EuiTitle>
@@ -65,10 +65,10 @@ export const Page: FC<{
             </EuiTitle>
           </EuiPageContentHeaderSection>
         </EuiPageContentHeader>
-        <EuiPageContentBody>
+        <EuiPageContentBody style={{ maxWidth: 'calc(100% - 0px)' }}>
           <EuiSpacer size="l" />
           {analysisType === ANALYSIS_CONFIG_TYPE.OUTLIER_DETECTION && (
-            <Exploration jobId={jobId} jobStatus={jobStatus} />
+            <OutlierExploration jobId={jobId} jobStatus={jobStatus} />
           )}
           {analysisType === ANALYSIS_CONFIG_TYPE.REGRESSION && (
             <RegressionExploration jobId={jobId} jobStatus={jobStatus} />
diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json
index 129aa25c27e84..15d9bec1189c6 100644
--- a/x-pack/plugins/translations/translations/ja-JP.json
+++ b/x-pack/plugins/translations/translations/ja-JP.json
@@ -7527,16 +7527,9 @@
     "xpack.ml.dataframe.analytics.create.trainingPercentLabel": "トレーニングパーセンテージ",
     "xpack.ml.dataframe.analytics.exploration.experimentalBadgeLabel": "実験的",
     "xpack.ml.dataframe.analytics.exploration.experimentalBadgeTooltipContent": "データフレーム分析は実験段階の機能です。フィードバックをお待ちしています。",
-    "xpack.ml.dataframe.analytics.exploration.fieldSelection": "{docFieldsCount, number} 件中 showing {selectedFieldsLength, number} 件の{docFieldsCount, plural, one {フィールド} other {フィールド}}",
-    "xpack.ml.dataframe.analytics.exploration.indexArrayBadgeContent": "配列",
-    "xpack.ml.dataframe.analytics.exploration.indexArrayToolTipContent": "この配列ベースの列の完全なコンテンツは表示できません。",
     "xpack.ml.dataframe.analytics.exploration.indexError": "インデックスデータの読み込み中にエラーが発生しました。",
-    "xpack.ml.dataframe.analytics.exploration.indexObjectBadgeContent": "オブジェクト",
-    "xpack.ml.dataframe.analytics.exploration.indexObjectToolTipContent": "このオブジェクトベースの列の完全なコンテンツは表示できません。",
     "xpack.ml.dataframe.analytics.exploration.jobIdTitle": "ジョブID {jobId}",
     "xpack.ml.dataframe.analytics.exploration.noDataCalloutBody": "インデックスのクエリが結果を返しませんでした。インデックスにドキュメントが含まれていて、クエリ要件が妥当であることを確認してください。",
-    "xpack.ml.dataframe.analytics.exploration.selectColumnsAriaLabel": "列を選択",
-    "xpack.ml.dataframe.analytics.exploration.selectFieldsPopoverTitle": "フィールドを選択",
     "xpack.ml.dataframe.analytics.exploration.title": "分析の探索",
     "xpack.ml.dataframe.analytics.regressionExploration.evaluateError": "データの読み込み中にエラーが発生しました。",
     "xpack.ml.dataframe.analytics.regressionExploration.generalError": "データの読み込み中にエラーが発生しました。",
diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json
index d0a354a2108d4..5037c883037b9 100644
--- a/x-pack/plugins/translations/translations/zh-CN.json
+++ b/x-pack/plugins/translations/translations/zh-CN.json
@@ -7527,16 +7527,9 @@
     "xpack.ml.dataframe.analytics.create.trainingPercentLabel": "训练百分比",
     "xpack.ml.dataframe.analytics.exploration.experimentalBadgeLabel": "实验性",
     "xpack.ml.dataframe.analytics.exploration.experimentalBadgeTooltipContent": "数据帧分析为实验功能。我们很乐意听取您的反馈意见。",
-    "xpack.ml.dataframe.analytics.exploration.fieldSelection": "已选择 {selectedFieldsLength, number} 个{docFieldsCount, plural, one {字段} other {字段}}，共 {docFieldsCount, number} 个",
-    "xpack.ml.dataframe.analytics.exploration.indexArrayBadgeContent": "数组",
-    "xpack.ml.dataframe.analytics.exploration.indexArrayToolTipContent": "无法显示此基于数组的列的完整内容。",
     "xpack.ml.dataframe.analytics.exploration.indexError": "加载索引数据时出错。",
-    "xpack.ml.dataframe.analytics.exploration.indexObjectBadgeContent": "对象",
-    "xpack.ml.dataframe.analytics.exploration.indexObjectToolTipContent": "无法显示此基于对象的列的完整内容。",
     "xpack.ml.dataframe.analytics.exploration.jobIdTitle": "作业 ID {jobId}",
     "xpack.ml.dataframe.analytics.exploration.noDataCalloutBody": "该索引的查询未返回结果。请确保索引包含文档且您的查询限制不过于严格。",
-    "xpack.ml.dataframe.analytics.exploration.selectColumnsAriaLabel": "选择列",
-    "xpack.ml.dataframe.analytics.exploration.selectFieldsPopoverTitle": "选择字段",
     "xpack.ml.dataframe.analytics.exploration.title": "分析浏览",
     "xpack.ml.dataframe.analytics.regressionExploration.evaluateError": "加载数据时出错。",
     "xpack.ml.dataframe.analytics.regressionExploration.generalError": "加载数据时出错。",

From 6c3fa6bd43915f987737939b8c37450c3318cbe3 Mon Sep 17 00:00:00 2001
From: Katrin Freihofner <katrin.freihofner@elastic.co>
Date: Wed, 25 Mar 2020 08:24:46 +0100
Subject: [PATCH 129/179] fix/uptime-alert-icon (#60750)

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 .../components/functional/alerts/toggle_alert_flyout_button.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/alerts/toggle_alert_flyout_button.tsx b/x-pack/legacy/plugins/uptime/public/components/functional/alerts/toggle_alert_flyout_button.tsx
index 99853a9f775ec..8093dd30604e4 100644
--- a/x-pack/legacy/plugins/uptime/public/components/functional/alerts/toggle_alert_flyout_button.tsx
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/alerts/toggle_alert_flyout_button.tsx
@@ -48,7 +48,7 @@ export const ToggleAlertFlyoutButtonComponent = ({ setAlertFlyoutVisible }: Prop
             })}
             data-test-subj="xpack.uptime.toggleAlertFlyout"
             key="create-alert"
-            icon="alert"
+            icon="bell"
             onClick={() => setAlertFlyoutVisible(true)}
           >
             <FormattedMessage

From db0a4e8ca0251cbba552c557726c272e7a30f179 Mon Sep 17 00:00:00 2001
From: Robert Oskamp <robert.oskamp@elastic.co>
Date: Wed, 25 Mar 2020 09:57:08 +0100
Subject: [PATCH 130/179] [ML] Jest tests - re-activate data recognizer tests
 (#60525)

This PR re-activates the data recognizer Jest tests.
---
 .../ml/server/models/data_recognizer/data_recognizer.test.ts   | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/x-pack/plugins/ml/server/models/data_recognizer/data_recognizer.test.ts b/x-pack/plugins/ml/server/models/data_recognizer/data_recognizer.test.ts
index 30cf5a0d4e58f..4f0e0ecc6b55b 100644
--- a/x-pack/plugins/ml/server/models/data_recognizer/data_recognizer.test.ts
+++ b/x-pack/plugins/ml/server/models/data_recognizer/data_recognizer.test.ts
@@ -8,8 +8,7 @@ import { APICaller, SavedObjectsClientContract } from 'kibana/server';
 import { Module } from '../../../common/types/modules';
 import { DataRecognizer } from '../data_recognizer';
 
-// FLAKY: https://github.com/elastic/kibana/issues/59541
-describe.skip('ML - data recognizer', () => {
+describe('ML - data recognizer', () => {
   const dr = new DataRecognizer(
     jest.fn() as APICaller,
     ({

From 90f0032c36d077285729b78e9703d4f96de7f058 Mon Sep 17 00:00:00 2001
From: Robert Oskamp <robert.oskamp@elastic.co>
Date: Wed, 25 Mar 2020 10:00:45 +0100
Subject: [PATCH 131/179] [ML] Adjust permissions for ml_ui_extras role
 (#61055)

This PR removes the cluster:manage permission from the ml_ui_extras role as this is no longer needed.
---
 .../functional/services/machine_learning/security_common.ts     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x-pack/test/functional/services/machine_learning/security_common.ts b/x-pack/test/functional/services/machine_learning/security_common.ts
index 069aec1697ebd..d59c1edcb00ab 100644
--- a/x-pack/test/functional/services/machine_learning/security_common.ts
+++ b/x-pack/test/functional/services/machine_learning/security_common.ts
@@ -42,7 +42,7 @@ export function MachineLearningSecurityCommonProvider({ getService }: FtrProvide
     {
       name: 'ml_ui_extras',
       elasticsearch: {
-        cluster: ['manage', 'manage_ingest_pipelines', 'monitor'],
+        cluster: ['manage_ingest_pipelines', 'monitor'],
       },
       kibana: [],
     },

From 5b706ee37202676dbc166cfa3f6d11b97ff49b45 Mon Sep 17 00:00:00 2001
From: MadameSheema <snootchie.boochies@gmail.com>
Date: Wed, 25 Mar 2020 11:11:03 +0100
Subject: [PATCH 132/179] [SIEM] Adds 'Create ML rule' Cypress test (#61059)

* splits signal detection rules tests in different spec files

* implements 'creates and activates a new ml rule'

* refactors code

* updates 'select_rule_type' data-test-subj selectors

* Refactor JobStatusBadge

I'm adding a data-test-subj and it seems silly to define it in two
branches.

* Update ML Rule cypress tests

* Updates the test now that the Rule Details have changed
* Adds an additional assertion on the new JobStatusBadge

* keeps code consistency

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
Co-authored-by: Ryland Herrick <ryalnd@gmail.com>
---
 ... => signal_detection_rules_custom.spec.ts} |   55 +-
 .../signal_detection_rules_ml.spec.ts         |  197 +
 .../signal_detection_rules_prebuilt.spec.ts   |   57 +
 .../plugins/siem/cypress/objects/rule.ts      |   31 +-
 .../siem/cypress/screens/create_new_rule.ts   |    8 +
 .../siem/cypress/screens/rule_details.ts      |    8 +
 .../cypress/screens/signal_detection_rules.ts |    2 +
 .../siem/cypress/tasks/create_new_rule.ts     |   27 +-
 .../plugins/siem/cypress/tasks/es_archiver.ts |   10 +-
 .../description_step/ml_job_description.tsx   |   12 +-
 .../components/select_rule_type/index.tsx     |    2 +
 .../prebuilt_rules_loaded/data.json.gz        |  Bin 0 -> 27315 bytes
 .../prebuilt_rules_loaded/mappings.json       | 4828 +++++++++++++++++
 13 files changed, 5188 insertions(+), 49 deletions(-)
 rename x-pack/legacy/plugins/siem/cypress/integration/{signal_detection_rules.spec.ts => signal_detection_rules_custom.spec.ts} (83%)
 create mode 100644 x-pack/legacy/plugins/siem/cypress/integration/signal_detection_rules_ml.spec.ts
 create mode 100644 x-pack/legacy/plugins/siem/cypress/integration/signal_detection_rules_prebuilt.spec.ts
 create mode 100644 x-pack/test/siem_cypress/es_archives/prebuilt_rules_loaded/data.json.gz
 create mode 100644 x-pack/test/siem_cypress/es_archives/prebuilt_rules_loaded/mappings.json

diff --git a/x-pack/legacy/plugins/siem/cypress/integration/signal_detection_rules.spec.ts b/x-pack/legacy/plugins/siem/cypress/integration/signal_detection_rules_custom.spec.ts
similarity index 83%
rename from x-pack/legacy/plugins/siem/cypress/integration/signal_detection_rules.spec.ts
rename to x-pack/legacy/plugins/siem/cypress/integration/signal_detection_rules_custom.spec.ts
index 70e4fb052e172..06ba4bed005ca 100644
--- a/x-pack/legacy/plugins/siem/cypress/integration/signal_detection_rules.spec.ts
+++ b/x-pack/legacy/plugins/siem/cypress/integration/signal_detection_rules_custom.spec.ts
@@ -26,7 +26,6 @@ import {
 } from '../screens/rule_details';
 import {
   CUSTOM_RULES_BTN,
-  ELASTIC_RULES_BTN,
   RISK_SCORE,
   RULE_NAME,
   RULES_ROW,
@@ -37,63 +36,43 @@ import {
 import {
   createAndActivateRule,
   fillAboutRuleAndContinue,
-  fillDefineRuleAndContinue,
+  fillDefineCustomRuleAndContinue,
 } from '../tasks/create_new_rule';
+import {
+  goToManageSignalDetectionRules,
+  waitForSignalsIndexToBeCreated,
+  waitForSignalsPanelToBeLoaded,
+} from '../tasks/detections';
 import {
   changeToThreeHundredRowsPerPage,
   filterByCustomRules,
   goToCreateNewRule,
   goToRuleDetails,
-  loadPrebuiltDetectionRules,
   waitForLoadElasticPrebuiltDetectionRulesTableToBeLoaded,
-  waitForPrebuiltDetectionRulesToBeLoaded,
   waitForRulesToBeLoaded,
 } from '../tasks/signal_detection_rules';
-import {
-  goToManageSignalDetectionRules,
-  waitForSignalsIndexToBeCreated,
-  waitForSignalsPanelToBeLoaded,
-} from '../tasks/detections';
-import { esArchiverLoadEmptyKibana, esArchiverUnloadEmptyKibana } from '../tasks/es_archiver';
+import { esArchiverLoad, esArchiverUnload } from '../tasks/es_archiver';
 import { loginAndWaitForPageWithoutDateRange } from '../tasks/login';
 
 import { DETECTIONS } from '../urls/navigation';
 
-describe('Signal detection rules', () => {
+describe('Signal detection rules, custom', () => {
   before(() => {
-    esArchiverLoadEmptyKibana();
-    loginAndWaitForPageWithoutDateRange(DETECTIONS);
-    waitForSignalsPanelToBeLoaded();
-    waitForSignalsIndexToBeCreated();
-    goToManageSignalDetectionRules();
-    waitForLoadElasticPrebuiltDetectionRulesTableToBeLoaded();
+    esArchiverLoad('prebuilt_rules_loaded');
   });
 
   after(() => {
-    esArchiverUnloadEmptyKibana();
+    esArchiverUnload('prebuilt_rules_loaded');
   });
 
-  it('Loads prebuilt rules', () => {
-    loadPrebuiltDetectionRules();
-    waitForPrebuiltDetectionRulesToBeLoaded();
-
-    const expectedElasticRulesBtnText = 'Elastic rules (92)';
-    cy.get(ELASTIC_RULES_BTN)
-      .invoke('text')
-      .should('eql', expectedElasticRulesBtnText);
-
-    changeToThreeHundredRowsPerPage();
-    waitForRulesToBeLoaded();
-
-    const expectedNumberOfRules = 92;
-    cy.get(RULES_TABLE).then($table => {
-      cy.wrap($table.find(RULES_ROW).length).should('eql', expectedNumberOfRules);
-    });
-  });
-
-  it('Creates and activates new rule', () => {
+  it('Creates and activates a new custom rule', () => {
+    loginAndWaitForPageWithoutDateRange(DETECTIONS);
+    waitForSignalsPanelToBeLoaded();
+    waitForSignalsIndexToBeCreated();
+    goToManageSignalDetectionRules();
+    waitForLoadElasticPrebuiltDetectionRulesTableToBeLoaded();
     goToCreateNewRule();
-    fillDefineRuleAndContinue(newRule);
+    fillDefineCustomRuleAndContinue(newRule);
     fillAboutRuleAndContinue(newRule);
     createAndActivateRule();
 
diff --git a/x-pack/legacy/plugins/siem/cypress/integration/signal_detection_rules_ml.spec.ts b/x-pack/legacy/plugins/siem/cypress/integration/signal_detection_rules_ml.spec.ts
new file mode 100644
index 0000000000000..99391fa73a753
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/cypress/integration/signal_detection_rules_ml.spec.ts
@@ -0,0 +1,197 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { machineLearningRule } from '../objects/rule';
+
+import {
+  ABOUT_FALSE_POSITIVES,
+  ABOUT_MITRE,
+  ABOUT_RISK,
+  ABOUT_RULE_DESCRIPTION,
+  ABOUT_SEVERITY,
+  ABOUT_STEP,
+  ABOUT_TAGS,
+  ABOUT_URLS,
+  ANOMALY_SCORE,
+  DEFINITION_TIMELINE,
+  DEFINITION_STEP,
+  MACHINE_LEARNING_JOB_ID,
+  MACHINE_LEARNING_JOB_STATUS,
+  RULE_NAME_HEADER,
+  SCHEDULE_LOOPBACK,
+  SCHEDULE_RUNS,
+  SCHEDULE_STEP,
+  RULE_TYPE,
+} from '../screens/rule_details';
+import {
+  CUSTOM_RULES_BTN,
+  RISK_SCORE,
+  RULE_NAME,
+  RULE_SWITCH,
+  RULES_ROW,
+  RULES_TABLE,
+  SEVERITY,
+} from '../screens/signal_detection_rules';
+
+import {
+  createAndActivateRule,
+  fillAboutRuleAndContinue,
+  fillDefineMachineLearningRuleAndContinue,
+  selectMachineLearningRuleType,
+} from '../tasks/create_new_rule';
+import {
+  goToManageSignalDetectionRules,
+  waitForSignalsIndexToBeCreated,
+  waitForSignalsPanelToBeLoaded,
+} from '../tasks/detections';
+import {
+  changeToThreeHundredRowsPerPage,
+  filterByCustomRules,
+  goToCreateNewRule,
+  goToRuleDetails,
+  waitForLoadElasticPrebuiltDetectionRulesTableToBeLoaded,
+  waitForRulesToBeLoaded,
+} from '../tasks/signal_detection_rules';
+import { esArchiverLoad, esArchiverUnload } from '../tasks/es_archiver';
+import { loginAndWaitForPageWithoutDateRange } from '../tasks/login';
+
+import { DETECTIONS } from '../urls/navigation';
+
+describe('Signal detection rules, machine learning', () => {
+  before(() => {
+    esArchiverLoad('prebuilt_rules_loaded');
+  });
+
+  after(() => {
+    esArchiverUnload('prebuilt_rules_loaded');
+  });
+
+  it('Creates and activates a new ml rule', () => {
+    loginAndWaitForPageWithoutDateRange(DETECTIONS);
+    waitForSignalsPanelToBeLoaded();
+    waitForSignalsIndexToBeCreated();
+    goToManageSignalDetectionRules();
+    waitForLoadElasticPrebuiltDetectionRulesTableToBeLoaded();
+    goToCreateNewRule();
+    selectMachineLearningRuleType();
+    fillDefineMachineLearningRuleAndContinue(machineLearningRule);
+    fillAboutRuleAndContinue(machineLearningRule);
+    createAndActivateRule();
+
+    cy.get(CUSTOM_RULES_BTN)
+      .invoke('text')
+      .should('eql', 'Custom rules (1)');
+
+    changeToThreeHundredRowsPerPage();
+    waitForRulesToBeLoaded();
+
+    const expectedNumberOfRules = 93;
+    cy.get(RULES_TABLE).then($table => {
+      cy.wrap($table.find(RULES_ROW).length).should('eql', expectedNumberOfRules);
+    });
+
+    filterByCustomRules();
+
+    cy.get(RULES_TABLE).then($table => {
+      cy.wrap($table.find(RULES_ROW).length).should('eql', 1);
+    });
+    cy.get(RULE_NAME)
+      .invoke('text')
+      .should('eql', machineLearningRule.name);
+    cy.get(RISK_SCORE)
+      .invoke('text')
+      .should('eql', machineLearningRule.riskScore);
+    cy.get(SEVERITY)
+      .invoke('text')
+      .should('eql', machineLearningRule.severity);
+    cy.get(RULE_SWITCH).should('have.attr', 'aria-checked', 'true');
+
+    goToRuleDetails();
+
+    let expectedUrls = '';
+    machineLearningRule.referenceUrls.forEach(url => {
+      expectedUrls = expectedUrls + url;
+    });
+    let expectedFalsePositives = '';
+    machineLearningRule.falsePositivesExamples.forEach(falsePositive => {
+      expectedFalsePositives = expectedFalsePositives + falsePositive;
+    });
+    let expectedTags = '';
+    machineLearningRule.tags.forEach(tag => {
+      expectedTags = expectedTags + tag;
+    });
+    let expectedMitre = '';
+    machineLearningRule.mitre.forEach(mitre => {
+      expectedMitre = expectedMitre + mitre.tactic;
+      mitre.techniques.forEach(technique => {
+        expectedMitre = expectedMitre + technique;
+      });
+    });
+
+    cy.get(RULE_NAME_HEADER)
+      .invoke('text')
+      .should('eql', `${machineLearningRule.name} Beta`);
+
+    cy.get(ABOUT_RULE_DESCRIPTION)
+      .invoke('text')
+      .should('eql', machineLearningRule.description);
+    cy.get(ABOUT_STEP)
+      .eq(ABOUT_SEVERITY)
+      .invoke('text')
+      .should('eql', machineLearningRule.severity);
+    cy.get(ABOUT_STEP)
+      .eq(ABOUT_RISK)
+      .invoke('text')
+      .should('eql', machineLearningRule.riskScore);
+    cy.get(ABOUT_STEP)
+      .eq(ABOUT_URLS)
+      .invoke('text')
+      .should('eql', expectedUrls);
+    cy.get(ABOUT_STEP)
+      .eq(ABOUT_FALSE_POSITIVES)
+      .invoke('text')
+      .should('eql', expectedFalsePositives);
+    cy.get(ABOUT_STEP)
+      .eq(ABOUT_MITRE)
+      .invoke('text')
+      .should('eql', expectedMitre);
+    cy.get(ABOUT_STEP)
+      .eq(ABOUT_TAGS)
+      .invoke('text')
+      .should('eql', expectedTags);
+
+    cy.get(DEFINITION_STEP)
+      .eq(RULE_TYPE)
+      .invoke('text')
+      .should('eql', 'Machine Learning');
+    cy.get(DEFINITION_STEP)
+      .eq(ANOMALY_SCORE)
+      .invoke('text')
+      .should('eql', machineLearningRule.anomalyScoreThreshold);
+    cy.get(DEFINITION_STEP)
+      .get(MACHINE_LEARNING_JOB_STATUS)
+      .invoke('text')
+      .should('eql', 'Stopped');
+    cy.get(DEFINITION_STEP)
+      .get(MACHINE_LEARNING_JOB_ID)
+      .invoke('text')
+      .should('eql', machineLearningRule.machineLearningJob);
+
+    cy.get(DEFINITION_STEP)
+      .eq(DEFINITION_TIMELINE)
+      .invoke('text')
+      .should('eql', 'Default blank timeline');
+
+    cy.get(SCHEDULE_STEP)
+      .eq(SCHEDULE_RUNS)
+      .invoke('text')
+      .should('eql', '5m');
+    cy.get(SCHEDULE_STEP)
+      .eq(SCHEDULE_LOOPBACK)
+      .invoke('text')
+      .should('eql', '1m');
+  });
+});
diff --git a/x-pack/legacy/plugins/siem/cypress/integration/signal_detection_rules_prebuilt.spec.ts b/x-pack/legacy/plugins/siem/cypress/integration/signal_detection_rules_prebuilt.spec.ts
new file mode 100644
index 0000000000000..172f1dc918163
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/cypress/integration/signal_detection_rules_prebuilt.spec.ts
@@ -0,0 +1,57 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { ELASTIC_RULES_BTN, RULES_ROW, RULES_TABLE } from '../screens/signal_detection_rules';
+
+import {
+  changeToThreeHundredRowsPerPage,
+  loadPrebuiltDetectionRules,
+  waitForLoadElasticPrebuiltDetectionRulesTableToBeLoaded,
+  waitForPrebuiltDetectionRulesToBeLoaded,
+  waitForRulesToBeLoaded,
+} from '../tasks/signal_detection_rules';
+import {
+  goToManageSignalDetectionRules,
+  waitForSignalsIndexToBeCreated,
+  waitForSignalsPanelToBeLoaded,
+} from '../tasks/detections';
+import { esArchiverLoadEmptyKibana, esArchiverUnloadEmptyKibana } from '../tasks/es_archiver';
+import { loginAndWaitForPageWithoutDateRange } from '../tasks/login';
+
+import { DETECTIONS } from '../urls/navigation';
+
+describe('Signal detection rules, prebuilt rules', () => {
+  before(() => {
+    esArchiverLoadEmptyKibana();
+  });
+
+  after(() => {
+    esArchiverUnloadEmptyKibana();
+  });
+
+  it('Loads prebuilt rules', () => {
+    loginAndWaitForPageWithoutDateRange(DETECTIONS);
+    waitForSignalsPanelToBeLoaded();
+    waitForSignalsIndexToBeCreated();
+    goToManageSignalDetectionRules();
+    waitForLoadElasticPrebuiltDetectionRulesTableToBeLoaded();
+    loadPrebuiltDetectionRules();
+    waitForPrebuiltDetectionRulesToBeLoaded();
+
+    const expectedElasticRulesBtnText = 'Elastic rules (92)';
+    cy.get(ELASTIC_RULES_BTN)
+      .invoke('text')
+      .should('eql', expectedElasticRulesBtnText);
+
+    changeToThreeHundredRowsPerPage();
+    waitForRulesToBeLoaded();
+
+    const expectedNumberOfRules = 92;
+    cy.get(RULES_TABLE).then($table => {
+      cy.wrap($table.find(RULES_ROW).length).should('eql', expectedNumberOfRules);
+    });
+  });
+});
diff --git a/x-pack/legacy/plugins/siem/cypress/objects/rule.ts b/x-pack/legacy/plugins/siem/cypress/objects/rule.ts
index ed9ef12860ab4..a183da1de5d6e 100644
--- a/x-pack/legacy/plugins/siem/cypress/objects/rule.ts
+++ b/x-pack/legacy/plugins/siem/cypress/objects/rule.ts
@@ -9,7 +9,7 @@ interface Mitre {
   techniques: string[];
 }
 
-export interface Rule {
+export interface CustomRule {
   customQuery: string;
   name: string;
   description: string;
@@ -22,6 +22,20 @@ export interface Rule {
   mitre: Mitre[];
 }
 
+export interface MachineLearningRule {
+  machineLearningJob: string;
+  anomalyScoreThreshold: string;
+  name: string;
+  description: string;
+  severity: string;
+  riskScore: string;
+  tags: string[];
+  timelineTemplate?: string;
+  referenceUrls: string[];
+  falsePositivesExamples: string[];
+  mitre: Mitre[];
+}
+
 const mitre1: Mitre = {
   tactic: 'Discovery (TA0007)',
   techniques: ['Cloud Service Discovery (T1526)', 'File and Directory Discovery (T1083)'],
@@ -32,7 +46,7 @@ const mitre2: Mitre = {
   techniques: ['CMSTP (T1191)'],
 };
 
-export const newRule: Rule = {
+export const newRule: CustomRule = {
   customQuery: 'hosts.name: *',
   name: 'New Rule Test',
   description: 'The new rule description.',
@@ -43,3 +57,16 @@ export const newRule: Rule = {
   falsePositivesExamples: ['False1', 'False2'],
   mitre: [mitre1, mitre2],
 };
+
+export const machineLearningRule: MachineLearningRule = {
+  machineLearningJob: 'linux_anomalous_network_service',
+  anomalyScoreThreshold: '20',
+  name: 'New ML Rule Test',
+  description: 'The new ML rule description.',
+  severity: 'Critical',
+  riskScore: '70',
+  tags: ['ML'],
+  referenceUrls: ['https://elastic.co/'],
+  falsePositivesExamples: ['False1'],
+  mitre: [mitre1],
+};
diff --git a/x-pack/legacy/plugins/siem/cypress/screens/create_new_rule.ts b/x-pack/legacy/plugins/siem/cypress/screens/create_new_rule.ts
index a61dc3fe61814..e603e2ee5158e 100644
--- a/x-pack/legacy/plugins/siem/cypress/screens/create_new_rule.ts
+++ b/x-pack/legacy/plugins/siem/cypress/screens/create_new_rule.ts
@@ -12,6 +12,8 @@ export const ADD_FALSE_POSITIVE_BTN =
 export const ADD_REFERENCE_URL_BTN =
   '[data-test-subj="detectionEngineStepAboutRuleReferenceUrls"] .euiButtonEmpty__text';
 
+export const ANOMALY_THRESHOLD_INPUT = '[data-test-subj="anomalyThresholdSlider"] .euiFieldNumber';
+
 export const MITRE_BTN = '[data-test-subj="addMitre"]';
 
 export const ADVANCED_SETTINGS_BTN = '[data-test-subj="advancedSettings"] .euiAccordion__button';
@@ -27,6 +29,12 @@ export const SCHEDULE_CONTINUE_BUTTON = '[data-test-subj="schedule-continue"]';
 export const FALSE_POSITIVES_INPUT =
   '[data-test-subj="detectionEngineStepAboutRuleFalsePositives"] input';
 
+export const MACHINE_LEARNING_DROPDOWN = '[data-test-subj="mlJobSelect"] button';
+
+export const MACHINE_LEARNING_LIST = '.euiContextMenuItem__text';
+
+export const MACHINE_LEARNING_TYPE = '[data-test-subj="machineLearningRuleType"]';
+
 export const MITRE_TACTIC = '.euiContextMenuItem__text';
 
 export const MITRE_TACTIC_DROPDOWN = '[data-test-subj="mitreTactic"]';
diff --git a/x-pack/legacy/plugins/siem/cypress/screens/rule_details.ts b/x-pack/legacy/plugins/siem/cypress/screens/rule_details.ts
index 06e535b37708c..fc9e4c56dd824 100644
--- a/x-pack/legacy/plugins/siem/cypress/screens/rule_details.ts
+++ b/x-pack/legacy/plugins/siem/cypress/screens/rule_details.ts
@@ -20,6 +20,8 @@ export const ABOUT_TAGS = 5;
 
 export const ABOUT_URLS = 2;
 
+export const ANOMALY_SCORE = 1;
+
 export const DEFINITION_CUSTOM_QUERY = 1;
 
 export const DEFINITION_TIMELINE = 3;
@@ -30,8 +32,14 @@ export const DEFINITION_INDEX_PATTERNS =
 export const DEFINITION_STEP =
   '[data-test-subj=definitionRule] [data-test-subj="listItemColumnStepRuleDescription"] .euiDescriptionList__description';
 
+export const MACHINE_LEARNING_JOB_ID = '[data-test-subj="machineLearningJobId"]';
+
+export const MACHINE_LEARNING_JOB_STATUS = '[data-test-subj="machineLearningJobStatus"  ]';
+
 export const RULE_NAME_HEADER = '[data-test-subj="header-page-title"]';
 
+export const RULE_TYPE = 0;
+
 export const SCHEDULE_STEP = '[data-test-subj="schedule"]  .euiDescriptionList__description';
 
 export const SCHEDULE_RUNS = 0;
diff --git a/x-pack/legacy/plugins/siem/cypress/screens/signal_detection_rules.ts b/x-pack/legacy/plugins/siem/cypress/screens/signal_detection_rules.ts
index db3aaaaa94f4a..2576715279347 100644
--- a/x-pack/legacy/plugins/siem/cypress/screens/signal_detection_rules.ts
+++ b/x-pack/legacy/plugins/siem/cypress/screens/signal_detection_rules.ts
@@ -23,6 +23,8 @@ export const RISK_SCORE = '[data-test-subj="riskScore"]';
 
 export const RULE_NAME = '[data-test-subj="ruleName"]';
 
+export const RULE_SWITCH = '[data-test-subj="rule-switch"]';
+
 export const RULES_TABLE = '[data-test-subj="rules-table"]';
 
 export const RULES_ROW = '.euiTableRow';
diff --git a/x-pack/legacy/plugins/siem/cypress/tasks/create_new_rule.ts b/x-pack/legacy/plugins/siem/cypress/tasks/create_new_rule.ts
index ccaa065754b5b..59ed156bf56b1 100644
--- a/x-pack/legacy/plugins/siem/cypress/tasks/create_new_rule.ts
+++ b/x-pack/legacy/plugins/siem/cypress/tasks/create_new_rule.ts
@@ -3,9 +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 { Rule } from '../objects/rule';
+import { CustomRule, MachineLearningRule, machineLearningRule } from '../objects/rule';
 import {
   ABOUT_CONTINUE_BTN,
+  ANOMALY_THRESHOLD_INPUT,
   ADD_FALSE_POSITIVE_BTN,
   ADD_REFERENCE_URL_BTN,
   ADVANCED_SETTINGS_BTN,
@@ -13,6 +14,9 @@ import {
   CUSTOM_QUERY_INPUT,
   DEFINE_CONTINUE_BUTTON,
   FALSE_POSITIVES_INPUT,
+  MACHINE_LEARNING_DROPDOWN,
+  MACHINE_LEARNING_LIST,
+  MACHINE_LEARNING_TYPE,
   MITRE_BTN,
   MITRE_TACTIC,
   MITRE_TACTIC_DROPDOWN,
@@ -32,7 +36,7 @@ export const createAndActivateRule = () => {
   cy.get(CREATE_AND_ACTIVATE_BTN).should('not.exist');
 };
 
-export const fillAboutRuleAndContinue = (rule: Rule) => {
+export const fillAboutRuleAndContinue = (rule: CustomRule | MachineLearningRule) => {
   cy.get(RULE_NAME_INPUT).type(rule.name, { force: true });
   cy.get(RULE_DESCRIPTION_INPUT).type(rule.description, { force: true });
 
@@ -83,7 +87,7 @@ export const fillAboutRuleAndContinue = (rule: Rule) => {
     .click({ force: true });
 };
 
-export const fillDefineRuleAndContinue = (rule: Rule) => {
+export const fillDefineCustomRuleAndContinue = (rule: CustomRule) => {
   cy.get(CUSTOM_QUERY_INPUT).type(rule.customQuery);
   cy.get(CUSTOM_QUERY_INPUT).should('have.attr', 'value', rule.customQuery);
   cy.get(DEFINE_CONTINUE_BUTTON)
@@ -92,3 +96,20 @@ export const fillDefineRuleAndContinue = (rule: Rule) => {
 
   cy.get(CUSTOM_QUERY_INPUT).should('not.exist');
 };
+
+export const fillDefineMachineLearningRuleAndContinue = (rule: MachineLearningRule) => {
+  cy.get(MACHINE_LEARNING_DROPDOWN).click({ force: true });
+  cy.contains(MACHINE_LEARNING_LIST, rule.machineLearningJob).click();
+  cy.get(ANOMALY_THRESHOLD_INPUT).type(`{selectall}${machineLearningRule.anomalyScoreThreshold}`, {
+    force: true,
+  });
+  cy.get(DEFINE_CONTINUE_BUTTON)
+    .should('exist')
+    .click({ force: true });
+
+  cy.get(MACHINE_LEARNING_DROPDOWN).should('not.exist');
+};
+
+export const selectMachineLearningRuleType = () => {
+  cy.get(MACHINE_LEARNING_TYPE).click({ force: true });
+};
diff --git a/x-pack/legacy/plugins/siem/cypress/tasks/es_archiver.ts b/x-pack/legacy/plugins/siem/cypress/tasks/es_archiver.ts
index 1743fcb561064..6417a7d872251 100644
--- a/x-pack/legacy/plugins/siem/cypress/tasks/es_archiver.ts
+++ b/x-pack/legacy/plugins/siem/cypress/tasks/es_archiver.ts
@@ -20,9 +20,17 @@ export const esArchiverLoad = (folder: string) => {
   );
 };
 
+export const esArchiverUnload = (folder: string) => {
+  cy.exec(
+    `node ../../../../scripts/es_archiver unload ${folder} --dir ../../../test/siem_cypress/es_archives --config ../../../../test/functional/config.js --es-url ${Cypress.env(
+      'ELASTICSEARCH_URL'
+    )} --kibana-url ${Cypress.config().baseUrl}`
+  );
+};
+
 export const esArchiverUnloadEmptyKibana = () => {
   cy.exec(
-    `node ../../../../scripts/es_archiver empty_kibana unload empty--dir ../../../test/siem_cypress/es_archives --config ../../../../test/functional/config.js --es-url ${Cypress.env(
+    `node ../../../../scripts/es_archiver unload empty_kibana empty--dir ../../../test/siem_cypress/es_archives --config ../../../../test/functional/config.js --es-url ${Cypress.env(
       'ELASTICSEARCH_URL'
     )} --kibana-url ${Cypress.config().baseUrl}`
   );
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/description_step/ml_job_description.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/description_step/ml_job_description.tsx
index 6697268defbac..947bf29c07148 100644
--- a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/description_step/ml_job_description.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/description_step/ml_job_description.tsx
@@ -47,11 +47,13 @@ const AuditIcon: React.FC<{
 
 export const JobStatusBadge: React.FC<{ job: SiemJob }> = ({ job }) => {
   const isStarted = isJobStarted(job.jobState, job.datafeedState);
+  const color = isStarted ? 'secondary' : 'danger';
+  const text = isStarted ? ML_JOB_STARTED : ML_JOB_STOPPED;
 
-  return isStarted ? (
-    <EuiBadge color="secondary">{ML_JOB_STARTED}</EuiBadge>
-  ) : (
-    <EuiBadge color="danger">{ML_JOB_STOPPED}</EuiBadge>
+  return (
+    <EuiBadge data-test-subj="machineLearningJobStatus" color={color}>
+      {text}
+    </EuiBadge>
   );
 };
 
@@ -69,7 +71,7 @@ export const MlJobDescription: React.FC<{ job: SiemJob }> = ({ job }) => {
   return (
     <Wrapper>
       <div>
-        <JobLink href={jobUrl} target="_blank">
+        <JobLink data-test-subj="machineLearningJobId" href={jobUrl} target="_blank">
           {job.id}
         </JobLink>
         <AuditIcon message={job.auditMessage} />
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/select_rule_type/index.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/select_rule_type/index.tsx
index af7150e083817..4ccde78f3cda7 100644
--- a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/select_rule_type/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/select_rule_type/index.tsx
@@ -80,6 +80,7 @@ export const SelectRuleType: React.FC<SelectRuleTypeProps> = ({
       <EuiFlexGrid columns={4}>
         <EuiFlexItem>
           <EuiCard
+            data-test-subj="customRuleType"
             title={i18n.QUERY_TYPE_TITLE}
             description={i18n.QUERY_TYPE_DESCRIPTION}
             icon={<EuiIcon size="l" type="search" />}
@@ -92,6 +93,7 @@ export const SelectRuleType: React.FC<SelectRuleTypeProps> = ({
         </EuiFlexItem>
         <EuiFlexItem>
           <EuiCard
+            data-test-subj="machineLearningRuleType"
             title={i18n.ML_TYPE_TITLE}
             description={<MlCardDescription hasValidLicense={hasValidLicense} />}
             icon={<EuiIcon size="l" type="machineLearningApp" />}
diff --git a/x-pack/test/siem_cypress/es_archives/prebuilt_rules_loaded/data.json.gz b/x-pack/test/siem_cypress/es_archives/prebuilt_rules_loaded/data.json.gz
new file mode 100644
index 0000000000000000000000000000000000000000..e3f535a5e69e1dbcf97d2b06c6160797ebbc826c
GIT binary patch
literal 27315
zcmV)EK)}BriwFP!000026YRZdbKA(41^E5_3XErBO72n8SQ1M*W+uXAS53LQ?DANy
zs+ewdRObc}&mh1DfRgn(`oGV;nE(h%lw^vOOwp*tmat?day@rD_rL$<IM15PxqkN2
zd8SJF>=-Yc^L&9<{u_RQUo(Ywd9JJGW$bBBM4FRC@Q6?^_6c_*PEsaQ77Lm9$}@%F
zdxg?p@YTuZOz?vL)!(VhMJ1OtIBn^J3wTL3Sy|L@@jv>D|9L#PkFR`!w!by)t1~^D
z)Y)0V^ZMEFv3d4y`VyWf7I}W{`fnG7uCCvdQ1N1B?wEpy1<FeEMyprY+-JV)yTlEM
zPd~ZrrR%*6{7D>#|GwshAF&b7bk6H0lf(PE;3C)f5h=7?5AMtsjeeEqH{4Ngi@M>3
zgbuj5mkK^JgZrUubkSryciy}|aXu}ILg!g==A38Td0VQi(8DIpdBtb-%6Pz4rE6Jb
za~u{d(!S<owZomJEORF<E2rs8ep@uUDs<z_tFkF2+&|Y<4evVCIePoy5Bl6`DxRj9
zbV|76G*fNb)<52qj?5~#n4Lq*oiwZT1<&*P*nvVX%IdRIYq_Yh=F&N<%EcUR@Iv)B
zxs<xDojj|X+PRo!xpwq9SJ*P88*L`nWbn=KeWsH?ly%l*=X$kE&HeXfHG>XZ)Y>Ui
zXZiVyLYA``d>Ds*gO*n1Y}vL(!+1lb*tSa7npbi<aejv~#HCY|1?ivE#TgU`eS~E~
zk6iWzPo51L@}H}1&T{DH`q~u6ThI<1r=q+d(QNfovl+}FoObX)Q!VuB&355l`Fy@m
zStDRBlYhCnJvlGV7W~Z2xz7vuh}C*${L4wZMqfIf>#p9^4PW;m1<c)b*ULpSUo>y~
zZ3b5=X}18PbjlZbvs(Q>OpD-Im}EFTCb&FaI!BouOPIg*C-vNnm&Tblu^Z7#{RIXJ
zR^4iel}>e~VG*vGFVm)(*DqhZkfqX-&(&o)sr3t6!Hb)Fu*&MsC$g;YljC6Z)*^3r
zJC}NjD(VpyCXCQP`$TXrAYqiaJdHywq`%tGnxDgtq1N?d4d00~5DT7WXVcXen<?&J
zSH5nw$xSxHHLuqf-`)L`HTl|cY|3_;Ua7b}m;P~m8nrtK&Y}MD{|xr8T28fE<ofCk
zmf@ZR#~T(K&YrD(x8Y}3$MV@v*LH2V_-j@yzN}vQ>n~FSOu)Zztp3W>%gsk>P)NT_
zU*aNtwswby@hO{iJ^O4iSJw}ozg_v_^)tAypdST$Lid;3vj5^YAA`*OcU#;4{0;yA
zpTGU>zc+;&VI0dea(zO5MhQ(*O%fF_!d#KWD&lS`lkXjFBtF|exN-9T{_1>cPj@)S
z@oew#z{WV^(-h7_Tu$x5UE6)RhEjRs%=o2aUl8yBht<O2Y;BRnX>s)K#DT^fJHJ(2
z=K9!qcWHjb?H!K#<_yl{f8?;;%c`vFm4;57H*InCX;DwhMXns4&)_8h8HiZ0LO><5
z$>H$+GB0bbu6`_3WD31>c%@H^w9>Gf75GBKt26i<g)qQwvCxL5gwr32IOAF2WJP8G
zTZ?4ia))i8&1Op1lha}|2=k+s9PtY@3I3dy6?7xC4C*q?*7K=`c?gwOaE?Q7HGSV>
zKbz74l_>al3CjUn33C@<0WO`>0;{MOa*7{)G1UNwocFIj!8cxL0f?x=POJ1h&$Rg*
z?nw9%upPiNcxei6EwB%{X;{}L(-P<<Tf8i@LS_p0s|ob7ZJ>lPI<__2TJTbV<D<XG
ze4(JsEX7#@qopR!NjcL{b-92OzBtdSvY46q1fOUtu{{I@n|7El`QyX;8u5W0aQy1R
zOhxQGz$e&Pd<&;lKMAvT!PuwlFluG1=qJv)iMJPU5314!g7(^VGl5;9sBui87v$Uy
zmVxKoNCWoHkw=37huRB$5C0B=Ai}>x8u%6$9@#PMinU{j7}0@7iV_wGKHolN7KK@^
zlWdN~yA$*8i^NnC`x7rRzk9y9!0<w1uSBN4WjQ$0hAqBFfwnOC>-p8a<3=cZGd`v9
z4fxaxn2c$d0L+Ovp`I%V52Ye$;`%`XCpY|ZFMK-FDqGCH0--u9XG*(5;B>+f!-C$u
z{q*rC=hdfA|NHBITPdyuffA3+m)8pE0m`RWuIqW%-W;5PuR(Uh*@FMSE{mor^L3B+
z-EQD_D>Co~TJU)?%bH40%IfTeZBYHfR=XlTTmi7%7ic*xvVRz4^&i)2z5ZFt5A$3a
ztZC?#FDnb!yne^+`a@YY>!1J1PwQF=Ux#&H`#6grhyVQN-)_3QH-d@(?F5tec3-+v
zG}(NS9*Ag?B>vW-N#IAm?^B;du?z^6p(KKWq~bBAT<*D%X6bh?ngrfHYeIiI=SCli
zI?$gDuyWqP=$ygVZZ4zfD@Al$zVo3f&!7b7D9xL9uP6G8e(nf3z^hAxsR5*NVPG!^
z0$kw+!mAb_FN(b6h=(ogb5xZfgtn?Fu23LKbpi6pCW_2&1}HBw_?)u?fs|G?h?>2Z
zo*9r8jbcC4TO%yryGa8WDXF<g30D#}?}WooGG-)ARZ3+bJk9vM5LSNexcgS{$_;OW
zS8wdx?^f|{pp_dwEVP0n<92BEGa4#zKD{wQMG3pa2VKpw8o#l2-jym#GilKO&M+4=
z>M$_ZH&h1y37cMdQQxf&-gwy_4CV^9##}7)67CC+$S^=%dK!^LGevwi0L<m`L?xp-
zIM_pVa4V4@CMv9|#DFe5$pQHMXwcBcn9IC|NU65PTx87@!AOl-Rh6A(4PZP}Q`#L<
zTcu!Y#&e(v?V5G!OL%2g8_P4a&O))S05hn~qS6jb%uHFmi}Pv#)DXojb*iFk72vlY
za=>3snWjd)2gpYKV8L74h8dJ7vvN@*z|*ZlTN*{PxSaF4cKCdrx7$5xNgIv!?9QCL
zwrL|0d}Jhew1WKfmpKd#LO;~KUAfg%T&}&9X`B*kZ_W5;ExE9A!!@JyX}`4Oa%ovJ
z2~6W7Jat|=?IZ2tdw%-NI!avEB@Q%+H$AbUUA*a`6^-M=LEtFRQK(V+hI5n9P`D&X
zeT6>-)MuWOl#UR1?;x<3+zx?PP6ZU7zg#*$nH_Vdpw~+_2ffFSJ^cP{!+%?++-KnZ
zao|U3XQ$H6<~#JkNIS{a(vB~Ln@|-Ko%oVaS24mO84|_f&`(lVrgHSPjgvieelhZd
zb28O=URyy2mR^RFY*QJh7g5>*9GE~L59Il!Q!NVgvpD(xPCotg&Oou&=fV0=pjYm^
z%FaQsIMWW4%5y75lykImFABgq6XzYzFVHywQKv36095k~I<2A?1&TJN9;e2Sv8A?c
z>HSpN7R;Aws!<4eY$4>TRPe!y5YB6}9y&pwy=pIZasd3(2^=sbu@obBoIdO39Eu*-
zpEVC1oj#K@)jj}o==9mVynyk;$zrcQe>fil04%<uu_9>3Bs7f};eO!5Pnszi^MD_M
zkAWN91_3`H8i2Km2xvDTFnD0!g3!Gk1isf7-FCS<r-INOA>U&uxHn#v2jlM?ZVmag
zA4Wc7lyK$&Ugk6*iBgj2AmE`F3K_ZTyH{|#{{BI}k8eIWM<4YJPIl*wu0J>B98X&l
z$n^XHJfJ&I;H#d{Fe!|#+tk+vDq-7tf9NYsnV7riLfg4?b*>0jDeiDJ%L+JQ02sEu
z$(8xa{PMJrt%n2e9>xH$8OPOJV8<aMKraSpMm+^+p$3l2&fCUW@u@y7Hgl@Z8f^AD
zhic<739sg5w${HILF_f}YG|r}6NIP|emXan*NvU4u`8Eq*t&D?m>Exv?wjCS`pCF}
z-n2#!;<7@|YV?dYjk2zqod{qZmRm3CrE9TRG}iNZSTjQUMZGX`f~npNtr*0ZO>E(B
zi}q#oazD0@;b)w|9J=6_a7o~T!ZM*>{=S&adk^dO>!72pvbp=J*1vi9X#?Q|K;dkT
zkDDmD-o4z;!?s8qQ}om}(-3{NajKIvhhA9qF}G8(8$x3eSs3ZY%)}ZR1|yvP6H2Pf
zv@wDXz*n^}j@w1onJ^hopg>#nvZ|F%{0!%H(d)YxMfcSh$p_MbU4SMOFy*r>&$t=J
zcCgB7#b4MdaaZhJ)R%>|Ur^7jQD}4n|CVmxL6ES~+54;PFglDF3zSddkV!&4II~$o
zC1F}JAsBU26+Ur0%<Z1uZ`-rvmDz|6#L4?7dxAP279!6i`I$?!JHJ{Qq`$4t_hXx4
zJok1}3~tF4-<>tab02#Ale@-$`AN=ic#gfwjhKe$rw6w?oCL|}`2R?b|C?{v2O^_0
zZ~K^Jo%mES?GlfAE}==15FuFvKd~h8Tp5Ll{O)D+FxW%K|5hjd3VQV%2{+I(^SYeP
z0pTj=mrw70MHl|fc~Dl1u%28;6FHqdHzGtYSt}HyGqGr_dB$*sl-4!uU4~JhAfwna
ze$n~7m8q}0n!&(G4PayGJceHAC_cj1{PNB;pvAPg2^WAf+yvX6XYk=xNY|ZJePUig
zK_269L4d)4gHCAHgVxwLaFkGlvH=a#sqsqMkVWOw*OrTxCmTm>6ayR;2^EG6%g<<r
zl3lk?v7ENU&Bvn_LKh48a6Pk<Svl8*jj=Tko2Nj8&XiS@n3nvJ=?h&=9HVT3{}6to
zb?mZUcJ;9lxA~P3G4UH#mNiFOnU`lq&|g1P`ytnTN6{E|K0ToP69hEif)VP|kkHr*
zi3lhq+Vf->376A2ed>N_2jz(5-yPq2^P#Y9ti=<Mbq+G{=828@Xnwqx`Em2T_+Uhv
z?c-|#PlvIq6iKNc5Gr&^L=yYN^QCr^*mdK?{q8-^!aa<y`L&b)Gf&!usGLu{#$X%6
zKe4&f*(;~+OKPyBp<@|FDHlBiHZWJ$xM;F^iaubSJIb*$E6*|Lr9nQS{L)Y^y+GN+
zx}xc&cUrxn1o5jrgIhB!W3{2ZQK}sjM=dH;S{iFv-ub_!PN6S)i_nP1_sJP;1-HZC
zno%`zF~hsOI;+w5?1dfY&i9P0{`%sizft$sK&I@k4t{<ir${rkEUEqV`NK&KJe5+1
zT#+bLnozBLl7wDFLhZ6Z1zfVHAHaQRzH4`2$kh#ahwf`5etazaxcRC)6!*1cd-t_i
z3L5LwC6Sv*LY3gqc`hX>qb{Q~N&MLV?p5P-FFA28bY<cdoO;eL3It8BXKHgwaD~)5
zDJn+!z>~$Xj^&P=W_f>#JC(MGte$3b8@%26k{doxT^O!z<0iCh9^M|K3mzNLt&0y>
zb@aau-rBKzKmwdJ@*=J^NxaCjM$9CPHHkrXjiNNvS_Grkb$_(3ZpiLt6@+O-enl#F
z<4u_IodyB0G2r)cM?8scAMxeBzPnLQq7f@UR;b6uJMh6o_p<GEt%+dLPht`!E`!bk
z8AE`OK|)sw=+y{rj&3A$52Jhkc>mft`Xj5F1<#!&vC#~`6#&-fon!kq3-`eG_2C}Z
z8Z$BX$AFKW1bkput_k>nkJ0dgS_%3v*+Om!;uu6WY#7PWjcAUa)n+1s8B#bWC%@QI
z;R`Xm0)1ER4zaj9y22KEcZdZ(FpRLcHMqhSdhZB}^}!V_o&OkN@$Dllj;@ASIRE$m
z<%Egru8qHN{!hH=xp(pHXT`b*44gr`io)2Z2#g!kL4~mkup#k?N+~5Y;+*hM#Uu#g
zm?dc#XpuZ*I;fFse+yQmJH+BPs?^4oIG@TguXo6W^b};`M~}U6A9&0?=I%@E4K!s8
zyLhCqi_LfGLy?!+_P$A)hfKs&6EA@tq;5b7kAj56OeU%8Q@H)zbN|NC9#SLx{ON;p
zWN6JlAu5C!Heg2RV=*2+N!&VF8QWG|BT%icwgv>lHo?Q1kARQ+^x?V5UM4i=JgW>M
z#RP6py<Akr^aaw=%&9XJlA+|&!efbRh2qw^ig%)$;dn*q-K0h{HWh^&zi{gkW^dnK
zBmESu^xKM@Hu_}ZbZOp9cu9ttaR(s_7a1~n<#h?SL2w^rJ8QqlutexC{Lg09vucf%
z24FTckhV;U3iPPL9KbcktJr*S*69oS=Cm*=g6BEU3exB=gN(o?@!K&bXEXbp)JP3*
zY=+CK0!+*Y&ZOFYCz2vV<qGP-vE$wJ$%^wbKgUC|qbH~r;_sNL%_uO=7Oklf8;yY@
zAV0!ToSJE@IF#23#*2b4nrT^~NV~B<0Grg;Z*?8R9CWLc2R1XHjWy}zQ=zB)JS(d<
zNu5~0ltI{s9c~5Zj%^z2LJ`~y4pd<rmN0q+NvM~P+aZQR2TTp{Yy~|BARjk`rNEDU
z4RfW{*c@LK%x>;;n8Ay}Nb~K>W^OFs?3pk?j2VjGH<s7w5b)hr#5e007g<quYz%c>
z%FOurVL9D58_iDFZ>^qV)<!qk-WU}C`$4gA<hwXnzBgvo`#O_%5^EU+EFz3c0Fbd8
z5g}8T_*w|xcU?cF!9f!(j4Aa-dWDf*VWd~sZ#jSSZTet*NVjLbmLV6h$28G#5E7~q
zN|HE<2v@FReiFxFF#3?v`03fjzby&kidFm?3F2rIztJYX6N~sY3dFmt;YKFyGQRK3
z8r~YhZMk<@!=10RhU0*@#{1n_!#hLxRRi``*6=|&OKbZm3?Gg)e9S&?PwIdx%4Fn`
zm@7%BFFhgvn~*s0wc>sX5F;J4&yNQ29T~(&G3j1n(&nr5V9cT0r=JhQB#Kgw)bP|L
zRCt_lKh`9T{V4H$FAR7*CI{L>G3jI(75DDM`3(gU?YuUDacxBWHc@wjn7fr=JB_xF
zwSvNudaiBDAmwQ79Q|2V>evS0eJEk|9XmgLkvf0gS(>iaVv-3ND@)E71#UMT2}3K4
z^dt=Hssq4ajAXC^7BeH%nYh3uf7*;=YsUz{Cq(Jstj{lWbc#KMw%lR*AdQpjT0WsU
zyfl31AB9#8Ebzg#G;eZM4X@1V`9iE-u)<rLnCN=QA~cCt^WiJ1Ha)O<3D(W<!r2@I
zdg!^~wJFH*Smf|pHiykD&CZ6`3emvMvGQu6um0*?`MsWAy>PXN9P@Xr^dc<4;qU+G
zzI%8L&A%%bE{sS%yj1CxVrseao6&z{MOqH8B7+AeEnc}+am>p+ymT=wL699@5ocG6
zl4@l<<*aU2MoZQ!1*qc7$_!b(yG*&eyz&Kya-~yR=9op3t<1`P)13U-TAe2?f7q2N
zC>F3iu3nn1cImACQm>R<Dj{*Etn~YpPlIu&&#ToH@Z}==CtqDnyb)FTd9_VxSy?BM
zm2q4WtqiK*_3T=uvR)kmwK@RiSh_7ASbOzibrN69vX!B@xL%ORn%d~$Rw{&9baiaf
zZc;pV9+12x@@WzUDdDlJ2=!w82?>=sb!ikNYNUMJt58&r-9_Cp*Rc0bvwCVgZLzIW
zL?AnKv>i!Y9*x9h<JEaEImqbNlBMScoO;yQEH#Mbp(aeKl&DC8&`BBPbTq()d+2D}
zZ^<_0>@b=3#v-M8%?OmX7$b(kdZ-PnUUmj@T<+lM3t}gl+N_Del6f0f)jn~p0fpAL
zv~_X3><chs*`RYP%*RYwt@1U(bL*dq!lvk2)s)T;NNx^tq$N-XF-rYlU1!@iEM-Q^
z$Zjkq()wgxq8sT@@<d0}Mk7qM?u=@E(>Ak(oj^k><J+ulx%e^G9Hcv&WuASu&bO1L
zD|G9$>wL~oK+zSt4%>b!%7XNkF4Ig9pKP{t<GX1sLdK9Z(i%QI$v7VT)*`dYd@}&0
zCb9DH<_s!q<&FpB7L2tLVGIYLmofndVC0cRdW^_e21y_UoQVEYho=X~QSIH~Gq$p)
zqqgPCrE?n)zpo7>8HsWpmyrGm5Bw;i+)G5+e1|?5p7QODU%v0E5QI4*Qsoh<!<aCo
zH3?kJ<0w&)^28Vm=<c70@~-|76{5~N{uu%B(o3*+@!H1t)s}8>*UZ+?d&I1X@@rH5
ztauFeadO5ft_9@0FM1h6lp`nt%xVeI2NH`3owFi{$;)J9l5^w#X51Dxlp{vy{t)J?
z_t$1aJ326)tu3p4q@9{;`N`j%EazKCTyw=g>ge>D=f}oF%Ig%=FJF4QAQr#T`^nWY
zV~HzJcjFSu;Sczqk%;+>N{{M<il^`WbXe+XKfWCReri=OZ(um`a;_`qcaSh)$I!d;
zeS$`e@b9sx6E|L?2NNO^Z4Li;5~hl!0SP>w5UPTJh`^0VsN673mG-0@)6^vH-upf+
zn!GGOKbG^;z|qN8e76hJAi~@zz-u%TI=z*!1BfG@dvrXvjX%;lZ=_RfjhPhIli-Tu
z(&!#Ex(AK!L8E)n*V<nKKc!I|Y7$Ax0NzPW5;tXp#gh3UQ<D37bPpQcgGTqDZy|hb
zzB&&k@MQZOPa@Fh9R$7QL6=bx!cRzJpJ?ApRP6gq2czzt?qQCn8aL%NI`?fvuAXF0
zJ13X*+jf!Eh6~QIH4fGBe2pHyRm01UF3p6ctIjb83U5=0ntY<T=WghR(|)(%pi>K;
z6XQ>W?XxaHgWRSVx-WDAQ^+wv{GA6;FX%aMn;&W?n_*BcFATYy;I-LIEjOMn&a<j4
z4Br^sM5S^y!@Jl+d{!>tIwl}3Gt-EclWo8ZhYcHjcOEQ*l@a6y^U_*pwzmyD9Fz=0
z6^5RSNDu^q&?pKC7qKRx@{sd1_Ch&A$$d(C6ohv`NdP<;__llh4XFAFIPN634fe0?
zUjMG$>vuHf$vEbt+_1IWu=!SeFh-jl<h$}^;Cez6C51<5;Bz8e2AvnG)Kj4=f+!k|
zHhY;Hwn4ZLo3c$1i@^ndYT=w1vY}nsYb;wy-TBTaQw?`6pd!m^bZp6@jk`|0I6KpI
z1NYAtISd0AXbZnIXs+dHGCIYUt!YDnp#y-kvdEg!#I74@pa7UVYdN_sr4zQrP%94`
zYWStg!bkupU{s5uZkyA8B{wN?TT!3_L1Rh$ycgJ?FI3hXBJ@XbZEEI;F=yCoM|{rV
zoWW7PxVUIl%oi5~skOU6@f9JVo1|Zf`km!rK8I3Z=H^^X1V~qaQqEq$)FEbmym+>q
z<BuPBNgU~zQ01lYM-&iFV@YVNl*gr#o;(D{pWrqC`2hh%-53ycf9yCwSf<7Y);_y;
zq=PZr?M~CALX{(I+!8h#4#PV^<K~O<V3f_#4w9s59k>E|i!mgF)tn?EO^J40sd(Zh
znujCHQM7-c@$JXg&QV8I>U@M|Tsp4-4Lx6`O?jl$FR1NpX+TkHTN@?snwCLxKfZpx
zCi4q^icubSrF0*#R(&k-A_4}qqB~8SET;7}KP~!~u|!P4!kx3SR9K9{C{t|;X)$a^
zEej|SAfjOtHSCZGONzc|Y_h2kb;!MfedF9E_?f-Od&`S@1)JJ@Bb^7T4M1InqavT`
zGXB&&JB(K~6i_YhLgw3Hbvwu;a#MM0GKs9q1JY;Av4O^RreKF>g_#d}J_YQLnyCu&
ztQ-&0xL}J+=R(UB!hhH&IJ^d<XA|LIN|lyG_F{@&WzPFop9uPtEoFvE&+|5V047>)
zQvX<aXKE9(DEt(p0&N>)nt`zgvdjvZDcr!J7Yf@j$!pU_{FW{uO*>P&Y&30#nOvW7
zdAZ8MwHkD7`r_COZ<nqH%7Z70LBgVryw>pXLSdR?G;-nOrG!3fiI*MB%5nxHlAYsB
zfBT{CggRB~+PKfpcmu!oo%=&Q=*E$s_8TT^If|kv#>E&#EFO7izfK^N5sj$~D8QF6
zAe6?OFgMVIrBcKKdeq~5<e|N%Qh!X@^1Y>O@y3)bBNy>zGWyqY5pTXz9}HvEHmO;y
z%lb=m&=Q`{r`)@bIBttsmB)>1^!o*3w}eK66ZRQ?($6TFG%uTfVhz84dVTK>YpcF@
z57cum^~+V9wb8fFvNOA*{L!zMK`)r%v7~4MoxJf^cCQagTqiuE-_aDsXY&<~dFy`}
z%Hb-jjnd#}Z8(wcmjB<h9dfO~U9Z}fZ9DM{o_l~9$6Pn|81qBe6<o%=EoawPtjFXf
zh5w>S;%~#?HskY}G&%=awW%&&uKs$j*|}Q6s>ZBostm+JU4PKkJ3harrr`}gv6*gO
zqvP8(Jn@X5;}E#32PTR~>#k-vU){gmaQHvdv-%H{vF2BP2`gz`jsJ5+NQ384q4%}V
zKG0XJJ>bk3eSjW@6Q=$%Yo`B?E`QE+uDUk3L+u<4(x<ZF`MR66ZjgNJni8#^mKQK+
ze`F}RXa6)?km-$1{kQ($1)T7j&v6q_Yo~A+f|wQm`@Q$$wNv))m9tXq{q@Z*toKlc
z31Nwg`es)UA(<c{4YeCFk4N5^WZd=kk^9h)%R9t*)A?!=r$vO$PlcKzcm2ki<*NlO
z9YJ~Fv{g==*LfyCn*;RP^BMGXuR=5y<XMTB*8w?UF*9DqhP^N=KKF_}xIO6?OZQ-V
z^QSKsa)RKYQ9}u+vv<FK`_sGj<Bbw;j%lJ$3CsI@+zv*}A#QpU4wA^Nx7W7mLY=`7
z9}IgSayq^=OMBo|VCTfk_FLDv8<?5)m$}$#-OZyDY(E~e6Wrup_5?FqYqa9vCKm(O
z4WyC@NmK%I66YZiUf?5(6;HIFN$AmgX|$%<+4L*)SqETu_S|iS+BN&x4YucvN9$0e
zTF=`)5vi+PFQ%LXaSEN6N<oqk0D<QzU+CBsfgG_wxQ7{bu17c-XTo<FTD^_CVjr9R
z712yzMJl!|a3fl=Wn7YNX+3g`?au+fV~VjAMu5%T4KFS(CTUh_eW@q1oV~C<hvr}<
zm990f<n)CP+uRE`d?7D|u86MZ2o}#Y0WlAj__UejTlyt(s-+hsKA~Y4!yi8Eq)c$4
zsTT;}*NTc{BqZCffcW?hm&B{P>6Y$@@#v2DXvr})UX2G6#j<_$I}NB}5k=}TPXQ=o
z5lI5&lRzXqO<fUs;mAC@j}D3NXMEoALG`YO8>2x}$^{>Usi6N;o6Q_qohFWX#P|#T
z{M*Ti4Kz;&8M$l8ivrQ3O*3&NM}$cUkDgjsigCorYFVPGxqZJrHkUICOD~<=IJ=wj
zY8zzOCWe@6G%LaNHUoz#8QO*U&2bBCy~+Srp7CaC@~`*GAyhZ@>CMY@C3WL*`|Tz;
zzuGo9|5}a=?611@XKW8>i>9kZ;rthN?tgX4FbS*3(hu~#XyR5(HyY=*)_<`lDaiUj
zBU5BqWoPI^q^<8{U&?BVjXsrnm%rUHJVVg$(7`48GX8GMFL2Dn<=UJa)>Uo{?s?eY
z9vp$qL9#9;7un}*4q%cSXoA1Jz^V3ZyU=}^#Hr+7OhmvLp*jhO2x&;tz>R4n!+`nj
z1BUL8py+F3G&UcogYo{@o{T?cp^8J_BcbmDs1$)q5*0`yyf{ij0Fx~BzI#X%B>M-6
z;Ml4F3Q0psV>mLmBm+Wo^$hh<04nSk!r^(*`hd57|DC_d5{9U<Fplh2LTm#XvH}Z$
zbJa%hTEBRUWK2XrIpf)=<9hVtb_?3ot5m8t5}7{lx%Af)wJu*A7R#%%8jHng*4~2O
zUT~$l8sKLr{2^H%J<gezc$`oMLN%4HM-t&hB;{@#gmDrHUp#fHo<|729jdt=I`TG%
z?(p%p6T96dcc<?PqEX-VNcyhLSLLAu;CkCTL@}j&ja)6hM%I=nz_hT86PN2yvm{Ji
zcVuk|_Rt~fjn1`EsQd`q&|>bq<_!lNQd=VXKZVg@?1=gCLiEhbmh=#+wv30uRxWMj
z6Xzo@0QmKhtff&rb+N6el2K(xg9s<P^>=AeU!{#6Y$V(N)`rcm#C+>)nS+UPm5jf`
zZ+7yucTb<SGiMk1l5S>Lgu_88I1yADM}+!95S}KQNES1Zih%Kujmc8?Em^AP-jOot
zXAHo%+u#oQ_MqAkxjh!&-o^{_V36DPe0!R4-xG-<N$djl4MLZQ)b)u}2@hiqw-Wu`
zBR9H-Jl$_h96cr}vN7~0?|$4BS$ARSru8t}QR~aLCO@WQ?2g6;NNG56+GXpQjrC;8
z4W$QSwaa-X4f{hjo9D&~h=x&o*>VIr@1QDlNB=P|<!9#zzUX<!{D6kBMPdBpYDYjL
zv@VP#weHv=mi14KgWMTFy%{{-@ms8GIl@U@<MPkysdc79IQkhmUGhl>R+e86<-b7c
zgJBsh(}=0x7;RzeJnl@P@Dthtmjs5WcOvM$mk;~4G$bUgjWi#z>o-?e-rFnh8X*Qu
znKnz*imDQhExJ$1KxN{~SS2Y*1=EBkF(sS|MN-9dkTRiV>K%aZ-2swH`<{Cj9l_Eo
z14Z$VmNly7nyz=47JhWjdo0Mi`EorJ$m?&<7MQSzdn`zaOk(IfSGa@;84=;hm};6R
z#?=UU!##}NEM%!#p5-^X{TX3qZ6Y^bLtkRL<881n!oOB!Im`-Y;wlQ0sNE3FnV(EV
zU0<tp=4(k_It;wzc(yP$TM|0sdr+r|{OI=L)zaGJqQW@fUA25)YYirtiKuCmaU`r8
z&GTlOS*GcpTd5}ttN^1fd1^+;`83p}>k^J$OJI2Ap-yK??40Qh-K)P6JCFLi-LDS_
zI#U(9k|mr->bZpaN)qntfW#5(#9l%ZF4F@5od>8?rFUS?H@Xz*qQ=eb#T&an*?roO
zs`d`VyHmH)5qmxs_S}5c9t!rP!S+nm%3~~u0;1A{5*oyq-Xu;)jFxg1rY?0y>`DFo
z!=3|^^kb2SEUO&JLq_tD2PO}x`pNc){2`3pfD98UXd3w;iDMcNs!~C?_TUf2e4&|2
zW1;Sa3}NLpXoVO#M0U&}viXP|3@X@OBjtshB`TF94I+(@$|piefK)O}DHnbi1tW(D
z-ADI1OL#f3c~<&@=ehH7(P^dL>!zOW$b+uHvU>lywr)&ErTJ%VPj4GVk+$ua*c|jm
zX>^h0dCS*72yiqxiEWzWWsz7=SA?S$#)8{a<pS>2)3R(@9h^}^nHP#a7n)76HmZ}J
zjymazE~%emH$+Z!^P=~?t98@=+)f~j&Vc!G^;NFUufN^!fgfL)rVpxdqJjoV98eO(
z49S`lh+m5OL~0EH#}ztB*{E^aLyeQ0usbwPX6E6>)W?c{!Wi-0(X1zIR53l0ifQv@
zdMIErbhnSi;4}e1Nr~^KoKTviL<E5(UMPeNk{}B72qx(s64L!@pj(#%yiJHw?*Ka1
zvcrt_JC6aUsVu#;&S?!ABzsbjvgp!^8SlC_5?7XsT%ns=OIC+APAIrzp1Zup?_u&l
z8N_MwgJt!llcjBHwES`z%!_{h^@tXqknwQ^F19mk9Zs}UturTDhWqZflxO*(>TjAU
z_@J>HItgP>g|HK9j`3;ICoByk!a(fSz6!Kr;Zu*@I3!*<*Y|FRdk^Kr1{IGe?~zd6
z=8N)RP~P^m!<>a&1S%$}uYH0}Ya~hClyD{eK&Y7cY4E+Hyu=Om(2)4ywR6;NU*?2W
za1uJNd7eLifE2f#Vs4n~c7=3!;P8emYg2HZ7FQG8n!Byu&_KA(E3J*YT_roiFR?H(
zzdS8EpR=Bt1x<#?%+f%Q7dCk-ynxN9r@Vr4D{W_{rK78-27dB<29Wf$DDeD6TxnBD
zLR<8gdD*hm4I6!o?8%v-vr8)t+hu_d1K2pzHaUYjE!sehF8Bjy2$C=3H*h3&gPsB$
zY8aUfM1rPbv@%g8{B&+I$!wNGcg#q-J$&6HBdOyB;h2Z?tFkr(KJx?WMI?>_PG}f-
zM2G<S%>n^;d@YrD$gB<DJ`3sFcCo)Qi~VWjqx9I<1%Nmo79!6i`I$>plfGJ}a^9UA
z9&^W3l#i5(a`VM{FzA_Xjh=<{LrEnku8v|teLsQDb3?*I&kJ3_lE6<!^t^{U(oR$L
zw)lG+m-$%Uc-Lwko$^Mfya#s5vw`S;)l;44=tRE{sl5_chQ1e3A`>6Z9oLtHG59qJ
z{V)hrm<a8SslE2bEpOw|Iuw);ZBJPoQqLEXD&qOBBs2&j!s3*ZG~zBzn4gB89#O&`
zQWn4aT$F12G!CEObhSAfW~RV-Ri43XYtke1sRpc5-JD<MC0E8o+L=?kds&ZMjy}GA
z`+Puf*Kvk)DHyuM3#i?~W1}y^F$aQkF>QVRnu_-)eY-!IL<713`3_4$4Fo^uS#G`i
ztd^{8<c66TY}cAtSKBqMO0Vskn=>l34;(wtq;p<f8pabOLcu`SPCq9vkJqMLunElI
z-9=NjxhG5ph~q0MATY@S!XI(zTxiiIVlYI~GdR`&Zhh9M0W48_xMXD+^DR7Vz6HB_
z*5oU-$x${>#W2?e=`x|zyr_*P!Xz#8T`#~SWp4DsPJe<#mhdG+lcFThE*O;AmI)go
zPX?a!C<)y-B{cG5lE4+>#(o$^B4M1#F=4|VBy8AxpbiH8Y#*wqB}@HCg@pOgWt8cZ
z2u>xDkuM_YsX+E|o+J9%cOA(G%aZ#*N|JeB`luxtwIqA5C26PYF4QD9Mj9~YCPBhE
z;VeWK=0Fn>NI@c{(l|`0(o8>Wq`{~t*+fyY`FM>`p@#}7)2?z|O*HosLbc>15lj$Q
zr97Z9APFwNd#K>;EB(KA{=idIJHMa2cm5Ry0nb9i|NnEn*pg3c5WJYyLpH4e`~P`g
z`@epC|7+`U-rJRXO~^F{tUQ}p9f3Z_JeShclp30uwsX7K#d%qS06649Z1bx_6G!Ls
zr{R3wvRYk<R$NZ1n|ZGmb+HUkG}G?yc9K7+%Xu2Xu@U<zoFGX^sLL@~AQEf4%Gasq
zdYbuTx_~iVz?d%JvH7buUYG}i^tMlI9tDggv51INF-OOlfFuD`#E*j{lFSR-G#ruM
z9`aYc&b4LY@2Dz%GD7mN<ypP6T%K4(U%nN>0kt@F14rc`r>EsLy`IlAE70G%Ezuyn
zbFMm9_BM|=`q5V9C2DTqaLMEV`xU)^`3UKrPCVh!)!a||{3?~{3Z6TCCi9kF;_9pO
z@&d*VwLmw&Y?c8rbN|-|&KISEz!O6IaLx!yD5D-pTpp6dk6k5VUyH~a0pQ*dO~iM2
zQ@^#5Gcf-!hzE{J+<ATh0dsdTi1A2f`dDCa^F?|vU~v1apD|~tpX!9Lh(hN{tw=(p
zA~H^bSi?WDU?UjZ!x+Sqrs7g>?;zEdQ!NUM-r%%_f^vPPEz!LGV$CoTaGlUgho)Nc
zxyB&BrplxtlhDO^R+YufL@5f4PsFcjGH$rWc<b?$AqG_1GLPi|4*^{CRhrm5<e#`-
zA|<E)9OK-i7Ca}0EzNMFVcg{KE6{Q%bOAHW)XMWVzf-GMyu8^Ds&nF6<L0E$9jcro
z7KTDkKK=wKx;W!!*1=3^u{b+xsn=SsE6k^b?q3+uGkP&StQS*lXU7iRm~=6@$UbLt
ztuk(40RHyE&cZESlvG4RS5Zw8Pez1BsN_(L5;tZ^5(QqORXDmR?SYHZ<^y#w03_KO
zfJi|@?#GO%kfACs4hRo?WRQrsrdmcGQzHP`Ljdwhm2i^&lKmaTAm;<FRyfX3NZJ&E
zylHt3E|Aw5jz+r~8#iZb2{b2nM?}@R58E`9IbRgAP5WpY1d^P+IBJj{`>e&$n#_4K
zMT_0*m#3#6T4#HkH{|F`5<NdXHNymd$*L4Et{*i=H2CKA>8btE-g^Dh&u~Fi@OP^T
zGBi`yO1*b^&#$9^Q)?OO49~5~3$Lx}yM|dH4X&6$C&8q}f*(#7<%={<IQI#YVT5ck
zng}moB=sUDQpRMOL{D8872KwaTEE9^qlXF}SPw<%R~RBstQY`aH_PhUI5z&N`R8Ii
zdBHu^QIw8B{g0%M+I*cJ3>w@%m3bP4uE(Q<z?Ag}4a0;aI!TD6t|zGPg&r3p8r;LY
zj)TqFQ0D)eap-m4SzqvX$W?lssbphQB?h}0U}*h?oz~S{S5=7_yKRC-%<p6EldDXp
zb3i<Wp@x|c8rxYvH`OzB4Amxvt)(q8q_3*VOu!l{hpI)<rY>(o=js*xmkBUjra52z
zDia9TdEO065U6xgS%I9bn2X#PWC8ISR<BWm^spMFqpYZ5d=QO(ZvTeAFec4VpjGh8
z^IhtfE-o%6Q)^r&9B`tZz&O9CK~BmwL7zwrmy2I`-U~o8MqNSDvLe5<uYBND1A8g?
zwOu&Gu1jLqWletlw|84=sS;1hFiAs_xRFmNgM&}-gpyE7DyRxPc_q={2utrkYmb0T
z;UK*onXYW#c6-CXoWkJK9i|%(M=R;0s3<pIrH2Aa<L!A`UC)yq(;?9=>UR?w0Vov-
zp}y-<9tOgfBPjLg9)?D|Kj{sl4?xUn$Qum3XdANFF}2D(L&v#V7piu!5iKR_lI`>=
zHS1~7dDd~5nW)@!gr4&A3^0X>a0ED67%O61$MMi8yNYvXJjWb>$4HF2%np9ME`>N|
z4>)$}Y&Or4wIQo5$NQp9C~n>T@B=!Vr~^Y%I`BNl4!DFVeOkb_&Wr4y=9M4d18n*z
z{6v67=-TICTxm5&^a5b1$ePl4F`Cp>Wor&iu^RhP<s8nL(*g_cdlU-eNI8*dC>bd^
zFr&IXmzIWG{J=%giW&80l&-kFev$bCT8rP?u}&D9ZqtuEukA1JpZ+qpq+;DTP5PKv
z40c%<^|U!O+I(KaVgYf&QPgpcWR>&gm)9R0=>53{F$VK4m}*djKwJs$RGCsJ(I6WM
zf_|qPDVy*fiqKs|ZcD@4vz9C?Uixo#;sUmyn^}WVYP%g|4J|nqmNi}e2w2w`$cwbC
zx^Zx&8K&RdFw@&5QO{ulI8zwqf5IiK9&2o1TKrS1)~eoZHqIX(-Y+v(;CPCvyuc5f
z=ZiA}XxsDxE~S-~)RPnUYiP*Niu@}@XYq$U#Hkk`7+L|%80PyAY*&!BW3R3bc+1an
z(~v(KNr87NYh7dh4TEiYe|Js$d*pZ#oA@D}w12+{Y&m{x>IsAH!Y1|N72l`k4L|ho
z*EDtg)6<vmUn<P)Fq{njckV+dd_}Na)I<WFn4Fd8FA7*FFATgu5yT7Oba!7}LHhm6
z#d$to2#|?E@Ud^h4|wIp2`rI}=a#3|uEiJc-=2J$oP3xhu1gY+_>;LxpKTYK9cdnW
z&_jf2v>L~uAS`qv;)jW=JgFluq)$Hy-0eiiuLtM(YkQtQ4Yp&K2DeL}uRDVJ-_cL&
zLs{+6F_#9TCFGIljW=JU2P1TDp8_rsOt~UTptqpQsMG=BzLq3SBzne(NV(p3FLe5Q
zXbCxa_vym}2%A^4f7llQy4w0$SZv^Hw}ws&lmE>MPxvE<aaCE@SF(b<HA3ul^nZ-c
zRmPXLl}RxX2#1<&-VwDFd`;n|X>(m60Z%I@r66ZmNz&3GqV#xL3=(-5Ic`nf4wQLs
zkXIcffpLbS?Z%Sc`&XZ!(oPt&?QZ?3^^9kE-<{aerZCfpHiyYA;=*n6q4_50(b)t~
zYb*TNY;4d7!(G(LC%wS4+L*5sdC)z1E0HHlM}cQQv!ERLAr2&s%wJ&=KOd8#d>z?i
z%$d-FlO%8zp>7ZofiW-C6|we{G~tpyaU0brD(r`-aQxWg?%tj<a(PPbXu#cv9`NL@
zOgPI=a(=@sVy|+8LX7(R0|*4ATsyn(I|-6eUVJQhapP_JVC2Q^<0z;H!lEx@;!)ot
zR0~B|Dt!_qNuX0N4*b;r?&Zb6-9LHp&uPhL+4g~)*BRR`Ov#3=&3eYEte)rm(mYTd
zJ7-n7m>;(k3w;FUfI+nrS**ngiZj_G7gc42H#FYCp=*fTEy=4fbZt)Hf&O%lNjZNr
z<9tyTL>EwqM#<1vBiFdv8S~zL$U+AdK(gX$H<-Oke>&ubed#@5lJPW&e3pbHNWFki
zKk^BWl8A(95XM3XCghW6e2Z@-{6HUo^Q$xD{vj6e1H;AO4*8&st}v&`i{Eh@yX_0_
zi4lWfbYpw0gyS18&_lt9$@Uz-UgS~crjq!9#%%3ABTQ*c!Y~N}%~b3qbi{~z=*V``
z=eg-|Vm;><1)?DXbxsV_v5Mh&rQy%57~uwqb$ZRX&{&(Pwo@AO7GhaLfUUQS!jPS=
zeAPLP55q73;7yGunB89Q8-Zc7$QT3&ja3V&J8KCh3o<xzvh)M&kR|fecjgLff*8Ty
zw*-GZ6&%b~gn9-9%9%0<5af`xx9$A9?U7kMZTM{utWwV1^i;JdRG!2BaLY3ncemzZ
zmd&g4TH`a%*O2Fltf{%0WyRG(?B~Ls*%NSM<jJ~kGfx(EUY4I1^R+kOKyP>ra!=og
z#{t&~QzDLHMHovNp)pHI;)Xt9z8j`0aGCq$)$oVNrWf52#ca<W*nxKks3W@nns?W~
zUGt6+U%MM*e;njdYPz@7wE50^Fj7;ry=I*zoYI(*)Rh?YqbNxzqeRLmNEsE>^S=8;
z^Rc^+eA$&&t*G&4F`J`|@K~AVuU9=LQM*A78k49wJ4&Jki%$IoW1KeokYqlLJ)R;3
zN~jf_IZ>zx_c<dj4O17+p-9JiOftVOxzjcutph;_vFGmqA^2Kz6%jYmF6vc1l5i=B
z$60{c(;^+ZBSP43gz%0R*?f`nM^3hSLkmW<FrtMAMhi{(Sr>oJ29s_tlCDaogG5J^
z1Syq-iZmcx(S*1<@_6KG?xlQ8y1GBWVe|1i7~nv+1`aF^<AgKlJn2(HeeRRQ^CgLe
zkbb}<cVjUEhv12*7QO*y7?lenT-ZD1!ehV$B@!6~9L||QDneP35T;@0R4%7U6mTWH
zV1x<#0~0nMuY-XJ+h^>InJbut-lCCC0b{ud;es*}hi=3oE`67KBTS%ANx$&uW{6R{
zFv5lX)-F7PO+vathiTvu?IkXuiB^Pj7n9$KAW9em!8ILi5__Xs*m$%K1~Y8$wczR?
z^@ZRh(jFx=2wfsVf!wdIa7D;d=-Ux9>>+>5PhaMFnKh57PvC{qRyqQM5g0r$Fwl0U
z?S&G-2gx%{wICvmV?wD?M8rHKEYRrK75i=wjY@?50R)?m*P#Fce|r}5$Ya#=bwm^r
zzf%BKBoRI%euC+<6D4#oDiPdh4+#Raa9+*l9iOT*2nOqdnqE4;7ktqe%4Imv-)Z<!
zZ441!IVPOGHWbnqP%9tQTIps{VdNKgs2d{Z^Ss1Z1{>|w26<UB>TB;REpx+nZ8^bB
zIGKS5ZFL>XG+z7V)29#4%zOaGTOr33&-3!4P1tN-YiHs8;>Bvo3me{rkz;M59$mv}
z*CLa;%P2H)-YqH7wV~0%{LPockE>VW&T?J>QYjWQVKP9cSBiUU;f-y+4JYe3){d7%
z3yZ;69y|R<+rDZ8(2m=ZvGT6-hf#a$Gg|LQa-jK){0lLRXLh4_`gjN<9wyzAn84C*
z7WH2yoQhtF2-+g4G_H)lu)OU+PaJ9;hbke`O4XjkR3Hh_I&?js@rdhm1U(NOx$)}5
zyF1~|<|B15aA$j;%rIpt3PnJ;h!}L9%Sl30Nj%?Ug2v2a9v$IM{6yi-hu=;<IUn02
z@l6Xa?g4mAIbVx<f*$o8?;Q5nIn>>PcP{t}_!+Uzh;{ZK>)31^?Gt7UCl<=T#8ibl
z213D>K!_(Xr<(f2Q;AO~6^aN~q(m_hr_4)5!t@A)_5lcOK2iq*gtjOB(UBWS>Zc^(
zF`!7UF&{OTB$Qmak?<o=jln7V2!viKT%gE4^J7OL|5$z_yl}49J{pHc<In>ehj2>N
ze_0MDYax0#<4+v(Kn4o-MJ*|zic=zD%r_q=X&8D+>xhlV|Na<%HXpBp0Rh{4kcPgm
zA{Gct#RQ#~N=bO&M#OXDG<4G-rore967Hcl$RBtr!kIVas=RPsm-9<F`f_cQ1?L%e
z{(SfL^)9HQXPGoyVR(+#wlay8sjjlJ=rfGgZ5~nC<z6VITp&Fj9Nn;`>zQ+rHB$$L
z-g1ViXz}zfF`1A_7g8;xVFR@EK=s3)&m+^`>H+Pn9=fN`I!?*gX2v^5xaGd=m?rJT
z=cmtFqVNHc-03r%emHNg+~w6-{qpGanVm^Ek=h4NpP2~-&p&@SFHa?z^wO9T#btng
zg8>mVPKg#VQzF1T=<!2(d5%PL_u?S))-qEMzUt=;<cV(g+Zhj;w}zv7<RN<)9<t3>
z=AmG?Wcy%Y!PCTLiV@#u(0S4gN#bFe51w#03Q{k2$6(=oWN&`QbAy5&&!e}kan#t1
z8k+~!*kCTkza-498srK2=rkfXV!%KIi66%<(WwxG(v%XRwIXS#UG9dSNLV;V`s|Bt
zXY<iI6n;{7`$(T86)D4HX|c~afT}1aJPiWk`eDKn=5y9lw|&RBAbNVboj>aO6>`Dv
zK)-Wd4`}7TQpYnYdA>&_&pIv7aQ57w>FLxut(M15uln@abLZjCcoAw&MXCw+FtE}0
zQo<CCK|bPf$fML}zBlT5_D;`3nR~mQ=WQ{~MAkTM?yiq|$N9RT0i(v}ku*M=uhBz6
zcD}ncvg0yIV(oJhsU#sZ3Xs5GdL%^td7i@lpNtwGx`)W_;}R7;p3-Mo>8SS^^*#^n
zsnbuky-@e)K!z%mf>2L|aLl+7CODBK4csvDG}i%_qq=8b)IFPz)}ercAl}{##6m4}
zDu_%xO{fS$!css6iDYiT1FEAS9zj8}f1u!lu4Y+{>(u##JerRP4X#!_0)!DDJPHBa
z9QI*5xO+kPLc<`9LZ*pJeMYD&JR(vhh=^Di`$?o-Dn_5*{Q(M_kJq691sd)EC;%AH
zA|$?yC_*hp7<4B|S-`31Mp2@p?>^i2eg^(1B$WRpQ%V<(@p^mJG*u>`AY&M^zil4w
z+=ld^T}bi*4_R{x|1dQ*{eZ@rww9)J(6V3S4{+DSD9>!t?>=-Fj(04iY4mJvf~WO4
zhbMa)&(Y@d_%@#%y7t=1aFfaB^x6M0J$?3YxuR(lxQfvPHhl$~m((fY5{VpK*VjH1
zGEid76}@*ZykT;?X=kvfSz3ZOSp~aAiF?xSJbJ_A38aq>ZX5j%h|}uEeD`ifJ{U)S
zwCwHDvbXsTeJI#G+MbM&@zkR(5;{@s5y}F<=5fe~h$ESDFJ*qnMr_XZ51YR?xt=;y
z)e#bH48?6R6*oRt-1#*t7GIocSvM2M-pWuJRyCcX?EQ?-0b-ZAQ!lc{s#~VKb}V<0
z$Z{n60SJyAZhWtx><cJCe%4KGHEPZU;`nof|L`o7TX!TuNDYK_4w-(A0p81eVFVG_
zw=si+d8Infr0(9BY{*Jf&a_jYGB5A^(wff23_l3@ec(Je%L;_5M%d`vXk)^WXb7Jy
zbc1Ixsv@yT8Wo1Ktbh}<;&7xu>p_aKg(LA0k_hFOhEAyhcnt;No5(#>6y*X&UQL|e
zZG-;HbpL-j0v|8PvRd?RtDrlO5dp;?TXJFD<MxDX2!^XU5K(4D7;y@-Cf0CC!}Msb
zl4ISUSO{0ymZU<iikKI=g0Lt>myK8wo<xf9DCR*BCsN1ps9}6)3}g1wI}yz0V|6eH
zX8UNgkV-d&{v$3;0l@@1f__U<;zlw6WXMDueD_}GiRbMhf@#mrlOjt~+*VPe_({&y
zVm99x$9w|#(Y}lNp)+`8J*w#*f<u${$2Xju8A^cA2smCXT5;;GT?XznQ{EV5r7&7Y
z!=)(syjfHl5Q>2Z+L3*lD|1exO$oJ=v(hHJ>c7+|J@dL87N(H(@Z5N<H$2M?kzv=q
z7VbckvDNcR10XWG(Hw@c0u(cYH)jEKDvQ-<*1}p_g^jifo5#RL2KhkMU3*tS5Mm}c
z=oNNF_e2Bu2c}p(ElUgFM%?m{xTR@l{kF*E9tzZ$dqJ$?h)5kM47K(Nqp>1>OyihE
z9F8~lsVh*U+f-<S+;^`ej>(P`Y0<+f(p-9ncl_1;duPfssQC$~P2*dY=Iv&Fxuda;
z$FUw2rP~P^oA1L1BV=qJ+R7p++$f1j6s4R{KXM6IDj<Q1WgtBj2I+TC;-2_>=)&-+
zS{N4dHvk;+at<(cNa_B2jX-XTsMdK|*O|yKhb-V7@i)L{BR#Y&Xw4Y_&%2f^8NxS0
z=${M+c`M{tCiG5>5SQ1hsf`K}q5L&fqEQ?grR09#?}PGzurS;3k$VPrAFV+0cPBqC
zvRs)sXp}jJ_h$8%I>$TD9}bo?<$10Y0SQwo2$hTz!P1bxPUdnic4Mx+(XV0e{2Kf_
zsL8JHcfU7il-a3q+mD|BKKE}M{GW{2ySric$6+6#`VM^>Hs75O1+2$xYp@<@79}bL
zNk=6p>Bx{IER0E-CfZfL3Syp)9K-(pf%V@l8120pI<3R&vM8)8?>1PyS59~M+$gV?
z$$*^N(mV{k4_boZm4rXM^InFQ_GR(9%?-4YrO2?+q>V0|91)UHf&&WY1OI1qSGGD>
z2eD$Sp&k8~zpelB73bw{BFcUuE>l#rp3Lnd?NnXs%6ufwFovvy{8EYj$64LX`(Ns;
z`%x8Nx*yZ!)lB1zS^oBAUSS>W@9#2Ml{L(|$)C`k6yW&ebvc`7uoHEUluAg<u+{xu
z4XXTdk^Pfb>Vc(?$a5KG+#`YKr-W*k5+TBn1UzOUku3D1_^C@DBLE!%=#vGYn=jCV
zAxPdn<tOL9bg7C+8u|gDu9hSTsYg<trrPD)qiS?X@uDXY8UHwWuEx0dF)n`J<KlaH
z<l)$JWZ*@y_5?}eKoaT+O+@4hlEf)hY3#<S4o3EzeF=)+e6$WmNws}8Oy&BNrP3z=
zs3@V#v&1<hkU}vLdNlIJpm;Cb=OhY`0}aL$3L_%e-xLbF0|kuT6v@I_EPNNFP><qH
zsW}lk@QDafvXYdB>VE05Vg11>f@5<82D=3Yn~&JR0E6w72Z>0d*p(>}UaASDOcCMx
zl*lBOZXEi7O2&v>-`~r47T7d<qt(4ba$ljP3QKB@2k53{A}CBaZgJg?bv<&|zMs{t
z@yYmx+0c<Cor5#ea>|RWo}o!ff0>t+4Zd}d|E#LDQ%`lCBX)rMCIZFWZLeaTxhV=S
z<IBT(O>j$H!dU^EVQm|bb`df93!d%O#`wVL``85Us0Ggn`n9c(&%x>hwC>EnpBc}u
zxaSR<YeS4}gbKF0?M;OtEXYG-kPduN23QD<EvEnAJq+Y6G!7E4vK24DiE~pRP3yRK
z>|9KdP^pXDJzg7GW9CJD?C?cXT0mvK7O%jO+}kYbF@EM@<7bWvY2ur3zSuaYm7gZ%
zTo<BNgDWt<J3RdSI@EHGT2rD{q$$lBD;I?#b!kG+Fr3`{^cNPa)$`2)i(kHYF-N}5
zx`B!HSzk_|O)mf<z`(%jg`dqDu3xkZotR(A;DIY9o8CTiad9!Jc~KkNOcxSQU_qGE
zrp8NQ<i4<7@Rup@FH_)O=iX$l(woY?Aqv_Qvt=AKSAs>Jc8L@*U=g3Ygr`gsAB1n}
zrAd;8=@<vSA0Y~xkJZ88#vQOM27<{*BqT^N`<BFv^a4|w1_4X_h^28Fj<|6TapRv_
ztOO;TEJF!84EfS|Um`I`<-9u6_s}lA0!)WSbi<CwoeQXO;HT6D@Iu!%95x>Xu*J!&
z<J2XhJHxWbv1SJW(N=sbtNu}NF18rQz@N4SSpTxliSrInt&{6BD1V072;1L&P`%`W
zd~0?BI6b>k_?m`0A6MSPl0;Qr7#<a#&#)rYw_Vn^m-5ys!|ZCYaTJ{!+3}K?a!~+o
zn*yf$CthxqaNS6>kr&6U-`I+a*&v!^J$C&XxOa!c%l`&5w9)ImSn9@}s<0I2C+4v`
zolEo=0L%6I;?hj#W+%X2`O6M!i*)n5OKw5mnsNc3->^Pck?KdCzHb+s-S1BDi2qIe
z9R}<jls>67ujKT^jOM?d{Puogd+|Tq|1|2ZiQO;P6#v=mUu(Z>o%4@Avt51_P+vJe
z+P+-#M7RHUkNoX6UznSHUv>`s=QHvzq`_Pq_H20i_<vF5lR0muFP(qc6|2wh{VdrM
z)6yVtgA~c`l7JDaX+nfAe3G~U7jERnVWLJ%`_P#7)rWU?a}#bnQU`-*cfjo9rU{D^
z5C^yqJxF5^2Ykken+DK#VHEj+HzL|#{}AoT$uG{)iKWCjLEXah>nQCW3_k#~a9y>g
z(WOJb(X7-~1GoaCS|En1H*6A|PidOT)8blVCg%Py$!r%++r<Q|650TYuJjBJo&55&
zK%iKaIjTnO!)@H}RQIGgxcynhsez7}Q97c^wdMX9w&nP=fcy2dT;vLsnW}_$O^REn
zzJ!8%D#Es6!wO`JObxg!8u);QS7#dS$58(%g44Xr8v9LlM@KM;--3E!H2h|b4QMbb
zXH-aW`I)E^emXbwxRcZ3KB&KEFlrk;FA>Zll~JCT7pC8pA>hp~*Fbq2x{M}fGrC!Q
zT433WBIUCz&v=Escb$Kz#FbX}>fmLFhY>i2N?NGCCs%^GV~dA(y20t&c4d@$O>tXg
z4aLeScBahB1zJnbGZ-!8WP)nm7Us4sUGiGjAP(R(!}<{uqQr3wU0z$c2tMWSNY`V(
ztdH^TKf|_ewey<N7QfO;{NA<~^cSSZN5#19<#sjMK4>ez=>z52nU7zGpGGi-pzZkX
zBkk<(W{d6BIT`_MPG@K)OePe29E?OT{u1-5R0~|T=4tz3P<h`i%c@M+Ovjb^8E`>i
zxi-sYFqHeD@kW#RfhfG&i99hV9*5GfMwy;hhGo^-Ys?+rw-N1j<hnQQR5a@CtT6g)
zoXG7%=0O-idmK-)`Ag@>b0_BC7YRP-#s0*L%<rCWE-<{1*elU<yOVWg4cl~&!fZkC
z*Ync{O!K3;8z(dc+(K1MXsS8kI*AAsoTq-wqtts~63)knbn(1f>95)|5dVK|PpsX<
zym;P2lOhGT$Gp7mz{2l%QhX?@W{0#$!4n9vPi`CcUt4OzcP%yHjsl&M2Of0ayM53<
z+LQ031r56!ao>9aBYx{jf7@cnowD3L@FMr_$^rkAMb6HLg#h46e&!Ov{Xk#8yYRL{
z$p-I#JDp7Hd~<i=*NqS6gVD=upZL{_Q<<cJB(ZiSS{g$lq!dKNu^al5GAh)lm)Xa}
zuW)j;M5IG|;}j-z$G?1{L<S|^i+}lQq0R-0!}i0C;n7I^X{%cRp-`cMWDYO1c_T2f
zLnkg;LInpyiMjDhYn3ZVk^pkDcF=k445W6$nT-2c%hk{kprwmKTK^j?8go<#twE9$
zoodJK#@ecLplqIlPz-4946S}cM>&IDD*?MU=3Fo=4Y~{8Mm@m5GTBw$dJpM(<Zk#j
z4)6oswG~gU+RksJH+VR9gH%z@n6F6W1umh9>l2oy2}yh=5(Wp2>!nYf-Qd8oh6Q(I
z4O_Qi?hg3{Pa#hny>-N^>^y^wP&+@>lIMJf)E0Cc`jOLO7n~NGZ_9@Q`V)71PK(q{
zf+PwErOGEX@Br_-X-r%%iag(sI33fh#L*tctNyZ^L~*~|oG9*>E>RqJe*W#`q_cVw
zWA$v4slY7AFaL>tbZx@88}r3=HoV(&#$B^3-jzEJPNkygl6R$9r7u7naZJR*<_?YT
zSHe1`-S>B~9MA|%nYWrau5TdJk0B)Jab~l<wY<!0Qp`b_m_%Sq@Ag<>9%d*5v=^D5
z{Qjrs51;hSETd=J5oj>jj#(H*#7ByHn)sB6L{pMPUMK@WwF>=_Kw}?b9X21SgCW@3
z0mCax5~V38Oj1oK<Ir!4rX)&S!F24ZKm{Xt#vW#^Jt;A6Zfh{|%CQ9vB4n$DJ>IXO
z6Z_;&VquRr35M<Ky(t#<YVNj;gDQ3x343R(DwGJ|%LIcUlda88*Ls`D%PnJ9Z5j^j
zSPaMLe4dbY7fw6q*Uvh?bPyzpVPwRJg&q_O)n<BieplTsUY*r1PoI%LT7KId0V0u?
zXOpU&7v+2cNcY8Jeum+*#Tm4GHqYA#)tWRVN#TPpi8%?){MDpsF6$TnEA-Q}RKzF7
z`;wUEZ|P<)6;)vzQsTy#8{JcIL^B=|ol?ys?sCtMMmPKYfK!`~)#zy7!>Ke1J*ufk
zJRiBpB=j3o+y`jN-B7ZGOFd?{dLoYYSNxPmH~WKkvxhES^3wOd;xm&%VBo#p`-BfX
zXOZ~?8lklDqi-8!Hr&=#-T1P%{`FZqF>OLI;|V^jcj&ZjDmMcx2I{Qd559GQw{>je
z2fzNCmQL@shAlnc?{<2()!f7LePgG0Ths5uh=`p9LyQjfd+bmT?O5kgzbkKgoM!vv
zQGavdh|~*RS4a~1=(wi^BT3|XB&JEIlNeA-N}srE#pq7IAMW&{Ywf*UYd2q^2P28?
zAkVOf-AIIzxFM!4^U{cjIMhTlNyFHcQ6S<`5~F*VXISTmLvh!-zgl}c*{f|rD}Dh~
zY%knP-s+?tr_7awlX@mF@)SUWeYw6%0PCfzmRG01)7FSuom8?E%}$FI+3ZeH%ehO^
z0_pB<QOkK{>;O5>3exB=M$OrjvdoXMcI;=PySL3eEs*5}$J+w=Ij?IN8)dqU7ndkM
zN<PQAhNDr6&Psq^wj7krguA!pC+Db_a&VBRP-Oia(>t4(Wg{bWA;{QbV+ODTzY_f0
z5nQGgr@_oaai>-N3mi)9rGY%s71quoOYz-L7u4qCSDM+;HU=HAb=?YG*4i=!@P%Cr
zRb|p_?9dvxm|^d?CHFk0S#e(G*054^^hh1W5^{$w@u{t%lXTHaFbwLxrQA*y8?auP
zHH982MQP<OTR4nv38Ea%u(rIuZ_HfkdaM;3(SWlwGL2HzUPx7rA3R)aZ$ML}X~GDj
z!X*?i58-i?5|MB(jAhFFh>fwmqcAeY_KvZ=Pa(F~d-T{|Z;b676%e~uKx}?6AB+Mb
z+1|4*rk)>aO0@6=p>gaI7K?<0p&z*{Vls){?_L2BgnOBN;!3V`6VKbGepb#epWglI
z{0u*Ctd&?T0!4}1Ihx4n?76X7^}2;VTY`14GcNFL(x^TswJqZpozGhp1jyinWaupi
zu+-=l*ZZlNh+D(N`}&u6rU5P7&og6}Y*~%r%!aMc2&#Q}?!>%;x{Ovn%S*00rGXx_
z#=c<$)Yj?EIhsyQ7VI&E_nSJR*-^OeZMH>L_BGb7fvxMNCsyoVH$Ajs6MHx_nDCj_
zJ|<jD86%WNl5pX1;w$NTNf5x%myG$-_a}e4@82zN-n>t5hdrV0Cm?Tzw~h82`0Aq8
z&QIsO-rbmo<Cu?O#oLD!Z@w2FOjz;u22Y;~Kh}y85IkanzmP=ml!RObew=#RReY2;
z_R#gTQ~iDbAUj`Xy<3VO8_OAQZN?Fl1LRB@&^P0st=Xoy2K8122WbtB$nDd=3_<~{
z-vSZ8)5`={rp@1LoB?^~)c5<xUpI`ud9`Xg?QL%ZbLiam4N4@HK3n8`)r58qPxBfB
zVBR)A)J`@-qXjRFID-^N#+rHwQ+voJY)ZS{9msBkU1dBkd&k==4Z$7(fLzV6U|w88
zhph?v!62ReFk2n2P}9xPQK}hAH3>@@N2MK0lax@cU6LezKqQSrk4GwsSTssC`y<u3
zA-mg(hD;E@;)Y|~7*Z~GhjO9*r*2nyvKCZtt;BZSn1*5veA)bRcea!@g4-zDJdA9!
z`Hp-rvd#7x89h&G=5hs{=S3hGf=tM0z=#`5$zs<PI{5B+Qsa0JSqeH9&l4k_IPIy7
zEK22tu1uiaHqs3rl+#lf<a|-!$~O^H8G!f7k+uK>6an;KEPtIizxD2gU1QtYkbj^f
zAMNZQMuZyFX&*iA9OznSQj|wP23VJEa5R8?3l7s>B<T1uUYo_yNdfIud$AJ&Iw=F@
zBo<+Wjib|NgSi6_!elyqCWn`vUuQ}^eKyA#W4(FJLk~!p8qzRL{fGn-1CUeY5}|?s
zevMNW@_@Uk9D)D-0Dq6&q1rx~YhKN#Sv@r#HQ3ha4US^>b*LE?+>geax$){e6cEU^
z=T=Z*N<~T&!h%>3>V*+uagdV8k9;baWQwQXJqTp+{(-=^A5MOH?Yw{W$@x@qqiN1}
z9^Nwy>ybSZfq6^d#<{Ky%TN+~*Dyf+@!`E=_Qw)H(4{TV(Cya_#-+63K1hMU^UpS5
zr8F4R#PFOJuz0FV6C>X&ibCi0<Vvl!%j-5-b^DMd?t}$i*kB|}#Xr^1v@T@j0xHp_
z4XrCsox%5EqlJdEK|$NGq6)wgyxUR$v`qdMo}PB3n(&`dhPTS^V?#q=HP+q9(9>;o
zaZam|K^SMm&&y1;1AywyZL%7+TK^`)fd95@x)7rJdhWt2k@|Tlp<_E${*_RyyHgkb
zs3o@s2PEpkiJ2KX2kc}$pX!<M(5^5^!ts*yz_i$WBb1G?I}-K;On3kb7^zSVYidV$
z0E34t1nY9e8>S5I%#G(P%u{H;s%$(AJgaR`lq2EC0w+NR1!9biWnXiCfAgVjvTd(v
zC61RYvqEC(dD*3N7}Bctyb~QC#Fgl#G1%tegKZY-reGWNw0$@cfio$Bh<YT2^OR7j
zB;jrp5J5$vT%Sj=jK{$LG1g`b{Qp*d_nWWK0}&ILyS<noSrEo4beYgduOBDSZzwfr
zFI53cS<Gnk-TT3~?*54h9|6i7wYIJ|y8hghbJWZk4EXKSo@487<7317yW(R@4Y@3?
z=mI+rwTz8H;!Zu~NUa6<(9F;JIyt~;aT_~;vl%(Sx8Y%PoUclFjy=9f!t+(30b|p*
zNOz8v57V9BlIa|4+A7)kN}hA9_-1~$<yYO9>U^c!uI6I@nk?s7K%3xwTe`QeV|p8W
z)IG`GMrr07QU?S<!oES0^JO_#o3*z|&J*bgrF255?@~fT=@N#CL1hw39x&IZNiq^4
zjKbMSgfJ2zj7iSNB<G_-=8+UKn;*;vqmbD?$vI1S5O7};9z~d9C{9S?GM7;5rqGos
zRdF~fWV}7(#DDjrbJRJ-8SmqhDX&Zlx6X3=jY;y`#+??1%AmHbbB>JRQi4bbI14`l
z@ciqyKc77B6gXE~Juy!Wv^R#KP#M!42<*MAj-=pI6Y+%94aXp)nnm8`;jw1mR)y1R
zXdDhDo}pd_R)3B1bW8fUA+O^#&5dE*--6fiist6DSfjeZo<k8Gwh0aeqOfck3pdm0
zj3W0Vi`++Ez;Ns+4WEy6=wFrZQ6|3dg-VEuT@TNBNd%_>Nj;ByVJM=+;}4ndaU>@D
z9`X32hfuk<`_3+R_#KVE`_M|4<gW2wev<PW9<Q%*gUgMRerI0Vp&}+3g|bHy$~NDz
z4@M~4KJROs#zC4gkH|EP2=%xkNh}nhDGTFBYMt<roi6nEP$=t-kX=yKZ{qI&=A3nb
z4;u$m!Sz!7eWLQb<9CA<Q}z_%OZK@wGHT#q+DmAB5c*_m$}M}oWmf32TXsH+R&42G
zX2uw)ZxSPg+<?#wYo1+B10y}GGA_V!MNi!>nr`K0rO)c~3Kq}Wn;>W8xxM-P0V&<$
zAPAJ35TT9xl)!}Go+iwvTnDiTyep=fCl~{DcqCtLMDK`%>cTR2ht?wc1dJ#L#dGmQ
z26>EcyB~qu#yjt!KyuID8j`!p)hS3YBv3j8NFFo7n2&7Rp$8~E&{Fe}<X{g8qkpe;
z<-EyiiBVgZhAjHeX~}2VJ**+xxiGJ;L<(K-dI_3Kq;EEvWu0kRH_PB2n=q&IJ2m8E
zZGI)(Lh1&my)%QYkr!D#GuDho*VYGbUS;Q5uFueRAU8$f7|Yf9Xf{UIdp4-OKM<{u
z02t6Z6Sj<MZQi6c>}eh48opIl*%_*kJF>Y&Q_gJPtgC20{QdYsWz8W{uJu#&D&<-?
zM;{K_d%hcnOhzQsJ|&c;lrSB*BuP^pu~?;%U{4*|$G1ZJZkyQ=-isd??*(_!8(4Fx
zIV)bQZlt?IfWgRcuq^^K2hN@NZ}a7OAowq4-q!dpQ9Nc53y4&4M5r4p!lJ+<iib3g
zv@4TzRLN5J$s`Q<XjEa_Xk$@1+FGhQHyjIhR<vw*4BHD4y_@TINC<F+uL|SS%|?n&
zD3_R(6N|Z+W({m<7S<vE?xHA6@s)t>mIL6m&9BWza|h=Mz{sVlSO9RVF1H1g*kT(L
zqC3~1Jo{{e_9sh!qz*iO&Mfc+a67YrxF`#v3qX+?gJX=tPNhuK5Or2<e7w<fkDR?b
z2arb_Xo&}N`T2wM`bKQxhjh~Z{UY!WgaJ4et}hZ5kl53jP@Z~3aH)vzg~|_7FNWb7
ziNN-V2+WJ`iX^aWW_J!NUOZ+q`38oLCo<Bb0CYc!w~hDRgW>tz-YZ4RK&v?Pq2KTi
z8GD3<ZbYPvR6<!IL!FEw&^~&loJ&+jJN2Aj80p~kOl?Q(y9~B>ECZ_}r&-=JtAfOn
z8%$MCv$^Ha>M}uKsTu?uXoXQ0*S2kVZ*(pBMtb8RiSA%Lu5;zKgZO~BSj9YYVRs3W
zloJ}Tn6N+wgvKoNDU&kg{)mgm%otl`#u%~F{jk%<Yx7{}akp0=dn{B;s)TUpDMCFr
zB_d2I2@>rw!DyfZHqzrp`-h!Az5Zb7a1+=~cNkf@QtUNqDihWR$5&p?O)|70^AKuL
zFSKY$cTS6rmB)lEp6LRK8lapucoCIcH?toNf-K*rNIQ#+J*P#dMeYfIdSxy;IIPAx
z;!AB^IQkiqt<G~B$&)oL{q1Ri8R&4kGvq;EF8}}buC}>t;|Tv1O!^^qt)uY%;(l`6
zq;X@#tfeIVpc&_YJBX-3fCWg)%1r-zclQn;NKq6ikrJgK<C#bzfqTE(-Fx<Vwx*qW
zFdA6o>Ba2Qwud*PdcB?I^<4w4;4mZC^Sdh4MF(Wk)!l2_-_ioZKZ3Tj{IO`aHLOeU
z63Hv-Dn-QGWZ4oUGC@laxbbcX9ibXE?>tdLt8oI2`7{~nT3x5YIwB49EJ5Kv)JMNz
z-X5)J19kbY!=H&FOU=zDaIDCqu=I>@Gm8C+3eWWVRbNq%7{bO>WnC{$>z-Tc5ffc$
zZ|f6WH*tK-P<SGcHVa%Z4O|y31t~a_u9dpB@4%p>J?(GLEY;KgK2}2G_AB(+BsAV1
zJsnuSWpi#Z;roc5mM#n9#ABxIrlA>zf#>$<>F@wqW`5DRg+mGvvbPlF{n(A}-Y1aU
z;AX%jxWFd~e@tQF4!NriFfZpcDjktFt8vV0++n!TKp4&UGF7%XZxJX(OXS<9GCs8N
z2*2!1@lBzbX-oYpeQp>pRCzC!<lX8q{Hz4w8q~)P>TwG0+6c$ZpL_Wd|FZh+NnLIF
z`c6eu0rOD%`Z8b=ARW*Kr7YBX?F(U6fjzvlH|90ps2i3Vv*wNOv4X$6+pKGs8bsZ@
zSkRi18m8!-R)1k|Z=D&7HK6LB)F+egi;HX3zgEx$L5E*98_I=p*3^E=>(BSA{>GEL
zDeCe8%0ejNhARn*5|`tp`P7+XPz<_-`=c9nJdv6LtV}bq1#@}murN$4=2@P_L(@$i
zD}MTP!=}5=DI7M5PsaCk!t)(c-<a;6y~5j+Bb$@&#}euCcbZb$OGZA}o!It^^w~It
z_rDYKeJhSaCt*(Ngv?ESo5ehhne<{S;HhvOvv&&pLv{-F9@c^u3}&3k@#H=(;at?a
zxrEBlWdpl>Qc^xcTINDl^Tb+|wZLttHU!Eq##aUxB<5J@JDX7^&^^rQj%>?Iry07t
zniBL#-Gcp77N4_1-)2CcRUOx~xd8h8csic^t}isoii93fH1V2x2WCD%r;;#>%5=bA
z`wZEAA)U~4fjRZ59huh#4%Hr$WpA|aL>hTf;D;<WlZd&(^;iUF2lIT>=XNYZ>GA#A
zcl|-XY3AhiWA$7zC&OR|nUf+;Wa=|+M>cbzuNe0+_M3QSl5*2aJo%@G4cp=29rHuj
zhYKQ|Jt+m8&YJI{Of?B@7H2ueRKLSKy=*}~W3yww3IC$R8izAgU*$LNO`#8FmF%#L
z!_k@ZS%Divqs;qRBFthO>l<G9N?IZ)fDTgvXn@mxL3DNl<4w^T2Um0!kFjA_bY@@j
ztGTqXibfOir6~_A3FN`!E%OC@4G!@}Q;m4Ju}*MGQIXno(Kwqv<oq}Xe}_HKS`|j7
zSWh>yvw~8OPvffm3^wPgd`OYilbm1GF!af2<u}IsqJT-Z@-tXCq&c|q!?OOo^6#~r
zj*^w1An_l}%{?>t1+M7{ky^}8Ldje!ku0>r6t;GlG=7|LDZ-}?(stH{rRJ19JBmg*
zdyYm~-uh_N;)ec%-gtKxlCr!fkj(g8Ly=E$@OwAqPVva?x8`S)-+2Fcr0_#0bsUqW
z(nW+%9I_~}Viv`Y>3gOVr!8O7pVv`w4luv*HyL+DBa99UcLUgeZPfn-(`aH4i`AQp
zMGeC()Q~b#=aFCec#;z@%c#6WBVTb`;AgYqk{44AA=hwmaz;3ossop`<W(|Kz-rAU
zGyjef-c|Lr2F}2;8f-R}ZcNGvLamJ-KAfHs<qUnlp<=;O7m(xl;pxBLgER7<hW}=k
zW0nAI_~5r~85BLcjt}psKcSA%QgP~dFv=vERh1N4Dw)1Y!BW-I-&IpCHKcxEv?Mcd
z-WG}z2HU8K3S|vOzmB(p&nBy?L;>P=sdBey5n^{?^^iJe2A)}^RE)diHL^NtLG+#6
ziTMN~vG0a1y@3%ONPu=SW`AXb#8&&s(|6Z!4SZ7TM3YM92wR{Da;%oZUux<n;{{qD
zV0@?#(d>A6{>_F?kD+Xrg{P0dxo12VQ{Vz8WdXN*=0ZDJ7{U1)rAc7ffe1p|?Blun
zHk95BPi~LqZaq@Z#z=DSZzRds^@EVJz)d)FO<%G&F=Hkj7bD?86!&_Op>v4QTzy%)
zNQHdH>(59Zx3w|!rgO=P2QnP;c&FKfNwWgE-IO`TV~mM5*SYh{(mP^tag~d4R%8h7
zCB?*fUKz@js0OuRTC~knj1EepPrzs+ON3MzuT^Vce0ODJ(^}@~5hgHRH*!|k1IC*a
z_6MVkF^;Y1{nD}olOq@Sl5a8H4P9(FxA;=WVZ}u|Cc4%QeO}X;&3m<H$9uRKGR0h*
zG1@ONMv_>58U!x$qBLTzZwnU2QOJZHB#Cf6E0Rf1t$aY#%3iP;{%;S2%3jYW_E7P*
z?U&`VF(vO03~(K3TA^jLz;Z3-rdG_jWyj1)BUdDx`_k=!0d8=BoET+wC>rBf70qaH
zUR>j}z)vY;*1U3}B}LUsYl)UtD?1KLZFVs-_<4b80+NU}VChs>1l5~@r6qIC_W&iq
zuqF}(x+!q?ZB6tF$}%JR1+Z%d=fxStj|jQYXn(9y`{r8qRFVNWE1F2=gil8VOeoKb
zra){WJq%@L1e}CXpw#IvWhQhlZmj}tsA1Ld$~Iq)XqPpuL{>mk3XWh3iCsJa%SF!h
z*O8AxH&s2LGUt)Kp=h4N3v1H)oj-OtlBn4(FXw@|Nr?tF(mPBhIT+V-?hk@zl-0CW
z??!;eE;vAzC_vQ9@4^Fu2vj1uZY#P>1ESu&ITwhLrO05ARZ{e17LTgh9+{?v6F4#*
zv)66kEGQZXJ8?o0Fezlf+*qV6wp^3Bt{0iU^b^lDpMDZk&unoR%oa!exbI@zt?(Av
z_7m7rGd3zGm;v&2cb+R0+|!vn5S_{PJM*()b9C;{=9rka>zWqhv7ca<nJkt*XCg|t
zaJb{9y*_&o9iZoWdU7_zdk3OkwEg3=x5FJctT#HU+DUCnMbgKKDp|om&Wnc0aFPBI
zd<HUhz?*5n9%G&ncVAJb4NRm~xDyzq6#S*>c|nkPbcVFqs|r>ndK!2_zoEYZU0H&o
z(GjKOO_m(=^Ek_|z~$sQ42kg_7efT95R@e89BYX>*07BYmR~2!ZS8!XYWIgav7r%{
zO{>X4$F5b5pz`J>&D)eJy5gYhx=zF-Gxq~|-9kNDa+z3;_?N7#df)0XeJk7F*a<P_
z#>A}1rmj7h@Vw;tv}_^@1DK)uGZu3(!I^u!WTUk2$m(QJLk$OTG9SbAo{j5ck@4#4
z_-FZb`f4_LbqN!)rXOH+y@DnD3hVp|HV@nLmei~7aIqr->D#C)$9WuK5;W#XS)4f{
zh-4y!Z#tqU{_EYNr|2G;>zVFxW36@wq~HI5-{Kc_n`C^zkl`C0*F_D#p^iQ8a1!+H
z(nGmR+i%m)hUnw|?vicAZV*}~OTrY~rPQ-gc-CUlb39w7eh`M%pWa<ML|}bG^l_7h
z>a6(t`}Ye{Xj}7rXi?7&r#Cng)vOSCt`#V?U}_suzpk6wP(m*FUM<cF@93KAtVXe3
z-J7LX9V{2Lr0(-`AB&hnX^VD;ec#fePfIY=vpJkRLCj*$!iW<bJ%m|yoiK<UE_oRG
zy)e=N2_uEKBwc>gbA5N#VA!WwJ{0V0`_=edg6HP_GYBjPD(7&E1)lJr^Ad}3GYME=
zic}^J97ciN2hR^NgJ5_zG+qo#n8_G<RzI8(ED8;@#=m{pV#6LFw9XBx)vv>!J63^G
zsyQzfkydjA5zbb!Gdm_E;n=7x_@%5xl_A0>hj$UU3Y&R%d=<&(w74h2{!g<!`$MWW
zG}yFyLD^?6>I07;v(2~^u#ZrSY5y<57|a?eoG(1faV89mUl4$%`i<T~A^nV3*iIz`
z)Y#E{F_}W+k2(bG6kTsKA_-N8$rF_3uvVg|i`?3?YE#jz$~wRn^@zgo&6Sjvl$y?#
z`yK~mtzc7sd+><22Vkf>`_$$Uw&^);<gqZtt8xo@;2e=M!A0o0rt8Pj=|l8=h`!h6
zd9>*4)+_YcL}$Hw+vDKEM2TlXzXg`b+&DHF4=m`xRQi4xIv(%SFoGyL$c)~vR|?9q
z$83yc3tT-A%jGl;FsDh`Q<;ENjq{=-FN)c#WG&S#rsc;oW%ho((pY&sU`{{0{pqy(
zSFp#f!1hF9j-&HpK?(IT%X6&_X*BEEcsB%-R#b=|LA(mr?^324RV1N|i@H27nzRhe
z=g6vLHpaGeBg}Z#)!OdRcE2%(ZJvY0d>51px&T<84DIUG#&aiipz#A5F;AjU*+k1z
zp}TL>^Bht|l<RN_#%}{ZLUd4<CPjN0S5zS=yp#RW9S&7!>$vDTFV^(7Dm4?PGia#x
zp<CGP9A$#H4V_AcS-6V{6H2iZ<}1RSDhY<3SmU*{?^Zpdre7x&rub6kU*LJ2ds4J_
z7n*H`G<#d)w8@1br>*Ng-Jqg+i#n<*bRQC_tI}(9W=%7qyG^fIpIM{Id<dD{KDFjh
zQfnN`rlgh73{A>af&cd@Hk+l`aA8VM1|Ab4jF=n3PoXe56RAk7&<<lSb@~*W-a+jh
z)JJqsw_l{s#zFP(@1Xh|Gg2f=9lB$SIQXWvWM=Alv13_@AN0JO<^k#ieH^|uUVM~e
zFfWu=keGp4`4-%Qmkl=m(TD@EZY^=ZwaN_W^OboSl;5y?X#$38MeU@l37r+ukXw-(
zI_9{Z3+y^H72pA^NIe2WTOgYy&CZ(KQ=Q4c^Kn^E&%x416FHXJ_=md4uai=Ht=&o=
zp^2T*6-!!4*fNRWYRan%sjqR)@lq!*v+2!D1SpTFAXAiqq16o-$s2qj&7AF=-rksg
z=-Uv-yTx+OidBX)8oawQo)5`z4xAedXUlbx*mitoMxM{y)U_E8OrM388z-EbNqR>C
zrcrh=dJ<;yJH6Hw0sIq5PL9mmK=`!78AIY3VL$K$Lp~jP=-s6&M`mw8Kac^v{bGGK
z26T821A3M*IH#&Cd9BQ0HYZqqeNz6B<vBn02Bz`i1eeLQtVe$%b0Rn355|X6<KJ-Z
zeX`t7u*2gLlE2CLr)+xcIl;j3jTb-tcy{t$3nTtRCZEff##`vfu{;iOzjvZA7+7v(
zobr@cnSSgpw)%$M+qSpU#qFOKEd2zIz-b3<_`l7@#D49X1Ivu=<J8QzqEAE<^{GSQ
z&GXleFN4sOCi4ZC%(5hBQIbmL#IY9$JMg0<xs$uIzT728Xfjc!<Ol|{Ynp@E3vNLD
zp*W?eI(!8NI`Cbm^Pk)G1!m(|Rv*&0Q1)lCqq>U@bvvhgJh{E6@3PizY4A29Zkan-
eg=qA>hOOvRdz)0>Whftcy8j<fj90VU0t5iuK|^5x

literal 0
HcmV?d00001

diff --git a/x-pack/test/siem_cypress/es_archives/prebuilt_rules_loaded/mappings.json b/x-pack/test/siem_cypress/es_archives/prebuilt_rules_loaded/mappings.json
new file mode 100644
index 0000000000000..1ff773c5c755c
--- /dev/null
+++ b/x-pack/test/siem_cypress/es_archives/prebuilt_rules_loaded/mappings.json
@@ -0,0 +1,4828 @@
+{
+  "type": "index",
+  "value": {
+    "aliases": {
+      ".kibana": {
+      }
+    },
+    "index": ".kibana_1",
+    "mappings": {
+      "_meta": {
+        "migrationMappingPropertyHashes": {
+          "action": "6e96ac5e648f57523879661ea72525b7",
+          "action_task_params": "a9d49f184ee89641044be0ca2950fa3a",
+          "agent_configs": "38abaf89513877745c359e7700c0c66a",
+          "agent_events": "3231653fafe4ef3196fe3b32ab774bf2",
+          "agents": "75c0f4a11560dbc38b65e5e1d98fc9da",
+          "alert": "7b44fba6773e37c806ce290ea9b7024e",
+          "apm-indices": "9bb9b2bf1fa636ed8619cbab5ce6a1dd",
+          "apm-services-telemetry": "07ee1939fa4302c62ddc052ec03fed90",
+          "application_usage_totals": "c897e4310c5f24b07caaff3db53ae2c1",
+          "application_usage_transactional": "965839e75f809fefe04f92dc4d99722a",
+          "canvas-element": "7390014e1091044523666d97247392fc",
+          "canvas-workpad": "b0a1706d356228dbdcb4a17e6b9eb231",
+          "cases": "08b8b110dbca273d37e8aef131ecab61",
+          "cases-comments": "df3c1aa1b3dd5737c94d9e430b13c48a",
+          "cases-configure": "42711cbb311976c0687853f4c1354572",
+          "cases-user-actions": "32277330ec6b721abe3b846cfd939a71",
+          "config": "ae24d22d5986d04124cc6568f771066f",
+          "dashboard": "d00f614b29a80360e1190193fd333bab",
+          "datasources": "d4bc0c252b2b5683ff21ea32d00acffc",
+          "enrollment_api_keys": "28b91e20b105b6f928e2012600085d8f",
+          "epm-package": "75d12cd13c867fd713d7dfb27366bc20",
+          "file-upload-telemetry": "0ed4d3e1983d1217a30982630897092e",
+          "graph-workspace": "cd7ba1330e6682e9cc00b78850874be1",
+          "index-pattern": "66eccb05066c5a89924f48a9e9736499",
+          "infrastructure-ui-source": "ddc0ecb18383f6b26101a2fadb2dab0c",
+          "inventory-view": "9ecce5b58867403613d82fe496470b34",
+          "kql-telemetry": "d12a98a6f19a2d273696597547e064ee",
+          "lens": "21c3ea0763beb1ecb0162529706b88c5",
+          "lens-ui-telemetry": "509bfa5978586998e05f9e303c07a327",
+          "map": "23d7aa4a720d4938ccde3983f87bd58d",
+          "maps-telemetry": "268da3a48066123fc5baf35abaa55014",
+          "metrics-explorer-view": "53c5365793677328df0ccb6138bf3cdd",
+          "migrationVersion": "4a1746014a75ade3a714e1db5763276f",
+          "ml-telemetry": "257fd1d4b4fdbb9cb4b8a3b27da201e9",
+          "namespace": "2f4316de49999235636386fe51dc06c1",
+          "outputs": "aee9782e0d500b867859650a36280165",
+          "query": "11aaeb7f5f7fa5bb43f25e18ce26e7d9",
+          "references": "7997cf5a56cc02bdc9c93361bde732b0",
+          "sample-data-telemetry": "7d3cfeb915303c9641c59681967ffeb4",
+          "search": "181661168bbadd1eff5902361e2a0d5c",
+          "server": "ec97f1c5da1a19609a60874e5af1100c",
+          "siem-detection-engine-rule-status": "0367e4d775814b56a4bee29384f9aafe",
+          "siem-ui-timeline": "ac8020190f5950dd3250b6499144e7fb",
+          "siem-ui-timeline-note": "8874706eedc49059d4cf0f5094559084",
+          "siem-ui-timeline-pinned-event": "20638091112f0e14f0e443d512301c29",
+          "space": "c5ca8acafa0beaa4d08d014a97b6bc6b",
+          "telemetry": "810bd6a9a42f0425dd6fee4a408e30e2",
+          "timelion-sheet": "9a2a2748877c7a7b582fef201ab1d4cf",
+          "tsvb-validation-telemetry": "3a37ef6c8700ae6fc97d5c7da00e9215",
+          "type": "2f4316de49999235636386fe51dc06c1",
+          "ui-metric": "0d409297dc5ebe1e3a1da691c6ee32e3",
+          "updated_at": "00da57df13e94e9d98437d13ace4bfe0",
+          "upgrade-assistant-reindex-operation": "a53a20fe086b72c9a86da3cc12dad8a6",
+          "upgrade-assistant-telemetry": "56702cec857e0a9dacfb696655b4ff7b",
+          "uptime-dynamic-settings": "b6289473c8985c79b6c47eebc19a0ca5",
+          "url": "c7f66a0df8b1b52f17c28c4adb111105",
+          "visualization": "52d7a13ad68a150c4525b292d23e12cc"
+        }
+      },
+      "dynamic": "strict",
+      "properties": {
+        "action": {
+          "properties": {
+            "actionTypeId": {
+              "type": "keyword"
+            },
+            "config": {
+              "enabled": false,
+              "type": "object"
+            },
+            "name": {
+              "fields": {
+                "keyword": {
+                  "type": "keyword"
+                }
+              },
+              "type": "text"
+            },
+            "secrets": {
+              "type": "binary"
+            }
+          }
+        },
+        "action_task_params": {
+          "properties": {
+            "actionId": {
+              "type": "keyword"
+            },
+            "apiKey": {
+              "type": "binary"
+            },
+            "params": {
+              "enabled": false,
+              "type": "object"
+            }
+          }
+        },
+        "agent_configs": {
+          "properties": {
+            "datasources": {
+              "type": "keyword"
+            },
+            "description": {
+              "type": "text"
+            },
+            "id": {
+              "type": "keyword"
+            },
+            "is_default": {
+              "type": "boolean"
+            },
+            "name": {
+              "type": "text"
+            },
+            "namespace": {
+              "type": "keyword"
+            },
+            "revision": {
+              "type": "integer"
+            },
+            "status": {
+              "type": "keyword"
+            },
+            "updated_by": {
+              "type": "keyword"
+            },
+            "updated_on": {
+              "type": "keyword"
+            }
+          }
+        },
+        "agent_events": {
+          "properties": {
+            "action_id": {
+              "type": "keyword"
+            },
+            "agent_id": {
+              "type": "keyword"
+            },
+            "config_id": {
+              "type": "keyword"
+            },
+            "data": {
+              "type": "text"
+            },
+            "message": {
+              "type": "text"
+            },
+            "payload": {
+              "type": "text"
+            },
+            "stream_id": {
+              "type": "keyword"
+            },
+            "subtype": {
+              "type": "keyword"
+            },
+            "timestamp": {
+              "type": "date"
+            },
+            "type": {
+              "type": "keyword"
+            }
+          }
+        },
+        "agents": {
+          "properties": {
+            "access_api_key_id": {
+              "type": "keyword"
+            },
+            "actions": {
+              "properties": {
+                "created_at": {
+                  "type": "date"
+                },
+                "data": {
+                  "type": "text"
+                },
+                "id": {
+                  "type": "keyword"
+                },
+                "sent_at": {
+                  "type": "date"
+                },
+                "type": {
+                  "type": "keyword"
+                }
+              },
+              "type": "nested"
+            },
+            "active": {
+              "type": "boolean"
+            },
+            "config_id": {
+              "type": "keyword"
+            },
+            "config_newest_revision": {
+              "type": "integer"
+            },
+            "config_revision": {
+              "type": "integer"
+            },
+            "current_error_events": {
+              "type": "text"
+            },
+            "default_api_key": {
+              "type": "keyword"
+            },
+            "enrolled_at": {
+              "type": "date"
+            },
+            "last_checkin": {
+              "type": "date"
+            },
+            "last_updated": {
+              "type": "date"
+            },
+            "local_metadata": {
+              "type": "text"
+            },
+            "shared_id": {
+              "type": "keyword"
+            },
+            "type": {
+              "type": "keyword"
+            },
+            "updated_at": {
+              "type": "date"
+            },
+            "user_provided_metadata": {
+              "type": "text"
+            },
+            "version": {
+              "type": "keyword"
+            }
+          }
+        },
+        "alert": {
+          "properties": {
+            "actions": {
+              "properties": {
+                "actionRef": {
+                  "type": "keyword"
+                },
+                "actionTypeId": {
+                  "type": "keyword"
+                },
+                "group": {
+                  "type": "keyword"
+                },
+                "params": {
+                  "enabled": false,
+                  "type": "object"
+                }
+              },
+              "type": "nested"
+            },
+            "alertTypeId": {
+              "type": "keyword"
+            },
+            "apiKey": {
+              "type": "binary"
+            },
+            "apiKeyOwner": {
+              "type": "keyword"
+            },
+            "consumer": {
+              "type": "keyword"
+            },
+            "createdAt": {
+              "type": "date"
+            },
+            "createdBy": {
+              "type": "keyword"
+            },
+            "enabled": {
+              "type": "boolean"
+            },
+            "muteAll": {
+              "type": "boolean"
+            },
+            "mutedInstanceIds": {
+              "type": "keyword"
+            },
+            "name": {
+              "fields": {
+                "keyword": {
+                  "type": "keyword"
+                }
+              },
+              "type": "text"
+            },
+            "params": {
+              "enabled": false,
+              "type": "object"
+            },
+            "schedule": {
+              "properties": {
+                "interval": {
+                  "type": "keyword"
+                }
+              }
+            },
+            "scheduledTaskId": {
+              "type": "keyword"
+            },
+            "tags": {
+              "type": "keyword"
+            },
+            "throttle": {
+              "type": "keyword"
+            },
+            "updatedBy": {
+              "type": "keyword"
+            }
+          }
+        },
+        "apm-indices": {
+          "properties": {
+            "apm_oss": {
+              "properties": {
+                "errorIndices": {
+                  "type": "keyword"
+                },
+                "metricsIndices": {
+                  "type": "keyword"
+                },
+                "onboardingIndices": {
+                  "type": "keyword"
+                },
+                "sourcemapIndices": {
+                  "type": "keyword"
+                },
+                "spanIndices": {
+                  "type": "keyword"
+                },
+                "transactionIndices": {
+                  "type": "keyword"
+                }
+              }
+            }
+          }
+        },
+        "apm-services-telemetry": {
+          "properties": {
+            "has_any_services": {
+              "type": "boolean"
+            },
+            "services_per_agent": {
+              "properties": {
+                "dotnet": {
+                  "null_value": 0,
+                  "type": "long"
+                },
+                "go": {
+                  "null_value": 0,
+                  "type": "long"
+                },
+                "java": {
+                  "null_value": 0,
+                  "type": "long"
+                },
+                "js-base": {
+                  "null_value": 0,
+                  "type": "long"
+                },
+                "nodejs": {
+                  "null_value": 0,
+                  "type": "long"
+                },
+                "python": {
+                  "null_value": 0,
+                  "type": "long"
+                },
+                "ruby": {
+                  "null_value": 0,
+                  "type": "long"
+                },
+                "rum-js": {
+                  "null_value": 0,
+                  "type": "long"
+                }
+              }
+            }
+          }
+        },
+        "application_usage_totals": {
+          "properties": {
+            "appId": {
+              "type": "keyword"
+            },
+            "minutesOnScreen": {
+              "type": "float"
+            },
+            "numberOfClicks": {
+              "type": "long"
+            }
+          }
+        },
+        "application_usage_transactional": {
+          "properties": {
+            "appId": {
+              "type": "keyword"
+            },
+            "minutesOnScreen": {
+              "type": "float"
+            },
+            "numberOfClicks": {
+              "type": "long"
+            },
+            "timestamp": {
+              "type": "date"
+            }
+          }
+        },
+        "canvas-element": {
+          "dynamic": "false",
+          "properties": {
+            "@created": {
+              "type": "date"
+            },
+            "@timestamp": {
+              "type": "date"
+            },
+            "content": {
+              "type": "text"
+            },
+            "help": {
+              "type": "text"
+            },
+            "image": {
+              "type": "text"
+            },
+            "name": {
+              "fields": {
+                "keyword": {
+                  "type": "keyword"
+                }
+              },
+              "type": "text"
+            }
+          }
+        },
+        "canvas-workpad": {
+          "dynamic": "false",
+          "properties": {
+            "@created": {
+              "type": "date"
+            },
+            "@timestamp": {
+              "type": "date"
+            },
+            "name": {
+              "fields": {
+                "keyword": {
+                  "type": "keyword"
+                }
+              },
+              "type": "text"
+            }
+          }
+        },
+        "cases": {
+          "properties": {
+            "closed_at": {
+              "type": "date"
+            },
+            "closed_by": {
+              "properties": {
+                "email": {
+                  "type": "keyword"
+                },
+                "full_name": {
+                  "type": "keyword"
+                },
+                "username": {
+                  "type": "keyword"
+                }
+              }
+            },
+            "created_at": {
+              "type": "date"
+            },
+            "created_by": {
+              "properties": {
+                "email": {
+                  "type": "keyword"
+                },
+                "full_name": {
+                  "type": "keyword"
+                },
+                "username": {
+                  "type": "keyword"
+                }
+              }
+            },
+            "description": {
+              "type": "text"
+            },
+            "external_service": {
+              "properties": {
+                "connector_id": {
+                  "type": "keyword"
+                },
+                "connector_name": {
+                  "type": "keyword"
+                },
+                "external_id": {
+                  "type": "keyword"
+                },
+                "external_title": {
+                  "type": "text"
+                },
+                "external_url": {
+                  "type": "text"
+                },
+                "pushed_at": {
+                  "type": "date"
+                },
+                "pushed_by": {
+                  "properties": {
+                    "email": {
+                      "type": "keyword"
+                    },
+                    "full_name": {
+                      "type": "keyword"
+                    },
+                    "username": {
+                      "type": "keyword"
+                    }
+                  }
+                }
+              }
+            },
+            "status": {
+              "type": "keyword"
+            },
+            "tags": {
+              "type": "keyword"
+            },
+            "title": {
+              "type": "keyword"
+            },
+            "updated_at": {
+              "type": "date"
+            },
+            "updated_by": {
+              "properties": {
+                "email": {
+                  "type": "keyword"
+                },
+                "full_name": {
+                  "type": "keyword"
+                },
+                "username": {
+                  "type": "keyword"
+                }
+              }
+            }
+          }
+        },
+        "cases-comments": {
+          "properties": {
+            "comment": {
+              "type": "text"
+            },
+            "created_at": {
+              "type": "date"
+            },
+            "created_by": {
+              "properties": {
+                "email": {
+                  "type": "keyword"
+                },
+                "full_name": {
+                  "type": "keyword"
+                },
+                "username": {
+                  "type": "keyword"
+                }
+              }
+            },
+            "pushed_at": {
+              "type": "date"
+            },
+            "pushed_by": {
+              "properties": {
+                "full_name": {
+                  "type": "keyword"
+                },
+                "username": {
+                  "type": "keyword"
+                }
+              }
+            },
+            "updated_at": {
+              "type": "date"
+            },
+            "updated_by": {
+              "properties": {
+                "email": {
+                  "type": "keyword"
+                },
+                "full_name": {
+                  "type": "keyword"
+                },
+                "username": {
+                  "type": "keyword"
+                }
+              }
+            }
+          }
+        },
+        "cases-configure": {
+          "properties": {
+            "closure_type": {
+              "type": "keyword"
+            },
+            "connector_id": {
+              "type": "keyword"
+            },
+            "connector_name": {
+              "type": "keyword"
+            },
+            "created_at": {
+              "type": "date"
+            },
+            "created_by": {
+              "properties": {
+                "email": {
+                  "type": "keyword"
+                },
+                "full_name": {
+                  "type": "keyword"
+                },
+                "username": {
+                  "type": "keyword"
+                }
+              }
+            },
+            "updated_at": {
+              "type": "date"
+            },
+            "updated_by": {
+              "properties": {
+                "email": {
+                  "type": "keyword"
+                },
+                "full_name": {
+                  "type": "keyword"
+                },
+                "username": {
+                  "type": "keyword"
+                }
+              }
+            }
+          }
+        },
+        "cases-user-actions": {
+          "properties": {
+            "action": {
+              "type": "keyword"
+            },
+            "action_at": {
+              "type": "date"
+            },
+            "action_by": {
+              "properties": {
+                "email": {
+                  "type": "keyword"
+                },
+                "full_name": {
+                  "type": "keyword"
+                },
+                "username": {
+                  "type": "keyword"
+                }
+              }
+            },
+            "action_field": {
+              "type": "keyword"
+            },
+            "new_value": {
+              "type": "text"
+            },
+            "old_value": {
+              "type": "text"
+            }
+          }
+        },
+        "config": {
+          "dynamic": "true",
+          "properties": {
+            "buildNum": {
+              "type": "keyword"
+            },
+            "dateFormat:tz": {
+              "fields": {
+                "keyword": {
+                  "ignore_above": 256,
+                  "type": "keyword"
+                }
+              },
+              "type": "text"
+            }
+          }
+        },
+        "dashboard": {
+          "properties": {
+            "description": {
+              "type": "text"
+            },
+            "hits": {
+              "type": "integer"
+            },
+            "kibanaSavedObjectMeta": {
+              "properties": {
+                "searchSourceJSON": {
+                  "type": "text"
+                }
+              }
+            },
+            "optionsJSON": {
+              "type": "text"
+            },
+            "panelsJSON": {
+              "type": "text"
+            },
+            "refreshInterval": {
+              "properties": {
+                "display": {
+                  "type": "keyword"
+                },
+                "pause": {
+                  "type": "boolean"
+                },
+                "section": {
+                  "type": "integer"
+                },
+                "value": {
+                  "type": "integer"
+                }
+              }
+            },
+            "timeFrom": {
+              "type": "keyword"
+            },
+            "timeRestore": {
+              "type": "boolean"
+            },
+            "timeTo": {
+              "type": "keyword"
+            },
+            "title": {
+              "type": "text"
+            },
+            "version": {
+              "type": "integer"
+            }
+          }
+        },
+        "datasources": {
+          "properties": {
+            "config_id": {
+              "type": "keyword"
+            },
+            "description": {
+              "type": "text"
+            },
+            "enabled": {
+              "type": "boolean"
+            },
+            "inputs": {
+              "properties": {
+                "config": {
+                  "type": "flattened"
+                },
+                "enabled": {
+                  "type": "boolean"
+                },
+                "processors": {
+                  "type": "keyword"
+                },
+                "streams": {
+                  "properties": {
+                    "config": {
+                      "type": "flattened"
+                    },
+                    "dataset": {
+                      "type": "keyword"
+                    },
+                    "enabled": {
+                      "type": "boolean"
+                    },
+                    "id": {
+                      "type": "keyword"
+                    },
+                    "processors": {
+                      "type": "keyword"
+                    }
+                  },
+                  "type": "nested"
+                },
+                "type": {
+                  "type": "keyword"
+                }
+              },
+              "type": "nested"
+            },
+            "name": {
+              "type": "keyword"
+            },
+            "namespace": {
+              "type": "keyword"
+            },
+            "output_id": {
+              "type": "keyword"
+            },
+            "package": {
+              "properties": {
+                "name": {
+                  "type": "keyword"
+                },
+                "title": {
+                  "type": "keyword"
+                },
+                "version": {
+                  "type": "keyword"
+                }
+              }
+            },
+            "revision": {
+              "type": "integer"
+            }
+          }
+        },
+        "enrollment_api_keys": {
+          "properties": {
+            "active": {
+              "type": "boolean"
+            },
+            "api_key": {
+              "type": "binary"
+            },
+            "api_key_id": {
+              "type": "keyword"
+            },
+            "config_id": {
+              "type": "keyword"
+            },
+            "created_at": {
+              "type": "date"
+            },
+            "expire_at": {
+              "type": "date"
+            },
+            "name": {
+              "type": "keyword"
+            },
+            "type": {
+              "type": "keyword"
+            },
+            "updated_at": {
+              "type": "date"
+            }
+          }
+        },
+        "epm-package": {
+          "properties": {
+            "installed": {
+              "properties": {
+                "id": {
+                  "type": "keyword"
+                },
+                "type": {
+                  "type": "keyword"
+                }
+              },
+              "type": "nested"
+            },
+            "name": {
+              "type": "keyword"
+            },
+            "version": {
+              "type": "keyword"
+            }
+          }
+        },
+        "file-upload-telemetry": {
+          "properties": {
+            "filesUploadedTotalCount": {
+              "type": "long"
+            }
+          }
+        },
+        "graph-workspace": {
+          "properties": {
+            "description": {
+              "type": "text"
+            },
+            "kibanaSavedObjectMeta": {
+              "properties": {
+                "searchSourceJSON": {
+                  "type": "text"
+                }
+              }
+            },
+            "numLinks": {
+              "type": "integer"
+            },
+            "numVertices": {
+              "type": "integer"
+            },
+            "title": {
+              "type": "text"
+            },
+            "version": {
+              "type": "integer"
+            },
+            "wsState": {
+              "type": "text"
+            }
+          }
+        },
+        "index-pattern": {
+          "properties": {
+            "fieldFormatMap": {
+              "type": "text"
+            },
+            "fields": {
+              "type": "text"
+            },
+            "intervalName": {
+              "type": "keyword"
+            },
+            "notExpandable": {
+              "type": "boolean"
+            },
+            "sourceFilters": {
+              "type": "text"
+            },
+            "timeFieldName": {
+              "type": "keyword"
+            },
+            "title": {
+              "type": "text"
+            },
+            "type": {
+              "type": "keyword"
+            },
+            "typeMeta": {
+              "type": "keyword"
+            }
+          }
+        },
+        "infrastructure-ui-source": {
+          "properties": {
+            "description": {
+              "type": "text"
+            },
+            "fields": {
+              "properties": {
+                "container": {
+                  "type": "keyword"
+                },
+                "host": {
+                  "type": "keyword"
+                },
+                "pod": {
+                  "type": "keyword"
+                },
+                "tiebreaker": {
+                  "type": "keyword"
+                },
+                "timestamp": {
+                  "type": "keyword"
+                }
+              }
+            },
+            "logAlias": {
+              "type": "keyword"
+            },
+            "logColumns": {
+              "properties": {
+                "fieldColumn": {
+                  "properties": {
+                    "field": {
+                      "type": "keyword"
+                    },
+                    "id": {
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "messageColumn": {
+                  "properties": {
+                    "id": {
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "timestampColumn": {
+                  "properties": {
+                    "id": {
+                      "type": "keyword"
+                    }
+                  }
+                }
+              },
+              "type": "nested"
+            },
+            "metricAlias": {
+              "type": "keyword"
+            },
+            "name": {
+              "type": "text"
+            }
+          }
+        },
+        "inventory-view": {
+          "properties": {
+            "autoBounds": {
+              "type": "boolean"
+            },
+            "autoReload": {
+              "type": "boolean"
+            },
+            "boundsOverride": {
+              "properties": {
+                "max": {
+                  "type": "integer"
+                },
+                "min": {
+                  "type": "integer"
+                }
+              }
+            },
+            "customMetrics": {
+              "properties": {
+                "aggregation": {
+                  "type": "keyword"
+                },
+                "field": {
+                  "type": "keyword"
+                },
+                "id": {
+                  "type": "keyword"
+                },
+                "label": {
+                  "type": "keyword"
+                },
+                "type": {
+                  "type": "keyword"
+                }
+              },
+              "type": "nested"
+            },
+            "customOptions": {
+              "properties": {
+                "field": {
+                  "type": "keyword"
+                },
+                "text": {
+                  "type": "keyword"
+                }
+              },
+              "type": "nested"
+            },
+            "filterQuery": {
+              "properties": {
+                "expression": {
+                  "type": "keyword"
+                },
+                "kind": {
+                  "type": "keyword"
+                }
+              }
+            },
+            "groupBy": {
+              "properties": {
+                "field": {
+                  "type": "keyword"
+                },
+                "label": {
+                  "type": "keyword"
+                }
+              },
+              "type": "nested"
+            },
+            "metric": {
+              "properties": {
+                "aggregation": {
+                  "type": "keyword"
+                },
+                "field": {
+                  "type": "keyword"
+                },
+                "id": {
+                  "type": "keyword"
+                },
+                "label": {
+                  "type": "keyword"
+                },
+                "type": {
+                  "type": "keyword"
+                }
+              }
+            },
+            "name": {
+              "type": "keyword"
+            },
+            "nodeType": {
+              "type": "keyword"
+            },
+            "time": {
+              "type": "integer"
+            },
+            "view": {
+              "type": "keyword"
+            }
+          }
+        },
+        "kql-telemetry": {
+          "properties": {
+            "optInCount": {
+              "type": "long"
+            },
+            "optOutCount": {
+              "type": "long"
+            }
+          }
+        },
+        "lens": {
+          "properties": {
+            "expression": {
+              "index": false,
+              "type": "keyword"
+            },
+            "state": {
+              "type": "flattened"
+            },
+            "title": {
+              "type": "text"
+            },
+            "visualizationType": {
+              "type": "keyword"
+            }
+          }
+        },
+        "lens-ui-telemetry": {
+          "properties": {
+            "count": {
+              "type": "integer"
+            },
+            "date": {
+              "type": "date"
+            },
+            "name": {
+              "type": "keyword"
+            },
+            "type": {
+              "type": "keyword"
+            }
+          }
+        },
+        "map": {
+          "properties": {
+            "bounds": {
+              "type": "geo_shape"
+            },
+            "description": {
+              "type": "text"
+            },
+            "layerListJSON": {
+              "type": "text"
+            },
+            "mapStateJSON": {
+              "type": "text"
+            },
+            "title": {
+              "type": "text"
+            },
+            "uiStateJSON": {
+              "type": "text"
+            },
+            "version": {
+              "type": "integer"
+            }
+          }
+        },
+        "maps-telemetry": {
+          "properties": {
+            "attributesPerMap": {
+              "properties": {
+                "dataSourcesCount": {
+                  "properties": {
+                    "avg": {
+                      "type": "long"
+                    },
+                    "max": {
+                      "type": "long"
+                    },
+                    "min": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "emsVectorLayersCount": {
+                  "dynamic": "true",
+                  "type": "object"
+                },
+                "layerTypesCount": {
+                  "dynamic": "true",
+                  "type": "object"
+                },
+                "layersCount": {
+                  "properties": {
+                    "avg": {
+                      "type": "long"
+                    },
+                    "max": {
+                      "type": "long"
+                    },
+                    "min": {
+                      "type": "long"
+                    }
+                  }
+                }
+              }
+            },
+            "indexPatternsWithGeoFieldCount": {
+              "type": "long"
+            },
+            "mapsTotalCount": {
+              "type": "long"
+            },
+            "settings": {
+              "properties": {
+                "showMapVisualizationTypes": {
+                  "type": "boolean"
+                }
+              }
+            },
+            "timeCaptured": {
+              "type": "date"
+            }
+          }
+        },
+        "metrics-explorer-view": {
+          "properties": {
+            "chartOptions": {
+              "properties": {
+                "stack": {
+                  "type": "boolean"
+                },
+                "type": {
+                  "type": "keyword"
+                },
+                "yAxisMode": {
+                  "type": "keyword"
+                }
+              }
+            },
+            "currentTimerange": {
+              "properties": {
+                "from": {
+                  "type": "keyword"
+                },
+                "interval": {
+                  "type": "keyword"
+                },
+                "to": {
+                  "type": "keyword"
+                }
+              }
+            },
+            "name": {
+              "type": "keyword"
+            },
+            "options": {
+              "properties": {
+                "aggregation": {
+                  "type": "keyword"
+                },
+                "filterQuery": {
+                  "type": "keyword"
+                },
+                "groupBy": {
+                  "type": "keyword"
+                },
+                "limit": {
+                  "type": "integer"
+                },
+                "metrics": {
+                  "properties": {
+                    "aggregation": {
+                      "type": "keyword"
+                    },
+                    "color": {
+                      "type": "keyword"
+                    },
+                    "field": {
+                      "type": "keyword"
+                    },
+                    "label": {
+                      "type": "keyword"
+                    }
+                  },
+                  "type": "nested"
+                }
+              }
+            }
+          }
+        },
+        "migrationVersion": {
+          "dynamic": "true",
+          "properties": {
+            "space": {
+              "fields": {
+                "keyword": {
+                  "ignore_above": 256,
+                  "type": "keyword"
+                }
+              },
+              "type": "text"
+            }
+          }
+        },
+        "ml-telemetry": {
+          "properties": {
+            "file_data_visualizer": {
+              "properties": {
+                "index_creation_count": {
+                  "type": "long"
+                }
+              }
+            }
+          }
+        },
+        "namespace": {
+          "type": "keyword"
+        },
+        "outputs": {
+          "properties": {
+            "api_key": {
+              "type": "keyword"
+            },
+            "ca_sha256": {
+              "type": "keyword"
+            },
+            "config": {
+              "type": "flattened"
+            },
+            "fleet_enroll_password": {
+              "type": "binary"
+            },
+            "fleet_enroll_username": {
+              "type": "binary"
+            },
+            "hosts": {
+              "type": "keyword"
+            },
+            "is_default": {
+              "type": "boolean"
+            },
+            "name": {
+              "type": "keyword"
+            },
+            "type": {
+              "type": "keyword"
+            }
+          }
+        },
+        "query": {
+          "properties": {
+            "description": {
+              "type": "text"
+            },
+            "filters": {
+              "enabled": false,
+              "type": "object"
+            },
+            "query": {
+              "properties": {
+                "language": {
+                  "type": "keyword"
+                },
+                "query": {
+                  "index": false,
+                  "type": "keyword"
+                }
+              }
+            },
+            "timefilter": {
+              "enabled": false,
+              "type": "object"
+            },
+            "title": {
+              "type": "text"
+            }
+          }
+        },
+        "references": {
+          "properties": {
+            "id": {
+              "type": "keyword"
+            },
+            "name": {
+              "type": "keyword"
+            },
+            "type": {
+              "type": "keyword"
+            }
+          },
+          "type": "nested"
+        },
+        "sample-data-telemetry": {
+          "properties": {
+            "installCount": {
+              "type": "long"
+            },
+            "unInstallCount": {
+              "type": "long"
+            }
+          }
+        },
+        "search": {
+          "properties": {
+            "columns": {
+              "type": "keyword"
+            },
+            "description": {
+              "type": "text"
+            },
+            "hits": {
+              "type": "integer"
+            },
+            "kibanaSavedObjectMeta": {
+              "properties": {
+                "searchSourceJSON": {
+                  "type": "text"
+                }
+              }
+            },
+            "sort": {
+              "type": "keyword"
+            },
+            "title": {
+              "type": "text"
+            },
+            "version": {
+              "type": "integer"
+            }
+          }
+        },
+        "server": {
+          "properties": {
+            "uuid": {
+              "type": "keyword"
+            }
+          }
+        },
+        "siem-detection-engine-rule-status": {
+          "properties": {
+            "alertId": {
+              "type": "keyword"
+            },
+            "lastFailureAt": {
+              "type": "date"
+            },
+            "lastFailureMessage": {
+              "type": "text"
+            },
+            "lastSuccessAt": {
+              "type": "date"
+            },
+            "lastSuccessMessage": {
+              "type": "text"
+            },
+            "status": {
+              "type": "keyword"
+            },
+            "statusDate": {
+              "type": "date"
+            }
+          }
+        },
+        "siem-ui-timeline": {
+          "properties": {
+            "columns": {
+              "properties": {
+                "aggregatable": {
+                  "type": "boolean"
+                },
+                "category": {
+                  "type": "keyword"
+                },
+                "columnHeaderType": {
+                  "type": "keyword"
+                },
+                "description": {
+                  "type": "text"
+                },
+                "example": {
+                  "type": "text"
+                },
+                "id": {
+                  "type": "keyword"
+                },
+                "indexes": {
+                  "type": "keyword"
+                },
+                "name": {
+                  "type": "text"
+                },
+                "placeholder": {
+                  "type": "text"
+                },
+                "searchable": {
+                  "type": "boolean"
+                },
+                "type": {
+                  "type": "keyword"
+                }
+              }
+            },
+            "created": {
+              "type": "date"
+            },
+            "createdBy": {
+              "type": "text"
+            },
+            "dataProviders": {
+              "properties": {
+                "and": {
+                  "properties": {
+                    "enabled": {
+                      "type": "boolean"
+                    },
+                    "excluded": {
+                      "type": "boolean"
+                    },
+                    "id": {
+                      "type": "keyword"
+                    },
+                    "kqlQuery": {
+                      "type": "text"
+                    },
+                    "name": {
+                      "type": "text"
+                    },
+                    "queryMatch": {
+                      "properties": {
+                        "displayField": {
+                          "type": "text"
+                        },
+                        "displayValue": {
+                          "type": "text"
+                        },
+                        "field": {
+                          "type": "text"
+                        },
+                        "operator": {
+                          "type": "text"
+                        },
+                        "value": {
+                          "type": "text"
+                        }
+                      }
+                    }
+                  }
+                },
+                "enabled": {
+                  "type": "boolean"
+                },
+                "excluded": {
+                  "type": "boolean"
+                },
+                "id": {
+                  "type": "keyword"
+                },
+                "kqlQuery": {
+                  "type": "text"
+                },
+                "name": {
+                  "type": "text"
+                },
+                "queryMatch": {
+                  "properties": {
+                    "displayField": {
+                      "type": "text"
+                    },
+                    "displayValue": {
+                      "type": "text"
+                    },
+                    "field": {
+                      "type": "text"
+                    },
+                    "operator": {
+                      "type": "text"
+                    },
+                    "value": {
+                      "type": "text"
+                    }
+                  }
+                }
+              }
+            },
+            "dateRange": {
+              "properties": {
+                "end": {
+                  "type": "date"
+                },
+                "start": {
+                  "type": "date"
+                }
+              }
+            },
+            "description": {
+              "type": "text"
+            },
+            "eventType": {
+              "type": "keyword"
+            },
+            "favorite": {
+              "properties": {
+                "favoriteDate": {
+                  "type": "date"
+                },
+                "fullName": {
+                  "type": "text"
+                },
+                "keySearch": {
+                  "type": "text"
+                },
+                "userName": {
+                  "type": "text"
+                }
+              }
+            },
+            "filters": {
+              "properties": {
+                "exists": {
+                  "type": "text"
+                },
+                "match_all": {
+                  "type": "text"
+                },
+                "meta": {
+                  "properties": {
+                    "alias": {
+                      "type": "text"
+                    },
+                    "controlledBy": {
+                      "type": "text"
+                    },
+                    "disabled": {
+                      "type": "boolean"
+                    },
+                    "field": {
+                      "type": "text"
+                    },
+                    "formattedValue": {
+                      "type": "text"
+                    },
+                    "index": {
+                      "type": "keyword"
+                    },
+                    "key": {
+                      "type": "keyword"
+                    },
+                    "negate": {
+                      "type": "boolean"
+                    },
+                    "params": {
+                      "type": "text"
+                    },
+                    "type": {
+                      "type": "keyword"
+                    },
+                    "value": {
+                      "type": "text"
+                    }
+                  }
+                },
+                "missing": {
+                  "type": "text"
+                },
+                "query": {
+                  "type": "text"
+                },
+                "range": {
+                  "type": "text"
+                },
+                "script": {
+                  "type": "text"
+                }
+              }
+            },
+            "kqlMode": {
+              "type": "keyword"
+            },
+            "kqlQuery": {
+              "properties": {
+                "filterQuery": {
+                  "properties": {
+                    "kuery": {
+                      "properties": {
+                        "expression": {
+                          "type": "text"
+                        },
+                        "kind": {
+                          "type": "keyword"
+                        }
+                      }
+                    },
+                    "serializedQuery": {
+                      "type": "text"
+                    }
+                  }
+                }
+              }
+            },
+            "savedQueryId": {
+              "type": "keyword"
+            },
+            "sort": {
+              "properties": {
+                "columnId": {
+                  "type": "keyword"
+                },
+                "sortDirection": {
+                  "type": "keyword"
+                }
+              }
+            },
+            "title": {
+              "type": "text"
+            },
+            "updated": {
+              "type": "date"
+            },
+            "updatedBy": {
+              "type": "text"
+            }
+          }
+        },
+        "siem-ui-timeline-note": {
+          "properties": {
+            "created": {
+              "type": "date"
+            },
+            "createdBy": {
+              "type": "text"
+            },
+            "eventId": {
+              "type": "keyword"
+            },
+            "note": {
+              "type": "text"
+            },
+            "timelineId": {
+              "type": "keyword"
+            },
+            "updated": {
+              "type": "date"
+            },
+            "updatedBy": {
+              "type": "text"
+            }
+          }
+        },
+        "siem-ui-timeline-pinned-event": {
+          "properties": {
+            "created": {
+              "type": "date"
+            },
+            "createdBy": {
+              "type": "text"
+            },
+            "eventId": {
+              "type": "keyword"
+            },
+            "timelineId": {
+              "type": "keyword"
+            },
+            "updated": {
+              "type": "date"
+            },
+            "updatedBy": {
+              "type": "text"
+            }
+          }
+        },
+        "space": {
+          "properties": {
+            "_reserved": {
+              "type": "boolean"
+            },
+            "color": {
+              "type": "keyword"
+            },
+            "description": {
+              "type": "text"
+            },
+            "disabledFeatures": {
+              "type": "keyword"
+            },
+            "imageUrl": {
+              "index": false,
+              "type": "text"
+            },
+            "initials": {
+              "type": "keyword"
+            },
+            "name": {
+              "fields": {
+                "keyword": {
+                  "ignore_above": 2048,
+                  "type": "keyword"
+                }
+              },
+              "type": "text"
+            }
+          }
+        },
+        "spaceId": {
+          "type": "keyword"
+        },
+        "telemetry": {
+          "properties": {
+            "enabled": {
+              "type": "boolean"
+            },
+            "lastReported": {
+              "type": "date"
+            },
+            "lastVersionChecked": {
+              "type": "keyword"
+            },
+            "reportFailureCount": {
+              "type": "integer"
+            },
+            "reportFailureVersion": {
+              "type": "keyword"
+            },
+            "sendUsageFrom": {
+              "type": "keyword"
+            },
+            "userHasSeenNotice": {
+              "type": "boolean"
+            }
+          }
+        },
+        "timelion-sheet": {
+          "properties": {
+            "description": {
+              "type": "text"
+            },
+            "hits": {
+              "type": "integer"
+            },
+            "kibanaSavedObjectMeta": {
+              "properties": {
+                "searchSourceJSON": {
+                  "type": "text"
+                }
+              }
+            },
+            "timelion_chart_height": {
+              "type": "integer"
+            },
+            "timelion_columns": {
+              "type": "integer"
+            },
+            "timelion_interval": {
+              "type": "keyword"
+            },
+            "timelion_other_interval": {
+              "type": "keyword"
+            },
+            "timelion_rows": {
+              "type": "integer"
+            },
+            "timelion_sheet": {
+              "type": "text"
+            },
+            "title": {
+              "type": "text"
+            },
+            "version": {
+              "type": "integer"
+            }
+          }
+        },
+        "tsvb-validation-telemetry": {
+          "properties": {
+            "failedRequests": {
+              "type": "long"
+            }
+          }
+        },
+        "type": {
+          "type": "keyword"
+        },
+        "ui-metric": {
+          "properties": {
+            "count": {
+              "type": "integer"
+            }
+          }
+        },
+        "updated_at": {
+          "type": "date"
+        },
+        "upgrade-assistant-reindex-operation": {
+          "dynamic": "true",
+          "properties": {
+            "indexName": {
+              "type": "keyword"
+            },
+            "status": {
+              "type": "integer"
+            }
+          }
+        },
+        "upgrade-assistant-telemetry": {
+          "properties": {
+            "features": {
+              "properties": {
+                "deprecation_logging": {
+                  "properties": {
+                    "enabled": {
+                      "null_value": true,
+                      "type": "boolean"
+                    }
+                  }
+                }
+              }
+            },
+            "ui_open": {
+              "properties": {
+                "cluster": {
+                  "null_value": 0,
+                  "type": "long"
+                },
+                "indices": {
+                  "null_value": 0,
+                  "type": "long"
+                },
+                "overview": {
+                  "null_value": 0,
+                  "type": "long"
+                }
+              }
+            },
+            "ui_reindex": {
+              "properties": {
+                "close": {
+                  "null_value": 0,
+                  "type": "long"
+                },
+                "open": {
+                  "null_value": 0,
+                  "type": "long"
+                },
+                "start": {
+                  "null_value": 0,
+                  "type": "long"
+                },
+                "stop": {
+                  "null_value": 0,
+                  "type": "long"
+                }
+              }
+            }
+          }
+        },
+        "uptime-dynamic-settings": {
+          "properties": {
+            "heartbeatIndices": {
+              "type": "keyword"
+            }
+          }
+        },
+        "url": {
+          "properties": {
+            "accessCount": {
+              "type": "long"
+            },
+            "accessDate": {
+              "type": "date"
+            },
+            "createDate": {
+              "type": "date"
+            },
+            "url": {
+              "fields": {
+                "keyword": {
+                  "ignore_above": 2048,
+                  "type": "keyword"
+                }
+              },
+              "type": "text"
+            }
+          }
+        },
+        "visualization": {
+          "properties": {
+            "description": {
+              "type": "text"
+            },
+            "kibanaSavedObjectMeta": {
+              "properties": {
+                "searchSourceJSON": {
+                  "type": "text"
+                }
+              }
+            },
+            "savedSearchRefName": {
+              "type": "keyword"
+            },
+            "title": {
+              "type": "text"
+            },
+            "uiStateJSON": {
+              "type": "text"
+            },
+            "version": {
+              "type": "integer"
+            },
+            "visState": {
+              "type": "text"
+            }
+          }
+        }
+      }
+    },
+    "settings": {
+      "index": {
+        "auto_expand_replicas": "0-1",
+        "number_of_replicas": "0",
+        "number_of_shards": "1"
+      }
+    }
+  }
+}
+
+{
+  "type": "index",
+  "value": {
+    "aliases": {
+      ".siem-signals-default": {
+        "is_write_index": true
+      }
+    },
+    "index": ".siem-signals-default-000001",
+    "mappings": {
+      "dynamic": "false",
+      "properties": {
+        "@timestamp": {
+          "type": "date"
+        },
+        "agent": {
+          "properties": {
+            "ephemeral_id": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "id": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "name": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "type": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "version": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "as": {
+          "properties": {
+            "number": {
+              "type": "long"
+            },
+            "organization": {
+              "properties": {
+                "name": {
+                  "fields": {
+                    "text": {
+                      "norms": false,
+                      "type": "text"
+                    }
+                  },
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            }
+          }
+        },
+        "client": {
+          "properties": {
+            "address": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "as": {
+              "properties": {
+                "number": {
+                  "type": "long"
+                },
+                "organization": {
+                  "properties": {
+                    "name": {
+                      "fields": {
+                        "text": {
+                          "norms": false,
+                          "type": "text"
+                        }
+                      },
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                }
+              }
+            },
+            "bytes": {
+              "type": "long"
+            },
+            "domain": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "geo": {
+              "properties": {
+                "city_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "continent_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "country_iso_code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "country_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "location": {
+                  "type": "geo_point"
+                },
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "region_iso_code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "region_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "ip": {
+              "type": "ip"
+            },
+            "mac": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "nat": {
+              "properties": {
+                "ip": {
+                  "type": "ip"
+                },
+                "port": {
+                  "type": "long"
+                }
+              }
+            },
+            "packets": {
+              "type": "long"
+            },
+            "port": {
+              "type": "long"
+            },
+            "registered_domain": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "top_level_domain": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "user": {
+              "properties": {
+                "domain": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "email": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "full_name": {
+                  "fields": {
+                    "text": {
+                      "norms": false,
+                      "type": "text"
+                    }
+                  },
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "group": {
+                  "properties": {
+                    "domain": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "id": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "name": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "hash": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "name": {
+                  "fields": {
+                    "text": {
+                      "norms": false,
+                      "type": "text"
+                    }
+                  },
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            }
+          }
+        },
+        "cloud": {
+          "properties": {
+            "account": {
+              "properties": {
+                "id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "availability_zone": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "instance": {
+              "properties": {
+                "id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "machine": {
+              "properties": {
+                "type": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "provider": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "region": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "container": {
+          "properties": {
+            "id": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "image": {
+              "properties": {
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "tag": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "labels": {
+              "type": "object"
+            },
+            "name": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "runtime": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "destination": {
+          "properties": {
+            "address": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "as": {
+              "properties": {
+                "number": {
+                  "type": "long"
+                },
+                "organization": {
+                  "properties": {
+                    "name": {
+                      "fields": {
+                        "text": {
+                          "norms": false,
+                          "type": "text"
+                        }
+                      },
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                }
+              }
+            },
+            "bytes": {
+              "type": "long"
+            },
+            "domain": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "geo": {
+              "properties": {
+                "city_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "continent_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "country_iso_code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "country_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "location": {
+                  "type": "geo_point"
+                },
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "region_iso_code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "region_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "ip": {
+              "type": "ip"
+            },
+            "mac": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "nat": {
+              "properties": {
+                "ip": {
+                  "type": "ip"
+                },
+                "port": {
+                  "type": "long"
+                }
+              }
+            },
+            "packets": {
+              "type": "long"
+            },
+            "port": {
+              "type": "long"
+            },
+            "registered_domain": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "top_level_domain": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "user": {
+              "properties": {
+                "domain": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "email": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "full_name": {
+                  "fields": {
+                    "text": {
+                      "norms": false,
+                      "type": "text"
+                    }
+                  },
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "group": {
+                  "properties": {
+                    "domain": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "id": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "name": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "hash": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "name": {
+                  "fields": {
+                    "text": {
+                      "norms": false,
+                      "type": "text"
+                    }
+                  },
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            }
+          }
+        },
+        "dns": {
+          "properties": {
+            "answers": {
+              "properties": {
+                "class": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "data": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "ttl": {
+                  "type": "long"
+                },
+                "type": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "header_flags": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "id": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "op_code": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "question": {
+              "properties": {
+                "class": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "registered_domain": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "subdomain": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "top_level_domain": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "type": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "resolved_ip": {
+              "type": "ip"
+            },
+            "response_code": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "type": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "ecs": {
+          "properties": {
+            "version": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "error": {
+          "properties": {
+            "code": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "id": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "message": {
+              "norms": false,
+              "type": "text"
+            },
+            "stack_trace": {
+              "doc_values": false,
+              "fields": {
+                "text": {
+                  "norms": false,
+                  "type": "text"
+                }
+              },
+              "ignore_above": 1024,
+              "index": false,
+              "type": "keyword"
+            },
+            "type": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "event": {
+          "properties": {
+            "action": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "category": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "code": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "created": {
+              "type": "date"
+            },
+            "dataset": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "duration": {
+              "type": "long"
+            },
+            "end": {
+              "type": "date"
+            },
+            "hash": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "id": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "ingested": {
+              "type": "date"
+            },
+            "kind": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "module": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "original": {
+              "doc_values": false,
+              "ignore_above": 1024,
+              "index": false,
+              "type": "keyword"
+            },
+            "outcome": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "provider": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "risk_score": {
+              "type": "float"
+            },
+            "risk_score_norm": {
+              "type": "float"
+            },
+            "sequence": {
+              "type": "long"
+            },
+            "severity": {
+              "type": "long"
+            },
+            "start": {
+              "type": "date"
+            },
+            "timezone": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "type": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "file": {
+          "properties": {
+            "accessed": {
+              "type": "date"
+            },
+            "attributes": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "created": {
+              "type": "date"
+            },
+            "ctime": {
+              "type": "date"
+            },
+            "device": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "directory": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "drive_letter": {
+              "ignore_above": 1,
+              "type": "keyword"
+            },
+            "extension": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "gid": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "group": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "hash": {
+              "properties": {
+                "md5": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "sha1": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "sha256": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "sha512": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "inode": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "mode": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "mtime": {
+              "type": "date"
+            },
+            "name": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "owner": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "path": {
+              "fields": {
+                "text": {
+                  "norms": false,
+                  "type": "text"
+                }
+              },
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "size": {
+              "type": "long"
+            },
+            "target_path": {
+              "fields": {
+                "text": {
+                  "norms": false,
+                  "type": "text"
+                }
+              },
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "type": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "uid": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "geo": {
+          "properties": {
+            "city_name": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "continent_name": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "country_iso_code": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "country_name": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "location": {
+              "type": "geo_point"
+            },
+            "name": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "region_iso_code": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "region_name": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "group": {
+          "properties": {
+            "domain": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "id": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "name": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "hash": {
+          "properties": {
+            "md5": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "sha1": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "sha256": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "sha512": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "host": {
+          "properties": {
+            "architecture": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "domain": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "geo": {
+              "properties": {
+                "city_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "continent_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "country_iso_code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "country_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "location": {
+                  "type": "geo_point"
+                },
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "region_iso_code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "region_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "hostname": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "id": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "ip": {
+              "type": "ip"
+            },
+            "mac": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "name": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "os": {
+              "properties": {
+                "family": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "full": {
+                  "fields": {
+                    "text": {
+                      "norms": false,
+                      "type": "text"
+                    }
+                  },
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "kernel": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "name": {
+                  "fields": {
+                    "text": {
+                      "norms": false,
+                      "type": "text"
+                    }
+                  },
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "platform": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "version": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "type": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "uptime": {
+              "type": "long"
+            },
+            "user": {
+              "properties": {
+                "domain": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "email": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "full_name": {
+                  "fields": {
+                    "text": {
+                      "norms": false,
+                      "type": "text"
+                    }
+                  },
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "group": {
+                  "properties": {
+                    "domain": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "id": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "name": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "hash": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "name": {
+                  "fields": {
+                    "text": {
+                      "norms": false,
+                      "type": "text"
+                    }
+                  },
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            }
+          }
+        },
+        "http": {
+          "properties": {
+            "request": {
+              "properties": {
+                "body": {
+                  "properties": {
+                    "bytes": {
+                      "type": "long"
+                    },
+                    "content": {
+                      "fields": {
+                        "text": {
+                          "norms": false,
+                          "type": "text"
+                        }
+                      },
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "bytes": {
+                  "type": "long"
+                },
+                "method": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "referrer": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "response": {
+              "properties": {
+                "body": {
+                  "properties": {
+                    "bytes": {
+                      "type": "long"
+                    },
+                    "content": {
+                      "fields": {
+                        "text": {
+                          "norms": false,
+                          "type": "text"
+                        }
+                      },
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "bytes": {
+                  "type": "long"
+                },
+                "status_code": {
+                  "type": "long"
+                }
+              }
+            },
+            "version": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "labels": {
+          "type": "object"
+        },
+        "log": {
+          "properties": {
+            "level": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "logger": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "origin": {
+              "properties": {
+                "file": {
+                  "properties": {
+                    "line": {
+                      "type": "integer"
+                    },
+                    "name": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "function": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "original": {
+              "doc_values": false,
+              "ignore_above": 1024,
+              "index": false,
+              "type": "keyword"
+            },
+            "syslog": {
+              "properties": {
+                "facility": {
+                  "properties": {
+                    "code": {
+                      "type": "long"
+                    },
+                    "name": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "priority": {
+                  "type": "long"
+                },
+                "severity": {
+                  "properties": {
+                    "code": {
+                      "type": "long"
+                    },
+                    "name": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                }
+              }
+            }
+          }
+        },
+        "message": {
+          "norms": false,
+          "type": "text"
+        },
+        "network": {
+          "properties": {
+            "application": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "bytes": {
+              "type": "long"
+            },
+            "community_id": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "direction": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "forwarded_ip": {
+              "type": "ip"
+            },
+            "iana_number": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "name": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "packets": {
+              "type": "long"
+            },
+            "protocol": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "transport": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "type": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "observer": {
+          "properties": {
+            "geo": {
+              "properties": {
+                "city_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "continent_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "country_iso_code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "country_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "location": {
+                  "type": "geo_point"
+                },
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "region_iso_code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "region_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "hostname": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "ip": {
+              "type": "ip"
+            },
+            "mac": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "name": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "os": {
+              "properties": {
+                "family": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "full": {
+                  "fields": {
+                    "text": {
+                      "norms": false,
+                      "type": "text"
+                    }
+                  },
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "kernel": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "name": {
+                  "fields": {
+                    "text": {
+                      "norms": false,
+                      "type": "text"
+                    }
+                  },
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "platform": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "version": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "product": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "serial_number": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "type": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "vendor": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "version": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "organization": {
+          "properties": {
+            "id": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "name": {
+              "fields": {
+                "text": {
+                  "norms": false,
+                  "type": "text"
+                }
+              },
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "os": {
+          "properties": {
+            "family": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "full": {
+              "fields": {
+                "text": {
+                  "norms": false,
+                  "type": "text"
+                }
+              },
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "kernel": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "name": {
+              "fields": {
+                "text": {
+                  "norms": false,
+                  "type": "text"
+                }
+              },
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "platform": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "version": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "package": {
+          "properties": {
+            "architecture": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "build_version": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "checksum": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "description": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "install_scope": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "installed": {
+              "type": "date"
+            },
+            "license": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "name": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "path": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "reference": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "size": {
+              "type": "long"
+            },
+            "type": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "version": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "process": {
+          "properties": {
+            "args": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "args_count": {
+              "type": "long"
+            },
+            "command_line": {
+              "fields": {
+                "text": {
+                  "norms": false,
+                  "type": "text"
+                }
+              },
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "executable": {
+              "fields": {
+                "text": {
+                  "norms": false,
+                  "type": "text"
+                }
+              },
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "exit_code": {
+              "type": "long"
+            },
+            "hash": {
+              "properties": {
+                "md5": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "sha1": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "sha256": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "sha512": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "name": {
+              "fields": {
+                "text": {
+                  "norms": false,
+                  "type": "text"
+                }
+              },
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "parent": {
+              "properties": {
+                "args": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "args_count": {
+                  "type": "long"
+                },
+                "command_line": {
+                  "fields": {
+                    "text": {
+                      "norms": false,
+                      "type": "text"
+                    }
+                  },
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "executable": {
+                  "fields": {
+                    "text": {
+                      "norms": false,
+                      "type": "text"
+                    }
+                  },
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "exit_code": {
+                  "type": "long"
+                },
+                "name": {
+                  "fields": {
+                    "text": {
+                      "norms": false,
+                      "type": "text"
+                    }
+                  },
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "pgid": {
+                  "type": "long"
+                },
+                "pid": {
+                  "type": "long"
+                },
+                "ppid": {
+                  "type": "long"
+                },
+                "start": {
+                  "type": "date"
+                },
+                "thread": {
+                  "properties": {
+                    "id": {
+                      "type": "long"
+                    },
+                    "name": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "title": {
+                  "fields": {
+                    "text": {
+                      "norms": false,
+                      "type": "text"
+                    }
+                  },
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "uptime": {
+                  "type": "long"
+                },
+                "working_directory": {
+                  "fields": {
+                    "text": {
+                      "norms": false,
+                      "type": "text"
+                    }
+                  },
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "pgid": {
+              "type": "long"
+            },
+            "pid": {
+              "type": "long"
+            },
+            "ppid": {
+              "type": "long"
+            },
+            "start": {
+              "type": "date"
+            },
+            "thread": {
+              "properties": {
+                "id": {
+                  "type": "long"
+                },
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "title": {
+              "fields": {
+                "text": {
+                  "norms": false,
+                  "type": "text"
+                }
+              },
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "uptime": {
+              "type": "long"
+            },
+            "working_directory": {
+              "fields": {
+                "text": {
+                  "norms": false,
+                  "type": "text"
+                }
+              },
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "registry": {
+          "properties": {
+            "data": {
+              "properties": {
+                "bytes": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "strings": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "type": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "hive": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "key": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "path": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "value": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "related": {
+          "properties": {
+            "hash": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "ip": {
+              "type": "ip"
+            },
+            "user": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "rule": {
+          "properties": {
+            "category": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "description": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "id": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "name": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "reference": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "ruleset": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "uuid": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "version": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "server": {
+          "properties": {
+            "address": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "as": {
+              "properties": {
+                "number": {
+                  "type": "long"
+                },
+                "organization": {
+                  "properties": {
+                    "name": {
+                      "fields": {
+                        "text": {
+                          "norms": false,
+                          "type": "text"
+                        }
+                      },
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                }
+              }
+            },
+            "bytes": {
+              "type": "long"
+            },
+            "domain": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "geo": {
+              "properties": {
+                "city_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "continent_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "country_iso_code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "country_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "location": {
+                  "type": "geo_point"
+                },
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "region_iso_code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "region_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "ip": {
+              "type": "ip"
+            },
+            "mac": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "nat": {
+              "properties": {
+                "ip": {
+                  "type": "ip"
+                },
+                "port": {
+                  "type": "long"
+                }
+              }
+            },
+            "packets": {
+              "type": "long"
+            },
+            "port": {
+              "type": "long"
+            },
+            "registered_domain": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "top_level_domain": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "user": {
+              "properties": {
+                "domain": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "email": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "full_name": {
+                  "fields": {
+                    "text": {
+                      "norms": false,
+                      "type": "text"
+                    }
+                  },
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "group": {
+                  "properties": {
+                    "domain": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "id": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "name": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "hash": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "name": {
+                  "fields": {
+                    "text": {
+                      "norms": false,
+                      "type": "text"
+                    }
+                  },
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            }
+          }
+        },
+        "service": {
+          "properties": {
+            "ephemeral_id": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "id": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "name": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "node": {
+              "properties": {
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "state": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "type": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "version": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "signal": {
+          "properties": {
+            "ancestors": {
+              "properties": {
+                "depth": {
+                  "type": "long"
+                },
+                "id": {
+                  "type": "keyword"
+                },
+                "rule": {
+                  "type": "keyword"
+                },
+                "type": {
+                  "type": "keyword"
+                }
+              }
+            },
+            "original_event": {
+              "properties": {
+                "action": {
+                  "type": "keyword"
+                },
+                "category": {
+                  "type": "keyword"
+                },
+                "code": {
+                  "type": "keyword"
+                },
+                "created": {
+                  "type": "date"
+                },
+                "dataset": {
+                  "type": "keyword"
+                },
+                "duration": {
+                  "type": "long"
+                },
+                "end": {
+                  "type": "date"
+                },
+                "hash": {
+                  "type": "keyword"
+                },
+                "id": {
+                  "type": "keyword"
+                },
+                "kind": {
+                  "type": "keyword"
+                },
+                "module": {
+                  "type": "keyword"
+                },
+                "original": {
+                  "doc_values": false,
+                  "index": false,
+                  "type": "keyword"
+                },
+                "outcome": {
+                  "type": "keyword"
+                },
+                "provider": {
+                  "type": "keyword"
+                },
+                "risk_score": {
+                  "type": "float"
+                },
+                "risk_score_norm": {
+                  "type": "float"
+                },
+                "sequence": {
+                  "type": "long"
+                },
+                "severity": {
+                  "type": "long"
+                },
+                "start": {
+                  "type": "date"
+                },
+                "timezone": {
+                  "type": "keyword"
+                },
+                "type": {
+                  "type": "keyword"
+                }
+              }
+            },
+            "original_time": {
+              "type": "date"
+            },
+            "parent": {
+              "properties": {
+                "depth": {
+                  "type": "long"
+                },
+                "id": {
+                  "type": "keyword"
+                },
+                "index": {
+                  "type": "keyword"
+                },
+                "rule": {
+                  "type": "keyword"
+                },
+                "type": {
+                  "type": "keyword"
+                }
+              }
+            },
+            "rule": {
+              "properties": {
+                "created_at": {
+                  "type": "date"
+                },
+                "created_by": {
+                  "type": "keyword"
+                },
+                "description": {
+                  "type": "keyword"
+                },
+                "enabled": {
+                  "type": "keyword"
+                },
+                "false_positives": {
+                  "type": "keyword"
+                },
+                "filters": {
+                  "type": "object"
+                },
+                "from": {
+                  "type": "keyword"
+                },
+                "id": {
+                  "type": "keyword"
+                },
+                "immutable": {
+                  "type": "keyword"
+                },
+                "index": {
+                  "type": "keyword"
+                },
+                "interval": {
+                  "type": "keyword"
+                },
+                "language": {
+                  "type": "keyword"
+                },
+                "max_signals": {
+                  "type": "keyword"
+                },
+                "name": {
+                  "type": "keyword"
+                },
+                "note": {
+                  "type": "text"
+                },
+                "output_index": {
+                  "type": "keyword"
+                },
+                "query": {
+                  "type": "keyword"
+                },
+                "references": {
+                  "type": "keyword"
+                },
+                "risk_score": {
+                  "type": "keyword"
+                },
+                "rule_id": {
+                  "type": "keyword"
+                },
+                "saved_id": {
+                  "type": "keyword"
+                },
+                "severity": {
+                  "type": "keyword"
+                },
+                "size": {
+                  "type": "keyword"
+                },
+                "tags": {
+                  "type": "keyword"
+                },
+                "threat": {
+                  "properties": {
+                    "framework": {
+                      "type": "keyword"
+                    },
+                    "tactic": {
+                      "properties": {
+                        "id": {
+                          "type": "keyword"
+                        },
+                        "name": {
+                          "type": "keyword"
+                        },
+                        "reference": {
+                          "type": "keyword"
+                        }
+                      }
+                    },
+                    "technique": {
+                      "properties": {
+                        "id": {
+                          "type": "keyword"
+                        },
+                        "name": {
+                          "type": "keyword"
+                        },
+                        "reference": {
+                          "type": "keyword"
+                        }
+                      }
+                    }
+                  }
+                },
+                "timeline_id": {
+                  "type": "keyword"
+                },
+                "timeline_title": {
+                  "type": "keyword"
+                },
+                "to": {
+                  "type": "keyword"
+                },
+                "type": {
+                  "type": "keyword"
+                },
+                "updated_at": {
+                  "type": "date"
+                },
+                "updated_by": {
+                  "type": "keyword"
+                },
+                "version": {
+                  "type": "keyword"
+                }
+              }
+            },
+            "status": {
+              "type": "keyword"
+            }
+          }
+        },
+        "source": {
+          "properties": {
+            "address": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "as": {
+              "properties": {
+                "number": {
+                  "type": "long"
+                },
+                "organization": {
+                  "properties": {
+                    "name": {
+                      "fields": {
+                        "text": {
+                          "norms": false,
+                          "type": "text"
+                        }
+                      },
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                }
+              }
+            },
+            "bytes": {
+              "type": "long"
+            },
+            "domain": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "geo": {
+              "properties": {
+                "city_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "continent_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "country_iso_code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "country_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "location": {
+                  "type": "geo_point"
+                },
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "region_iso_code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "region_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "ip": {
+              "type": "ip"
+            },
+            "mac": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "nat": {
+              "properties": {
+                "ip": {
+                  "type": "ip"
+                },
+                "port": {
+                  "type": "long"
+                }
+              }
+            },
+            "packets": {
+              "type": "long"
+            },
+            "port": {
+              "type": "long"
+            },
+            "registered_domain": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "top_level_domain": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "user": {
+              "properties": {
+                "domain": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "email": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "full_name": {
+                  "fields": {
+                    "text": {
+                      "norms": false,
+                      "type": "text"
+                    }
+                  },
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "group": {
+                  "properties": {
+                    "domain": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "id": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "name": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "hash": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "name": {
+                  "fields": {
+                    "text": {
+                      "norms": false,
+                      "type": "text"
+                    }
+                  },
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            }
+          }
+        },
+        "tags": {
+          "ignore_above": 1024,
+          "type": "keyword"
+        },
+        "threat": {
+          "properties": {
+            "framework": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "tactic": {
+              "properties": {
+                "id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "reference": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "technique": {
+              "properties": {
+                "id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "name": {
+                  "fields": {
+                    "text": {
+                      "norms": false,
+                      "type": "text"
+                    }
+                  },
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "reference": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            }
+          }
+        },
+        "tls": {
+          "properties": {
+            "cipher": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "client": {
+              "properties": {
+                "certificate": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "certificate_chain": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "hash": {
+                  "properties": {
+                    "md5": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "sha1": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "sha256": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "issuer": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "ja3": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "not_after": {
+                  "type": "date"
+                },
+                "not_before": {
+                  "type": "date"
+                },
+                "server_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "subject": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "supported_ciphers": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "curve": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "established": {
+              "type": "boolean"
+            },
+            "next_protocol": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "resumed": {
+              "type": "boolean"
+            },
+            "server": {
+              "properties": {
+                "certificate": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "certificate_chain": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "hash": {
+                  "properties": {
+                    "md5": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "sha1": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "sha256": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "issuer": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "ja3s": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "not_after": {
+                  "type": "date"
+                },
+                "not_before": {
+                  "type": "date"
+                },
+                "subject": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "version": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "version_protocol": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "trace": {
+          "properties": {
+            "id": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "transaction": {
+          "properties": {
+            "id": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "url": {
+          "properties": {
+            "domain": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "extension": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "fragment": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "full": {
+              "fields": {
+                "text": {
+                  "norms": false,
+                  "type": "text"
+                }
+              },
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "original": {
+              "fields": {
+                "text": {
+                  "norms": false,
+                  "type": "text"
+                }
+              },
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "password": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "path": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "port": {
+              "type": "long"
+            },
+            "query": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "registered_domain": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "scheme": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "top_level_domain": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "username": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "user": {
+          "properties": {
+            "domain": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "email": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "full_name": {
+              "fields": {
+                "text": {
+                  "norms": false,
+                  "type": "text"
+                }
+              },
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "group": {
+              "properties": {
+                "domain": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "hash": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "id": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "name": {
+              "fields": {
+                "text": {
+                  "norms": false,
+                  "type": "text"
+                }
+              },
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "user_agent": {
+          "properties": {
+            "device": {
+              "properties": {
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "name": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "original": {
+              "fields": {
+                "text": {
+                  "norms": false,
+                  "type": "text"
+                }
+              },
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "os": {
+              "properties": {
+                "family": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "full": {
+                  "fields": {
+                    "text": {
+                      "norms": false,
+                      "type": "text"
+                    }
+                  },
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "kernel": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "name": {
+                  "fields": {
+                    "text": {
+                      "norms": false,
+                      "type": "text"
+                    }
+                  },
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "platform": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "version": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "version": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "vulnerability": {
+          "properties": {
+            "category": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "classification": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "description": {
+              "fields": {
+                "text": {
+                  "norms": false,
+                  "type": "text"
+                }
+              },
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "enumeration": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "id": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "reference": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "report_id": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "scanner": {
+              "properties": {
+                "vendor": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "score": {
+              "properties": {
+                "base": {
+                  "type": "float"
+                },
+                "environmental": {
+                  "type": "float"
+                },
+                "temporal": {
+                  "type": "float"
+                },
+                "version": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "severity": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        }
+      }
+    },
+    "settings": {
+      "index": {
+        "lifecycle": {
+          "name": ".siem-signals-default",
+          "rollover_alias": ".siem-signals-default"
+        },
+        "number_of_replicas": "1",
+        "number_of_shards": "1"
+      }
+    }
+  }
+}
\ No newline at end of file

From f28a0fe9176bc7298effe2f24b1bb232dafd8e3d Mon Sep 17 00:00:00 2001
From: Sandra Gonzales <neptunian@users.noreply.github.com>
Date: Wed, 25 Mar 2020 06:35:19 -0400
Subject: [PATCH 133/179] [EPM] fix fetchFindLatestPackage to return latest
 package (#61107)

* get latest package instead of oldest

* sort by version becasue registry does not

* fix type

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 .../ingest_manager/server/services/epm/registry/index.ts   | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/x-pack/plugins/ingest_manager/server/services/epm/registry/index.ts b/x-pack/plugins/ingest_manager/server/services/epm/registry/index.ts
index ba4b3135aac1d..7c315f7616e1f 100644
--- a/x-pack/plugins/ingest_manager/server/services/epm/registry/index.ts
+++ b/x-pack/plugins/ingest_manager/server/services/epm/registry/index.ts
@@ -6,6 +6,7 @@
 
 import { Response } from 'node-fetch';
 import { URL } from 'url';
+import { sortBy } from 'lodash';
 import {
   AssetParts,
   AssetsGroupedByServiceByType,
@@ -50,7 +51,11 @@ export async function fetchFindLatestPackage(
   const res = await fetchUrl(url.toString());
   const searchResults = JSON.parse(res);
   if (searchResults.length) {
-    return searchResults[0];
+    // sort by version, then get the last (most recent)
+    const latestPackage = sortBy<string[], RegistrySearchResult>(searchResults, ['version'])[
+      searchResults.length - 1
+    ];
+    return latestPackage;
   } else {
     throw new Error('package not found');
   }

From 2ae1235456f768af6410a0d35cc8db9c7b422465 Mon Sep 17 00:00:00 2001
From: James Gowdy <jgowdy@elastic.co>
Date: Wed, 25 Mar 2020 10:39:13 +0000
Subject: [PATCH 134/179] [ML] Disabling start trial option when license
 management ui is disabled (#60987)

* [ML] Disabling start trial option when license management ui is disabled

* tiny refactor

* changes based on review
---
 .../license_management/public/index.ts        |  2 +-
 .../license_management/public/plugin.ts       | 20 +++++++++++++++----
 x-pack/plugins/ml/kibana.json                 |  3 ++-
 x-pack/plugins/ml/public/application/app.tsx  |  1 +
 .../contexts/kibana/kibana_context.ts         |  2 ++
 .../datavisualizer_selector.tsx               | 10 ++++++++--
 x-pack/plugins/ml/public/plugin.ts            |  3 +++
 7 files changed, 33 insertions(+), 8 deletions(-)

diff --git a/x-pack/plugins/license_management/public/index.ts b/x-pack/plugins/license_management/public/index.ts
index 3c76549ebdc16..99f715f9718f6 100644
--- a/x-pack/plugins/license_management/public/index.ts
+++ b/x-pack/plugins/license_management/public/index.ts
@@ -4,8 +4,8 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 import { PluginInitializerContext } from 'src/core/public';
-
 import { LicenseManagementUIPlugin } from './plugin';
 import './application/index.scss';
 
+export { LicenseManagementUIPluginSetup, LicenseManagementUIPluginStart } from './plugin';
 export const plugin = (ctx: PluginInitializerContext) => new LicenseManagementUIPlugin(ctx);
diff --git a/x-pack/plugins/license_management/public/plugin.ts b/x-pack/plugins/license_management/public/plugin.ts
index 00d353bc97e04..1d309f229cb8b 100644
--- a/x-pack/plugins/license_management/public/plugin.ts
+++ b/x-pack/plugins/license_management/public/plugin.ts
@@ -20,17 +20,25 @@ interface PluginsDependencies {
   telemetry?: TelemetryPluginSetup;
 }
 
-export class LicenseManagementUIPlugin implements Plugin<void, void, any, any> {
+export interface LicenseManagementUIPluginSetup {
+  enabled: boolean;
+}
+export type LicenseManagementUIPluginStart = void;
+
+export class LicenseManagementUIPlugin
+  implements Plugin<LicenseManagementUIPluginSetup, LicenseManagementUIPluginStart, any, any> {
   private breadcrumbService = new BreadcrumbService();
 
   constructor(private readonly initializerContext: PluginInitializerContext) {}
 
-  setup(coreSetup: CoreSetup, plugins: PluginsDependencies) {
+  setup(coreSetup: CoreSetup, plugins: PluginsDependencies): LicenseManagementUIPluginSetup {
     const config = this.initializerContext.config.get<ClientConfigType>();
 
     if (!config.ui.enabled) {
       // No need to go any further
-      return;
+      return {
+        enabled: false,
+      };
     }
 
     const { getStartServices } = coreSetup;
@@ -76,8 +84,12 @@ export class LicenseManagementUIPlugin implements Plugin<void, void, any, any> {
         return renderApp(element, appDependencies);
       },
     });
+
+    return {
+      enabled: true,
+    };
   }
 
-  start() {}
+  start(): LicenseManagementUIPluginStart {}
   stop() {}
 }
diff --git a/x-pack/plugins/ml/kibana.json b/x-pack/plugins/ml/kibana.json
index b6db289f4be6d..038f61b3a33b7 100644
--- a/x-pack/plugins/ml/kibana.json
+++ b/x-pack/plugins/ml/kibana.json
@@ -18,7 +18,8 @@
   "optionalPlugins": [
     "security",
     "spaces",
-    "management"
+    "management",
+    "licenseManagement"
   ],
   "server": true,
   "ui": true
diff --git a/x-pack/plugins/ml/public/application/app.tsx b/x-pack/plugins/ml/public/application/app.tsx
index 8c3e0c066f411..e9796fcbb0fe4 100644
--- a/x-pack/plugins/ml/public/application/app.tsx
+++ b/x-pack/plugins/ml/public/application/app.tsx
@@ -37,6 +37,7 @@ const App: FC<AppProps> = ({ coreStart, deps }) => {
     appName: 'ML',
     data: deps.data,
     security: deps.security,
+    licenseManagement: deps.licenseManagement,
     storage: localStorage,
     ...coreStart,
   };
diff --git a/x-pack/plugins/ml/public/application/contexts/kibana/kibana_context.ts b/x-pack/plugins/ml/public/application/contexts/kibana/kibana_context.ts
index d2615e8174dd1..475e44af3669c 100644
--- a/x-pack/plugins/ml/public/application/contexts/kibana/kibana_context.ts
+++ b/x-pack/plugins/ml/public/application/contexts/kibana/kibana_context.ts
@@ -11,10 +11,12 @@ import {
   KibanaReactContextValue,
 } from '../../../../../../../src/plugins/kibana_react/public';
 import { SecurityPluginSetup } from '../../../../../security/public';
+import { LicenseManagementUIPluginSetup } from '../../../../../license_management/public';
 
 interface StartPlugins {
   data: DataPublicPluginStart;
   security: SecurityPluginSetup;
+  licenseManagement?: LicenseManagementUIPluginSetup;
 }
 export type StartServices = CoreStart & StartPlugins;
 // eslint-disable-next-line react-hooks/rules-of-hooks
diff --git a/x-pack/plugins/ml/public/application/datavisualizer/datavisualizer_selector.tsx b/x-pack/plugins/ml/public/application/datavisualizer/datavisualizer_selector.tsx
index 254788c52a7a8..a8bb5a0a8fe10 100644
--- a/x-pack/plugins/ml/public/application/datavisualizer/datavisualizer_selector.tsx
+++ b/x-pack/plugins/ml/public/application/datavisualizer/datavisualizer_selector.tsx
@@ -23,7 +23,7 @@ import { i18n } from '@kbn/i18n';
 
 import { FormattedMessage } from '@kbn/i18n/react';
 import { isFullLicense } from '../license';
-import { useTimefilter } from '../contexts/kibana';
+import { useTimefilter, useMlKibana } from '../contexts/kibana';
 
 import { NavigationMenu } from '../components/navigation_menu';
 
@@ -50,8 +50,14 @@ function startTrialDescription() {
 
 export const DatavisualizerSelector: FC = () => {
   useTimefilter({ timeRangeSelector: false, autoRefreshSelector: false });
+  const {
+    services: { licenseManagement },
+  } = useMlKibana();
 
-  const startTrialVisible = isFullLicense() === false;
+  const startTrialVisible =
+    licenseManagement !== undefined &&
+    licenseManagement.enabled === true &&
+    isFullLicense() === false;
 
   return (
     <Fragment>
diff --git a/x-pack/plugins/ml/public/plugin.ts b/x-pack/plugins/ml/public/plugin.ts
index 30b7133f4147e..d4bec3d617a04 100644
--- a/x-pack/plugins/ml/public/plugin.ts
+++ b/x-pack/plugins/ml/public/plugin.ts
@@ -14,6 +14,7 @@ import { DataPublicPluginStart } from 'src/plugins/data/public';
 import { SecurityPluginSetup } from '../../security/public';
 import { LicensingPluginSetup } from '../../licensing/public';
 import { initManagementSection } from './application/management';
+import { LicenseManagementUIPluginSetup } from '../../license_management/public';
 import { setDependencyCache } from './application/util/dependency_cache';
 import { PLUGIN_ID, PLUGIN_ICON } from '../common/constants/app';
 
@@ -26,6 +27,7 @@ export interface MlSetupDependencies {
   licensing: LicensingPluginSetup;
   management: ManagementSetup;
   usageCollection: UsageCollectionSetup;
+  licenseManagement?: LicenseManagementUIPluginSetup;
 }
 
 export class MlPlugin implements Plugin<MlPluginSetup, MlPluginStart> {
@@ -50,6 +52,7 @@ export class MlPlugin implements Plugin<MlPluginSetup, MlPluginStart> {
             licensing: pluginsSetup.licensing,
             management: pluginsSetup.management,
             usageCollection: pluginsSetup.usageCollection,
+            licenseManagement: pluginsSetup.licenseManagement,
           },
           {
             element: params.element,

From ee939de3db794c002567f03eaa1d535f6e7a302f Mon Sep 17 00:00:00 2001
From: Dario Gieselaar <dario.gieselaar@elastic.co>
Date: Wed, 25 Mar 2020 12:10:56 +0100
Subject: [PATCH 135/179] [APM] Return empty object for telemetry collection on
 startup (#61164)

Closes #61154.
---
 .../apm/server/lib/apm_telemetry/index.ts     | 22 +++++++++++++------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/x-pack/plugins/apm/server/lib/apm_telemetry/index.ts b/x-pack/plugins/apm/server/lib/apm_telemetry/index.ts
index c80057a2894dc..a78b2b93a250d 100644
--- a/x-pack/plugins/apm/server/lib/apm_telemetry/index.ts
+++ b/x-pack/plugins/apm/server/lib/apm_telemetry/index.ts
@@ -96,14 +96,22 @@ export async function createApmTelemetry({
   const collector = usageCollector.makeUsageCollector({
     type: 'apm',
     fetch: async () => {
-      const data = (
-        await savedObjectsClient.get(
-          APM_TELEMETRY_SAVED_OBJECT_TYPE,
-          APM_TELEMETRY_SAVED_OBJECT_ID
-        )
-      ).attributes;
+      try {
+        const data = (
+          await savedObjectsClient.get(
+            APM_TELEMETRY_SAVED_OBJECT_TYPE,
+            APM_TELEMETRY_SAVED_OBJECT_ID
+          )
+        ).attributes;
 
-      return data;
+        return data;
+      } catch (err) {
+        if (err.output?.statusCode === 404) {
+          // task has not run yet, so no saved object to return
+          return {};
+        }
+        throw err;
+      }
     },
     isReady: () => true
   });

From 583104b50ef83241bab97815d4d6315e305690d9 Mon Sep 17 00:00:00 2001
From: James Gowdy <jgowdy@elastic.co>
Date: Wed, 25 Mar 2020 11:20:53 +0000
Subject: [PATCH 136/179] [ML] Removing assignment_explanation from cloned
 datafeed (#61224)

---
 x-pack/plugins/ml/public/application/services/job_service.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/x-pack/plugins/ml/public/application/services/job_service.js b/x-pack/plugins/ml/public/application/services/job_service.js
index e087740ec0e99..a84400f236134 100644
--- a/x-pack/plugins/ml/public/application/services/job_service.js
+++ b/x-pack/plugins/ml/public/application/services/job_service.js
@@ -383,6 +383,7 @@ class JobService {
       delete tempJob.datafeed_config.state;
       delete tempJob.datafeed_config.node;
       delete tempJob.datafeed_config.timing_stats;
+      delete tempJob.datafeed_config.assignment_explanation;
 
       // remove query_delay if it's between 60s and 120s
       // the back-end produces a random value between 60 and 120 and so

From 1b7d15cdcec071282559fed18b668aeb1131f562 Mon Sep 17 00:00:00 2001
From: nnamdifrankie <56440728+nnamdifrankie@users.noreply.github.com>
Date: Wed, 25 Mar 2020 07:39:51 -0400
Subject: [PATCH 137/179] EMT-248: renable test (#60882)

[Ingest]EMT-248: renable integration test, ran flaky test runner 100x2 and this test did not fail.
---
 .../api_integration/apis/fleet/agents/acks.ts | 23 +++++++++----------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/x-pack/test/api_integration/apis/fleet/agents/acks.ts b/x-pack/test/api_integration/apis/fleet/agents/acks.ts
index db925813b90c4..437a5b58710c1 100644
--- a/x-pack/test/api_integration/apis/fleet/agents/acks.ts
+++ b/x-pack/test/api_integration/apis/fleet/agents/acks.ts
@@ -15,11 +15,11 @@ export default function(providerContext: FtrProviderContext) {
   const esArchiver = getService('esArchiver');
   const esClient = getService('es');
 
-  const supertest = getSupertestWithoutAuth(providerContext);
+  const supertestWithoutAuth = getSupertestWithoutAuth(providerContext);
+  const supertest = getService('supertest');
   let apiKey: { id: string; api_key: string };
 
-  // FLAKY: https://github.com/elastic/kibana/issues/60471
-  describe.skip('fleet_agents_acks', () => {
+  describe('fleet_agents_acks', () => {
     before(async () => {
       await esArchiver.loadIfNeeded('fleet/agents');
 
@@ -50,7 +50,7 @@ export default function(providerContext: FtrProviderContext) {
     });
 
     it('should return a 401 if this a not a valid acks access', async () => {
-      await supertest
+      await supertestWithoutAuth
         .post(`/api/ingest_manager/fleet/agents/agent1/acks`)
         .set('kbn-xsrf', 'xx')
         .set('Authorization', 'ApiKey NOT_A_VALID_TOKEN')
@@ -61,7 +61,7 @@ export default function(providerContext: FtrProviderContext) {
     });
 
     it('should return a 200 if this a valid acks request', async () => {
-      const { body: apiResponse } = await supertest
+      const { body: apiResponse } = await supertestWithoutAuth
         .post(`/api/ingest_manager/fleet/agents/agent1/acks`)
         .set('kbn-xsrf', 'xx')
         .set(
@@ -91,16 +91,15 @@ export default function(providerContext: FtrProviderContext) {
           ],
         })
         .expect(200);
+
       expect(apiResponse.action).to.be('acks');
       expect(apiResponse.success).to.be(true);
+
       const { body: eventResponse } = await supertest
         .get(`/api/ingest_manager/fleet/agents/agent1/events`)
         .set('kbn-xsrf', 'xx')
-        .set(
-          'Authorization',
-          `ApiKey ${Buffer.from(`${apiKey.id}:${apiKey.api_key}`).toString('base64')}`
-        )
         .expect(200);
+
       const expectedEvents = eventResponse.list.filter(
         (item: Record<string, string>) =>
           item.action_id === '48cebde1-c906-4893-b89f-595d943b72a1' ||
@@ -122,7 +121,7 @@ export default function(providerContext: FtrProviderContext) {
     });
 
     it('should return a 400 when request event list contains event for another agent id', async () => {
-      const { body: apiResponse } = await supertest
+      const { body: apiResponse } = await supertestWithoutAuth
         .post(`/api/ingest_manager/fleet/agents/agent1/acks`)
         .set('kbn-xsrf', 'xx')
         .set(
@@ -149,7 +148,7 @@ export default function(providerContext: FtrProviderContext) {
     });
 
     it('should return a 400 when request event list contains action that does not belong to agent current actions', async () => {
-      const { body: apiResponse } = await supertest
+      const { body: apiResponse } = await supertestWithoutAuth
         .post(`/api/ingest_manager/fleet/agents/agent1/acks`)
         .set('kbn-xsrf', 'xx')
         .set(
@@ -183,7 +182,7 @@ export default function(providerContext: FtrProviderContext) {
     });
 
     it('should return a 400 when request event list contains action types that are not allowed for acknowledgement', async () => {
-      const { body: apiResponse } = await supertest
+      const { body: apiResponse } = await supertestWithoutAuth
         .post(`/api/ingest_manager/fleet/agents/agent1/acks`)
         .set('kbn-xsrf', 'xx')
         .set(

From 28701e2da88e7b5b0fc401456efe4a5478131c3b Mon Sep 17 00:00:00 2001
From: Robert Oskamp <robert.oskamp@elastic.co>
Date: Wed, 25 Mar 2020 13:15:53 +0100
Subject: [PATCH 138/179] [ML] Functional tests - add anomaly explorer
 influencer checks (#61091)

This PR adds checks for the anomaly explorer influencer list length and for contained labels.
---
 .../influencers_list/influencers_list.js      |   2 +-
 .../anomaly_detection/anomaly_explorer.ts     | 103 ++++++++++++------
 .../machine_learning/anomaly_explorer.ts      |  26 +++++
 3 files changed, 98 insertions(+), 33 deletions(-)

diff --git a/x-pack/plugins/ml/public/application/components/influencers_list/influencers_list.js b/x-pack/plugins/ml/public/application/components/influencers_list/influencers_list.js
index 5a31dcef51676..1044caa83e2ad 100644
--- a/x-pack/plugins/ml/public/application/components/influencers_list/influencers_list.js
+++ b/x-pack/plugins/ml/public/application/components/influencers_list/influencers_list.js
@@ -57,7 +57,7 @@ function Influencer({ influencerFieldName, influencerFilter, valueData }) {
 
   return (
     <div data-test-subj={`mlInfluencerEntry field-${influencerFieldName}`}>
-      <div className="field-label">
+      <div className="field-label" data-test-subj="mlInfluencerEntryFieldLabel">
         {influencerFieldName !== 'mlcategory' ? (
           <EntityCell
             entityName={influencerFieldName}
diff --git a/x-pack/test/functional/apps/machine_learning/anomaly_detection/anomaly_explorer.ts b/x-pack/test/functional/apps/machine_learning/anomaly_detection/anomaly_explorer.ts
index d9a327040f90b..83e9c01a46319 100644
--- a/x-pack/test/functional/apps/machine_learning/anomaly_detection/anomaly_explorer.ts
+++ b/x-pack/test/functional/apps/machine_learning/anomaly_detection/anomaly_explorer.ts
@@ -34,6 +34,23 @@ const DATAFEED_CONFIG: Datafeed = {
   query: { bool: { must: [{ match_all: {} }] } },
 };
 
+const testDataList = [
+  {
+    suiteSuffix: 'with farequote based multi metric job',
+    jobConfig: JOB_CONFIG,
+    datafeedConfig: DATAFEED_CONFIG,
+    expected: {
+      influencers: [
+        {
+          field: 'airline',
+          count: 10,
+          labelsContained: ['AAL'],
+        },
+      ],
+    },
+  },
+];
+
 // eslint-disable-next-line import/no-default-export
 export default function({ getService }: FtrProviderContext) {
   const esArchiver = getService('esArchiver');
@@ -43,51 +60,73 @@ export default function({ getService }: FtrProviderContext) {
     this.tags(['smoke', 'mlqa']);
     before(async () => {
       await esArchiver.load('ml/farequote');
-      await ml.api.createAndRunAnomalyDetectionLookbackJob(JOB_CONFIG, DATAFEED_CONFIG);
       await ml.securityUI.loginAsMlPowerUser();
     });
 
     after(async () => {
       await esArchiver.unload('ml/farequote');
-      await ml.api.cleanMlIndices();
     });
 
-    it('loads from job list row link', async () => {
-      await ml.navigation.navigateToMl();
-      await ml.navigation.navigateToJobManagement();
+    for (const testData of testDataList) {
+      describe(testData.suiteSuffix, function() {
+        before(async () => {
+          await ml.api.createAndRunAnomalyDetectionLookbackJob(
+            testData.jobConfig,
+            testData.datafeedConfig
+          );
+        });
 
-      await ml.jobTable.waitForJobsToLoad();
-      await ml.jobTable.filterWithSearchString(JOB_CONFIG.job_id);
-      const rows = await ml.jobTable.parseJobTable();
-      expect(rows.filter(row => row.id === JOB_CONFIG.job_id)).to.have.length(1);
+        after(async () => {
+          await ml.api.cleanMlIndices();
+        });
 
-      await ml.jobTable.clickOpenJobInAnomalyExplorerButton(JOB_CONFIG.job_id);
-      await ml.common.waitForMlLoadingIndicatorToDisappear();
-    });
+        it('loads from job list row link', async () => {
+          await ml.navigation.navigateToMl();
+          await ml.navigation.navigateToJobManagement();
 
-    it('pre-fills the job selection', async () => {
-      await ml.jobSelection.assertJobSelection([JOB_CONFIG.job_id]);
-    });
+          await ml.jobTable.waitForJobsToLoad();
+          await ml.jobTable.filterWithSearchString(testData.jobConfig.job_id);
+          const rows = await ml.jobTable.parseJobTable();
+          expect(rows.filter(row => row.id === testData.jobConfig.job_id)).to.have.length(1);
 
-    it('displays the influencers list', async () => {
-      await ml.anomalyExplorer.assertInfluencerListExists();
-      for (const influencerField of JOB_CONFIG.analysis_config.influencers) {
-        await ml.anomalyExplorer.assertInfluencerFieldExists(influencerField);
-        await ml.anomalyExplorer.assertInfluencerFieldListNotEmpty(influencerField);
-      }
-    });
+          await ml.jobTable.clickOpenJobInAnomalyExplorerButton(testData.jobConfig.job_id);
+          await ml.common.waitForMlLoadingIndicatorToDisappear();
+        });
 
-    it('displays the swimlanes', async () => {
-      await ml.anomalyExplorer.assertOverallSwimlaneExists();
-      await ml.anomalyExplorer.assertSwimlaneViewByExists();
-    });
+        it('pre-fills the job selection', async () => {
+          await ml.jobSelection.assertJobSelection([testData.jobConfig.job_id]);
+        });
 
-    it('displays the anomalies table', async () => {
-      await ml.anomaliesTable.assertTableExists();
-    });
+        it('displays the influencers list', async () => {
+          await ml.anomalyExplorer.assertInfluencerListExists();
+          for (const influencerBlock of testData.expected.influencers) {
+            await ml.anomalyExplorer.assertInfluencerFieldExists(influencerBlock.field);
+            await ml.anomalyExplorer.assertInfluencerFieldListLength(
+              influencerBlock.field,
+              influencerBlock.count
+            );
+            for (const influencerLabel of influencerBlock.labelsContained) {
+              await ml.anomalyExplorer.assertInfluencerListContainsLabel(
+                influencerBlock.field,
+                influencerLabel
+              );
+            }
+          }
+        });
 
-    it('anomalies table is not empty', async () => {
-      await ml.anomaliesTable.assertTableNotEmpty();
-    });
+        it('displays the swimlanes', async () => {
+          await ml.anomalyExplorer.assertOverallSwimlaneExists();
+          await ml.anomalyExplorer.assertSwimlaneViewByExists();
+        });
+
+        it('displays the anomalies table', async () => {
+          await ml.anomaliesTable.assertTableExists();
+        });
+
+        it('anomalies table is not empty', async () => {
+          await ml.anomaliesTable.assertTableNotEmpty();
+        });
+      });
+    }
   });
 }
diff --git a/x-pack/test/functional/services/machine_learning/anomaly_explorer.ts b/x-pack/test/functional/services/machine_learning/anomaly_explorer.ts
index e18441ba7c3fa..1c67bcc848160 100644
--- a/x-pack/test/functional/services/machine_learning/anomaly_explorer.ts
+++ b/x-pack/test/functional/services/machine_learning/anomaly_explorer.ts
@@ -23,6 +23,32 @@ export function MachineLearningAnomalyExplorerProvider({ getService }: FtrProvid
       await testSubjects.existOrFail(`mlInfluencerFieldName ${influencerField}`);
     },
 
+    async getInfluencerFieldLabels(influencerField: string): Promise<string[]> {
+      const influencerFieldLabelElements = await testSubjects.findAll(
+        `mlInfluencerEntry field-${influencerField} > mlInfluencerEntryFieldLabel`
+      );
+      const influencerFieldLabels = await Promise.all(
+        influencerFieldLabelElements.map(async elmnt => await elmnt.getVisibleText())
+      );
+      return influencerFieldLabels;
+    },
+
+    async assertInfluencerListContainsLabel(influencerField: string, label: string) {
+      const influencerFieldLabels = await this.getInfluencerFieldLabels(influencerField);
+      expect(influencerFieldLabels).to.contain(
+        label,
+        `Expected influencer list for '${influencerField}' to contain label '${label}' (got '${influencerFieldLabels}')`
+      );
+    },
+
+    async assertInfluencerFieldListLength(influencerField: string, expectedLength: number) {
+      const influencerFieldLabels = await this.getInfluencerFieldLabels(influencerField);
+      expect(influencerFieldLabels.length).to.eql(
+        expectedLength,
+        `Expected influencer list for '${influencerField}' to have length '${expectedLength}' (got '${influencerFieldLabels.length}')`
+      );
+    },
+
     async assertInfluencerFieldListNotEmpty(influencerField: string) {
       const influencerFieldEntries = await testSubjects.findAll(
         `mlInfluencerEntry field-${influencerField}`

From 4f863c627ada459c5784cbfbd49e94f08cdf92f5 Mon Sep 17 00:00:00 2001
From: Robert Oskamp <robert.oskamp@elastic.co>
Date: Wed, 25 Mar 2020 13:17:32 +0100
Subject: [PATCH 139/179] [ML] Add uptime_heartbeat module to recognizer test
 (#61235)

This PR adds the new uptime_heartbeat module to the recognizer list modules test.
---
 .../ml/server/models/data_recognizer/data_recognizer.test.ts     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/x-pack/plugins/ml/server/models/data_recognizer/data_recognizer.test.ts b/x-pack/plugins/ml/server/models/data_recognizer/data_recognizer.test.ts
index 4f0e0ecc6b55b..277e1547e4b23 100644
--- a/x-pack/plugins/ml/server/models/data_recognizer/data_recognizer.test.ts
+++ b/x-pack/plugins/ml/server/models/data_recognizer/data_recognizer.test.ts
@@ -35,6 +35,7 @@ describe('ML - data recognizer', () => {
     'siem_packetbeat',
     'siem_winlogbeat',
     'siem_winlogbeat_auth',
+    'uptime_heartbeat',
   ];
 
   // check all module IDs are the same as the list above

From 3b27e199ce6fb3e5ba0a0c34a1bb00b3bdef895c Mon Sep 17 00:00:00 2001
From: James Gowdy <jgowdy@elastic.co>
Date: Wed, 25 Mar 2020 12:41:45 +0000
Subject: [PATCH 140/179] [ML] Allow "starting" jobs to be stopped (#61233)

---
 .../ml/public/application/jobs/jobs_list/components/utils.js  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/x-pack/plugins/ml/public/application/jobs/jobs_list/components/utils.js b/x-pack/plugins/ml/public/application/jobs/jobs_list/components/utils.js
index 2739f32aa1055..37b9fe5e1f2d0 100644
--- a/x-pack/plugins/ml/public/application/jobs/jobs_list/components/utils.js
+++ b/x-pack/plugins/ml/public/application/jobs/jobs_list/components/utils.js
@@ -38,7 +38,9 @@ export function isStartable(jobs) {
 }
 
 export function isStoppable(jobs) {
-  return jobs.some(j => j.datafeedState === DATAFEED_STATE.STARTED);
+  return jobs.some(
+    j => j.datafeedState === DATAFEED_STATE.STARTED || j.datafeedState === DATAFEED_STATE.STARTING
+  );
 }
 
 export function isClosable(jobs) {

From ba10b9d69bfc7cf2d580be2cd349fd6188d6a282 Mon Sep 17 00:00:00 2001
From: Melissa Alvarez <melissa.alvarez@elastic.co>
Date: Wed, 25 Mar 2020 08:47:38 -0400
Subject: [PATCH 141/179] [ML] Anomaly Detection: Replace KqlFilterBar with
 QueryStringInput (#60451)

* replace KqlFilterBar with QueryStringInput in explorer

* search bar query persists on refresh

* wrap QueryInputString in component to manage input state

* fix query persists on refresh

* Update types. ensure filter icon works

* ensure explorer has up-to-date query language
---
 .../explorer_query_bar/explorer_query_bar.tsx | 156 ++++++++++++++++++
 .../components/explorer_query_bar/index.ts    |   7 +
 .../public/application/explorer/explorer.js   |  49 +++---
 .../explorer/explorer_constants.ts            |   5 +
 .../explorer/explorer_dashboard_service.ts    |   6 +
 .../reducers/explorer_reducer/reducer.ts      |   7 +
 .../reducers/explorer_reducer/state.ts        |  10 ++
 7 files changed, 217 insertions(+), 23 deletions(-)
 create mode 100644 x-pack/plugins/ml/public/application/explorer/components/explorer_query_bar/explorer_query_bar.tsx
 create mode 100644 x-pack/plugins/ml/public/application/explorer/components/explorer_query_bar/index.ts

diff --git a/x-pack/plugins/ml/public/application/explorer/components/explorer_query_bar/explorer_query_bar.tsx b/x-pack/plugins/ml/public/application/explorer/components/explorer_query_bar/explorer_query_bar.tsx
new file mode 100644
index 0000000000000..0789a7f8ef5ff
--- /dev/null
+++ b/x-pack/plugins/ml/public/application/explorer/components/explorer_query_bar/explorer_query_bar.tsx
@@ -0,0 +1,156 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React, { FC, useState, useEffect } from 'react';
+import {
+  Query,
+  esKuery,
+  esQuery,
+  QueryStringInput,
+} from '../../../../../../../../src/plugins/data/public';
+import { IIndexPattern } from '../../../../../../../../src/plugins/data/common/index_patterns';
+import { QUERY_LANGUAGE_KUERY, QUERY_LANGUAGE_LUCENE } from '../../explorer_constants';
+import { explorerService } from '../../explorer_dashboard_service';
+
+export const DEFAULT_QUERY_LANG = QUERY_LANGUAGE_KUERY;
+
+export function getKqlQueryValues({
+  inputString,
+  queryLanguage,
+  indexPattern,
+}: {
+  inputString: string | { [key: string]: any };
+  queryLanguage: string;
+  indexPattern: IIndexPattern;
+}) {
+  let influencersFilterQuery: any = {};
+  const ast = esKuery.fromKueryExpression(inputString);
+  const isAndOperator = ast.function === 'and';
+  const filteredFields: string[] = [];
+  // if ast.type == 'function' then layout of ast.arguments:
+  // [{ arguments: [ { type: 'literal', value: 'AAL' } ] },{ arguments: [ { type: 'literal', value: 'AAL' } ] }]
+  if (ast && Array.isArray(ast.arguments)) {
+    ast.arguments.forEach(arg => {
+      if (arg.arguments !== undefined) {
+        arg.arguments.forEach((nestedArg: { type: string; value: string }) => {
+          if (typeof nestedArg.value === 'string') {
+            filteredFields.push(nestedArg.value);
+          }
+        });
+      } else if (typeof arg.value === 'string') {
+        filteredFields.push(arg.value);
+      }
+    });
+  }
+  if (queryLanguage === QUERY_LANGUAGE_KUERY) {
+    influencersFilterQuery = esKuery.toElasticsearchQuery(
+      esKuery.fromKueryExpression(inputString),
+      indexPattern
+    );
+  } else if (queryLanguage === QUERY_LANGUAGE_LUCENE) {
+    influencersFilterQuery = esQuery.luceneStringToDsl(inputString);
+  }
+
+  const clearSettings =
+    influencersFilterQuery?.match_all && Object.keys(influencersFilterQuery.match_all).length === 0;
+
+  return {
+    clearSettings,
+    settings: {
+      filterQuery: influencersFilterQuery,
+      queryString: inputString,
+      tableQueryString: inputString,
+      isAndOperator,
+      filteredFields,
+    },
+  };
+}
+
+function getInitSearchInputState({
+  filterActive,
+  queryString,
+}: {
+  filterActive: boolean;
+  queryString?: string;
+}) {
+  if (queryString !== undefined && filterActive === true) {
+    return {
+      language: QUERY_LANGUAGE_KUERY,
+      query: queryString,
+    };
+  } else {
+    return {
+      query: '',
+      language: DEFAULT_QUERY_LANG,
+    };
+  }
+}
+
+interface ExplorerQueryBarProps {
+  filterActive: boolean;
+  filterIconTriggeredQuery: string;
+  filterPlaceHolder: string;
+  indexPattern: IIndexPattern;
+  queryString?: string;
+  updateLanguage: (language: string) => void;
+}
+
+export const ExplorerQueryBar: FC<ExplorerQueryBarProps> = ({
+  filterActive,
+  filterIconTriggeredQuery,
+  filterPlaceHolder,
+  indexPattern,
+  queryString,
+  updateLanguage,
+}) => {
+  // The internal state of the input query bar updated on every key stroke.
+  const [searchInput, setSearchInput] = useState<Query>(
+    getInitSearchInputState({ filterActive, queryString })
+  );
+
+  useEffect(() => {
+    if (filterIconTriggeredQuery !== undefined) {
+      setSearchInput({
+        language: searchInput.language,
+        query: filterIconTriggeredQuery,
+      });
+    }
+  }, [filterIconTriggeredQuery]);
+
+  const searchChangeHandler = (query: Query) => {
+    if (searchInput.language !== query.language) {
+      updateLanguage(query.language);
+    }
+    setSearchInput(query);
+  };
+  const applyInfluencersFilterQuery = (query: Query) => {
+    const { clearSettings, settings } = getKqlQueryValues({
+      inputString: query.query,
+      queryLanguage: query.language,
+      indexPattern,
+    });
+
+    if (clearSettings === true) {
+      explorerService.clearInfluencerFilterSettings();
+    } else {
+      explorerService.setInfluencerFilterSettings(settings);
+    }
+  };
+
+  return (
+    <QueryStringInput
+      bubbleSubmitEvent
+      query={searchInput}
+      indexPatterns={[indexPattern]}
+      onChange={searchChangeHandler}
+      onSubmit={applyInfluencersFilterQuery}
+      placeholder={filterPlaceHolder}
+      disableAutoFocus
+      dataTestSubj="explorerQueryInput"
+      languageSwitcherPopoverAnchorPosition="rightDown"
+    />
+  );
+};
diff --git a/x-pack/plugins/ml/public/application/explorer/components/explorer_query_bar/index.ts b/x-pack/plugins/ml/public/application/explorer/components/explorer_query_bar/index.ts
new file mode 100644
index 0000000000000..3c1d653249889
--- /dev/null
+++ b/x-pack/plugins/ml/public/application/explorer/components/explorer_query_bar/index.ts
@@ -0,0 +1,7 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+export { ExplorerQueryBar } from './explorer_query_bar';
diff --git a/x-pack/plugins/ml/public/application/explorer/explorer.js b/x-pack/plugins/ml/public/application/explorer/explorer.js
index cf01ef1e44c85..9b02150bae9bb 100644
--- a/x-pack/plugins/ml/public/application/explorer/explorer.js
+++ b/x-pack/plugins/ml/public/application/explorer/explorer.js
@@ -38,7 +38,6 @@ import {
 } from './components';
 import { ChartTooltip } from '../components/chart_tooltip';
 import { ExplorerSwimlane } from './explorer_swimlane';
-import { KqlFilterBar } from '../components/kql_filter_bar';
 import { TimeBuckets } from '../util/time_buckets';
 import { InfluencersList } from '../components/influencers_list';
 import {
@@ -54,7 +53,11 @@ import { SelectInterval } from '../components/controls/select_interval/select_in
 import { SelectLimit, limit$ } from './select_limit/select_limit';
 import { SelectSeverity } from '../components/controls/select_severity/select_severity';
 import {
+  ExplorerQueryBar,
   getKqlQueryValues,
+  DEFAULT_QUERY_LANG,
+} from './components/explorer_query_bar/explorer_query_bar';
+import {
   removeFilterFromQueryString,
   getQueryPattern,
   escapeParens,
@@ -86,7 +89,6 @@ function mapSwimlaneOptionsToEuiOptions(options) {
     text: option,
   }));
 }
-
 const ExplorerPage = ({ children, jobSelectorProps, resizeRef }) => (
   <div ref={resizeRef} data-test-subj="mlPageAnomalyExplorer">
     <NavigationMenu tabId="explorer" />
@@ -112,6 +114,8 @@ export class Explorer extends React.Component {
     showCharts: PropTypes.bool.isRequired,
   };
 
+  state = { filterIconTriggeredQuery: undefined, language: DEFAULT_QUERY_LANG };
+
   _unsubscribeAll = new Subject();
   // make sure dragSelect is only available if the mouse pointer is actually over a swimlane
   disableDragSelectOnMouseLeave = true;
@@ -221,7 +225,6 @@ export class Explorer extends React.Component {
   // and will cause a syntax error when called with getKqlQueryValues
   applyFilter = (fieldName, fieldValue, action) => {
     const { filterActive, indexPattern, queryString } = this.props.explorerState;
-
     let newQueryString = '';
     const operator = 'and ';
     const sanitizedFieldName = escapeParens(fieldName);
@@ -248,9 +251,20 @@ export class Explorer extends React.Component {
       }
     }
 
+    this.setState({ filterIconTriggeredQuery: `${newQueryString}` });
+
     try {
-      const queryValues = getKqlQueryValues(`${newQueryString}`, indexPattern);
-      this.applyInfluencersFilterQuery(queryValues);
+      const { clearSettings, settings } = getKqlQueryValues({
+        inputString: `${newQueryString}`,
+        queryLanguage: this.state.language,
+        indexPattern,
+      });
+
+      if (clearSettings === true) {
+        explorerService.clearInfluencerFilterSettings();
+      } else {
+        explorerService.setInfluencerFilterSettings(settings);
+      }
     } catch (e) {
       console.log('Invalid kuery syntax', e); // eslint-disable-line no-console
 
@@ -264,18 +278,7 @@ export class Explorer extends React.Component {
     }
   };
 
-  applyInfluencersFilterQuery = payload => {
-    const { filterQuery: influencersFilterQuery } = payload;
-
-    if (
-      influencersFilterQuery.match_all &&
-      Object.keys(influencersFilterQuery.match_all).length === 0
-    ) {
-      explorerService.clearInfluencerFilterSettings();
-    } else {
-      explorerService.setInfluencerFilterSettings(payload);
-    }
-  };
+  updateLanguage = language => this.setState({ language });
 
   render() {
     const { showCharts, severity } = this.props;
@@ -296,7 +299,6 @@ export class Explorer extends React.Component {
       selectedJobs,
       swimlaneContainerWidth,
       tableData,
-      tableQueryString,
       viewByLoadedForTimeFormatted,
       viewBySwimlaneData,
       viewBySwimlaneDataLoading,
@@ -362,12 +364,13 @@ export class Explorer extends React.Component {
 
           {noInfluencersConfigured === false && influencers !== undefined && (
             <div className="mlAnomalyExplorer__filterBar">
-              <KqlFilterBar
+              <ExplorerQueryBar
+                filterActive={filterActive}
+                filterPlaceHolder={filterPlaceHolder}
                 indexPattern={indexPattern}
-                onSubmit={this.applyInfluencersFilterQuery}
-                initialValue={queryString}
-                placeholder={filterPlaceHolder}
-                valueExternal={tableQueryString}
+                queryString={queryString}
+                filterIconTriggeredQuery={this.state.filterIconTriggeredQuery}
+                updateLanguage={this.updateLanguage}
               />
             </div>
           )}
diff --git a/x-pack/plugins/ml/public/application/explorer/explorer_constants.ts b/x-pack/plugins/ml/public/application/explorer/explorer_constants.ts
index b084f503272cc..afec50eae06aa 100644
--- a/x-pack/plugins/ml/public/application/explorer/explorer_constants.ts
+++ b/x-pack/plugins/ml/public/application/explorer/explorer_constants.ts
@@ -25,6 +25,7 @@ export const EXPLORER_ACTION = {
   SET_EXPLORER_DATA: 'setExplorerData',
   SET_FILTER_DATA: 'setFilterData',
   SET_INFLUENCER_FILTER_SETTINGS: 'setInfluencerFilterSettings',
+  SET_SEARCH_INPUT: 'setSearchInput',
   SET_SELECTED_CELLS: 'setSelectedCells',
   SET_SWIMLANE_CONTAINER_WIDTH: 'setSwimlaneContainerWidth',
   SET_SWIMLANE_LIMIT: 'setSwimlaneLimit',
@@ -55,3 +56,7 @@ export const MAX_INFLUENCER_FIELD_NAMES = 50;
 export const VIEW_BY_JOB_LABEL = i18n.translate('xpack.ml.explorer.jobIdLabel', {
   defaultMessage: 'job ID',
 });
+
+export const QUERY_LANGUAGE_KUERY = 'kuery';
+export const QUERY_LANGUAGE_LUCENE = 'lucene';
+export type QUERY_LANGUAGE = 'kuery' | 'lucene';
diff --git a/x-pack/plugins/ml/public/application/explorer/explorer_dashboard_service.ts b/x-pack/plugins/ml/public/application/explorer/explorer_dashboard_service.ts
index 89e1a908b1ecc..277c1aa6f4566 100644
--- a/x-pack/plugins/ml/public/application/explorer/explorer_dashboard_service.ts
+++ b/x-pack/plugins/ml/public/application/explorer/explorer_dashboard_service.ts
@@ -132,6 +132,12 @@ export const explorerService = {
       payload,
     });
   },
+  setSearchInput: (query: any) => {
+    explorerAction$.next({
+      type: EXPLORER_ACTION.SET_SEARCH_INPUT,
+      payload: query,
+    });
+  },
   setSelectedCells: (payload: AppStateSelectedCells | undefined) => {
     explorerAction$.next({
       type: EXPLORER_ACTION.SET_SELECTED_CELLS,
diff --git a/x-pack/plugins/ml/public/application/explorer/reducers/explorer_reducer/reducer.ts b/x-pack/plugins/ml/public/application/explorer/reducers/explorer_reducer/reducer.ts
index c31b26b7adb7b..ff659029e38d7 100644
--- a/x-pack/plugins/ml/public/application/explorer/reducers/explorer_reducer/reducer.ts
+++ b/x-pack/plugins/ml/public/application/explorer/reducers/explorer_reducer/reducer.ts
@@ -68,6 +68,13 @@ export const explorerReducer = (state: ExplorerState, nextAction: Action): Explo
       nextState = setInfluencerFilterSettings(state, payload);
       break;
 
+    case EXPLORER_ACTION.SET_SEARCH_INPUT:
+      nextState = {
+        ...state,
+        searchInput: payload,
+      };
+      break;
+
     case EXPLORER_ACTION.SET_SELECTED_CELLS:
       const selectedCells = payload;
       nextState = {
diff --git a/x-pack/plugins/ml/public/application/explorer/reducers/explorer_reducer/state.ts b/x-pack/plugins/ml/public/application/explorer/reducers/explorer_reducer/state.ts
index 0a2dbf5bcff35..44e1486508ea3 100644
--- a/x-pack/plugins/ml/public/application/explorer/reducers/explorer_reducer/state.ts
+++ b/x-pack/plugins/ml/public/application/explorer/reducers/explorer_reducer/state.ts
@@ -20,6 +20,8 @@ import {
   TimeRangeBounds,
 } from '../../explorer_utils';
 
+import { QUERY_LANGUAGE_KUERY, QUERY_LANGUAGE } from '../../explorer_constants'; // QUERY_LANGUAGE_LUCENE
+
 export interface ExplorerState {
   annotationsData: any[];
   bounds: TimeRangeBounds | undefined;
@@ -37,6 +39,10 @@ export interface ExplorerState {
   noInfluencersConfigured: boolean;
   overallSwimlaneData: SwimlaneData;
   queryString: string;
+  searchInput: {
+    query: string;
+    language: QUERY_LANGUAGE;
+  };
   selectedCells: AppStateSelectedCells | undefined;
   selectedJobs: ExplorerJob[] | null;
   swimlaneBucketInterval: any;
@@ -73,6 +79,10 @@ export function getExplorerDefaultState(): ExplorerState {
     noInfluencersConfigured: true,
     overallSwimlaneData: getDefaultSwimlaneData(),
     queryString: '',
+    searchInput: {
+      query: '',
+      language: QUERY_LANGUAGE_KUERY,
+    },
     selectedCells: undefined,
     selectedJobs: null,
     swimlaneBucketInterval: undefined,

From f5da5bc6d695c7d85bb008112a5e24c03615afd2 Mon Sep 17 00:00:00 2001
From: Aaron Caldwell <aaron.caldwell@elastic.co>
Date: Wed, 25 Mar 2020 07:23:25 -0600
Subject: [PATCH 142/179] Fix typo: autocompleteService -> autocomplete
 (#61186)

---
 x-pack/legacy/plugins/maps/public/plugin.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x-pack/legacy/plugins/maps/public/plugin.ts b/x-pack/legacy/plugins/maps/public/plugin.ts
index 1f8f83e44a769..1f5817aa33dcc 100644
--- a/x-pack/legacy/plugins/maps/public/plugin.ts
+++ b/x-pack/legacy/plugins/maps/public/plugin.ts
@@ -80,7 +80,7 @@ export const bindStartCoreAndPlugins = (core: CoreStart, plugins: any) => {
   setIndexPatternSelect(data.ui.IndexPatternSelect);
   setTimeFilter(data.query.timefilter.timefilter);
   setIndexPatternService(data.indexPatterns);
-  setAutocompleteService(data.autocompleteService);
+  setAutocompleteService(data.autocomplete);
 };
 
 /** @internal */

From baf83247422a5daab30d4160c18b4c2cb45d6437 Mon Sep 17 00:00:00 2001
From: Tiago Costa <tiagoffcc@hotmail.com>
Date: Wed, 25 Mar 2020 14:21:27 +0000
Subject: [PATCH 143/179] chore(na): add 7.7 branch to the list of branches to
 backport (#61240)

---
 .backportrc.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.backportrc.json b/.backportrc.json
index 77456cf33f625..2603eb2e2d444 100644
--- a/.backportrc.json
+++ b/.backportrc.json
@@ -1,5 +1,5 @@
 {
   "upstream": "elastic/kibana",
-  "branches": [{ "name": "7.x", "checked": true }, "7.6", "7.5", "7.4", "7.3", "7.2", "7.1", "7.0", "6.8", "6.7", "6.6", "6.5", "6.4", "6.3", "6.2", "6.1", "6.0", "5.6"],
+  "branches": [{ "name": "7.x", "checked": true }, "7.7", "7.6", "7.5", "7.4", "7.3", "7.2", "7.1", "7.0", "6.8", "6.7", "6.6", "6.5", "6.4", "6.3", "6.2", "6.1", "6.0", "5.6"],
   "labels": ["backport"]
 }

From d170b37b8fb2b734cd12186dd26b6acaa002e276 Mon Sep 17 00:00:00 2001
From: Joe Reuter <johannes.reuter@elastic.co>
Date: Wed, 25 Mar 2020 16:16:11 +0100
Subject: [PATCH 144/179] Shim getFormat function correctly (#60032)

---
 .../kibana/public/discover/kibana_services.ts |  1 -
 .../np_ready/angular/response_handler.js      |  4 +-
 .../metric_vis_component.test.tsx.snap        | 32 +++++------
 .../components/metric_vis_component.test.tsx  | 20 ++++---
 .../components/metric_vis_component.tsx       |  6 +--
 .../vis_type_metric/public/legacy.ts          |  2 +-
 .../public/metric_vis_type.test.ts            | 21 ++++----
 .../vis_type_metric/public/plugin.ts          | 11 +++-
 .../vis_type_metric/public/services.ts        | 25 +++++++++
 .../public/agg_table/agg_table.js             |  6 +--
 .../vis_type_table/public/legacy.ts           |  2 +-
 .../vis_type_table/public/legacy_imports.ts   |  1 -
 .../vis_type_table/public/plugin.ts           | 11 +++-
 .../public/services.ts}                       |  7 ++-
 .../public/table_vis_response_handler.ts      |  4 +-
 .../components/tag_cloud_visualization.js     |  4 +-
 .../vis_type_tagcloud/public/legacy.ts        |  2 +-
 .../vis_type_tagcloud/public/plugin.ts        | 11 +++-
 .../public/services.ts}                       |  7 ++-
 .../vis_type_vislib/public/legacy.ts          |  1 +
 .../vis_type_vislib/public/legacy_imports.ts  |  1 -
 .../vis_type_vislib/public/plugin.ts          |  5 +-
 .../vis_type_vislib/public/services.ts        | 25 +++++++++
 .../vis_type_vislib/public/vislib/lib/data.js | 12 ++---
 .../public/vislib/response_handler.js         |  5 +-
 .../public/vislib/visualizations/_chart.js    |  6 ++-
 .../build_hierarchical_data.test.js           | 53 ++++++++++++++++++-
 .../datatable_visualization/expression.tsx    |  8 +--
 .../public/datatable_visualization/index.ts   |  5 +-
 x-pack/legacy/plugins/lens/public/legacy.ts   |  4 +-
 .../plugins/lens/public/legacy_imports.ts     |  1 -
 .../lens/public/metric_visualization/index.ts |  5 +-
 .../metric_expression.tsx                     | 22 +++++---
 x-pack/legacy/plugins/lens/public/plugin.tsx  |  8 +--
 x-pack/legacy/plugins/lens/public/types.ts    |  9 +++-
 .../lens/public/xy_visualization/index.ts     |  5 +-
 .../public/xy_visualization/xy_expression.tsx | 12 +++--
 37 files changed, 255 insertions(+), 109 deletions(-)
 create mode 100644 src/legacy/core_plugins/vis_type_metric/public/services.ts
 rename src/legacy/core_plugins/{vis_type_tagcloud/public/legacy_imports.ts => vis_type_table/public/services.ts} (73%)
 rename src/legacy/core_plugins/{vis_type_metric/public/legacy_imports.ts => vis_type_tagcloud/public/services.ts} (73%)
 create mode 100644 src/legacy/core_plugins/vis_type_vislib/public/services.ts

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 7a3a6949baa94..e1ff274911284 100644
--- a/src/legacy/core_plugins/kibana/public/discover/kibana_services.ts
+++ b/src/legacy/core_plugins/kibana/public/discover/kibana_services.ts
@@ -75,6 +75,5 @@ export {
   EsQuerySortValue,
   SortDirection,
 } from '../../../../../plugins/data/public';
-export { getFormat } from 'ui/visualize/loader/pipeline_helpers/utilities';
 // @ts-ignore
 export { buildPointSeriesData } from 'ui/agg_response/point_series/point_series';
diff --git a/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/response_handler.js b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/response_handler.js
index e49f43a443719..0c19c10841535 100644
--- a/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/response_handler.js
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/response_handler.js
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { buildPointSeriesData, getFormat } from '../../kibana_services';
+import { buildPointSeriesData, getServices } from '../../kibana_services';
 
 function tableResponseHandler(table, dimensions) {
   const converted = { tables: [] };
@@ -26,7 +26,7 @@ function tableResponseHandler(table, dimensions) {
   if (split) {
     converted.direction = dimensions.splitRow ? 'row' : 'column';
     const splitColumnIndex = split[0].accessor;
-    const splitColumnFormatter = getFormat(split[0].format);
+    const splitColumnFormatter = getServices().data.fieldFormats.deserialize(split[0].format);
     const splitColumn = table.columns[splitColumnIndex];
     const splitMap = {};
     let splitIndex = 0;
diff --git a/src/legacy/core_plugins/vis_type_metric/public/components/__snapshots__/metric_vis_component.test.tsx.snap b/src/legacy/core_plugins/vis_type_metric/public/components/__snapshots__/metric_vis_component.test.tsx.snap
index d84424cc6179a..47ca3f1e0465e 100644
--- a/src/legacy/core_plugins/vis_type_metric/public/components/__snapshots__/metric_vis_component.test.tsx.snap
+++ b/src/legacy/core_plugins/vis_type_metric/public/components/__snapshots__/metric_vis_component.test.tsx.snap
@@ -1,6 +1,6 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`MetricVisComponent should render correct structure for single metric 1`] = `
+exports[`MetricVisComponent should render correct structure for multi-value metrics 1`] = `
 <div
   className="mtrVis"
 >
@@ -10,45 +10,45 @@ exports[`MetricVisComponent should render correct structure for single metric 1`
       Object {
         "bgColor": undefined,
         "color": undefined,
-        "label": "Count",
+        "label": "1st percentile of bytes",
         "lightText": false,
         "rowIndex": 0,
-        "value": "<span ng-non-bindable>4301021</span>",
+        "value": 182,
       }
     }
     showLabel={true}
   />
-</div>
-`;
-
-exports[`MetricVisComponent should render correct structure for multi-value metrics 1`] = `
-<div
-  className="mtrVis"
->
   <MetricVisValue
-    key="0"
+    key="1"
     metric={
       Object {
         "bgColor": undefined,
         "color": undefined,
-        "label": "1st percentile of bytes",
+        "label": "99th percentile of bytes",
         "lightText": false,
         "rowIndex": 0,
-        "value": "<span ng-non-bindable>182</span>",
+        "value": 445842.4634666484,
       }
     }
     showLabel={true}
   />
+</div>
+`;
+
+exports[`MetricVisComponent should render correct structure for single metric 1`] = `
+<div
+  className="mtrVis"
+>
   <MetricVisValue
-    key="1"
+    key="0"
     metric={
       Object {
         "bgColor": undefined,
         "color": undefined,
-        "label": "99th percentile of bytes",
+        "label": "Count",
         "lightText": false,
         "rowIndex": 0,
-        "value": "<span ng-non-bindable>445842.4634666484</span>",
+        "value": 4301021,
       }
     }
     showLabel={true}
diff --git a/src/legacy/core_plugins/vis_type_metric/public/components/metric_vis_component.test.tsx b/src/legacy/core_plugins/vis_type_metric/public/components/metric_vis_component.test.tsx
index 7ba4fe017522d..00e8df2f0f936 100644
--- a/src/legacy/core_plugins/vis_type_metric/public/components/metric_vis_component.test.tsx
+++ b/src/legacy/core_plugins/vis_type_metric/public/components/metric_vis_component.test.tsx
@@ -21,13 +21,17 @@ import React from 'react';
 import { shallow } from 'enzyme';
 
 import { MetricVisComponent, MetricVisComponentProps } from './metric_vis_component';
-// eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { npStart } from 'ui/new_platform';
-import { fieldFormats } from '../../../../../plugins/data/public';
-import { identity } from 'lodash';
 import { ExprVis } from '../../../visualizations/public/np_ready/public/expressions/vis';
 
-jest.mock('ui/new_platform');
+jest.mock('../services', () => ({
+  getFormatService: () => ({
+    deserialize: () => {
+      return {
+        convert: (x: unknown) => x,
+      };
+    },
+  }),
+}));
 
 type Props = MetricVisComponentProps;
 
@@ -66,12 +70,6 @@ describe('MetricVisComponent', function() {
     return shallow(<MetricVisComponent {...props} />);
   };
 
-  beforeAll(() => {
-    (npStart.plugins.data.fieldFormats.deserialize as jest.Mock).mockImplementation(() => {
-      return new (fieldFormats.FieldFormat.from(identity))();
-    });
-  });
-
   it('should render component', () => {
     expect(getComponent().exists()).toBe(true);
   });
diff --git a/src/legacy/core_plugins/vis_type_metric/public/components/metric_vis_component.tsx b/src/legacy/core_plugins/vis_type_metric/public/components/metric_vis_component.tsx
index 175458497a05e..3fca1df92eacb 100644
--- a/src/legacy/core_plugins/vis_type_metric/public/components/metric_vis_component.tsx
+++ b/src/legacy/core_plugins/vis_type_metric/public/components/metric_vis_component.tsx
@@ -20,13 +20,13 @@
 import { last, findIndex, isNaN } from 'lodash';
 import React, { Component } from 'react';
 import { isColorDark } from '@elastic/eui';
-import { getFormat } from '../legacy_imports';
 import { MetricVisValue } from './metric_vis_value';
 import { Input } from '../metric_vis_fn';
 import { FieldFormatsContentType, IFieldFormat } from '../../../../../plugins/data/public';
 import { KibanaDatatable } from '../../../../../plugins/expressions/public';
 import { getHeatmapColors } from '../../../../../plugins/charts/public';
 import { VisParams, MetricVisMetric } from '../types';
+import { getFormatService } from '../services';
 import { SchemaConfig } from '../../../visualizations/public';
 import { ExprVis } from '../../../visualizations/public/np_ready/public/expressions/vis';
 
@@ -122,13 +122,13 @@ export class MetricVisComponent extends Component<MetricVisComponentProps> {
 
     if (dimensions.bucket) {
       bucketColumnId = table.columns[dimensions.bucket.accessor].id;
-      bucketFormatter = getFormat(dimensions.bucket.format);
+      bucketFormatter = getFormatService().deserialize(dimensions.bucket.format);
     }
 
     dimensions.metrics.forEach((metric: SchemaConfig) => {
       const columnIndex = metric.accessor;
       const column = table?.columns[columnIndex];
-      const formatter = getFormat(metric.format);
+      const formatter = getFormatService().deserialize(metric.format);
       table.rows.forEach((row, rowIndex) => {
         let title = column.name;
         let value: any = row[column.id];
diff --git a/src/legacy/core_plugins/vis_type_metric/public/legacy.ts b/src/legacy/core_plugins/vis_type_metric/public/legacy.ts
index 87355c57926b6..5fc2e48609d4b 100644
--- a/src/legacy/core_plugins/vis_type_metric/public/legacy.ts
+++ b/src/legacy/core_plugins/vis_type_metric/public/legacy.ts
@@ -33,4 +33,4 @@ const plugins: Readonly<MetricVisPluginSetupDependencies> = {
 const pluginInstance = plugin({} as PluginInitializerContext);
 
 export const setup = pluginInstance.setup(npSetup.core, plugins);
-export const start = pluginInstance.start(npStart.core);
+export const start = pluginInstance.start(npStart.core, { data: npStart.plugins.data });
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 c0bfa47bff502..2a5478f23e850 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
@@ -20,14 +20,11 @@
 import $ from 'jquery';
 
 // TODO This is an integration test and thus requires a running platform. When moving to the new platform,
-// this test has to be migrated to the newly created integration test environment.
-// eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { npStart } from 'ui/new_platform';
+// this test has to be migrated to a real unit test.
 // @ts-ignore
 import getStubIndexPattern from 'fixtures/stubbed_logstash_index_pattern';
 
 import { Vis } from '../../visualizations/public';
-import { fieldFormats } from '../../../../plugins/data/public';
 import {
   setup as visualizationsSetup,
   start as visualizationsStart,
@@ -36,6 +33,16 @@ import { createMetricVisTypeDefinition } from './metric_vis_type';
 
 jest.mock('ui/new_platform');
 
+jest.mock('./services', () => ({
+  getFormatService: () => ({
+    deserialize: () => {
+      return {
+        convert: (x: unknown) => `<a href="http://ip.info?address={{${x}}">ip[${x}]</a>`,
+      };
+    },
+  }),
+}));
+
 jest.mock('../../vis_default_editor/public', () => ({
   Schemas: class {},
 }));
@@ -45,12 +52,6 @@ describe('metric_vis - createMetricVisTypeDefinition', () => {
 
   beforeAll(() => {
     visualizationsSetup.createReactVisualization(createMetricVisTypeDefinition());
-    (npStart.plugins.data.fieldFormats.getType as jest.Mock).mockImplementation(() => {
-      return fieldFormats.UrlFormat;
-    });
-    (npStart.plugins.data.fieldFormats.deserialize as jest.Mock).mockImplementation(mapping => {
-      return new fieldFormats.UrlFormat(mapping ? mapping.params : {});
-    });
   });
 
   const setup = () => {
diff --git a/src/legacy/core_plugins/vis_type_metric/public/plugin.ts b/src/legacy/core_plugins/vis_type_metric/public/plugin.ts
index 28b435cbc7980..1c3e1568f4de2 100644
--- a/src/legacy/core_plugins/vis_type_metric/public/plugin.ts
+++ b/src/legacy/core_plugins/vis_type_metric/public/plugin.ts
@@ -24,6 +24,8 @@ import { VisualizationsSetup } from '../../visualizations/public';
 import { createMetricVisFn } from './metric_vis_fn';
 import { createMetricVisTypeDefinition } from './metric_vis_type';
 import { ChartsPluginSetup } from '../../../../plugins/charts/public';
+import { DataPublicPluginStart } from '../../../../plugins/data/public';
+import { setFormatService } from './services';
 
 /** @internal */
 export interface MetricVisPluginSetupDependencies {
@@ -32,6 +34,11 @@ export interface MetricVisPluginSetupDependencies {
   charts: ChartsPluginSetup;
 }
 
+/** @internal */
+export interface MetricVisPluginStartDependencies {
+  data: DataPublicPluginStart;
+}
+
 /** @internal */
 export class MetricVisPlugin implements Plugin<void, void> {
   initializerContext: PluginInitializerContext;
@@ -48,7 +55,7 @@ export class MetricVisPlugin implements Plugin<void, void> {
     visualizations.createReactVisualization(createMetricVisTypeDefinition());
   }
 
-  public start(core: CoreStart) {
-    // nothing to do here yet
+  public start(core: CoreStart, { data }: MetricVisPluginStartDependencies) {
+    setFormatService(data.fieldFormats);
   }
 }
diff --git a/src/legacy/core_plugins/vis_type_metric/public/services.ts b/src/legacy/core_plugins/vis_type_metric/public/services.ts
new file mode 100644
index 0000000000000..5af11bc7f0b03
--- /dev/null
+++ b/src/legacy/core_plugins/vis_type_metric/public/services.ts
@@ -0,0 +1,25 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { createGetterSetter } from '../../../../plugins/kibana_utils/common';
+import { DataPublicPluginStart } from '../../../../plugins/data/public';
+
+export const [getFormatService, setFormatService] = createGetterSetter<
+  DataPublicPluginStart['fieldFormats']
+>('metric data.fieldFormats');
diff --git a/src/legacy/core_plugins/vis_type_table/public/agg_table/agg_table.js b/src/legacy/core_plugins/vis_type_table/public/agg_table/agg_table.js
index 83d7ca4084a20..b9e79f96e4fc1 100644
--- a/src/legacy/core_plugins/vis_type_table/public/agg_table/agg_table.js
+++ b/src/legacy/core_plugins/vis_type_table/public/agg_table/agg_table.js
@@ -18,7 +18,7 @@
  */
 import _ from 'lodash';
 import aggTableTemplate from './agg_table.html';
-import { getFormat } from '../legacy_imports';
+import { getFormatService } from '../services';
 import { i18n } from '@kbn/i18n';
 
 export function KbnAggTable(config, RecursionHelper) {
@@ -127,7 +127,7 @@ export function KbnAggTable(config, RecursionHelper) {
 
               if (!dimension) return;
 
-              const formatter = getFormat(dimension.format);
+              const formatter = getFormatService().deserialize(dimension.format);
 
               const formattedColumn = {
                 id: col.id,
@@ -247,7 +247,7 @@ export function KbnAggTable(config, RecursionHelper) {
 function addPercentageCol(columns, title, rows, insertAtIndex) {
   const { id, sumTotal } = columns[insertAtIndex];
   const newId = `${id}-percents`;
-  const formatter = getFormat({ id: 'percent' });
+  const formatter = getFormatService().deserialize({ id: 'percent' });
   const i18nTitle = i18n.translate('visTypeTable.params.percentageTableColumnName', {
     defaultMessage: '{title} percentages',
     values: { title },
diff --git a/src/legacy/core_plugins/vis_type_table/public/legacy.ts b/src/legacy/core_plugins/vis_type_table/public/legacy.ts
index e5b2619ef2970..30403139d212d 100644
--- a/src/legacy/core_plugins/vis_type_table/public/legacy.ts
+++ b/src/legacy/core_plugins/vis_type_table/public/legacy.ts
@@ -32,4 +32,4 @@ const plugins: Readonly<TablePluginSetupDependencies> = {
 const pluginInstance = plugin({} as PluginInitializerContext);
 
 export const setup = pluginInstance.setup(npSetup.core, plugins);
-export const start = pluginInstance.start(npStart.core);
+export const start = pluginInstance.start(npStart.core, { data: npStart.plugins.data });
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 287b6c172ffd9..1030e971d6450 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
@@ -18,4 +18,3 @@
  */
 
 export { npSetup, npStart } from 'ui/new_platform';
-export { getFormat } from 'ui/visualize/loader/pipeline_helpers/utilities';
diff --git a/src/legacy/core_plugins/vis_type_table/public/plugin.ts b/src/legacy/core_plugins/vis_type_table/public/plugin.ts
index 519a56da23ac9..42bd36c83e28c 100644
--- a/src/legacy/core_plugins/vis_type_table/public/plugin.ts
+++ b/src/legacy/core_plugins/vis_type_table/public/plugin.ts
@@ -23,6 +23,8 @@ import { PluginInitializerContext, CoreSetup, CoreStart, Plugin } from '../../..
 
 import { createTableVisFn } from './table_vis_fn';
 import { tableVisTypeDefinition } from './table_vis_type';
+import { DataPublicPluginStart } from '../../../../plugins/data/public';
+import { setFormatService } from './services';
 
 /** @internal */
 export interface TablePluginSetupDependencies {
@@ -30,6 +32,11 @@ export interface TablePluginSetupDependencies {
   visualizations: VisualizationsSetup;
 }
 
+/** @internal */
+export interface TablePluginStartDependencies {
+  data: DataPublicPluginStart;
+}
+
 /** @internal */
 export class TableVisPlugin implements Plugin<Promise<void>, void> {
   initializerContext: PluginInitializerContext;
@@ -47,7 +54,7 @@ export class TableVisPlugin implements Plugin<Promise<void>, void> {
     visualizations.createBaseVisualization(tableVisTypeDefinition);
   }
 
-  public start(core: CoreStart) {
-    // nothing to do here yet
+  public start(core: CoreStart, { data }: TablePluginStartDependencies) {
+    setFormatService(data.fieldFormats);
   }
 }
diff --git a/src/legacy/core_plugins/vis_type_tagcloud/public/legacy_imports.ts b/src/legacy/core_plugins/vis_type_table/public/services.ts
similarity index 73%
rename from src/legacy/core_plugins/vis_type_tagcloud/public/legacy_imports.ts
rename to src/legacy/core_plugins/vis_type_table/public/services.ts
index cd7a8e740d85d..08efed733cafe 100644
--- a/src/legacy/core_plugins/vis_type_tagcloud/public/legacy_imports.ts
+++ b/src/legacy/core_plugins/vis_type_table/public/services.ts
@@ -17,4 +17,9 @@
  * under the License.
  */
 
-export { getFormat } from 'ui/visualize/loader/pipeline_helpers/utilities';
+import { createGetterSetter } from '../../../../plugins/kibana_utils/common';
+import { DataPublicPluginStart } from '../../../../plugins/data/public';
+
+export const [getFormatService, setFormatService] = createGetterSetter<
+  DataPublicPluginStart['fieldFormats']
+>('table data.fieldFormats');
diff --git a/src/legacy/core_plugins/vis_type_table/public/table_vis_response_handler.ts b/src/legacy/core_plugins/vis_type_table/public/table_vis_response_handler.ts
index 426480fa5b52d..4bf33c876dfff 100644
--- a/src/legacy/core_plugins/vis_type_table/public/table_vis_response_handler.ts
+++ b/src/legacy/core_plugins/vis_type_table/public/table_vis_response_handler.ts
@@ -19,7 +19,7 @@
 
 import { Required } from '@kbn/utility-types';
 
-import { getFormat } from './legacy_imports';
+import { getFormatService } from './services';
 import { Input } from './table_vis_fn';
 
 export interface TableContext {
@@ -54,7 +54,7 @@ export function tableVisResponseHandler(table: Input, dimensions: any): TableCon
   if (split) {
     converted.direction = dimensions.splitRow ? 'row' : 'column';
     const splitColumnIndex = split[0].accessor;
-    const splitColumnFormatter = getFormat(split[0].format);
+    const splitColumnFormatter = getFormatService().deserialize(split[0].format);
     const splitColumn = table.columns[splitColumnIndex];
     const splitMap = {};
     let splitIndex = 0;
diff --git a/src/legacy/core_plugins/vis_type_tagcloud/public/components/tag_cloud_visualization.js b/src/legacy/core_plugins/vis_type_tagcloud/public/components/tag_cloud_visualization.js
index 04f447bf78d50..4094f2ab59158 100644
--- a/src/legacy/core_plugins/vis_type_tagcloud/public/components/tag_cloud_visualization.js
+++ b/src/legacy/core_plugins/vis_type_tagcloud/public/components/tag_cloud_visualization.js
@@ -23,7 +23,7 @@ import { take } from 'rxjs/operators';
 import { render, unmountComponentAtNode } from 'react-dom';
 import { I18nProvider } from '@kbn/i18n/react';
 
-import { getFormat } from '../legacy_imports';
+import { getFormatService } from '../services';
 
 import { Label } from './label';
 import { TagCloud } from './tag_cloud';
@@ -118,7 +118,7 @@ export function createTagCloudVisualization({ colors }) {
 
       const bucket = this._visParams.bucket;
       const metric = this._visParams.metric;
-      const bucketFormatter = bucket ? getFormat(bucket.format) : null;
+      const bucketFormatter = bucket ? getFormatService().deserialize(bucket.format) : null;
       const tagColumn = bucket ? data.columns[bucket.accessor].id : -1;
       const metricColumn = data.columns[metric.accessor].id;
       const tags = data.rows.map((row, rowIndex) => {
diff --git a/src/legacy/core_plugins/vis_type_tagcloud/public/legacy.ts b/src/legacy/core_plugins/vis_type_tagcloud/public/legacy.ts
index 182da40a3e6ea..96073caf20515 100644
--- a/src/legacy/core_plugins/vis_type_tagcloud/public/legacy.ts
+++ b/src/legacy/core_plugins/vis_type_tagcloud/public/legacy.ts
@@ -33,4 +33,4 @@ const plugins: Readonly<TagCloudPluginSetupDependencies> = {
 const pluginInstance = plugin({} as PluginInitializerContext);
 
 export const setup = pluginInstance.setup(npSetup.core, plugins);
-export const start = pluginInstance.start(npStart.core);
+export const start = pluginInstance.start(npStart.core, { data: npStart.plugins.data });
diff --git a/src/legacy/core_plugins/vis_type_tagcloud/public/plugin.ts b/src/legacy/core_plugins/vis_type_tagcloud/public/plugin.ts
index 8244cba38edc3..c9dd4943519be 100644
--- a/src/legacy/core_plugins/vis_type_tagcloud/public/plugin.ts
+++ b/src/legacy/core_plugins/vis_type_tagcloud/public/plugin.ts
@@ -24,6 +24,8 @@ import { ChartsPluginSetup } from '../../../../plugins/charts/public';
 
 import { createTagCloudFn } from './tag_cloud_fn';
 import { createTagCloudVisTypeDefinition } from './tag_cloud_type';
+import { DataPublicPluginStart } from '../../../../plugins/data/public';
+import { setFormatService } from './services';
 
 /** @internal */
 export interface TagCloudPluginSetupDependencies {
@@ -37,6 +39,11 @@ export interface TagCloudVisDependencies {
   colors: ChartsPluginSetup['colors'];
 }
 
+/** @internal */
+export interface TagCloudVisPluginStartDependencies {
+  data: DataPublicPluginStart;
+}
+
 /** @internal */
 export class TagCloudPlugin implements Plugin<void, void> {
   initializerContext: PluginInitializerContext;
@@ -58,7 +65,7 @@ export class TagCloudPlugin implements Plugin<void, void> {
     );
   }
 
-  public start(core: CoreStart) {
-    // nothing to do here yet
+  public start(core: CoreStart, { data }: TagCloudVisPluginStartDependencies) {
+    setFormatService(data.fieldFormats);
   }
 }
diff --git a/src/legacy/core_plugins/vis_type_metric/public/legacy_imports.ts b/src/legacy/core_plugins/vis_type_tagcloud/public/services.ts
similarity index 73%
rename from src/legacy/core_plugins/vis_type_metric/public/legacy_imports.ts
rename to src/legacy/core_plugins/vis_type_tagcloud/public/services.ts
index cd7a8e740d85d..30fd185be877d 100644
--- a/src/legacy/core_plugins/vis_type_metric/public/legacy_imports.ts
+++ b/src/legacy/core_plugins/vis_type_tagcloud/public/services.ts
@@ -17,4 +17,9 @@
  * under the License.
  */
 
-export { getFormat } from 'ui/visualize/loader/pipeline_helpers/utilities';
+import { createGetterSetter } from '../../../../plugins/kibana_utils/common';
+import { DataPublicPluginStart } from '../../../../plugins/data/public';
+
+export const [getFormatService, setFormatService] = createGetterSetter<
+  DataPublicPluginStart['fieldFormats']
+>('data.fieldFormats');
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/legacy.ts b/src/legacy/core_plugins/vis_type_vislib/public/legacy.ts
index 5828a0cccebd7..de3a115fc3e49 100644
--- a/src/legacy/core_plugins/vis_type_vislib/public/legacy.ts
+++ b/src/legacy/core_plugins/vis_type_vislib/public/legacy.ts
@@ -39,6 +39,7 @@ const setupPlugins: Readonly<VisTypeVislibPluginSetupDependencies> = {
 const startPlugins: Readonly<VisTypeVislibPluginStartDependencies> = {
   expressions: npStart.plugins.expressions,
   visualizations: visualizationsStart,
+  data: npStart.plugins.data,
 };
 
 const pluginInstance = plugin({} as PluginInitializerContext);
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 2b177bff98d56..667396a14c3dd 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 { getFormat } from 'ui/visualize/loader/pipeline_helpers/utilities';
 import { search } from '../../../../plugins/data/public';
 export const { tabifyAggResponse, tabifyGetColumns } = search;
 // @ts-ignore
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/plugin.ts b/src/legacy/core_plugins/vis_type_vislib/public/plugin.ts
index a71892cc47b05..9539adbd2ec29 100644
--- a/src/legacy/core_plugins/vis_type_vislib/public/plugin.ts
+++ b/src/legacy/core_plugins/vis_type_vislib/public/plugin.ts
@@ -40,6 +40,8 @@ import {
 } from './vis_type_vislib_vis_types';
 import { ChartsPluginSetup } from '../../../../plugins/charts/public';
 import { ConfigSchema as VisTypeXyConfigSchema } from '../../vis_type_xy';
+import { DataPublicPluginStart } from '../../../../plugins/data/public';
+import { setFormatService } from './services';
 
 export interface VisTypeVislibDependencies {
   uiSettings: IUiSettingsClient;
@@ -57,6 +59,7 @@ export interface VisTypeVislibPluginSetupDependencies {
 export interface VisTypeVislibPluginStartDependencies {
   expressions: ReturnType<ExpressionsPublicPlugin['start']>;
   visualizations: VisualizationsStart;
+  data: DataPublicPluginStart;
 }
 
 type VisTypeVislibCoreSetup = CoreSetup<VisTypeVislibPluginStartDependencies>;
@@ -109,6 +112,6 @@ export class VisTypeVislibPlugin implements Plugin<Promise<void>, void> {
   }
 
   public start(core: CoreStart, deps: VisTypeVislibPluginStartDependencies) {
-    // nothing to do here
+    setFormatService(deps.data.fieldFormats);
   }
 }
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/services.ts b/src/legacy/core_plugins/vis_type_vislib/public/services.ts
new file mode 100644
index 0000000000000..658db00b9a31d
--- /dev/null
+++ b/src/legacy/core_plugins/vis_type_vislib/public/services.ts
@@ -0,0 +1,25 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { createGetterSetter } from '../../../../plugins/kibana_utils/common';
+import { DataPublicPluginStart } from '../../../../plugins/data/public';
+
+export const [getFormatService, setFormatService] = createGetterSetter<
+  DataPublicPluginStart['fieldFormats']
+>('vislib data.fieldFormats');
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/lib/data.js b/src/legacy/core_plugins/vis_type_vislib/public/vislib/lib/data.js
index 2ed6d899f8602..2df157b6f121d 100644
--- a/src/legacy/core_plugins/vis_type_vislib/public/vislib/lib/data.js
+++ b/src/legacy/core_plugins/vis_type_vislib/public/vislib/lib/data.js
@@ -23,7 +23,7 @@ import _ from 'lodash';
 import { injectZeros } from '../components/zero_injection/inject_zeros';
 import { orderXValues } from '../components/zero_injection/ordered_x_keys';
 import { labels } from '../components/labels/labels';
-import { getFormat } from '../../legacy_imports';
+import { getFormatService } from '../../services';
 
 /**
  * Provides an API for pulling values off the data
@@ -56,8 +56,8 @@ export class Data {
           newData[key] = data[key];
         } else {
           newData[key] = data[key].map(seri => {
-            const converter = getFormat(seri.format);
-            const zConverter = getFormat(seri.zFormat);
+            const converter = getFormatService().deserialize(seri.format);
+            const zConverter = getFormatService().deserialize(seri.zFormat);
             return {
               id: seri.id,
               rawId: seri.rawId,
@@ -76,9 +76,9 @@ export class Data {
         }
       });
 
-      const xConverter = getFormat(newData.xAxisFormat);
-      const yConverter = getFormat(newData.yAxisFormat);
-      const zConverter = getFormat(newData.zAxisFormat);
+      const xConverter = getFormatService().deserialize(newData.xAxisFormat);
+      const yConverter = getFormatService().deserialize(newData.yAxisFormat);
+      const zConverter = getFormatService().deserialize(newData.zAxisFormat);
       newData.xAxisFormatter = val => xConverter.convert(val);
       newData.yAxisFormatter = val => yConverter.convert(val);
       newData.zAxisFormatter = val => zConverter.convert(val);
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/response_handler.js b/src/legacy/core_plugins/vis_type_vislib/public/vislib/response_handler.js
index 0c584fedda217..9ba86c5181a4c 100644
--- a/src/legacy/core_plugins/vis_type_vislib/public/vislib/response_handler.js
+++ b/src/legacy/core_plugins/vis_type_vislib/public/vislib/response_handler.js
@@ -17,7 +17,8 @@
  * under the License.
  */
 
-import { buildHierarchicalData, buildPointSeriesData, getFormat } from '../legacy_imports';
+import { buildHierarchicalData, buildPointSeriesData } from '../legacy_imports';
+import { getFormatService } from '../services';
 
 function tableResponseHandler(table, dimensions) {
   const converted = { tables: [] };
@@ -26,7 +27,7 @@ function tableResponseHandler(table, dimensions) {
   if (split) {
     converted.direction = dimensions.splitRow ? 'row' : 'column';
     const splitColumnIndex = split[0].accessor;
-    const splitColumnFormatter = getFormat(split[0].format);
+    const splitColumnFormatter = getFormatService().deserialize(split[0].format);
     const splitColumn = table.columns[splitColumnIndex];
     const splitMap = {};
     let splitIndex = 0;
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/visualizations/_chart.js b/src/legacy/core_plugins/vis_type_vislib/public/vislib/visualizations/_chart.js
index a36c7c4774dad..8e881c2a15726 100644
--- a/src/legacy/core_plugins/vis_type_vislib/public/vislib/visualizations/_chart.js
+++ b/src/legacy/core_plugins/vis_type_vislib/public/vislib/visualizations/_chart.js
@@ -22,7 +22,7 @@ import _ from 'lodash';
 
 import { dataLabel } from '../lib/_data_label';
 import { Dispatch } from '../lib/dispatch';
-import { getFormat } from '../../legacy_imports';
+import { getFormatService } from '../../services';
 import {
   Tooltip,
   hierarchicalTooltipFormatter,
@@ -47,7 +47,9 @@ export class Chart {
 
     const events = (this.events = new Dispatch(handler, deps.uiSettings));
 
-    const fieldFormatter = getFormat(this.handler.data.get('tooltipFormatter'));
+    const fieldFormatter = getFormatService().deserialize(
+      this.handler.data.get('tooltipFormatter')
+    );
     const tooltipFormatterProvider =
       this.handler.visConfig.get('type') === 'pie'
         ? hierarchicalTooltipFormatter
diff --git a/src/legacy/ui/public/agg_response/hierarchical/build_hierarchical_data.test.js b/src/legacy/ui/public/agg_response/hierarchical/build_hierarchical_data.test.js
index f96f194108ff9..21a937bf1fb66 100644
--- a/src/legacy/ui/public/agg_response/hierarchical/build_hierarchical_data.test.js
+++ b/src/legacy/ui/public/agg_response/hierarchical/build_hierarchical_data.test.js
@@ -18,7 +18,58 @@
  */
 
 import { buildHierarchicalData } from './build_hierarchical_data';
-import { tableVisResponseHandler } from '../../../../core_plugins/vis_type_table/public/table_vis_response_handler';
+
+function tableVisResponseHandler(table, dimensions) {
+  const converted = {
+    tables: [],
+  };
+
+  const split = dimensions.splitColumn || dimensions.splitRow;
+
+  if (split) {
+    converted.direction = dimensions.splitRow ? 'row' : 'column';
+    const splitColumnIndex = split[0].accessor;
+    const splitColumn = table.columns[splitColumnIndex];
+    const splitMap = {};
+    let splitIndex = 0;
+
+    table.rows.forEach((row, rowIndex) => {
+      const splitValue = row[splitColumn.id];
+
+      if (!splitMap.hasOwnProperty(splitValue)) {
+        splitMap[splitValue] = splitIndex++;
+        const tableGroup = {
+          $parent: converted,
+          title: `splitValue: ${splitColumn.name}`,
+          name: splitColumn.name,
+          key: splitValue,
+          column: splitColumnIndex,
+          row: rowIndex,
+          table,
+          tables: [],
+        };
+
+        tableGroup.tables.push({
+          $parent: tableGroup,
+          columns: table.columns,
+          rows: [],
+        });
+
+        converted.tables.push(tableGroup);
+      }
+
+      const tableIndex = splitMap[splitValue];
+      converted.tables[tableIndex].tables[0].rows.push(row);
+    });
+  } else {
+    converted.tables.push({
+      columns: table.columns,
+      rows: table.rows,
+    });
+  }
+
+  return converted;
+}
 
 jest.mock('ui/new_platform');
 jest.mock('ui/chrome', () => ({
diff --git a/x-pack/legacy/plugins/lens/public/datatable_visualization/expression.tsx b/x-pack/legacy/plugins/lens/public/datatable_visualization/expression.tsx
index 440f7bdc42bcb..050f294d0b964 100644
--- a/x-pack/legacy/plugins/lens/public/datatable_visualization/expression.tsx
+++ b/x-pack/legacy/plugins/lens/public/datatable_visualization/expression.tsx
@@ -8,13 +8,12 @@ import React from 'react';
 import ReactDOM from 'react-dom';
 import { i18n } from '@kbn/i18n';
 import { EuiBasicTable } from '@elastic/eui';
-import { LensMultiTable } from '../types';
+import { FormatFactory, LensMultiTable } from '../types';
 import {
   ExpressionFunctionDefinition,
   ExpressionRenderDefinition,
   IInterpreterRenderHandlers,
 } from '../../../../../../src/plugins/expressions/public';
-import { FormatFactory } from '../../../../../../src/legacy/ui/public/visualize/loader/pipeline_helpers/utilities';
 import { VisualizationContainer } from '../visualization_container';
 
 export interface DatatableColumns {
@@ -102,7 +101,7 @@ export const datatableColumns: ExpressionFunctionDefinition<
 };
 
 export const getDatatableRenderer = (
-  formatFactory: FormatFactory
+  formatFactory: Promise<FormatFactory>
 ): ExpressionRenderDefinition<DatatableProps> => ({
   name: 'lens_datatable_renderer',
   displayName: i18n.translate('xpack.lens.datatable.visualizationName', {
@@ -116,8 +115,9 @@ export const getDatatableRenderer = (
     config: DatatableProps,
     handlers: IInterpreterRenderHandlers
   ) => {
+    const resolvedFormatFactory = await formatFactory;
     ReactDOM.render(
-      <DatatableComponent {...config} formatFactory={formatFactory} />,
+      <DatatableComponent {...config} formatFactory={resolvedFormatFactory} />,
       domNode,
       () => {
         handlers.done();
diff --git a/x-pack/legacy/plugins/lens/public/datatable_visualization/index.ts b/x-pack/legacy/plugins/lens/public/datatable_visualization/index.ts
index 6dee47cc632c2..7a54a5daa3095 100644
--- a/x-pack/legacy/plugins/lens/public/datatable_visualization/index.ts
+++ b/x-pack/legacy/plugins/lens/public/datatable_visualization/index.ts
@@ -8,12 +8,11 @@ import { CoreSetup } from 'src/core/public';
 import { datatableVisualization } from './visualization';
 import { ExpressionsSetup } from '../../../../../../src/plugins/expressions/public';
 import { datatable, datatableColumns, getDatatableRenderer } from './expression';
-import { FormatFactory } from '../legacy_imports';
-import { EditorFrameSetup } from '../types';
+import { EditorFrameSetup, FormatFactory } from '../types';
 
 export interface DatatableVisualizationPluginSetupPlugins {
   expressions: ExpressionsSetup;
-  formatFactory: FormatFactory;
+  formatFactory: Promise<FormatFactory>;
   editorFrame: EditorFrameSetup;
 }
 
diff --git a/x-pack/legacy/plugins/lens/public/legacy.ts b/x-pack/legacy/plugins/lens/public/legacy.ts
index 1cfd3e198547d..b7d47644c7f31 100644
--- a/x-pack/legacy/plugins/lens/public/legacy.ts
+++ b/x-pack/legacy/plugins/lens/public/legacy.ts
@@ -5,7 +5,7 @@
  */
 
 import { npSetup, npStart } from 'ui/new_platform';
-import { getFormat, visualizations } from './legacy_imports';
+import { visualizations } from './legacy_imports';
 
 export * from './types';
 
@@ -14,6 +14,6 @@ import { plugin } from './index';
 const pluginInstance = plugin();
 pluginInstance.setup(npSetup.core, {
   ...npSetup.plugins,
-  __LEGACY: { formatFactory: getFormat, visualizations },
+  __LEGACY: { visualizations },
 });
 pluginInstance.start(npStart.core, npStart.plugins);
diff --git a/x-pack/legacy/plugins/lens/public/legacy_imports.ts b/x-pack/legacy/plugins/lens/public/legacy_imports.ts
index 88f189fe3db5a..d53842d209e2b 100644
--- a/x-pack/legacy/plugins/lens/public/legacy_imports.ts
+++ b/x-pack/legacy/plugins/lens/public/legacy_imports.ts
@@ -4,6 +4,5 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-export { getFormat, FormatFactory } from 'ui/visualize/loader/pipeline_helpers/utilities';
 export { setup as visualizations } from '../../../../../src/legacy/core_plugins/visualizations/public/np_ready/public/legacy';
 export { VisualizationsSetup } from '../../../../../src/legacy/core_plugins/visualizations/public';
diff --git a/x-pack/legacy/plugins/lens/public/metric_visualization/index.ts b/x-pack/legacy/plugins/lens/public/metric_visualization/index.ts
index 217cc6902fc99..65f064258a5e2 100644
--- a/x-pack/legacy/plugins/lens/public/metric_visualization/index.ts
+++ b/x-pack/legacy/plugins/lens/public/metric_visualization/index.ts
@@ -5,15 +5,14 @@
  */
 
 import { CoreSetup } from 'src/core/public';
-import { FormatFactory } from '../legacy_imports';
 import { metricVisualization } from './metric_visualization';
 import { ExpressionsSetup } from '../../../../../../src/plugins/expressions/public';
 import { metricChart, getMetricChartRenderer } from './metric_expression';
-import { EditorFrameSetup } from '../types';
+import { EditorFrameSetup, FormatFactory } from '../types';
 
 export interface MetricVisualizationPluginSetupPlugins {
   expressions: ExpressionsSetup;
-  formatFactory: FormatFactory;
+  formatFactory: Promise<FormatFactory>;
   editorFrame: EditorFrameSetup;
 }
 
diff --git a/x-pack/legacy/plugins/lens/public/metric_visualization/metric_expression.tsx b/x-pack/legacy/plugins/lens/public/metric_visualization/metric_expression.tsx
index 4d979a766cd2b..a80552e57a9e0 100644
--- a/x-pack/legacy/plugins/lens/public/metric_visualization/metric_expression.tsx
+++ b/x-pack/legacy/plugins/lens/public/metric_visualization/metric_expression.tsx
@@ -6,14 +6,13 @@
 
 import React from 'react';
 import ReactDOM from 'react-dom';
-import { FormatFactory } from 'ui/visualize/loader/pipeline_helpers/utilities';
 import {
   ExpressionFunctionDefinition,
   ExpressionRenderDefinition,
   IInterpreterRenderHandlers,
 } from '../../../../../../src/plugins/expressions/public';
 import { MetricConfig } from './types';
-import { LensMultiTable } from '../types';
+import { FormatFactory, LensMultiTable } from '../types';
 import { AutoScale } from './auto_scale';
 import { VisualizationContainer } from '../visualization_container';
 
@@ -68,17 +67,26 @@ export const metricChart: ExpressionFunctionDefinition<
 };
 
 export const getMetricChartRenderer = (
-  formatFactory: FormatFactory
+  formatFactory: Promise<FormatFactory>
 ): ExpressionRenderDefinition<MetricChartProps> => ({
   name: 'lens_metric_chart_renderer',
   displayName: 'Metric chart',
   help: 'Metric chart renderer',
   validate: () => undefined,
   reuseDomNode: true,
-  render: (domNode: Element, config: MetricChartProps, handlers: IInterpreterRenderHandlers) => {
-    ReactDOM.render(<MetricChart {...config} formatFactory={formatFactory} />, domNode, () => {
-      handlers.done();
-    });
+  render: async (
+    domNode: Element,
+    config: MetricChartProps,
+    handlers: IInterpreterRenderHandlers
+  ) => {
+    const resolvedFormatFactory = await formatFactory;
+    ReactDOM.render(
+      <MetricChart {...config} formatFactory={resolvedFormatFactory} />,
+      domNode,
+      () => {
+        handlers.done();
+      }
+    );
     handlers.onDestroy(() => ReactDOM.unmountComponentAtNode(domNode));
   },
 });
diff --git a/x-pack/legacy/plugins/lens/public/plugin.tsx b/x-pack/legacy/plugins/lens/public/plugin.tsx
index 16f1d194b240a..fad1371199e6a 100644
--- a/x-pack/legacy/plugins/lens/public/plugin.tsx
+++ b/x-pack/legacy/plugins/lens/public/plugin.tsx
@@ -37,7 +37,6 @@ import {
   getUrlVars,
   getLensUrlFromDashboardAbsoluteUrl,
 } from '../../../../../src/legacy/core_plugins/kibana/public/dashboard/np_ready/url_helper';
-import { FormatFactory } from './legacy_imports';
 import { EmbeddableSetup, EmbeddableStart } from '../../../../../src/plugins/embeddable/public';
 import { EditorFrameStart } from './types';
 import { getLensAliasConfig } from './vis_type_alias';
@@ -48,7 +47,6 @@ export interface LensPluginSetupDependencies {
   data: DataPublicPluginSetup;
   embeddable: EmbeddableSetup;
   __LEGACY: {
-    formatFactory: FormatFactory;
     visualizations: VisualizationsSetup;
   };
 }
@@ -86,7 +84,7 @@ export class LensPlugin {
       expressions,
       data,
       embeddable,
-      __LEGACY: { formatFactory, visualizations },
+      __LEGACY: { visualizations },
     }: LensPluginSetupDependencies
   ) {
     const editorFrameSetupInterface = this.editorFrameService.setup(core, {
@@ -98,7 +96,9 @@ export class LensPlugin {
       expressions,
       data,
       editorFrame: editorFrameSetupInterface,
-      formatFactory,
+      formatFactory: core
+        .getStartServices()
+        .then(([_, { data: dataStart }]) => dataStart.fieldFormats.deserialize),
     };
     this.indexpatternDatasource.setup(core, dependencies);
     this.xyVisualization.setup(core, dependencies);
diff --git a/x-pack/legacy/plugins/lens/public/types.ts b/x-pack/legacy/plugins/lens/public/types.ts
index c897979b06cfb..3d67b7b2da460 100644
--- a/x-pack/legacy/plugins/lens/public/types.ts
+++ b/x-pack/legacy/plugins/lens/public/types.ts
@@ -7,14 +7,19 @@
 import { Ast } from '@kbn/interpreter/common';
 import { IconType } from '@elastic/eui/src/components/icon/icon';
 import { CoreSetup } from 'src/core/public';
-import { KibanaDatatable } from '../../../../../src/plugins/expressions/public';
+import {
+  KibanaDatatable,
+  SerializedFieldFormat,
+} from '../../../../../src/plugins/expressions/public';
 import { DragContextState } from './drag_drop';
 import { Document } from './persistence';
 import { DateRange } from '../../../../plugins/lens/common';
-import { Query, Filter, SavedQuery } from '../../../../../src/plugins/data/public';
+import { Query, Filter, SavedQuery, IFieldFormat } from '../../../../../src/plugins/data/public';
 
 export type ErrorCallback = (e: { message: string }) => void;
 
+export type FormatFactory = (mapping?: SerializedFieldFormat) => IFieldFormat;
+
 export interface PublicAPIProps<T> {
   state: T;
   layerId: string;
diff --git a/x-pack/legacy/plugins/lens/public/xy_visualization/index.ts b/x-pack/legacy/plugins/lens/public/xy_visualization/index.ts
index fc836d81ada2b..8cc5abb44d6e1 100644
--- a/x-pack/legacy/plugins/lens/public/xy_visualization/index.ts
+++ b/x-pack/legacy/plugins/lens/public/xy_visualization/index.ts
@@ -7,18 +7,17 @@
 import { EUI_CHARTS_THEME_DARK, EUI_CHARTS_THEME_LIGHT } from '@elastic/eui/dist/eui_charts_theme';
 import { CoreSetup, IUiSettingsClient, CoreStart } from 'src/core/public';
 import moment from 'moment-timezone';
-import { FormatFactory } from '../legacy_imports';
 import { ExpressionsSetup } from '../../../../../../src/plugins/expressions/public';
 import { xyVisualization } from './xy_visualization';
 import { xyChart, getXyChartRenderer } from './xy_expression';
 import { legendConfig, xConfig, layerConfig } from './types';
-import { EditorFrameSetup } from '../types';
+import { EditorFrameSetup, FormatFactory } from '../types';
 import { UiActionsStart } from '../../../../../../src/plugins/ui_actions/public';
 import { setExecuteTriggerActions } from './services';
 
 export interface XyVisualizationPluginSetupPlugins {
   expressions: ExpressionsSetup;
-  formatFactory: FormatFactory;
+  formatFactory: Promise<FormatFactory>;
   editorFrame: EditorFrameSetup;
 }
 
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 98d95c2ea7715..eaf3acf7bb2a7 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
@@ -30,8 +30,7 @@ import { FormattedMessage } from '@kbn/i18n/react';
 import { i18n } from '@kbn/i18n';
 import { EmbeddableVisTriggerContext } from '../../../../../../src/plugins/embeddable/public';
 import { VIS_EVENT_TO_TRIGGER } from '../../../../../../src/legacy/core_plugins/visualizations/public/np_ready/public/embeddable/events';
-import { FormatFactory } from '../../../../../../src/legacy/ui/public/visualize/loader/pipeline_helpers/utilities';
-import { LensMultiTable } from '../types';
+import { LensMultiTable, FormatFactory } from '../types';
 import { XYArgs, SeriesType, visualizationTypes } from './types';
 import { VisualizationContainer } from '../visualization_container';
 import { isHorizontalChart } from './state_helpers';
@@ -108,7 +107,7 @@ export const xyChart: ExpressionFunctionDefinition<
 };
 
 export const getXyChartRenderer = (dependencies: {
-  formatFactory: FormatFactory;
+  formatFactory: Promise<FormatFactory>;
   chartTheme: PartialTheme;
   timeZone: string;
 }): ExpressionRenderDefinition<XYChartProps> => ({
@@ -119,14 +118,17 @@ export const getXyChartRenderer = (dependencies: {
   }),
   validate: () => undefined,
   reuseDomNode: true,
-  render: (domNode: Element, config: XYChartProps, handlers: IInterpreterRenderHandlers) => {
+  render: async (domNode: Element, config: XYChartProps, handlers: IInterpreterRenderHandlers) => {
     const executeTriggerActions = getExecuteTriggerActions();
     handlers.onDestroy(() => ReactDOM.unmountComponentAtNode(domNode));
+    const formatFactory = await dependencies.formatFactory;
     ReactDOM.render(
       <I18nProvider>
         <XYChartReportable
           {...config}
-          {...dependencies}
+          formatFactory={formatFactory}
+          chartTheme={dependencies.chartTheme}
+          timeZone={dependencies.timeZone}
           executeTriggerActions={executeTriggerActions}
         />
       </I18nProvider>,

From a8f92c5e0bf653d3d7b747269457a18d7a82dc08 Mon Sep 17 00:00:00 2001
From: Mikhail Shustov <restrry@gmail.com>
Date: Wed, 25 Mar 2020 16:37:30 +0100
Subject: [PATCH 145/179] bump up babel version (#61037)

* bump babel version

* build kbm-pm

* refresh transitive @babel/* versions to kick yarn into shape

* update kbn/pm dist

Co-authored-by: spalger <spalger@users.noreply.github.com>
---
 package.json                                |    8 +-
 packages/elastic-datemath/package.json      |    4 +-
 packages/kbn-analytics/package.json         |    2 +-
 packages/kbn-babel-code-parser/package.json |    6 +-
 packages/kbn-babel-preset/package.json      |   16 +-
 packages/kbn-i18n/package.json              |    4 +-
 packages/kbn-interpreter/package.json       |    8 +-
 packages/kbn-optimizer/package.json         |    2 +-
 packages/kbn-plugin-helpers/package.json    |    2 +-
 packages/kbn-pm/dist/index.js               | 3228 +++++++++----------
 packages/kbn-pm/package.json                |   10 +-
 packages/kbn-test/package.json              |    2 +-
 packages/kbn-ui-framework/package.json      |    2 +-
 x-pack/package.json                         |    6 +-
 yarn.lock                                   | 2359 +++++---------
 15 files changed, 2334 insertions(+), 3325 deletions(-)

diff --git a/package.json b/package.json
index 4baffa8719fe3..b5da10c71a1a1 100644
--- a/package.json
+++ b/package.json
@@ -115,8 +115,8 @@
     ]
   },
   "dependencies": {
-    "@babel/core": "^7.5.5",
-    "@babel/register": "^7.7.0",
+    "@babel/core": "^7.9.0",
+    "@babel/register": "^7.9.0",
     "@elastic/apm-rum": "^4.6.0",
     "@elastic/charts": "^18.1.0",
     "@elastic/datemath": "5.0.2",
@@ -284,8 +284,8 @@
     "yauzl": "2.10.0"
   },
   "devDependencies": {
-    "@babel/parser": "^7.5.5",
-    "@babel/types": "^7.5.5",
+    "@babel/parser": "^7.9.3",
+    "@babel/types": "^7.9.0",
     "@elastic/elasticsearch": "^7.4.0",
     "@elastic/eslint-config-kibana": "0.15.0",
     "@elastic/eslint-plugin-eui": "0.0.2",
diff --git a/packages/elastic-datemath/package.json b/packages/elastic-datemath/package.json
index 57873d28d372d..8c7c93834adc6 100644
--- a/packages/elastic-datemath/package.json
+++ b/packages/elastic-datemath/package.json
@@ -11,8 +11,8 @@
     "kbn:watch": "yarn build --watch"
   },
   "devDependencies": {
-    "@babel/cli": "^7.5.5",
-    "@babel/preset-env": "^7.5.5",
+    "@babel/cli": "^7.8.4",
+    "@babel/preset-env": "^7.9.0",
     "babel-plugin-add-module-exports": "^1.0.2",
     "moment": "^2.24.0"
   },
diff --git a/packages/kbn-analytics/package.json b/packages/kbn-analytics/package.json
index 9eefa16aaca01..b7a719e5595e6 100644
--- a/packages/kbn-analytics/package.json
+++ b/packages/kbn-analytics/package.json
@@ -14,7 +14,7 @@
     "kbn:watch": "node scripts/build --source-maps --watch"
   },
   "devDependencies": {
-    "@babel/cli": "^7.5.5",
+    "@babel/cli": "^7.8.4",
     "@kbn/dev-utils": "1.0.0",
     "@kbn/babel-preset": "1.0.0",
     "typescript": "3.7.2"
diff --git a/packages/kbn-babel-code-parser/package.json b/packages/kbn-babel-code-parser/package.json
index a9d373d33ab38..4321cd6ee762c 100755
--- a/packages/kbn-babel-code-parser/package.json
+++ b/packages/kbn-babel-code-parser/package.json
@@ -15,12 +15,12 @@
     "kbn:watch": "yarn build --watch"
   },
   "devDependencies": {
-    "@babel/cli": "^7.5.5"
+    "@babel/cli": "^7.8.4"
   },
   "dependencies": {
     "@kbn/babel-preset": "1.0.0",
-    "@babel/parser": "^7.5.5",
-    "@babel/traverse": "^7.5.5",
+    "@babel/parser": "^7.9.3",
+    "@babel/traverse": "^7.9.0",
     "lodash": "^4.17.15"
   }
 }
diff --git a/packages/kbn-babel-preset/package.json b/packages/kbn-babel-preset/package.json
index 0acafbae59afd..b82c8d0fac897 100644
--- a/packages/kbn-babel-preset/package.json
+++ b/packages/kbn-babel-preset/package.json
@@ -4,14 +4,14 @@
   "version": "1.0.0",
   "license": "Apache-2.0",
   "dependencies": {
-    "@babel/plugin-proposal-class-properties": "^7.5.1",
-    "@babel/plugin-proposal-nullish-coalescing-operator": "^7.4.4",
-    "@babel/plugin-proposal-optional-chaining": "^7.6.0",
-    "@babel/plugin-syntax-dynamic-import": "^7.2.0",
-    "@babel/plugin-transform-modules-commonjs": "^7.5.0",
-    "@babel/preset-env": "^7.5.5",
-    "@babel/preset-react": "^7.7.4",
-    "@babel/preset-typescript": "^7.7.4",
+    "@babel/plugin-proposal-class-properties": "^7.8.3",
+    "@babel/plugin-proposal-nullish-coalescing-operator": "^7.8.3",
+    "@babel/plugin-proposal-optional-chaining": "^7.9.0",
+    "@babel/plugin-syntax-dynamic-import": "^7.8.3",
+    "@babel/plugin-transform-modules-commonjs": "^7.9.0",
+    "@babel/preset-env": "^7.9.0",
+    "@babel/preset-react": "^7.9.1",
+    "@babel/preset-typescript": "^7.9.0",
     "babel-plugin-add-module-exports": "^1.0.2",
     "babel-plugin-filter-imports": "^3.0.0",
     "babel-plugin-styled-components": "^1.10.6",
diff --git a/packages/kbn-i18n/package.json b/packages/kbn-i18n/package.json
index bbc5126da1dce..a2b5a2c692645 100644
--- a/packages/kbn-i18n/package.json
+++ b/packages/kbn-i18n/package.json
@@ -12,8 +12,8 @@
     "kbn:watch": "node scripts/build --watch --source-maps"
   },
   "devDependencies": {
-    "@babel/cli": "^7.5.5",
-    "@babel/core": "^7.5.5",
+    "@babel/cli": "^7.8.4",
+    "@babel/core": "^7.9.0",
     "@kbn/babel-preset": "1.0.0",
     "@kbn/dev-utils": "1.0.0",
     "@types/intl-relativeformat": "^2.1.0",
diff --git a/packages/kbn-interpreter/package.json b/packages/kbn-interpreter/package.json
index 5dede7fbf1aaa..dee35043211f7 100644
--- a/packages/kbn-interpreter/package.json
+++ b/packages/kbn-interpreter/package.json
@@ -9,16 +9,16 @@
     "kbn:watch": "node scripts/build --dev --watch"
   },
   "dependencies": {
-    "@babel/runtime": "^7.5.5",
+    "@babel/runtime": "^7.9.2",
     "@kbn/i18n": "1.0.0",
     "lodash": "npm:@elastic/lodash@3.10.1-kibana4",
     "lodash.clone": "^4.5.0",
     "uuid": "3.3.2"
   },
   "devDependencies": {
-    "@babel/cli": "^7.5.5",
-    "@babel/core": "^7.5.5",
-    "@babel/plugin-transform-runtime": "^7.5.5",
+    "@babel/cli": "^7.8.4",
+    "@babel/core": "^7.9.0",
+    "@babel/plugin-transform-runtime": "^7.9.0",
     "@kbn/babel-preset": "1.0.0",
     "@kbn/dev-utils": "1.0.0",
     "babel-loader": "^8.0.6",
diff --git a/packages/kbn-optimizer/package.json b/packages/kbn-optimizer/package.json
index 219b9aaa7f8f2..d32c7489641a0 100644
--- a/packages/kbn-optimizer/package.json
+++ b/packages/kbn-optimizer/package.json
@@ -10,7 +10,7 @@
     "kbn:watch": "yarn build --watch"
   },
   "dependencies": {
-    "@babel/cli": "^7.5.5",
+    "@babel/cli": "^7.8.4",
     "@kbn/babel-preset": "1.0.0",
     "@kbn/dev-utils": "1.0.0",
     "@kbn/ui-shared-deps": "1.0.0",
diff --git a/packages/kbn-plugin-helpers/package.json b/packages/kbn-plugin-helpers/package.json
index c348aa43789d1..53c998ddfaac2 100644
--- a/packages/kbn-plugin-helpers/package.json
+++ b/packages/kbn-plugin-helpers/package.json
@@ -13,7 +13,7 @@
     "@kbn/babel-preset": "1.0.0"
   },
   "dependencies": {
-    "@babel/core": "^7.5.5",
+    "@babel/core": "^7.9.0",
     "argv-split": "^2.0.1",
     "commander": "^3.0.0",
     "del": "^5.1.0",
diff --git a/packages/kbn-pm/dist/index.js b/packages/kbn-pm/dist/index.js
index 62b12e8e38c87..4b6375b0cc099 100644
--- a/packages/kbn-pm/dist/index.js
+++ b/packages/kbn-pm/dist/index.js
@@ -94,21 +94,21 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _cli__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(1);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "run", function() { return _cli__WEBPACK_IMPORTED_MODULE_0__["run"]; });
 
-/* harmony import */ var _production__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(704);
+/* harmony import */ var _production__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(703);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "buildProductionProjects", function() { return _production__WEBPACK_IMPORTED_MODULE_1__["buildProductionProjects"]; });
 
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "prepareExternalProjectDependencies", function() { return _production__WEBPACK_IMPORTED_MODULE_1__["prepareExternalProjectDependencies"]; });
 
-/* harmony import */ var _utils_projects__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(500);
+/* harmony import */ var _utils_projects__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(499);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "getProjects", function() { return _utils_projects__WEBPACK_IMPORTED_MODULE_2__["getProjects"]; });
 
-/* harmony import */ var _utils_project__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(515);
+/* harmony import */ var _utils_project__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(514);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "Project", function() { return _utils_project__WEBPACK_IMPORTED_MODULE_3__["Project"]; });
 
-/* harmony import */ var _utils_workspaces__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(577);
+/* harmony import */ var _utils_workspaces__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(576);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "copyWorkspacePackages", function() { return _utils_workspaces__WEBPACK_IMPORTED_MODULE_4__["copyWorkspacePackages"]; });
 
-/* harmony import */ var _config__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(578);
+/* harmony import */ var _config__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(577);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "getProjectPaths", function() { return _config__WEBPACK_IMPORTED_MODULE_5__["getProjectPaths"]; });
 
 /*
@@ -152,7 +152,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var path__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(16);
 /* harmony import */ var path__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(path__WEBPACK_IMPORTED_MODULE_3__);
 /* harmony import */ var _commands__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(17);
-/* harmony import */ var _run__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(688);
+/* harmony import */ var _run__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(687);
 /* harmony import */ var _utils_log__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(34);
 /*
  * Licensed to Elasticsearch B.V. under one or more contributor
@@ -2506,9 +2506,9 @@ module.exports = require("path");
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "commands", function() { return commands; });
 /* harmony import */ var _bootstrap__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(18);
-/* harmony import */ var _clean__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(585);
-/* harmony import */ var _run__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(685);
-/* harmony import */ var _watch__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(686);
+/* harmony import */ var _clean__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(584);
+/* harmony import */ var _run__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(684);
+/* harmony import */ var _watch__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(685);
 /*
  * Licensed to Elasticsearch B.V. under one or more contributor
  * license agreements. See the NOTICE file distributed with
@@ -2549,10 +2549,10 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var chalk__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(chalk__WEBPACK_IMPORTED_MODULE_0__);
 /* harmony import */ var _utils_link_project_executables__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(19);
 /* harmony import */ var _utils_log__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(34);
-/* harmony import */ var _utils_parallelize__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(499);
-/* harmony import */ var _utils_projects__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(500);
-/* harmony import */ var _utils_project_checksums__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(579);
-/* harmony import */ var _utils_bootstrap_cache_file__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(584);
+/* harmony import */ var _utils_parallelize__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(498);
+/* harmony import */ var _utils_projects__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(499);
+/* harmony import */ var _utils_project_checksums__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(578);
+/* harmony import */ var _utils_bootstrap_cache_file__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(583);
 /*
  * Licensed to Elasticsearch B.V. under one or more contributor
  * license agreements. See the NOTICE file distributed with
@@ -4493,7 +4493,7 @@ exports.ProcRunner = proc_runner_1.ProcRunner;
 tslib_1.__exportStar(__webpack_require__(414), exports);
 var serializers_1 = __webpack_require__(419);
 exports.createAbsolutePathSerializer = serializers_1.createAbsolutePathSerializer;
-var certs_1 = __webpack_require__(444);
+var certs_1 = __webpack_require__(443);
 exports.CA_CERT_PATH = certs_1.CA_CERT_PATH;
 exports.ES_KEY_PATH = certs_1.ES_KEY_PATH;
 exports.ES_CERT_PATH = certs_1.ES_CERT_PATH;
@@ -4505,7 +4505,7 @@ exports.KBN_KEY_PATH = certs_1.KBN_KEY_PATH;
 exports.KBN_CERT_PATH = certs_1.KBN_CERT_PATH;
 exports.KBN_P12_PATH = certs_1.KBN_P12_PATH;
 exports.KBN_P12_PASSWORD = certs_1.KBN_P12_PASSWORD;
-var run_1 = __webpack_require__(445);
+var run_1 = __webpack_require__(444);
 exports.run = run_1.run;
 exports.createFailError = run_1.createFailError;
 exports.createFlagError = run_1.createFlagError;
@@ -4513,9 +4513,9 @@ exports.combineErrors = run_1.combineErrors;
 exports.isFailError = run_1.isFailError;
 var repo_root_1 = __webpack_require__(421);
 exports.REPO_ROOT = repo_root_1.REPO_ROOT;
-var kbn_client_1 = __webpack_require__(450);
+var kbn_client_1 = __webpack_require__(449);
 exports.KbnClient = kbn_client_1.KbnClient;
-tslib_1.__exportStar(__webpack_require__(492), exports);
+tslib_1.__exportStar(__webpack_require__(491), exports);
 
 
 /***/ }),
@@ -38173,17 +38173,11 @@ Object.defineProperty(exports, "__esModule", {
 exports.codeFrameColumns = codeFrameColumns;
 exports.default = _default;
 
-function _highlight() {
-  const data = _interopRequireWildcard(__webpack_require__(434));
+var _highlight = _interopRequireWildcard(__webpack_require__(434));
 
-  _highlight = function () {
-    return data;
-  };
+function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return null; var cache = new WeakMap(); _getRequireWildcardCache = function () { return cache; }; return cache; }
 
-  return data;
-}
-
-function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = Object.defineProperty && Object.getOwnPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : {}; if (desc.get || desc.set) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } } newObj.default = obj; return newObj; } }
+function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
 let deprecationWarningShown = false;
 
@@ -38202,7 +38196,7 @@ function getMarkerLines(loc, source, opts) {
     column: 0,
     line: -1
   }, loc.start);
-  const endLoc = Object.assign({}, startLoc, loc.end);
+  const endLoc = Object.assign({}, startLoc, {}, loc.end);
   const {
     linesAbove = 2,
     linesBelow = 3
@@ -38261,8 +38255,8 @@ function getMarkerLines(loc, source, opts) {
 }
 
 function codeFrameColumns(rawLines, loc, opts = {}) {
-  const highlighted = (opts.highlightCode || opts.forceColor) && (0, _highlight().shouldHighlight)(opts);
-  const chalk = (0, _highlight().getChalk)(opts);
+  const highlighted = (opts.highlightCode || opts.forceColor) && (0, _highlight.shouldHighlight)(opts);
+  const chalk = (0, _highlight.getChalk)(opts);
   const defs = getDefs(chalk);
 
   const maybeHighlight = (chalkFn, string) => {
@@ -38277,7 +38271,7 @@ function codeFrameColumns(rawLines, loc, opts = {}) {
   } = getMarkerLines(loc, lines, opts);
   const hasColumns = loc.start && typeof loc.start.column === "number";
   const numberMaxWidth = String(end).length;
-  const highlightedLines = highlighted ? (0, _highlight().default)(rawLines, opts) : rawLines;
+  const highlightedLines = highlighted ? (0, _highlight.default)(rawLines, opts) : rawLines;
   let frame = highlightedLines.split(NEWLINE).slice(start, end).map((line, index) => {
     const number = start + 1 + index;
     const paddedNumber = ` ${number}`.slice(-numberMaxWidth);
@@ -38353,39 +38347,17 @@ exports.shouldHighlight = shouldHighlight;
 exports.getChalk = getChalk;
 exports.default = highlight;
 
-function _jsTokens() {
-  const data = _interopRequireWildcard(__webpack_require__(435));
+var _jsTokens = _interopRequireWildcard(__webpack_require__(435));
 
-  _jsTokens = function () {
-    return data;
-  };
-
-  return data;
-}
+var _helperValidatorIdentifier = __webpack_require__(436);
 
-function _esutils() {
-  const data = _interopRequireDefault(__webpack_require__(436));
-
-  _esutils = function () {
-    return data;
-  };
-
-  return data;
-}
-
-function _chalk() {
-  const data = _interopRequireDefault(__webpack_require__(440));
-
-  _chalk = function () {
-    return data;
-  };
-
-  return data;
-}
+var _chalk = _interopRequireDefault(__webpack_require__(439));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = Object.defineProperty && Object.getOwnPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : {}; if (desc.get || desc.set) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } } newObj.default = obj; return newObj; } }
+function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return null; var cache = new WeakMap(); _getRequireWildcardCache = function () { return cache; }; return cache; }
+
+function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
 function getDefs(chalk) {
   return {
@@ -38407,10 +38379,10 @@ const BRACKET = /^[()[\]{}]$/;
 
 function getTokenType(match) {
   const [offset, text] = match.slice(-2);
-  const token = (0, _jsTokens().matchToToken)(match);
+  const token = (0, _jsTokens.matchToToken)(match);
 
   if (token.type === "name") {
-    if (_esutils().default.keyword.isReservedWordES6(token.value)) {
+    if ((0, _helperValidatorIdentifier.isKeyword)(token.value) || (0, _helperValidatorIdentifier.isReservedWord)(token.value)) {
       return "keyword";
     }
 
@@ -38435,7 +38407,7 @@ function getTokenType(match) {
 }
 
 function highlightTokens(defs, text) {
-  return text.replace(_jsTokens().default, function (...args) {
+  return text.replace(_jsTokens.default, function (...args) {
     const type = getTokenType(args);
     const colorize = defs[type];
 
@@ -38448,14 +38420,14 @@ function highlightTokens(defs, text) {
 }
 
 function shouldHighlight(options) {
-  return _chalk().default.supportsColor || options.forceColor;
+  return _chalk.default.supportsColor || options.forceColor;
 }
 
 function getChalk(options) {
-  let chalk = _chalk().default;
+  let chalk = _chalk.default;
 
   if (options.forceColor) {
-    chalk = new (_chalk().default.constructor)({
+    chalk = new _chalk.default.constructor({
       enabled: true,
       level: 1
     });
@@ -38507,514 +38479,203 @@ exports.matchToToken = function(match) {
 /* 436 */
 /***/ (function(module, exports, __webpack_require__) {
 
-/*
-  Copyright (C) 2013 Yusuke Suzuki <utatane.tea@gmail.com>
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-  ARE DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
-  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-  THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+"use strict";
 
 
-(function () {
-    'use strict';
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+Object.defineProperty(exports, "isIdentifierName", {
+  enumerable: true,
+  get: function () {
+    return _identifier.isIdentifierName;
+  }
+});
+Object.defineProperty(exports, "isIdentifierChar", {
+  enumerable: true,
+  get: function () {
+    return _identifier.isIdentifierChar;
+  }
+});
+Object.defineProperty(exports, "isIdentifierStart", {
+  enumerable: true,
+  get: function () {
+    return _identifier.isIdentifierStart;
+  }
+});
+Object.defineProperty(exports, "isReservedWord", {
+  enumerable: true,
+  get: function () {
+    return _keyword.isReservedWord;
+  }
+});
+Object.defineProperty(exports, "isStrictBindOnlyReservedWord", {
+  enumerable: true,
+  get: function () {
+    return _keyword.isStrictBindOnlyReservedWord;
+  }
+});
+Object.defineProperty(exports, "isStrictBindReservedWord", {
+  enumerable: true,
+  get: function () {
+    return _keyword.isStrictBindReservedWord;
+  }
+});
+Object.defineProperty(exports, "isStrictReservedWord", {
+  enumerable: true,
+  get: function () {
+    return _keyword.isStrictReservedWord;
+  }
+});
+Object.defineProperty(exports, "isKeyword", {
+  enumerable: true,
+  get: function () {
+    return _keyword.isKeyword;
+  }
+});
 
-    exports.ast = __webpack_require__(437);
-    exports.code = __webpack_require__(438);
-    exports.keyword = __webpack_require__(439);
-}());
-/* vim: set sw=4 ts=4 et tw=80 : */
+var _identifier = __webpack_require__(437);
 
+var _keyword = __webpack_require__(438);
 
 /***/ }),
 /* 437 */
-/***/ (function(module, exports) {
-
-/*
-  Copyright (C) 2013 Yusuke Suzuki <utatane.tea@gmail.com>
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 'AS IS'
-  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-  ARE DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
-  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-  THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-(function () {
-    'use strict';
-
-    function isExpression(node) {
-        if (node == null) { return false; }
-        switch (node.type) {
-            case 'ArrayExpression':
-            case 'AssignmentExpression':
-            case 'BinaryExpression':
-            case 'CallExpression':
-            case 'ConditionalExpression':
-            case 'FunctionExpression':
-            case 'Identifier':
-            case 'Literal':
-            case 'LogicalExpression':
-            case 'MemberExpression':
-            case 'NewExpression':
-            case 'ObjectExpression':
-            case 'SequenceExpression':
-            case 'ThisExpression':
-            case 'UnaryExpression':
-            case 'UpdateExpression':
-                return true;
-        }
-        return false;
-    }
-
-    function isIterationStatement(node) {
-        if (node == null) { return false; }
-        switch (node.type) {
-            case 'DoWhileStatement':
-            case 'ForInStatement':
-            case 'ForStatement':
-            case 'WhileStatement':
-                return true;
-        }
-        return false;
-    }
-
-    function isStatement(node) {
-        if (node == null) { return false; }
-        switch (node.type) {
-            case 'BlockStatement':
-            case 'BreakStatement':
-            case 'ContinueStatement':
-            case 'DebuggerStatement':
-            case 'DoWhileStatement':
-            case 'EmptyStatement':
-            case 'ExpressionStatement':
-            case 'ForInStatement':
-            case 'ForStatement':
-            case 'IfStatement':
-            case 'LabeledStatement':
-            case 'ReturnStatement':
-            case 'SwitchStatement':
-            case 'ThrowStatement':
-            case 'TryStatement':
-            case 'VariableDeclaration':
-            case 'WhileStatement':
-            case 'WithStatement':
-                return true;
-        }
-        return false;
-    }
-
-    function isSourceElement(node) {
-      return isStatement(node) || node != null && node.type === 'FunctionDeclaration';
-    }
-
-    function trailingStatement(node) {
-        switch (node.type) {
-        case 'IfStatement':
-            if (node.alternate != null) {
-                return node.alternate;
-            }
-            return node.consequent;
-
-        case 'LabeledStatement':
-        case 'ForStatement':
-        case 'ForInStatement':
-        case 'WhileStatement':
-        case 'WithStatement':
-            return node.body;
-        }
-        return null;
-    }
-
-    function isProblematicIfStatement(node) {
-        var current;
-
-        if (node.type !== 'IfStatement') {
-            return false;
-        }
-        if (node.alternate == null) {
-            return false;
-        }
-        current = node.consequent;
-        do {
-            if (current.type === 'IfStatement') {
-                if (current.alternate == null)  {
-                    return true;
-                }
-            }
-            current = trailingStatement(current);
-        } while (current);
-
-        return false;
-    }
-
-    module.exports = {
-        isExpression: isExpression,
-        isStatement: isStatement,
-        isIterationStatement: isIterationStatement,
-        isSourceElement: isSourceElement,
-        isProblematicIfStatement: isProblematicIfStatement,
-
-        trailingStatement: trailingStatement
-    };
-}());
-/* vim: set sw=4 ts=4 et tw=80 : */
-
-
-/***/ }),
-/* 438 */
-/***/ (function(module, exports) {
-
-/*
-  Copyright (C) 2013-2014 Yusuke Suzuki <utatane.tea@gmail.com>
-  Copyright (C) 2014 Ivan Nikulin <ifaaan@gmail.com>
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-  ARE DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
-  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-  THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-(function () {
-    'use strict';
-
-    var ES6Regex, ES5Regex, NON_ASCII_WHITESPACES, IDENTIFIER_START, IDENTIFIER_PART, ch;
-
-    // See `tools/generate-identifier-regex.js`.
-    ES5Regex = {
-        // ECMAScript 5.1/Unicode v7.0.0 NonAsciiIdentifierStart:
-        NonAsciiIdentifierStart: /[\xAA\xB5\xBA\xC0-\xD6\xD8-\xF6\xF8-\u02C1\u02C6-\u02D1\u02E0-\u02E4\u02EC\u02EE\u0370-\u0374\u0376\u0377\u037A-\u037D\u037F\u0386\u0388-\u038A\u038C\u038E-\u03A1\u03A3-\u03F5\u03F7-\u0481\u048A-\u052F\u0531-\u0556\u0559\u0561-\u0587\u05D0-\u05EA\u05F0-\u05F2\u0620-\u064A\u066E\u066F\u0671-\u06D3\u06D5\u06E5\u06E6\u06EE\u06EF\u06FA-\u06FC\u06FF\u0710\u0712-\u072F\u074D-\u07A5\u07B1\u07CA-\u07EA\u07F4\u07F5\u07FA\u0800-\u0815\u081A\u0824\u0828\u0840-\u0858\u08A0-\u08B2\u0904-\u0939\u093D\u0950\u0958-\u0961\u0971-\u0980\u0985-\u098C\u098F\u0990\u0993-\u09A8\u09AA-\u09B0\u09B2\u09B6-\u09B9\u09BD\u09CE\u09DC\u09DD\u09DF-\u09E1\u09F0\u09F1\u0A05-\u0A0A\u0A0F\u0A10\u0A13-\u0A28\u0A2A-\u0A30\u0A32\u0A33\u0A35\u0A36\u0A38\u0A39\u0A59-\u0A5C\u0A5E\u0A72-\u0A74\u0A85-\u0A8D\u0A8F-\u0A91\u0A93-\u0AA8\u0AAA-\u0AB0\u0AB2\u0AB3\u0AB5-\u0AB9\u0ABD\u0AD0\u0AE0\u0AE1\u0B05-\u0B0C\u0B0F\u0B10\u0B13-\u0B28\u0B2A-\u0B30\u0B32\u0B33\u0B35-\u0B39\u0B3D\u0B5C\u0B5D\u0B5F-\u0B61\u0B71\u0B83\u0B85-\u0B8A\u0B8E-\u0B90\u0B92-\u0B95\u0B99\u0B9A\u0B9C\u0B9E\u0B9F\u0BA3\u0BA4\u0BA8-\u0BAA\u0BAE-\u0BB9\u0BD0\u0C05-\u0C0C\u0C0E-\u0C10\u0C12-\u0C28\u0C2A-\u0C39\u0C3D\u0C58\u0C59\u0C60\u0C61\u0C85-\u0C8C\u0C8E-\u0C90\u0C92-\u0CA8\u0CAA-\u0CB3\u0CB5-\u0CB9\u0CBD\u0CDE\u0CE0\u0CE1\u0CF1\u0CF2\u0D05-\u0D0C\u0D0E-\u0D10\u0D12-\u0D3A\u0D3D\u0D4E\u0D60\u0D61\u0D7A-\u0D7F\u0D85-\u0D96\u0D9A-\u0DB1\u0DB3-\u0DBB\u0DBD\u0DC0-\u0DC6\u0E01-\u0E30\u0E32\u0E33\u0E40-\u0E46\u0E81\u0E82\u0E84\u0E87\u0E88\u0E8A\u0E8D\u0E94-\u0E97\u0E99-\u0E9F\u0EA1-\u0EA3\u0EA5\u0EA7\u0EAA\u0EAB\u0EAD-\u0EB0\u0EB2\u0EB3\u0EBD\u0EC0-\u0EC4\u0EC6\u0EDC-\u0EDF\u0F00\u0F40-\u0F47\u0F49-\u0F6C\u0F88-\u0F8C\u1000-\u102A\u103F\u1050-\u1055\u105A-\u105D\u1061\u1065\u1066\u106E-\u1070\u1075-\u1081\u108E\u10A0-\u10C5\u10C7\u10CD\u10D0-\u10FA\u10FC-\u1248\u124A-\u124D\u1250-\u1256\u1258\u125A-\u125D\u1260-\u1288\u128A-\u128D\u1290-\u12B0\u12B2-\u12B5\u12B8-\u12BE\u12C0\u12C2-\u12C5\u12C8-\u12D6\u12D8-\u1310\u1312-\u1315\u1318-\u135A\u1380-\u138F\u13A0-\u13F4\u1401-\u166C\u166F-\u167F\u1681-\u169A\u16A0-\u16EA\u16EE-\u16F8\u1700-\u170C\u170E-\u1711\u1720-\u1731\u1740-\u1751\u1760-\u176C\u176E-\u1770\u1780-\u17B3\u17D7\u17DC\u1820-\u1877\u1880-\u18A8\u18AA\u18B0-\u18F5\u1900-\u191E\u1950-\u196D\u1970-\u1974\u1980-\u19AB\u19C1-\u19C7\u1A00-\u1A16\u1A20-\u1A54\u1AA7\u1B05-\u1B33\u1B45-\u1B4B\u1B83-\u1BA0\u1BAE\u1BAF\u1BBA-\u1BE5\u1C00-\u1C23\u1C4D-\u1C4F\u1C5A-\u1C7D\u1CE9-\u1CEC\u1CEE-\u1CF1\u1CF5\u1CF6\u1D00-\u1DBF\u1E00-\u1F15\u1F18-\u1F1D\u1F20-\u1F45\u1F48-\u1F4D\u1F50-\u1F57\u1F59\u1F5B\u1F5D\u1F5F-\u1F7D\u1F80-\u1FB4\u1FB6-\u1FBC\u1FBE\u1FC2-\u1FC4\u1FC6-\u1FCC\u1FD0-\u1FD3\u1FD6-\u1FDB\u1FE0-\u1FEC\u1FF2-\u1FF4\u1FF6-\u1FFC\u2071\u207F\u2090-\u209C\u2102\u2107\u210A-\u2113\u2115\u2119-\u211D\u2124\u2126\u2128\u212A-\u212D\u212F-\u2139\u213C-\u213F\u2145-\u2149\u214E\u2160-\u2188\u2C00-\u2C2E\u2C30-\u2C5E\u2C60-\u2CE4\u2CEB-\u2CEE\u2CF2\u2CF3\u2D00-\u2D25\u2D27\u2D2D\u2D30-\u2D67\u2D6F\u2D80-\u2D96\u2DA0-\u2DA6\u2DA8-\u2DAE\u2DB0-\u2DB6\u2DB8-\u2DBE\u2DC0-\u2DC6\u2DC8-\u2DCE\u2DD0-\u2DD6\u2DD8-\u2DDE\u2E2F\u3005-\u3007\u3021-\u3029\u3031-\u3035\u3038-\u303C\u3041-\u3096\u309D-\u309F\u30A1-\u30FA\u30FC-\u30FF\u3105-\u312D\u3131-\u318E\u31A0-\u31BA\u31F0-\u31FF\u3400-\u4DB5\u4E00-\u9FCC\uA000-\uA48C\uA4D0-\uA4FD\uA500-\uA60C\uA610-\uA61F\uA62A\uA62B\uA640-\uA66E\uA67F-\uA69D\uA6A0-\uA6EF\uA717-\uA71F\uA722-\uA788\uA78B-\uA78E\uA790-\uA7AD\uA7B0\uA7B1\uA7F7-\uA801\uA803-\uA805\uA807-\uA80A\uA80C-\uA822\uA840-\uA873\uA882-\uA8B3\uA8F2-\uA8F7\uA8FB\uA90A-\uA925\uA930-\uA946\uA960-\uA97C\uA984-\uA9B2\uA9CF\uA9E0-\uA9E4\uA9E6-\uA9EF\uA9FA-\uA9FE\uAA00-\uAA28\uAA40-\uAA42\uAA44-\uAA4B\uAA60-\uAA76\uAA7A\uAA7E-\uAAAF\uAAB1\uAAB5\uAAB6\uAAB9-\uAABD\uAAC0\uAAC2\uAADB-\uAADD\uAAE0-\uAAEA\uAAF2-\uAAF4\uAB01-\uAB06\uAB09-\uAB0E\uAB11-\uAB16\uAB20-\uAB26\uAB28-\uAB2E\uAB30-\uAB5A\uAB5C-\uAB5F\uAB64\uAB65\uABC0-\uABE2\uAC00-\uD7A3\uD7B0-\uD7C6\uD7CB-\uD7FB\uF900-\uFA6D\uFA70-\uFAD9\uFB00-\uFB06\uFB13-\uFB17\uFB1D\uFB1F-\uFB28\uFB2A-\uFB36\uFB38-\uFB3C\uFB3E\uFB40\uFB41\uFB43\uFB44\uFB46-\uFBB1\uFBD3-\uFD3D\uFD50-\uFD8F\uFD92-\uFDC7\uFDF0-\uFDFB\uFE70-\uFE74\uFE76-\uFEFC\uFF21-\uFF3A\uFF41-\uFF5A\uFF66-\uFFBE\uFFC2-\uFFC7\uFFCA-\uFFCF\uFFD2-\uFFD7\uFFDA-\uFFDC]/,
-        // ECMAScript 5.1/Unicode v7.0.0 NonAsciiIdentifierPart:
-        NonAsciiIdentifierPart: /[\xAA\xB5\xBA\xC0-\xD6\xD8-\xF6\xF8-\u02C1\u02C6-\u02D1\u02E0-\u02E4\u02EC\u02EE\u0300-\u0374\u0376\u0377\u037A-\u037D\u037F\u0386\u0388-\u038A\u038C\u038E-\u03A1\u03A3-\u03F5\u03F7-\u0481\u0483-\u0487\u048A-\u052F\u0531-\u0556\u0559\u0561-\u0587\u0591-\u05BD\u05BF\u05C1\u05C2\u05C4\u05C5\u05C7\u05D0-\u05EA\u05F0-\u05F2\u0610-\u061A\u0620-\u0669\u066E-\u06D3\u06D5-\u06DC\u06DF-\u06E8\u06EA-\u06FC\u06FF\u0710-\u074A\u074D-\u07B1\u07C0-\u07F5\u07FA\u0800-\u082D\u0840-\u085B\u08A0-\u08B2\u08E4-\u0963\u0966-\u096F\u0971-\u0983\u0985-\u098C\u098F\u0990\u0993-\u09A8\u09AA-\u09B0\u09B2\u09B6-\u09B9\u09BC-\u09C4\u09C7\u09C8\u09CB-\u09CE\u09D7\u09DC\u09DD\u09DF-\u09E3\u09E6-\u09F1\u0A01-\u0A03\u0A05-\u0A0A\u0A0F\u0A10\u0A13-\u0A28\u0A2A-\u0A30\u0A32\u0A33\u0A35\u0A36\u0A38\u0A39\u0A3C\u0A3E-\u0A42\u0A47\u0A48\u0A4B-\u0A4D\u0A51\u0A59-\u0A5C\u0A5E\u0A66-\u0A75\u0A81-\u0A83\u0A85-\u0A8D\u0A8F-\u0A91\u0A93-\u0AA8\u0AAA-\u0AB0\u0AB2\u0AB3\u0AB5-\u0AB9\u0ABC-\u0AC5\u0AC7-\u0AC9\u0ACB-\u0ACD\u0AD0\u0AE0-\u0AE3\u0AE6-\u0AEF\u0B01-\u0B03\u0B05-\u0B0C\u0B0F\u0B10\u0B13-\u0B28\u0B2A-\u0B30\u0B32\u0B33\u0B35-\u0B39\u0B3C-\u0B44\u0B47\u0B48\u0B4B-\u0B4D\u0B56\u0B57\u0B5C\u0B5D\u0B5F-\u0B63\u0B66-\u0B6F\u0B71\u0B82\u0B83\u0B85-\u0B8A\u0B8E-\u0B90\u0B92-\u0B95\u0B99\u0B9A\u0B9C\u0B9E\u0B9F\u0BA3\u0BA4\u0BA8-\u0BAA\u0BAE-\u0BB9\u0BBE-\u0BC2\u0BC6-\u0BC8\u0BCA-\u0BCD\u0BD0\u0BD7\u0BE6-\u0BEF\u0C00-\u0C03\u0C05-\u0C0C\u0C0E-\u0C10\u0C12-\u0C28\u0C2A-\u0C39\u0C3D-\u0C44\u0C46-\u0C48\u0C4A-\u0C4D\u0C55\u0C56\u0C58\u0C59\u0C60-\u0C63\u0C66-\u0C6F\u0C81-\u0C83\u0C85-\u0C8C\u0C8E-\u0C90\u0C92-\u0CA8\u0CAA-\u0CB3\u0CB5-\u0CB9\u0CBC-\u0CC4\u0CC6-\u0CC8\u0CCA-\u0CCD\u0CD5\u0CD6\u0CDE\u0CE0-\u0CE3\u0CE6-\u0CEF\u0CF1\u0CF2\u0D01-\u0D03\u0D05-\u0D0C\u0D0E-\u0D10\u0D12-\u0D3A\u0D3D-\u0D44\u0D46-\u0D48\u0D4A-\u0D4E\u0D57\u0D60-\u0D63\u0D66-\u0D6F\u0D7A-\u0D7F\u0D82\u0D83\u0D85-\u0D96\u0D9A-\u0DB1\u0DB3-\u0DBB\u0DBD\u0DC0-\u0DC6\u0DCA\u0DCF-\u0DD4\u0DD6\u0DD8-\u0DDF\u0DE6-\u0DEF\u0DF2\u0DF3\u0E01-\u0E3A\u0E40-\u0E4E\u0E50-\u0E59\u0E81\u0E82\u0E84\u0E87\u0E88\u0E8A\u0E8D\u0E94-\u0E97\u0E99-\u0E9F\u0EA1-\u0EA3\u0EA5\u0EA7\u0EAA\u0EAB\u0EAD-\u0EB9\u0EBB-\u0EBD\u0EC0-\u0EC4\u0EC6\u0EC8-\u0ECD\u0ED0-\u0ED9\u0EDC-\u0EDF\u0F00\u0F18\u0F19\u0F20-\u0F29\u0F35\u0F37\u0F39\u0F3E-\u0F47\u0F49-\u0F6C\u0F71-\u0F84\u0F86-\u0F97\u0F99-\u0FBC\u0FC6\u1000-\u1049\u1050-\u109D\u10A0-\u10C5\u10C7\u10CD\u10D0-\u10FA\u10FC-\u1248\u124A-\u124D\u1250-\u1256\u1258\u125A-\u125D\u1260-\u1288\u128A-\u128D\u1290-\u12B0\u12B2-\u12B5\u12B8-\u12BE\u12C0\u12C2-\u12C5\u12C8-\u12D6\u12D8-\u1310\u1312-\u1315\u1318-\u135A\u135D-\u135F\u1380-\u138F\u13A0-\u13F4\u1401-\u166C\u166F-\u167F\u1681-\u169A\u16A0-\u16EA\u16EE-\u16F8\u1700-\u170C\u170E-\u1714\u1720-\u1734\u1740-\u1753\u1760-\u176C\u176E-\u1770\u1772\u1773\u1780-\u17D3\u17D7\u17DC\u17DD\u17E0-\u17E9\u180B-\u180D\u1810-\u1819\u1820-\u1877\u1880-\u18AA\u18B0-\u18F5\u1900-\u191E\u1920-\u192B\u1930-\u193B\u1946-\u196D\u1970-\u1974\u1980-\u19AB\u19B0-\u19C9\u19D0-\u19D9\u1A00-\u1A1B\u1A20-\u1A5E\u1A60-\u1A7C\u1A7F-\u1A89\u1A90-\u1A99\u1AA7\u1AB0-\u1ABD\u1B00-\u1B4B\u1B50-\u1B59\u1B6B-\u1B73\u1B80-\u1BF3\u1C00-\u1C37\u1C40-\u1C49\u1C4D-\u1C7D\u1CD0-\u1CD2\u1CD4-\u1CF6\u1CF8\u1CF9\u1D00-\u1DF5\u1DFC-\u1F15\u1F18-\u1F1D\u1F20-\u1F45\u1F48-\u1F4D\u1F50-\u1F57\u1F59\u1F5B\u1F5D\u1F5F-\u1F7D\u1F80-\u1FB4\u1FB6-\u1FBC\u1FBE\u1FC2-\u1FC4\u1FC6-\u1FCC\u1FD0-\u1FD3\u1FD6-\u1FDB\u1FE0-\u1FEC\u1FF2-\u1FF4\u1FF6-\u1FFC\u200C\u200D\u203F\u2040\u2054\u2071\u207F\u2090-\u209C\u20D0-\u20DC\u20E1\u20E5-\u20F0\u2102\u2107\u210A-\u2113\u2115\u2119-\u211D\u2124\u2126\u2128\u212A-\u212D\u212F-\u2139\u213C-\u213F\u2145-\u2149\u214E\u2160-\u2188\u2C00-\u2C2E\u2C30-\u2C5E\u2C60-\u2CE4\u2CEB-\u2CF3\u2D00-\u2D25\u2D27\u2D2D\u2D30-\u2D67\u2D6F\u2D7F-\u2D96\u2DA0-\u2DA6\u2DA8-\u2DAE\u2DB0-\u2DB6\u2DB8-\u2DBE\u2DC0-\u2DC6\u2DC8-\u2DCE\u2DD0-\u2DD6\u2DD8-\u2DDE\u2DE0-\u2DFF\u2E2F\u3005-\u3007\u3021-\u302F\u3031-\u3035\u3038-\u303C\u3041-\u3096\u3099\u309A\u309D-\u309F\u30A1-\u30FA\u30FC-\u30FF\u3105-\u312D\u3131-\u318E\u31A0-\u31BA\u31F0-\u31FF\u3400-\u4DB5\u4E00-\u9FCC\uA000-\uA48C\uA4D0-\uA4FD\uA500-\uA60C\uA610-\uA62B\uA640-\uA66F\uA674-\uA67D\uA67F-\uA69D\uA69F-\uA6F1\uA717-\uA71F\uA722-\uA788\uA78B-\uA78E\uA790-\uA7AD\uA7B0\uA7B1\uA7F7-\uA827\uA840-\uA873\uA880-\uA8C4\uA8D0-\uA8D9\uA8E0-\uA8F7\uA8FB\uA900-\uA92D\uA930-\uA953\uA960-\uA97C\uA980-\uA9C0\uA9CF-\uA9D9\uA9E0-\uA9FE\uAA00-\uAA36\uAA40-\uAA4D\uAA50-\uAA59\uAA60-\uAA76\uAA7A-\uAAC2\uAADB-\uAADD\uAAE0-\uAAEF\uAAF2-\uAAF6\uAB01-\uAB06\uAB09-\uAB0E\uAB11-\uAB16\uAB20-\uAB26\uAB28-\uAB2E\uAB30-\uAB5A\uAB5C-\uAB5F\uAB64\uAB65\uABC0-\uABEA\uABEC\uABED\uABF0-\uABF9\uAC00-\uD7A3\uD7B0-\uD7C6\uD7CB-\uD7FB\uF900-\uFA6D\uFA70-\uFAD9\uFB00-\uFB06\uFB13-\uFB17\uFB1D-\uFB28\uFB2A-\uFB36\uFB38-\uFB3C\uFB3E\uFB40\uFB41\uFB43\uFB44\uFB46-\uFBB1\uFBD3-\uFD3D\uFD50-\uFD8F\uFD92-\uFDC7\uFDF0-\uFDFB\uFE00-\uFE0F\uFE20-\uFE2D\uFE33\uFE34\uFE4D-\uFE4F\uFE70-\uFE74\uFE76-\uFEFC\uFF10-\uFF19\uFF21-\uFF3A\uFF3F\uFF41-\uFF5A\uFF66-\uFFBE\uFFC2-\uFFC7\uFFCA-\uFFCF\uFFD2-\uFFD7\uFFDA-\uFFDC]/
-    };
-
-    ES6Regex = {
-        // ECMAScript 6/Unicode v7.0.0 NonAsciiIdentifierStart:
-        NonAsciiIdentifierStart: /[\xAA\xB5\xBA\xC0-\xD6\xD8-\xF6\xF8-\u02C1\u02C6-\u02D1\u02E0-\u02E4\u02EC\u02EE\u0370-\u0374\u0376\u0377\u037A-\u037D\u037F\u0386\u0388-\u038A\u038C\u038E-\u03A1\u03A3-\u03F5\u03F7-\u0481\u048A-\u052F\u0531-\u0556\u0559\u0561-\u0587\u05D0-\u05EA\u05F0-\u05F2\u0620-\u064A\u066E\u066F\u0671-\u06D3\u06D5\u06E5\u06E6\u06EE\u06EF\u06FA-\u06FC\u06FF\u0710\u0712-\u072F\u074D-\u07A5\u07B1\u07CA-\u07EA\u07F4\u07F5\u07FA\u0800-\u0815\u081A\u0824\u0828\u0840-\u0858\u08A0-\u08B2\u0904-\u0939\u093D\u0950\u0958-\u0961\u0971-\u0980\u0985-\u098C\u098F\u0990\u0993-\u09A8\u09AA-\u09B0\u09B2\u09B6-\u09B9\u09BD\u09CE\u09DC\u09DD\u09DF-\u09E1\u09F0\u09F1\u0A05-\u0A0A\u0A0F\u0A10\u0A13-\u0A28\u0A2A-\u0A30\u0A32\u0A33\u0A35\u0A36\u0A38\u0A39\u0A59-\u0A5C\u0A5E\u0A72-\u0A74\u0A85-\u0A8D\u0A8F-\u0A91\u0A93-\u0AA8\u0AAA-\u0AB0\u0AB2\u0AB3\u0AB5-\u0AB9\u0ABD\u0AD0\u0AE0\u0AE1\u0B05-\u0B0C\u0B0F\u0B10\u0B13-\u0B28\u0B2A-\u0B30\u0B32\u0B33\u0B35-\u0B39\u0B3D\u0B5C\u0B5D\u0B5F-\u0B61\u0B71\u0B83\u0B85-\u0B8A\u0B8E-\u0B90\u0B92-\u0B95\u0B99\u0B9A\u0B9C\u0B9E\u0B9F\u0BA3\u0BA4\u0BA8-\u0BAA\u0BAE-\u0BB9\u0BD0\u0C05-\u0C0C\u0C0E-\u0C10\u0C12-\u0C28\u0C2A-\u0C39\u0C3D\u0C58\u0C59\u0C60\u0C61\u0C85-\u0C8C\u0C8E-\u0C90\u0C92-\u0CA8\u0CAA-\u0CB3\u0CB5-\u0CB9\u0CBD\u0CDE\u0CE0\u0CE1\u0CF1\u0CF2\u0D05-\u0D0C\u0D0E-\u0D10\u0D12-\u0D3A\u0D3D\u0D4E\u0D60\u0D61\u0D7A-\u0D7F\u0D85-\u0D96\u0D9A-\u0DB1\u0DB3-\u0DBB\u0DBD\u0DC0-\u0DC6\u0E01-\u0E30\u0E32\u0E33\u0E40-\u0E46\u0E81\u0E82\u0E84\u0E87\u0E88\u0E8A\u0E8D\u0E94-\u0E97\u0E99-\u0E9F\u0EA1-\u0EA3\u0EA5\u0EA7\u0EAA\u0EAB\u0EAD-\u0EB0\u0EB2\u0EB3\u0EBD\u0EC0-\u0EC4\u0EC6\u0EDC-\u0EDF\u0F00\u0F40-\u0F47\u0F49-\u0F6C\u0F88-\u0F8C\u1000-\u102A\u103F\u1050-\u1055\u105A-\u105D\u1061\u1065\u1066\u106E-\u1070\u1075-\u1081\u108E\u10A0-\u10C5\u10C7\u10CD\u10D0-\u10FA\u10FC-\u1248\u124A-\u124D\u1250-\u1256\u1258\u125A-\u125D\u1260-\u1288\u128A-\u128D\u1290-\u12B0\u12B2-\u12B5\u12B8-\u12BE\u12C0\u12C2-\u12C5\u12C8-\u12D6\u12D8-\u1310\u1312-\u1315\u1318-\u135A\u1380-\u138F\u13A0-\u13F4\u1401-\u166C\u166F-\u167F\u1681-\u169A\u16A0-\u16EA\u16EE-\u16F8\u1700-\u170C\u170E-\u1711\u1720-\u1731\u1740-\u1751\u1760-\u176C\u176E-\u1770\u1780-\u17B3\u17D7\u17DC\u1820-\u1877\u1880-\u18A8\u18AA\u18B0-\u18F5\u1900-\u191E\u1950-\u196D\u1970-\u1974\u1980-\u19AB\u19C1-\u19C7\u1A00-\u1A16\u1A20-\u1A54\u1AA7\u1B05-\u1B33\u1B45-\u1B4B\u1B83-\u1BA0\u1BAE\u1BAF\u1BBA-\u1BE5\u1C00-\u1C23\u1C4D-\u1C4F\u1C5A-\u1C7D\u1CE9-\u1CEC\u1CEE-\u1CF1\u1CF5\u1CF6\u1D00-\u1DBF\u1E00-\u1F15\u1F18-\u1F1D\u1F20-\u1F45\u1F48-\u1F4D\u1F50-\u1F57\u1F59\u1F5B\u1F5D\u1F5F-\u1F7D\u1F80-\u1FB4\u1FB6-\u1FBC\u1FBE\u1FC2-\u1FC4\u1FC6-\u1FCC\u1FD0-\u1FD3\u1FD6-\u1FDB\u1FE0-\u1FEC\u1FF2-\u1FF4\u1FF6-\u1FFC\u2071\u207F\u2090-\u209C\u2102\u2107\u210A-\u2113\u2115\u2118-\u211D\u2124\u2126\u2128\u212A-\u2139\u213C-\u213F\u2145-\u2149\u214E\u2160-\u2188\u2C00-\u2C2E\u2C30-\u2C5E\u2C60-\u2CE4\u2CEB-\u2CEE\u2CF2\u2CF3\u2D00-\u2D25\u2D27\u2D2D\u2D30-\u2D67\u2D6F\u2D80-\u2D96\u2DA0-\u2DA6\u2DA8-\u2DAE\u2DB0-\u2DB6\u2DB8-\u2DBE\u2DC0-\u2DC6\u2DC8-\u2DCE\u2DD0-\u2DD6\u2DD8-\u2DDE\u3005-\u3007\u3021-\u3029\u3031-\u3035\u3038-\u303C\u3041-\u3096\u309B-\u309F\u30A1-\u30FA\u30FC-\u30FF\u3105-\u312D\u3131-\u318E\u31A0-\u31BA\u31F0-\u31FF\u3400-\u4DB5\u4E00-\u9FCC\uA000-\uA48C\uA4D0-\uA4FD\uA500-\uA60C\uA610-\uA61F\uA62A\uA62B\uA640-\uA66E\uA67F-\uA69D\uA6A0-\uA6EF\uA717-\uA71F\uA722-\uA788\uA78B-\uA78E\uA790-\uA7AD\uA7B0\uA7B1\uA7F7-\uA801\uA803-\uA805\uA807-\uA80A\uA80C-\uA822\uA840-\uA873\uA882-\uA8B3\uA8F2-\uA8F7\uA8FB\uA90A-\uA925\uA930-\uA946\uA960-\uA97C\uA984-\uA9B2\uA9CF\uA9E0-\uA9E4\uA9E6-\uA9EF\uA9FA-\uA9FE\uAA00-\uAA28\uAA40-\uAA42\uAA44-\uAA4B\uAA60-\uAA76\uAA7A\uAA7E-\uAAAF\uAAB1\uAAB5\uAAB6\uAAB9-\uAABD\uAAC0\uAAC2\uAADB-\uAADD\uAAE0-\uAAEA\uAAF2-\uAAF4\uAB01-\uAB06\uAB09-\uAB0E\uAB11-\uAB16\uAB20-\uAB26\uAB28-\uAB2E\uAB30-\uAB5A\uAB5C-\uAB5F\uAB64\uAB65\uABC0-\uABE2\uAC00-\uD7A3\uD7B0-\uD7C6\uD7CB-\uD7FB\uF900-\uFA6D\uFA70-\uFAD9\uFB00-\uFB06\uFB13-\uFB17\uFB1D\uFB1F-\uFB28\uFB2A-\uFB36\uFB38-\uFB3C\uFB3E\uFB40\uFB41\uFB43\uFB44\uFB46-\uFBB1\uFBD3-\uFD3D\uFD50-\uFD8F\uFD92-\uFDC7\uFDF0-\uFDFB\uFE70-\uFE74\uFE76-\uFEFC\uFF21-\uFF3A\uFF41-\uFF5A\uFF66-\uFFBE\uFFC2-\uFFC7\uFFCA-\uFFCF\uFFD2-\uFFD7\uFFDA-\uFFDC]|\uD800[\uDC00-\uDC0B\uDC0D-\uDC26\uDC28-\uDC3A\uDC3C\uDC3D\uDC3F-\uDC4D\uDC50-\uDC5D\uDC80-\uDCFA\uDD40-\uDD74\uDE80-\uDE9C\uDEA0-\uDED0\uDF00-\uDF1F\uDF30-\uDF4A\uDF50-\uDF75\uDF80-\uDF9D\uDFA0-\uDFC3\uDFC8-\uDFCF\uDFD1-\uDFD5]|\uD801[\uDC00-\uDC9D\uDD00-\uDD27\uDD30-\uDD63\uDE00-\uDF36\uDF40-\uDF55\uDF60-\uDF67]|\uD802[\uDC00-\uDC05\uDC08\uDC0A-\uDC35\uDC37\uDC38\uDC3C\uDC3F-\uDC55\uDC60-\uDC76\uDC80-\uDC9E\uDD00-\uDD15\uDD20-\uDD39\uDD80-\uDDB7\uDDBE\uDDBF\uDE00\uDE10-\uDE13\uDE15-\uDE17\uDE19-\uDE33\uDE60-\uDE7C\uDE80-\uDE9C\uDEC0-\uDEC7\uDEC9-\uDEE4\uDF00-\uDF35\uDF40-\uDF55\uDF60-\uDF72\uDF80-\uDF91]|\uD803[\uDC00-\uDC48]|\uD804[\uDC03-\uDC37\uDC83-\uDCAF\uDCD0-\uDCE8\uDD03-\uDD26\uDD50-\uDD72\uDD76\uDD83-\uDDB2\uDDC1-\uDDC4\uDDDA\uDE00-\uDE11\uDE13-\uDE2B\uDEB0-\uDEDE\uDF05-\uDF0C\uDF0F\uDF10\uDF13-\uDF28\uDF2A-\uDF30\uDF32\uDF33\uDF35-\uDF39\uDF3D\uDF5D-\uDF61]|\uD805[\uDC80-\uDCAF\uDCC4\uDCC5\uDCC7\uDD80-\uDDAE\uDE00-\uDE2F\uDE44\uDE80-\uDEAA]|\uD806[\uDCA0-\uDCDF\uDCFF\uDEC0-\uDEF8]|\uD808[\uDC00-\uDF98]|\uD809[\uDC00-\uDC6E]|[\uD80C\uD840-\uD868\uD86A-\uD86C][\uDC00-\uDFFF]|\uD80D[\uDC00-\uDC2E]|\uD81A[\uDC00-\uDE38\uDE40-\uDE5E\uDED0-\uDEED\uDF00-\uDF2F\uDF40-\uDF43\uDF63-\uDF77\uDF7D-\uDF8F]|\uD81B[\uDF00-\uDF44\uDF50\uDF93-\uDF9F]|\uD82C[\uDC00\uDC01]|\uD82F[\uDC00-\uDC6A\uDC70-\uDC7C\uDC80-\uDC88\uDC90-\uDC99]|\uD835[\uDC00-\uDC54\uDC56-\uDC9C\uDC9E\uDC9F\uDCA2\uDCA5\uDCA6\uDCA9-\uDCAC\uDCAE-\uDCB9\uDCBB\uDCBD-\uDCC3\uDCC5-\uDD05\uDD07-\uDD0A\uDD0D-\uDD14\uDD16-\uDD1C\uDD1E-\uDD39\uDD3B-\uDD3E\uDD40-\uDD44\uDD46\uDD4A-\uDD50\uDD52-\uDEA5\uDEA8-\uDEC0\uDEC2-\uDEDA\uDEDC-\uDEFA\uDEFC-\uDF14\uDF16-\uDF34\uDF36-\uDF4E\uDF50-\uDF6E\uDF70-\uDF88\uDF8A-\uDFA8\uDFAA-\uDFC2\uDFC4-\uDFCB]|\uD83A[\uDC00-\uDCC4]|\uD83B[\uDE00-\uDE03\uDE05-\uDE1F\uDE21\uDE22\uDE24\uDE27\uDE29-\uDE32\uDE34-\uDE37\uDE39\uDE3B\uDE42\uDE47\uDE49\uDE4B\uDE4D-\uDE4F\uDE51\uDE52\uDE54\uDE57\uDE59\uDE5B\uDE5D\uDE5F\uDE61\uDE62\uDE64\uDE67-\uDE6A\uDE6C-\uDE72\uDE74-\uDE77\uDE79-\uDE7C\uDE7E\uDE80-\uDE89\uDE8B-\uDE9B\uDEA1-\uDEA3\uDEA5-\uDEA9\uDEAB-\uDEBB]|\uD869[\uDC00-\uDED6\uDF00-\uDFFF]|\uD86D[\uDC00-\uDF34\uDF40-\uDFFF]|\uD86E[\uDC00-\uDC1D]|\uD87E[\uDC00-\uDE1D]/,
-        // ECMAScript 6/Unicode v7.0.0 NonAsciiIdentifierPart:
-        NonAsciiIdentifierPart: /[\xAA\xB5\xB7\xBA\xC0-\xD6\xD8-\xF6\xF8-\u02C1\u02C6-\u02D1\u02E0-\u02E4\u02EC\u02EE\u0300-\u0374\u0376\u0377\u037A-\u037D\u037F\u0386-\u038A\u038C\u038E-\u03A1\u03A3-\u03F5\u03F7-\u0481\u0483-\u0487\u048A-\u052F\u0531-\u0556\u0559\u0561-\u0587\u0591-\u05BD\u05BF\u05C1\u05C2\u05C4\u05C5\u05C7\u05D0-\u05EA\u05F0-\u05F2\u0610-\u061A\u0620-\u0669\u066E-\u06D3\u06D5-\u06DC\u06DF-\u06E8\u06EA-\u06FC\u06FF\u0710-\u074A\u074D-\u07B1\u07C0-\u07F5\u07FA\u0800-\u082D\u0840-\u085B\u08A0-\u08B2\u08E4-\u0963\u0966-\u096F\u0971-\u0983\u0985-\u098C\u098F\u0990\u0993-\u09A8\u09AA-\u09B0\u09B2\u09B6-\u09B9\u09BC-\u09C4\u09C7\u09C8\u09CB-\u09CE\u09D7\u09DC\u09DD\u09DF-\u09E3\u09E6-\u09F1\u0A01-\u0A03\u0A05-\u0A0A\u0A0F\u0A10\u0A13-\u0A28\u0A2A-\u0A30\u0A32\u0A33\u0A35\u0A36\u0A38\u0A39\u0A3C\u0A3E-\u0A42\u0A47\u0A48\u0A4B-\u0A4D\u0A51\u0A59-\u0A5C\u0A5E\u0A66-\u0A75\u0A81-\u0A83\u0A85-\u0A8D\u0A8F-\u0A91\u0A93-\u0AA8\u0AAA-\u0AB0\u0AB2\u0AB3\u0AB5-\u0AB9\u0ABC-\u0AC5\u0AC7-\u0AC9\u0ACB-\u0ACD\u0AD0\u0AE0-\u0AE3\u0AE6-\u0AEF\u0B01-\u0B03\u0B05-\u0B0C\u0B0F\u0B10\u0B13-\u0B28\u0B2A-\u0B30\u0B32\u0B33\u0B35-\u0B39\u0B3C-\u0B44\u0B47\u0B48\u0B4B-\u0B4D\u0B56\u0B57\u0B5C\u0B5D\u0B5F-\u0B63\u0B66-\u0B6F\u0B71\u0B82\u0B83\u0B85-\u0B8A\u0B8E-\u0B90\u0B92-\u0B95\u0B99\u0B9A\u0B9C\u0B9E\u0B9F\u0BA3\u0BA4\u0BA8-\u0BAA\u0BAE-\u0BB9\u0BBE-\u0BC2\u0BC6-\u0BC8\u0BCA-\u0BCD\u0BD0\u0BD7\u0BE6-\u0BEF\u0C00-\u0C03\u0C05-\u0C0C\u0C0E-\u0C10\u0C12-\u0C28\u0C2A-\u0C39\u0C3D-\u0C44\u0C46-\u0C48\u0C4A-\u0C4D\u0C55\u0C56\u0C58\u0C59\u0C60-\u0C63\u0C66-\u0C6F\u0C81-\u0C83\u0C85-\u0C8C\u0C8E-\u0C90\u0C92-\u0CA8\u0CAA-\u0CB3\u0CB5-\u0CB9\u0CBC-\u0CC4\u0CC6-\u0CC8\u0CCA-\u0CCD\u0CD5\u0CD6\u0CDE\u0CE0-\u0CE3\u0CE6-\u0CEF\u0CF1\u0CF2\u0D01-\u0D03\u0D05-\u0D0C\u0D0E-\u0D10\u0D12-\u0D3A\u0D3D-\u0D44\u0D46-\u0D48\u0D4A-\u0D4E\u0D57\u0D60-\u0D63\u0D66-\u0D6F\u0D7A-\u0D7F\u0D82\u0D83\u0D85-\u0D96\u0D9A-\u0DB1\u0DB3-\u0DBB\u0DBD\u0DC0-\u0DC6\u0DCA\u0DCF-\u0DD4\u0DD6\u0DD8-\u0DDF\u0DE6-\u0DEF\u0DF2\u0DF3\u0E01-\u0E3A\u0E40-\u0E4E\u0E50-\u0E59\u0E81\u0E82\u0E84\u0E87\u0E88\u0E8A\u0E8D\u0E94-\u0E97\u0E99-\u0E9F\u0EA1-\u0EA3\u0EA5\u0EA7\u0EAA\u0EAB\u0EAD-\u0EB9\u0EBB-\u0EBD\u0EC0-\u0EC4\u0EC6\u0EC8-\u0ECD\u0ED0-\u0ED9\u0EDC-\u0EDF\u0F00\u0F18\u0F19\u0F20-\u0F29\u0F35\u0F37\u0F39\u0F3E-\u0F47\u0F49-\u0F6C\u0F71-\u0F84\u0F86-\u0F97\u0F99-\u0FBC\u0FC6\u1000-\u1049\u1050-\u109D\u10A0-\u10C5\u10C7\u10CD\u10D0-\u10FA\u10FC-\u1248\u124A-\u124D\u1250-\u1256\u1258\u125A-\u125D\u1260-\u1288\u128A-\u128D\u1290-\u12B0\u12B2-\u12B5\u12B8-\u12BE\u12C0\u12C2-\u12C5\u12C8-\u12D6\u12D8-\u1310\u1312-\u1315\u1318-\u135A\u135D-\u135F\u1369-\u1371\u1380-\u138F\u13A0-\u13F4\u1401-\u166C\u166F-\u167F\u1681-\u169A\u16A0-\u16EA\u16EE-\u16F8\u1700-\u170C\u170E-\u1714\u1720-\u1734\u1740-\u1753\u1760-\u176C\u176E-\u1770\u1772\u1773\u1780-\u17D3\u17D7\u17DC\u17DD\u17E0-\u17E9\u180B-\u180D\u1810-\u1819\u1820-\u1877\u1880-\u18AA\u18B0-\u18F5\u1900-\u191E\u1920-\u192B\u1930-\u193B\u1946-\u196D\u1970-\u1974\u1980-\u19AB\u19B0-\u19C9\u19D0-\u19DA\u1A00-\u1A1B\u1A20-\u1A5E\u1A60-\u1A7C\u1A7F-\u1A89\u1A90-\u1A99\u1AA7\u1AB0-\u1ABD\u1B00-\u1B4B\u1B50-\u1B59\u1B6B-\u1B73\u1B80-\u1BF3\u1C00-\u1C37\u1C40-\u1C49\u1C4D-\u1C7D\u1CD0-\u1CD2\u1CD4-\u1CF6\u1CF8\u1CF9\u1D00-\u1DF5\u1DFC-\u1F15\u1F18-\u1F1D\u1F20-\u1F45\u1F48-\u1F4D\u1F50-\u1F57\u1F59\u1F5B\u1F5D\u1F5F-\u1F7D\u1F80-\u1FB4\u1FB6-\u1FBC\u1FBE\u1FC2-\u1FC4\u1FC6-\u1FCC\u1FD0-\u1FD3\u1FD6-\u1FDB\u1FE0-\u1FEC\u1FF2-\u1FF4\u1FF6-\u1FFC\u200C\u200D\u203F\u2040\u2054\u2071\u207F\u2090-\u209C\u20D0-\u20DC\u20E1\u20E5-\u20F0\u2102\u2107\u210A-\u2113\u2115\u2118-\u211D\u2124\u2126\u2128\u212A-\u2139\u213C-\u213F\u2145-\u2149\u214E\u2160-\u2188\u2C00-\u2C2E\u2C30-\u2C5E\u2C60-\u2CE4\u2CEB-\u2CF3\u2D00-\u2D25\u2D27\u2D2D\u2D30-\u2D67\u2D6F\u2D7F-\u2D96\u2DA0-\u2DA6\u2DA8-\u2DAE\u2DB0-\u2DB6\u2DB8-\u2DBE\u2DC0-\u2DC6\u2DC8-\u2DCE\u2DD0-\u2DD6\u2DD8-\u2DDE\u2DE0-\u2DFF\u3005-\u3007\u3021-\u302F\u3031-\u3035\u3038-\u303C\u3041-\u3096\u3099-\u309F\u30A1-\u30FA\u30FC-\u30FF\u3105-\u312D\u3131-\u318E\u31A0-\u31BA\u31F0-\u31FF\u3400-\u4DB5\u4E00-\u9FCC\uA000-\uA48C\uA4D0-\uA4FD\uA500-\uA60C\uA610-\uA62B\uA640-\uA66F\uA674-\uA67D\uA67F-\uA69D\uA69F-\uA6F1\uA717-\uA71F\uA722-\uA788\uA78B-\uA78E\uA790-\uA7AD\uA7B0\uA7B1\uA7F7-\uA827\uA840-\uA873\uA880-\uA8C4\uA8D0-\uA8D9\uA8E0-\uA8F7\uA8FB\uA900-\uA92D\uA930-\uA953\uA960-\uA97C\uA980-\uA9C0\uA9CF-\uA9D9\uA9E0-\uA9FE\uAA00-\uAA36\uAA40-\uAA4D\uAA50-\uAA59\uAA60-\uAA76\uAA7A-\uAAC2\uAADB-\uAADD\uAAE0-\uAAEF\uAAF2-\uAAF6\uAB01-\uAB06\uAB09-\uAB0E\uAB11-\uAB16\uAB20-\uAB26\uAB28-\uAB2E\uAB30-\uAB5A\uAB5C-\uAB5F\uAB64\uAB65\uABC0-\uABEA\uABEC\uABED\uABF0-\uABF9\uAC00-\uD7A3\uD7B0-\uD7C6\uD7CB-\uD7FB\uF900-\uFA6D\uFA70-\uFAD9\uFB00-\uFB06\uFB13-\uFB17\uFB1D-\uFB28\uFB2A-\uFB36\uFB38-\uFB3C\uFB3E\uFB40\uFB41\uFB43\uFB44\uFB46-\uFBB1\uFBD3-\uFD3D\uFD50-\uFD8F\uFD92-\uFDC7\uFDF0-\uFDFB\uFE00-\uFE0F\uFE20-\uFE2D\uFE33\uFE34\uFE4D-\uFE4F\uFE70-\uFE74\uFE76-\uFEFC\uFF10-\uFF19\uFF21-\uFF3A\uFF3F\uFF41-\uFF5A\uFF66-\uFFBE\uFFC2-\uFFC7\uFFCA-\uFFCF\uFFD2-\uFFD7\uFFDA-\uFFDC]|\uD800[\uDC00-\uDC0B\uDC0D-\uDC26\uDC28-\uDC3A\uDC3C\uDC3D\uDC3F-\uDC4D\uDC50-\uDC5D\uDC80-\uDCFA\uDD40-\uDD74\uDDFD\uDE80-\uDE9C\uDEA0-\uDED0\uDEE0\uDF00-\uDF1F\uDF30-\uDF4A\uDF50-\uDF7A\uDF80-\uDF9D\uDFA0-\uDFC3\uDFC8-\uDFCF\uDFD1-\uDFD5]|\uD801[\uDC00-\uDC9D\uDCA0-\uDCA9\uDD00-\uDD27\uDD30-\uDD63\uDE00-\uDF36\uDF40-\uDF55\uDF60-\uDF67]|\uD802[\uDC00-\uDC05\uDC08\uDC0A-\uDC35\uDC37\uDC38\uDC3C\uDC3F-\uDC55\uDC60-\uDC76\uDC80-\uDC9E\uDD00-\uDD15\uDD20-\uDD39\uDD80-\uDDB7\uDDBE\uDDBF\uDE00-\uDE03\uDE05\uDE06\uDE0C-\uDE13\uDE15-\uDE17\uDE19-\uDE33\uDE38-\uDE3A\uDE3F\uDE60-\uDE7C\uDE80-\uDE9C\uDEC0-\uDEC7\uDEC9-\uDEE6\uDF00-\uDF35\uDF40-\uDF55\uDF60-\uDF72\uDF80-\uDF91]|\uD803[\uDC00-\uDC48]|\uD804[\uDC00-\uDC46\uDC66-\uDC6F\uDC7F-\uDCBA\uDCD0-\uDCE8\uDCF0-\uDCF9\uDD00-\uDD34\uDD36-\uDD3F\uDD50-\uDD73\uDD76\uDD80-\uDDC4\uDDD0-\uDDDA\uDE00-\uDE11\uDE13-\uDE37\uDEB0-\uDEEA\uDEF0-\uDEF9\uDF01-\uDF03\uDF05-\uDF0C\uDF0F\uDF10\uDF13-\uDF28\uDF2A-\uDF30\uDF32\uDF33\uDF35-\uDF39\uDF3C-\uDF44\uDF47\uDF48\uDF4B-\uDF4D\uDF57\uDF5D-\uDF63\uDF66-\uDF6C\uDF70-\uDF74]|\uD805[\uDC80-\uDCC5\uDCC7\uDCD0-\uDCD9\uDD80-\uDDB5\uDDB8-\uDDC0\uDE00-\uDE40\uDE44\uDE50-\uDE59\uDE80-\uDEB7\uDEC0-\uDEC9]|\uD806[\uDCA0-\uDCE9\uDCFF\uDEC0-\uDEF8]|\uD808[\uDC00-\uDF98]|\uD809[\uDC00-\uDC6E]|[\uD80C\uD840-\uD868\uD86A-\uD86C][\uDC00-\uDFFF]|\uD80D[\uDC00-\uDC2E]|\uD81A[\uDC00-\uDE38\uDE40-\uDE5E\uDE60-\uDE69\uDED0-\uDEED\uDEF0-\uDEF4\uDF00-\uDF36\uDF40-\uDF43\uDF50-\uDF59\uDF63-\uDF77\uDF7D-\uDF8F]|\uD81B[\uDF00-\uDF44\uDF50-\uDF7E\uDF8F-\uDF9F]|\uD82C[\uDC00\uDC01]|\uD82F[\uDC00-\uDC6A\uDC70-\uDC7C\uDC80-\uDC88\uDC90-\uDC99\uDC9D\uDC9E]|\uD834[\uDD65-\uDD69\uDD6D-\uDD72\uDD7B-\uDD82\uDD85-\uDD8B\uDDAA-\uDDAD\uDE42-\uDE44]|\uD835[\uDC00-\uDC54\uDC56-\uDC9C\uDC9E\uDC9F\uDCA2\uDCA5\uDCA6\uDCA9-\uDCAC\uDCAE-\uDCB9\uDCBB\uDCBD-\uDCC3\uDCC5-\uDD05\uDD07-\uDD0A\uDD0D-\uDD14\uDD16-\uDD1C\uDD1E-\uDD39\uDD3B-\uDD3E\uDD40-\uDD44\uDD46\uDD4A-\uDD50\uDD52-\uDEA5\uDEA8-\uDEC0\uDEC2-\uDEDA\uDEDC-\uDEFA\uDEFC-\uDF14\uDF16-\uDF34\uDF36-\uDF4E\uDF50-\uDF6E\uDF70-\uDF88\uDF8A-\uDFA8\uDFAA-\uDFC2\uDFC4-\uDFCB\uDFCE-\uDFFF]|\uD83A[\uDC00-\uDCC4\uDCD0-\uDCD6]|\uD83B[\uDE00-\uDE03\uDE05-\uDE1F\uDE21\uDE22\uDE24\uDE27\uDE29-\uDE32\uDE34-\uDE37\uDE39\uDE3B\uDE42\uDE47\uDE49\uDE4B\uDE4D-\uDE4F\uDE51\uDE52\uDE54\uDE57\uDE59\uDE5B\uDE5D\uDE5F\uDE61\uDE62\uDE64\uDE67-\uDE6A\uDE6C-\uDE72\uDE74-\uDE77\uDE79-\uDE7C\uDE7E\uDE80-\uDE89\uDE8B-\uDE9B\uDEA1-\uDEA3\uDEA5-\uDEA9\uDEAB-\uDEBB]|\uD869[\uDC00-\uDED6\uDF00-\uDFFF]|\uD86D[\uDC00-\uDF34\uDF40-\uDFFF]|\uD86E[\uDC00-\uDC1D]|\uD87E[\uDC00-\uDE1D]|\uDB40[\uDD00-\uDDEF]/
-    };
-
-    function isDecimalDigit(ch) {
-        return 0x30 <= ch && ch <= 0x39;  // 0..9
-    }
-
-    function isHexDigit(ch) {
-        return 0x30 <= ch && ch <= 0x39 ||  // 0..9
-            0x61 <= ch && ch <= 0x66 ||     // a..f
-            0x41 <= ch && ch <= 0x46;       // A..F
-    }
+/***/ (function(module, exports, __webpack_require__) {
 
-    function isOctalDigit(ch) {
-        return ch >= 0x30 && ch <= 0x37;  // 0..7
-    }
+"use strict";
 
-    // 7.2 White Space
 
-    NON_ASCII_WHITESPACES = [
-        0x1680, 0x180E,
-        0x2000, 0x2001, 0x2002, 0x2003, 0x2004, 0x2005, 0x2006, 0x2007, 0x2008, 0x2009, 0x200A,
-        0x202F, 0x205F,
-        0x3000,
-        0xFEFF
-    ];
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.isIdentifierStart = isIdentifierStart;
+exports.isIdentifierChar = isIdentifierChar;
+exports.isIdentifierName = isIdentifierName;
+let nonASCIIidentifierStartChars = "\xaa\xb5\xba\xc0-\xd6\xd8-\xf6\xf8-\u02c1\u02c6-\u02d1\u02e0-\u02e4\u02ec\u02ee\u0370-\u0374\u0376\u0377\u037a-\u037d\u037f\u0386\u0388-\u038a\u038c\u038e-\u03a1\u03a3-\u03f5\u03f7-\u0481\u048a-\u052f\u0531-\u0556\u0559\u0560-\u0588\u05d0-\u05ea\u05ef-\u05f2\u0620-\u064a\u066e\u066f\u0671-\u06d3\u06d5\u06e5\u06e6\u06ee\u06ef\u06fa-\u06fc\u06ff\u0710\u0712-\u072f\u074d-\u07a5\u07b1\u07ca-\u07ea\u07f4\u07f5\u07fa\u0800-\u0815\u081a\u0824\u0828\u0840-\u0858\u0860-\u086a\u08a0-\u08b4\u08b6-\u08c7\u0904-\u0939\u093d\u0950\u0958-\u0961\u0971-\u0980\u0985-\u098c\u098f\u0990\u0993-\u09a8\u09aa-\u09b0\u09b2\u09b6-\u09b9\u09bd\u09ce\u09dc\u09dd\u09df-\u09e1\u09f0\u09f1\u09fc\u0a05-\u0a0a\u0a0f\u0a10\u0a13-\u0a28\u0a2a-\u0a30\u0a32\u0a33\u0a35\u0a36\u0a38\u0a39\u0a59-\u0a5c\u0a5e\u0a72-\u0a74\u0a85-\u0a8d\u0a8f-\u0a91\u0a93-\u0aa8\u0aaa-\u0ab0\u0ab2\u0ab3\u0ab5-\u0ab9\u0abd\u0ad0\u0ae0\u0ae1\u0af9\u0b05-\u0b0c\u0b0f\u0b10\u0b13-\u0b28\u0b2a-\u0b30\u0b32\u0b33\u0b35-\u0b39\u0b3d\u0b5c\u0b5d\u0b5f-\u0b61\u0b71\u0b83\u0b85-\u0b8a\u0b8e-\u0b90\u0b92-\u0b95\u0b99\u0b9a\u0b9c\u0b9e\u0b9f\u0ba3\u0ba4\u0ba8-\u0baa\u0bae-\u0bb9\u0bd0\u0c05-\u0c0c\u0c0e-\u0c10\u0c12-\u0c28\u0c2a-\u0c39\u0c3d\u0c58-\u0c5a\u0c60\u0c61\u0c80\u0c85-\u0c8c\u0c8e-\u0c90\u0c92-\u0ca8\u0caa-\u0cb3\u0cb5-\u0cb9\u0cbd\u0cde\u0ce0\u0ce1\u0cf1\u0cf2\u0d04-\u0d0c\u0d0e-\u0d10\u0d12-\u0d3a\u0d3d\u0d4e\u0d54-\u0d56\u0d5f-\u0d61\u0d7a-\u0d7f\u0d85-\u0d96\u0d9a-\u0db1\u0db3-\u0dbb\u0dbd\u0dc0-\u0dc6\u0e01-\u0e30\u0e32\u0e33\u0e40-\u0e46\u0e81\u0e82\u0e84\u0e86-\u0e8a\u0e8c-\u0ea3\u0ea5\u0ea7-\u0eb0\u0eb2\u0eb3\u0ebd\u0ec0-\u0ec4\u0ec6\u0edc-\u0edf\u0f00\u0f40-\u0f47\u0f49-\u0f6c\u0f88-\u0f8c\u1000-\u102a\u103f\u1050-\u1055\u105a-\u105d\u1061\u1065\u1066\u106e-\u1070\u1075-\u1081\u108e\u10a0-\u10c5\u10c7\u10cd\u10d0-\u10fa\u10fc-\u1248\u124a-\u124d\u1250-\u1256\u1258\u125a-\u125d\u1260-\u1288\u128a-\u128d\u1290-\u12b0\u12b2-\u12b5\u12b8-\u12be\u12c0\u12c2-\u12c5\u12c8-\u12d6\u12d8-\u1310\u1312-\u1315\u1318-\u135a\u1380-\u138f\u13a0-\u13f5\u13f8-\u13fd\u1401-\u166c\u166f-\u167f\u1681-\u169a\u16a0-\u16ea\u16ee-\u16f8\u1700-\u170c\u170e-\u1711\u1720-\u1731\u1740-\u1751\u1760-\u176c\u176e-\u1770\u1780-\u17b3\u17d7\u17dc\u1820-\u1878\u1880-\u18a8\u18aa\u18b0-\u18f5\u1900-\u191e\u1950-\u196d\u1970-\u1974\u1980-\u19ab\u19b0-\u19c9\u1a00-\u1a16\u1a20-\u1a54\u1aa7\u1b05-\u1b33\u1b45-\u1b4b\u1b83-\u1ba0\u1bae\u1baf\u1bba-\u1be5\u1c00-\u1c23\u1c4d-\u1c4f\u1c5a-\u1c7d\u1c80-\u1c88\u1c90-\u1cba\u1cbd-\u1cbf\u1ce9-\u1cec\u1cee-\u1cf3\u1cf5\u1cf6\u1cfa\u1d00-\u1dbf\u1e00-\u1f15\u1f18-\u1f1d\u1f20-\u1f45\u1f48-\u1f4d\u1f50-\u1f57\u1f59\u1f5b\u1f5d\u1f5f-\u1f7d\u1f80-\u1fb4\u1fb6-\u1fbc\u1fbe\u1fc2-\u1fc4\u1fc6-\u1fcc\u1fd0-\u1fd3\u1fd6-\u1fdb\u1fe0-\u1fec\u1ff2-\u1ff4\u1ff6-\u1ffc\u2071\u207f\u2090-\u209c\u2102\u2107\u210a-\u2113\u2115\u2118-\u211d\u2124\u2126\u2128\u212a-\u2139\u213c-\u213f\u2145-\u2149\u214e\u2160-\u2188\u2c00-\u2c2e\u2c30-\u2c5e\u2c60-\u2ce4\u2ceb-\u2cee\u2cf2\u2cf3\u2d00-\u2d25\u2d27\u2d2d\u2d30-\u2d67\u2d6f\u2d80-\u2d96\u2da0-\u2da6\u2da8-\u2dae\u2db0-\u2db6\u2db8-\u2dbe\u2dc0-\u2dc6\u2dc8-\u2dce\u2dd0-\u2dd6\u2dd8-\u2dde\u3005-\u3007\u3021-\u3029\u3031-\u3035\u3038-\u303c\u3041-\u3096\u309b-\u309f\u30a1-\u30fa\u30fc-\u30ff\u3105-\u312f\u3131-\u318e\u31a0-\u31bf\u31f0-\u31ff\u3400-\u4dbf\u4e00-\u9ffc\ua000-\ua48c\ua4d0-\ua4fd\ua500-\ua60c\ua610-\ua61f\ua62a\ua62b\ua640-\ua66e\ua67f-\ua69d\ua6a0-\ua6ef\ua717-\ua71f\ua722-\ua788\ua78b-\ua7bf\ua7c2-\ua7ca\ua7f5-\ua801\ua803-\ua805\ua807-\ua80a\ua80c-\ua822\ua840-\ua873\ua882-\ua8b3\ua8f2-\ua8f7\ua8fb\ua8fd\ua8fe\ua90a-\ua925\ua930-\ua946\ua960-\ua97c\ua984-\ua9b2\ua9cf\ua9e0-\ua9e4\ua9e6-\ua9ef\ua9fa-\ua9fe\uaa00-\uaa28\uaa40-\uaa42\uaa44-\uaa4b\uaa60-\uaa76\uaa7a\uaa7e-\uaaaf\uaab1\uaab5\uaab6\uaab9-\uaabd\uaac0\uaac2\uaadb-\uaadd\uaae0-\uaaea\uaaf2-\uaaf4\uab01-\uab06\uab09-\uab0e\uab11-\uab16\uab20-\uab26\uab28-\uab2e\uab30-\uab5a\uab5c-\uab69\uab70-\uabe2\uac00-\ud7a3\ud7b0-\ud7c6\ud7cb-\ud7fb\uf900-\ufa6d\ufa70-\ufad9\ufb00-\ufb06\ufb13-\ufb17\ufb1d\ufb1f-\ufb28\ufb2a-\ufb36\ufb38-\ufb3c\ufb3e\ufb40\ufb41\ufb43\ufb44\ufb46-\ufbb1\ufbd3-\ufd3d\ufd50-\ufd8f\ufd92-\ufdc7\ufdf0-\ufdfb\ufe70-\ufe74\ufe76-\ufefc\uff21-\uff3a\uff41-\uff5a\uff66-\uffbe\uffc2-\uffc7\uffca-\uffcf\uffd2-\uffd7\uffda-\uffdc";
+let nonASCIIidentifierChars = "\u200c\u200d\xb7\u0300-\u036f\u0387\u0483-\u0487\u0591-\u05bd\u05bf\u05c1\u05c2\u05c4\u05c5\u05c7\u0610-\u061a\u064b-\u0669\u0670\u06d6-\u06dc\u06df-\u06e4\u06e7\u06e8\u06ea-\u06ed\u06f0-\u06f9\u0711\u0730-\u074a\u07a6-\u07b0\u07c0-\u07c9\u07eb-\u07f3\u07fd\u0816-\u0819\u081b-\u0823\u0825-\u0827\u0829-\u082d\u0859-\u085b\u08d3-\u08e1\u08e3-\u0903\u093a-\u093c\u093e-\u094f\u0951-\u0957\u0962\u0963\u0966-\u096f\u0981-\u0983\u09bc\u09be-\u09c4\u09c7\u09c8\u09cb-\u09cd\u09d7\u09e2\u09e3\u09e6-\u09ef\u09fe\u0a01-\u0a03\u0a3c\u0a3e-\u0a42\u0a47\u0a48\u0a4b-\u0a4d\u0a51\u0a66-\u0a71\u0a75\u0a81-\u0a83\u0abc\u0abe-\u0ac5\u0ac7-\u0ac9\u0acb-\u0acd\u0ae2\u0ae3\u0ae6-\u0aef\u0afa-\u0aff\u0b01-\u0b03\u0b3c\u0b3e-\u0b44\u0b47\u0b48\u0b4b-\u0b4d\u0b55-\u0b57\u0b62\u0b63\u0b66-\u0b6f\u0b82\u0bbe-\u0bc2\u0bc6-\u0bc8\u0bca-\u0bcd\u0bd7\u0be6-\u0bef\u0c00-\u0c04\u0c3e-\u0c44\u0c46-\u0c48\u0c4a-\u0c4d\u0c55\u0c56\u0c62\u0c63\u0c66-\u0c6f\u0c81-\u0c83\u0cbc\u0cbe-\u0cc4\u0cc6-\u0cc8\u0cca-\u0ccd\u0cd5\u0cd6\u0ce2\u0ce3\u0ce6-\u0cef\u0d00-\u0d03\u0d3b\u0d3c\u0d3e-\u0d44\u0d46-\u0d48\u0d4a-\u0d4d\u0d57\u0d62\u0d63\u0d66-\u0d6f\u0d81-\u0d83\u0dca\u0dcf-\u0dd4\u0dd6\u0dd8-\u0ddf\u0de6-\u0def\u0df2\u0df3\u0e31\u0e34-\u0e3a\u0e47-\u0e4e\u0e50-\u0e59\u0eb1\u0eb4-\u0ebc\u0ec8-\u0ecd\u0ed0-\u0ed9\u0f18\u0f19\u0f20-\u0f29\u0f35\u0f37\u0f39\u0f3e\u0f3f\u0f71-\u0f84\u0f86\u0f87\u0f8d-\u0f97\u0f99-\u0fbc\u0fc6\u102b-\u103e\u1040-\u1049\u1056-\u1059\u105e-\u1060\u1062-\u1064\u1067-\u106d\u1071-\u1074\u1082-\u108d\u108f-\u109d\u135d-\u135f\u1369-\u1371\u1712-\u1714\u1732-\u1734\u1752\u1753\u1772\u1773\u17b4-\u17d3\u17dd\u17e0-\u17e9\u180b-\u180d\u1810-\u1819\u18a9\u1920-\u192b\u1930-\u193b\u1946-\u194f\u19d0-\u19da\u1a17-\u1a1b\u1a55-\u1a5e\u1a60-\u1a7c\u1a7f-\u1a89\u1a90-\u1a99\u1ab0-\u1abd\u1abf\u1ac0\u1b00-\u1b04\u1b34-\u1b44\u1b50-\u1b59\u1b6b-\u1b73\u1b80-\u1b82\u1ba1-\u1bad\u1bb0-\u1bb9\u1be6-\u1bf3\u1c24-\u1c37\u1c40-\u1c49\u1c50-\u1c59\u1cd0-\u1cd2\u1cd4-\u1ce8\u1ced\u1cf4\u1cf7-\u1cf9\u1dc0-\u1df9\u1dfb-\u1dff\u203f\u2040\u2054\u20d0-\u20dc\u20e1\u20e5-\u20f0\u2cef-\u2cf1\u2d7f\u2de0-\u2dff\u302a-\u302f\u3099\u309a\ua620-\ua629\ua66f\ua674-\ua67d\ua69e\ua69f\ua6f0\ua6f1\ua802\ua806\ua80b\ua823-\ua827\ua82c\ua880\ua881\ua8b4-\ua8c5\ua8d0-\ua8d9\ua8e0-\ua8f1\ua8ff-\ua909\ua926-\ua92d\ua947-\ua953\ua980-\ua983\ua9b3-\ua9c0\ua9d0-\ua9d9\ua9e5\ua9f0-\ua9f9\uaa29-\uaa36\uaa43\uaa4c\uaa4d\uaa50-\uaa59\uaa7b-\uaa7d\uaab0\uaab2-\uaab4\uaab7\uaab8\uaabe\uaabf\uaac1\uaaeb-\uaaef\uaaf5\uaaf6\uabe3-\uabea\uabec\uabed\uabf0-\uabf9\ufb1e\ufe00-\ufe0f\ufe20-\ufe2f\ufe33\ufe34\ufe4d-\ufe4f\uff10-\uff19\uff3f";
+const nonASCIIidentifierStart = new RegExp("[" + nonASCIIidentifierStartChars + "]");
+const nonASCIIidentifier = new RegExp("[" + nonASCIIidentifierStartChars + nonASCIIidentifierChars + "]");
+nonASCIIidentifierStartChars = nonASCIIidentifierChars = null;
+const astralIdentifierStartCodes = [0, 11, 2, 25, 2, 18, 2, 1, 2, 14, 3, 13, 35, 122, 70, 52, 268, 28, 4, 48, 48, 31, 14, 29, 6, 37, 11, 29, 3, 35, 5, 7, 2, 4, 43, 157, 19, 35, 5, 35, 5, 39, 9, 51, 157, 310, 10, 21, 11, 7, 153, 5, 3, 0, 2, 43, 2, 1, 4, 0, 3, 22, 11, 22, 10, 30, 66, 18, 2, 1, 11, 21, 11, 25, 71, 55, 7, 1, 65, 0, 16, 3, 2, 2, 2, 28, 43, 28, 4, 28, 36, 7, 2, 27, 28, 53, 11, 21, 11, 18, 14, 17, 111, 72, 56, 50, 14, 50, 14, 35, 349, 41, 7, 1, 79, 28, 11, 0, 9, 21, 107, 20, 28, 22, 13, 52, 76, 44, 33, 24, 27, 35, 30, 0, 3, 0, 9, 34, 4, 0, 13, 47, 15, 3, 22, 0, 2, 0, 36, 17, 2, 24, 85, 6, 2, 0, 2, 3, 2, 14, 2, 9, 8, 46, 39, 7, 3, 1, 3, 21, 2, 6, 2, 1, 2, 4, 4, 0, 19, 0, 13, 4, 159, 52, 19, 3, 21, 2, 31, 47, 21, 1, 2, 0, 185, 46, 42, 3, 37, 47, 21, 0, 60, 42, 14, 0, 72, 26, 230, 43, 117, 63, 32, 7, 3, 0, 3, 7, 2, 1, 2, 23, 16, 0, 2, 0, 95, 7, 3, 38, 17, 0, 2, 0, 29, 0, 11, 39, 8, 0, 22, 0, 12, 45, 20, 0, 35, 56, 264, 8, 2, 36, 18, 0, 50, 29, 113, 6, 2, 1, 2, 37, 22, 0, 26, 5, 2, 1, 2, 31, 15, 0, 328, 18, 190, 0, 80, 921, 103, 110, 18, 195, 2749, 1070, 4050, 582, 8634, 568, 8, 30, 114, 29, 19, 47, 17, 3, 32, 20, 6, 18, 689, 63, 129, 74, 6, 0, 67, 12, 65, 1, 2, 0, 29, 6135, 9, 1237, 43, 8, 8952, 286, 50, 2, 18, 3, 9, 395, 2309, 106, 6, 12, 4, 8, 8, 9, 5991, 84, 2, 70, 2, 1, 3, 0, 3, 1, 3, 3, 2, 11, 2, 0, 2, 6, 2, 64, 2, 3, 3, 7, 2, 6, 2, 27, 2, 3, 2, 4, 2, 0, 4, 6, 2, 339, 3, 24, 2, 24, 2, 30, 2, 24, 2, 30, 2, 24, 2, 30, 2, 24, 2, 30, 2, 24, 2, 7, 2357, 44, 11, 6, 17, 0, 370, 43, 1301, 196, 60, 67, 8, 0, 1205, 3, 2, 26, 2, 1, 2, 0, 3, 0, 2, 9, 2, 3, 2, 0, 2, 0, 7, 0, 5, 0, 2, 0, 2, 0, 2, 2, 2, 1, 2, 0, 3, 0, 2, 0, 2, 0, 2, 0, 2, 0, 2, 1, 2, 0, 3, 3, 2, 6, 2, 3, 2, 3, 2, 0, 2, 9, 2, 16, 6, 2, 2, 4, 2, 16, 4421, 42717, 35, 4148, 12, 221, 3, 5761, 15, 7472, 3104, 541, 1507, 4938];
+const astralIdentifierCodes = [509, 0, 227, 0, 150, 4, 294, 9, 1368, 2, 2, 1, 6, 3, 41, 2, 5, 0, 166, 1, 574, 3, 9, 9, 370, 1, 154, 10, 176, 2, 54, 14, 32, 9, 16, 3, 46, 10, 54, 9, 7, 2, 37, 13, 2, 9, 6, 1, 45, 0, 13, 2, 49, 13, 9, 3, 2, 11, 83, 11, 7, 0, 161, 11, 6, 9, 7, 3, 56, 1, 2, 6, 3, 1, 3, 2, 10, 0, 11, 1, 3, 6, 4, 4, 193, 17, 10, 9, 5, 0, 82, 19, 13, 9, 214, 6, 3, 8, 28, 1, 83, 16, 16, 9, 82, 12, 9, 9, 84, 14, 5, 9, 243, 14, 166, 9, 71, 5, 2, 1, 3, 3, 2, 0, 2, 1, 13, 9, 120, 6, 3, 6, 4, 0, 29, 9, 41, 6, 2, 3, 9, 0, 10, 10, 47, 15, 406, 7, 2, 7, 17, 9, 57, 21, 2, 13, 123, 5, 4, 0, 2, 1, 2, 6, 2, 0, 9, 9, 49, 4, 2, 1, 2, 4, 9, 9, 330, 3, 19306, 9, 135, 4, 60, 6, 26, 9, 1014, 0, 2, 54, 8, 3, 82, 0, 12, 1, 19628, 1, 5319, 4, 4, 5, 9, 7, 3, 6, 31, 3, 149, 2, 1418, 49, 513, 54, 5, 49, 9, 0, 15, 0, 23, 4, 2, 14, 1361, 6, 2, 16, 3, 6, 2, 1, 2, 4, 262, 6, 10, 9, 419, 13, 1495, 6, 110, 6, 6, 9, 4759, 9, 787719, 239];
+
+function isInAstralSet(code, set) {
+  let pos = 0x10000;
+
+  for (let i = 0, length = set.length; i < length; i += 2) {
+    pos += set[i];
+    if (pos > code) return false;
+    pos += set[i + 1];
+    if (pos >= code) return true;
+  }
 
-    function isWhiteSpace(ch) {
-        return ch === 0x20 || ch === 0x09 || ch === 0x0B || ch === 0x0C || ch === 0xA0 ||
-            ch >= 0x1680 && NON_ASCII_WHITESPACES.indexOf(ch) >= 0;
-    }
+  return false;
+}
 
-    // 7.3 Line Terminators
+function isIdentifierStart(code) {
+  if (code < 65) return code === 36;
+  if (code <= 90) return true;
+  if (code < 97) return code === 95;
+  if (code <= 122) return true;
 
-    function isLineTerminator(ch) {
-        return ch === 0x0A || ch === 0x0D || ch === 0x2028 || ch === 0x2029;
-    }
+  if (code <= 0xffff) {
+    return code >= 0xaa && nonASCIIidentifierStart.test(String.fromCharCode(code));
+  }
 
-    // 7.6 Identifier Names and Identifiers
+  return isInAstralSet(code, astralIdentifierStartCodes);
+}
 
-    function fromCodePoint(cp) {
-        if (cp <= 0xFFFF) { return String.fromCharCode(cp); }
-        var cu1 = String.fromCharCode(Math.floor((cp - 0x10000) / 0x400) + 0xD800);
-        var cu2 = String.fromCharCode(((cp - 0x10000) % 0x400) + 0xDC00);
-        return cu1 + cu2;
-    }
+function isIdentifierChar(code) {
+  if (code < 48) return code === 36;
+  if (code < 58) return true;
+  if (code < 65) return false;
+  if (code <= 90) return true;
+  if (code < 97) return code === 95;
+  if (code <= 122) return true;
 
-    IDENTIFIER_START = new Array(0x80);
-    for(ch = 0; ch < 0x80; ++ch) {
-        IDENTIFIER_START[ch] =
-            ch >= 0x61 && ch <= 0x7A ||  // a..z
-            ch >= 0x41 && ch <= 0x5A ||  // A..Z
-            ch === 0x24 || ch === 0x5F;  // $ (dollar) and _ (underscore)
-    }
+  if (code <= 0xffff) {
+    return code >= 0xaa && nonASCIIidentifier.test(String.fromCharCode(code));
+  }
 
-    IDENTIFIER_PART = new Array(0x80);
-    for(ch = 0; ch < 0x80; ++ch) {
-        IDENTIFIER_PART[ch] =
-            ch >= 0x61 && ch <= 0x7A ||  // a..z
-            ch >= 0x41 && ch <= 0x5A ||  // A..Z
-            ch >= 0x30 && ch <= 0x39 ||  // 0..9
-            ch === 0x24 || ch === 0x5F;  // $ (dollar) and _ (underscore)
-    }
+  return isInAstralSet(code, astralIdentifierStartCodes) || isInAstralSet(code, astralIdentifierCodes);
+}
 
-    function isIdentifierStartES5(ch) {
-        return ch < 0x80 ? IDENTIFIER_START[ch] : ES5Regex.NonAsciiIdentifierStart.test(fromCodePoint(ch));
-    }
+function isIdentifierName(name) {
+  let isFirst = true;
 
-    function isIdentifierPartES5(ch) {
-        return ch < 0x80 ? IDENTIFIER_PART[ch] : ES5Regex.NonAsciiIdentifierPart.test(fromCodePoint(ch));
-    }
+  for (let _i = 0, _Array$from = Array.from(name); _i < _Array$from.length; _i++) {
+    const char = _Array$from[_i];
+    const cp = char.codePointAt(0);
 
-    function isIdentifierStartES6(ch) {
-        return ch < 0x80 ? IDENTIFIER_START[ch] : ES6Regex.NonAsciiIdentifierStart.test(fromCodePoint(ch));
-    }
+    if (isFirst) {
+      if (!isIdentifierStart(cp)) {
+        return false;
+      }
 
-    function isIdentifierPartES6(ch) {
-        return ch < 0x80 ? IDENTIFIER_PART[ch] : ES6Regex.NonAsciiIdentifierPart.test(fromCodePoint(ch));
+      isFirst = false;
+    } else if (!isIdentifierChar(cp)) {
+      return false;
     }
+  }
 
-    module.exports = {
-        isDecimalDigit: isDecimalDigit,
-        isHexDigit: isHexDigit,
-        isOctalDigit: isOctalDigit,
-        isWhiteSpace: isWhiteSpace,
-        isLineTerminator: isLineTerminator,
-        isIdentifierStartES5: isIdentifierStartES5,
-        isIdentifierPartES5: isIdentifierPartES5,
-        isIdentifierStartES6: isIdentifierStartES6,
-        isIdentifierPartES6: isIdentifierPartES6
-    };
-}());
-/* vim: set sw=4 ts=4 et tw=80 : */
-
+  return true;
+}
 
 /***/ }),
-/* 439 */
+/* 438 */
 /***/ (function(module, exports, __webpack_require__) {
 
-/*
-  Copyright (C) 2013 Yusuke Suzuki <utatane.tea@gmail.com>
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-  ARE DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
-  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-  THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-(function () {
-    'use strict';
-
-    var code = __webpack_require__(438);
-
-    function isStrictModeReservedWordES6(id) {
-        switch (id) {
-        case 'implements':
-        case 'interface':
-        case 'package':
-        case 'private':
-        case 'protected':
-        case 'public':
-        case 'static':
-        case 'let':
-            return true;
-        default:
-            return false;
-        }
-    }
-
-    function isKeywordES5(id, strict) {
-        // yield should not be treated as keyword under non-strict mode.
-        if (!strict && id === 'yield') {
-            return false;
-        }
-        return isKeywordES6(id, strict);
-    }
-
-    function isKeywordES6(id, strict) {
-        if (strict && isStrictModeReservedWordES6(id)) {
-            return true;
-        }
-
-        switch (id.length) {
-        case 2:
-            return (id === 'if') || (id === 'in') || (id === 'do');
-        case 3:
-            return (id === 'var') || (id === 'for') || (id === 'new') || (id === 'try');
-        case 4:
-            return (id === 'this') || (id === 'else') || (id === 'case') ||
-                (id === 'void') || (id === 'with') || (id === 'enum');
-        case 5:
-            return (id === 'while') || (id === 'break') || (id === 'catch') ||
-                (id === 'throw') || (id === 'const') || (id === 'yield') ||
-                (id === 'class') || (id === 'super');
-        case 6:
-            return (id === 'return') || (id === 'typeof') || (id === 'delete') ||
-                (id === 'switch') || (id === 'export') || (id === 'import');
-        case 7:
-            return (id === 'default') || (id === 'finally') || (id === 'extends');
-        case 8:
-            return (id === 'function') || (id === 'continue') || (id === 'debugger');
-        case 10:
-            return (id === 'instanceof');
-        default:
-            return false;
-        }
-    }
-
-    function isReservedWordES5(id, strict) {
-        return id === 'null' || id === 'true' || id === 'false' || isKeywordES5(id, strict);
-    }
-
-    function isReservedWordES6(id, strict) {
-        return id === 'null' || id === 'true' || id === 'false' || isKeywordES6(id, strict);
-    }
-
-    function isRestrictedWord(id) {
-        return id === 'eval' || id === 'arguments';
-    }
-
-    function isIdentifierNameES5(id) {
-        var i, iz, ch;
-
-        if (id.length === 0) { return false; }
-
-        ch = id.charCodeAt(0);
-        if (!code.isIdentifierStartES5(ch)) {
-            return false;
-        }
-
-        for (i = 1, iz = id.length; i < iz; ++i) {
-            ch = id.charCodeAt(i);
-            if (!code.isIdentifierPartES5(ch)) {
-                return false;
-            }
-        }
-        return true;
-    }
-
-    function decodeUtf16(lead, trail) {
-        return (lead - 0xD800) * 0x400 + (trail - 0xDC00) + 0x10000;
-    }
+"use strict";
 
-    function isIdentifierNameES6(id) {
-        var i, iz, ch, lowCh, check;
 
-        if (id.length === 0) { return false; }
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.isReservedWord = isReservedWord;
+exports.isStrictReservedWord = isStrictReservedWord;
+exports.isStrictBindOnlyReservedWord = isStrictBindOnlyReservedWord;
+exports.isStrictBindReservedWord = isStrictBindReservedWord;
+exports.isKeyword = isKeyword;
+const reservedWords = {
+  keyword: ["break", "case", "catch", "continue", "debugger", "default", "do", "else", "finally", "for", "function", "if", "return", "switch", "throw", "try", "var", "const", "while", "with", "new", "this", "super", "class", "extends", "export", "import", "null", "true", "false", "in", "instanceof", "typeof", "void", "delete"],
+  strict: ["implements", "interface", "let", "package", "private", "protected", "public", "static", "yield"],
+  strictBind: ["eval", "arguments"]
+};
+const keywords = new Set(reservedWords.keyword);
+const reservedWordsStrictSet = new Set(reservedWords.strict);
+const reservedWordsStrictBindSet = new Set(reservedWords.strictBind);
 
-        check = code.isIdentifierStartES6;
-        for (i = 0, iz = id.length; i < iz; ++i) {
-            ch = id.charCodeAt(i);
-            if (0xD800 <= ch && ch <= 0xDBFF) {
-                ++i;
-                if (i >= iz) { return false; }
-                lowCh = id.charCodeAt(i);
-                if (!(0xDC00 <= lowCh && lowCh <= 0xDFFF)) {
-                    return false;
-                }
-                ch = decodeUtf16(ch, lowCh);
-            }
-            if (!check(ch)) {
-                return false;
-            }
-            check = code.isIdentifierPartES6;
-        }
-        return true;
-    }
+function isReservedWord(word, inModule) {
+  return inModule && word === "await" || word === "enum";
+}
 
-    function isIdentifierES5(id, strict) {
-        return isIdentifierNameES5(id) && !isReservedWordES5(id, strict);
-    }
+function isStrictReservedWord(word, inModule) {
+  return isReservedWord(word, inModule) || reservedWordsStrictSet.has(word);
+}
 
-    function isIdentifierES6(id, strict) {
-        return isIdentifierNameES6(id) && !isReservedWordES6(id, strict);
-    }
+function isStrictBindOnlyReservedWord(word) {
+  return reservedWordsStrictBindSet.has(word);
+}
 
-    module.exports = {
-        isKeywordES5: isKeywordES5,
-        isKeywordES6: isKeywordES6,
-        isReservedWordES5: isReservedWordES5,
-        isReservedWordES6: isReservedWordES6,
-        isRestrictedWord: isRestrictedWord,
-        isIdentifierNameES5: isIdentifierNameES5,
-        isIdentifierNameES6: isIdentifierNameES6,
-        isIdentifierES5: isIdentifierES5,
-        isIdentifierES6: isIdentifierES6
-    };
-}());
-/* vim: set sw=4 ts=4 et tw=80 : */
+function isStrictBindReservedWord(word, inModule) {
+  return isStrictReservedWord(word, inModule) || isStrictBindOnlyReservedWord(word);
+}
 
+function isKeyword(word) {
+  return keywords.has(word);
+}
 
 /***/ }),
-/* 440 */
+/* 439 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 const escapeStringRegexp = __webpack_require__(3);
-const ansiStyles = __webpack_require__(441);
-const stdoutColor = __webpack_require__(442).stdout;
+const ansiStyles = __webpack_require__(440);
+const stdoutColor = __webpack_require__(441).stdout;
 
-const template = __webpack_require__(443);
+const template = __webpack_require__(442);
 
 const isSimpleWindowsTerm = process.platform === 'win32' && !(process.env.TERM || '').toLowerCase().startsWith('xterm');
 
@@ -39240,7 +38901,7 @@ module.exports.default = module.exports; // For TypeScript
 
 
 /***/ }),
-/* 441 */
+/* 440 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -39413,7 +39074,7 @@ Object.defineProperty(module, 'exports', {
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(5)(module)))
 
 /***/ }),
-/* 442 */
+/* 441 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -39555,7 +39216,7 @@ module.exports = {
 
 
 /***/ }),
-/* 443 */
+/* 442 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -39690,7 +39351,7 @@ module.exports = (chalk, tmp) => {
 
 
 /***/ }),
-/* 444 */
+/* 443 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -39729,7 +39390,7 @@ exports.KBN_P12_PASSWORD = 'storepass';
 
 
 /***/ }),
-/* 445 */
+/* 444 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -39753,9 +39414,9 @@ exports.KBN_P12_PASSWORD = 'storepass';
  * under the License.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-var run_1 = __webpack_require__(446);
+var run_1 = __webpack_require__(445);
 exports.run = run_1.run;
-var fail_1 = __webpack_require__(447);
+var fail_1 = __webpack_require__(446);
 exports.createFailError = fail_1.createFailError;
 exports.createFlagError = fail_1.createFlagError;
 exports.combineErrors = fail_1.combineErrors;
@@ -39763,7 +39424,7 @@ exports.isFailError = fail_1.isFailError;
 
 
 /***/ }),
-/* 446 */
+/* 445 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -39792,8 +39453,8 @@ const util_1 = __webpack_require__(29);
 // @ts-ignore @types are outdated and module is super simple
 const exit_hook_1 = tslib_1.__importDefault(__webpack_require__(348));
 const tooling_log_1 = __webpack_require__(414);
-const fail_1 = __webpack_require__(447);
-const flags_1 = __webpack_require__(448);
+const fail_1 = __webpack_require__(446);
+const flags_1 = __webpack_require__(447);
 const proc_runner_1 = __webpack_require__(37);
 async function run(fn, options = {}) {
     var _a;
@@ -39868,7 +39529,7 @@ exports.run = run;
 
 
 /***/ }),
-/* 447 */
+/* 446 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -39936,7 +39597,7 @@ exports.combineErrors = combineErrors;
 
 
 /***/ }),
-/* 448 */
+/* 447 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -39963,7 +39624,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = __webpack_require__(36);
 const path_1 = __webpack_require__(16);
 const dedent_1 = tslib_1.__importDefault(__webpack_require__(14));
-const getopts_1 = tslib_1.__importDefault(__webpack_require__(449));
+const getopts_1 = tslib_1.__importDefault(__webpack_require__(448));
 function getFlags(argv, options) {
     const unexpectedNames = new Set();
     const flagOpts = options.flags || {};
@@ -40066,7 +39727,7 @@ exports.getHelp = getHelp;
 
 
 /***/ }),
-/* 449 */
+/* 448 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -40278,7 +39939,7 @@ module.exports = getopts
 
 
 /***/ }),
-/* 450 */
+/* 449 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -40302,14 +39963,14 @@ module.exports = getopts
  * under the License.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-var kbn_client_1 = __webpack_require__(451);
+var kbn_client_1 = __webpack_require__(450);
 exports.KbnClient = kbn_client_1.KbnClient;
-var kbn_client_requester_1 = __webpack_require__(452);
+var kbn_client_requester_1 = __webpack_require__(451);
 exports.uriencode = kbn_client_requester_1.uriencode;
 
 
 /***/ }),
-/* 451 */
+/* 450 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -40333,12 +39994,12 @@ exports.uriencode = kbn_client_requester_1.uriencode;
  * under the License.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-const kbn_client_requester_1 = __webpack_require__(452);
-const kbn_client_status_1 = __webpack_require__(494);
-const kbn_client_plugins_1 = __webpack_require__(495);
-const kbn_client_version_1 = __webpack_require__(496);
-const kbn_client_saved_objects_1 = __webpack_require__(497);
-const kbn_client_ui_settings_1 = __webpack_require__(498);
+const kbn_client_requester_1 = __webpack_require__(451);
+const kbn_client_status_1 = __webpack_require__(493);
+const kbn_client_plugins_1 = __webpack_require__(494);
+const kbn_client_version_1 = __webpack_require__(495);
+const kbn_client_saved_objects_1 = __webpack_require__(496);
+const kbn_client_ui_settings_1 = __webpack_require__(497);
 class KbnClient {
     /**
      * Basic Kibana server client that implements common behaviors for talking
@@ -40376,7 +40037,7 @@ exports.KbnClient = KbnClient;
 
 
 /***/ }),
-/* 452 */
+/* 451 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -40401,9 +40062,9 @@ exports.KbnClient = KbnClient;
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = __webpack_require__(36);
-const url_1 = tslib_1.__importDefault(__webpack_require__(453));
-const axios_1 = tslib_1.__importDefault(__webpack_require__(454));
-const axios_2 = __webpack_require__(492);
+const url_1 = tslib_1.__importDefault(__webpack_require__(452));
+const axios_1 = tslib_1.__importDefault(__webpack_require__(453));
+const axios_2 = __webpack_require__(491);
 const isConcliftOnGetError = (error) => {
     return (axios_2.isAxiosResponseError(error) && error.config.method === 'GET' && error.response.status === 409);
 };
@@ -40487,28 +40148,28 @@ exports.KbnClientRequester = KbnClientRequester;
 
 
 /***/ }),
-/* 453 */
+/* 452 */
 /***/ (function(module, exports) {
 
 module.exports = require("url");
 
 /***/ }),
-/* 454 */
+/* 453 */
 /***/ (function(module, exports, __webpack_require__) {
 
-module.exports = __webpack_require__(455);
+module.exports = __webpack_require__(454);
 
 /***/ }),
-/* 455 */
+/* 454 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var utils = __webpack_require__(456);
-var bind = __webpack_require__(457);
-var Axios = __webpack_require__(459);
-var defaults = __webpack_require__(460);
+var utils = __webpack_require__(455);
+var bind = __webpack_require__(456);
+var Axios = __webpack_require__(458);
+var defaults = __webpack_require__(459);
 
 /**
  * Create an instance of Axios
@@ -40541,15 +40202,15 @@ axios.create = function create(instanceConfig) {
 };
 
 // Expose Cancel & CancelToken
-axios.Cancel = __webpack_require__(489);
-axios.CancelToken = __webpack_require__(490);
-axios.isCancel = __webpack_require__(486);
+axios.Cancel = __webpack_require__(488);
+axios.CancelToken = __webpack_require__(489);
+axios.isCancel = __webpack_require__(485);
 
 // Expose all/spread
 axios.all = function all(promises) {
   return Promise.all(promises);
 };
-axios.spread = __webpack_require__(491);
+axios.spread = __webpack_require__(490);
 
 module.exports = axios;
 
@@ -40558,14 +40219,14 @@ module.exports.default = axios;
 
 
 /***/ }),
-/* 456 */
+/* 455 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var bind = __webpack_require__(457);
-var isBuffer = __webpack_require__(458);
+var bind = __webpack_require__(456);
+var isBuffer = __webpack_require__(457);
 
 /*global toString:true*/
 
@@ -40868,7 +40529,7 @@ module.exports = {
 
 
 /***/ }),
-/* 457 */
+/* 456 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -40886,7 +40547,7 @@ module.exports = function bind(fn, thisArg) {
 
 
 /***/ }),
-/* 458 */
+/* 457 */
 /***/ (function(module, exports) {
 
 /*!
@@ -40903,16 +40564,16 @@ module.exports = function isBuffer (obj) {
 
 
 /***/ }),
-/* 459 */
+/* 458 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var defaults = __webpack_require__(460);
-var utils = __webpack_require__(456);
-var InterceptorManager = __webpack_require__(483);
-var dispatchRequest = __webpack_require__(484);
+var defaults = __webpack_require__(459);
+var utils = __webpack_require__(455);
+var InterceptorManager = __webpack_require__(482);
+var dispatchRequest = __webpack_require__(483);
 
 /**
  * Create a new instance of Axios
@@ -40989,14 +40650,14 @@ module.exports = Axios;
 
 
 /***/ }),
-/* 460 */
+/* 459 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var utils = __webpack_require__(456);
-var normalizeHeaderName = __webpack_require__(461);
+var utils = __webpack_require__(455);
+var normalizeHeaderName = __webpack_require__(460);
 
 var DEFAULT_CONTENT_TYPE = {
   'Content-Type': 'application/x-www-form-urlencoded'
@@ -41012,10 +40673,10 @@ function getDefaultAdapter() {
   var adapter;
   if (typeof XMLHttpRequest !== 'undefined') {
     // For browsers use XHR adapter
-    adapter = __webpack_require__(462);
+    adapter = __webpack_require__(461);
   } else if (typeof process !== 'undefined') {
     // For node use HTTP adapter
-    adapter = __webpack_require__(470);
+    adapter = __webpack_require__(469);
   }
   return adapter;
 }
@@ -41092,13 +40753,13 @@ module.exports = defaults;
 
 
 /***/ }),
-/* 461 */
+/* 460 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var utils = __webpack_require__(456);
+var utils = __webpack_require__(455);
 
 module.exports = function normalizeHeaderName(headers, normalizedName) {
   utils.forEach(headers, function processHeader(value, name) {
@@ -41111,18 +40772,18 @@ module.exports = function normalizeHeaderName(headers, normalizedName) {
 
 
 /***/ }),
-/* 462 */
+/* 461 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var utils = __webpack_require__(456);
-var settle = __webpack_require__(463);
-var buildURL = __webpack_require__(466);
-var parseHeaders = __webpack_require__(467);
-var isURLSameOrigin = __webpack_require__(468);
-var createError = __webpack_require__(464);
+var utils = __webpack_require__(455);
+var settle = __webpack_require__(462);
+var buildURL = __webpack_require__(465);
+var parseHeaders = __webpack_require__(466);
+var isURLSameOrigin = __webpack_require__(467);
+var createError = __webpack_require__(463);
 
 module.exports = function xhrAdapter(config) {
   return new Promise(function dispatchXhrRequest(resolve, reject) {
@@ -41202,7 +40863,7 @@ module.exports = function xhrAdapter(config) {
     // This is only done if running in a standard browser environment.
     // Specifically not if we're in a web worker, or react-native.
     if (utils.isStandardBrowserEnv()) {
-      var cookies = __webpack_require__(469);
+      var cookies = __webpack_require__(468);
 
       // Add xsrf header
       var xsrfValue = (config.withCredentials || isURLSameOrigin(config.url)) && config.xsrfCookieName ?
@@ -41280,13 +40941,13 @@ module.exports = function xhrAdapter(config) {
 
 
 /***/ }),
-/* 463 */
+/* 462 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var createError = __webpack_require__(464);
+var createError = __webpack_require__(463);
 
 /**
  * Resolve or reject a Promise based on response status.
@@ -41313,13 +40974,13 @@ module.exports = function settle(resolve, reject, response) {
 
 
 /***/ }),
-/* 464 */
+/* 463 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var enhanceError = __webpack_require__(465);
+var enhanceError = __webpack_require__(464);
 
 /**
  * Create an Error with the specified message, config, error code, request and response.
@@ -41338,7 +40999,7 @@ module.exports = function createError(message, config, code, request, response)
 
 
 /***/ }),
-/* 465 */
+/* 464 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -41366,13 +41027,13 @@ module.exports = function enhanceError(error, config, code, request, response) {
 
 
 /***/ }),
-/* 466 */
+/* 465 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var utils = __webpack_require__(456);
+var utils = __webpack_require__(455);
 
 function encode(val) {
   return encodeURIComponent(val).
@@ -41439,13 +41100,13 @@ module.exports = function buildURL(url, params, paramsSerializer) {
 
 
 /***/ }),
-/* 467 */
+/* 466 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var utils = __webpack_require__(456);
+var utils = __webpack_require__(455);
 
 // Headers whose duplicates are ignored by node
 // c.f. https://nodejs.org/api/http.html#http_message_headers
@@ -41499,13 +41160,13 @@ module.exports = function parseHeaders(headers) {
 
 
 /***/ }),
-/* 468 */
+/* 467 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var utils = __webpack_require__(456);
+var utils = __webpack_require__(455);
 
 module.exports = (
   utils.isStandardBrowserEnv() ?
@@ -41574,13 +41235,13 @@ module.exports = (
 
 
 /***/ }),
-/* 469 */
+/* 468 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var utils = __webpack_require__(456);
+var utils = __webpack_require__(455);
 
 module.exports = (
   utils.isStandardBrowserEnv() ?
@@ -41634,24 +41295,24 @@ module.exports = (
 
 
 /***/ }),
-/* 470 */
+/* 469 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var utils = __webpack_require__(456);
-var settle = __webpack_require__(463);
-var buildURL = __webpack_require__(466);
-var http = __webpack_require__(471);
-var https = __webpack_require__(472);
-var httpFollow = __webpack_require__(473).http;
-var httpsFollow = __webpack_require__(473).https;
-var url = __webpack_require__(453);
-var zlib = __webpack_require__(481);
-var pkg = __webpack_require__(482);
-var createError = __webpack_require__(464);
-var enhanceError = __webpack_require__(465);
+var utils = __webpack_require__(455);
+var settle = __webpack_require__(462);
+var buildURL = __webpack_require__(465);
+var http = __webpack_require__(470);
+var https = __webpack_require__(471);
+var httpFollow = __webpack_require__(472).http;
+var httpsFollow = __webpack_require__(472).https;
+var url = __webpack_require__(452);
+var zlib = __webpack_require__(480);
+var pkg = __webpack_require__(481);
+var createError = __webpack_require__(463);
+var enhanceError = __webpack_require__(464);
 
 /*eslint consistent-return:0*/
 module.exports = function httpAdapter(config) {
@@ -41879,27 +41540,27 @@ module.exports = function httpAdapter(config) {
 
 
 /***/ }),
-/* 471 */
+/* 470 */
 /***/ (function(module, exports) {
 
 module.exports = require("http");
 
 /***/ }),
-/* 472 */
+/* 471 */
 /***/ (function(module, exports) {
 
 module.exports = require("https");
 
 /***/ }),
-/* 473 */
+/* 472 */
 /***/ (function(module, exports, __webpack_require__) {
 
-var url = __webpack_require__(453);
-var http = __webpack_require__(471);
-var https = __webpack_require__(472);
+var url = __webpack_require__(452);
+var http = __webpack_require__(470);
+var https = __webpack_require__(471);
 var assert = __webpack_require__(30);
 var Writable = __webpack_require__(27).Writable;
-var debug = __webpack_require__(474)("follow-redirects");
+var debug = __webpack_require__(473)("follow-redirects");
 
 // RFC7231§4.2.1: Of the request methods defined by this specification,
 // the GET, HEAD, OPTIONS, and TRACE methods are defined to be safe.
@@ -42219,7 +41880,7 @@ module.exports.wrap = wrap;
 
 
 /***/ }),
-/* 474 */
+/* 473 */
 /***/ (function(module, exports, __webpack_require__) {
 
 /**
@@ -42228,14 +41889,14 @@ module.exports.wrap = wrap;
  */
 
 if (typeof process === 'undefined' || process.type === 'renderer') {
-  module.exports = __webpack_require__(475);
+  module.exports = __webpack_require__(474);
 } else {
-  module.exports = __webpack_require__(478);
+  module.exports = __webpack_require__(477);
 }
 
 
 /***/ }),
-/* 475 */
+/* 474 */
 /***/ (function(module, exports, __webpack_require__) {
 
 /**
@@ -42244,7 +41905,7 @@ if (typeof process === 'undefined' || process.type === 'renderer') {
  * Expose `debug()` as the module.
  */
 
-exports = module.exports = __webpack_require__(476);
+exports = module.exports = __webpack_require__(475);
 exports.log = log;
 exports.formatArgs = formatArgs;
 exports.save = save;
@@ -42436,7 +42097,7 @@ function localstorage() {
 
 
 /***/ }),
-/* 476 */
+/* 475 */
 /***/ (function(module, exports, __webpack_require__) {
 
 
@@ -42452,7 +42113,7 @@ exports.coerce = coerce;
 exports.disable = disable;
 exports.enable = enable;
 exports.enabled = enabled;
-exports.humanize = __webpack_require__(477);
+exports.humanize = __webpack_require__(476);
 
 /**
  * Active `debug` instances.
@@ -42667,7 +42328,7 @@ function coerce(val) {
 
 
 /***/ }),
-/* 477 */
+/* 476 */
 /***/ (function(module, exports) {
 
 /**
@@ -42825,14 +42486,14 @@ function plural(ms, n, name) {
 
 
 /***/ }),
-/* 478 */
+/* 477 */
 /***/ (function(module, exports, __webpack_require__) {
 
 /**
  * Module dependencies.
  */
 
-var tty = __webpack_require__(479);
+var tty = __webpack_require__(478);
 var util = __webpack_require__(29);
 
 /**
@@ -42841,7 +42502,7 @@ var util = __webpack_require__(29);
  * Expose `debug()` as the module.
  */
 
-exports = module.exports = __webpack_require__(476);
+exports = module.exports = __webpack_require__(475);
 exports.init = init;
 exports.log = log;
 exports.formatArgs = formatArgs;
@@ -42856,7 +42517,7 @@ exports.useColors = useColors;
 exports.colors = [ 6, 2, 3, 4, 5, 1 ];
 
 try {
-  var supportsColor = __webpack_require__(480);
+  var supportsColor = __webpack_require__(479);
   if (supportsColor && supportsColor.level >= 2) {
     exports.colors = [
       20, 21, 26, 27, 32, 33, 38, 39, 40, 41, 42, 43, 44, 45, 56, 57, 62, 63, 68,
@@ -43017,13 +42678,13 @@ exports.enable(load());
 
 
 /***/ }),
-/* 479 */
+/* 478 */
 /***/ (function(module, exports) {
 
 module.exports = require("tty");
 
 /***/ }),
-/* 480 */
+/* 479 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -43168,25 +42829,25 @@ module.exports = {
 
 
 /***/ }),
-/* 481 */
+/* 480 */
 /***/ (function(module, exports) {
 
 module.exports = require("zlib");
 
 /***/ }),
-/* 482 */
+/* 481 */
 /***/ (function(module) {
 
 module.exports = JSON.parse("{\"name\":\"axios\",\"version\":\"0.18.1\",\"description\":\"Promise based HTTP client for the browser and node.js\",\"main\":\"index.js\",\"scripts\":{\"test\":\"grunt test && bundlesize\",\"start\":\"node ./sandbox/server.js\",\"build\":\"NODE_ENV=production grunt build\",\"preversion\":\"npm test\",\"version\":\"npm run build && grunt version && git add -A dist && git add CHANGELOG.md bower.json package.json\",\"postversion\":\"git push && git push --tags\",\"examples\":\"node ./examples/server.js\",\"coveralls\":\"cat coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js\"},\"repository\":{\"type\":\"git\",\"url\":\"https://github.com/axios/axios.git\"},\"keywords\":[\"xhr\",\"http\",\"ajax\",\"promise\",\"node\"],\"author\":\"Matt Zabriskie\",\"license\":\"MIT\",\"bugs\":{\"url\":\"https://github.com/axios/axios/issues\"},\"homepage\":\"https://github.com/axios/axios\",\"devDependencies\":{\"bundlesize\":\"^0.5.7\",\"coveralls\":\"^2.11.9\",\"es6-promise\":\"^4.0.5\",\"grunt\":\"^1.0.1\",\"grunt-banner\":\"^0.6.0\",\"grunt-cli\":\"^1.2.0\",\"grunt-contrib-clean\":\"^1.0.0\",\"grunt-contrib-nodeunit\":\"^1.0.0\",\"grunt-contrib-watch\":\"^1.0.0\",\"grunt-eslint\":\"^19.0.0\",\"grunt-karma\":\"^2.0.0\",\"grunt-ts\":\"^6.0.0-beta.3\",\"grunt-webpack\":\"^1.0.18\",\"istanbul-instrumenter-loader\":\"^1.0.0\",\"jasmine-core\":\"^2.4.1\",\"karma\":\"^1.3.0\",\"karma-chrome-launcher\":\"^2.0.0\",\"karma-coverage\":\"^1.0.0\",\"karma-firefox-launcher\":\"^1.0.0\",\"karma-jasmine\":\"^1.0.2\",\"karma-jasmine-ajax\":\"^0.1.13\",\"karma-opera-launcher\":\"^1.0.0\",\"karma-safari-launcher\":\"^1.0.0\",\"karma-sauce-launcher\":\"^1.1.0\",\"karma-sinon\":\"^1.0.5\",\"karma-sourcemap-loader\":\"^0.3.7\",\"karma-webpack\":\"^1.7.0\",\"load-grunt-tasks\":\"^3.5.2\",\"minimist\":\"^1.2.0\",\"sinon\":\"^1.17.4\",\"webpack\":\"^1.13.1\",\"webpack-dev-server\":\"^1.14.1\",\"url-search-params\":\"^0.6.1\",\"typescript\":\"^2.0.3\"},\"browser\":{\"./lib/adapters/http.js\":\"./lib/adapters/xhr.js\"},\"typings\":\"./index.d.ts\",\"dependencies\":{\"follow-redirects\":\"1.5.10\",\"is-buffer\":\"^2.0.2\"},\"bundlesize\":[{\"path\":\"./dist/axios.min.js\",\"threshold\":\"5kB\"}]}");
 
 /***/ }),
-/* 483 */
+/* 482 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var utils = __webpack_require__(456);
+var utils = __webpack_require__(455);
 
 function InterceptorManager() {
   this.handlers = [];
@@ -43239,18 +42900,18 @@ module.exports = InterceptorManager;
 
 
 /***/ }),
-/* 484 */
+/* 483 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var utils = __webpack_require__(456);
-var transformData = __webpack_require__(485);
-var isCancel = __webpack_require__(486);
-var defaults = __webpack_require__(460);
-var isAbsoluteURL = __webpack_require__(487);
-var combineURLs = __webpack_require__(488);
+var utils = __webpack_require__(455);
+var transformData = __webpack_require__(484);
+var isCancel = __webpack_require__(485);
+var defaults = __webpack_require__(459);
+var isAbsoluteURL = __webpack_require__(486);
+var combineURLs = __webpack_require__(487);
 
 /**
  * Throws a `Cancel` if cancellation has been requested.
@@ -43332,13 +42993,13 @@ module.exports = function dispatchRequest(config) {
 
 
 /***/ }),
-/* 485 */
+/* 484 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var utils = __webpack_require__(456);
+var utils = __webpack_require__(455);
 
 /**
  * Transform the data for a request or a response
@@ -43359,7 +43020,7 @@ module.exports = function transformData(data, headers, fns) {
 
 
 /***/ }),
-/* 486 */
+/* 485 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -43371,7 +43032,7 @@ module.exports = function isCancel(value) {
 
 
 /***/ }),
-/* 487 */
+/* 486 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -43392,7 +43053,7 @@ module.exports = function isAbsoluteURL(url) {
 
 
 /***/ }),
-/* 488 */
+/* 487 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -43413,7 +43074,7 @@ module.exports = function combineURLs(baseURL, relativeURL) {
 
 
 /***/ }),
-/* 489 */
+/* 488 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -43439,13 +43100,13 @@ module.exports = Cancel;
 
 
 /***/ }),
-/* 490 */
+/* 489 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var Cancel = __webpack_require__(489);
+var Cancel = __webpack_require__(488);
 
 /**
  * A `CancelToken` is an object that can be used to request cancellation of an operation.
@@ -43503,7 +43164,7 @@ module.exports = CancelToken;
 
 
 /***/ }),
-/* 491 */
+/* 490 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -43537,7 +43198,7 @@ module.exports = function spread(callback) {
 
 
 /***/ }),
-/* 492 */
+/* 491 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -43562,11 +43223,11 @@ module.exports = function spread(callback) {
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = __webpack_require__(36);
-tslib_1.__exportStar(__webpack_require__(493), exports);
+tslib_1.__exportStar(__webpack_require__(492), exports);
 
 
 /***/ }),
-/* 493 */
+/* 492 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -43599,7 +43260,7 @@ exports.isAxiosResponseError = (error) => {
 
 
 /***/ }),
-/* 494 */
+/* 493 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -43648,7 +43309,7 @@ exports.KbnClientStatus = KbnClientStatus;
 
 
 /***/ }),
-/* 495 */
+/* 494 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -43698,7 +43359,7 @@ exports.KbnClientPlugins = KbnClientPlugins;
 
 
 /***/ }),
-/* 496 */
+/* 495 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -43739,7 +43400,7 @@ exports.KbnClientVersion = KbnClientVersion;
 
 
 /***/ }),
-/* 497 */
+/* 496 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -43763,7 +43424,7 @@ exports.KbnClientVersion = KbnClientVersion;
  * under the License.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-const kbn_client_requester_1 = __webpack_require__(452);
+const kbn_client_requester_1 = __webpack_require__(451);
 class KbnClientSavedObjects {
     constructor(log, requester) {
         this.log = log;
@@ -43848,7 +43509,7 @@ exports.KbnClientSavedObjects = KbnClientSavedObjects;
 
 
 /***/ }),
-/* 498 */
+/* 497 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -43872,7 +43533,7 @@ exports.KbnClientSavedObjects = KbnClientSavedObjects;
  * under the License.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-const kbn_client_requester_1 = __webpack_require__(452);
+const kbn_client_requester_1 = __webpack_require__(451);
 class KbnClientUiSettings {
     constructor(log, requester, defaults) {
         this.log = log;
@@ -43948,7 +43609,7 @@ exports.KbnClientUiSettings = KbnClientUiSettings;
 
 
 /***/ }),
-/* 499 */
+/* 498 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -44014,7 +43675,7 @@ async function parallelize(items, fn, concurrency = 4) {
 }
 
 /***/ }),
-/* 500 */
+/* 499 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -44023,15 +43684,15 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "buildProjectGraph", function() { return buildProjectGraph; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "topologicallyBatchProjects", function() { return topologicallyBatchProjects; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "includeTransitiveProjects", function() { return includeTransitiveProjects; });
-/* harmony import */ var glob__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(501);
+/* harmony import */ var glob__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(500);
 /* harmony import */ var glob__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(glob__WEBPACK_IMPORTED_MODULE_0__);
 /* harmony import */ var path__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(16);
 /* harmony import */ var path__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(path__WEBPACK_IMPORTED_MODULE_1__);
 /* harmony import */ var util__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(29);
 /* harmony import */ var util__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(util__WEBPACK_IMPORTED_MODULE_2__);
-/* harmony import */ var _errors__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(514);
-/* harmony import */ var _project__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(515);
-/* harmony import */ var _workspaces__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(577);
+/* harmony import */ var _errors__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(513);
+/* harmony import */ var _project__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(514);
+/* harmony import */ var _workspaces__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(576);
 /*
  * Licensed to Elasticsearch B.V. under one or more contributor
  * license agreements. See the NOTICE file distributed with
@@ -44230,7 +43891,7 @@ function includeTransitiveProjects(subsetOfProjects, allProjects, {
 }
 
 /***/ }),
-/* 501 */
+/* 500 */
 /***/ (function(module, exports, __webpack_require__) {
 
 // Approach:
@@ -44276,21 +43937,21 @@ function includeTransitiveProjects(subsetOfProjects, allProjects, {
 module.exports = glob
 
 var fs = __webpack_require__(23)
-var rp = __webpack_require__(502)
-var minimatch = __webpack_require__(504)
+var rp = __webpack_require__(501)
+var minimatch = __webpack_require__(503)
 var Minimatch = minimatch.Minimatch
-var inherits = __webpack_require__(508)
+var inherits = __webpack_require__(507)
 var EE = __webpack_require__(379).EventEmitter
 var path = __webpack_require__(16)
 var assert = __webpack_require__(30)
-var isAbsolute = __webpack_require__(510)
-var globSync = __webpack_require__(511)
-var common = __webpack_require__(512)
+var isAbsolute = __webpack_require__(509)
+var globSync = __webpack_require__(510)
+var common = __webpack_require__(511)
 var alphasort = common.alphasort
 var alphasorti = common.alphasorti
 var setopts = common.setopts
 var ownProp = common.ownProp
-var inflight = __webpack_require__(513)
+var inflight = __webpack_require__(512)
 var util = __webpack_require__(29)
 var childrenIgnored = common.childrenIgnored
 var isIgnored = common.isIgnored
@@ -45026,7 +44687,7 @@ Glob.prototype._stat2 = function (f, abs, er, stat, cb) {
 
 
 /***/ }),
-/* 502 */
+/* 501 */
 /***/ (function(module, exports, __webpack_require__) {
 
 module.exports = realpath
@@ -45042,7 +44703,7 @@ var origRealpathSync = fs.realpathSync
 
 var version = process.version
 var ok = /^v[0-5]\./.test(version)
-var old = __webpack_require__(503)
+var old = __webpack_require__(502)
 
 function newError (er) {
   return er && er.syscall === 'realpath' && (
@@ -45098,7 +44759,7 @@ function unmonkeypatch () {
 
 
 /***/ }),
-/* 503 */
+/* 502 */
 /***/ (function(module, exports, __webpack_require__) {
 
 // Copyright Joyent, Inc. and other Node contributors.
@@ -45407,7 +45068,7 @@ exports.realpath = function realpath(p, cache, cb) {
 
 
 /***/ }),
-/* 504 */
+/* 503 */
 /***/ (function(module, exports, __webpack_require__) {
 
 module.exports = minimatch
@@ -45419,7 +45080,7 @@ try {
 } catch (er) {}
 
 var GLOBSTAR = minimatch.GLOBSTAR = Minimatch.GLOBSTAR = {}
-var expand = __webpack_require__(505)
+var expand = __webpack_require__(504)
 
 var plTypes = {
   '!': { open: '(?:(?!(?:', close: '))[^/]*?)'},
@@ -46336,11 +45997,11 @@ function regExpEscape (s) {
 
 
 /***/ }),
-/* 505 */
+/* 504 */
 /***/ (function(module, exports, __webpack_require__) {
 
-var concatMap = __webpack_require__(506);
-var balanced = __webpack_require__(507);
+var concatMap = __webpack_require__(505);
+var balanced = __webpack_require__(506);
 
 module.exports = expandTop;
 
@@ -46543,7 +46204,7 @@ function expand(str, isTop) {
 
 
 /***/ }),
-/* 506 */
+/* 505 */
 /***/ (function(module, exports) {
 
 module.exports = function (xs, fn) {
@@ -46562,7 +46223,7 @@ var isArray = Array.isArray || function (xs) {
 
 
 /***/ }),
-/* 507 */
+/* 506 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -46628,7 +46289,7 @@ function range(a, b, str) {
 
 
 /***/ }),
-/* 508 */
+/* 507 */
 /***/ (function(module, exports, __webpack_require__) {
 
 try {
@@ -46638,12 +46299,12 @@ try {
   module.exports = util.inherits;
 } catch (e) {
   /* istanbul ignore next */
-  module.exports = __webpack_require__(509);
+  module.exports = __webpack_require__(508);
 }
 
 
 /***/ }),
-/* 509 */
+/* 508 */
 /***/ (function(module, exports) {
 
 if (typeof Object.create === 'function') {
@@ -46676,7 +46337,7 @@ if (typeof Object.create === 'function') {
 
 
 /***/ }),
-/* 510 */
+/* 509 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -46703,22 +46364,22 @@ module.exports.win32 = win32;
 
 
 /***/ }),
-/* 511 */
+/* 510 */
 /***/ (function(module, exports, __webpack_require__) {
 
 module.exports = globSync
 globSync.GlobSync = GlobSync
 
 var fs = __webpack_require__(23)
-var rp = __webpack_require__(502)
-var minimatch = __webpack_require__(504)
+var rp = __webpack_require__(501)
+var minimatch = __webpack_require__(503)
 var Minimatch = minimatch.Minimatch
-var Glob = __webpack_require__(501).Glob
+var Glob = __webpack_require__(500).Glob
 var util = __webpack_require__(29)
 var path = __webpack_require__(16)
 var assert = __webpack_require__(30)
-var isAbsolute = __webpack_require__(510)
-var common = __webpack_require__(512)
+var isAbsolute = __webpack_require__(509)
+var common = __webpack_require__(511)
 var alphasort = common.alphasort
 var alphasorti = common.alphasorti
 var setopts = common.setopts
@@ -47195,7 +46856,7 @@ GlobSync.prototype._makeAbs = function (f) {
 
 
 /***/ }),
-/* 512 */
+/* 511 */
 /***/ (function(module, exports, __webpack_require__) {
 
 exports.alphasort = alphasort
@@ -47213,8 +46874,8 @@ function ownProp (obj, field) {
 }
 
 var path = __webpack_require__(16)
-var minimatch = __webpack_require__(504)
-var isAbsolute = __webpack_require__(510)
+var minimatch = __webpack_require__(503)
+var isAbsolute = __webpack_require__(509)
 var Minimatch = minimatch.Minimatch
 
 function alphasorti (a, b) {
@@ -47441,7 +47102,7 @@ function childrenIgnored (self, path) {
 
 
 /***/ }),
-/* 513 */
+/* 512 */
 /***/ (function(module, exports, __webpack_require__) {
 
 var wrappy = __webpack_require__(385)
@@ -47501,7 +47162,7 @@ function slice (args) {
 
 
 /***/ }),
-/* 514 */
+/* 513 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -47534,7 +47195,7 @@ class CliError extends Error {
 }
 
 /***/ }),
-/* 515 */
+/* 514 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -47548,13 +47209,13 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var path__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(path__WEBPACK_IMPORTED_MODULE_2__);
 /* harmony import */ var util__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(29);
 /* harmony import */ var util__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(util__WEBPACK_IMPORTED_MODULE_3__);
-/* harmony import */ var _errors__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(514);
+/* harmony import */ var _errors__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(513);
 /* harmony import */ var _log__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(34);
-/* harmony import */ var _package_json__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(516);
-/* harmony import */ var _scripts__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(562);
+/* harmony import */ var _package_json__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(515);
+/* harmony import */ var _scripts__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(561);
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
 
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(source, true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(source).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
@@ -47782,7 +47443,7 @@ function normalizePath(path) {
 }
 
 /***/ }),
-/* 516 */
+/* 515 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -47790,9 +47451,9 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "readPackageJson", function() { return readPackageJson; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "writePackageJson", function() { return writePackageJson; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "isLinkDependency", function() { return isLinkDependency; });
-/* harmony import */ var read_pkg__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(517);
+/* harmony import */ var read_pkg__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(516);
 /* harmony import */ var read_pkg__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(read_pkg__WEBPACK_IMPORTED_MODULE_0__);
-/* harmony import */ var write_pkg__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(543);
+/* harmony import */ var write_pkg__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(542);
 /* harmony import */ var write_pkg__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(write_pkg__WEBPACK_IMPORTED_MODULE_1__);
 /*
  * Licensed to Elasticsearch B.V. under one or more contributor
@@ -47826,7 +47487,7 @@ function writePackageJson(path, json) {
 const isLinkDependency = depVersion => depVersion.startsWith('link:');
 
 /***/ }),
-/* 517 */
+/* 516 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -47834,7 +47495,7 @@ const isLinkDependency = depVersion => depVersion.startsWith('link:');
 const {promisify} = __webpack_require__(29);
 const fs = __webpack_require__(23);
 const path = __webpack_require__(16);
-const parseJson = __webpack_require__(518);
+const parseJson = __webpack_require__(517);
 
 const readFileAsync = promisify(fs.readFile);
 
@@ -47849,7 +47510,7 @@ module.exports = async options => {
 	const json = parseJson(await readFileAsync(filePath, 'utf8'));
 
 	if (options.normalize) {
-		__webpack_require__(519)(json);
+		__webpack_require__(518)(json);
 	}
 
 	return json;
@@ -47866,7 +47527,7 @@ module.exports.sync = options => {
 	const json = parseJson(fs.readFileSync(filePath, 'utf8'));
 
 	if (options.normalize) {
-		__webpack_require__(519)(json);
+		__webpack_require__(518)(json);
 	}
 
 	return json;
@@ -47874,7 +47535,7 @@ module.exports.sync = options => {
 
 
 /***/ }),
-/* 518 */
+/* 517 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -47931,15 +47592,15 @@ module.exports = (string, reviver, filename) => {
 
 
 /***/ }),
-/* 519 */
+/* 518 */
 /***/ (function(module, exports, __webpack_require__) {
 
 module.exports = normalize
 
-var fixer = __webpack_require__(520)
+var fixer = __webpack_require__(519)
 normalize.fixer = fixer
 
-var makeWarning = __webpack_require__(541)
+var makeWarning = __webpack_require__(540)
 
 var fieldsToFix = ['name','version','description','repository','modules','scripts'
                   ,'files','bin','man','bugs','keywords','readme','homepage','license']
@@ -47976,17 +47637,17 @@ function ucFirst (string) {
 
 
 /***/ }),
-/* 520 */
+/* 519 */
 /***/ (function(module, exports, __webpack_require__) {
 
-var semver = __webpack_require__(521)
-var validateLicense = __webpack_require__(522);
-var hostedGitInfo = __webpack_require__(527)
-var isBuiltinModule = __webpack_require__(530).isCore
+var semver = __webpack_require__(520)
+var validateLicense = __webpack_require__(521);
+var hostedGitInfo = __webpack_require__(526)
+var isBuiltinModule = __webpack_require__(529).isCore
 var depTypes = ["dependencies","devDependencies","optionalDependencies"]
-var extractDescription = __webpack_require__(539)
-var url = __webpack_require__(453)
-var typos = __webpack_require__(540)
+var extractDescription = __webpack_require__(538)
+var url = __webpack_require__(452)
+var typos = __webpack_require__(539)
 
 var fixer = module.exports = {
   // default warning function
@@ -48400,7 +48061,7 @@ function bugsTypos(bugs, warn) {
 
 
 /***/ }),
-/* 521 */
+/* 520 */
 /***/ (function(module, exports) {
 
 exports = module.exports = SemVer
@@ -49889,11 +49550,11 @@ function coerce (version) {
 
 
 /***/ }),
-/* 522 */
+/* 521 */
 /***/ (function(module, exports, __webpack_require__) {
 
-var parse = __webpack_require__(523);
-var correct = __webpack_require__(525);
+var parse = __webpack_require__(522);
+var correct = __webpack_require__(524);
 
 var genericWarning = (
   'license should be ' +
@@ -49979,10 +49640,10 @@ module.exports = function(argument) {
 
 
 /***/ }),
-/* 523 */
+/* 522 */
 /***/ (function(module, exports, __webpack_require__) {
 
-var parser = __webpack_require__(524).parser
+var parser = __webpack_require__(523).parser
 
 module.exports = function (argument) {
   return parser.parse(argument)
@@ -49990,7 +49651,7 @@ module.exports = function (argument) {
 
 
 /***/ }),
-/* 524 */
+/* 523 */
 /***/ (function(module, exports, __webpack_require__) {
 
 /* WEBPACK VAR INJECTION */(function(module) {/* parser generated by jison 0.4.17 */
@@ -51354,10 +51015,10 @@ if ( true && __webpack_require__.c[__webpack_require__.s] === module) {
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(5)(module)))
 
 /***/ }),
-/* 525 */
+/* 524 */
 /***/ (function(module, exports, __webpack_require__) {
 
-var licenseIDs = __webpack_require__(526);
+var licenseIDs = __webpack_require__(525);
 
 function valid(string) {
   return licenseIDs.indexOf(string) > -1;
@@ -51597,20 +51258,20 @@ module.exports = function(identifier) {
 
 
 /***/ }),
-/* 526 */
+/* 525 */
 /***/ (function(module) {
 
 module.exports = JSON.parse("[\"Glide\",\"Abstyles\",\"AFL-1.1\",\"AFL-1.2\",\"AFL-2.0\",\"AFL-2.1\",\"AFL-3.0\",\"AMPAS\",\"APL-1.0\",\"Adobe-Glyph\",\"APAFML\",\"Adobe-2006\",\"AGPL-1.0\",\"Afmparse\",\"Aladdin\",\"ADSL\",\"AMDPLPA\",\"ANTLR-PD\",\"Apache-1.0\",\"Apache-1.1\",\"Apache-2.0\",\"AML\",\"APSL-1.0\",\"APSL-1.1\",\"APSL-1.2\",\"APSL-2.0\",\"Artistic-1.0\",\"Artistic-1.0-Perl\",\"Artistic-1.0-cl8\",\"Artistic-2.0\",\"AAL\",\"Bahyph\",\"Barr\",\"Beerware\",\"BitTorrent-1.0\",\"BitTorrent-1.1\",\"BSL-1.0\",\"Borceux\",\"BSD-2-Clause\",\"BSD-2-Clause-FreeBSD\",\"BSD-2-Clause-NetBSD\",\"BSD-3-Clause\",\"BSD-3-Clause-Clear\",\"BSD-4-Clause\",\"BSD-Protection\",\"BSD-Source-Code\",\"BSD-3-Clause-Attribution\",\"0BSD\",\"BSD-4-Clause-UC\",\"bzip2-1.0.5\",\"bzip2-1.0.6\",\"Caldera\",\"CECILL-1.0\",\"CECILL-1.1\",\"CECILL-2.0\",\"CECILL-2.1\",\"CECILL-B\",\"CECILL-C\",\"ClArtistic\",\"MIT-CMU\",\"CNRI-Jython\",\"CNRI-Python\",\"CNRI-Python-GPL-Compatible\",\"CPOL-1.02\",\"CDDL-1.0\",\"CDDL-1.1\",\"CPAL-1.0\",\"CPL-1.0\",\"CATOSL-1.1\",\"Condor-1.1\",\"CC-BY-1.0\",\"CC-BY-2.0\",\"CC-BY-2.5\",\"CC-BY-3.0\",\"CC-BY-4.0\",\"CC-BY-ND-1.0\",\"CC-BY-ND-2.0\",\"CC-BY-ND-2.5\",\"CC-BY-ND-3.0\",\"CC-BY-ND-4.0\",\"CC-BY-NC-1.0\",\"CC-BY-NC-2.0\",\"CC-BY-NC-2.5\",\"CC-BY-NC-3.0\",\"CC-BY-NC-4.0\",\"CC-BY-NC-ND-1.0\",\"CC-BY-NC-ND-2.0\",\"CC-BY-NC-ND-2.5\",\"CC-BY-NC-ND-3.0\",\"CC-BY-NC-ND-4.0\",\"CC-BY-NC-SA-1.0\",\"CC-BY-NC-SA-2.0\",\"CC-BY-NC-SA-2.5\",\"CC-BY-NC-SA-3.0\",\"CC-BY-NC-SA-4.0\",\"CC-BY-SA-1.0\",\"CC-BY-SA-2.0\",\"CC-BY-SA-2.5\",\"CC-BY-SA-3.0\",\"CC-BY-SA-4.0\",\"CC0-1.0\",\"Crossword\",\"CrystalStacker\",\"CUA-OPL-1.0\",\"Cube\",\"curl\",\"D-FSL-1.0\",\"diffmark\",\"WTFPL\",\"DOC\",\"Dotseqn\",\"DSDP\",\"dvipdfm\",\"EPL-1.0\",\"ECL-1.0\",\"ECL-2.0\",\"eGenix\",\"EFL-1.0\",\"EFL-2.0\",\"MIT-advertising\",\"MIT-enna\",\"Entessa\",\"ErlPL-1.1\",\"EUDatagrid\",\"EUPL-1.0\",\"EUPL-1.1\",\"Eurosym\",\"Fair\",\"MIT-feh\",\"Frameworx-1.0\",\"FreeImage\",\"FTL\",\"FSFAP\",\"FSFUL\",\"FSFULLR\",\"Giftware\",\"GL2PS\",\"Glulxe\",\"AGPL-3.0\",\"GFDL-1.1\",\"GFDL-1.2\",\"GFDL-1.3\",\"GPL-1.0\",\"GPL-2.0\",\"GPL-3.0\",\"LGPL-2.1\",\"LGPL-3.0\",\"LGPL-2.0\",\"gnuplot\",\"gSOAP-1.3b\",\"HaskellReport\",\"HPND\",\"IBM-pibs\",\"IPL-1.0\",\"ICU\",\"ImageMagick\",\"iMatix\",\"Imlib2\",\"IJG\",\"Info-ZIP\",\"Intel-ACPI\",\"Intel\",\"Interbase-1.0\",\"IPA\",\"ISC\",\"JasPer-2.0\",\"JSON\",\"LPPL-1.0\",\"LPPL-1.1\",\"LPPL-1.2\",\"LPPL-1.3a\",\"LPPL-1.3c\",\"Latex2e\",\"BSD-3-Clause-LBNL\",\"Leptonica\",\"LGPLLR\",\"Libpng\",\"libtiff\",\"LAL-1.2\",\"LAL-1.3\",\"LiLiQ-P-1.1\",\"LiLiQ-Rplus-1.1\",\"LiLiQ-R-1.1\",\"LPL-1.02\",\"LPL-1.0\",\"MakeIndex\",\"MTLL\",\"MS-PL\",\"MS-RL\",\"MirOS\",\"MITNFA\",\"MIT\",\"Motosoto\",\"MPL-1.0\",\"MPL-1.1\",\"MPL-2.0\",\"MPL-2.0-no-copyleft-exception\",\"mpich2\",\"Multics\",\"Mup\",\"NASA-1.3\",\"Naumen\",\"NBPL-1.0\",\"NetCDF\",\"NGPL\",\"NOSL\",\"NPL-1.0\",\"NPL-1.1\",\"Newsletr\",\"NLPL\",\"Nokia\",\"NPOSL-3.0\",\"NLOD-1.0\",\"Noweb\",\"NRL\",\"NTP\",\"Nunit\",\"OCLC-2.0\",\"ODbL-1.0\",\"PDDL-1.0\",\"OCCT-PL\",\"OGTSL\",\"OLDAP-2.2.2\",\"OLDAP-1.1\",\"OLDAP-1.2\",\"OLDAP-1.3\",\"OLDAP-1.4\",\"OLDAP-2.0\",\"OLDAP-2.0.1\",\"OLDAP-2.1\",\"OLDAP-2.2\",\"OLDAP-2.2.1\",\"OLDAP-2.3\",\"OLDAP-2.4\",\"OLDAP-2.5\",\"OLDAP-2.6\",\"OLDAP-2.7\",\"OLDAP-2.8\",\"OML\",\"OPL-1.0\",\"OSL-1.0\",\"OSL-1.1\",\"OSL-2.0\",\"OSL-2.1\",\"OSL-3.0\",\"OpenSSL\",\"OSET-PL-2.1\",\"PHP-3.0\",\"PHP-3.01\",\"Plexus\",\"PostgreSQL\",\"psfrag\",\"psutils\",\"Python-2.0\",\"QPL-1.0\",\"Qhull\",\"Rdisc\",\"RPSL-1.0\",\"RPL-1.1\",\"RPL-1.5\",\"RHeCos-1.1\",\"RSCPL\",\"RSA-MD\",\"Ruby\",\"SAX-PD\",\"Saxpath\",\"SCEA\",\"SWL\",\"SMPPL\",\"Sendmail\",\"SGI-B-1.0\",\"SGI-B-1.1\",\"SGI-B-2.0\",\"OFL-1.0\",\"OFL-1.1\",\"SimPL-2.0\",\"Sleepycat\",\"SNIA\",\"Spencer-86\",\"Spencer-94\",\"Spencer-99\",\"SMLNJ\",\"SugarCRM-1.1.3\",\"SISSL\",\"SISSL-1.2\",\"SPL-1.0\",\"Watcom-1.0\",\"TCL\",\"Unlicense\",\"TMate\",\"TORQUE-1.1\",\"TOSL\",\"Unicode-TOU\",\"UPL-1.0\",\"NCSA\",\"Vim\",\"VOSTROM\",\"VSL-1.0\",\"W3C-19980720\",\"W3C\",\"Wsuipa\",\"Xnet\",\"X11\",\"Xerox\",\"XFree86-1.1\",\"xinetd\",\"xpp\",\"XSkat\",\"YPL-1.0\",\"YPL-1.1\",\"Zed\",\"Zend-2.0\",\"Zimbra-1.3\",\"Zimbra-1.4\",\"Zlib\",\"zlib-acknowledgement\",\"ZPL-1.1\",\"ZPL-2.0\",\"ZPL-2.1\",\"BSD-3-Clause-No-Nuclear-License\",\"BSD-3-Clause-No-Nuclear-Warranty\",\"BSD-3-Clause-No-Nuclear-License-2014\",\"eCos-2.0\",\"GPL-2.0-with-autoconf-exception\",\"GPL-2.0-with-bison-exception\",\"GPL-2.0-with-classpath-exception\",\"GPL-2.0-with-font-exception\",\"GPL-2.0-with-GCC-exception\",\"GPL-3.0-with-autoconf-exception\",\"GPL-3.0-with-GCC-exception\",\"StandardML-NJ\",\"WXwindows\"]");
 
 /***/ }),
-/* 527 */
+/* 526 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
-var url = __webpack_require__(453)
-var gitHosts = __webpack_require__(528)
-var GitHost = module.exports = __webpack_require__(529)
+var url = __webpack_require__(452)
+var gitHosts = __webpack_require__(527)
+var GitHost = module.exports = __webpack_require__(528)
 
 var protocolToRepresentationMap = {
   'git+ssh': 'sshurl',
@@ -51731,7 +51392,7 @@ function parseGitUrl (giturl) {
 
 
 /***/ }),
-/* 528 */
+/* 527 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -51806,12 +51467,12 @@ Object.keys(gitHosts).forEach(function (name) {
 
 
 /***/ }),
-/* 529 */
+/* 528 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
-var gitHosts = __webpack_require__(528)
+var gitHosts = __webpack_require__(527)
 var extend = Object.assign || __webpack_require__(29)._extend
 
 var GitHost = module.exports = function (type, user, auth, project, committish, defaultRepresentation, opts) {
@@ -51927,21 +51588,21 @@ GitHost.prototype.toString = function (opts) {
 
 
 /***/ }),
-/* 530 */
+/* 529 */
 /***/ (function(module, exports, __webpack_require__) {
 
-var core = __webpack_require__(531);
-var async = __webpack_require__(533);
+var core = __webpack_require__(530);
+var async = __webpack_require__(532);
 async.core = core;
 async.isCore = function isCore(x) { return core[x]; };
-async.sync = __webpack_require__(538);
+async.sync = __webpack_require__(537);
 
 exports = async;
 module.exports = async;
 
 
 /***/ }),
-/* 531 */
+/* 530 */
 /***/ (function(module, exports, __webpack_require__) {
 
 var current = (process.versions && process.versions.node && process.versions.node.split('.')) || [];
@@ -51988,7 +51649,7 @@ function versionIncluded(specifierValue) {
     return matchesRange(specifierValue);
 }
 
-var data = __webpack_require__(532);
+var data = __webpack_require__(531);
 
 var core = {};
 for (var mod in data) { // eslint-disable-line no-restricted-syntax
@@ -52000,21 +51661,21 @@ module.exports = core;
 
 
 /***/ }),
-/* 532 */
+/* 531 */
 /***/ (function(module) {
 
 module.exports = JSON.parse("{\"assert\":true,\"async_hooks\":\">= 8\",\"buffer_ieee754\":\"< 0.9.7\",\"buffer\":true,\"child_process\":true,\"cluster\":true,\"console\":true,\"constants\":true,\"crypto\":true,\"_debugger\":\"< 8\",\"dgram\":true,\"dns\":true,\"domain\":true,\"events\":true,\"freelist\":\"< 6\",\"fs\":true,\"fs/promises\":\">= 10 && < 10.1\",\"_http_agent\":\">= 0.11.1\",\"_http_client\":\">= 0.11.1\",\"_http_common\":\">= 0.11.1\",\"_http_incoming\":\">= 0.11.1\",\"_http_outgoing\":\">= 0.11.1\",\"_http_server\":\">= 0.11.1\",\"http\":true,\"http2\":\">= 8.8\",\"https\":true,\"inspector\":\">= 8.0.0\",\"_linklist\":\"< 8\",\"module\":true,\"net\":true,\"node-inspect/lib/_inspect\":\">= 7.6.0\",\"node-inspect/lib/internal/inspect_client\":\">= 7.6.0\",\"node-inspect/lib/internal/inspect_repl\":\">= 7.6.0\",\"os\":true,\"path\":true,\"perf_hooks\":\">= 8.5\",\"process\":\">= 1\",\"punycode\":true,\"querystring\":true,\"readline\":true,\"repl\":true,\"smalloc\":\">= 0.11.5 && < 3\",\"_stream_duplex\":\">= 0.9.4\",\"_stream_transform\":\">= 0.9.4\",\"_stream_wrap\":\">= 1.4.1\",\"_stream_passthrough\":\">= 0.9.4\",\"_stream_readable\":\">= 0.9.4\",\"_stream_writable\":\">= 0.9.4\",\"stream\":true,\"string_decoder\":true,\"sys\":true,\"timers\":true,\"_tls_common\":\">= 0.11.13\",\"_tls_legacy\":\">= 0.11.3 && < 10\",\"_tls_wrap\":\">= 0.11.3\",\"tls\":true,\"trace_events\":\">= 10\",\"tty\":true,\"url\":true,\"util\":true,\"v8/tools/arguments\":\">= 10\",\"v8/tools/codemap\":[\">= 4.4.0 && < 5\",\">= 5.2.0\"],\"v8/tools/consarray\":[\">= 4.4.0 && < 5\",\">= 5.2.0\"],\"v8/tools/csvparser\":[\">= 4.4.0 && < 5\",\">= 5.2.0\"],\"v8/tools/logreader\":[\">= 4.4.0 && < 5\",\">= 5.2.0\"],\"v8/tools/profile_view\":[\">= 4.4.0 && < 5\",\">= 5.2.0\"],\"v8/tools/splaytree\":[\">= 4.4.0 && < 5\",\">= 5.2.0\"],\"v8\":\">= 1\",\"vm\":true,\"worker_threads\":\">= 11.7\",\"zlib\":true}");
 
 /***/ }),
-/* 533 */
+/* 532 */
 /***/ (function(module, exports, __webpack_require__) {
 
-var core = __webpack_require__(531);
+var core = __webpack_require__(530);
 var fs = __webpack_require__(23);
 var path = __webpack_require__(16);
-var caller = __webpack_require__(534);
-var nodeModulesPaths = __webpack_require__(535);
-var normalizeOptions = __webpack_require__(537);
+var caller = __webpack_require__(533);
+var nodeModulesPaths = __webpack_require__(534);
+var normalizeOptions = __webpack_require__(536);
 
 var defaultIsFile = function isFile(file, cb) {
     fs.stat(file, function (err, stat) {
@@ -52241,7 +51902,7 @@ module.exports = function resolve(x, options, callback) {
 
 
 /***/ }),
-/* 534 */
+/* 533 */
 /***/ (function(module, exports) {
 
 module.exports = function () {
@@ -52255,11 +51916,11 @@ module.exports = function () {
 
 
 /***/ }),
-/* 535 */
+/* 534 */
 /***/ (function(module, exports, __webpack_require__) {
 
 var path = __webpack_require__(16);
-var parse = path.parse || __webpack_require__(536);
+var parse = path.parse || __webpack_require__(535);
 
 var getNodeModulesDirs = function getNodeModulesDirs(absoluteStart, modules) {
     var prefix = '/';
@@ -52303,7 +51964,7 @@ module.exports = function nodeModulesPaths(start, opts, request) {
 
 
 /***/ }),
-/* 536 */
+/* 535 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -52403,7 +52064,7 @@ module.exports.win32 = win32.parse;
 
 
 /***/ }),
-/* 537 */
+/* 536 */
 /***/ (function(module, exports) {
 
 module.exports = function (x, opts) {
@@ -52419,15 +52080,15 @@ module.exports = function (x, opts) {
 
 
 /***/ }),
-/* 538 */
+/* 537 */
 /***/ (function(module, exports, __webpack_require__) {
 
-var core = __webpack_require__(531);
+var core = __webpack_require__(530);
 var fs = __webpack_require__(23);
 var path = __webpack_require__(16);
-var caller = __webpack_require__(534);
-var nodeModulesPaths = __webpack_require__(535);
-var normalizeOptions = __webpack_require__(537);
+var caller = __webpack_require__(533);
+var nodeModulesPaths = __webpack_require__(534);
+var normalizeOptions = __webpack_require__(536);
 
 var defaultIsFile = function isFile(file) {
     try {
@@ -52579,7 +52240,7 @@ module.exports = function (x, options) {
 
 
 /***/ }),
-/* 539 */
+/* 538 */
 /***/ (function(module, exports) {
 
 module.exports = extractDescription
@@ -52599,17 +52260,17 @@ function extractDescription (d) {
 
 
 /***/ }),
-/* 540 */
+/* 539 */
 /***/ (function(module) {
 
 module.exports = JSON.parse("{\"topLevel\":{\"dependancies\":\"dependencies\",\"dependecies\":\"dependencies\",\"depdenencies\":\"dependencies\",\"devEependencies\":\"devDependencies\",\"depends\":\"dependencies\",\"dev-dependencies\":\"devDependencies\",\"devDependences\":\"devDependencies\",\"devDepenencies\":\"devDependencies\",\"devdependencies\":\"devDependencies\",\"repostitory\":\"repository\",\"repo\":\"repository\",\"prefereGlobal\":\"preferGlobal\",\"hompage\":\"homepage\",\"hampage\":\"homepage\",\"autohr\":\"author\",\"autor\":\"author\",\"contributers\":\"contributors\",\"publicationConfig\":\"publishConfig\",\"script\":\"scripts\"},\"bugs\":{\"web\":\"url\",\"name\":\"url\"},\"script\":{\"server\":\"start\",\"tests\":\"test\"}}");
 
 /***/ }),
-/* 541 */
+/* 540 */
 /***/ (function(module, exports, __webpack_require__) {
 
 var util = __webpack_require__(29)
-var messages = __webpack_require__(542)
+var messages = __webpack_require__(541)
 
 module.exports = function() {
   var args = Array.prototype.slice.call(arguments, 0)
@@ -52634,20 +52295,20 @@ function makeTypoWarning (providedName, probableName, field) {
 
 
 /***/ }),
-/* 542 */
+/* 541 */
 /***/ (function(module) {
 
 module.exports = JSON.parse("{\"repositories\":\"'repositories' (plural) Not supported. Please pick one as the 'repository' field\",\"missingRepository\":\"No repository field.\",\"brokenGitUrl\":\"Probably broken git url: %s\",\"nonObjectScripts\":\"scripts must be an object\",\"nonStringScript\":\"script values must be string commands\",\"nonArrayFiles\":\"Invalid 'files' member\",\"invalidFilename\":\"Invalid filename in 'files' list: %s\",\"nonArrayBundleDependencies\":\"Invalid 'bundleDependencies' list. Must be array of package names\",\"nonStringBundleDependency\":\"Invalid bundleDependencies member: %s\",\"nonDependencyBundleDependency\":\"Non-dependency in bundleDependencies: %s\",\"nonObjectDependencies\":\"%s field must be an object\",\"nonStringDependency\":\"Invalid dependency: %s %s\",\"deprecatedArrayDependencies\":\"specifying %s as array is deprecated\",\"deprecatedModules\":\"modules field is deprecated\",\"nonArrayKeywords\":\"keywords should be an array of strings\",\"nonStringKeyword\":\"keywords should be an array of strings\",\"conflictingName\":\"%s is also the name of a node core module.\",\"nonStringDescription\":\"'description' field should be a string\",\"missingDescription\":\"No description\",\"missingReadme\":\"No README data\",\"missingLicense\":\"No license field.\",\"nonEmailUrlBugsString\":\"Bug string field must be url, email, or {email,url}\",\"nonUrlBugsUrlField\":\"bugs.url field must be a string url. Deleted.\",\"nonEmailBugsEmailField\":\"bugs.email field must be a string email. Deleted.\",\"emptyNormalizedBugs\":\"Normalized value of bugs field is an empty object. Deleted.\",\"nonUrlHomepage\":\"homepage field must be a string url. Deleted.\",\"invalidLicense\":\"license should be a valid SPDX license expression\",\"typo\":\"%s should probably be %s.\"}");
 
 /***/ }),
-/* 543 */
+/* 542 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 const path = __webpack_require__(16);
-const writeJsonFile = __webpack_require__(544);
-const sortKeys = __webpack_require__(556);
+const writeJsonFile = __webpack_require__(543);
+const sortKeys = __webpack_require__(555);
 
 const dependencyKeys = new Set([
 	'dependencies',
@@ -52712,18 +52373,18 @@ module.exports.sync = (filePath, data, options) => {
 
 
 /***/ }),
-/* 544 */
+/* 543 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 const path = __webpack_require__(16);
-const fs = __webpack_require__(545);
-const writeFileAtomic = __webpack_require__(549);
-const sortKeys = __webpack_require__(556);
-const makeDir = __webpack_require__(558);
-const pify = __webpack_require__(560);
-const detectIndent = __webpack_require__(561);
+const fs = __webpack_require__(544);
+const writeFileAtomic = __webpack_require__(548);
+const sortKeys = __webpack_require__(555);
+const makeDir = __webpack_require__(557);
+const pify = __webpack_require__(559);
+const detectIndent = __webpack_require__(560);
 
 const init = (fn, filePath, data, options) => {
 	if (!filePath) {
@@ -52795,13 +52456,13 @@ module.exports.sync = (filePath, data, options) => {
 
 
 /***/ }),
-/* 545 */
+/* 544 */
 /***/ (function(module, exports, __webpack_require__) {
 
 var fs = __webpack_require__(23)
-var polyfills = __webpack_require__(546)
-var legacy = __webpack_require__(547)
-var clone = __webpack_require__(548)
+var polyfills = __webpack_require__(545)
+var legacy = __webpack_require__(546)
+var clone = __webpack_require__(547)
 
 var queue = []
 
@@ -53080,7 +52741,7 @@ function retry () {
 
 
 /***/ }),
-/* 546 */
+/* 545 */
 /***/ (function(module, exports, __webpack_require__) {
 
 var constants = __webpack_require__(25)
@@ -53415,7 +53076,7 @@ function patch (fs) {
 
 
 /***/ }),
-/* 547 */
+/* 546 */
 /***/ (function(module, exports, __webpack_require__) {
 
 var Stream = __webpack_require__(27).Stream
@@ -53539,7 +53200,7 @@ function legacy (fs) {
 
 
 /***/ }),
-/* 548 */
+/* 547 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -53565,7 +53226,7 @@ function clone (obj) {
 
 
 /***/ }),
-/* 549 */
+/* 548 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -53575,8 +53236,8 @@ module.exports.sync = writeFileSync
 module.exports._getTmpname = getTmpname // for testing
 module.exports._cleanupOnExit = cleanupOnExit
 
-var fs = __webpack_require__(550)
-var MurmurHash3 = __webpack_require__(554)
+var fs = __webpack_require__(549)
+var MurmurHash3 = __webpack_require__(553)
 var onExit = __webpack_require__(377)
 var path = __webpack_require__(16)
 var activeFiles = {}
@@ -53585,7 +53246,7 @@ var activeFiles = {}
 /* istanbul ignore next */
 var threadId = (function getId () {
   try {
-    var workerThreads = __webpack_require__(555)
+    var workerThreads = __webpack_require__(554)
 
     /// if we are in main thread, this is set to `0`
     return workerThreads.threadId
@@ -53810,12 +53471,12 @@ function writeFileSync (filename, data, options) {
 
 
 /***/ }),
-/* 550 */
+/* 549 */
 /***/ (function(module, exports, __webpack_require__) {
 
 var fs = __webpack_require__(23)
-var polyfills = __webpack_require__(551)
-var legacy = __webpack_require__(553)
+var polyfills = __webpack_require__(550)
+var legacy = __webpack_require__(552)
 var queue = []
 
 var util = __webpack_require__(29)
@@ -53839,7 +53500,7 @@ if (/\bgfs4\b/i.test(process.env.NODE_DEBUG || '')) {
   })
 }
 
-module.exports = patch(__webpack_require__(552))
+module.exports = patch(__webpack_require__(551))
 if (process.env.TEST_GRACEFUL_FS_GLOBAL_PATCH) {
   module.exports = patch(fs)
 }
@@ -54078,10 +53739,10 @@ function retry () {
 
 
 /***/ }),
-/* 551 */
+/* 550 */
 /***/ (function(module, exports, __webpack_require__) {
 
-var fs = __webpack_require__(552)
+var fs = __webpack_require__(551)
 var constants = __webpack_require__(25)
 
 var origCwd = process.cwd
@@ -54414,7 +54075,7 @@ function chownErOk (er) {
 
 
 /***/ }),
-/* 552 */
+/* 551 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -54442,7 +54103,7 @@ function clone (obj) {
 
 
 /***/ }),
-/* 553 */
+/* 552 */
 /***/ (function(module, exports, __webpack_require__) {
 
 var Stream = __webpack_require__(27).Stream
@@ -54566,7 +54227,7 @@ function legacy (fs) {
 
 
 /***/ }),
-/* 554 */
+/* 553 */
 /***/ (function(module, exports, __webpack_require__) {
 
 /**
@@ -54708,18 +54369,18 @@ function legacy (fs) {
 
 
 /***/ }),
-/* 555 */
+/* 554 */
 /***/ (function(module, exports) {
 
 module.exports = require(undefined);
 
 /***/ }),
-/* 556 */
+/* 555 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
-const isPlainObj = __webpack_require__(557);
+const isPlainObj = __webpack_require__(556);
 
 module.exports = (obj, opts) => {
 	if (!isPlainObj(obj)) {
@@ -54776,7 +54437,7 @@ module.exports = (obj, opts) => {
 
 
 /***/ }),
-/* 557 */
+/* 556 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -54790,15 +54451,15 @@ module.exports = function (x) {
 
 
 /***/ }),
-/* 558 */
+/* 557 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 const fs = __webpack_require__(23);
 const path = __webpack_require__(16);
-const pify = __webpack_require__(559);
-const semver = __webpack_require__(521);
+const pify = __webpack_require__(558);
+const semver = __webpack_require__(520);
 
 const defaults = {
 	mode: 0o777 & (~process.umask()),
@@ -54936,7 +54597,7 @@ module.exports.sync = (input, options) => {
 
 
 /***/ }),
-/* 559 */
+/* 558 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -55011,7 +54672,7 @@ module.exports = (input, options) => {
 
 
 /***/ }),
-/* 560 */
+/* 559 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -55086,7 +54747,7 @@ module.exports = (input, options) => {
 
 
 /***/ }),
-/* 561 */
+/* 560 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -55215,7 +54876,7 @@ module.exports = str => {
 
 
 /***/ }),
-/* 562 */
+/* 561 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -55224,7 +54885,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "runScriptInPackage", function() { return runScriptInPackage; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "runScriptInPackageStreaming", function() { return runScriptInPackageStreaming; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "yarnWorkspacesInfo", function() { return yarnWorkspacesInfo; });
-/* harmony import */ var _child_process__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(563);
+/* harmony import */ var _child_process__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(562);
 /*
  * Licensed to Elasticsearch B.V. under one or more contributor
  * license agreements. See the NOTICE file distributed with
@@ -55294,7 +54955,7 @@ async function yarnWorkspacesInfo(directory) {
 }
 
 /***/ }),
-/* 563 */
+/* 562 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -55305,13 +54966,13 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var chalk__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(chalk__WEBPACK_IMPORTED_MODULE_0__);
 /* harmony import */ var execa__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(351);
 /* harmony import */ var execa__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(execa__WEBPACK_IMPORTED_MODULE_1__);
-/* harmony import */ var log_symbols__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(564);
+/* harmony import */ var log_symbols__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(563);
 /* harmony import */ var log_symbols__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(log_symbols__WEBPACK_IMPORTED_MODULE_2__);
-/* harmony import */ var strong_log_transformer__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(569);
+/* harmony import */ var strong_log_transformer__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(568);
 /* harmony import */ var strong_log_transformer__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(strong_log_transformer__WEBPACK_IMPORTED_MODULE_3__);
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
 
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(source, true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(source).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
@@ -55373,12 +55034,12 @@ function spawnStreaming(command, args, opts, {
 }
 
 /***/ }),
-/* 564 */
+/* 563 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
-const chalk = __webpack_require__(565);
+const chalk = __webpack_require__(564);
 
 const isSupported = process.platform !== 'win32' || process.env.CI || process.env.TERM === 'xterm-256color';
 
@@ -55400,16 +55061,16 @@ module.exports = isSupported ? main : fallbacks;
 
 
 /***/ }),
-/* 565 */
+/* 564 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 const escapeStringRegexp = __webpack_require__(3);
-const ansiStyles = __webpack_require__(566);
-const stdoutColor = __webpack_require__(567).stdout;
+const ansiStyles = __webpack_require__(565);
+const stdoutColor = __webpack_require__(566).stdout;
 
-const template = __webpack_require__(568);
+const template = __webpack_require__(567);
 
 const isSimpleWindowsTerm = process.platform === 'win32' && !(process.env.TERM || '').toLowerCase().startsWith('xterm');
 
@@ -55635,7 +55296,7 @@ module.exports.default = module.exports; // For TypeScript
 
 
 /***/ }),
-/* 566 */
+/* 565 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -55808,7 +55469,7 @@ Object.defineProperty(module, 'exports', {
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(5)(module)))
 
 /***/ }),
-/* 567 */
+/* 566 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -55950,7 +55611,7 @@ module.exports = {
 
 
 /***/ }),
-/* 568 */
+/* 567 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -56085,7 +55746,7 @@ module.exports = (chalk, tmp) => {
 
 
 /***/ }),
-/* 569 */
+/* 568 */
 /***/ (function(module, exports, __webpack_require__) {
 
 // Copyright IBM Corp. 2014,2018. All Rights Reserved.
@@ -56093,12 +55754,12 @@ module.exports = (chalk, tmp) => {
 // This file is licensed under the Apache License 2.0.
 // License text available at https://opensource.org/licenses/Apache-2.0
 
-module.exports = __webpack_require__(570);
-module.exports.cli = __webpack_require__(574);
+module.exports = __webpack_require__(569);
+module.exports.cli = __webpack_require__(573);
 
 
 /***/ }),
-/* 570 */
+/* 569 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -56113,9 +55774,9 @@ var stream = __webpack_require__(27);
 var util = __webpack_require__(29);
 var fs = __webpack_require__(23);
 
-var through = __webpack_require__(571);
-var duplexer = __webpack_require__(572);
-var StringDecoder = __webpack_require__(573).StringDecoder;
+var through = __webpack_require__(570);
+var duplexer = __webpack_require__(571);
+var StringDecoder = __webpack_require__(572).StringDecoder;
 
 module.exports = Logger;
 
@@ -56304,7 +55965,7 @@ function lineMerger(host) {
 
 
 /***/ }),
-/* 571 */
+/* 570 */
 /***/ (function(module, exports, __webpack_require__) {
 
 var Stream = __webpack_require__(27)
@@ -56418,7 +56079,7 @@ function through (write, end, opts) {
 
 
 /***/ }),
-/* 572 */
+/* 571 */
 /***/ (function(module, exports, __webpack_require__) {
 
 var Stream = __webpack_require__(27)
@@ -56511,13 +56172,13 @@ function duplex(writer, reader) {
 
 
 /***/ }),
-/* 573 */
+/* 572 */
 /***/ (function(module, exports) {
 
 module.exports = require("string_decoder");
 
 /***/ }),
-/* 574 */
+/* 573 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -56528,11 +56189,11 @@ module.exports = require("string_decoder");
 
 
 
-var minimist = __webpack_require__(575);
+var minimist = __webpack_require__(574);
 var path = __webpack_require__(16);
 
-var Logger = __webpack_require__(570);
-var pkg = __webpack_require__(576);
+var Logger = __webpack_require__(569);
+var pkg = __webpack_require__(575);
 
 module.exports = cli;
 
@@ -56586,7 +56247,7 @@ function usage($0, p) {
 
 
 /***/ }),
-/* 575 */
+/* 574 */
 /***/ (function(module, exports) {
 
 module.exports = function (args, opts) {
@@ -56828,29 +56489,29 @@ function isNumber (x) {
 
 
 /***/ }),
-/* 576 */
+/* 575 */
 /***/ (function(module) {
 
 module.exports = JSON.parse("{\"name\":\"strong-log-transformer\",\"version\":\"2.1.0\",\"description\":\"Stream transformer that prefixes lines with timestamps and other things.\",\"author\":\"Ryan Graham <ryan@strongloop.com>\",\"license\":\"Apache-2.0\",\"repository\":{\"type\":\"git\",\"url\":\"git://github.com/strongloop/strong-log-transformer\"},\"keywords\":[\"logging\",\"streams\"],\"bugs\":{\"url\":\"https://github.com/strongloop/strong-log-transformer/issues\"},\"homepage\":\"https://github.com/strongloop/strong-log-transformer\",\"directories\":{\"test\":\"test\"},\"bin\":{\"sl-log-transformer\":\"bin/sl-log-transformer.js\"},\"main\":\"index.js\",\"scripts\":{\"test\":\"tap --100 test/test-*\"},\"dependencies\":{\"duplexer\":\"^0.1.1\",\"minimist\":\"^1.2.0\",\"through\":\"^2.3.4\"},\"devDependencies\":{\"tap\":\"^12.0.1\"},\"engines\":{\"node\":\">=4\"}}");
 
 /***/ }),
-/* 577 */
+/* 576 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "workspacePackagePaths", function() { return workspacePackagePaths; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "copyWorkspacePackages", function() { return copyWorkspacePackages; });
-/* harmony import */ var glob__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(501);
+/* harmony import */ var glob__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(500);
 /* harmony import */ var glob__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(glob__WEBPACK_IMPORTED_MODULE_0__);
 /* harmony import */ var path__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(16);
 /* harmony import */ var path__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(path__WEBPACK_IMPORTED_MODULE_1__);
 /* harmony import */ var util__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(29);
 /* harmony import */ var util__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(util__WEBPACK_IMPORTED_MODULE_2__);
-/* harmony import */ var _config__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(578);
+/* harmony import */ var _config__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(577);
 /* harmony import */ var _fs__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(20);
-/* harmony import */ var _package_json__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(516);
-/* harmony import */ var _projects__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(500);
+/* harmony import */ var _package_json__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(515);
+/* harmony import */ var _projects__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(499);
 /*
  * Licensed to Elasticsearch B.V. under one or more contributor
  * license agreements. See the NOTICE file distributed with
@@ -56942,7 +56603,7 @@ function packagesFromGlobPattern({
 }
 
 /***/ }),
-/* 578 */
+/* 577 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -57012,7 +56673,7 @@ function getProjectPaths({
 }
 
 /***/ }),
-/* 579 */
+/* 578 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -57020,13 +56681,13 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "getAllChecksums", function() { return getAllChecksums; });
 /* harmony import */ var fs__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(23);
 /* harmony import */ var fs__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(fs__WEBPACK_IMPORTED_MODULE_0__);
-/* harmony import */ var crypto__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(580);
+/* harmony import */ var crypto__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(579);
 /* harmony import */ var crypto__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(crypto__WEBPACK_IMPORTED_MODULE_1__);
 /* harmony import */ var util__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(29);
 /* harmony import */ var util__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(util__WEBPACK_IMPORTED_MODULE_2__);
 /* harmony import */ var execa__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(351);
 /* harmony import */ var execa__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(execa__WEBPACK_IMPORTED_MODULE_3__);
-/* harmony import */ var _yarn_lock__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(581);
+/* harmony import */ var _yarn_lock__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(580);
 /*
  * Licensed to Elasticsearch B.V. under one or more contributor
  * license agreements. See the NOTICE file distributed with
@@ -57252,19 +56913,19 @@ async function getAllChecksums(kbn, log) {
 }
 
 /***/ }),
-/* 580 */
+/* 579 */
 /***/ (function(module, exports) {
 
 module.exports = require("crypto");
 
 /***/ }),
-/* 581 */
+/* 580 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "readYarnLock", function() { return readYarnLock; });
-/* harmony import */ var _yarnpkg_lockfile__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(582);
+/* harmony import */ var _yarnpkg_lockfile__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(581);
 /* harmony import */ var _yarnpkg_lockfile__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_yarnpkg_lockfile__WEBPACK_IMPORTED_MODULE_0__);
 /* harmony import */ var _utils_fs__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(20);
 /*
@@ -57308,7 +56969,7 @@ async function readYarnLock(kbn) {
 }
 
 /***/ }),
-/* 582 */
+/* 581 */
 /***/ (function(module, exports, __webpack_require__) {
 
 module.exports =
@@ -58867,7 +58528,7 @@ module.exports = invariant;
 /* 9 */
 /***/ (function(module, exports) {
 
-module.exports = __webpack_require__(580);
+module.exports = __webpack_require__(579);
 
 /***/ }),
 /* 10 */,
@@ -61191,7 +60852,7 @@ function onceStrict (fn) {
 /* 63 */
 /***/ (function(module, exports) {
 
-module.exports = __webpack_require__(583);
+module.exports = __webpack_require__(582);
 
 /***/ }),
 /* 64 */,
@@ -62129,7 +61790,7 @@ module.exports.win32 = win32;
 /* 79 */
 /***/ (function(module, exports) {
 
-module.exports = __webpack_require__(479);
+module.exports = __webpack_require__(478);
 
 /***/ }),
 /* 80 */,
@@ -67586,13 +67247,13 @@ module.exports = process && support(supportLevel);
 /******/ ]);
 
 /***/ }),
-/* 583 */
+/* 582 */
 /***/ (function(module, exports) {
 
 module.exports = require("buffer");
 
 /***/ }),
-/* 584 */
+/* 583 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -67689,7 +67350,7 @@ class BootstrapCacheFile {
 }
 
 /***/ }),
-/* 585 */
+/* 584 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -67697,9 +67358,9 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "CleanCommand", function() { return CleanCommand; });
 /* harmony import */ var chalk__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(2);
 /* harmony import */ var chalk__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(chalk__WEBPACK_IMPORTED_MODULE_0__);
-/* harmony import */ var del__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(586);
+/* harmony import */ var del__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(585);
 /* harmony import */ var del__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(del__WEBPACK_IMPORTED_MODULE_1__);
-/* harmony import */ var ora__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(674);
+/* harmony import */ var ora__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(673);
 /* harmony import */ var ora__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(ora__WEBPACK_IMPORTED_MODULE_2__);
 /* harmony import */ var path__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(16);
 /* harmony import */ var path__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(path__WEBPACK_IMPORTED_MODULE_3__);
@@ -67780,11 +67441,10 @@ const CleanCommand = {
       const originalCwd = process.cwd();
 
       try {
-        for (const _ref of toDelete) {
-          const {
-            pattern,
-            cwd
-          } = _ref;
+        for (const {
+          pattern,
+          cwd
+        } of toDelete) {
           process.chdir(cwd);
           const promise = del__WEBPACK_IMPORTED_MODULE_1___default()(pattern);
           ora__WEBPACK_IMPORTED_MODULE_2___default.a.promise(promise, Object(path__WEBPACK_IMPORTED_MODULE_3__["relative"])(originalCwd, Object(path__WEBPACK_IMPORTED_MODULE_3__["join"])(cwd, String(pattern))));
@@ -67799,21 +67459,21 @@ const CleanCommand = {
 };
 
 /***/ }),
-/* 586 */
+/* 585 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 const {promisify} = __webpack_require__(29);
 const path = __webpack_require__(16);
-const globby = __webpack_require__(587);
-const isGlob = __webpack_require__(604);
-const slash = __webpack_require__(665);
+const globby = __webpack_require__(586);
+const isGlob = __webpack_require__(603);
+const slash = __webpack_require__(664);
 const gracefulFs = __webpack_require__(22);
-const isPathCwd = __webpack_require__(667);
-const isPathInside = __webpack_require__(668);
-const rimraf = __webpack_require__(669);
-const pMap = __webpack_require__(670);
+const isPathCwd = __webpack_require__(666);
+const isPathInside = __webpack_require__(667);
+const rimraf = __webpack_require__(668);
+const pMap = __webpack_require__(669);
 
 const rimrafP = promisify(rimraf);
 
@@ -67927,19 +67587,19 @@ module.exports.sync = (patterns, {force, dryRun, cwd = process.cwd(), ...options
 
 
 /***/ }),
-/* 587 */
+/* 586 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 const fs = __webpack_require__(23);
-const arrayUnion = __webpack_require__(588);
-const merge2 = __webpack_require__(589);
-const glob = __webpack_require__(590);
-const fastGlob = __webpack_require__(595);
-const dirGlob = __webpack_require__(661);
-const gitignore = __webpack_require__(663);
-const {FilterStream, UniqueStream} = __webpack_require__(666);
+const arrayUnion = __webpack_require__(587);
+const merge2 = __webpack_require__(588);
+const glob = __webpack_require__(589);
+const fastGlob = __webpack_require__(594);
+const dirGlob = __webpack_require__(660);
+const gitignore = __webpack_require__(662);
+const {FilterStream, UniqueStream} = __webpack_require__(665);
 
 const DEFAULT_FILTER = () => false;
 
@@ -68112,7 +67772,7 @@ module.exports.gitignore = gitignore;
 
 
 /***/ }),
-/* 588 */
+/* 587 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -68124,7 +67784,7 @@ module.exports = (...arguments_) => {
 
 
 /***/ }),
-/* 589 */
+/* 588 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -68238,7 +67898,7 @@ function pauseStreams (streams, options) {
 
 
 /***/ }),
-/* 590 */
+/* 589 */
 /***/ (function(module, exports, __webpack_require__) {
 
 // Approach:
@@ -68284,21 +67944,21 @@ function pauseStreams (streams, options) {
 module.exports = glob
 
 var fs = __webpack_require__(23)
-var rp = __webpack_require__(502)
-var minimatch = __webpack_require__(504)
+var rp = __webpack_require__(501)
+var minimatch = __webpack_require__(503)
 var Minimatch = minimatch.Minimatch
-var inherits = __webpack_require__(591)
+var inherits = __webpack_require__(590)
 var EE = __webpack_require__(379).EventEmitter
 var path = __webpack_require__(16)
 var assert = __webpack_require__(30)
-var isAbsolute = __webpack_require__(510)
-var globSync = __webpack_require__(593)
-var common = __webpack_require__(594)
+var isAbsolute = __webpack_require__(509)
+var globSync = __webpack_require__(592)
+var common = __webpack_require__(593)
 var alphasort = common.alphasort
 var alphasorti = common.alphasorti
 var setopts = common.setopts
 var ownProp = common.ownProp
-var inflight = __webpack_require__(513)
+var inflight = __webpack_require__(512)
 var util = __webpack_require__(29)
 var childrenIgnored = common.childrenIgnored
 var isIgnored = common.isIgnored
@@ -69034,7 +68694,7 @@ Glob.prototype._stat2 = function (f, abs, er, stat, cb) {
 
 
 /***/ }),
-/* 591 */
+/* 590 */
 /***/ (function(module, exports, __webpack_require__) {
 
 try {
@@ -69044,12 +68704,12 @@ try {
   module.exports = util.inherits;
 } catch (e) {
   /* istanbul ignore next */
-  module.exports = __webpack_require__(592);
+  module.exports = __webpack_require__(591);
 }
 
 
 /***/ }),
-/* 592 */
+/* 591 */
 /***/ (function(module, exports) {
 
 if (typeof Object.create === 'function') {
@@ -69082,22 +68742,22 @@ if (typeof Object.create === 'function') {
 
 
 /***/ }),
-/* 593 */
+/* 592 */
 /***/ (function(module, exports, __webpack_require__) {
 
 module.exports = globSync
 globSync.GlobSync = GlobSync
 
 var fs = __webpack_require__(23)
-var rp = __webpack_require__(502)
-var minimatch = __webpack_require__(504)
+var rp = __webpack_require__(501)
+var minimatch = __webpack_require__(503)
 var Minimatch = minimatch.Minimatch
-var Glob = __webpack_require__(590).Glob
+var Glob = __webpack_require__(589).Glob
 var util = __webpack_require__(29)
 var path = __webpack_require__(16)
 var assert = __webpack_require__(30)
-var isAbsolute = __webpack_require__(510)
-var common = __webpack_require__(594)
+var isAbsolute = __webpack_require__(509)
+var common = __webpack_require__(593)
 var alphasort = common.alphasort
 var alphasorti = common.alphasorti
 var setopts = common.setopts
@@ -69574,7 +69234,7 @@ GlobSync.prototype._makeAbs = function (f) {
 
 
 /***/ }),
-/* 594 */
+/* 593 */
 /***/ (function(module, exports, __webpack_require__) {
 
 exports.alphasort = alphasort
@@ -69592,8 +69252,8 @@ function ownProp (obj, field) {
 }
 
 var path = __webpack_require__(16)
-var minimatch = __webpack_require__(504)
-var isAbsolute = __webpack_require__(510)
+var minimatch = __webpack_require__(503)
+var isAbsolute = __webpack_require__(509)
 var Minimatch = minimatch.Minimatch
 
 function alphasorti (a, b) {
@@ -69820,17 +69480,17 @@ function childrenIgnored (self, path) {
 
 
 /***/ }),
-/* 595 */
+/* 594 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
-const taskManager = __webpack_require__(596);
-const async_1 = __webpack_require__(624);
-const stream_1 = __webpack_require__(657);
-const sync_1 = __webpack_require__(658);
-const settings_1 = __webpack_require__(660);
-const utils = __webpack_require__(597);
+const taskManager = __webpack_require__(595);
+const async_1 = __webpack_require__(623);
+const stream_1 = __webpack_require__(656);
+const sync_1 = __webpack_require__(657);
+const settings_1 = __webpack_require__(659);
+const utils = __webpack_require__(596);
 function FastGlob(source, options) {
     try {
         assertPatternsInput(source);
@@ -69888,13 +69548,13 @@ module.exports = FastGlob;
 
 
 /***/ }),
-/* 596 */
+/* 595 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 Object.defineProperty(exports, "__esModule", { value: true });
-const utils = __webpack_require__(597);
+const utils = __webpack_require__(596);
 function generate(patterns, settings) {
     const positivePatterns = getPositivePatterns(patterns);
     const negativePatterns = getNegativePatternsAsPositive(patterns, settings.ignore);
@@ -69962,28 +69622,28 @@ exports.convertPatternGroupToTask = convertPatternGroupToTask;
 
 
 /***/ }),
-/* 597 */
+/* 596 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 Object.defineProperty(exports, "__esModule", { value: true });
-const array = __webpack_require__(598);
+const array = __webpack_require__(597);
 exports.array = array;
-const errno = __webpack_require__(599);
+const errno = __webpack_require__(598);
 exports.errno = errno;
-const fs = __webpack_require__(600);
+const fs = __webpack_require__(599);
 exports.fs = fs;
-const path = __webpack_require__(601);
+const path = __webpack_require__(600);
 exports.path = path;
-const pattern = __webpack_require__(602);
+const pattern = __webpack_require__(601);
 exports.pattern = pattern;
-const stream = __webpack_require__(623);
+const stream = __webpack_require__(622);
 exports.stream = stream;
 
 
 /***/ }),
-/* 598 */
+/* 597 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -69996,7 +69656,7 @@ exports.flatten = flatten;
 
 
 /***/ }),
-/* 599 */
+/* 598 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -70009,7 +69669,7 @@ exports.isEnoentCodeError = isEnoentCodeError;
 
 
 /***/ }),
-/* 600 */
+/* 599 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -70034,7 +69694,7 @@ exports.createDirentFromStats = createDirentFromStats;
 
 
 /***/ }),
-/* 601 */
+/* 600 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -70055,16 +69715,16 @@ exports.makeAbsolute = makeAbsolute;
 
 
 /***/ }),
-/* 602 */
+/* 601 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 Object.defineProperty(exports, "__esModule", { value: true });
 const path = __webpack_require__(16);
-const globParent = __webpack_require__(603);
-const isGlob = __webpack_require__(604);
-const micromatch = __webpack_require__(606);
+const globParent = __webpack_require__(602);
+const isGlob = __webpack_require__(603);
+const micromatch = __webpack_require__(605);
 const GLOBSTAR = '**';
 function isStaticPattern(pattern) {
     return !isDynamicPattern(pattern);
@@ -70153,13 +69813,13 @@ exports.matchAny = matchAny;
 
 
 /***/ }),
-/* 603 */
+/* 602 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var isGlob = __webpack_require__(604);
+var isGlob = __webpack_require__(603);
 var pathPosixDirname = __webpack_require__(16).posix.dirname;
 var isWin32 = __webpack_require__(11).platform() === 'win32';
 
@@ -70194,7 +69854,7 @@ module.exports = function globParent(str) {
 
 
 /***/ }),
-/* 604 */
+/* 603 */
 /***/ (function(module, exports, __webpack_require__) {
 
 /*!
@@ -70204,7 +69864,7 @@ module.exports = function globParent(str) {
  * Released under the MIT License.
  */
 
-var isExtglob = __webpack_require__(605);
+var isExtglob = __webpack_require__(604);
 var chars = { '{': '}', '(': ')', '[': ']'};
 var strictRegex = /\\(.)|(^!|\*|[\].+)]\?|\[[^\\\]]+\]|\{[^\\}]+\}|\(\?[:!=][^\\)]+\)|\([^|]+\|[^\\)]+\))/;
 var relaxedRegex = /\\(.)|(^!|[*?{}()[\]]|\(\?)/;
@@ -70248,7 +69908,7 @@ module.exports = function isGlob(str, options) {
 
 
 /***/ }),
-/* 605 */
+/* 604 */
 /***/ (function(module, exports) {
 
 /*!
@@ -70274,16 +69934,16 @@ module.exports = function isExtglob(str) {
 
 
 /***/ }),
-/* 606 */
+/* 605 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
 const util = __webpack_require__(29);
-const braces = __webpack_require__(607);
-const picomatch = __webpack_require__(617);
-const utils = __webpack_require__(620);
+const braces = __webpack_require__(606);
+const picomatch = __webpack_require__(616);
+const utils = __webpack_require__(619);
 const isEmptyString = val => typeof val === 'string' && (val === '' || val === './');
 
 /**
@@ -70748,16 +70408,16 @@ module.exports = micromatch;
 
 
 /***/ }),
-/* 607 */
+/* 606 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-const stringify = __webpack_require__(608);
-const compile = __webpack_require__(610);
-const expand = __webpack_require__(614);
-const parse = __webpack_require__(615);
+const stringify = __webpack_require__(607);
+const compile = __webpack_require__(609);
+const expand = __webpack_require__(613);
+const parse = __webpack_require__(614);
 
 /**
  * Expand the given pattern or create a regex-compatible string.
@@ -70925,13 +70585,13 @@ module.exports = braces;
 
 
 /***/ }),
-/* 608 */
+/* 607 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-const utils = __webpack_require__(609);
+const utils = __webpack_require__(608);
 
 module.exports = (ast, options = {}) => {
   let stringify = (node, parent = {}) => {
@@ -70964,7 +70624,7 @@ module.exports = (ast, options = {}) => {
 
 
 /***/ }),
-/* 609 */
+/* 608 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -71083,14 +70743,14 @@ exports.flatten = (...args) => {
 
 
 /***/ }),
-/* 610 */
+/* 609 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-const fill = __webpack_require__(611);
-const utils = __webpack_require__(609);
+const fill = __webpack_require__(610);
+const utils = __webpack_require__(608);
 
 const compile = (ast, options = {}) => {
   let walk = (node, parent = {}) => {
@@ -71147,7 +70807,7 @@ module.exports = compile;
 
 
 /***/ }),
-/* 611 */
+/* 610 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -71161,7 +70821,7 @@ module.exports = compile;
 
 
 const util = __webpack_require__(29);
-const toRegexRange = __webpack_require__(612);
+const toRegexRange = __webpack_require__(611);
 
 const isObject = val => val !== null && typeof val === 'object' && !Array.isArray(val);
 
@@ -71403,7 +71063,7 @@ module.exports = fill;
 
 
 /***/ }),
-/* 612 */
+/* 611 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -71416,7 +71076,7 @@ module.exports = fill;
 
 
 
-const isNumber = __webpack_require__(613);
+const isNumber = __webpack_require__(612);
 
 const toRegexRange = (min, max, options) => {
   if (isNumber(min) === false) {
@@ -71698,7 +71358,7 @@ module.exports = toRegexRange;
 
 
 /***/ }),
-/* 613 */
+/* 612 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -71723,15 +71383,15 @@ module.exports = function(num) {
 
 
 /***/ }),
-/* 614 */
+/* 613 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-const fill = __webpack_require__(611);
-const stringify = __webpack_require__(608);
-const utils = __webpack_require__(609);
+const fill = __webpack_require__(610);
+const stringify = __webpack_require__(607);
+const utils = __webpack_require__(608);
 
 const append = (queue = '', stash = '', enclose = false) => {
   let result = [];
@@ -71843,13 +71503,13 @@ module.exports = expand;
 
 
 /***/ }),
-/* 615 */
+/* 614 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-const stringify = __webpack_require__(608);
+const stringify = __webpack_require__(607);
 
 /**
  * Constants
@@ -71871,7 +71531,7 @@ const {
   CHAR_SINGLE_QUOTE, /* ' */
   CHAR_NO_BREAK_SPACE,
   CHAR_ZERO_WIDTH_NOBREAK_SPACE
-} = __webpack_require__(616);
+} = __webpack_require__(615);
 
 /**
  * parse
@@ -72183,7 +71843,7 @@ module.exports = parse;
 
 
 /***/ }),
-/* 616 */
+/* 615 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -72247,26 +71907,26 @@ module.exports = {
 
 
 /***/ }),
-/* 617 */
+/* 616 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-module.exports = __webpack_require__(618);
+module.exports = __webpack_require__(617);
 
 
 /***/ }),
-/* 618 */
+/* 617 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
 const path = __webpack_require__(16);
-const scan = __webpack_require__(619);
-const parse = __webpack_require__(622);
-const utils = __webpack_require__(620);
+const scan = __webpack_require__(618);
+const parse = __webpack_require__(621);
+const utils = __webpack_require__(619);
 
 /**
  * Creates a matcher function from one or more glob patterns. The
@@ -72569,7 +72229,7 @@ picomatch.toRegex = (source, options) => {
  * @return {Object}
  */
 
-picomatch.constants = __webpack_require__(621);
+picomatch.constants = __webpack_require__(620);
 
 /**
  * Expose "picomatch"
@@ -72579,13 +72239,13 @@ module.exports = picomatch;
 
 
 /***/ }),
-/* 619 */
+/* 618 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-const utils = __webpack_require__(620);
+const utils = __webpack_require__(619);
 
 const {
   CHAR_ASTERISK,             /* * */
@@ -72603,7 +72263,7 @@ const {
   CHAR_RIGHT_CURLY_BRACE,    /* } */
   CHAR_RIGHT_PARENTHESES,    /* ) */
   CHAR_RIGHT_SQUARE_BRACKET /* ] */
-} = __webpack_require__(621);
+} = __webpack_require__(620);
 
 const isPathSeparator = code => {
   return code === CHAR_FORWARD_SLASH || code === CHAR_BACKWARD_SLASH;
@@ -72805,7 +72465,7 @@ module.exports = (input, options) => {
 
 
 /***/ }),
-/* 620 */
+/* 619 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -72817,7 +72477,7 @@ const {
   REGEX_SPECIAL_CHARS,
   REGEX_SPECIAL_CHARS_GLOBAL,
   REGEX_REMOVE_BACKSLASH
-} = __webpack_require__(621);
+} = __webpack_require__(620);
 
 exports.isObject = val => val !== null && typeof val === 'object' && !Array.isArray(val);
 exports.hasRegexChars = str => REGEX_SPECIAL_CHARS.test(str);
@@ -72855,7 +72515,7 @@ exports.escapeLast = (input, char, lastIdx) => {
 
 
 /***/ }),
-/* 621 */
+/* 620 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -73041,14 +72701,14 @@ module.exports = {
 
 
 /***/ }),
-/* 622 */
+/* 621 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-const utils = __webpack_require__(620);
-const constants = __webpack_require__(621);
+const utils = __webpack_require__(619);
+const constants = __webpack_require__(620);
 
 /**
  * Constants
@@ -74059,13 +73719,13 @@ module.exports = parse;
 
 
 /***/ }),
-/* 623 */
+/* 622 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 Object.defineProperty(exports, "__esModule", { value: true });
-const merge2 = __webpack_require__(589);
+const merge2 = __webpack_require__(588);
 function merge(streams) {
     const mergedStream = merge2(streams);
     streams.forEach((stream) => {
@@ -74077,14 +73737,14 @@ exports.merge = merge;
 
 
 /***/ }),
-/* 624 */
+/* 623 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 Object.defineProperty(exports, "__esModule", { value: true });
-const stream_1 = __webpack_require__(625);
-const provider_1 = __webpack_require__(652);
+const stream_1 = __webpack_require__(624);
+const provider_1 = __webpack_require__(651);
 class ProviderAsync extends provider_1.default {
     constructor() {
         super(...arguments);
@@ -74112,16 +73772,16 @@ exports.default = ProviderAsync;
 
 
 /***/ }),
-/* 625 */
+/* 624 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 Object.defineProperty(exports, "__esModule", { value: true });
 const stream_1 = __webpack_require__(27);
-const fsStat = __webpack_require__(626);
-const fsWalk = __webpack_require__(631);
-const reader_1 = __webpack_require__(651);
+const fsStat = __webpack_require__(625);
+const fsWalk = __webpack_require__(630);
+const reader_1 = __webpack_require__(650);
 class ReaderStream extends reader_1.default {
     constructor() {
         super(...arguments);
@@ -74174,15 +73834,15 @@ exports.default = ReaderStream;
 
 
 /***/ }),
-/* 626 */
+/* 625 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 Object.defineProperty(exports, "__esModule", { value: true });
-const async = __webpack_require__(627);
-const sync = __webpack_require__(628);
-const settings_1 = __webpack_require__(629);
+const async = __webpack_require__(626);
+const sync = __webpack_require__(627);
+const settings_1 = __webpack_require__(628);
 exports.Settings = settings_1.default;
 function stat(path, optionsOrSettingsOrCallback, callback) {
     if (typeof optionsOrSettingsOrCallback === 'function') {
@@ -74205,7 +73865,7 @@ function getSettings(settingsOrOptions = {}) {
 
 
 /***/ }),
-/* 627 */
+/* 626 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -74243,7 +73903,7 @@ function callSuccessCallback(callback, result) {
 
 
 /***/ }),
-/* 628 */
+/* 627 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -74272,13 +73932,13 @@ exports.read = read;
 
 
 /***/ }),
-/* 629 */
+/* 628 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 Object.defineProperty(exports, "__esModule", { value: true });
-const fs = __webpack_require__(630);
+const fs = __webpack_require__(629);
 class Settings {
     constructor(_options = {}) {
         this._options = _options;
@@ -74295,7 +73955,7 @@ exports.default = Settings;
 
 
 /***/ }),
-/* 630 */
+/* 629 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -74318,16 +73978,16 @@ exports.createFileSystemAdapter = createFileSystemAdapter;
 
 
 /***/ }),
-/* 631 */
+/* 630 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 Object.defineProperty(exports, "__esModule", { value: true });
-const async_1 = __webpack_require__(632);
-const stream_1 = __webpack_require__(647);
-const sync_1 = __webpack_require__(648);
-const settings_1 = __webpack_require__(650);
+const async_1 = __webpack_require__(631);
+const stream_1 = __webpack_require__(646);
+const sync_1 = __webpack_require__(647);
+const settings_1 = __webpack_require__(649);
 exports.Settings = settings_1.default;
 function walk(dir, optionsOrSettingsOrCallback, callback) {
     if (typeof optionsOrSettingsOrCallback === 'function') {
@@ -74357,13 +74017,13 @@ function getSettings(settingsOrOptions = {}) {
 
 
 /***/ }),
-/* 632 */
+/* 631 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 Object.defineProperty(exports, "__esModule", { value: true });
-const async_1 = __webpack_require__(633);
+const async_1 = __webpack_require__(632);
 class AsyncProvider {
     constructor(_root, _settings) {
         this._root = _root;
@@ -74394,17 +74054,17 @@ function callSuccessCallback(callback, entries) {
 
 
 /***/ }),
-/* 633 */
+/* 632 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 Object.defineProperty(exports, "__esModule", { value: true });
 const events_1 = __webpack_require__(379);
-const fsScandir = __webpack_require__(634);
-const fastq = __webpack_require__(643);
-const common = __webpack_require__(645);
-const reader_1 = __webpack_require__(646);
+const fsScandir = __webpack_require__(633);
+const fastq = __webpack_require__(642);
+const common = __webpack_require__(644);
+const reader_1 = __webpack_require__(645);
 class AsyncReader extends reader_1.default {
     constructor(_root, _settings) {
         super(_root, _settings);
@@ -74494,15 +74154,15 @@ exports.default = AsyncReader;
 
 
 /***/ }),
-/* 634 */
+/* 633 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 Object.defineProperty(exports, "__esModule", { value: true });
-const async = __webpack_require__(635);
-const sync = __webpack_require__(640);
-const settings_1 = __webpack_require__(641);
+const async = __webpack_require__(634);
+const sync = __webpack_require__(639);
+const settings_1 = __webpack_require__(640);
 exports.Settings = settings_1.default;
 function scandir(path, optionsOrSettingsOrCallback, callback) {
     if (typeof optionsOrSettingsOrCallback === 'function') {
@@ -74525,16 +74185,16 @@ function getSettings(settingsOrOptions = {}) {
 
 
 /***/ }),
-/* 635 */
+/* 634 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 Object.defineProperty(exports, "__esModule", { value: true });
-const fsStat = __webpack_require__(626);
-const rpl = __webpack_require__(636);
-const constants_1 = __webpack_require__(637);
-const utils = __webpack_require__(638);
+const fsStat = __webpack_require__(625);
+const rpl = __webpack_require__(635);
+const constants_1 = __webpack_require__(636);
+const utils = __webpack_require__(637);
 function read(dir, settings, callback) {
     if (!settings.stats && constants_1.IS_SUPPORT_READDIR_WITH_FILE_TYPES) {
         return readdirWithFileTypes(dir, settings, callback);
@@ -74623,7 +74283,7 @@ function callSuccessCallback(callback, result) {
 
 
 /***/ }),
-/* 636 */
+/* 635 */
 /***/ (function(module, exports) {
 
 module.exports = runParallel
@@ -74677,7 +74337,7 @@ function runParallel (tasks, cb) {
 
 
 /***/ }),
-/* 637 */
+/* 636 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -74693,18 +74353,18 @@ exports.IS_SUPPORT_READDIR_WITH_FILE_TYPES = MAJOR_VERSION > 10 || (MAJOR_VERSIO
 
 
 /***/ }),
-/* 638 */
+/* 637 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 Object.defineProperty(exports, "__esModule", { value: true });
-const fs = __webpack_require__(639);
+const fs = __webpack_require__(638);
 exports.fs = fs;
 
 
 /***/ }),
-/* 639 */
+/* 638 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -74729,15 +74389,15 @@ exports.createDirentFromStats = createDirentFromStats;
 
 
 /***/ }),
-/* 640 */
+/* 639 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 Object.defineProperty(exports, "__esModule", { value: true });
-const fsStat = __webpack_require__(626);
-const constants_1 = __webpack_require__(637);
-const utils = __webpack_require__(638);
+const fsStat = __webpack_require__(625);
+const constants_1 = __webpack_require__(636);
+const utils = __webpack_require__(637);
 function read(dir, settings) {
     if (!settings.stats && constants_1.IS_SUPPORT_READDIR_WITH_FILE_TYPES) {
         return readdirWithFileTypes(dir, settings);
@@ -74788,15 +74448,15 @@ exports.readdir = readdir;
 
 
 /***/ }),
-/* 641 */
+/* 640 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 Object.defineProperty(exports, "__esModule", { value: true });
 const path = __webpack_require__(16);
-const fsStat = __webpack_require__(626);
-const fs = __webpack_require__(642);
+const fsStat = __webpack_require__(625);
+const fs = __webpack_require__(641);
 class Settings {
     constructor(_options = {}) {
         this._options = _options;
@@ -74819,7 +74479,7 @@ exports.default = Settings;
 
 
 /***/ }),
-/* 642 */
+/* 641 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -74844,13 +74504,13 @@ exports.createFileSystemAdapter = createFileSystemAdapter;
 
 
 /***/ }),
-/* 643 */
+/* 642 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var reusify = __webpack_require__(644)
+var reusify = __webpack_require__(643)
 
 function fastqueue (context, worker, concurrency) {
   if (typeof context === 'function') {
@@ -75024,7 +74684,7 @@ module.exports = fastqueue
 
 
 /***/ }),
-/* 644 */
+/* 643 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -75064,7 +74724,7 @@ module.exports = reusify
 
 
 /***/ }),
-/* 645 */
+/* 644 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -75095,13 +74755,13 @@ exports.joinPathSegments = joinPathSegments;
 
 
 /***/ }),
-/* 646 */
+/* 645 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 Object.defineProperty(exports, "__esModule", { value: true });
-const common = __webpack_require__(645);
+const common = __webpack_require__(644);
 class Reader {
     constructor(_root, _settings) {
         this._root = _root;
@@ -75113,14 +74773,14 @@ exports.default = Reader;
 
 
 /***/ }),
-/* 647 */
+/* 646 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 Object.defineProperty(exports, "__esModule", { value: true });
 const stream_1 = __webpack_require__(27);
-const async_1 = __webpack_require__(633);
+const async_1 = __webpack_require__(632);
 class StreamProvider {
     constructor(_root, _settings) {
         this._root = _root;
@@ -75150,13 +74810,13 @@ exports.default = StreamProvider;
 
 
 /***/ }),
-/* 648 */
+/* 647 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 Object.defineProperty(exports, "__esModule", { value: true });
-const sync_1 = __webpack_require__(649);
+const sync_1 = __webpack_require__(648);
 class SyncProvider {
     constructor(_root, _settings) {
         this._root = _root;
@@ -75171,15 +74831,15 @@ exports.default = SyncProvider;
 
 
 /***/ }),
-/* 649 */
+/* 648 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 Object.defineProperty(exports, "__esModule", { value: true });
-const fsScandir = __webpack_require__(634);
-const common = __webpack_require__(645);
-const reader_1 = __webpack_require__(646);
+const fsScandir = __webpack_require__(633);
+const common = __webpack_require__(644);
+const reader_1 = __webpack_require__(645);
 class SyncReader extends reader_1.default {
     constructor() {
         super(...arguments);
@@ -75237,14 +74897,14 @@ exports.default = SyncReader;
 
 
 /***/ }),
-/* 650 */
+/* 649 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 Object.defineProperty(exports, "__esModule", { value: true });
 const path = __webpack_require__(16);
-const fsScandir = __webpack_require__(634);
+const fsScandir = __webpack_require__(633);
 class Settings {
     constructor(_options = {}) {
         this._options = _options;
@@ -75270,15 +74930,15 @@ exports.default = Settings;
 
 
 /***/ }),
-/* 651 */
+/* 650 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 Object.defineProperty(exports, "__esModule", { value: true });
 const path = __webpack_require__(16);
-const fsStat = __webpack_require__(626);
-const utils = __webpack_require__(597);
+const fsStat = __webpack_require__(625);
+const utils = __webpack_require__(596);
 class Reader {
     constructor(_settings) {
         this._settings = _settings;
@@ -75310,17 +74970,17 @@ exports.default = Reader;
 
 
 /***/ }),
-/* 652 */
+/* 651 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 Object.defineProperty(exports, "__esModule", { value: true });
 const path = __webpack_require__(16);
-const deep_1 = __webpack_require__(653);
-const entry_1 = __webpack_require__(654);
-const error_1 = __webpack_require__(655);
-const entry_2 = __webpack_require__(656);
+const deep_1 = __webpack_require__(652);
+const entry_1 = __webpack_require__(653);
+const error_1 = __webpack_require__(654);
+const entry_2 = __webpack_require__(655);
 class Provider {
     constructor(_settings) {
         this._settings = _settings;
@@ -75365,13 +75025,13 @@ exports.default = Provider;
 
 
 /***/ }),
-/* 653 */
+/* 652 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 Object.defineProperty(exports, "__esModule", { value: true });
-const utils = __webpack_require__(597);
+const utils = __webpack_require__(596);
 class DeepFilter {
     constructor(_settings, _micromatchOptions) {
         this._settings = _settings;
@@ -75431,13 +75091,13 @@ exports.default = DeepFilter;
 
 
 /***/ }),
-/* 654 */
+/* 653 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 Object.defineProperty(exports, "__esModule", { value: true });
-const utils = __webpack_require__(597);
+const utils = __webpack_require__(596);
 class EntryFilter {
     constructor(_settings, _micromatchOptions) {
         this._settings = _settings;
@@ -75492,13 +75152,13 @@ exports.default = EntryFilter;
 
 
 /***/ }),
-/* 655 */
+/* 654 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 Object.defineProperty(exports, "__esModule", { value: true });
-const utils = __webpack_require__(597);
+const utils = __webpack_require__(596);
 class ErrorFilter {
     constructor(_settings) {
         this._settings = _settings;
@@ -75514,13 +75174,13 @@ exports.default = ErrorFilter;
 
 
 /***/ }),
-/* 656 */
+/* 655 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 Object.defineProperty(exports, "__esModule", { value: true });
-const utils = __webpack_require__(597);
+const utils = __webpack_require__(596);
 class EntryTransformer {
     constructor(_settings) {
         this._settings = _settings;
@@ -75547,15 +75207,15 @@ exports.default = EntryTransformer;
 
 
 /***/ }),
-/* 657 */
+/* 656 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 Object.defineProperty(exports, "__esModule", { value: true });
 const stream_1 = __webpack_require__(27);
-const stream_2 = __webpack_require__(625);
-const provider_1 = __webpack_require__(652);
+const stream_2 = __webpack_require__(624);
+const provider_1 = __webpack_require__(651);
 class ProviderStream extends provider_1.default {
     constructor() {
         super(...arguments);
@@ -75583,14 +75243,14 @@ exports.default = ProviderStream;
 
 
 /***/ }),
-/* 658 */
+/* 657 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 Object.defineProperty(exports, "__esModule", { value: true });
-const sync_1 = __webpack_require__(659);
-const provider_1 = __webpack_require__(652);
+const sync_1 = __webpack_require__(658);
+const provider_1 = __webpack_require__(651);
 class ProviderSync extends provider_1.default {
     constructor() {
         super(...arguments);
@@ -75613,15 +75273,15 @@ exports.default = ProviderSync;
 
 
 /***/ }),
-/* 659 */
+/* 658 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 Object.defineProperty(exports, "__esModule", { value: true });
-const fsStat = __webpack_require__(626);
-const fsWalk = __webpack_require__(631);
-const reader_1 = __webpack_require__(651);
+const fsStat = __webpack_require__(625);
+const fsWalk = __webpack_require__(630);
+const reader_1 = __webpack_require__(650);
 class ReaderSync extends reader_1.default {
     constructor() {
         super(...arguments);
@@ -75663,7 +75323,7 @@ exports.default = ReaderSync;
 
 
 /***/ }),
-/* 660 */
+/* 659 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -75723,13 +75383,13 @@ exports.default = Settings;
 
 
 /***/ }),
-/* 661 */
+/* 660 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 const path = __webpack_require__(16);
-const pathType = __webpack_require__(662);
+const pathType = __webpack_require__(661);
 
 const getExtensions = extensions => extensions.length > 1 ? `{${extensions.join(',')}}` : extensions[0];
 
@@ -75805,7 +75465,7 @@ module.exports.sync = (input, options) => {
 
 
 /***/ }),
-/* 662 */
+/* 661 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -75855,7 +75515,7 @@ exports.isSymlinkSync = isTypeSync.bind(null, 'lstatSync', 'isSymbolicLink');
 
 
 /***/ }),
-/* 663 */
+/* 662 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -75863,9 +75523,9 @@ exports.isSymlinkSync = isTypeSync.bind(null, 'lstatSync', 'isSymbolicLink');
 const {promisify} = __webpack_require__(29);
 const fs = __webpack_require__(23);
 const path = __webpack_require__(16);
-const fastGlob = __webpack_require__(595);
-const gitIgnore = __webpack_require__(664);
-const slash = __webpack_require__(665);
+const fastGlob = __webpack_require__(594);
+const gitIgnore = __webpack_require__(663);
+const slash = __webpack_require__(664);
 
 const DEFAULT_IGNORE = [
 	'**/node_modules/**',
@@ -75979,7 +75639,7 @@ module.exports.sync = options => {
 
 
 /***/ }),
-/* 664 */
+/* 663 */
 /***/ (function(module, exports) {
 
 // A simple implementation of make-array
@@ -76570,7 +76230,7 @@ if (
 
 
 /***/ }),
-/* 665 */
+/* 664 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -76588,7 +76248,7 @@ module.exports = path => {
 
 
 /***/ }),
-/* 666 */
+/* 665 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -76641,7 +76301,7 @@ module.exports = {
 
 
 /***/ }),
-/* 667 */
+/* 666 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -76663,7 +76323,7 @@ module.exports = path_ => {
 
 
 /***/ }),
-/* 668 */
+/* 667 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -76691,7 +76351,7 @@ module.exports = (childPath, parentPath) => {
 
 
 /***/ }),
-/* 669 */
+/* 668 */
 /***/ (function(module, exports, __webpack_require__) {
 
 const assert = __webpack_require__(30)
@@ -76699,7 +76359,7 @@ const path = __webpack_require__(16)
 const fs = __webpack_require__(23)
 let glob = undefined
 try {
-  glob = __webpack_require__(590)
+  glob = __webpack_require__(589)
 } catch (_err) {
   // treat glob as optional.
 }
@@ -77065,12 +76725,12 @@ rimraf.sync = rimrafSync
 
 
 /***/ }),
-/* 670 */
+/* 669 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
-const AggregateError = __webpack_require__(671);
+const AggregateError = __webpack_require__(670);
 
 module.exports = async (
 	iterable,
@@ -77153,13 +76813,13 @@ module.exports = async (
 
 
 /***/ }),
-/* 671 */
+/* 670 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
-const indentString = __webpack_require__(672);
-const cleanStack = __webpack_require__(673);
+const indentString = __webpack_require__(671);
+const cleanStack = __webpack_require__(672);
 
 const cleanInternalStack = stack => stack.replace(/\s+at .*aggregate-error\/index.js:\d+:\d+\)?/g, '');
 
@@ -77207,7 +76867,7 @@ module.exports = AggregateError;
 
 
 /***/ }),
-/* 672 */
+/* 671 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -77249,7 +76909,7 @@ module.exports = (string, count = 1, options) => {
 
 
 /***/ }),
-/* 673 */
+/* 672 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -77296,15 +76956,15 @@ module.exports = (stack, options) => {
 
 
 /***/ }),
-/* 674 */
+/* 673 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
-const chalk = __webpack_require__(675);
-const cliCursor = __webpack_require__(679);
-const cliSpinners = __webpack_require__(683);
-const logSymbols = __webpack_require__(564);
+const chalk = __webpack_require__(674);
+const cliCursor = __webpack_require__(678);
+const cliSpinners = __webpack_require__(682);
+const logSymbols = __webpack_require__(563);
 
 class Ora {
 	constructor(options) {
@@ -77451,16 +77111,16 @@ module.exports.promise = (action, options) => {
 
 
 /***/ }),
-/* 675 */
+/* 674 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 const escapeStringRegexp = __webpack_require__(3);
-const ansiStyles = __webpack_require__(676);
-const stdoutColor = __webpack_require__(677).stdout;
+const ansiStyles = __webpack_require__(675);
+const stdoutColor = __webpack_require__(676).stdout;
 
-const template = __webpack_require__(678);
+const template = __webpack_require__(677);
 
 const isSimpleWindowsTerm = process.platform === 'win32' && !(process.env.TERM || '').toLowerCase().startsWith('xterm');
 
@@ -77686,7 +77346,7 @@ module.exports.default = module.exports; // For TypeScript
 
 
 /***/ }),
-/* 676 */
+/* 675 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -77859,7 +77519,7 @@ Object.defineProperty(module, 'exports', {
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(5)(module)))
 
 /***/ }),
-/* 677 */
+/* 676 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -78001,7 +77661,7 @@ module.exports = {
 
 
 /***/ }),
-/* 678 */
+/* 677 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -78136,12 +77796,12 @@ module.exports = (chalk, tmp) => {
 
 
 /***/ }),
-/* 679 */
+/* 678 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
-const restoreCursor = __webpack_require__(680);
+const restoreCursor = __webpack_require__(679);
 
 let hidden = false;
 
@@ -78182,12 +77842,12 @@ exports.toggle = (force, stream) => {
 
 
 /***/ }),
-/* 680 */
+/* 679 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
-const onetime = __webpack_require__(681);
+const onetime = __webpack_require__(680);
 const signalExit = __webpack_require__(377);
 
 module.exports = onetime(() => {
@@ -78198,12 +77858,12 @@ module.exports = onetime(() => {
 
 
 /***/ }),
-/* 681 */
+/* 680 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
-const mimicFn = __webpack_require__(682);
+const mimicFn = __webpack_require__(681);
 
 module.exports = (fn, opts) => {
 	// TODO: Remove this in v3
@@ -78244,7 +77904,7 @@ module.exports = (fn, opts) => {
 
 
 /***/ }),
-/* 682 */
+/* 681 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -78260,22 +77920,22 @@ module.exports = (to, from) => {
 
 
 /***/ }),
-/* 683 */
+/* 682 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
-module.exports = __webpack_require__(684);
+module.exports = __webpack_require__(683);
 
 
 /***/ }),
-/* 684 */
+/* 683 */
 /***/ (function(module) {
 
 module.exports = JSON.parse("{\"dots\":{\"interval\":80,\"frames\":[\"⠋\",\"⠙\",\"⠹\",\"⠸\",\"⠼\",\"⠴\",\"⠦\",\"⠧\",\"⠇\",\"⠏\"]},\"dots2\":{\"interval\":80,\"frames\":[\"⣾\",\"⣽\",\"⣻\",\"⢿\",\"⡿\",\"⣟\",\"⣯\",\"⣷\"]},\"dots3\":{\"interval\":80,\"frames\":[\"⠋\",\"⠙\",\"⠚\",\"⠞\",\"⠖\",\"⠦\",\"⠴\",\"⠲\",\"⠳\",\"⠓\"]},\"dots4\":{\"interval\":80,\"frames\":[\"⠄\",\"⠆\",\"⠇\",\"⠋\",\"⠙\",\"⠸\",\"⠰\",\"⠠\",\"⠰\",\"⠸\",\"⠙\",\"⠋\",\"⠇\",\"⠆\"]},\"dots5\":{\"interval\":80,\"frames\":[\"⠋\",\"⠙\",\"⠚\",\"⠒\",\"⠂\",\"⠂\",\"⠒\",\"⠲\",\"⠴\",\"⠦\",\"⠖\",\"⠒\",\"⠐\",\"⠐\",\"⠒\",\"⠓\",\"⠋\"]},\"dots6\":{\"interval\":80,\"frames\":[\"⠁\",\"⠉\",\"⠙\",\"⠚\",\"⠒\",\"⠂\",\"⠂\",\"⠒\",\"⠲\",\"⠴\",\"⠤\",\"⠄\",\"⠄\",\"⠤\",\"⠴\",\"⠲\",\"⠒\",\"⠂\",\"⠂\",\"⠒\",\"⠚\",\"⠙\",\"⠉\",\"⠁\"]},\"dots7\":{\"interval\":80,\"frames\":[\"⠈\",\"⠉\",\"⠋\",\"⠓\",\"⠒\",\"⠐\",\"⠐\",\"⠒\",\"⠖\",\"⠦\",\"⠤\",\"⠠\",\"⠠\",\"⠤\",\"⠦\",\"⠖\",\"⠒\",\"⠐\",\"⠐\",\"⠒\",\"⠓\",\"⠋\",\"⠉\",\"⠈\"]},\"dots8\":{\"interval\":80,\"frames\":[\"⠁\",\"⠁\",\"⠉\",\"⠙\",\"⠚\",\"⠒\",\"⠂\",\"⠂\",\"⠒\",\"⠲\",\"⠴\",\"⠤\",\"⠄\",\"⠄\",\"⠤\",\"⠠\",\"⠠\",\"⠤\",\"⠦\",\"⠖\",\"⠒\",\"⠐\",\"⠐\",\"⠒\",\"⠓\",\"⠋\",\"⠉\",\"⠈\",\"⠈\"]},\"dots9\":{\"interval\":80,\"frames\":[\"⢹\",\"⢺\",\"⢼\",\"⣸\",\"⣇\",\"⡧\",\"⡗\",\"⡏\"]},\"dots10\":{\"interval\":80,\"frames\":[\"⢄\",\"⢂\",\"⢁\",\"⡁\",\"⡈\",\"⡐\",\"⡠\"]},\"dots11\":{\"interval\":100,\"frames\":[\"⠁\",\"⠂\",\"⠄\",\"⡀\",\"⢀\",\"⠠\",\"⠐\",\"⠈\"]},\"dots12\":{\"interval\":80,\"frames\":[\"⢀⠀\",\"⡀⠀\",\"⠄⠀\",\"⢂⠀\",\"⡂⠀\",\"⠅⠀\",\"⢃⠀\",\"⡃⠀\",\"⠍⠀\",\"⢋⠀\",\"⡋⠀\",\"⠍⠁\",\"⢋⠁\",\"⡋⠁\",\"⠍⠉\",\"⠋⠉\",\"⠋⠉\",\"⠉⠙\",\"⠉⠙\",\"⠉⠩\",\"⠈⢙\",\"⠈⡙\",\"⢈⠩\",\"⡀⢙\",\"⠄⡙\",\"⢂⠩\",\"⡂⢘\",\"⠅⡘\",\"⢃⠨\",\"⡃⢐\",\"⠍⡐\",\"⢋⠠\",\"⡋⢀\",\"⠍⡁\",\"⢋⠁\",\"⡋⠁\",\"⠍⠉\",\"⠋⠉\",\"⠋⠉\",\"⠉⠙\",\"⠉⠙\",\"⠉⠩\",\"⠈⢙\",\"⠈⡙\",\"⠈⠩\",\"⠀⢙\",\"⠀⡙\",\"⠀⠩\",\"⠀⢘\",\"⠀⡘\",\"⠀⠨\",\"⠀⢐\",\"⠀⡐\",\"⠀⠠\",\"⠀⢀\",\"⠀⡀\"]},\"line\":{\"interval\":130,\"frames\":[\"-\",\"\\\\\",\"|\",\"/\"]},\"line2\":{\"interval\":100,\"frames\":[\"⠂\",\"-\",\"–\",\"—\",\"–\",\"-\"]},\"pipe\":{\"interval\":100,\"frames\":[\"┤\",\"┘\",\"┴\",\"└\",\"├\",\"┌\",\"┬\",\"┐\"]},\"simpleDots\":{\"interval\":400,\"frames\":[\".  \",\".. \",\"...\",\"   \"]},\"simpleDotsScrolling\":{\"interval\":200,\"frames\":[\".  \",\".. \",\"...\",\" ..\",\"  .\",\"   \"]},\"star\":{\"interval\":70,\"frames\":[\"✶\",\"✸\",\"✹\",\"✺\",\"✹\",\"✷\"]},\"star2\":{\"interval\":80,\"frames\":[\"+\",\"x\",\"*\"]},\"flip\":{\"interval\":70,\"frames\":[\"_\",\"_\",\"_\",\"-\",\"`\",\"`\",\"'\",\"´\",\"-\",\"_\",\"_\",\"_\"]},\"hamburger\":{\"interval\":100,\"frames\":[\"☱\",\"☲\",\"☴\"]},\"growVertical\":{\"interval\":120,\"frames\":[\"▁\",\"▃\",\"▄\",\"▅\",\"▆\",\"▇\",\"▆\",\"▅\",\"▄\",\"▃\"]},\"growHorizontal\":{\"interval\":120,\"frames\":[\"▏\",\"▎\",\"▍\",\"▌\",\"▋\",\"▊\",\"▉\",\"▊\",\"▋\",\"▌\",\"▍\",\"▎\"]},\"balloon\":{\"interval\":140,\"frames\":[\" \",\".\",\"o\",\"O\",\"@\",\"*\",\" \"]},\"balloon2\":{\"interval\":120,\"frames\":[\".\",\"o\",\"O\",\"°\",\"O\",\"o\",\".\"]},\"noise\":{\"interval\":100,\"frames\":[\"▓\",\"▒\",\"░\"]},\"bounce\":{\"interval\":120,\"frames\":[\"⠁\",\"⠂\",\"⠄\",\"⠂\"]},\"boxBounce\":{\"interval\":120,\"frames\":[\"▖\",\"▘\",\"▝\",\"▗\"]},\"boxBounce2\":{\"interval\":100,\"frames\":[\"▌\",\"▀\",\"▐\",\"▄\"]},\"triangle\":{\"interval\":50,\"frames\":[\"◢\",\"◣\",\"◤\",\"◥\"]},\"arc\":{\"interval\":100,\"frames\":[\"◜\",\"◠\",\"◝\",\"◞\",\"◡\",\"◟\"]},\"circle\":{\"interval\":120,\"frames\":[\"◡\",\"⊙\",\"◠\"]},\"squareCorners\":{\"interval\":180,\"frames\":[\"◰\",\"◳\",\"◲\",\"◱\"]},\"circleQuarters\":{\"interval\":120,\"frames\":[\"◴\",\"◷\",\"◶\",\"◵\"]},\"circleHalves\":{\"interval\":50,\"frames\":[\"◐\",\"◓\",\"◑\",\"◒\"]},\"squish\":{\"interval\":100,\"frames\":[\"╫\",\"╪\"]},\"toggle\":{\"interval\":250,\"frames\":[\"⊶\",\"⊷\"]},\"toggle2\":{\"interval\":80,\"frames\":[\"▫\",\"▪\"]},\"toggle3\":{\"interval\":120,\"frames\":[\"□\",\"■\"]},\"toggle4\":{\"interval\":100,\"frames\":[\"■\",\"□\",\"▪\",\"▫\"]},\"toggle5\":{\"interval\":100,\"frames\":[\"▮\",\"▯\"]},\"toggle6\":{\"interval\":300,\"frames\":[\"ဝ\",\"၀\"]},\"toggle7\":{\"interval\":80,\"frames\":[\"⦾\",\"⦿\"]},\"toggle8\":{\"interval\":100,\"frames\":[\"◍\",\"◌\"]},\"toggle9\":{\"interval\":100,\"frames\":[\"◉\",\"◎\"]},\"toggle10\":{\"interval\":100,\"frames\":[\"㊂\",\"㊀\",\"㊁\"]},\"toggle11\":{\"interval\":50,\"frames\":[\"⧇\",\"⧆\"]},\"toggle12\":{\"interval\":120,\"frames\":[\"☗\",\"☖\"]},\"toggle13\":{\"interval\":80,\"frames\":[\"=\",\"*\",\"-\"]},\"arrow\":{\"interval\":100,\"frames\":[\"←\",\"↖\",\"↑\",\"↗\",\"→\",\"↘\",\"↓\",\"↙\"]},\"arrow2\":{\"interval\":80,\"frames\":[\"⬆️ \",\"↗️ \",\"➡️ \",\"↘️ \",\"⬇️ \",\"↙️ \",\"⬅️ \",\"↖️ \"]},\"arrow3\":{\"interval\":120,\"frames\":[\"▹▹▹▹▹\",\"▸▹▹▹▹\",\"▹▸▹▹▹\",\"▹▹▸▹▹\",\"▹▹▹▸▹\",\"▹▹▹▹▸\"]},\"bouncingBar\":{\"interval\":80,\"frames\":[\"[    ]\",\"[=   ]\",\"[==  ]\",\"[=== ]\",\"[ ===]\",\"[  ==]\",\"[   =]\",\"[    ]\",\"[   =]\",\"[  ==]\",\"[ ===]\",\"[====]\",\"[=== ]\",\"[==  ]\",\"[=   ]\"]},\"bouncingBall\":{\"interval\":80,\"frames\":[\"( ●    )\",\"(  ●   )\",\"(   ●  )\",\"(    ● )\",\"(     ●)\",\"(    ● )\",\"(   ●  )\",\"(  ●   )\",\"( ●    )\",\"(●     )\"]},\"smiley\":{\"interval\":200,\"frames\":[\"😄 \",\"😝 \"]},\"monkey\":{\"interval\":300,\"frames\":[\"🙈 \",\"🙈 \",\"🙉 \",\"🙊 \"]},\"hearts\":{\"interval\":100,\"frames\":[\"💛 \",\"💙 \",\"💜 \",\"💚 \",\"❤️ \"]},\"clock\":{\"interval\":100,\"frames\":[\"🕐 \",\"🕑 \",\"🕒 \",\"🕓 \",\"🕔 \",\"🕕 \",\"🕖 \",\"🕗 \",\"🕘 \",\"🕙 \",\"🕚 \"]},\"earth\":{\"interval\":180,\"frames\":[\"🌍 \",\"🌎 \",\"🌏 \"]},\"moon\":{\"interval\":80,\"frames\":[\"🌑 \",\"🌒 \",\"🌓 \",\"🌔 \",\"🌕 \",\"🌖 \",\"🌗 \",\"🌘 \"]},\"runner\":{\"interval\":140,\"frames\":[\"🚶 \",\"🏃 \"]},\"pong\":{\"interval\":80,\"frames\":[\"▐⠂       ▌\",\"▐⠈       ▌\",\"▐ ⠂      ▌\",\"▐ ⠠      ▌\",\"▐  ⡀     ▌\",\"▐  ⠠     ▌\",\"▐   ⠂    ▌\",\"▐   ⠈    ▌\",\"▐    ⠂   ▌\",\"▐    ⠠   ▌\",\"▐     ⡀  ▌\",\"▐     ⠠  ▌\",\"▐      ⠂ ▌\",\"▐      ⠈ ▌\",\"▐       ⠂▌\",\"▐       ⠠▌\",\"▐       ⡀▌\",\"▐      ⠠ ▌\",\"▐      ⠂ ▌\",\"▐     ⠈  ▌\",\"▐     ⠂  ▌\",\"▐    ⠠   ▌\",\"▐    ⡀   ▌\",\"▐   ⠠    ▌\",\"▐   ⠂    ▌\",\"▐  ⠈     ▌\",\"▐  ⠂     ▌\",\"▐ ⠠      ▌\",\"▐ ⡀      ▌\",\"▐⠠       ▌\"]},\"shark\":{\"interval\":120,\"frames\":[\"▐|\\\\____________▌\",\"▐_|\\\\___________▌\",\"▐__|\\\\__________▌\",\"▐___|\\\\_________▌\",\"▐____|\\\\________▌\",\"▐_____|\\\\_______▌\",\"▐______|\\\\______▌\",\"▐_______|\\\\_____▌\",\"▐________|\\\\____▌\",\"▐_________|\\\\___▌\",\"▐__________|\\\\__▌\",\"▐___________|\\\\_▌\",\"▐____________|\\\\▌\",\"▐____________/|▌\",\"▐___________/|_▌\",\"▐__________/|__▌\",\"▐_________/|___▌\",\"▐________/|____▌\",\"▐_______/|_____▌\",\"▐______/|______▌\",\"▐_____/|_______▌\",\"▐____/|________▌\",\"▐___/|_________▌\",\"▐__/|__________▌\",\"▐_/|___________▌\",\"▐/|____________▌\"]},\"dqpb\":{\"interval\":100,\"frames\":[\"d\",\"q\",\"p\",\"b\"]},\"weather\":{\"interval\":100,\"frames\":[\"☀️ \",\"☀️ \",\"☀️ \",\"🌤 \",\"⛅️ \",\"🌥 \",\"☁️ \",\"🌧 \",\"🌨 \",\"🌧 \",\"🌨 \",\"🌧 \",\"🌨 \",\"⛈ \",\"🌨 \",\"🌧 \",\"🌨 \",\"☁️ \",\"🌥 \",\"⛅️ \",\"🌤 \",\"☀️ \",\"☀️ \"]},\"christmas\":{\"interval\":400,\"frames\":[\"🌲\",\"🎄\"]}}");
 
 /***/ }),
-/* 685 */
+/* 684 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -78284,8 +77944,8 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var chalk__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(2);
 /* harmony import */ var chalk__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(chalk__WEBPACK_IMPORTED_MODULE_0__);
 /* harmony import */ var _utils_log__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(34);
-/* harmony import */ var _utils_parallelize__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(499);
-/* harmony import */ var _utils_projects__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(500);
+/* harmony import */ var _utils_parallelize__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(498);
+/* harmony import */ var _utils_projects__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(499);
 /*
  * Licensed to Elasticsearch B.V. under one or more contributor
  * license agreements. See the NOTICE file distributed with
@@ -78335,7 +77995,7 @@ const RunCommand = {
 };
 
 /***/ }),
-/* 686 */
+/* 685 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -78344,9 +78004,9 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var chalk__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(2);
 /* harmony import */ var chalk__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(chalk__WEBPACK_IMPORTED_MODULE_0__);
 /* harmony import */ var _utils_log__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(34);
-/* harmony import */ var _utils_parallelize__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(499);
-/* harmony import */ var _utils_projects__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(500);
-/* harmony import */ var _utils_watch__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(687);
+/* harmony import */ var _utils_parallelize__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(498);
+/* harmony import */ var _utils_projects__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(499);
+/* harmony import */ var _utils_watch__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(686);
 /*
  * Licensed to Elasticsearch B.V. under one or more contributor
  * license agreements. See the NOTICE file distributed with
@@ -78430,7 +78090,7 @@ const WatchCommand = {
 };
 
 /***/ }),
-/* 687 */
+/* 686 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -78504,7 +78164,7 @@ function waitUntilWatchIsReady(stream, opts = {}) {
 }
 
 /***/ }),
-/* 688 */
+/* 687 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -78512,18 +78172,18 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "runCommand", function() { return runCommand; });
 /* harmony import */ var chalk__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(2);
 /* harmony import */ var chalk__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(chalk__WEBPACK_IMPORTED_MODULE_0__);
-/* harmony import */ var indent_string__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(689);
+/* harmony import */ var indent_string__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(688);
 /* harmony import */ var indent_string__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(indent_string__WEBPACK_IMPORTED_MODULE_1__);
-/* harmony import */ var wrap_ansi__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(690);
+/* harmony import */ var wrap_ansi__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(689);
 /* harmony import */ var wrap_ansi__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(wrap_ansi__WEBPACK_IMPORTED_MODULE_2__);
-/* harmony import */ var _utils_errors__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(514);
+/* harmony import */ var _utils_errors__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(513);
 /* harmony import */ var _utils_log__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(34);
-/* harmony import */ var _utils_projects__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(500);
-/* harmony import */ var _utils_projects_tree__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(697);
-/* harmony import */ var _utils_kibana__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(698);
+/* harmony import */ var _utils_projects__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(499);
+/* harmony import */ var _utils_projects_tree__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(696);
+/* harmony import */ var _utils_kibana__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(697);
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
 
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(source, true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(source).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
@@ -78608,7 +78268,7 @@ function toArray(value) {
 }
 
 /***/ }),
-/* 689 */
+/* 688 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -78642,13 +78302,13 @@ module.exports = (str, count, opts) => {
 
 
 /***/ }),
-/* 690 */
+/* 689 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
-const stringWidth = __webpack_require__(691);
-const stripAnsi = __webpack_require__(695);
+const stringWidth = __webpack_require__(690);
+const stripAnsi = __webpack_require__(694);
 
 const ESCAPES = new Set([
 	'\u001B',
@@ -78842,13 +78502,13 @@ module.exports = (str, cols, opts) => {
 
 
 /***/ }),
-/* 691 */
+/* 690 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
-const stripAnsi = __webpack_require__(692);
-const isFullwidthCodePoint = __webpack_require__(694);
+const stripAnsi = __webpack_require__(691);
+const isFullwidthCodePoint = __webpack_require__(693);
 
 module.exports = str => {
 	if (typeof str !== 'string' || str.length === 0) {
@@ -78885,18 +78545,18 @@ module.exports = str => {
 
 
 /***/ }),
-/* 692 */
+/* 691 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
-const ansiRegex = __webpack_require__(693);
+const ansiRegex = __webpack_require__(692);
 
 module.exports = input => typeof input === 'string' ? input.replace(ansiRegex(), '') : input;
 
 
 /***/ }),
-/* 693 */
+/* 692 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -78913,7 +78573,7 @@ module.exports = () => {
 
 
 /***/ }),
-/* 694 */
+/* 693 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -78966,18 +78626,18 @@ module.exports = x => {
 
 
 /***/ }),
-/* 695 */
+/* 694 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
-const ansiRegex = __webpack_require__(696);
+const ansiRegex = __webpack_require__(695);
 
 module.exports = input => typeof input === 'string' ? input.replace(ansiRegex(), '') : input;
 
 
 /***/ }),
-/* 696 */
+/* 695 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -78994,7 +78654,7 @@ module.exports = () => {
 
 
 /***/ }),
-/* 697 */
+/* 696 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -79147,7 +78807,7 @@ function addProjectToTree(tree, pathParts, project) {
 }
 
 /***/ }),
-/* 698 */
+/* 697 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -79155,15 +78815,15 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Kibana", function() { return Kibana; });
 /* harmony import */ var path__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(16);
 /* harmony import */ var path__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(path__WEBPACK_IMPORTED_MODULE_0__);
-/* harmony import */ var multimatch__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(699);
+/* harmony import */ var multimatch__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(698);
 /* harmony import */ var multimatch__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(multimatch__WEBPACK_IMPORTED_MODULE_1__);
-/* harmony import */ var is_path_inside__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(703);
+/* harmony import */ var is_path_inside__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(702);
 /* harmony import */ var is_path_inside__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(is_path_inside__WEBPACK_IMPORTED_MODULE_2__);
-/* harmony import */ var _projects__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(500);
-/* harmony import */ var _config__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(578);
+/* harmony import */ var _projects__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(499);
+/* harmony import */ var _config__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(577);
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
 
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(source, true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(source).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
@@ -79301,15 +78961,15 @@ class Kibana {
 }
 
 /***/ }),
-/* 699 */
+/* 698 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
-const minimatch = __webpack_require__(504);
-const arrayUnion = __webpack_require__(700);
-const arrayDiffer = __webpack_require__(701);
-const arrify = __webpack_require__(702);
+const minimatch = __webpack_require__(503);
+const arrayUnion = __webpack_require__(699);
+const arrayDiffer = __webpack_require__(700);
+const arrify = __webpack_require__(701);
 
 module.exports = (list, patterns, options = {}) => {
 	list = arrify(list);
@@ -79333,7 +78993,7 @@ module.exports = (list, patterns, options = {}) => {
 
 
 /***/ }),
-/* 700 */
+/* 699 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -79345,7 +79005,7 @@ module.exports = (...arguments_) => {
 
 
 /***/ }),
-/* 701 */
+/* 700 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -79360,7 +79020,7 @@ module.exports = arrayDiffer;
 
 
 /***/ }),
-/* 702 */
+/* 701 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -79390,7 +79050,7 @@ module.exports = arrify;
 
 
 /***/ }),
-/* 703 */
+/* 702 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -79418,15 +79078,15 @@ module.exports = (childPath, parentPath) => {
 
 
 /***/ }),
-/* 704 */
+/* 703 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _build_production_projects__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(705);
+/* harmony import */ var _build_production_projects__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(704);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "buildProductionProjects", function() { return _build_production_projects__WEBPACK_IMPORTED_MODULE_0__["buildProductionProjects"]; });
 
-/* harmony import */ var _prepare_project_dependencies__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(928);
+/* harmony import */ var _prepare_project_dependencies__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(927);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "prepareExternalProjectDependencies", function() { return _prepare_project_dependencies__WEBPACK_IMPORTED_MODULE_1__["prepareExternalProjectDependencies"]; });
 
 /*
@@ -79451,23 +79111,23 @@ __webpack_require__.r(__webpack_exports__);
 
 
 /***/ }),
-/* 705 */
+/* 704 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "buildProductionProjects", function() { return buildProductionProjects; });
-/* harmony import */ var cpy__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(706);
+/* harmony import */ var cpy__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(705);
 /* harmony import */ var cpy__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(cpy__WEBPACK_IMPORTED_MODULE_0__);
-/* harmony import */ var del__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(586);
+/* harmony import */ var del__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(585);
 /* harmony import */ var del__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(del__WEBPACK_IMPORTED_MODULE_1__);
 /* harmony import */ var path__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(16);
 /* harmony import */ var path__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(path__WEBPACK_IMPORTED_MODULE_2__);
-/* harmony import */ var _config__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(578);
+/* harmony import */ var _config__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(577);
 /* harmony import */ var _utils_fs__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(20);
 /* harmony import */ var _utils_log__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(34);
-/* harmony import */ var _utils_package_json__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(516);
-/* harmony import */ var _utils_projects__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(500);
+/* harmony import */ var _utils_package_json__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(515);
+/* harmony import */ var _utils_projects__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(499);
 /*
  * Licensed to Elasticsearch B.V. under one or more contributor
  * license agreements. See the NOTICE file distributed with
@@ -79599,7 +79259,7 @@ async function copyToBuild(project, kibanaRoot, buildRoot) {
 }
 
 /***/ }),
-/* 706 */
+/* 705 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -79607,13 +79267,13 @@ async function copyToBuild(project, kibanaRoot, buildRoot) {
 const EventEmitter = __webpack_require__(379);
 const path = __webpack_require__(16);
 const os = __webpack_require__(11);
-const pAll = __webpack_require__(707);
-const arrify = __webpack_require__(709);
-const globby = __webpack_require__(710);
-const isGlob = __webpack_require__(604);
-const cpFile = __webpack_require__(913);
-const junk = __webpack_require__(925);
-const CpyError = __webpack_require__(926);
+const pAll = __webpack_require__(706);
+const arrify = __webpack_require__(708);
+const globby = __webpack_require__(709);
+const isGlob = __webpack_require__(603);
+const cpFile = __webpack_require__(912);
+const junk = __webpack_require__(924);
+const CpyError = __webpack_require__(925);
 
 const defaultOptions = {
 	ignoreJunk: true
@@ -79732,12 +79392,12 @@ module.exports = (source, destination, {
 
 
 /***/ }),
-/* 707 */
+/* 706 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
-const pMap = __webpack_require__(708);
+const pMap = __webpack_require__(707);
 
 module.exports = (iterable, options) => pMap(iterable, element => element(), options);
 // TODO: Remove this for the next major release
@@ -79745,7 +79405,7 @@ module.exports.default = module.exports;
 
 
 /***/ }),
-/* 708 */
+/* 707 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -79824,7 +79484,7 @@ module.exports.default = pMap;
 
 
 /***/ }),
-/* 709 */
+/* 708 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -79854,17 +79514,17 @@ module.exports = arrify;
 
 
 /***/ }),
-/* 710 */
+/* 709 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 const fs = __webpack_require__(23);
-const arrayUnion = __webpack_require__(711);
-const glob = __webpack_require__(713);
-const fastGlob = __webpack_require__(718);
-const dirGlob = __webpack_require__(906);
-const gitignore = __webpack_require__(909);
+const arrayUnion = __webpack_require__(710);
+const glob = __webpack_require__(712);
+const fastGlob = __webpack_require__(717);
+const dirGlob = __webpack_require__(905);
+const gitignore = __webpack_require__(908);
 
 const DEFAULT_FILTER = () => false;
 
@@ -80009,12 +79669,12 @@ module.exports.gitignore = gitignore;
 
 
 /***/ }),
-/* 711 */
+/* 710 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
-var arrayUniq = __webpack_require__(712);
+var arrayUniq = __webpack_require__(711);
 
 module.exports = function () {
 	return arrayUniq([].concat.apply([], arguments));
@@ -80022,7 +79682,7 @@ module.exports = function () {
 
 
 /***/ }),
-/* 712 */
+/* 711 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -80091,7 +79751,7 @@ if ('Set' in global) {
 
 
 /***/ }),
-/* 713 */
+/* 712 */
 /***/ (function(module, exports, __webpack_require__) {
 
 // Approach:
@@ -80137,21 +79797,21 @@ if ('Set' in global) {
 module.exports = glob
 
 var fs = __webpack_require__(23)
-var rp = __webpack_require__(502)
-var minimatch = __webpack_require__(504)
+var rp = __webpack_require__(501)
+var minimatch = __webpack_require__(503)
 var Minimatch = minimatch.Minimatch
-var inherits = __webpack_require__(714)
+var inherits = __webpack_require__(713)
 var EE = __webpack_require__(379).EventEmitter
 var path = __webpack_require__(16)
 var assert = __webpack_require__(30)
-var isAbsolute = __webpack_require__(510)
-var globSync = __webpack_require__(716)
-var common = __webpack_require__(717)
+var isAbsolute = __webpack_require__(509)
+var globSync = __webpack_require__(715)
+var common = __webpack_require__(716)
 var alphasort = common.alphasort
 var alphasorti = common.alphasorti
 var setopts = common.setopts
 var ownProp = common.ownProp
-var inflight = __webpack_require__(513)
+var inflight = __webpack_require__(512)
 var util = __webpack_require__(29)
 var childrenIgnored = common.childrenIgnored
 var isIgnored = common.isIgnored
@@ -80887,7 +80547,7 @@ Glob.prototype._stat2 = function (f, abs, er, stat, cb) {
 
 
 /***/ }),
-/* 714 */
+/* 713 */
 /***/ (function(module, exports, __webpack_require__) {
 
 try {
@@ -80897,12 +80557,12 @@ try {
   module.exports = util.inherits;
 } catch (e) {
   /* istanbul ignore next */
-  module.exports = __webpack_require__(715);
+  module.exports = __webpack_require__(714);
 }
 
 
 /***/ }),
-/* 715 */
+/* 714 */
 /***/ (function(module, exports) {
 
 if (typeof Object.create === 'function') {
@@ -80935,22 +80595,22 @@ if (typeof Object.create === 'function') {
 
 
 /***/ }),
-/* 716 */
+/* 715 */
 /***/ (function(module, exports, __webpack_require__) {
 
 module.exports = globSync
 globSync.GlobSync = GlobSync
 
 var fs = __webpack_require__(23)
-var rp = __webpack_require__(502)
-var minimatch = __webpack_require__(504)
+var rp = __webpack_require__(501)
+var minimatch = __webpack_require__(503)
 var Minimatch = minimatch.Minimatch
-var Glob = __webpack_require__(713).Glob
+var Glob = __webpack_require__(712).Glob
 var util = __webpack_require__(29)
 var path = __webpack_require__(16)
 var assert = __webpack_require__(30)
-var isAbsolute = __webpack_require__(510)
-var common = __webpack_require__(717)
+var isAbsolute = __webpack_require__(509)
+var common = __webpack_require__(716)
 var alphasort = common.alphasort
 var alphasorti = common.alphasorti
 var setopts = common.setopts
@@ -81427,7 +81087,7 @@ GlobSync.prototype._makeAbs = function (f) {
 
 
 /***/ }),
-/* 717 */
+/* 716 */
 /***/ (function(module, exports, __webpack_require__) {
 
 exports.alphasort = alphasort
@@ -81445,8 +81105,8 @@ function ownProp (obj, field) {
 }
 
 var path = __webpack_require__(16)
-var minimatch = __webpack_require__(504)
-var isAbsolute = __webpack_require__(510)
+var minimatch = __webpack_require__(503)
+var isAbsolute = __webpack_require__(509)
 var Minimatch = minimatch.Minimatch
 
 function alphasorti (a, b) {
@@ -81673,10 +81333,10 @@ function childrenIgnored (self, path) {
 
 
 /***/ }),
-/* 718 */
+/* 717 */
 /***/ (function(module, exports, __webpack_require__) {
 
-const pkg = __webpack_require__(719);
+const pkg = __webpack_require__(718);
 
 module.exports = pkg.async;
 module.exports.default = pkg.async;
@@ -81689,19 +81349,19 @@ module.exports.generateTasks = pkg.generateTasks;
 
 
 /***/ }),
-/* 719 */
+/* 718 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 Object.defineProperty(exports, "__esModule", { value: true });
-var optionsManager = __webpack_require__(720);
-var taskManager = __webpack_require__(721);
-var reader_async_1 = __webpack_require__(877);
-var reader_stream_1 = __webpack_require__(901);
-var reader_sync_1 = __webpack_require__(902);
-var arrayUtils = __webpack_require__(904);
-var streamUtils = __webpack_require__(905);
+var optionsManager = __webpack_require__(719);
+var taskManager = __webpack_require__(720);
+var reader_async_1 = __webpack_require__(876);
+var reader_stream_1 = __webpack_require__(900);
+var reader_sync_1 = __webpack_require__(901);
+var arrayUtils = __webpack_require__(903);
+var streamUtils = __webpack_require__(904);
 /**
  * Synchronous API.
  */
@@ -81767,7 +81427,7 @@ function isString(source) {
 
 
 /***/ }),
-/* 720 */
+/* 719 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -81805,13 +81465,13 @@ exports.prepare = prepare;
 
 
 /***/ }),
-/* 721 */
+/* 720 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 Object.defineProperty(exports, "__esModule", { value: true });
-var patternUtils = __webpack_require__(722);
+var patternUtils = __webpack_require__(721);
 /**
  * Generate tasks based on parent directory of each pattern.
  */
@@ -81902,16 +81562,16 @@ exports.convertPatternGroupToTask = convertPatternGroupToTask;
 
 
 /***/ }),
-/* 722 */
+/* 721 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 Object.defineProperty(exports, "__esModule", { value: true });
 var path = __webpack_require__(16);
-var globParent = __webpack_require__(723);
-var isGlob = __webpack_require__(726);
-var micromatch = __webpack_require__(727);
+var globParent = __webpack_require__(722);
+var isGlob = __webpack_require__(725);
+var micromatch = __webpack_require__(726);
 var GLOBSTAR = '**';
 /**
  * Return true for static pattern.
@@ -82057,15 +81717,15 @@ exports.matchAny = matchAny;
 
 
 /***/ }),
-/* 723 */
+/* 722 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
 var path = __webpack_require__(16);
-var isglob = __webpack_require__(724);
-var pathDirname = __webpack_require__(725);
+var isglob = __webpack_require__(723);
+var pathDirname = __webpack_require__(724);
 var isWin32 = __webpack_require__(11).platform() === 'win32';
 
 module.exports = function globParent(str) {
@@ -82088,7 +81748,7 @@ module.exports = function globParent(str) {
 
 
 /***/ }),
-/* 724 */
+/* 723 */
 /***/ (function(module, exports, __webpack_require__) {
 
 /*!
@@ -82098,7 +81758,7 @@ module.exports = function globParent(str) {
  * Licensed under the MIT License.
  */
 
-var isExtglob = __webpack_require__(605);
+var isExtglob = __webpack_require__(604);
 
 module.exports = function isGlob(str) {
   if (typeof str !== 'string' || str === '') {
@@ -82119,7 +81779,7 @@ module.exports = function isGlob(str) {
 
 
 /***/ }),
-/* 725 */
+/* 724 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -82269,7 +81929,7 @@ module.exports.win32 = win32;
 
 
 /***/ }),
-/* 726 */
+/* 725 */
 /***/ (function(module, exports, __webpack_require__) {
 
 /*!
@@ -82279,7 +81939,7 @@ module.exports.win32 = win32;
  * Released under the MIT License.
  */
 
-var isExtglob = __webpack_require__(605);
+var isExtglob = __webpack_require__(604);
 var chars = { '{': '}', '(': ')', '[': ']'};
 
 module.exports = function isGlob(str, options) {
@@ -82321,7 +81981,7 @@ module.exports = function isGlob(str, options) {
 
 
 /***/ }),
-/* 727 */
+/* 726 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -82332,18 +81992,18 @@ module.exports = function isGlob(str, options) {
  */
 
 var util = __webpack_require__(29);
-var braces = __webpack_require__(728);
-var toRegex = __webpack_require__(830);
-var extend = __webpack_require__(838);
+var braces = __webpack_require__(727);
+var toRegex = __webpack_require__(829);
+var extend = __webpack_require__(837);
 
 /**
  * Local dependencies
  */
 
-var compilers = __webpack_require__(841);
-var parsers = __webpack_require__(873);
-var cache = __webpack_require__(874);
-var utils = __webpack_require__(875);
+var compilers = __webpack_require__(840);
+var parsers = __webpack_require__(872);
+var cache = __webpack_require__(873);
+var utils = __webpack_require__(874);
 var MAX_LENGTH = 1024 * 64;
 
 /**
@@ -83205,7 +82865,7 @@ module.exports = micromatch;
 
 
 /***/ }),
-/* 728 */
+/* 727 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -83215,18 +82875,18 @@ module.exports = micromatch;
  * Module dependencies
  */
 
-var toRegex = __webpack_require__(729);
-var unique = __webpack_require__(741);
-var extend = __webpack_require__(738);
+var toRegex = __webpack_require__(728);
+var unique = __webpack_require__(740);
+var extend = __webpack_require__(737);
 
 /**
  * Local dependencies
  */
 
-var compilers = __webpack_require__(742);
-var parsers = __webpack_require__(757);
-var Braces = __webpack_require__(767);
-var utils = __webpack_require__(743);
+var compilers = __webpack_require__(741);
+var parsers = __webpack_require__(756);
+var Braces = __webpack_require__(766);
+var utils = __webpack_require__(742);
 var MAX_LENGTH = 1024 * 64;
 var cache = {};
 
@@ -83530,15 +83190,15 @@ module.exports = braces;
 
 
 /***/ }),
-/* 729 */
+/* 728 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var define = __webpack_require__(730);
-var extend = __webpack_require__(738);
-var not = __webpack_require__(740);
+var define = __webpack_require__(729);
+var extend = __webpack_require__(737);
+var not = __webpack_require__(739);
 var MAX_LENGTH = 1024 * 64;
 
 /**
@@ -83685,7 +83345,7 @@ module.exports.makeRe = makeRe;
 
 
 /***/ }),
-/* 730 */
+/* 729 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -83698,7 +83358,7 @@ module.exports.makeRe = makeRe;
 
 
 
-var isDescriptor = __webpack_require__(731);
+var isDescriptor = __webpack_require__(730);
 
 module.exports = function defineProperty(obj, prop, val) {
   if (typeof obj !== 'object' && typeof obj !== 'function') {
@@ -83723,7 +83383,7 @@ module.exports = function defineProperty(obj, prop, val) {
 
 
 /***/ }),
-/* 731 */
+/* 730 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -83736,9 +83396,9 @@ module.exports = function defineProperty(obj, prop, val) {
 
 
 
-var typeOf = __webpack_require__(732);
-var isAccessor = __webpack_require__(733);
-var isData = __webpack_require__(736);
+var typeOf = __webpack_require__(731);
+var isAccessor = __webpack_require__(732);
+var isData = __webpack_require__(735);
 
 module.exports = function isDescriptor(obj, key) {
   if (typeOf(obj) !== 'object') {
@@ -83752,7 +83412,7 @@ module.exports = function isDescriptor(obj, key) {
 
 
 /***/ }),
-/* 732 */
+/* 731 */
 /***/ (function(module, exports) {
 
 var toString = Object.prototype.toString;
@@ -83905,7 +83565,7 @@ function isBuffer(val) {
 
 
 /***/ }),
-/* 733 */
+/* 732 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -83918,7 +83578,7 @@ function isBuffer(val) {
 
 
 
-var typeOf = __webpack_require__(734);
+var typeOf = __webpack_require__(733);
 
 // accessor descriptor properties
 var accessor = {
@@ -83981,10 +83641,10 @@ module.exports = isAccessorDescriptor;
 
 
 /***/ }),
-/* 734 */
+/* 733 */
 /***/ (function(module, exports, __webpack_require__) {
 
-var isBuffer = __webpack_require__(735);
+var isBuffer = __webpack_require__(734);
 var toString = Object.prototype.toString;
 
 /**
@@ -84103,7 +83763,7 @@ module.exports = function kindOf(val) {
 
 
 /***/ }),
-/* 735 */
+/* 734 */
 /***/ (function(module, exports) {
 
 /*!
@@ -84130,7 +83790,7 @@ function isSlowBuffer (obj) {
 
 
 /***/ }),
-/* 736 */
+/* 735 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -84143,7 +83803,7 @@ function isSlowBuffer (obj) {
 
 
 
-var typeOf = __webpack_require__(737);
+var typeOf = __webpack_require__(736);
 
 // data descriptor properties
 var data = {
@@ -84192,10 +83852,10 @@ module.exports = isDataDescriptor;
 
 
 /***/ }),
-/* 737 */
+/* 736 */
 /***/ (function(module, exports, __webpack_require__) {
 
-var isBuffer = __webpack_require__(735);
+var isBuffer = __webpack_require__(734);
 var toString = Object.prototype.toString;
 
 /**
@@ -84314,13 +83974,13 @@ module.exports = function kindOf(val) {
 
 
 /***/ }),
-/* 738 */
+/* 737 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var isObject = __webpack_require__(739);
+var isObject = __webpack_require__(738);
 
 module.exports = function extend(o/*, objects*/) {
   if (!isObject(o)) { o = {}; }
@@ -84354,7 +84014,7 @@ function hasOwn(obj, key) {
 
 
 /***/ }),
-/* 739 */
+/* 738 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -84374,13 +84034,13 @@ module.exports = function isExtendable(val) {
 
 
 /***/ }),
-/* 740 */
+/* 739 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var extend = __webpack_require__(738);
+var extend = __webpack_require__(737);
 
 /**
  * The main export is a function that takes a `pattern` string and an `options` object.
@@ -84447,7 +84107,7 @@ module.exports = toRegex;
 
 
 /***/ }),
-/* 741 */
+/* 740 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -84497,13 +84157,13 @@ module.exports.immutable = function uniqueImmutable(arr) {
 
 
 /***/ }),
-/* 742 */
+/* 741 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var utils = __webpack_require__(743);
+var utils = __webpack_require__(742);
 
 module.exports = function(braces, options) {
   braces.compiler
@@ -84786,25 +84446,25 @@ function hasQueue(node) {
 
 
 /***/ }),
-/* 743 */
+/* 742 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var splitString = __webpack_require__(744);
+var splitString = __webpack_require__(743);
 var utils = module.exports;
 
 /**
  * Module dependencies
  */
 
-utils.extend = __webpack_require__(738);
-utils.flatten = __webpack_require__(750);
-utils.isObject = __webpack_require__(748);
-utils.fillRange = __webpack_require__(751);
-utils.repeat = __webpack_require__(756);
-utils.unique = __webpack_require__(741);
+utils.extend = __webpack_require__(737);
+utils.flatten = __webpack_require__(749);
+utils.isObject = __webpack_require__(747);
+utils.fillRange = __webpack_require__(750);
+utils.repeat = __webpack_require__(755);
+utils.unique = __webpack_require__(740);
 
 utils.define = function(obj, key, val) {
   Object.defineProperty(obj, key, {
@@ -85136,7 +84796,7 @@ utils.escapeRegex = function(str) {
 
 
 /***/ }),
-/* 744 */
+/* 743 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -85149,7 +84809,7 @@ utils.escapeRegex = function(str) {
 
 
 
-var extend = __webpack_require__(745);
+var extend = __webpack_require__(744);
 
 module.exports = function(str, options, fn) {
   if (typeof str !== 'string') {
@@ -85314,14 +84974,14 @@ function keepEscaping(opts, str, idx) {
 
 
 /***/ }),
-/* 745 */
+/* 744 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var isExtendable = __webpack_require__(746);
-var assignSymbols = __webpack_require__(749);
+var isExtendable = __webpack_require__(745);
+var assignSymbols = __webpack_require__(748);
 
 module.exports = Object.assign || function(obj/*, objects*/) {
   if (obj === null || typeof obj === 'undefined') {
@@ -85381,7 +85041,7 @@ function isEnum(obj, key) {
 
 
 /***/ }),
-/* 746 */
+/* 745 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -85394,7 +85054,7 @@ function isEnum(obj, key) {
 
 
 
-var isPlainObject = __webpack_require__(747);
+var isPlainObject = __webpack_require__(746);
 
 module.exports = function isExtendable(val) {
   return isPlainObject(val) || typeof val === 'function' || Array.isArray(val);
@@ -85402,7 +85062,7 @@ module.exports = function isExtendable(val) {
 
 
 /***/ }),
-/* 747 */
+/* 746 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -85415,7 +85075,7 @@ module.exports = function isExtendable(val) {
 
 
 
-var isObject = __webpack_require__(748);
+var isObject = __webpack_require__(747);
 
 function isObjectObject(o) {
   return isObject(o) === true
@@ -85446,7 +85106,7 @@ module.exports = function isPlainObject(o) {
 
 
 /***/ }),
-/* 748 */
+/* 747 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -85465,7 +85125,7 @@ module.exports = function isObject(val) {
 
 
 /***/ }),
-/* 749 */
+/* 748 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -85512,7 +85172,7 @@ module.exports = function(receiver, objects) {
 
 
 /***/ }),
-/* 750 */
+/* 749 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -85541,7 +85201,7 @@ function flat(arr, res) {
 
 
 /***/ }),
-/* 751 */
+/* 750 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -85555,10 +85215,10 @@ function flat(arr, res) {
 
 
 var util = __webpack_require__(29);
-var isNumber = __webpack_require__(752);
-var extend = __webpack_require__(738);
-var repeat = __webpack_require__(754);
-var toRegex = __webpack_require__(755);
+var isNumber = __webpack_require__(751);
+var extend = __webpack_require__(737);
+var repeat = __webpack_require__(753);
+var toRegex = __webpack_require__(754);
 
 /**
  * Return a range of numbers or letters.
@@ -85756,7 +85416,7 @@ module.exports = fillRange;
 
 
 /***/ }),
-/* 752 */
+/* 751 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -85769,7 +85429,7 @@ module.exports = fillRange;
 
 
 
-var typeOf = __webpack_require__(753);
+var typeOf = __webpack_require__(752);
 
 module.exports = function isNumber(num) {
   var type = typeOf(num);
@@ -85785,10 +85445,10 @@ module.exports = function isNumber(num) {
 
 
 /***/ }),
-/* 753 */
+/* 752 */
 /***/ (function(module, exports, __webpack_require__) {
 
-var isBuffer = __webpack_require__(735);
+var isBuffer = __webpack_require__(734);
 var toString = Object.prototype.toString;
 
 /**
@@ -85907,7 +85567,7 @@ module.exports = function kindOf(val) {
 
 
 /***/ }),
-/* 754 */
+/* 753 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -85984,7 +85644,7 @@ function repeat(str, num) {
 
 
 /***/ }),
-/* 755 */
+/* 754 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -85997,8 +85657,8 @@ function repeat(str, num) {
 
 
 
-var repeat = __webpack_require__(754);
-var isNumber = __webpack_require__(752);
+var repeat = __webpack_require__(753);
+var isNumber = __webpack_require__(751);
 var cache = {};
 
 function toRegexRange(min, max, options) {
@@ -86285,7 +85945,7 @@ module.exports = toRegexRange;
 
 
 /***/ }),
-/* 756 */
+/* 755 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -86310,14 +85970,14 @@ module.exports = function repeat(ele, num) {
 
 
 /***/ }),
-/* 757 */
+/* 756 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var Node = __webpack_require__(758);
-var utils = __webpack_require__(743);
+var Node = __webpack_require__(757);
+var utils = __webpack_require__(742);
 
 /**
  * Braces parsers
@@ -86677,15 +86337,15 @@ function concatNodes(pos, node, parent, options) {
 
 
 /***/ }),
-/* 758 */
+/* 757 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var isObject = __webpack_require__(748);
-var define = __webpack_require__(759);
-var utils = __webpack_require__(766);
+var isObject = __webpack_require__(747);
+var define = __webpack_require__(758);
+var utils = __webpack_require__(765);
 var ownNames;
 
 /**
@@ -87176,7 +86836,7 @@ exports = module.exports = Node;
 
 
 /***/ }),
-/* 759 */
+/* 758 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -87189,7 +86849,7 @@ exports = module.exports = Node;
 
 
 
-var isDescriptor = __webpack_require__(760);
+var isDescriptor = __webpack_require__(759);
 
 module.exports = function defineProperty(obj, prop, val) {
   if (typeof obj !== 'object' && typeof obj !== 'function') {
@@ -87214,7 +86874,7 @@ module.exports = function defineProperty(obj, prop, val) {
 
 
 /***/ }),
-/* 760 */
+/* 759 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -87227,9 +86887,9 @@ module.exports = function defineProperty(obj, prop, val) {
 
 
 
-var typeOf = __webpack_require__(761);
-var isAccessor = __webpack_require__(762);
-var isData = __webpack_require__(764);
+var typeOf = __webpack_require__(760);
+var isAccessor = __webpack_require__(761);
+var isData = __webpack_require__(763);
 
 module.exports = function isDescriptor(obj, key) {
   if (typeOf(obj) !== 'object') {
@@ -87243,7 +86903,7 @@ module.exports = function isDescriptor(obj, key) {
 
 
 /***/ }),
-/* 761 */
+/* 760 */
 /***/ (function(module, exports) {
 
 var toString = Object.prototype.toString;
@@ -87378,7 +87038,7 @@ function isBuffer(val) {
 
 
 /***/ }),
-/* 762 */
+/* 761 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -87391,7 +87051,7 @@ function isBuffer(val) {
 
 
 
-var typeOf = __webpack_require__(763);
+var typeOf = __webpack_require__(762);
 
 // accessor descriptor properties
 var accessor = {
@@ -87454,7 +87114,7 @@ module.exports = isAccessorDescriptor;
 
 
 /***/ }),
-/* 763 */
+/* 762 */
 /***/ (function(module, exports) {
 
 var toString = Object.prototype.toString;
@@ -87589,7 +87249,7 @@ function isBuffer(val) {
 
 
 /***/ }),
-/* 764 */
+/* 763 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -87602,7 +87262,7 @@ function isBuffer(val) {
 
 
 
-var typeOf = __webpack_require__(765);
+var typeOf = __webpack_require__(764);
 
 module.exports = function isDataDescriptor(obj, prop) {
   // data descriptor properties
@@ -87645,7 +87305,7 @@ module.exports = function isDataDescriptor(obj, prop) {
 
 
 /***/ }),
-/* 765 */
+/* 764 */
 /***/ (function(module, exports) {
 
 var toString = Object.prototype.toString;
@@ -87780,13 +87440,13 @@ function isBuffer(val) {
 
 
 /***/ }),
-/* 766 */
+/* 765 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var typeOf = __webpack_require__(753);
+var typeOf = __webpack_require__(752);
 var utils = module.exports;
 
 /**
@@ -88806,17 +88466,17 @@ function assert(val, message) {
 
 
 /***/ }),
-/* 767 */
+/* 766 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var extend = __webpack_require__(738);
-var Snapdragon = __webpack_require__(768);
-var compilers = __webpack_require__(742);
-var parsers = __webpack_require__(757);
-var utils = __webpack_require__(743);
+var extend = __webpack_require__(737);
+var Snapdragon = __webpack_require__(767);
+var compilers = __webpack_require__(741);
+var parsers = __webpack_require__(756);
+var utils = __webpack_require__(742);
 
 /**
  * Customize Snapdragon parser and renderer
@@ -88917,17 +88577,17 @@ module.exports = Braces;
 
 
 /***/ }),
-/* 768 */
+/* 767 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var Base = __webpack_require__(769);
-var define = __webpack_require__(730);
-var Compiler = __webpack_require__(798);
-var Parser = __webpack_require__(827);
-var utils = __webpack_require__(807);
+var Base = __webpack_require__(768);
+var define = __webpack_require__(729);
+var Compiler = __webpack_require__(797);
+var Parser = __webpack_require__(826);
+var utils = __webpack_require__(806);
 var regexCache = {};
 var cache = {};
 
@@ -89098,20 +88758,20 @@ module.exports.Parser = Parser;
 
 
 /***/ }),
-/* 769 */
+/* 768 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
 var util = __webpack_require__(29);
-var define = __webpack_require__(770);
-var CacheBase = __webpack_require__(771);
-var Emitter = __webpack_require__(772);
-var isObject = __webpack_require__(748);
-var merge = __webpack_require__(789);
-var pascal = __webpack_require__(792);
-var cu = __webpack_require__(793);
+var define = __webpack_require__(769);
+var CacheBase = __webpack_require__(770);
+var Emitter = __webpack_require__(771);
+var isObject = __webpack_require__(747);
+var merge = __webpack_require__(788);
+var pascal = __webpack_require__(791);
+var cu = __webpack_require__(792);
 
 /**
  * Optionally define a custom `cache` namespace to use.
@@ -89540,7 +89200,7 @@ module.exports.namespace = namespace;
 
 
 /***/ }),
-/* 770 */
+/* 769 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -89553,7 +89213,7 @@ module.exports.namespace = namespace;
 
 
 
-var isDescriptor = __webpack_require__(760);
+var isDescriptor = __webpack_require__(759);
 
 module.exports = function defineProperty(obj, prop, val) {
   if (typeof obj !== 'object' && typeof obj !== 'function') {
@@ -89578,21 +89238,21 @@ module.exports = function defineProperty(obj, prop, val) {
 
 
 /***/ }),
-/* 771 */
+/* 770 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var isObject = __webpack_require__(748);
-var Emitter = __webpack_require__(772);
-var visit = __webpack_require__(773);
-var toPath = __webpack_require__(776);
-var union = __webpack_require__(777);
-var del = __webpack_require__(781);
-var get = __webpack_require__(779);
-var has = __webpack_require__(786);
-var set = __webpack_require__(780);
+var isObject = __webpack_require__(747);
+var Emitter = __webpack_require__(771);
+var visit = __webpack_require__(772);
+var toPath = __webpack_require__(775);
+var union = __webpack_require__(776);
+var del = __webpack_require__(780);
+var get = __webpack_require__(778);
+var has = __webpack_require__(785);
+var set = __webpack_require__(779);
 
 /**
  * Create a `Cache` constructor that when instantiated will
@@ -89846,7 +89506,7 @@ module.exports.namespace = namespace;
 
 
 /***/ }),
-/* 772 */
+/* 771 */
 /***/ (function(module, exports, __webpack_require__) {
 
 
@@ -90015,7 +89675,7 @@ Emitter.prototype.hasListeners = function(event){
 
 
 /***/ }),
-/* 773 */
+/* 772 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -90028,8 +89688,8 @@ Emitter.prototype.hasListeners = function(event){
 
 
 
-var visit = __webpack_require__(774);
-var mapVisit = __webpack_require__(775);
+var visit = __webpack_require__(773);
+var mapVisit = __webpack_require__(774);
 
 module.exports = function(collection, method, val) {
   var result;
@@ -90052,7 +89712,7 @@ module.exports = function(collection, method, val) {
 
 
 /***/ }),
-/* 774 */
+/* 773 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -90065,7 +89725,7 @@ module.exports = function(collection, method, val) {
 
 
 
-var isObject = __webpack_require__(748);
+var isObject = __webpack_require__(747);
 
 module.exports = function visit(thisArg, method, target, val) {
   if (!isObject(thisArg) && typeof thisArg !== 'function') {
@@ -90092,14 +89752,14 @@ module.exports = function visit(thisArg, method, target, val) {
 
 
 /***/ }),
-/* 775 */
+/* 774 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
 var util = __webpack_require__(29);
-var visit = __webpack_require__(774);
+var visit = __webpack_require__(773);
 
 /**
  * Map `visit` over an array of objects.
@@ -90136,7 +89796,7 @@ function isObject(val) {
 
 
 /***/ }),
-/* 776 */
+/* 775 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -90149,7 +89809,7 @@ function isObject(val) {
 
 
 
-var typeOf = __webpack_require__(753);
+var typeOf = __webpack_require__(752);
 
 module.exports = function toPath(args) {
   if (typeOf(args) !== 'arguments') {
@@ -90176,16 +89836,16 @@ function filter(arr) {
 
 
 /***/ }),
-/* 777 */
+/* 776 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var isObject = __webpack_require__(739);
-var union = __webpack_require__(778);
-var get = __webpack_require__(779);
-var set = __webpack_require__(780);
+var isObject = __webpack_require__(738);
+var union = __webpack_require__(777);
+var get = __webpack_require__(778);
+var set = __webpack_require__(779);
 
 module.exports = function unionValue(obj, prop, value) {
   if (!isObject(obj)) {
@@ -90213,7 +89873,7 @@ function arrayify(val) {
 
 
 /***/ }),
-/* 778 */
+/* 777 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -90249,7 +89909,7 @@ module.exports = function union(init) {
 
 
 /***/ }),
-/* 779 */
+/* 778 */
 /***/ (function(module, exports) {
 
 /*!
@@ -90305,7 +89965,7 @@ function toString(val) {
 
 
 /***/ }),
-/* 780 */
+/* 779 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -90318,10 +89978,10 @@ function toString(val) {
 
 
 
-var split = __webpack_require__(744);
-var extend = __webpack_require__(738);
-var isPlainObject = __webpack_require__(747);
-var isObject = __webpack_require__(739);
+var split = __webpack_require__(743);
+var extend = __webpack_require__(737);
+var isPlainObject = __webpack_require__(746);
+var isObject = __webpack_require__(738);
 
 module.exports = function(obj, prop, val) {
   if (!isObject(obj)) {
@@ -90367,7 +90027,7 @@ function isValidKey(key) {
 
 
 /***/ }),
-/* 781 */
+/* 780 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -90380,8 +90040,8 @@ function isValidKey(key) {
 
 
 
-var isObject = __webpack_require__(748);
-var has = __webpack_require__(782);
+var isObject = __webpack_require__(747);
+var has = __webpack_require__(781);
 
 module.exports = function unset(obj, prop) {
   if (!isObject(obj)) {
@@ -90406,7 +90066,7 @@ module.exports = function unset(obj, prop) {
 
 
 /***/ }),
-/* 782 */
+/* 781 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -90419,9 +90079,9 @@ module.exports = function unset(obj, prop) {
 
 
 
-var isObject = __webpack_require__(783);
-var hasValues = __webpack_require__(785);
-var get = __webpack_require__(779);
+var isObject = __webpack_require__(782);
+var hasValues = __webpack_require__(784);
+var get = __webpack_require__(778);
 
 module.exports = function(obj, prop, noZero) {
   if (isObject(obj)) {
@@ -90432,7 +90092,7 @@ module.exports = function(obj, prop, noZero) {
 
 
 /***/ }),
-/* 783 */
+/* 782 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -90445,7 +90105,7 @@ module.exports = function(obj, prop, noZero) {
 
 
 
-var isArray = __webpack_require__(784);
+var isArray = __webpack_require__(783);
 
 module.exports = function isObject(val) {
   return val != null && typeof val === 'object' && isArray(val) === false;
@@ -90453,7 +90113,7 @@ module.exports = function isObject(val) {
 
 
 /***/ }),
-/* 784 */
+/* 783 */
 /***/ (function(module, exports) {
 
 var toString = {}.toString;
@@ -90464,7 +90124,7 @@ module.exports = Array.isArray || function (arr) {
 
 
 /***/ }),
-/* 785 */
+/* 784 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -90507,7 +90167,7 @@ module.exports = function hasValue(o, noZero) {
 
 
 /***/ }),
-/* 786 */
+/* 785 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -90520,9 +90180,9 @@ module.exports = function hasValue(o, noZero) {
 
 
 
-var isObject = __webpack_require__(748);
-var hasValues = __webpack_require__(787);
-var get = __webpack_require__(779);
+var isObject = __webpack_require__(747);
+var hasValues = __webpack_require__(786);
+var get = __webpack_require__(778);
 
 module.exports = function(val, prop) {
   return hasValues(isObject(val) && prop ? get(val, prop) : val);
@@ -90530,7 +90190,7 @@ module.exports = function(val, prop) {
 
 
 /***/ }),
-/* 787 */
+/* 786 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -90543,8 +90203,8 @@ module.exports = function(val, prop) {
 
 
 
-var typeOf = __webpack_require__(788);
-var isNumber = __webpack_require__(752);
+var typeOf = __webpack_require__(787);
+var isNumber = __webpack_require__(751);
 
 module.exports = function hasValue(val) {
   // is-number checks for NaN and other edge cases
@@ -90597,10 +90257,10 @@ module.exports = function hasValue(val) {
 
 
 /***/ }),
-/* 788 */
+/* 787 */
 /***/ (function(module, exports, __webpack_require__) {
 
-var isBuffer = __webpack_require__(735);
+var isBuffer = __webpack_require__(734);
 var toString = Object.prototype.toString;
 
 /**
@@ -90722,14 +90382,14 @@ module.exports = function kindOf(val) {
 
 
 /***/ }),
-/* 789 */
+/* 788 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var isExtendable = __webpack_require__(790);
-var forIn = __webpack_require__(791);
+var isExtendable = __webpack_require__(789);
+var forIn = __webpack_require__(790);
 
 function mixinDeep(target, objects) {
   var len = arguments.length, i = 0;
@@ -90793,7 +90453,7 @@ module.exports = mixinDeep;
 
 
 /***/ }),
-/* 790 */
+/* 789 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -90806,7 +90466,7 @@ module.exports = mixinDeep;
 
 
 
-var isPlainObject = __webpack_require__(747);
+var isPlainObject = __webpack_require__(746);
 
 module.exports = function isExtendable(val) {
   return isPlainObject(val) || typeof val === 'function' || Array.isArray(val);
@@ -90814,7 +90474,7 @@ module.exports = function isExtendable(val) {
 
 
 /***/ }),
-/* 791 */
+/* 790 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -90837,7 +90497,7 @@ module.exports = function forIn(obj, fn, thisArg) {
 
 
 /***/ }),
-/* 792 */
+/* 791 */
 /***/ (function(module, exports) {
 
 /*!
@@ -90864,14 +90524,14 @@ module.exports = pascalcase;
 
 
 /***/ }),
-/* 793 */
+/* 792 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
 var util = __webpack_require__(29);
-var utils = __webpack_require__(794);
+var utils = __webpack_require__(793);
 
 /**
  * Expose class utils
@@ -91236,7 +90896,7 @@ cu.bubble = function(Parent, events) {
 
 
 /***/ }),
-/* 794 */
+/* 793 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -91250,10 +90910,10 @@ var utils = {};
  * Lazily required module dependencies
  */
 
-utils.union = __webpack_require__(778);
-utils.define = __webpack_require__(730);
-utils.isObj = __webpack_require__(748);
-utils.staticExtend = __webpack_require__(795);
+utils.union = __webpack_require__(777);
+utils.define = __webpack_require__(729);
+utils.isObj = __webpack_require__(747);
+utils.staticExtend = __webpack_require__(794);
 
 
 /**
@@ -91264,7 +90924,7 @@ module.exports = utils;
 
 
 /***/ }),
-/* 795 */
+/* 794 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -91277,8 +90937,8 @@ module.exports = utils;
 
 
 
-var copy = __webpack_require__(796);
-var define = __webpack_require__(730);
+var copy = __webpack_require__(795);
+var define = __webpack_require__(729);
 var util = __webpack_require__(29);
 
 /**
@@ -91361,15 +91021,15 @@ module.exports = extend;
 
 
 /***/ }),
-/* 796 */
+/* 795 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var typeOf = __webpack_require__(753);
-var copyDescriptor = __webpack_require__(797);
-var define = __webpack_require__(730);
+var typeOf = __webpack_require__(752);
+var copyDescriptor = __webpack_require__(796);
+var define = __webpack_require__(729);
 
 /**
  * Copy static properties, prototype properties, and descriptors from one object to another.
@@ -91542,7 +91202,7 @@ module.exports.has = has;
 
 
 /***/ }),
-/* 797 */
+/* 796 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -91630,16 +91290,16 @@ function isObject(val) {
 
 
 /***/ }),
-/* 798 */
+/* 797 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var use = __webpack_require__(799);
-var define = __webpack_require__(730);
-var debug = __webpack_require__(801)('snapdragon:compiler');
-var utils = __webpack_require__(807);
+var use = __webpack_require__(798);
+var define = __webpack_require__(729);
+var debug = __webpack_require__(800)('snapdragon:compiler');
+var utils = __webpack_require__(806);
 
 /**
  * Create a new `Compiler` with the given `options`.
@@ -91793,7 +91453,7 @@ Compiler.prototype = {
 
     // source map support
     if (opts.sourcemap) {
-      var sourcemaps = __webpack_require__(826);
+      var sourcemaps = __webpack_require__(825);
       sourcemaps(this);
       this.mapVisit(this.ast.nodes);
       this.applySourceMaps();
@@ -91814,7 +91474,7 @@ module.exports = Compiler;
 
 
 /***/ }),
-/* 799 */
+/* 798 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -91827,7 +91487,7 @@ module.exports = Compiler;
 
 
 
-var utils = __webpack_require__(800);
+var utils = __webpack_require__(799);
 
 module.exports = function base(app, opts) {
   if (!utils.isObject(app) && typeof app !== 'function') {
@@ -91942,7 +91602,7 @@ module.exports = function base(app, opts) {
 
 
 /***/ }),
-/* 800 */
+/* 799 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -91956,8 +91616,8 @@ var utils = {};
  * Lazily required module dependencies
  */
 
-utils.define = __webpack_require__(730);
-utils.isObject = __webpack_require__(748);
+utils.define = __webpack_require__(729);
+utils.isObject = __webpack_require__(747);
 
 
 utils.isString = function(val) {
@@ -91972,7 +91632,7 @@ module.exports = utils;
 
 
 /***/ }),
-/* 801 */
+/* 800 */
 /***/ (function(module, exports, __webpack_require__) {
 
 /**
@@ -91981,14 +91641,14 @@ module.exports = utils;
  */
 
 if (typeof process !== 'undefined' && process.type === 'renderer') {
-  module.exports = __webpack_require__(802);
+  module.exports = __webpack_require__(801);
 } else {
-  module.exports = __webpack_require__(805);
+  module.exports = __webpack_require__(804);
 }
 
 
 /***/ }),
-/* 802 */
+/* 801 */
 /***/ (function(module, exports, __webpack_require__) {
 
 /**
@@ -91997,7 +91657,7 @@ if (typeof process !== 'undefined' && process.type === 'renderer') {
  * Expose `debug()` as the module.
  */
 
-exports = module.exports = __webpack_require__(803);
+exports = module.exports = __webpack_require__(802);
 exports.log = log;
 exports.formatArgs = formatArgs;
 exports.save = save;
@@ -92179,7 +91839,7 @@ function localstorage() {
 
 
 /***/ }),
-/* 803 */
+/* 802 */
 /***/ (function(module, exports, __webpack_require__) {
 
 
@@ -92195,7 +91855,7 @@ exports.coerce = coerce;
 exports.disable = disable;
 exports.enable = enable;
 exports.enabled = enabled;
-exports.humanize = __webpack_require__(804);
+exports.humanize = __webpack_require__(803);
 
 /**
  * The currently active debug mode names, and names to skip.
@@ -92387,7 +92047,7 @@ function coerce(val) {
 
 
 /***/ }),
-/* 804 */
+/* 803 */
 /***/ (function(module, exports) {
 
 /**
@@ -92545,14 +92205,14 @@ function plural(ms, n, name) {
 
 
 /***/ }),
-/* 805 */
+/* 804 */
 /***/ (function(module, exports, __webpack_require__) {
 
 /**
  * Module dependencies.
  */
 
-var tty = __webpack_require__(479);
+var tty = __webpack_require__(478);
 var util = __webpack_require__(29);
 
 /**
@@ -92561,7 +92221,7 @@ var util = __webpack_require__(29);
  * Expose `debug()` as the module.
  */
 
-exports = module.exports = __webpack_require__(803);
+exports = module.exports = __webpack_require__(802);
 exports.init = init;
 exports.log = log;
 exports.formatArgs = formatArgs;
@@ -92740,7 +92400,7 @@ function createWritableStdioStream (fd) {
 
     case 'PIPE':
     case 'TCP':
-      var net = __webpack_require__(806);
+      var net = __webpack_require__(805);
       stream = new net.Socket({
         fd: fd,
         readable: false,
@@ -92799,13 +92459,13 @@ exports.enable(load());
 
 
 /***/ }),
-/* 806 */
+/* 805 */
 /***/ (function(module, exports) {
 
 module.exports = require("net");
 
 /***/ }),
-/* 807 */
+/* 806 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -92815,9 +92475,9 @@ module.exports = require("net");
  * Module dependencies
  */
 
-exports.extend = __webpack_require__(738);
-exports.SourceMap = __webpack_require__(808);
-exports.sourceMapResolve = __webpack_require__(819);
+exports.extend = __webpack_require__(737);
+exports.SourceMap = __webpack_require__(807);
+exports.sourceMapResolve = __webpack_require__(818);
 
 /**
  * Convert backslash in the given string to forward slashes
@@ -92860,7 +92520,7 @@ exports.last = function(arr, n) {
 
 
 /***/ }),
-/* 808 */
+/* 807 */
 /***/ (function(module, exports, __webpack_require__) {
 
 /*
@@ -92868,13 +92528,13 @@ exports.last = function(arr, n) {
  * Licensed under the New BSD license. See LICENSE.txt or:
  * http://opensource.org/licenses/BSD-3-Clause
  */
-exports.SourceMapGenerator = __webpack_require__(809).SourceMapGenerator;
-exports.SourceMapConsumer = __webpack_require__(815).SourceMapConsumer;
-exports.SourceNode = __webpack_require__(818).SourceNode;
+exports.SourceMapGenerator = __webpack_require__(808).SourceMapGenerator;
+exports.SourceMapConsumer = __webpack_require__(814).SourceMapConsumer;
+exports.SourceNode = __webpack_require__(817).SourceNode;
 
 
 /***/ }),
-/* 809 */
+/* 808 */
 /***/ (function(module, exports, __webpack_require__) {
 
 /* -*- Mode: js; js-indent-level: 2; -*- */
@@ -92884,10 +92544,10 @@ exports.SourceNode = __webpack_require__(818).SourceNode;
  * http://opensource.org/licenses/BSD-3-Clause
  */
 
-var base64VLQ = __webpack_require__(810);
-var util = __webpack_require__(812);
-var ArraySet = __webpack_require__(813).ArraySet;
-var MappingList = __webpack_require__(814).MappingList;
+var base64VLQ = __webpack_require__(809);
+var util = __webpack_require__(811);
+var ArraySet = __webpack_require__(812).ArraySet;
+var MappingList = __webpack_require__(813).MappingList;
 
 /**
  * An instance of the SourceMapGenerator represents a source map which is
@@ -93296,7 +92956,7 @@ exports.SourceMapGenerator = SourceMapGenerator;
 
 
 /***/ }),
-/* 810 */
+/* 809 */
 /***/ (function(module, exports, __webpack_require__) {
 
 /* -*- Mode: js; js-indent-level: 2; -*- */
@@ -93336,7 +92996,7 @@ exports.SourceMapGenerator = SourceMapGenerator;
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-var base64 = __webpack_require__(811);
+var base64 = __webpack_require__(810);
 
 // A single base 64 digit can contain 6 bits of data. For the base 64 variable
 // length quantities we use in the source map spec, the first bit is the sign,
@@ -93442,7 +93102,7 @@ exports.decode = function base64VLQ_decode(aStr, aIndex, aOutParam) {
 
 
 /***/ }),
-/* 811 */
+/* 810 */
 /***/ (function(module, exports) {
 
 /* -*- Mode: js; js-indent-level: 2; -*- */
@@ -93515,7 +93175,7 @@ exports.decode = function (charCode) {
 
 
 /***/ }),
-/* 812 */
+/* 811 */
 /***/ (function(module, exports) {
 
 /* -*- Mode: js; js-indent-level: 2; -*- */
@@ -93938,7 +93598,7 @@ exports.compareByGeneratedPositionsInflated = compareByGeneratedPositionsInflate
 
 
 /***/ }),
-/* 813 */
+/* 812 */
 /***/ (function(module, exports, __webpack_require__) {
 
 /* -*- Mode: js; js-indent-level: 2; -*- */
@@ -93948,7 +93608,7 @@ exports.compareByGeneratedPositionsInflated = compareByGeneratedPositionsInflate
  * http://opensource.org/licenses/BSD-3-Clause
  */
 
-var util = __webpack_require__(812);
+var util = __webpack_require__(811);
 var has = Object.prototype.hasOwnProperty;
 var hasNativeMap = typeof Map !== "undefined";
 
@@ -94065,7 +93725,7 @@ exports.ArraySet = ArraySet;
 
 
 /***/ }),
-/* 814 */
+/* 813 */
 /***/ (function(module, exports, __webpack_require__) {
 
 /* -*- Mode: js; js-indent-level: 2; -*- */
@@ -94075,7 +93735,7 @@ exports.ArraySet = ArraySet;
  * http://opensource.org/licenses/BSD-3-Clause
  */
 
-var util = __webpack_require__(812);
+var util = __webpack_require__(811);
 
 /**
  * Determine whether mappingB is after mappingA with respect to generated
@@ -94150,7 +93810,7 @@ exports.MappingList = MappingList;
 
 
 /***/ }),
-/* 815 */
+/* 814 */
 /***/ (function(module, exports, __webpack_require__) {
 
 /* -*- Mode: js; js-indent-level: 2; -*- */
@@ -94160,11 +93820,11 @@ exports.MappingList = MappingList;
  * http://opensource.org/licenses/BSD-3-Clause
  */
 
-var util = __webpack_require__(812);
-var binarySearch = __webpack_require__(816);
-var ArraySet = __webpack_require__(813).ArraySet;
-var base64VLQ = __webpack_require__(810);
-var quickSort = __webpack_require__(817).quickSort;
+var util = __webpack_require__(811);
+var binarySearch = __webpack_require__(815);
+var ArraySet = __webpack_require__(812).ArraySet;
+var base64VLQ = __webpack_require__(809);
+var quickSort = __webpack_require__(816).quickSort;
 
 function SourceMapConsumer(aSourceMap) {
   var sourceMap = aSourceMap;
@@ -95238,7 +94898,7 @@ exports.IndexedSourceMapConsumer = IndexedSourceMapConsumer;
 
 
 /***/ }),
-/* 816 */
+/* 815 */
 /***/ (function(module, exports) {
 
 /* -*- Mode: js; js-indent-level: 2; -*- */
@@ -95355,7 +95015,7 @@ exports.search = function search(aNeedle, aHaystack, aCompare, aBias) {
 
 
 /***/ }),
-/* 817 */
+/* 816 */
 /***/ (function(module, exports) {
 
 /* -*- Mode: js; js-indent-level: 2; -*- */
@@ -95475,7 +95135,7 @@ exports.quickSort = function (ary, comparator) {
 
 
 /***/ }),
-/* 818 */
+/* 817 */
 /***/ (function(module, exports, __webpack_require__) {
 
 /* -*- Mode: js; js-indent-level: 2; -*- */
@@ -95485,8 +95145,8 @@ exports.quickSort = function (ary, comparator) {
  * http://opensource.org/licenses/BSD-3-Clause
  */
 
-var SourceMapGenerator = __webpack_require__(809).SourceMapGenerator;
-var util = __webpack_require__(812);
+var SourceMapGenerator = __webpack_require__(808).SourceMapGenerator;
+var util = __webpack_require__(811);
 
 // Matches a Windows-style `\r\n` newline or a `\n` newline used by all other
 // operating systems these days (capturing the result).
@@ -95894,17 +95554,17 @@ exports.SourceNode = SourceNode;
 
 
 /***/ }),
-/* 819 */
+/* 818 */
 /***/ (function(module, exports, __webpack_require__) {
 
 // Copyright 2014, 2015, 2016, 2017 Simon Lydell
 // X11 (“MIT”) Licensed. (See LICENSE.)
 
-var sourceMappingURL   = __webpack_require__(820)
-var resolveUrl         = __webpack_require__(821)
-var decodeUriComponent = __webpack_require__(822)
-var urix               = __webpack_require__(824)
-var atob               = __webpack_require__(825)
+var sourceMappingURL   = __webpack_require__(819)
+var resolveUrl         = __webpack_require__(820)
+var decodeUriComponent = __webpack_require__(821)
+var urix               = __webpack_require__(823)
+var atob               = __webpack_require__(824)
 
 
 
@@ -96202,7 +95862,7 @@ module.exports = {
 
 
 /***/ }),
-/* 820 */
+/* 819 */
 /***/ (function(module, exports, __webpack_require__) {
 
 var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_RESULT__;// Copyright 2014 Simon Lydell
@@ -96265,13 +95925,13 @@ void (function(root, factory) {
 
 
 /***/ }),
-/* 821 */
+/* 820 */
 /***/ (function(module, exports, __webpack_require__) {
 
 // Copyright 2014 Simon Lydell
 // X11 (“MIT”) Licensed. (See LICENSE.)
 
-var url = __webpack_require__(453)
+var url = __webpack_require__(452)
 
 function resolveUrl(/* ...urls */) {
   return Array.prototype.reduce.call(arguments, function(resolved, nextUrl) {
@@ -96283,13 +95943,13 @@ module.exports = resolveUrl
 
 
 /***/ }),
-/* 822 */
+/* 821 */
 /***/ (function(module, exports, __webpack_require__) {
 
 // Copyright 2017 Simon Lydell
 // X11 (“MIT”) Licensed. (See LICENSE.)
 
-var decodeUriComponent = __webpack_require__(823)
+var decodeUriComponent = __webpack_require__(822)
 
 function customDecodeUriComponent(string) {
   // `decodeUriComponent` turns `+` into ` `, but that's not wanted.
@@ -96300,7 +95960,7 @@ module.exports = customDecodeUriComponent
 
 
 /***/ }),
-/* 823 */
+/* 822 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -96401,7 +96061,7 @@ module.exports = function (encodedURI) {
 
 
 /***/ }),
-/* 824 */
+/* 823 */
 /***/ (function(module, exports, __webpack_require__) {
 
 // Copyright 2014 Simon Lydell
@@ -96424,7 +96084,7 @@ module.exports = urix
 
 
 /***/ }),
-/* 825 */
+/* 824 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -96438,7 +96098,7 @@ module.exports = atob.atob = atob;
 
 
 /***/ }),
-/* 826 */
+/* 825 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -96446,8 +96106,8 @@ module.exports = atob.atob = atob;
 
 var fs = __webpack_require__(23);
 var path = __webpack_require__(16);
-var define = __webpack_require__(730);
-var utils = __webpack_require__(807);
+var define = __webpack_require__(729);
+var utils = __webpack_require__(806);
 
 /**
  * Expose `mixin()`.
@@ -96590,19 +96250,19 @@ exports.comment = function(node) {
 
 
 /***/ }),
-/* 827 */
+/* 826 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var use = __webpack_require__(799);
+var use = __webpack_require__(798);
 var util = __webpack_require__(29);
-var Cache = __webpack_require__(828);
-var define = __webpack_require__(730);
-var debug = __webpack_require__(801)('snapdragon:parser');
-var Position = __webpack_require__(829);
-var utils = __webpack_require__(807);
+var Cache = __webpack_require__(827);
+var define = __webpack_require__(729);
+var debug = __webpack_require__(800)('snapdragon:parser');
+var Position = __webpack_require__(828);
+var utils = __webpack_require__(806);
 
 /**
  * Create a new `Parser` with the given `input` and `options`.
@@ -97130,7 +96790,7 @@ module.exports = Parser;
 
 
 /***/ }),
-/* 828 */
+/* 827 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -97237,13 +96897,13 @@ MapCache.prototype.del = function mapDelete(key) {
 
 
 /***/ }),
-/* 829 */
+/* 828 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var define = __webpack_require__(730);
+var define = __webpack_require__(729);
 
 /**
  * Store position for a node
@@ -97258,16 +96918,16 @@ module.exports = function Position(start, parser) {
 
 
 /***/ }),
-/* 830 */
+/* 829 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var safe = __webpack_require__(831);
-var define = __webpack_require__(837);
-var extend = __webpack_require__(838);
-var not = __webpack_require__(840);
+var safe = __webpack_require__(830);
+var define = __webpack_require__(836);
+var extend = __webpack_require__(837);
+var not = __webpack_require__(839);
 var MAX_LENGTH = 1024 * 64;
 
 /**
@@ -97420,10 +97080,10 @@ module.exports.makeRe = makeRe;
 
 
 /***/ }),
-/* 831 */
+/* 830 */
 /***/ (function(module, exports, __webpack_require__) {
 
-var parse = __webpack_require__(832);
+var parse = __webpack_require__(831);
 var types = parse.types;
 
 module.exports = function (re, opts) {
@@ -97469,13 +97129,13 @@ function isRegExp (x) {
 
 
 /***/ }),
-/* 832 */
+/* 831 */
 /***/ (function(module, exports, __webpack_require__) {
 
-var util      = __webpack_require__(833);
-var types     = __webpack_require__(834);
-var sets      = __webpack_require__(835);
-var positions = __webpack_require__(836);
+var util      = __webpack_require__(832);
+var types     = __webpack_require__(833);
+var sets      = __webpack_require__(834);
+var positions = __webpack_require__(835);
 
 
 module.exports = function(regexpStr) {
@@ -97757,11 +97417,11 @@ module.exports.types = types;
 
 
 /***/ }),
-/* 833 */
+/* 832 */
 /***/ (function(module, exports, __webpack_require__) {
 
-var types = __webpack_require__(834);
-var sets  = __webpack_require__(835);
+var types = __webpack_require__(833);
+var sets  = __webpack_require__(834);
 
 
 // All of these are private and only used by randexp.
@@ -97874,7 +97534,7 @@ exports.error = function(regexp, msg) {
 
 
 /***/ }),
-/* 834 */
+/* 833 */
 /***/ (function(module, exports) {
 
 module.exports = {
@@ -97890,10 +97550,10 @@ module.exports = {
 
 
 /***/ }),
-/* 835 */
+/* 834 */
 /***/ (function(module, exports, __webpack_require__) {
 
-var types = __webpack_require__(834);
+var types = __webpack_require__(833);
 
 var INTS = function() {
  return [{ type: types.RANGE , from: 48, to: 57 }];
@@ -97978,10 +97638,10 @@ exports.anyChar = function() {
 
 
 /***/ }),
-/* 836 */
+/* 835 */
 /***/ (function(module, exports, __webpack_require__) {
 
-var types = __webpack_require__(834);
+var types = __webpack_require__(833);
 
 exports.wordBoundary = function() {
   return { type: types.POSITION, value: 'b' };
@@ -98001,7 +97661,7 @@ exports.end = function() {
 
 
 /***/ }),
-/* 837 */
+/* 836 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -98014,8 +97674,8 @@ exports.end = function() {
 
 
 
-var isobject = __webpack_require__(748);
-var isDescriptor = __webpack_require__(760);
+var isobject = __webpack_require__(747);
+var isDescriptor = __webpack_require__(759);
 var define = (typeof Reflect !== 'undefined' && Reflect.defineProperty)
   ? Reflect.defineProperty
   : Object.defineProperty;
@@ -98046,14 +97706,14 @@ module.exports = function defineProperty(obj, key, val) {
 
 
 /***/ }),
-/* 838 */
+/* 837 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var isExtendable = __webpack_require__(839);
-var assignSymbols = __webpack_require__(749);
+var isExtendable = __webpack_require__(838);
+var assignSymbols = __webpack_require__(748);
 
 module.exports = Object.assign || function(obj/*, objects*/) {
   if (obj === null || typeof obj === 'undefined') {
@@ -98113,7 +97773,7 @@ function isEnum(obj, key) {
 
 
 /***/ }),
-/* 839 */
+/* 838 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -98126,7 +97786,7 @@ function isEnum(obj, key) {
 
 
 
-var isPlainObject = __webpack_require__(747);
+var isPlainObject = __webpack_require__(746);
 
 module.exports = function isExtendable(val) {
   return isPlainObject(val) || typeof val === 'function' || Array.isArray(val);
@@ -98134,14 +97794,14 @@ module.exports = function isExtendable(val) {
 
 
 /***/ }),
-/* 840 */
+/* 839 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var extend = __webpack_require__(838);
-var safe = __webpack_require__(831);
+var extend = __webpack_require__(837);
+var safe = __webpack_require__(830);
 
 /**
  * The main export is a function that takes a `pattern` string and an `options` object.
@@ -98213,14 +97873,14 @@ module.exports = toRegex;
 
 
 /***/ }),
-/* 841 */
+/* 840 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var nanomatch = __webpack_require__(842);
-var extglob = __webpack_require__(857);
+var nanomatch = __webpack_require__(841);
+var extglob = __webpack_require__(856);
 
 module.exports = function(snapdragon) {
   var compilers = snapdragon.compiler.compilers;
@@ -98297,7 +97957,7 @@ function escapeExtglobs(compiler) {
 
 
 /***/ }),
-/* 842 */
+/* 841 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -98308,17 +97968,17 @@ function escapeExtglobs(compiler) {
  */
 
 var util = __webpack_require__(29);
-var toRegex = __webpack_require__(729);
-var extend = __webpack_require__(843);
+var toRegex = __webpack_require__(728);
+var extend = __webpack_require__(842);
 
 /**
  * Local dependencies
  */
 
-var compilers = __webpack_require__(845);
-var parsers = __webpack_require__(846);
-var cache = __webpack_require__(849);
-var utils = __webpack_require__(851);
+var compilers = __webpack_require__(844);
+var parsers = __webpack_require__(845);
+var cache = __webpack_require__(848);
+var utils = __webpack_require__(850);
 var MAX_LENGTH = 1024 * 64;
 
 /**
@@ -99142,14 +98802,14 @@ module.exports = nanomatch;
 
 
 /***/ }),
-/* 843 */
+/* 842 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var isExtendable = __webpack_require__(844);
-var assignSymbols = __webpack_require__(749);
+var isExtendable = __webpack_require__(843);
+var assignSymbols = __webpack_require__(748);
 
 module.exports = Object.assign || function(obj/*, objects*/) {
   if (obj === null || typeof obj === 'undefined') {
@@ -99209,7 +98869,7 @@ function isEnum(obj, key) {
 
 
 /***/ }),
-/* 844 */
+/* 843 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -99222,7 +98882,7 @@ function isEnum(obj, key) {
 
 
 
-var isPlainObject = __webpack_require__(747);
+var isPlainObject = __webpack_require__(746);
 
 module.exports = function isExtendable(val) {
   return isPlainObject(val) || typeof val === 'function' || Array.isArray(val);
@@ -99230,7 +98890,7 @@ module.exports = function isExtendable(val) {
 
 
 /***/ }),
-/* 845 */
+/* 844 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -99576,15 +99236,15 @@ module.exports = function(nanomatch, options) {
 
 
 /***/ }),
-/* 846 */
+/* 845 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var regexNot = __webpack_require__(740);
-var toRegex = __webpack_require__(729);
-var isOdd = __webpack_require__(847);
+var regexNot = __webpack_require__(739);
+var toRegex = __webpack_require__(728);
+var isOdd = __webpack_require__(846);
 
 /**
  * Characters to use in negation regex (we want to "not" match
@@ -99970,7 +99630,7 @@ module.exports.not = NOT_REGEX;
 
 
 /***/ }),
-/* 847 */
+/* 846 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -99983,7 +99643,7 @@ module.exports.not = NOT_REGEX;
 
 
 
-var isNumber = __webpack_require__(848);
+var isNumber = __webpack_require__(847);
 
 module.exports = function isOdd(i) {
   if (!isNumber(i)) {
@@ -99997,7 +99657,7 @@ module.exports = function isOdd(i) {
 
 
 /***/ }),
-/* 848 */
+/* 847 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -100025,14 +99685,14 @@ module.exports = function isNumber(num) {
 
 
 /***/ }),
-/* 849 */
+/* 848 */
 /***/ (function(module, exports, __webpack_require__) {
 
-module.exports = new (__webpack_require__(850))();
+module.exports = new (__webpack_require__(849))();
 
 
 /***/ }),
-/* 850 */
+/* 849 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -100045,7 +99705,7 @@ module.exports = new (__webpack_require__(850))();
 
 
 
-var MapCache = __webpack_require__(828);
+var MapCache = __webpack_require__(827);
 
 /**
  * Create a new `FragmentCache` with an optional object to use for `caches`.
@@ -100167,7 +99827,7 @@ exports = module.exports = FragmentCache;
 
 
 /***/ }),
-/* 851 */
+/* 850 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -100180,14 +99840,14 @@ var path = __webpack_require__(16);
  * Module dependencies
  */
 
-var isWindows = __webpack_require__(852)();
-var Snapdragon = __webpack_require__(768);
-utils.define = __webpack_require__(853);
-utils.diff = __webpack_require__(854);
-utils.extend = __webpack_require__(843);
-utils.pick = __webpack_require__(855);
-utils.typeOf = __webpack_require__(856);
-utils.unique = __webpack_require__(741);
+var isWindows = __webpack_require__(851)();
+var Snapdragon = __webpack_require__(767);
+utils.define = __webpack_require__(852);
+utils.diff = __webpack_require__(853);
+utils.extend = __webpack_require__(842);
+utils.pick = __webpack_require__(854);
+utils.typeOf = __webpack_require__(855);
+utils.unique = __webpack_require__(740);
 
 /**
  * Returns true if the given value is effectively an empty string
@@ -100553,7 +100213,7 @@ utils.unixify = function(options) {
 
 
 /***/ }),
-/* 852 */
+/* 851 */
 /***/ (function(module, exports, __webpack_require__) {
 
 var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;/*!
@@ -100581,7 +100241,7 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
 
 
 /***/ }),
-/* 853 */
+/* 852 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -100594,8 +100254,8 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
 
 
 
-var isobject = __webpack_require__(748);
-var isDescriptor = __webpack_require__(760);
+var isobject = __webpack_require__(747);
+var isDescriptor = __webpack_require__(759);
 var define = (typeof Reflect !== 'undefined' && Reflect.defineProperty)
   ? Reflect.defineProperty
   : Object.defineProperty;
@@ -100626,7 +100286,7 @@ module.exports = function defineProperty(obj, key, val) {
 
 
 /***/ }),
-/* 854 */
+/* 853 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -100680,7 +100340,7 @@ function diffArray(one, two) {
 
 
 /***/ }),
-/* 855 */
+/* 854 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -100693,7 +100353,7 @@ function diffArray(one, two) {
 
 
 
-var isObject = __webpack_require__(748);
+var isObject = __webpack_require__(747);
 
 module.exports = function pick(obj, keys) {
   if (!isObject(obj) && typeof obj !== 'function') {
@@ -100722,7 +100382,7 @@ module.exports = function pick(obj, keys) {
 
 
 /***/ }),
-/* 856 */
+/* 855 */
 /***/ (function(module, exports) {
 
 var toString = Object.prototype.toString;
@@ -100857,7 +100517,7 @@ function isBuffer(val) {
 
 
 /***/ }),
-/* 857 */
+/* 856 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -100867,18 +100527,18 @@ function isBuffer(val) {
  * Module dependencies
  */
 
-var extend = __webpack_require__(738);
-var unique = __webpack_require__(741);
-var toRegex = __webpack_require__(729);
+var extend = __webpack_require__(737);
+var unique = __webpack_require__(740);
+var toRegex = __webpack_require__(728);
 
 /**
  * Local dependencies
  */
 
-var compilers = __webpack_require__(858);
-var parsers = __webpack_require__(869);
-var Extglob = __webpack_require__(872);
-var utils = __webpack_require__(871);
+var compilers = __webpack_require__(857);
+var parsers = __webpack_require__(868);
+var Extglob = __webpack_require__(871);
+var utils = __webpack_require__(870);
 var MAX_LENGTH = 1024 * 64;
 
 /**
@@ -101195,13 +100855,13 @@ module.exports = extglob;
 
 
 /***/ }),
-/* 858 */
+/* 857 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var brackets = __webpack_require__(859);
+var brackets = __webpack_require__(858);
 
 /**
  * Extglob compilers
@@ -101371,7 +101031,7 @@ module.exports = function(extglob) {
 
 
 /***/ }),
-/* 859 */
+/* 858 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -101381,17 +101041,17 @@ module.exports = function(extglob) {
  * Local dependencies
  */
 
-var compilers = __webpack_require__(860);
-var parsers = __webpack_require__(862);
+var compilers = __webpack_require__(859);
+var parsers = __webpack_require__(861);
 
 /**
  * Module dependencies
  */
 
-var debug = __webpack_require__(864)('expand-brackets');
-var extend = __webpack_require__(738);
-var Snapdragon = __webpack_require__(768);
-var toRegex = __webpack_require__(729);
+var debug = __webpack_require__(863)('expand-brackets');
+var extend = __webpack_require__(737);
+var Snapdragon = __webpack_require__(767);
+var toRegex = __webpack_require__(728);
 
 /**
  * Parses the given POSIX character class `pattern` and returns a
@@ -101589,13 +101249,13 @@ module.exports = brackets;
 
 
 /***/ }),
-/* 860 */
+/* 859 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var posix = __webpack_require__(861);
+var posix = __webpack_require__(860);
 
 module.exports = function(brackets) {
   brackets.compiler
@@ -101683,7 +101343,7 @@ module.exports = function(brackets) {
 
 
 /***/ }),
-/* 861 */
+/* 860 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -101712,14 +101372,14 @@ module.exports = {
 
 
 /***/ }),
-/* 862 */
+/* 861 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var utils = __webpack_require__(863);
-var define = __webpack_require__(730);
+var utils = __webpack_require__(862);
+var define = __webpack_require__(729);
 
 /**
  * Text regex
@@ -101938,14 +101598,14 @@ module.exports.TEXT_REGEX = TEXT_REGEX;
 
 
 /***/ }),
-/* 863 */
+/* 862 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var toRegex = __webpack_require__(729);
-var regexNot = __webpack_require__(740);
+var toRegex = __webpack_require__(728);
+var regexNot = __webpack_require__(739);
 var cached;
 
 /**
@@ -101979,7 +101639,7 @@ exports.createRegex = function(pattern, include) {
 
 
 /***/ }),
-/* 864 */
+/* 863 */
 /***/ (function(module, exports, __webpack_require__) {
 
 /**
@@ -101988,14 +101648,14 @@ exports.createRegex = function(pattern, include) {
  */
 
 if (typeof process !== 'undefined' && process.type === 'renderer') {
-  module.exports = __webpack_require__(865);
+  module.exports = __webpack_require__(864);
 } else {
-  module.exports = __webpack_require__(868);
+  module.exports = __webpack_require__(867);
 }
 
 
 /***/ }),
-/* 865 */
+/* 864 */
 /***/ (function(module, exports, __webpack_require__) {
 
 /**
@@ -102004,7 +101664,7 @@ if (typeof process !== 'undefined' && process.type === 'renderer') {
  * Expose `debug()` as the module.
  */
 
-exports = module.exports = __webpack_require__(866);
+exports = module.exports = __webpack_require__(865);
 exports.log = log;
 exports.formatArgs = formatArgs;
 exports.save = save;
@@ -102186,7 +101846,7 @@ function localstorage() {
 
 
 /***/ }),
-/* 866 */
+/* 865 */
 /***/ (function(module, exports, __webpack_require__) {
 
 
@@ -102202,7 +101862,7 @@ exports.coerce = coerce;
 exports.disable = disable;
 exports.enable = enable;
 exports.enabled = enabled;
-exports.humanize = __webpack_require__(867);
+exports.humanize = __webpack_require__(866);
 
 /**
  * The currently active debug mode names, and names to skip.
@@ -102394,7 +102054,7 @@ function coerce(val) {
 
 
 /***/ }),
-/* 867 */
+/* 866 */
 /***/ (function(module, exports) {
 
 /**
@@ -102552,14 +102212,14 @@ function plural(ms, n, name) {
 
 
 /***/ }),
-/* 868 */
+/* 867 */
 /***/ (function(module, exports, __webpack_require__) {
 
 /**
  * Module dependencies.
  */
 
-var tty = __webpack_require__(479);
+var tty = __webpack_require__(478);
 var util = __webpack_require__(29);
 
 /**
@@ -102568,7 +102228,7 @@ var util = __webpack_require__(29);
  * Expose `debug()` as the module.
  */
 
-exports = module.exports = __webpack_require__(866);
+exports = module.exports = __webpack_require__(865);
 exports.init = init;
 exports.log = log;
 exports.formatArgs = formatArgs;
@@ -102747,7 +102407,7 @@ function createWritableStdioStream (fd) {
 
     case 'PIPE':
     case 'TCP':
-      var net = __webpack_require__(806);
+      var net = __webpack_require__(805);
       stream = new net.Socket({
         fd: fd,
         readable: false,
@@ -102806,15 +102466,15 @@ exports.enable(load());
 
 
 /***/ }),
-/* 869 */
+/* 868 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var brackets = __webpack_require__(859);
-var define = __webpack_require__(870);
-var utils = __webpack_require__(871);
+var brackets = __webpack_require__(858);
+var define = __webpack_require__(869);
+var utils = __webpack_require__(870);
 
 /**
  * Characters to use in text regex (we want to "not" match
@@ -102969,7 +102629,7 @@ module.exports = parsers;
 
 
 /***/ }),
-/* 870 */
+/* 869 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -102982,7 +102642,7 @@ module.exports = parsers;
 
 
 
-var isDescriptor = __webpack_require__(760);
+var isDescriptor = __webpack_require__(759);
 
 module.exports = function defineProperty(obj, prop, val) {
   if (typeof obj !== 'object' && typeof obj !== 'function') {
@@ -103007,14 +102667,14 @@ module.exports = function defineProperty(obj, prop, val) {
 
 
 /***/ }),
-/* 871 */
+/* 870 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var regex = __webpack_require__(740);
-var Cache = __webpack_require__(850);
+var regex = __webpack_require__(739);
+var Cache = __webpack_require__(849);
 
 /**
  * Utils
@@ -103083,7 +102743,7 @@ utils.createRegex = function(str) {
 
 
 /***/ }),
-/* 872 */
+/* 871 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -103093,16 +102753,16 @@ utils.createRegex = function(str) {
  * Module dependencies
  */
 
-var Snapdragon = __webpack_require__(768);
-var define = __webpack_require__(870);
-var extend = __webpack_require__(738);
+var Snapdragon = __webpack_require__(767);
+var define = __webpack_require__(869);
+var extend = __webpack_require__(737);
 
 /**
  * Local dependencies
  */
 
-var compilers = __webpack_require__(858);
-var parsers = __webpack_require__(869);
+var compilers = __webpack_require__(857);
+var parsers = __webpack_require__(868);
 
 /**
  * Customize Snapdragon parser and renderer
@@ -103168,16 +102828,16 @@ module.exports = Extglob;
 
 
 /***/ }),
-/* 873 */
+/* 872 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var extglob = __webpack_require__(857);
-var nanomatch = __webpack_require__(842);
-var regexNot = __webpack_require__(740);
-var toRegex = __webpack_require__(830);
+var extglob = __webpack_require__(856);
+var nanomatch = __webpack_require__(841);
+var regexNot = __webpack_require__(739);
+var toRegex = __webpack_require__(829);
 var not;
 
 /**
@@ -103258,14 +102918,14 @@ function textRegex(pattern) {
 
 
 /***/ }),
-/* 874 */
+/* 873 */
 /***/ (function(module, exports, __webpack_require__) {
 
-module.exports = new (__webpack_require__(850))();
+module.exports = new (__webpack_require__(849))();
 
 
 /***/ }),
-/* 875 */
+/* 874 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -103278,13 +102938,13 @@ var path = __webpack_require__(16);
  * Module dependencies
  */
 
-var Snapdragon = __webpack_require__(768);
-utils.define = __webpack_require__(837);
-utils.diff = __webpack_require__(854);
-utils.extend = __webpack_require__(838);
-utils.pick = __webpack_require__(855);
-utils.typeOf = __webpack_require__(876);
-utils.unique = __webpack_require__(741);
+var Snapdragon = __webpack_require__(767);
+utils.define = __webpack_require__(836);
+utils.diff = __webpack_require__(853);
+utils.extend = __webpack_require__(837);
+utils.pick = __webpack_require__(854);
+utils.typeOf = __webpack_require__(875);
+utils.unique = __webpack_require__(740);
 
 /**
  * Returns true if the platform is windows, or `path.sep` is `\\`.
@@ -103581,7 +103241,7 @@ utils.unixify = function(options) {
 
 
 /***/ }),
-/* 876 */
+/* 875 */
 /***/ (function(module, exports) {
 
 var toString = Object.prototype.toString;
@@ -103716,7 +103376,7 @@ function isBuffer(val) {
 
 
 /***/ }),
-/* 877 */
+/* 876 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -103735,9 +103395,9 @@ var __extends = (this && this.__extends) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
-var readdir = __webpack_require__(878);
-var reader_1 = __webpack_require__(891);
-var fs_stream_1 = __webpack_require__(895);
+var readdir = __webpack_require__(877);
+var reader_1 = __webpack_require__(890);
+var fs_stream_1 = __webpack_require__(894);
 var ReaderAsync = /** @class */ (function (_super) {
     __extends(ReaderAsync, _super);
     function ReaderAsync() {
@@ -103798,15 +103458,15 @@ exports.default = ReaderAsync;
 
 
 /***/ }),
-/* 878 */
+/* 877 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-const readdirSync = __webpack_require__(879);
-const readdirAsync = __webpack_require__(887);
-const readdirStream = __webpack_require__(890);
+const readdirSync = __webpack_require__(878);
+const readdirAsync = __webpack_require__(886);
+const readdirStream = __webpack_require__(889);
 
 module.exports = exports = readdirAsyncPath;
 exports.readdir = exports.readdirAsync = exports.async = readdirAsyncPath;
@@ -103890,7 +103550,7 @@ function readdirStreamStat (dir, options) {
 
 
 /***/ }),
-/* 879 */
+/* 878 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -103898,11 +103558,11 @@ function readdirStreamStat (dir, options) {
 
 module.exports = readdirSync;
 
-const DirectoryReader = __webpack_require__(880);
+const DirectoryReader = __webpack_require__(879);
 
 let syncFacade = {
-  fs: __webpack_require__(885),
-  forEach: __webpack_require__(886),
+  fs: __webpack_require__(884),
+  forEach: __webpack_require__(885),
   sync: true
 };
 
@@ -103931,7 +103591,7 @@ function readdirSync (dir, options, internalOptions) {
 
 
 /***/ }),
-/* 880 */
+/* 879 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -103940,9 +103600,9 @@ function readdirSync (dir, options, internalOptions) {
 const Readable = __webpack_require__(27).Readable;
 const EventEmitter = __webpack_require__(379).EventEmitter;
 const path = __webpack_require__(16);
-const normalizeOptions = __webpack_require__(881);
-const stat = __webpack_require__(883);
-const call = __webpack_require__(884);
+const normalizeOptions = __webpack_require__(880);
+const stat = __webpack_require__(882);
+const call = __webpack_require__(883);
 
 /**
  * Asynchronously reads the contents of a directory and streams the results
@@ -104318,14 +103978,14 @@ module.exports = DirectoryReader;
 
 
 /***/ }),
-/* 881 */
+/* 880 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
 const path = __webpack_require__(16);
-const globToRegExp = __webpack_require__(882);
+const globToRegExp = __webpack_require__(881);
 
 module.exports = normalizeOptions;
 
@@ -104502,7 +104162,7 @@ function normalizeOptions (options, internalOptions) {
 
 
 /***/ }),
-/* 882 */
+/* 881 */
 /***/ (function(module, exports) {
 
 module.exports = function (glob, opts) {
@@ -104639,13 +104299,13 @@ module.exports = function (glob, opts) {
 
 
 /***/ }),
-/* 883 */
+/* 882 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-const call = __webpack_require__(884);
+const call = __webpack_require__(883);
 
 module.exports = stat;
 
@@ -104720,7 +104380,7 @@ function symlinkStat (fs, path, lstats, callback) {
 
 
 /***/ }),
-/* 884 */
+/* 883 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -104781,14 +104441,14 @@ function callOnce (fn) {
 
 
 /***/ }),
-/* 885 */
+/* 884 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
 const fs = __webpack_require__(23);
-const call = __webpack_require__(884);
+const call = __webpack_require__(883);
 
 /**
  * A facade around {@link fs.readdirSync} that allows it to be called
@@ -104852,7 +104512,7 @@ exports.lstat = function (path, callback) {
 
 
 /***/ }),
-/* 886 */
+/* 885 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -104881,7 +104541,7 @@ function syncForEach (array, iterator, done) {
 
 
 /***/ }),
-/* 887 */
+/* 886 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -104889,12 +104549,12 @@ function syncForEach (array, iterator, done) {
 
 module.exports = readdirAsync;
 
-const maybe = __webpack_require__(888);
-const DirectoryReader = __webpack_require__(880);
+const maybe = __webpack_require__(887);
+const DirectoryReader = __webpack_require__(879);
 
 let asyncFacade = {
   fs: __webpack_require__(23),
-  forEach: __webpack_require__(889),
+  forEach: __webpack_require__(888),
   async: true
 };
 
@@ -104936,7 +104596,7 @@ function readdirAsync (dir, options, callback, internalOptions) {
 
 
 /***/ }),
-/* 888 */
+/* 887 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -104963,7 +104623,7 @@ module.exports = function maybe (cb, promise) {
 
 
 /***/ }),
-/* 889 */
+/* 888 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -104999,7 +104659,7 @@ function asyncForEach (array, iterator, done) {
 
 
 /***/ }),
-/* 890 */
+/* 889 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -105007,11 +104667,11 @@ function asyncForEach (array, iterator, done) {
 
 module.exports = readdirStream;
 
-const DirectoryReader = __webpack_require__(880);
+const DirectoryReader = __webpack_require__(879);
 
 let streamFacade = {
   fs: __webpack_require__(23),
-  forEach: __webpack_require__(889),
+  forEach: __webpack_require__(888),
   async: true
 };
 
@@ -105031,16 +104691,16 @@ function readdirStream (dir, options, internalOptions) {
 
 
 /***/ }),
-/* 891 */
+/* 890 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 Object.defineProperty(exports, "__esModule", { value: true });
 var path = __webpack_require__(16);
-var deep_1 = __webpack_require__(892);
-var entry_1 = __webpack_require__(894);
-var pathUtil = __webpack_require__(893);
+var deep_1 = __webpack_require__(891);
+var entry_1 = __webpack_require__(893);
+var pathUtil = __webpack_require__(892);
 var Reader = /** @class */ (function () {
     function Reader(options) {
         this.options = options;
@@ -105106,14 +104766,14 @@ exports.default = Reader;
 
 
 /***/ }),
-/* 892 */
+/* 891 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 Object.defineProperty(exports, "__esModule", { value: true });
-var pathUtils = __webpack_require__(893);
-var patternUtils = __webpack_require__(722);
+var pathUtils = __webpack_require__(892);
+var patternUtils = __webpack_require__(721);
 var DeepFilter = /** @class */ (function () {
     function DeepFilter(options, micromatchOptions) {
         this.options = options;
@@ -105196,7 +104856,7 @@ exports.default = DeepFilter;
 
 
 /***/ }),
-/* 893 */
+/* 892 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -105227,14 +104887,14 @@ exports.makeAbsolute = makeAbsolute;
 
 
 /***/ }),
-/* 894 */
+/* 893 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 Object.defineProperty(exports, "__esModule", { value: true });
-var pathUtils = __webpack_require__(893);
-var patternUtils = __webpack_require__(722);
+var pathUtils = __webpack_require__(892);
+var patternUtils = __webpack_require__(721);
 var EntryFilter = /** @class */ (function () {
     function EntryFilter(options, micromatchOptions) {
         this.options = options;
@@ -105319,7 +104979,7 @@ exports.default = EntryFilter;
 
 
 /***/ }),
-/* 895 */
+/* 894 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -105339,8 +104999,8 @@ var __extends = (this && this.__extends) || (function () {
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
 var stream = __webpack_require__(27);
-var fsStat = __webpack_require__(896);
-var fs_1 = __webpack_require__(900);
+var fsStat = __webpack_require__(895);
+var fs_1 = __webpack_require__(899);
 var FileSystemStream = /** @class */ (function (_super) {
     __extends(FileSystemStream, _super);
     function FileSystemStream() {
@@ -105390,14 +105050,14 @@ exports.default = FileSystemStream;
 
 
 /***/ }),
-/* 896 */
+/* 895 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 Object.defineProperty(exports, "__esModule", { value: true });
-const optionsManager = __webpack_require__(897);
-const statProvider = __webpack_require__(899);
+const optionsManager = __webpack_require__(896);
+const statProvider = __webpack_require__(898);
 /**
  * Asynchronous API.
  */
@@ -105428,13 +105088,13 @@ exports.statSync = statSync;
 
 
 /***/ }),
-/* 897 */
+/* 896 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 Object.defineProperty(exports, "__esModule", { value: true });
-const fsAdapter = __webpack_require__(898);
+const fsAdapter = __webpack_require__(897);
 function prepare(opts) {
     const options = Object.assign({
         fs: fsAdapter.getFileSystemAdapter(opts ? opts.fs : undefined),
@@ -105447,7 +105107,7 @@ exports.prepare = prepare;
 
 
 /***/ }),
-/* 898 */
+/* 897 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -105470,7 +105130,7 @@ exports.getFileSystemAdapter = getFileSystemAdapter;
 
 
 /***/ }),
-/* 899 */
+/* 898 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -105522,7 +105182,7 @@ exports.isFollowedSymlink = isFollowedSymlink;
 
 
 /***/ }),
-/* 900 */
+/* 899 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -105553,7 +105213,7 @@ exports.default = FileSystem;
 
 
 /***/ }),
-/* 901 */
+/* 900 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -105573,9 +105233,9 @@ var __extends = (this && this.__extends) || (function () {
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
 var stream = __webpack_require__(27);
-var readdir = __webpack_require__(878);
-var reader_1 = __webpack_require__(891);
-var fs_stream_1 = __webpack_require__(895);
+var readdir = __webpack_require__(877);
+var reader_1 = __webpack_require__(890);
+var fs_stream_1 = __webpack_require__(894);
 var TransformStream = /** @class */ (function (_super) {
     __extends(TransformStream, _super);
     function TransformStream(reader) {
@@ -105643,7 +105303,7 @@ exports.default = ReaderStream;
 
 
 /***/ }),
-/* 902 */
+/* 901 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -105662,9 +105322,9 @@ var __extends = (this && this.__extends) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
-var readdir = __webpack_require__(878);
-var reader_1 = __webpack_require__(891);
-var fs_sync_1 = __webpack_require__(903);
+var readdir = __webpack_require__(877);
+var reader_1 = __webpack_require__(890);
+var fs_sync_1 = __webpack_require__(902);
 var ReaderSync = /** @class */ (function (_super) {
     __extends(ReaderSync, _super);
     function ReaderSync() {
@@ -105724,7 +105384,7 @@ exports.default = ReaderSync;
 
 
 /***/ }),
-/* 903 */
+/* 902 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -105743,8 +105403,8 @@ var __extends = (this && this.__extends) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
-var fsStat = __webpack_require__(896);
-var fs_1 = __webpack_require__(900);
+var fsStat = __webpack_require__(895);
+var fs_1 = __webpack_require__(899);
 var FileSystemSync = /** @class */ (function (_super) {
     __extends(FileSystemSync, _super);
     function FileSystemSync() {
@@ -105790,7 +105450,7 @@ exports.default = FileSystemSync;
 
 
 /***/ }),
-/* 904 */
+/* 903 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -105806,13 +105466,13 @@ exports.flatten = flatten;
 
 
 /***/ }),
-/* 905 */
+/* 904 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 Object.defineProperty(exports, "__esModule", { value: true });
-var merge2 = __webpack_require__(589);
+var merge2 = __webpack_require__(588);
 /**
  * Merge multiple streams and propagate their errors into one stream in parallel.
  */
@@ -105827,13 +105487,13 @@ exports.merge = merge;
 
 
 /***/ }),
-/* 906 */
+/* 905 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 const path = __webpack_require__(16);
-const pathType = __webpack_require__(907);
+const pathType = __webpack_require__(906);
 
 const getExtensions = extensions => extensions.length > 1 ? `{${extensions.join(',')}}` : extensions[0];
 
@@ -105899,13 +105559,13 @@ module.exports.sync = (input, opts) => {
 
 
 /***/ }),
-/* 907 */
+/* 906 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 const fs = __webpack_require__(23);
-const pify = __webpack_require__(908);
+const pify = __webpack_require__(907);
 
 function type(fn, fn2, fp) {
 	if (typeof fp !== 'string') {
@@ -105948,7 +105608,7 @@ exports.symlinkSync = typeSync.bind(null, 'lstatSync', 'isSymbolicLink');
 
 
 /***/ }),
-/* 908 */
+/* 907 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -106039,17 +105699,17 @@ module.exports = (obj, opts) => {
 
 
 /***/ }),
-/* 909 */
+/* 908 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 const fs = __webpack_require__(23);
 const path = __webpack_require__(16);
-const fastGlob = __webpack_require__(718);
-const gitIgnore = __webpack_require__(910);
-const pify = __webpack_require__(911);
-const slash = __webpack_require__(912);
+const fastGlob = __webpack_require__(717);
+const gitIgnore = __webpack_require__(909);
+const pify = __webpack_require__(910);
+const slash = __webpack_require__(911);
 
 const DEFAULT_IGNORE = [
 	'**/node_modules/**',
@@ -106147,7 +105807,7 @@ module.exports.sync = options => {
 
 
 /***/ }),
-/* 910 */
+/* 909 */
 /***/ (function(module, exports) {
 
 // A simple implementation of make-array
@@ -106616,7 +106276,7 @@ module.exports = options => new IgnoreBase(options)
 
 
 /***/ }),
-/* 911 */
+/* 910 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -106691,7 +106351,7 @@ module.exports = (input, options) => {
 
 
 /***/ }),
-/* 912 */
+/* 911 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -106709,17 +106369,17 @@ module.exports = input => {
 
 
 /***/ }),
-/* 913 */
+/* 912 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 const path = __webpack_require__(16);
 const {constants: fsConstants} = __webpack_require__(23);
-const pEvent = __webpack_require__(914);
-const CpFileError = __webpack_require__(917);
-const fs = __webpack_require__(921);
-const ProgressEmitter = __webpack_require__(924);
+const pEvent = __webpack_require__(913);
+const CpFileError = __webpack_require__(916);
+const fs = __webpack_require__(920);
+const ProgressEmitter = __webpack_require__(923);
 
 const cpFileAsync = async (source, destination, options, progressEmitter) => {
 	let readError;
@@ -106833,12 +106493,12 @@ module.exports.sync = (source, destination, options) => {
 
 
 /***/ }),
-/* 914 */
+/* 913 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
-const pTimeout = __webpack_require__(915);
+const pTimeout = __webpack_require__(914);
 
 const symbolAsyncIterator = Symbol.asyncIterator || '@@asyncIterator';
 
@@ -107129,12 +106789,12 @@ module.exports.iterator = (emitter, event, options) => {
 
 
 /***/ }),
-/* 915 */
+/* 914 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
-const pFinally = __webpack_require__(916);
+const pFinally = __webpack_require__(915);
 
 class TimeoutError extends Error {
 	constructor(message) {
@@ -107180,7 +106840,7 @@ module.exports.TimeoutError = TimeoutError;
 
 
 /***/ }),
-/* 916 */
+/* 915 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -107202,12 +106862,12 @@ module.exports = (promise, onFinally) => {
 
 
 /***/ }),
-/* 917 */
+/* 916 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
-const NestedError = __webpack_require__(918);
+const NestedError = __webpack_require__(917);
 
 class CpFileError extends NestedError {
 	constructor(message, nested) {
@@ -107221,10 +106881,10 @@ module.exports = CpFileError;
 
 
 /***/ }),
-/* 918 */
+/* 917 */
 /***/ (function(module, exports, __webpack_require__) {
 
-var inherits = __webpack_require__(919);
+var inherits = __webpack_require__(918);
 
 var NestedError = function (message, nested) {
     this.nested = nested;
@@ -107275,7 +106935,7 @@ module.exports = NestedError;
 
 
 /***/ }),
-/* 919 */
+/* 918 */
 /***/ (function(module, exports, __webpack_require__) {
 
 try {
@@ -107283,12 +106943,12 @@ try {
   if (typeof util.inherits !== 'function') throw '';
   module.exports = util.inherits;
 } catch (e) {
-  module.exports = __webpack_require__(920);
+  module.exports = __webpack_require__(919);
 }
 
 
 /***/ }),
-/* 920 */
+/* 919 */
 /***/ (function(module, exports) {
 
 if (typeof Object.create === 'function') {
@@ -107317,16 +106977,16 @@ if (typeof Object.create === 'function') {
 
 
 /***/ }),
-/* 921 */
+/* 920 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 const {promisify} = __webpack_require__(29);
 const fs = __webpack_require__(22);
-const makeDir = __webpack_require__(922);
-const pEvent = __webpack_require__(914);
-const CpFileError = __webpack_require__(917);
+const makeDir = __webpack_require__(921);
+const pEvent = __webpack_require__(913);
+const CpFileError = __webpack_require__(916);
 
 const stat = promisify(fs.stat);
 const lstat = promisify(fs.lstat);
@@ -107423,7 +107083,7 @@ exports.copyFileSync = (source, destination, flags) => {
 
 
 /***/ }),
-/* 922 */
+/* 921 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -107431,7 +107091,7 @@ exports.copyFileSync = (source, destination, flags) => {
 const fs = __webpack_require__(23);
 const path = __webpack_require__(16);
 const {promisify} = __webpack_require__(29);
-const semver = __webpack_require__(923);
+const semver = __webpack_require__(922);
 
 const defaults = {
 	mode: 0o777 & (~process.umask()),
@@ -107580,7 +107240,7 @@ module.exports.sync = (input, options) => {
 
 
 /***/ }),
-/* 923 */
+/* 922 */
 /***/ (function(module, exports) {
 
 exports = module.exports = SemVer
@@ -109182,7 +108842,7 @@ function coerce (version, options) {
 
 
 /***/ }),
-/* 924 */
+/* 923 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -109223,7 +108883,7 @@ module.exports = ProgressEmitter;
 
 
 /***/ }),
-/* 925 */
+/* 924 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -109269,12 +108929,12 @@ exports.default = module.exports;
 
 
 /***/ }),
-/* 926 */
+/* 925 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
-const NestedError = __webpack_require__(927);
+const NestedError = __webpack_require__(926);
 
 class CpyError extends NestedError {
 	constructor(message, nested) {
@@ -109288,7 +108948,7 @@ module.exports = CpyError;
 
 
 /***/ }),
-/* 927 */
+/* 926 */
 /***/ (function(module, exports, __webpack_require__) {
 
 var inherits = __webpack_require__(29).inherits;
@@ -109344,14 +109004,14 @@ module.exports = NestedError;
 
 
 /***/ }),
-/* 928 */
+/* 927 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "prepareExternalProjectDependencies", function() { return prepareExternalProjectDependencies; });
-/* harmony import */ var _utils_package_json__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(516);
-/* harmony import */ var _utils_project__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(515);
+/* harmony import */ var _utils_package_json__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(515);
+/* harmony import */ var _utils_project__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(514);
 /*
  * Licensed to Elasticsearch B.V. under one or more contributor
  * license agreements. See the NOTICE file distributed with
diff --git a/packages/kbn-pm/package.json b/packages/kbn-pm/package.json
index a236db9eee18a..be56fad8aa0ce 100644
--- a/packages/kbn-pm/package.json
+++ b/packages/kbn-pm/package.json
@@ -10,11 +10,11 @@
     "prettier": "prettier --write './src/**/*.ts'"
   },
   "devDependencies": {
-    "@babel/core": "^7.5.5",
-    "@babel/plugin-proposal-class-properties": "^7.5.5",
-    "@babel/plugin-proposal-object-rest-spread": "^7.5.5",
-    "@babel/preset-env": "^7.5.5",
-    "@babel/preset-typescript": "^7.7.4",
+    "@babel/core": "^7.9.0",
+    "@babel/plugin-proposal-class-properties": "^7.8.3",
+    "@babel/plugin-proposal-object-rest-spread": "^7.9.0",
+    "@babel/preset-env": "^7.9.0",
+    "@babel/preset-typescript": "^7.9.0",
     "@types/cmd-shim": "^2.0.0",
     "@types/cpy": "^5.1.0",
     "@types/dedent": "^0.7.0",
diff --git a/packages/kbn-test/package.json b/packages/kbn-test/package.json
index a01c4ebab8ad0..0ab0048619358 100644
--- a/packages/kbn-test/package.json
+++ b/packages/kbn-test/package.json
@@ -10,7 +10,7 @@
     "kbn:watch": "yarn build --watch"
   },
   "devDependencies": {
-    "@babel/cli": "^7.5.5",
+    "@babel/cli": "^7.8.4",
     "@kbn/babel-preset": "1.0.0",
     "@kbn/dev-utils": "1.0.0",
     "@types/parse-link-header": "^1.0.0",
diff --git a/packages/kbn-ui-framework/package.json b/packages/kbn-ui-framework/package.json
index 0402a83d3d274..bcebdf591d6f0 100644
--- a/packages/kbn-ui-framework/package.json
+++ b/packages/kbn-ui-framework/package.json
@@ -30,7 +30,7 @@
     "enzyme-adapter-react-16": "^1.9.1"
   },
   "devDependencies": {
-    "@babel/core": "^7.5.5",
+    "@babel/core": "^7.9.0",
     "@elastic/eui": "0.0.55",
     "@kbn/babel-preset": "1.0.0",
     "autoprefixer": "^9.7.4",
diff --git a/x-pack/package.json b/x-pack/package.json
index fcc7e70d3e417..7430964c8418a 100644
--- a/x-pack/package.json
+++ b/x-pack/package.json
@@ -176,9 +176,9 @@
     "yargs": "4.8.1"
   },
   "dependencies": {
-    "@babel/core": "^7.5.5",
-    "@babel/register": "^7.7.0",
-    "@babel/runtime": "^7.5.5",
+    "@babel/core": "^7.9.0",
+    "@babel/register": "^7.9.0",
+    "@babel/runtime": "^7.9.2",
     "@elastic/apm-rum-react": "^0.3.2",
     "@elastic/datemath": "5.0.2",
     "@elastic/ems-client": "7.7.1",
diff --git a/yarn.lock b/yarn.lock
index 3997cfbaeca6b..9fc599c9cd329 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,31 +2,46 @@
 # yarn lockfile v1
 
 
-"@babel/cli@^7.5.5":
-  version "7.5.5"
-  resolved "https://registry.yarnpkg.com/@babel/cli/-/cli-7.5.5.tgz#bdb6d9169e93e241a08f5f7b0265195bf38ef5ec"
-  integrity sha512-UHI+7pHv/tk9g6WXQKYz+kmXTI77YtuY3vqC59KIqcoWEjsJJSG6rAxKaLsgj3LDyadsPrCB929gVOKM6Hui0w==
+"@babel/cli@^7.8.4":
+  version "7.8.4"
+  resolved "https://registry.yarnpkg.com/@babel/cli/-/cli-7.8.4.tgz#505fb053721a98777b2b175323ea4f090b7d3c1c"
+  integrity sha512-XXLgAm6LBbaNxaGhMAznXXaxtCWfuv6PIDJ9Alsy9JYTOh+j2jJz+L/162kkfU1j/pTSxK1xGmlwI4pdIMkoag==
   dependencies:
-    commander "^2.8.1"
+    commander "^4.0.1"
     convert-source-map "^1.1.0"
     fs-readdir-recursive "^1.1.0"
     glob "^7.0.0"
     lodash "^4.17.13"
-    mkdirp "^0.5.1"
-    output-file-sync "^2.0.0"
+    make-dir "^2.1.0"
     slash "^2.0.0"
     source-map "^0.5.0"
   optionalDependencies:
-    chokidar "^2.0.4"
+    chokidar "^2.1.8"
 
-"@babel/code-frame@7.5.5", "@babel/code-frame@^7.0.0", "@babel/code-frame@^7.5.5":
+"@babel/code-frame@7.5.5":
   version "7.5.5"
   resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.5.5.tgz#bc0782f6d69f7b7d49531219699b988f669a8f9d"
   integrity sha512-27d4lZoomVyo51VegxI20xZPuSHusqbQag/ztrBC7wegWoQ1nLREPVSKSW8byhTlzTKyNE4ifaTA6lCp7JjpFw==
   dependencies:
     "@babel/highlight" "^7.0.0"
 
-"@babel/core@7.5.5", "@babel/core@^7.0.0", "@babel/core@^7.1.0", "@babel/core@^7.4.3", "@babel/core@^7.5.5":
+"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.5.5", "@babel/code-frame@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.8.3.tgz#33e25903d7481181534e12ec0a25f16b6fcf419e"
+  integrity sha512-a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g==
+  dependencies:
+    "@babel/highlight" "^7.8.3"
+
+"@babel/compat-data@^7.8.6", "@babel/compat-data@^7.9.0":
+  version "7.9.0"
+  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.9.0.tgz#04815556fc90b0c174abd2c0c1bb966faa036a6c"
+  integrity sha512-zeFQrr+284Ekvd9e7KAX954LkapWiOmQtsfHirhxqfdlX6MEC32iRE+pqUGlYIBchdevaCwvzxWGSy/YBNI85g==
+  dependencies:
+    browserslist "^4.9.1"
+    invariant "^2.2.4"
+    semver "^5.5.0"
+
+"@babel/core@7.5.5":
   version "7.5.5"
   resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.5.5.tgz#17b2686ef0d6bc58f963dddd68ab669755582c30"
   integrity sha512-i4qoSr2KTtce0DmkuuQBV4AuQgGPUcPXMr9L5MyYAtk06z068lQ10a4O009fe5OB/DfNV+h+qqT7ddNV8UnRjg==
@@ -46,484 +61,272 @@
     semver "^5.4.1"
     source-map "^0.5.0"
 
-"@babel/core@^7.0.1":
-  version "7.6.0"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.6.0.tgz#9b00f73554edd67bebc86df8303ef678be3d7b48"
-  integrity sha512-FuRhDRtsd6IptKpHXAa+4WPZYY2ZzgowkbLBecEDDSje1X/apG7jQM33or3NdOmjXBKWGOg4JmSiRfUfuTtHXw==
-  dependencies:
-    "@babel/code-frame" "^7.5.5"
-    "@babel/generator" "^7.6.0"
-    "@babel/helpers" "^7.6.0"
-    "@babel/parser" "^7.6.0"
-    "@babel/template" "^7.6.0"
-    "@babel/traverse" "^7.6.0"
-    "@babel/types" "^7.6.0"
-    convert-source-map "^1.1.0"
+"@babel/core@^7.0.0", "@babel/core@^7.0.1", "@babel/core@^7.1.0", "@babel/core@^7.4.3", "@babel/core@^7.9.0":
+  version "7.9.0"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.9.0.tgz#ac977b538b77e132ff706f3b8a4dbad09c03c56e"
+  integrity sha512-kWc7L0fw1xwvI0zi8OKVBuxRVefwGOrKSQMvrQ3dW+bIIavBY3/NpXmpjMy7bQnLgwgzWQZ8TlM57YHpHNHz4w==
+  dependencies:
+    "@babel/code-frame" "^7.8.3"
+    "@babel/generator" "^7.9.0"
+    "@babel/helper-module-transforms" "^7.9.0"
+    "@babel/helpers" "^7.9.0"
+    "@babel/parser" "^7.9.0"
+    "@babel/template" "^7.8.6"
+    "@babel/traverse" "^7.9.0"
+    "@babel/types" "^7.9.0"
+    convert-source-map "^1.7.0"
     debug "^4.1.0"
-    json5 "^2.1.0"
+    gensync "^1.0.0-beta.1"
+    json5 "^2.1.2"
     lodash "^4.17.13"
     resolve "^1.3.2"
     semver "^5.4.1"
     source-map "^0.5.0"
 
-"@babel/generator@^7.0.0", "@babel/generator@^7.4.0", "@babel/generator@^7.5.5":
-  version "7.5.5"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.5.5.tgz#873a7f936a3c89491b43536d12245b626664e3cf"
-  integrity sha512-ETI/4vyTSxTzGnU2c49XHv2zhExkv9JHLTwDAFz85kmcwuShvYG2H08FwgIguQf4JC75CBnXAUM5PqeF4fj0nQ==
-  dependencies:
-    "@babel/types" "^7.5.5"
-    jsesc "^2.5.1"
-    lodash "^4.17.13"
-    source-map "^0.5.0"
-    trim-right "^1.0.1"
-
-"@babel/generator@^7.6.0", "@babel/generator@^7.6.2":
-  version "7.6.2"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.6.2.tgz#dac8a3c2df118334c2a29ff3446da1636a8f8c03"
-  integrity sha512-j8iHaIW4gGPnViaIHI7e9t/Hl8qLjERI6DcV9kEpAIDJsAOrcnXqRS7t+QbhL76pwbtqP+QCQLL0z1CyVmtjjQ==
+"@babel/generator@^7.0.0", "@babel/generator@^7.4.0", "@babel/generator@^7.5.5", "@babel/generator@^7.9.0":
+  version "7.9.4"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.9.4.tgz#12441e90c3b3c4159cdecf312075bf1a8ce2dbce"
+  integrity sha512-rjP8ahaDy/ouhrvCoU1E5mqaitWrxwuNGU+dy1EpaoK48jZay4MdkskKGIMHLZNewg8sAsqpGSREJwP0zH3YQA==
   dependencies:
-    "@babel/types" "^7.6.0"
+    "@babel/types" "^7.9.0"
     jsesc "^2.5.1"
     lodash "^4.17.13"
     source-map "^0.5.0"
 
-"@babel/generator@^7.6.3":
-  version "7.6.4"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.6.4.tgz#a4f8437287bf9671b07f483b76e3bb731bc97671"
-  integrity sha512-jsBuXkFoZxk0yWLyGI9llT9oiQ2FeTASmRFE32U+aaDTfoE92t78eroO7PTpU/OrYq38hlcDM6vbfLDaOLy+7w==
+"@babel/helper-annotate-as-pure@^7.0.0", "@babel/helper-annotate-as-pure@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.8.3.tgz#60bc0bc657f63a0924ff9a4b4a0b24a13cf4deee"
+  integrity sha512-6o+mJrZBxOoEX77Ezv9zwW7WV8DdluouRKNY/IR5u/YTMuKHgugHOzYWlYvYLpLA9nPsQCAAASpCIbjI9Mv+Uw==
   dependencies:
-    "@babel/types" "^7.6.3"
-    jsesc "^2.5.1"
-    lodash "^4.17.13"
-    source-map "^0.5.0"
+    "@babel/types" "^7.8.3"
 
-"@babel/generator@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.7.4.tgz#db651e2840ca9aa66f327dcec1dc5f5fa9611369"
-  integrity sha512-m5qo2WgdOJeyYngKImbkyQrnUN1mPceaG5BV+G0E3gWsa4l/jCSryWJdM2x8OuGAOyh+3d5pVYfZWCiNFtynxg==
+"@babel/helper-builder-binary-assignment-operator-visitor@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.8.3.tgz#c84097a427a061ac56a1c30ebf54b7b22d241503"
+  integrity sha512-5eFOm2SyFPK4Rh3XMMRDjN7lBH0orh3ss0g3rTYZnBQ+r6YPj7lgDyCvPphynHvUrobJmeMignBr6Acw9mAPlw==
   dependencies:
-    "@babel/types" "^7.7.4"
-    jsesc "^2.5.1"
-    lodash "^4.17.13"
-    source-map "^0.5.0"
+    "@babel/helper-explode-assignable-expression" "^7.8.3"
+    "@babel/types" "^7.8.3"
 
-"@babel/helper-annotate-as-pure@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.0.0.tgz#323d39dd0b50e10c7c06ca7d7638e6864d8c5c32"
-  integrity sha512-3UYcJUj9kvSLbLbUIfQTqzcy5VX7GRZ/CCDrnOaZorFFM01aXp1+GJwuFGV4NDDoAS+mOUyHcO6UD/RfqOks3Q==
+"@babel/helper-builder-react-jsx-experimental@^7.9.0":
+  version "7.9.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-builder-react-jsx-experimental/-/helper-builder-react-jsx-experimental-7.9.0.tgz#066d80262ade488f9c1b1823ce5db88a4cedaa43"
+  integrity sha512-3xJEiyuYU4Q/Ar9BsHisgdxZsRlsShMe90URZ0e6przL26CCs8NJbDoxH94kKT17PcxlMhsCAwZd90evCo26VQ==
   dependencies:
-    "@babel/types" "^7.0.0"
+    "@babel/helper-annotate-as-pure" "^7.8.3"
+    "@babel/helper-module-imports" "^7.8.3"
+    "@babel/types" "^7.9.0"
 
-"@babel/helper-annotate-as-pure@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.7.4.tgz#bb3faf1e74b74bd547e867e48f551fa6b098b6ce"
-  integrity sha512-2BQmQgECKzYKFPpiycoF9tlb5HA4lrVyAmLLVK177EcQAqjVLciUb2/R+n1boQ9y5ENV3uz2ZqiNw7QMBBw1Og==
+"@babel/helper-builder-react-jsx@^7.9.0":
+  version "7.9.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-builder-react-jsx/-/helper-builder-react-jsx-7.9.0.tgz#16bf391990b57732700a3278d4d9a81231ea8d32"
+  integrity sha512-weiIo4gaoGgnhff54GQ3P5wsUQmnSwpkvU0r6ZHq6TzoSzKy4JxHEgnxNytaKbov2a9z/CVNyzliuCOUPEX3Jw==
   dependencies:
-    "@babel/types" "^7.7.4"
+    "@babel/helper-annotate-as-pure" "^7.8.3"
+    "@babel/types" "^7.9.0"
 
-"@babel/helper-builder-binary-assignment-operator-visitor@^7.1.0":
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.1.0.tgz#6b69628dfe4087798e0c4ed98e3d4a6b2fbd2f5f"
-  integrity sha512-qNSR4jrmJ8M1VMM9tibvyRAHXQs2PmaksQF7c1CGJNipfe3D8p+wgNwgso/P2A2r2mdgBWAXljNWR0QRZAMW8w==
+"@babel/helper-compilation-targets@^7.8.7":
+  version "7.8.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.8.7.tgz#dac1eea159c0e4bd46e309b5a1b04a66b53c1dde"
+  integrity sha512-4mWm8DCK2LugIS+p1yArqvG1Pf162upsIsjE7cNBjez+NjliQpVhj20obE520nao0o14DaTnFJv+Fw5a0JpoUw==
   dependencies:
-    "@babel/helper-explode-assignable-expression" "^7.1.0"
-    "@babel/types" "^7.0.0"
-
-"@babel/helper-builder-binary-assignment-operator-visitor@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.7.4.tgz#5f73f2b28580e224b5b9bd03146a4015d6217f5f"
-  integrity sha512-Biq/d/WtvfftWZ9Uf39hbPBYDUo986m5Bb4zhkeYDGUllF43D+nUe5M6Vuo6/8JDK/0YX/uBdeoQpyaNhNugZQ==
-  dependencies:
-    "@babel/helper-explode-assignable-expression" "^7.7.4"
-    "@babel/types" "^7.7.4"
-
-"@babel/helper-builder-react-jsx@^7.3.0":
-  version "7.3.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-builder-react-jsx/-/helper-builder-react-jsx-7.3.0.tgz#a1ac95a5d2b3e88ae5e54846bf462eeb81b318a4"
-  integrity sha512-MjA9KgwCuPEkQd9ncSXvSyJ5y+j2sICHyrI0M3L+6fnS4wMSNDc1ARXsbTfbb2cXHn17VisSnU/sHFTCxVxSMw==
-  dependencies:
-    "@babel/types" "^7.3.0"
-    esutils "^2.0.0"
-
-"@babel/helper-builder-react-jsx@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-builder-react-jsx/-/helper-builder-react-jsx-7.7.4.tgz#da188d247508b65375b2c30cf59de187be6b0c66"
-  integrity sha512-kvbfHJNN9dg4rkEM4xn1s8d1/h6TYNvajy9L1wx4qLn9HFg0IkTsQi4rfBe92nxrPUFcMsHoMV+8rU7MJb3fCA==
-  dependencies:
-    "@babel/types" "^7.7.4"
-    esutils "^2.0.0"
-
-"@babel/helper-call-delegate@^7.4.4":
-  version "7.4.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-call-delegate/-/helper-call-delegate-7.4.4.tgz#87c1f8ca19ad552a736a7a27b1c1fcf8b1ff1f43"
-  integrity sha512-l79boDFJ8S1c5hvQvG+rc+wHw6IuH7YldmRKsYtpbawsxURu/paVy57FZMomGK22/JckepaikOkY0MoAmdyOlQ==
-  dependencies:
-    "@babel/helper-hoist-variables" "^7.4.4"
-    "@babel/traverse" "^7.4.4"
-    "@babel/types" "^7.4.4"
-
-"@babel/helper-call-delegate@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-call-delegate/-/helper-call-delegate-7.7.4.tgz#621b83e596722b50c0066f9dc37d3232e461b801"
-  integrity sha512-8JH9/B7J7tCYJ2PpWVpw9JhPuEVHztagNVuQAFBVFYluRMlpG7F1CgKEgGeL6KFqcsIa92ZYVj6DSc0XwmN1ZA==
-  dependencies:
-    "@babel/helper-hoist-variables" "^7.7.4"
-    "@babel/traverse" "^7.7.4"
-    "@babel/types" "^7.7.4"
-
-"@babel/helper-create-class-features-plugin@^7.4.4", "@babel/helper-create-class-features-plugin@^7.5.5":
-  version "7.5.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.5.5.tgz#401f302c8ddbc0edd36f7c6b2887d8fa1122e5a4"
-  integrity sha512-ZsxkyYiRA7Bg+ZTRpPvB6AbOFKTFFK4LrvTet8lInm0V468MWCaSYJE+I7v2z2r8KNLtYiV+K5kTCnR7dvyZjg==
-  dependencies:
-    "@babel/helper-function-name" "^7.1.0"
-    "@babel/helper-member-expression-to-functions" "^7.5.5"
-    "@babel/helper-optimise-call-expression" "^7.0.0"
-    "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/helper-replace-supers" "^7.5.5"
-    "@babel/helper-split-export-declaration" "^7.4.4"
-
-"@babel/helper-create-class-features-plugin@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.7.4.tgz#fce60939fd50618610942320a8d951b3b639da2d"
-  integrity sha512-l+OnKACG4uiDHQ/aJT8dwpR+LhCJALxL0mJ6nzjB25e5IPwqV1VOsY7ah6UB1DG+VOXAIMtuC54rFJGiHkxjgA==
-  dependencies:
-    "@babel/helper-function-name" "^7.7.4"
-    "@babel/helper-member-expression-to-functions" "^7.7.4"
-    "@babel/helper-optimise-call-expression" "^7.7.4"
-    "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/helper-replace-supers" "^7.7.4"
-    "@babel/helper-split-export-declaration" "^7.7.4"
-
-"@babel/helper-create-regexp-features-plugin@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.7.4.tgz#6d5762359fd34f4da1500e4cff9955b5299aaf59"
-  integrity sha512-Mt+jBKaxL0zfOIWrfQpnfYCN7/rS6GKx6CCCfuoqVVd+17R8zNDlzVYmIi9qyb2wOk002NsmSTDymkIygDUH7A==
-  dependencies:
-    "@babel/helper-regex" "^7.4.4"
-    regexpu-core "^4.6.0"
-
-"@babel/helper-define-map@^7.5.5":
-  version "7.5.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-define-map/-/helper-define-map-7.5.5.tgz#3dec32c2046f37e09b28c93eb0b103fd2a25d369"
-  integrity sha512-fTfxx7i0B5NJqvUOBBGREnrqbTxRh7zinBANpZXAVDlsZxYdclDp467G1sQ8VZYMnAURY3RpBUAgOYT9GfzHBg==
-  dependencies:
-    "@babel/helper-function-name" "^7.1.0"
-    "@babel/types" "^7.5.5"
-    lodash "^4.17.13"
+    "@babel/compat-data" "^7.8.6"
+    browserslist "^4.9.1"
+    invariant "^2.2.4"
+    levenary "^1.1.1"
+    semver "^5.5.0"
 
-"@babel/helper-define-map@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-define-map/-/helper-define-map-7.7.4.tgz#2841bf92eb8bd9c906851546fe6b9d45e162f176"
-  integrity sha512-v5LorqOa0nVQUvAUTUF3KPastvUt/HzByXNamKQ6RdJRTV7j8rLL+WB5C/MzzWAwOomxDhYFb1wLLxHqox86lg==
-  dependencies:
-    "@babel/helper-function-name" "^7.7.4"
-    "@babel/types" "^7.7.4"
+"@babel/helper-create-class-features-plugin@^7.4.4", "@babel/helper-create-class-features-plugin@^7.5.5", "@babel/helper-create-class-features-plugin@^7.8.3":
+  version "7.8.6"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.8.6.tgz#243a5b46e2f8f0f674dc1387631eb6b28b851de0"
+  integrity sha512-klTBDdsr+VFFqaDHm5rR69OpEQtO2Qv8ECxHS1mNhJJvaHArR6a1xTf5K/eZW7eZpJbhCx3NW1Yt/sKsLXLblg==
+  dependencies:
+    "@babel/helper-function-name" "^7.8.3"
+    "@babel/helper-member-expression-to-functions" "^7.8.3"
+    "@babel/helper-optimise-call-expression" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-replace-supers" "^7.8.6"
+    "@babel/helper-split-export-declaration" "^7.8.3"
+
+"@babel/helper-create-regexp-features-plugin@^7.8.3", "@babel/helper-create-regexp-features-plugin@^7.8.8":
+  version "7.8.8"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.8.8.tgz#5d84180b588f560b7864efaeea89243e58312087"
+  integrity sha512-LYVPdwkrQEiX9+1R29Ld/wTrmQu1SSKYnuOk3g0CkcZMA1p0gsNxJFj/3gBdaJ7Cg0Fnek5z0DsMULePP7Lrqg==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.8.3"
+    "@babel/helper-regex" "^7.8.3"
+    regexpu-core "^4.7.0"
+
+"@babel/helper-define-map@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/helper-define-map/-/helper-define-map-7.8.3.tgz#a0655cad5451c3760b726eba875f1cd8faa02c15"
+  integrity sha512-PoeBYtxoZGtct3md6xZOCWPcKuMuk3IHhgxsRRNtnNShebf4C8YonTSblsK4tvDbm+eJAw2HAPOfCr+Q/YRG/g==
+  dependencies:
+    "@babel/helper-function-name" "^7.8.3"
+    "@babel/types" "^7.8.3"
     lodash "^4.17.13"
 
-"@babel/helper-explode-assignable-expression@^7.1.0":
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.1.0.tgz#537fa13f6f1674df745b0c00ec8fe4e99681c8f6"
-  integrity sha512-NRQpfHrJ1msCHtKjbzs9YcMmJZOg6mQMmGRB+hbamEdG5PNpaSm95275VD92DvJKuyl0s2sFiDmMZ+EnnvufqA==
+"@babel/helper-explode-assignable-expression@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.8.3.tgz#a728dc5b4e89e30fc2dfc7d04fa28a930653f982"
+  integrity sha512-N+8eW86/Kj147bO9G2uclsg5pwfs/fqqY5rwgIL7eTBklgXjcOJ3btzS5iM6AitJcftnY7pm2lGsrJVYLGjzIw==
   dependencies:
-    "@babel/traverse" "^7.1.0"
-    "@babel/types" "^7.0.0"
+    "@babel/traverse" "^7.8.3"
+    "@babel/types" "^7.8.3"
 
-"@babel/helper-explode-assignable-expression@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.7.4.tgz#fa700878e008d85dc51ba43e9fb835cddfe05c84"
-  integrity sha512-2/SicuFrNSXsZNBxe5UGdLr+HZg+raWBLE9vC98bdYOKX/U6PY0mdGlYUJdtTDPSU0Lw0PNbKKDpwYHJLn2jLg==
+"@babel/helper-function-name@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.8.3.tgz#eeeb665a01b1f11068e9fb86ad56a1cb1a824cca"
+  integrity sha512-BCxgX1BC2hD/oBlIFUgOCQDOPV8nSINxCwM3o93xP4P9Fq6aV5sgv2cOOITDMtCfQ+3PvHp3l689XZvAM9QyOA==
   dependencies:
-    "@babel/traverse" "^7.7.4"
-    "@babel/types" "^7.7.4"
+    "@babel/helper-get-function-arity" "^7.8.3"
+    "@babel/template" "^7.8.3"
+    "@babel/types" "^7.8.3"
 
-"@babel/helper-function-name@^7.1.0":
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.1.0.tgz#a0ceb01685f73355d4360c1247f582bfafc8ff53"
-  integrity sha512-A95XEoCpb3TO+KZzJ4S/5uW5fNe26DjBGqf1o9ucyLyCmi1dXq/B3c8iaWTfBk3VvetUxl16e8tIrd5teOCfGw==
+"@babel/helper-get-function-arity@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.8.3.tgz#b894b947bd004381ce63ea1db9f08547e920abd5"
+  integrity sha512-FVDR+Gd9iLjUMY1fzE2SR0IuaJToR4RkCDARVfsBBPSP53GEqSFjD8gNyxg246VUyc/ALRxFaAK8rVG7UT7xRA==
   dependencies:
-    "@babel/helper-get-function-arity" "^7.0.0"
-    "@babel/template" "^7.1.0"
-    "@babel/types" "^7.0.0"
+    "@babel/types" "^7.8.3"
 
-"@babel/helper-function-name@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.7.4.tgz#ab6e041e7135d436d8f0a3eca15de5b67a341a2e"
-  integrity sha512-AnkGIdiBhEuiwdoMnKm7jfPfqItZhgRaZfMg1XX3bS25INOnLPjPG1Ppnajh8eqgt5kPJnfqrRHqFqmjKDZLzQ==
+"@babel/helper-hoist-variables@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.8.3.tgz#1dbe9b6b55d78c9b4183fc8cdc6e30ceb83b7134"
+  integrity sha512-ky1JLOjcDUtSc+xkt0xhYff7Z6ILTAHKmZLHPxAhOP0Nd77O+3nCsd6uSVYur6nJnCI029CrNbYlc0LoPfAPQg==
   dependencies:
-    "@babel/helper-get-function-arity" "^7.7.4"
-    "@babel/template" "^7.7.4"
-    "@babel/types" "^7.7.4"
-
-"@babel/helper-get-function-arity@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.0.0.tgz#83572d4320e2a4657263734113c42868b64e49c3"
-  integrity sha512-r2DbJeg4svYvt3HOS74U4eWKsUAMRH01Z1ds1zx8KNTPtpTL5JAsdFv8BNyOpVqdFhHkkRDIg5B4AsxmkjAlmQ==
-  dependencies:
-    "@babel/types" "^7.0.0"
-
-"@babel/helper-get-function-arity@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.7.4.tgz#cb46348d2f8808e632f0ab048172130e636005f0"
-  integrity sha512-QTGKEdCkjgzgfJ3bAyRwF4yyT3pg+vDgan8DSivq1eS0gwi+KGKE5x8kRcbeFTb/673mkO5SN1IZfmCfA5o+EA==
-  dependencies:
-    "@babel/types" "^7.7.4"
-
-"@babel/helper-hoist-variables@^7.4.4":
-  version "7.4.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.4.4.tgz#0298b5f25c8c09c53102d52ac4a98f773eb2850a"
-  integrity sha512-VYk2/H/BnYbZDDg39hr3t2kKyifAm1W6zHRfhx8jGjIHpQEBv9dry7oQ2f3+J703TLu69nYdxsovl0XYfcnK4w==
-  dependencies:
-    "@babel/types" "^7.4.4"
-
-"@babel/helper-hoist-variables@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.7.4.tgz#612384e3d823fdfaaf9fce31550fe5d4db0f3d12"
-  integrity sha512-wQC4xyvc1Jo/FnLirL6CEgPgPCa8M74tOdjWpRhQYapz5JC7u3NYU1zCVoVAGCE3EaIP9T1A3iW0WLJ+reZlpQ==
-  dependencies:
-    "@babel/types" "^7.7.4"
-
-"@babel/helper-member-expression-to-functions@^7.5.5":
-  version "7.5.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.5.5.tgz#1fb5b8ec4453a93c439ee9fe3aeea4a84b76b590"
-  integrity sha512-5qZ3D1uMclSNqYcXqiHoA0meVdv+xUEex9em2fqMnrk/scphGlGgg66zjMrPJESPwrFJ6sbfFQYUSa0Mz7FabA==
-  dependencies:
-    "@babel/types" "^7.5.5"
-
-"@babel/helper-member-expression-to-functions@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.7.4.tgz#356438e2569df7321a8326644d4b790d2122cb74"
-  integrity sha512-9KcA1X2E3OjXl/ykfMMInBK+uVdfIVakVe7W7Lg3wfXUNyS3Q1HWLFRwZIjhqiCGbslummPDnmb7vIekS0C1vw==
-  dependencies:
-    "@babel/types" "^7.7.4"
-
-"@babel/helper-module-imports@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.0.0.tgz#96081b7111e486da4d2cd971ad1a4fe216cc2e3d"
-  integrity sha512-aP/hlLq01DWNEiDg4Jn23i+CXxW/owM4WpDLFUbpjxe4NS3BhLVZQ5i7E0ZrxuQ/vwekIeciyamgB1UIYxxM6A==
-  dependencies:
-    "@babel/types" "^7.0.0"
+    "@babel/types" "^7.8.3"
 
-"@babel/helper-module-imports@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.7.4.tgz#e5a92529f8888bf319a6376abfbd1cebc491ad91"
-  integrity sha512-dGcrX6K9l8258WFjyDLJwuVKxR4XZfU0/vTUgOQYWEnRD8mgr+p4d6fCUMq/ys0h4CCt/S5JhbvtyErjWouAUQ==
+"@babel/helper-member-expression-to-functions@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.8.3.tgz#659b710498ea6c1d9907e0c73f206eee7dadc24c"
+  integrity sha512-fO4Egq88utkQFjbPrSHGmGLFqmrshs11d46WI+WZDESt7Wu7wN2G2Iu+NMMZJFDOVRHAMIkB5SNh30NtwCA7RA==
   dependencies:
-    "@babel/types" "^7.7.4"
+    "@babel/types" "^7.8.3"
 
-"@babel/helper-module-transforms@^7.1.0", "@babel/helper-module-transforms@^7.4.4":
-  version "7.5.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.5.5.tgz#f84ff8a09038dcbca1fd4355661a500937165b4a"
-  integrity sha512-jBeCvETKuJqeiaCdyaheF40aXnnU1+wkSiUs/IQg3tB85up1LyL8x77ClY8qJpuRJUcXQo+ZtdNESmZl4j56Pw==
+"@babel/helper-module-imports@^7.0.0", "@babel/helper-module-imports@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.8.3.tgz#7fe39589b39c016331b6b8c3f441e8f0b1419498"
+  integrity sha512-R0Bx3jippsbAEtzkpZ/6FIiuzOURPcMjHp+Z6xPe6DtApDJx+w7UYyOLanZqO8+wKR9G10s/FmHXvxaMd9s6Kg==
   dependencies:
-    "@babel/helper-module-imports" "^7.0.0"
-    "@babel/helper-simple-access" "^7.1.0"
-    "@babel/helper-split-export-declaration" "^7.4.4"
-    "@babel/template" "^7.4.4"
-    "@babel/types" "^7.5.5"
-    lodash "^4.17.13"
+    "@babel/types" "^7.8.3"
 
-"@babel/helper-module-transforms@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.7.4.tgz#8d7cdb1e1f8ea3d8c38b067345924ac4f8e0879a"
-  integrity sha512-ehGBu4mXrhs0FxAqN8tWkzF8GSIGAiEumu4ONZ/hD9M88uHcD+Yu2ttKfOCgwzoesJOJrtQh7trI5YPbRtMmnA==
+"@babel/helper-module-transforms@^7.9.0":
+  version "7.9.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.9.0.tgz#43b34dfe15961918707d247327431388e9fe96e5"
+  integrity sha512-0FvKyu0gpPfIQ8EkxlrAydOWROdHpBmiCiRwLkUiBGhCUPRRbVD2/tm3sFr/c/GWFrQ/ffutGUAnx7V0FzT2wA==
   dependencies:
-    "@babel/helper-module-imports" "^7.7.4"
-    "@babel/helper-simple-access" "^7.7.4"
-    "@babel/helper-split-export-declaration" "^7.7.4"
-    "@babel/template" "^7.7.4"
-    "@babel/types" "^7.7.4"
+    "@babel/helper-module-imports" "^7.8.3"
+    "@babel/helper-replace-supers" "^7.8.6"
+    "@babel/helper-simple-access" "^7.8.3"
+    "@babel/helper-split-export-declaration" "^7.8.3"
+    "@babel/template" "^7.8.6"
+    "@babel/types" "^7.9.0"
     lodash "^4.17.13"
 
-"@babel/helper-optimise-call-expression@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.0.0.tgz#a2920c5702b073c15de51106200aa8cad20497d5"
-  integrity sha512-u8nd9NQePYNQV8iPWu/pLLYBqZBa4ZaY1YWRFMuxrid94wKI1QNt67NEZ7GAe5Kc/0LLScbim05xZFWkAdrj9g==
-  dependencies:
-    "@babel/types" "^7.0.0"
-
-"@babel/helper-optimise-call-expression@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.7.4.tgz#034af31370d2995242aa4df402c3b7794b2dcdf2"
-  integrity sha512-VB7gWZ2fDkSuqW6b1AKXkJWO5NyNI3bFL/kK79/30moK57blr6NbH8xcl2XcKCwOmJosftWunZqfO84IGq3ZZg==
+"@babel/helper-optimise-call-expression@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.8.3.tgz#7ed071813d09c75298ef4f208956006b6111ecb9"
+  integrity sha512-Kag20n86cbO2AvHca6EJsvqAd82gc6VMGule4HwebwMlwkpXuVqrNRj6CkCV2sKxgi9MyAUnZVnZ6lJ1/vKhHQ==
   dependencies:
-    "@babel/types" "^7.7.4"
+    "@babel/types" "^7.8.3"
 
-"@babel/helper-plugin-utils@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.0.0.tgz#bbb3fbee98661c569034237cc03967ba99b4f250"
-  integrity sha512-CYAOUCARwExnEixLdB6sDm2dIJ/YgEAKDM1MOeMeZu9Ld/bDgVo8aiWrXwcY7OBh+1Ea2uUcVRcxKk0GJvW7QA==
+"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz#9ea293be19babc0f52ff8ca88b34c3611b208670"
+  integrity sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==
 
-"@babel/helper-regex@^7.0.0", "@babel/helper-regex@^7.4.4":
-  version "7.5.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-regex/-/helper-regex-7.5.5.tgz#0aa6824f7100a2e0e89c1527c23936c152cab351"
-  integrity sha512-CkCYQLkfkiugbRDO8eZn6lRuR8kzZoGXCg3149iTk5se7g6qykSpy3+hELSwquhu+TgHn8nkLiBwHvNX8Hofcw==
+"@babel/helper-regex@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/helper-regex/-/helper-regex-7.8.3.tgz#139772607d51b93f23effe72105b319d2a4c6965"
+  integrity sha512-BWt0QtYv/cg/NecOAZMdcn/waj/5P26DR4mVLXfFtDokSR6fyuG0Pj+e2FqtSME+MqED1khnSMulkmGl8qWiUQ==
   dependencies:
     lodash "^4.17.13"
 
-"@babel/helper-remap-async-to-generator@^7.1.0":
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.1.0.tgz#361d80821b6f38da75bd3f0785ece20a88c5fe7f"
-  integrity sha512-3fOK0L+Fdlg8S5al8u/hWE6vhufGSn0bN09xm2LXMy//REAF8kDCrYoOBKYmA8m5Nom+sV9LyLCwrFynA8/slg==
-  dependencies:
-    "@babel/helper-annotate-as-pure" "^7.0.0"
-    "@babel/helper-wrap-function" "^7.1.0"
-    "@babel/template" "^7.1.0"
-    "@babel/traverse" "^7.1.0"
-    "@babel/types" "^7.0.0"
-
-"@babel/helper-remap-async-to-generator@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.7.4.tgz#c68c2407350d9af0e061ed6726afb4fff16d0234"
-  integrity sha512-Sk4xmtVdM9sA/jCI80f+KS+Md+ZHIpjuqmYPk1M7F/upHou5e4ReYmExAiu6PVe65BhJPZA2CY9x9k4BqE5klw==
-  dependencies:
-    "@babel/helper-annotate-as-pure" "^7.7.4"
-    "@babel/helper-wrap-function" "^7.7.4"
-    "@babel/template" "^7.7.4"
-    "@babel/traverse" "^7.7.4"
-    "@babel/types" "^7.7.4"
-
-"@babel/helper-replace-supers@^7.5.5":
-  version "7.5.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.5.5.tgz#f84ce43df031222d2bad068d2626cb5799c34bc2"
-  integrity sha512-XvRFWrNnlsow2u7jXDuH4jDDctkxbS7gXssrP4q2nUD606ukXHRvydj346wmNg+zAgpFx4MWf4+usfC93bElJg==
-  dependencies:
-    "@babel/helper-member-expression-to-functions" "^7.5.5"
-    "@babel/helper-optimise-call-expression" "^7.0.0"
-    "@babel/traverse" "^7.5.5"
-    "@babel/types" "^7.5.5"
-
-"@babel/helper-replace-supers@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.7.4.tgz#3c881a6a6a7571275a72d82e6107126ec9e2cdd2"
-  integrity sha512-pP0tfgg9hsZWo5ZboYGuBn/bbYT/hdLPVSS4NMmiRJdwWhP0IznPwN9AE1JwyGsjSPLC364I0Qh5p+EPkGPNpg==
-  dependencies:
-    "@babel/helper-member-expression-to-functions" "^7.7.4"
-    "@babel/helper-optimise-call-expression" "^7.7.4"
-    "@babel/traverse" "^7.7.4"
-    "@babel/types" "^7.7.4"
-
-"@babel/helper-simple-access@^7.1.0":
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.1.0.tgz#65eeb954c8c245beaa4e859da6188f39d71e585c"
-  integrity sha512-Vk+78hNjRbsiu49zAPALxTb+JUQCz1aolpd8osOF16BGnLtseD21nbHgLPGUwrXEurZgiCOUmvs3ExTu4F5x6w==
-  dependencies:
-    "@babel/template" "^7.1.0"
-    "@babel/types" "^7.0.0"
-
-"@babel/helper-simple-access@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.7.4.tgz#a169a0adb1b5f418cfc19f22586b2ebf58a9a294"
-  integrity sha512-zK7THeEXfan7UlWsG2A6CI/L9jVnI5+xxKZOdej39Y0YtDYKx9raHk5F2EtK9K8DHRTihYwg20ADt9S36GR78A==
-  dependencies:
-    "@babel/template" "^7.7.4"
-    "@babel/types" "^7.7.4"
-
-"@babel/helper-split-export-declaration@^7.4.4":
-  version "7.4.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.4.4.tgz#ff94894a340be78f53f06af038b205c49d993677"
-  integrity sha512-Ro/XkzLf3JFITkW6b+hNxzZ1n5OQ80NvIUdmHspih1XAhtN3vPTuUFT4eQnela+2MaZ5ulH+iyP513KJrxbN7Q==
-  dependencies:
-    "@babel/types" "^7.4.4"
-
-"@babel/helper-split-export-declaration@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.7.4.tgz#57292af60443c4a3622cf74040ddc28e68336fd8"
-  integrity sha512-guAg1SXFcVr04Guk9eq0S4/rWS++sbmyqosJzVs8+1fH5NI+ZcmkaSkc7dmtAFbHFva6yRJnjW3yAcGxjueDug==
-  dependencies:
-    "@babel/types" "^7.7.4"
-
-"@babel/helper-wrap-function@^7.1.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.2.0.tgz#c4e0012445769e2815b55296ead43a958549f6fa"
-  integrity sha512-o9fP1BZLLSrYlxYEYyl2aS+Flun5gtjTIG8iln+XuEzQTs0PLagAGSXUcqruJwD5fM48jzIEggCKpIfWTcR7pQ==
-  dependencies:
-    "@babel/helper-function-name" "^7.1.0"
-    "@babel/template" "^7.1.0"
-    "@babel/traverse" "^7.1.0"
-    "@babel/types" "^7.2.0"
-
-"@babel/helper-wrap-function@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.7.4.tgz#37ab7fed5150e22d9d7266e830072c0cdd8baace"
-  integrity sha512-VsfzZt6wmsocOaVU0OokwrIytHND55yvyT4BPB9AIIgwr8+x7617hetdJTsuGwygN5RC6mxA9EJztTjuwm2ofg==
-  dependencies:
-    "@babel/helper-function-name" "^7.7.4"
-    "@babel/template" "^7.7.4"
-    "@babel/traverse" "^7.7.4"
-    "@babel/types" "^7.7.4"
-
-"@babel/helpers@^7.5.5":
-  version "7.5.5"
-  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.5.5.tgz#63908d2a73942229d1e6685bc2a0e730dde3b75e"
-  integrity sha512-nRq2BUhxZFnfEn/ciJuhklHvFOqjJUD5wpx+1bxUF2axL9C+v4DE/dmp5sT2dKnpOs4orZWzpAZqlCy8QqE/7g==
-  dependencies:
-    "@babel/template" "^7.4.4"
-    "@babel/traverse" "^7.5.5"
-    "@babel/types" "^7.5.5"
-
-"@babel/helpers@^7.6.0":
-  version "7.6.0"
-  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.6.0.tgz#21961d16c6a3c3ab597325c34c465c0887d31c6e"
-  integrity sha512-W9kao7OBleOjfXtFGgArGRX6eCP0UEcA2ZWEWNkJdRZnHhW4eEbeswbG3EwaRsnQUAEGWYgMq1HsIXuNNNy2eQ==
-  dependencies:
-    "@babel/template" "^7.6.0"
-    "@babel/traverse" "^7.6.0"
-    "@babel/types" "^7.6.0"
-
-"@babel/highlight@^7.0.0":
-  version "7.5.0"
-  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.5.0.tgz#56d11312bd9248fa619591d02472be6e8cb32540"
-  integrity sha512-7dV4eu9gBxoM0dAnj/BCFDW9LFU0zvTrkq0ugM7pnHEgguOEeOz1so2ZghEdzviYzQEED0r4EAgpsBChKy1TRQ==
-  dependencies:
+"@babel/helper-remap-async-to-generator@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.8.3.tgz#273c600d8b9bf5006142c1e35887d555c12edd86"
+  integrity sha512-kgwDmw4fCg7AVgS4DukQR/roGp+jP+XluJE5hsRZwxCYGg+Rv9wSGErDWhlI90FODdYfd4xG4AQRiMDjjN0GzA==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.8.3"
+    "@babel/helper-wrap-function" "^7.8.3"
+    "@babel/template" "^7.8.3"
+    "@babel/traverse" "^7.8.3"
+    "@babel/types" "^7.8.3"
+
+"@babel/helper-replace-supers@^7.8.3", "@babel/helper-replace-supers@^7.8.6":
+  version "7.8.6"
+  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.8.6.tgz#5ada744fd5ad73203bf1d67459a27dcba67effc8"
+  integrity sha512-PeMArdA4Sv/Wf4zXwBKPqVj7n9UF/xg6slNRtZW84FM7JpE1CbG8B612FyM4cxrf4fMAMGO0kR7voy1ForHHFA==
+  dependencies:
+    "@babel/helper-member-expression-to-functions" "^7.8.3"
+    "@babel/helper-optimise-call-expression" "^7.8.3"
+    "@babel/traverse" "^7.8.6"
+    "@babel/types" "^7.8.6"
+
+"@babel/helper-simple-access@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.8.3.tgz#7f8109928b4dab4654076986af575231deb639ae"
+  integrity sha512-VNGUDjx5cCWg4vvCTR8qQ7YJYZ+HBjxOgXEl7ounz+4Sn7+LMD3CFrCTEU6/qXKbA2nKg21CwhhBzO0RpRbdCw==
+  dependencies:
+    "@babel/template" "^7.8.3"
+    "@babel/types" "^7.8.3"
+
+"@babel/helper-split-export-declaration@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.8.3.tgz#31a9f30070f91368a7182cf05f831781065fc7a9"
+  integrity sha512-3x3yOeyBhW851hroze7ElzdkeRXQYQbFIb7gLK1WQYsw2GWDay5gAJNw1sWJ0VFP6z5J1whqeXH/WCdCjZv6dA==
+  dependencies:
+    "@babel/types" "^7.8.3"
+
+"@babel/helper-validator-identifier@^7.9.0":
+  version "7.9.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.9.0.tgz#ad53562a7fc29b3b9a91bbf7d10397fd146346ed"
+  integrity sha512-6G8bQKjOh+of4PV/ThDm/rRqlU7+IGoJuofpagU5GlEl29Vv0RGqqt86ZGRV8ZuSOY3o+8yXl5y782SMcG7SHw==
+
+"@babel/helper-wrap-function@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.8.3.tgz#9dbdb2bb55ef14aaa01fe8c99b629bd5352d8610"
+  integrity sha512-LACJrbUET9cQDzb6kG7EeD7+7doC3JNvUgTEQOx2qaO1fKlzE/Bf05qs9w1oXQMmXlPO65lC3Tq9S6gZpTErEQ==
+  dependencies:
+    "@babel/helper-function-name" "^7.8.3"
+    "@babel/template" "^7.8.3"
+    "@babel/traverse" "^7.8.3"
+    "@babel/types" "^7.8.3"
+
+"@babel/helpers@^7.5.5", "@babel/helpers@^7.9.0":
+  version "7.9.2"
+  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.9.2.tgz#b42a81a811f1e7313b88cba8adc66b3d9ae6c09f"
+  integrity sha512-JwLvzlXVPjO8eU9c/wF9/zOIN7X6h8DYf7mG4CiFRZRvZNKEF5dQ3H3V+ASkHoIB3mWhatgl5ONhyqHRI6MppA==
+  dependencies:
+    "@babel/template" "^7.8.3"
+    "@babel/traverse" "^7.9.0"
+    "@babel/types" "^7.9.0"
+
+"@babel/highlight@^7.0.0", "@babel/highlight@^7.8.3":
+  version "7.9.0"
+  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.9.0.tgz#4e9b45ccb82b79607271b2979ad82c7b68163079"
+  integrity sha512-lJZPilxX7Op3Nv/2cvFdnlepPXDxi29wxteT57Q965oc5R9v86ztx0jfxVrTcBk8C2kcPkkDa2Z4T3ZsPPVWsQ==
+  dependencies:
+    "@babel/helper-validator-identifier" "^7.9.0"
     chalk "^2.0.0"
-    esutils "^2.0.2"
     js-tokens "^4.0.0"
 
-"@babel/parser@^7.0.0", "@babel/parser@^7.1.0", "@babel/parser@^7.4.3", "@babel/parser@^7.4.4", "@babel/parser@^7.5.5":
-  version "7.5.5"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.5.5.tgz#02f077ac8817d3df4a832ef59de67565e71cca4b"
-  integrity sha512-E5BN68cqR7dhKan1SfqgPGhQ178bkVKpXTPEXnFJBrEt8/DKRZlybmy+IgYLTeN7tp1R5Ccmbm2rBk17sHYU3g==
-
-"@babel/parser@^7.2.0", "@babel/parser@^7.6.2":
-  version "7.6.2"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.6.2.tgz#205e9c95e16ba3b8b96090677a67c9d6075b70a1"
-  integrity sha512-mdFqWrSPCmikBoaBYMuBulzTIKuXVPtEISFbRRVNwMWpCms/hmE2kRq0bblUHaNRKrjRlmVbx1sDHmjmRgD2Xg==
-
-"@babel/parser@^7.6.0":
-  version "7.6.0"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.6.0.tgz#3e05d0647432a8326cb28d0de03895ae5a57f39b"
-  integrity sha512-+o2q111WEx4srBs7L9eJmcwi655eD8sXniLqMB93TBK9GrNzGrxDWSjiqz2hLU0Ha8MTXFIP0yd9fNdP+m43ZQ==
-
-"@babel/parser@^7.6.3":
-  version "7.6.4"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.6.4.tgz#cb9b36a7482110282d5cb6dd424ec9262b473d81"
-  integrity sha512-D8RHPW5qd0Vbyo3qb+YjO5nvUVRTXFLQ/FsDxJU2Nqz4uB5EnUN0ZQSEYpvTIbRuttig1XbHWU5oMeQwQSAA+A==
-
-"@babel/parser@^7.7.4":
-  version "7.7.5"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.7.5.tgz#cbf45321619ac12d83363fcf9c94bb67fa646d71"
-  integrity sha512-KNlOe9+/nk4i29g0VXgl8PEXIRms5xKLJeuZ6UptN0fHv+jDiriG+y94X6qAgWTR0h3KaoM1wK5G5h7MHFRSig==
-
-"@babel/plugin-proposal-async-generator-functions@^7.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.2.0.tgz#b289b306669dce4ad20b0252889a15768c9d417e"
-  integrity sha512-+Dfo/SCQqrwx48ptLVGLdE39YtWRuKc/Y9I5Fy0P1DDBB9lsAHpjcEJQt+4IifuSOSTLBKJObJqMvaO1pIE8LQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/helper-remap-async-to-generator" "^7.1.0"
-    "@babel/plugin-syntax-async-generators" "^7.2.0"
+"@babel/parser@^7.0.0", "@babel/parser@^7.1.0", "@babel/parser@^7.2.0", "@babel/parser@^7.4.3", "@babel/parser@^7.5.5", "@babel/parser@^7.8.6", "@babel/parser@^7.9.0", "@babel/parser@^7.9.3":
+  version "7.9.4"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.9.4.tgz#68a35e6b0319bbc014465be43828300113f2f2e8"
+  integrity sha512-bC49otXX6N0/VYhgOMh4gnP26E9xnDZK3TmbNpxYzzz9BQLBosQwfyOe9/cXUU3txYhTzLCbcqd5c8y/OmCjHA==
 
-"@babel/plugin-proposal-async-generator-functions@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.7.4.tgz#0351c5ac0a9e927845fffd5b82af476947b7ce6d"
-  integrity sha512-1ypyZvGRXriY/QP668+s8sFr2mqinhkRDMPSQLNghCQE+GAkFtp+wkHVvg2+Hdki8gwP+NFzJBJ/N1BfzCCDEw==
+"@babel/plugin-proposal-async-generator-functions@^7.2.0", "@babel/plugin-proposal-async-generator-functions@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.8.3.tgz#bad329c670b382589721b27540c7d288601c6e6f"
+  integrity sha512-NZ9zLv848JsV3hs8ryEh7Uaz/0KsmPLqv0+PdkDJL1cJy0K4kOCFa8zc1E3mp+RHPQcpdfb/6GovEsW4VDrOMw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/helper-remap-async-to-generator" "^7.7.4"
-    "@babel/plugin-syntax-async-generators" "^7.7.4"
+    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-remap-async-to-generator" "^7.8.3"
+    "@babel/plugin-syntax-async-generators" "^7.8.0"
 
-"@babel/plugin-proposal-class-properties@7.5.5", "@babel/plugin-proposal-class-properties@^7.3.3", "@babel/plugin-proposal-class-properties@^7.5.1", "@babel/plugin-proposal-class-properties@^7.5.5":
+"@babel/plugin-proposal-class-properties@7.5.5":
   version "7.5.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.5.5.tgz#a974cfae1e37c3110e71f3c6a2e48b8e71958cd4"
   integrity sha512-AF79FsnWFxjlaosgdi421vmYG6/jg79bVD0dpD44QdgobzHKuLZ6S3vl8la9qIeSwGi8i1fS0O1mfuDAAdo1/A==
@@ -531,13 +334,13 @@
     "@babel/helper-create-class-features-plugin" "^7.5.5"
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-proposal-class-properties@^7.7.0":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.7.4.tgz#2f964f0cb18b948450362742e33e15211e77c2ba"
-  integrity sha512-EcuXeV4Hv1X3+Q1TsuOmyyxeTRiSqurGJ26+I/FW1WbymmRRapVORm6x1Zl3iDIHyRxEs+VXWp6qnlcfcJSbbw==
+"@babel/plugin-proposal-class-properties@^7.3.3", "@babel/plugin-proposal-class-properties@^7.7.0", "@babel/plugin-proposal-class-properties@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.8.3.tgz#5e06654af5cd04b608915aada9b2a6788004464e"
+  integrity sha512-EqFhbo7IosdgPgZggHaNObkmO1kNUe3slaKu54d5OWvy+p9QIKOzK1GAEpAIsZtWVtPXUHSMcT4smvDrCfY4AA==
   dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.7.4"
-    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/helper-create-class-features-plugin" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.8.3"
 
 "@babel/plugin-proposal-decorators@7.4.4":
   version "7.4.4"
@@ -548,47 +351,39 @@
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/plugin-syntax-decorators" "^7.2.0"
 
-"@babel/plugin-proposal-dynamic-import@^7.5.0":
-  version "7.5.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.5.0.tgz#e532202db4838723691b10a67b8ce509e397c506"
-  integrity sha512-x/iMjggsKTFHYC6g11PL7Qy58IK8H5zqfm9e6hu4z1iH2IRyAp9u9dL80zA6R76yFovETFLKz2VJIC2iIPBuFw==
+"@babel/plugin-proposal-dynamic-import@^7.5.0", "@babel/plugin-proposal-dynamic-import@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.8.3.tgz#38c4fe555744826e97e2ae930b0fb4cc07e66054"
+  integrity sha512-NyaBbyLFXFLT9FP+zk0kYlUlA8XtCUbehs67F0nnEg7KICgMc2mNkIeu9TYhKzyXMkrapZFwAhXLdnt4IYHy1w==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/plugin-syntax-dynamic-import" "^7.2.0"
+    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/plugin-syntax-dynamic-import" "^7.8.0"
 
-"@babel/plugin-proposal-dynamic-import@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.7.4.tgz#dde64a7f127691758cbfed6cf70de0fa5879d52d"
-  integrity sha512-StH+nGAdO6qDB1l8sZ5UBV8AC3F2VW2I8Vfld73TMKyptMU9DY5YsJAS8U81+vEtxcH3Y/La0wG0btDrhpnhjQ==
+"@babel/plugin-proposal-json-strings@^7.2.0", "@babel/plugin-proposal-json-strings@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.8.3.tgz#da5216b238a98b58a1e05d6852104b10f9a70d6b"
+  integrity sha512-KGhQNZ3TVCQG/MjRbAUwuH+14y9q0tpxs1nWWs3pbSleRdDro9SAMMDyye8HhY1gqZ7/NqIc8SKhya0wRDgP1Q==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/plugin-syntax-dynamic-import" "^7.7.4"
+    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/plugin-syntax-json-strings" "^7.8.0"
 
-"@babel/plugin-proposal-json-strings@^7.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.2.0.tgz#568ecc446c6148ae6b267f02551130891e29f317"
-  integrity sha512-MAFV1CA/YVmYwZG0fBQyXhmj0BHCB5egZHCKWIFVv/XCxAeVGIHfos3SwDck4LvCllENIAg7xMKOG5kH0dzyUg==
+"@babel/plugin-proposal-nullish-coalescing-operator@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.8.3.tgz#e4572253fdeed65cddeecfdab3f928afeb2fd5d2"
+  integrity sha512-TS9MlfzXpXKt6YYomudb/KU7nQI6/xnapG6in1uZxoxDghuSMZsPb6D2fyUwNYSAp4l1iR7QtFOjkqcRYcUsfw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/plugin-syntax-json-strings" "^7.2.0"
-
-"@babel/plugin-proposal-json-strings@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.7.4.tgz#7700a6bfda771d8dc81973249eac416c6b4c697d"
-  integrity sha512-wQvt3akcBTfLU/wYoqm/ws7YOAQKu8EVJEvHip/mzkNtjaclQoCCIqKXFP5/eyfnfbQCDV3OLRIK3mIVyXuZlw==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/plugin-syntax-json-strings" "^7.7.4"
+    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.0"
 
-"@babel/plugin-proposal-nullish-coalescing-operator@^7.4.4":
-  version "7.4.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.4.4.tgz#41c360d59481d88e0ce3a3f837df10121a769b39"
-  integrity sha512-Amph7Epui1Dh/xxUxS2+K22/MUi6+6JVTvy3P58tja3B6yKTSjwwx0/d83rF7551D6PVSSoplQb8GCwqec7HRw==
+"@babel/plugin-proposal-numeric-separator@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.8.3.tgz#5d6769409699ec9b3b68684cd8116cedff93bad8"
+  integrity sha512-jWioO1s6R/R+wEHizfaScNsAx+xKgwTLNXSh7tTC4Usj3ItsPEhYkEpU4h+lpnBwq7NBVOJXfO6cRFYcX69JUQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/plugin-syntax-nullish-coalescing-operator" "^7.2.0"
+    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/plugin-syntax-numeric-separator" "^7.8.3"
 
-"@babel/plugin-proposal-object-rest-spread@7.5.5", "@babel/plugin-proposal-object-rest-spread@^7.3.2", "@babel/plugin-proposal-object-rest-spread@^7.5.5":
+"@babel/plugin-proposal-object-rest-spread@7.5.5":
   version "7.5.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.5.5.tgz#61939744f71ba76a3ae46b5eea18a54c16d22e58"
   integrity sha512-F2DxJJSQ7f64FyTVl5cw/9MWn6naXGdk3Q3UhDbFEEHv+EilCPoeRD3Zh/Utx1CJz4uyKlQ4uH+bJPbEhMV7Zw==
@@ -596,827 +391,489 @@
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/plugin-syntax-object-rest-spread" "^7.2.0"
 
-"@babel/plugin-proposal-object-rest-spread@^7.6.2", "@babel/plugin-proposal-object-rest-spread@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.7.4.tgz#cc57849894a5c774214178c8ab64f6334ec8af71"
-  integrity sha512-rnpnZR3/iWKmiQyJ3LKJpSwLDcX/nSXhdLk4Aq/tXOApIvyu7qoabrige0ylsAJffaUC51WiBu209Q0U+86OWQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/plugin-syntax-object-rest-spread" "^7.7.4"
-
-"@babel/plugin-proposal-optional-catch-binding@^7.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.2.0.tgz#135d81edb68a081e55e56ec48541ece8065c38f5"
-  integrity sha512-mgYj3jCcxug6KUcX4OBoOJz3CMrwRfQELPQ5560F70YQUBZB7uac9fqaWamKR1iWUzGiK2t0ygzjTScZnVz75g==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/plugin-syntax-optional-catch-binding" "^7.2.0"
-
-"@babel/plugin-proposal-optional-catch-binding@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.7.4.tgz#ec21e8aeb09ec6711bc0a39ca49520abee1de379"
-  integrity sha512-DyM7U2bnsQerCQ+sejcTNZh8KQEUuC3ufzdnVnSiUv/qoGJp2Z3hanKL18KDhsBT5Wj6a7CMT5mdyCNJsEaA9w==
+"@babel/plugin-proposal-object-rest-spread@^7.3.2", "@babel/plugin-proposal-object-rest-spread@^7.5.5", "@babel/plugin-proposal-object-rest-spread@^7.6.2", "@babel/plugin-proposal-object-rest-spread@^7.9.0":
+  version "7.9.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.9.0.tgz#a28993699fc13df165995362693962ba6b061d6f"
+  integrity sha512-UgqBv6bjq4fDb8uku9f+wcm1J7YxJ5nT7WO/jBr0cl0PLKb7t1O6RNR1kZbjgx2LQtsDI9hwoQVmn0yhXeQyow==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/plugin-syntax-optional-catch-binding" "^7.7.4"
+    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/plugin-syntax-object-rest-spread" "^7.8.0"
 
-"@babel/plugin-proposal-optional-chaining@^7.6.0":
-  version "7.6.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.6.0.tgz#e9bf1f9b9ba10c77c033082da75f068389041af8"
-  integrity sha512-kj4gkZ6qUggkprRq3Uh5KP8XnE1MdIO0J7MhdDX8+rAbB6dJ2UrensGIS+0NPZAaaJ1Vr0PN6oLUgXMU1uMcSg==
+"@babel/plugin-proposal-optional-catch-binding@^7.2.0", "@babel/plugin-proposal-optional-catch-binding@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.8.3.tgz#9dee96ab1650eed88646ae9734ca167ac4a9c5c9"
+  integrity sha512-0gkX7J7E+AtAw9fcwlVQj8peP61qhdg/89D5swOkjYbkboA2CVckn3kiyum1DE0wskGb7KJJxBdyEBApDLLVdw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/plugin-syntax-optional-chaining" "^7.2.0"
+    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/plugin-syntax-optional-catch-binding" "^7.8.0"
 
-"@babel/plugin-proposal-unicode-property-regex@^7.4.4":
-  version "7.4.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.4.4.tgz#501ffd9826c0b91da22690720722ac7cb1ca9c78"
-  integrity sha512-j1NwnOqMG9mFUOH58JTFsA/+ZYzQLUZ/drqWUqxCYLGeu2JFZL8YrNC9hBxKmWtAuOCHPcRpgv7fhap09Fb4kA==
+"@babel/plugin-proposal-optional-chaining@^7.9.0":
+  version "7.9.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.9.0.tgz#31db16b154c39d6b8a645292472b98394c292a58"
+  integrity sha512-NDn5tu3tcv4W30jNhmc2hyD5c56G6cXx4TesJubhxrJeCvuuMpttxr0OnNCqbZGhFjLrg+NIhxxC+BK5F6yS3w==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/helper-regex" "^7.4.4"
-    regexpu-core "^4.5.4"
+    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/plugin-syntax-optional-chaining" "^7.8.0"
 
-"@babel/plugin-proposal-unicode-property-regex@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.7.4.tgz#7c239ccaf09470dbe1d453d50057460e84517ebb"
-  integrity sha512-cHgqHgYvffluZk85dJ02vloErm3Y6xtH+2noOBOJ2kXOJH3aVCDnj5eR/lVNlTnYu4hndAPJD3rTFjW3qee0PA==
+"@babel/plugin-proposal-unicode-property-regex@^7.4.4", "@babel/plugin-proposal-unicode-property-regex@^7.8.3":
+  version "7.8.8"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.8.8.tgz#ee3a95e90cdc04fe8cd92ec3279fa017d68a0d1d"
+  integrity sha512-EVhjVsMpbhLw9ZfHWSx2iy13Q8Z/eg8e8ccVWt23sWQK5l1UdkoLJPN5w69UA4uITGBnEZD2JOe4QOHycYKv8A==
   dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.7.4"
-    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/helper-create-regexp-features-plugin" "^7.8.8"
+    "@babel/helper-plugin-utils" "^7.8.3"
 
-"@babel/plugin-syntax-async-generators@^7.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.2.0.tgz#69e1f0db34c6f5a0cf7e2b3323bf159a76c8cb7f"
-  integrity sha512-1ZrIRBv2t0GSlcwVoQ6VgSLpLgiN/FVQUzt9znxo7v2Ov4jJrs8RY8tv0wvDmFN3qIdMKWrmMMW6yZ0G19MfGg==
+"@babel/plugin-syntax-async-generators@^7.2.0", "@babel/plugin-syntax-async-generators@^7.8.0":
+  version "7.8.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz#a983fb1aeb2ec3f6ed042a210f640e90e786fe0d"
+  integrity sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-
-"@babel/plugin-syntax-async-generators@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.7.4.tgz#331aaf310a10c80c44a66b238b6e49132bd3c889"
-  integrity sha512-Li4+EjSpBgxcsmeEF8IFcfV/+yJGxHXDirDkEoyFjumuwbmfCVHUt0HuowD/iGM7OhIRyXJH9YXxqiH6N815+g==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/helper-plugin-utils" "^7.8.0"
 
 "@babel/plugin-syntax-decorators@^7.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.2.0.tgz#c50b1b957dcc69e4b1127b65e1c33eef61570c1b"
-  integrity sha512-38QdqVoXdHUQfTpZo3rQwqQdWtCn5tMv4uV6r2RMfTqNBuv4ZBhz79SfaQWKTVmxHjeFv/DnXVC/+agHCklYWA==
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.8.3.tgz#8d2c15a9f1af624b0025f961682a9d53d3001bda"
+  integrity sha512-8Hg4dNNT9/LcA1zQlfwuKR8BUc/if7Q7NkTam9sGTcJphLwpf2g4S42uhspQrIrR+dpzE0dtTqBVFoHl8GtnnQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/helper-plugin-utils" "^7.8.3"
 
-"@babel/plugin-syntax-dynamic-import@7.2.0", "@babel/plugin-syntax-dynamic-import@^7.2.0":
+"@babel/plugin-syntax-dynamic-import@7.2.0":
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.2.0.tgz#69c159ffaf4998122161ad8ebc5e6d1f55df8612"
   integrity sha512-mVxuJ0YroI/h/tbFTPGZR8cv6ai+STMKNBq0f8hFxsxWjl94qqhsb+wXbpNMDPU3cfR1TIsVFzU3nXyZMqyK4w==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-syntax-dynamic-import@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.7.4.tgz#29ca3b4415abfe4a5ec381e903862ad1a54c3aec"
-  integrity sha512-jHQW0vbRGvwQNgyVxwDh4yuXu4bH1f5/EICJLAhl1SblLs2CDhrsmCk+v5XLdE9wxtAFRyxx+P//Iw+a5L/tTg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-
-"@babel/plugin-syntax-flow@^7.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.2.0.tgz#a765f061f803bc48f240c26f8747faf97c26bf7c"
-  integrity sha512-r6YMuZDWLtLlu0kqIim5o/3TNRAlWb073HwT3e2nKf9I8IIvOggPrnILYPsrrKilmn/mYEMCf/Z07w3yQJF6dg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-
-"@babel/plugin-syntax-json-strings@^7.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.2.0.tgz#72bd13f6ffe1d25938129d2a186b11fd62951470"
-  integrity sha512-5UGYnMSLRE1dqqZwug+1LISpA403HzlSfsg6P9VXU6TBjcSHeNlw4DxDx7LgpF+iKZoOG/+uzqoRHTdcUpiZNg==
+"@babel/plugin-syntax-dynamic-import@^7.2.0", "@babel/plugin-syntax-dynamic-import@^7.8.0", "@babel/plugin-syntax-dynamic-import@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz#62bf98b2da3cd21d626154fc96ee5b3cb68eacb3"
+  integrity sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-
-"@babel/plugin-syntax-json-strings@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.7.4.tgz#86e63f7d2e22f9e27129ac4e83ea989a382e86cc"
-  integrity sha512-QpGupahTQW1mHRXddMG5srgpHWqRLwJnJZKXTigB9RPFCCGbDGCgBeM/iC82ICXp414WeYx/tD54w7M2qRqTMg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-
-"@babel/plugin-syntax-jsx@^7.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.2.0.tgz#0b85a3b4bc7cdf4cc4b8bf236335b907ca22e7c7"
-  integrity sha512-VyN4QANJkRW6lDBmENzRszvZf3/4AXaj9YR7GwrWeeN9tEBPuXbmDYVU9bYBN0D70zCWVwUy0HWq2553VCb6Hw==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-
-"@babel/plugin-syntax-jsx@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.7.4.tgz#dab2b56a36fb6c3c222a1fbc71f7bf97f327a9ec"
-  integrity sha512-wuy6fiMe9y7HeZBWXYCGt2RGxZOj0BImZ9EyXJVnVGBKO/Br592rbR3rtIQn0eQhAk9vqaKP5n8tVqEFBQMfLg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/helper-plugin-utils" "^7.8.0"
 
-"@babel/plugin-syntax-nullish-coalescing-operator@^7.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.2.0.tgz#f75083dfd5ade73e783db729bbd87e7b9efb7624"
-  integrity sha512-lRCEaKE+LTxDQtgbYajI04ddt6WW0WJq57xqkAZ+s11h4YgfRHhVA/Y2VhfPzzFD4qeLHWg32DMp9HooY4Kqlg==
+"@babel/plugin-syntax-flow@^7.2.0", "@babel/plugin-syntax-flow@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.8.3.tgz#f2c883bd61a6316f2c89380ae5122f923ba4527f"
+  integrity sha512-innAx3bUbA0KSYj2E2MNFSn9hiCeowOFLxlsuhXzw8hMQnzkDomUr9QCD7E9VF60NmnG1sNTuuv6Qf4f8INYsg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/helper-plugin-utils" "^7.8.3"
 
-"@babel/plugin-syntax-object-rest-spread@^7.0.0", "@babel/plugin-syntax-object-rest-spread@^7.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.2.0.tgz#3b7a3e733510c57e820b9142a6579ac8b0dfad2e"
-  integrity sha512-t0JKGgqk2We+9may3t0xDdmneaXmyxq0xieYcKHxIsrJO64n1OiMWNUtc5gQK1PA0NpdCRrtZp4z+IUaKugrSA==
+"@babel/plugin-syntax-json-strings@^7.2.0", "@babel/plugin-syntax-json-strings@^7.8.0":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz#01ca21b668cd8218c9e640cb6dd88c5412b2c96a"
+  integrity sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/helper-plugin-utils" "^7.8.0"
 
-"@babel/plugin-syntax-object-rest-spread@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.7.4.tgz#47cf220d19d6d0d7b154304701f468fc1cc6ff46"
-  integrity sha512-mObR+r+KZq0XhRVS2BrBKBpr5jqrqzlPvS9C9vuOf5ilSwzloAl7RPWLrgKdWS6IreaVrjHxTjtyqFiOisaCwg==
+"@babel/plugin-syntax-jsx@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.8.3.tgz#521b06c83c40480f1e58b4fd33b92eceb1d6ea94"
+  integrity sha512-WxdW9xyLgBdefoo0Ynn3MRSkhe5tFVxxKNVdnZSh318WrG2e2jH+E9wd/++JsqcLJZPfz87njQJ8j2Upjm0M0A==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/helper-plugin-utils" "^7.8.3"
 
-"@babel/plugin-syntax-optional-catch-binding@^7.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.2.0.tgz#a94013d6eda8908dfe6a477e7f9eda85656ecf5c"
-  integrity sha512-bDe4xKNhb0LI7IvZHiA13kff0KEfaGX/Hv4lMA9+7TEc63hMNvfKo6ZFpXhKuEp+II/q35Gc4NoMeDZyaUbj9w==
+"@babel/plugin-syntax-nullish-coalescing-operator@^7.8.0":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz#167ed70368886081f74b5c36c65a88c03b66d1a9"
+  integrity sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/helper-plugin-utils" "^7.8.0"
 
-"@babel/plugin-syntax-optional-catch-binding@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.7.4.tgz#a3e38f59f4b6233867b4a92dcb0ee05b2c334aa6"
-  integrity sha512-4ZSuzWgFxqHRE31Glu+fEr/MirNZOMYmD/0BhBWyLyOOQz/gTAl7QmWm2hX1QxEIXsr2vkdlwxIzTyiYRC4xcQ==
+"@babel/plugin-syntax-numeric-separator@^7.8.0", "@babel/plugin-syntax-numeric-separator@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.8.3.tgz#0e3fb63e09bea1b11e96467271c8308007e7c41f"
+  integrity sha512-H7dCMAdN83PcCmqmkHB5dtp+Xa9a6LKSvA2hiFBC/5alSHxM5VgWZXFqDi0YFe8XNGT6iCa+z4V4zSt/PdZ7Dw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/helper-plugin-utils" "^7.8.3"
 
-"@babel/plugin-syntax-optional-chaining@^7.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.2.0.tgz#a59d6ae8c167e7608eaa443fda9fa8fa6bf21dff"
-  integrity sha512-HtGCtvp5Uq/jH/WNUPkK6b7rufnCPLLlDAFN7cmACoIjaOOiXxUt3SswU5loHqrhtqTsa/WoLQ1OQ1AGuZqaWA==
+"@babel/plugin-syntax-object-rest-spread@^7.0.0", "@babel/plugin-syntax-object-rest-spread@^7.2.0", "@babel/plugin-syntax-object-rest-spread@^7.8.0":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz#60e225edcbd98a640332a2e72dd3e66f1af55871"
+  integrity sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/helper-plugin-utils" "^7.8.0"
 
-"@babel/plugin-syntax-top-level-await@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.7.4.tgz#bd7d8fa7b9fee793a36e4027fd6dd1aa32f946da"
-  integrity sha512-wdsOw0MvkL1UIgiQ/IFr3ETcfv1xb8RMM0H9wbiDyLaJFyiDg5oZvDLCXosIXmFeIlweML5iOBXAkqddkYNizg==
+"@babel/plugin-syntax-optional-catch-binding@^7.2.0", "@babel/plugin-syntax-optional-catch-binding@^7.8.0":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz#6111a265bcfb020eb9efd0fdfd7d26402b9ed6c1"
+  integrity sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/helper-plugin-utils" "^7.8.0"
 
-"@babel/plugin-syntax-typescript@^7.2.0":
-  version "7.3.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.3.3.tgz#a7cc3f66119a9f7ebe2de5383cce193473d65991"
-  integrity sha512-dGwbSMA1YhVS8+31CnPR7LB4pcbrzcV99wQzby4uAfrkZPYZlQ7ImwdpzLqi6Z6IL02b8IAL379CaMwo0x5Lag==
+"@babel/plugin-syntax-optional-chaining@^7.8.0":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz#4f69c2ab95167e0180cd5336613f8c5788f7d48a"
+  integrity sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/helper-plugin-utils" "^7.8.0"
 
-"@babel/plugin-syntax-typescript@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.7.4.tgz#5d037ffa10f3b25a16f32570ebbe7a8c2efa304b"
-  integrity sha512-77blgY18Hud4NM1ggTA8xVT/dBENQf17OpiToSa2jSmEY3fWXD2jwrdVlO4kq5yzUTeF15WSQ6b4fByNvJcjpQ==
+"@babel/plugin-syntax-top-level-await@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.8.3.tgz#3acdece695e6b13aaf57fc291d1a800950c71391"
+  integrity sha512-kwj1j9lL/6Wd0hROD3b/OZZ7MSrZLqqn9RAZ5+cYYsflQ9HZBIKCUkr3+uL1MEJ1NePiUbf98jjiMQSv0NMR9g==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/helper-plugin-utils" "^7.8.3"
 
-"@babel/plugin-transform-arrow-functions@^7.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.2.0.tgz#9aeafbe4d6ffc6563bf8f8372091628f00779550"
-  integrity sha512-ER77Cax1+8/8jCB9fo4Ud161OZzWN5qawi4GusDuRLcDbDG+bIGYY20zb2dfAFdTRGzrfq2xZPvF0R64EHnimg==
+"@babel/plugin-syntax-typescript@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.8.3.tgz#c1f659dda97711a569cef75275f7e15dcaa6cabc"
+  integrity sha512-GO1MQ/SGGGoiEXY0e0bSpHimJvxqB7lktLLIq2pv8xG7WZ8IMEle74jIe1FhprHBWjwjZtXHkycDLZXIWM5Wfg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/helper-plugin-utils" "^7.8.3"
 
-"@babel/plugin-transform-arrow-functions@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.7.4.tgz#76309bd578addd8aee3b379d809c802305a98a12"
-  integrity sha512-zUXy3e8jBNPiffmqkHRNDdZM2r8DWhCB7HhcoyZjiK1TxYEluLHAvQuYnTT+ARqRpabWqy/NHkO6e3MsYB5YfA==
+"@babel/plugin-transform-arrow-functions@^7.2.0", "@babel/plugin-transform-arrow-functions@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.8.3.tgz#82776c2ed0cd9e1a49956daeb896024c9473b8b6"
+  integrity sha512-0MRF+KC8EqH4dbuITCWwPSzsyO3HIWWlm30v8BbbpOrS1B++isGxPnnuq/IZvOX5J2D/p7DQalQm+/2PnlKGxg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/helper-plugin-utils" "^7.8.3"
 
-"@babel/plugin-transform-async-to-generator@^7.5.0":
-  version "7.5.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.5.0.tgz#89a3848a0166623b5bc481164b5936ab947e887e"
-  integrity sha512-mqvkzwIGkq0bEF1zLRRiTdjfomZJDV33AH3oQzHVGkI2VzEmXLpKKOBvEVaFZBJdN0XTyH38s9j/Kiqr68dggg==
+"@babel/plugin-transform-async-to-generator@^7.5.0", "@babel/plugin-transform-async-to-generator@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.8.3.tgz#4308fad0d9409d71eafb9b1a6ee35f9d64b64086"
+  integrity sha512-imt9tFLD9ogt56Dd5CI/6XgpukMwd/fLGSrix2httihVe7LOGVPhyhMh1BU5kDM7iHD08i8uUtmV2sWaBFlHVQ==
   dependencies:
-    "@babel/helper-module-imports" "^7.0.0"
-    "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/helper-remap-async-to-generator" "^7.1.0"
+    "@babel/helper-module-imports" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-remap-async-to-generator" "^7.8.3"
 
-"@babel/plugin-transform-async-to-generator@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.7.4.tgz#694cbeae6d613a34ef0292713fa42fb45c4470ba"
-  integrity sha512-zpUTZphp5nHokuy8yLlyafxCJ0rSlFoSHypTUWgpdwoDXWQcseaect7cJ8Ppk6nunOM6+5rPMkod4OYKPR5MUg==
+"@babel/plugin-transform-block-scoped-functions@^7.2.0", "@babel/plugin-transform-block-scoped-functions@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.8.3.tgz#437eec5b799b5852072084b3ae5ef66e8349e8a3"
+  integrity sha512-vo4F2OewqjbB1+yaJ7k2EJFHlTP3jR634Z9Cj9itpqNjuLXvhlVxgnjsHsdRgASR8xYDrx6onw4vW5H6We0Jmg==
   dependencies:
-    "@babel/helper-module-imports" "^7.7.4"
-    "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/helper-remap-async-to-generator" "^7.7.4"
+    "@babel/helper-plugin-utils" "^7.8.3"
 
-"@babel/plugin-transform-block-scoped-functions@^7.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.2.0.tgz#5d3cc11e8d5ddd752aa64c9148d0db6cb79fd190"
-  integrity sha512-ntQPR6q1/NKuphly49+QiQiTN0O63uOwjdD6dhIjSWBI5xlrbUFh720TIpzBhpnrLfv2tNH/BXvLIab1+BAI0w==
+"@babel/plugin-transform-block-scoping@^7.5.5", "@babel/plugin-transform-block-scoping@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.8.3.tgz#97d35dab66857a437c166358b91d09050c868f3a"
+  integrity sha512-pGnYfm7RNRgYRi7bids5bHluENHqJhrV4bCZRwc5GamaWIIs07N4rZECcmJL6ZClwjDz1GbdMZFtPs27hTB06w==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-
-"@babel/plugin-transform-block-scoped-functions@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.7.4.tgz#d0d9d5c269c78eaea76227ace214b8d01e4d837b"
-  integrity sha512-kqtQzwtKcpPclHYjLK//3lH8OFsCDuDJBaFhVwf8kqdnF6MN4l618UDlcA7TfRs3FayrHj+svYnSX8MC9zmUyQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-
-"@babel/plugin-transform-block-scoping@^7.5.5":
-  version "7.5.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.5.5.tgz#a35f395e5402822f10d2119f6f8e045e3639a2ce"
-  integrity sha512-82A3CLRRdYubkG85lKwhZB0WZoHxLGsJdux/cOVaJCJpvYFl1LVzAIFyRsa7CvXqW8rBM4Zf3Bfn8PHt5DP0Sg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-    lodash "^4.17.13"
-
-"@babel/plugin-transform-block-scoping@^7.6.0":
-  version "7.6.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.6.0.tgz#c49e21228c4bbd4068a35667e6d951c75439b1dc"
-  integrity sha512-tIt4E23+kw6TgL/edACZwP1OUKrjOTyMrFMLoT5IOFrfMRabCgekjqFd5o6PaAMildBu46oFkekIdMuGkkPEpA==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/helper-plugin-utils" "^7.8.3"
     lodash "^4.17.13"
 
-"@babel/plugin-transform-block-scoping@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.7.4.tgz#200aad0dcd6bb80372f94d9e628ea062c58bf224"
-  integrity sha512-2VBe9u0G+fDt9B5OV5DQH4KBf5DoiNkwFKOz0TCvBWvdAN2rOykCTkrL+jTLxfCAm76l9Qo5OqL7HBOx2dWggg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-    lodash "^4.17.13"
-
-"@babel/plugin-transform-classes@^7.5.5":
-  version "7.5.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.5.5.tgz#d094299d9bd680a14a2a0edae38305ad60fb4de9"
-  integrity sha512-U2htCNK/6e9K7jGyJ++1p5XRU+LJjrwtoiVn9SzRlDT2KubcZ11OOwy3s24TjHxPgxNwonCYP7U2K51uVYCMDg==
-  dependencies:
-    "@babel/helper-annotate-as-pure" "^7.0.0"
-    "@babel/helper-define-map" "^7.5.5"
-    "@babel/helper-function-name" "^7.1.0"
-    "@babel/helper-optimise-call-expression" "^7.0.0"
-    "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/helper-replace-supers" "^7.5.5"
-    "@babel/helper-split-export-declaration" "^7.4.4"
+"@babel/plugin-transform-classes@^7.5.5", "@babel/plugin-transform-classes@^7.9.0":
+  version "7.9.2"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.9.2.tgz#8603fc3cc449e31fdbdbc257f67717536a11af8d"
+  integrity sha512-TC2p3bPzsfvSsqBZo0kJnuelnoK9O3welkUpqSqBQuBF6R5MN2rysopri8kNvtlGIb2jmUO7i15IooAZJjZuMQ==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.8.3"
+    "@babel/helper-define-map" "^7.8.3"
+    "@babel/helper-function-name" "^7.8.3"
+    "@babel/helper-optimise-call-expression" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-replace-supers" "^7.8.6"
+    "@babel/helper-split-export-declaration" "^7.8.3"
     globals "^11.1.0"
 
-"@babel/plugin-transform-classes@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.7.4.tgz#c92c14be0a1399e15df72667067a8f510c9400ec"
-  integrity sha512-sK1mjWat7K+buWRuImEzjNf68qrKcrddtpQo3swi9j7dUcG6y6R6+Di039QN2bD1dykeswlagupEmpOatFHHUg==
+"@babel/plugin-transform-computed-properties@^7.2.0", "@babel/plugin-transform-computed-properties@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.8.3.tgz#96d0d28b7f7ce4eb5b120bb2e0e943343c86f81b"
+  integrity sha512-O5hiIpSyOGdrQZRQ2ccwtTVkgUDBBiCuK//4RJ6UfePllUTCENOzKxfh6ulckXKc0DixTFLCfb2HVkNA7aDpzA==
   dependencies:
-    "@babel/helper-annotate-as-pure" "^7.7.4"
-    "@babel/helper-define-map" "^7.7.4"
-    "@babel/helper-function-name" "^7.7.4"
-    "@babel/helper-optimise-call-expression" "^7.7.4"
-    "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/helper-replace-supers" "^7.7.4"
-    "@babel/helper-split-export-declaration" "^7.7.4"
-    globals "^11.1.0"
+    "@babel/helper-plugin-utils" "^7.8.3"
 
-"@babel/plugin-transform-computed-properties@^7.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.2.0.tgz#83a7df6a658865b1c8f641d510c6f3af220216da"
-  integrity sha512-kP/drqTxY6Xt3NNpKiMomfgkNn4o7+vKxK2DDKcBG9sHj51vHqMBGy8wbDS/J4lMxnqs153/T3+DmCEAkC5cpA==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-
-"@babel/plugin-transform-computed-properties@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.7.4.tgz#e856c1628d3238ffe12d668eb42559f79a81910d"
-  integrity sha512-bSNsOsZnlpLLyQew35rl4Fma3yKWqK3ImWMSC/Nc+6nGjC9s5NFWAer1YQ899/6s9HxO2zQC1WoFNfkOqRkqRQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-
-"@babel/plugin-transform-destructuring@7.5.0", "@babel/plugin-transform-destructuring@^7.5.0":
+"@babel/plugin-transform-destructuring@7.5.0":
   version "7.5.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.5.0.tgz#f6c09fdfe3f94516ff074fe877db7bc9ef05855a"
   integrity sha512-YbYgbd3TryYYLGyC7ZR+Tq8H/+bCmwoaxHfJHupom5ECstzbRLTch6gOQbhEY9Z4hiCNHEURgq06ykFv9JZ/QQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-
-"@babel/plugin-transform-destructuring@^7.6.0":
-  version "7.6.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.6.0.tgz#44bbe08b57f4480094d57d9ffbcd96d309075ba6"
-  integrity sha512-2bGIS5P1v4+sWTCnKNDZDxbGvEqi0ijeqM/YqHtVGrvG2y0ySgnEEhXErvE9dA0bnIzY9bIzdFK0jFA46ASIIQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-
-"@babel/plugin-transform-destructuring@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.7.4.tgz#2b713729e5054a1135097b6a67da1b6fe8789267"
-  integrity sha512-4jFMXI1Cu2aXbcXXl8Lr6YubCn6Oc7k9lLsu8v61TZh+1jny2BWmdtvY9zSUlLdGUvcy9DMAWyZEOqjsbeg/wA==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-
-"@babel/plugin-transform-dotall-regex@^7.4.4":
-  version "7.4.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.4.4.tgz#361a148bc951444312c69446d76ed1ea8e4450c3"
-  integrity sha512-P05YEhRc2h53lZDjRPk/OektxCVevFzZs2Gfjd545Wde3k+yFDbXORgl2e0xpbq8mLcKJ7Idss4fAg0zORN/zg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/helper-regex" "^7.4.4"
-    regexpu-core "^4.5.4"
-
-"@babel/plugin-transform-dotall-regex@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.7.4.tgz#f7ccda61118c5b7a2599a72d5e3210884a021e96"
-  integrity sha512-mk0cH1zyMa/XHeb6LOTXTbG7uIJ8Rrjlzu91pUx/KS3JpcgaTDwMS8kM+ar8SLOvlL2Lofi4CGBAjCo3a2x+lw==
-  dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.7.4"
-    "@babel/helper-plugin-utils" "^7.0.0"
-
-"@babel/plugin-transform-duplicate-keys@^7.5.0":
-  version "7.5.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.5.0.tgz#c5dbf5106bf84cdf691222c0974c12b1df931853"
-  integrity sha512-igcziksHizyQPlX9gfSjHkE2wmoCH3evvD2qR5w29/Dk0SMKE/eOI7f1HhBdNhR/zxJDqrgpoDTq5YSLH/XMsQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-
-"@babel/plugin-transform-duplicate-keys@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.7.4.tgz#3d21731a42e3f598a73835299dd0169c3b90ac91"
-  integrity sha512-g1y4/G6xGWMD85Tlft5XedGaZBCIVN+/P0bs6eabmcPP9egFleMAo65OOjlhcz1njpwagyY3t0nsQC9oTFegJA==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-
-"@babel/plugin-transform-exponentiation-operator@^7.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.2.0.tgz#a63868289e5b4007f7054d46491af51435766008"
-  integrity sha512-umh4hR6N7mu4Elq9GG8TOu9M0bakvlsREEC+ialrQN6ABS4oDQ69qJv1VtR3uxlKMCQMCvzk7vr17RHKcjx68A==
-  dependencies:
-    "@babel/helper-builder-binary-assignment-operator-visitor" "^7.1.0"
-    "@babel/helper-plugin-utils" "^7.0.0"
-
-"@babel/plugin-transform-exponentiation-operator@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.7.4.tgz#dd30c0191e3a1ba19bcc7e389bdfddc0729d5db9"
-  integrity sha512-MCqiLfCKm6KEA1dglf6Uqq1ElDIZwFuzz1WH5mTf8k2uQSxEJMbOIEh7IZv7uichr7PMfi5YVSrr1vz+ipp7AQ==
-  dependencies:
-    "@babel/helper-builder-binary-assignment-operator-visitor" "^7.7.4"
-    "@babel/helper-plugin-utils" "^7.0.0"
-
-"@babel/plugin-transform-flow-strip-types@7.4.4", "@babel/plugin-transform-flow-strip-types@^7.0.0":
-  version "7.4.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.4.4.tgz#d267a081f49a8705fc9146de0768c6b58dccd8f7"
-  integrity sha512-WyVedfeEIILYEaWGAUWzVNyqG4sfsNooMhXWsu/YzOvVGcsnPb5PguysjJqI3t3qiaYj0BR8T2f5njdjTGe44Q==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/plugin-syntax-flow" "^7.2.0"
-
-"@babel/plugin-transform-for-of@^7.4.4":
-  version "7.4.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.4.4.tgz#0267fc735e24c808ba173866c6c4d1440fc3c556"
-  integrity sha512-9T/5Dlr14Z9TIEXLXkt8T1DU7F24cbhwhMNUziN3hB1AXoZcdzPcTiKGRn/6iOymDqtTKWnr/BtRKN9JwbKtdQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-
-"@babel/plugin-transform-for-of@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.7.4.tgz#248800e3a5e507b1f103d8b4ca998e77c63932bc"
-  integrity sha512-zZ1fD1B8keYtEcKF+M1TROfeHTKnijcVQm0yO/Yu1f7qoDoxEIc/+GX6Go430Bg84eM/xwPFp0+h4EbZg7epAA==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-
-"@babel/plugin-transform-function-name@^7.4.4":
-  version "7.4.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.4.4.tgz#e1436116abb0610c2259094848754ac5230922ad"
-  integrity sha512-iU9pv7U+2jC9ANQkKeNF6DrPy4GBa4NWQtl6dHB4Pb3izX2JOEvDTFarlNsBj/63ZEzNNIAMs3Qw4fNCcSOXJA==
-  dependencies:
-    "@babel/helper-function-name" "^7.1.0"
-    "@babel/helper-plugin-utils" "^7.0.0"
-
-"@babel/plugin-transform-function-name@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.7.4.tgz#75a6d3303d50db638ff8b5385d12451c865025b1"
-  integrity sha512-E/x09TvjHNhsULs2IusN+aJNRV5zKwxu1cpirZyRPw+FyyIKEHPXTsadj48bVpc1R5Qq1B5ZkzumuFLytnbT6g==
-  dependencies:
-    "@babel/helper-function-name" "^7.7.4"
-    "@babel/helper-plugin-utils" "^7.0.0"
-
-"@babel/plugin-transform-literals@^7.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.2.0.tgz#690353e81f9267dad4fd8cfd77eafa86aba53ea1"
-  integrity sha512-2ThDhm4lI4oV7fVQ6pNNK+sx+c/GM5/SaML0w/r4ZB7sAneD/piDJtwdKlNckXeyGK7wlwg2E2w33C/Hh+VFCg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-
-"@babel/plugin-transform-literals@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.7.4.tgz#27fe87d2b5017a2a5a34d1c41a6b9f6a6262643e"
-  integrity sha512-X2MSV7LfJFm4aZfxd0yLVFrEXAgPqYoDG53Br/tCKiKYfX0MjVjQeWPIhPHHsCqzwQANq+FLN786fF5rgLS+gw==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-
-"@babel/plugin-transform-member-expression-literals@^7.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.2.0.tgz#fa10aa5c58a2cb6afcf2c9ffa8cb4d8b3d489a2d"
-  integrity sha512-HiU3zKkSU6scTidmnFJ0bMX8hz5ixC93b4MHMiYebmk2lUVNGOboPsqQvx5LzooihijUoLR/v7Nc1rbBtnc7FA==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-
-"@babel/plugin-transform-member-expression-literals@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.7.4.tgz#aee127f2f3339fc34ce5e3055d7ffbf7aa26f19a"
-  integrity sha512-9VMwMO7i69LHTesL0RdGy93JU6a+qOPuvB4F4d0kR0zyVjJRVJRaoaGjhtki6SzQUu8yen/vxPKN6CWnCUw6bA==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-
-"@babel/plugin-transform-modules-amd@^7.5.0":
-  version "7.5.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.5.0.tgz#ef00435d46da0a5961aa728a1d2ecff063e4fb91"
-  integrity sha512-n20UsQMKnWrltocZZm24cRURxQnWIvsABPJlw/fvoy9c6AgHZzoelAIzajDHAQrDpuKFFPPcFGd7ChsYuIUMpg==
-  dependencies:
-    "@babel/helper-module-transforms" "^7.1.0"
-    "@babel/helper-plugin-utils" "^7.0.0"
-    babel-plugin-dynamic-import-node "^2.3.0"
-
-"@babel/plugin-transform-modules-amd@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.7.4.tgz#276b3845ca2b228f2995e453adc2e6f54d72fb71"
-  integrity sha512-/542/5LNA18YDtg1F+QHvvUSlxdvjZoD/aldQwkq+E3WCkbEjNSN9zdrOXaSlfg3IfGi22ijzecklF/A7kVZFQ==
-  dependencies:
-    "@babel/helper-module-transforms" "^7.7.4"
-    "@babel/helper-plugin-utils" "^7.0.0"
-    babel-plugin-dynamic-import-node "^2.3.0"
-
-"@babel/plugin-transform-modules-commonjs@^7.5.0":
-  version "7.5.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.5.0.tgz#425127e6045231360858eeaa47a71d75eded7a74"
-  integrity sha512-xmHq0B+ytyrWJvQTc5OWAC4ii6Dhr0s22STOoydokG51JjWhyYo5mRPXoi+ZmtHQhZZwuXNN+GG5jy5UZZJxIQ==
-  dependencies:
-    "@babel/helper-module-transforms" "^7.4.4"
-    "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/helper-simple-access" "^7.1.0"
-    babel-plugin-dynamic-import-node "^2.3.0"
-
-"@babel/plugin-transform-modules-commonjs@^7.6.0":
-  version "7.6.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.6.0.tgz#39dfe957de4420445f1fcf88b68a2e4aa4515486"
-  integrity sha512-Ma93Ix95PNSEngqomy5LSBMAQvYKVe3dy+JlVJSHEXZR5ASL9lQBedMiCyVtmTLraIDVRE3ZjTZvmXXD2Ozw3g==
-  dependencies:
-    "@babel/helper-module-transforms" "^7.4.4"
-    "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/helper-simple-access" "^7.1.0"
-    babel-plugin-dynamic-import-node "^2.3.0"
-
-"@babel/plugin-transform-modules-commonjs@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.7.4.tgz#bee4386e550446343dd52a571eda47851ff857a3"
-  integrity sha512-k8iVS7Jhc367IcNF53KCwIXtKAH7czev866ThsTgy8CwlXjnKZna2VHwChglzLleYrcHz1eQEIJlGRQxB53nqA==
-  dependencies:
-    "@babel/helper-module-transforms" "^7.7.4"
-    "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/helper-simple-access" "^7.7.4"
-    babel-plugin-dynamic-import-node "^2.3.0"
-
-"@babel/plugin-transform-modules-systemjs@^7.5.0":
-  version "7.5.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.5.0.tgz#e75266a13ef94202db2a0620977756f51d52d249"
-  integrity sha512-Q2m56tyoQWmuNGxEtUyeEkm6qJYFqs4c+XyXH5RAuYxObRNz9Zgj/1g2GMnjYp2EUyEy7YTrxliGCXzecl/vJg==
-  dependencies:
-    "@babel/helper-hoist-variables" "^7.4.4"
-    "@babel/helper-plugin-utils" "^7.0.0"
-    babel-plugin-dynamic-import-node "^2.3.0"
-
-"@babel/plugin-transform-modules-systemjs@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.7.4.tgz#cd98152339d3e763dfe838b7d4273edaf520bb30"
-  integrity sha512-y2c96hmcsUi6LrMqvmNDPBBiGCiQu0aYqpHatVVu6kD4mFEXKjyNxd/drc18XXAf9dv7UXjrZwBVmTTGaGP8iw==
-  dependencies:
-    "@babel/helper-hoist-variables" "^7.7.4"
-    "@babel/helper-plugin-utils" "^7.0.0"
-    babel-plugin-dynamic-import-node "^2.3.0"
-
-"@babel/plugin-transform-modules-umd@^7.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.2.0.tgz#7678ce75169f0877b8eb2235538c074268dd01ae"
-  integrity sha512-BV3bw6MyUH1iIsGhXlOK6sXhmSarZjtJ/vMiD9dNmpY8QXFFQTj+6v92pcfy1iqa8DeAfJFwoxcrS/TUZda6sw==
-  dependencies:
-    "@babel/helper-module-transforms" "^7.1.0"
-    "@babel/helper-plugin-utils" "^7.0.0"
-
-"@babel/plugin-transform-modules-umd@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.7.4.tgz#1027c355a118de0aae9fee00ad7813c584d9061f"
-  integrity sha512-u2B8TIi0qZI4j8q4C51ktfO7E3cQ0qnaXFI1/OXITordD40tt17g/sXqgNNCcMTcBFKrUPcGDx+TBJuZxLx7tw==
-  dependencies:
-    "@babel/helper-module-transforms" "^7.7.4"
-    "@babel/helper-plugin-utils" "^7.0.0"
-
-"@babel/plugin-transform-named-capturing-groups-regex@^7.4.5":
-  version "7.4.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.4.5.tgz#9d269fd28a370258199b4294736813a60bbdd106"
-  integrity sha512-z7+2IsWafTBbjNsOxU/Iv5CvTJlr5w4+HGu1HovKYTtgJ362f7kBcQglkfmlspKKZ3bgrbSGvLfNx++ZJgCWsg==
-  dependencies:
-    regexp-tree "^0.1.6"
-
-"@babel/plugin-transform-named-capturing-groups-regex@^7.6.0":
-  version "7.6.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.6.0.tgz#1e6e663097813bb4f53d42df0750cf28ad3bb3f1"
-  integrity sha512-jem7uytlmrRl3iCAuQyw8BpB4c4LWvSpvIeXKpMb+7j84lkx4m4mYr5ErAcmN5KM7B6BqrAvRGjBIbbzqCczew==
-  dependencies:
-    regexp-tree "^0.1.13"
-
-"@babel/plugin-transform-named-capturing-groups-regex@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.7.4.tgz#fb3bcc4ee4198e7385805007373d6b6f42c98220"
-  integrity sha512-jBUkiqLKvUWpv9GLSuHUFYdmHg0ujC1JEYoZUfeOOfNydZXp1sXObgyPatpcwjWgsdBGsagWW0cdJpX/DO2jMw==
-  dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.7.4"
+    "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-transform-new-target@^7.4.4":
-  version "7.4.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.4.4.tgz#18d120438b0cc9ee95a47f2c72bc9768fbed60a5"
-  integrity sha512-r1z3T2DNGQwwe2vPGZMBNjioT2scgWzK9BCnDEh+46z8EEwXBq24uRzd65I7pjtugzPSj921aM15RpESgzsSuA==
+"@babel/plugin-transform-destructuring@^7.5.0", "@babel/plugin-transform-destructuring@^7.8.3":
+  version "7.8.8"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.8.8.tgz#fadb2bc8e90ccaf5658de6f8d4d22ff6272a2f4b"
+  integrity sha512-eRJu4Vs2rmttFCdhPUM3bV0Yo/xPSdPw6ML9KHs/bjB4bLA5HXlbvYXPOD5yASodGod+krjYx21xm1QmL8dCJQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/helper-plugin-utils" "^7.8.3"
 
-"@babel/plugin-transform-new-target@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.7.4.tgz#4a0753d2d60639437be07b592a9e58ee00720167"
-  integrity sha512-CnPRiNtOG1vRodnsyGX37bHQleHE14B9dnnlgSeEs3ek3fHN1A1SScglTCg1sfbe7sRQ2BUcpgpTpWSfMKz3gg==
+"@babel/plugin-transform-dotall-regex@^7.4.4", "@babel/plugin-transform-dotall-regex@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.8.3.tgz#c3c6ec5ee6125c6993c5cbca20dc8621a9ea7a6e"
+  integrity sha512-kLs1j9Nn4MQoBYdRXH6AeaXMbEJFaFu/v1nQkvib6QzTj8MZI5OQzqmD83/2jEM1z0DLilra5aWO5YpyC0ALIw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/helper-create-regexp-features-plugin" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.8.3"
 
-"@babel/plugin-transform-object-super@^7.5.5":
-  version "7.5.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.5.5.tgz#c70021df834073c65eb613b8679cc4a381d1a9f9"
-  integrity sha512-un1zJQAhSosGFBduPgN/YFNvWVpRuHKU7IHBglLoLZsGmruJPOo6pbInneflUdmq7YvSVqhpPs5zdBvLnteltQ==
+"@babel/plugin-transform-duplicate-keys@^7.5.0", "@babel/plugin-transform-duplicate-keys@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.8.3.tgz#8d12df309aa537f272899c565ea1768e286e21f1"
+  integrity sha512-s8dHiBUbcbSgipS4SMFuWGqCvyge5V2ZeAWzR6INTVC3Ltjig/Vw1G2Gztv0vU/hRG9X8IvKvYdoksnUfgXOEQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/helper-replace-supers" "^7.5.5"
+    "@babel/helper-plugin-utils" "^7.8.3"
 
-"@babel/plugin-transform-object-super@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.7.4.tgz#48488937a2d586c0148451bf51af9d7dda567262"
-  integrity sha512-ho+dAEhC2aRnff2JCA0SAK7V2R62zJd/7dmtoe7MHcso4C2mS+vZjn1Pb1pCVZvJs1mgsvv5+7sT+m3Bysb6eg==
+"@babel/plugin-transform-exponentiation-operator@^7.2.0", "@babel/plugin-transform-exponentiation-operator@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.8.3.tgz#581a6d7f56970e06bf51560cd64f5e947b70d7b7"
+  integrity sha512-zwIpuIymb3ACcInbksHaNcR12S++0MDLKkiqXHl3AzpgdKlFNhog+z/K0+TGW+b0w5pgTq4H6IwV/WhxbGYSjQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/helper-replace-supers" "^7.7.4"
+    "@babel/helper-builder-binary-assignment-operator-visitor" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.8.3"
 
-"@babel/plugin-transform-parameters@^7.4.4":
+"@babel/plugin-transform-flow-strip-types@7.4.4":
   version "7.4.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.4.4.tgz#7556cf03f318bd2719fe4c922d2d808be5571e16"
-  integrity sha512-oMh5DUO1V63nZcu/ZVLQFqiihBGo4OpxJxR1otF50GMeCLiRx5nUdtokd+u9SuVJrvvuIh9OosRFPP4pIPnwmw==
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.4.4.tgz#d267a081f49a8705fc9146de0768c6b58dccd8f7"
+  integrity sha512-WyVedfeEIILYEaWGAUWzVNyqG4sfsNooMhXWsu/YzOvVGcsnPb5PguysjJqI3t3qiaYj0BR8T2f5njdjTGe44Q==
   dependencies:
-    "@babel/helper-call-delegate" "^7.4.4"
-    "@babel/helper-get-function-arity" "^7.0.0"
     "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/plugin-syntax-flow" "^7.2.0"
 
-"@babel/plugin-transform-parameters@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.7.4.tgz#da4555c97f39b51ac089d31c7380f03bca4075ce"
-  integrity sha512-VJwhVePWPa0DqE9vcfptaJSzNDKrWU/4FbYCjZERtmqEs05g3UMXnYMZoXja7JAJ7Y7sPZipwm/pGApZt7wHlw==
+"@babel/plugin-transform-flow-strip-types@^7.9.0":
+  version "7.9.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.9.0.tgz#8a3538aa40434e000b8f44a3c5c9ac7229bd2392"
+  integrity sha512-7Qfg0lKQhEHs93FChxVLAvhBshOPQDtJUTVHr/ZwQNRccCm4O9D79r9tVSoV8iNwjP1YgfD+e/fgHcPkN1qEQg==
   dependencies:
-    "@babel/helper-call-delegate" "^7.7.4"
-    "@babel/helper-get-function-arity" "^7.7.4"
-    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/plugin-syntax-flow" "^7.8.3"
 
-"@babel/plugin-transform-property-literals@^7.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.2.0.tgz#03e33f653f5b25c4eb572c98b9485055b389e905"
-  integrity sha512-9q7Dbk4RhgcLp8ebduOpCbtjh7C0itoLYHXd9ueASKAG/is5PQtMR5VJGka9NKqGhYEGn5ITahd4h9QeBMylWQ==
+"@babel/plugin-transform-for-of@^7.4.4", "@babel/plugin-transform-for-of@^7.9.0":
+  version "7.9.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.9.0.tgz#0f260e27d3e29cd1bb3128da5e76c761aa6c108e"
+  integrity sha512-lTAnWOpMwOXpyDx06N+ywmF3jNbafZEqZ96CGYabxHrxNX8l5ny7dt4bK/rGwAh9utyP2b2Hv7PlZh1AAS54FQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/helper-plugin-utils" "^7.8.3"
 
-"@babel/plugin-transform-property-literals@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.7.4.tgz#2388d6505ef89b266103f450f9167e6bd73f98c2"
-  integrity sha512-MatJhlC4iHsIskWYyawl53KuHrt+kALSADLQQ/HkhTjX954fkxIEh4q5slL4oRAnsm/eDoZ4q0CIZpcqBuxhJQ==
+"@babel/plugin-transform-function-name@^7.4.4", "@babel/plugin-transform-function-name@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.8.3.tgz#279373cb27322aaad67c2683e776dfc47196ed8b"
+  integrity sha512-rO/OnDS78Eifbjn5Py9v8y0aR+aSYhDhqAwVfsTl0ERuMZyr05L1aFSCJnbv2mmsLkit/4ReeQ9N2BgLnOcPCQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/helper-function-name" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.8.3"
 
-"@babel/plugin-transform-react-constant-elements@^7.0.0", "@babel/plugin-transform-react-constant-elements@^7.2.0":
-  version "7.5.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-constant-elements/-/plugin-transform-react-constant-elements-7.5.0.tgz#4d6ae4033bc38f8a65dfca2b6235c44522a422fc"
-  integrity sha512-c5Ba8cpybZFp1Izkf2sWGuNjOxoQ32tFgBvvYvwGhi4+9f6vGiSK9Gex4uVuO/Va6YJFu41aAh1MzMjUWkp0IQ==
+"@babel/plugin-transform-literals@^7.2.0", "@babel/plugin-transform-literals@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.8.3.tgz#aef239823d91994ec7b68e55193525d76dbd5dc1"
+  integrity sha512-3Tqf8JJ/qB7TeldGl+TT55+uQei9JfYaregDcEAyBZ7akutriFrt6C/wLYIer6OYhleVQvH/ntEhjE/xMmy10A==
   dependencies:
-    "@babel/helper-annotate-as-pure" "^7.0.0"
-    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/helper-plugin-utils" "^7.8.3"
 
-"@babel/plugin-transform-react-constant-elements@^7.6.3":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-constant-elements/-/plugin-transform-react-constant-elements-7.7.4.tgz#499cf732a21ffd62cc4b0016e27c3906097f8982"
-  integrity sha512-U6XkHZ8RnmeEb8jBUOpeo6oFka5RhLgxAVvK4/fBbwoYlsHQYLb8I37ymTPDVsrWjqb94+hueuWQA/1OAA4rAQ==
+"@babel/plugin-transform-member-expression-literals@^7.2.0", "@babel/plugin-transform-member-expression-literals@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.8.3.tgz#963fed4b620ac7cbf6029c755424029fa3a40410"
+  integrity sha512-3Wk2EXhnw+rP+IDkK6BdtPKsUE5IeZ6QOGrPYvw52NwBStw9V1ZVzxgK6fSKSxqUvH9eQPR3tm3cOq79HlsKYA==
   dependencies:
-    "@babel/helper-annotate-as-pure" "^7.7.4"
-    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/helper-plugin-utils" "^7.8.3"
 
-"@babel/plugin-transform-react-display-name@7.2.0", "@babel/plugin-transform-react-display-name@^7.0.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.2.0.tgz#ebfaed87834ce8dc4279609a4f0c324c156e3eb0"
-  integrity sha512-Htf/tPa5haZvRMiNSQSFifK12gtr/8vwfr+A9y69uF0QcU77AVu4K7MiHEkTxF7lQoHOL0F9ErqgfNEAKgXj7A==
+"@babel/plugin-transform-modules-amd@^7.5.0", "@babel/plugin-transform-modules-amd@^7.9.0":
+  version "7.9.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.9.0.tgz#19755ee721912cf5bb04c07d50280af3484efef4"
+  integrity sha512-vZgDDF003B14O8zJy0XXLnPH4sg+9X5hFBBGN1V+B2rgrB+J2xIypSN6Rk9imB2hSTHQi5OHLrFWsZab1GMk+Q==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/helper-module-transforms" "^7.9.0"
+    "@babel/helper-plugin-utils" "^7.8.3"
+    babel-plugin-dynamic-import-node "^2.3.0"
 
-"@babel/plugin-transform-react-display-name@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.7.4.tgz#9f2b80b14ebc97eef4a9b29b612c58ed9c0d10dd"
-  integrity sha512-sBbIvqYkthai0X0vkD2xsAwluBp+LtNHH+/V4a5ydifmTtb8KOVOlrMIk/MYmIc4uTYDnjZUHQildYNo36SRJw==
+"@babel/plugin-transform-modules-commonjs@^7.5.0", "@babel/plugin-transform-modules-commonjs@^7.9.0":
+  version "7.9.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.9.0.tgz#e3e72f4cbc9b4a260e30be0ea59bdf5a39748940"
+  integrity sha512-qzlCrLnKqio4SlgJ6FMMLBe4bySNis8DFn1VkGmOcxG9gqEyPIOzeQrA//u0HAKrWpJlpZbZMPB1n/OPa4+n8g==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/helper-module-transforms" "^7.9.0"
+    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-simple-access" "^7.8.3"
+    babel-plugin-dynamic-import-node "^2.3.0"
 
-"@babel/plugin-transform-react-jsx-self@^7.0.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.2.0.tgz#461e21ad9478f1031dd5e276108d027f1b5240ba"
-  integrity sha512-v6S5L/myicZEy+jr6ielB0OR8h+EH/1QFx/YJ7c7Ua+7lqsjj/vW6fD5FR9hB/6y7mGbfT4vAURn3xqBxsUcdg==
+"@babel/plugin-transform-modules-systemjs@^7.5.0", "@babel/plugin-transform-modules-systemjs@^7.9.0":
+  version "7.9.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.9.0.tgz#e9fd46a296fc91e009b64e07ddaa86d6f0edeb90"
+  integrity sha512-FsiAv/nao/ud2ZWy4wFacoLOm5uxl0ExSQ7ErvP7jpoihLR6Cq90ilOFyX9UXct3rbtKsAiZ9kFt5XGfPe/5SQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/plugin-syntax-jsx" "^7.2.0"
+    "@babel/helper-hoist-variables" "^7.8.3"
+    "@babel/helper-module-transforms" "^7.9.0"
+    "@babel/helper-plugin-utils" "^7.8.3"
+    babel-plugin-dynamic-import-node "^2.3.0"
 
-"@babel/plugin-transform-react-jsx-self@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.7.4.tgz#81b8fbfd14b2215e8f1c2c3adfba266127b0231c"
-  integrity sha512-PWYjSfqrO273mc1pKCRTIJXyqfc9vWYBax88yIhQb+bpw3XChVC7VWS4VwRVs63wFHKxizvGSd00XEr+YB9Q2A==
+"@babel/plugin-transform-modules-umd@^7.2.0", "@babel/plugin-transform-modules-umd@^7.9.0":
+  version "7.9.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.9.0.tgz#e909acae276fec280f9b821a5f38e1f08b480697"
+  integrity sha512-uTWkXkIVtg/JGRSIABdBoMsoIeoHQHPTL0Y2E7xf5Oj7sLqwVsNXOkNk0VJc7vF0IMBsPeikHxFjGe+qmwPtTQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/plugin-syntax-jsx" "^7.7.4"
+    "@babel/helper-module-transforms" "^7.9.0"
+    "@babel/helper-plugin-utils" "^7.8.3"
 
-"@babel/plugin-transform-react-jsx-source@^7.0.0":
-  version "7.5.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.5.0.tgz#583b10c49cf057e237085bcbd8cc960bd83bd96b"
-  integrity sha512-58Q+Jsy4IDCZx7kqEZuSDdam/1oW8OdDX8f+Loo6xyxdfg1yF0GE2XNJQSTZCaMol93+FBzpWiPEwtbMloAcPg==
+"@babel/plugin-transform-named-capturing-groups-regex@^7.4.5", "@babel/plugin-transform-named-capturing-groups-regex@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.8.3.tgz#a2a72bffa202ac0e2d0506afd0939c5ecbc48c6c"
+  integrity sha512-f+tF/8UVPU86TrCb06JoPWIdDpTNSGGcAtaD9mLP0aYGA0OS0j7j7DHJR0GTFrUZPUU6loZhbsVZgTh0N+Qdnw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/plugin-syntax-jsx" "^7.2.0"
+    "@babel/helper-create-regexp-features-plugin" "^7.8.3"
 
-"@babel/plugin-transform-react-jsx-source@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.7.4.tgz#8994b1bf6014b133f5a46d3b7d1ee5f5e3e72c10"
-  integrity sha512-5ZU9FnPhqtHsOXxutRtXZAzoEJwDaP32QcobbMP1/qt7NYcsCNK8XgzJcJfoEr/ZnzVvUNInNjIW22Z6I8p9mg==
+"@babel/plugin-transform-new-target@^7.4.4", "@babel/plugin-transform-new-target@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.8.3.tgz#60cc2ae66d85c95ab540eb34babb6434d4c70c43"
+  integrity sha512-QuSGysibQpyxexRyui2vca+Cmbljo8bcRckgzYV4kRIsHpVeyeC3JDO63pY+xFZ6bWOBn7pfKZTqV4o/ix9sFw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/plugin-syntax-jsx" "^7.7.4"
+    "@babel/helper-plugin-utils" "^7.8.3"
 
-"@babel/plugin-transform-react-jsx@^7.0.0":
-  version "7.3.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.3.0.tgz#f2cab99026631c767e2745a5368b331cfe8f5290"
-  integrity sha512-a/+aRb7R06WcKvQLOu4/TpjKOdvVEKRLWFpKcNuHhiREPgGRB4TQJxq07+EZLS8LFVYpfq1a5lDUnuMdcCpBKg==
+"@babel/plugin-transform-object-super@^7.5.5", "@babel/plugin-transform-object-super@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.8.3.tgz#ebb6a1e7a86ffa96858bd6ac0102d65944261725"
+  integrity sha512-57FXk+gItG/GejofIyLIgBKTas4+pEU47IXKDBWFTxdPd7F80H8zybyAY7UoblVfBhBGs2EKM+bJUu2+iUYPDQ==
   dependencies:
-    "@babel/helper-builder-react-jsx" "^7.3.0"
-    "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/plugin-syntax-jsx" "^7.2.0"
+    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-replace-supers" "^7.8.3"
 
-"@babel/plugin-transform-react-jsx@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.7.4.tgz#d91205717fae4e2f84d020cd3057ec02a10f11da"
-  integrity sha512-LixU4BS95ZTEAZdPaIuyg/k8FiiqN9laQ0dMHB4MlpydHY53uQdWCUrwjLr5o6ilS6fAgZey4Q14XBjl5tL6xw==
+"@babel/plugin-transform-parameters@^7.4.4", "@babel/plugin-transform-parameters@^7.8.7":
+  version "7.9.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.9.3.tgz#3028d0cc20ddc733166c6e9c8534559cee09f54a"
+  integrity sha512-fzrQFQhp7mIhOzmOtPiKffvCYQSK10NR8t6BBz2yPbeUHb9OLW8RZGtgDRBn8z2hGcwvKDL3vC7ojPTLNxmqEg==
   dependencies:
-    "@babel/helper-builder-react-jsx" "^7.7.4"
-    "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/plugin-syntax-jsx" "^7.7.4"
+    "@babel/helper-get-function-arity" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.8.3"
 
-"@babel/plugin-transform-regenerator@^7.4.5":
-  version "7.4.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.4.5.tgz#629dc82512c55cee01341fb27bdfcb210354680f"
-  integrity sha512-gBKRh5qAaCWntnd09S8QC7r3auLCqq5DI6O0DlfoyDjslSBVqBibrMdsqO+Uhmx3+BlOmE/Kw1HFxmGbv0N9dA==
+"@babel/plugin-transform-property-literals@^7.2.0", "@babel/plugin-transform-property-literals@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.8.3.tgz#33194300d8539c1ed28c62ad5087ba3807b98263"
+  integrity sha512-uGiiXAZMqEoQhRWMK17VospMZh5sXWg+dlh2soffpkAl96KAm+WZuJfa6lcELotSRmooLqg0MWdH6UUq85nmmg==
   dependencies:
-    regenerator-transform "^0.14.0"
+    "@babel/helper-plugin-utils" "^7.8.3"
 
-"@babel/plugin-transform-regenerator@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.7.4.tgz#d18eac0312a70152d7d914cbed2dc3999601cfc0"
-  integrity sha512-e7MWl5UJvmPEwFJTwkBlPmqixCtr9yAASBqff4ggXTNicZiwbF8Eefzm6NVgfiBp7JdAGItecnctKTgH44q2Jw==
+"@babel/plugin-transform-react-constant-elements@^7.0.0", "@babel/plugin-transform-react-constant-elements@^7.2.0", "@babel/plugin-transform-react-constant-elements@^7.6.3":
+  version "7.9.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-constant-elements/-/plugin-transform-react-constant-elements-7.9.0.tgz#a75abc936a3819edec42d3386d9f1c93f28d9d9e"
+  integrity sha512-wXMXsToAUOxJuBBEHajqKLFWcCkOSLshTI2ChCFFj1zDd7od4IOxiwLCOObNUvOpkxLpjIuaIdBMmNt6ocCPAw==
   dependencies:
-    regenerator-transform "^0.14.0"
+    "@babel/helper-plugin-utils" "^7.8.3"
 
-"@babel/plugin-transform-reserved-words@^7.2.0":
+"@babel/plugin-transform-react-display-name@7.2.0":
   version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.2.0.tgz#4792af87c998a49367597d07fedf02636d2e1634"
-  integrity sha512-fz43fqW8E1tAB3DKF19/vxbpib1fuyCwSPE418ge5ZxILnBhWyhtPgz8eh1RCGGJlwvksHkyxMxh0eenFi+kFw==
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.2.0.tgz#ebfaed87834ce8dc4279609a4f0c324c156e3eb0"
+  integrity sha512-Htf/tPa5haZvRMiNSQSFifK12gtr/8vwfr+A9y69uF0QcU77AVu4K7MiHEkTxF7lQoHOL0F9ErqgfNEAKgXj7A==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-transform-reserved-words@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.7.4.tgz#6a7cf123ad175bb5c69aec8f6f0770387ed3f1eb"
-  integrity sha512-OrPiUB5s5XvkCO1lS7D8ZtHcswIC57j62acAnJZKqGGnHP+TIc/ljQSrgdX/QyOTdEK5COAhuc820Hi1q2UgLQ==
+"@babel/plugin-transform-react-display-name@^7.0.0", "@babel/plugin-transform-react-display-name@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.8.3.tgz#70ded987c91609f78353dd76d2fb2a0bb991e8e5"
+  integrity sha512-3Jy/PCw8Fe6uBKtEgz3M82ljt+lTg+xJaM4og+eyu83qLT87ZUSckn0wy7r31jflURWLO83TW6Ylf7lyXj3m5A==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/helper-plugin-utils" "^7.8.3"
 
-"@babel/plugin-transform-runtime@7.5.5", "@babel/plugin-transform-runtime@^7.5.5":
-  version "7.5.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.5.5.tgz#a6331afbfc59189d2135b2e09474457a8e3d28bc"
-  integrity sha512-6Xmeidsun5rkwnGfMOp6/z9nSzWpHFNVr2Jx7kwoq4mVatQfQx5S56drBgEHF+XQbKOdIaOiMIINvp/kAwMN+w==
+"@babel/plugin-transform-react-jsx-development@^7.9.0":
+  version "7.9.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.9.0.tgz#3c2a130727caf00c2a293f0aed24520825dbf754"
+  integrity sha512-tK8hWKrQncVvrhvtOiPpKrQjfNX3DtkNLSX4ObuGcpS9p0QrGetKmlySIGR07y48Zft8WVgPakqd/bk46JrMSw==
   dependencies:
-    "@babel/helper-module-imports" "^7.0.0"
-    "@babel/helper-plugin-utils" "^7.0.0"
-    resolve "^1.8.1"
-    semver "^5.5.1"
+    "@babel/helper-builder-react-jsx-experimental" "^7.9.0"
+    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/plugin-syntax-jsx" "^7.8.3"
 
-"@babel/plugin-transform-shorthand-properties@^7.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.2.0.tgz#6333aee2f8d6ee7e28615457298934a3b46198f0"
-  integrity sha512-QP4eUM83ha9zmYtpbnyjTLAGKQritA5XW/iG9cjtuOI8s1RuL/3V6a3DeSHfKutJQ+ayUfeZJPcnCYEQzaPQqg==
+"@babel/plugin-transform-react-jsx-self@^7.0.0", "@babel/plugin-transform-react-jsx-self@^7.9.0":
+  version "7.9.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.9.0.tgz#f4f26a325820205239bb915bad8e06fcadabb49b"
+  integrity sha512-K2ObbWPKT7KUTAoyjCsFilOkEgMvFG+y0FqOl6Lezd0/13kMkkjHskVsZvblRPj1PHA44PrToaZANrryppzTvQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/plugin-syntax-jsx" "^7.8.3"
 
-"@babel/plugin-transform-shorthand-properties@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.7.4.tgz#74a0a9b2f6d67a684c6fbfd5f0458eb7ba99891e"
-  integrity sha512-q+suddWRfIcnyG5YiDP58sT65AJDZSUhXQDZE3r04AuqD6d/XLaQPPXSBzP2zGerkgBivqtQm9XKGLuHqBID6Q==
+"@babel/plugin-transform-react-jsx-source@^7.0.0", "@babel/plugin-transform-react-jsx-source@^7.9.0":
+  version "7.9.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.9.0.tgz#89ef93025240dd5d17d3122294a093e5e0183de0"
+  integrity sha512-K6m3LlSnTSfRkM6FcRk8saNEeaeyG5k7AVkBU2bZK3+1zdkSED3qNdsWrUgQBeTVD2Tp3VMmerxVO2yM5iITmw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/plugin-syntax-jsx" "^7.8.3"
 
-"@babel/plugin-transform-spread@^7.2.0":
-  version "7.2.2"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.2.2.tgz#3103a9abe22f742b6d406ecd3cd49b774919b406"
-  integrity sha512-KWfky/58vubwtS0hLqEnrWJjsMGaOeSBn90Ezn5Jeg9Z8KKHmELbP1yGylMlm5N6TPKeY9A2+UaSYLdxahg01w==
+"@babel/plugin-transform-react-jsx@^7.0.0", "@babel/plugin-transform-react-jsx@^7.9.4":
+  version "7.9.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.9.4.tgz#86f576c8540bd06d0e95e0b61ea76d55f6cbd03f"
+  integrity sha512-Mjqf3pZBNLt854CK0C/kRuXAnE6H/bo7xYojP+WGtX8glDGSibcwnsWwhwoSuRg0+EBnxPC1ouVnuetUIlPSAw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/helper-builder-react-jsx" "^7.9.0"
+    "@babel/helper-builder-react-jsx-experimental" "^7.9.0"
+    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/plugin-syntax-jsx" "^7.8.3"
 
-"@babel/plugin-transform-spread@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.7.4.tgz#aa673b356fe6b7e70d69b6e33a17fef641008578"
-  integrity sha512-8OSs0FLe5/80cndziPlg4R0K6HcWSM0zyNhHhLsmw/Nc5MaA49cAsnoJ/t/YZf8qkG7fD+UjTRaApVDB526d7Q==
+"@babel/plugin-transform-regenerator@^7.4.5", "@babel/plugin-transform-regenerator@^7.8.7":
+  version "7.8.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.8.7.tgz#5e46a0dca2bee1ad8285eb0527e6abc9c37672f8"
+  integrity sha512-TIg+gAl4Z0a3WmD3mbYSk+J9ZUH6n/Yc57rtKRnlA/7rcCvpekHXe0CMZHP1gYp7/KLe9GHTuIba0vXmls6drA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
+    regenerator-transform "^0.14.2"
 
-"@babel/plugin-transform-sticky-regex@^7.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.2.0.tgz#a1e454b5995560a9c1e0d537dfc15061fd2687e1"
-  integrity sha512-KKYCoGaRAf+ckH8gEL3JHUaFVyNHKe3ASNsZ+AlktgHevvxGigoIttrEJb8iKN03Q7Eazlv1s6cx2B2cQ3Jabw==
+"@babel/plugin-transform-reserved-words@^7.2.0", "@babel/plugin-transform-reserved-words@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.8.3.tgz#9a0635ac4e665d29b162837dd3cc50745dfdf1f5"
+  integrity sha512-mwMxcycN3omKFDjDQUl+8zyMsBfjRFr0Zn/64I41pmjv4NJuqcYlEtezwYtw9TFd9WR1vN5kiM+O0gMZzO6L0A==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/helper-regex" "^7.0.0"
+    "@babel/helper-plugin-utils" "^7.8.3"
 
-"@babel/plugin-transform-sticky-regex@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.7.4.tgz#ffb68c05090c30732076b1285dc1401b404a123c"
-  integrity sha512-Ls2NASyL6qtVe1H1hXts9yuEeONV2TJZmplLONkMPUG158CtmnrzW5Q5teibM5UVOFjG0D3IC5mzXR6pPpUY7A==
+"@babel/plugin-transform-runtime@7.5.5":
+  version "7.5.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.5.5.tgz#a6331afbfc59189d2135b2e09474457a8e3d28bc"
+  integrity sha512-6Xmeidsun5rkwnGfMOp6/z9nSzWpHFNVr2Jx7kwoq4mVatQfQx5S56drBgEHF+XQbKOdIaOiMIINvp/kAwMN+w==
   dependencies:
+    "@babel/helper-module-imports" "^7.0.0"
     "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/helper-regex" "^7.0.0"
+    resolve "^1.8.1"
+    semver "^5.5.1"
 
-"@babel/plugin-transform-template-literals@^7.4.4":
-  version "7.4.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.4.4.tgz#9d28fea7bbce637fb7612a0750989d8321d4bcb0"
-  integrity sha512-mQrEC4TWkhLN0z8ygIvEL9ZEToPhG5K7KDW3pzGqOfIGZ28Jb0POUkeWcoz8HnHvhFy6dwAT1j8OzqN8s804+g==
+"@babel/plugin-transform-runtime@^7.9.0":
+  version "7.9.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.9.0.tgz#45468c0ae74cc13204e1d3b1f4ce6ee83258af0b"
+  integrity sha512-pUu9VSf3kI1OqbWINQ7MaugnitRss1z533436waNXp+0N3ur3zfut37sXiQMxkuCF4VUjwZucen/quskCh7NHw==
   dependencies:
-    "@babel/helper-annotate-as-pure" "^7.0.0"
-    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/helper-module-imports" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.8.3"
+    resolve "^1.8.1"
+    semver "^5.5.1"
 
-"@babel/plugin-transform-template-literals@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.7.4.tgz#1eb6411736dd3fe87dbd20cc6668e5121c17d604"
-  integrity sha512-sA+KxLwF3QwGj5abMHkHgshp9+rRz+oY9uoRil4CyLtgEuE/88dpkeWgNk5qKVsJE9iSfly3nvHapdRiIS2wnQ==
+"@babel/plugin-transform-shorthand-properties@^7.2.0", "@babel/plugin-transform-shorthand-properties@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.8.3.tgz#28545216e023a832d4d3a1185ed492bcfeac08c8"
+  integrity sha512-I9DI6Odg0JJwxCHzbzW08ggMdCezoWcuQRz3ptdudgwaHxTjxw5HgdFJmZIkIMlRymL6YiZcped4TTCB0JcC8w==
   dependencies:
-    "@babel/helper-annotate-as-pure" "^7.7.4"
-    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/helper-plugin-utils" "^7.8.3"
 
-"@babel/plugin-transform-typeof-symbol@^7.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.2.0.tgz#117d2bcec2fbf64b4b59d1f9819894682d29f2b2"
-  integrity sha512-2LNhETWYxiYysBtrBTqL8+La0jIoQQnIScUJc74OYvUGRmkskNY4EzLCnjHBzdmb38wqtTaixpo1NctEcvMDZw==
+"@babel/plugin-transform-spread@^7.2.0", "@babel/plugin-transform-spread@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.8.3.tgz#9c8ffe8170fdfb88b114ecb920b82fb6e95fe5e8"
+  integrity sha512-CkuTU9mbmAoFOI1tklFWYYbzX5qCIZVXPVy0jpXgGwkplCndQAa58s2jr66fTeQnA64bDox0HL4U56CFYoyC7g==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/helper-plugin-utils" "^7.8.3"
 
-"@babel/plugin-transform-typeof-symbol@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.7.4.tgz#3174626214f2d6de322882e498a38e8371b2140e"
-  integrity sha512-KQPUQ/7mqe2m0B8VecdyaW5XcQYaePyl9R7IsKd+irzj6jvbhoGnRE+M0aNkyAzI07VfUQ9266L5xMARitV3wg==
+"@babel/plugin-transform-sticky-regex@^7.2.0", "@babel/plugin-transform-sticky-regex@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.8.3.tgz#be7a1290f81dae767475452199e1f76d6175b100"
+  integrity sha512-9Spq0vGCD5Bb4Z/ZXXSK5wbbLFMG085qd2vhL1JYu1WcQ5bXqZBAYRzU1d+p79GcHs2szYv5pVQCX13QgldaWw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-regex" "^7.8.3"
 
-"@babel/plugin-transform-typescript@^7.3.2":
-  version "7.5.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.5.5.tgz#6d862766f09b2da1cb1f7d505fe2aedab6b7d4b8"
-  integrity sha512-pehKf4m640myZu5B2ZviLaiBlxMCjSZ1qTEO459AXKX5GnPueyulJeCqZFs1nz/Ya2dDzXQ1NxZ/kKNWyD4h6w==
+"@babel/plugin-transform-template-literals@^7.4.4", "@babel/plugin-transform-template-literals@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.8.3.tgz#7bfa4732b455ea6a43130adc0ba767ec0e402a80"
+  integrity sha512-820QBtykIQOLFT8NZOcTRJ1UNuztIELe4p9DCgvj4NK+PwluSJ49we7s9FB1HIGNIYT7wFUJ0ar2QpCDj0escQ==
   dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.5.5"
-    "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/plugin-syntax-typescript" "^7.2.0"
+    "@babel/helper-annotate-as-pure" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.8.3"
 
-"@babel/plugin-transform-typescript@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.7.4.tgz#2974fd05f4e85c695acaf497f432342de9fc0636"
-  integrity sha512-X8e3tcPEKnwwPVG+vP/vSqEShkwODOEeyQGod82qrIuidwIrfnsGn11qPM1jBLF4MqguTXXYzm58d0dY+/wdpg==
+"@babel/plugin-transform-typeof-symbol@^7.2.0", "@babel/plugin-transform-typeof-symbol@^7.8.4":
+  version "7.8.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.8.4.tgz#ede4062315ce0aaf8a657a920858f1a2f35fc412"
+  integrity sha512-2QKyfjGdvuNfHsb7qnBBlKclbD4CfshH2KvDabiijLMGXPHJXGxtDzwIF7bQP+T0ysw8fYTtxPafgfs/c1Lrqg==
   dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.7.4"
-    "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/plugin-syntax-typescript" "^7.7.4"
+    "@babel/helper-plugin-utils" "^7.8.3"
 
-"@babel/plugin-transform-unicode-regex@^7.4.4":
-  version "7.4.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.4.4.tgz#ab4634bb4f14d36728bf5978322b35587787970f"
-  integrity sha512-il+/XdNw01i93+M9J9u4T7/e/Ue/vWfNZE4IRUQjplu2Mqb/AFTDimkw2tdEdSH50wuQXZAbXSql0UphQke+vA==
+"@babel/plugin-transform-typescript@^7.3.2", "@babel/plugin-transform-typescript@^7.9.0":
+  version "7.9.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.9.4.tgz#4bb4dde4f10bbf2d787fce9707fb09b483e33359"
+  integrity sha512-yeWeUkKx2auDbSxRe8MusAG+n4m9BFY/v+lPjmQDgOFX5qnySkUY5oXzkp6FwPdsYqnKay6lorXYdC0n3bZO7w==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/helper-regex" "^7.4.4"
-    regexpu-core "^4.5.4"
+    "@babel/helper-create-class-features-plugin" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/plugin-syntax-typescript" "^7.8.3"
 
-"@babel/plugin-transform-unicode-regex@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.7.4.tgz#a3c0f65b117c4c81c5b6484f2a5e7b95346b83ae"
-  integrity sha512-N77UUIV+WCvE+5yHw+oks3m18/umd7y392Zv7mYTpFqHtkpcc+QUz+gLJNTWVlWROIWeLqY0f3OjZxV5TcXnRw==
+"@babel/plugin-transform-unicode-regex@^7.4.4", "@babel/plugin-transform-unicode-regex@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.8.3.tgz#0cef36e3ba73e5c57273effb182f46b91a1ecaad"
+  integrity sha512-+ufgJjYdmWfSQ+6NS9VGUR2ns8cjJjYbrbi11mZBTaWm+Fui/ncTLFF28Ei1okavY+xkojGr1eJxNsWYeA5aZw==
   dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.7.4"
-    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/helper-create-regexp-features-plugin" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.8.3"
 
-"@babel/preset-env@7.5.5", "@babel/preset-env@^7.4.3", "@babel/preset-env@^7.4.5", "@babel/preset-env@^7.5.5":
+"@babel/preset-env@7.5.5":
   version "7.5.5"
   resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.5.5.tgz#bc470b53acaa48df4b8db24a570d6da1fef53c9a"
   integrity sha512-GMZQka/+INwsMz1A5UEql8tG015h5j/qjptpKY2gJ7giy8ohzU710YciJB5rcKsWGWHiW3RUnHib0E5/m3Tp3A==
@@ -1472,128 +929,92 @@
     js-levenshtein "^1.1.3"
     semver "^5.5.0"
 
-"@babel/preset-env@^7.0.0":
-  version "7.6.0"
-  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.6.0.tgz#aae4141c506100bb2bfaa4ac2a5c12b395619e50"
-  integrity sha512-1efzxFv/TcPsNXlRhMzRnkBFMeIqBBgzwmZwlFDw5Ubj0AGLeufxugirwZmkkX/ayi3owsSqoQ4fw8LkfK9SYg==
-  dependencies:
-    "@babel/helper-module-imports" "^7.0.0"
-    "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/plugin-proposal-async-generator-functions" "^7.2.0"
-    "@babel/plugin-proposal-dynamic-import" "^7.5.0"
-    "@babel/plugin-proposal-json-strings" "^7.2.0"
-    "@babel/plugin-proposal-object-rest-spread" "^7.5.5"
-    "@babel/plugin-proposal-optional-catch-binding" "^7.2.0"
-    "@babel/plugin-proposal-unicode-property-regex" "^7.4.4"
-    "@babel/plugin-syntax-async-generators" "^7.2.0"
-    "@babel/plugin-syntax-dynamic-import" "^7.2.0"
-    "@babel/plugin-syntax-json-strings" "^7.2.0"
-    "@babel/plugin-syntax-object-rest-spread" "^7.2.0"
-    "@babel/plugin-syntax-optional-catch-binding" "^7.2.0"
-    "@babel/plugin-transform-arrow-functions" "^7.2.0"
-    "@babel/plugin-transform-async-to-generator" "^7.5.0"
-    "@babel/plugin-transform-block-scoped-functions" "^7.2.0"
-    "@babel/plugin-transform-block-scoping" "^7.6.0"
-    "@babel/plugin-transform-classes" "^7.5.5"
-    "@babel/plugin-transform-computed-properties" "^7.2.0"
-    "@babel/plugin-transform-destructuring" "^7.6.0"
-    "@babel/plugin-transform-dotall-regex" "^7.4.4"
-    "@babel/plugin-transform-duplicate-keys" "^7.5.0"
-    "@babel/plugin-transform-exponentiation-operator" "^7.2.0"
-    "@babel/plugin-transform-for-of" "^7.4.4"
-    "@babel/plugin-transform-function-name" "^7.4.4"
-    "@babel/plugin-transform-literals" "^7.2.0"
-    "@babel/plugin-transform-member-expression-literals" "^7.2.0"
-    "@babel/plugin-transform-modules-amd" "^7.5.0"
-    "@babel/plugin-transform-modules-commonjs" "^7.6.0"
-    "@babel/plugin-transform-modules-systemjs" "^7.5.0"
-    "@babel/plugin-transform-modules-umd" "^7.2.0"
-    "@babel/plugin-transform-named-capturing-groups-regex" "^7.6.0"
-    "@babel/plugin-transform-new-target" "^7.4.4"
-    "@babel/plugin-transform-object-super" "^7.5.5"
-    "@babel/plugin-transform-parameters" "^7.4.4"
-    "@babel/plugin-transform-property-literals" "^7.2.0"
-    "@babel/plugin-transform-regenerator" "^7.4.5"
-    "@babel/plugin-transform-reserved-words" "^7.2.0"
-    "@babel/plugin-transform-shorthand-properties" "^7.2.0"
-    "@babel/plugin-transform-spread" "^7.2.0"
-    "@babel/plugin-transform-sticky-regex" "^7.2.0"
-    "@babel/plugin-transform-template-literals" "^7.4.4"
-    "@babel/plugin-transform-typeof-symbol" "^7.2.0"
-    "@babel/plugin-transform-unicode-regex" "^7.4.4"
-    "@babel/types" "^7.6.0"
-    browserslist "^4.6.0"
-    core-js-compat "^3.1.1"
+"@babel/preset-env@^7.0.0", "@babel/preset-env@^7.4.3", "@babel/preset-env@^7.4.5", "@babel/preset-env@^7.7.1", "@babel/preset-env@^7.9.0":
+  version "7.9.0"
+  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.9.0.tgz#a5fc42480e950ae8f5d9f8f2bbc03f52722df3a8"
+  integrity sha512-712DeRXT6dyKAM/FMbQTV/FvRCms2hPCx+3weRjZ8iQVQWZejWWk1wwG6ViWMyqb/ouBbGOl5b6aCk0+j1NmsQ==
+  dependencies:
+    "@babel/compat-data" "^7.9.0"
+    "@babel/helper-compilation-targets" "^7.8.7"
+    "@babel/helper-module-imports" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/plugin-proposal-async-generator-functions" "^7.8.3"
+    "@babel/plugin-proposal-dynamic-import" "^7.8.3"
+    "@babel/plugin-proposal-json-strings" "^7.8.3"
+    "@babel/plugin-proposal-nullish-coalescing-operator" "^7.8.3"
+    "@babel/plugin-proposal-numeric-separator" "^7.8.3"
+    "@babel/plugin-proposal-object-rest-spread" "^7.9.0"
+    "@babel/plugin-proposal-optional-catch-binding" "^7.8.3"
+    "@babel/plugin-proposal-optional-chaining" "^7.9.0"
+    "@babel/plugin-proposal-unicode-property-regex" "^7.8.3"
+    "@babel/plugin-syntax-async-generators" "^7.8.0"
+    "@babel/plugin-syntax-dynamic-import" "^7.8.0"
+    "@babel/plugin-syntax-json-strings" "^7.8.0"
+    "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.0"
+    "@babel/plugin-syntax-numeric-separator" "^7.8.0"
+    "@babel/plugin-syntax-object-rest-spread" "^7.8.0"
+    "@babel/plugin-syntax-optional-catch-binding" "^7.8.0"
+    "@babel/plugin-syntax-optional-chaining" "^7.8.0"
+    "@babel/plugin-syntax-top-level-await" "^7.8.3"
+    "@babel/plugin-transform-arrow-functions" "^7.8.3"
+    "@babel/plugin-transform-async-to-generator" "^7.8.3"
+    "@babel/plugin-transform-block-scoped-functions" "^7.8.3"
+    "@babel/plugin-transform-block-scoping" "^7.8.3"
+    "@babel/plugin-transform-classes" "^7.9.0"
+    "@babel/plugin-transform-computed-properties" "^7.8.3"
+    "@babel/plugin-transform-destructuring" "^7.8.3"
+    "@babel/plugin-transform-dotall-regex" "^7.8.3"
+    "@babel/plugin-transform-duplicate-keys" "^7.8.3"
+    "@babel/plugin-transform-exponentiation-operator" "^7.8.3"
+    "@babel/plugin-transform-for-of" "^7.9.0"
+    "@babel/plugin-transform-function-name" "^7.8.3"
+    "@babel/plugin-transform-literals" "^7.8.3"
+    "@babel/plugin-transform-member-expression-literals" "^7.8.3"
+    "@babel/plugin-transform-modules-amd" "^7.9.0"
+    "@babel/plugin-transform-modules-commonjs" "^7.9.0"
+    "@babel/plugin-transform-modules-systemjs" "^7.9.0"
+    "@babel/plugin-transform-modules-umd" "^7.9.0"
+    "@babel/plugin-transform-named-capturing-groups-regex" "^7.8.3"
+    "@babel/plugin-transform-new-target" "^7.8.3"
+    "@babel/plugin-transform-object-super" "^7.8.3"
+    "@babel/plugin-transform-parameters" "^7.8.7"
+    "@babel/plugin-transform-property-literals" "^7.8.3"
+    "@babel/plugin-transform-regenerator" "^7.8.7"
+    "@babel/plugin-transform-reserved-words" "^7.8.3"
+    "@babel/plugin-transform-shorthand-properties" "^7.8.3"
+    "@babel/plugin-transform-spread" "^7.8.3"
+    "@babel/plugin-transform-sticky-regex" "^7.8.3"
+    "@babel/plugin-transform-template-literals" "^7.8.3"
+    "@babel/plugin-transform-typeof-symbol" "^7.8.4"
+    "@babel/plugin-transform-unicode-regex" "^7.8.3"
+    "@babel/preset-modules" "^0.1.3"
+    "@babel/types" "^7.9.0"
+    browserslist "^4.9.1"
+    core-js-compat "^3.6.2"
     invariant "^2.2.2"
-    js-levenshtein "^1.1.3"
+    levenary "^1.1.1"
     semver "^5.5.0"
 
-"@babel/preset-env@^7.7.1":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.7.4.tgz#ccaf309ae8d1ee2409c85a4e2b5e280ceee830f8"
-  integrity sha512-Dg+ciGJjwvC1NIe/DGblMbcGq1HOtKbw8RLl4nIjlfcILKEOkWT/vRqPpumswABEBVudii6dnVwrBtzD7ibm4g==
+"@babel/preset-flow@^7.0.0":
+  version "7.9.0"
+  resolved "https://registry.yarnpkg.com/@babel/preset-flow/-/preset-flow-7.9.0.tgz#fee847c3e090b0b2d9227c1949e4da1d1379280d"
+  integrity sha512-88uSmlshIrlmPkNkEcx3UpSZ6b8n0UGBq0/0ZMZCF/uxAW0XIAUuDHBhIOAh0pvweafH4RxOwi/H3rWhtqOYPA==
   dependencies:
-    "@babel/helper-module-imports" "^7.7.4"
-    "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/plugin-proposal-async-generator-functions" "^7.7.4"
-    "@babel/plugin-proposal-dynamic-import" "^7.7.4"
-    "@babel/plugin-proposal-json-strings" "^7.7.4"
-    "@babel/plugin-proposal-object-rest-spread" "^7.7.4"
-    "@babel/plugin-proposal-optional-catch-binding" "^7.7.4"
-    "@babel/plugin-proposal-unicode-property-regex" "^7.7.4"
-    "@babel/plugin-syntax-async-generators" "^7.7.4"
-    "@babel/plugin-syntax-dynamic-import" "^7.7.4"
-    "@babel/plugin-syntax-json-strings" "^7.7.4"
-    "@babel/plugin-syntax-object-rest-spread" "^7.7.4"
-    "@babel/plugin-syntax-optional-catch-binding" "^7.7.4"
-    "@babel/plugin-syntax-top-level-await" "^7.7.4"
-    "@babel/plugin-transform-arrow-functions" "^7.7.4"
-    "@babel/plugin-transform-async-to-generator" "^7.7.4"
-    "@babel/plugin-transform-block-scoped-functions" "^7.7.4"
-    "@babel/plugin-transform-block-scoping" "^7.7.4"
-    "@babel/plugin-transform-classes" "^7.7.4"
-    "@babel/plugin-transform-computed-properties" "^7.7.4"
-    "@babel/plugin-transform-destructuring" "^7.7.4"
-    "@babel/plugin-transform-dotall-regex" "^7.7.4"
-    "@babel/plugin-transform-duplicate-keys" "^7.7.4"
-    "@babel/plugin-transform-exponentiation-operator" "^7.7.4"
-    "@babel/plugin-transform-for-of" "^7.7.4"
-    "@babel/plugin-transform-function-name" "^7.7.4"
-    "@babel/plugin-transform-literals" "^7.7.4"
-    "@babel/plugin-transform-member-expression-literals" "^7.7.4"
-    "@babel/plugin-transform-modules-amd" "^7.7.4"
-    "@babel/plugin-transform-modules-commonjs" "^7.7.4"
-    "@babel/plugin-transform-modules-systemjs" "^7.7.4"
-    "@babel/plugin-transform-modules-umd" "^7.7.4"
-    "@babel/plugin-transform-named-capturing-groups-regex" "^7.7.4"
-    "@babel/plugin-transform-new-target" "^7.7.4"
-    "@babel/plugin-transform-object-super" "^7.7.4"
-    "@babel/plugin-transform-parameters" "^7.7.4"
-    "@babel/plugin-transform-property-literals" "^7.7.4"
-    "@babel/plugin-transform-regenerator" "^7.7.4"
-    "@babel/plugin-transform-reserved-words" "^7.7.4"
-    "@babel/plugin-transform-shorthand-properties" "^7.7.4"
-    "@babel/plugin-transform-spread" "^7.7.4"
-    "@babel/plugin-transform-sticky-regex" "^7.7.4"
-    "@babel/plugin-transform-template-literals" "^7.7.4"
-    "@babel/plugin-transform-typeof-symbol" "^7.7.4"
-    "@babel/plugin-transform-unicode-regex" "^7.7.4"
-    "@babel/types" "^7.7.4"
-    browserslist "^4.6.0"
-    core-js-compat "^3.1.1"
-    invariant "^2.2.2"
-    js-levenshtein "^1.1.3"
-    semver "^5.5.0"
+    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/plugin-transform-flow-strip-types" "^7.9.0"
 
-"@babel/preset-flow@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/preset-flow/-/preset-flow-7.0.0.tgz#afd764835d9535ec63d8c7d4caf1c06457263da2"
-  integrity sha512-bJOHrYOPqJZCkPVbG1Lot2r5OSsB+iUOaxiHdlOeB1yPWS6evswVHwvkDLZ54WTaTRIk89ds0iHmGZSnxlPejQ==
+"@babel/preset-modules@^0.1.3":
+  version "0.1.3"
+  resolved "https://registry.yarnpkg.com/@babel/preset-modules/-/preset-modules-0.1.3.tgz#13242b53b5ef8c883c3cf7dddd55b36ce80fbc72"
+  integrity sha512-Ra3JXOHBq2xd56xSF7lMKXdjBn3T772Y1Wet3yWnkDly9zHvJki029tAFzvAAK5cf4YV3yoxuP61crYRol6SVg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/plugin-transform-flow-strip-types" "^7.0.0"
+    "@babel/plugin-proposal-unicode-property-regex" "^7.4.4"
+    "@babel/plugin-transform-dotall-regex" "^7.4.4"
+    "@babel/types" "^7.4.4"
+    esutils "^2.0.2"
 
-"@babel/preset-react@7.0.0", "@babel/preset-react@^7.0.0":
+"@babel/preset-react@7.0.0":
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.0.0.tgz#e86b4b3d99433c7b3e9e91747e2653958bc6b3c0"
   integrity sha512-oayxyPS4Zj+hF6Et11BwuBkmpgT/zMxyuZgFrMeZID6Hdh3dGlk4sHCAhdBCpuCKW2ppBfl2uCCetlrUIJRY3w==
@@ -1604,16 +1025,17 @@
     "@babel/plugin-transform-react-jsx-self" "^7.0.0"
     "@babel/plugin-transform-react-jsx-source" "^7.0.0"
 
-"@babel/preset-react@^7.7.0", "@babel/preset-react@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.7.4.tgz#3fe2ea698d8fb536d8e7881a592c3c1ee8bf5707"
-  integrity sha512-j+vZtg0/8pQr1H8wKoaJyGL2IEk3rG/GIvua7Sec7meXVIvGycihlGMx5xcU00kqCJbwzHs18xTu3YfREOqQ+g==
+"@babel/preset-react@^7.0.0", "@babel/preset-react@^7.7.0", "@babel/preset-react@^7.9.1":
+  version "7.9.4"
+  resolved "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.9.4.tgz#c6c97693ac65b6b9c0b4f25b948a8f665463014d"
+  integrity sha512-AxylVB3FXeOTQXNXyiuAQJSvss62FEotbX2Pzx3K/7c+MKJMdSg6Ose6QYllkdCFA8EInCJVw7M/o5QbLuA4ZQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/plugin-transform-react-display-name" "^7.7.4"
-    "@babel/plugin-transform-react-jsx" "^7.7.4"
-    "@babel/plugin-transform-react-jsx-self" "^7.7.4"
-    "@babel/plugin-transform-react-jsx-source" "^7.7.4"
+    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/plugin-transform-react-display-name" "^7.8.3"
+    "@babel/plugin-transform-react-jsx" "^7.9.4"
+    "@babel/plugin-transform-react-jsx-development" "^7.9.0"
+    "@babel/plugin-transform-react-jsx-self" "^7.9.0"
+    "@babel/plugin-transform-react-jsx-source" "^7.9.0"
 
 "@babel/preset-typescript@7.3.3":
   version "7.3.3"
@@ -1623,18 +1045,18 @@
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/plugin-transform-typescript" "^7.3.2"
 
-"@babel/preset-typescript@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/preset-typescript/-/preset-typescript-7.7.4.tgz#780059a78e6fa7f7a4c87f027292a86b31ce080a"
-  integrity sha512-rqrjxfdiHPsnuPur0jKrIIGQCIgoTWMTjlbWE69G4QJ6TIOVnnRnIJhUxNTL/VwDmEAVX08Tq3B1nirer5341w==
+"@babel/preset-typescript@^7.9.0":
+  version "7.9.0"
+  resolved "https://registry.yarnpkg.com/@babel/preset-typescript/-/preset-typescript-7.9.0.tgz#87705a72b1f0d59df21c179f7c3d2ef4b16ce192"
+  integrity sha512-S4cueFnGrIbvYJgwsVFKdvOmpiL0XGw9MFW9D0vgRys5g36PBhZRL8NX8Gr2akz8XRtzq6HuDXPD/1nniagNUg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/plugin-transform-typescript" "^7.7.4"
+    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/plugin-transform-typescript" "^7.9.0"
 
-"@babel/register@^7.7.0":
-  version "7.7.0"
-  resolved "https://registry.yarnpkg.com/@babel/register/-/register-7.7.0.tgz#4e23ecf840296ef79c605baaa5c89e1a2426314b"
-  integrity sha512-HV3GJzTvSoyOMWGYn2TAh6uL6g+gqKTgEZ99Q3+X9UURT1VPT/WcU46R61XftIc5rXytcOHZ4Z0doDlsjPomIg==
+"@babel/register@^7.9.0":
+  version "7.9.0"
+  resolved "https://registry.yarnpkg.com/@babel/register/-/register-7.9.0.tgz#02464ede57548bddbb5e9f705d263b7c3f43d48b"
+  integrity sha512-Tv8Zyi2J2VRR8g7pC5gTeIN8Ihultbmk0ocyNz8H2nEZbmhp1N6q0A1UGsQbDvGP/sNinQKUHf3SqXwqjtFv4Q==
   dependencies:
     find-cache-dir "^2.0.0"
     lodash "^4.17.13"
@@ -1642,21 +1064,13 @@
     pirates "^4.0.0"
     source-map-support "^0.5.16"
 
-"@babel/runtime-corejs2@^7.2.0", "@babel/runtime-corejs2@^7.4.2":
-  version "7.5.5"
-  resolved "https://registry.yarnpkg.com/@babel/runtime-corejs2/-/runtime-corejs2-7.5.5.tgz#c3214c08ef20341af4187f1c9fbdc357fbec96b2"
-  integrity sha512-FYATQVR00NSNi7mUfpPDp7E8RYMXDuO8gaix7u/w3GekfUinKgX1AcTxs7SoiEmoEW9mbpjrwqWSW6zCmw5h8A==
-  dependencies:
-    core-js "^2.6.5"
-    regenerator-runtime "^0.13.2"
-
-"@babel/runtime-corejs2@^7.6.3":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/runtime-corejs2/-/runtime-corejs2-7.7.4.tgz#b9c2b1b5882762005785bc47740195a0ac780888"
-  integrity sha512-hKNcmHQbBSJFnZ82ewYtWDZ3fXkP/l1XcfRtm7c8gHPM/DMecJtFFBEp7KMLZTuHwwb7RfemHdsEnd7L916Z6A==
+"@babel/runtime-corejs2@^7.2.0", "@babel/runtime-corejs2@^7.4.2", "@babel/runtime-corejs2@^7.6.3":
+  version "7.9.2"
+  resolved "https://registry.yarnpkg.com/@babel/runtime-corejs2/-/runtime-corejs2-7.9.2.tgz#f11d074ff99b9b4319b5ecf0501f12202bf2bf4d"
+  integrity sha512-ayjSOxuK2GaSDJFCtLgHnYjuMyIpViNujWrZo8GUpN60/n7juzJKK5yOo6RFVb0zdU9ACJFK+MsZrUnj3OmXMw==
   dependencies:
     core-js "^2.6.5"
-    regenerator-runtime "^0.13.2"
+    regenerator-runtime "^0.13.4"
 
 "@babel/runtime@7.0.0-beta.54":
   version "7.0.0-beta.54"
@@ -1680,140 +1094,43 @@
   dependencies:
     regenerator-runtime "^0.13.2"
 
-"@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.4.0", "@babel/runtime@^7.4.2", "@babel/runtime@^7.4.4", "@babel/runtime@^7.4.5", "@babel/runtime@^7.5.0", "@babel/runtime@^7.5.1", "@babel/runtime@^7.5.4", "@babel/runtime@^7.5.5", "@babel/runtime@^7.6.0", "@babel/runtime@^7.6.2", "@babel/runtime@^7.6.3", "@babel/runtime@^7.7.2":
-  version "7.7.6"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.7.6.tgz#d18c511121aff1b4f2cd1d452f1bac9601dd830f"
-  integrity sha512-BWAJxpNVa0QlE5gZdWjSxXtemZyZ9RmrmVozxt3NUXeZhVIJ5ANyqmMc0JDrivBZyxUuQvFxlvH4OWWOogGfUw==
-  dependencies:
-    regenerator-runtime "^0.13.2"
-
-"@babel/runtime@^7.7.4":
-  version "7.7.7"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.7.7.tgz#194769ca8d6d7790ec23605af9ee3e42a0aa79cf"
-  integrity sha512-uCnC2JEVAu8AKB5do1WRIsvrdJ0flYx/A/9f/6chdacnEZ7LmavjdsDXr5ksYBegxtuTPR5Va9/+13QF/kFkCA==
-  dependencies:
-    regenerator-runtime "^0.13.2"
-
-"@babel/template@^7.0.0", "@babel/template@^7.1.0", "@babel/template@^7.4.0", "@babel/template@^7.4.4":
-  version "7.4.4"
-  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.4.4.tgz#f4b88d1225689a08f5bc3a17483545be9e4ed237"
-  integrity sha512-CiGzLN9KgAvgZsnivND7rkA+AeJ9JB0ciPOD4U59GKbQP2iQl+olF1l76kJOupqidozfZ32ghwBEJDhnk9MEcw==
-  dependencies:
-    "@babel/code-frame" "^7.0.0"
-    "@babel/parser" "^7.4.4"
-    "@babel/types" "^7.4.4"
-
-"@babel/template@^7.6.0":
-  version "7.6.0"
-  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.6.0.tgz#7f0159c7f5012230dad64cca42ec9bdb5c9536e6"
-  integrity sha512-5AEH2EXD8euCk446b7edmgFdub/qfH1SN6Nii3+fyXP807QRx9Q73A2N5hNwRRslC2H9sNzaFhsPubkS4L8oNQ==
-  dependencies:
-    "@babel/code-frame" "^7.0.0"
-    "@babel/parser" "^7.6.0"
-    "@babel/types" "^7.6.0"
-
-"@babel/template@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.7.4.tgz#428a7d9eecffe27deac0a98e23bf8e3675d2a77b"
-  integrity sha512-qUzihgVPguAzXCK7WXw8pqs6cEwi54s3E+HrejlkuWO6ivMKx9hZl3Y2fSXp9i5HgyWmj7RKP+ulaYnKM4yYxw==
-  dependencies:
-    "@babel/code-frame" "^7.0.0"
-    "@babel/parser" "^7.7.4"
-    "@babel/types" "^7.7.4"
-
-"@babel/traverse@^7.0.0", "@babel/traverse@^7.1.0", "@babel/traverse@^7.4.3", "@babel/traverse@^7.4.4", "@babel/traverse@^7.5.5":
-  version "7.5.5"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.5.5.tgz#f664f8f368ed32988cd648da9f72d5ca70f165bb"
-  integrity sha512-MqB0782whsfffYfSjH4TM+LMjrJnhCNEDMDIjeTpl+ASaUvxcjoiVCo/sM1GhS1pHOXYfWVCYneLjMckuUxDaQ==
-  dependencies:
-    "@babel/code-frame" "^7.5.5"
-    "@babel/generator" "^7.5.5"
-    "@babel/helper-function-name" "^7.1.0"
-    "@babel/helper-split-export-declaration" "^7.4.4"
-    "@babel/parser" "^7.5.5"
-    "@babel/types" "^7.5.5"
-    debug "^4.1.0"
-    globals "^11.1.0"
-    lodash "^4.17.13"
-
-"@babel/traverse@^7.1.6", "@babel/traverse@^7.6.0":
-  version "7.6.2"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.6.2.tgz#b0e2bfd401d339ce0e6c05690206d1e11502ce2c"
-  integrity sha512-8fRE76xNwNttVEF2TwxJDGBLWthUkHWSldmfuBzVRmEDWOtu4XdINTgN7TDWzuLg4bbeIMLvfMFD9we5YcWkRQ==
-  dependencies:
-    "@babel/code-frame" "^7.5.5"
-    "@babel/generator" "^7.6.2"
-    "@babel/helper-function-name" "^7.1.0"
-    "@babel/helper-split-export-declaration" "^7.4.4"
-    "@babel/parser" "^7.6.2"
-    "@babel/types" "^7.6.0"
-    debug "^4.1.0"
-    globals "^11.1.0"
-    lodash "^4.17.13"
-
-"@babel/traverse@^7.4.5":
-  version "7.6.3"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.6.3.tgz#66d7dba146b086703c0fb10dd588b7364cec47f9"
-  integrity sha512-unn7P4LGsijIxaAJo/wpoU11zN+2IaClkQAxcJWBNCMS6cmVh802IyLHNkAjQ0iYnRS3nnxk5O3fuXW28IMxTw==
-  dependencies:
-    "@babel/code-frame" "^7.5.5"
-    "@babel/generator" "^7.6.3"
-    "@babel/helper-function-name" "^7.1.0"
-    "@babel/helper-split-export-declaration" "^7.4.4"
-    "@babel/parser" "^7.6.3"
-    "@babel/types" "^7.6.3"
-    debug "^4.1.0"
-    globals "^11.1.0"
-    lodash "^4.17.13"
-
-"@babel/traverse@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.7.4.tgz#9c1e7c60fb679fe4fcfaa42500833333c2058558"
-  integrity sha512-P1L58hQyupn8+ezVA2z5KBm4/Zr4lCC8dwKCMYzsa5jFMDMQAzaBNy9W5VjB+KAmBjb40U7a/H6ao+Xo+9saIw==
-  dependencies:
-    "@babel/code-frame" "^7.5.5"
-    "@babel/generator" "^7.7.4"
-    "@babel/helper-function-name" "^7.7.4"
-    "@babel/helper-split-export-declaration" "^7.7.4"
-    "@babel/parser" "^7.7.4"
-    "@babel/types" "^7.7.4"
+"@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.4.0", "@babel/runtime@^7.4.2", "@babel/runtime@^7.4.4", "@babel/runtime@^7.4.5", "@babel/runtime@^7.5.0", "@babel/runtime@^7.5.1", "@babel/runtime@^7.5.4", "@babel/runtime@^7.5.5", "@babel/runtime@^7.6.0", "@babel/runtime@^7.6.2", "@babel/runtime@^7.6.3", "@babel/runtime@^7.7.2", "@babel/runtime@^7.7.4", "@babel/runtime@^7.8.4", "@babel/runtime@^7.9.2":
+  version "7.9.2"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.9.2.tgz#d90df0583a3a252f09aaa619665367bae518db06"
+  integrity sha512-NE2DtOdufG7R5vnfQUTehdTfNycfUANEtCa9PssN9O/xmTzP4E08UI797ixaei6hBEVL9BI/PsdJS5x7mWoB9Q==
+  dependencies:
+    regenerator-runtime "^0.13.4"
+
+"@babel/template@^7.0.0", "@babel/template@^7.4.0", "@babel/template@^7.4.4", "@babel/template@^7.8.3", "@babel/template@^7.8.6":
+  version "7.8.6"
+  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.8.6.tgz#86b22af15f828dfb086474f964dcc3e39c43ce2b"
+  integrity sha512-zbMsPMy/v0PWFZEhQJ66bqjhH+z0JgMoBWuikXybgG3Gkd/3t5oQ1Rw2WQhnSrsOmsKXnZOx15tkC4qON/+JPg==
+  dependencies:
+    "@babel/code-frame" "^7.8.3"
+    "@babel/parser" "^7.8.6"
+    "@babel/types" "^7.8.6"
+
+"@babel/traverse@^7.0.0", "@babel/traverse@^7.1.0", "@babel/traverse@^7.1.6", "@babel/traverse@^7.4.3", "@babel/traverse@^7.4.5", "@babel/traverse@^7.5.5", "@babel/traverse@^7.8.3", "@babel/traverse@^7.8.6", "@babel/traverse@^7.9.0":
+  version "7.9.0"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.9.0.tgz#d3882c2830e513f4fe4cec9fe76ea1cc78747892"
+  integrity sha512-jAZQj0+kn4WTHO5dUZkZKhbFrqZE7K5LAQ5JysMnmvGij+wOdr+8lWqPeW0BcF4wFwrEXXtdGO7wcV6YPJcf3w==
+  dependencies:
+    "@babel/code-frame" "^7.8.3"
+    "@babel/generator" "^7.9.0"
+    "@babel/helper-function-name" "^7.8.3"
+    "@babel/helper-split-export-declaration" "^7.8.3"
+    "@babel/parser" "^7.9.0"
+    "@babel/types" "^7.9.0"
     debug "^4.1.0"
     globals "^11.1.0"
     lodash "^4.17.13"
 
-"@babel/types@^7.0.0", "@babel/types@^7.2.0", "@babel/types@^7.3.0", "@babel/types@^7.4.0", "@babel/types@^7.4.4", "@babel/types@^7.5.5":
-  version "7.5.5"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.5.5.tgz#97b9f728e182785909aa4ab56264f090a028d18a"
-  integrity sha512-s63F9nJioLqOlW3UkyMd+BYhXt44YuaFm/VV0VwuteqjYwRrObkU7ra9pY4wAJR3oXi8hJrMcrcJdO/HH33vtw==
-  dependencies:
-    esutils "^2.0.2"
-    lodash "^4.17.13"
-    to-fast-properties "^2.0.0"
-
-"@babel/types@^7.6.0":
-  version "7.6.1"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.6.1.tgz#53abf3308add3ac2a2884d539151c57c4b3ac648"
-  integrity sha512-X7gdiuaCmA0uRjCmRtYJNAVCc/q+5xSgsfKJHqMN4iNLILX39677fJE1O40arPMh0TTtS9ItH67yre6c7k6t0g==
-  dependencies:
-    esutils "^2.0.2"
-    lodash "^4.17.13"
-    to-fast-properties "^2.0.0"
-
-"@babel/types@^7.6.3":
-  version "7.6.3"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.6.3.tgz#3f07d96f854f98e2fbd45c64b0cb942d11e8ba09"
-  integrity sha512-CqbcpTxMcpuQTMhjI37ZHVgjBkysg5icREQIEZ0eG1yCNwg3oy+5AaLiOKmjsCj6nqOsa6Hf0ObjRVwokb7srA==
-  dependencies:
-    esutils "^2.0.2"
-    lodash "^4.17.13"
-    to-fast-properties "^2.0.0"
-
-"@babel/types@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.7.4.tgz#516570d539e44ddf308c07569c258ff94fde9193"
-  integrity sha512-cz5Ji23KCi4T+YIE/BolWosrJuSmoZeN1EFnRtBwF+KKLi8GG/Z2c2hOJJeCXPk4mwk4QFvTmwIodJowXgttRA==
+"@babel/types@^7.0.0", "@babel/types@^7.2.0", "@babel/types@^7.3.0", "@babel/types@^7.4.0", "@babel/types@^7.4.4", "@babel/types@^7.5.5", "@babel/types@^7.8.3", "@babel/types@^7.8.6", "@babel/types@^7.9.0":
+  version "7.9.0"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.9.0.tgz#00b064c3df83ad32b2dbf5ff07312b15c7f1efb5"
+  integrity sha512-BS9JKfXkzzJl8RluW4JGknzpiUV7ZrvTayM6yfqLTVBEnFtyowVIOu6rqxRd5cVO6yGoWf4T8u8dgK9oB+GCng==
   dependencies:
-    esutils "^2.0.2"
+    "@babel/helper-validator-identifier" "^7.9.0"
     lodash "^4.17.13"
     to-fast-properties "^2.0.0"
 
@@ -8449,6 +7766,16 @@ browserslist@^4.6.0, browserslist@^4.6.6, browserslist@^4.8.3:
     electron-to-chromium "^1.3.338"
     node-releases "^1.1.46"
 
+browserslist@^4.9.1:
+  version "4.11.0"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.11.0.tgz#aef4357b10a8abda00f97aac7cd587b2082ba1ad"
+  integrity sha512-WqEC7Yr5wUH5sg6ruR++v2SGOQYpyUdYYd4tZoAq1F7y+QXoLoYGXVbxhtaIqWmAJjtNTRjVD3HuJc1OXTel2A==
+  dependencies:
+    caniuse-lite "^1.0.30001035"
+    electron-to-chromium "^1.3.380"
+    node-releases "^1.1.52"
+    pkg-up "^3.1.0"
+
 bser@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/bser/-/bser-2.0.0.tgz#9ac78d3ed5d915804fd87acb158bc797147a1719"
@@ -8854,6 +8181,11 @@ caniuse-lite@^1.0.30000984, caniuse-lite@^1.0.30001020, caniuse-lite@^1.0.300010
   resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001022.tgz#9eeffe580c3a8f110b7b1742dcf06a395885e4c6"
   integrity sha512-FjwPPtt/I07KyLPkBQ0g7/XuZg6oUkYBVnPHNj3VHJbOjmmJ/GdSo/GUY6MwINEQvjhP6WZVbX8Tvms8xh0D5A==
 
+caniuse-lite@^1.0.30001035:
+  version "1.0.30001036"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001036.tgz#930ea5272010d8bf190d859159d757c0b398caf0"
+  integrity sha512-jU8CIFIj2oR7r4W+5AKcsvWNVIb6Q6OZE3UsrXrZBHFtreT4YgTeOJtTucp+zSedEpTi3L5wASSP0LYIE3if6w==
+
 capture-exit@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/capture-exit/-/capture-exit-2.0.0.tgz#fb953bfaebeb781f62898239dabb426d08a509a4"
@@ -9788,6 +9120,11 @@ commander@^3.0.0:
   resolved "https://registry.yarnpkg.com/commander/-/commander-3.0.0.tgz#0641ea00838c7a964627f04cddc336a2deddd60a"
   integrity sha512-pl3QrGOBa9RZaslQiqnnKX2J068wcQw7j9AIaBQ9/JEp5RY6je4jKTImg0Bd+rpoONSe7GUFSgkxLeo17m3Pow==
 
+commander@^4.0.1:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-4.1.1.tgz#9fd602bd936294e9e9ef46a3f4d6964044b18068"
+  integrity sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==
+
 commander@~2.8.1:
   version "2.8.1"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.8.1.tgz#06be367febfda0c330aa1e2a072d3dc9762425d4"
@@ -10089,7 +9426,7 @@ contour_plot@^0.0.1:
   resolved "https://registry.yarnpkg.com/contour_plot/-/contour_plot-0.0.1.tgz#475870f032b8e338412aa5fc507880f0bf495c77"
   integrity sha1-R1hw8DK44zhBKqX8UHiA8L9JXHc=
 
-convert-source-map@1.7.0:
+convert-source-map@1.7.0, convert-source-map@^1.7.0:
   version "1.7.0"
   resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.7.0.tgz#17a2cb882d7f77d3490585e2ce6c524424a3a442"
   integrity sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==
@@ -10226,6 +9563,14 @@ core-js-compat@^3.1.1:
     core-js-pure "3.1.3"
     semver "^6.1.0"
 
+core-js-compat@^3.6.2:
+  version "3.6.4"
+  resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.6.4.tgz#938476569ebb6cda80d339bcf199fae4f16fff17"
+  integrity sha512-zAa3IZPvsJ0slViBQ2z+vgyyTuhd3MFn1rBQjZSKVEgB0UMYhUkCj9jJUVPgGTGqWvsBVmfnruXgTcNyTlEiSA==
+  dependencies:
+    browserslist "^4.8.3"
+    semver "7.0.0"
+
 core-js-pure@3.1.3:
   version "3.1.3"
   resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.1.3.tgz#4c90752d5b9471f641514f3728f51c1e0783d0b5"
@@ -12209,6 +11554,11 @@ electron-to-chromium@^1.3.191, electron-to-chromium@^1.3.338:
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.340.tgz#5d4fe78e984d4211194cf5a52e08069543da146f"
   integrity sha512-hRFBAglhcj5iVYH+o8QU0+XId1WGoc0VGowJB1cuJAt3exHGrivZvWeAO5BRgBZqwZtwxjm8a5MQeGoT/Su3ww==
 
+electron-to-chromium@^1.3.380:
+  version "1.3.382"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.382.tgz#cad02da655c33f7a3d6ca7525bd35c17e90f3a8f"
+  integrity sha512-gJfxOcgnBlXhfnUUObsq3n3ReU8CT6S8je97HndYRkKsNZMJJ38zO/pI5aqO7L3Myfq+E3pqPyKK/ynyLEQfBA==
+
 elegant-spinner@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/elegant-spinner/-/elegant-spinner-1.0.1.tgz#db043521c95d7e303fd8f345bedc3349cfb0729e"
@@ -13135,7 +12485,7 @@ estree-is-function@^1.0.0:
   resolved "https://registry.yarnpkg.com/estree-is-function/-/estree-is-function-1.0.0.tgz#c0adc29806d7f18a74db7df0f3b2666702e37ad2"
   integrity sha512-nSCWn1jkSq2QAtkaVLJZY2ezwcFO161HVc174zL1KPW3RJ+O6C3eJb8Nx7OXzvhoEv+nLgSR1g71oWUHUDTrJA==
 
-esutils@^2.0.0, esutils@^2.0.2:
+esutils@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.2.tgz#0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b"
   integrity sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=
@@ -14697,6 +14047,11 @@ generic-pool@^3.7.1:
   resolved "https://registry.yarnpkg.com/generic-pool/-/generic-pool-3.7.1.tgz#36fe5bb83e7e0e032e5d32cd05dc00f5ff119aa8"
   integrity sha512-ug6DAZoNgWm6q5KhPFA+hzXfBLFQu5sTXxPpv44DmE0A2g+CiHoq9LTVdkXpZMkYVMoGw83F6W+WT0h0MFMK/w==
 
+gensync@^1.0.0-beta.1:
+  version "1.0.0-beta.1"
+  resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.1.tgz#58f4361ff987e5ff6e1e7a210827aa371eaac269"
+  integrity sha512-r8EC6NO1sngH/zdD9fiRDLdcgnbayXah+mLgManTaIZJqEC1MZstmnox8KpnI2/fxQwrp5OpCOYWLp4rBl4Jcg==
+
 geojson-area@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/geojson-area/-/geojson-area-0.2.1.tgz#2537b0982db86309f21d2c428a4257c7a6282cc6"
@@ -18758,6 +18113,13 @@ json5@^2.1.0:
   dependencies:
     minimist "^1.2.0"
 
+json5@^2.1.2:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/json5/-/json5-2.1.2.tgz#43ef1f0af9835dd624751a6b7fa48874fb2d608e"
+  integrity sha512-MoUOQ4WdiN3yxhm7NEVJSJrieAo5hNSLQ5sj05OTRHPL9HOBy8u4Bu88jsC1jvqAdN+E1bJmsUcZH+1HQxliqQ==
+  dependencies:
+    minimist "^1.2.5"
+
 jsonfile@^2.1.0:
   version "2.4.0"
   resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-2.4.0.tgz#3736a2b428b87bbda0cc83b53fa3d633a35c2ae8"
@@ -19298,6 +18660,13 @@ leven@^3.1.0:
   resolved "https://registry.yarnpkg.com/leven/-/leven-3.1.0.tgz#77891de834064cccba82ae7842bb6b14a13ed7f2"
   integrity sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==
 
+levenary@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/levenary/-/levenary-1.1.1.tgz#842a9ee98d2075aa7faeedbe32679e9205f46f77"
+  integrity sha512-mkAdOIt79FD6irqjYSs4rdbnlT5vRonMEvBVPVb3XmevfS8kgRXwfes0dhPdEtzTWD/1eNE/Bm/G1iRt6DcnQQ==
+  dependencies:
+    leven "^3.1.0"
+
 levn@^0.3.0, levn@~0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee"
@@ -21601,6 +20970,13 @@ node-releases@^1.1.25, node-releases@^1.1.46:
   dependencies:
     semver "^6.3.0"
 
+node-releases@^1.1.52:
+  version "1.1.52"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.52.tgz#bcffee3e0a758e92e44ecfaecd0a47554b0bcba9"
+  integrity sha512-snSiT1UypkgGt2wxPqS6ImEUICbNCMb31yaxWrOLXjhlt2z2/IBpaOxzONExqSm4y5oLnAqjjRWu+wsDzK5yNQ==
+  dependencies:
+    semver "^6.3.0"
+
 node-sass@^4.13.0, node-sass@^4.13.1:
   version "4.13.1"
   resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-4.13.1.tgz#9db5689696bb2eec2c32b98bfea4c7a2e992d0a3"
@@ -22366,15 +21742,6 @@ osenv@0, osenv@^0.1.0:
     os-homedir "^1.0.0"
     os-tmpdir "^1.0.0"
 
-output-file-sync@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/output-file-sync/-/output-file-sync-2.0.1.tgz#f53118282f5f553c2799541792b723a4c71430c0"
-  integrity sha512-mDho4qm7WgIXIGf4eYU1RHN2UU5tPfVYVSRwDJw0uTmj35DQUt/eNp19N7v6T3SrR0ESTEf2up2CGO73qI35zQ==
-  dependencies:
-    graceful-fs "^4.1.11"
-    is-plain-obj "^1.1.0"
-    mkdirp "^0.5.1"
-
 p-all@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/p-all/-/p-all-2.1.0.tgz#91419be56b7dee8fe4c5db875d55e0da084244a0"
@@ -23517,7 +22884,7 @@ prismjs@^1.8.4, prismjs@~1.16.0:
   optionalDependencies:
     clipboard "^2.0.0"
 
-private@^0.1.6, private@^0.1.8, private@~0.1.5:
+private@^0.1.8, private@~0.1.5:
   version "0.1.8"
   resolved "https://registry.yarnpkg.com/private/-/private-0.1.8.tgz#2381edb3689f7a53d653190060fcf822d2f368ff"
   integrity sha512-VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg==
@@ -25457,17 +24824,10 @@ refractor@^2.4.1:
     parse-entities "^1.1.2"
     prismjs "~1.16.0"
 
-regenerate-unicode-properties@^8.0.2:
-  version "8.0.2"
-  resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-8.0.2.tgz#7b38faa296252376d363558cfbda90c9ce709662"
-  integrity sha512-SbA/iNrBUf6Pv2zU8Ekv1Qbhv92yxL4hiDa2siuxs4KKn4oOoMDHXjAf7+Nz9qinUQ46B1LcWEi/PhJfPWpZWQ==
-  dependencies:
-    regenerate "^1.4.0"
-
-regenerate-unicode-properties@^8.1.0:
-  version "8.1.0"
-  resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-8.1.0.tgz#ef51e0f0ea4ad424b77bf7cb41f3e015c70a3f0e"
-  integrity sha512-LGZzkgtLY79GeXLm8Dp0BVLdQlWICzBnJz/ipWUgo59qBaZ+BHtq51P2q1uVZlppMuUAT37SDk39qUbjTWB7bA==
+regenerate-unicode-properties@^8.2.0:
+  version "8.2.0"
+  resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-8.2.0.tgz#e5de7111d655e7ba60c057dbe9ff37c87e65cdec"
+  integrity sha512-F9DjY1vKLo/tPePDycuH3dn9H1OTPIkVD9Kz4LODu+F2C75mgjAJ7x/gwy6ZcSNRAAkhNlJSOHRe8k3p+K9WhA==
   dependencies:
     regenerate "^1.4.0"
 
@@ -25501,12 +24861,18 @@ regenerator-runtime@^0.13.3:
   resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.3.tgz#7cf6a77d8f5c6f60eb73c5fc1955b2ceb01e6bf5"
   integrity sha512-naKIZz2GQ8JWh///G7L3X6LaQUAMp2lvb1rvwwsURe/VXwD6VMfr+/1NuNw3ag8v2kY1aQ/go5SNn79O9JU7yw==
 
-regenerator-transform@^0.14.0:
-  version "0.14.0"
-  resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.14.0.tgz#2ca9aaf7a2c239dd32e4761218425b8c7a86ecaf"
-  integrity sha512-rtOelq4Cawlbmq9xuMR5gdFmv7ku/sFoB7sRiywx7aq53bc52b4j6zvH7Te1Vt/X2YveDKnCGUbioieU7FEL3w==
+regenerator-runtime@^0.13.4:
+  version "0.13.5"
+  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz#d878a1d094b4306d10b9096484b33ebd55e26697"
+  integrity sha512-ZS5w8CpKFinUzOwW3c83oPeVXoNsrLsaCoLtJvAClH135j/R77RuymhiSErhm2lKcwSCIpmvIWSbDkIfAqKQlA==
+
+regenerator-transform@^0.14.2:
+  version "0.14.4"
+  resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.14.4.tgz#5266857896518d1616a78a0479337a30ea974cc7"
+  integrity sha512-EaJaKPBI9GvKpvUz2mz4fhx7WPgvwRLY9v3hlNHWmAuJHI13T4nwKnNvm5RWJzEdnI5g5UwtOww+S8IdoUC2bw==
   dependencies:
-    private "^0.1.6"
+    "@babel/runtime" "^7.8.4"
+    private "^0.1.8"
 
 regex-not@^1.0.0:
   version "1.0.0"
@@ -25533,16 +24899,6 @@ regex-regex@^1.0.0:
   resolved "https://registry.yarnpkg.com/regex-regex/-/regex-regex-1.0.0.tgz#9048a1eaeb870f4d480dabc76fc42cdcc0bc3a72"
   integrity sha1-kEih6uuHD01IDavHb8Qs3MC8OnI=
 
-regexp-tree@^0.1.13:
-  version "0.1.13"
-  resolved "https://registry.yarnpkg.com/regexp-tree/-/regexp-tree-0.1.13.tgz#5b19ab9377edc68bc3679256840bb29afc158d7f"
-  integrity sha512-hwdV/GQY5F8ReLZWO+W1SRoN5YfpOKY6852+tBFcma72DKBIcHjPRIlIvQN35bCOljuAfP2G2iB0FC/w236mUw==
-
-regexp-tree@^0.1.6:
-  version "0.1.10"
-  resolved "https://registry.yarnpkg.com/regexp-tree/-/regexp-tree-0.1.10.tgz#d837816a039c7af8a8d64d7a7c3cf6a1d93450bc"
-  integrity sha512-K1qVSbcedffwuIslMwpe6vGlj+ZXRnGkvjAtFHfDZZZuEdA/h0dxljAPu9vhUo6Rrx2U2AwJ+nSQ6hK+lrP5MQ==
-
 regexp.prototype.flags@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.2.0.tgz#6b30724e306a27833eeb171b66ac8890ba37e41c"
@@ -25560,29 +24916,17 @@ regexpp@^3.0.0:
   resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.0.0.tgz#dd63982ee3300e67b41c1956f850aa680d9d330e"
   integrity sha512-Z+hNr7RAVWxznLPuA7DIh8UNX1j9CDrUQxskw9IrBE1Dxue2lyXT+shqEIeLUjrokxIP8CMy1WkjgG3rTsd5/g==
 
-regexpu-core@^4.5.4:
-  version "4.5.4"
-  resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.5.4.tgz#080d9d02289aa87fe1667a4f5136bc98a6aebaae"
-  integrity sha512-BtizvGtFQKGPUcTy56o3nk1bGRp4SZOTYrDtGNlqCQufptV5IkkLN6Emw+yunAJjzf+C9FQFtvq7IoA3+oMYHQ==
-  dependencies:
-    regenerate "^1.4.0"
-    regenerate-unicode-properties "^8.0.2"
-    regjsgen "^0.5.0"
-    regjsparser "^0.6.0"
-    unicode-match-property-ecmascript "^1.0.4"
-    unicode-match-property-value-ecmascript "^1.1.0"
-
-regexpu-core@^4.6.0:
-  version "4.6.0"
-  resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.6.0.tgz#2037c18b327cfce8a6fea2a4ec441f2432afb8b6"
-  integrity sha512-YlVaefl8P5BnFYOITTNzDvan1ulLOiXJzCNZxduTIosN17b87h3bvG9yHMoHaRuo88H4mQ06Aodj5VtYGGGiTg==
+regexpu-core@^4.7.0:
+  version "4.7.0"
+  resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.7.0.tgz#fcbf458c50431b0bb7b45d6967b8192d91f3d938"
+  integrity sha512-TQ4KXRnIn6tz6tjnrXEkD/sshygKH/j5KzK86X8MkeHyZ8qst/LZ89j3X4/8HEIfHANTFIP/AbXakeRhWIl5YQ==
   dependencies:
     regenerate "^1.4.0"
-    regenerate-unicode-properties "^8.1.0"
-    regjsgen "^0.5.0"
-    regjsparser "^0.6.0"
+    regenerate-unicode-properties "^8.2.0"
+    regjsgen "^0.5.1"
+    regjsparser "^0.6.4"
     unicode-match-property-ecmascript "^1.0.4"
-    unicode-match-property-value-ecmascript "^1.1.0"
+    unicode-match-property-value-ecmascript "^1.2.0"
 
 registry-auth-token@^3.0.1, registry-auth-token@^3.3.2:
   version "3.3.2"
@@ -25599,15 +24943,15 @@ registry-url@^3.0.0, registry-url@^3.0.3, registry-url@^3.1.0:
   dependencies:
     rc "^1.0.1"
 
-regjsgen@^0.5.0:
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.5.0.tgz#a7634dc08f89209c2049adda3525711fb97265dd"
-  integrity sha512-RnIrLhrXCX5ow/E5/Mh2O4e/oa1/jW0eaBKTSy3LaCj+M3Bqvm97GWDp2yUtzIs4LEn65zR2yiYGFqb2ApnzDA==
+regjsgen@^0.5.1:
+  version "0.5.1"
+  resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.5.1.tgz#48f0bf1a5ea205196929c0d9798b42d1ed98443c"
+  integrity sha512-5qxzGZjDs9w4tzT3TPhCJqWdCc3RLYwy9J2NB0nm5Lz+S273lvWcpjaTGHsT1dc6Hhfq41uSEOw8wBmxrKOuyg==
 
-regjsparser@^0.6.0:
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.6.0.tgz#f1e6ae8b7da2bae96c99399b868cd6c933a2ba9c"
-  integrity sha512-RQ7YyokLiQBomUJuUG8iGVvkgOLxwyZM8k6d3q5SAXpg4r5TZJZigKFvC6PpD+qQ98bCDC5YelPeA3EucDoNeQ==
+regjsparser@^0.6.4:
+  version "0.6.4"
+  resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.6.4.tgz#a769f8684308401a66e9b529d2436ff4d0666272"
+  integrity sha512-64O87/dPDgfk8/RQqC4gkZoGyyWFIEUTTh80CU6CWuK5vkCGyekIx+oKcEIYtP/RAxSQltCZHCNu/mdd7fqlJw==
   dependencies:
     jsesc "~0.5.0"
 
@@ -26789,6 +26133,11 @@ semver@5.7.0:
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.0.tgz#790a7cf6fea5459bac96110b29b60412dc8ff96b"
   integrity sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA==
 
+semver@7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e"
+  integrity sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==
+
 semver@^5.5.1:
   version "5.5.1"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.1.tgz#7dfdd8814bdb7cabc7be0fb1d734cfb66c940477"
@@ -30139,10 +29488,10 @@ unicode-match-property-ecmascript@^1.0.4:
     unicode-canonical-property-names-ecmascript "^1.0.4"
     unicode-property-aliases-ecmascript "^1.0.4"
 
-unicode-match-property-value-ecmascript@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.1.0.tgz#5b4b426e08d13a80365e0d657ac7a6c1ec46a277"
-  integrity sha512-hDTHvaBk3RmFzvSl0UVrUmC3PuW9wKVnpoUDYH0JDkSIovzw+J5viQmeYHxVSBptubnr7PbH2e0fnpDRQnQl5g==
+unicode-match-property-value-ecmascript@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.2.0.tgz#0d91f600eeeb3096aa962b1d6fc88876e64ea531"
+  integrity sha512-wjuQHGQVofmSJv1uVISKLE5zO2rNGzM/KCYZch/QQvez7C1hUhBIuZ701fYXExuufJFMPhv2SyL8CyoIfMLbIQ==
 
 unicode-properties@^1.0.0:
   version "1.1.0"

From 7c18d70b2e0a6c789c5af60b47002ed574689e63 Mon Sep 17 00:00:00 2001
From: Thomas Watson <w@tson.dk>
Date: Wed, 25 Mar 2020 17:11:53 +0100
Subject: [PATCH 146/179] Use renamed @mapbox/geojson-rewind instead of
 geojson-rewind module (#61139)

---
 x-pack/package.json                           |  2 +-
 .../util/geo_json_clean_and_validate.js       |  2 +-
 yarn.lock                                     | 20 +++++--------------
 3 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/x-pack/package.json b/x-pack/package.json
index 7430964c8418a..dacde606239b1 100644
--- a/x-pack/package.json
+++ b/x-pack/package.json
@@ -193,6 +193,7 @@
     "@kbn/interpreter": "1.0.0",
     "@kbn/storybook": "1.0.0",
     "@kbn/ui-framework": "1.0.0",
+    "@mapbox/geojson-rewind": "^0.4.1",
     "@mapbox/mapbox-gl-draw": "^1.1.2",
     "@mapbox/mapbox-gl-rtl-text": "^0.2.3",
     "@scant/router": "^0.1.0",
@@ -238,7 +239,6 @@
     "font-awesome": "4.7.0",
     "formsy-react": "^1.1.5",
     "fp-ts": "^2.3.1",
-    "geojson-rewind": "^0.3.1",
     "get-port": "4.2.0",
     "getos": "^3.1.0",
     "git-url-parse": "11.1.2",
diff --git a/x-pack/plugins/file_upload/public/util/geo_json_clean_and_validate.js b/x-pack/plugins/file_upload/public/util/geo_json_clean_and_validate.js
index 25bfba93bfd84..00e852c65c7bf 100644
--- a/x-pack/plugins/file_upload/public/util/geo_json_clean_and_validate.js
+++ b/x-pack/plugins/file_upload/public/util/geo_json_clean_and_validate.js
@@ -5,7 +5,7 @@
  */
 
 import * as jsts from 'jsts';
-import rewind from 'geojson-rewind';
+import rewind from '@mapbox/geojson-rewind';
 
 const geoJSONReader = new jsts.io.GeoJSONReader();
 const geoJSONWriter = new jsts.io.GeoJSONWriter();
diff --git a/yarn.lock b/yarn.lock
index 9fc599c9cd329..7608fedd705a4 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2047,14 +2047,14 @@
   resolved "https://registry.yarnpkg.com/@mapbox/geojson-normalize/-/geojson-normalize-0.0.1.tgz#1da1e6b3a7add3ad29909b30f438f60581b7cd80"
   integrity sha1-HaHms6et060pkJsw9Dj2BYG3zYA=
 
-"@mapbox/geojson-rewind@^0.4.0":
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/@mapbox/geojson-rewind/-/geojson-rewind-0.4.0.tgz#0d3632d4c1b4a928cf10a06ade387e1c8a8c181b"
-  integrity sha512-b+1uPWBERW4Pet/969BNu61ZPDyH2ilIxBjJDFzxyS9TyszF9UrTQyYIl/G38clux3rtpAGGFSGTCSF/qR6UjA==
+"@mapbox/geojson-rewind@^0.4.0", "@mapbox/geojson-rewind@^0.4.1":
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/@mapbox/geojson-rewind/-/geojson-rewind-0.4.1.tgz#357d79300adb7fec7c1f091512988bca6458f068"
+  integrity sha512-mxo2MEr7izA1uOXcDsw99Kgg6xW3P4H2j4n1lmldsgviIelpssvP+jQDivFKOHrOVJDpTTi5oZJvRcHtU9Uufw==
   dependencies:
     "@mapbox/geojson-area" "0.2.2"
     concat-stream "~1.6.0"
-    minimist "1.2.0"
+    minimist "^1.2.5"
     sharkdown "^0.1.0"
 
 "@mapbox/geojson-types@^1.0.2":
@@ -14077,16 +14077,6 @@ geojson-random@^0.2.2:
   resolved "https://registry.yarnpkg.com/geojson-random/-/geojson-random-0.2.2.tgz#ab4838f126adc5e16f8f94e655def820f9119dbc"
   integrity sha1-q0g48SatxeFvj5TmVd74IPkRnbw=
 
-geojson-rewind@^0.3.1:
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/geojson-rewind/-/geojson-rewind-0.3.1.tgz#22240797c847cc2f0c1d313e4aa0c915afa7f29d"
-  integrity sha1-IiQHl8hHzC8MHTE+SqDJFa+n8p0=
-  dependencies:
-    "@mapbox/geojson-area" "0.2.2"
-    concat-stream "~1.6.0"
-    minimist "1.2.0"
-    sharkdown "^0.1.0"
-
 geojson-vt@^3.2.1:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/geojson-vt/-/geojson-vt-3.2.1.tgz#f8adb614d2c1d3f6ee7c4265cad4bbf3ad60c8b7"

From 6d924c59961edc66f19f3eff0cbc7a03f638fe81 Mon Sep 17 00:00:00 2001
From: Stacey Gammon <gammon@elastic.co>
Date: Wed, 25 Mar 2020 12:12:40 -0400
Subject: [PATCH 147/179] Embeddable cleanup: remove unused, non-serializable,
 input params (#61102)

* remove unused, non-serializable, input params

* Fix merge mistakes
---
 .../np_ready/public/embeddable/visualize_embeddable.ts       | 5 -----
 .../public/embeddable/visualize_embeddable_factory.tsx       | 2 --
 2 files changed, 7 deletions(-)

diff --git a/src/legacy/core_plugins/visualizations/public/np_ready/public/embeddable/visualize_embeddable.ts b/src/legacy/core_plugins/visualizations/public/np_ready/public/embeddable/visualize_embeddable.ts
index 342824bade3dd..3739d1af6fc40 100644
--- a/src/legacy/core_plugins/visualizations/public/np_ready/public/embeddable/visualize_embeddable.ts
+++ b/src/legacy/core_plugins/visualizations/public/np_ready/public/embeddable/visualize_embeddable.ts
@@ -41,7 +41,6 @@ import {
   IExpressionLoaderParams,
   ExpressionsStart,
 } from '../../../../../../../plugins/expressions/public';
-import { PersistedState } from '../../../../../../../plugins/visualizations/public';
 import { buildPipeline } from '../legacy/build_pipeline';
 import { Vis } from '../vis';
 import { getExpressions, getUiActions } from '../services';
@@ -54,8 +53,6 @@ export interface VisualizeEmbeddableConfiguration {
   indexPatterns?: IIndexPattern[];
   editUrl: string;
   editable: boolean;
-  appState?: { save(): void };
-  uiState?: PersistedState;
 }
 
 export interface VisualizeInput extends EmbeddableInput {
@@ -65,8 +62,6 @@ export interface VisualizeInput extends EmbeddableInput {
   vis?: {
     colors?: { [key: string]: string };
   };
-  appState?: { save(): void };
-  uiState?: PersistedState;
 }
 
 export interface VisualizeOutput extends EmbeddableOutput {
diff --git a/src/legacy/core_plugins/visualizations/public/np_ready/public/embeddable/visualize_embeddable_factory.tsx b/src/legacy/core_plugins/visualizations/public/np_ready/public/embeddable/visualize_embeddable_factory.tsx
index 911f5530e97e3..36d3d8bb07d29 100644
--- a/src/legacy/core_plugins/visualizations/public/np_ready/public/embeddable/visualize_embeddable_factory.tsx
+++ b/src/legacy/core_plugins/visualizations/public/np_ready/public/embeddable/visualize_embeddable_factory.tsx
@@ -122,8 +122,6 @@ export class VisualizeEmbeddableFactory extends EmbeddableFactory<
           indexPatterns,
           editUrl,
           editable,
-          appState: input.appState,
-          uiState: input.uiState,
         },
         input,
         parent

From 31c745b97cd4f55bd589deae36da2d27191aa449 Mon Sep 17 00:00:00 2001
From: Silvia Mitter <silvia.mitter@elastic.co>
Date: Wed, 25 Mar 2020 17:24:24 +0100
Subject: [PATCH 148/179] update apm index pattern (#61265)

---
 x-pack/plugins/apm/server/tutorial/index_pattern.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x-pack/plugins/apm/server/tutorial/index_pattern.json b/x-pack/plugins/apm/server/tutorial/index_pattern.json
index 4052f4050a31b..ede9ba54681c0 100644
--- a/x-pack/plugins/apm/server/tutorial/index_pattern.json
+++ b/x-pack/plugins/apm/server/tutorial/index_pattern.json
@@ -1,7 +1,7 @@
 {
   "attributes": {
     "fieldFormatMap": "{\"client.bytes\":{\"id\":\"bytes\"},\"client.nat.port\":{\"id\":\"string\"},\"client.port\":{\"id\":\"string\"},\"destination.bytes\":{\"id\":\"bytes\"},\"destination.nat.port\":{\"id\":\"string\"},\"destination.port\":{\"id\":\"string\"},\"event.duration\":{\"id\":\"duration\",\"params\":{\"inputFormat\":\"nanoseconds\",\"outputFormat\":\"asMilliseconds\",\"outputPrecision\":1}},\"event.sequence\":{\"id\":\"string\"},\"event.severity\":{\"id\":\"string\"},\"http.request.body.bytes\":{\"id\":\"bytes\"},\"http.request.bytes\":{\"id\":\"bytes\"},\"http.response.body.bytes\":{\"id\":\"bytes\"},\"http.response.bytes\":{\"id\":\"bytes\"},\"http.response.status_code\":{\"id\":\"string\"},\"log.syslog.facility.code\":{\"id\":\"string\"},\"log.syslog.priority\":{\"id\":\"string\"},\"network.bytes\":{\"id\":\"bytes\"},\"package.size\":{\"id\":\"string\"},\"process.parent.pgid\":{\"id\":\"string\"},\"process.parent.pid\":{\"id\":\"string\"},\"process.parent.ppid\":{\"id\":\"string\"},\"process.parent.thread.id\":{\"id\":\"string\"},\"process.pgid\":{\"id\":\"string\"},\"process.pid\":{\"id\":\"string\"},\"process.ppid\":{\"id\":\"string\"},\"process.thread.id\":{\"id\":\"string\"},\"server.bytes\":{\"id\":\"bytes\"},\"server.nat.port\":{\"id\":\"string\"},\"server.port\":{\"id\":\"string\"},\"source.bytes\":{\"id\":\"bytes\"},\"source.nat.port\":{\"id\":\"string\"},\"source.port\":{\"id\":\"string\"},\"system.cpu.total.norm.pct\":{\"id\":\"percent\"},\"system.memory.actual.free\":{\"id\":\"bytes\"},\"system.memory.total\":{\"id\":\"bytes\"},\"system.process.cpu.total.norm.pct\":{\"id\":\"percent\"},\"system.process.memory.rss.bytes\":{\"id\":\"bytes\"},\"system.process.memory.size\":{\"id\":\"bytes\"},\"url.port\":{\"id\":\"string\"},\"view spans\":{\"id\":\"url\",\"params\":{\"labelTemplate\":\"View Spans\"}}}",
-    "fields": "[{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"@timestamp\",\"scripted\":false,\"searchable\":true,\"type\":\"date\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"labels\",\"scripted\":false,\"searchable\":true},{\"aggregatable\":false,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"message\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"tags\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"agent.ephemeral_id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"agent.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"agent.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"agent.type\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"agent.version\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"as.number\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"as.organization.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":false,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"as.organization.name.text\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"client.address\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"client.as.number\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"client.as.organization.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":false,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"client.as.organization.name.text\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"client.bytes\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"client.domain\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"client.geo.city_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"client.geo.continent_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"client.geo.country_iso_code\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"client.geo.country_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"client.geo.location\",\"scripted\":false,\"searchable\":true,\"type\":\"geo_point\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"client.geo.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"client.geo.region_iso_code\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"client.geo.region_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"client.ip\",\"scripted\":false,\"searchable\":true,\"type\":\"ip\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"client.mac\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"client.nat.ip\",\"scripted\":false,\"searchable\":true,\"type\":\"ip\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"client.nat.port\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"client.packets\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"client.port\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"client.registered_domain\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"client.top_level_domain\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"client.user.domain\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"client.user.email\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"client.user.full_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":false,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"client.user.full_name.text\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"client.user.group.domain\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"client.user.group.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"client.user.group.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"client.user.hash\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"client.user.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"client.user.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":false,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"client.user.name.text\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"cloud.account.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"cloud.availability_zone\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"cloud.instance.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"cloud.instance.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"cloud.machine.type\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"cloud.provider\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"cloud.region\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"container.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"container.image.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"container.image.tag\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"container.labels\",\"scripted\":false,\"searchable\":true},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"container.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"container.runtime\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"destination.address\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"destination.as.number\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"destination.as.organization.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":false,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"destination.as.organization.name.text\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"destination.bytes\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"destination.domain\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"destination.geo.city_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"destination.geo.continent_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"destination.geo.country_iso_code\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"destination.geo.country_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"destination.geo.location\",\"scripted\":false,\"searchable\":true,\"type\":\"geo_point\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"destination.geo.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"destination.geo.region_iso_code\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"destination.geo.region_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"destination.ip\",\"scripted\":false,\"searchable\":true,\"type\":\"ip\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"destination.mac\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"destination.nat.ip\",\"scripted\":false,\"searchable\":true,\"type\":\"ip\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"destination.nat.port\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"destination.packets\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"destination.port\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"destination.registered_domain\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"destination.top_level_domain\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"destination.user.domain\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"destination.user.email\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"destination.user.full_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":false,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"destination.user.full_name.text\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"destination.user.group.domain\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"destination.user.group.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"destination.user.group.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"destination.user.hash\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"destination.user.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"destination.user.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":false,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"destination.user.name.text\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"dns.answers\",\"scripted\":false,\"searchable\":true},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"dns.answers.class\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"dns.answers.data\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"dns.answers.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"dns.answers.ttl\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"dns.answers.type\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"dns.header_flags\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"dns.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"dns.op_code\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"dns.question.class\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"dns.question.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"dns.question.registered_domain\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"dns.question.subdomain\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"dns.question.top_level_domain\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"dns.question.type\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"dns.resolved_ip\",\"scripted\":false,\"searchable\":true,\"type\":\"ip\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"dns.response_code\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"dns.type\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"ecs.version\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"error.code\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":4,\"doc_values\":true,\"indexed\":true,\"name\":\"error.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":false,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"error.message\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"error.stack_trace\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":false,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"error.stack_trace.text\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"error.type\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"event.action\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"event.category\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"event.code\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"event.created\",\"scripted\":false,\"searchable\":true,\"type\":\"date\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"event.dataset\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"event.duration\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"event.end\",\"scripted\":false,\"searchable\":true,\"type\":\"date\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"event.hash\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"event.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"event.ingested\",\"scripted\":false,\"searchable\":true,\"type\":\"date\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"event.kind\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"event.module\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"event.original\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"event.outcome\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"event.provider\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"event.risk_score\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"event.risk_score_norm\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"event.sequence\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"event.severity\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"event.start\",\"scripted\":false,\"searchable\":true,\"type\":\"date\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"event.timezone\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"event.type\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"file.accessed\",\"scripted\":false,\"searchable\":true,\"type\":\"date\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"file.attributes\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"file.created\",\"scripted\":false,\"searchable\":true,\"type\":\"date\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"file.ctime\",\"scripted\":false,\"searchable\":true,\"type\":\"date\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"file.device\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"file.directory\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"file.drive_letter\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"file.extension\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"file.gid\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"file.group\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"file.hash.md5\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"file.hash.sha1\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"file.hash.sha256\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"file.hash.sha512\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"file.inode\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"file.mode\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"file.mtime\",\"scripted\":false,\"searchable\":true,\"type\":\"date\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"file.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"file.owner\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"file.path\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":false,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"file.path.text\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"file.size\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"file.target_path\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":false,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"file.target_path.text\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"file.type\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"file.uid\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"geo.city_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"geo.continent_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"geo.country_iso_code\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"geo.country_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"geo.location\",\"scripted\":false,\"searchable\":true,\"type\":\"geo_point\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"geo.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"geo.region_iso_code\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"geo.region_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"group.domain\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"group.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"group.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"hash.md5\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"hash.sha1\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"hash.sha256\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"hash.sha512\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.architecture\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.domain\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.geo.city_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.geo.continent_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.geo.country_iso_code\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.geo.country_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.geo.location\",\"scripted\":false,\"searchable\":true,\"type\":\"geo_point\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.geo.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.geo.region_iso_code\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.geo.region_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.hostname\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.ip\",\"scripted\":false,\"searchable\":true,\"type\":\"ip\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.mac\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.os.family\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.os.full\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":false,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.os.full.text\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.os.kernel\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.os.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":false,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.os.name.text\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.os.platform\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.os.version\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.type\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.uptime\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.user.domain\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.user.email\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.user.full_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":false,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.user.full_name.text\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.user.group.domain\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.user.group.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.user.group.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.user.hash\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.user.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.user.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":false,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.user.name.text\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"http.request.body.bytes\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"http.request.body.content\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":false,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"http.request.body.content.text\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"http.request.bytes\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"http.request.method\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"http.request.referrer\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"http.response.body.bytes\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"http.response.body.content\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":false,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"http.response.body.content.text\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"http.response.bytes\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"http.response.status_code\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"http.version\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"log.level\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"log.logger\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"log.origin.file.line\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"log.origin.file.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"log.origin.function\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"log.original\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"log.syslog\",\"scripted\":false,\"searchable\":true},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"log.syslog.facility.code\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"log.syslog.facility.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"log.syslog.priority\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"log.syslog.severity.code\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"log.syslog.severity.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"network.application\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"network.bytes\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"network.community_id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"network.direction\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"network.forwarded_ip\",\"scripted\":false,\"searchable\":true,\"type\":\"ip\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"network.iana_number\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"network.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"network.packets\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"network.protocol\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"network.transport\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"network.type\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"observer.geo.city_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"observer.geo.continent_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"observer.geo.country_iso_code\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"observer.geo.country_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"observer.geo.location\",\"scripted\":false,\"searchable\":true,\"type\":\"geo_point\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"observer.geo.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"observer.geo.region_iso_code\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"observer.geo.region_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"observer.hostname\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"observer.ip\",\"scripted\":false,\"searchable\":true,\"type\":\"ip\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"observer.mac\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"observer.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"observer.os.family\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"observer.os.full\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":false,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"observer.os.full.text\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"observer.os.kernel\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"observer.os.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":false,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"observer.os.name.text\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"observer.os.platform\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"observer.os.version\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"observer.product\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"observer.serial_number\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"observer.type\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"observer.vendor\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"observer.version\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"organization.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"organization.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":false,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"organization.name.text\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"os.family\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"os.full\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":false,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"os.full.text\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"os.kernel\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"os.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":false,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"os.name.text\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"os.platform\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"os.version\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"package.architecture\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"package.build_version\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"package.checksum\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"package.description\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"package.install_scope\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"package.installed\",\"scripted\":false,\"searchable\":true,\"type\":\"date\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"package.license\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"package.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"package.path\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"package.reference\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"package.size\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"package.type\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"package.version\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"process.args\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"process.args_count\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"process.command_line\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":false,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"process.command_line.text\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"process.executable\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":false,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"process.executable.text\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"process.exit_code\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"process.hash.md5\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"process.hash.sha1\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"process.hash.sha256\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"process.hash.sha512\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"process.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":false,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"process.name.text\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"process.parent.args\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"process.parent.args_count\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"process.parent.command_line\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":false,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"process.parent.command_line.text\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"process.parent.executable\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":false,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"process.parent.executable.text\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"process.parent.exit_code\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"process.parent.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":false,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"process.parent.name.text\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"process.parent.pgid\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"process.parent.pid\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"process.parent.ppid\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"process.parent.start\",\"scripted\":false,\"searchable\":true,\"type\":\"date\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"process.parent.thread.id\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"process.parent.thread.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"process.parent.title\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":false,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"process.parent.title.text\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"process.parent.uptime\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"process.parent.working_directory\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":false,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"process.parent.working_directory.text\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"process.pgid\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"process.pid\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"process.ppid\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"process.start\",\"scripted\":false,\"searchable\":true,\"type\":\"date\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"process.thread.id\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"process.thread.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"process.title\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":false,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"process.title.text\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"process.uptime\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"process.working_directory\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":false,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"process.working_directory.text\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"registry.data.bytes\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"registry.data.strings\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"registry.data.type\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"registry.hive\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"registry.key\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"registry.path\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"registry.value\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"related.ip\",\"scripted\":false,\"searchable\":true,\"type\":\"ip\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"related.user\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"rule.category\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"rule.description\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"rule.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"rule.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"rule.reference\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"rule.ruleset\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"rule.uuid\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"rule.version\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"server.address\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"server.as.number\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"server.as.organization.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":false,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"server.as.organization.name.text\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"server.bytes\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"server.domain\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"server.geo.city_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"server.geo.continent_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"server.geo.country_iso_code\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"server.geo.country_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"server.geo.location\",\"scripted\":false,\"searchable\":true,\"type\":\"geo_point\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"server.geo.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"server.geo.region_iso_code\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"server.geo.region_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"server.ip\",\"scripted\":false,\"searchable\":true,\"type\":\"ip\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"server.mac\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"server.nat.ip\",\"scripted\":false,\"searchable\":true,\"type\":\"ip\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"server.nat.port\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"server.packets\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"server.port\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"server.registered_domain\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"server.top_level_domain\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"server.user.domain\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"server.user.email\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"server.user.full_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":false,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"server.user.full_name.text\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"server.user.group.domain\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"server.user.group.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"server.user.group.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"server.user.hash\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"server.user.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"server.user.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":false,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"server.user.name.text\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"service.ephemeral_id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"service.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"service.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"service.node.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"service.state\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"service.type\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"service.version\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"source.address\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"source.as.number\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"source.as.organization.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":false,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"source.as.organization.name.text\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"source.bytes\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"source.domain\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"source.geo.city_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"source.geo.continent_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"source.geo.country_iso_code\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"source.geo.country_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"source.geo.location\",\"scripted\":false,\"searchable\":true,\"type\":\"geo_point\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"source.geo.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"source.geo.region_iso_code\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"source.geo.region_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"source.ip\",\"scripted\":false,\"searchable\":true,\"type\":\"ip\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"source.mac\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"source.nat.ip\",\"scripted\":false,\"searchable\":true,\"type\":\"ip\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"source.nat.port\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"source.packets\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"source.port\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"source.registered_domain\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"source.top_level_domain\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"source.user.domain\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"source.user.email\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"source.user.full_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":false,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"source.user.full_name.text\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"source.user.group.domain\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"source.user.group.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"source.user.group.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"source.user.hash\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"source.user.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"source.user.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":false,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"source.user.name.text\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"threat.framework\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"threat.tactic.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"threat.tactic.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"threat.tactic.reference\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"threat.technique.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"threat.technique.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":false,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"threat.technique.name.text\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"threat.technique.reference\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"tls.cipher\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"tls.client.certificate\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"tls.client.certificate_chain\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"tls.client.hash.md5\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"tls.client.hash.sha1\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"tls.client.hash.sha256\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"tls.client.issuer\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"tls.client.ja3\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"tls.client.not_after\",\"scripted\":false,\"searchable\":true,\"type\":\"date\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"tls.client.not_before\",\"scripted\":false,\"searchable\":true,\"type\":\"date\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"tls.client.server_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"tls.client.subject\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"tls.client.supported_ciphers\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"tls.curve\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"tls.established\",\"scripted\":false,\"searchable\":true,\"type\":\"boolean\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"tls.next_protocol\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"tls.resumed\",\"scripted\":false,\"searchable\":true,\"type\":\"boolean\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"tls.server.certificate\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"tls.server.certificate_chain\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"tls.server.hash.md5\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"tls.server.hash.sha1\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"tls.server.hash.sha256\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"tls.server.issuer\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"tls.server.ja3s\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"tls.server.not_after\",\"scripted\":false,\"searchable\":true,\"type\":\"date\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"tls.server.not_before\",\"scripted\":false,\"searchable\":true,\"type\":\"date\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"tls.server.subject\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"tls.version\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"tls.version_protocol\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"tracing.trace.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"tracing.transaction.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"url.domain\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"url.extension\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"url.fragment\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"url.full\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":false,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"url.full.text\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"url.original\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":false,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"url.original.text\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"url.password\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"url.path\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"url.port\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"url.query\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"url.registered_domain\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"url.scheme\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"url.top_level_domain\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"url.username\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"user.domain\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"user.email\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"user.full_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":false,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"user.full_name.text\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"user.group.domain\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"user.group.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"user.group.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"user.hash\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"user.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"user.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":false,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"user.name.text\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"user_agent.device.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"user_agent.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"user_agent.original\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":false,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"user_agent.original.text\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"user_agent.os.family\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"user_agent.os.full\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":false,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"user_agent.os.full.text\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"user_agent.os.kernel\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"user_agent.os.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":false,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"user_agent.os.name.text\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"user_agent.os.platform\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"user_agent.os.version\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"user_agent.version\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"vulnerability.category\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"vulnerability.classification\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"vulnerability.description\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":false,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"vulnerability.description.text\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"vulnerability.enumeration\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"vulnerability.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"vulnerability.reference\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"vulnerability.report_id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"vulnerability.scanner.vendor\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"vulnerability.score.base\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"vulnerability.score.environmental\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"vulnerability.score.temporal\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"vulnerability.score.version\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"vulnerability.severity\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"agent.hostname\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"fields\",\"scripted\":false,\"searchable\":true},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"timeseries.instance\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"cloud.project.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"cloud.image.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"docker.container.labels\",\"scripted\":false,\"searchable\":true},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.containerized\",\"scripted\":false,\"searchable\":true,\"type\":\"boolean\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.os.build\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.os.codename\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"kubernetes.pod.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"kubernetes.pod.uid\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"kubernetes.namespace\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"kubernetes.node.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"kubernetes.labels.*\",\"scripted\":false,\"searchable\":true},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"kubernetes.annotations.*\",\"scripted\":false,\"searchable\":true},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"kubernetes.replicaset.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"kubernetes.deployment.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"kubernetes.statefulset.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"kubernetes.container.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"kubernetes.container.image\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"processor.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"processor.event\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":1,\"doc_values\":true,\"indexed\":true,\"name\":\"timestamp.us\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":false,\"analyzed\":false,\"count\":0,\"doc_values\":false,\"enabled\":false,\"indexed\":false,\"name\":\"http.request.headers\",\"scripted\":false,\"searchable\":false},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"http.response.finished\",\"scripted\":false,\"searchable\":true,\"type\":\"boolean\"},{\"aggregatable\":false,\"analyzed\":false,\"count\":0,\"doc_values\":false,\"enabled\":false,\"indexed\":false,\"name\":\"http.response.headers\",\"scripted\":false,\"searchable\":false},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"service.environment\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"service.language.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"service.language.version\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"service.runtime.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"service.runtime.version\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"service.framework.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"service.framework.version\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"transaction.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"transaction.sampled\",\"scripted\":false,\"searchable\":true,\"type\":\"boolean\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"transaction.type\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"transaction.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":false,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"transaction.name.text\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"transaction.duration.count\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"transaction.duration.sum.us\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"transaction.self_time.count\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"transaction.self_time.sum.us\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"transaction.breakdown.count\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":1,\"doc_values\":true,\"indexed\":true,\"name\":\"span.type\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":1,\"doc_values\":true,\"indexed\":true,\"name\":\"span.subtype\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"span.self_time.count\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"span.self_time.sum.us\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"trace.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"parent.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"observer.listening\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"observer.version_major\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"experimental\",\"scripted\":false,\"searchable\":true},{\"aggregatable\":true,\"analyzed\":false,\"count\":2,\"doc_values\":true,\"indexed\":true,\"name\":\"error.culprit\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"error.grouping_key\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"error.exception.code\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":false,\"analyzed\":false,\"count\":2,\"doc_values\":true,\"indexed\":true,\"name\":\"error.exception.message\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"error.exception.module\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":4,\"doc_values\":true,\"indexed\":true,\"name\":\"error.exception.type\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":2,\"doc_values\":true,\"indexed\":true,\"name\":\"error.exception.handled\",\"scripted\":false,\"searchable\":true,\"type\":\"boolean\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"error.log.level\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"error.log.logger_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":false,\"analyzed\":false,\"count\":2,\"doc_values\":true,\"indexed\":true,\"name\":\"error.log.message\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"error.log.param_message\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"system.cpu.total.norm.pct\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"system.memory.total\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"system.memory.actual.free\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"system.process.cpu.total.norm.pct\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"system.process.memory.size\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"system.process.memory.rss.bytes\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":1,\"doc_values\":true,\"indexed\":true,\"name\":\"profile.cpu.ns\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":1,\"doc_values\":true,\"indexed\":true,\"name\":\"profile.samples.count\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":1,\"doc_values\":true,\"indexed\":true,\"name\":\"profile.alloc_objects.count\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":1,\"doc_values\":true,\"indexed\":true,\"name\":\"profile.alloc_space.bytes\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":1,\"doc_values\":true,\"indexed\":true,\"name\":\"profile.inuse_objects.count\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":1,\"doc_values\":true,\"indexed\":true,\"name\":\"profile.inuse_space.bytes\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":1,\"doc_values\":true,\"indexed\":true,\"name\":\"profile.duration\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"profile.top.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":1,\"doc_values\":true,\"indexed\":true,\"name\":\"profile.top.function\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":1,\"doc_values\":true,\"indexed\":true,\"name\":\"profile.top.filename\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":1,\"doc_values\":true,\"indexed\":true,\"name\":\"profile.top.line\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"profile.stack.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"profile.stack.function\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"profile.stack.filename\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"profile.stack.line\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"sourcemap.service.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"sourcemap.service.version\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"sourcemap.bundle_filepath\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"view spans\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"span.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":1,\"doc_values\":true,\"indexed\":true,\"name\":\"span.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":1,\"doc_values\":true,\"indexed\":true,\"name\":\"span.action\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":1,\"doc_values\":true,\"indexed\":true,\"name\":\"span.start.us\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":1,\"doc_values\":true,\"indexed\":true,\"name\":\"span.duration.us\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"span.sync\",\"scripted\":false,\"searchable\":true,\"type\":\"boolean\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"span.db.link\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"span.db.rows_affected\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"span.destination.service.type\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"span.destination.service.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"span.destination.service.resource\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"span.message.queue.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"span.message.age.ms\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"transaction.duration.us\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"transaction.result\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"transaction.marks\",\"scripted\":false,\"searchable\":true},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"transaction.marks.*.*\",\"scripted\":false,\"searchable\":true},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"transaction.span_count.dropped\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"transaction.message.queue.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"transaction.message.age.ms\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":false,\"analyzed\":false,\"count\":0,\"doc_values\":false,\"indexed\":false,\"name\":\"_id\",\"scripted\":false,\"searchable\":false,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":false,\"indexed\":false,\"name\":\"_type\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":false,\"analyzed\":false,\"count\":0,\"doc_values\":false,\"indexed\":false,\"name\":\"_index\",\"scripted\":false,\"searchable\":false,\"type\":\"string\"},{\"aggregatable\":false,\"analyzed\":false,\"count\":0,\"doc_values\":false,\"indexed\":false,\"name\":\"_score\",\"scripted\":false,\"searchable\":false,\"type\":\"number\"}]",
+    "fields": "[{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"@timestamp\",\"scripted\":false,\"searchable\":true,\"type\":\"date\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"labels\",\"scripted\":false,\"searchable\":true},{\"aggregatable\":false,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"message\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"tags\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"agent.ephemeral_id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"agent.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"agent.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"agent.type\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"agent.version\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"as.number\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"as.organization.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":false,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"as.organization.name.text\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"client.address\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"client.as.number\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"client.as.organization.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":false,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"client.as.organization.name.text\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"client.bytes\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"client.domain\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"client.geo.city_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"client.geo.continent_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"client.geo.country_iso_code\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"client.geo.country_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"client.geo.location\",\"scripted\":false,\"searchable\":true,\"type\":\"geo_point\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"client.geo.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"client.geo.region_iso_code\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"client.geo.region_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"client.ip\",\"scripted\":false,\"searchable\":true,\"type\":\"ip\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"client.mac\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"client.nat.ip\",\"scripted\":false,\"searchable\":true,\"type\":\"ip\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"client.nat.port\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"client.packets\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"client.port\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"client.registered_domain\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"client.top_level_domain\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"client.user.domain\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"client.user.email\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"client.user.full_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":false,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"client.user.full_name.text\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"client.user.group.domain\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"client.user.group.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"client.user.group.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"client.user.hash\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"client.user.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"client.user.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":false,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"client.user.name.text\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"cloud.account.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"cloud.availability_zone\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"cloud.instance.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"cloud.instance.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"cloud.machine.type\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"cloud.provider\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"cloud.region\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"code_signature.exists\",\"scripted\":false,\"searchable\":true,\"type\":\"boolean\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"code_signature.status\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"code_signature.subject_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"code_signature.trusted\",\"scripted\":false,\"searchable\":true,\"type\":\"boolean\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"code_signature.valid\",\"scripted\":false,\"searchable\":true,\"type\":\"boolean\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"container.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"container.image.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"container.image.tag\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"container.labels\",\"scripted\":false,\"searchable\":true},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"container.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"container.runtime\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"destination.address\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"destination.as.number\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"destination.as.organization.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":false,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"destination.as.organization.name.text\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"destination.bytes\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"destination.domain\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"destination.geo.city_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"destination.geo.continent_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"destination.geo.country_iso_code\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"destination.geo.country_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"destination.geo.location\",\"scripted\":false,\"searchable\":true,\"type\":\"geo_point\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"destination.geo.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"destination.geo.region_iso_code\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"destination.geo.region_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"destination.ip\",\"scripted\":false,\"searchable\":true,\"type\":\"ip\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"destination.mac\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"destination.nat.ip\",\"scripted\":false,\"searchable\":true,\"type\":\"ip\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"destination.nat.port\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"destination.packets\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"destination.port\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"destination.registered_domain\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"destination.top_level_domain\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"destination.user.domain\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"destination.user.email\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"destination.user.full_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":false,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"destination.user.full_name.text\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"destination.user.group.domain\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"destination.user.group.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"destination.user.group.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"destination.user.hash\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"destination.user.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"destination.user.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":false,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"destination.user.name.text\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"dll.code_signature.exists\",\"scripted\":false,\"searchable\":true,\"type\":\"boolean\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"dll.code_signature.status\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"dll.code_signature.subject_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"dll.code_signature.trusted\",\"scripted\":false,\"searchable\":true,\"type\":\"boolean\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"dll.code_signature.valid\",\"scripted\":false,\"searchable\":true,\"type\":\"boolean\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"dll.hash.md5\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"dll.hash.sha1\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"dll.hash.sha256\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"dll.hash.sha512\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"dll.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"dll.path\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"dll.pe.company\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"dll.pe.description\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"dll.pe.file_version\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"dll.pe.original_file_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"dll.pe.product\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"dns.answers\",\"scripted\":false,\"searchable\":true},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"dns.answers.class\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"dns.answers.data\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"dns.answers.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"dns.answers.ttl\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"dns.answers.type\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"dns.header_flags\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"dns.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"dns.op_code\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"dns.question.class\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"dns.question.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"dns.question.registered_domain\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"dns.question.subdomain\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"dns.question.top_level_domain\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"dns.question.type\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"dns.resolved_ip\",\"scripted\":false,\"searchable\":true,\"type\":\"ip\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"dns.response_code\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"dns.type\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"ecs.version\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"error.code\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":4,\"doc_values\":true,\"indexed\":true,\"name\":\"error.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":false,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"error.message\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"error.stack_trace\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":false,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"error.stack_trace.text\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"error.type\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"event.action\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"event.category\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"event.code\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"event.created\",\"scripted\":false,\"searchable\":true,\"type\":\"date\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"event.dataset\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"event.duration\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"event.end\",\"scripted\":false,\"searchable\":true,\"type\":\"date\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"event.hash\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"event.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"event.ingested\",\"scripted\":false,\"searchable\":true,\"type\":\"date\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"event.kind\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"event.module\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"event.original\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"event.outcome\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"event.provider\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"event.reference\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"event.risk_score\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"event.risk_score_norm\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"event.sequence\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"event.severity\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"event.start\",\"scripted\":false,\"searchable\":true,\"type\":\"date\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"event.timezone\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"event.type\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"event.url\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"file.accessed\",\"scripted\":false,\"searchable\":true,\"type\":\"date\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"file.attributes\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"file.code_signature.exists\",\"scripted\":false,\"searchable\":true,\"type\":\"boolean\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"file.code_signature.status\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"file.code_signature.subject_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"file.code_signature.trusted\",\"scripted\":false,\"searchable\":true,\"type\":\"boolean\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"file.code_signature.valid\",\"scripted\":false,\"searchable\":true,\"type\":\"boolean\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"file.created\",\"scripted\":false,\"searchable\":true,\"type\":\"date\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"file.ctime\",\"scripted\":false,\"searchable\":true,\"type\":\"date\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"file.device\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"file.directory\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"file.drive_letter\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"file.extension\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"file.gid\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"file.group\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"file.hash.md5\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"file.hash.sha1\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"file.hash.sha256\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"file.hash.sha512\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"file.inode\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"file.mime_type\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"file.mode\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"file.mtime\",\"scripted\":false,\"searchable\":true,\"type\":\"date\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"file.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"file.owner\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"file.path\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":false,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"file.path.text\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"file.pe.company\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"file.pe.description\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"file.pe.file_version\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"file.pe.original_file_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"file.pe.product\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"file.size\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"file.target_path\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":false,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"file.target_path.text\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"file.type\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"file.uid\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"geo.city_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"geo.continent_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"geo.country_iso_code\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"geo.country_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"geo.location\",\"scripted\":false,\"searchable\":true,\"type\":\"geo_point\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"geo.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"geo.region_iso_code\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"geo.region_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"group.domain\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"group.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"group.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"hash.md5\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"hash.sha1\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"hash.sha256\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"hash.sha512\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.architecture\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.domain\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.geo.city_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.geo.continent_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.geo.country_iso_code\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.geo.country_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.geo.location\",\"scripted\":false,\"searchable\":true,\"type\":\"geo_point\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.geo.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.geo.region_iso_code\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.geo.region_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.hostname\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.ip\",\"scripted\":false,\"searchable\":true,\"type\":\"ip\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.mac\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.os.family\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.os.full\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":false,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.os.full.text\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.os.kernel\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.os.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":false,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.os.name.text\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.os.platform\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.os.version\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.type\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.uptime\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.user.domain\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.user.email\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.user.full_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":false,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.user.full_name.text\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.user.group.domain\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.user.group.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.user.group.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.user.hash\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.user.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.user.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":false,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.user.name.text\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"http.request.body.bytes\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"http.request.body.content\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":false,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"http.request.body.content.text\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"http.request.bytes\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"http.request.method\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"http.request.referrer\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"http.response.body.bytes\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"http.response.body.content\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":false,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"http.response.body.content.text\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"http.response.bytes\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"http.response.status_code\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"http.version\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"interface.alias\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"interface.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"interface.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"log.level\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"log.logger\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"log.origin.file.line\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"log.origin.file.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"log.origin.function\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"log.original\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"log.syslog\",\"scripted\":false,\"searchable\":true},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"log.syslog.facility.code\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"log.syslog.facility.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"log.syslog.priority\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"log.syslog.severity.code\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"log.syslog.severity.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"network.application\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"network.bytes\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"network.community_id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"network.direction\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"network.forwarded_ip\",\"scripted\":false,\"searchable\":true,\"type\":\"ip\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"network.iana_number\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"network.inner\",\"scripted\":false,\"searchable\":true},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"network.inner.vlan.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"network.inner.vlan.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"network.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"network.packets\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"network.protocol\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"network.transport\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"network.type\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"network.vlan.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"network.vlan.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"observer.egress\",\"scripted\":false,\"searchable\":true},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"observer.egress.interface.alias\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"observer.egress.interface.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"observer.egress.interface.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"observer.egress.vlan.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"observer.egress.vlan.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"observer.egress.zone\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"observer.geo.city_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"observer.geo.continent_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"observer.geo.country_iso_code\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"observer.geo.country_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"observer.geo.location\",\"scripted\":false,\"searchable\":true,\"type\":\"geo_point\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"observer.geo.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"observer.geo.region_iso_code\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"observer.geo.region_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"observer.hostname\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"observer.ingress\",\"scripted\":false,\"searchable\":true},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"observer.ingress.interface.alias\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"observer.ingress.interface.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"observer.ingress.interface.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"observer.ingress.vlan.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"observer.ingress.vlan.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"observer.ingress.zone\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"observer.ip\",\"scripted\":false,\"searchable\":true,\"type\":\"ip\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"observer.mac\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"observer.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"observer.os.family\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"observer.os.full\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":false,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"observer.os.full.text\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"observer.os.kernel\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"observer.os.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":false,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"observer.os.name.text\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"observer.os.platform\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"observer.os.version\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"observer.product\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"observer.serial_number\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"observer.type\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"observer.vendor\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"observer.version\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"organization.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"organization.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":false,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"organization.name.text\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"os.family\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"os.full\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":false,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"os.full.text\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"os.kernel\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"os.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":false,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"os.name.text\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"os.platform\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"os.version\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"package.architecture\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"package.build_version\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"package.checksum\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"package.description\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"package.install_scope\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"package.installed\",\"scripted\":false,\"searchable\":true,\"type\":\"date\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"package.license\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"package.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"package.path\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"package.reference\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"package.size\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"package.type\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"package.version\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"pe.company\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"pe.description\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"pe.file_version\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"pe.original_file_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"pe.product\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"process.args\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"process.args_count\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"process.code_signature.exists\",\"scripted\":false,\"searchable\":true,\"type\":\"boolean\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"process.code_signature.status\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"process.code_signature.subject_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"process.code_signature.trusted\",\"scripted\":false,\"searchable\":true,\"type\":\"boolean\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"process.code_signature.valid\",\"scripted\":false,\"searchable\":true,\"type\":\"boolean\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"process.command_line\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":false,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"process.command_line.text\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"process.entity_id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"process.executable\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":false,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"process.executable.text\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"process.exit_code\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"process.hash.md5\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"process.hash.sha1\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"process.hash.sha256\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"process.hash.sha512\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"process.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":false,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"process.name.text\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"process.parent.args\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"process.parent.args_count\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"process.parent.code_signature.exists\",\"scripted\":false,\"searchable\":true,\"type\":\"boolean\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"process.parent.code_signature.status\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"process.parent.code_signature.subject_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"process.parent.code_signature.trusted\",\"scripted\":false,\"searchable\":true,\"type\":\"boolean\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"process.parent.code_signature.valid\",\"scripted\":false,\"searchable\":true,\"type\":\"boolean\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"process.parent.command_line\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":false,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"process.parent.command_line.text\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"process.parent.entity_id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"process.parent.executable\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":false,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"process.parent.executable.text\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"process.parent.exit_code\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"process.parent.hash.md5\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"process.parent.hash.sha1\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"process.parent.hash.sha256\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"process.parent.hash.sha512\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"process.parent.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":false,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"process.parent.name.text\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"process.parent.pgid\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"process.parent.pid\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"process.parent.ppid\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"process.parent.start\",\"scripted\":false,\"searchable\":true,\"type\":\"date\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"process.parent.thread.id\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"process.parent.thread.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"process.parent.title\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":false,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"process.parent.title.text\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"process.parent.uptime\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"process.parent.working_directory\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":false,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"process.parent.working_directory.text\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"process.pe.company\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"process.pe.description\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"process.pe.file_version\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"process.pe.original_file_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"process.pe.product\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"process.pgid\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"process.pid\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"process.ppid\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"process.start\",\"scripted\":false,\"searchable\":true,\"type\":\"date\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"process.thread.id\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"process.thread.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"process.title\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":false,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"process.title.text\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"process.uptime\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"process.working_directory\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":false,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"process.working_directory.text\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"registry.data.bytes\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"registry.data.strings\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"registry.data.type\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"registry.hive\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"registry.key\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"registry.path\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"registry.value\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"related.hash\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"related.ip\",\"scripted\":false,\"searchable\":true,\"type\":\"ip\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"related.user\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"rule.author\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"rule.category\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"rule.description\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"rule.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"rule.license\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"rule.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"rule.reference\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"rule.ruleset\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"rule.uuid\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"rule.version\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"server.address\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"server.as.number\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"server.as.organization.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":false,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"server.as.organization.name.text\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"server.bytes\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"server.domain\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"server.geo.city_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"server.geo.continent_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"server.geo.country_iso_code\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"server.geo.country_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"server.geo.location\",\"scripted\":false,\"searchable\":true,\"type\":\"geo_point\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"server.geo.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"server.geo.region_iso_code\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"server.geo.region_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"server.ip\",\"scripted\":false,\"searchable\":true,\"type\":\"ip\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"server.mac\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"server.nat.ip\",\"scripted\":false,\"searchable\":true,\"type\":\"ip\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"server.nat.port\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"server.packets\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"server.port\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"server.registered_domain\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"server.top_level_domain\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"server.user.domain\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"server.user.email\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"server.user.full_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":false,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"server.user.full_name.text\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"server.user.group.domain\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"server.user.group.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"server.user.group.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"server.user.hash\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"server.user.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"server.user.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":false,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"server.user.name.text\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"service.ephemeral_id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"service.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"service.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"service.node.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"service.state\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"service.type\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"service.version\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"source.address\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"source.as.number\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"source.as.organization.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":false,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"source.as.organization.name.text\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"source.bytes\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"source.domain\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"source.geo.city_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"source.geo.continent_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"source.geo.country_iso_code\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"source.geo.country_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"source.geo.location\",\"scripted\":false,\"searchable\":true,\"type\":\"geo_point\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"source.geo.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"source.geo.region_iso_code\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"source.geo.region_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"source.ip\",\"scripted\":false,\"searchable\":true,\"type\":\"ip\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"source.mac\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"source.nat.ip\",\"scripted\":false,\"searchable\":true,\"type\":\"ip\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"source.nat.port\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"source.packets\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"source.port\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"source.registered_domain\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"source.top_level_domain\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"source.user.domain\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"source.user.email\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"source.user.full_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":false,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"source.user.full_name.text\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"source.user.group.domain\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"source.user.group.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"source.user.group.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"source.user.hash\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"source.user.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"source.user.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":false,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"source.user.name.text\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"threat.framework\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"threat.tactic.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"threat.tactic.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"threat.tactic.reference\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"threat.technique.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"threat.technique.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":false,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"threat.technique.name.text\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"threat.technique.reference\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"tls.cipher\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"tls.client.certificate\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"tls.client.certificate_chain\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"tls.client.hash.md5\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"tls.client.hash.sha1\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"tls.client.hash.sha256\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"tls.client.issuer\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"tls.client.ja3\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"tls.client.not_after\",\"scripted\":false,\"searchable\":true,\"type\":\"date\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"tls.client.not_before\",\"scripted\":false,\"searchable\":true,\"type\":\"date\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"tls.client.server_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"tls.client.subject\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"tls.client.supported_ciphers\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"tls.curve\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"tls.established\",\"scripted\":false,\"searchable\":true,\"type\":\"boolean\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"tls.next_protocol\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"tls.resumed\",\"scripted\":false,\"searchable\":true,\"type\":\"boolean\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"tls.server.certificate\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"tls.server.certificate_chain\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"tls.server.hash.md5\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"tls.server.hash.sha1\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"tls.server.hash.sha256\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"tls.server.issuer\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"tls.server.ja3s\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"tls.server.not_after\",\"scripted\":false,\"searchable\":true,\"type\":\"date\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"tls.server.not_before\",\"scripted\":false,\"searchable\":true,\"type\":\"date\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"tls.server.subject\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"tls.version\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"tls.version_protocol\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"tracing.trace.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"tracing.transaction.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"url.domain\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"url.extension\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"url.fragment\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"url.full\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":false,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"url.full.text\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"url.original\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":false,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"url.original.text\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"url.password\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"url.path\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"url.port\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"url.query\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"url.registered_domain\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"url.scheme\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"url.top_level_domain\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"url.username\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"user.domain\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"user.email\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"user.full_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":false,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"user.full_name.text\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"user.group.domain\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"user.group.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"user.group.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"user.hash\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"user.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"user.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":false,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"user.name.text\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"user_agent.device.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"user_agent.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"user_agent.original\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":false,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"user_agent.original.text\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"user_agent.os.family\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"user_agent.os.full\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":false,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"user_agent.os.full.text\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"user_agent.os.kernel\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"user_agent.os.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":false,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"user_agent.os.name.text\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"user_agent.os.platform\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"user_agent.os.version\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"user_agent.version\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"vlan.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"vlan.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"vulnerability.category\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"vulnerability.classification\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"vulnerability.description\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":false,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"vulnerability.description.text\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"vulnerability.enumeration\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"vulnerability.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"vulnerability.reference\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"vulnerability.report_id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"vulnerability.scanner.vendor\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"vulnerability.score.base\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"vulnerability.score.environmental\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"vulnerability.score.temporal\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"vulnerability.score.version\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"vulnerability.severity\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"agent.hostname\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"fields\",\"scripted\":false,\"searchable\":true},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"timeseries.instance\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"cloud.project.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"cloud.image.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"docker.container.labels\",\"scripted\":false,\"searchable\":true},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.containerized\",\"scripted\":false,\"searchable\":true,\"type\":\"boolean\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.os.build\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.os.codename\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"kubernetes.pod.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"kubernetes.pod.uid\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"kubernetes.namespace\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"kubernetes.node.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"kubernetes.labels.*\",\"scripted\":false,\"searchable\":true},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"kubernetes.annotations.*\",\"scripted\":false,\"searchable\":true},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"kubernetes.replicaset.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"kubernetes.deployment.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"kubernetes.statefulset.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"kubernetes.container.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"kubernetes.container.image\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"processor.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"processor.event\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":1,\"doc_values\":true,\"indexed\":true,\"name\":\"timestamp.us\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":false,\"analyzed\":false,\"count\":0,\"doc_values\":false,\"enabled\":false,\"indexed\":false,\"name\":\"http.request.headers\",\"scripted\":false,\"searchable\":false},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"http.response.finished\",\"scripted\":false,\"searchable\":true,\"type\":\"boolean\"},{\"aggregatable\":false,\"analyzed\":false,\"count\":0,\"doc_values\":false,\"enabled\":false,\"indexed\":false,\"name\":\"http.response.headers\",\"scripted\":false,\"searchable\":false},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"service.environment\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"service.language.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"service.language.version\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"service.runtime.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"service.runtime.version\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"service.framework.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"service.framework.version\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"transaction.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"transaction.sampled\",\"scripted\":false,\"searchable\":true,\"type\":\"boolean\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"transaction.type\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"transaction.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":false,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"transaction.name.text\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"transaction.duration.count\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"transaction.duration.sum.us\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"transaction.self_time.count\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"transaction.self_time.sum.us\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"transaction.breakdown.count\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":1,\"doc_values\":true,\"indexed\":true,\"name\":\"span.type\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":1,\"doc_values\":true,\"indexed\":true,\"name\":\"span.subtype\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"span.self_time.count\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"span.self_time.sum.us\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"trace.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"parent.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"observer.listening\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"observer.version_major\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"experimental\",\"scripted\":false,\"searchable\":true},{\"aggregatable\":true,\"analyzed\":false,\"count\":2,\"doc_values\":true,\"indexed\":true,\"name\":\"error.culprit\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"error.grouping_key\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"error.exception.code\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":false,\"analyzed\":false,\"count\":2,\"doc_values\":true,\"indexed\":true,\"name\":\"error.exception.message\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"error.exception.module\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":4,\"doc_values\":true,\"indexed\":true,\"name\":\"error.exception.type\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":2,\"doc_values\":true,\"indexed\":true,\"name\":\"error.exception.handled\",\"scripted\":false,\"searchable\":true,\"type\":\"boolean\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"error.log.level\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"error.log.logger_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":false,\"analyzed\":false,\"count\":2,\"doc_values\":true,\"indexed\":true,\"name\":\"error.log.message\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"error.log.param_message\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"system.cpu.total.norm.pct\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"system.memory.total\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"system.memory.actual.free\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"system.process.cpu.total.norm.pct\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"system.process.memory.size\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"system.process.memory.rss.bytes\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":1,\"doc_values\":true,\"indexed\":true,\"name\":\"profile.cpu.ns\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":1,\"doc_values\":true,\"indexed\":true,\"name\":\"profile.samples.count\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":1,\"doc_values\":true,\"indexed\":true,\"name\":\"profile.alloc_objects.count\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":1,\"doc_values\":true,\"indexed\":true,\"name\":\"profile.alloc_space.bytes\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":1,\"doc_values\":true,\"indexed\":true,\"name\":\"profile.inuse_objects.count\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":1,\"doc_values\":true,\"indexed\":true,\"name\":\"profile.inuse_space.bytes\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":1,\"doc_values\":true,\"indexed\":true,\"name\":\"profile.duration\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"profile.top.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":1,\"doc_values\":true,\"indexed\":true,\"name\":\"profile.top.function\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":1,\"doc_values\":true,\"indexed\":true,\"name\":\"profile.top.filename\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":1,\"doc_values\":true,\"indexed\":true,\"name\":\"profile.top.line\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"profile.stack.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"profile.stack.function\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"profile.stack.filename\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"profile.stack.line\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"sourcemap.service.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"sourcemap.service.version\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"sourcemap.bundle_filepath\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"view spans\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"span.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":1,\"doc_values\":true,\"indexed\":true,\"name\":\"span.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":1,\"doc_values\":true,\"indexed\":true,\"name\":\"span.action\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":1,\"doc_values\":true,\"indexed\":true,\"name\":\"span.start.us\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":1,\"doc_values\":true,\"indexed\":true,\"name\":\"span.duration.us\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"span.sync\",\"scripted\":false,\"searchable\":true,\"type\":\"boolean\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"span.db.link\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"span.db.rows_affected\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"span.destination.service.type\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"span.destination.service.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"span.destination.service.resource\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"span.message.queue.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"span.message.age.ms\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"transaction.duration.us\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"transaction.result\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"transaction.marks\",\"scripted\":false,\"searchable\":true},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"transaction.marks.*.*\",\"scripted\":false,\"searchable\":true},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"transaction.span_count.dropped\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"transaction.message.queue.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"transaction.message.age.ms\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":false,\"analyzed\":false,\"count\":0,\"doc_values\":false,\"indexed\":false,\"name\":\"_id\",\"scripted\":false,\"searchable\":false,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":false,\"indexed\":false,\"name\":\"_type\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":false,\"analyzed\":false,\"count\":0,\"doc_values\":false,\"indexed\":false,\"name\":\"_index\",\"scripted\":false,\"searchable\":false,\"type\":\"string\"},{\"aggregatable\":false,\"analyzed\":false,\"count\":0,\"doc_values\":false,\"indexed\":false,\"name\":\"_score\",\"scripted\":false,\"searchable\":false,\"type\":\"number\"}]",
     "sourceFilters": "[{\"value\":\"sourcemap.sourcemap\"}]",
     "timeFieldName": "@timestamp"
   },

From 46e495ff8ab5f1cdee45adfa61412f78cd24f5ff Mon Sep 17 00:00:00 2001
From: Tim Schnell <timductive@gmail.com>
Date: Wed, 25 Mar 2020 11:27:03 -0500
Subject: [PATCH 149/179] Limit rows in debug element (#60804)

* limiting the number of rows displayed in debug element to 100

* updating function and typescripting

* adding debug tests
---
 .../__snapshots__/debug.examples.storyshot    | 1435 ++++++++++++++++
 .../debug/__examples__/debug.examples.tsx     |   14 +
 .../components/debug/__examples__/helpers.tsx | 1443 +++++++++++++++++
 .../components/debug/{debug.js => debug.tsx}  |   12 +-
 .../components/debug/{index.js => index.tsx}  |    0
 5 files changed, 2902 insertions(+), 2 deletions(-)
 create mode 100644 x-pack/legacy/plugins/canvas/public/components/debug/__examples__/__snapshots__/debug.examples.storyshot
 create mode 100644 x-pack/legacy/plugins/canvas/public/components/debug/__examples__/debug.examples.tsx
 create mode 100644 x-pack/legacy/plugins/canvas/public/components/debug/__examples__/helpers.tsx
 rename x-pack/legacy/plugins/canvas/public/components/debug/{debug.js => debug.tsx} (72%)
 rename x-pack/legacy/plugins/canvas/public/components/debug/{index.js => index.tsx} (100%)

diff --git a/x-pack/legacy/plugins/canvas/public/components/debug/__examples__/__snapshots__/debug.examples.storyshot b/x-pack/legacy/plugins/canvas/public/components/debug/__examples__/__snapshots__/debug.examples.storyshot
new file mode 100644
index 0000000000000..86d5dbc39197f
--- /dev/null
+++ b/x-pack/legacy/plugins/canvas/public/components/debug/__examples__/__snapshots__/debug.examples.storyshot
@@ -0,0 +1,1435 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Storyshots components/Elements/Debug large payload 1`] = `
+<span>
+  <code>
+    <pre
+      className="canvasDebug__content"
+    >
+      {
+  "datatable": {
+    "type": "datatable",
+    "columns": [
+      {
+        "name": "@timestamp",
+        "type": "date"
+      },
+      {
+        "name": "time",
+        "type": "date"
+      },
+      {
+        "name": "cost",
+        "type": "number"
+      },
+      {
+        "name": "username",
+        "type": "string"
+      },
+      {
+        "name": "price",
+        "type": "number"
+      },
+      {
+        "name": "age",
+        "type": "number"
+      },
+      {
+        "name": "country",
+        "type": "string"
+      },
+      {
+        "name": "state",
+        "type": "string"
+      },
+      {
+        "name": "project",
+        "type": "string"
+      },
+      {
+        "name": "percent_uptime",
+        "type": "number"
+      }
+    ],
+    "rows": [
+      {
+        "age": 63,
+        "cost": 32.15,
+        "country": "US",
+        "price": 53,
+        "project": "elasticsearch",
+        "state": "running",
+        "time": 1546334211208,
+        "@timestamp": 1546334211208,
+        "username": "aevans2e",
+        "percent_uptime": 0.83
+      },
+      {
+        "age": 68,
+        "cost": 20.52,
+        "country": "JP",
+        "price": 33,
+        "project": "beats",
+        "state": "done",
+        "time": 1546351551031,
+        "@timestamp": 1546351551031,
+        "username": "aking2c",
+        "percent_uptime": 0.9
+      },
+      {
+        "age": 57,
+        "cost": 21.15,
+        "country": "UK",
+        "price": 59,
+        "project": "apm",
+        "state": "running",
+        "time": 1546352631083,
+        "@timestamp": 1546352631083,
+        "username": "mmoore2o",
+        "percent_uptime": 0.96
+      },
+      {
+        "age": 73,
+        "cost": 35.64,
+        "country": "CN",
+        "price": 71,
+        "project": "machine-learning",
+        "state": "start",
+        "time": 1546402490956,
+        "@timestamp": 1546402490956,
+        "username": "wrodriguez1r",
+        "percent_uptime": 0.61
+      },
+      {
+        "age": 38,
+        "cost": 27.19,
+        "country": "TZ",
+        "price": 36,
+        "project": "kibana",
+        "state": "done",
+        "time": 1546467111351,
+        "@timestamp": 1546467111351,
+        "username": "wrodriguez1r",
+        "percent_uptime": 0.72
+      },
+      {
+        "age": 61,
+        "cost": 49.95,
+        "country": "NL",
+        "price": 65,
+        "project": "machine-learning",
+        "state": "start",
+        "time": 1546473771019,
+        "@timestamp": 1546473771019,
+        "username": "mmoore2o",
+        "percent_uptime": 0.72
+      },
+      {
+        "age": 53,
+        "cost": 27.36,
+        "country": "JP",
+        "price": 60,
+        "project": "x-pack",
+        "state": "running",
+        "time": 1546482171310,
+        "@timestamp": 1546482171310,
+        "username": "hcrawford2h",
+        "percent_uptime": 0.65
+      },
+      {
+        "age": 31,
+        "cost": 33.77,
+        "country": "AZ",
+        "price": 77,
+        "project": "kibana",
+        "state": "start",
+        "time": 1546493451206,
+        "@timestamp": 1546493451206,
+        "username": "aking2c",
+        "percent_uptime": 0.92
+      },
+      {
+        "age": 71,
+        "cost": 20.2,
+        "country": "TZ",
+        "price": 57,
+        "project": "swiftype",
+        "state": "running",
+        "time": 1546494651235,
+        "@timestamp": 1546494651235,
+        "username": "jlawson2p",
+        "percent_uptime": 0.59
+      },
+      {
+        "age": 54,
+        "cost": 36.65,
+        "country": "TZ",
+        "price": 72,
+        "project": "apm",
+        "state": "done",
+        "time": 1546498431195,
+        "@timestamp": 1546498431195,
+        "username": "aking2c",
+        "percent_uptime": 1
+      },
+      {
+        "age": 31,
+        "cost": 26.57,
+        "country": "BR",
+        "price": 48,
+        "project": "logstash",
+        "state": "done",
+        "time": 1546509170962,
+        "@timestamp": 1546509170962,
+        "username": "hcrawford2h",
+        "percent_uptime": 0.86
+      },
+      {
+        "age": 99,
+        "cost": 22.46,
+        "country": "TZ",
+        "price": 66,
+        "project": "swiftype",
+        "state": "done",
+        "time": 1546552371305,
+        "@timestamp": 1546552371305,
+        "username": "bmorris2n",
+        "percent_uptime": 0.76
+      },
+      {
+        "age": 87,
+        "cost": 21.54,
+        "country": "US",
+        "price": 43,
+        "project": "machine-learning",
+        "state": "start",
+        "time": 1546575231270,
+        "@timestamp": 1546575231270,
+        "username": "sadams1v",
+        "percent_uptime": 0.58
+      },
+      {
+        "age": 10,
+        "cost": 37.68,
+        "country": "CN",
+        "price": 36,
+        "project": "x-pack",
+        "state": "done",
+        "time": 1546678071026,
+        "@timestamp": 1546678071026,
+        "username": "jchavez2a",
+        "percent_uptime": 0.5
+      },
+      {
+        "age": 30,
+        "cost": 21.62,
+        "country": "DE",
+        "price": 78,
+        "project": "machine-learning",
+        "state": "running",
+        "time": 1546678911351,
+        "@timestamp": 1546678911351,
+        "username": "kbrooks23",
+        "percent_uptime": 1
+      },
+      {
+        "age": 49,
+        "cost": 26.46,
+        "country": "BR",
+        "price": 76,
+        "project": "swiftype",
+        "state": "start",
+        "time": 1546701050984,
+        "@timestamp": 1546701050984,
+        "username": "sadams1v",
+        "percent_uptime": 0.97
+      },
+      {
+        "age": 81,
+        "cost": 36.69,
+        "country": "TZ",
+        "price": 80,
+        "project": "logstash",
+        "state": "done",
+        "time": 1546702851232,
+        "@timestamp": 1546702851232,
+        "username": "smurphy1y",
+        "percent_uptime": 0.92
+      },
+      {
+        "age": 68,
+        "cost": 28.74,
+        "country": "DE",
+        "price": 56,
+        "project": "machine-learning",
+        "state": "running",
+        "time": 1546712451326,
+        "@timestamp": 1546712451326,
+        "username": "wmontgomery22",
+        "percent_uptime": 0.85
+      },
+      {
+        "age": 28,
+        "cost": 21.3,
+        "country": "SA",
+        "price": 72,
+        "project": "apm",
+        "state": "start",
+        "time": 1546728771027,
+        "@timestamp": 1546728771027,
+        "username": "hbowman1s",
+        "percent_uptime": 0.79
+      },
+      {
+        "age": 57,
+        "cost": 28.72,
+        "country": "UK",
+        "price": 34,
+        "project": "machine-learning",
+        "state": "done",
+        "time": 1546738610972,
+        "@timestamp": 1546738610972,
+        "username": "pjohnston2l",
+        "percent_uptime": 0.6
+      },
+      {
+        "age": 35,
+        "cost": 48.87,
+        "country": "US",
+        "price": 78,
+        "project": "apm",
+        "state": "running",
+        "time": 1546761591244,
+        "@timestamp": 1546761591244,
+        "username": "bfranklin27",
+        "percent_uptime": 0.52
+      },
+      {
+        "age": 89,
+        "cost": 29.48,
+        "country": "TZ",
+        "price": 69,
+        "project": "beats",
+        "state": "done",
+        "time": 1546791771183,
+        "@timestamp": 1546791771183,
+        "username": "ccarpenter2m",
+        "percent_uptime": 0.72
+      },
+      {
+        "age": 14,
+        "cost": 28.94,
+        "country": "BR",
+        "price": 49,
+        "project": "elasticsearch",
+        "state": "running",
+        "time": 1546886211287,
+        "@timestamp": 1546886211287,
+        "username": "pjohnston2l",
+        "percent_uptime": 0.75
+      },
+      {
+        "age": 39,
+        "cost": 27.16,
+        "country": "CN",
+        "price": 49,
+        "project": "elasticsearch",
+        "state": "start",
+        "time": 1546934631129,
+        "@timestamp": 1546934631129,
+        "username": "jlawson2p",
+        "percent_uptime": 0.7
+      },
+      {
+        "age": 84,
+        "cost": 35.6,
+        "country": "NL",
+        "price": 76,
+        "project": "swiftype",
+        "state": "running",
+        "time": 1546948431271,
+        "@timestamp": 1546948431271,
+        "username": "hbowman1s",
+        "percent_uptime": 0.72
+      },
+      {
+        "age": 54,
+        "cost": 27.08,
+        "country": "AZ",
+        "price": 49,
+        "project": "x-pack",
+        "state": "start",
+        "time": 1546986231297,
+        "@timestamp": 1546986231297,
+        "username": "krobinson2b",
+        "percent_uptime": 0.89
+      },
+      {
+        "age": 58,
+        "cost": 26.9,
+        "country": "DE",
+        "price": 43,
+        "project": "apm",
+        "state": "start",
+        "time": 1547041191338,
+        "@timestamp": 1547041191338,
+        "username": "hperez29",
+        "percent_uptime": 0.63
+      },
+      {
+        "age": 26,
+        "cost": 48.27,
+        "country": "DE",
+        "price": 36,
+        "project": "machine-learning",
+        "state": "start",
+        "time": 1547118111126,
+        "@timestamp": 1547118111126,
+        "username": "sadams1v",
+        "percent_uptime": 0.56
+      },
+      {
+        "age": 82,
+        "cost": 32.13,
+        "country": "SA",
+        "price": 79,
+        "project": "elasticsearch",
+        "state": "done",
+        "time": 1547159331136,
+        "@timestamp": 1547159331136,
+        "username": "dhicks28",
+        "percent_uptime": 0.71
+      },
+      {
+        "age": 26,
+        "cost": 20.59,
+        "country": "UK",
+        "price": 52,
+        "project": "kibana",
+        "state": "done",
+        "time": 1547174150962,
+        "@timestamp": 1547174150962,
+        "username": "greynolds2j",
+        "percent_uptime": 0.94
+      },
+      {
+        "age": 19,
+        "cost": 25.73,
+        "country": "RU",
+        "price": 45,
+        "project": "beats",
+        "state": "start",
+        "time": 1547205411225,
+        "@timestamp": 1547205411225,
+        "username": "sadams1v",
+        "percent_uptime": 0.6
+      },
+      {
+        "age": 53,
+        "cost": 46.19,
+        "country": "JP",
+        "price": 30,
+        "project": "apm",
+        "state": "done",
+        "time": 1547217171103,
+        "@timestamp": 1547217171103,
+        "username": "jlawson2p",
+        "percent_uptime": 0.54
+      },
+      {
+        "age": 76,
+        "cost": 40.52,
+        "country": "DE",
+        "price": 43,
+        "project": "machine-learning",
+        "state": "start",
+        "time": 1547261271103,
+        "@timestamp": 1547261271103,
+        "username": "athomas1w",
+        "percent_uptime": 0.86
+      },
+      {
+        "age": 31,
+        "cost": 27.62,
+        "country": "BR",
+        "price": 71,
+        "project": "machine-learning",
+        "state": "start",
+        "time": 1547262771238,
+        "@timestamp": 1547262771238,
+        "username": "jhanson1x",
+        "percent_uptime": 0.79
+      },
+      {
+        "age": 42,
+        "cost": 30.91,
+        "country": "US",
+        "price": 58,
+        "project": "beats",
+        "state": "running",
+        "time": 1547274291106,
+        "@timestamp": 1547274291106,
+        "username": "amartinez26",
+        "percent_uptime": 0.82
+      },
+      {
+        "age": 43,
+        "cost": 23.29,
+        "country": "UK",
+        "price": 41,
+        "project": "kibana",
+        "state": "start",
+        "time": 1547293010955,
+        "@timestamp": 1547293010955,
+        "username": "ediaz2d",
+        "percent_uptime": 0.93
+      },
+      {
+        "age": 45,
+        "cost": 21.18,
+        "country": "AZ",
+        "price": 62,
+        "project": "logstash",
+        "state": "done",
+        "time": 1547316050970,
+        "@timestamp": 1547316050970,
+        "username": "hperez29",
+        "percent_uptime": 0.75
+      },
+      {
+        "age": 39,
+        "cost": 29.66,
+        "country": "IN",
+        "price": 40,
+        "project": "swiftype",
+        "state": "start",
+        "time": 1547320011249,
+        "@timestamp": 1547320011249,
+        "username": "hcrawford2h",
+        "percent_uptime": 0.99
+      },
+      {
+        "age": 98,
+        "cost": 37.42,
+        "country": "US",
+        "price": 58,
+        "project": "beats",
+        "state": "done",
+        "time": 1547331051346,
+        "@timestamp": 1547331051346,
+        "username": "jmills21",
+        "percent_uptime": 0.51
+      },
+      {
+        "age": 96,
+        "cost": 40,
+        "country": "DE",
+        "price": 58,
+        "project": "apm",
+        "state": "start",
+        "time": 1547425371273,
+        "@timestamp": 1547425371273,
+        "username": "rsmith25",
+        "percent_uptime": 0.87
+      },
+      {
+        "age": 13,
+        "cost": 47.45,
+        "country": "AZ",
+        "price": 30,
+        "project": "apm",
+        "state": "done",
+        "time": 1547482911215,
+        "@timestamp": 1547482911215,
+        "username": "smurphy1y",
+        "percent_uptime": 0.83
+      },
+      {
+        "age": 100,
+        "cost": 24.36,
+        "country": "IN",
+        "price": 59,
+        "project": "apm",
+        "state": "done",
+        "time": 1547485611233,
+        "@timestamp": 1547485611233,
+        "username": "jlawson2p",
+        "percent_uptime": 0.64
+      },
+      {
+        "age": 10,
+        "cost": 27.59,
+        "country": "US",
+        "price": 53,
+        "project": "apm",
+        "state": "start",
+        "time": 1547518911272,
+        "@timestamp": 1547518911272,
+        "username": "wmontgomery22",
+        "percent_uptime": 0.93
+      },
+      {
+        "age": 83,
+        "cost": 37.05,
+        "country": "BR",
+        "price": 77,
+        "project": "logstash",
+        "state": "running",
+        "time": 1547521971300,
+        "@timestamp": 1547521971300,
+        "username": "hperez29",
+        "percent_uptime": 0.53
+      },
+      {
+        "age": 60,
+        "cost": 31.19,
+        "country": "CN",
+        "price": 69,
+        "project": "kibana",
+        "state": "running",
+        "time": 1547555751264,
+        "@timestamp": 1547555751264,
+        "username": "aevans2e",
+        "percent_uptime": 0.99
+      },
+      {
+        "age": 61,
+        "cost": 27.69,
+        "country": "JP",
+        "price": 39,
+        "project": "elasticsearch",
+        "state": "start",
+        "time": 1547564691226,
+        "@timestamp": 1547564691226,
+        "username": "greynolds2j",
+        "percent_uptime": 0.72
+      },
+      {
+        "age": 89,
+        "cost": 33.03,
+        "country": "JP",
+        "price": 75,
+        "project": "machine-learning",
+        "state": "done",
+        "time": 1547581671013,
+        "@timestamp": 1547581671013,
+        "username": "aevans2e",
+        "percent_uptime": 0.88
+      },
+      {
+        "age": 45,
+        "cost": 40.38,
+        "country": "JP",
+        "price": 76,
+        "project": "x-pack",
+        "state": "start",
+        "time": 1547582451365,
+        "@timestamp": 1547582451365,
+        "username": "wrodriguez1r",
+        "percent_uptime": 0.65
+      },
+      {
+        "age": 62,
+        "cost": 29.53,
+        "country": "AZ",
+        "price": 46,
+        "project": "machine-learning",
+        "state": "running",
+        "time": 1547598471186,
+        "@timestamp": 1547598471186,
+        "username": "aking2c",
+        "percent_uptime": 0.93
+      },
+      {
+        "age": 69,
+        "cost": 45.37,
+        "country": "AZ",
+        "price": 35,
+        "project": "machine-learning",
+        "state": "start",
+        "time": 1547599370965,
+        "@timestamp": 1547599370965,
+        "username": "jlawson2p",
+        "percent_uptime": 0.82
+      },
+      {
+        "age": 46,
+        "cost": 39.71,
+        "country": "UK",
+        "price": 39,
+        "project": "machine-learning",
+        "state": "done",
+        "time": 1547650491235,
+        "@timestamp": 1547650491235,
+        "username": "wmontgomery22",
+        "percent_uptime": 0.99
+      },
+      {
+        "age": 62,
+        "cost": 38.21,
+        "country": "SA",
+        "price": 31,
+        "project": "x-pack",
+        "state": "start",
+        "time": 1547667891326,
+        "@timestamp": 1547667891326,
+        "username": "greynolds2j",
+        "percent_uptime": 0.73
+      },
+      {
+        "age": 46,
+        "cost": 28.44,
+        "country": "TZ",
+        "price": 75,
+        "project": "apm",
+        "state": "running",
+        "time": 1547685471027,
+        "@timestamp": 1547685471027,
+        "username": "aking2c",
+        "percent_uptime": 0.7
+      },
+      {
+        "age": 85,
+        "cost": 30.5,
+        "country": "JP",
+        "price": 30,
+        "project": "beats",
+        "state": "running",
+        "time": 1547694951230,
+        "@timestamp": 1547694951230,
+        "username": "sjordan2k",
+        "percent_uptime": 0.5
+      },
+      {
+        "age": 51,
+        "cost": 27.1,
+        "country": "DE",
+        "price": 37,
+        "project": "kibana",
+        "state": "done",
+        "time": 1547699331145,
+        "@timestamp": 1547699331145,
+        "username": "wmontgomery22",
+        "percent_uptime": 0.79
+      },
+      {
+        "age": 84,
+        "cost": 36.47,
+        "country": "TZ",
+        "price": 43,
+        "project": "logstash",
+        "state": "start",
+        "time": 1547729571155,
+        "@timestamp": 1547729571155,
+        "username": "jchavez2a",
+        "percent_uptime": 0.67
+      },
+      {
+        "age": 66,
+        "cost": 37.74,
+        "country": "PH",
+        "price": 63,
+        "project": "x-pack",
+        "state": "start",
+        "time": 1547738331360,
+        "@timestamp": 1547738331360,
+        "username": "ccarpenter2m",
+        "percent_uptime": 0.74
+      },
+      {
+        "age": 87,
+        "cost": 49.07,
+        "country": "BR",
+        "price": 72,
+        "project": "machine-learning",
+        "state": "running",
+        "time": 1547742291143,
+        "@timestamp": 1547742291143,
+        "username": "hcrawford2h",
+        "percent_uptime": 0.99
+      },
+      {
+        "age": 92,
+        "cost": 31.7,
+        "country": "TZ",
+        "price": 55,
+        "project": "apm",
+        "state": "done",
+        "time": 1547772651030,
+        "@timestamp": 1547772651030,
+        "username": "jhanson1x",
+        "percent_uptime": 0.89
+      },
+      {
+        "age": 98,
+        "cost": 29.77,
+        "country": "US",
+        "price": 72,
+        "project": "logstash",
+        "state": "start",
+        "time": 1547786271226,
+        "@timestamp": 1547786271226,
+        "username": "wmontgomery22",
+        "percent_uptime": 0.66
+      },
+      {
+        "age": 10,
+        "cost": 20.49,
+        "country": "DE",
+        "price": 64,
+        "project": "machine-learning",
+        "state": "running",
+        "time": 1547871831230,
+        "@timestamp": 1547871831230,
+        "username": "dmarshall24",
+        "percent_uptime": 0.54
+      },
+      {
+        "age": 69,
+        "cost": 42.89,
+        "country": "AZ",
+        "price": 61,
+        "project": "kibana",
+        "state": "start",
+        "time": 1547902191247,
+        "@timestamp": 1547902191247,
+        "username": "sadams1v",
+        "percent_uptime": 0.8
+      },
+      {
+        "age": 42,
+        "cost": 32.31,
+        "country": "SA",
+        "price": 47,
+        "project": "swiftype",
+        "state": "running",
+        "time": 1547922591339,
+        "@timestamp": 1547922591339,
+        "username": "bmorris2n",
+        "percent_uptime": 0.65
+      },
+      {
+        "age": 100,
+        "cost": 30.42,
+        "country": "BR",
+        "price": 42,
+        "project": "kibana",
+        "state": "done",
+        "time": 1547926491261,
+        "@timestamp": 1547926491261,
+        "username": "jaustin1z",
+        "percent_uptime": 0.66
+      },
+      {
+        "age": 34,
+        "cost": 48.98,
+        "country": "DE",
+        "price": 70,
+        "project": "beats",
+        "state": "running",
+        "time": 1547958651364,
+        "@timestamp": 1547958651364,
+        "username": "jlawson2p",
+        "percent_uptime": 0.9
+      },
+      {
+        "age": 68,
+        "cost": 31.64,
+        "country": "NL",
+        "price": 47,
+        "project": "machine-learning",
+        "state": "done",
+        "time": 1547967231273,
+        "@timestamp": 1547967231273,
+        "username": "hbowman1s",
+        "percent_uptime": 0.55
+      },
+      {
+        "age": 91,
+        "cost": 46.82,
+        "country": "RU",
+        "price": 62,
+        "project": "swiftype",
+        "state": "done",
+        "time": 1547969691305,
+        "@timestamp": 1547969691305,
+        "username": "wmontgomery22",
+        "percent_uptime": 0.89
+      },
+      {
+        "age": 17,
+        "cost": 42.19,
+        "country": "IN",
+        "price": 79,
+        "project": "apm",
+        "state": "running",
+        "time": 1547974551309,
+        "@timestamp": 1547974551309,
+        "username": "hperez29",
+        "percent_uptime": 0.58
+      },
+      {
+        "age": 83,
+        "cost": 25.61,
+        "country": "CN",
+        "price": 54,
+        "project": "swiftype",
+        "state": "running",
+        "time": 1547977911240,
+        "@timestamp": 1547977911240,
+        "username": "aking2c",
+        "percent_uptime": 0.96
+      },
+      {
+        "age": 31,
+        "cost": 49.49,
+        "country": "JP",
+        "price": 58,
+        "project": "elasticsearch",
+        "state": "done",
+        "time": 1547984271197,
+        "@timestamp": 1547984271197,
+        "username": "dmarshall24",
+        "percent_uptime": 0.72
+      },
+      {
+        "age": 97,
+        "cost": 33.33,
+        "country": "PH",
+        "price": 34,
+        "project": "logstash",
+        "state": "start",
+        "time": 1547984631153,
+        "@timestamp": 1547984631153,
+        "username": "hbowman1s",
+        "percent_uptime": 0.56
+      },
+      {
+        "age": 67,
+        "cost": 31.1,
+        "country": "US",
+        "price": 73,
+        "project": "x-pack",
+        "state": "done",
+        "time": 1548001430974,
+        "@timestamp": 1548001430974,
+        "username": "ccarpenter2m",
+        "percent_uptime": 0.78
+      },
+      {
+        "age": 31,
+        "cost": 21.6,
+        "country": "PH",
+        "price": 73,
+        "project": "kibana",
+        "state": "running",
+        "time": 1548014391252,
+        "@timestamp": 1548014391252,
+        "username": "jmills21",
+        "percent_uptime": 0.59
+      },
+      {
+        "age": 57,
+        "cost": 25.84,
+        "country": "NL",
+        "price": 53,
+        "project": "swiftype",
+        "state": "start",
+        "time": 1548039051145,
+        "@timestamp": 1548039051145,
+        "username": "dhicks28",
+        "percent_uptime": 0.63
+      },
+      {
+        "age": 92,
+        "cost": 27.09,
+        "country": "CN",
+        "price": 34,
+        "project": "apm",
+        "state": "done",
+        "time": 1548052791195,
+        "@timestamp": 1548052791195,
+        "username": "dramirez2i",
+        "percent_uptime": 0.98
+      },
+      {
+        "age": 43,
+        "cost": 36.39,
+        "country": "US",
+        "price": 68,
+        "project": "elasticsearch",
+        "state": "done",
+        "time": 1548058071369,
+        "@timestamp": 1548058071369,
+        "username": "wmontgomery22",
+        "percent_uptime": 0.55
+      },
+      {
+        "age": 68,
+        "cost": 44.69,
+        "country": "JP",
+        "price": 66,
+        "project": "machine-learning",
+        "state": "running",
+        "time": 1548072471282,
+        "@timestamp": 1548072471282,
+        "username": "jmills21",
+        "percent_uptime": 0.68
+      },
+      {
+        "age": 47,
+        "cost": 25.34,
+        "country": "NL",
+        "price": 32,
+        "project": "kibana",
+        "state": "running",
+        "time": 1548075171245,
+        "@timestamp": 1548075171245,
+        "username": "wrodriguez1r",
+        "percent_uptime": 0.95
+      },
+      {
+        "age": 19,
+        "cost": 25.4,
+        "country": "SA",
+        "price": 42,
+        "project": "kibana",
+        "state": "start",
+        "time": 1548125331273,
+        "@timestamp": 1548125331273,
+        "username": "dhicks28",
+        "percent_uptime": 0.95
+      },
+      {
+        "age": 88,
+        "cost": 36.38,
+        "country": "TZ",
+        "price": 77,
+        "project": "x-pack",
+        "state": "start",
+        "time": 1548126771234,
+        "@timestamp": 1548126771234,
+        "username": "sjordan2k",
+        "percent_uptime": 0.84
+      },
+      {
+        "age": 36,
+        "cost": 28.62,
+        "country": "DE",
+        "price": 34,
+        "project": "kibana",
+        "state": "start",
+        "time": 1548128331153,
+        "@timestamp": 1548128331153,
+        "username": "dramirez2i",
+        "percent_uptime": 0.72
+      },
+      {
+        "age": 32,
+        "cost": 48.69,
+        "country": "AZ",
+        "price": 40,
+        "project": "swiftype",
+        "state": "start",
+        "time": 1548161391285,
+        "@timestamp": 1548161391285,
+        "username": "dramirez2i",
+        "percent_uptime": 0.69
+      },
+      {
+        "age": 53,
+        "cost": 44.25,
+        "country": "UK",
+        "price": 35,
+        "project": "machine-learning",
+        "state": "running",
+        "time": 1548192651185,
+        "@timestamp": 1548192651185,
+        "username": "wmontgomery22",
+        "percent_uptime": 0.68
+      },
+      {
+        "age": 37,
+        "cost": 32.67,
+        "country": "DE",
+        "price": 31,
+        "project": "kibana",
+        "state": "running",
+        "time": 1548218751137,
+        "@timestamp": 1548218751137,
+        "username": "ccarpenter2m",
+        "percent_uptime": 0.77
+      },
+      {
+        "age": 58,
+        "cost": 40.83,
+        "country": "PH",
+        "price": 61,
+        "project": "logstash",
+        "state": "running",
+        "time": 1548221151061,
+        "@timestamp": 1548221151061,
+        "username": "dmarshall24",
+        "percent_uptime": 0.88
+      },
+      {
+        "age": 45,
+        "cost": 42.97,
+        "country": "AZ",
+        "price": 44,
+        "project": "machine-learning",
+        "state": "running",
+        "time": 1548262131313,
+        "@timestamp": 1548262131313,
+        "username": "dmarshall24",
+        "percent_uptime": 0.64
+      },
+      {
+        "age": 21,
+        "cost": 23.16,
+        "country": "NL",
+        "price": 78,
+        "project": "machine-learning",
+        "state": "start",
+        "time": 1548265611336,
+        "@timestamp": 1548265611336,
+        "username": "jlawson2p",
+        "percent_uptime": 0.88
+      },
+      {
+        "age": 77,
+        "cost": 31.37,
+        "country": "RU",
+        "price": 52,
+        "project": "kibana",
+        "state": "start",
+        "time": 1548274611337,
+        "@timestamp": 1548274611337,
+        "username": "jhanson1x",
+        "percent_uptime": 0.68
+      },
+      {
+        "age": 34,
+        "cost": 41.41,
+        "country": "AZ",
+        "price": 52,
+        "project": "elasticsearch",
+        "state": "start",
+        "time": 1548276411368,
+        "@timestamp": 1548276411368,
+        "username": "agonzales1t",
+        "percent_uptime": 0.75
+      },
+      {
+        "age": 95,
+        "cost": 24.93,
+        "country": "AZ",
+        "price": 66,
+        "project": "logstash",
+        "state": "running",
+        "time": 1548301071035,
+        "@timestamp": 1548301071035,
+        "username": "phansen1q",
+        "percent_uptime": 0.75
+      },
+      {
+        "age": 12,
+        "cost": 32.33,
+        "country": "PH",
+        "price": 31,
+        "project": "elasticsearch",
+        "state": "start",
+        "time": 1548342711164,
+        "@timestamp": 1548342711164,
+        "username": "amartinez26",
+        "percent_uptime": 0.96
+      },
+      {
+        "age": 15,
+        "cost": 44.74,
+        "country": "IN",
+        "price": 41,
+        "project": "x-pack",
+        "state": "done",
+        "time": 1548372111228,
+        "@timestamp": 1548372111228,
+        "username": "rmartinez2g",
+        "percent_uptime": 0.51
+      },
+      {
+        "age": 83,
+        "cost": 29.03,
+        "country": "DE",
+        "price": 66,
+        "project": "machine-learning",
+        "state": "done",
+        "time": 1548417590970,
+        "@timestamp": 1548417590970,
+        "username": "agonzales1t",
+        "percent_uptime": 0.84
+      },
+      {
+        "age": 31,
+        "cost": 38.12,
+        "country": "PH",
+        "price": 35,
+        "project": "logstash",
+        "state": "done",
+        "time": 1548419931271,
+        "@timestamp": 1548419931271,
+        "username": "lperez2f",
+        "percent_uptime": 0.69
+      },
+      {
+        "age": 97,
+        "cost": 38.24,
+        "country": "RU",
+        "price": 32,
+        "project": "apm",
+        "state": "done",
+        "time": 1548474651117,
+        "@timestamp": 1548474651117,
+        "username": "sadams1v",
+        "percent_uptime": 0.77
+      },
+      {
+        "age": 87,
+        "cost": 34.16,
+        "country": "TZ",
+        "price": 38,
+        "project": "beats",
+        "state": "start",
+        "time": 1548575991155,
+        "@timestamp": 1548575991155,
+        "username": "bmorris2n",
+        "percent_uptime": 0.65
+      },
+      {
+        "age": 74,
+        "cost": 45.69,
+        "country": "AZ",
+        "price": 66,
+        "project": "elasticsearch",
+        "state": "start",
+        "time": 1548599391338,
+        "@timestamp": 1548599391338,
+        "username": "greynolds2j",
+        "percent_uptime": 0.98
+      },
+      {
+        "age": 83,
+        "cost": 33.43,
+        "country": "BR",
+        "price": 79,
+        "project": "elasticsearch",
+        "state": "done",
+        "time": 1548648171078,
+        "@timestamp": 1548648171078,
+        "username": "kbrooks23",
+        "percent_uptime": 0.57
+      },
+      {
+        "age": 89,
+        "cost": 41.87,
+        "country": "SA",
+        "price": 44,
+        "project": "apm",
+        "state": "start",
+        "time": 1548666111256,
+        "@timestamp": 1548666111256,
+        "username": "hcrawford2h",
+        "percent_uptime": 0.91
+      }
+    ]
+  },
+  "paginate": true,
+  "perPage": 10,
+  "showHeader": true
+}
+    </pre>
+  </code>
+</span>
+`;
+
+exports[`Storyshots components/Elements/Debug small payload 1`] = `
+<span>
+  <code>
+    <pre
+      className="canvasDebug__content"
+    >
+      {
+  "datatable": {
+    "type": "datatable",
+    "columns": [
+      {
+        "name": "@timestamp",
+        "type": "date"
+      },
+      {
+        "name": "time",
+        "type": "date"
+      },
+      {
+        "name": "cost",
+        "type": "number"
+      },
+      {
+        "name": "username",
+        "type": "string"
+      },
+      {
+        "name": "price",
+        "type": "number"
+      },
+      {
+        "name": "age",
+        "type": "number"
+      },
+      {
+        "name": "country",
+        "type": "string"
+      },
+      {
+        "name": "state",
+        "type": "string"
+      },
+      {
+        "name": "project",
+        "type": "string"
+      },
+      {
+        "name": "percent_uptime",
+        "type": "number"
+      }
+    ],
+    "rows": [
+      {
+        "age": 63,
+        "cost": 32.15,
+        "country": "US",
+        "price": 53,
+        "project": "elasticsearch",
+        "state": "running",
+        "time": 1546334211208,
+        "@timestamp": 1546334211208,
+        "username": "aevans2e",
+        "percent_uptime": 0.83
+      },
+      {
+        "age": 68,
+        "cost": 20.52,
+        "country": "JP",
+        "price": 33,
+        "project": "beats",
+        "state": "done",
+        "time": 1546351551031,
+        "@timestamp": 1546351551031,
+        "username": "aking2c",
+        "percent_uptime": 0.9
+      },
+      {
+        "age": 57,
+        "cost": 21.15,
+        "country": "UK",
+        "price": 59,
+        "project": "apm",
+        "state": "running",
+        "time": 1546352631083,
+        "@timestamp": 1546352631083,
+        "username": "mmoore2o",
+        "percent_uptime": 0.96
+      },
+      {
+        "age": 73,
+        "cost": 35.64,
+        "country": "CN",
+        "price": 71,
+        "project": "machine-learning",
+        "state": "start",
+        "time": 1546402490956,
+        "@timestamp": 1546402490956,
+        "username": "wrodriguez1r",
+        "percent_uptime": 0.61
+      },
+      {
+        "age": 38,
+        "cost": 27.19,
+        "country": "TZ",
+        "price": 36,
+        "project": "kibana",
+        "state": "done",
+        "time": 1546467111351,
+        "@timestamp": 1546467111351,
+        "username": "wrodriguez1r",
+        "percent_uptime": 0.72
+      },
+      {
+        "age": 61,
+        "cost": 49.95,
+        "country": "NL",
+        "price": 65,
+        "project": "machine-learning",
+        "state": "start",
+        "time": 1546473771019,
+        "@timestamp": 1546473771019,
+        "username": "mmoore2o",
+        "percent_uptime": 0.72
+      },
+      {
+        "age": 53,
+        "cost": 27.36,
+        "country": "JP",
+        "price": 60,
+        "project": "x-pack",
+        "state": "running",
+        "time": 1546482171310,
+        "@timestamp": 1546482171310,
+        "username": "hcrawford2h",
+        "percent_uptime": 0.65
+      },
+      {
+        "age": 31,
+        "cost": 33.77,
+        "country": "AZ",
+        "price": 77,
+        "project": "kibana",
+        "state": "start",
+        "time": 1546493451206,
+        "@timestamp": 1546493451206,
+        "username": "aking2c",
+        "percent_uptime": 0.92
+      },
+      {
+        "age": 71,
+        "cost": 20.2,
+        "country": "TZ",
+        "price": 57,
+        "project": "swiftype",
+        "state": "running",
+        "time": 1546494651235,
+        "@timestamp": 1546494651235,
+        "username": "jlawson2p",
+        "percent_uptime": 0.59
+      },
+      {
+        "age": 54,
+        "cost": 36.65,
+        "country": "TZ",
+        "price": 72,
+        "project": "apm",
+        "state": "done",
+        "time": 1546498431195,
+        "@timestamp": 1546498431195,
+        "username": "aking2c",
+        "percent_uptime": 1
+      }
+    ]
+  },
+  "paginate": true,
+  "perPage": 10,
+  "showHeader": true
+}
+    </pre>
+  </code>
+</span>
+`;
diff --git a/x-pack/legacy/plugins/canvas/public/components/debug/__examples__/debug.examples.tsx b/x-pack/legacy/plugins/canvas/public/components/debug/__examples__/debug.examples.tsx
new file mode 100644
index 0000000000000..ade133a2e2d04
--- /dev/null
+++ b/x-pack/legacy/plugins/canvas/public/components/debug/__examples__/debug.examples.tsx
@@ -0,0 +1,14 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React from 'react';
+import { storiesOf } from '@storybook/react';
+import { Debug } from '../debug';
+import { largePayload, smallPayload } from './helpers';
+
+storiesOf('components/Elements/Debug', module)
+  .add('small payload', () => <Debug payload={smallPayload} />)
+  .add('large payload', () => <Debug payload={largePayload} />);
diff --git a/x-pack/legacy/plugins/canvas/public/components/debug/__examples__/helpers.tsx b/x-pack/legacy/plugins/canvas/public/components/debug/__examples__/helpers.tsx
new file mode 100644
index 0000000000000..d9c45d0fb7bf1
--- /dev/null
+++ b/x-pack/legacy/plugins/canvas/public/components/debug/__examples__/helpers.tsx
@@ -0,0 +1,1443 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under 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 largePayload = {
+  datatable: {
+    type: 'datatable',
+    columns: [
+      {
+        name: '@timestamp',
+        type: 'date',
+      },
+      {
+        name: 'time',
+        type: 'date',
+      },
+      {
+        name: 'cost',
+        type: 'number',
+      },
+      {
+        name: 'username',
+        type: 'string',
+      },
+      {
+        name: 'price',
+        type: 'number',
+      },
+      {
+        name: 'age',
+        type: 'number',
+      },
+      {
+        name: 'country',
+        type: 'string',
+      },
+      {
+        name: 'state',
+        type: 'string',
+      },
+      {
+        name: 'project',
+        type: 'string',
+      },
+      {
+        name: 'percent_uptime',
+        type: 'number',
+      },
+    ],
+    rows: [
+      {
+        age: 63,
+        cost: 32.15,
+        country: 'US',
+        price: 53,
+        project: 'elasticsearch',
+        state: 'running',
+        time: 1546334211208,
+        '@timestamp': 1546334211208,
+        username: 'aevans2e',
+        percent_uptime: 0.83,
+      },
+      {
+        age: 68,
+        cost: 20.52,
+        country: 'JP',
+        price: 33,
+        project: 'beats',
+        state: 'done',
+        time: 1546351551031,
+        '@timestamp': 1546351551031,
+        username: 'aking2c',
+        percent_uptime: 0.9,
+      },
+      {
+        age: 57,
+        cost: 21.15,
+        country: 'UK',
+        price: 59,
+        project: 'apm',
+        state: 'running',
+        time: 1546352631083,
+        '@timestamp': 1546352631083,
+        username: 'mmoore2o',
+        percent_uptime: 0.96,
+      },
+      {
+        age: 73,
+        cost: 35.64,
+        country: 'CN',
+        price: 71,
+        project: 'machine-learning',
+        state: 'start',
+        time: 1546402490956,
+        '@timestamp': 1546402490956,
+        username: 'wrodriguez1r',
+        percent_uptime: 0.61,
+      },
+      {
+        age: 38,
+        cost: 27.19,
+        country: 'TZ',
+        price: 36,
+        project: 'kibana',
+        state: 'done',
+        time: 1546467111351,
+        '@timestamp': 1546467111351,
+        username: 'wrodriguez1r',
+        percent_uptime: 0.72,
+      },
+      {
+        age: 61,
+        cost: 49.95,
+        country: 'NL',
+        price: 65,
+        project: 'machine-learning',
+        state: 'start',
+        time: 1546473771019,
+        '@timestamp': 1546473771019,
+        username: 'mmoore2o',
+        percent_uptime: 0.72,
+      },
+      {
+        age: 53,
+        cost: 27.36,
+        country: 'JP',
+        price: 60,
+        project: 'x-pack',
+        state: 'running',
+        time: 1546482171310,
+        '@timestamp': 1546482171310,
+        username: 'hcrawford2h',
+        percent_uptime: 0.65,
+      },
+      {
+        age: 31,
+        cost: 33.77,
+        country: 'AZ',
+        price: 77,
+        project: 'kibana',
+        state: 'start',
+        time: 1546493451206,
+        '@timestamp': 1546493451206,
+        username: 'aking2c',
+        percent_uptime: 0.92,
+      },
+      {
+        age: 71,
+        cost: 20.2,
+        country: 'TZ',
+        price: 57,
+        project: 'swiftype',
+        state: 'running',
+        time: 1546494651235,
+        '@timestamp': 1546494651235,
+        username: 'jlawson2p',
+        percent_uptime: 0.59,
+      },
+      {
+        age: 54,
+        cost: 36.65,
+        country: 'TZ',
+        price: 72,
+        project: 'apm',
+        state: 'done',
+        time: 1546498431195,
+        '@timestamp': 1546498431195,
+        username: 'aking2c',
+        percent_uptime: 1,
+      },
+      {
+        age: 31,
+        cost: 26.57,
+        country: 'BR',
+        price: 48,
+        project: 'logstash',
+        state: 'done',
+        time: 1546509170962,
+        '@timestamp': 1546509170962,
+        username: 'hcrawford2h',
+        percent_uptime: 0.86,
+      },
+      {
+        age: 99,
+        cost: 22.46,
+        country: 'TZ',
+        price: 66,
+        project: 'swiftype',
+        state: 'done',
+        time: 1546552371305,
+        '@timestamp': 1546552371305,
+        username: 'bmorris2n',
+        percent_uptime: 0.76,
+      },
+      {
+        age: 87,
+        cost: 21.54,
+        country: 'US',
+        price: 43,
+        project: 'machine-learning',
+        state: 'start',
+        time: 1546575231270,
+        '@timestamp': 1546575231270,
+        username: 'sadams1v',
+        percent_uptime: 0.58,
+      },
+      {
+        age: 10,
+        cost: 37.68,
+        country: 'CN',
+        price: 36,
+        project: 'x-pack',
+        state: 'done',
+        time: 1546678071026,
+        '@timestamp': 1546678071026,
+        username: 'jchavez2a',
+        percent_uptime: 0.5,
+      },
+      {
+        age: 30,
+        cost: 21.62,
+        country: 'DE',
+        price: 78,
+        project: 'machine-learning',
+        state: 'running',
+        time: 1546678911351,
+        '@timestamp': 1546678911351,
+        username: 'kbrooks23',
+        percent_uptime: 1,
+      },
+      {
+        age: 49,
+        cost: 26.46,
+        country: 'BR',
+        price: 76,
+        project: 'swiftype',
+        state: 'start',
+        time: 1546701050984,
+        '@timestamp': 1546701050984,
+        username: 'sadams1v',
+        percent_uptime: 0.97,
+      },
+      {
+        age: 81,
+        cost: 36.69,
+        country: 'TZ',
+        price: 80,
+        project: 'logstash',
+        state: 'done',
+        time: 1546702851232,
+        '@timestamp': 1546702851232,
+        username: 'smurphy1y',
+        percent_uptime: 0.92,
+      },
+      {
+        age: 68,
+        cost: 28.74,
+        country: 'DE',
+        price: 56,
+        project: 'machine-learning',
+        state: 'running',
+        time: 1546712451326,
+        '@timestamp': 1546712451326,
+        username: 'wmontgomery22',
+        percent_uptime: 0.85,
+      },
+      {
+        age: 28,
+        cost: 21.3,
+        country: 'SA',
+        price: 72,
+        project: 'apm',
+        state: 'start',
+        time: 1546728771027,
+        '@timestamp': 1546728771027,
+        username: 'hbowman1s',
+        percent_uptime: 0.79,
+      },
+      {
+        age: 57,
+        cost: 28.72,
+        country: 'UK',
+        price: 34,
+        project: 'machine-learning',
+        state: 'done',
+        time: 1546738610972,
+        '@timestamp': 1546738610972,
+        username: 'pjohnston2l',
+        percent_uptime: 0.6,
+      },
+      {
+        age: 35,
+        cost: 48.87,
+        country: 'US',
+        price: 78,
+        project: 'apm',
+        state: 'running',
+        time: 1546761591244,
+        '@timestamp': 1546761591244,
+        username: 'bfranklin27',
+        percent_uptime: 0.52,
+      },
+      {
+        age: 89,
+        cost: 29.48,
+        country: 'TZ',
+        price: 69,
+        project: 'beats',
+        state: 'done',
+        time: 1546791771183,
+        '@timestamp': 1546791771183,
+        username: 'ccarpenter2m',
+        percent_uptime: 0.72,
+      },
+      {
+        age: 14,
+        cost: 28.94,
+        country: 'BR',
+        price: 49,
+        project: 'elasticsearch',
+        state: 'running',
+        time: 1546886211287,
+        '@timestamp': 1546886211287,
+        username: 'pjohnston2l',
+        percent_uptime: 0.75,
+      },
+      {
+        age: 39,
+        cost: 27.16,
+        country: 'CN',
+        price: 49,
+        project: 'elasticsearch',
+        state: 'start',
+        time: 1546934631129,
+        '@timestamp': 1546934631129,
+        username: 'jlawson2p',
+        percent_uptime: 0.7,
+      },
+      {
+        age: 84,
+        cost: 35.6,
+        country: 'NL',
+        price: 76,
+        project: 'swiftype',
+        state: 'running',
+        time: 1546948431271,
+        '@timestamp': 1546948431271,
+        username: 'hbowman1s',
+        percent_uptime: 0.72,
+      },
+      {
+        age: 54,
+        cost: 27.08,
+        country: 'AZ',
+        price: 49,
+        project: 'x-pack',
+        state: 'start',
+        time: 1546986231297,
+        '@timestamp': 1546986231297,
+        username: 'krobinson2b',
+        percent_uptime: 0.89,
+      },
+      {
+        age: 58,
+        cost: 26.9,
+        country: 'DE',
+        price: 43,
+        project: 'apm',
+        state: 'start',
+        time: 1547041191338,
+        '@timestamp': 1547041191338,
+        username: 'hperez29',
+        percent_uptime: 0.63,
+      },
+      {
+        age: 26,
+        cost: 48.27,
+        country: 'DE',
+        price: 36,
+        project: 'machine-learning',
+        state: 'start',
+        time: 1547118111126,
+        '@timestamp': 1547118111126,
+        username: 'sadams1v',
+        percent_uptime: 0.56,
+      },
+      {
+        age: 82,
+        cost: 32.13,
+        country: 'SA',
+        price: 79,
+        project: 'elasticsearch',
+        state: 'done',
+        time: 1547159331136,
+        '@timestamp': 1547159331136,
+        username: 'dhicks28',
+        percent_uptime: 0.71,
+      },
+      {
+        age: 26,
+        cost: 20.59,
+        country: 'UK',
+        price: 52,
+        project: 'kibana',
+        state: 'done',
+        time: 1547174150962,
+        '@timestamp': 1547174150962,
+        username: 'greynolds2j',
+        percent_uptime: 0.94,
+      },
+      {
+        age: 19,
+        cost: 25.73,
+        country: 'RU',
+        price: 45,
+        project: 'beats',
+        state: 'start',
+        time: 1547205411225,
+        '@timestamp': 1547205411225,
+        username: 'sadams1v',
+        percent_uptime: 0.6,
+      },
+      {
+        age: 53,
+        cost: 46.19,
+        country: 'JP',
+        price: 30,
+        project: 'apm',
+        state: 'done',
+        time: 1547217171103,
+        '@timestamp': 1547217171103,
+        username: 'jlawson2p',
+        percent_uptime: 0.54,
+      },
+      {
+        age: 76,
+        cost: 40.52,
+        country: 'DE',
+        price: 43,
+        project: 'machine-learning',
+        state: 'start',
+        time: 1547261271103,
+        '@timestamp': 1547261271103,
+        username: 'athomas1w',
+        percent_uptime: 0.86,
+      },
+      {
+        age: 31,
+        cost: 27.62,
+        country: 'BR',
+        price: 71,
+        project: 'machine-learning',
+        state: 'start',
+        time: 1547262771238,
+        '@timestamp': 1547262771238,
+        username: 'jhanson1x',
+        percent_uptime: 0.79,
+      },
+      {
+        age: 42,
+        cost: 30.91,
+        country: 'US',
+        price: 58,
+        project: 'beats',
+        state: 'running',
+        time: 1547274291106,
+        '@timestamp': 1547274291106,
+        username: 'amartinez26',
+        percent_uptime: 0.82,
+      },
+      {
+        age: 43,
+        cost: 23.29,
+        country: 'UK',
+        price: 41,
+        project: 'kibana',
+        state: 'start',
+        time: 1547293010955,
+        '@timestamp': 1547293010955,
+        username: 'ediaz2d',
+        percent_uptime: 0.93,
+      },
+      {
+        age: 45,
+        cost: 21.18,
+        country: 'AZ',
+        price: 62,
+        project: 'logstash',
+        state: 'done',
+        time: 1547316050970,
+        '@timestamp': 1547316050970,
+        username: 'hperez29',
+        percent_uptime: 0.75,
+      },
+      {
+        age: 39,
+        cost: 29.66,
+        country: 'IN',
+        price: 40,
+        project: 'swiftype',
+        state: 'start',
+        time: 1547320011249,
+        '@timestamp': 1547320011249,
+        username: 'hcrawford2h',
+        percent_uptime: 0.99,
+      },
+      {
+        age: 98,
+        cost: 37.42,
+        country: 'US',
+        price: 58,
+        project: 'beats',
+        state: 'done',
+        time: 1547331051346,
+        '@timestamp': 1547331051346,
+        username: 'jmills21',
+        percent_uptime: 0.51,
+      },
+      {
+        age: 96,
+        cost: 40,
+        country: 'DE',
+        price: 58,
+        project: 'apm',
+        state: 'start',
+        time: 1547425371273,
+        '@timestamp': 1547425371273,
+        username: 'rsmith25',
+        percent_uptime: 0.87,
+      },
+      {
+        age: 13,
+        cost: 47.45,
+        country: 'AZ',
+        price: 30,
+        project: 'apm',
+        state: 'done',
+        time: 1547482911215,
+        '@timestamp': 1547482911215,
+        username: 'smurphy1y',
+        percent_uptime: 0.83,
+      },
+      {
+        age: 100,
+        cost: 24.36,
+        country: 'IN',
+        price: 59,
+        project: 'apm',
+        state: 'done',
+        time: 1547485611233,
+        '@timestamp': 1547485611233,
+        username: 'jlawson2p',
+        percent_uptime: 0.64,
+      },
+      {
+        age: 10,
+        cost: 27.59,
+        country: 'US',
+        price: 53,
+        project: 'apm',
+        state: 'start',
+        time: 1547518911272,
+        '@timestamp': 1547518911272,
+        username: 'wmontgomery22',
+        percent_uptime: 0.93,
+      },
+      {
+        age: 83,
+        cost: 37.05,
+        country: 'BR',
+        price: 77,
+        project: 'logstash',
+        state: 'running',
+        time: 1547521971300,
+        '@timestamp': 1547521971300,
+        username: 'hperez29',
+        percent_uptime: 0.53,
+      },
+      {
+        age: 60,
+        cost: 31.19,
+        country: 'CN',
+        price: 69,
+        project: 'kibana',
+        state: 'running',
+        time: 1547555751264,
+        '@timestamp': 1547555751264,
+        username: 'aevans2e',
+        percent_uptime: 0.99,
+      },
+      {
+        age: 61,
+        cost: 27.69,
+        country: 'JP',
+        price: 39,
+        project: 'elasticsearch',
+        state: 'start',
+        time: 1547564691226,
+        '@timestamp': 1547564691226,
+        username: 'greynolds2j',
+        percent_uptime: 0.72,
+      },
+      {
+        age: 89,
+        cost: 33.03,
+        country: 'JP',
+        price: 75,
+        project: 'machine-learning',
+        state: 'done',
+        time: 1547581671013,
+        '@timestamp': 1547581671013,
+        username: 'aevans2e',
+        percent_uptime: 0.88,
+      },
+      {
+        age: 45,
+        cost: 40.38,
+        country: 'JP',
+        price: 76,
+        project: 'x-pack',
+        state: 'start',
+        time: 1547582451365,
+        '@timestamp': 1547582451365,
+        username: 'wrodriguez1r',
+        percent_uptime: 0.65,
+      },
+      {
+        age: 62,
+        cost: 29.53,
+        country: 'AZ',
+        price: 46,
+        project: 'machine-learning',
+        state: 'running',
+        time: 1547598471186,
+        '@timestamp': 1547598471186,
+        username: 'aking2c',
+        percent_uptime: 0.93,
+      },
+      {
+        age: 69,
+        cost: 45.37,
+        country: 'AZ',
+        price: 35,
+        project: 'machine-learning',
+        state: 'start',
+        time: 1547599370965,
+        '@timestamp': 1547599370965,
+        username: 'jlawson2p',
+        percent_uptime: 0.82,
+      },
+      {
+        age: 46,
+        cost: 39.71,
+        country: 'UK',
+        price: 39,
+        project: 'machine-learning',
+        state: 'done',
+        time: 1547650491235,
+        '@timestamp': 1547650491235,
+        username: 'wmontgomery22',
+        percent_uptime: 0.99,
+      },
+      {
+        age: 62,
+        cost: 38.21,
+        country: 'SA',
+        price: 31,
+        project: 'x-pack',
+        state: 'start',
+        time: 1547667891326,
+        '@timestamp': 1547667891326,
+        username: 'greynolds2j',
+        percent_uptime: 0.73,
+      },
+      {
+        age: 46,
+        cost: 28.44,
+        country: 'TZ',
+        price: 75,
+        project: 'apm',
+        state: 'running',
+        time: 1547685471027,
+        '@timestamp': 1547685471027,
+        username: 'aking2c',
+        percent_uptime: 0.7,
+      },
+      {
+        age: 85,
+        cost: 30.5,
+        country: 'JP',
+        price: 30,
+        project: 'beats',
+        state: 'running',
+        time: 1547694951230,
+        '@timestamp': 1547694951230,
+        username: 'sjordan2k',
+        percent_uptime: 0.5,
+      },
+      {
+        age: 51,
+        cost: 27.1,
+        country: 'DE',
+        price: 37,
+        project: 'kibana',
+        state: 'done',
+        time: 1547699331145,
+        '@timestamp': 1547699331145,
+        username: 'wmontgomery22',
+        percent_uptime: 0.79,
+      },
+      {
+        age: 84,
+        cost: 36.47,
+        country: 'TZ',
+        price: 43,
+        project: 'logstash',
+        state: 'start',
+        time: 1547729571155,
+        '@timestamp': 1547729571155,
+        username: 'jchavez2a',
+        percent_uptime: 0.67,
+      },
+      {
+        age: 66,
+        cost: 37.74,
+        country: 'PH',
+        price: 63,
+        project: 'x-pack',
+        state: 'start',
+        time: 1547738331360,
+        '@timestamp': 1547738331360,
+        username: 'ccarpenter2m',
+        percent_uptime: 0.74,
+      },
+      {
+        age: 87,
+        cost: 49.07,
+        country: 'BR',
+        price: 72,
+        project: 'machine-learning',
+        state: 'running',
+        time: 1547742291143,
+        '@timestamp': 1547742291143,
+        username: 'hcrawford2h',
+        percent_uptime: 0.99,
+      },
+      {
+        age: 92,
+        cost: 31.7,
+        country: 'TZ',
+        price: 55,
+        project: 'apm',
+        state: 'done',
+        time: 1547772651030,
+        '@timestamp': 1547772651030,
+        username: 'jhanson1x',
+        percent_uptime: 0.89,
+      },
+      {
+        age: 98,
+        cost: 29.77,
+        country: 'US',
+        price: 72,
+        project: 'logstash',
+        state: 'start',
+        time: 1547786271226,
+        '@timestamp': 1547786271226,
+        username: 'wmontgomery22',
+        percent_uptime: 0.66,
+      },
+      {
+        age: 10,
+        cost: 20.49,
+        country: 'DE',
+        price: 64,
+        project: 'machine-learning',
+        state: 'running',
+        time: 1547871831230,
+        '@timestamp': 1547871831230,
+        username: 'dmarshall24',
+        percent_uptime: 0.54,
+      },
+      {
+        age: 69,
+        cost: 42.89,
+        country: 'AZ',
+        price: 61,
+        project: 'kibana',
+        state: 'start',
+        time: 1547902191247,
+        '@timestamp': 1547902191247,
+        username: 'sadams1v',
+        percent_uptime: 0.8,
+      },
+      {
+        age: 42,
+        cost: 32.31,
+        country: 'SA',
+        price: 47,
+        project: 'swiftype',
+        state: 'running',
+        time: 1547922591339,
+        '@timestamp': 1547922591339,
+        username: 'bmorris2n',
+        percent_uptime: 0.65,
+      },
+      {
+        age: 100,
+        cost: 30.42,
+        country: 'BR',
+        price: 42,
+        project: 'kibana',
+        state: 'done',
+        time: 1547926491261,
+        '@timestamp': 1547926491261,
+        username: 'jaustin1z',
+        percent_uptime: 0.66,
+      },
+      {
+        age: 34,
+        cost: 48.98,
+        country: 'DE',
+        price: 70,
+        project: 'beats',
+        state: 'running',
+        time: 1547958651364,
+        '@timestamp': 1547958651364,
+        username: 'jlawson2p',
+        percent_uptime: 0.9,
+      },
+      {
+        age: 68,
+        cost: 31.64,
+        country: 'NL',
+        price: 47,
+        project: 'machine-learning',
+        state: 'done',
+        time: 1547967231273,
+        '@timestamp': 1547967231273,
+        username: 'hbowman1s',
+        percent_uptime: 0.55,
+      },
+      {
+        age: 91,
+        cost: 46.82,
+        country: 'RU',
+        price: 62,
+        project: 'swiftype',
+        state: 'done',
+        time: 1547969691305,
+        '@timestamp': 1547969691305,
+        username: 'wmontgomery22',
+        percent_uptime: 0.89,
+      },
+      {
+        age: 17,
+        cost: 42.19,
+        country: 'IN',
+        price: 79,
+        project: 'apm',
+        state: 'running',
+        time: 1547974551309,
+        '@timestamp': 1547974551309,
+        username: 'hperez29',
+        percent_uptime: 0.58,
+      },
+      {
+        age: 83,
+        cost: 25.61,
+        country: 'CN',
+        price: 54,
+        project: 'swiftype',
+        state: 'running',
+        time: 1547977911240,
+        '@timestamp': 1547977911240,
+        username: 'aking2c',
+        percent_uptime: 0.96,
+      },
+      {
+        age: 31,
+        cost: 49.49,
+        country: 'JP',
+        price: 58,
+        project: 'elasticsearch',
+        state: 'done',
+        time: 1547984271197,
+        '@timestamp': 1547984271197,
+        username: 'dmarshall24',
+        percent_uptime: 0.72,
+      },
+      {
+        age: 97,
+        cost: 33.33,
+        country: 'PH',
+        price: 34,
+        project: 'logstash',
+        state: 'start',
+        time: 1547984631153,
+        '@timestamp': 1547984631153,
+        username: 'hbowman1s',
+        percent_uptime: 0.56,
+      },
+      {
+        age: 67,
+        cost: 31.1,
+        country: 'US',
+        price: 73,
+        project: 'x-pack',
+        state: 'done',
+        time: 1548001430974,
+        '@timestamp': 1548001430974,
+        username: 'ccarpenter2m',
+        percent_uptime: 0.78,
+      },
+      {
+        age: 31,
+        cost: 21.6,
+        country: 'PH',
+        price: 73,
+        project: 'kibana',
+        state: 'running',
+        time: 1548014391252,
+        '@timestamp': 1548014391252,
+        username: 'jmills21',
+        percent_uptime: 0.59,
+      },
+      {
+        age: 57,
+        cost: 25.84,
+        country: 'NL',
+        price: 53,
+        project: 'swiftype',
+        state: 'start',
+        time: 1548039051145,
+        '@timestamp': 1548039051145,
+        username: 'dhicks28',
+        percent_uptime: 0.63,
+      },
+      {
+        age: 92,
+        cost: 27.09,
+        country: 'CN',
+        price: 34,
+        project: 'apm',
+        state: 'done',
+        time: 1548052791195,
+        '@timestamp': 1548052791195,
+        username: 'dramirez2i',
+        percent_uptime: 0.98,
+      },
+      {
+        age: 43,
+        cost: 36.39,
+        country: 'US',
+        price: 68,
+        project: 'elasticsearch',
+        state: 'done',
+        time: 1548058071369,
+        '@timestamp': 1548058071369,
+        username: 'wmontgomery22',
+        percent_uptime: 0.55,
+      },
+      {
+        age: 68,
+        cost: 44.69,
+        country: 'JP',
+        price: 66,
+        project: 'machine-learning',
+        state: 'running',
+        time: 1548072471282,
+        '@timestamp': 1548072471282,
+        username: 'jmills21',
+        percent_uptime: 0.68,
+      },
+      {
+        age: 47,
+        cost: 25.34,
+        country: 'NL',
+        price: 32,
+        project: 'kibana',
+        state: 'running',
+        time: 1548075171245,
+        '@timestamp': 1548075171245,
+        username: 'wrodriguez1r',
+        percent_uptime: 0.95,
+      },
+      {
+        age: 19,
+        cost: 25.4,
+        country: 'SA',
+        price: 42,
+        project: 'kibana',
+        state: 'start',
+        time: 1548125331273,
+        '@timestamp': 1548125331273,
+        username: 'dhicks28',
+        percent_uptime: 0.95,
+      },
+      {
+        age: 88,
+        cost: 36.38,
+        country: 'TZ',
+        price: 77,
+        project: 'x-pack',
+        state: 'start',
+        time: 1548126771234,
+        '@timestamp': 1548126771234,
+        username: 'sjordan2k',
+        percent_uptime: 0.84,
+      },
+      {
+        age: 36,
+        cost: 28.62,
+        country: 'DE',
+        price: 34,
+        project: 'kibana',
+        state: 'start',
+        time: 1548128331153,
+        '@timestamp': 1548128331153,
+        username: 'dramirez2i',
+        percent_uptime: 0.72,
+      },
+      {
+        age: 32,
+        cost: 48.69,
+        country: 'AZ',
+        price: 40,
+        project: 'swiftype',
+        state: 'start',
+        time: 1548161391285,
+        '@timestamp': 1548161391285,
+        username: 'dramirez2i',
+        percent_uptime: 0.69,
+      },
+      {
+        age: 53,
+        cost: 44.25,
+        country: 'UK',
+        price: 35,
+        project: 'machine-learning',
+        state: 'running',
+        time: 1548192651185,
+        '@timestamp': 1548192651185,
+        username: 'wmontgomery22',
+        percent_uptime: 0.68,
+      },
+      {
+        age: 37,
+        cost: 32.67,
+        country: 'DE',
+        price: 31,
+        project: 'kibana',
+        state: 'running',
+        time: 1548218751137,
+        '@timestamp': 1548218751137,
+        username: 'ccarpenter2m',
+        percent_uptime: 0.77,
+      },
+      {
+        age: 58,
+        cost: 40.83,
+        country: 'PH',
+        price: 61,
+        project: 'logstash',
+        state: 'running',
+        time: 1548221151061,
+        '@timestamp': 1548221151061,
+        username: 'dmarshall24',
+        percent_uptime: 0.88,
+      },
+      {
+        age: 45,
+        cost: 42.97,
+        country: 'AZ',
+        price: 44,
+        project: 'machine-learning',
+        state: 'running',
+        time: 1548262131313,
+        '@timestamp': 1548262131313,
+        username: 'dmarshall24',
+        percent_uptime: 0.64,
+      },
+      {
+        age: 21,
+        cost: 23.16,
+        country: 'NL',
+        price: 78,
+        project: 'machine-learning',
+        state: 'start',
+        time: 1548265611336,
+        '@timestamp': 1548265611336,
+        username: 'jlawson2p',
+        percent_uptime: 0.88,
+      },
+      {
+        age: 77,
+        cost: 31.37,
+        country: 'RU',
+        price: 52,
+        project: 'kibana',
+        state: 'start',
+        time: 1548274611337,
+        '@timestamp': 1548274611337,
+        username: 'jhanson1x',
+        percent_uptime: 0.68,
+      },
+      {
+        age: 34,
+        cost: 41.41,
+        country: 'AZ',
+        price: 52,
+        project: 'elasticsearch',
+        state: 'start',
+        time: 1548276411368,
+        '@timestamp': 1548276411368,
+        username: 'agonzales1t',
+        percent_uptime: 0.75,
+      },
+      {
+        age: 95,
+        cost: 24.93,
+        country: 'AZ',
+        price: 66,
+        project: 'logstash',
+        state: 'running',
+        time: 1548301071035,
+        '@timestamp': 1548301071035,
+        username: 'phansen1q',
+        percent_uptime: 0.75,
+      },
+      {
+        age: 12,
+        cost: 32.33,
+        country: 'PH',
+        price: 31,
+        project: 'elasticsearch',
+        state: 'start',
+        time: 1548342711164,
+        '@timestamp': 1548342711164,
+        username: 'amartinez26',
+        percent_uptime: 0.96,
+      },
+      {
+        age: 15,
+        cost: 44.74,
+        country: 'IN',
+        price: 41,
+        project: 'x-pack',
+        state: 'done',
+        time: 1548372111228,
+        '@timestamp': 1548372111228,
+        username: 'rmartinez2g',
+        percent_uptime: 0.51,
+      },
+      {
+        age: 83,
+        cost: 29.03,
+        country: 'DE',
+        price: 66,
+        project: 'machine-learning',
+        state: 'done',
+        time: 1548417590970,
+        '@timestamp': 1548417590970,
+        username: 'agonzales1t',
+        percent_uptime: 0.84,
+      },
+      {
+        age: 31,
+        cost: 38.12,
+        country: 'PH',
+        price: 35,
+        project: 'logstash',
+        state: 'done',
+        time: 1548419931271,
+        '@timestamp': 1548419931271,
+        username: 'lperez2f',
+        percent_uptime: 0.69,
+      },
+      {
+        age: 97,
+        cost: 38.24,
+        country: 'RU',
+        price: 32,
+        project: 'apm',
+        state: 'done',
+        time: 1548474651117,
+        '@timestamp': 1548474651117,
+        username: 'sadams1v',
+        percent_uptime: 0.77,
+      },
+      {
+        age: 87,
+        cost: 34.16,
+        country: 'TZ',
+        price: 38,
+        project: 'beats',
+        state: 'start',
+        time: 1548575991155,
+        '@timestamp': 1548575991155,
+        username: 'bmorris2n',
+        percent_uptime: 0.65,
+      },
+      {
+        age: 74,
+        cost: 45.69,
+        country: 'AZ',
+        price: 66,
+        project: 'elasticsearch',
+        state: 'start',
+        time: 1548599391338,
+        '@timestamp': 1548599391338,
+        username: 'greynolds2j',
+        percent_uptime: 0.98,
+      },
+      {
+        age: 83,
+        cost: 33.43,
+        country: 'BR',
+        price: 79,
+        project: 'elasticsearch',
+        state: 'done',
+        time: 1548648171078,
+        '@timestamp': 1548648171078,
+        username: 'kbrooks23',
+        percent_uptime: 0.57,
+      },
+      {
+        age: 89,
+        cost: 41.87,
+        country: 'SA',
+        price: 44,
+        project: 'apm',
+        state: 'start',
+        time: 1548666111256,
+        '@timestamp': 1548666111256,
+        username: 'hcrawford2h',
+        percent_uptime: 0.91,
+      },
+      {
+        age: 83,
+        cost: 33.43,
+        country: 'BR',
+        price: 79,
+        project: 'elasticsearch',
+        state: 'done',
+        time: 1548648171078,
+        '@timestamp': 1548648171078,
+        username: 'kbrooks23',
+        percent_uptime: 0.57,
+      },
+      {
+        age: 89,
+        cost: 41.87,
+        country: 'SA',
+        price: 44,
+        project: 'apm',
+        state: 'start',
+        time: 1548666111256,
+        '@timestamp': 1548666111256,
+        username: 'hcrawford2h',
+        percent_uptime: 0.91,
+      },
+    ],
+  },
+  paginate: true,
+  perPage: 10,
+  showHeader: true,
+};
+
+export const smallPayload = {
+  datatable: {
+    type: 'datatable',
+    columns: [
+      {
+        name: '@timestamp',
+        type: 'date',
+      },
+      {
+        name: 'time',
+        type: 'date',
+      },
+      {
+        name: 'cost',
+        type: 'number',
+      },
+      {
+        name: 'username',
+        type: 'string',
+      },
+      {
+        name: 'price',
+        type: 'number',
+      },
+      {
+        name: 'age',
+        type: 'number',
+      },
+      {
+        name: 'country',
+        type: 'string',
+      },
+      {
+        name: 'state',
+        type: 'string',
+      },
+      {
+        name: 'project',
+        type: 'string',
+      },
+      {
+        name: 'percent_uptime',
+        type: 'number',
+      },
+    ],
+    rows: [
+      {
+        age: 63,
+        cost: 32.15,
+        country: 'US',
+        price: 53,
+        project: 'elasticsearch',
+        state: 'running',
+        time: 1546334211208,
+        '@timestamp': 1546334211208,
+        username: 'aevans2e',
+        percent_uptime: 0.83,
+      },
+      {
+        age: 68,
+        cost: 20.52,
+        country: 'JP',
+        price: 33,
+        project: 'beats',
+        state: 'done',
+        time: 1546351551031,
+        '@timestamp': 1546351551031,
+        username: 'aking2c',
+        percent_uptime: 0.9,
+      },
+      {
+        age: 57,
+        cost: 21.15,
+        country: 'UK',
+        price: 59,
+        project: 'apm',
+        state: 'running',
+        time: 1546352631083,
+        '@timestamp': 1546352631083,
+        username: 'mmoore2o',
+        percent_uptime: 0.96,
+      },
+      {
+        age: 73,
+        cost: 35.64,
+        country: 'CN',
+        price: 71,
+        project: 'machine-learning',
+        state: 'start',
+        time: 1546402490956,
+        '@timestamp': 1546402490956,
+        username: 'wrodriguez1r',
+        percent_uptime: 0.61,
+      },
+      {
+        age: 38,
+        cost: 27.19,
+        country: 'TZ',
+        price: 36,
+        project: 'kibana',
+        state: 'done',
+        time: 1546467111351,
+        '@timestamp': 1546467111351,
+        username: 'wrodriguez1r',
+        percent_uptime: 0.72,
+      },
+      {
+        age: 61,
+        cost: 49.95,
+        country: 'NL',
+        price: 65,
+        project: 'machine-learning',
+        state: 'start',
+        time: 1546473771019,
+        '@timestamp': 1546473771019,
+        username: 'mmoore2o',
+        percent_uptime: 0.72,
+      },
+      {
+        age: 53,
+        cost: 27.36,
+        country: 'JP',
+        price: 60,
+        project: 'x-pack',
+        state: 'running',
+        time: 1546482171310,
+        '@timestamp': 1546482171310,
+        username: 'hcrawford2h',
+        percent_uptime: 0.65,
+      },
+      {
+        age: 31,
+        cost: 33.77,
+        country: 'AZ',
+        price: 77,
+        project: 'kibana',
+        state: 'start',
+        time: 1546493451206,
+        '@timestamp': 1546493451206,
+        username: 'aking2c',
+        percent_uptime: 0.92,
+      },
+      {
+        age: 71,
+        cost: 20.2,
+        country: 'TZ',
+        price: 57,
+        project: 'swiftype',
+        state: 'running',
+        time: 1546494651235,
+        '@timestamp': 1546494651235,
+        username: 'jlawson2p',
+        percent_uptime: 0.59,
+      },
+      {
+        age: 54,
+        cost: 36.65,
+        country: 'TZ',
+        price: 72,
+        project: 'apm',
+        state: 'done',
+        time: 1546498431195,
+        '@timestamp': 1546498431195,
+        username: 'aking2c',
+        percent_uptime: 1,
+      },
+    ],
+  },
+  paginate: true,
+  perPage: 10,
+  showHeader: true,
+};
diff --git a/x-pack/legacy/plugins/canvas/public/components/debug/debug.js b/x-pack/legacy/plugins/canvas/public/components/debug/debug.tsx
similarity index 72%
rename from x-pack/legacy/plugins/canvas/public/components/debug/debug.js
rename to x-pack/legacy/plugins/canvas/public/components/debug/debug.tsx
index 749ba00758881..eb8189d479f4c 100644
--- a/x-pack/legacy/plugins/canvas/public/components/debug/debug.js
+++ b/x-pack/legacy/plugins/canvas/public/components/debug/debug.tsx
@@ -7,9 +7,17 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { EuiCode } from '@elastic/eui';
-export const Debug = ({ payload }) => (
+
+const LimitRows = (key: string, value: any) => {
+  if (key === 'rows') {
+    return value.slice(0, 99);
+  }
+  return value;
+};
+
+export const Debug = ({ payload }: any) => (
   <EuiCode className="canvasDebug">
-    <pre className="canvasDebug__content">{JSON.stringify(payload, null, 2)}</pre>
+    <pre className="canvasDebug__content">{JSON.stringify(payload, LimitRows, 2)}</pre>
   </EuiCode>
 );
 
diff --git a/x-pack/legacy/plugins/canvas/public/components/debug/index.js b/x-pack/legacy/plugins/canvas/public/components/debug/index.tsx
similarity index 100%
rename from x-pack/legacy/plugins/canvas/public/components/debug/index.js
rename to x-pack/legacy/plugins/canvas/public/components/debug/index.tsx

From 11bcfae3a756aaf71f5c59ae9d0b1d1f684d008f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alejandro=20Fern=C3=A1ndez=20Haro?=
 <alejandro.haro@elastic.co>
Date: Wed, 25 Mar 2020 16:37:04 +0000
Subject: [PATCH 150/179] [Telemetry] Fix cloud tests (NP version of #59040)
 (#61271)

---
 ..._telemetry_allow_changing_opt_in_status.ts |  4 +-
 .../common/telemetry_config/types.ts          |  2 +-
 src/plugins/telemetry/server/plugin.ts        |  3 +
 .../api_integration/apis/telemetry/opt_in.ts  | 55 ++++++++++++++++++-
 4 files changed, 58 insertions(+), 6 deletions(-)

diff --git a/src/plugins/telemetry/common/telemetry_config/get_telemetry_allow_changing_opt_in_status.ts b/src/plugins/telemetry/common/telemetry_config/get_telemetry_allow_changing_opt_in_status.ts
index d7dcfd606b6ac..030edf7e1c112 100644
--- a/src/plugins/telemetry/common/telemetry_config/get_telemetry_allow_changing_opt_in_status.ts
+++ b/src/plugins/telemetry/common/telemetry_config/get_telemetry_allow_changing_opt_in_status.ts
@@ -32,9 +32,9 @@ export function getTelemetryAllowChangingOptInStatus({
     return configTelemetryAllowChangingOptInStatus;
   }
 
-  if (typeof telemetrySavedObject.telemetryAllowChangingOptInStatus === 'undefined') {
+  if (typeof telemetrySavedObject.allowChangingOptInStatus === 'undefined') {
     return configTelemetryAllowChangingOptInStatus;
   }
 
-  return telemetrySavedObject.telemetryAllowChangingOptInStatus;
+  return telemetrySavedObject.allowChangingOptInStatus;
 }
diff --git a/src/plugins/telemetry/common/telemetry_config/types.ts b/src/plugins/telemetry/common/telemetry_config/types.ts
index 7ab37e9544164..4deb1ab9a12f2 100644
--- a/src/plugins/telemetry/common/telemetry_config/types.ts
+++ b/src/plugins/telemetry/common/telemetry_config/types.ts
@@ -22,7 +22,7 @@ export interface TelemetrySavedObjectAttributes {
   lastVersionChecked?: string;
   sendUsageFrom?: 'browser' | 'server';
   lastReported?: number;
-  telemetryAllowChangingOptInStatus?: boolean;
+  allowChangingOptInStatus?: boolean;
   userHasSeenNotice?: boolean;
   reportFailureCount?: number;
   reportFailureVersion?: string;
diff --git a/src/plugins/telemetry/server/plugin.ts b/src/plugins/telemetry/server/plugin.ts
index af512d234a7dc..d7a4e15968a47 100644
--- a/src/plugins/telemetry/server/plugin.ts
+++ b/src/plugins/telemetry/server/plugin.ts
@@ -143,6 +143,9 @@ export class TelemetryPlugin implements Plugin {
           reportFailureVersion: {
             type: 'keyword',
           },
+          allowChangingOptInStatus: {
+            type: 'boolean',
+          },
         },
       },
     });
diff --git a/x-pack/test/api_integration/apis/telemetry/opt_in.ts b/x-pack/test/api_integration/apis/telemetry/opt_in.ts
index d2ad2d773d692..1b443c87c267a 100644
--- a/x-pack/test/api_integration/apis/telemetry/opt_in.ts
+++ b/x-pack/test/api_integration/apis/telemetry/opt_in.ts
@@ -6,6 +6,7 @@
 
 import expect from '@kbn/expect';
 
+import { TelemetrySavedObjectAttributes } from 'src/plugins/telemetry/server/telemetry_repository';
 import { FtrProviderContext } from '../../ftr_provider_context';
 
 export default function optInTest({ getService }: FtrProviderContext) {
@@ -13,30 +14,66 @@ export default function optInTest({ getService }: FtrProviderContext) {
   const kibanaServer = getService('kibanaServer');
 
   describe('/api/telemetry/v2/optIn API', () => {
+    let defaultAttributes: TelemetrySavedObjectAttributes;
     let kibanaVersion: any;
 
     before(async () => {
       const kibanaVersionAccessor = kibanaServer.version;
       kibanaVersion = await kibanaVersionAccessor.get();
+      defaultAttributes =
+        (await getSavedObjectAttributes(supertest).catch(err => {
+          if (err.message === 'expected 200 "OK", got 404 "Not Found"') {
+            return null;
+          }
+          throw err;
+        })) || {};
 
       expect(typeof kibanaVersion).to.eql('string');
       expect(kibanaVersion.length).to.be.greaterThan(0);
     });
 
-    it('should support sending false', async () => {
+    afterEach(async () => {
+      await updateSavedObjectAttributes(supertest, defaultAttributes);
+    });
+
+    it('should support sending false with allowChangingOptInStatus true', async () => {
+      await updateSavedObjectAttributes(supertest, {
+        ...defaultAttributes,
+        allowChangingOptInStatus: true,
+      });
       await postTelemetryV2Optin(supertest, false, 200);
       const { enabled, lastVersionChecked } = await getSavedObjectAttributes(supertest);
       expect(enabled).to.be(false);
       expect(lastVersionChecked).to.be(kibanaVersion);
     });
 
-    it('should support sending true', async () => {
+    it('should support sending true with allowChangingOptInStatus true', async () => {
+      await updateSavedObjectAttributes(supertest, {
+        ...defaultAttributes,
+        allowChangingOptInStatus: true,
+      });
       await postTelemetryV2Optin(supertest, true, 200);
       const { enabled, lastVersionChecked } = await getSavedObjectAttributes(supertest);
       expect(enabled).to.be(true);
       expect(lastVersionChecked).to.be(kibanaVersion);
     });
 
+    it('should not support sending false with allowChangingOptInStatus false', async () => {
+      await updateSavedObjectAttributes(supertest, {
+        ...defaultAttributes,
+        allowChangingOptInStatus: false,
+      });
+      await postTelemetryV2Optin(supertest, false, 400);
+    });
+
+    it('should not support sending true with allowChangingOptInStatus false', async () => {
+      await updateSavedObjectAttributes(supertest, {
+        ...defaultAttributes,
+        allowChangingOptInStatus: false,
+      });
+      await postTelemetryV2Optin(supertest, true, 400);
+    });
+
     it('should not support sending null', async () => {
       await postTelemetryV2Optin(supertest, null, 400);
     });
@@ -57,7 +94,19 @@ async function postTelemetryV2Optin(supertest: any, value: any, statusCode: numb
   return body;
 }
 
-async function getSavedObjectAttributes(supertest: any): Promise<any> {
+async function updateSavedObjectAttributes(
+  supertest: any,
+  attributes: TelemetrySavedObjectAttributes
+): Promise<any> {
+  return await supertest
+    .post('/api/saved_objects/telemetry/telemetry')
+    .query({ overwrite: true })
+    .set('kbn-xsrf', 'xxx')
+    .send({ attributes })
+    .expect(200);
+}
+
+async function getSavedObjectAttributes(supertest: any): Promise<TelemetrySavedObjectAttributes> {
   const { body } = await supertest.get('/api/saved_objects/telemetry/telemetry').expect(200);
   return body.attributes;
 }

From b8e3ccb35624dfb24a9f8b29c896ce9096ad54d2 Mon Sep 17 00:00:00 2001
From: Tim Roes <tim.roes@elastic.co>
Date: Wed, 25 Mar 2020 17:56:49 +0100
Subject: [PATCH 151/179] Move lens saved object setup to Kibana platform
 (#61157)

---
 x-pack/legacy/plugins/lens/index.ts         | 19 +-----
 x-pack/legacy/plugins/lens/mappings.json    | 35 -----------
 x-pack/plugins/lens/server/plugin.tsx       |  2 +
 x-pack/plugins/lens/server/saved_objects.ts | 65 +++++++++++++++++++++
 4 files changed, 68 insertions(+), 53 deletions(-)
 delete mode 100644 x-pack/legacy/plugins/lens/mappings.json
 create mode 100644 x-pack/plugins/lens/server/saved_objects.ts

diff --git a/x-pack/legacy/plugins/lens/index.ts b/x-pack/legacy/plugins/lens/index.ts
index b1c67fb81ba07..e9a901c58cd90 100644
--- a/x-pack/legacy/plugins/lens/index.ts
+++ b/x-pack/legacy/plugins/lens/index.ts
@@ -7,12 +7,7 @@
 import * as Joi from 'joi';
 import { resolve } from 'path';
 import { LegacyPluginInitializer } from 'src/legacy/types';
-import mappings from './mappings.json';
-import {
-  PLUGIN_ID,
-  getEditPath,
-  NOT_INTERNATIONALIZED_PRODUCT_NAME,
-} from '../../../plugins/lens/common';
+import { PLUGIN_ID, NOT_INTERNATIONALIZED_PRODUCT_NAME } from '../../../plugins/lens/common';
 
 export const lens: LegacyPluginInitializer = kibana => {
   return new kibana.Plugin({
@@ -32,18 +27,6 @@ export const lens: LegacyPluginInitializer = kibana => {
       visualize: [`plugins/${PLUGIN_ID}/legacy`],
       embeddableFactories: [`plugins/${PLUGIN_ID}/legacy`],
       styleSheetPaths: resolve(__dirname, 'public/index.scss'),
-      mappings,
-      savedObjectsManagement: {
-        lens: {
-          defaultSearchField: 'title',
-          isImportableAndExportable: true,
-          getTitle: (obj: { attributes: { title: string } }) => obj.attributes.title,
-          getInAppUrl: (obj: { id: string }) => ({
-            path: getEditPath(obj.id),
-            uiCapabilitiesPath: 'lens.show',
-          }),
-        },
-      },
     },
 
     config: () => {
diff --git a/x-pack/legacy/plugins/lens/mappings.json b/x-pack/legacy/plugins/lens/mappings.json
deleted file mode 100644
index 8304cf9c9cb64..0000000000000
--- a/x-pack/legacy/plugins/lens/mappings.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  "lens": {
-    "properties": {
-      "title": {
-        "type": "text"
-      },
-      "visualizationType": {
-        "type": "keyword"
-      },
-      "state": {
-        "type": "flattened"
-      },
-      "expression": {
-        "index": false,
-        "type": "keyword"
-      }
-    }
-  },
-  "lens-ui-telemetry": {
-    "properties": {
-      "name": {
-        "type": "keyword"
-      },
-      "type": {
-        "type": "keyword"
-      },
-      "date": {
-        "type": "date"
-      },
-      "count": {
-        "type": "integer"
-      }
-    }
-  }
-}
diff --git a/x-pack/plugins/lens/server/plugin.tsx b/x-pack/plugins/lens/server/plugin.tsx
index e805f9f7e0a92..3611658fbbcd9 100644
--- a/x-pack/plugins/lens/server/plugin.tsx
+++ b/x-pack/plugins/lens/server/plugin.tsx
@@ -14,6 +14,7 @@ import {
   initializeLensTelemetry,
   scheduleLensTelemetry,
 } from './usage';
+import { setupSavedObjects } from './saved_objects';
 
 export interface PluginSetupContract {
   usageCollection?: UsageCollectionSetup;
@@ -33,6 +34,7 @@ export class LensServerPlugin implements Plugin<{}, {}, {}, {}> {
     this.telemetryLogger = initializerContext.logger.get('telemetry');
   }
   setup(core: CoreSetup<PluginStartContract>, plugins: PluginSetupContract) {
+    setupSavedObjects(core);
     setupRoutes(core);
     if (plugins.usageCollection && plugins.taskManager) {
       registerLensUsageCollector(
diff --git a/x-pack/plugins/lens/server/saved_objects.ts b/x-pack/plugins/lens/server/saved_objects.ts
new file mode 100644
index 0000000000000..42dc750878f45
--- /dev/null
+++ b/x-pack/plugins/lens/server/saved_objects.ts
@@ -0,0 +1,65 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { CoreSetup } from 'kibana/server';
+import { getEditPath } from '../common';
+
+export function setupSavedObjects(core: CoreSetup) {
+  core.savedObjects.registerType({
+    name: 'lens',
+    hidden: false,
+    namespaceAgnostic: false,
+    management: {
+      icon: 'lensApp',
+      defaultSearchField: 'title',
+      importableAndExportable: true,
+      getTitle: (obj: { attributes: { title: string } }) => obj.attributes.title,
+      getInAppUrl: (obj: { id: string }) => ({
+        path: getEditPath(obj.id),
+        uiCapabilitiesPath: 'visualize.show',
+      }),
+    },
+    mappings: {
+      properties: {
+        title: {
+          type: 'text',
+        },
+        visualizationType: {
+          type: 'keyword',
+        },
+        state: {
+          type: 'flattened',
+        },
+        expression: {
+          index: false,
+          type: 'keyword',
+        },
+      },
+    },
+  });
+
+  core.savedObjects.registerType({
+    name: 'lens-ui-telemetry',
+    hidden: false,
+    namespaceAgnostic: false,
+    mappings: {
+      properties: {
+        name: {
+          type: 'keyword',
+        },
+        type: {
+          type: 'keyword',
+        },
+        date: {
+          type: 'date',
+        },
+        count: {
+          type: 'integer',
+        },
+      },
+    },
+  });
+}

From 49f037284d8c5861ceeb74bb159a59caec0d3030 Mon Sep 17 00:00:00 2001
From: Nicolas Chaulet <nicolas.chaulet@elastic.co>
Date: Wed, 25 Mar 2020 12:57:51 -0400
Subject: [PATCH 152/179] [Fleet] Fix agent config yaml view to work without
 fleet (#61194)

---
 .../details_page/components/yaml/index.tsx    | 38 +++++++++----------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/details_page/components/yaml/index.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/details_page/components/yaml/index.tsx
index 57031a3d72abe..79f85b0eecdf6 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/details_page/components/yaml/index.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/details_page/components/yaml/index.tsx
@@ -32,7 +32,7 @@ export const ConfigYamlView = memo<{ config: AgentConfig }>(({ config }) => {
 
   const fullConfigRequest = useGetOneAgentConfigFull(config.id);
   const apiKeysRequest = useGetEnrollmentAPIKeys();
-  const apiKeyRequest = useGetOneEnrollmentAPIKey(apiKeysRequest.data?.list?.[0].id as string);
+  const apiKeyRequest = useGetOneEnrollmentAPIKey(apiKeysRequest.data?.list?.[0]?.id as string);
 
   if (fullConfigRequest.isLoading && !fullConfigRequest.data) {
     return <Loading />;
@@ -49,30 +49,30 @@ export const ConfigYamlView = memo<{ config: AgentConfig }>(({ config }) => {
           })}
         </EuiCodeBlock>
       </EuiFlexItem>
-      <EuiFlexItem grow={3}>
-        <EuiTitle size="s">
-          <h3>
+      {apiKeyRequest.data && (
+        <EuiFlexItem grow={3}>
+          <EuiTitle size="s">
+            <h3>
+              <FormattedMessage
+                id="xpack.ingestManager.yamlConfig.instructionTittle"
+                defaultMessage="Enroll with fleet"
+              />
+            </h3>
+          </EuiTitle>
+          <EuiSpacer size="m" />
+          <EuiText size="s">
             <FormattedMessage
-              id="xpack.ingestManager.yamlConfig.instructionTittle"
-              defaultMessage="Enroll with fleet"
+              id="xpack.ingestManager.yamlConfig.instructionDescription"
+              defaultMessage="To enroll an agent with this configuration, copy and run the following command on your host."
             />
-          </h3>
-        </EuiTitle>
-        <EuiSpacer size="m" />
-        <EuiText size="s">
-          <FormattedMessage
-            id="xpack.ingestManager.yamlConfig.instructionDescription"
-            defaultMessage="To enroll an agent with this configuration, copy and run the following command on your host."
-          />
-        </EuiText>
-        <EuiSpacer size="m" />
-        {apiKeyRequest.data && (
+          </EuiText>
+          <EuiSpacer size="m" />
           <ShellEnrollmentInstructions
             apiKey={apiKeyRequest.data.item}
             kibanaUrl={`${window.location.origin}${core.http.basePath.get()}`}
           />
-        )}
-      </EuiFlexItem>
+        </EuiFlexItem>
+      )}
     </EuiFlexGroup>
   );
 });

From c91828aa924b95bef5c1845625abfde3da9a5f5a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alejandro=20Fern=C3=A1ndez=20Haro?=
 <alejandro.haro@elastic.co>
Date: Wed, 25 Mar 2020 17:28:14 +0000
Subject: [PATCH 153/179] [Telemetry] Fix /api/telemetry/v2/userHasSeenNotice
 tests (#61286)

---
 .../telemetry/telemetry_optin_notice_seen.ts     | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/x-pack/test/api_integration/apis/telemetry/telemetry_optin_notice_seen.ts b/x-pack/test/api_integration/apis/telemetry/telemetry_optin_notice_seen.ts
index c25ea403ce364..2b6f3b9309c17 100644
--- a/x-pack/test/api_integration/apis/telemetry/telemetry_optin_notice_seen.ts
+++ b/x-pack/test/api_integration/apis/telemetry/telemetry_optin_notice_seen.ts
@@ -13,12 +13,18 @@ export default function optInTest({ getService }: FtrProviderContext) {
   const client: Client = getService('legacyEs');
   const supertest = getService('supertest');
 
-  describe('/api/telemetry/v2/optIn API Telemetry User has seen OptIn Notice', () => {
+  describe('/api/telemetry/v2/userHasSeenNotice API Telemetry User has seen OptIn Notice', () => {
     it('should update telemetry setting field via PUT', async () => {
-      await client.delete({
-        index: '.kibana',
-        id: 'telemetry:telemetry',
-      } as DeleteDocumentParams);
+      try {
+        await client.delete({
+          index: '.kibana',
+          id: 'telemetry:telemetry',
+        } as DeleteDocumentParams);
+      } catch (err) {
+        if (err.statusCode !== 404) {
+          throw err;
+        }
+      }
 
       await supertest
         .put('/api/telemetry/v2/userHasSeenNotice')

From 72406f3d5c1a18100d21db2d6866fc858b6e3033 Mon Sep 17 00:00:00 2001
From: Brent Kimmel <bkimmel@users.noreply.github.com>
Date: Wed, 25 Mar 2020 13:35:12 -0400
Subject: [PATCH 154/179] advancing nodes (25% level) to 3/24 comps (#61177)

* advancing Resolver nodes (25% level) to 3/24 comps
---
 .../public/embeddables/resolver/view/defs.tsx | 299 ++++++++++--------
 .../resolver/view/process_event_dot.tsx       |  10 +-
 2 files changed, 170 insertions(+), 139 deletions(-)

diff --git a/x-pack/plugins/endpoint/public/embeddables/resolver/view/defs.tsx b/x-pack/plugins/endpoint/public/embeddables/resolver/view/defs.tsx
index 799f67123ba26..3295ef0289235 100644
--- a/x-pack/plugins/endpoint/public/embeddables/resolver/view/defs.tsx
+++ b/x-pack/plugins/endpoint/public/embeddables/resolver/view/defs.tsx
@@ -133,52 +133,52 @@ const PaintServers = memo(() => (
       />
     </linearGradient>
     <linearGradient
-      id={PaintServerIds.runningProcessCube}
-      x1="-382.33074"
-      y1="265.24689"
-      x2="-381.88086"
-      y2="264.46019"
-      gradientTransform="matrix(88, 0, 0, -100, 33669, 26535)"
+      id={PaintServerIds.terminatedProcessCube}
+      x1="-381.23752"
+      y1="264.24026"
+      x2="-380.48514"
+      y2="263.3816"
+      gradientTransform="matrix(70.05178, 0, 0, -79.94771, 26724.01313, 21140.72096)"
       gradientUnits="userSpaceOnUse"
     >
-      <stop offset="0" stopColor={NamedColors.runningProcessStart} />
-      <stop offset="1" stopColor={NamedColors.runningProcessEnd} />
+      <stop offset="0" stopColor="#4c82c3" />
+      <stop offset="1" stopColor="#8bd1c7" />
     </linearGradient>
     <linearGradient
       id={PaintServerIds.runningTriggerCube}
-      x1="-382.32713"
-      y1="265.24057"
-      x2="-381.88108"
-      y2="264.46057"
-      gradientTransform="matrix(88, 0, 0, -100, 33669, 26535)"
+      x1="-381.18643"
+      y1="264.68195"
+      x2="-380.48514"
+      y2="263.8816"
+      gradientTransform="matrix(70.05179, 0, 0, -79.94774, 26724.01618, 21181.09848)"
       gradientUnits="userSpaceOnUse"
     >
-      <stop offset="0" stopColor="#bd281f" />
-      <stop offset="1" stopColor="#dc0b72" />
+      <stop offset="0" stopColor="#dd0a73" />
+      <stop offset="1" stopColor="#f66" />
     </linearGradient>
     <linearGradient
-      id={PaintServerIds.terminatedProcessCube}
-      x1="-382.33074"
-      y1="265.24689"
-      x2="-381.88086"
-      y2="264.46019"
-      gradientTransform="matrix(88, 0, 0, -100, 33669, 26535)"
+      id={PaintServerIds.runningProcessCube}
+      x1="-381.23556"
+      y1="264.73802"
+      x2="-380.48514"
+      y2="263.8816"
+      gradientTransform="matrix(70.05179, 0, 0, -79.94774, 26724.01618, 21181.09848)"
       gradientUnits="userSpaceOnUse"
     >
-      <stop offset="0" stopColor="#006bb4" />
-      <stop offset="1" stopColor="#017d73" />
+      <stop offset="0.00087" stopColor="#006bb4" />
+      <stop offset="1" stopColor="#54b399" />
     </linearGradient>
     <linearGradient
       id={PaintServerIds.terminatedTriggerCube}
-      x1="-382.33074"
-      y1="265.24689"
-      x2="-381.88086"
-      y2="264.46019"
-      gradientTransform="matrix(88, 0, 0, -100, 33669, 26535)"
+      x1="-381.18658"
+      y1="264.68187"
+      x2="-380.48546"
+      y2="263.8817"
+      gradientTransform="matrix(70.05179, 0, 0, -79.94774, 26724.01618, 21181.09848)"
       gradientUnits="userSpaceOnUse"
     >
-      <stop offset="0" stopColor="#be2820" />
-      <stop offset="1" stopColor="#dc0b72" />
+      <stop offset="0" stopColor="#dd0a73" />
+      <stop offset="1" stopColor="#f66" />
     </linearGradient>
   </>
 ));
@@ -187,8 +187,7 @@ const PaintServers = memo(() => (
  * Ids of symbols to be linked by <use> elements
  */
 export const SymbolIds = {
-  processNode: idGenerator('nodeSymbol'),
-  solidHexagon: idGenerator('hexagon'),
+  processNodeLabel: idGenerator('nodeSymbol'),
   runningProcessCube: idGenerator('runningCube'),
   runningTriggerCube: idGenerator('runningTriggerCube'),
   terminatedProcessCube: idGenerator('terminatedCube'),
@@ -200,7 +199,11 @@ export const SymbolIds = {
  */
 const SymbolsAndShapes = memo(() => (
   <>
-    <symbol id={SymbolIds.processNode} viewBox="0 0 144 25" preserveAspectRatio="xMidYMid meet">
+    <symbol
+      id={SymbolIds.processNodeLabel}
+      viewBox="0 0 144 25"
+      preserveAspectRatio="xMidYMid meet"
+    >
       <rect
         x="1"
         y="1"
@@ -211,156 +214,184 @@ const SymbolsAndShapes = memo(() => (
         paintOrder="normal"
       />
     </symbol>
-    <symbol id={SymbolIds.solidHexagon} viewBox="0 0 200 200" preserveAspectRatio="xMidYMid meet">
-      <g transform="translate(0,-97)">
-        <path
-          transform="matrix(1.6461 0 0 1.6596 -56.401 -64.183)"
-          d="m95.148 97.617 28.238 16.221 23.609 13.713 0.071 32.566-0.071 27.302-28.167 16.344-23.68 13.59-28.238-16.221-23.609-13.713-0.07098-32.566 0.07098-27.302 28.167-16.344z"
-          fill="inherit"
-          strokeWidth="15"
-          stroke="inherit"
-        />
-      </g>
-    </symbol>
     <symbol id={SymbolIds.runningProcessCube} viewBox="0 0 88 100">
       <title>Running Process</title>
-      <g>
-        <polygon
-          points="0 25.839 44.23 0 88 25.839 88 74.688 44.23 100 0 74.688 0 25.839"
-          fill="#1d1e24"
+      <path
+        d="M87.52127,25.129a3.79536,3.79536,0,0,0-1.43184-1.47165L45.91025.57471a3.83652,3.83652,0,0,0-3.8205,0L1.91039,23.65739A3.86308,3.86308,0,0,0,0,26.95V73.11541a3.79835,3.79835,0,0,0,1.9104,3.2925L42.08975,99.49067a3.83691,3.83691,0,0,0,3.8205,0L86.08943,76.40791A3.79852,3.79852,0,0,0,88,73.11541V26.95A3.77641,3.77641,0,0,0,87.52127,25.129Z"
+        transform="translate(0.00001 0)"
+        fill={`url(#${PaintServerIds.runningProcessCube})`}
+      />
+      <g opacity="0.5">
+        <path
+          d="M59.18326,40.255,44.93983,32.07224a1.7853,1.7853,0,0,0-1.77779,0L28.91861,40.255a1.77022,1.77022,0,0,0-.64527.64058L44.0088,49.96977,59.838,40.91219a1.77,1.77,0,0,0-.65469-.65719Z"
+          transform="translate(0.00001 0)"
+          fill="#fff"
         />
-        <polygon
-          points="44.23 100 44 50 0 25.839 0 74.664 44.23 100"
-          opacity="0.25179"
+        <path
+          d="M59.18326,40.255,44.93983,32.07224a1.7853,1.7853,0,0,0-1.77779,0L28.91861,40.255a1.77022,1.77022,0,0,0-.64527.64058L44.0088,49.96977,59.838,40.91219a1.77,1.77,0,0,0-.65469-.65719Z"
+          transform="translate(0.00001 0)"
+          fill="#fff"
+          opacity="0.2"
           style={{ isolation: 'isolate' }}
         />
-        <polygon
-          points="27 41.077 44.089 31 61 41.077 61 60.128 44.089 70 27 60.128 27 41.077"
+        <path
+          d="M28.27334,40.89555a1.75837,1.75837,0,0,0-.24347.89149V58.1525a1.76751,1.76751,0,0,0,.88874,1.532L43.162,67.86729a1.77951,1.77951,0,0,0,.84679.2316V49.96977Z"
+          transform="translate(0.00001 0)"
           fill="#fff"
         />
-        <polygon points="44 31 61 41.077 61 60.128 44 50 44 31" fill="#d8d8d8" />
-        <polygon points="27 60.128 27 41.077 44 31 44 50 27 60.128" fill="#959595" />
-        <polygon
-          points="0 25.839 44.23 0 88 25.839 88 74.688 44.23 100 0 74.688 0 25.839"
-          opacity="0.74744"
-          fill={`url(#${PaintServerIds.runningProcessCube})`}
+        <path
+          d="M28.27334,40.89555a1.75837,1.75837,0,0,0-.24347.89149V58.1525a1.76751,1.76751,0,0,0,.88874,1.532L43.162,67.86729a1.77951,1.77951,0,0,0,.84679.2316V49.96977Z"
+          transform="translate(0.00001 0)"
+          fill="#fff"
+          opacity="0.2"
           style={{ isolation: 'isolate' }}
         />
-        <polygon
-          points="88 25.839 44.23 0 0 25.839 44 50 88 25.839"
+        <path
+          d="M44.0088,68.0989a1.7772,1.7772,0,0,0,.931-.2316l14.24344-8.18274a1.76754,1.76754,0,0,0,.889-1.532V41.787a1.76037,1.76037,0,0,0-.23432-.87485L44.0088,49.96977Z"
+          transform="translate(0.00001 0)"
           fill="#fff"
-          opacity="0.13893"
-          style={{ isolation: 'isolate' }}
         />
-        <polygon
-          points="44.23 100 44 50 0 25.839 0 74.664 44.23 100"
-          opacity="0.25179"
+        <path
+          d="M44.0088,68.0989a1.7772,1.7772,0,0,0,.931-.2316l14.24344-8.18274a1.76754,1.76754,0,0,0,.889-1.532V41.787a1.76037,1.76037,0,0,0-.23432-.87485L44.0088,49.96977Z"
+          transform="translate(0.00001 0)"
+          fill="#fff"
+          opacity="0.2"
           style={{ isolation: 'isolate' }}
         />
       </g>
+      <path
+        d="M.57144,24.91834a3.79909,3.79909,0,0,1,1.34825-1.32625L42.0989.50939a3.837,3.837,0,0,1,3.82081,0L86.09892,23.59206a3.79782,3.79782,0,0,1,1.4318,1.47169L44.00915,49.96733Z"
+        transform="translate(0.00001 0)"
+        fill="#fff"
+        opacity="0.3"
+        style={{ isolation: 'isolate' }}
+      />
+      <path
+        d="M43.99984,50.03265V100a3.83392,3.83392,0,0,1-1.91024-.50933L1.91039,76.40791A3.79835,3.79835,0,0,1,0,73.11541V26.95a3.77423,3.77423,0,0,1,.56216-1.96625Z"
+        transform="translate(0.00001 0)"
+        fill="#353944"
+        opacity="0.2"
+        style={{ isolation: 'isolate' }}
+      />
     </symbol>
     <symbol id={SymbolIds.runningTriggerCube} viewBox="0 0 88 100">
-      <title>Running Trigger Process</title>
-      <g>
-        <polygon
-          points="0 25.839 44.23 0 88 25.839 88 74.688 44.23 100 0 74.688 0 25.839"
-          fill="#1d1e24"
+      <title>resolver_dark process running</title>
+      <path
+        d="M87.52127,25.129a3.79536,3.79536,0,0,0-1.43184-1.47165L45.91025.57471a3.83652,3.83652,0,0,0-3.8205,0L1.91039,23.65739A3.86308,3.86308,0,0,0,0,26.95V73.11541a3.79835,3.79835,0,0,0,1.9104,3.2925L42.08975,99.49067a3.83691,3.83691,0,0,0,3.8205,0L86.08943,76.40791A3.79852,3.79852,0,0,0,88,73.11541V26.95A3.77641,3.77641,0,0,0,87.52127,25.129Z"
+        transform="translate(0.00001 0)"
+        fill={`url(#${PaintServerIds.runningTriggerCube})`}
+      />
+      <g opacity="0.5">
+        <path
+          d="M59.18326,40.255,44.93983,32.07224a1.7853,1.7853,0,0,0-1.77779,0L28.91861,40.255a1.77022,1.77022,0,0,0-.64527.64058L44.0088,49.96977,59.838,40.91219a1.77,1.77,0,0,0-.65469-.65719Z"
+          transform="translate(0.00001 0)"
+          fill="#fff"
         />
-        <polygon
-          points="44.23 100 44 50 0 25.839 0 74.664 44.23 100"
-          opacity="0.25179"
+        <path
+          d="M59.18326,40.255,44.93983,32.07224a1.7853,1.7853,0,0,0-1.77779,0L28.91861,40.255a1.77022,1.77022,0,0,0-.64527.64058L44.0088,49.96977,59.838,40.91219a1.77,1.77,0,0,0-.65469-.65719Z"
+          transform="translate(0.00001 0)"
+          fill="#fff"
+          opacity="0.2"
           style={{ isolation: 'isolate' }}
         />
-        <polygon
-          points="27 41.077 44.089 31 61 41.077 61 60.128 44.089 70 27 60.128 27 41.077"
+        <path
+          d="M28.27334,40.89555a1.75837,1.75837,0,0,0-.24347.89149V58.1525a1.76751,1.76751,0,0,0,.88874,1.532L43.162,67.86729a1.77951,1.77951,0,0,0,.84679.2316V49.96977Z"
+          transform="translate(0.00001 0)"
           fill="#fff"
         />
-        <polygon points="44 31 61 41.077 61 60.128 44 50 44 31" fill="#d8d8d8" />
-        <polygon points="27 60.128 27 41.077 44 31 44 50 27 60.128" fill="#959595" />
-        <polygon
-          points="0 25.839 44.23 0 88 25.839 88 74.688 44.23 100 0 74.688 0 25.839"
-          opacity="0.75"
-          fill={`url(#${PaintServerIds.runningTriggerCube})`}
+        <path
+          d="M28.27334,40.89555a1.75837,1.75837,0,0,0-.24347.89149V58.1525a1.76751,1.76751,0,0,0,.88874,1.532L43.162,67.86729a1.77951,1.77951,0,0,0,.84679.2316V49.96977Z"
+          transform="translate(0.00001 0)"
+          fill="#fff"
+          opacity="0.2"
           style={{ isolation: 'isolate' }}
         />
-        <polygon
-          points="88 25.839 44.23 0 0 25.839 44 50 88 25.839"
+        <path
+          d="M44.0088,68.0989a1.7772,1.7772,0,0,0,.931-.2316l14.24344-8.18274a1.76754,1.76754,0,0,0,.889-1.532V41.787a1.76037,1.76037,0,0,0-.23432-.87485L44.0088,49.96977Z"
+          transform="translate(0.00001 0)"
           fill="#fff"
-          opacity="0.13893"
-          style={{ isolation: 'isolate' }}
         />
-        <polygon
-          points="44.23 100 44 50 0 25.839 0 74.664 44.23 100"
-          opacity="0.25179"
+        <path
+          d="M44.0088,68.0989a1.7772,1.7772,0,0,0,.931-.2316l14.24344-8.18274a1.76754,1.76754,0,0,0,.889-1.532V41.787a1.76037,1.76037,0,0,0-.23432-.87485L44.0088,49.96977Z"
+          transform="translate(0.00001 0)"
+          fill="#fff"
+          opacity="0.2"
           style={{ isolation: 'isolate' }}
         />
       </g>
+      <path
+        d="M.57144,24.91834a3.79909,3.79909,0,0,1,1.34825-1.32625L42.0989.50939a3.837,3.837,0,0,1,3.82081,0L86.09892,23.59206a3.79782,3.79782,0,0,1,1.4318,1.47169L44.00915,49.96733Z"
+        transform="translate(0.00001 0)"
+        fill="#fff"
+        opacity="0.3"
+        style={{ isolation: 'isolate' }}
+      />
+      <path
+        d="M43.99984,50.03265V100a3.83392,3.83392,0,0,1-1.91024-.50933L1.91039,76.40791A3.79835,3.79835,0,0,1,0,73.11541V26.95a3.77423,3.77423,0,0,1,.56216-1.96625Z"
+        transform="translate(0.00001 0)"
+        fill="#353944"
+        opacity="0.2"
+        style={{ isolation: 'isolate' }}
+      />
     </symbol>
     <symbol viewBox="0 0 88 100" id={SymbolIds.terminatedProcessCube}>
       <title>Terminated Process</title>
-      <g>
-        <polygon
-          points="0 25.839 44.23 0 88 25.839 88 74.688 44.23 100 0 74.688 0 25.839"
-          fill="#1d1e24"
-        />
-        <polygon
-          points="44.23 100 44 50 0 25.839 0 74.664 44.23 100"
-          opacity="0.25179"
-          style={{ isolation: 'isolate' }}
-        />
-        <polygon
-          id="Path-4-Copy-15"
-          points="0 25.839 44.23 0 88 25.839 88 74.688 44.23 100 0 74.688 0 25.839"
-          opacity="0.35"
+      <path
+        d="M87.52113,24.73352a3.7956,3.7956,0,0,0-1.43182-1.47166L45.91012.17918a3.8365,3.8365,0,0,0-3.82049,0L1.91029,23.26186A3.86312,3.86312,0,0,0-.00009,26.55445V72.7199a3.79834,3.79834,0,0,0,1.91041,3.29249L42.08963,99.09514a3.83689,3.83689,0,0,0,3.82049,0L86.08931,76.01239a3.79852,3.79852,0,0,0,1.91056-3.29249V26.55445A3.77643,3.77643,0,0,0,87.52113,24.73352Z"
+        transform="translate(0.00013 0.39551)"
+        fill="#010101"
+      />
+      <g opacity="0.7">
+        <path
+          d="M87.52113,24.73352a3.7956,3.7956,0,0,0-1.43182-1.47166L45.91012.17918a3.8365,3.8365,0,0,0-3.82049,0L1.91029,23.26186A3.86312,3.86312,0,0,0-.00009,26.55445V72.7199a3.79834,3.79834,0,0,0,1.91041,3.29249L42.08963,99.09514a3.83689,3.83689,0,0,0,3.82049,0L86.08931,76.01239a3.79852,3.79852,0,0,0,1.91056-3.29249V26.55445A3.77643,3.77643,0,0,0,87.52113,24.73352Z"
+          transform="translate(0.00013 0.39551)"
           fill={`url(#${PaintServerIds.terminatedProcessCube})`}
-          style={{ isolation: 'isolate' }}
         />
-        <polygon
-          id="Path-Copy-20"
-          points="88 25.839 44.23 0 0 25.839 44 50 88 25.839"
+        <path
+          d="M.57134,24.52282a3.79906,3.79906,0,0,1,1.34824-1.32625L42.09878.11387a3.83708,3.83708,0,0,1,3.8208,0L86.09877,23.19655a3.79771,3.79771,0,0,1,1.43182,1.47165L44.00909,49.57182Z"
+          transform="translate(0.00013 0.39551)"
           fill="#fff"
-          opacity="0.13893"
+          opacity="0.3"
           style={{ isolation: 'isolate' }}
         />
-        <polygon
-          id="Path-Copy-21"
-          points="44.23 100 44 50 0 25.839 0 74.664 44.23 100"
-          opacity="0.25179"
+        <path
+          d="M43.99972,49.63713V99.60449a3.83406,3.83406,0,0,1-1.91025-.50932L1.91029,76.01239A3.79835,3.79835,0,0,1-.00013,72.7199V26.55445A3.77431,3.77431,0,0,1,.562,24.5882Z"
+          transform="translate(0.00013 0.39551)"
+          fill="#353944"
+          opacity="0.2"
           style={{ isolation: 'isolate' }}
         />
       </g>
     </symbol>
-    <svg id={SymbolIds.terminatedTriggerCube} viewBox="0 0 88 100">
+    <symbol id={SymbolIds.terminatedTriggerCube} viewBox="0 0 88 100">
       <title>Terminated Trigger Process</title>
-      <g>
-        <polygon
-          points="0 25.839 44.23 0 88 25.839 88 74.688 44.23 100 0 74.688 0 25.839"
-          fill="#1d1e24"
-        />
-        <polygon
-          points="44.23 100 44 50 0 25.839 0 74.664 44.23 100"
-          opacity="0.25179"
-          style={{ isolation: 'isolate' }}
-        />
-        <polygon
-          points="0 25.839 44.23 0 88 25.839 88 74.688 44.23 100 0 74.688 0 25.839"
-          opacity="0.35"
+      <path
+        d="M87.52143,25.06372a3.795,3.795,0,0,0-1.43129-1.47166L45.92578.50939a3.83384,3.83384,0,0,0-3.81907,0L1.94219,23.59206A3.8634,3.8634,0,0,0,.03252,26.88465V73.05008a3.7986,3.7986,0,0,0,1.90971,3.2925L42.10671,99.42532a3.83423,3.83423,0,0,0,3.81907,0L86.09014,76.34258A3.79881,3.79881,0,0,0,88,73.05008V26.88465A3.77748,3.77748,0,0,0,87.52143,25.06372Z"
+        transform="translate(0)"
+        fill="#010101"
+      />
+      <g opacity="0.6">
+        <path
+          d="M87.48893,25.129a3.79468,3.79468,0,0,0-1.4313-1.47165L45.89329.57472a3.83381,3.83381,0,0,0-3.81908,0L1.90969,23.65739A3.86331,3.86331,0,0,0,0,26.95V73.11541a3.79859,3.79859,0,0,0,1.90969,3.2925L42.07421,99.49067a3.83425,3.83425,0,0,0,3.81908,0L86.05763,76.40791a3.79876,3.79876,0,0,0,1.90985-3.2925V26.95A3.77746,3.77746,0,0,0,87.48893,25.129Z"
+          transform="translate(0)"
           fill={`url(#${PaintServerIds.terminatedTriggerCube})`}
-          style={{ isolation: 'isolate' }}
         />
-        <polygon
-          points="88 25.839 44.23 0 0 25.839 44 50 88 25.839"
+        <path
+          d="M.57124,24.91834A3.79833,3.79833,0,0,1,1.919,23.59209L42.08335.50939a3.83441,3.83441,0,0,1,3.8194,0L86.06711,23.59206a3.7972,3.7972,0,0,1,1.43128,1.47169L43.99289,49.96733Z"
+          transform="translate(0)"
           fill="#fff"
-          opacity="0.13893"
+          opacity="0.3"
           style={{ isolation: 'isolate' }}
         />
-        <polygon
-          points="44.23 100 44 50 0 25.839 0 74.664 44.23 100"
-          opacity="0.25179"
+        <path
+          d="M43.98359,50.03265V100a3.83139,3.83139,0,0,1-1.90953-.50933L1.90969,76.40791A3.79859,3.79859,0,0,1,0,73.11541V26.95a3.77523,3.77523,0,0,1,.56195-1.96625Z"
+          transform="translate(0)"
+          fill="#353944"
+          opacity="0.2"
           style={{ isolation: 'isolate' }}
         />
       </g>
-    </svg>
+    </symbol>
   </>
 ));
 
diff --git a/x-pack/plugins/endpoint/public/embeddables/resolver/view/process_event_dot.tsx b/x-pack/plugins/endpoint/public/embeddables/resolver/view/process_event_dot.tsx
index f3086be1598a8..603521e2d9bb3 100644
--- a/x-pack/plugins/endpoint/public/embeddables/resolver/view/process_event_dot.tsx
+++ b/x-pack/plugins/endpoint/public/embeddables/resolver/view/process_event_dot.tsx
@@ -20,7 +20,7 @@ const nodeAssets = {
   runningProcessCube: {
     cubeSymbol: `#${SymbolIds.runningProcessCube}`,
     labelFill: `url(#${PaintServerIds.runningProcess})`,
-    descriptionFill: NamedColors.activeNoWarning,
+    descriptionFill: NamedColors.empty,
     descriptionText: i18n.translate('xpack.endpoint.resolver.runningProcess', {
       defaultMessage: 'Running Process',
     }),
@@ -28,7 +28,7 @@ const nodeAssets = {
   runningTriggerCube: {
     cubeSymbol: `#${SymbolIds.runningTriggerCube}`,
     labelFill: `url(#${PaintServerIds.runningTrigger})`,
-    descriptionFill: NamedColors.activeWarning,
+    descriptionFill: NamedColors.empty,
     descriptionText: i18n.translate('xpack.endpoint.resolver.runningTrigger', {
       defaultMessage: 'Running Trigger',
     }),
@@ -36,7 +36,7 @@ const nodeAssets = {
   terminatedProcessCube: {
     cubeSymbol: `#${SymbolIds.terminatedProcessCube}`,
     labelFill: NamedColors.fullLabelBackground,
-    descriptionFill: NamedColors.inertDescription,
+    descriptionFill: NamedColors.empty,
     descriptionText: i18n.translate('xpack.endpoint.resolver.terminatedProcess', {
       defaultMessage: 'Terminated Process',
     }),
@@ -44,7 +44,7 @@ const nodeAssets = {
   terminatedTriggerCube: {
     cubeSymbol: `#${SymbolIds.terminatedTriggerCube}`,
     labelFill: NamedColors.fullLabelBackground,
-    descriptionFill: NamedColors.inertDescription,
+    descriptionFill: NamedColors.empty,
     descriptionText: i18n.translate('xpack.endpoint.resolver.terminatedTrigger', {
       defaultMessage: 'Terminated Trigger',
     }),
@@ -207,7 +207,7 @@ export const ProcessEventDot = styled(
               </use>
               <use
                 role="presentation"
-                xlinkHref={`#${SymbolIds.processNode}`}
+                xlinkHref={`#${SymbolIds.processNodeLabel}`}
                 x={markerPositionOffset + markerSize - 0.5}
                 y={labelYOffset}
                 width={(markerSize / 1.7647) * 5}

From 6c8cc4cf74c0e3f3d120fd3c969058960876ede6 Mon Sep 17 00:00:00 2001
From: Chris Roberson <chrisronline@gmail.com>
Date: Wed, 25 Mar 2020 13:35:45 -0400
Subject: [PATCH 155/179] Fix issue with no logstash monitoring data in the top
 end of the time series (#61273)

---
 .../lib/logstash/get_paginated_pipelines.js   |  3 +++
 .../apis/monitoring/logstash/pipelines.js     | 22 +++++++++++++++++++
 2 files changed, 25 insertions(+)

diff --git a/x-pack/plugins/monitoring/server/lib/logstash/get_paginated_pipelines.js b/x-pack/plugins/monitoring/server/lib/logstash/get_paginated_pipelines.js
index 5ceb9536be2ae..81eca5bbff9cb 100644
--- a/x-pack/plugins/monitoring/server/lib/logstash/get_paginated_pipelines.js
+++ b/x-pack/plugins/monitoring/server/lib/logstash/get_paginated_pipelines.js
@@ -118,6 +118,9 @@ async function getPaginatedThroughputData(pipelines, req, lsIndexPattern, throug
     for (const pipeline of pipelines) {
       if (pipelineAggregationData.id === pipeline.id) {
         const dataSeries = get(pipelineAggregationData, `metrics.${throughputMetric}.data`, [[]]);
+        if (dataSeries.length === 0) {
+          continue;
+        }
         pipeline[throughputMetric] = dataSeries.pop()[1];
       }
     }
diff --git a/x-pack/test/api_integration/apis/monitoring/logstash/pipelines.js b/x-pack/test/api_integration/apis/monitoring/logstash/pipelines.js
index b93f03151f6cb..fd427039d29c0 100644
--- a/x-pack/test/api_integration/apis/monitoring/logstash/pipelines.js
+++ b/x-pack/test/api_integration/apis/monitoring/logstash/pipelines.js
@@ -58,5 +58,27 @@ export default function({ getService }) {
       const ids = [...(await getIds(0)), ...(await getIds(1)), ...(await getIds(2))];
       expect(ids.length).to.be(26);
     });
+
+    it('should not error out if there is missing data for part of the time series', async () => {
+      const customTimeRange = {
+        ...timeRange,
+        max: '2019-11-04T15:59:38.667Z',
+      };
+
+      const customSort = {
+        ...sort,
+        field: 'logstash_cluster_pipeline_throughput',
+      };
+
+      await supertest
+        .post('/api/monitoring/v1/clusters/TUjQLdHNTh2SB9Wy0gOtWg/logstash/pipelines')
+        .set('kbn-xsrf', 'xxx')
+        .send({
+          timeRange: customTimeRange,
+          pagination: { ...pagination, index: 1 },
+          sort: customSort,
+        })
+        .expect(200);
+    });
   });
 }

From cfb7c0d00f881343c90d588b5b86a5337cc8b27b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alejandro=20Fern=C3=A1ndez=20Haro?=
 <alejandro.haro@elastic.co>
Date: Wed, 25 Mar 2020 17:36:51 +0000
Subject: [PATCH 156/179] [Telemetry] Fix license.issuer validation in tests
 (general 'string' instead of constant 'elasticsearch') (#61289)

---
 x-pack/test/api_integration/apis/telemetry/telemetry_local.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x-pack/test/api_integration/apis/telemetry/telemetry_local.js b/x-pack/test/api_integration/apis/telemetry/telemetry_local.js
index db705b301a71e..70017ce424a1f 100644
--- a/x-pack/test/api_integration/apis/telemetry/telemetry_local.js
+++ b/x-pack/test/api_integration/apis/telemetry/telemetry_local.js
@@ -63,7 +63,7 @@ export default function({ getService }) {
       const stats = body[0];
 
       expect(stats.collection).to.be('local');
-      expect(stats.license.issuer).to.be('elasticsearch');
+      expect(stats.license.issuer).to.be.a('string');
       expect(stats.license.status).to.be('active');
 
       expect(stats.stack_stats.kibana.count).to.be(1);

From 75aa2076bf9a14342443899fabaffe5c579f7d47 Mon Sep 17 00:00:00 2001
From: Lukas Olson <olson.lukas@gmail.com>
Date: Wed, 25 Mar 2020 10:55:43 -0700
Subject: [PATCH 157/179] Fix search interceptor toast lifetime (#61133)

---
 src/plugins/data/public/search/search_interceptor.ts            | 2 +-
 .../plugins/data_enhanced/public/search/search_interceptor.ts   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/plugins/data/public/search/search_interceptor.ts b/src/plugins/data/public/search/search_interceptor.ts
index d83ddab807bc5..2815b41eaba5c 100644
--- a/src/plugins/data/public/search/search_interceptor.ts
+++ b/src/plugins/data/public/search/search_interceptor.ts
@@ -140,7 +140,7 @@ export class SearchInterceptor {
         }),
       },
       {
-        toastLifeTimeMs: Infinity,
+        toastLifeTimeMs: 1000000,
       }
     );
   };
diff --git a/x-pack/plugins/data_enhanced/public/search/search_interceptor.ts b/x-pack/plugins/data_enhanced/public/search/search_interceptor.ts
index 38452dee9a2da..472d39179b468 100644
--- a/x-pack/plugins/data_enhanced/public/search/search_interceptor.ts
+++ b/x-pack/plugins/data_enhanced/public/search/search_interceptor.ts
@@ -49,7 +49,7 @@ export class EnhancedSearchInterceptor extends SearchInterceptor {
         }),
       },
       {
-        toastLifeTimeMs: Infinity,
+        toastLifeTimeMs: 1000000,
       }
     );
   };

From 008d3944c00b309a86f5bd2cf8e2b3c2fb461003 Mon Sep 17 00:00:00 2001
From: Alison Goryachev <alison.goryachev@elastic.co>
Date: Wed, 25 Mar 2020 14:33:33 -0400
Subject: [PATCH 158/179] [Remote clusters] Fix handling of remote clusters
 with deprecated proxy setting (#61126)

---
 .../common/lib/cluster_serialization.test.ts  | 36 ++++++++++-
 .../common/lib/cluster_serialization.ts       | 62 ++++++++++++-------
 .../remote_clusters/common/lib/index.ts       |  7 ++-
 .../remote_cluster_form.js                    |  2 +
 .../server/routes/api/delete_route.test.ts    | 40 +++++++++++-
 .../server/routes/api/delete_route.ts         | 15 ++++-
 .../server/routes/api/update_route.ts         |  7 ++-
 7 files changed, 139 insertions(+), 30 deletions(-)

diff --git a/x-pack/plugins/remote_clusters/common/lib/cluster_serialization.test.ts b/x-pack/plugins/remote_clusters/common/lib/cluster_serialization.test.ts
index 10b3dbbd9b452..7fd8b4a894989 100644
--- a/x-pack/plugins/remote_clusters/common/lib/cluster_serialization.test.ts
+++ b/x-pack/plugins/remote_clusters/common/lib/cluster_serialization.test.ts
@@ -124,6 +124,7 @@ describe('cluster_serialization', () => {
         skipUnavailable: false,
         transportPingSchedule: '-1',
         transportCompress: false,
+        serverName: 'localhost',
       });
     });
 
@@ -155,6 +156,38 @@ describe('cluster_serialization', () => {
       expect(() => serializeCluster('foo')).toThrowError();
     });
 
+    it('should serialize a cluster that has a deprecated proxy setting', () => {
+      expect(
+        serializeCluster({
+          name: 'test_cluster',
+          proxyAddress: 'localhost:9300',
+          mode: 'proxy',
+          isConnected: true,
+          skipUnavailable: false,
+          proxySocketConnections: 18,
+          serverName: 'localhost',
+          hasDeprecatedProxySetting: true,
+        })
+      ).toEqual({
+        persistent: {
+          cluster: {
+            remote: {
+              test_cluster: {
+                mode: 'proxy',
+                proxy_socket_connections: 18,
+                proxy_address: 'localhost:9300',
+                skip_unavailable: false,
+                server_name: 'localhost',
+                proxy: null,
+                seeds: null,
+                node_connections: null,
+              },
+            },
+          },
+        },
+      });
+    });
+
     it('should serialize a complete cluster object to only dynamic properties', () => {
       expect(
         serializeCluster({
@@ -167,13 +200,14 @@ describe('cluster_serialization', () => {
           skipUnavailable: false,
           transportPingSchedule: '-1',
           transportCompress: false,
+          mode: 'sniff',
         })
       ).toEqual({
         persistent: {
           cluster: {
             remote: {
               test_cluster: {
-                mode: null,
+                mode: 'sniff',
                 node_connections: null,
                 proxy_address: null,
                 proxy_socket_connections: null,
diff --git a/x-pack/plugins/remote_clusters/common/lib/cluster_serialization.ts b/x-pack/plugins/remote_clusters/common/lib/cluster_serialization.ts
index d0898fda93a41..3d8ffa13b8218 100644
--- a/x-pack/plugins/remote_clusters/common/lib/cluster_serialization.ts
+++ b/x-pack/plugins/remote_clusters/common/lib/cluster_serialization.ts
@@ -6,7 +6,8 @@
 
 import { PROXY_MODE } from '../constants';
 
-export interface ClusterEs {
+// Values returned from ES GET /_remote/info
+export interface ClusterInfoEs {
   seeds?: string[];
   mode?: 'proxy' | 'sniff';
   connected?: boolean;
@@ -42,19 +43,23 @@ export interface Cluster {
   connectedSocketsCount?: number;
   hasDeprecatedProxySetting?: boolean;
 }
-export interface ClusterPayload {
+
+interface ClusterPayloadEs {
+  skip_unavailable?: boolean | null;
+  mode?: 'sniff' | 'proxy' | null;
+  proxy_address?: string | null;
+  proxy_socket_connections?: number | null;
+  server_name?: string | null;
+  seeds?: string[] | null;
+  node_connections?: number | null;
+  proxy?: null;
+}
+// Payload expected from ES PUT /_cluster/settings
+export interface ClusterSettingsPayloadEs {
   persistent: {
     cluster: {
       remote: {
-        [key: string]: {
-          skip_unavailable?: boolean | null;
-          mode?: 'sniff' | 'proxy' | null;
-          proxy_address?: string | null;
-          proxy_socket_connections?: number | null;
-          server_name?: string | null;
-          seeds?: string[] | null;
-          node_connections?: number | null;
-        };
+        [key: string]: ClusterPayloadEs;
       };
     };
   };
@@ -62,7 +67,7 @@ export interface ClusterPayload {
 
 export function deserializeCluster(
   name: string,
-  esClusterObject: ClusterEs,
+  esClusterObject: ClusterInfoEs,
   deprecatedProxyAddress?: string | undefined
 ): Cluster {
   if (!name || !esClusterObject || typeof esClusterObject !== 'object') {
@@ -112,12 +117,16 @@ export function deserializeCluster(
   // If a user has a remote cluster with the deprecated proxy setting,
   // we transform the data to support the new implementation and also flag the deprecation
   if (deprecatedProxyAddress) {
+    // Create server name (address, without port), since field doesn't exist in deprecated implementation
+    const defaultServerName = deprecatedProxyAddress.split(':')[0];
+
     deserializedClusterObject = {
       ...deserializedClusterObject,
       proxyAddress: deprecatedProxyAddress,
       seeds: undefined,
       hasDeprecatedProxySetting: true,
       mode: PROXY_MODE,
+      serverName: defaultServerName,
     };
   }
 
@@ -131,7 +140,7 @@ export function deserializeCluster(
   return deserializedClusterObject;
 }
 
-export function serializeCluster(deserializedClusterObject: Cluster): ClusterPayload {
+export function serializeCluster(deserializedClusterObject: Cluster): ClusterSettingsPayloadEs {
   if (!deserializedClusterObject || typeof deserializedClusterObject !== 'object') {
     throw new Error('Unable to serialize cluster');
   }
@@ -145,22 +154,31 @@ export function serializeCluster(deserializedClusterObject: Cluster): ClusterPay
     proxyAddress,
     proxySocketConnections,
     serverName,
+    hasDeprecatedProxySetting,
   } = deserializedClusterObject;
 
+  const clusterData: ClusterPayloadEs = {
+    skip_unavailable: typeof skipUnavailable === 'boolean' ? skipUnavailable : null,
+    mode: mode || null,
+    proxy_address: proxyAddress || null,
+    proxy_socket_connections: proxySocketConnections || null,
+    server_name: serverName || null,
+    seeds: seeds || null,
+    node_connections: nodeConnections || null,
+  };
+
+  // This is only applicable in edit mode
+  // In order to "upgrade" an existing remote cluster to use the new proxy mode settings, we need to set the old proxy setting to null
+  if (hasDeprecatedProxySetting) {
+    clusterData.proxy = null;
+  }
+
   return {
     // Background on why we only save as persistent settings detailed here: https://github.com/elastic/kibana/pull/26067#issuecomment-441848124
     persistent: {
       cluster: {
         remote: {
-          [name]: {
-            skip_unavailable: typeof skipUnavailable === 'boolean' ? skipUnavailable : null,
-            mode: mode || null,
-            proxy_address: proxyAddress || null,
-            proxy_socket_connections: proxySocketConnections || null,
-            server_name: serverName || null,
-            seeds: seeds || null,
-            node_connections: nodeConnections || null,
-          },
+          [name]: clusterData,
         },
       },
     },
diff --git a/x-pack/plugins/remote_clusters/common/lib/index.ts b/x-pack/plugins/remote_clusters/common/lib/index.ts
index 52a0536bfd55b..43cf004becff9 100644
--- a/x-pack/plugins/remote_clusters/common/lib/index.ts
+++ b/x-pack/plugins/remote_clusters/common/lib/index.ts
@@ -4,4 +4,9 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-export { deserializeCluster, serializeCluster, Cluster, ClusterEs } from './cluster_serialization';
+export {
+  deserializeCluster,
+  serializeCluster,
+  Cluster,
+  ClusterInfoEs,
+} from './cluster_serialization';
diff --git a/x-pack/plugins/remote_clusters/public/application/sections/components/remote_cluster_form/remote_cluster_form.js b/x-pack/plugins/remote_clusters/public/application/sections/components/remote_cluster_form/remote_cluster_form.js
index 94d6ca4ebb648..7d3ed0708ae54 100644
--- a/x-pack/plugins/remote_clusters/public/application/sections/components/remote_cluster_form/remote_cluster_form.js
+++ b/x-pack/plugins/remote_clusters/public/application/sections/components/remote_cluster_form/remote_cluster_form.js
@@ -135,6 +135,7 @@ export class RemoteClusterForm extends Component {
         skipUnavailable,
       },
     } = this.state;
+    const { fields } = this.props;
 
     let modeSettings;
 
@@ -155,6 +156,7 @@ export class RemoteClusterForm extends Component {
       name,
       skipUnavailable,
       mode,
+      hasDeprecatedProxySetting: fields.hasDeprecatedProxySetting,
       ...modeSettings,
     };
   }
diff --git a/x-pack/plugins/remote_clusters/server/routes/api/delete_route.test.ts b/x-pack/plugins/remote_clusters/server/routes/api/delete_route.test.ts
index cf14f8a67054e..ec14336da08d4 100644
--- a/x-pack/plugins/remote_clusters/server/routes/api/delete_route.test.ts
+++ b/x-pack/plugins/remote_clusters/server/routes/api/delete_route.test.ts
@@ -84,6 +84,20 @@ describe('DELETE remote clusters', () => {
   describe('success', () => {
     deleteRemoteClustersTest('deletes remote cluster', {
       apiResponses: [
+        async () => ({
+          persistent: {
+            cluster: {
+              remote: {
+                test: {
+                  seeds: ['127.0.0.1:9300'],
+                  skip_unavailable: false,
+                  mode: 'sniff',
+                },
+              },
+            },
+          },
+          transient: {},
+        }),
         async () => ({
           test: {
             connected: true,
@@ -143,7 +157,17 @@ describe('DELETE remote clusters', () => {
     deleteRemoteClustersTest(
       'returns errors array with 404 error if remote cluster does not exist',
       {
-        apiResponses: [async () => ({})],
+        apiResponses: [
+          async () => ({
+            persistent: {
+              cluster: {
+                remote: {},
+              },
+            },
+            transient: {},
+          }),
+          async () => ({}),
+        ],
         params: {
           nameOrNames: 'test',
         },
@@ -178,6 +202,20 @@ describe('DELETE remote clusters', () => {
       'returns errors array with 400 error if ES still returns cluster information',
       {
         apiResponses: [
+          async () => ({
+            persistent: {
+              cluster: {
+                remote: {
+                  test: {
+                    seeds: ['127.0.0.1:9300'],
+                    skip_unavailable: false,
+                    mode: 'sniff',
+                  },
+                },
+              },
+            },
+            transient: {},
+          }),
           async () => ({
             test: {
               connected: true,
diff --git a/x-pack/plugins/remote_clusters/server/routes/api/delete_route.ts b/x-pack/plugins/remote_clusters/server/routes/api/delete_route.ts
index 742780ffed309..07b0fa3fd9cd7 100644
--- a/x-pack/plugins/remote_clusters/server/routes/api/delete_route.ts
+++ b/x-pack/plugins/remote_clusters/server/routes/api/delete_route.ts
@@ -37,6 +37,8 @@ export const register = (deps: RouteDependencies): void => {
       const itemsDeleted: any[] = [];
       const errors: any[] = [];
 
+      const clusterSettings = await callAsCurrentUser('cluster.getSettings');
+
       // Validator that returns an error if the remote cluster does not exist.
       const validateClusterDoesExist = async (name: string) => {
         try {
@@ -60,9 +62,12 @@ export const register = (deps: RouteDependencies): void => {
       };
 
       // Send the request to delete the cluster and return an error if it could not be deleted.
-      const sendRequestToDeleteCluster = async (name: string) => {
+      const sendRequestToDeleteCluster = async (
+        name: string,
+        hasDeprecatedProxySetting: boolean
+      ) => {
         try {
-          const body = serializeCluster({ name });
+          const body = serializeCluster({ name, hasDeprecatedProxySetting });
           const updateClusterResponse = await callAsCurrentUser('cluster.putSettings', { body });
           const acknowledged = get(updateClusterResponse, 'acknowledged');
           const cluster = get(updateClusterResponse, `persistent.cluster.remote.${name}`);
@@ -98,8 +103,12 @@ export const register = (deps: RouteDependencies): void => {
         let error: any = await validateClusterDoesExist(clusterName);
 
         if (!error) {
+          // Check if cluster contains deprecated proxy setting
+          const hasDeprecatedProxySetting = Boolean(
+            get(clusterSettings, `persistent.cluster.remote[${clusterName}].proxy`, undefined)
+          );
           // Delete the cluster.
-          error = await sendRequestToDeleteCluster(clusterName);
+          error = await sendRequestToDeleteCluster(clusterName, hasDeprecatedProxySetting);
         }
 
         if (error) {
diff --git a/x-pack/plugins/remote_clusters/server/routes/api/update_route.ts b/x-pack/plugins/remote_clusters/server/routes/api/update_route.ts
index 14b161b6f26b5..47b0d4ad2def2 100644
--- a/x-pack/plugins/remote_clusters/server/routes/api/update_route.ts
+++ b/x-pack/plugins/remote_clusters/server/routes/api/update_route.ts
@@ -10,7 +10,7 @@ import { i18n } from '@kbn/i18n';
 import { RequestHandler } from 'src/core/server';
 
 import { API_BASE_PATH, SNIFF_MODE, PROXY_MODE } from '../../../common/constants';
-import { serializeCluster, deserializeCluster, Cluster, ClusterEs } from '../../../common/lib';
+import { serializeCluster, deserializeCluster, Cluster, ClusterInfoEs } from '../../../common/lib';
 import { doesClusterExist } from '../../lib/does_cluster_exist';
 import { RouteDependencies } from '../../types';
 import { licensePreRoutingFactory } from '../../lib/license_pre_routing_factory';
@@ -68,7 +68,10 @@ export const register = (deps: RouteDependencies): void => {
       });
 
       const acknowledged = get(updateClusterResponse, 'acknowledged');
-      const cluster = get(updateClusterResponse, `persistent.cluster.remote.${name}`) as ClusterEs;
+      const cluster = get(
+        updateClusterResponse,
+        `persistent.cluster.remote.${name}`
+      ) as ClusterInfoEs;
 
       if (acknowledged && cluster) {
         const body = {

From 4c70ef54a7656361886568195946b9cd361d20f5 Mon Sep 17 00:00:00 2001
From: Nathan Reese <reese.nathan@gmail.com>
Date: Wed, 25 Mar 2020 13:42:50 -0600
Subject: [PATCH 159/179] descriptors to descriptor_types (#61290)

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 x-pack/legacy/plugins/maps/common/descriptor_types.ts  |  8 ++++++++
 .../plugins/maps/public/actions/map_actions.d.ts       |  2 +-
 .../plugins/maps/public/layers/blended_vector_layer.ts |  2 +-
 .../plugins/maps/public/layers/sources/es_source.d.ts  |  2 +-
 .../maps/public/layers/sources/vector_source.d.ts      |  2 +-
 .../field_meta/categorical_field_meta_popover.tsx      |  2 +-
 .../field_meta/ordinal_field_meta_popover.tsx          |  2 +-
 .../vector/properties/dynamic_style_property.d.ts      |  7 ++++---
 .../layers/styles/vector/properties/style_property.ts  |  5 +----
 .../maps/public/layers/styles/vector/vector_style.d.ts |  2 +-
 .../layers/styles/vector/vector_style_defaults.ts      |  2 +-
 .../plugins/maps/public/layers/util/can_skip_fetch.ts  |  2 +-
 .../plugins/maps/public/layers/util/data_request.ts    |  2 +-
 .../maps/public/layers/util/is_refresh_only_query.ts   |  2 +-
 .../plugins/maps/public/layers/vector_layer.d.ts       |  7 +++++--
 .../data_request_descriptor_types.d.ts                 |  0
 .../common/descriptor_types}/descriptor_types.d.ts     |  2 +-
 x-pack/plugins/maps/common/descriptor_types/index.ts   | 10 ++++++++++
 .../maps/common/descriptor_types}/map_descriptor.ts    |  0
 .../style_property_descriptor_types.d.ts               |  2 +-
 20 files changed, 41 insertions(+), 22 deletions(-)
 create mode 100644 x-pack/legacy/plugins/maps/common/descriptor_types.ts
 rename x-pack/{legacy/plugins/maps/common => plugins/maps/common/descriptor_types}/data_request_descriptor_types.d.ts (100%)
 rename x-pack/{legacy/plugins/maps/common => plugins/maps/common/descriptor_types}/descriptor_types.d.ts (99%)
 create mode 100644 x-pack/plugins/maps/common/descriptor_types/index.ts
 rename x-pack/{legacy/plugins/maps/common => plugins/maps/common/descriptor_types}/map_descriptor.ts (100%)
 rename x-pack/{legacy/plugins/maps/common => plugins/maps/common/descriptor_types}/style_property_descriptor_types.d.ts (99%)

diff --git a/x-pack/legacy/plugins/maps/common/descriptor_types.ts b/x-pack/legacy/plugins/maps/common/descriptor_types.ts
new file mode 100644
index 0000000000000..1f0eda26e7f7d
--- /dev/null
+++ b/x-pack/legacy/plugins/maps/common/descriptor_types.ts
@@ -0,0 +1,8 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+export * from '../../../../plugins/maps/common/descriptor_types';
diff --git a/x-pack/legacy/plugins/maps/public/actions/map_actions.d.ts b/x-pack/legacy/plugins/maps/public/actions/map_actions.d.ts
index 3a61d5affd861..48ab957089361 100644
--- a/x-pack/legacy/plugins/maps/public/actions/map_actions.d.ts
+++ b/x-pack/legacy/plugins/maps/public/actions/map_actions.d.ts
@@ -6,7 +6,7 @@
 /* eslint-disable @typescript-eslint/consistent-type-definitions */
 
 import { LAYER_TYPE } from '../../common/constants';
-import { DataMeta, MapFilters } from '../../common/data_request_descriptor_types';
+import { DataMeta, MapFilters } from '../../common/descriptor_types';
 
 export type SyncContext = {
   startLoading(dataId: string, requestToken: symbol, meta: DataMeta): void;
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 8c54720987e41..f5526ad703dd2 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
@@ -34,7 +34,7 @@ import {
   VectorStyleDescriptor,
   SizeDynamicOptions,
   DynamicStylePropertyOptions,
-} from '../../common/style_property_descriptor_types';
+} from '../../common/descriptor_types';
 
 const ACTIVE_COUNT_DATA_ID = 'ACTIVE_COUNT_DATA_ID';
 
diff --git a/x-pack/legacy/plugins/maps/public/layers/sources/es_source.d.ts b/x-pack/legacy/plugins/maps/public/layers/sources/es_source.d.ts
index b565cb9108aea..ffd1d343b59e0 100644
--- a/x-pack/legacy/plugins/maps/public/layers/sources/es_source.d.ts
+++ b/x-pack/legacy/plugins/maps/public/layers/sources/es_source.d.ts
@@ -7,7 +7,7 @@
 import { AbstractVectorSource } from './vector_source';
 import { IVectorSource } from './vector_source';
 import { IndexPattern, SearchSource } from '../../../../../../../src/plugins/data/public';
-import { VectorSourceRequestMeta } from '../../../common/data_request_descriptor_types';
+import { VectorSourceRequestMeta } from '../../../common/descriptor_types';
 
 export interface IESSource extends IVectorSource {
   getId(): string;
diff --git a/x-pack/legacy/plugins/maps/public/layers/sources/vector_source.d.ts b/x-pack/legacy/plugins/maps/public/layers/sources/vector_source.d.ts
index fd585e100924e..7a747da244233 100644
--- a/x-pack/legacy/plugins/maps/public/layers/sources/vector_source.d.ts
+++ b/x-pack/legacy/plugins/maps/public/layers/sources/vector_source.d.ts
@@ -8,7 +8,7 @@
 import { FeatureCollection } from 'geojson';
 import { AbstractSource, ISource } from './source';
 import { IField } from '../fields/field';
-import { ESSearchSourceResponseMeta } from '../../../common/data_request_descriptor_types';
+import { ESSearchSourceResponseMeta } from '../../../common/descriptor_types';
 
 export type GeoJsonFetchMeta = ESSearchSourceResponseMeta;
 
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/field_meta/categorical_field_meta_popover.tsx b/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/field_meta/categorical_field_meta_popover.tsx
index 9aec7ece45f36..550b3737963d5 100644
--- a/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/field_meta/categorical_field_meta_popover.tsx
+++ b/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/field_meta/categorical_field_meta_popover.tsx
@@ -11,7 +11,7 @@ import { EuiFormRow, EuiSwitch, EuiSwitchEvent } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { FieldMetaPopover } from './field_meta_popover';
 import { IDynamicStyleProperty } from '../../properties/dynamic_style_property';
-import { FieldMetaOptions } from '../../../../../../common/style_property_descriptor_types';
+import { FieldMetaOptions } from '../../../../../../common/descriptor_types';
 
 type Props = {
   styleProperty: IDynamicStyleProperty;
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 777f60b5075af..32a54a45ed4d7 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
@@ -12,7 +12,7 @@ import { i18n } from '@kbn/i18n';
 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 { FieldMetaOptions } from '../../../../../../common/descriptor_types';
 import { VECTOR_STYLES } from '../../../../../../common/constants';
 
 function getIsEnableToggleLabel(styleName: string) {
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/properties/dynamic_style_property.d.ts b/x-pack/legacy/plugins/maps/public/layers/styles/vector/properties/dynamic_style_property.d.ts
index a83dd55c0c175..88eb489c4996e 100644
--- a/x-pack/legacy/plugins/maps/public/layers/styles/vector/properties/dynamic_style_property.d.ts
+++ b/x-pack/legacy/plugins/maps/public/layers/styles/vector/properties/dynamic_style_property.d.ts
@@ -8,11 +8,12 @@
 import { IStyleProperty } from './style_property';
 import { FIELD_ORIGIN } from '../../../../../common/constants';
 import {
-  FieldMetaOptions,
+  CategoryFieldMeta,
   DynamicStylePropertyOptions,
-} from '../../../../../common/style_property_descriptor_types';
+  FieldMetaOptions,
+  RangeFieldMeta,
+} from '../../../../../common/descriptor_types';
 import { IField } from '../../../fields/field';
-import { CategoryFieldMeta, RangeFieldMeta } from '../../../../../common/descriptor_types';
 
 export interface IDynamicStyleProperty extends IStyleProperty {
   getOptions(): DynamicStylePropertyOptions;
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 fef7778c5f08e..af04a95e3c3bd 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
@@ -8,10 +8,7 @@
 import { ReactElement } from 'react';
 // @ts-ignore
 import { getVectorStyleLabel } from '../components/get_vector_style_label';
-import {
-  FieldMetaOptions,
-  StylePropertyOptions,
-} from '../../../../../common/style_property_descriptor_types';
+import { FieldMetaOptions, StylePropertyOptions } from '../../../../../common/descriptor_types';
 import { VECTOR_STYLES } from '../../../../../common/constants';
 
 type LegendProps = {
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 37aea501f5193..77ea44ac26bf9 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,7 +7,7 @@ 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';
+import { VectorStyleDescriptor } from '../../../../common/descriptor_types';
 
 export interface IVectorStyle {
   getAllStyleProperties(): IStyleProperty[];
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/vector_style_defaults.ts b/x-pack/legacy/plugins/maps/public/layers/styles/vector/vector_style_defaults.ts
index f104afd2a7857..86602381cf615 100644
--- a/x-pack/legacy/plugins/maps/public/layers/styles/vector/vector_style_defaults.ts
+++ b/x-pack/legacy/plugins/maps/public/layers/styles/vector/vector_style_defaults.ts
@@ -18,7 +18,7 @@ import {
   DEFAULT_LINE_COLORS,
   // @ts-ignore
 } from '../color_utils';
-import { VectorStylePropertiesDescriptor } from '../../../../common/style_property_descriptor_types';
+import { VectorStylePropertiesDescriptor } from '../../../../common/descriptor_types';
 // @ts-ignore
 import { getUiSettings } from '../../../kibana_services';
 
diff --git a/x-pack/legacy/plugins/maps/public/layers/util/can_skip_fetch.ts b/x-pack/legacy/plugins/maps/public/layers/util/can_skip_fetch.ts
index 7b75bb0f21b79..758cc35f41fbb 100644
--- a/x-pack/legacy/plugins/maps/public/layers/util/can_skip_fetch.ts
+++ b/x-pack/legacy/plugins/maps/public/layers/util/can_skip_fetch.ts
@@ -9,7 +9,7 @@ import turf from 'turf';
 import turfBooleanContains from '@turf/boolean-contains';
 import { isRefreshOnlyQuery } from './is_refresh_only_query';
 import { ISource } from '../sources/source';
-import { DataMeta } from '../../../common/data_request_descriptor_types';
+import { DataMeta } from '../../../common/descriptor_types';
 import { DataRequest } from './data_request';
 
 const SOURCE_UPDATE_REQUIRED = true;
diff --git a/x-pack/legacy/plugins/maps/public/layers/util/data_request.ts b/x-pack/legacy/plugins/maps/public/layers/util/data_request.ts
index e361574194628..eeef5c49c6ef8 100644
--- a/x-pack/legacy/plugins/maps/public/layers/util/data_request.ts
+++ b/x-pack/legacy/plugins/maps/public/layers/util/data_request.ts
@@ -6,7 +6,7 @@
 /* eslint-disable max-classes-per-file */
 
 import _ from 'lodash';
-import { DataRequestDescriptor, DataMeta } from '../../../common/data_request_descriptor_types';
+import { DataRequestDescriptor, DataMeta } from '../../../common/descriptor_types';
 
 export class DataRequest {
   private readonly _descriptor: DataRequestDescriptor;
diff --git a/x-pack/legacy/plugins/maps/public/layers/util/is_refresh_only_query.ts b/x-pack/legacy/plugins/maps/public/layers/util/is_refresh_only_query.ts
index 48b1340207fd4..a56da4b23aa1e 100644
--- a/x-pack/legacy/plugins/maps/public/layers/util/is_refresh_only_query.ts
+++ b/x-pack/legacy/plugins/maps/public/layers/util/is_refresh_only_query.ts
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { Query } from '../../../common/map_descriptor';
+import { Query } from '../../../common/descriptor_types';
 
 // Refresh only query is query where timestamps are different but query is the same.
 // Triggered by clicking "Refresh" button in QueryBar
diff --git a/x-pack/legacy/plugins/maps/public/layers/vector_layer.d.ts b/x-pack/legacy/plugins/maps/public/layers/vector_layer.d.ts
index 390374f761fc7..70fd9927b7732 100644
--- a/x-pack/legacy/plugins/maps/public/layers/vector_layer.d.ts
+++ b/x-pack/legacy/plugins/maps/public/layers/vector_layer.d.ts
@@ -7,8 +7,11 @@
 
 import { AbstractLayer } from './layer';
 import { IVectorSource } from './sources/vector_source';
-import { VectorLayerDescriptor } from '../../common/descriptor_types';
-import { MapFilters, VectorSourceRequestMeta } from '../../common/data_request_descriptor_types';
+import {
+  MapFilters,
+  VectorLayerDescriptor,
+  VectorSourceRequestMeta,
+} from '../../common/descriptor_types';
 import { ILayer } from './layer';
 import { IJoin } from './joins/join';
 import { IVectorStyle } from './styles/vector/vector_style';
diff --git a/x-pack/legacy/plugins/maps/common/data_request_descriptor_types.d.ts b/x-pack/plugins/maps/common/descriptor_types/data_request_descriptor_types.d.ts
similarity index 100%
rename from x-pack/legacy/plugins/maps/common/data_request_descriptor_types.d.ts
rename to x-pack/plugins/maps/common/descriptor_types/data_request_descriptor_types.d.ts
diff --git a/x-pack/legacy/plugins/maps/common/descriptor_types.d.ts b/x-pack/plugins/maps/common/descriptor_types/descriptor_types.d.ts
similarity index 99%
rename from x-pack/legacy/plugins/maps/common/descriptor_types.d.ts
rename to x-pack/plugins/maps/common/descriptor_types/descriptor_types.d.ts
index cfbcb65255ab2..fb49e1aaebe1c 100644
--- a/x-pack/legacy/plugins/maps/common/descriptor_types.d.ts
+++ b/x-pack/plugins/maps/common/descriptor_types/descriptor_types.d.ts
@@ -5,7 +5,7 @@
  */
 /* eslint-disable @typescript-eslint/consistent-type-definitions */
 
-import { AGG_TYPE, GRID_RESOLUTION, RENDER_AS, SORT_ORDER, SCALING_TYPES } from './constants';
+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';
 
diff --git a/x-pack/plugins/maps/common/descriptor_types/index.ts b/x-pack/plugins/maps/common/descriptor_types/index.ts
new file mode 100644
index 0000000000000..af0f4487f471b
--- /dev/null
+++ b/x-pack/plugins/maps/common/descriptor_types/index.ts
@@ -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.
+ */
+
+export * from './data_request_descriptor_types';
+export * from './descriptor_types';
+export * from './map_descriptor';
+export * from './style_property_descriptor_types';
diff --git a/x-pack/legacy/plugins/maps/common/map_descriptor.ts b/x-pack/plugins/maps/common/descriptor_types/map_descriptor.ts
similarity index 100%
rename from x-pack/legacy/plugins/maps/common/map_descriptor.ts
rename to x-pack/plugins/maps/common/descriptor_types/map_descriptor.ts
diff --git a/x-pack/legacy/plugins/maps/common/style_property_descriptor_types.d.ts b/x-pack/plugins/maps/common/descriptor_types/style_property_descriptor_types.d.ts
similarity index 99%
rename from x-pack/legacy/plugins/maps/common/style_property_descriptor_types.d.ts
rename to x-pack/plugins/maps/common/descriptor_types/style_property_descriptor_types.d.ts
index 2fce56339e106..47e56ff96d623 100644
--- a/x-pack/legacy/plugins/maps/common/style_property_descriptor_types.d.ts
+++ b/x-pack/plugins/maps/common/descriptor_types/style_property_descriptor_types.d.ts
@@ -12,7 +12,7 @@ import {
   VECTOR_STYLES,
   STYLE_TYPE,
   LAYER_STYLE_TYPE,
-} from './constants';
+} from '../constants';
 
 // Non-static/dynamic options
 export type SymbolizeAsOptions = {

From a16968dd3a92216f1da14eb992690181b29693e2 Mon Sep 17 00:00:00 2001
From: Poff Poffenberger <poffdeluxe@gmail.com>
Date: Wed, 25 Mar 2020 14:54:32 -0500
Subject: [PATCH 160/179] [Canvas] Fix map embeddables not showing up on PDF
 reports (#61149)

* Allow embeddables to track their own render complete for report generation in canvas

* Updating following consult with reporting team

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 .../canvas/public/apps/export/export/export_app.js        | 3 ++-
 .../element_share_container/element_share_container.js    | 8 ++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/x-pack/legacy/plugins/canvas/public/apps/export/export/export_app.js b/x-pack/legacy/plugins/canvas/public/apps/export/export/export_app.js
index 9b198cee34aae..7537f8eaa9039 100644
--- a/x-pack/legacy/plugins/canvas/public/apps/export/export/export_app.js
+++ b/x-pack/legacy/plugins/canvas/public/apps/export/export/export_app.js
@@ -28,6 +28,7 @@ export class ExportApp extends React.PureComponent {
     const { workpad, selectedPageId } = this.props;
     const { pages, height, width } = workpad;
     const activePage = pages.find(page => page.id === selectedPageId);
+    const pageElementCount = activePage.elements.length;
 
     return (
       <div className="canvasExport">
@@ -39,7 +40,7 @@ export class ExportApp extends React.PureComponent {
           </div>
           {Style.it(
             workpad.css,
-            <div className="canvasExport__stageContent">
+            <div className="canvasExport__stageContent" data-shared-items-count={pageElementCount}>
               <WorkpadPage
                 isSelected
                 key={activePage.id}
diff --git a/x-pack/legacy/plugins/canvas/public/components/element_share_container/element_share_container.js b/x-pack/legacy/plugins/canvas/public/components/element_share_container/element_share_container.js
index e21ffb16a10b6..ab023aef9520f 100644
--- a/x-pack/legacy/plugins/canvas/public/components/element_share_container/element_share_container.js
+++ b/x-pack/legacy/plugins/canvas/public/components/element_share_container/element_share_container.js
@@ -81,11 +81,15 @@ export class ElementShareContainer extends React.PureComponent {
   };
 
   render() {
+    const shouldTrackComplete = this.props.functionName !== 'embeddable';
+
     // NOTE: the data-shared-item and data-render-complete attributes are used for reporting
+    // Embeddables should be setting data-shared-item and data-render-complete on themselves
+    // so we should not be tracking them here.
     return (
       <div
-        data-shared-item
-        data-render-complete={this.state.renderComplete}
+        data-shared-item={shouldTrackComplete ? this.state.renderComplete : undefined}
+        data-render-complete={shouldTrackComplete ? this.state.renderComplete : undefined}
         className={this.props.className}
         ref={ref => (this.sharedItemRef = ref)}
       >

From d50fe0c985c711dfaa1c2b99fed4292eebe56398 Mon Sep 17 00:00:00 2001
From: Zacqary Adam Xeper <Zacqary@users.noreply.github.com>
Date: Wed, 25 Mar 2020 15:56:35 -0500
Subject: [PATCH 161/179] [Logs / Metrics UI] [NP followup] Cleanup link-to
 routes (#61162)

* Split link-to into Metrics and Logs routers

* Fix logs stream link-to

* Import fix

* Update snapshots

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 .../with_log_position_url_state.tsx           |  2 ++
 .../infra/public/pages/link_to/index.ts       |  3 +-
 .../public/pages/link_to/link_to_logs.tsx     | 34 +++++++++++++++++++
 .../{link_to.tsx => link_to_metrics.tsx}      | 11 ++----
 .../pages/link_to/redirect_to_logs.test.tsx   |  4 +--
 .../link_to/redirect_to_node_logs.test.tsx    |  4 +--
 .../infra/public/routers/logs_router.tsx      |  4 +--
 .../infra/public/routers/metrics_router.tsx   |  4 +--
 x-pack/test/functional/apps/infra/link_to.ts  |  2 +-
 9 files changed, 49 insertions(+), 19 deletions(-)
 create mode 100644 x-pack/plugins/infra/public/pages/link_to/link_to_logs.tsx
 rename x-pack/plugins/infra/public/pages/link_to/{link_to.tsx => link_to_metrics.tsx} (68%)

diff --git a/x-pack/plugins/infra/public/containers/logs/log_position/with_log_position_url_state.tsx b/x-pack/plugins/infra/public/containers/logs/log_position/with_log_position_url_state.tsx
index 0d3586f9376f3..ddd5b471a02c6 100644
--- a/x-pack/plugins/infra/public/containers/logs/log_position/with_log_position_url_state.tsx
+++ b/x-pack/plugins/infra/public/containers/logs/log_position/with_log_position_url_state.tsx
@@ -144,5 +144,7 @@ export const replaceLogPositionInQueryString = (time: number) =>
           time,
           tiebreaker: 0,
         },
+        end: new Date(time + ONE_HOUR).toISOString(),
+        start: new Date(time - ONE_HOUR).toISOString(),
         streamLive: false,
       });
diff --git a/x-pack/plugins/infra/public/pages/link_to/index.ts b/x-pack/plugins/infra/public/pages/link_to/index.ts
index 4c8051f8da73e..27e2d483f8fa9 100644
--- a/x-pack/plugins/infra/public/pages/link_to/index.ts
+++ b/x-pack/plugins/infra/public/pages/link_to/index.ts
@@ -4,6 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-export { LinkToPage } from './link_to';
+export { LinkToLogsPage } from './link_to_logs';
+export { LinkToMetricsPage } from './link_to_metrics';
 export { getNodeLogsUrl, RedirectToNodeLogs } from './redirect_to_node_logs';
 export { getNodeDetailUrl, RedirectToNodeDetail } from './redirect_to_node_detail';
diff --git a/x-pack/plugins/infra/public/pages/link_to/link_to_logs.tsx b/x-pack/plugins/infra/public/pages/link_to/link_to_logs.tsx
new file mode 100644
index 0000000000000..04d5c454a92cc
--- /dev/null
+++ b/x-pack/plugins/infra/public/pages/link_to/link_to_logs.tsx
@@ -0,0 +1,34 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React from 'react';
+import { match as RouteMatch, Redirect, Route, Switch } from 'react-router-dom';
+
+import { RedirectToLogs } from './redirect_to_logs';
+import { RedirectToNodeLogs } from './redirect_to_node_logs';
+import { inventoryModels } from '../../../common/inventory_models';
+
+interface LinkToPageProps {
+  match: RouteMatch<{}>;
+  location: {
+    search: string;
+  };
+}
+
+const ITEM_TYPES = inventoryModels.map(m => m.id).join('|');
+
+export const LinkToLogsPage: React.FC<LinkToPageProps> = props => {
+  return (
+    <Switch>
+      <Route
+        path={`${props.match.url}/:sourceId?/:nodeType(${ITEM_TYPES})-logs/:nodeId`}
+        component={RedirectToNodeLogs}
+      />
+      <Route path={`${props.match.url}/:sourceId?`} component={RedirectToLogs} />
+      <Redirect to="/" />
+    </Switch>
+  );
+};
diff --git a/x-pack/plugins/infra/public/pages/link_to/link_to.tsx b/x-pack/plugins/infra/public/pages/link_to/link_to_metrics.tsx
similarity index 68%
rename from x-pack/plugins/infra/public/pages/link_to/link_to.tsx
rename to x-pack/plugins/infra/public/pages/link_to/link_to_metrics.tsx
index ce62a0a3f4e33..3eb4a9f26fe2e 100644
--- a/x-pack/plugins/infra/public/pages/link_to/link_to.tsx
+++ b/x-pack/plugins/infra/public/pages/link_to/link_to_metrics.tsx
@@ -7,9 +7,7 @@
 import React from 'react';
 import { match as RouteMatch, Redirect, Route, Switch } from 'react-router-dom';
 
-import { RedirectToLogs } from './redirect_to_logs';
 import { RedirectToNodeDetail } from './redirect_to_node_detail';
-import { RedirectToNodeLogs } from './redirect_to_node_logs';
 import { RedirectToHostDetailViaIP } from './redirect_to_host_detail_via_ip';
 import { inventoryModels } from '../../../common/inventory_models';
 
@@ -19,13 +17,9 @@ interface LinkToPageProps {
 
 const ITEM_TYPES = inventoryModels.map(m => m.id).join('|');
 
-export const LinkToPage: React.FC<LinkToPageProps> = props => {
+export const LinkToMetricsPage: React.FC<LinkToPageProps> = props => {
   return (
     <Switch>
-      <Route
-        path={`${props.match.url}/:sourceId?/:nodeType(${ITEM_TYPES})-logs/:nodeId`}
-        component={RedirectToNodeLogs}
-      />
       <Route
         path={`${props.match.url}/:nodeType(${ITEM_TYPES})-detail/:nodeId`}
         component={RedirectToNodeDetail}
@@ -34,8 +28,7 @@ export const LinkToPage: React.FC<LinkToPageProps> = props => {
         path={`${props.match.url}/host-detail-via-ip/:hostIp`}
         component={RedirectToHostDetailViaIP}
       />
-      <Route path={`${props.match.url}/:sourceId?/logs`} component={RedirectToLogs} />
-      <Redirect to="/infrastructure" />
+      <Redirect to="/" />
     </Switch>
   );
 };
diff --git a/x-pack/plugins/infra/public/pages/link_to/redirect_to_logs.test.tsx b/x-pack/plugins/infra/public/pages/link_to/redirect_to_logs.test.tsx
index b4ed43f84e27f..0556955e47f66 100644
--- a/x-pack/plugins/infra/public/pages/link_to/redirect_to_logs.test.tsx
+++ b/x-pack/plugins/infra/public/pages/link_to/redirect_to_logs.test.tsx
@@ -19,7 +19,7 @@ describe('RedirectToLogs component', () => {
 
     expect(component).toMatchInlineSnapshot(`
       <Redirect
-        to="/stream?logPosition=(position:(tiebreaker:0,time:1550671089404),streamLive:!f)&sourceId=default&logFilter=(expression:'',kind:kuery)"
+        to="/stream?logPosition=(end:'2019-02-20T14:58:09.404Z',position:(tiebreaker:0,time:1550671089404),start:'2019-02-20T12:58:09.404Z',streamLive:!f)&sourceId=default&logFilter=(expression:'',kind:kuery)"
       />
     `);
   });
@@ -33,7 +33,7 @@ describe('RedirectToLogs component', () => {
 
     expect(component).toMatchInlineSnapshot(`
       <Redirect
-        to="/stream?logPosition=(position:(tiebreaker:0,time:1550671089404),streamLive:!f)&sourceId=default&logFilter=(expression:'FILTER_FIELD:FILTER_VALUE',kind:kuery)"
+        to="/stream?logPosition=(end:'2019-02-20T14:58:09.404Z',position:(tiebreaker:0,time:1550671089404),start:'2019-02-20T12:58:09.404Z',streamLive:!f)&sourceId=default&logFilter=(expression:'FILTER_FIELD:FILTER_VALUE',kind:kuery)"
       />
     `);
   });
diff --git a/x-pack/plugins/infra/public/pages/link_to/redirect_to_node_logs.test.tsx b/x-pack/plugins/infra/public/pages/link_to/redirect_to_node_logs.test.tsx
index 519ee64060932..1394fc48107ef 100644
--- a/x-pack/plugins/infra/public/pages/link_to/redirect_to_node_logs.test.tsx
+++ b/x-pack/plugins/infra/public/pages/link_to/redirect_to_node_logs.test.tsx
@@ -73,7 +73,7 @@ describe('RedirectToNodeLogs component', () => {
 
     expect(component).toMatchInlineSnapshot(`
       <Redirect
-        to="/?logPosition=(position:(tiebreaker:0,time:1550671089404),streamLive:!f)&sourceId=default&logFilter=(expression:'HOST_FIELD:%20HOST_NAME',kind:kuery)"
+        to="/?logPosition=(end:'2019-02-20T14:58:09.404Z',position:(tiebreaker:0,time:1550671089404),start:'2019-02-20T12:58:09.404Z',streamLive:!f)&sourceId=default&logFilter=(expression:'HOST_FIELD:%20HOST_NAME',kind:kuery)"
       />
     `);
   });
@@ -89,7 +89,7 @@ describe('RedirectToNodeLogs component', () => {
 
     expect(component).toMatchInlineSnapshot(`
       <Redirect
-        to="/?logPosition=(position:(tiebreaker:0,time:1550671089404),streamLive:!f)&sourceId=default&logFilter=(expression:'(HOST_FIELD:%20HOST_NAME)%20and%20(FILTER_FIELD:FILTER_VALUE)',kind:kuery)"
+        to="/?logPosition=(end:'2019-02-20T14:58:09.404Z',position:(tiebreaker:0,time:1550671089404),start:'2019-02-20T12:58:09.404Z',streamLive:!f)&sourceId=default&logFilter=(expression:'(HOST_FIELD:%20HOST_NAME)%20and%20(FILTER_FIELD:FILTER_VALUE)',kind:kuery)"
       />
     `);
   });
diff --git a/x-pack/plugins/infra/public/routers/logs_router.tsx b/x-pack/plugins/infra/public/routers/logs_router.tsx
index 6700ed1fc8479..8258f087b5872 100644
--- a/x-pack/plugins/infra/public/routers/logs_router.tsx
+++ b/x-pack/plugins/infra/public/routers/logs_router.tsx
@@ -8,7 +8,7 @@ import React from 'react';
 import { Route, Router, Switch } from 'react-router-dom';
 
 import { NotFoundPage } from '../pages/404';
-import { LinkToPage } from '../pages/link_to';
+import { LinkToLogsPage } from '../pages/link_to';
 import { LogsPage } from '../pages/logs';
 import { RedirectWithQueryParams } from '../utils/redirect_with_query_params';
 import { useKibana } from '../../../../../src/plugins/kibana_react/public';
@@ -19,7 +19,7 @@ export const LogsRouter: AppRouter = ({ history }) => {
   return (
     <Router history={history}>
       <Switch>
-        <Route path="/link-to" component={LinkToPage} />
+        <Route path="/link-to" component={LinkToLogsPage} />
         {uiCapabilities?.logs?.show && (
           <RedirectWithQueryParams from="/" exact={true} to="/stream" />
         )}
diff --git a/x-pack/plugins/infra/public/routers/metrics_router.tsx b/x-pack/plugins/infra/public/routers/metrics_router.tsx
index 7c2ebed8463f1..7cb9de65e7291 100644
--- a/x-pack/plugins/infra/public/routers/metrics_router.tsx
+++ b/x-pack/plugins/infra/public/routers/metrics_router.tsx
@@ -9,7 +9,7 @@ import { Route, Router, Switch } from 'react-router-dom';
 
 import { NotFoundPage } from '../pages/404';
 import { InfrastructurePage } from '../pages/infrastructure';
-import { LinkToPage } from '../pages/link_to';
+import { LinkToMetricsPage } from '../pages/link_to';
 import { MetricDetail } from '../pages/metrics';
 import { RedirectWithQueryParams } from '../utils/redirect_with_query_params';
 import { useKibana } from '../../../../../src/plugins/kibana_react/public';
@@ -20,7 +20,7 @@ export const MetricsRouter: AppRouter = ({ history }) => {
   return (
     <Router history={history}>
       <Switch>
-        <Route path="/link-to" component={LinkToPage} />
+        <Route path="/link-to" component={LinkToMetricsPage} />
         {uiCapabilities?.infrastructure?.show && (
           <RedirectWithQueryParams from="/" exact={true} to="/inventory" />
         )}
diff --git a/x-pack/test/functional/apps/infra/link_to.ts b/x-pack/test/functional/apps/infra/link_to.ts
index 7e79f42ac94cb..a287d53d5df0b 100644
--- a/x-pack/test/functional/apps/infra/link_to.ts
+++ b/x-pack/test/functional/apps/infra/link_to.ts
@@ -25,7 +25,7 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
     it('redirects to the logs app and parses URL search params correctly', async () => {
       const location = {
         hash: '',
-        pathname: '/link-to/logs',
+        pathname: '/link-to',
         search: `time=${timestamp}&filter=trace.id:${traceId}`,
         state: undefined,
       };

From d87cb9489f966e7f0c9d242bee31ec4cda3ecfd0 Mon Sep 17 00:00:00 2001
From: Dario Gieselaar <dario.gieselaar@elastic.co>
Date: Wed, 25 Mar 2020 22:07:45 +0100
Subject: [PATCH 162/179] [APM] Explicit telemetry mappings (#61266)

Replaces generic object type mappings with explicitly defined properties. These were probably unmapped because the sample data for some agents does not have these fields.
---
 x-pack/legacy/plugins/apm/mappings.json | 113 ++++++++++++++++++++++--
 1 file changed, 106 insertions(+), 7 deletions(-)

diff --git a/x-pack/legacy/plugins/apm/mappings.json b/x-pack/legacy/plugins/apm/mappings.json
index ba4c7a89ceaa8..5d14ae03f9a33 100644
--- a/x-pack/legacy/plugins/apm/mappings.json
+++ b/x-pack/legacy/plugins/apm/mappings.json
@@ -136,7 +136,20 @@
               "service": {
                 "properties": {
                   "framework": {
-                    "type": "object"
+                    "properties": {
+                      "composite": {
+                        "type": "keyword",
+                        "ignore_above": 256
+                      },
+                      "name": {
+                        "type": "keyword",
+                        "ignore_above": 256
+                      },
+                      "version": {
+                        "type": "keyword",
+                        "ignore_above": 256
+                      }
+                    }
                   },
                   "language": {
                     "properties": {
@@ -187,18 +200,52 @@
               "service": {
                 "properties": {
                   "framework": {
-                    "type": "object"
+                    "properties": {
+                      "composite": {
+                        "type": "keyword",
+                        "ignore_above": 256
+                      },
+                      "name": {
+                        "type": "keyword",
+                        "ignore_above": 256
+                      },
+                      "version": {
+                        "type": "keyword",
+                        "ignore_above": 256
+                      }
+                    }
                   },
                   "language": {
                     "properties": {
+                      "composite": {
+                        "type": "keyword",
+                        "ignore_above": 256
+                      },
                       "name": {
                         "type": "keyword",
                         "ignore_above": 256
+                      },
+                      "version": {
+                        "type": "keyword",
+                        "ignore_above": 256
                       }
                     }
                   },
                   "runtime": {
-                    "type": "object"
+                    "properties": {
+                      "composite": {
+                        "type": "keyword",
+                        "ignore_above": 256
+                      },
+                      "name": {
+                        "type": "keyword",
+                        "ignore_above": 256
+                      },
+                      "version": {
+                        "type": "keyword",
+                        "ignore_above": 256
+                      }
+                    }
                   }
                 }
               }
@@ -234,9 +281,17 @@
                   },
                   "language": {
                     "properties": {
+                      "composite": {
+                        "type": "keyword",
+                        "ignore_above": 256
+                      },
                       "name": {
                         "type": "keyword",
                         "ignore_above": 256
+                      },
+                      "version": {
+                        "type": "keyword",
+                        "ignore_above": 256
                       }
                     }
                   },
@@ -391,18 +446,62 @@
           "rum-js": {
             "properties": {
               "agent": {
-                "type": "object"
+                "properties": {
+                  "version": {
+                    "type": "keyword",
+                    "ignore_above": 256
+                  }
+                }
               },
               "service": {
                 "properties": {
                   "framework": {
-                    "type": "object"
+                    "properties": {
+                      "composite": {
+                        "type": "keyword",
+                        "ignore_above": 256
+                      },
+                      "name": {
+                        "type": "keyword",
+                        "ignore_above": 256
+                      },
+                      "version": {
+                        "type": "keyword",
+                        "ignore_above": 256
+                      }
+                    }
                   },
                   "language": {
-                    "type": "object"
+                    "properties": {
+                      "composite": {
+                        "type": "keyword",
+                        "ignore_above": 256
+                      },
+                      "name": {
+                        "type": "keyword",
+                        "ignore_above": 256
+                      },
+                      "version": {
+                        "type": "keyword",
+                        "ignore_above": 256
+                      }
+                    }
                   },
                   "runtime": {
-                    "type": "object"
+                    "properties": {
+                      "composite": {
+                        "type": "keyword",
+                        "ignore_above": 256
+                      },
+                      "name": {
+                        "type": "keyword",
+                        "ignore_above": 256
+                      },
+                      "version": {
+                        "type": "keyword",
+                        "ignore_above": 256
+                      }
+                    }
                   }
                 }
               }

From 37c92ca4764cc096f7eeaf1f7d57d4c733fdb4e2 Mon Sep 17 00:00:00 2001
From: Josh Dover <me@joshdover.com>
Date: Wed, 25 Mar 2020 15:09:04 -0600
Subject: [PATCH 163/179] Fix plugin enabled config options (#60998)

---
 src/plugins/apm_oss/server/index.ts            | 1 +
 src/plugins/timelion/config.ts                 | 1 +
 x-pack/plugins/advanced_ui_actions/kibana.json | 1 +
 x-pack/plugins/alerting_builtins/kibana.json   | 1 +
 x-pack/plugins/data_enhanced/kibana.json       | 2 +-
 x-pack/plugins/drilldowns/kibana.json          | 1 +
 x-pack/plugins/features/kibana.json            | 1 +
 x-pack/plugins/lens/kibana.json                | 3 ++-
 x-pack/plugins/observability/kibana.json       | 1 +
 x-pack/plugins/oss_telemetry/kibana.json       | 1 +
 x-pack/plugins/reporting/kibana.json           | 1 +
 x-pack/plugins/searchprofiler/kibana.json      | 1 +
 x-pack/plugins/triggers_actions_ui/kibana.json | 3 ++-
 x-pack/plugins/uptime/kibana.json              | 2 +-
 x-pack/plugins/watcher/kibana.json             | 1 +
 15 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/src/plugins/apm_oss/server/index.ts b/src/plugins/apm_oss/server/index.ts
index 95a4ae4519bc9..bd0d23d62500d 100644
--- a/src/plugins/apm_oss/server/index.ts
+++ b/src/plugins/apm_oss/server/index.ts
@@ -22,6 +22,7 @@ import { APMOSSPlugin } from './plugin';
 
 export const config = {
   schema: schema.object({
+    enabled: schema.boolean({ defaultValue: true }),
     transactionIndices: schema.string({ defaultValue: 'apm-*' }),
     spanIndices: schema.string({ defaultValue: 'apm-*' }),
     errorIndices: schema.string({ defaultValue: 'apm-*' }),
diff --git a/src/plugins/timelion/config.ts b/src/plugins/timelion/config.ts
index eaea1aaca1b7b..97a423331b921 100644
--- a/src/plugins/timelion/config.ts
+++ b/src/plugins/timelion/config.ts
@@ -21,6 +21,7 @@ import { schema, TypeOf } from '@kbn/config-schema';
 
 export const configSchema = schema.object(
   {
+    enabled: schema.boolean({ defaultValue: true }),
     ui: schema.object({ enabled: schema.boolean({ defaultValue: false }) }),
     graphiteUrls: schema.maybe(schema.arrayOf(schema.string())),
   },
diff --git a/x-pack/plugins/advanced_ui_actions/kibana.json b/x-pack/plugins/advanced_ui_actions/kibana.json
index 515c4749de212..45907e2d8b602 100644
--- a/x-pack/plugins/advanced_ui_actions/kibana.json
+++ b/x-pack/plugins/advanced_ui_actions/kibana.json
@@ -1,6 +1,7 @@
 {
   "id": "advancedUiActions",
   "version": "kibana",
+  "configPath": ["xpack", "advanced_ui_actions"],
   "requiredPlugins": [
     "embeddable",
     "uiActions"
diff --git a/x-pack/plugins/alerting_builtins/kibana.json b/x-pack/plugins/alerting_builtins/kibana.json
index cd6bb7519c093..78de9a1ae0165 100644
--- a/x-pack/plugins/alerting_builtins/kibana.json
+++ b/x-pack/plugins/alerting_builtins/kibana.json
@@ -4,5 +4,6 @@
   "version": "8.0.0",
   "kibanaVersion": "kibana",
   "requiredPlugins": ["alerting"],
+  "configPath": ["xpack", "alerting_builtins"],
   "ui": false
 }
diff --git a/x-pack/plugins/data_enhanced/kibana.json b/x-pack/plugins/data_enhanced/kibana.json
index b2d5f42d9e468..443bb63a27799 100644
--- a/x-pack/plugins/data_enhanced/kibana.json
+++ b/x-pack/plugins/data_enhanced/kibana.json
@@ -3,7 +3,7 @@
   "version": "8.0.0",
   "kibanaVersion": "kibana",
   "configPath": [
-    "xpack"
+    "xpack", "data_enhanced"
   ],
   "requiredPlugins": [
     "data"
diff --git a/x-pack/plugins/drilldowns/kibana.json b/x-pack/plugins/drilldowns/kibana.json
index b951c7dc1fc87..4dba07b5a7be3 100644
--- a/x-pack/plugins/drilldowns/kibana.json
+++ b/x-pack/plugins/drilldowns/kibana.json
@@ -3,6 +3,7 @@
   "version": "kibana",
   "server": false,
   "ui": true,
+  "configPath": ["xpack", "drilldowns"],
   "requiredPlugins": [
     "uiActions",
     "embeddable"
diff --git a/x-pack/plugins/features/kibana.json b/x-pack/plugins/features/kibana.json
index e38d7be892904..325e5a0407493 100644
--- a/x-pack/plugins/features/kibana.json
+++ b/x-pack/plugins/features/kibana.json
@@ -3,6 +3,7 @@
   "version": "8.0.0",
   "kibanaVersion": "kibana",
   "optionalPlugins": ["timelion"],
+  "configPath": ["xpack", "features"],
   "server": true,
   "ui": true
 }
diff --git a/x-pack/plugins/lens/kibana.json b/x-pack/plugins/lens/kibana.json
index 867a7454f0448..6abdaad7903be 100644
--- a/x-pack/plugins/lens/kibana.json
+++ b/x-pack/plugins/lens/kibana.json
@@ -4,5 +4,6 @@
   "kibanaVersion": "kibana",
   "server": true,
   "ui": false,
-  "optionalPlugins": ["usageCollection", "taskManager"]
+  "optionalPlugins": ["usageCollection", "taskManager"],
+  "configPath": ["xpack", "lens"]
 }
diff --git a/x-pack/plugins/observability/kibana.json b/x-pack/plugins/observability/kibana.json
index 57063ea729ed6..438b9ddea4734 100644
--- a/x-pack/plugins/observability/kibana.json
+++ b/x-pack/plugins/observability/kibana.json
@@ -2,5 +2,6 @@
   "id": "observability",
   "version": "8.0.0",
   "kibanaVersion": "kibana",
+  "configPath": ["xpack", "observability"],
   "ui": true
 }
diff --git a/x-pack/plugins/oss_telemetry/kibana.json b/x-pack/plugins/oss_telemetry/kibana.json
index d83894f7c44a3..0defee0881e0e 100644
--- a/x-pack/plugins/oss_telemetry/kibana.json
+++ b/x-pack/plugins/oss_telemetry/kibana.json
@@ -4,5 +4,6 @@
   "version": "8.0.0",
   "kibanaVersion": "kibana",
   "requiredPlugins": ["usageCollection", "taskManager"],
+  "configPath": ["xpack", "oss_telemetry"],
   "ui": false
 }
diff --git a/x-pack/plugins/reporting/kibana.json b/x-pack/plugins/reporting/kibana.json
index a7e2bd288f0b1..3da2d2a094706 100644
--- a/x-pack/plugins/reporting/kibana.json
+++ b/x-pack/plugins/reporting/kibana.json
@@ -2,6 +2,7 @@
   "id": "reporting",
   "version": "8.0.0",
   "kibanaVersion": "kibana",
+  "configPath": ["xpack", "reporting"],
   "requiredPlugins": [
     "home",
     "management",
diff --git a/x-pack/plugins/searchprofiler/kibana.json b/x-pack/plugins/searchprofiler/kibana.json
index 1831308212402..f92083ee9d9fe 100644
--- a/x-pack/plugins/searchprofiler/kibana.json
+++ b/x-pack/plugins/searchprofiler/kibana.json
@@ -3,6 +3,7 @@
   "version": "8.0.0",
   "kibanaVersion": "kibana",
   "requiredPlugins": ["devTools", "home", "licensing"],
+  "configPath": ["xpack", "searchprofiler"],
   "server": true,
   "ui": true
 }
diff --git a/x-pack/plugins/triggers_actions_ui/kibana.json b/x-pack/plugins/triggers_actions_ui/kibana.json
index d11f2b3e51c9d..11cbacee08afc 100644
--- a/x-pack/plugins/triggers_actions_ui/kibana.json
+++ b/x-pack/plugins/triggers_actions_ui/kibana.json
@@ -4,5 +4,6 @@
   "server": false,
   "ui": true,
   "optionalPlugins": ["alerting", "alertingBuiltins"],
-  "requiredPlugins": ["management", "charts", "data"]
+  "requiredPlugins": ["management", "charts", "data"],
+  "configPath": ["xpack", "trigger_actions_ui"]
 }
diff --git a/x-pack/plugins/uptime/kibana.json b/x-pack/plugins/uptime/kibana.json
index 603cfac316b2d..6ec8a755ebea0 100644
--- a/x-pack/plugins/uptime/kibana.json
+++ b/x-pack/plugins/uptime/kibana.json
@@ -1,5 +1,5 @@
 {
-  "configPath": ["xpack"],
+  "configPath": ["xpack", "uptime"],
   "id": "uptime",
   "kibanaVersion": "kibana",
   "requiredPlugins": ["alerting", "features", "licensing", "usageCollection"],
diff --git a/x-pack/plugins/watcher/kibana.json b/x-pack/plugins/watcher/kibana.json
index 7c02118c58d7a..a0482ad00797c 100644
--- a/x-pack/plugins/watcher/kibana.json
+++ b/x-pack/plugins/watcher/kibana.json
@@ -1,5 +1,6 @@
 {
   "id": "watcher",
+  "configPath": ["xpack", "watcher"],
   "version": "kibana",
   "requiredPlugins": [
     "home",

From 0d45d9b53f0bd329c642e6c60f18377f9b666842 Mon Sep 17 00:00:00 2001
From: Rudolf Meijering <skaapgif@gmail.com>
Date: Wed, 25 Mar 2020 22:22:21 +0100
Subject: [PATCH 164/179] Update core migration docs links (#61251)

---
 ...a-plugin-core-public.httpsetup.basepath.md |   2 +-
 .../kibana-plugin-core-public.httpsetup.md    |   2 +-
 src/core/MIGRATION.md                         | 100 +++++++++---------
 src/core/public/http/types.ts                 |   1 +
 4 files changed, 53 insertions(+), 52 deletions(-)

diff --git a/docs/development/core/public/kibana-plugin-core-public.httpsetup.basepath.md b/docs/development/core/public/kibana-plugin-core-public.httpsetup.basepath.md
index 90af143af3539..15206a7ae5e1d 100644
--- a/docs/development/core/public/kibana-plugin-core-public.httpsetup.basepath.md
+++ b/docs/development/core/public/kibana-plugin-core-public.httpsetup.basepath.md
@@ -4,7 +4,7 @@
 
 ## HttpSetup.basePath property
 
-APIs for manipulating the basePath on URL segments.
+APIs for manipulating the basePath on URL segments. See [IBasePath](./kibana-plugin-core-public.ibasepath.md)
 
 <b>Signature:</b>
 
diff --git a/docs/development/core/public/kibana-plugin-core-public.httpsetup.md b/docs/development/core/public/kibana-plugin-core-public.httpsetup.md
index b7375b724549f..bb43e9f588a72 100644
--- a/docs/development/core/public/kibana-plugin-core-public.httpsetup.md
+++ b/docs/development/core/public/kibana-plugin-core-public.httpsetup.md
@@ -16,7 +16,7 @@ export interface HttpSetup
 |  Property | Type | Description |
 |  --- | --- | --- |
 |  [anonymousPaths](./kibana-plugin-core-public.httpsetup.anonymouspaths.md) | <code>IAnonymousPaths</code> | APIs for denoting certain paths for not requiring authentication |
-|  [basePath](./kibana-plugin-core-public.httpsetup.basepath.md) | <code>IBasePath</code> | APIs for manipulating the basePath on URL segments. |
+|  [basePath](./kibana-plugin-core-public.httpsetup.basepath.md) | <code>IBasePath</code> | APIs for manipulating the basePath on URL segments. See [IBasePath](./kibana-plugin-core-public.ibasepath.md) |
 |  [delete](./kibana-plugin-core-public.httpsetup.delete.md) | <code>HttpHandler</code> | Makes an HTTP request with the DELETE method. See [HttpHandler](./kibana-plugin-core-public.httphandler.md) for options. |
 |  [fetch](./kibana-plugin-core-public.httpsetup.fetch.md) | <code>HttpHandler</code> | Makes an HTTP request. Defaults to a GET request unless overriden. See [HttpHandler](./kibana-plugin-core-public.httphandler.md) for options. |
 |  [get](./kibana-plugin-core-public.httpsetup.get.md) | <code>HttpHandler</code> | Makes an HTTP request with the GET method. See [HttpHandler](./kibana-plugin-core-public.httphandler.md) for options. |
diff --git a/src/core/MIGRATION.md b/src/core/MIGRATION.md
index 0d5d300ec3b79..50fd1f716ba37 100644
--- a/src/core/MIGRATION.md
+++ b/src/core/MIGRATION.md
@@ -88,7 +88,7 @@ src/plugins
       plugin.ts [5]
 ```
 
-**[1] `kibana.json`** is a [static manifest](../../docs/development/core/server/kibana-plugin-server.pluginmanifest.md) file that is used to identify the plugin and to determine what kind of code the platform should execute from the plugin:
+**[1] `kibana.json`** is a [static manifest](../../docs/development/core/server/kibana-plugin-core-server.pluginmanifest.md) file that is used to identify the plugin and to determine what kind of code the platform should execute from the plugin:
 
 ```json
 {
@@ -98,7 +98,7 @@ src/plugins
   "ui": true
 }
 ```
-More details about[manifest file format](/docs/development/core/server/kibana-plugin-server.pluginmanifest.md)
+More details about[manifest file format](/docs/development/core/server/kibana-plugin-core-server.pluginmanifest.md)
 
 Note that `package.json` files are irrelevant to and ignored by the new platform.
 
@@ -210,9 +210,9 @@ These are the contracts exposed by the core services for each lifecycle event:
 
 | lifecycle event | contract                                                                                                        |
 | --------------- | --------------------------------------------------------------------------------------------------------------- |
-| *contructor*    | [PluginInitializerContext](../../docs/development/core/server/kibana-plugin-server.plugininitializercontext.md) |
-| *setup*         | [CoreSetup](../../docs/development/core/server/kibana-plugin-server.coresetup.md)                               |
-| *start*         | [CoreStart](../../docs/development/core/server/kibana-plugin-server.corestart.md)                               |
+| *contructor*    | [PluginInitializerContext](../../docs/development/core/server/kibana-plugin-core-server.plugininitializercontext.md) |
+| *setup*         | [CoreSetup](../../docs/development/core/server/kibana-plugin-core-server.coresetup.md)                               |
+| *start*         | [CoreStart](../../docs/development/core/server/kibana-plugin-core-server.corestart.md)                               |
 | *stop*          |                                                                                                                 |
 
 ### Integrating with other plugins
@@ -1131,24 +1131,24 @@ import { npStart: { core } } from 'ui/new_platform';
 
 | Legacy Platform                                       | New Platform                                                                                                                                                                               | Notes                                                                                                                                          |
 | ----------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | ---------------------------------------------------------------------------------------------------------------------------------------------- |
-| `chrome.addBasePath`                                  | [`core.http.basePath.prepend`](/docs/development/core/public/kibana-plugin-public.httpservicebase.basepath.md)                                                                             |                                                                                                                                                |
-| `chrome.navLinks.update`                              | [`core.appbase.updater`](/docs/development/core/public/kibana-plugin-public.appbase.updater_.md)                                                                                           | Use the `updater$` property when registering your application via `core.application.register`                                                  |
-| `chrome.breadcrumbs.set`                              | [`core.chrome.setBreadcrumbs`](/docs/development/core/public/kibana-plugin-public.chromestart.setbreadcrumbs.md)                                                                           |                                                                                                                                                |
-| `chrome.getUiSettingsClient`                          | [`core.uiSettings`](/docs/development/core/public/kibana-plugin-public.uisettingsclient.md)                                                                                                |                                                                                                                                                |
-| `chrome.helpExtension.set`                            | [`core.chrome.setHelpExtension`](/docs/development/core/public/kibana-plugin-public.chromestart.sethelpextension.md)                                                                       |                                                                                                                                                |
-| `chrome.setVisible`                                   | [`core.chrome.setIsVisible`](/docs/development/core/public/kibana-plugin-public.chromestart.setisvisible.md)                                                                               |                                                                                                                                                |
+| `chrome.addBasePath`                                  | [`core.http.basePath.prepend`](/docs/development/core/public/kibana-plugin-core-public.httpsetup.basepath.md)                                                                             |                                                                                                                                                |
+| `chrome.navLinks.update`                              | [`core.appbase.updater`](/docs/development/core/public/kibana-plugin-core-public.appbase.updater_.md)                                                                                           | Use the `updater$` property when registering your application via `core.application.register`                                                  |
+| `chrome.breadcrumbs.set`                              | [`core.chrome.setBreadcrumbs`](/docs/development/core/public/kibana-plugin-core-public.chromestart.setbreadcrumbs.md)                                                                           |                                                                                                                                                |
+| `chrome.getUiSettingsClient`                          | [`core.uiSettings`](/docs/development/core/public/kibana-plugin-core-public.uisettingsclient.md)                                                                                                |                                                                                                                                                |
+| `chrome.helpExtension.set`                            | [`core.chrome.setHelpExtension`](/docs/development/core/public/kibana-plugin-core-public.chromestart.sethelpextension.md)                                                                       |                                                                                                                                                |
+| `chrome.setVisible`                                   | [`core.chrome.setIsVisible`](/docs/development/core/public/kibana-plugin-core-public.chromestart.setisvisible.md)                                                                               |                                                                                                                                                |
 | `chrome.setRootTemplate` / `chrome.setRootController` | --                                                                                                                                                                                         | Use application mounting via `core.application.register` (not available to legacy plugins at this time).                                       |
-| `import { recentlyAccessed } from 'ui/persisted_log'` | [`core.chrome.recentlyAccessed`](/docs/development/core/public/kibana-plugin-public.chromerecentlyaccessed.md)                                                                             |                                                                                                                                                |
-| `ui/capabilities`                                     | [`core.application.capabilities`](/docs/development/core/public/kibana-plugin-public.capabilities.md)                                                                                      |                                                                                                                                                |
-| `ui/documentation_links`                              | [`core.docLinks`](/docs/development/core/public/kibana-plugin-public.doclinksstart.md)                                                                                                     |                                                                                                                                                |
-| `ui/kfetch`                                           | [`core.http`](/docs/development/core/public/kibana-plugin-public.httpservicebase.md)                                                                                                       | API is nearly identical                                                                                                                        |
-| `ui/notify`                                           | [`core.notifications`](/docs/development/core/public/kibana-plugin-public.notificationsstart.md) and [`core.overlays`](/docs/development/core/public/kibana-plugin-public.overlaystart.md) | Toast messages are in `notifications`, banners are in `overlays`. May be combined later.                                                       |
+| `import { recentlyAccessed } from 'ui/persisted_log'` | [`core.chrome.recentlyAccessed`](/docs/development/core/public/kibana-plugin-core-public.chromerecentlyaccessed.md)                                                                             |                                                                                                                                                |
+| `ui/capabilities`                                     | [`core.application.capabilities`](/docs/development/core/public/kibana-plugin-core-public.capabilities.md)                                                                                      |                                                                                                                                                |
+| `ui/documentation_links`                              | [`core.docLinks`](/docs/development/core/public/kibana-plugin-core-public.doclinksstart.md)                                                                                                     |                                                                                                                                                |
+| `ui/kfetch`                                           | [`core.http`](/docs/development/core/public/kibana-plugin-core-public.httpservicebase.md)                                                                                                       | API is nearly identical                                                                                                                        |
+| `ui/notify`                                           | [`core.notifications`](/docs/development/core/public/kibana-plugin-core-public.notificationsstart.md) and [`core.overlays`](/docs/development/core/public/kibana-plugin-core-public.overlaystart.md) | Toast messages are in `notifications`, banners are in `overlays`. May be combined later.                                                       |
 | `ui/routes`                                           | --                                                                                                                                                                                         | There is no global routing mechanism. Each app [configures its own routing](/rfcs/text/0004_application_service_mounting.md#complete-example). |
-| `ui/saved_objects`                                    | [`core.savedObjects`](/docs/development/core/public/kibana-plugin-public.savedobjectsstart.md)                                                                                             | Client API is the same                                                                                                                         |
-| `ui/doc_title`                                        | [`core.chrome.docTitle`](/docs/development/core/public/kibana-plugin-public.chromedoctitle.md)                                                                                             |                                                                                                                                                |
-| `uiExports/injectedVars` / `chrome.getInjected`       | [Configure plugin](#configure-plugin) and [`PluginConfigDescriptor.exposeToBrowser`](/docs/development/core/server/kibana-plugin-server.pluginconfigdescriptor.exposetobrowser.md)         | Can only be used to expose configuration properties                                                                                            |
+| `ui/saved_objects`                                    | [`core.savedObjects`](/docs/development/core/public/kibana-plugin-core-public.savedobjectsstart.md)                                                                                             | Client API is the same                                                                                                                         |
+| `ui/doc_title`                                        | [`core.chrome.docTitle`](/docs/development/core/public/kibana-plugin-core-public.chromedoctitle.md)                                                                                             |                                                                                                                                                |
+| `uiExports/injectedVars` / `chrome.getInjected`       | [Configure plugin](#configure-plugin) and [`PluginConfigDescriptor.exposeToBrowser`](/docs/development/core/server/kibana-plugin-core-server.pluginconfigdescriptor.exposetobrowser.md)         | Can only be used to expose configuration properties                                                                                            |
 
-_See also: [Public's CoreStart API Docs](/docs/development/core/public/kibana-plugin-public.corestart.md)_
+_See also: [Public's CoreStart API Docs](/docs/development/core/public/kibana-plugin-core-public.corestart.md)_
 
 ##### Plugins for shared application services
 
@@ -1192,26 +1192,26 @@ In server code, `core` can be accessed from either `server.newPlatform` or `kbnS
 
 | Legacy Platform                                                               | New Platform                                                                                                                                                                                                                                                                                                | Notes                                                                       |
 | ----------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------- |
-| `server.config()`                                                             | [`initializerContext.config.create()`](/docs/development/core/server/kibana-plugin-server.plugininitializercontext.config.md)                                                                                                                                                                               | Must also define schema. See _[how to configure plugin](#configure-plugin)_ |
-| `server.route`                                                                | [`core.http.createRouter`](/docs/development/core/server/kibana-plugin-server.httpservicesetup.createrouter.md)                                                                                                                                                                                             | [Examples](./MIGRATION_EXAMPLES.md#route-registration)                      |
-| `server.renderApp()` / `server.renderAppWithDefaultConfig()`                  | [`context.rendering.render()`](/docs/development/core/server/kibana-plugin-server.iscopedrenderingclient.render.md)                                                                                                                                                                                         | [Examples](./MIGRATION_EXAMPLES.md#render-html-content)                     |
-| `request.getBasePath()`                                                       | [`core.http.basePath.get`](/docs/development/core/server/kibana-plugin-server.httpservicesetup.basepath.md)                                                                                                                                                                                                 |                                                                             |
-| `server.plugins.elasticsearch.getCluster('data')`                             | [`context.core.elasticsearch.dataClient`](/docs/development/core/server/kibana-plugin-server.iscopedclusterclient.md)                                                                                                                                                                                            |                                                                             |
-| `server.plugins.elasticsearch.getCluster('admin')`                            | [`context.core.elasticsearch.adminClient`](/docs/development/core/server/kibana-plugin-server.iscopedclusterclient.md)                                                                                                                                                                                           |                                                                             |
-| `server.plugins.elasticsearch.createCluster(...)`                             | [`core.elasticsearch.legacy.createClient`](/docs/development/core/server/kibana-plugin-server.elasticsearchservicestart.legacy.md)                                                                                                                                                                           |                                                                             |
-| `server.savedObjects.setScopedSavedObjectsClientFactory`                      | [`core.savedObjects.setClientFactoryProvider`](/docs/development/core/server/kibana-plugin-server.savedobjectsservicesetup.setclientfactoryprovider.md)                                                                                                                                                                     |                                                                             |
-| `server.savedObjects.addScopedSavedObjectsClientWrapperFactory`               | [`core.savedObjects.addClientWrapper`](/docs/development/core/server/kibana-plugin-server.savedobjectsservicesetup.addclientwrapper.md)                                                                                                                                                                     |                                                                             |
-| `server.savedObjects.getSavedObjectsRepository`                               | [`core.savedObjects.createInternalRepository`](/docs/development/core/server/kibana-plugin-server.savedobjectsservicestart.createinternalrepository.md) [`core.savedObjects.createScopedRepository`](/docs/development/core/server/kibana-plugin-server.savedobjectsservicestart.createscopedrepository.md) |                                                                             |
-| `server.savedObjects.getScopedSavedObjectsClient`                             | [`core.savedObjects.getScopedClient`](/docs/development/core/server/kibana-plugin-server.savedobjectsservicestart.getscopedclient.md)                                                                                                                                                                       |                                                                             |
-| `request.getSavedObjectsClient`                                               | [`context.core.savedObjects.client`](/docs/development/core/server/kibana-plugin-server.requesthandlercontext.core.md)                                                                                                                                                                                      |                                                                             |
-| `request.getUiSettingsService`                                                | [`context.core.uiSettings.client`](/docs/development/core/server/kibana-plugin-server.iuisettingsclient.md)                                                                                                                                                                                                      |                                                                             |
-| `kibana.Plugin.deprecations`                                                  | [Handle plugin configuration deprecations](#handle-plugin-config-deprecations) and [`PluginConfigDescriptor.deprecations`](docs/development/core/server/kibana-plugin-server.pluginconfigdescriptor.md)                                                                                                     | Deprecations from New Platform are not applied to legacy configuration      |
-| `kibana.Plugin.savedObjectSchemas`                                            | [`core.savedObjects.registerType`](docs/development/core/server/kibana-plugin-server.savedobjectsservicesetup.registertype.md)                                                                                                                                                                              | [Examples](./MIGRATION_EXAMPLES.md#saved-objects-types)                     |
-| `kibana.Plugin.mappings`                                                      | [`core.savedObjects.registerType`](docs/development/core/server/kibana-plugin-server.savedobjectsservicesetup.registertype.md)                                                                                                                                                                              | [Examples](./MIGRATION_EXAMPLES.md#saved-objects-types)                     |
-| `kibana.Plugin.migrations`                                                    | [`core.savedObjects.registerType`](docs/development/core/server/kibana-plugin-server.savedobjectsservicesetup.registertype.md)                                                                                                                                                                              | [Examples](./MIGRATION_EXAMPLES.md#saved-objects-types)                     |
-| `kibana.Plugin.savedObjectsManagement`                                        | [`core.savedObjects.registerType`](docs/development/core/server/kibana-plugin-server.savedobjectsservicesetup.registertype.md)                                                                                                                                                                              | [Examples](./MIGRATION_EXAMPLES.md#saved-objects-types)                     |
-
-_See also: [Server's CoreSetup API Docs](/docs/development/core/server/kibana-plugin-server.coresetup.md)_
+| `server.config()`                                                             | [`initializerContext.config.create()`](/docs/development/core/server/kibana-plugin-core-server.plugininitializercontext.config.md)                                                                                                                                                                               | Must also define schema. See _[how to configure plugin](#configure-plugin)_ |
+| `server.route`                                                                | [`core.http.createRouter`](/docs/development/core/server/kibana-plugin-core-server.httpservicesetup.createrouter.md)                                                                                                                                                                                             | [Examples](./MIGRATION_EXAMPLES.md#route-registration)                      |
+| `server.renderApp()` / `server.renderAppWithDefaultConfig()`                  | [`context.rendering.render()`](/docs/development/core/server/kibana-plugin-core-server.iscopedrenderingclient.render.md)                                                                                                                                                                                         | [Examples](./MIGRATION_EXAMPLES.md#render-html-content)                     |
+| `request.getBasePath()`                                                       | [`core.http.basePath.get`](/docs/development/core/server/kibana-plugin-core-server.httpservicesetup.basepath.md)                                                                                                                                                                                                 |                                                                             |
+| `server.plugins.elasticsearch.getCluster('data')`                             | [`context.core.elasticsearch.dataClient`](/docs/development/core/server/kibana-plugin-core-server.iscopedclusterclient.md)                                                                                                                                                                                            |                                                                             |
+| `server.plugins.elasticsearch.getCluster('admin')`                            | [`context.core.elasticsearch.adminClient`](/docs/development/core/server/kibana-plugin-core-server.iscopedclusterclient.md)                                                                                                                                                                                           |                                                                             |
+| `server.plugins.elasticsearch.createCluster(...)`                             | [`core.elasticsearch.legacy.createClient`](/docs/development/core/server/kibana-plugin-core-server.elasticsearchservicestart.legacy.md)                                                                                                                                                                           |                                                                             |
+| `server.savedObjects.setScopedSavedObjectsClientFactory`                      | [`core.savedObjects.setClientFactoryProvider`](/docs/development/core/server/kibana-plugin-core-server.savedobjectsservicesetup.setclientfactoryprovider.md)                                                                                                                                                                     |                                                                             |
+| `server.savedObjects.addScopedSavedObjectsClientWrapperFactory`               | [`core.savedObjects.addClientWrapper`](/docs/development/core/server/kibana-plugin-core-server.savedobjectsservicesetup.addclientwrapper.md)                                                                                                                                                                     |                                                                             |
+| `server.savedObjects.getSavedObjectsRepository`                               | [`core.savedObjects.createInternalRepository`](/docs/development/core/server/kibana-plugin-core-server.savedobjectsservicestart.createinternalrepository.md) [`core.savedObjects.createScopedRepository`](/docs/development/core/server/kibana-plugin-core-server.savedobjectsservicestart.createscopedrepository.md) |                                                                             |
+| `server.savedObjects.getScopedSavedObjectsClient`                             | [`core.savedObjects.getScopedClient`](/docs/development/core/server/kibana-plugin-core-server.savedobjectsservicestart.getscopedclient.md)                                                                                                                                                                       |                                                                             |
+| `request.getSavedObjectsClient`                                               | [`context.core.savedObjects.client`](/docs/development/core/server/kibana-plugin-core-server.requesthandlercontext.core.md)                                                                                                                                                                                      |                                                                             |
+| `request.getUiSettingsService`                                                | [`context.core.uiSettings.client`](/docs/development/core/server/kibana-plugin-core-server.iuisettingsclient.md)                                                                                                                                                                                                      |                                                                             |
+| `kibana.Plugin.deprecations`                                                  | [Handle plugin configuration deprecations](#handle-plugin-config-deprecations) and [`PluginConfigDescriptor.deprecations`](docs/development/core/server/kibana-plugin-core-server.pluginconfigdescriptor.md)                                                                                                     | Deprecations from New Platform are not applied to legacy configuration      |
+| `kibana.Plugin.savedObjectSchemas`                                            | [`core.savedObjects.registerType`](docs/development/core/server/kibana-plugin-core-server.savedobjectsservicesetup.registertype.md)                                                                                                                                                                              | [Examples](./MIGRATION_EXAMPLES.md#saved-objects-types)                     |
+| `kibana.Plugin.mappings`                                                      | [`core.savedObjects.registerType`](docs/development/core/server/kibana-plugin-core-server.savedobjectsservicesetup.registertype.md)                                                                                                                                                                              | [Examples](./MIGRATION_EXAMPLES.md#saved-objects-types)                     |
+| `kibana.Plugin.migrations`                                                    | [`core.savedObjects.registerType`](docs/development/core/server/kibana-plugin-core-server.savedobjectsservicesetup.registertype.md)                                                                                                                                                                              | [Examples](./MIGRATION_EXAMPLES.md#saved-objects-types)                     |
+| `kibana.Plugin.savedObjectsManagement`                                        | [`core.savedObjects.registerType`](docs/development/core/server/kibana-plugin-core-server.savedobjectsservicesetup.registertype.md)                                                                                                                                                                              | [Examples](./MIGRATION_EXAMPLES.md#saved-objects-types)                     |
+
+_See also: [Server's CoreSetup API Docs](/docs/development/core/server/kibana-plugin-core-server.coresetup.md)_
 
 ##### Plugin services
 | Legacy Platform                                                                    | New Platform                                                                   | Notes |
@@ -1228,9 +1228,9 @@ This table shows where these uiExports have moved to in the New Platform. In mos
 | Legacy Platform              | New Platform                                                                                                              | Notes                                                                                                                                 |
 | ---------------------------- | ------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------- |
 | `aliases`                    |                                                                                                                           |                                                                                                                                       |
-| `app`                        | [`core.application.register`](/docs/development/core/public/kibana-plugin-public.applicationsetup.register.md)            |                                                                                                                                       |
+| `app`                        | [`core.application.register`](/docs/development/core/public/kibana-plugin-core-public.applicationsetup.register.md)            |                                                                                                                                       |
 | `canvas`                     |                                                                                                                           | Should be an API on the canvas plugin.                                                                                                |
-| `chromeNavControls`          | [`core.chrome.navControls.register{Left,Right}`](/docs/development/core/public/kibana-plugin-public.chromenavcontrols.md) |                                                                                                                                       |
+| `chromeNavControls`          | [`core.chrome.navControls.register{Left,Right}`](/docs/development/core/public/kibana-plugin-core-public.chromenavcontrols.md) |                                                                                                                                       |
 | `contextMenuActions`         |                                                                                                                           | Should be an API on the devTools plugin.                                                                                              |
 | `devTools`                   |                                                                                                                           |                                                                                                                                       |
 | `docViews`                   | [`plugins.discover.docViews.addDocView`](./src/plugins/discover/public/doc_views)                                         | Should be an API on the discover plugin.                                                                                              |
@@ -1256,8 +1256,8 @@ This table shows where these uiExports have moved to in the New Platform. In mos
 | `shareContextMenuExtensions` |                                                                                                                           |                                                                                                                                       |
 | `styleSheetPaths`            |                                                                                                                           |                                                                                                                                       |
 | `taskDefinitions`            |                                                                                                                           | Should be an API on the taskManager plugin.                                                                                           |
-| `uiCapabilities`             | [`core.application.register`](/docs/development/core/public/kibana-plugin-public.applicationsetup.register.md)            |                                                                                                                                       |
-| `uiSettingDefaults`          | [`core.uiSettings.register`](/docs/development/core/server/kibana-plugin-server.uisettingsservicesetup.md)                |                                                                                                                                       |
+| `uiCapabilities`             | [`core.application.register`](/docs/development/core/public/kibana-plugin-core-public.applicationsetup.register.md)            |                                                                                                                                       |
+| `uiSettingDefaults`          | [`core.uiSettings.register`](/docs/development/core/server/kibana-plugin-core-server.uisettingsservicesetup.md)                |                                                                                                                                       |
 | `validations`                |                                                                                                                           | Part of SavedObjects, see [#33587](https://github.com/elastic/kibana/issues/33587)                                                    |
 | `visEditorTypes`             |                                                                                                                           |                                                                                                                                       |
 | `visTypeEnhancers`           |                                                                                                                           |                                                                                                                                       |
@@ -1444,7 +1444,7 @@ In the legacy platform, Kibana requires to bind elasticsearch related API with a
 ```
 
 The new platform introduced [a handler interface](/rfcs/text/0003_handler_interface.md) on the server-side to perform that association internally. Core services, that require impersonation with an incoming request, are
-exposed via `context` argument of [the request handler interface.](/docs/development/core/server/kibana-plugin-server.requesthandler.md)
+exposed via `context` argument of [the request handler interface.](/docs/development/core/server/kibana-plugin-core-server.requesthandler.md)
 The above example looks in the new platform as
 ```js
   async function handler(context, req, res) {
@@ -1452,13 +1452,13 @@ The above example looks in the new platform as
   }
 ```
 
-The [request handler context](/docs/development/core/server/kibana-plugin-server.requesthandlercontext.md) exposed the next scoped **core** services:
+The [request handler context](/docs/development/core/server/kibana-plugin-core-server.requesthandlercontext.md) exposed the next scoped **core** services:
 | Legacy Platform                                     | New Platform                                                                                                       |
 | --------------------------------------------------- | -------------------------------------------------------------------------------------------------------------------|
-| `request.getSavedObjectsClient`                     | [`context.savedObjects.client`](/docs/development/core/server/kibana-plugin-server.savedobjectsclient.md)          |
-| `server.plugins.elasticsearch.getCluster('admin')`  | [`context.elasticsearch.adminClient`](/docs/development/core/server/kibana-plugin-server.iscopedclusterclient.md)  |
-| `server.plugins.elasticsearch.getCluster('data')`   | [`context.elasticsearch.dataClient`](/docs/development/core/server/kibana-plugin-server.iscopedclusterclient.md)   |
-| `request.getUiSettingsService`                      | [`context.uiSettings.client`](/docs/development/core/server/kibana-plugin-server.iuisettingsclient.md)             |
+| `request.getSavedObjectsClient`                     | [`context.savedObjects.client`](/docs/development/core/server/kibana-plugin-core-server.savedobjectsclient.md)          |
+| `server.plugins.elasticsearch.getCluster('admin')`  | [`context.elasticsearch.adminClient`](/docs/development/core/server/kibana-plugin-core-server.iscopedclusterclient.md)  |
+| `server.plugins.elasticsearch.getCluster('data')`   | [`context.elasticsearch.dataClient`](/docs/development/core/server/kibana-plugin-core-server.iscopedclusterclient.md)   |
+| `request.getUiSettingsService`                      | [`context.uiSettings.client`](/docs/development/core/server/kibana-plugin-core-server.iuisettingsclient.md)             |
 
 #### Declare a custom scoped service
 Plugins can extend the handler context with custom API that will be available to the plugin itself and all dependent plugins.
diff --git a/src/core/public/http/types.ts b/src/core/public/http/types.ts
index c40ad74893ead..b12cd1fe09a91 100644
--- a/src/core/public/http/types.ts
+++ b/src/core/public/http/types.ts
@@ -24,6 +24,7 @@ import { MaybePromise } from '@kbn/utility-types';
 export interface HttpSetup {
   /**
    * APIs for manipulating the basePath on URL segments.
+   * See {@link IBasePath}
    */
   basePath: IBasePath;
 

From 4b012fb21af603efcf07c285f1c713e8eae6b828 Mon Sep 17 00:00:00 2001
From: Josh Dover <me@joshdover.com>
Date: Wed, 25 Mar 2020 15:27:26 -0600
Subject: [PATCH 165/179] Fix running Kibana Platform migrations in development
 (#61325)

---
 .../core/server/kibana-plugin-core-server.md  |  2 -
 ...re-server.pluginsservicesetup.contracts.md | 11 ----
 ...-plugin-core-server.pluginsservicesetup.md | 20 -------
 ...re-server.pluginsservicesetup.uiplugins.md | 15 -----
 ...re-server.pluginsservicestart.contracts.md | 11 ----
 ...-plugin-core-server.pluginsservicestart.md | 19 -------
 src/core/server/legacy/legacy_service.test.ts |  1 +
 .../server/plugins/plugins_service.mock.ts    |  1 +
 .../server/plugins/plugins_service.test.ts    | 57 ++++++++++++-------
 src/core/server/plugins/plugins_service.ts    | 16 ++++--
 .../saved_objects_service.test.ts             |  8 +--
 .../saved_objects/saved_objects_service.ts    | 12 ++--
 src/core/server/server.api.md                 |  9 ++-
 src/core/server/server.ts                     |  6 +-
 14 files changed, 71 insertions(+), 117 deletions(-)
 delete mode 100644 docs/development/core/server/kibana-plugin-core-server.pluginsservicesetup.contracts.md
 delete mode 100644 docs/development/core/server/kibana-plugin-core-server.pluginsservicesetup.md
 delete mode 100644 docs/development/core/server/kibana-plugin-core-server.pluginsservicesetup.uiplugins.md
 delete mode 100644 docs/development/core/server/kibana-plugin-core-server.pluginsservicestart.contracts.md
 delete mode 100644 docs/development/core/server/kibana-plugin-core-server.pluginsservicestart.md

diff --git a/docs/development/core/server/kibana-plugin-core-server.md b/docs/development/core/server/kibana-plugin-core-server.md
index a1158dc853918..793684c1b3796 100644
--- a/docs/development/core/server/kibana-plugin-core-server.md
+++ b/docs/development/core/server/kibana-plugin-core-server.md
@@ -115,8 +115,6 @@ The plugin integrates with the core system via lifecycle events: `setup`<!-- -->
 |  [PluginConfigDescriptor](./kibana-plugin-core-server.pluginconfigdescriptor.md) | Describes a plugin configuration properties. |
 |  [PluginInitializerContext](./kibana-plugin-core-server.plugininitializercontext.md) | Context that's available to plugins during initialization stage. |
 |  [PluginManifest](./kibana-plugin-core-server.pluginmanifest.md) | Describes the set of required and optional properties plugin can define in its mandatory JSON manifest file. |
-|  [PluginsServiceSetup](./kibana-plugin-core-server.pluginsservicesetup.md) |  |
-|  [PluginsServiceStart](./kibana-plugin-core-server.pluginsservicestart.md) |  |
 |  [RequestHandlerContext](./kibana-plugin-core-server.requesthandlercontext.md) | Plugin specific context passed to a route handler.<!-- -->Provides the following clients and services: - [rendering](./kibana-plugin-core-server.iscopedrenderingclient.md) - Rendering client which uses the data of the incoming request - [savedObjects.client](./kibana-plugin-core-server.savedobjectsclient.md) - Saved Objects client which uses the credentials of the incoming request - [savedObjects.typeRegistry](./kibana-plugin-core-server.isavedobjecttyperegistry.md) - Type registry containing all the registered types. - [elasticsearch.dataClient](./kibana-plugin-core-server.scopedclusterclient.md) - Elasticsearch data client which uses the credentials of the incoming request - [elasticsearch.adminClient](./kibana-plugin-core-server.scopedclusterclient.md) - Elasticsearch admin client which uses the credentials of the incoming request - [uiSettings.client](./kibana-plugin-core-server.iuisettingsclient.md) - uiSettings client which uses the credentials of the incoming request |
 |  [RouteConfig](./kibana-plugin-core-server.routeconfig.md) | Route specific configuration. |
 |  [RouteConfigOptions](./kibana-plugin-core-server.routeconfigoptions.md) | Additional route options. |
diff --git a/docs/development/core/server/kibana-plugin-core-server.pluginsservicesetup.contracts.md b/docs/development/core/server/kibana-plugin-core-server.pluginsservicesetup.contracts.md
deleted file mode 100644
index 5e0543dbaa2d4..0000000000000
--- a/docs/development/core/server/kibana-plugin-core-server.pluginsservicesetup.contracts.md
+++ /dev/null
@@ -1,11 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [kibana-plugin-core-server](./kibana-plugin-core-server.md) &gt; [PluginsServiceSetup](./kibana-plugin-core-server.pluginsservicesetup.md) &gt; [contracts](./kibana-plugin-core-server.pluginsservicesetup.contracts.md)
-
-## PluginsServiceSetup.contracts property
-
-<b>Signature:</b>
-
-```typescript
-contracts: Map<PluginName, unknown>;
-```
diff --git a/docs/development/core/server/kibana-plugin-core-server.pluginsservicesetup.md b/docs/development/core/server/kibana-plugin-core-server.pluginsservicesetup.md
deleted file mode 100644
index 5bfa65f36bda3..0000000000000
--- a/docs/development/core/server/kibana-plugin-core-server.pluginsservicesetup.md
+++ /dev/null
@@ -1,20 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [kibana-plugin-core-server](./kibana-plugin-core-server.md) &gt; [PluginsServiceSetup](./kibana-plugin-core-server.pluginsservicesetup.md)
-
-## PluginsServiceSetup interface
-
-
-<b>Signature:</b>
-
-```typescript
-export interface PluginsServiceSetup 
-```
-
-## Properties
-
-|  Property | Type | Description |
-|  --- | --- | --- |
-|  [contracts](./kibana-plugin-core-server.pluginsservicesetup.contracts.md) | <code>Map&lt;PluginName, unknown&gt;</code> |  |
-|  [uiPlugins](./kibana-plugin-core-server.pluginsservicesetup.uiplugins.md) | <code>{</code><br/><code>        internal: Map&lt;PluginName, InternalPluginInfo&gt;;</code><br/><code>        public: Map&lt;PluginName, DiscoveredPlugin&gt;;</code><br/><code>        browserConfigs: Map&lt;PluginName, Observable&lt;unknown&gt;&gt;;</code><br/><code>    }</code> |  |
-
diff --git a/docs/development/core/server/kibana-plugin-core-server.pluginsservicesetup.uiplugins.md b/docs/development/core/server/kibana-plugin-core-server.pluginsservicesetup.uiplugins.md
deleted file mode 100644
index 7168a360c244d..0000000000000
--- a/docs/development/core/server/kibana-plugin-core-server.pluginsservicesetup.uiplugins.md
+++ /dev/null
@@ -1,15 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [kibana-plugin-core-server](./kibana-plugin-core-server.md) &gt; [PluginsServiceSetup](./kibana-plugin-core-server.pluginsservicesetup.md) &gt; [uiPlugins](./kibana-plugin-core-server.pluginsservicesetup.uiplugins.md)
-
-## PluginsServiceSetup.uiPlugins property
-
-<b>Signature:</b>
-
-```typescript
-uiPlugins: {
-        internal: Map<PluginName, InternalPluginInfo>;
-        public: Map<PluginName, DiscoveredPlugin>;
-        browserConfigs: Map<PluginName, Observable<unknown>>;
-    };
-```
diff --git a/docs/development/core/server/kibana-plugin-core-server.pluginsservicestart.contracts.md b/docs/development/core/server/kibana-plugin-core-server.pluginsservicestart.contracts.md
deleted file mode 100644
index 5c680d9d2d504..0000000000000
--- a/docs/development/core/server/kibana-plugin-core-server.pluginsservicestart.contracts.md
+++ /dev/null
@@ -1,11 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [kibana-plugin-core-server](./kibana-plugin-core-server.md) &gt; [PluginsServiceStart](./kibana-plugin-core-server.pluginsservicestart.md) &gt; [contracts](./kibana-plugin-core-server.pluginsservicestart.contracts.md)
-
-## PluginsServiceStart.contracts property
-
-<b>Signature:</b>
-
-```typescript
-contracts: Map<PluginName, unknown>;
-```
diff --git a/docs/development/core/server/kibana-plugin-core-server.pluginsservicestart.md b/docs/development/core/server/kibana-plugin-core-server.pluginsservicestart.md
deleted file mode 100644
index cb450ded47c5b..0000000000000
--- a/docs/development/core/server/kibana-plugin-core-server.pluginsservicestart.md
+++ /dev/null
@@ -1,19 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [kibana-plugin-core-server](./kibana-plugin-core-server.md) &gt; [PluginsServiceStart](./kibana-plugin-core-server.pluginsservicestart.md)
-
-## PluginsServiceStart interface
-
-
-<b>Signature:</b>
-
-```typescript
-export interface PluginsServiceStart 
-```
-
-## Properties
-
-|  Property | Type | Description |
-|  --- | --- | --- |
-|  [contracts](./kibana-plugin-core-server.pluginsservicestart.contracts.md) | <code>Map&lt;PluginName, unknown&gt;</code> |  |
-
diff --git a/src/core/server/legacy/legacy_service.test.ts b/src/core/server/legacy/legacy_service.test.ts
index 94e86c39289bc..ef31be559b30b 100644
--- a/src/core/server/legacy/legacy_service.test.ts
+++ b/src/core/server/legacy/legacy_service.test.ts
@@ -87,6 +87,7 @@ beforeEach(() => {
       },
       savedObjects: savedObjectsServiceMock.createInternalSetupContract(),
       plugins: {
+        initialized: true,
         contracts: new Map([['plugin-id', 'plugin-value']]),
         uiPlugins: {
           public: new Map([['plugin-id', {} as DiscoveredPlugin]]),
diff --git a/src/core/server/plugins/plugins_service.mock.ts b/src/core/server/plugins/plugins_service.mock.ts
index 5a52ebccbd472..29e5b83b2e4c7 100644
--- a/src/core/server/plugins/plugins_service.mock.ts
+++ b/src/core/server/plugins/plugins_service.mock.ts
@@ -28,6 +28,7 @@ const createSetupContractMock = (): PluginsServiceSetup => ({
     internal: new Map(),
     public: new Map(),
   },
+  initialized: true,
 });
 const createStartContractMock = () => ({ contracts: new Map() });
 const createServiceMock = (): PluginsServiceMock => ({
diff --git a/src/core/server/plugins/plugins_service.test.ts b/src/core/server/plugins/plugins_service.test.ts
index df618b2c0a706..4f69a2b4156be 100644
--- a/src/core/server/plugins/plugins_service.test.ts
+++ b/src/core/server/plugins/plugins_service.test.ts
@@ -516,28 +516,29 @@ describe('PluginsService', () => {
   });
 
   describe('#setup()', () => {
-    describe('uiPlugins.internal', () => {
-      it('includes disabled plugins', async () => {
-        mockDiscover.mockReturnValue({
-          error$: from([]),
-          plugin$: from([
-            createPlugin('plugin-1', {
-              path: 'path-1',
-              version: 'some-version',
-              configPath: 'plugin1',
-            }),
-            createPlugin('plugin-2', {
-              path: 'path-2',
-              version: 'some-version',
-              configPath: 'plugin2',
-            }),
-          ]),
-        });
+    beforeEach(() => {
+      mockDiscover.mockReturnValue({
+        error$: from([]),
+        plugin$: from([
+          createPlugin('plugin-1', {
+            path: 'path-1',
+            version: 'some-version',
+            configPath: 'plugin1',
+          }),
+          createPlugin('plugin-2', {
+            path: 'path-2',
+            version: 'some-version',
+            configPath: 'plugin2',
+          }),
+        ]),
+      });
 
-        mockPluginSystem.uiPlugins.mockReturnValue(new Map());
+      mockPluginSystem.uiPlugins.mockReturnValue(new Map());
+    });
 
+    describe('uiPlugins.internal', () => {
+      it('includes disabled plugins', async () => {
         config$.next({ plugins: { initialize: true }, plugin1: { enabled: false } });
-
         await pluginsService.discover();
         const { uiPlugins } = await pluginsService.setup({} as any);
         expect(uiPlugins.internal).toMatchInlineSnapshot(`
@@ -552,6 +553,24 @@ describe('PluginsService', () => {
         `);
       });
     });
+
+    describe('plugin initialization', () => {
+      it('does initialize if plugins.initialize is true', async () => {
+        config$.next({ plugins: { initialize: true } });
+        await pluginsService.discover();
+        const { initialized } = await pluginsService.setup({} as any);
+        expect(mockPluginSystem.setupPlugins).toHaveBeenCalled();
+        expect(initialized).toBe(true);
+      });
+
+      it('does not initialize if plugins.initialize is false', async () => {
+        config$.next({ plugins: { initialize: false } });
+        await pluginsService.discover();
+        const { initialized } = await pluginsService.setup({} as any);
+        expect(mockPluginSystem.setupPlugins).not.toHaveBeenCalled();
+        expect(initialized).toBe(false);
+      });
+    });
   });
 
   describe('#stop()', () => {
diff --git a/src/core/server/plugins/plugins_service.ts b/src/core/server/plugins/plugins_service.ts
index 427cc19a8614f..9987d1633c502 100644
--- a/src/core/server/plugins/plugins_service.ts
+++ b/src/core/server/plugins/plugins_service.ts
@@ -33,8 +33,11 @@ import { InternalCoreSetup, InternalCoreStart } from '../internal_types';
 import { IConfigService } from '../config';
 import { pick } from '../../utils';
 
-/** @public */
+/** @internal */
 export interface PluginsServiceSetup {
+  /** Indicates whether or not plugins were initialized. */
+  initialized: boolean;
+  /** Setup contracts returned by plugins. */
   contracts: Map<PluginName, unknown>;
   uiPlugins: {
     /**
@@ -55,8 +58,9 @@ export interface PluginsServiceSetup {
   };
 }
 
-/** @public */
+/** @internal */
 export interface PluginsServiceStart {
+  /** Start contracts returned by plugins. */
   contracts: Map<PluginName, unknown>;
 }
 
@@ -103,14 +107,16 @@ export class PluginsService implements CoreService<PluginsServiceSetup, PluginsS
     const config = await this.config$.pipe(first()).toPromise();
 
     let contracts = new Map<PluginName, unknown>();
-    if (!config.initialize || this.coreContext.env.isDevClusterMaster) {
-      this.log.info('Plugin initialization disabled.');
-    } else {
+    const initialize = config.initialize && !this.coreContext.env.isDevClusterMaster;
+    if (initialize) {
       contracts = await this.pluginsSystem.setupPlugins(deps);
+    } else {
+      this.log.info('Plugin initialization disabled.');
     }
 
     const uiPlugins = this.pluginsSystem.uiPlugins();
     return {
+      initialized: initialize,
       contracts,
       uiPlugins: {
         internal: this.uiPluginInternalInfo,
diff --git a/src/core/server/saved_objects/saved_objects_service.test.ts b/src/core/server/saved_objects/saved_objects_service.test.ts
index 58b9abfbcdb3a..018117776dcc8 100644
--- a/src/core/server/saved_objects/saved_objects_service.test.ts
+++ b/src/core/server/saved_objects/saved_objects_service.test.ts
@@ -171,14 +171,12 @@ describe('SavedObjectsService', () => {
       return expect(KibanaMigratorMock.mock.calls[0][0].callCluster()).resolves.toMatch('success');
     });
 
-    it('skips KibanaMigrator migrations when --optimize=true', async () => {
-      const coreContext = createCoreContext({
-        env: ({ cliArgs: { optimize: true }, packageInfo: { version: 'x.x.x' } } as unknown) as Env,
-      });
+    it('skips KibanaMigrator migrations when pluginsInitialized=false', async () => {
+      const coreContext = createCoreContext({ skipMigration: false });
       const soService = new SavedObjectsService(coreContext);
 
       await soService.setup(createSetupDeps());
-      await soService.start({});
+      await soService.start({ pluginsInitialized: false });
       expect(migratorInstanceMock.runMigrations).not.toHaveBeenCalled();
     });
 
diff --git a/src/core/server/saved_objects/saved_objects_service.ts b/src/core/server/saved_objects/saved_objects_service.ts
index 175eac3c1bd95..aa440c6454569 100644
--- a/src/core/server/saved_objects/saved_objects_service.ts
+++ b/src/core/server/saved_objects/saved_objects_service.ts
@@ -269,7 +269,9 @@ interface WrappedClientFactoryWrapper {
 
 /** @internal */
 // eslint-disable-next-line @typescript-eslint/no-empty-interface
-export interface SavedObjectsStartDeps {}
+export interface SavedObjectsStartDeps {
+  pluginsInitialized?: boolean;
+}
 
 export class SavedObjectsService
   implements CoreService<InternalSavedObjectsServiceSetup, InternalSavedObjectsServiceStart> {
@@ -349,7 +351,7 @@ export class SavedObjectsService
   }
 
   public async start(
-    core: SavedObjectsStartDeps,
+    { pluginsInitialized = true }: SavedObjectsStartDeps,
     migrationsRetryDelay?: number
   ): Promise<InternalSavedObjectsServiceStart> {
     if (!this.setupDeps || !this.config) {
@@ -376,9 +378,11 @@ export class SavedObjectsService
      * However, our build system optimize step and some tests depend on the
      * HTTP server running without an Elasticsearch server being available.
      * So, when the `migrations.skip` is true, we skip migrations altogether.
+     *
+     * We also cannot safely run migrations if plugins are not initialized since
+     * not plugin migrations won't be registered.
      */
-    const cliArgs = this.coreContext.env.cliArgs;
-    const skipMigrations = cliArgs.optimize || this.config.migration.skip;
+    const skipMigrations = this.config.migration.skip || !pluginsInitialized;
 
     if (skipMigrations) {
       this.logger.warn(
diff --git a/src/core/server/server.api.md b/src/core/server/server.api.md
index 6d4181e5e1ab3..232d34e484382 100644
--- a/src/core/server/server.api.md
+++ b/src/core/server/server.api.md
@@ -1426,10 +1426,10 @@ export type PluginName = string;
 // @public (undocumented)
 export type PluginOpaqueId = symbol;
 
-// @public (undocumented)
+// @internal (undocumented)
 export interface PluginsServiceSetup {
-    // (undocumented)
     contracts: Map<PluginName, unknown>;
+    initialized: boolean;
     // (undocumented)
     uiPlugins: {
         internal: Map<PluginName, InternalPluginInfo>;
@@ -1438,9 +1438,8 @@ export interface PluginsServiceSetup {
     };
 }
 
-// @public (undocumented)
+// @internal (undocumented)
 export interface PluginsServiceStart {
-    // (undocumented)
     contracts: Map<PluginName, unknown>;
 }
 
@@ -2348,7 +2347,7 @@ export const validBodyOutput: readonly ["data", "stream"];
 // src/core/server/legacy/types.ts:164:3 - (ae-forgotten-export) The symbol "LegacyNavLinkSpec" needs to be exported by the entry point index.d.ts
 // src/core/server/legacy/types.ts:165:3 - (ae-forgotten-export) The symbol "LegacyAppSpec" needs to be exported by the entry point index.d.ts
 // src/core/server/legacy/types.ts:166:16 - (ae-forgotten-export) The symbol "LegacyPluginSpec" needs to be exported by the entry point index.d.ts
-// src/core/server/plugins/plugins_service.ts:44:5 - (ae-forgotten-export) The symbol "InternalPluginInfo" needs to be exported by the entry point index.d.ts
+// src/core/server/plugins/plugins_service.ts:47:5 - (ae-forgotten-export) The symbol "InternalPluginInfo" needs to be exported by the entry point index.d.ts
 // src/core/server/plugins/types.ts:226:3 - (ae-forgotten-export) The symbol "KibanaConfigType" needs to be exported by the entry point index.d.ts
 // src/core/server/plugins/types.ts:226:3 - (ae-forgotten-export) The symbol "SharedGlobalConfigKeys" needs to be exported by the entry point index.d.ts
 // src/core/server/plugins/types.ts:228:3 - (ae-forgotten-export) The symbol "PathConfigType" needs to be exported by the entry point index.d.ts
diff --git a/src/core/server/server.ts b/src/core/server/server.ts
index 09a1328f346d8..222be572b75e4 100644
--- a/src/core/server/server.ts
+++ b/src/core/server/server.ts
@@ -72,6 +72,7 @@ export class Server {
   private readonly metrics: MetricsService;
   private readonly coreApp: CoreApp;
 
+  private pluginsInitialized?: boolean;
   private coreStart?: InternalCoreStart;
 
   constructor(
@@ -156,6 +157,7 @@ export class Server {
     };
 
     const pluginsSetup = await this.plugins.setup(coreSetup);
+    this.pluginsInitialized = pluginsSetup.initialized;
 
     const renderingSetup = await this.rendering.setup({
       http: httpSetup,
@@ -176,7 +178,9 @@ export class Server {
 
   public async start() {
     this.log.debug('starting server');
-    const savedObjectsStart = await this.savedObjects.start({});
+    const savedObjectsStart = await this.savedObjects.start({
+      pluginsInitialized: this.pluginsInitialized,
+    });
     const capabilitiesStart = this.capabilities.start();
     const uiSettingsStart = await this.uiSettings.start();
     const elasticsearchStart = await this.elasticsearch.start();

From 8eaed26eb8366cdbfb9ba04eb04c8577f4c70bc4 Mon Sep 17 00:00:00 2001
From: CJ Cenizal <cj@cenizal.com>
Date: Wed, 25 Mar 2020 14:42:48 -0700
Subject: [PATCH 166/179] Set initial nav drawer isLocked state in Header
 constructor (#61338)

---
 src/core/public/chrome/ui/header/header.tsx | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/core/public/chrome/ui/header/header.tsx b/src/core/public/chrome/ui/header/header.tsx
index 4dec084fd8a83..66b34c3db7bad 100644
--- a/src/core/public/chrome/ui/header/header.tsx
+++ b/src/core/public/chrome/ui/header/header.tsx
@@ -92,6 +92,9 @@ export class Header extends Component<HeaderProps, State> {
   constructor(props: HeaderProps) {
     super(props);
 
+    let isLocked = false;
+    props.isLocked$.subscribe(initialIsLocked => (isLocked = initialIsLocked));
+
     this.state = {
       appTitle: 'Kibana',
       isVisible: true,
@@ -101,7 +104,7 @@ export class Header extends Component<HeaderProps, State> {
       navControlsLeft: [],
       navControlsRight: [],
       currentAppId: '',
-      isLocked: false,
+      isLocked,
     };
   }
 

From 22552564901ff9c9cb16c43b6f767d24cac97b3e Mon Sep 17 00:00:00 2001
From: Vadim Dalecky <streamich@users.noreply.github.com>
Date: Wed, 25 Mar 2020 23:14:11 +0100
Subject: [PATCH 167/179] =?UTF-8?q?test:=20=F0=9F=92=8D=20use=20fake=20tim?=
 =?UTF-8?q?ers=20in=20TimedItemBuffer=20tests=20(#61225)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

✅ Closes: #58662

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 .../buffer/tests/timed_item_buffer.test.ts    | 31 +++++++++++--------
 1 file changed, 18 insertions(+), 13 deletions(-)

diff --git a/src/plugins/bfetch/common/buffer/tests/timed_item_buffer.test.ts b/src/plugins/bfetch/common/buffer/tests/timed_item_buffer.test.ts
index e1640927c4ead..7a0d324995890 100644
--- a/src/plugins/bfetch/common/buffer/tests/timed_item_buffer.test.ts
+++ b/src/plugins/bfetch/common/buffer/tests/timed_item_buffer.test.ts
@@ -20,11 +20,16 @@
 import { TimedItemBuffer } from '../timed_item_buffer';
 import { runItemBufferTests } from './run_item_buffer_tests';
 
-// FLAKY: https://github.com/elastic/kibana/issues/58662
-describe.skip('TimedItemBuffer', () => {
+jest.useFakeTimers();
+
+beforeEach(() => {
+  jest.clearAllTimers();
+});
+
+describe('TimedItemBuffer', () => {
   runItemBufferTests(TimedItemBuffer);
 
-  test('does not do unnecessary flushes', async () => {
+  test('does not do unnecessary flushes', () => {
     const onFlush = jest.fn();
     const buf = new TimedItemBuffer({
       onFlush,
@@ -38,7 +43,7 @@ describe.skip('TimedItemBuffer', () => {
     expect(onFlush).toHaveBeenCalledTimes(1);
   });
 
-  test('does not do extra flush after timeout if buffer was flushed during timeout wait', async () => {
+  test('does not do extra flush after timeout if buffer was flushed during timeout wait', () => {
     const onFlush = jest.fn();
     const buf = new TimedItemBuffer({
       onFlush,
@@ -46,14 +51,14 @@ describe.skip('TimedItemBuffer', () => {
     });
 
     buf.write(0);
-    await new Promise(r => setTimeout(r, 3));
+    jest.advanceTimersByTime(3);
     buf.flush();
-    await new Promise(r => setTimeout(r, 11));
+    jest.advanceTimersByTime(11);
 
     expect(onFlush).toHaveBeenCalledTimes(1);
   });
 
-  test('flushes buffer automatically after timeout reached', async () => {
+  test('flushes buffer automatically after timeout reached', () => {
     const onFlush = jest.fn();
     const buf = new TimedItemBuffer({
       onFlush,
@@ -64,12 +69,12 @@ describe.skip('TimedItemBuffer', () => {
     buf.write(2);
     expect(onFlush).toHaveBeenCalledTimes(0);
 
-    await new Promise(r => setTimeout(r, 3));
+    jest.advanceTimersByTime(3);
     expect(onFlush).toHaveBeenCalledTimes(1);
     expect(onFlush).toHaveBeenCalledWith([1, 2]);
   });
 
-  test('does not call flush after timeout if flush was triggered because buffer size reached', async () => {
+  test('does not call flush after timeout if flush was triggered because buffer size reached', () => {
     const onFlush = jest.fn();
     const buf = new TimedItemBuffer({
       onFlush,
@@ -81,11 +86,11 @@ describe.skip('TimedItemBuffer', () => {
     buf.write(2);
 
     expect(onFlush).toHaveBeenCalledTimes(1);
-    await new Promise(r => setTimeout(r, 3));
+    jest.advanceTimersByTime(3);
     expect(onFlush).toHaveBeenCalledTimes(1);
   });
 
-  test('does not automatically flush if `.clear()` was called', async () => {
+  test('does not automatically flush if `.clear()` was called', () => {
     const onFlush = jest.fn();
     const buf = new TimedItemBuffer({
       onFlush,
@@ -95,11 +100,11 @@ describe.skip('TimedItemBuffer', () => {
 
     buf.write(1);
     buf.write(2);
-    await new Promise(r => setImmediate(r));
+    jest.advanceTimersByTime(1);
     buf.clear();
 
     expect(onFlush).toHaveBeenCalledTimes(0);
-    await new Promise(r => setTimeout(r, 6));
+    jest.advanceTimersByTime(6);
     expect(onFlush).toHaveBeenCalledTimes(0);
   });
 });

From a825fc9e932bbb155d350a6ecace20bafd094db3 Mon Sep 17 00:00:00 2001
From: Rudolf Meijering <skaapgif@gmail.com>
Date: Wed, 25 Mar 2020 23:17:40 +0100
Subject: [PATCH 168/179] Fix incorrect config validation on SIGHUP (#61246)

---
 src/legacy/server/kbn_server.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/legacy/server/kbn_server.js b/src/legacy/server/kbn_server.js
index 6991527a9503c..e06212d87e3e3 100644
--- a/src/legacy/server/kbn_server.js
+++ b/src/legacy/server/kbn_server.js
@@ -199,8 +199,7 @@ export default class KbnServer {
   }
 
   applyLoggingConfiguration(settings) {
-    const config = new Config(this.config.getSchema(), settings);
-
+    const config = Config.withDefaultSchema(settings);
     const loggingOptions = loggingConfiguration(config);
     const subset = {
       ops: config.get('ops'),

From 45132a1763014c7c1ec401f36ed0a652acc69ceb Mon Sep 17 00:00:00 2001
From: Candace Park <56409205+parkiino@users.noreply.github.com>
Date: Wed, 25 Mar 2020 18:19:28 -0400
Subject: [PATCH 169/179] Task/windows eventing form (#60690)

Policy Details: Windows Eventing UI card

Co-authored-by: kevinlog <kevin.logan@elastic.co>
---
 .../endpoint/models/policy_details_config.ts  |  45 +++++++
 .../endpoint/store/policy_details/action.ts   |  14 ++-
 .../store/policy_details/index.test.ts        |  92 +++++++++++++++
 .../store/policy_details/middleware.ts        |  17 ++-
 .../endpoint/store/policy_details/reducer.ts  |   8 ++
 .../store/policy_details/selectors.ts         |  37 +++++-
 .../public/applications/endpoint/types.ts     |  64 +++++++++-
 .../endpoint/view/policy/policy_details.tsx   |  58 ++++++++-
 .../view/policy/policy_forms/config_form.tsx  | 110 ++++++++++++++++++
 .../policy/policy_forms/eventing/checkbox.tsx |  49 ++++++++
 .../policy/policy_forms/eventing/windows.tsx  |  70 +++++++++++
 x-pack/test/functional/apps/endpoint/index.ts |   1 -
 .../apps/endpoint/policy_details.ts           |  25 ----
 13 files changed, 550 insertions(+), 40 deletions(-)
 create mode 100644 x-pack/plugins/endpoint/public/applications/endpoint/models/policy_details_config.ts
 create mode 100644 x-pack/plugins/endpoint/public/applications/endpoint/store/policy_details/index.test.ts
 create mode 100644 x-pack/plugins/endpoint/public/applications/endpoint/view/policy/policy_forms/config_form.tsx
 create mode 100644 x-pack/plugins/endpoint/public/applications/endpoint/view/policy/policy_forms/eventing/checkbox.tsx
 create mode 100644 x-pack/plugins/endpoint/public/applications/endpoint/view/policy/policy_forms/eventing/windows.tsx
 delete mode 100644 x-pack/test/functional/apps/endpoint/policy_details.ts

diff --git a/x-pack/plugins/endpoint/public/applications/endpoint/models/policy_details_config.ts b/x-pack/plugins/endpoint/public/applications/endpoint/models/policy_details_config.ts
new file mode 100644
index 0000000000000..1900516cb539b
--- /dev/null
+++ b/x-pack/plugins/endpoint/public/applications/endpoint/models/policy_details_config.ts
@@ -0,0 +1,45 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { PolicyConfig } from '../types';
+
+/**
+ * A typed Object.entries() function where the keys and values are typed based on the given object
+ */
+const entries = <T extends object>(o: T): Array<[keyof T, T[keyof T]]> =>
+  Object.entries(o) as Array<[keyof T, T[keyof T]]>;
+type DeepPartial<T> = { [K in keyof T]?: DeepPartial<T[K]> };
+
+/**
+ * Returns a deep copy of PolicyDetailsConfig
+ */
+export function clone(policyDetailsConfig: PolicyConfig): PolicyConfig {
+  const clonedConfig: DeepPartial<PolicyConfig> = {};
+  for (const [key, val] of entries(policyDetailsConfig)) {
+    if (typeof val === 'object') {
+      const valClone: Partial<typeof val> = {};
+      clonedConfig[key] = valClone;
+      for (const [key2, val2] of entries(val)) {
+        if (typeof val2 === 'object') {
+          valClone[key2] = {
+            ...val2,
+          };
+        } else {
+          clonedConfig[key] = {
+            ...val,
+          };
+        }
+      }
+    } else {
+      clonedConfig[key] = val;
+    }
+  }
+
+  /**
+   * clonedConfig is typed as DeepPartial so we can construct the copy from an empty object
+   */
+  return clonedConfig as PolicyConfig;
+}
diff --git a/x-pack/plugins/endpoint/public/applications/endpoint/store/policy_details/action.ts b/x-pack/plugins/endpoint/public/applications/endpoint/store/policy_details/action.ts
index cf875e01a6fde..e7e523a9287b8 100644
--- a/x-pack/plugins/endpoint/public/applications/endpoint/store/policy_details/action.ts
+++ b/x-pack/plugins/endpoint/public/applications/endpoint/store/policy_details/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, PolicyConfig } from '../../types';
 
 interface ServerReturnedPolicyDetailsData {
   type: 'serverReturnedPolicyDetailsData';
@@ -13,4 +13,14 @@ interface ServerReturnedPolicyDetailsData {
   };
 }
 
-export type PolicyDetailsAction = ServerReturnedPolicyDetailsData;
+/**
+ * When users change a policy via forms, this action is dispatched with a payload that modifies the configuration of a cloned policy config.
+ */
+interface UserChangedPolicyConfig {
+  type: 'userChangedPolicyConfig';
+  payload: {
+    policyConfig: PolicyConfig;
+  };
+}
+
+export type PolicyDetailsAction = ServerReturnedPolicyDetailsData | UserChangedPolicyConfig;
diff --git a/x-pack/plugins/endpoint/public/applications/endpoint/store/policy_details/index.test.ts b/x-pack/plugins/endpoint/public/applications/endpoint/store/policy_details/index.test.ts
new file mode 100644
index 0000000000000..b20df84fdf575
--- /dev/null
+++ b/x-pack/plugins/endpoint/public/applications/endpoint/store/policy_details/index.test.ts
@@ -0,0 +1,92 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { PolicyDetailsState } from '../../types';
+import { createStore, Dispatch, Store } from 'redux';
+import { policyDetailsReducer, PolicyDetailsAction } from './index';
+import { policyConfig, windowsEventing } from './selectors';
+import { clone } from '../../models/policy_details_config';
+
+describe('policy details: ', () => {
+  let store: Store<PolicyDetailsState>;
+  let getState: typeof store['getState'];
+  let dispatch: Dispatch<PolicyDetailsAction>;
+
+  beforeEach(() => {
+    store = createStore(policyDetailsReducer);
+    getState = store.getState;
+    dispatch = store.dispatch;
+
+    dispatch({
+      type: 'serverReturnedPolicyDetailsData',
+      payload: {
+        policyItem: {
+          id: '',
+          name: '',
+          description: '',
+          config_id: '',
+          enabled: true,
+          output_id: '',
+          inputs: [],
+          namespace: '',
+          package: {
+            name: '',
+            title: '',
+            version: '',
+          },
+          revision: 1,
+        },
+        policyConfig: {
+          windows: {
+            malware: {
+              mode: 'detect',
+            },
+            eventing: {
+              process: false,
+              network: false,
+            },
+          },
+          mac: {
+            malware: {
+              mode: '',
+            },
+            eventing: {
+              process: false,
+              network: false,
+            },
+          },
+          linux: {
+            eventing: {
+              process: false,
+              network: false,
+            },
+          },
+        },
+      },
+    });
+  });
+
+  describe('when the user has enabled windows process eventing', () => {
+    beforeEach(() => {
+      const config = policyConfig(getState());
+      if (!config) {
+        throw new Error();
+      }
+
+      const newPayload1 = clone(config);
+      newPayload1.windows.eventing.process = true;
+
+      dispatch({
+        type: 'userChangedPolicyConfig',
+        payload: { policyConfig: newPayload1 },
+      });
+    });
+
+    it('windows process eventing is enabled', async () => {
+      expect(windowsEventing(getState())!.process).toEqual(true);
+    });
+  });
+});
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 39d7eb93569e2..1942538aa9df9 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
@@ -5,7 +5,7 @@
  */
 
 import { MiddlewareFactory, PolicyDetailsState } from '../../types';
-import { selectPolicyIdFromParams, isOnPolicyDetailsPage } from './selectors';
+import { policyIdFromParams, isOnPolicyDetailsPage } from './selectors';
 import { sendGetDatasource } from '../../services/ingest';
 
 export const policyDetailsMiddlewareFactory: MiddlewareFactory<PolicyDetailsState> = coreStart => {
@@ -16,7 +16,7 @@ export const policyDetailsMiddlewareFactory: MiddlewareFactory<PolicyDetailsStat
     const state = getState();
 
     if (action.type === 'userChangedUrl' && isOnPolicyDetailsPage(state)) {
-      const id = selectPolicyIdFromParams(state);
+      const id = policyIdFromParams(state);
 
       const { item: policyItem } = await sendGetDatasource(http, id);
 
@@ -24,6 +24,19 @@ export const policyDetailsMiddlewareFactory: MiddlewareFactory<PolicyDetailsStat
         type: 'serverReturnedPolicyDetailsData',
         payload: {
           policyItem,
+          policyConfig: {
+            windows: {
+              malware: {
+                mode: 'detect',
+              },
+              eventing: {
+                process: true,
+                network: true,
+              },
+            },
+            mac: {},
+            linux: {},
+          },
         },
       });
     }
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 7a0c8ca8c610a..7f3712083e6fa 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
@@ -11,6 +11,7 @@ import { AppAction } from '../action';
 const initialPolicyDetailsState = (): PolicyDetailsState => {
   return {
     policyItem: undefined,
+    policyConfig: undefined,
     isLoading: false,
   };
 };
@@ -34,5 +35,12 @@ export const policyDetailsReducer: Reducer<PolicyDetailsState, AppAction> = (
     };
   }
 
+  if (action.type === 'userChangedPolicyConfig') {
+    return {
+      ...state,
+      policyConfig: action.payload.policyConfig,
+    };
+  }
+
   return state;
 };
diff --git a/x-pack/plugins/endpoint/public/applications/endpoint/store/policy_details/selectors.ts b/x-pack/plugins/endpoint/public/applications/endpoint/store/policy_details/selectors.ts
index a08130d0f4b30..6a5d4077b3c32 100644
--- a/x-pack/plugins/endpoint/public/applications/endpoint/store/policy_details/selectors.ts
+++ b/x-pack/plugins/endpoint/public/applications/endpoint/store/policy_details/selectors.ts
@@ -6,9 +6,12 @@
 
 import { createSelector } from 'reselect';
 import { PolicyDetailsState } from '../../types';
+import { Immutable } from '../../../../../common/types';
 
-export const selectPolicyDetails = (state: PolicyDetailsState) => state.policyItem;
+/** Returns the policy details */
+export const policyDetails = (state: PolicyDetailsState) => state.policyItem;
 
+/** Returns a boolean of whether the user is on the policy details page or not */
 export const isOnPolicyDetailsPage = (state: PolicyDetailsState) => {
   if (state.location) {
     const pathnameParts = state.location.pathname.split('/');
@@ -18,7 +21,8 @@ export const isOnPolicyDetailsPage = (state: PolicyDetailsState) => {
   }
 };
 
-export const selectPolicyIdFromParams: (state: PolicyDetailsState) => string = createSelector(
+/** Returns the policyId from the url */
+export const policyIdFromParams: (state: PolicyDetailsState) => string = createSelector(
   (state: PolicyDetailsState) => state.location,
   (location: PolicyDetailsState['location']) => {
     if (location) {
@@ -27,3 +31,32 @@ export const selectPolicyIdFromParams: (state: PolicyDetailsState) => string = c
     return '';
   }
 );
+
+/** Returns the policy configuration */
+export const policyConfig = (state: Immutable<PolicyDetailsState>) => state.policyConfig;
+
+/** Returns an object of all the windows eventing configuration */
+export const windowsEventing = (state: PolicyDetailsState) => {
+  const config = policyConfig(state);
+  return config && config.windows.eventing;
+};
+
+/** Returns the total number of possible windows eventing configurations */
+export const totalWindowsEventing = (state: PolicyDetailsState): number => {
+  const config = policyConfig(state);
+  if (config) {
+    return Object.keys(config.windows.eventing).length;
+  }
+  return 0;
+};
+
+/** Returns the number of selected windows eventing configurations */
+export const selectedWindowsEventing = (state: PolicyDetailsState): number => {
+  const config = policyConfig(state);
+  if (config) {
+    return Object.values(config.windows.eventing).reduce((count, event) => {
+      return event === true ? count + 1 : count;
+    }, 0);
+  }
+  return 0;
+};
diff --git a/x-pack/plugins/endpoint/public/applications/endpoint/types.ts b/x-pack/plugins/endpoint/public/applications/endpoint/types.ts
index dae2c93c9dd04..6c5330bd78baf 100644
--- a/x-pack/plugins/endpoint/public/applications/endpoint/types.ts
+++ b/x-pack/plugins/endpoint/public/applications/endpoint/types.ts
@@ -75,17 +75,77 @@ export interface PolicyListState {
 }
 
 /**
- * Policy list store state
+ * Policy details store state
  */
 export interface PolicyDetailsState {
   /** A single policy item  */
-  policyItem: PolicyData | undefined;
+  policyItem?: PolicyData;
   /** data is being retrieved from server */
+  policyConfig?: PolicyConfig;
   isLoading: boolean;
   /** current location of the application */
   location?: Immutable<EndpointAppLocation>;
 }
 
+/**
+ * Policy Details configuration
+ */
+export interface PolicyConfig {
+  windows: WindowsPolicyConfig;
+  mac: MacPolicyConfig;
+  linux: LinuxPolicyConfig;
+}
+
+/**
+ * Windows-specific policy configuration
+ */
+interface WindowsPolicyConfig {
+  /** malware mode can be detect, prevent or prevent and notify user */
+  malware: {
+    mode: string;
+  };
+  eventing: {
+    process: boolean;
+    network: boolean;
+  };
+}
+
+/**
+ * Mac-specific policy configuration
+ */
+interface MacPolicyConfig {
+  /** malware mode can be detect, prevent or prevent and notify user */
+  malware: {
+    mode: string;
+  };
+  eventing: {
+    process: boolean;
+    network: boolean;
+  };
+}
+/**
+ * Linux-specific policy configuration
+ */
+interface LinuxPolicyConfig {
+  eventing: {
+    process: boolean;
+    network: boolean;
+  };
+}
+
+/** OS used in Policy */
+export enum OS {
+  windows = 'windows',
+  mac = 'mac',
+  linux = 'linux',
+}
+
+/** Used in Policy */
+export enum EventingFields {
+  process = 'process',
+  network = 'network',
+}
+
 export interface GlobalState {
   readonly hostList: HostListState;
   readonly alertList: AlertListState;
diff --git a/x-pack/plugins/endpoint/public/applications/endpoint/view/policy/policy_details.tsx b/x-pack/plugins/endpoint/public/applications/endpoint/view/policy/policy_details.tsx
index bdbd323eaab72..7317bd5e03ed9 100644
--- a/x-pack/plugins/endpoint/public/applications/endpoint/view/policy/policy_details.tsx
+++ b/x-pack/plugins/endpoint/public/applications/endpoint/view/policy/policy_details.tsx
@@ -5,13 +5,26 @@
  */
 
 import React from 'react';
-import { EuiTitle } from '@elastic/eui';
+import {
+  EuiTitle,
+  EuiPage,
+  EuiPageBody,
+  EuiPageHeader,
+  EuiPageHeaderSection,
+  EuiFlexGroup,
+  EuiFlexItem,
+  EuiButton,
+  EuiButtonEmpty,
+  EuiText,
+  EuiSpacer,
+} from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n/react';
 import { usePolicyDetailsSelector } from './policy_hooks';
-import { selectPolicyDetails } from '../../store/policy_details/selectors';
+import { policyDetails } from '../../store/policy_details/selectors';
+import { WindowsEventing } from './policy_forms/eventing/windows';
 
 export const PolicyDetails = React.memo(() => {
-  const policyItem = usePolicyDetailsSelector(selectPolicyDetails);
+  const policyItem = usePolicyDetailsSelector(policyDetails);
 
   function policyName() {
     if (policyItem) {
@@ -29,8 +42,41 @@ export const PolicyDetails = React.memo(() => {
   }
 
   return (
-    <EuiTitle size="l">
-      <h1 data-test-subj="policyDetailsViewTitle">{policyName()}</h1>
-    </EuiTitle>
+    <EuiPage data-test-subj="policyDetailsPage">
+      <EuiPageBody>
+        <EuiPageHeader>
+          <EuiPageHeaderSection>
+            <EuiTitle size="m">
+              <h1 data-test-subj="policyDetailsViewTitle">{policyName()}</h1>
+            </EuiTitle>
+          </EuiPageHeaderSection>
+          <EuiFlexGroup justifyContent="flexEnd" gutterSize="s">
+            <EuiFlexItem grow={false}>
+              <EuiButtonEmpty>
+                <FormattedMessage
+                  id="xpack.endpoint.policy.details.cancel"
+                  defaultMessage="Cancel"
+                />
+              </EuiButtonEmpty>
+            </EuiFlexItem>
+            <EuiFlexItem grow={false}>
+              <EuiButton fill={true} iconType="save">
+                <FormattedMessage id="xpack.endpoint.policy.details.save" defaultMessage="Save" />
+              </EuiButton>
+            </EuiFlexItem>
+          </EuiFlexGroup>
+        </EuiPageHeader>
+        <EuiText size="xs" color="subdued">
+          <h4>
+            <FormattedMessage
+              id="xpack.endpoint.policy.details.settings"
+              defaultMessage="Settings"
+            />
+          </h4>
+        </EuiText>
+        <EuiSpacer size="xs" />
+        <WindowsEventing />
+      </EuiPageBody>
+    </EuiPage>
   );
 });
diff --git a/x-pack/plugins/endpoint/public/applications/endpoint/view/policy/policy_forms/config_form.tsx b/x-pack/plugins/endpoint/public/applications/endpoint/view/policy/policy_forms/config_form.tsx
new file mode 100644
index 0000000000000..66d5932b91c2b
--- /dev/null
+++ b/x-pack/plugins/endpoint/public/applications/endpoint/view/policy/policy_forms/config_form.tsx
@@ -0,0 +1,110 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * 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 {
+  EuiCard,
+  EuiFlexGroup,
+  EuiFlexItem,
+  EuiTitle,
+  EuiHorizontalRule,
+  EuiSpacer,
+  EuiText,
+} from '@elastic/eui';
+import { FormattedMessage } from '@kbn/i18n/react';
+import styled from 'styled-components';
+
+const PolicyDetailCard = styled.div`
+  .policyDetailTitleOS {
+    flex-grow: 2;
+  }
+  .policyDetailTitleFlexItem {
+    margin: 0;
+  }
+`;
+export const ConfigForm: React.FC<{
+  type: string;
+  supportedOss: string[];
+  children: React.ReactNode;
+  id: string;
+  selectedEventing: number;
+  totalEventing: number;
+}> = React.memo(({ type, supportedOss, children, id, selectedEventing, totalEventing }) => {
+  const typeTitle = () => {
+    return (
+      <EuiFlexGroup direction="row" gutterSize="none" alignItems="center">
+        <EuiFlexGroup direction="column" gutterSize="none">
+          <EuiFlexItem className="policyDetailTitleFlexItem">
+            <EuiTitle size="xxxs">
+              <h6>
+                <FormattedMessage id="xpack.endpoint.policyDetailType" defaultMessage="Type" />
+              </h6>
+            </EuiTitle>
+          </EuiFlexItem>
+          <EuiFlexItem className="policyDetailTitleFlexItem">
+            <EuiText size="m">{type}</EuiText>
+          </EuiFlexItem>
+        </EuiFlexGroup>
+        <EuiFlexGroup direction="column" gutterSize="none" className="policyDetailTitleOS">
+          <EuiFlexItem className="policyDetailTitleFlexItem">
+            <EuiTitle size="xxxs">
+              <h6>
+                <FormattedMessage
+                  id="xpack.endpoint.policyDetailOS"
+                  defaultMessage="Operating System"
+                />
+              </h6>
+            </EuiTitle>
+          </EuiFlexItem>
+          <EuiFlexItem className="policyDetailTitleFlexItem">
+            <EuiText>{supportedOss.join(', ')}</EuiText>
+          </EuiFlexItem>
+        </EuiFlexGroup>
+        <EuiFlexItem grow={false}>
+          <EuiText size="s" color="subdued">
+            <FormattedMessage
+              id="xpack.endpoint.policy.details.eventCollectionsEnabled"
+              defaultMessage="{selectedEventing} / {totalEventing} event collections enabled"
+              values={{ selectedEventing, totalEventing }}
+            />
+          </EuiText>
+        </EuiFlexItem>
+      </EuiFlexGroup>
+    );
+  };
+
+  const events = () => {
+    return (
+      <EuiTitle size="xxs">
+        <h5>
+          <FormattedMessage
+            id="xpack.endpoint.policyDetailsConfig.eventingEvents"
+            defaultMessage="Events"
+          />
+        </h5>
+      </EuiTitle>
+    );
+  };
+
+  return (
+    <PolicyDetailCard>
+      <EuiCard
+        data-test-subj={id}
+        textAlign="left"
+        title={typeTitle()}
+        description=""
+        children={
+          <>
+            <EuiHorizontalRule margin="m" />
+            {events()}
+            <EuiSpacer size="s" />
+            {children}
+          </>
+        }
+      />
+    </PolicyDetailCard>
+  );
+});
diff --git a/x-pack/plugins/endpoint/public/applications/endpoint/view/policy/policy_forms/eventing/checkbox.tsx b/x-pack/plugins/endpoint/public/applications/endpoint/view/policy/policy_forms/eventing/checkbox.tsx
new file mode 100644
index 0000000000000..add137ea57a5e
--- /dev/null
+++ b/x-pack/plugins/endpoint/public/applications/endpoint/view/policy/policy_forms/eventing/checkbox.tsx
@@ -0,0 +1,49 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React, { useCallback } from 'react';
+import { EuiCheckbox } from '@elastic/eui';
+import { useDispatch } from 'react-redux';
+import { usePolicyDetailsSelector } from '../../policy_hooks';
+import { policyConfig, windowsEventing } from '../../../../store/policy_details/selectors';
+import { PolicyDetailsAction } from '../../../../store/policy_details';
+import { OS, EventingFields } from '../../../../types';
+import { clone } from '../../../../models/policy_details_config';
+
+export const EventingCheckbox: React.FC<{
+  id: string;
+  name: string;
+  os: OS;
+  protectionField: EventingFields;
+}> = React.memo(({ id, name, os, protectionField }) => {
+  const policyDetailsConfig = usePolicyDetailsSelector(policyConfig);
+  const eventing = usePolicyDetailsSelector(windowsEventing);
+  const dispatch = useDispatch<(action: PolicyDetailsAction) => void>();
+
+  const handleRadioChange = useCallback(
+    (event: React.ChangeEvent<HTMLInputElement>) => {
+      if (policyDetailsConfig) {
+        const newPayload = clone(policyDetailsConfig);
+        newPayload[os].eventing[protectionField] = event.target.checked;
+
+        dispatch({
+          type: 'userChangedPolicyConfig',
+          payload: { policyConfig: newPayload },
+        });
+      }
+    },
+    [dispatch, os, policyDetailsConfig, protectionField]
+  );
+
+  return (
+    <EuiCheckbox
+      id={id}
+      label={name}
+      checked={eventing && eventing[protectionField]}
+      onChange={handleRadioChange}
+    />
+  );
+});
diff --git a/x-pack/plugins/endpoint/public/applications/endpoint/view/policy/policy_forms/eventing/windows.tsx b/x-pack/plugins/endpoint/public/applications/endpoint/view/policy/policy_forms/eventing/windows.tsx
new file mode 100644
index 0000000000000..e92e22fc97fe6
--- /dev/null
+++ b/x-pack/plugins/endpoint/public/applications/endpoint/view/policy/policy_forms/eventing/windows.tsx
@@ -0,0 +1,70 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React, { useMemo } from 'react';
+import { i18n } from '@kbn/i18n';
+import { EventingCheckbox } from './checkbox';
+import { OS, EventingFields } from '../../../../types';
+import { usePolicyDetailsSelector } from '../../policy_hooks';
+import {
+  selectedWindowsEventing,
+  totalWindowsEventing,
+} from '../../../../store/policy_details/selectors';
+import { ConfigForm } from '../config_form';
+
+export const WindowsEventing = React.memo(() => {
+  const checkboxes = useMemo(
+    () => [
+      {
+        name: i18n.translate('xpack.endpoint.policyDetailsConfig.eventingProcess', {
+          defaultMessage: 'Process',
+        }),
+        os: OS.windows,
+        protectionField: EventingFields.process,
+      },
+      {
+        name: i18n.translate('xpack.endpoint.policyDetailsConfig.eventingNetwork', {
+          defaultMessage: 'Network',
+        }),
+        os: OS.windows,
+        protectionField: EventingFields.network,
+      },
+    ],
+    []
+  );
+
+  const renderCheckboxes = () => {
+    return checkboxes.map((item, index) => {
+      return (
+        <EventingCheckbox
+          id={`eventing${item.name}`}
+          name={item.name}
+          key={index}
+          os={item.os}
+          protectionField={item.protectionField}
+        />
+      );
+    });
+  };
+
+  const selected = usePolicyDetailsSelector(selectedWindowsEventing);
+  const total = usePolicyDetailsSelector(totalWindowsEventing);
+
+  return (
+    <ConfigForm
+      type={i18n.translate('xpack.endpoint.policy.details.eventCollection', {
+        defaultMessage: 'Event Collection',
+      })}
+      supportedOss={[
+        i18n.translate('xpack.endpoint.policy.details.windows', { defaultMessage: 'Windows' }),
+      ]}
+      id="windowsEventingForm"
+      children={renderCheckboxes()}
+      selectedEventing={selected}
+      totalEventing={total}
+    />
+  );
+});
diff --git a/x-pack/test/functional/apps/endpoint/index.ts b/x-pack/test/functional/apps/endpoint/index.ts
index 4d55b3af4956e..3e70a1cc67670 100644
--- a/x-pack/test/functional/apps/endpoint/index.ts
+++ b/x-pack/test/functional/apps/endpoint/index.ts
@@ -14,7 +14,6 @@ export default function({ loadTestFile }: FtrProviderContext) {
     loadTestFile(require.resolve('./header_nav'));
     loadTestFile(require.resolve('./host_list'));
     loadTestFile(require.resolve('./policy_list'));
-    loadTestFile(require.resolve('./policy_details'));
     loadTestFile(require.resolve('./alerts'));
   });
 }
diff --git a/x-pack/test/functional/apps/endpoint/policy_details.ts b/x-pack/test/functional/apps/endpoint/policy_details.ts
deleted file mode 100644
index f251dcd93014e..0000000000000
--- a/x-pack/test/functional/apps/endpoint/policy_details.ts
+++ /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 expect from '@kbn/expect';
-import { FtrProviderContext } from '../../ftr_provider_context';
-
-export default function({ getPageObjects, getService }: FtrProviderContext) {
-  const pageObjects = getPageObjects(['common', 'endpoint']);
-  const testSubjects = getService('testSubjects');
-
-  // 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 () => {
-      await pageObjects.common.navigateToUrlWithBrowserHistory('endpoint', '/policy/123');
-      await testSubjects.existOrFail('policyDetailsViewTitle');
-
-      const policyDetailsNotFoundTitle = await testSubjects.getVisibleText('policyDetailsName');
-      expect(policyDetailsNotFoundTitle).to.equal('policy with some protections 123');
-    });
-  });
-}

From 33511b38794a89b6e357d223ef4282ccf0a1a0c7 Mon Sep 17 00:00:00 2001
From: Frank Hassanabad <frank.hassanabad@elastic.co>
Date: Wed, 25 Mar 2020 16:30:53 -0600
Subject: [PATCH 170/179] [SIEM] Add developer optimization scripts for their
 environments

## Summary

This adds an optimization script very copied and slightly modified from:
* https://github.com/elastic/kibana/pull/49868

Usage:

Run this to do an dev tsconfig optimization:
```ts
node x-pack/legacy/plugins/siem/scripts/optimize_tsconfig
```

Run this to undo the optimization:
```ts
node x-pack/legacy/plugins/siem/scripts/unoptimize_tsconfig
```

Testing and what this does:

Run this:
```ts
node x-pack/legacy/plugins/siem/scripts/optimize_tsconfig
```

Then run your start-test-all or at least your linter, typescript check, and jest tests to make sure they all operate as expected. Restart your IDE and ensure everything works as expected.

Run `git status` and ensure it looks like no new files want to be checked in.

Open up your:
```ts
kibana/x-pack/tsconfig.json
```

And notice it is now changed when optimization has run to use a smaller set of includes.

Open up your:
```ts
kibana/tsconfig.json
```

And notice it is now changed when optimization is run to use a smaller set of includes.
---
 .../plugins/siem/scripts/optimize_tsconfig.js | 13 ++++
 .../siem/scripts/optimize_tsconfig/README.md  | 16 ++++
 .../scripts/optimize_tsconfig/optimize.js     | 76 +++++++++++++++++++
 .../siem/scripts/optimize_tsconfig/paths.js   | 23 ++++++
 .../scripts/optimize_tsconfig/tsconfig.json   | 15 ++++
 .../scripts/optimize_tsconfig/unoptimize.js   | 25 ++++++
 .../siem/scripts/unoptimize_tsconfig.js       | 13 ++++
 7 files changed, 181 insertions(+)
 create mode 100644 x-pack/legacy/plugins/siem/scripts/optimize_tsconfig.js
 create mode 100644 x-pack/legacy/plugins/siem/scripts/optimize_tsconfig/README.md
 create mode 100644 x-pack/legacy/plugins/siem/scripts/optimize_tsconfig/optimize.js
 create mode 100644 x-pack/legacy/plugins/siem/scripts/optimize_tsconfig/paths.js
 create mode 100644 x-pack/legacy/plugins/siem/scripts/optimize_tsconfig/tsconfig.json
 create mode 100644 x-pack/legacy/plugins/siem/scripts/optimize_tsconfig/unoptimize.js
 create mode 100644 x-pack/legacy/plugins/siem/scripts/unoptimize_tsconfig.js

diff --git a/x-pack/legacy/plugins/siem/scripts/optimize_tsconfig.js b/x-pack/legacy/plugins/siem/scripts/optimize_tsconfig.js
new file mode 100644
index 0000000000000..ff4002b076e5d
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/scripts/optimize_tsconfig.js
@@ -0,0 +1,13 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+const { optimizeTsConfig } = require('./optimize_tsconfig/optimize');
+
+optimizeTsConfig().catch(err => {
+  console.error(err);
+  // eslint-disable-next-line no-process-exit
+  process.exit(1);
+});
diff --git a/x-pack/legacy/plugins/siem/scripts/optimize_tsconfig/README.md b/x-pack/legacy/plugins/siem/scripts/optimize_tsconfig/README.md
new file mode 100644
index 0000000000000..d3615d2870ef9
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/scripts/optimize_tsconfig/README.md
@@ -0,0 +1,16 @@
+Hard forked from here:
+x-pack/legacy/plugins/apm/scripts/optimize-tsconfig.js
+
+
+#### Optimizing TypeScript 
+
+Kibana and X-Pack are very large TypeScript projects, and it comes at a cost. Editor responsiveness is not great, and the CLI type check for X-Pack takes about a minute. To get faster feedback, we create a smaller SIEM TypeScript project that only type checks the SIEM project and the files it uses. This optimization consists of creating a `tsconfig.json` in SIEM that includes the Kibana/X-Pack typings, and editing the Kibana/X-Pack configurations to not include any files, or removing the configurations altogether. The script configures git to ignore any changes in these files, and has an undo script as well.
+
+To run the optimization:
+
+`$ node x-pack/legacy/plugins/siem/scripts/optimize_tsconfig`
+
+To undo the optimization:
+
+`$ node x-pack/legacy/plugins/siem/scripts/unoptimize_tsconfig`
+
diff --git a/x-pack/legacy/plugins/siem/scripts/optimize_tsconfig/optimize.js b/x-pack/legacy/plugins/siem/scripts/optimize_tsconfig/optimize.js
new file mode 100644
index 0000000000000..9c04e0b69b738
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/scripts/optimize_tsconfig/optimize.js
@@ -0,0 +1,76 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+/* eslint-disable import/no-extraneous-dependencies */
+
+const fs = require('fs');
+const { promisify } = require('util');
+const path = require('path');
+const json5 = require('json5');
+const execa = require('execa');
+
+const readFile = promisify(fs.readFile);
+const writeFile = promisify(fs.writeFile);
+
+const { xpackRoot, kibanaRoot, tsconfigTpl, filesToIgnore } = require('./paths');
+const { unoptimizeTsConfig } = require('./unoptimize');
+
+function prepareParentTsConfigs() {
+  return Promise.all(
+    [path.resolve(xpackRoot, 'tsconfig.json'), path.resolve(kibanaRoot, 'tsconfig.json')].map(
+      async filename => {
+        const config = json5.parse(await readFile(filename, 'utf-8'));
+
+        await writeFile(
+          filename,
+          JSON.stringify(
+            {
+              ...config,
+              include: [],
+            },
+            null,
+            2
+          ),
+          { encoding: 'utf-8' }
+        );
+      }
+    )
+  );
+}
+
+async function addFilesToXpackTsConfig() {
+  const template = json5.parse(await readFile(tsconfigTpl, 'utf-8'));
+  const xpackTsConfig = path.join(xpackRoot, 'tsconfig.json');
+  const config = json5.parse(await readFile(xpackTsConfig, 'utf-8'));
+
+  await writeFile(xpackTsConfig, JSON.stringify({ ...config, ...template }, null, 2), {
+    encoding: 'utf-8',
+  });
+}
+
+async function setIgnoreChanges() {
+  for (const filename of filesToIgnore) {
+    await execa('git', ['update-index', '--skip-worktree', filename]);
+  }
+}
+
+async function optimizeTsConfig() {
+  await unoptimizeTsConfig();
+
+  await prepareParentTsConfigs();
+
+  await addFilesToXpackTsConfig();
+
+  await setIgnoreChanges();
+  // eslint-disable-next-line no-console
+  console.log(
+    'Created an optimized tsconfig.json for SIEM. To undo these changes, run `./scripts/unoptimize_tsconfig.js`'
+  );
+}
+
+module.exports = {
+  optimizeTsConfig,
+};
diff --git a/x-pack/legacy/plugins/siem/scripts/optimize_tsconfig/paths.js b/x-pack/legacy/plugins/siem/scripts/optimize_tsconfig/paths.js
new file mode 100644
index 0000000000000..ca26203e17d2e
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/scripts/optimize_tsconfig/paths.js
@@ -0,0 +1,23 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+const path = require('path');
+
+const xpackRoot = path.resolve(__dirname, '../../../../..');
+const kibanaRoot = path.resolve(xpackRoot, '..');
+
+const tsconfigTpl = path.resolve(__dirname, './tsconfig.json');
+
+const filesToIgnore = [
+  path.resolve(xpackRoot, 'tsconfig.json'),
+  path.resolve(kibanaRoot, 'tsconfig.json'),
+];
+
+module.exports = {
+  xpackRoot,
+  kibanaRoot,
+  tsconfigTpl,
+  filesToIgnore,
+};
diff --git a/x-pack/legacy/plugins/siem/scripts/optimize_tsconfig/tsconfig.json b/x-pack/legacy/plugins/siem/scripts/optimize_tsconfig/tsconfig.json
new file mode 100644
index 0000000000000..bec6988bdebd9
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/scripts/optimize_tsconfig/tsconfig.json
@@ -0,0 +1,15 @@
+{
+  "include": [
+    "typings/**/*",
+    "plugins/siem/**/*",
+    "legacy/plugins/siem/**/*",
+    "plugins/apm/typings/numeral.d.ts",
+    "legacy/plugins/canvas/types/webpack.d.ts"
+  ],
+  "exclude": [
+    "test/**/*",
+    "**/__fixtures__/**/*",
+    "legacy/plugins/siem/cypress/**/*",
+    "**/typespec_tests.ts"
+  ]
+}
diff --git a/x-pack/legacy/plugins/siem/scripts/optimize_tsconfig/unoptimize.js b/x-pack/legacy/plugins/siem/scripts/optimize_tsconfig/unoptimize.js
new file mode 100644
index 0000000000000..21fc1aa2a1a33
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/scripts/optimize_tsconfig/unoptimize.js
@@ -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.
+ */
+/* eslint-disable import/no-extraneous-dependencies */
+
+const execa = require('execa');
+
+const { filesToIgnore } = require('./paths');
+
+async function unoptimizeTsConfig() {
+  for (const filename of filesToIgnore) {
+    await execa('git', ['update-index', '--no-skip-worktree', filename]);
+    await execa('git', ['checkout', filename]);
+  }
+}
+
+module.exports = {
+  unoptimizeTsConfig: async () => {
+    await unoptimizeTsConfig();
+    // eslint-disable-next-line no-console
+    console.log('Removed SIEM TypeScript optimizations');
+  },
+};
diff --git a/x-pack/legacy/plugins/siem/scripts/unoptimize_tsconfig.js b/x-pack/legacy/plugins/siem/scripts/unoptimize_tsconfig.js
new file mode 100644
index 0000000000000..d5392c76d9f8f
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/scripts/unoptimize_tsconfig.js
@@ -0,0 +1,13 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+const { unoptimizeTsConfig } = require('./optimize_tsconfig/unoptimize');
+
+unoptimizeTsConfig().catch(err => {
+  console.error(err);
+  // eslint-disable-next-line no-process-exit
+  process.exit(1);
+});

From 30a512d83175cdfd907657865272131aea27a51e Mon Sep 17 00:00:00 2001
From: Tyler Smalley <tyler.smalley@elastic.co>
Date: Wed, 25 Mar 2020 15:35:33 -0700
Subject: [PATCH 171/179] Temporarily disable tests caused by possible ES
 regression

https://github.com/elastic/kibana/issues/61366

Signed-off-by: Tyler Smalley <tyler.smalley@elastic.co>
---
 test/functional/apps/discover/_errors.js                       | 3 ++-
 .../api_integration/apis/monitoring/elasticsearch/nodes.js     | 3 ++-
 x-pack/test/functional/apps/monitoring/elasticsearch/nodes.js  | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/test/functional/apps/discover/_errors.js b/test/functional/apps/discover/_errors.js
index 7dbb93c884f46..9a7356d8e521a 100644
--- a/test/functional/apps/discover/_errors.js
+++ b/test/functional/apps/discover/_errors.js
@@ -35,7 +35,8 @@ export default function({ getService, getPageObjects }) {
       await esArchiver.unload('invalid_scripted_field');
     });
 
-    describe('invalid scripted field error', () => {
+    // https://github.com/elastic/kibana/issues/61366
+    describe.skip('invalid scripted field error', () => {
       it('is rendered', async () => {
         const isFetchErrorVisible = await testSubjects.exists('discoverFetchError');
         expect(isFetchErrorVisible).to.be(true);
diff --git a/x-pack/test/api_integration/apis/monitoring/elasticsearch/nodes.js b/x-pack/test/api_integration/apis/monitoring/elasticsearch/nodes.js
index 4d86fc9d9a7f5..f9a6dd31092aa 100644
--- a/x-pack/test/api_integration/apis/monitoring/elasticsearch/nodes.js
+++ b/x-pack/test/api_integration/apis/monitoring/elasticsearch/nodes.js
@@ -34,7 +34,8 @@ export default function({ getService }) {
         return esArchiver.unload(archive);
       });
 
-      it('should return data for 2 active nodes', async () => {
+      // https://github.com/elastic/kibana/issues/61366
+      it.skip('should return data for 2 active nodes', async () => {
         const { body } = await supertest
           .post('/api/monitoring/v1/clusters/fHJwISmKTFO8bj57oFBLUQ/elasticsearch/nodes')
           .set('kbn-xsrf', 'xxx')
diff --git a/x-pack/test/functional/apps/monitoring/elasticsearch/nodes.js b/x-pack/test/functional/apps/monitoring/elasticsearch/nodes.js
index d407ba898f107..dcbd94de8a770 100644
--- a/x-pack/test/functional/apps/monitoring/elasticsearch/nodes.js
+++ b/x-pack/test/functional/apps/monitoring/elasticsearch/nodes.js
@@ -34,7 +34,8 @@ export default function({ getService, getPageObjects }) {
         await tearDown();
       });
 
-      it('should have an Elasticsearch Cluster Summary Status with correct info', async () => {
+      // https://github.com/elastic/kibana/issues/61366
+      it.skip('should have an Elasticsearch Cluster Summary Status with correct info', async () => {
         expect(await esClusterSummaryStatus.getContent()).to.eql({
           nodesCount: 'Nodes\n2',
           indicesCount: 'Indices\n20',

From 420c213b582b5490c1b033e68138e19a931200cb Mon Sep 17 00:00:00 2001
From: Vadim Dalecky <streamich@users.noreply.github.com>
Date: Wed, 25 Mar 2020 23:57:03 +0100
Subject: [PATCH 172/179] =?UTF-8?q?ci:=20=F0=9F=8E=A1=20add=20more=20tags?=
 =?UTF-8?q?=20to=20ProBot=20PR=20path=20labeler=20(#59913)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* ci: 🎡 add more tags to ProBot PR path labeler

* fix: 🐛 add missing colon

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 .github/paths-labeller.yml | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/.github/paths-labeller.yml b/.github/paths-labeller.yml
index 694d1a2f67e2b..4a498af6b1c88 100644
--- a/.github/paths-labeller.yml
+++ b/.github/paths-labeller.yml
@@ -1,3 +1,19 @@
 ---
+  - "Team:AppArch":
+    - "src/plugins/bfetch/**/*.*"
+    - "src/plugins/dashboard_embeddable_container/**/*.*"
+    - "src/plugins/data/**/*.*"
+    - "src/plugins/embeddable/**/*.*"
+    - "src/plugins/expressions/**/*.*"
+    - "src/plugins/inspector/**/*.*"
+    - "src/plugins/ui_actions/**/*.*"
+    - "src/plugins/visualizations/**/*.*"
+  - "Feature:Embedding":
+    - "src/plugins/embeddable/**/*.*"
+    - "src/plugins/dashboard_embeddable_container/**/*.*"
   - "Feature:Drilldowns":
     - "x-pack/plugins/drilldowns/**/*.*"
+    - "x-pack/plugins/dashboard_enhanced/public/services/drilldowns/**/*.*"
+  - "Feature:ExpressionLanguage":
+    - "src/plugins/expressions/**/*.*"
+    - "src/plugins/bfetch/**/*.*"

From 5c5c98f0e76726bc974f3ae5bffdfadd0efcfbb1 Mon Sep 17 00:00:00 2001
From: Andrew Cholakian <andrew@andrewvc.com>
Date: Wed, 25 Mar 2020 17:58:07 -0500
Subject: [PATCH 173/179] [Uptime] Various Settings Fixes (#61007)

Fixes behavior in chrome where using the enter key to submit the settings form would reload the page. Fixes #61006

Fixes test failures in uptime settings tests by waiting until form data is loaded: https://kibana-ci.elastic.co/job/elastic+kibana+master/3882/https:/

Sample failure:

{ Error: expected { heartbeatIndices: '' } to sort of equal { heartbeatIndices: 'heartbeat-8*' }
    at Assertion.assert (/dev/shm/workspace/kibana/packages/kbn-expect/expect.js:100:11)
    at Assertion.eql (/dev/shm/workspace/kibana/packages/kbn-expect/expect.js:244:8)
    at Context.it (test/functional/apps/uptime/settings.ts:31:25)
    at process._tickCallback (internal/process/next_tick.js:68:7)
  actual: '{\n  "heartbeatIndices": ""\n}',
  expected: '{\n  "heartbeatIndices": "heartbeat-8*"\n}',
  showDiff: true }

Re-enables location tests failure, which should have been fixed by https://github.com/elastic/kibana/pull/60573/files#diff-7198f3de6fe631f903e590f63bc88e21R20
---
 .../plugins/uptime/public/pages/settings.tsx       |  7 +++++--
 x-pack/test/functional/apps/uptime/index.ts        | 14 ++++++++++----
 x-pack/test/functional/apps/uptime/locations.ts    |  2 +-
 x-pack/test/functional/apps/uptime/settings.ts     |  4 ++--
 x-pack/test/functional/services/uptime.ts          | 10 +++++-----
 5 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/x-pack/legacy/plugins/uptime/public/pages/settings.tsx b/x-pack/legacy/plugins/uptime/public/pages/settings.tsx
index e78c3e0f7de09..d3e17a15ee0e0 100644
--- a/x-pack/legacy/plugins/uptime/public/pages/settings.tsx
+++ b/x-pack/legacy/plugins/uptime/public/pages/settings.tsx
@@ -78,7 +78,8 @@ export const SettingsPageComponent = ({
     }
   };
 
-  const onApply = () => {
+  const onApply = (event: React.FormEvent) => {
+    event.preventDefault();
     if (formFields) {
       dispatchSetDynamicSettings(formFields);
     }
@@ -176,7 +177,9 @@ export const SettingsPageComponent = ({
                     }
                   >
                     <EuiFieldText
-                      data-test-subj="heartbeat-indices-input"
+                      data-test-subj={`heartbeat-indices-input-${
+                        dss.loading ? 'loading' : 'loaded'
+                      }`}
                       fullWidth
                       disabled={isFormDisabled}
                       isLoading={dss.loading}
diff --git a/x-pack/test/functional/apps/uptime/index.ts b/x-pack/test/functional/apps/uptime/index.ts
index 446f28d182926..3789351263b98 100644
--- a/x-pack/test/functional/apps/uptime/index.ts
+++ b/x-pack/test/functional/apps/uptime/index.ts
@@ -28,10 +28,16 @@ export default ({ loadTestFile, getService }: FtrProviderContext) => {
           id: settingsObjectId,
         });
       } catch (e) {
-        // If it's not found that's fine, we just want to ensure
-        // this is the default state
-        if (e.response?.status !== 404) {
-          throw e;
+        // a 404 just means the doc is already missing
+        if (e.response.status !== 404) {
+          const { status, statusText, data, headers, config } = e.response;
+          throw new Error(
+            `error attempting to delete settings:\n${JSON.stringify(
+              { status, statusText, data, headers, config },
+              null,
+              2
+            )}`
+          );
         }
       }
     });
diff --git a/x-pack/test/functional/apps/uptime/locations.ts b/x-pack/test/functional/apps/uptime/locations.ts
index 96c7fad89a85d..7f6932ab50319 100644
--- a/x-pack/test/functional/apps/uptime/locations.ts
+++ b/x-pack/test/functional/apps/uptime/locations.ts
@@ -10,7 +10,7 @@ import { FtrProviderContext } from '../../ftr_provider_context';
 export default ({ getPageObjects, getService }: FtrProviderContext) => {
   const pageObjects = getPageObjects(['uptime']);
 
-  describe.skip('location', () => {
+  describe('location', () => {
     const start = new Date().toISOString();
     const end = new Date().toISOString();
 
diff --git a/x-pack/test/functional/apps/uptime/settings.ts b/x-pack/test/functional/apps/uptime/settings.ts
index aafb145a1b9b0..477eeb84ae5c3 100644
--- a/x-pack/test/functional/apps/uptime/settings.ts
+++ b/x-pack/test/functional/apps/uptime/settings.ts
@@ -17,7 +17,7 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
   const es = getService('es');
 
   // Flaky https://github.com/elastic/kibana/issues/60866
-  describe.skip('uptime settings page', () => {
+  describe('uptime settings page', () => {
     const settingsPage = () => pageObjects.uptime.settings;
     beforeEach('navigate to clean app root', async () => {
       // make 10 checks
@@ -48,7 +48,7 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
     });
 
     // Failing: https://github.com/elastic/kibana/issues/60863
-    it.skip('changing index pattern setting is reflected elsewhere in UI', async () => {
+    it('changing index pattern setting is reflected elsewhere in UI', async () => {
       const originalCount = await pageObjects.uptime.getSnapshotCount();
       // We should find 1 monitor up with the default index pattern
       expect(originalCount.up).to.eql(1);
diff --git a/x-pack/test/functional/services/uptime.ts b/x-pack/test/functional/services/uptime.ts
index f9902d0142b96..5a24a51f967fd 100644
--- a/x-pack/test/functional/services/uptime.ts
+++ b/x-pack/test/functional/services/uptime.ts
@@ -16,14 +16,14 @@ export function UptimeProvider({ getService }: FtrProviderContext) {
       await testSubjects.click('settings-page-link', 5000);
     },
     changeHeartbeatIndicesInput: async (text: string) => {
-      const input = await testSubjects.find('heartbeat-indices-input', 5000);
+      const input = await testSubjects.find('heartbeat-indices-input-loaded', 5000);
       await input.clearValueWithKeyboard();
       await input.type(text);
     },
     loadFields: async () => {
-      const heartbeatIndices = await (
-        await testSubjects.find('heartbeat-indices-input', 5000)
-      ).getAttribute('value');
+      const input = await testSubjects.find('heartbeat-indices-input-loaded', 5000);
+      const heartbeatIndices = await input.getAttribute('value');
+
       return { heartbeatIndices };
     },
     applyButtonIsDisabled: async () => {
@@ -34,7 +34,7 @@ export function UptimeProvider({ getService }: FtrProviderContext) {
       await retry.waitFor('submit to succeed', async () => {
         // When the form submit is complete the form will no longer be disabled
         const disabled = await (
-          await testSubjects.find('heartbeat-indices-input', 5000)
+          await testSubjects.find('heartbeat-indices-input-loaded', 5000)
         ).getAttribute('disabled');
         return disabled === null;
       });

From 43d95da4644a222fc89fc18112627ff0bc664777 Mon Sep 17 00:00:00 2001
From: Nathan L Smith <nathan.smith@elastic.co>
Date: Wed, 25 Mar 2020 18:24:15 -0500
Subject: [PATCH 174/179] Make global service map zoom toward center (#61340)

* Make global service map zoom toward center

Calculate the center of the graph when there's not a primary node.

Also update to latest version of types.

Fixes #61176.

* Fix types
---
 .../apm/public/components/app/ServiceMap/Controls.tsx  | 10 +++++++++-
 .../components/app/ServiceMap/cytoscapeOptions.ts      |  8 ++++----
 x-pack/package.json                                    |  2 +-
 yarn.lock                                              |  8 ++++----
 4 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/x-pack/legacy/plugins/apm/public/components/app/ServiceMap/Controls.tsx b/x-pack/legacy/plugins/apm/public/components/app/ServiceMap/Controls.tsx
index a2e7b2c76031e..eabd967e6efe9 100644
--- a/x-pack/legacy/plugins/apm/public/components/app/ServiceMap/Controls.tsx
+++ b/x-pack/legacy/plugins/apm/public/components/app/ServiceMap/Controls.tsx
@@ -41,9 +41,17 @@ const steps = 5;
 function doZoom(cy: cytoscape.Core | undefined, increment: number) {
   if (cy) {
     const level = cy.zoom() + increment;
+    // @ts-ignore `.position()` _does_ work on a NodeCollection. It returns the position of the first element in the collection.
+    const primaryCenter = cy.nodes('.primary').position();
+    const { x1, y1, w, h } = cy.nodes().boundingBox({});
+    const graphCenter = { x: x1 + w / 2, y: y1 + h / 2 };
+
     cy.animate({
       duration,
-      zoom: { level, position: cy.$('.primary').position() }
+      zoom: {
+        level,
+        position: primaryCenter || graphCenter
+      }
     });
   }
 }
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 413458f336e6f..0438842f7af10 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
@@ -62,7 +62,7 @@ const style: cytoscape.Stylesheet[] = [
         isService(el)
           ? el.data(SERVICE_NAME)
           : el.data(SPAN_DESTINATION_SERVICE_RESOURCE),
-      'min-zoomed-font-size': theme.euiSizeL,
+      'min-zoomed-font-size': parseInt(theme.euiSizeL, 10),
       'overlay-opacity': 0,
       shape: (el: cytoscape.NodeSingular) =>
         isService(el) ? 'ellipse' : 'diamond',
@@ -70,7 +70,7 @@ const style: cytoscape.Stylesheet[] = [
       'text-background-opacity': 0,
       'text-background-padding': theme.paddingSizes.xs,
       'text-background-shape': 'roundrectangle',
-      'text-margin-y': theme.paddingSizes.s,
+      'text-margin-y': parseInt(theme.paddingSizes.s, 10),
       'text-max-width': '200px',
       'text-valign': 'bottom',
       'text-wrap': 'ellipsis',
@@ -105,8 +105,8 @@ const style: cytoscape.Stylesheet[] = [
       'source-arrow-color': lineColor,
       'target-arrow-shape': 'triangle',
       // @ts-ignore
-      'source-distance-from-node': theme.paddingSizes.xs,
-      'target-distance-from-node': theme.paddingSizes.xs
+      'source-distance-from-node': parseInt(theme.paddingSizes.xs, 10),
+      'target-distance-from-node': parseInt(theme.paddingSizes.xs, 10)
     }
   },
   // @ts-ignore DefinitelyTyped says visibility is "none" but it's
diff --git a/x-pack/package.json b/x-pack/package.json
index dacde606239b1..2f94beaf1bf78 100644
--- a/x-pack/package.json
+++ b/x-pack/package.json
@@ -50,7 +50,7 @@
     "@types/cheerio": "^0.22.10",
     "@types/chroma-js": "^1.4.2",
     "@types/color": "^3.0.0",
-    "@types/cytoscape": "^3.8.2",
+    "@types/cytoscape": "^3.14.0",
     "@types/d3-array": "^1.2.7",
     "@types/d3-scale": "^2.1.1",
     "@types/d3-shape": "^1.3.1",
diff --git a/yarn.lock b/yarn.lock
index 7608fedd705a4..461f12cd2ea1a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3726,10 +3726,10 @@
     "@types/cp-file" "*"
     "@types/glob" "*"
 
-"@types/cytoscape@^3.8.2":
-  version "3.8.2"
-  resolved "https://registry.yarnpkg.com/@types/cytoscape/-/cytoscape-3.8.2.tgz#428e85e12fb8dba94b05b1b1a8b04fd6f91b9c2d"
-  integrity sha512-b9n8dwMnU+64++Vky7bfab3Fod6JRbhZRrRJgnyKd03sh/vgNYHsq9N3W1MlU32d3AanxWUDH/1+jC+l5V9BeQ==
+"@types/cytoscape@^3.14.0":
+  version "3.14.0"
+  resolved "https://registry.yarnpkg.com/@types/cytoscape/-/cytoscape-3.14.0.tgz#346b5430a7a1533784bcf44fcbe6c5255b948d36"
+  integrity sha512-qOhhZFGb35457vmCu9YHqwjqleraSAEikaIFmMUPWzTC7FrwkS7VR/6ymqRHW7Z8wivHuzsZDYCoePIepd69qg==
 
 "@types/d3-array@^1.2.7":
   version "1.2.7"

From 9243b6de2897fa55f7f47b685fd344dbe9d4e497 Mon Sep 17 00:00:00 2001
From: Ryland Herrick <ryalnd@gmail.com>
Date: Wed, 25 Mar 2020 19:08:29 -0500
Subject: [PATCH 175/179] Check auth status via security plugin on our
 privileges endpoint (#61334)

* Accounts for security being disabled, adds tests
* Updates other auth-aware endpoints (import timeline, graphql) to
account for security being disabled.
---
 .../routes/__mocks__/request_responses.ts     |  4 +-
 .../privileges/read_privileges_route.test.ts  | 56 +++++++++++++++++--
 .../privileges/read_privileges_route.ts       |  9 ++-
 .../lib/framework/kibana_framework_adapter.ts |  2 +-
 .../timeline/routes/import_timelines_route.ts |  6 +-
 x-pack/legacy/plugins/siem/server/plugin.ts   |  2 +-
 .../plugins/siem/server/routes/index.ts       |  6 +-
 7 files changed, 66 insertions(+), 19 deletions(-)

diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/__mocks__/request_responses.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/__mocks__/request_responses.ts
index 24f50c5ce87a0..3b24b722f7356 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/__mocks__/request_responses.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/__mocks__/request_responses.ts
@@ -514,7 +514,7 @@ export const updateActionResult = (): ActionResult => ({
   config: {},
 });
 
-export const getMockPrivileges = () => ({
+export const getMockPrivilegesResult = () => ({
   username: 'test-space',
   has_all_requested: false,
   cluster: {
@@ -565,8 +565,6 @@ export const getMockPrivileges = () => ({
     },
   },
   application: {},
-  is_authenticated: false,
-  has_encryption_key: true,
 });
 
 export const getFindResultStatusEmpty = (): SavedObjectsFindResponse<IRuleSavedAttributesSavedObjectAttributes> => ({
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/privileges/read_privileges_route.test.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/privileges/read_privileges_route.test.ts
index 44050f21a1259..aa4f6150889f9 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/privileges/read_privileges_route.test.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/privileges/read_privileges_route.test.ts
@@ -4,20 +4,24 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+import { securityMock } from '../../../../../../../../plugins/security/server/mocks';
 import { readPrivilegesRoute } from './read_privileges_route';
 import { serverMock, requestContextMock } from '../__mocks__';
-import { getPrivilegeRequest, getMockPrivileges } from '../__mocks__/request_responses';
+import { getPrivilegeRequest, getMockPrivilegesResult } from '../__mocks__/request_responses';
 
-describe('read_privileges', () => {
+describe('read_privileges route', () => {
   let server: ReturnType<typeof serverMock.create>;
   let { clients, context } = requestContextMock.createTools();
+  let mockSecurity: ReturnType<typeof securityMock.createSetup>;
 
   beforeEach(() => {
     server = serverMock.create();
     ({ clients, context } = requestContextMock.createTools());
 
-    clients.clusterClient.callAsCurrentUser.mockResolvedValue(getMockPrivileges());
-    readPrivilegesRoute(server.router, false);
+    mockSecurity = securityMock.createSetup();
+    mockSecurity.authc.isAuthenticated.mockReturnValue(false);
+    clients.clusterClient.callAsCurrentUser.mockResolvedValue(getMockPrivilegesResult());
+    readPrivilegesRoute(server.router, mockSecurity, false);
   });
 
   describe('normal status codes', () => {
@@ -26,10 +30,28 @@ describe('read_privileges', () => {
       expect(response.status).toEqual(200);
     });
 
-    test.skip('returns the payload when doing a normal request', async () => {
+    test('returns the payload when doing a normal request', async () => {
       const response = await server.inject(getPrivilegeRequest(), context);
+      const expectedBody = {
+        ...getMockPrivilegesResult(),
+        is_authenticated: false,
+        has_encryption_key: true,
+      };
       expect(response.status).toEqual(200);
-      expect(response.body).toEqual(getMockPrivileges());
+      expect(response.body).toEqual(expectedBody);
+    });
+
+    test('is authenticated when security says so', async () => {
+      mockSecurity.authc.isAuthenticated.mockReturnValue(true);
+      const expectedBody = {
+        ...getMockPrivilegesResult(),
+        is_authenticated: true,
+        has_encryption_key: true,
+      };
+
+      const response = await server.inject(getPrivilegeRequest(), context);
+      expect(response.status).toEqual(200);
+      expect(response.body).toEqual(expectedBody);
     });
 
     test('returns 500 when bad response from cluster', async () => {
@@ -41,4 +63,26 @@ describe('read_privileges', () => {
       expect(response.body).toEqual({ message: 'Test error', status_code: 500 });
     });
   });
+
+  describe('when security plugin is disabled', () => {
+    beforeEach(() => {
+      server = serverMock.create();
+      ({ clients, context } = requestContextMock.createTools());
+
+      clients.clusterClient.callAsCurrentUser.mockResolvedValue(getMockPrivilegesResult());
+      readPrivilegesRoute(server.router, undefined, false);
+    });
+
+    it('returns unauthenticated', async () => {
+      const expectedBody = {
+        ...getMockPrivilegesResult(),
+        is_authenticated: false,
+        has_encryption_key: true,
+      };
+
+      const response = await server.inject(getPrivilegeRequest(), context);
+      expect(response.status).toEqual(200);
+      expect(response.body).toEqual(expectedBody);
+    });
+  });
 });
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/privileges/read_privileges_route.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/privileges/read_privileges_route.ts
index 81ce4a9c3f2fc..2f5ea4d1ec767 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/privileges/read_privileges_route.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/privileges/read_privileges_route.ts
@@ -8,10 +8,15 @@ import { merge } from 'lodash/fp';
 
 import { IRouter } from '../../../../../../../../../src/core/server';
 import { DETECTION_ENGINE_PRIVILEGES_URL } from '../../../../../common/constants';
+import { SetupPlugins } from '../../../../plugin';
 import { buildSiemResponse, transformError } from '../utils';
 import { readPrivileges } from '../../privileges/read_privileges';
 
-export const readPrivilegesRoute = (router: IRouter, usingEphemeralEncryptionKey: boolean) => {
+export const readPrivilegesRoute = (
+  router: IRouter,
+  security: SetupPlugins['security'],
+  usingEphemeralEncryptionKey: boolean
+) => {
   router.get(
     {
       path: DETECTION_ENGINE_PRIVILEGES_URL,
@@ -29,7 +34,7 @@ export const readPrivilegesRoute = (router: IRouter, usingEphemeralEncryptionKey
         const index = siemClient.signalsIndex;
         const clusterPrivileges = await readPrivileges(clusterClient.callAsCurrentUser, index);
         const privileges = merge(clusterPrivileges, {
-          is_authenticated: true, // until we support optional auth: https://github.com/elastic/kibana/pull/55327#issuecomment-577159911
+          is_authenticated: security?.authc.isAuthenticated(request) ?? false,
           has_encryption_key: !usingEphemeralEncryptionKey,
         });
 
diff --git a/x-pack/legacy/plugins/siem/server/lib/framework/kibana_framework_adapter.ts b/x-pack/legacy/plugins/siem/server/lib/framework/kibana_framework_adapter.ts
index 004ac36bad5b4..6b41426e047ca 100644
--- a/x-pack/legacy/plugins/siem/server/lib/framework/kibana_framework_adapter.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/framework/kibana_framework_adapter.ts
@@ -122,7 +122,7 @@ export class KibanaBackendFrameworkAdapter implements FrameworkAdapter {
 
   private async getCurrentUserInfo(request: KibanaRequest): Promise<AuthenticatedUser | null> {
     try {
-      const user = await this.security.authc.getCurrentUser(request);
+      const user = (await this.security?.authc.getCurrentUser(request)) ?? null;
       return user;
     } catch {
       return null;
diff --git a/x-pack/legacy/plugins/siem/server/lib/timeline/routes/import_timelines_route.ts b/x-pack/legacy/plugins/siem/server/lib/timeline/routes/import_timelines_route.ts
index fefe31b2f36d0..2b41b4e7843a7 100644
--- a/x-pack/legacy/plugins/siem/server/lib/timeline/routes/import_timelines_route.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/timeline/routes/import_timelines_route.ts
@@ -30,6 +30,7 @@ import {
 
 import { IRouter } from '../../../../../../../../src/core/server';
 import { TIMELINE_IMPORT_URL } from '../../../../common/constants';
+import { SetupPlugins } from '../../../plugin';
 import { importTimelinesPayloadSchema } from './schemas/import_timelines_schema';
 import { importRulesSchema } from '../../detection_engine/routes/schemas/response/import_rules_schema';
 import { LegacyServices } from '../../../types';
@@ -37,7 +38,6 @@ import { LegacyServices } from '../../../types';
 import { Timeline } from '../saved_object';
 import { validate } from '../../detection_engine/routes/rules/validate';
 import { FrameworkRequest } from '../../framework';
-import { SecurityPluginSetup } from '../../../../../../../plugins/security/server';
 
 const CHUNK_PARSED_OBJECT_SIZE = 10;
 
@@ -46,7 +46,7 @@ const timelineLib = new Timeline();
 export const importTimelinesRoute = (
   router: IRouter,
   config: LegacyServices['config'],
-  securityPluginSetup: SecurityPluginSetup
+  security: SetupPlugins['security']
 ) => {
   router.post(
     {
@@ -96,7 +96,7 @@ export const importTimelinesRoute = (
         const chunkParseObjects = chunk(CHUNK_PARSED_OBJECT_SIZE, uniqueParsedObjects);
         let importTimelineResponse: ImportTimelineResponse[] = [];
 
-        const user = await securityPluginSetup.authc.getCurrentUser(request);
+        const user = await security?.authc.getCurrentUser(request);
         let frameworkRequest = set('context.core.savedObjects.client', savedObjectsClient, request);
         frameworkRequest = set('user', user, frameworkRequest);
 
diff --git a/x-pack/legacy/plugins/siem/server/plugin.ts b/x-pack/legacy/plugins/siem/server/plugin.ts
index 2bce9b6a7e1aa..98631ea220a54 100644
--- a/x-pack/legacy/plugins/siem/server/plugin.ts
+++ b/x-pack/legacy/plugins/siem/server/plugin.ts
@@ -46,7 +46,7 @@ export interface SetupPlugins {
   encryptedSavedObjects: EncryptedSavedObjectsSetup;
   features: FeaturesSetup;
   licensing: LicensingPluginSetup;
-  security: SecuritySetup;
+  security?: SecuritySetup;
   spaces?: SpacesSetup;
 }
 
diff --git a/x-pack/legacy/plugins/siem/server/routes/index.ts b/x-pack/legacy/plugins/siem/server/routes/index.ts
index 29c21ad157235..8c9f92890c26a 100644
--- a/x-pack/legacy/plugins/siem/server/routes/index.ts
+++ b/x-pack/legacy/plugins/siem/server/routes/index.ts
@@ -31,13 +31,13 @@ import { findRulesStatusesRoute } from '../lib/detection_engine/routes/rules/fin
 import { getPrepackagedRulesStatusRoute } from '../lib/detection_engine/routes/rules/get_prepackaged_rules_status_route';
 import { importTimelinesRoute } from '../lib/timeline/routes/import_timelines_route';
 import { exportTimelinesRoute } from '../lib/timeline/routes/export_timelines_route';
-import { SecurityPluginSetup } from '../../../../../plugins/security/server/';
+import { SetupPlugins } from '../plugin';
 
 export const initRoutes = (
   router: IRouter,
   config: LegacyServices['config'],
   usingEphemeralEncryptionKey: boolean,
-  security: SecurityPluginSetup
+  security: SetupPlugins['security']
 ) => {
   // Detection Engine Rule routes that have the REST endpoints of /api/detection_engine/rules
   // All REST rule creation, deletion, updating, etc......
@@ -79,5 +79,5 @@ export const initRoutes = (
   readTagsRoute(router);
 
   // Privileges API to get the generic user privileges
-  readPrivilegesRoute(router, usingEphemeralEncryptionKey);
+  readPrivilegesRoute(router, security, usingEphemeralEncryptionKey);
 };

From 1bcf848e468e58809ccb850784c42626bdd15eee Mon Sep 17 00:00:00 2001
From: Tyler Smalley <tyler.smalley@elastic.co>
Date: Wed, 25 Mar 2020 22:22:04 -0700
Subject: [PATCH 176/179] Sets min_doc_count=0 for parent histogram of
 derivative aggregation (#61390)

From the docs: The specified metric must be numeric and the enclosing
histogram must have min_doc_count set to 0 (default for histogram
aggregations).

https://www.elastic.co/guide/en/elasticsearch/reference/current/search-aggregations-pipeline-derivative-aggregation.html#search-aggregations-pipeline-derivative-aggregation

This is now enforced, and currently failing the promotion of the current
Elasticsearch build

Related to https://github.com/elastic/kibana/pull/61387

Signed-off-by: Tyler Smalley <tyler.smalley@elastic.co>
---
 .../server/lib/elasticsearch/nodes/get_nodes/get_nodes.js      | 2 +-
 .../api_integration/apis/monitoring/elasticsearch/nodes.js     | 3 +--
 x-pack/test/functional/apps/monitoring/elasticsearch/nodes.js  | 3 +--
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/x-pack/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
index c248ad743e0ec..d431ec47adbcb 100644
--- a/x-pack/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
@@ -84,7 +84,7 @@ export async function getNodes(req, esIndexPattern, pageOfNodes, clusterStats, n
             by_date: {
               date_histogram: {
                 field: 'timestamp',
-                min_doc_count: 1,
+                min_doc_count: 0,
                 fixed_interval: bucketSize + 's',
               },
               aggs: getMetricAggs(LISTING_METRICS_NAMES, bucketSize),
diff --git a/x-pack/test/api_integration/apis/monitoring/elasticsearch/nodes.js b/x-pack/test/api_integration/apis/monitoring/elasticsearch/nodes.js
index f9a6dd31092aa..4d86fc9d9a7f5 100644
--- a/x-pack/test/api_integration/apis/monitoring/elasticsearch/nodes.js
+++ b/x-pack/test/api_integration/apis/monitoring/elasticsearch/nodes.js
@@ -34,8 +34,7 @@ export default function({ getService }) {
         return esArchiver.unload(archive);
       });
 
-      // https://github.com/elastic/kibana/issues/61366
-      it.skip('should return data for 2 active nodes', async () => {
+      it('should return data for 2 active nodes', async () => {
         const { body } = await supertest
           .post('/api/monitoring/v1/clusters/fHJwISmKTFO8bj57oFBLUQ/elasticsearch/nodes')
           .set('kbn-xsrf', 'xxx')
diff --git a/x-pack/test/functional/apps/monitoring/elasticsearch/nodes.js b/x-pack/test/functional/apps/monitoring/elasticsearch/nodes.js
index dcbd94de8a770..d407ba898f107 100644
--- a/x-pack/test/functional/apps/monitoring/elasticsearch/nodes.js
+++ b/x-pack/test/functional/apps/monitoring/elasticsearch/nodes.js
@@ -34,8 +34,7 @@ export default function({ getService, getPageObjects }) {
         await tearDown();
       });
 
-      // https://github.com/elastic/kibana/issues/61366
-      it.skip('should have an Elasticsearch Cluster Summary Status with correct info', async () => {
+      it('should have an Elasticsearch Cluster Summary Status with correct info', async () => {
         expect(await esClusterSummaryStatus.getContent()).to.eql({
           nodesCount: 'Nodes\n2',
           indicesCount: 'Indices\n20',

From 9dd7ac2de9f7ef117601e09682361142f228cf80 Mon Sep 17 00:00:00 2001
From: Thomas Watson <w@tson.dk>
Date: Thu, 26 Mar 2020 06:59:13 +0100
Subject: [PATCH 177/179] Bump cypress dev-dependency from 4.0.2 to 4.2.0
 (#61128)

---
 x-pack/package.json |   2 +-
 yarn.lock           | 128 +++++++++++++++++++++++++++-----------------
 2 files changed, 80 insertions(+), 50 deletions(-)

diff --git a/x-pack/package.json b/x-pack/package.json
index 2f94beaf1bf78..1b69ed3539847 100644
--- a/x-pack/package.json
+++ b/x-pack/package.json
@@ -120,7 +120,7 @@
     "cheerio": "0.22.0",
     "commander": "3.0.2",
     "copy-webpack-plugin": "^5.0.4",
-    "cypress": "^4.0.2",
+    "cypress": "^4.2.0",
     "cypress-multi-reporters": "^1.2.3",
     "enzyme": "^3.11.0",
     "enzyme-adapter-react-16": "^1.15.2",
diff --git a/yarn.lock b/yarn.lock
index 461f12cd2ea1a..a925df3d1f461 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8283,14 +8283,6 @@ chalk@2.4.2, chalk@^2.3.2, chalk@^2.4.2, chalk@~2.4.1:
     escape-string-regexp "^1.0.5"
     supports-color "^5.3.0"
 
-chalk@3.0.0, chalk@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-3.0.0.tgz#3f73c2bf526591f574cc492c51e2456349f844e4"
-  integrity sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==
-  dependencies:
-    ansi-styles "^4.1.0"
-    supports-color "^7.1.0"
-
 chalk@^1.0.0, chalk@^1.1.1, chalk@^1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
@@ -8320,6 +8312,14 @@ chalk@^2.3.0:
     escape-string-regexp "^1.0.5"
     supports-color "^5.2.0"
 
+chalk@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-3.0.0.tgz#3f73c2bf526591f574cc492c51e2456349f844e4"
+  integrity sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==
+  dependencies:
+    ansi-styles "^4.1.0"
+    supports-color "^7.1.0"
+
 chalk@~0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-0.4.0.tgz#5199a3ddcd0c1efe23bc08c1b027b06176e0c64f"
@@ -10145,10 +10145,10 @@ cypress-multi-reporters@^1.2.3:
     debug "^4.1.1"
     lodash "^4.17.11"
 
-cypress@^4.0.2:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/cypress/-/cypress-4.0.2.tgz#ede194d7bc73fb449f8de553c9e1db4ca15309ef"
-  integrity sha512-WRzxOoSd+TxyXKa7Zi9orz3ii5VW7yhhVYstCU+EpOKfPan9x5Ww2Clucmy4H/W0GHUYAo7GYFZRD33ZCSNBQA==
+cypress@^4.2.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/cypress/-/cypress-4.2.0.tgz#45673fb648b1a77b9a78d73e58b89ed05212d243"
+  integrity sha512-8LdreL91S/QiTCLYLNbIjLL8Ht4fJmu/4HGLxUI20Tc7JSfqEfCmXELrRfuPT0kjosJwJJZacdSji9XSRkPKUw==
   dependencies:
     "@cypress/listr-verbose-renderer" "0.4.1"
     "@cypress/xvfb" "1.2.4"
@@ -10156,13 +10156,14 @@ cypress@^4.0.2:
     arch "2.1.1"
     bluebird "3.7.2"
     cachedir "2.3.0"
-    chalk "3.0.0"
+    chalk "2.4.2"
     check-more-types "2.24.0"
+    cli-table3 "0.5.1"
     commander "4.1.0"
     common-tags "1.8.0"
     debug "4.1.1"
     eventemitter2 "4.1.2"
-    execa "3.3.0"
+    execa "1.0.0"
     executable "4.1.1"
     extract-zip "1.6.7"
     fs-extra "8.1.0"
@@ -10173,10 +10174,12 @@ cypress@^4.0.2:
     listr "0.14.3"
     lodash "4.17.15"
     log-symbols "3.0.0"
-    minimist "1.2.0"
+    minimist "1.2.2"
     moment "2.24.0"
+    ospath "1.2.2"
+    pretty-bytes "5.3.0"
     ramda "0.26.1"
-    request "2.88.0"
+    request cypress-io/request#b5af0d1fa47eec97ba980cde90a13e69a2afcd16
     request-progress "3.0.0"
     supports-color "7.1.0"
     tmp "0.1.0"
@@ -12568,21 +12571,18 @@ exec-sh@^0.3.2:
   resolved "https://registry.yarnpkg.com/exec-sh/-/exec-sh-0.3.2.tgz#6738de2eb7c8e671d0366aea0b0db8c6f7d7391b"
   integrity sha512-9sLAvzhI5nc8TpuQUh4ahMdCrWT00wPWz7j47/emR5+2qEfoZP5zzUXvx+vdx+H6ohhnsYC31iX04QLYJK8zTg==
 
-execa@3.3.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/execa/-/execa-3.3.0.tgz#7e348eef129a1937f21ecbbd53390942653522c1"
-  integrity sha512-j5Vit5WZR/cbHlqU97+qcnw9WHRCIL4V1SVe75VcHcD1JRBdt8fv0zw89b7CQHQdUHTt2VjuhcF5ibAgVOxqpg==
+execa@1.0.0, execa@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/execa/-/execa-1.0.0.tgz#c6236a5bb4df6d6f15e88e7f017798216749ddd8"
+  integrity sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==
   dependencies:
-    cross-spawn "^7.0.0"
-    get-stream "^5.0.0"
-    human-signals "^1.1.1"
-    is-stream "^2.0.0"
-    merge-stream "^2.0.0"
-    npm-run-path "^4.0.0"
-    onetime "^5.1.0"
-    p-finally "^2.0.0"
-    signal-exit "^3.0.2"
-    strip-final-newline "^2.0.0"
+    cross-spawn "^6.0.0"
+    get-stream "^4.0.0"
+    is-stream "^1.1.0"
+    npm-run-path "^2.0.0"
+    p-finally "^1.0.0"
+    signal-exit "^3.0.0"
+    strip-eof "^1.0.0"
 
 execa@^0.1.1:
   version "0.1.1"
@@ -12644,19 +12644,6 @@ execa@^0.7.0:
     signal-exit "^3.0.0"
     strip-eof "^1.0.0"
 
-execa@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/execa/-/execa-1.0.0.tgz#c6236a5bb4df6d6f15e88e7f017798216749ddd8"
-  integrity sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==
-  dependencies:
-    cross-spawn "^6.0.0"
-    get-stream "^4.0.0"
-    is-stream "^1.1.0"
-    npm-run-path "^2.0.0"
-    p-finally "^1.0.0"
-    signal-exit "^3.0.0"
-    strip-eof "^1.0.0"
-
 execa@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/execa/-/execa-4.0.0.tgz#7f37d6ec17f09e6b8fc53288611695b6d12b9daf"
@@ -15314,7 +15301,7 @@ har-validator@~5.0.3:
     ajv "^5.1.0"
     har-schema "^2.0.0"
 
-har-validator@~5.1.0:
+har-validator@~5.1.0, har-validator@~5.1.3:
   version "5.1.3"
   resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.3.tgz#1ef89ebd3e4996557675eed9893110dc350fa080"
   integrity sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==
@@ -20148,6 +20135,11 @@ minimist@1.2.0, minimist@^1.1.0, minimist@^1.1.1, minimist@^1.1.3, minimist@^1.2
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
   integrity sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=
 
+minimist@1.2.2:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.2.tgz#b00a00230a1108c48c169e69a291aafda3aacd63"
+  integrity sha512-rIqbOrKb8GJmx/5bc2M0QchhUouMXSpd1RTclXsB41JdL+VtnojfaJR+h7F9k18/4kHUsBFgk80Uk+q569vjPA==
+
 minimist@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.1.0.tgz#99df657a52574c21c9057497df742790b2b4c0de"
@@ -21732,6 +21724,11 @@ osenv@0, osenv@^0.1.0:
     os-homedir "^1.0.0"
     os-tmpdir "^1.0.0"
 
+ospath@1.2.2:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/ospath/-/ospath-1.2.2.tgz#1276639774a3f8ef2572f7fe4280e0ea4550c07b"
+  integrity sha1-EnZjl3Sj+O8lcvf+QoDg6kVQwHs=
+
 p-all@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/p-all/-/p-all-2.1.0.tgz#91419be56b7dee8fe4c5db875d55e0da084244a0"
@@ -21780,11 +21777,6 @@ p-finally@^1.0.0:
   resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae"
   integrity sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=
 
-p-finally@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-2.0.1.tgz#bd6fcaa9c559a096b680806f4d657b3f0f240561"
-  integrity sha512-vpm09aKwq6H9phqRQzecoDpD8TmVyGw70qmWlyq5onxY7tqyTTFVvxMykxQSQKILBSFlbXpypIw2T1Ml7+DDtw==
-
 p-is-promise@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/p-is-promise/-/p-is-promise-1.1.0.tgz#9c9456989e9f6588017b0434d56097675c3da05e"
@@ -22812,6 +22804,11 @@ prettier@^1.19.1:
   resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.19.1.tgz#f7d7f5ff8a9cd872a7be4ca142095956a60797cb"
   integrity sha512-s7PoyDv/II1ObgQunCbB9PdLmUcBZcnWOcxDh7O0N/UwDEsHyqkW+Qh28jW+mVuCdx7gLB0BotYI1Y6uI9iyew==
 
+pretty-bytes@5.3.0:
+  version "5.3.0"
+  resolved "https://registry.yarnpkg.com/pretty-bytes/-/pretty-bytes-5.3.0.tgz#f2849e27db79fb4d6cfe24764fc4134f165989f2"
+  integrity sha512-hjGrh+P926p4R4WbaB6OckyRtO0F0/lQBiT+0gnxjV+5kjPBrfVBFCsCLbMqVQeydvIoouYTCmmEURiH3R1Bdg==
+
 pretty-bytes@^4.0.2:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/pretty-bytes/-/pretty-bytes-4.0.2.tgz#b2bf82e7350d65c6c33aa95aaa5a4f6327f61cd9"
@@ -25259,6 +25256,31 @@ request@^2.87.0:
     tunnel-agent "^0.6.0"
     uuid "^3.1.0"
 
+request@cypress-io/request#b5af0d1fa47eec97ba980cde90a13e69a2afcd16:
+  version "2.88.1"
+  resolved "https://codeload.github.com/cypress-io/request/tar.gz/b5af0d1fa47eec97ba980cde90a13e69a2afcd16"
+  dependencies:
+    aws-sign2 "~0.7.0"
+    aws4 "^1.8.0"
+    caseless "~0.12.0"
+    combined-stream "~1.0.6"
+    extend "~3.0.2"
+    forever-agent "~0.6.1"
+    form-data "~2.3.2"
+    har-validator "~5.1.3"
+    http-signature "~1.2.0"
+    is-typedarray "~1.0.0"
+    isstream "~0.1.2"
+    json-stringify-safe "~5.0.1"
+    mime-types "~2.1.19"
+    oauth-sign "~0.9.0"
+    performance-now "^2.1.0"
+    qs "~6.5.2"
+    safe-buffer "^5.1.2"
+    tough-cookie "~2.5.0"
+    tunnel-agent "^0.6.0"
+    uuid "^3.3.2"
+
 require-ancestors@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/require-ancestors/-/require-ancestors-1.0.0.tgz#807831f8f8081fb12863da81ddb15c8f2a73a004"
@@ -28567,6 +28589,14 @@ tough-cookie@~2.3.0, tough-cookie@~2.3.3:
   dependencies:
     punycode "^1.4.1"
 
+tough-cookie@~2.5.0:
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz#cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2"
+  integrity sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==
+  dependencies:
+    psl "^1.1.28"
+    punycode "^2.1.1"
+
 tr46@^1.0.0, tr46@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/tr46/-/tr46-1.0.1.tgz#a8b13fd6bfd2489519674ccde55ba3693b706d09"

From fe2ae7ea0d24d6105993920a3bdc19033483f0cb Mon Sep 17 00:00:00 2001
From: Thomas Watson <w@tson.dk>
Date: Thu, 26 Mar 2020 07:07:42 +0100
Subject: [PATCH 178/179] Bump extract-zip from v1.6.7 to v1.7.0 (#61209)

This commit also consolidates our versions of the mkdirp sub-dependency
to use the newest 0.5.x version (v0.5.4) wherever possible.
---
 packages/kbn-pm/dist/index.js |  1 +
 x-pack/package.json           |  2 +-
 yarn.lock                     | 23 ++++++++++++++++++++---
 3 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/packages/kbn-pm/dist/index.js b/packages/kbn-pm/dist/index.js
index 4b6375b0cc099..ace8fc11c1247 100644
--- a/packages/kbn-pm/dist/index.js
+++ b/packages/kbn-pm/dist/index.js
@@ -4013,6 +4013,7 @@ function mkdirP (p, opts, f, made) {
         }
         switch (er.code) {
             case 'ENOENT':
+                if (path.dirname(p) === p) return cb(er);
                 mkdirP(path.dirname(p), opts, function (er, made) {
                     if (er) cb(er, made);
                     else mkdirP(p, opts, cb, made);
diff --git a/x-pack/package.json b/x-pack/package.json
index 1b69ed3539847..1677748e4c9e1 100644
--- a/x-pack/package.json
+++ b/x-pack/package.json
@@ -233,7 +233,7 @@
     "del": "^5.1.0",
     "dragselect": "1.13.1",
     "elasticsearch": "^16.5.0",
-    "extract-zip": "1.6.7",
+    "extract-zip": "^1.7.0",
     "file-saver": "^1.3.8",
     "file-type": "^10.9.0",
     "font-awesome": "4.7.0",
diff --git a/yarn.lock b/yarn.lock
index a925df3d1f461..7717ea90f1ee7 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9213,7 +9213,7 @@ concat-stream@1.6.0, concat-stream@^1.4.7, concat-stream@~1.6.0:
     readable-stream "^2.2.2"
     typedarray "^0.0.6"
 
-concat-stream@1.6.2, concat-stream@^1.4.6, concat-stream@^1.5.0, concat-stream@^1.6.0, concat-stream@^1.6.1:
+concat-stream@1.6.2, concat-stream@^1.4.6, concat-stream@^1.5.0, concat-stream@^1.6.0, concat-stream@^1.6.1, concat-stream@^1.6.2:
   version "1.6.2"
   resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34"
   integrity sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==
@@ -12946,7 +12946,7 @@ extract-zip@1.6.6:
     mkdirp "0.5.0"
     yauzl "2.4.1"
 
-extract-zip@1.6.7, extract-zip@^1.6.6, extract-zip@^1.6.7:
+extract-zip@1.6.7:
   version "1.6.7"
   resolved "https://registry.yarnpkg.com/extract-zip/-/extract-zip-1.6.7.tgz#a840b4b8af6403264c8db57f4f1a74333ef81fe9"
   integrity sha1-qEC0uK9kAyZMjbV/Txp0Mz74H+k=
@@ -12956,6 +12956,16 @@ extract-zip@1.6.7, extract-zip@^1.6.6, extract-zip@^1.6.7:
     mkdirp "0.5.1"
     yauzl "2.4.1"
 
+extract-zip@^1.6.6, extract-zip@^1.6.7, extract-zip@^1.7.0:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/extract-zip/-/extract-zip-1.7.0.tgz#556cc3ae9df7f452c493a0cfb51cc30277940927"
+  integrity sha512-xoh5G1W/PB0/27lXgMQyIhP5DSY/LhoCsOyZgb+6iMmRtCwVBo55uKaMoEYrDCKQhWvqEip5ZPKAc6eFNyf/MA==
+  dependencies:
+    concat-stream "^1.6.2"
+    debug "^2.6.9"
+    mkdirp "^0.5.4"
+    yauzl "^2.10.0"
+
 extsprintf@1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05"
@@ -20266,7 +20276,7 @@ mkdirp@0.5.0:
   dependencies:
     minimist "0.0.8"
 
-mkdirp@0.5.1, mkdirp@0.5.x, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0, mkdirp@~0.5.1:
+mkdirp@0.5.1:
   version "0.5.1"
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
   integrity sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=
@@ -20280,6 +20290,13 @@ mkdirp@0.5.3:
   dependencies:
     minimist "^1.2.5"
 
+mkdirp@0.5.x, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@^0.5.4, mkdirp@~0.5.0, mkdirp@~0.5.1:
+  version "0.5.4"
+  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.4.tgz#fd01504a6797ec5c9be81ff43d204961ed64a512"
+  integrity sha512-iG9AK/dJLtJ0XNgTuDbSyNS3zECqDlAhnQW4CsNxBG3LQJBbHmRX1egw39DmtOdCAqY+dKXV+sgPgilNWUKMVw==
+  dependencies:
+    minimist "^1.2.5"
+
 mkdirp@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.3.tgz#4cf2e30ad45959dddea53ad97d518b6c8205e1ea"

From cf5c8f60bbed35cfe47ec3f8e2aa3a30f4705547 Mon Sep 17 00:00:00 2001
From: Peter Pisljar <peter.pisljar@gmail.com>
Date: Thu, 26 Mar 2020 07:34:18 +0100
Subject: [PATCH 179/179] fixing tabifyAggResponse (#61214)

---
 .../search/tabify/response_writer.test.ts     | 21 ++++++++++++++++---
 .../public/search/tabify/response_writer.ts   |  7 +++----
 2 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/src/plugins/data/public/search/tabify/response_writer.test.ts b/src/plugins/data/public/search/tabify/response_writer.test.ts
index ca84f08de8c8a..52338ae79ccbb 100644
--- a/src/plugins/data/public/search/tabify/response_writer.test.ts
+++ b/src/plugins/data/public/search/tabify/response_writer.test.ts
@@ -106,13 +106,13 @@ describe('TabbedAggResponseWriter class', () => {
       });
 
       test('adds the row to the array', () => {
-        responseWriter.bucketBuffer = [{ id: 'col-0', value: 'US' }];
-        responseWriter.metricBuffer = [{ id: 'col-1', value: 5 }];
+        responseWriter.bucketBuffer = [{ id: 'col-0-1', value: 'US' }];
+        responseWriter.metricBuffer = [{ id: 'col-1-2', value: 5 }];
 
         responseWriter.row();
 
         expect(responseWriter.rows.length).toEqual(1);
-        expect(responseWriter.rows[0]).toEqual({ 'col-0': 'US', 'col-1': 5 });
+        expect(responseWriter.rows[0]).toEqual({ 'col-0-1': 'US', 'col-1-2': 5 });
       });
 
       test("doesn't add an empty row", () => {
@@ -120,6 +120,21 @@ describe('TabbedAggResponseWriter class', () => {
 
         expect(responseWriter.rows.length).toEqual(0);
       });
+
+      test('doesnt add a partial row', () => {
+        responseWriter.bucketBuffer = [{ id: 'col-0-1', value: 'US' }];
+        responseWriter.row();
+
+        expect(responseWriter.rows.length).toEqual(0);
+      });
+
+      test('adds partial row if partialRows is set to true', () => {
+        responseWriter = createResponseWritter(splitAggConfig, { partialRows: true });
+        responseWriter.bucketBuffer = [{ id: 'col-0-1', value: 'US' }];
+        responseWriter.row();
+
+        expect(responseWriter.rows.length).toEqual(1);
+      });
     });
 
     describe('response()', () => {
diff --git a/src/plugins/data/public/search/tabify/response_writer.ts b/src/plugins/data/public/search/tabify/response_writer.ts
index cacecbec3be0b..02e18d75ae6e5 100644
--- a/src/plugins/data/public/search/tabify/response_writer.ts
+++ b/src/plugins/data/public/search/tabify/response_writer.ts
@@ -69,10 +69,9 @@ export class TabbedAggResponseWriter {
       rowBuffer[metric.id] = metric.value;
     });
 
-    const isPartialRow =
-      this.partialRows && !this.columns.every(column => rowBuffer.hasOwnProperty(column.id));
-
-    if (!isEmpty(rowBuffer) && !isPartialRow) {
+    const isPartialRow = !this.columns.every(column => rowBuffer.hasOwnProperty(column.id));
+    const removePartial = isPartialRow && !this.partialRows;
+    if (!isEmpty(rowBuffer) && !removePartial) {
       this.rows.push(rowBuffer);
     }
   }