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 01/35] 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 02/35] [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 03/35] 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 04/35] [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 05/35] 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 06/35] [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 07/35] [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 08/35] =?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 09/35] 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 10/35] [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 11/35] [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 12/35] [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 13/35] 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 14/35] 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 15/35] [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 16/35] 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 17/35] [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 18/35] [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 19/35] [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 20/35] [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 21/35] [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
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

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 22/35] 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 23/35] 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 24/35] [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 25/35] [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 26/35] 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 27/35] [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 28/35] [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 29/35] 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 30/35] 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 31/35] [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 32/35] [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 33/35] [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 34/35] [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 35/35] 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}`);